Adopt odlparent-10.0.0/yangtools-8.0.0-SNAPSHOT

[mdsal.git] / binding / mdsal-binding-dom-adapter / src / main / java / org / opendaylight / mdsal / binding / dom / adapter / BindingStructuralType.java

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 483c4079e644fc13eeb6f9cfbeccc35f91e3b2db..7fabbeab785d6f752c2ff3419bd13c5534b52ec2 100644 (file)
--- 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
@@ -25,7 +25,7 @@ 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.UnkeyedListEntryNode;
 import org.opendaylight.yangtools.yang.data.api.schema.UnkeyedListNode;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidateNode;
+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
@@ -70,7 +70,7 @@ public enum BindingStructuralType {
     UNKNOWN;
 
     public static BindingStructuralType from(final DataTreeCandidateNode domChildNode) {
-        Optional<NormalizedNode<?, ?>> dataBased = domChildNode.getDataAfter();
+        Optional<NormalizedNode> dataBased = domChildNode.getDataAfter();
         if (!dataBased.isPresent()) {
             dataBased = domChildNode.getDataBefore();
         }
@@ -90,7 +90,7 @@ public enum BindingStructuralType {
         return UNKNOWN;
     }
 
-    static BindingStructuralType from(final NormalizedNode<?, ?> data) {
+    static BindingStructuralType from(final NormalizedNode data) {
         if (isNotAddressable(data)) {
             return NOT_ADDRESSABLE;
         }
@@ -135,11 +135,11 @@ public enum BindingStructuralType {
         }
     }
 
-    private static boolean isVisibleContainer(final NormalizedNode<?, ?> data) {
+    private static boolean isVisibleContainer(final NormalizedNode data) {
         return data instanceof MapEntryNode || data instanceof ContainerNode || data instanceof AugmentationNode;
     }
 
-    private static boolean isNotAddressable(final NormalizedNode<?, ?> normalizedNode) {
+    private static boolean isNotAddressable(final NormalizedNode normalizedNode) {
         return normalizedNode instanceof LeafNode
                 || normalizedNode instanceof AnyxmlNode
                 || normalizedNode instanceof LeafSetNode