Rework NormalizedNode type hierarchy

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

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/NormalizedNodeContainerSupport.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/NormalizedNodeContainerSupport.java
index e1e1b88885dc75955746fffd59136a4fc94938a0..26cb28fc8e7f32250cbd306511ff25784fdc1de9 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/NormalizedNodeContainerSupport.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/NormalizedNodeContainerSupport.java
@@ -17,7 +17,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgum
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNodeContainerBuilder;
 
-final class NormalizedNodeContainerSupport<K extends PathArgument, T extends NormalizedNode<K, ?>> {
+final class NormalizedNodeContainerSupport<K extends PathArgument, T extends NormalizedNode> {
     final Function<T, NormalizedNodeContainerBuilder<K, ?, ?, T>> copyBuilder;
     final Supplier<NormalizedNodeContainerBuilder<K, ?, ?, T>> emptyBuilder;
     final ChildTrackingPolicy childPolicy;
@@ -38,15 +38,15 @@ final class NormalizedNodeContainerSupport<K extends PathArgument, T extends Nor
         this(requiredClass, ChildTrackingPolicy.UNORDERED, copyBuilder, emptyBuilder);
     }
 
-    NormalizedNodeContainerBuilder<?, ?, ?, T> createBuilder(final NormalizedNode<?, ?> original) {
+    NormalizedNodeContainerBuilder<?, ?, ?, T> createBuilder(final NormalizedNode original) {
         return copyBuilder.apply(cast(original));
     }
 
-    NormalizedNode<?, ?> createEmptyValue(final NormalizedNode<?, ?> original) {
-        return emptyBuilder.get().withNodeIdentifier(cast(original).getIdentifier()).build();
+    NormalizedNode createEmptyValue(final NormalizedNode original) {
+        return emptyBuilder.get().withNodeIdentifier((K) cast(original).getIdentifier()).build();
     }
 
-    private T cast(final NormalizedNode<?, ?> original) {
+    private T cast(final NormalizedNode original) {
         checkArgument(requiredClass.isInstance(original), "Require %s, got %s", requiredClass, original);
         return requiredClass.cast(original);
     }