Clean up TreeNode API

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

diff --git a/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/InMemoryDataTreeSnapshot.java b/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/InMemoryDataTreeSnapshot.java
index 210b110baaf0ac97d51a942ff599696071508dee..8b8ac71f5792369f66a0aa1e480da1eb533bb16c 100644 (file)
--- a/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/InMemoryDataTreeSnapshot.java
+++ b/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/InMemoryDataTreeSnapshot.java
@@ -16,37 +16,35 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.DistinctNodeContainer;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodes;
-import org.opendaylight.yangtools.yang.data.spi.tree.TreeNode;
 import org.opendaylight.yangtools.yang.data.tree.api.CursorAwareDataTreeSnapshot;
 import org.opendaylight.yangtools.yang.data.tree.api.DataTreeSnapshotCursor;
+import org.opendaylight.yangtools.yang.data.tree.impl.node.TreeNode;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
-import org.opendaylight.yangtools.yang.model.api.EffectiveModelContextProvider;
 
-final class InMemoryDataTreeSnapshot extends AbstractCursorAware implements CursorAwareDataTreeSnapshot,
-        EffectiveModelContextProvider {
+final class InMemoryDataTreeSnapshot extends AbstractCursorAware implements CursorAwareDataTreeSnapshot {
+    private final @NonNull EffectiveModelContext modelContext;
     private final @NonNull RootApplyStrategy applyOper;
-    private final @NonNull EffectiveModelContext schemaContext;
     private final @NonNull TreeNode rootNode;
 
-    InMemoryDataTreeSnapshot(final EffectiveModelContext schemaContext, final TreeNode rootNode,
+    InMemoryDataTreeSnapshot(final EffectiveModelContext modelContext, final TreeNode rootNode,
             final RootApplyStrategy applyOper) {
-        this.schemaContext = requireNonNull(schemaContext);
+        this.modelContext = requireNonNull(modelContext);
         this.rootNode = requireNonNull(rootNode);
         this.applyOper = requireNonNull(applyOper);
     }
 
-    TreeNode getRootNode() {
+    @NonNull TreeNode getRootNode() {
         return rootNode;
     }
 
     @Override
-    public EffectiveModelContext getEffectiveModelContext() {
-        return schemaContext;
+    public EffectiveModelContext modelContext() {
+        return modelContext;
     }
 
     @Override
     public Optional<NormalizedNode> readNode(final YangInstanceIdentifier path) {
-        return NormalizedNodes.findNode(rootNode.getData(), path);
+        return NormalizedNodes.findNode(rootNode.data(), path);
     }
 
     @Override
@@ -56,7 +54,7 @@ final class InMemoryDataTreeSnapshot extends AbstractCursorAware implements Curs
 
     @Override
     public Optional<DataTreeSnapshotCursor> openCursor(final YangInstanceIdentifier path) {
-        return NormalizedNodes.findNode(rootNode.getData(), path).map(root -> {
+        return NormalizedNodes.findNode(rootNode.data(), path).map(root -> {
             checkArgument(root instanceof DistinctNodeContainer, "Child %s is not a container", path);
             return openCursor(new InMemoryDataTreeSnapshotCursor(this, path, (DistinctNodeContainer<?, ?>)root));
         });
@@ -64,6 +62,6 @@ final class InMemoryDataTreeSnapshot extends AbstractCursorAware implements Curs
 
     @Override
     public String toString() {
-        return rootNode.getSubtreeVersion().toString();
+        return rootNode.subtreeVersion().toString();
     }
 }