X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-parser-rfc7950%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fparser%2Frfc7950%2Fstmt%2Flist%2FAbstractListStatementSupport.java;h=e33f18b94ddf5b92b5765a6db87c7858334cb7e5;hb=88aeb1cd912d37fcadf671b622fece9a01297e90;hp=4a4df814ef2b9286ac5328f6ed0592a2c633d9c8;hpb=724bcace3d03fd634d573916519fc59f65785d09;p=yangtools.git 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 4a4df814ef..e33f18b94d 100644 --- 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 @@ -7,12 +7,17 @@ */ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.list; +import static com.google.common.base.Verify.verify; + import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; import java.util.ArrayList; import java.util.HashSet; 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; @@ -22,61 +27,51 @@ 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.SchemaNodeIdentifier; 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.opendaylight.yangtools.yang.parser.spi.source.StatementSourceReference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -abstract class AbstractListStatementSupport extends BaseQNameStatementSupport { +abstract class AbstractListStatementSupport extends + BaseSchemaTreeStatementSupport { + private static final Logger LOG = LoggerFactory.getLogger(AbstractListStatementSupport.class); + private static final ImmutableSet UNINSTANTIATED_DATATREE_STATEMENTS = ImmutableSet.of( + YangStmtMapping.GROUPING, YangStmtMapping.NOTIFICATION, YangStmtMapping.INPUT, YangStmtMapping.OUTPUT); AbstractListStatementSupport() { 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 stmt) { - stmt.coerceParentContext().addToNs(ChildSchemaNodeNamespace.class, stmt.coerceStatementArgument(), stmt); - } - - @Override - protected ListStatement createDeclared(final StmtContext ctx, + protected final ListStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { return new RegularListStatement(ctx.coerceStatementArgument(), substatements); } @Override - protected ListStatement createEmptyDeclared(final StmtContext ctx) { + protected final ListStatement createEmptyDeclared(final StmtContext ctx) { return new EmptyListStatement(ctx.coerceStatementArgument()); } @Override - protected final ListEffectiveStatement createEffective( - final StmtContext ctx, - final ListStatement declared, final ImmutableList> substatements) { - final StatementSourceReference ref = ctx.getStatementSourceReference(); - final SchemaPath path = ctx.getSchemaPath().get(); - final ListSchemaNode original = (ListSchemaNode) ctx.getOriginalCtx().map(StmtContext::buildEffective) - .orElse(null); + protected ListEffectiveStatement createEffective(final Current stmt, + final ImmutableList> substatements) { + final SchemaPath path = stmt.getSchemaPath(); + final ListSchemaNode original = (ListSchemaNode) stmt.original(); final ImmutableList keyDefinition; final KeyEffectiveStatement keyStmt = findFirstStatement(substatements, KeyEffectiveStatement.class); @@ -88,12 +83,11 @@ abstract class AbstractListStatementSupport extends BaseQNameStatementSupport
  • 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 boolean inGrouping(final StmtContext ctx) { - StmtContext parent = ctx.getParentContext(); - while (parent != null) { - if (parent.getPublicDefinition() == YangStmtMapping.GROUPING) { - return true; - } - parent = parent.getParentContext(); + private static void warnConfigList(final @NonNull Current stmt) { + final StmtContext ctx = stmt.caerbannog(); + final StmtContext 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 + if (warned == null) { + verify(warnCtx instanceof Mutable, "Unexpected context %s", warnCtx); + ((Mutable) warnCtx).addToNs(ConfigListWarningNamespace.class, Boolean.TRUE, Boolean.TRUE); + LOG.info("Configuration list {} does not define any keys in violation of RFC7950 section 7.8.2. While " + + "this is fine with OpenDaylight, it can cause interoperability issues with other systems " + + "[defined at {}]", ctx.getStatementArgument(), warnCtx.getStatementSourceReference()); } - return false; } - @Override - protected final ListEffectiveStatement createEmptyEffective( - final StmtContext ctx, final ListStatement declared) { - return createEffective(ctx, declared, ImmutableList.of()); + 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; } }