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 6c99d3bb5890169f9cf41a96a2a866d3649287c8..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,6 +7,7 @@
  */
 package org.opendaylight.yangtools.yang.data.impl.schema.tree;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.collect.ImmutableList;
@@ -16,6 +17,7 @@ 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;
@@ -31,56 +33,58 @@ import org.slf4j.LoggerFactory;
 final class MandatoryLeafEnforcer implements Immutable {
     private static final Logger LOG = LoggerFactory.getLogger(MandatoryLeafEnforcer.class);
 
-    private final ImmutableList<MandatoryDescendant> mandatoryNodes;
+    private final ImmutableList<YangInstanceIdentifier> mandatoryNodes;
 
-    private MandatoryLeafEnforcer(final ImmutableList<MandatoryDescendant> mandatoryNodes) {
+    private MandatoryLeafEnforcer(final ImmutableList<YangInstanceIdentifier> mandatoryNodes) {
         this.mandatoryNodes = requireNonNull(mandatoryNodes);
     }
 
+
     static Optional<MandatoryLeafEnforcer> forContainer(final DataNodeContainer schema,
             final DataTreeConfiguration treeConfig) {
         if (!treeConfig.isMandatoryNodesValidationEnabled()) {
             return Optional.empty();
         }
 
-        final Builder<MandatoryDescendant> builder = ImmutableList.builder();
+        final Builder<YangInstanceIdentifier> builder = ImmutableList.builder();
         findMandatoryNodes(builder, YangInstanceIdentifier.empty(), schema, treeConfig.getTreeType());
-        final ImmutableList<MandatoryDescendant> mandatoryNodes = builder.build();
+        final ImmutableList<YangInstanceIdentifier> mandatoryNodes = builder.build();
         return mandatoryNodes.isEmpty() ? Optional.empty() : Optional.of(new MandatoryLeafEnforcer(mandatoryNodes));
     }
 
     void enforceOnData(final NormalizedNode<?, ?> data) {
-        mandatoryNodes.forEach(node -> node.enforceOnData(data));
+        for (final YangInstanceIdentifier id : mandatoryNodes) {
+            checkArgument(NormalizedNodes.findNode(data, id).isPresent(),
+                "Node %s is missing mandatory descendant %s", data.getIdentifier(), id);
+        }
     }
 
     void enforceOnTreeNode(final TreeNode tree) {
         enforceOnData(tree.getData());
     }
 
-    private static void findMandatoryNodes(final Builder<MandatoryDescendant> builder,
-        final YangInstanceIdentifier id, final DataNodeContainer schema, final TreeType type) {
+    private static void findMandatoryNodes(final Builder<YangInstanceIdentifier> builder,
+            final YangInstanceIdentifier id, final DataNodeContainer schema, final TreeType type) {
         for (final DataSchemaNode child : schema.getChildNodes()) {
             if (SchemaAwareApplyOperation.belongsToTree(type, child)) {
                 if (child instanceof ContainerSchemaNode) {
                     final ContainerSchemaNode container = (ContainerSchemaNode) child;
                     if (!container.isPresenceContainer()) {
-                        findMandatoryNodes(builder,
-                            id.node(NodeIdentifier.create(container.getQName())), container, type);
+                        findMandatoryNodes(builder, id.node(NodeIdentifier.create(child.getQName())), container, type);
                     }
                 } else {
                     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);
+                        needEnforce = ((ElementCountConstraintAware) child)
+                                .getElementCountConstraint().map(constraint -> {
+                                    final Integer min = constraint.getMinElements();
+                                    return min != null && min > 0;
+                                }).orElse(Boolean.FALSE).booleanValue();
                     }
                     if (needEnforce) {
-                        final MandatoryDescendant desc = MandatoryDescendant.create(id, schema, child);
-                        LOG.debug("Adding mandatory child {}", desc);
-                        builder.add(desc);
+                        final YangInstanceIdentifier childId = id.node(NodeIdentifier.create(child.getQName()));
+                        LOG.debug("Adding mandatory child {}", childId);
+                        builder.add(childId.toOptimized());
                     }
                 }
             }