Code Review / yangtools.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Reformulate StatementContextFactory.createEffective()
[yangtools.git] / yang / yang-parser-rfc7950 / src / main / java / org / opendaylight / yangtools / yang / parser / rfc7950 / stmt / list / AbstractListStatementSupport.java
diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/AbstractListStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/AbstractListStatementSupport.java
index 8d3d913f7efaeb4ed67cd0a28db43e554bf8d0c5..e33f18b94ddf5b92b5765a6db87c7858334cb7e5 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/AbstractListStatementSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/AbstractListStatementSupport.java
@@ -17,6 +17,7 @@ import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.yangtools.yang.common.Ordering;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.ElementCountConstraint;
 import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
@@ -26,24 +27,27 @@ import org.opendaylight.yangtools.yang.model.api.Status;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
+import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 import org.opendaylight.yangtools.yang.model.api.stmt.KeyEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.ListEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.ListStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.OrderedByEffectiveStatement;
-import org.opendaylight.yangtools.yang.model.api.stmt.OrderedByStatement.Ordering;
 import org.opendaylight.yangtools.yang.model.api.stmt.StatusEffectiveStatement;
-import org.opendaylight.yangtools.yang.parser.rfc7950.namespace.ChildSchemaNodeNamespace;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.BaseQNameStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.BaseSchemaTreeStatementSupport;
 import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStatementMixins.EffectiveStatementWithFlags.FlagsBuilder;
 import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStmtUtils;
+import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx;
+import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current;
+import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Parent;
 import org.opendaylight.yangtools.yang.parser.spi.meta.InferenceException;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable;
