Update MutableTreeNode methods

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

diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/MaterializedContainerNode.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/MaterializedContainerNode.java
index a98cd332f193bfd48c29148a22d15f2338fdf420..d7c5fa7d6d287bb54e75aacc60e639b457511898 100644 (file)
--- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/MaterializedContainerNode.java
+++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/MaterializedContainerNode.java
@@ -7,31 +7,26 @@
  */
 package org.opendaylight.yangtools.yang.data.api.schema.tree.spi;
 
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
-
 import java.util.Map;
-
-import org.opendaylight.yangtools.util.MapAdaptor;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 
-final class MaterializedContainerNode extends ContainerNode {
-    private final Map<PathArgument, TreeNode> children;
-
+/**
+ * A fully-modified node -- we know we have all children, so it performs lookups only.
+ */
+final class MaterializedContainerNode extends AbstractModifiedContainerNode {
     protected MaterializedContainerNode(final NormalizedNode<?, ?> data, final Version version,
             final Map<PathArgument, TreeNode> children, final Version subtreeVersion) {
-        super(data, version, subtreeVersion);
-        this.children = Preconditions.checkNotNull(children);
+        super(data, version, children, subtreeVersion);
     }
 
     @Override
-    public Optional<TreeNode> getChild(final PathArgument key) {
-        return Optional.fromNullable(children.get(key));
+    public TreeNode childByArg(final PathArgument arg) {
+        return getModifiedChild(arg);
     }
 
     @Override
     public MutableTreeNode mutable() {
-        return new Mutable(this, MapAdaptor.getDefaultInstance().takeSnapshot(children));
+        return new MaterializedMutableContainerNode(this, snapshotChildren());
     }
 }