BUG-4684: validate changes against effective state

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

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ModifiedNode.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ModifiedNode.java
index be0ed682adf111f79b9148bdfdb4953fc5045dcc..299a52b5770f23439e71c6f6252f7119c7edef28 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ModifiedNode.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ModifiedNode.java
@@ -66,6 +66,11 @@ final class ModifiedNode extends NodeModification implements StoreTreeNode<Modif
     // Alternative history introduced in WRITE nodes. Instantiated when we touch any child underneath such a node.
     private TreeNode writtenOriginal;
 
+    // Internal cache for TreeNodes created as part of validation
+    private SchemaAwareApplyOperation validatedOp;
+    private Optional<TreeNode> validatedCurrent;
+    private TreeNode validatedNode;
+
     private ModifiedNode(final PathArgument identifier, final Optional<TreeNode> original, final ChildTrackingPolicy childPolicy) {
         this.identifier = identifier;
         this.original = original;
@@ -346,4 +351,14 @@ final class ModifiedNode extends NodeModification implements StoreTreeNode<Modif
     public static ModifiedNode createUnmodified(final TreeNode metadataTree, final ChildTrackingPolicy childPolicy) {
         return new ModifiedNode(metadataTree.getIdentifier(), Optional.of(metadataTree), childPolicy);
     }
+
+    void setValidatedNode(final SchemaAwareApplyOperation op, final Optional<TreeNode> current, final TreeNode node) {
+        this.validatedOp = Preconditions.checkNotNull(op);
+        this.validatedCurrent = Preconditions.checkNotNull(current);
+        this.validatedNode = Preconditions.checkNotNull(node);
+    }
+
+    TreeNode getValidatedNode(final SchemaAwareApplyOperation op, final Optional<TreeNode> current) {
+        return op.equals(validatedOp) && current.equals(validatedCurrent) ? validatedNode : null;
+    }
 }