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%2FNoopDataTreeCandidate.java;h=608d1d9273b271c9b97d4e3cfd1039746fda6ce0;hb=bb92c633b41a636162f4f14cf818f4f66d9eaab4;hp=5f77994996ece3a99a8847063d6b8023f727145d;hpb=85d357f59a39cd5d782e0364c86ef8d8b9b68f2d;p=yangtools.git

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/NoopDataTreeCandidate.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/NoopDataTreeCandidate.java
index 5f77994996..608d1d9273 100644
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/NoopDataTreeCandidate.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/NoopDataTreeCandidate.java
@@ -9,12 +9,15 @@ package org.opendaylight.yangtools.yang.data.impl.schema.tree;
 
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
+import java.util.Collection;
 import java.util.Collections;
+import javax.annotation.Nonnull;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidateNode;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.ModificationType;
+import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode;
 
 /**
  * Internal utility class for an empty candidate. We instantiate this class
@@ -24,26 +27,30 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.ModificationType;
 final class NoopDataTreeCandidate extends AbstractDataTreeCandidate {
     private static final DataTreeCandidateNode ROOT = new DataTreeCandidateNode() {
         @Override
+        @Nonnull
         public ModificationType getModificationType() {
             return ModificationType.UNMODIFIED;
         }
 
         @Override
-        public Iterable<DataTreeCandidateNode> getChildNodes() {
+        public Collection<DataTreeCandidateNode> getChildNodes() {
             return Collections.emptyList();
         }
 
         @Override
+        @Nonnull
         public PathArgument getIdentifier() {
             throw new IllegalStateException("Attempted to read identifier of the no-operation change");
         }
 
         @Override
+        @Nonnull
         public Optional<NormalizedNode<?, ?>> getDataAfter() {
             return Optional.absent();
         }
 
         @Override
+        @Nonnull
         public Optional<NormalizedNode<?, ?>> getDataBefore() {
             return Optional.absent();
         }
@@ -53,14 +60,22 @@ final class NoopDataTreeCandidate extends AbstractDataTreeCandidate {
             return null;
         }
     };
+    private final TreeNode afterRoot;
 
-    protected NoopDataTreeCandidate(final YangInstanceIdentifier rootPath, final ModifiedNode modificationRoot) {
+    protected NoopDataTreeCandidate(final YangInstanceIdentifier rootPath, final ModifiedNode modificationRoot, final TreeNode afterRoot) {
         super(rootPath);
-        Preconditions.checkArgument(modificationRoot.getType() == ModificationType.UNMODIFIED);
+        Preconditions.checkArgument(modificationRoot.getOperation() == LogicalOperation.NONE);
+        this.afterRoot = Preconditions.checkNotNull(afterRoot);
     }
 
     @Override
     public DataTreeCandidateNode getRootNode() {
         return ROOT;
     }
+
+    @Override
+    @Nonnull
+    protected TreeNode getTipRoot() {
+        return afterRoot;
+    }
 }