Rework NormalizedNode type hierarchy

[yangtools.git] / yang / yang-data-impl / src / main / java / org / opendaylight / yangtools / yang / data / impl / schema / tree / UniqueValidation.java

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/UniqueValidation.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/UniqueValidation.java
index 6aab3ab4d8c4cf6d037171933444232a0f6a2e78..d70b5d3de7e06d789da58e2132e419252952155e 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/UniqueValidation.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/UniqueValidation.java
@@ -80,24 +80,23 @@ final class UniqueValidation extends AbstractValidation {
     }
 
     @Override
-    void enforceOnData(final NormalizedNode<?, ?> data) {
+    void enforceOnData(final NormalizedNode data) {
         enforceOnData(data, (message, values) -> new UniqueValidationFailedException(message));
     }
 
     @Override
-    void enforceOnData(final ModificationPath path, final NormalizedNode<?, ?> data)
-            throws UniqueConstraintException {
+    void enforceOnData(final ModificationPath path, final NormalizedNode data) throws UniqueConstraintException {
         enforceOnData(data, (message, values) -> new UniqueConstraintException(path.toInstanceIdentifier(), values,
             message));
     }
 
-    private <T extends @NonNull Exception> void enforceOnData(final NormalizedNode<?, ?> data,
+    private <T extends @NonNull Exception> void enforceOnData(final NormalizedNode data,
             final ExceptionSupplier<T> exceptionSupplier) throws T {
         final Stopwatch sw = Stopwatch.createStarted();
         verify(data instanceof NormalizedNodeContainer, "Unexpected data %s", data);
-        final var children = ((NormalizedNodeContainer<?, ?, ?>) data).getValue();
+        final var children = ((NormalizedNodeContainer<?, ?>) data).body();
         final var collected = HashMultimap.<UniqueValidator<?>, Object>create(validators.size(), children.size());
-        for (NormalizedNode<?, ?> child : children) {
+        for (NormalizedNode child : children) {
             verify(child instanceof DataContainerNode, "Unexpected child %s", child);
             final DataContainerNode<?> cont = (DataContainerNode<?>) child;