BUG-2876: determine ModificationType while applying changes

[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 053e21ff2642b5fc5dfeca79fbbfaf514e8a4d44..84ad738698f7e23c11b2988cae0d93e4588a0800 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
@@ -10,6 +10,7 @@ package org.opendaylight.yangtools.yang.data.impl.schema.tree;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Predicate;
+import com.google.common.base.Verify;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -58,6 +59,7 @@ final class ModifiedNode extends NodeModification implements StoreTreeNode<Modif
     private LogicalOperation operation = LogicalOperation.NONE;
     private Optional<TreeNode> snapshotCache;
     private NormalizedNode<?, ?> value;
+    private ModificationType modType;
 
     private ModifiedNode(final PathArgument identifier, final Optional<TreeNode> original, final boolean isOrdered) {
         this.identifier = identifier;
@@ -89,7 +91,6 @@ final class ModifiedNode extends NodeModification implements StoreTreeNode<Modif
         return original;
     }
 
-
     @Override
     LogicalOperation getOperation() {
         return operation;
@@ -123,7 +124,7 @@ final class ModifiedNode extends NodeModification implements StoreTreeNode<Modif
     ModifiedNode modifyChild(final PathArgument child, final boolean isOrdered) {
         clearSnapshot();
         if (operation == LogicalOperation.NONE) {
-            updateModificationType(LogicalOperation.TOUCH);
+            updateOperationType(LogicalOperation.TOUCH);
         }
         final ModifiedNode potential = children.get(child);
         if (potential != null) {
@@ -185,7 +186,7 @@ final class ModifiedNode extends NodeModification implements StoreTreeNode<Modif
         clearSnapshot();
         children.clear();
         this.value = null;
-        updateModificationType(newType);
+        updateOperationType(newType);
     }
 
     /**
@@ -195,14 +196,14 @@ final class ModifiedNode extends NodeModification implements StoreTreeNode<Modif
      */
     void write(final NormalizedNode<?, ?> value) {
         clearSnapshot();
-        updateModificationType(LogicalOperation.WRITE);
+        updateOperationType(LogicalOperation.WRITE);
         children.clear();
         this.value = value;
     }
 
     void merge(final NormalizedNode<?, ?> value) {
         clearSnapshot();
-        updateModificationType(LogicalOperation.MERGE);
+        updateOperationType(LogicalOperation.MERGE);
 
         /*
          * Blind overwrite of any previous data is okay, no matter whether the node
@@ -243,7 +244,7 @@ final class ModifiedNode extends NodeModification implements StoreTreeNode<Modif
 
         // A TOUCH node without any children is a no-op
         if (operation == LogicalOperation.TOUCH && children.isEmpty()) {
-            updateModificationType(LogicalOperation.NONE);
+            updateOperationType(LogicalOperation.NONE);
         }
     }
 
@@ -260,8 +261,9 @@ final class ModifiedNode extends NodeModification implements StoreTreeNode<Modif
         return snapshot;
     }
 
-    private void updateModificationType(final LogicalOperation type) {
+    private void updateOperationType(final LogicalOperation type) {
         operation = type;
+        modType = null;
         clearSnapshot();
     }
 
@@ -271,6 +273,14 @@ final class ModifiedNode extends NodeModification implements StoreTreeNode<Modif
                 + operation + ", childModification=" + children + "]";
     }
 
+    void resolveModificationType(@Nonnull final ModificationType type) {
+        modType = type;
+    }
+
+    @Nonnull ModificationType modificationType() {
+        return Verify.verifyNotNull(modType, "Node %s does not have resolved modification type", this);
+    }
+
     /**
      * Create a node which will reflect the state of this node, except it will behave as newly-written
      * value. This is useful only for merge validation.