Rework NormalizedNode type hierarchy

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

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableDataContainerNode.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableDataContainerNode.java
index 6b5e0d7e5124eb8ee661fa9f8119a624252f7daf..3394effafb72d345ed86f517acc5373452e6f9be 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableDataContainerNode.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableDataContainerNode.java
@@ -9,30 +9,27 @@ package org.opendaylight.yangtools.yang.data.impl.schema.nodes;
 
 import java.util.Collection;
 import java.util.Map;
-import java.util.Optional;
 import org.opendaylight.yangtools.util.ImmutableOffsetMap;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
 import org.opendaylight.yangtools.yang.data.api.schema.DataContainerNode;
 
-public abstract class AbstractImmutableDataContainerNode<K extends PathArgument>
-        extends AbstractImmutableNormalizedNode<K, Collection<DataContainerChild<? extends PathArgument, ?>>>
-        implements DataContainerNode<K> {
+public abstract class AbstractImmutableDataContainerNode<K extends PathArgument, N extends DataContainerNode<K>>
+        extends AbstractImmutableNormalizedNode<K, N> implements DataContainerNode<K> {
     private final Map<PathArgument, Object> children;
 
     protected AbstractImmutableDataContainerNode(final Map<PathArgument, Object> children, final K nodeIdentifier) {
         super(nodeIdentifier);
-
         this.children = ImmutableOffsetMap.unorderedCopyOf(children);
     }
 
     @Override
-    public final Optional<DataContainerChild<? extends PathArgument, ?>> getChild(final PathArgument child) {
-        return Optional.ofNullable(LazyLeafOperations.getChild(children, child));
+    public final DataContainerChild childByArg(final PathArgument child) {
+        return LazyLeafOperations.getChild(children, child);
     }
 
     @Override
-    public final Collection<DataContainerChild<? extends PathArgument, ?>> getValue() {
+    public final Collection<DataContainerChild> body() {
         return new LazyValues(children);
     }
 
@@ -41,11 +38,6 @@ public abstract class AbstractImmutableDataContainerNode<K extends PathArgument>
         return children.size();
     }
 
-    @Override
-    protected int valueHashCode() {
-        return children.hashCode();
-    }
-
     /**
      * DO NOT USE THIS METHOD.
      *
@@ -60,8 +52,13 @@ public abstract class AbstractImmutableDataContainerNode<K extends PathArgument>
     }
 
     @Override
-    protected boolean valueEquals(final AbstractImmutableNormalizedNode<?, ?> other) {
-        return other instanceof AbstractImmutableDataContainerNode<?> && children.equals(
-                ((AbstractImmutableDataContainerNode<?>) other).children);
+    protected int valueHashCode() {
+        return children.hashCode();
+    }
+
+    @Override
+    protected boolean valueEquals(final N other) {
+        return other instanceof AbstractImmutableDataContainerNode<?, ?> && children.equals(
+                ((AbstractImmutableDataContainerNode<?, ?>) other).children);
     }
 }