Rework NormalizedNode type hierarchy

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

diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/SimpleContainerNode.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/SimpleContainerNode.java
index 3d2f140e838736c2a9ed9d24f48213e8c1f16fce..ec086d2c124aa702619ac4cc6c9c6c6a44b64960 100644 (file)
--- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/SimpleContainerNode.java
+++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/SimpleContainerNode.java
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.yangtools.yang.data.api.schema.tree.spi;
 
-import com.google.common.base.Optional;
+import com.google.common.base.MoreObjects.ToStringHelper;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 
@@ -15,7 +15,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
  * A container node which has not seen a modification. All nodes underneath it share the same subtree version.
  */
 final class SimpleContainerNode extends AbstractContainerNode {
-    protected SimpleContainerNode(final NormalizedNode<?, ?> data, final Version version) {
+    protected SimpleContainerNode(final NormalizedNode data, final Version version) {
         super(data, version);
     }
 
@@ -25,12 +25,17 @@ final class SimpleContainerNode extends AbstractContainerNode {
     }
 
     @Override
-    public Optional<TreeNode> getChild(final PathArgument child) {
-        return getChildFromData(child);
+    public TreeNode childByArg(final PathArgument arg) {
+        return getChildFromData(arg);
     }
 
     @Override
     public MutableTreeNode mutable() {
         return new LazyMutableContainerNode(this);
     }
+
+    @Override
+    protected ToStringHelper addToStringAttributes(final ToStringHelper helper) {
+        return helper.add("data", getData());
+    }
 }