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%2FModifiedNode.java;h=9e163f538aaa2cd2325ec9cd5325dca2a4cce09f;hb=c07aad0f89c57a66089df3c431c1767ab4a04eea;hp=23674daf32655142e17815d6ca3c52486e3b6485;hpb=976487b65036c293658ed17f18b44cae359bab2d;p=yangtools.git

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 23674daf32..9e163f538a 100644
--- 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
@@ -7,16 +7,17 @@
  */
 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 static java.util.Objects.requireNonNull;
+
 import java.util.Collection;
 import java.util.Map;
+import java.util.Optional;
+import java.util.function.Predicate;
 import javax.annotation.Nonnull;
 import javax.annotation.concurrent.NotThreadSafe;
 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.NormalizedNodes;
+import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodeContainer;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.ModificationType;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.StoreTreeNode;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode;
@@ -24,21 +25,24 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNodeFactory;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.Version;
 
 /**
- * Node Modification Node and Tree
+ * Node Modification Node and Tree.
  *
- * Tree which structurally resembles data tree and captures client modifications
- * to the data store tree.
+ * <p>
+ * Tree which structurally resembles data tree and captures client modifications to the data store tree. This tree is
+ * lazily created and populated via {@link #modifyChild(PathArgument, ModificationApplyOperation, Version)} and
+ * {@link TreeNode} which represents original state as tracked by {@link #getOriginal()}.
  *
- * This tree is lazily created and populated via {@link #modifyChild(PathArgument)}
- * and {@link TreeNode} which represents original state as tracked by {@link #getOriginal()}.
+ * <p>
+ * The contract is that the state information exposed here preserves the temporal ordering of whatever modifications
+ * were executed. A child's effects pertain to data node as modified by its ancestors. This means that in order to
+ * reconstruct the effective data node presentation, it is sufficient to perform a depth-first pre-order traversal of
+ * the tree.
  */
 @NotThreadSafe
 final class ModifiedNode extends NodeModification implements StoreTreeNode<ModifiedNode> {
-    static final Predicate<ModifiedNode> IS_TERMINAL_PREDICATE = new Predicate<ModifiedNode>() {
-        @Override
-        public boolean apply(@Nonnull final ModifiedNode input) {
-            Preconditions.checkNotNull(input);
-            switch (input.getOperation()) {
+    static final Predicate<ModifiedNode> IS_TERMINAL_PREDICATE = input -> {
+        requireNonNull(input);
+        switch (input.getOperation()) {
             case DELETE:
             case MERGE:
             case WRITE:
@@ -46,9 +50,8 @@ final class ModifiedNode extends NodeModification implements StoreTreeNode<Modif
             case TOUCH:
             case NONE:
                 return false;
-            }
-
-            throw new IllegalArgumentException(String.format("Unhandled modification type %s", input.getOperation()));
+            default:
+                throw new IllegalArgumentException("Unhandled modification type " + input.getOperation());
         }
     };
 
@@ -63,51 +66,57 @@ 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;
 
-    private ModifiedNode(final PathArgument identifier, final Optional<TreeNode> original, final ChildTrackingPolicy childPolicy) {
+    // 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;
         this.children = childPolicy.createMap();
     }
 
-    /**
-     * Return the value which was written to this node.
-     *
-     * @return Currently-written value
-     */
-    public NormalizedNode<?, ?> getWrittenValue() {
-        return value;
-    }
-
     @Override
     public PathArgument getIdentifier() {
         return identifier;
     }
 
     @Override
-    Optional<TreeNode> getOriginal() {
-        return original;
+    LogicalOperation getOperation() {
+        return operation;
     }
 
     @Override
-    LogicalOperation getOperation() {
-        return operation;
+    Optional<TreeNode> getOriginal() {
+        return original;
     }
 
     /**
+     * Return the value which was written to this node. The returned object is only valid for
+     * {@link LogicalOperation#MERGE} and {@link LogicalOperation#WRITE}.
+     * operations. It should only be consulted when this modification is going to end up being
+     * {@link ModificationType#WRITE}.
      *
-     * Returns child modification if child was modified
-     *
-     * @return Child modification if direct child or it's subtree
-     *  was modified.
+     * @return Currently-written value
+     */
+    NormalizedNode<?, ?> getWrittenValue() {
+        return value;
+    }
+
+    /**
+     * Returns child modification if child was modified.
      *
+     * @return Child modification if direct child or it's subtree was modified.
      */
     @Override
     public Optional<ModifiedNode> getChild(final PathArgument child) {
-        return Optional.<ModifiedNode> fromNullable(children.get(child));
+        return Optional.ofNullable(children.get(child));
     }
 
     private Optional<TreeNode> metadataFromSnapshot(@Nonnull final PathArgument child) {
-        return original.isPresent() ? original.get().getChild(child) : Optional.<TreeNode>absent();
+        return original.isPresent() ? original.get().getChild(child) : Optional.empty();
     }
 
     private Optional<TreeNode> metadataFromData(@Nonnull final PathArgument child, final Version modVersion) {
@@ -132,43 +141,33 @@ final class ModifiedNode extends NodeModification implements StoreTreeNode<Modif
      */
     private Optional<TreeNode> findOriginalMetadata(@Nonnull final PathArgument child, final Version modVersion) {
         switch (operation) {
-        case DELETE:
-            // DELETE implies non-presence
-            return Optional.absent();
-        case NONE:
-        case TOUCH:
-            return metadataFromSnapshot(child);
-        case MERGE:
-            // MERGE is half-way between TOUCH and WRITE. If the child exists in data, it behaves as a WRITE, otherwise
-            // it behaves as a TOUCH
-            if (NormalizedNodes.findNode(value, child).isPresent()) {
-                return metadataFromData(child, modVersion);
-            } else {
+            case DELETE:
+                // DELETE implies non-presence
+                return Optional.empty();
+            case NONE:
+            case TOUCH:
+            case MERGE:
                 return metadataFromSnapshot(child);
-            }
-        case WRITE:
-            // WRITE implies presence based on written data
-            return metadataFromData(child, modVersion);
+            case WRITE:
+                // WRITE implies presence based on written data
+                return metadataFromData(child, modVersion);
+            default:
+                throw new IllegalStateException("Unhandled node operation " + operation);
         }
-
-        throw new IllegalStateException("Unhandled node operation " + operation);
     }
 
     /**
-     *
      * Returns child modification if child was modified, creates {@link ModifiedNode}
-     * for child otherwise.
-     *
-     * If this node's {@link ModificationType} is {@link ModificationType#UNMODIFIED}
-     * changes modification type to {@link ModificationType#SUBTREE_MODIFIED}
+     * for child otherwise. If this node's {@link ModificationType} is {@link ModificationType#UNMODIFIED}
+     * changes modification type to {@link ModificationType#SUBTREE_MODIFIED}.
      *
      * @param child child identifier, may not be null
-     * @param childPolicy child tracking policy for the node we are looking for
+     * @param childOper Child operation
      * @param modVersion Version allocated by the calling {@link InMemoryDataTreeModification}
      * @return {@link ModifiedNode} for specified child, with {@link #getOriginal()}
      *         containing child metadata if child was present in original data.
      */
-    ModifiedNode modifyChild(@Nonnull final PathArgument child, @Nonnull final ChildTrackingPolicy childPolicy,
+    ModifiedNode modifyChild(@Nonnull final PathArgument child, @Nonnull final ModificationApplyOperation childOper,
             @Nonnull final Version modVersion) {
         clearSnapshot();
         if (operation == LogicalOperation.NONE) {
@@ -182,13 +181,25 @@ final class ModifiedNode extends NodeModification implements StoreTreeNode<Modif
         final Optional<TreeNode> currentMetadata = findOriginalMetadata(child, modVersion);
 
 
-        final ModifiedNode newlyCreated = new ModifiedNode(child, currentMetadata, childPolicy);
+        final ModifiedNode newlyCreated = new ModifiedNode(child, currentMetadata, childOper.getChildPolicy());
+        if (operation == LogicalOperation.MERGE && value != null) {
+            /*
+             * We are attempting to modify a previously-unmodified part of a MERGE node. If the
+             * value contains this component, we need to materialize it as a MERGE modification.
+             */
+            @SuppressWarnings({ "rawtypes", "unchecked" })
+            final Optional<NormalizedNode<?, ?>> childData = ((NormalizedNodeContainer)value).getChild(child);
+            if (childData.isPresent()) {
+                childOper.mergeIntoModifiedNode(newlyCreated, childData.get(), modVersion);
+            }
+        }
+
         children.put(child, newlyCreated);
         return newlyCreated;
     }
 
     /**
-     * Returns all recorded direct child modification
+     * Returns all recorded direct child modifications.
      *
      * @return all recorded direct child modifications
      */
@@ -204,26 +215,29 @@ final class ModifiedNode extends NodeModification implements StoreTreeNode<Modif
         final LogicalOperation newType;
 
         switch (operation) {
-        case DELETE:
-        case NONE:
-            // We need to record this delete.
-            newType = LogicalOperation.DELETE;
-            break;
-        case MERGE:
-        case TOUCH:
-        case WRITE:
-            /*
-             * We are canceling a previous modification. This is a bit tricky,
-             * as the original write may have just introduced the data, or it
-             * may have modified it.
-             *
-             * As documented in BUG-2470, a delete of data introduced in this
-             * transaction needs to be turned into a no-op.
-             */
-            newType = original.isPresent() ? LogicalOperation.DELETE : LogicalOperation.NONE;
-            break;
-        default:
-            throw new IllegalStateException("Unhandled deletion of node with " + operation);
+            case DELETE:
+            case NONE:
+                // We need to record this delete.
+                newType = LogicalOperation.DELETE;
+                break;
+            case MERGE:
+                // In case of merge - delete needs to be recored and must not to be changed into NONE, because lazy
+                // expansion of parent MERGE node would reintroduce it again.
+                newType = LogicalOperation.DELETE;
+                break;
+            case TOUCH:
+            case WRITE:
+                /*
+                 * We are canceling a previous modification. This is a bit tricky, as the original write may have just
+                 * introduced the data, or it may have modified it.
+                 *
+                 * As documented in BUG-2470, a delete of data introduced in this transaction needs to be turned into
+                 * a no-op.
+                 */
+                newType = original.isPresent() ? LogicalOperation.DELETE : LogicalOperation.NONE;
+                break;
+            default:
+                throw new IllegalStateException("Unhandled deletion of node with " + operation);
         }
 
         clearSnapshot();
@@ -235,46 +249,18 @@ final class ModifiedNode extends NodeModification implements StoreTreeNode<Modif
     /**
      * Records a write for associated node.
      *
-     * @param value
+     * @param newValue new value
      */
-    void write(final NormalizedNode<?, ?> value) {
-        pushWrite(value);
+    void write(final NormalizedNode<?, ?> newValue) {
+        updateValue(LogicalOperation.WRITE, newValue);
         children.clear();
     }
 
-    // Promote the node to write, but do not lose children
-    void pushWrite(final NormalizedNode<?, ?> value) {
-        clearSnapshot();
-        updateOperationType(LogicalOperation.WRITE);
-        this.value = value;
-    }
-
-    void merge(final NormalizedNode<?, ?> value) {
-        clearSnapshot();
-        updateOperationType(LogicalOperation.MERGE);
-
-        /*
-         * Blind overwrite of any previous data is okay, no matter whether the node
-         * is simple or complex type.
-         *
-         * If this is a simple or complex type with unkeyed children, this merge will
-         * be turned into a write operation, overwriting whatever was there before.
-         *
-         * If this is a container with keyed children, there are two possibilities:
-         * - if it existed before, this value will never be consulted and the children
-         *   will get explicitly merged onto the original data.
-         * - if it did not exist before, this value will be used as a seed write and
-         *   children will be merged into it.
-         * In either case we rely on OperationWithModification to manipulate the children
-         * before calling this method, so unlike a write we do not want to clear them.
-         */
-        this.value = value;
-    }
-
     /**
      * Seal the modification node and prune any children which has not been modified.
      *
-     * @param schema
+     * @param schema associated apply operation
+     * @param version target version
      */
     void seal(final ModificationApplyOperation schema, final Version version) {
         clearSnapshot();
@@ -310,11 +296,11 @@ final class ModifiedNode extends NodeModification implements StoreTreeNode<Modif
     }
 
     Optional<TreeNode> setSnapshot(final Optional<TreeNode> snapshot) {
-        snapshotCache = Preconditions.checkNotNull(snapshot);
+        snapshotCache = requireNonNull(snapshot);
         return snapshot;
     }
 
-    private void updateOperationType(final LogicalOperation type) {
+    void updateOperationType(final LogicalOperation type) {
         operation = type;
         modType = null;
 
@@ -333,6 +319,17 @@ final class ModifiedNode extends NodeModification implements StoreTreeNode<Modif
         modType = type;
     }
 
+    /**
+     * Update this node's value and operation type without disturbing any of its child modifications.
+     *
+     * @param type New operation type
+     * @param newValue New node value
+     */
+    void updateValue(final LogicalOperation type, final NormalizedNode<?, ?> newValue) {
+        this.value = requireNonNull(newValue);
+        updateOperationType(type);
+    }
+
     /**
      * Return the physical modification done to data. May return null if the
      * operation has not been applied to the underlying tree. This is different
@@ -345,31 +342,17 @@ final class ModifiedNode extends NodeModification implements StoreTreeNode<Modif
         return modType;
     }
 
-    /**
-     * 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.
-     *
-     * @param value Value associated with the node
-     * @return An isolated node. This node should never reach a datatree.
-     */
-    ModifiedNode asNewlyWritten(final NormalizedNode<?, ?> value) {
-        /*
-         * We are instantiating an "equivalent" of this node. Currently the only callsite does not care
-         * about the actual iteration order, so we do not have to specify the same tracking policy as
-         * we were instantiated with. Since this is the only time we need to know that policy (it affects
-         * only things in constructor), we do not want to retain it (saves some memory on per-instance
-         * basis).
-         *
-         * We could reconstruct it using two instanceof checks (to undo what the constructor has done),
-         * which would give perfect results. The memory saving would be at most 32 bytes of a short-lived
-         * object, so let's not bother with that.
-         */
-        final ModifiedNode ret = new ModifiedNode(getIdentifier(), Optional.<TreeNode>absent(), ChildTrackingPolicy.UNORDERED);
-        ret.write(value);
-        return ret;
-    }
-
     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 = requireNonNull(op);
+        this.validatedCurrent = requireNonNull(current);
+        this.validatedNode = requireNonNull(node);
+    }
+
+    TreeNode getValidatedNode(final SchemaAwareApplyOperation op, final Optional<TreeNode> current) {
+        return op.equals(validatedOp) && current.equals(validatedCurrent) ? validatedNode : null;
+    }
 }