Revert "Fix mandatory enforcer failure on augmented nodes"

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

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/MandatoryLeafEnforcer.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/MandatoryLeafEnforcer.java
index 5bce99c4cb2f892aa393d50c6a6626aab8b1e59d..90ae47c9865183f29534d5ffa733894c9e5616ee 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/MandatoryLeafEnforcer.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/MandatoryLeafEnforcer.java
@@ -7,71 +7,65 @@
  */
 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.collect.ImmutableCollection.Builder;
+import static com.google.common.base.Preconditions.checkArgument;
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.collect.ImmutableList;
-import java.util.Collection;
+import com.google.common.collect.ImmutableList.Builder;
+import java.util.Optional;
 import org.opendaylight.yangtools.concepts.Immutable;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
 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.tree.DataTreeConfiguration;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.TreeType;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode;
-import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition;
 import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.DataNodeContainer;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.ElementCountConstraintAware;
+import org.opendaylight.yangtools.yang.model.api.MandatoryAware;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 // TODO: would making this Serializable be useful (for Functions and similar?)
-abstract class MandatoryLeafEnforcer implements Immutable {
-    private static final class NoOp extends MandatoryLeafEnforcer {
-        @Override
-        protected void enforceOnTreeNode(final TreeNode tree) {
-            // Intentional no-op
-        }
+final class MandatoryLeafEnforcer implements Immutable {
+    private static final Logger LOG = LoggerFactory.getLogger(MandatoryLeafEnforcer.class);
 
-        @Override
-        protected void enforceOnTreeNode(final NormalizedNode<?, ?> normalizedNode) {
-            // Intentional no-op
-        }
+    private final ImmutableList<YangInstanceIdentifier> mandatoryNodes;
+
+    private MandatoryLeafEnforcer(final ImmutableList<YangInstanceIdentifier> mandatoryNodes) {
+        this.mandatoryNodes = requireNonNull(mandatoryNodes);
     }
 
-    private static final class Strict extends MandatoryLeafEnforcer {
-        private final Collection<YangInstanceIdentifier> mandatoryNodes;
 
-        private Strict(final Collection<YangInstanceIdentifier> mandatoryNodes) {
-            this.mandatoryNodes = Preconditions.checkNotNull(mandatoryNodes);
+    static Optional<MandatoryLeafEnforcer> forContainer(final DataNodeContainer schema,
+            final DataTreeConfiguration treeConfig) {
+        if (!treeConfig.isMandatoryNodesValidationEnabled()) {
+            return Optional.empty();
         }
 
-        @Override
-        protected void enforceOnTreeNode(final TreeNode tree) {
-            enforceOnTreeNode(tree.getData());
-        }
+        final Builder<YangInstanceIdentifier> builder = ImmutableList.builder();
+        findMandatoryNodes(builder, YangInstanceIdentifier.empty(), schema, treeConfig.getTreeType());
+        final ImmutableList<YangInstanceIdentifier> mandatoryNodes = builder.build();
+        return mandatoryNodes.isEmpty() ? Optional.empty() : Optional.of(new MandatoryLeafEnforcer(mandatoryNodes));
+    }
 
-        @Override
-        protected void enforceOnTreeNode(final NormalizedNode<?, ?> data) {
-            for (YangInstanceIdentifier id : mandatoryNodes) {
-                final Optional<NormalizedNode<?, ?>> descandant = NormalizedNodes.findNode(data, id);
-                Preconditions.checkArgument(descandant.isPresent(), "Node %s is missing mandatory descendant %s",
-                        data.getIdentifier(), id);
-            }
+    void enforceOnData(final NormalizedNode<?, ?> data) {
+        for (final YangInstanceIdentifier id : mandatoryNodes) {
+            checkArgument(NormalizedNodes.findNode(data, id).isPresent(),
+                "Node %s is missing mandatory descendant %s", data.getIdentifier(), id);
         }
     }
 
-    private static final Logger LOG = LoggerFactory.getLogger(MandatoryLeafEnforcer.class);
-    private static final MandatoryLeafEnforcer NOOP_ENFORCER = new NoOp();
-
-    protected abstract void enforceOnTreeNode(final TreeNode tree);
-
-    protected abstract void enforceOnTreeNode(final NormalizedNode<?, ?> normalizedNode);
+    void enforceOnTreeNode(final TreeNode tree) {
+        enforceOnData(tree.getData());
+    }
 
     private static void findMandatoryNodes(final Builder<YangInstanceIdentifier> builder,
             final YangInstanceIdentifier id, final DataNodeContainer schema, final TreeType type) {
-        for (DataSchemaNode child : schema.getChildNodes()) {
+        for (final DataSchemaNode child : schema.getChildNodes()) {
             if (SchemaAwareApplyOperation.belongsToTree(type, child)) {
                 if (child instanceof ContainerSchemaNode) {
                     final ContainerSchemaNode container = (ContainerSchemaNode) child;
@@ -79,9 +73,15 @@ abstract class MandatoryLeafEnforcer implements Immutable {
                         findMandatoryNodes(builder, id.node(NodeIdentifier.create(child.getQName())), container, type);
                     }
                 } else {
-                    final ConstraintDefinition constraints = child.getConstraints();
-                    final Integer minElements = constraints.getMinElements();
-                    if (constraints.isMandatory() || (minElements != null && minElements > 0)) {
+                    boolean needEnforce = child instanceof MandatoryAware && ((MandatoryAware) child).isMandatory();
+                    if (!needEnforce && child instanceof ElementCountConstraintAware) {
+                        needEnforce = ((ElementCountConstraintAware) child)
+                                .getElementCountConstraint().map(constraint -> {
+                                    final Integer min = constraint.getMinElements();
+                                    return min != null && min > 0;
+                                }).orElse(Boolean.FALSE).booleanValue();
+                    }
+                    if (needEnforce) {
                         final YangInstanceIdentifier childId = id.node(NodeIdentifier.create(child.getQName()));
                         LOG.debug("Adding mandatory child {}", childId);
                         builder.add(childId.toOptimized());
@@ -90,18 +90,4 @@ abstract class MandatoryLeafEnforcer implements Immutable {
             }
         }
     }
-
-    static MandatoryLeafEnforcer forContainer(final DataNodeContainer schema, final TreeType type) {
-        switch (type) {
-        case CONFIGURATION:
-            final Builder<YangInstanceIdentifier> builder = ImmutableList.builder();
-            findMandatoryNodes(builder, YangInstanceIdentifier.EMPTY, schema, type);
-            final Collection<YangInstanceIdentifier> mandatoryNodes = builder.build();
-            return mandatoryNodes.isEmpty() ? NOOP_ENFORCER : new Strict(mandatoryNodes);
-        case OPERATIONAL:
-            return NOOP_ENFORCER;
-        default:
-            throw new UnsupportedOperationException(String.format("Not supported tree type %s", type));
-        }
-    }
 }