Revert "Fix mandatory enforcer failure on augmented nodes"

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

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/DataTreeState.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/DataTreeState.java
index a05cdd8d05ef707bd8c589cbcfa4045ed9b9e555..522b402efdc76a5b79d79d8a02c43d16408f0118 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/DataTreeState.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/DataTreeState.java
@@ -10,9 +10,10 @@ package org.opendaylight.yangtools.yang.data.impl.schema.tree;
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.base.MoreObjects;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodes;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 
 /**
  * Instances of this class hold the current state of a DataTree instance.
@@ -21,8 +22,8 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext;
  */
 final class DataTreeState {
     private final LatestOperationHolder holder;
-    private final SchemaContext schemaContext;
-    private final TreeNode root;
+    private final EffectiveModelContext schemaContext;
+    private final @NonNull TreeNode root;
 
     private DataTreeState(final TreeNode root) {
         this.root = requireNonNull(root);
@@ -30,7 +31,8 @@ final class DataTreeState {
         schemaContext = null;
     }
 
-    private DataTreeState(final TreeNode root, final LatestOperationHolder holder, final SchemaContext schemaContext) {
+    private DataTreeState(final TreeNode root, final LatestOperationHolder holder,
+            final EffectiveModelContext schemaContext) {
         // It should be impossible to instantiate a new root without a SchemaContext
         this.schemaContext = requireNonNull(schemaContext);
         this.holder = requireNonNull(holder);
@@ -41,7 +43,7 @@ final class DataTreeState {
         return new DataTreeState(root);
     }
 
-    TreeNode getRoot() {
+    @NonNull TreeNode getRoot() {
         return root;
     }
 
@@ -49,7 +51,8 @@ final class DataTreeState {
         return new InMemoryDataTreeSnapshot(schemaContext, root, holder.newSnapshot());
     }
 
-    DataTreeState withSchemaContext(final SchemaContext newSchemaContext, final ModificationApplyOperation operation) {
+    DataTreeState withSchemaContext(final EffectiveModelContext newSchemaContext,
+            final ModificationApplyOperation operation) {
         holder.setCurrent(operation);
         return new DataTreeState(root, holder, newSchemaContext);
     }