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%2FStructuralContainerModificationStrategy.java;h=ff19a41c9c69267a29b52533b7753ecf2341f803;hb=99bb34694d35803da6cc1ccbe112d3efa5b4e2fd;hp=f13c25b7cf0137f162a48ccaa9181a7360679e1a;hpb=19c31f13e5040750d30cf9f4211913b2be04b403;p=yangtools.git

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/StructuralContainerModificationStrategy.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/StructuralContainerModificationStrategy.java
index f13c25b7cf..ff19a41c9c 100644
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/StructuralContainerModificationStrategy.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/StructuralContainerModificationStrategy.java
@@ -7,17 +7,10 @@
  */
 package org.opendaylight.yangtools.yang.data.impl.schema.tree;
 
-import com.google.common.base.Optional;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
+import java.util.Optional;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
-import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
-import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodeContainer;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.DataValidationFailedException;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.ModificationType;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.TreeType;
+import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeConfiguration;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNodeFactory;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.Version;
 import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
 import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
@@ -30,98 +23,23 @@ import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
  * it enforces presence of mandatory leaves, which is not something we want here, as structural containers are not
  * root anchors for that validation.
  */
-final class StructuralContainerModificationStrategy extends ModificationApplyOperation {
-    /**
-     * Fake TreeNode version used in
-     * {@link #checkApplicable(YangInstanceIdentifier, NodeModification, Optional, Version)}.
-     * It is okay to use a global constant, as the delegate will ignore it anyway. For
-     * {@link #apply(ModifiedNode, Optional, Version)} we will use the appropriate version as provided to us.
-     */
-    private static final Version FAKE_VERSION = Version.initial();
-    private final ContainerModificationStrategy delegate;
+final class StructuralContainerModificationStrategy extends ContainerModificationStrategy {
+    private final ContainerNode emptyNode;
 
-    StructuralContainerModificationStrategy(final ContainerSchemaNode schemaNode, final TreeType treeType) {
-        this.delegate = new ContainerModificationStrategy(schemaNode, treeType);
-    }
-
-    private Optional<TreeNode> fakeMeta(final Version version) {
-        final ContainerNode container = ImmutableNodes.containerNode(delegate.getSchema().getQName());
-        return Optional.of(TreeNodeFactory.createTreeNode(container, version));
-    }
-
-    @Override
-    Optional<TreeNode> apply(final ModifiedNode modification, final Optional<TreeNode> storeMeta, final Version version) {
-        final Optional<TreeNode> ret;
-        if (modification.getOperation() == LogicalOperation.TOUCH && !storeMeta.isPresent()) {
-            // Container is not present, let's take care of the 'magically appear' part of our job
-            ret = delegate.apply(modification, fakeMeta(version), version);
-
-            // Fake container got removed: that is a no-op
-            if (!ret.isPresent()) {
-                modification.resolveModificationType(ModificationType.UNMODIFIED);
-                return ret;
-            }
-
-            // If the delegate indicated SUBTREE_MODIFIED, account for the fake and report APPEARED
-            if (modification.getModificationType() == ModificationType.SUBTREE_MODIFIED) {
-                modification.resolveModificationType(ModificationType.APPEARED);
-            }
-        } else {
-            // Container is present, run normal apply operation
-            ret = delegate.apply(modification, storeMeta, version);
-
-            // Container was explicitly deleted, no magic required
-            if (!ret.isPresent()) {
-                return ret;
-            }
-        }
-
-        /*
-         * At this point ret is guaranteed to be present. We need to take care of the 'magically disappear' part of
-         * our job. Check if there are any child nodes left. If there are none, remove this container and turn the
-         * modification into a DISAPPEARED.
-         */
-        if (((NormalizedNodeContainer<?, ?, ?>) ret.get().getData()).getValue().isEmpty()) {
-            modification.resolveModificationType(ModificationType.DISAPPEARED);
-            return Optional.absent();
-        }
-
-        return ret;
-    }
-
-    @Override
-    void checkApplicable(final YangInstanceIdentifier path, final NodeModification modification,
-            final Optional<TreeNode> current, final Version version) throws DataValidationFailedException {
-        if (modification.getOperation() == LogicalOperation.TOUCH && !current.isPresent()) {
-            // Structural containers are created as needed, so we pretend this container is here
-            delegate.checkApplicable(path, modification, fakeMeta(FAKE_VERSION), version);
-        } else {
-            delegate.checkApplicable(path, modification, current, version);
-        }
-    }
-
-    @Override
-    void verifyStructure(final NormalizedNode<?, ?> modification, final boolean verifyChildren) throws IllegalArgumentException {
-        delegate.verifyStructure(modification, verifyChildren);
-    }
-
-    @Override
-    void recursivelyVerifyStructure(NormalizedNode<?, ?> value) {
-        delegate.recursivelyVerifyStructure(value);
-    }
-
-    @Override
-    ChildTrackingPolicy getChildPolicy() {
-        return delegate.getChildPolicy();
+    StructuralContainerModificationStrategy(final ContainerSchemaNode schema, final DataTreeConfiguration treeConfig) {
+        super(schema, treeConfig);
+        this.emptyNode = ImmutableNodes.containerNode(schema.getQName());
     }
 
     @Override
-    void mergeIntoModifiedNode(ModifiedNode modification, NormalizedNode<?, ?> value, Version version) {
-        delegate.mergeIntoModifiedNode(modification, value, version);
+    Optional<TreeNode> apply(final ModifiedNode modification, final Optional<TreeNode> storeMeta,
+            final Version version) {
+        return AutomaticLifecycleMixin.apply(super::apply, this::applyWrite, emptyNode, modification, storeMeta,
+            version);
     }
 
     @Override
-    public Optional<ModificationApplyOperation> getChild(final PathArgument child) {
-        return delegate.getChild(child);
+    TreeNode defaultTreeNode() {
+        return defaultTreeNode(emptyNode);
     }
 }