-import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-abstract class AbstractListStatementSupport extends BaseQNameStatementSupport<ListStatement, ListEffectiveStatement> {
+abstract class AbstractListStatementSupport extends
+        BaseSchemaTreeStatementSupport<ListStatement, ListEffectiveStatement> {
+
     private static final Logger LOG = LoggerFactory.getLogger(AbstractListStatementSupport.class);
     private static final ImmutableSet<YangStmtMapping> UNINSTANTIATED_DATATREE_STATEMENTS = ImmutableSet.of(
         YangStmtMapping.GROUPING, YangStmtMapping.NOTIFICATION, YangStmtMapping.INPUT, YangStmtMapping.OUTPUT);
@@ -52,16 +56,6 @@ abstract class AbstractListStatementSupport extends BaseQNameStatementSupport<Li
         super(YangStmtMapping.LIST);
     }
 
-    @Override
-    public final QName parseArgumentValue(final StmtContext<?, ?, ?> ctx, final String value) {
-        return StmtContextUtils.parseIdentifier(ctx, value);
-    }
-
-    @Override
-    public final void onStatementAdded(final Mutable<QName, ListStatement, ListEffectiveStatement> stmt) {
-        stmt.coerceParentContext().addToNs(ChildSchemaNodeNamespace.class, stmt.coerceStatementArgument(), stmt);
-    }
-
     @Override
     protected final ListStatement createDeclared(final StmtContext<QName, ListStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
@@ -74,12 +68,10 @@ abstract class AbstractListStatementSupport extends BaseQNameStatementSupport<Li
     }
 
     @Override
-    protected final ListEffectiveStatement createEffective(
-            final StmtContext<QName, ListStatement, ListEffectiveStatement> ctx,
-            final ListStatement declared, final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
-        final SchemaPath path = ctx.getSchemaPath().get();
-        final ListSchemaNode original = (ListSchemaNode) ctx.getOriginalCtx().map(StmtContext::buildEffective)
-                .orElse(null);
+    protected ListEffectiveStatement createEffective(final Current<QName, ListStatement> stmt,
+            final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
+        final SchemaPath path = stmt.getSchemaPath();
+        final ListSchemaNode original = (ListSchemaNode) stmt.original();
 
         final ImmutableList<QName> keyDefinition;
         final KeyEffectiveStatement keyStmt = findFirstStatement(substatements, KeyEffectiveStatement.class);
@@ -93,9 +85,9 @@ abstract class AbstractListStatementSupport extends BaseQNameStatementSupport<Li
             }
             for (final QName keyQName : keyStmt.argument()) {
                 if (!possibleLeafQNamesForKey.contains(keyQName)) {
-                    throw new InferenceException(ctx.getStatementSourceReference(),
+                    throw new InferenceException(stmt.sourceReference(),
                         "Key '%s' misses node '%s' in list '%s'", keyStmt.getDeclared().rawArgument(),
-                        keyQName.getLocalName(), ctx.getStatementArgument());
+                        keyQName.getLocalName(), stmt.argument());
                 }
                 keyDefinitionInit.add(keyQName);
             }
@@ -105,27 +97,28 @@ abstract class AbstractListStatementSupport extends BaseQNameStatementSupport<Li
             keyDefinition = ImmutableList.of();
         }
 
-        final boolean configuration = ctx.isConfiguration();
+        final boolean configuration = stmt.effectiveConfig();
         final int flags = new FlagsBuilder()
-                .setHistory(ctx.getCopyHistory())
+                .setHistory(stmt.history())
                 .setStatus(findFirstArgument(substatements, StatusEffectiveStatement.class, Status.CURRENT))
                 .setConfiguration(configuration)
                 .setUserOrdered(findFirstArgument(substatements, OrderedByEffectiveStatement.class, Ordering.SYSTEM)
                     .equals(Ordering.USER))
                 .toFlags();
-        if (configuration && keyDefinition.isEmpty() && isInstantied(ctx)) {
-            warnConfigList(ctx);
+        if (configuration && keyDefinition.isEmpty() && isInstantied(stmt)) {
+            warnConfigList(stmt);
         }
 
         final Optional<ElementCountConstraint> elementCountConstraint =
                 EffectiveStmtUtils.createElementCountConstraint(substatements);
         return original == null && !elementCountConstraint.isPresent()
-                ? new EmptyListEffectiveStatement(declared, path, flags, ctx, substatements, keyDefinition)
-                        : new RegularListEffectiveStatement(declared, path, flags, ctx, substatements, keyDefinition,
-                            elementCountConstraint.orElse(null), original);
+                ? new EmptyListEffectiveStatement(stmt, path, flags, substatements, keyDefinition)
+                : new RegularListEffectiveStatement(stmt, path, flags, substatements, keyDefinition,
+                    elementCountConstraint.orElse(null), original);
     }
 
-    private static void warnConfigList(final @NonNull StmtContext<QName, ListStatement, ListEffectiveStatement> ctx) {
+    private static void warnConfigList(final @NonNull Current<QName, ListStatement> stmt) {
+        final StmtContext<QName, ListStatement, ListEffectiveStatement> ctx = stmt.caerbannog();
         final StmtContext<QName, ListStatement, ListEffectiveStatement> warnCtx = ctx.getOriginalCtx().orElse(ctx);
         final Boolean warned = warnCtx.getFromNamespace(ConfigListWarningNamespace.class, Boolean.TRUE);
         // Hacky check if we have issued a warning for the original statement
@@ -138,18 +131,26 @@ abstract class AbstractListStatementSupport extends BaseQNameStatementSupport<Li
         }
     }
 
-    private static boolean isInstantied(final StmtContext<?, ?, ?> ctx) {
-        for (StmtContext<?, ?, ?> parent = ctx.getParentContext(); parent != null; parent = parent.getParentContext()) {
-            if (UNINSTANTIATED_DATATREE_STATEMENTS.contains(parent.getPublicDefinition())) {
+    private static boolean isInstantied(final EffectiveStmtCtx ctx) {
+        Parent parent = ctx.parent();
+        while (parent != null) {
+            final StatementDefinition parentDef = parent.publicDefinition();
+            if (UNINSTANTIATED_DATATREE_STATEMENTS.contains(parentDef)) {
                 return false;
             }
+
+            final Parent grandParent = parent.parent();
+            if (YangStmtMapping.AUGMENT == parentDef && grandParent != null) {
+                // If this is an augment statement and its parent is either a 'module' or 'submodule' statement, we are
+                // dealing with an uninstantiated context.
+                final StatementDefinition grandParentDef = grandParent.publicDefinition();
+                if (YangStmtMapping.MODULE == grandParentDef || YangStmtMapping.SUBMODULE == grandParentDef) {
+                    return false;
+                }
+            }
+
+            parent = grandParent;
         }
         return true;
     }
-
-    @Override
-    protected final ListEffectiveStatement createEmptyEffective(
-            final StmtContext<QName, ListStatement, ListEffectiveStatement> ctx, final ListStatement declared) {
-        return createEffective(ctx, declared, ImmutableList.of());
-    }
 }
OpenDaylight YANG Tools