Add Abstract{LeafSet,Map}ModificationStrategy

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

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/PresenceContainerModificationStrategy.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/PresenceContainerModificationStrategy.java
index 78523fe354d15463c4665b711ecd174f001a1a9c..5be8745cad758f1623a76030a250261c699d67a1 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/PresenceContainerModificationStrategy.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/PresenceContainerModificationStrategy.java
@@ -8,7 +8,7 @@
 
 package org.opendaylight.yangtools.yang.data.impl.schema.tree;
 
-import com.google.common.base.Optional;
+import java.util.Optional;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeConfiguration;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode;
@@ -22,17 +22,18 @@ import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
 final class PresenceContainerModificationStrategy extends ContainerModificationStrategy {
     private final MandatoryLeafEnforcer enforcer;
 
-    PresenceContainerModificationStrategy(final ContainerSchemaNode schemaNode, final DataTreeConfiguration treeConfig) {
+    PresenceContainerModificationStrategy(final ContainerSchemaNode schemaNode,
+            final DataTreeConfiguration treeConfig) {
         super(schemaNode, treeConfig);
         enforcer = MandatoryLeafEnforcer.forContainer(schemaNode, treeConfig);
     }
 
     @Override
     void verifyStructure(final NormalizedNode<?, ?> writtenValue, final boolean verifyChildren) {
-        if (verifyChildrenStructure() && verifyChildren) {
-            enforcer.enforceOnTreeNode(writtenValue);
-        }
         super.verifyStructure(writtenValue, verifyChildren);
+        if (verifyChildren) {
+            enforcer.enforceOnData(writtenValue);
+        }
     }
 
     @Override
@@ -43,9 +44,9 @@ final class PresenceContainerModificationStrategy extends ContainerModificationS
     }
 
     @Override
-    protected TreeNode applyWrite(final ModifiedNode modification, final Optional<TreeNode> currentMeta,
-            final Version version) {
-        final TreeNode ret = super.applyWrite(modification, currentMeta, version);
+    protected TreeNode applyWrite(final ModifiedNode modification, final NormalizedNode<?, ?> newValue,
+            final Optional<TreeNode> currentMeta, final Version version) {
+        final TreeNode ret = super.applyWrite(modification, newValue, currentMeta, version);
         enforcer.enforceOnTreeNode(ret);
         return ret;
     }