X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=binding%2Fmdsal-binding-dom-adapter%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Fbinding%2Fdom%2Fadapter%2FBindingStructuralType.java;h=8927cb40e13d9ee7c95e5ab51af74dc53e256d78;hb=7ce6b76f0d546db7d841479932eac3f48dafc017;hp=eca0082c4b69f782c03d77c3108e93c26c627c38;hpb=99bc0e872a9a3f2d2c892ef81b08a5ff5dcd2339;p=mdsal.git

diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingStructuralType.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingStructuralType.java
index eca0082c4b..8927cb40e1 100644
--- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingStructuralType.java
+++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingStructuralType.java
@@ -7,13 +7,12 @@
  */
 package org.opendaylight.mdsal.binding.dom.adapter;
 
-import com.google.common.base.Optional;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier;
+import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
-import org.opendaylight.yangtools.yang.data.api.schema.AnyXmlNode;
-import org.opendaylight.yangtools.yang.data.api.schema.AugmentationNode;
+import org.opendaylight.yangtools.yang.data.api.schema.AnydataNode;
+import org.opendaylight.yangtools.yang.data.api.schema.AnyxmlNode;
 import org.opendaylight.yangtools.yang.data.api.schema.ChoiceNode;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.LeafNode;
@@ -22,109 +21,118 @@ import org.opendaylight.yangtools.yang.data.api.schema.LeafSetNode;
 import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
 import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidateNode;
+import org.opendaylight.yangtools.yang.data.api.schema.UnkeyedListEntryNode;
+import org.opendaylight.yangtools.yang.data.api.schema.UnkeyedListNode;
+import org.opendaylight.yangtools.yang.data.tree.api.DataTreeCandidateNode;
 
 /**
+ * Defines structural mapping of Normalized Node to Binding data addressable by Instance Identifier. Not all binding
+ * data are addressable by instance identifier and there are some differences.
  *
- * Defines structural mapping of Normalized Node to Binding data
- * addressable by Instance Identifier.
- *
- * Not all binding data are addressable by instance identifier
- * and there are some differences.
- *
- * See {@link #NOT_ADDRESSABLE},{@link #INVISIBLE_CONTAINER},{@link #VISIBLE_CONTAINER}
- * for more details.
- *
+ * <p>
+ * See {@link #NOT_ADDRESSABLE},{@link #INVISIBLE_CONTAINER},{@link #VISIBLE_CONTAINER} for more details.
  *
+ * <p>
+ * NOTE: this class is exposed for migration purposes only, no new users outside of its package should be introduced.
  */
