Rework NormalizedNode type hierarchy

[yangtools.git] / yang / yang-data-api / src / main / java / org / opendaylight / yangtools / yang / data / api / schema / DuplicateFinder.java

diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/DuplicateFinder.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/DuplicateFinder.java
index 364218cc1cf8561b0f47d0fdc683636f2f88aee3..cb6087a31898295ac16f17b5619815ef9fd77cd4 100644 (file)
--- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/DuplicateFinder.java
+++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/DuplicateFinder.java
@@ -13,14 +13,14 @@ import java.util.Map;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 
 final class DuplicateFinder {
-    private final Map<NormalizedNode<?, ?>, DuplicateEntry> identities = new IdentityHashMap<>();
-    private final Map<NormalizedNode<?, ?>, DuplicateEntry> duplicates = new HashMap<>();
+    private final Map<NormalizedNode, DuplicateEntry> identities = new IdentityHashMap<>();
+    private final Map<NormalizedNode, DuplicateEntry> duplicates = new HashMap<>();
 
     private DuplicateFinder() {
         // Hidden on purpose
     }
 
-    private void findDuplicates(final YangInstanceIdentifier path, final NormalizedNode<?, ?> node) {
+    private void findDuplicates(final YangInstanceIdentifier path, final NormalizedNode node) {
         final DuplicateEntry i = identities.get(node);
         if (i == null) {
             final DuplicateEntry d = duplicates.get(node);
@@ -32,10 +32,10 @@ final class DuplicateFinder {
                 d.addDuplicate(path);
             }
 
-            if (node instanceof NormalizedNodeContainer<?, ?, ?>) {
-                final NormalizedNodeContainer<?, ?, ?> container = (NormalizedNodeContainer<?, ?, ?>) node;
+            if (node instanceof NormalizedNodeContainer<?, ?>) {
+                final NormalizedNodeContainer<?, ?> container = (NormalizedNodeContainer<?, ?>) node;
 
-                for (NormalizedNode<?, ?> c : container.getValue()) {
+                for (NormalizedNode c : container.body()) {
                     findDuplicates(path.node(c.getIdentifier()), c);
                 }
             }
@@ -52,9 +52,9 @@ final class DuplicateFinder {
      * @param node Root node, may not be null.
      * @return List of entries
      */
-    static Map<NormalizedNode<?, ?>, DuplicateEntry> findDuplicates(final NormalizedNode<?, ?> node) {
+    static Map<NormalizedNode, DuplicateEntry> findDuplicates(final NormalizedNode node) {
         final DuplicateFinder finder = new DuplicateFinder();
-        finder.findDuplicates(YangInstanceIdentifier.EMPTY, node);
+        finder.findDuplicates(YangInstanceIdentifier.empty(), node);
         return finder.identities;
     }
 }