X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-data-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fdata%2Fimpl%2Fschema%2Ftree%2FDataTreeState.java;h=48d8d49cde7bfcbb0cae114ee00544bfeec023fb;hb=9467f6862cb941a8721bda321bd5beaec5c303bd;hp=9790fc2d87f994ca1516bd98927e6f86614ca751;hpb=0ac42f9585b8309fb5a0f3d7429719c23b02a836;p=yangtools.git

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 9790fc2d87..48d8d49cde 100644
--- 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
@@ -7,8 +7,10 @@
  */
 package org.opendaylight.yangtools.yang.data.impl.schema.tree;
 
-import com.google.common.base.Objects;
-import com.google.common.base.Preconditions;
+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;
@@ -21,26 +23,26 @@ 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 @NonNull TreeNode root;
 
     private DataTreeState(final TreeNode root) {
-        this.root = Preconditions.checkNotNull(root);
+        this.root = requireNonNull(root);
         holder = new LatestOperationHolder();
         schemaContext = null;
     }
 
     private DataTreeState(final TreeNode root, final LatestOperationHolder holder, final SchemaContext schemaContext) {
         // It should be impossible to instantiate a new root without a SchemaContext
-        this.schemaContext = Preconditions.checkNotNull(schemaContext);
-        this.holder = Preconditions.checkNotNull(holder);
-        this.root = Preconditions.checkNotNull(root);
+        this.schemaContext = requireNonNull(schemaContext);
+        this.holder = requireNonNull(holder);
+        this.root = requireNonNull(root);
     }
 
     static DataTreeState createInitial(final TreeNode root) {
         return new DataTreeState(root);
     }
 
-    TreeNode getRoot() {
+    @NonNull TreeNode getRoot() {
         return root;
     }
 
@@ -48,7 +50,7 @@ final class DataTreeState {
         return new InMemoryDataTreeSnapshot(schemaContext, root, holder.newSnapshot());
     }
 
-    DataTreeState withSchemaContext(final SchemaContext newSchemaContext, final SchemaAwareApplyOperation operation) {
+    DataTreeState withSchemaContext(final SchemaContext newSchemaContext, final ModificationApplyOperation operation) {
         holder.setCurrent(operation);
         return new DataTreeState(root, holder, newSchemaContext);
     }
@@ -60,6 +62,6 @@ final class DataTreeState {
     @Override
     public String toString() {
         final TreeNode r = root;
-        return Objects.toStringHelper(this).add("data", NormalizedNodes.toStringTree(r.getData())).toString();
+        return MoreObjects.toStringHelper(this).add("data", NormalizedNodes.toStringTree(r.getData())).toString();
     }
 }
\ No newline at end of file