Remove Augmentation{Identifier,Node}

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

diff --git a/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/MandatoryLeafEnforcer.java b/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/MandatoryLeafEnforcer.java
index 398d07f110066f36a12bc516135c5d0610193812..3ab1934b15fd0b8a32dea57bce14fb9cec5d61b0 100644 (file)
--- a/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/MandatoryLeafEnforcer.java
+++ b/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/MandatoryLeafEnforcer.java
@@ -8,7 +8,6 @@
 package org.opendaylight.yangtools.yang.data.tree.impl;
 
 import static java.util.Objects.requireNonNull;
-import static org.opendaylight.yangtools.yang.data.tree.impl.MandatoryDescendant.getAugIdentifierOfChild;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableList.Builder;
@@ -20,10 +19,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.tree.api.DataTreeConfiguration;
 import org.opendaylight.yangtools.yang.data.tree.api.TreeType;
 import org.opendaylight.yangtools.yang.data.tree.impl.node.TreeNode;
-import org.opendaylight.yangtools.yang.data.util.DataSchemaContextNode;
-import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
-import org.opendaylight.yangtools.yang.model.api.CopyableNode;
 import org.opendaylight.yangtools.yang.model.api.DataNodeContainer;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.ElementCountConstraintAware;
@@ -48,8 +44,7 @@ final class MandatoryLeafEnforcer implements Immutable {
         }
 
         final var builder = ImmutableList.<MandatoryDescendant>builder();
-        final var isAugmentingNode = schema instanceof CopyableNode && ((CopyableNode) schema).isAugmenting();
-        findMandatoryNodes(builder, YangInstanceIdentifier.empty(), schema, treeConfig.getTreeType(), isAugmentingNode);
+        findMandatoryNodes(builder, YangInstanceIdentifier.empty(), schema, treeConfig.getTreeType());
         final var mandatoryNodes = builder.build();
         return mandatoryNodes.isEmpty() ? null : new MandatoryLeafEnforcer(mandatoryNodes);
     }
@@ -62,34 +57,18 @@ final class MandatoryLeafEnforcer implements Immutable {
         enforceOnData(tree.getData());
     }
 
-    private static void findMandatoryNodes(final Builder<MandatoryDescendant> builder,
-        final YangInstanceIdentifier id, final DataNodeContainer schema, final TreeType type,
-        final boolean augmentedSubtree) {
+    private static void findMandatoryNodes(final Builder<MandatoryDescendant> 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 container) {
                     if (!container.isPresenceContainer()) {
-                        if (!augmentedSubtree) {
-                            // this container is not part of augmented subtree.
-                            final boolean parentSchemaAugmenting = schema instanceof CopyableNode copyable
-                                && copyable.isAugmenting();
-                            if (container.isAugmenting() && !parentSchemaAugmenting) {
-                                // the container is augmenting, but the parent schema is not. Meaning this is the root
-                                // of the augmentation (the augmented subtree starts here). The container has to be
-                                // represented by AugmentationID and the whole subtree needs to be based on it.
-                                final AugmentationSchemaNode aug = getAugIdentifierOfChild(schema, child);
-                                findMandatoryNodes(builder, id.node(DataSchemaContextNode
-                                    .augmentationIdentifierFrom(aug)).node(NodeIdentifier.create(container.getQName())),
-                                    container, type, true);
-                                continue;
-                            }
-                        }
                         // the container is either:
                         //    - not in an augmented subtree and not augmenting
                         //    - in an augmented subtree
                         // in both cases just append the NodeID to the ongoing ID and continue the search.
-                        findMandatoryNodes(builder, id.node(NodeIdentifier.create(container.getQName())),
-                            container, type, augmentedSubtree);
+                        findMandatoryNodes(builder, id.node(NodeIdentifier.create(container.getQName())), container,
+                            type);
                     }
                 } else {
                     boolean needEnforce = child instanceof MandatoryAware aware && aware.isMandatory();
@@ -102,8 +81,7 @@ final class MandatoryLeafEnforcer implements Immutable {
                             .orElse(Boolean.FALSE);
                     }
                     if (needEnforce) {
-                        final MandatoryDescendant desc = MandatoryDescendant.create(id, schema, child,
-                            augmentedSubtree);
+                        final MandatoryDescendant desc = MandatoryDescendant.create(id, schema, child);
                         LOG.debug("Adding mandatory child {}", desc);
                         builder.add(desc);
                     }