From 6a3d3bfeda9ac4337ac151b472244fc447b1efbb Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 27 Nov 2020 09:48:36 +0100 Subject: [PATCH] Migrate coerceStatementArgument() callers This is a mass migration of callers, deprecating the method in the process. Change-Id: I41f44da5c9c460ce971f5c75f4f8b3998a12ecaf Signed-off-by: Robert Varga --- .../openconfig/stmt/OpenConfigVersionSupport.java | 2 +- .../rfc7950/stmt/BaseBooleanStatementSupport.java | 2 +- .../rfc7950/stmt/BaseInternedStatementSupport.java | 4 ++-- .../rfc7950/stmt/BaseQNameStatementSupport.java | 2 +- .../rfc7950/stmt/BaseSchemaTreeStatementSupport.java | 2 +- .../rfc7950/stmt/action/ActionStatementSupport.java | 4 ++-- .../stmt/anydata/AnydataStatementSupport.java | 4 ++-- .../rfc7950/stmt/anyxml/AnyxmlStatementSupport.java | 4 ++-- .../stmt/argument/ArgumentStatementSupport.java | 4 ++-- .../augment/AbstractAugmentStatementSupport.java | 5 ++--- .../rfc7950/stmt/base/BaseStatementSupport.java | 6 +++--- .../stmt/belongs_to/BelongsToStatementSupport.java | 7 +++---- .../stmt/bit/AbstractBitStatementSupport.java | 4 ++-- .../stmt/case_/AbstractCaseStatementSupport.java | 8 ++++---- .../stmt/choice/AbstractChoiceStatementSupport.java | 4 ++-- .../rfc7950/stmt/config/ConfigStatementSupport.java | 2 +- .../container/AbstractContainerStatementSupport.java | 4 ++-- .../deviate/AbstractDeviateStatementSupport.java | 2 +- .../stmt/deviation/DeviationStatementSupport.java | 8 +++----- .../stmt/enum_/AbstractEnumStatementSupport.java | 4 ++-- .../stmt/extension/ExtensionStatementSupport.java | 11 +++++------ .../stmt/feature/FeatureStatementSupport.java | 6 +++--- .../FractionDigitsStatementSupport.java | 4 ++-- .../grouping/AbstractGroupingStatementSupport.java | 8 ++++---- .../identity/AbstractIdentityStatementSupport.java | 6 +++--- .../AbstractIfFeatureStatementSupport.java | 6 +++--- .../stmt/import_/AbstractImportStatementSupport.java | 2 +- .../parser/rfc7950/stmt/import_/RevisionImport.java | 2 +- .../rfc7950/stmt/import_/SemanticVersionImport.java | 2 +- .../include/AbstractIncludeStatementSupport.java | 12 +++++------- .../stmt/input/AbstractInputStatementSupport.java | 8 ++++---- .../parser/rfc7950/stmt/key/KeyStatementSupport.java | 6 +++--- .../rfc7950/stmt/leaf/LeafStatementSupport.java | 4 ++-- .../leaf_list/AbstractLeafListStatementSupport.java | 4 ++-- .../rfc7950/stmt/length/LengthStatementSupport.java | 4 ++-- .../stmt/list/AbstractListStatementSupport.java | 4 ++-- .../stmt/mandatory/MandatoryStatementSupport.java | 2 +- .../max_elements/MaxElementsStatementSupport.java | 4 ++-- .../stmt/modifier/ModifierStatementSupport.java | 4 ++-- .../stmt/module/AbstractModuleStatementSupport.java | 5 ++--- .../rfc7950/stmt/must/MustStatementSupport.java | 4 ++-- .../stmt/namespace/NamespaceStatementSupport.java | 4 ++-- .../AbstractNotificationStatementSupport.java | 4 ++-- .../stmt/ordered_by/OrderedByStatementSupport.java | 4 ++-- .../stmt/output/AbstractOutputStatementSupport.java | 8 ++++---- .../rfc7950/stmt/path/PathStatementSupport.java | 4 ++-- .../pattern/AbstractPatternStatementSupport.java | 4 ++-- .../rfc7950/stmt/range/RangeStatementSupport.java | 4 ++-- .../stmt/refine/AbstractRefineStatementSupport.java | 2 +- .../RequireInstanceStatementSupport.java | 2 +- .../stmt/revision/RevisionStatementSupport.java | 4 ++-- .../revision_date/RevisionDateStatementSupport.java | 4 ++-- .../stmt/rpc/AbstractRpcStatementSupport.java | 4 ++-- .../rfc7950/stmt/status/StatusStatementSupport.java | 4 ++-- .../submodule/AbstractSubmoduleStatementSupport.java | 2 +- .../AbstractIdentityRefSpecificationSupport.java | 2 +- .../rfc7950/stmt/type/BuiltinTypeStatement.java | 2 +- .../stmt/typedef/TypedefStatementSupport.java | 8 ++++---- .../rfc7950/stmt/unique/UniqueStatementSupport.java | 5 ++--- .../rfc7950/stmt/uses/UsesStatementSupport.java | 4 ++-- .../rfc7950/stmt/when/WhenStatementSupport.java | 4 ++-- .../yang_version/YangVersionStatementSupport.java | 4 ++-- .../stmt/yin_element/YinElementStatementSupport.java | 2 +- .../yangtools/yang/parser/spi/meta/StmtContext.java | 3 ++- .../yang/parser/spi/meta/StmtContextDefaults.java | 2 +- .../yang/parser/spi/meta/StmtContextUtils.java | 4 ++-- 66 files changed, 138 insertions(+), 146 deletions(-) diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt/OpenConfigVersionSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt/OpenConfigVersionSupport.java index 515dd9b6ba..dec0395b51 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt/OpenConfigVersionSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt/OpenConfigVersionSupport.java @@ -54,7 +54,7 @@ public final class OpenConfigVersionSupport @Override protected OpenConfigVersionStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new OpenConfigVersionStatementImpl(ctx.coerceStatementArgument(), substatements); + return new OpenConfigVersionStatementImpl(ctx.getArgument(), substatements); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/BaseBooleanStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/BaseBooleanStatementSupport.java index d85c658ce1..e7cc8147c9 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/BaseBooleanStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/BaseBooleanStatementSupport.java @@ -53,7 +53,7 @@ public abstract class BaseBooleanStatementSupport ctx) { - return ctx.coerceStatementArgument() ? emptyDeclaredTrue : emptyDeclaredFalse; + return ctx.getArgument() ? emptyDeclaredTrue : emptyDeclaredFalse; } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/BaseInternedStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/BaseInternedStatementSupport.java index 80bcfd6d37..c9d2a3cfd0 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/BaseInternedStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/BaseInternedStatementSupport.java @@ -53,7 +53,7 @@ public abstract class BaseInternedStatementSupport ctx) { - return declaredCache.getUnchecked(ctx.coerceStatementArgument()); + return declaredCache.getUnchecked(ctx.getArgument()); } protected abstract @NonNull D createEmptyDeclared(@NonNull A argument); @@ -73,7 +73,7 @@ public abstract class BaseInternedStatementSupport ctx, final ImmutableList> substatements) { - return createDeclared(ctx.coerceStatementArgument(), substatements); + return createDeclared(ctx.getArgument(), substatements); } protected abstract @NonNull D createDeclared(@NonNull A argument, diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/BaseQNameStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/BaseQNameStatementSupport.java index 35262006bf..57a9e0016b 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/BaseQNameStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/BaseQNameStatementSupport.java @@ -39,7 +39,7 @@ public abstract class BaseQNameStatementSupport ctx, final QNameModule targetModule) { - return ctx.coerceStatementArgument().bindTo(targetModule).intern(); + return ctx.getArgument().bindTo(targetModule).intern(); } protected static final int historyAndStatusFlags(final CopyHistory history, diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/BaseSchemaTreeStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/BaseSchemaTreeStatementSupport.java index 2bb06827d9..5139b6cd92 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/BaseSchemaTreeStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/BaseSchemaTreeStatementSupport.java @@ -35,7 +35,7 @@ public abstract class BaseSchemaTreeStatementSupport stmt) { - stmt.coerceParentContext().addToNs(SchemaTreeNamespace.class, stmt.coerceStatementArgument(), stmt); + stmt.coerceParentContext().addToNs(SchemaTreeNamespace.class, stmt.getArgument(), stmt); } // Non-final because {@code input} and {@code output} are doing their own thing. diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/action/ActionStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/action/ActionStatementSupport.java index 55e794bc46..f4fb7be220 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/action/ActionStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/action/ActionStatementSupport.java @@ -81,12 +81,12 @@ public final class ActionStatementSupport extends @Override protected ActionStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularActionStatement(ctx.coerceStatementArgument(), substatements); + return new RegularActionStatement(ctx.getArgument(), substatements); } @Override protected ActionStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyActionStatement(ctx.coerceStatementArgument()); + return new EmptyActionStatement(ctx.getArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anydata/AnydataStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anydata/AnydataStatementSupport.java index 82f545a822..6c3aaa1768 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anydata/AnydataStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anydata/AnydataStatementSupport.java @@ -58,12 +58,12 @@ public final class AnydataStatementSupport @Override protected AnydataStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularAnydataStatement(ctx.coerceStatementArgument(), substatements); + return new RegularAnydataStatement(ctx.getArgument(), substatements); } @Override protected AnydataStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyAnydataStatement(ctx.coerceStatementArgument()); + return new EmptyAnydataStatement(ctx.getArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anyxml/AnyxmlStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anyxml/AnyxmlStatementSupport.java index 041adefd28..30816936e6 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anyxml/AnyxmlStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anyxml/AnyxmlStatementSupport.java @@ -58,12 +58,12 @@ public final class AnyxmlStatementSupport @Override protected AnyxmlStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularAnyxmlStatement(ctx.coerceStatementArgument(), substatements); + return new RegularAnyxmlStatement(ctx.getArgument(), substatements); } @Override protected AnyxmlStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyAnyxmlStatement(ctx.coerceStatementArgument()); + return new EmptyAnyxmlStatement(ctx.getArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/argument/ArgumentStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/argument/ArgumentStatementSupport.java index 95eed1c7f0..51ed38e1ee 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/argument/ArgumentStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/argument/ArgumentStatementSupport.java @@ -49,12 +49,12 @@ public final class ArgumentStatementSupport @Override protected ArgumentStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularArgumentStatement(ctx.coerceStatementArgument(), substatements); + return new RegularArgumentStatement(ctx.getArgument(), substatements); } @Override protected ArgumentStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyArgumentStatement(ctx.coerceStatementArgument()); + return new EmptyArgumentStatement(ctx.getArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AbstractAugmentStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AbstractAugmentStatementSupport.java index e51ae8cce6..5dcf3bbc61 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AbstractAugmentStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AbstractAugmentStatementSupport.java @@ -91,8 +91,7 @@ abstract class AbstractAugmentStatementSupport final ModelActionBuilder augmentAction = augmentNode.newInferenceAction(ModelProcessingPhase.EFFECTIVE_MODEL); augmentAction.requiresCtx(augmentNode, ModelProcessingPhase.EFFECTIVE_MODEL); final Prerequisite>> target = augmentAction.mutatesEffectiveCtxPath( - getSearchRoot(augmentNode), SchemaTreeNamespace.class, - augmentNode.coerceStatementArgument().getNodeIdentifiers()); + getSearchRoot(augmentNode), SchemaTreeNamespace.class, augmentNode.getArgument().getNodeIdentifiers()); augmentAction.apply(new InferenceAction() { @Override @@ -327,7 +326,7 @@ abstract class AbstractAugmentStatementSupport final Optional> optPrevCopy = targetCtx.getPreviousCopyCtx(); if (optPrevCopy.isPresent()) { final StmtContext original = optPrevCopy.get(); - final Object origArg = original.coerceStatementArgument(); + final Object origArg = original.getArgument(); Verify.verify(origArg instanceof QName, "Unexpected statement argument %s", origArg); if (sourceStmtQName.getModule().equals(((QName) origArg).getModule()) diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/base/BaseStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/base/BaseStatementSupport.java index 44dd2f3006..1a351e4dd9 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/base/BaseStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/base/BaseStatementSupport.java @@ -52,7 +52,7 @@ public final class BaseStatementSupport extends BaseQNameStatementSupport baseStmtCtx) { final Mutable baseParentCtx = baseStmtCtx.coerceParentContext(); if (baseParentCtx.producesDeclared(IdentityStatement.class)) { - final QName baseIdentityQName = baseStmtCtx.coerceStatementArgument(); + final QName baseIdentityQName = baseStmtCtx.getArgument(); final ModelActionBuilder baseIdentityAction = baseStmtCtx.newInferenceAction( ModelProcessingPhase.STATEMENT_DEFINITION); baseIdentityAction.requiresCtx(baseStmtCtx, IdentityNamespace.class, baseIdentityQName, @@ -83,12 +83,12 @@ public final class BaseStatementSupport extends BaseQNameStatementSupport ctx, final ImmutableList> substatements) { - return new RegularBaseStatement(ctx.coerceStatementArgument(), substatements); + return new RegularBaseStatement(ctx.getArgument(), substatements); } @Override protected BaseStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyBaseStatement(ctx.coerceStatementArgument()); + return new EmptyBaseStatement(ctx.getArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/belongs_to/BelongsToStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/belongs_to/BelongsToStatementSupport.java index 70883c80b1..6a8ef1727c 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/belongs_to/BelongsToStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/belongs_to/BelongsToStatementSupport.java @@ -59,8 +59,7 @@ public final class BelongsToStatementSupport final SourceIdentifier belongsToSourceIdentifier = getSourceIdentifier(belongsToCtx); final Prerequisite> belongsToPrereq = belongsToAction.requiresCtx(belongsToCtx, - ModuleNamespaceForBelongsTo.class, belongsToCtx.coerceStatementArgument(), - ModelProcessingPhase.SOURCE_LINKAGE); + ModuleNamespaceForBelongsTo.class, belongsToCtx.getArgument(), ModelProcessingPhase.SOURCE_LINKAGE); belongsToAction.apply(new InferenceAction() { @Override @@ -69,7 +68,7 @@ public final class BelongsToStatementSupport belongsToCtx.addToNs(BelongsToModuleContext.class, belongsToSourceIdentifier, belongsToModuleCtx); belongsToCtx.addToNs(BelongsToPrefixToModuleCtx.class, - findFirstDeclaredSubstatement(belongsToCtx, PrefixStatement.class).coerceStatementArgument(), + findFirstDeclaredSubstatement(belongsToCtx, PrefixStatement.class).getArgument(), belongsToModuleCtx); } @@ -103,7 +102,7 @@ public final class BelongsToStatementSupport private static SourceIdentifier getSourceIdentifier(final StmtContext belongsToCtx) { - return RevisionSourceIdentifier.create(belongsToCtx.coerceStatementArgument()); + return RevisionSourceIdentifier.create(belongsToCtx.getArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/bit/AbstractBitStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/bit/AbstractBitStatementSupport.java index 3b20501a49..1d688b30f9 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/bit/AbstractBitStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/bit/AbstractBitStatementSupport.java @@ -32,12 +32,12 @@ abstract class AbstractBitStatementSupport extends BaseStatementSupport ctx, final ImmutableList> substatements) { - return new RegularBitStatement(ctx.coerceStatementArgument(), substatements); + return new RegularBitStatement(ctx.getArgument(), substatements); } @Override protected final BitStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyBitStatement(ctx.coerceStatementArgument()); + return new EmptyBitStatement(ctx.getArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/case_/AbstractCaseStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/case_/AbstractCaseStatementSupport.java index f1f4081595..f67c317ee0 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/case_/AbstractCaseStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/case_/AbstractCaseStatementSupport.java @@ -36,9 +36,9 @@ abstract class AbstractCaseStatementSupport final StatementSource source = ctx.source(); switch (source) { case CONTEXT: - return new RegularUndeclaredCaseStatement(ctx.coerceStatementArgument(), substatements); + return new RegularUndeclaredCaseStatement(ctx.getArgument(), substatements); case DECLARATION: - return new RegularCaseStatement(ctx.coerceStatementArgument(), substatements); + return new RegularCaseStatement(ctx.getArgument(), substatements); default: throw new IllegalStateException("Unhandled statement source " + source); } @@ -49,9 +49,9 @@ abstract class AbstractCaseStatementSupport final StatementSource source = ctx.source(); switch (source) { case CONTEXT: - return new EmptyUndeclaredCaseStatement(ctx.coerceStatementArgument()); + return new EmptyUndeclaredCaseStatement(ctx.getArgument()); case DECLARATION: - return new EmptyCaseStatement(ctx.coerceStatementArgument()); + return new EmptyCaseStatement(ctx.getArgument()); default: throw new IllegalStateException("Unhandled statement source " + source); } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/choice/AbstractChoiceStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/choice/AbstractChoiceStatementSupport.java index 89cd7112ad..751fb7a8a0 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/choice/AbstractChoiceStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/choice/AbstractChoiceStatementSupport.java @@ -49,12 +49,12 @@ abstract class AbstractChoiceStatementSupport @Override protected final ChoiceStatement createDeclared(@NonNull final StmtContext ctx, final ImmutableList> substatements) { - return new RegularChoiceStatement(ctx.coerceStatementArgument(), substatements); + return new RegularChoiceStatement(ctx.getArgument(), substatements); } @Override protected final ChoiceStatement createEmptyDeclared(@NonNull final StmtContext ctx) { - return new EmptyChoiceStatement(ctx.coerceStatementArgument()); + return new EmptyChoiceStatement(ctx.getArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/config/ConfigStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/config/ConfigStatementSupport.java index aa3b533336..413f24e347 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/config/ConfigStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/config/ConfigStatementSupport.java @@ -40,7 +40,7 @@ public final class ConfigStatementSupport @Override protected ConfigStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularConfigStatement(ctx.coerceStatementArgument(), substatements); + return new RegularConfigStatement(ctx.getArgument(), substatements); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/container/AbstractContainerStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/container/AbstractContainerStatementSupport.java index cdae50b543..d7fab2f837 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/container/AbstractContainerStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/container/AbstractContainerStatementSupport.java @@ -34,12 +34,12 @@ abstract class AbstractContainerStatementSupport @Override protected final ContainerStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularContainerStatement(ctx.coerceStatementArgument(), substatements); + return new RegularContainerStatement(ctx.getArgument(), substatements); } @Override protected final ContainerStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyContainerStatement(ctx.coerceStatementArgument()); + return new EmptyContainerStatement(ctx.getArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviate/AbstractDeviateStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviate/AbstractDeviateStatementSupport.java index 9250774c8b..bf30b3886a 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviate/AbstractDeviateStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviate/AbstractDeviateStatementSupport.java @@ -191,7 +191,7 @@ abstract class AbstractDeviateStatementSupport @Override protected final DeviateStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new DeviateStatementImpl(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements); + return new DeviateStatementImpl(ctx.getRawArgument(), ctx.getArgument(), substatements); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviation/DeviationStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviation/DeviationStatementSupport.java index 6d880af4f4..6340eae3e8 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviation/DeviationStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviation/DeviationStatementSupport.java @@ -51,10 +51,8 @@ public final class DeviationStatementSupport @Override public void onFullDefinitionDeclared( final Mutable ctx) { - final QNameModule currentModule = ctx.getFromNamespace(ModuleCtxToModuleQName.class, - ctx.getRoot()); - final QNameModule targetModule = Iterables.getLast(ctx.coerceStatementArgument().getNodeIdentifiers()) - .getModule(); + final QNameModule currentModule = ctx.getFromNamespace(ModuleCtxToModuleQName.class, ctx.getRoot()); + final QNameModule targetModule = Iterables.getLast(ctx.getArgument().getNodeIdentifiers()).getModule(); if (currentModule.equals(targetModule)) { throw new InferenceException(ctx.sourceReference(), @@ -70,7 +68,7 @@ public final class DeviationStatementSupport @Override protected DeviationStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new DeviationStatementImpl(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements); + return new DeviationStatementImpl(ctx.getRawArgument(), ctx.getArgument(), substatements); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/enum_/AbstractEnumStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/enum_/AbstractEnumStatementSupport.java index c3a62cc430..a2948dcc6f 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/enum_/AbstractEnumStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/enum_/AbstractEnumStatementSupport.java @@ -32,12 +32,12 @@ abstract class AbstractEnumStatementSupport @Override protected final EnumStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularEnumStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements); + return new RegularEnumStatement(ctx.getRawArgument(), ctx.getArgument(), substatements); } @Override protected final EnumStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyEnumStatement(ctx.getRawArgument(), ctx.coerceStatementArgument()); + return new EmptyEnumStatement(ctx.getRawArgument(), ctx.getArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/ExtensionStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/ExtensionStatementSupport.java index 147d9c2ac7..0278689032 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/ExtensionStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/ExtensionStatementSupport.java @@ -64,7 +64,7 @@ public final class ExtensionStatementSupport final Mutable stmt) { super.onStatementDefinitionDeclared(stmt); - QName stmtName = stmt.coerceStatementArgument(); + QName stmtName = stmt.getArgument(); if (OpenConfigStatements.OPENCONFIG_VERSION.getStatementName().isEqualWithoutRevision(stmtName)) { stmtName = stmtName.withoutRevision(); } @@ -77,9 +77,8 @@ public final class ExtensionStatementSupport YinElementStatement.class); stmt.addToNs(StatementDefinitionNamespace.class, stmt.argument(), - new ModelDefinedStatementSupport(new ModelDefinedStatementDefinition(stmt.coerceStatementArgument(), - argument != null ? argument.argument() : null, - yinElement != null && yinElement.coerceStatementArgument()))); + new ModelDefinedStatementSupport(new ModelDefinedStatementDefinition(stmt.getArgument(), + argument != null ? argument.argument() : null, yinElement != null && yinElement.getArgument()))); } @Override @@ -90,12 +89,12 @@ public final class ExtensionStatementSupport @Override protected ExtensionStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularExtensionStatement(ctx.coerceStatementArgument(), substatements); + return new RegularExtensionStatement(ctx.getArgument(), substatements); } @Override protected ExtensionStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyExtensionStatement(ctx.coerceStatementArgument()); + return new EmptyExtensionStatement(ctx.getArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/feature/FeatureStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/feature/FeatureStatementSupport.java index 296af054b0..ade9f5fe4a 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/feature/FeatureStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/feature/FeatureStatementSupport.java @@ -54,7 +54,7 @@ public final class FeatureStatementSupport @Override public void onFullDefinitionDeclared(final Mutable stmt) { super.onFullDefinitionDeclared(stmt); - stmt.addContext(FeatureNamespace.class, stmt.coerceStatementArgument(), stmt); + stmt.addContext(FeatureNamespace.class, stmt.getArgument(), stmt); } @Override @@ -65,12 +65,12 @@ public final class FeatureStatementSupport @Override protected FeatureStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularFeatureStatement(ctx.coerceStatementArgument(), substatements); + return new RegularFeatureStatement(ctx.getArgument(), substatements); } @Override protected FeatureStatement createEmptyDeclared(@NonNull final StmtContext ctx) { - return new EmptyFeatureStatement(ctx.coerceStatementArgument()); + return new EmptyFeatureStatement(ctx.getArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/fraction_digits/FractionDigitsStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/fraction_digits/FractionDigitsStatementSupport.java index 16fcefbf0d..693ef1f070 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/fraction_digits/FractionDigitsStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/fraction_digits/FractionDigitsStatementSupport.java @@ -81,12 +81,12 @@ public final class FractionDigitsStatementSupport @Override protected FractionDigitsStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularFractionDigitsStatement(ctx.coerceStatementArgument(), substatements); + return new RegularFractionDigitsStatement(ctx.getArgument(), substatements); } @Override protected FractionDigitsStatement createEmptyDeclared(final StmtContext ctx) { - final Integer argument = ctx.coerceStatementArgument(); + final Integer argument = ctx.getArgument(); return verifyNotNull(EMPTY_DECLS.get(argument), "No declared instance for %s", argument); } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/grouping/AbstractGroupingStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/grouping/AbstractGroupingStatementSupport.java index 26ec9ea155..7b2317bb4d 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/grouping/AbstractGroupingStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/grouping/AbstractGroupingStatementSupport.java @@ -44,7 +44,7 @@ abstract class AbstractGroupingStatementSupport // Shadowing check: make sure we do not trample on pre-existing definitions. This catches sibling // declarations and parent declarations which have already been declared. checkConflict(parent, stmt); - parent.addContext(GroupingNamespace.class, stmt.coerceStatementArgument(), stmt); + parent.addContext(GroupingNamespace.class, stmt.getArgument(), stmt); } } } @@ -53,13 +53,13 @@ abstract class AbstractGroupingStatementSupport protected final GroupingStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { checkDeclaredConflict(ctx); - return new RegularGroupingStatement(ctx.coerceStatementArgument(), substatements); + return new RegularGroupingStatement(ctx.getArgument(), substatements); } @Override protected final GroupingStatement createEmptyDeclared(final StmtContext ctx) { checkDeclaredConflict(ctx); - return new EmptyGroupingStatement(ctx.coerceStatementArgument()); + return new EmptyGroupingStatement(ctx.getArgument()); } @Override @@ -82,7 +82,7 @@ abstract class AbstractGroupingStatementSupport } private static void checkConflict(final StmtContext parent, final StmtContext stmt) { - final QName arg = stmt.coerceStatementArgument(); + final QName arg = stmt.getArgument(); final StmtContext existing = parent.getFromNamespace(GroupingNamespace.class, arg); SourceException.throwIf(existing != null, stmt.sourceReference(), "Duplicate name for grouping %s", arg); } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/identity/AbstractIdentityStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/identity/AbstractIdentityStatementSupport.java index cc7c9e458c..705560e902 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/identity/AbstractIdentityStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/identity/AbstractIdentityStatementSupport.java @@ -49,7 +49,7 @@ abstract class AbstractIdentityStatementSupport @Override public final void onStatementDefinitionDeclared( final Mutable stmt) { - final QName qname = stmt.coerceStatementArgument(); + final QName qname = stmt.getArgument(); final StmtContext prev = stmt.getFromNamespace(IdentityNamespace.class, qname); SourceException.throwIf(prev != null, stmt.sourceReference(), "Duplicate identity definition %s", qname); stmt.addToNs(IdentityNamespace.class, qname, stmt); @@ -58,12 +58,12 @@ abstract class AbstractIdentityStatementSupport @Override protected final IdentityStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularIdentityStatement(ctx.coerceStatementArgument(), substatements); + return new RegularIdentityStatement(ctx.getArgument(), substatements); } @Override protected final IdentityStatement createEmptyDeclared(@NonNull final StmtContext ctx) { - return new EmptyIdentityStatement(ctx.coerceStatementArgument()); + return new EmptyIdentityStatement(ctx.getArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/if_feature/AbstractIfFeatureStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/if_feature/AbstractIfFeatureStatementSupport.java index 5ef538a8cb..554f756dc7 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/if_feature/AbstractIfFeatureStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/if_feature/AbstractIfFeatureStatementSupport.java @@ -55,7 +55,7 @@ abstract class AbstractIfFeatureStatementSupport final ModelActionBuilder verifyFeatures = stmt.newInferenceAction(ModelProcessingPhase.EFFECTIVE_MODEL); final Map, QName> backRef = new HashMap<>(); - for (QName feature : stmt.coerceStatementArgument().getReferencedFeatures()) { + for (QName feature : stmt.getArgument().getReferencedFeatures()) { backRef.put(verifyFeatures.requiresCtx(stmt, FeatureNamespace.class, feature, ModelProcessingPhase.EFFECTIVE_MODEL), feature); } @@ -87,13 +87,13 @@ abstract class AbstractIfFeatureStatementSupport @Override protected final IfFeatureStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularIfFeatureStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements); + return new RegularIfFeatureStatement(ctx.getRawArgument(), ctx.getArgument(), substatements); } @Override protected final IfFeatureStatement createEmptyDeclared( final StmtContext ctx) { - return new EmptyIfFeatureStatement(ctx.getRawArgument(), ctx.coerceStatementArgument()); + return new EmptyIfFeatureStatement(ctx.getRawArgument(), ctx.getArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/AbstractImportStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/AbstractImportStatementSupport.java index d6acb373bd..5c7cfe0f6d 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/AbstractImportStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/AbstractImportStatementSupport.java @@ -58,7 +58,7 @@ abstract class AbstractImportStatementSupport */ stmt.addRequiredSource(RevisionImport.getImportedSourceIdentifier(stmt)); - final String moduleName = stmt.coerceStatementArgument(); + final String moduleName = stmt.getArgument(); final ModelActionBuilder importAction = stmt.newInferenceAction(SOURCE_PRE_LINKAGE); final Prerequisite> imported = importAction.requiresCtx(stmt, PreLinkageModuleNamespace.class, moduleName, SOURCE_PRE_LINKAGE); diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/RevisionImport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/RevisionImport.java index 0fc5e8b8cb..f319b7b38c 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/RevisionImport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/RevisionImport.java @@ -47,7 +47,7 @@ final class RevisionImport { static void onLinkageDeclared(final Mutable stmt) { final ModelActionBuilder importAction = stmt.newInferenceAction(SOURCE_LINKAGE); final Prerequisite> imported; - final String moduleName = stmt.coerceStatementArgument(); + final String moduleName = stmt.getArgument(); final Revision revision = firstAttributeOf(stmt.declaredSubstatements(), RevisionDateStatement.class); if (revision == null) { imported = importAction.requiresCtx(stmt, ModuleNamespace.class, diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/SemanticVersionImport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/SemanticVersionImport.java index 13b394dfbb..a6872b8b9d 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/SemanticVersionImport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/SemanticVersionImport.java @@ -122,7 +122,7 @@ final class SemanticVersionImport { static void onLinkageDeclared(final Mutable stmt) { final ModelActionBuilder importAction = stmt.newInferenceAction(SOURCE_LINKAGE); - final String moduleName = stmt.coerceStatementArgument(); + final String moduleName = stmt.getArgument(); final SemVer semanticVersion = stmt.getFromNamespace(SemanticVersionNamespace.class, stmt); final SemanticVersionImport.CompatibleCriterion criterion = semanticVersion == null ? new NoVerCompatibleCriterion(moduleName) diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/include/AbstractIncludeStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/include/AbstractIncludeStatementSupport.java index 74e612d1fd..fb8e43e159 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/include/AbstractIncludeStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/include/AbstractIncludeStatementSupport.java @@ -52,9 +52,8 @@ abstract class AbstractIncludeStatementSupport @Override public final void onLinkageDeclared(final Mutable stmt) { - final String submoduleName = stmt.coerceStatementArgument(); - final StmtContext revision = findFirstDeclaredSubstatement(stmt, - RevisionDateStatement.class); + final String submoduleName = stmt.getArgument(); + final StmtContext revision = findFirstDeclaredSubstatement(stmt, RevisionDateStatement.class); final ModelActionBuilder includeAction = stmt.newInferenceAction(SOURCE_LINKAGE); final Prerequisite> requiresCtxPrerequisite; @@ -63,8 +62,7 @@ abstract class AbstractIncludeStatementSupport NamespaceKeyCriterion.latestRevisionModule(submoduleName), SOURCE_LINKAGE); } else { requiresCtxPrerequisite = includeAction.requiresCtx(stmt, SubmoduleNamespace.class, - RevisionSourceIdentifier.create(submoduleName, Optional.of(revision.argument())), - SOURCE_LINKAGE); + RevisionSourceIdentifier.create(submoduleName, Optional.of(revision.argument())), SOURCE_LINKAGE); } includeAction.apply(new InferenceAction() { @@ -89,12 +87,12 @@ abstract class AbstractIncludeStatementSupport @Override protected final IncludeStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularIncludeStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements); + return new RegularIncludeStatement(ctx.getRawArgument(), ctx.getArgument(), substatements); } @Override protected final IncludeStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyIncludeStatement(ctx.getRawArgument(), ctx.coerceStatementArgument()); + return new EmptyIncludeStatement(ctx.getRawArgument(), ctx.getArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/input/AbstractInputStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/input/AbstractInputStatementSupport.java index b756f1d06f..ed181e1d9b 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/input/AbstractInputStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/input/AbstractInputStatementSupport.java @@ -32,9 +32,9 @@ abstract class AbstractInputStatementSupport final StatementSource source = ctx.source(); switch (source) { case CONTEXT: - return new RegularUndeclaredInputStatement(ctx.coerceStatementArgument(), substatements); + return new RegularUndeclaredInputStatement(ctx.getArgument(), substatements); case DECLARATION: - return new RegularInputStatement(ctx.coerceStatementArgument(), substatements); + return new RegularInputStatement(ctx.getArgument(), substatements); default: throw new IllegalStateException("Unhandled statement source " + source); } @@ -45,9 +45,9 @@ abstract class AbstractInputStatementSupport final StatementSource source = ctx.source(); switch (source) { case CONTEXT: - return new EmptyUndeclaredInputStatement(ctx.coerceStatementArgument()); + return new EmptyUndeclaredInputStatement(ctx.getArgument()); case DECLARATION: - return new EmptyInputStatement(ctx.coerceStatementArgument()); + return new EmptyInputStatement(ctx.getArgument()); default: throw new IllegalStateException("Unhandled statement source " + source); } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/key/KeyStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/key/KeyStatementSupport.java index 724d86b423..300e5f71b1 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/key/KeyStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/key/KeyStatementSupport.java @@ -66,7 +66,7 @@ public final class KeyStatementSupport final QNameModule targetModule) { final Builder builder = ImmutableSet.builder(); boolean replaced = false; - for (final QName qname : ctx.coerceStatementArgument()) { + for (final QName qname : ctx.getArgument()) { if (!targetModule.equals(qname.getModule())) { final QName newQname = qname.bindTo(targetModule).intern(); builder.add(newQname); @@ -89,12 +89,12 @@ public final class KeyStatementSupport @Override protected KeyStatement createDeclared(final StmtContext, KeyStatement, ?> ctx, final ImmutableList> substatements) { - return new RegularKeyStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements); + return new RegularKeyStatement(ctx.getRawArgument(), ctx.getArgument(), substatements); } @Override protected KeyStatement createEmptyDeclared(final StmtContext, KeyStatement, ?> ctx) { - return new EmptyKeyStatement(ctx.getRawArgument(), ctx.coerceStatementArgument()); + return new EmptyKeyStatement(ctx.getRawArgument(), ctx.getArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf/LeafStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf/LeafStatementSupport.java index e8fdff1d61..938505abd2 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf/LeafStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf/LeafStatementSupport.java @@ -70,12 +70,12 @@ public final class LeafStatementSupport extends BaseSchemaTreeStatementSupport ctx, final ImmutableList> substatements) { - return new RegularLeafStatement(ctx.coerceStatementArgument(), substatements); + return new RegularLeafStatement(ctx.getArgument(), substatements); } @Override protected LeafStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyLeafStatement(ctx.coerceStatementArgument()); + return new EmptyLeafStatement(ctx.getArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/AbstractLeafListStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/AbstractLeafListStatementSupport.java index cd6a295f34..c9db870bd1 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/AbstractLeafListStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/AbstractLeafListStatementSupport.java @@ -41,12 +41,12 @@ abstract class AbstractLeafListStatementSupport @Override protected final LeafListStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularLeafListStatement(ctx.coerceStatementArgument(), substatements); + return new RegularLeafListStatement(ctx.getArgument(), substatements); } @Override protected final LeafListStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyLeafListStatement(ctx.coerceStatementArgument()); + return new EmptyLeafListStatement(ctx.getArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/length/LengthStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/length/LengthStatementSupport.java index 4c91a062a1..a619f0971b 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/length/LengthStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/length/LengthStatementSupport.java @@ -86,12 +86,12 @@ public final class LengthStatementSupport @Override protected LengthStatement createDeclared(final StmtContext, LengthStatement, ?> ctx, final ImmutableList> substatements) { - return new RegularLengthStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements); + return new RegularLengthStatement(ctx.getRawArgument(), ctx.getArgument(), substatements); } @Override protected LengthStatement createEmptyDeclared(final StmtContext, LengthStatement, ?> ctx) { - return new EmptyLengthStatement(ctx.getRawArgument(), ctx.coerceStatementArgument()); + return new EmptyLengthStatement(ctx.getRawArgument(), ctx.getArgument()); } @Override 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 baa4bd5333..2a825e90a1 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 @@ -59,12 +59,12 @@ abstract class AbstractListStatementSupport extends @Override protected final ListStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularListStatement(ctx.coerceStatementArgument(), substatements); + return new RegularListStatement(ctx.getArgument(), substatements); } @Override protected final ListStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyListStatement(ctx.coerceStatementArgument()); + return new EmptyListStatement(ctx.getArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/mandatory/MandatoryStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/mandatory/MandatoryStatementSupport.java index 008955c981..8008a6a9cd 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/mandatory/MandatoryStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/mandatory/MandatoryStatementSupport.java @@ -41,7 +41,7 @@ public final class MandatoryStatementSupport extends @Override protected MandatoryStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularMandatoryStatement(ctx.coerceStatementArgument(), substatements); + return new RegularMandatoryStatement(ctx.getArgument(), substatements); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/max_elements/MaxElementsStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/max_elements/MaxElementsStatementSupport.java index 413ff3c264..eb7c9f7200 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/max_elements/MaxElementsStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/max_elements/MaxElementsStatementSupport.java @@ -46,12 +46,12 @@ public final class MaxElementsStatementSupport @Override protected MaxElementsStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularMaxElementsStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements); + return new RegularMaxElementsStatement(ctx.getRawArgument(), ctx.getArgument(), substatements); } @Override protected MaxElementsStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyMaxElementsStatement(ctx.getRawArgument(), ctx.coerceStatementArgument()); + return new EmptyMaxElementsStatement(ctx.getRawArgument(), ctx.getArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/modifier/ModifierStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/modifier/ModifierStatementSupport.java index a62659dfe6..467aa9884e 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/modifier/ModifierStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/modifier/ModifierStatementSupport.java @@ -53,12 +53,12 @@ public final class ModifierStatementSupport @Override protected ModifierStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularModifierStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements); + return new RegularModifierStatement(ctx.getRawArgument(), ctx.getArgument(), substatements); } @Override protected ModifierStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyModifierStatement(ctx.getRawArgument(), ctx.coerceStatementArgument()); + return new EmptyModifierStatement(ctx.getRawArgument(), ctx.getArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/module/AbstractModuleStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/module/AbstractModuleStatementSupport.java index 8aa3035ab6..7a497fa931 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/module/AbstractModuleStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/module/AbstractModuleStatementSupport.java @@ -93,8 +93,7 @@ abstract class AbstractModuleStatementSupport final QNameModule qNameModule = QNameModule.create(moduleNs, revisionDate.orElse(null)).intern(); stmt.addToNs(ModuleCtxToModuleQName.class, stmt, qNameModule); - stmt.setRootIdentifier(RevisionSourceIdentifier.create(stmt.coerceStatementArgument().getLocalName(), - revisionDate)); + stmt.setRootIdentifier(RevisionSourceIdentifier.create(stmt.getArgument().getLocalName(), revisionDate)); } @Override @@ -168,7 +167,7 @@ abstract class AbstractModuleStatementSupport @Override protected final ModuleStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new ModuleStatementImpl(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements); + return new ModuleStatementImpl(ctx.getRawArgument(), ctx.getArgument(), substatements); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/must/MustStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/must/MustStatementSupport.java index ad5a36a013..f163b344e1 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/must/MustStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/must/MustStatementSupport.java @@ -57,12 +57,12 @@ public final class MustStatementSupport @Override protected MustStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularMustStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements); + return new RegularMustStatement(ctx.getRawArgument(), ctx.getArgument(), substatements); } @Override protected MustStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyMustStatement(ctx.getRawArgument(), ctx.coerceStatementArgument()); + return new EmptyMustStatement(ctx.getRawArgument(), ctx.getArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/namespace/NamespaceStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/namespace/NamespaceStatementSupport.java index 548fb5ea03..3220102996 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/namespace/NamespaceStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/namespace/NamespaceStatementSupport.java @@ -54,12 +54,12 @@ public final class NamespaceStatementSupport @Override protected NamespaceStatement createDeclared(@NonNull final StmtContext ctx, final ImmutableList> substatements) { - return new RegularNamespaceStatement(ctx.coerceStatementArgument(), substatements); + return new RegularNamespaceStatement(ctx.getArgument(), substatements); } @Override protected NamespaceStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyNamespaceStatement(ctx.coerceStatementArgument()); + return new EmptyNamespaceStatement(ctx.getArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/notification/AbstractNotificationStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/notification/AbstractNotificationStatementSupport.java index 44b34afce0..a4a597383a 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/notification/AbstractNotificationStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/notification/AbstractNotificationStatementSupport.java @@ -27,12 +27,12 @@ abstract class AbstractNotificationStatementSupport @Override protected final NotificationStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularNotificationStatement(ctx.coerceStatementArgument(), substatements); + return new RegularNotificationStatement(ctx.getArgument(), substatements); } @Override protected final NotificationStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyNotificationStatement(ctx.coerceStatementArgument()); + return new EmptyNotificationStatement(ctx.getArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/ordered_by/OrderedByStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/ordered_by/OrderedByStatementSupport.java index e1373b4605..316b574293 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/ordered_by/OrderedByStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/ordered_by/OrderedByStatementSupport.java @@ -76,12 +76,12 @@ public final class OrderedByStatementSupport @Override protected OrderedByStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularOrderedByStatement(ctx.coerceStatementArgument(), substatements); + return new RegularOrderedByStatement(ctx.getArgument(), substatements); } @Override protected OrderedByStatement createEmptyDeclared(final StmtContext ctx) { - final Ordering argument = ctx.coerceStatementArgument(); + final Ordering argument = ctx.getArgument(); switch (argument) { case SYSTEM: return EMPTY_SYSTEM_DECL; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/output/AbstractOutputStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/output/AbstractOutputStatementSupport.java index 8f368bf856..8827681dd3 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/output/AbstractOutputStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/output/AbstractOutputStatementSupport.java @@ -32,9 +32,9 @@ abstract class AbstractOutputStatementSupport final StatementSource source = ctx.source(); switch (source) { case CONTEXT: - return new RegularUndeclaredOutputStatement(ctx.coerceStatementArgument(), substatements); + return new RegularUndeclaredOutputStatement(ctx.getArgument(), substatements); case DECLARATION: - return new RegularOutputStatement(ctx.coerceStatementArgument(), substatements); + return new RegularOutputStatement(ctx.getArgument(), substatements); default: throw new IllegalStateException("Unhandled statement source " + source); } @@ -45,9 +45,9 @@ abstract class AbstractOutputStatementSupport final StatementSource source = ctx.source(); switch (source) { case CONTEXT: - return new EmptyUndeclaredOutputStatement(ctx.coerceStatementArgument()); + return new EmptyUndeclaredOutputStatement(ctx.getArgument()); case DECLARATION: - return new EmptyOutputStatement(ctx.coerceStatementArgument()); + return new EmptyOutputStatement(ctx.getArgument()); default: throw new IllegalStateException("Unhandled statement source " + source); } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/PathStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/PathStatementSupport.java index ff99dbcf05..9994c08506 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/PathStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/PathStatementSupport.java @@ -58,12 +58,12 @@ public final class PathStatementSupport @Override protected PathStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularPathStatement(ctx.coerceStatementArgument(), substatements); + return new RegularPathStatement(ctx.getArgument(), substatements); } @Override protected PathStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyPathStatement(ctx.coerceStatementArgument()); + return new EmptyPathStatement(ctx.getArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/pattern/AbstractPatternStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/pattern/AbstractPatternStatementSupport.java index 9a8710b6db..5e9fce833f 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/pattern/AbstractPatternStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/pattern/AbstractPatternStatementSupport.java @@ -42,13 +42,13 @@ abstract class AbstractPatternStatementSupport @Override protected final PatternStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularPatternStatement(ctx.coerceStatementArgument(), substatements); + return new RegularPatternStatement(ctx.getArgument(), substatements); } @Override protected final PatternStatement createEmptyDeclared( final StmtContext ctx) { - return new EmptyPatternStatement(ctx.coerceStatementArgument()); + return new EmptyPatternStatement(ctx.getArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/range/RangeStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/range/RangeStatementSupport.java index e797235356..348913cccc 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/range/RangeStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/range/RangeStatementSupport.java @@ -82,12 +82,12 @@ public final class RangeStatementSupport @Override protected RangeStatement createDeclared(final StmtContext, RangeStatement, ?> ctx, final ImmutableList> substatements) { - return new RegularRangeStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements); + return new RegularRangeStatement(ctx.getRawArgument(), ctx.getArgument(), substatements); } @Override protected RangeStatement createEmptyDeclared(final StmtContext, RangeStatement, ?> ctx) { - return new EmptyRangeStatement(ctx.getRawArgument(), ctx.coerceStatementArgument()); + return new EmptyRangeStatement(ctx.getRawArgument(), ctx.getArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/refine/AbstractRefineStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/refine/AbstractRefineStatementSupport.java index bf90524bcc..50a2696ea2 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/refine/AbstractRefineStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/refine/AbstractRefineStatementSupport.java @@ -35,7 +35,7 @@ abstract class AbstractRefineStatementSupport @Override protected final RefineStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RefineStatementImpl(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements); + return new RefineStatementImpl(ctx.getRawArgument(), ctx.getArgument(), substatements); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/require_instance/RequireInstanceStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/require_instance/RequireInstanceStatementSupport.java index bcc30d6eaf..f1ef050573 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/require_instance/RequireInstanceStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/require_instance/RequireInstanceStatementSupport.java @@ -42,7 +42,7 @@ public final class RequireInstanceStatementSupport @Override protected RequireInstanceStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularRequireInstanceStatement(ctx.coerceStatementArgument(), substatements); + return new RegularRequireInstanceStatement(ctx.getArgument(), substatements); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/revision/RevisionStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/revision/RevisionStatementSupport.java index f6f83e7b93..89cceb5402 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/revision/RevisionStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/revision/RevisionStatementSupport.java @@ -56,12 +56,12 @@ public final class RevisionStatementSupport @Override protected RevisionStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularRevisionStatement(ctx.coerceStatementArgument(), substatements); + return new RegularRevisionStatement(ctx.getArgument(), substatements); } @Override protected RevisionStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyRevisionStatement(ctx.coerceStatementArgument()); + return new EmptyRevisionStatement(ctx.getArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/revision_date/RevisionDateStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/revision_date/RevisionDateStatementSupport.java index 4bbcacc13b..1b75579cce 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/revision_date/RevisionDateStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/revision_date/RevisionDateStatementSupport.java @@ -53,12 +53,12 @@ public final class RevisionDateStatementSupport @Override protected RevisionDateStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularRevisionDateStatement(ctx.coerceStatementArgument(), substatements); + return new RegularRevisionDateStatement(ctx.getArgument(), substatements); } @Override protected RevisionDateStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyRevisionDateStatement(ctx.coerceStatementArgument()); + return new EmptyRevisionDateStatement(ctx.getArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/rpc/AbstractRpcStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/rpc/AbstractRpcStatementSupport.java index 2141ce2fb7..db99a6a7cb 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/rpc/AbstractRpcStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/rpc/AbstractRpcStatementSupport.java @@ -67,12 +67,12 @@ abstract class AbstractRpcStatementSupport extends BaseSchemaTreeStatementSuppor @Override protected final RpcStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularRpcStatement(ctx.coerceStatementArgument(), substatements); + return new RegularRpcStatement(ctx.getArgument(), substatements); } @Override protected final RpcStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyRpcStatement(ctx.coerceStatementArgument()); + return new EmptyRpcStatement(ctx.getArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/status/StatusStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/status/StatusStatementSupport.java index 1673357ce1..c0c6f6f641 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/status/StatusStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/status/StatusStatementSupport.java @@ -89,12 +89,12 @@ public final class StatusStatementSupport @Override protected StatusStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularStatusStatement(ctx.coerceStatementArgument(), substatements); + return new RegularStatusStatement(ctx.getArgument(), substatements); } @Override protected StatusStatement createEmptyDeclared(final StmtContext ctx) { - final Status argument = ctx.coerceStatementArgument(); + final Status argument = ctx.getArgument(); switch (argument) { case CURRENT: return EMPTY_CURRENT_DECL; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/submodule/AbstractSubmoduleStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/submodule/AbstractSubmoduleStatementSupport.java index 2e33f9c32d..2b2cec2444 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/submodule/AbstractSubmoduleStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/submodule/AbstractSubmoduleStatementSupport.java @@ -81,7 +81,7 @@ abstract class AbstractSubmoduleStatementSupport @Override protected final SubmoduleStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new SubmoduleStatementImpl(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements); + return new SubmoduleStatementImpl(ctx.getRawArgument(), ctx.getArgument(), substatements); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractIdentityRefSpecificationSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractIdentityRefSpecificationSupport.java index 4feb3654e2..cd4456e04b 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractIdentityRefSpecificationSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractIdentityRefSpecificationSupport.java @@ -51,7 +51,7 @@ abstract class AbstractIdentityRefSpecificationSupport final Collection> baseStatements = StmtContextUtils.findAllDeclaredSubstatements(stmt, BaseStatement.class); for (StmtContext baseStmt : baseStatements) { - final QName baseIdentity = baseStmt.coerceStatementArgument(); + final QName baseIdentity = baseStmt.getArgument(); final StmtContext stmtCtx = stmt.getFromNamespace(IdentityNamespace.class, baseIdentity); InferenceException.throwIfNull(stmtCtx, stmt.sourceReference(), "Referenced base identity '%s' doesn't exist in given scope (module, imported modules, submodules)", diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BuiltinTypeStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BuiltinTypeStatement.java index b29fdf02cd..4769a781f8 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BuiltinTypeStatement.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BuiltinTypeStatement.java @@ -46,6 +46,6 @@ final class BuiltinTypeStatement extends WithRawStringArgument implements TypeSt } static @Nullable TypeStatement lookup(final StmtContext ctx) { - return BUILTINS.get(ctx.coerceStatementArgument()); + return BUILTINS.get(ctx.getArgument()); } } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/typedef/TypedefStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/typedef/TypedefStatementSupport.java index a084a5ac1a..b792eac6a0 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/typedef/TypedefStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/typedef/TypedefStatementSupport.java @@ -67,7 +67,7 @@ public final class TypedefStatementSupport extends // Shadowing check: make sure we do not trample on pre-existing definitions. This catches sibling // declarations and parent declarations which have already been declared. checkConflict(parent, stmt); - parent.addContext(TypeNamespace.class, stmt.coerceStatementArgument(), stmt); + parent.addContext(TypeNamespace.class, stmt.getArgument(), stmt); } } } @@ -81,13 +81,13 @@ public final class TypedefStatementSupport extends protected TypedefStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { checkDeclared(ctx); - return new RegularTypedefStatement(ctx.coerceStatementArgument(), substatements); + return new RegularTypedefStatement(ctx.getArgument(), substatements); } @Override protected TypedefStatement createEmptyDeclared(final StmtContext ctx) { checkDeclared(ctx); - return new EmptyTypedefStatement(ctx.coerceStatementArgument()); + return new EmptyTypedefStatement(ctx.getArgument()); } @Override @@ -109,7 +109,7 @@ public final class TypedefStatementSupport extends } private static void checkConflict(final StmtContext parent, final StmtContext stmt) { - final QName arg = stmt.coerceStatementArgument(); + final QName arg = stmt.getArgument(); final StmtContext existing = parent.getFromNamespace(TypeNamespace.class, arg); // RFC7950 sections 5.5 and 6.2.1: identifiers must not be shadowed SourceException.throwIf(existing != null, stmt.sourceReference(), "Duplicate name for typedef %s", arg); diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/unique/UniqueStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/unique/UniqueStatementSupport.java index 15da737d43..4a190b8f9e 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/unique/UniqueStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/unique/UniqueStatementSupport.java @@ -69,13 +69,12 @@ public final class UniqueStatementSupport @Override protected UniqueStatement createDeclared(final StmtContext, UniqueStatement, ?> ctx, final ImmutableList> substatements) { - return new RegularUniqueStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), - substatements); + return new RegularUniqueStatement(ctx.getRawArgument(), ctx.getArgument(), substatements); } @Override protected UniqueStatement createEmptyDeclared(final StmtContext, UniqueStatement, ?> ctx) { - return new EmptyUniqueStatement(ctx.getRawArgument(), ctx.coerceStatementArgument()); + return new EmptyUniqueStatement(ctx.getRawArgument(), ctx.getArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/UsesStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/UsesStatementSupport.java index 6a3fd61348..a6e0b075d5 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/UsesStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/UsesStatementSupport.java @@ -132,12 +132,12 @@ public final class UsesStatementSupport @Override protected UsesStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularUsesStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements); + return new RegularUsesStatement(ctx.getRawArgument(), ctx.getArgument(), substatements); } @Override protected UsesStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyUsesStatement(ctx.getRawArgument(), ctx.coerceStatementArgument()); + return new EmptyUsesStatement(ctx.getRawArgument(), ctx.getArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/when/WhenStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/when/WhenStatementSupport.java index aaba4c6462..aaa3190c75 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/when/WhenStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/when/WhenStatementSupport.java @@ -55,12 +55,12 @@ public final class WhenStatementSupport @Override protected WhenStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularWhenStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements); + return new RegularWhenStatement(ctx.getRawArgument(), ctx.getArgument(), substatements); } @Override protected WhenStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyWhenStatement(ctx.getRawArgument(), ctx.coerceStatementArgument()); + return new EmptyWhenStatement(ctx.getRawArgument(), ctx.getArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/yang_version/YangVersionStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/yang_version/YangVersionStatementSupport.java index 81c7f60c97..c7676d4e4d 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/yang_version/YangVersionStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/yang_version/YangVersionStatementSupport.java @@ -66,12 +66,12 @@ public final class YangVersionStatementSupport @Override protected YangVersionStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularYangVersionStatement(ctx.coerceStatementArgument(), substatements); + return new RegularYangVersionStatement(ctx.getArgument(), substatements); } @Override protected YangVersionStatement createEmptyDeclared(final StmtContext ctx) { - final YangVersion argument = ctx.coerceStatementArgument(); + final YangVersion argument = ctx.getArgument(); switch (argument) { case VERSION_1: return EMPTY_VER1_DECL; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/yin_element/YinElementStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/yin_element/YinElementStatementSupport.java index df3ebedb8d..19c0252af0 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/yin_element/YinElementStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/yin_element/YinElementStatementSupport.java @@ -41,7 +41,7 @@ public final class YinElementStatementSupport @Override protected YinElementStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularYinElementStatement(ctx.coerceStatementArgument(), substatements); + return new RegularYinElementStatement(ctx.getArgument(), substatements); } @Override diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContext.java b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContext.java index c2116fded5..1bc1dbfcee 100644 --- a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContext.java +++ b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContext.java @@ -92,8 +92,9 @@ public interface StmtContext, E extends Effect * * @return raw statement argument string * @throws VerifyException if this statement does not have an argument + * @deprecated Use {@link #getArgument()} instead. */ - // TODO: gradually migrate callers of this method + @Deprecated(forRemoval = true) default @NonNull A coerceStatementArgument() { return getArgument(); } diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextDefaults.java b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextDefaults.java index 9d6bc7f6e4..e885bf8dff 100644 --- a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextDefaults.java +++ b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextDefaults.java @@ -35,7 +35,7 @@ public final class StmtContextDefaults { return stmt.allSubstatementsStream() .filter(ctx -> ctx.isSupportedToBuildEffective() && ctx.producesEffective(type)) .findAny() - .map(ctx -> (A) ctx.coerceStatementArgument()); + .map(ctx -> (A) ctx.getArgument()); } /** diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextUtils.java b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextUtils.java index 551f601162..e47b0052ec 100644 --- a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextUtils.java +++ b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextUtils.java @@ -248,7 +248,7 @@ public final class StmtContextUtils { if (YangStmtMapping.IF_FEATURE.equals(stmt.publicDefinition())) { containsIfFeature = true; @SuppressWarnings("unchecked") - final Predicate> argument = (Predicate>) stmt.coerceStatementArgument(); + final Predicate> argument = (Predicate>) stmt.getArgument(); if (argument.test(supportedFeatures)) { isSupported = true; } else { @@ -446,7 +446,7 @@ public final class StmtContextUtils { private static boolean isListKey(final StmtContext leafStmtCtx, final StmtContext, ?, ?> keyStmtCtx) { - return keyStmtCtx.coerceStatementArgument().contains(leafStmtCtx.argument()); + return keyStmtCtx.getArgument().contains(leafStmtCtx.argument()); } private static void disallowIfFeatureAndWhenOnListKeys(final StmtContext leafStmtCtx) { -- 2.36.6