-enum BindingStructuralType {
-
+@Beta
+public enum BindingStructuralType {
     /**
-     * DOM Item is not addressable in Binding Instance Identifier,
-     * data is not lost, but are available only via parent object.
-     *
-     * Such types of data are leaf-lists, leafs, list without keys
-     * or anyxml.
-     *
+     * DOM Item is not addressable in Binding InstanceIdentifier, data is not lost, but are available only via parent
+     * object. Such types of data are leaf-lists, leafs, list without keys or anyxml.
      */
     NOT_ADDRESSABLE,
     /**
-     * Data container is addressable in NormalizedNode format,
-     * but in Binding it is not represented in Instance Identifier.
-     *
-     * This are choice / case nodes.
-     *
-     * This data is still accessible using parent object and their
-     * children are addressable.
+     * Data container is addressable in NormalizedNode format, but in Binding it is not represented in
+     * InstanceIdentifier. These are choice / case nodes.
      *
+     * <p>
+     * This data is still accessible using parent object and their children are addressable.
      */
     INVISIBLE_CONTAINER,
     /**
-     * Data container is addressable in NormalizedNode format,
-     * but in Binding it is not represented in Instance Identifier.
-     *
-     * This are list nodes.
-     *
-     * This data is still accessible using parent object and their
-     * children are addressable.
+     * Data container is addressable in NormalizedNode format, but in Binding it is not represented in
+     * InstanceIdentifier. These are list nodes.
      *
+     * <p>
+     * This data is still accessible using parent object and their children are addressable.
      */
     INVISIBLE_LIST,
     /**
-     * Data container is addressable in Binding Instance Identifier format
-     * and also YangInstanceIdentifier format.
-     *
+     * Data container is addressable in Binding InstanceIdentifier format and also YangInstanceIdentifier format.
      */
     VISIBLE_CONTAINER,
     /**
-     * Mapping algorithm was unable to detect type or was not updated after introduction
-     * of new NormalizedNode type.
+     * Mapping algorithm was unable to detect type or was not updated after introduction of new NormalizedNode type.
      */
     UNKNOWN;
 
-    static BindingStructuralType from(final DataTreeCandidateNode domChildNode) {
-        final Optional<NormalizedNode<?, ?>> dataBased = domChildNode.getDataAfter().or(domChildNode.getDataBefore());
-        if(dataBased.isPresent()) {
-            return from(dataBased.get());
+    public static BindingStructuralType from(final DataTreeCandidateNode domChildNode) {
+        var dataBased = domChildNode.dataAfter();
+        if (dataBased == null) {
+            dataBased = domChildNode.dataBefore();
         }
-        return from(domChildNode.getIdentifier());
+        return dataBased != null ? from(dataBased) : from(domChildNode.name());
     }
 
     private static BindingStructuralType from(final PathArgument identifier) {
-        if(identifier instanceof NodeIdentifierWithPredicates || identifier instanceof AugmentationIdentifier) {
+        if (identifier instanceof NodeIdentifierWithPredicates) {
             return VISIBLE_CONTAINER;
         }
-        if(identifier instanceof NodeWithValue) {
+        if (identifier instanceof NodeWithValue) {
             return NOT_ADDRESSABLE;
         }
         return UNKNOWN;
     }
 
-    static BindingStructuralType from(final NormalizedNode<?, ?> data) {
-        if(isNotAddressable(data)) {
+    static BindingStructuralType from(final NormalizedNode data) {
+        if (isNotAddressable(data)) {
             return NOT_ADDRESSABLE;
         }
-        if(data instanceof MapNode) {
+        if (data instanceof MapNode) {
             return INVISIBLE_LIST;
         }
-        if(data instanceof ChoiceNode) {
+        if (data instanceof ChoiceNode) {
             return INVISIBLE_CONTAINER;
         }
-        if(isVisibleContainer(data)) {
+        if (isVisibleContainer(data)) {
             return VISIBLE_CONTAINER;
         }
         return UNKNOWN;
     }
 
-    private static boolean isVisibleContainer(final NormalizedNode<?, ?> data) {
-        return data instanceof MapEntryNode || data instanceof ContainerNode || data instanceof AugmentationNode;
+    public static BindingStructuralType recursiveFrom(final DataTreeCandidateNode node) {
+        final var type = BindingStructuralType.from(node);
+        return switch (type) {
+            case INVISIBLE_CONTAINER, INVISIBLE_LIST -> {
+                // This node is invisible, try to resolve using a child node
+                for (var child : node.childNodes()) {
+                    final var childType = recursiveFrom(child);
+                    yield switch (childType) {
+                            case INVISIBLE_CONTAINER, INVISIBLE_LIST ->
+                                // Invisible nodes are not addressable
+                                BindingStructuralType.NOT_ADDRESSABLE;
+                            case NOT_ADDRESSABLE, UNKNOWN, VISIBLE_CONTAINER -> childType;
+                        };
+                }
+
+                yield BindingStructuralType.NOT_ADDRESSABLE;
+            }
+            default -> type;
+        };
     }
 
-    private static boolean isNotAddressable(final NormalizedNode<?, ?> d) {
-        return d instanceof LeafNode
-                || d instanceof AnyXmlNode
-                || d instanceof LeafSetNode
-                || d instanceof LeafSetEntryNode;
+    private static boolean isVisibleContainer(final NormalizedNode data) {
+        return data instanceof MapEntryNode || data instanceof ContainerNode;
     }
 
+    private static boolean isNotAddressable(final NormalizedNode normalizedNode) {
+        return normalizedNode instanceof LeafNode
+                || normalizedNode instanceof AnyxmlNode
+                || normalizedNode instanceof AnydataNode
+                || normalizedNode instanceof LeafSetNode
+                || normalizedNode instanceof LeafSetEntryNode
+                || normalizedNode instanceof UnkeyedListNode
+                || normalizedNode instanceof UnkeyedListEntryNode;
+    }
 }