Migrate coerceStatementArgument() callers 55/93955/1
authorRobert Varga <robert.varga@pantheon.tech>
Fri, 27 Nov 2020 08:48:36 +0000 (09:48 +0100)
committerRobert Varga <robert.varga@pantheon.tech>
Fri, 27 Nov 2020 08:48:36 +0000 (09:48 +0100)
This is a mass migration of callers, deprecating the method
in the process.

Change-Id: I41f44da5c9c460ce971f5c75f4f8b3998a12ecaf
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
66 files changed:
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt/OpenConfigVersionSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/BaseBooleanStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/BaseInternedStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/BaseQNameStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/BaseSchemaTreeStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/action/ActionStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anydata/AnydataStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anyxml/AnyxmlStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/argument/ArgumentStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AbstractAugmentStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/base/BaseStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/belongs_to/BelongsToStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/bit/AbstractBitStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/case_/AbstractCaseStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/choice/AbstractChoiceStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/config/ConfigStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/container/AbstractContainerStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviate/AbstractDeviateStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviation/DeviationStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/enum_/AbstractEnumStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/ExtensionStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/feature/FeatureStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/fraction_digits/FractionDigitsStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/grouping/AbstractGroupingStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/identity/AbstractIdentityStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/if_feature/AbstractIfFeatureStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/AbstractImportStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/RevisionImport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/SemanticVersionImport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/include/AbstractIncludeStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/input/AbstractInputStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/key/KeyStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf/LeafStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/AbstractLeafListStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/length/LengthStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/list/AbstractListStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/mandatory/MandatoryStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/max_elements/MaxElementsStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/modifier/ModifierStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/module/AbstractModuleStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/must/MustStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/namespace/NamespaceStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/notification/AbstractNotificationStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/ordered_by/OrderedByStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/output/AbstractOutputStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/PathStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/pattern/AbstractPatternStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/range/RangeStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/refine/AbstractRefineStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/require_instance/RequireInstanceStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/revision/RevisionStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/revision_date/RevisionDateStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/rpc/AbstractRpcStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/status/StatusStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/submodule/AbstractSubmoduleStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractIdentityRefSpecificationSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BuiltinTypeStatement.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/typedef/TypedefStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/unique/UniqueStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/UsesStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/when/WhenStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/yang_version/YangVersionStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/yin_element/YinElementStatementSupport.java
yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContext.java
yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextDefaults.java
yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextUtils.java

index 515dd9b6bae661be4bf7b96cce2fae419ceb385b..dec0395b518cde413b60b0298fcf9b23392ffe1c 100644 (file)
@@ -54,7 +54,7 @@ public final class OpenConfigVersionSupport
     @Override
     protected OpenConfigVersionStatement createDeclared(final StmtContext<SemVer, OpenConfigVersionStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new OpenConfigVersionStatementImpl(ctx.coerceStatementArgument(), substatements);
+        return new OpenConfigVersionStatementImpl(ctx.getArgument(), substatements);
     }
 
     @Override
index d85c658ce1b3689c740070d17bda8775d66d3c43..e7cc8147c9382729b7727e83bae2dd7cb7dc70a6 100644 (file)
@@ -53,7 +53,7 @@ public abstract class BaseBooleanStatementSupport<D extends DeclaredStatement<Bo
 
     @Override
     protected final D createEmptyDeclared(final StmtContext<Boolean, D, ?> ctx) {
-        return ctx.coerceStatementArgument() ? emptyDeclaredTrue : emptyDeclaredFalse;
+        return ctx.getArgument() ? emptyDeclaredTrue : emptyDeclaredFalse;
     }
 
     @Override
index 80bcfd6d37963327becafe020b69fb5ce96dda5e..c9d2a3cfd0799cade5110fbe1c37a6834e98d247 100644 (file)
@@ -53,7 +53,7 @@ public abstract class BaseInternedStatementSupport<A, D extends DeclaredStatemen
 
     @Override
     protected final D createEmptyDeclared(final StmtContext<A, D, ?> 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<A, D extends DeclaredStatemen
     @Override
     protected final D createDeclared(final StmtContext<A, D, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return createDeclared(ctx.coerceStatementArgument(), substatements);
+        return createDeclared(ctx.getArgument(), substatements);
     }
 
     protected abstract @NonNull D createDeclared(@NonNull A argument,
index 35262006bfc4090504e8a38a57b0aef17bce100e..57a9e0016b76aecbd97eb5e9748f6eed79a09528 100644 (file)
@@ -39,7 +39,7 @@ public abstract class BaseQNameStatementSupport<D extends DeclaredStatement<QNam
 
     @Override
     public QName adaptArgumentValue(final StmtContext<QName, D, E> ctx, final QNameModule targetModule) {
-        return ctx.coerceStatementArgument().bindTo(targetModule).intern();
+        return ctx.getArgument().bindTo(targetModule).intern();
     }
 
     protected static final int historyAndStatusFlags(final CopyHistory history,
index 2bb06827d9ad61fc9431b8d408b6f52c0ef3f8ef..5139b6cd926637a8233d986d0ae4b2aaff0cb93d 100644 (file)
@@ -35,7 +35,7 @@ public abstract class BaseSchemaTreeStatementSupport<D extends DeclaredStatement
 
     @Override
     public final void onStatementAdded(final Mutable<QName, D, E> 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.
index 55e794bc46a0367b04304da93b79bf714cc2fdbe..f4fb7be2201116cfc4a9baed656fd20aa45bb174 100644 (file)
@@ -81,12 +81,12 @@ public final class ActionStatementSupport extends
     @Override
     protected ActionStatement createDeclared(final StmtContext<QName, ActionStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularActionStatement(ctx.coerceStatementArgument(), substatements);
+        return new RegularActionStatement(ctx.getArgument(), substatements);
     }
 
     @Override
     protected ActionStatement createEmptyDeclared(final StmtContext<QName, ActionStatement, ?> ctx) {
-        return new EmptyActionStatement(ctx.coerceStatementArgument());
+        return new EmptyActionStatement(ctx.getArgument());
     }
 
     @Override
index 82f545a822013f089f212a69a7f057c09edfdad2..6c3aaa176845a2890bd3db8e6e8be5620bb2e218 100644 (file)
@@ -58,12 +58,12 @@ public final class AnydataStatementSupport
     @Override
     protected AnydataStatement createDeclared(final StmtContext<QName, AnydataStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularAnydataStatement(ctx.coerceStatementArgument(), substatements);
+        return new RegularAnydataStatement(ctx.getArgument(), substatements);
     }
 
     @Override
     protected AnydataStatement createEmptyDeclared(final StmtContext<QName, AnydataStatement, ?> ctx) {
-        return new EmptyAnydataStatement(ctx.coerceStatementArgument());
+        return new EmptyAnydataStatement(ctx.getArgument());
     }
 
     @Override
index 041adefd281be9beea94c234961b80b4935d2c5a..30816936e6cbd3520998a6a1f517b0891004f431 100644 (file)
@@ -58,12 +58,12 @@ public final class AnyxmlStatementSupport
     @Override
     protected AnyxmlStatement createDeclared(final StmtContext<QName, AnyxmlStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularAnyxmlStatement(ctx.coerceStatementArgument(), substatements);
+        return new RegularAnyxmlStatement(ctx.getArgument(), substatements);
     }
 
     @Override
     protected AnyxmlStatement createEmptyDeclared(final StmtContext<QName, AnyxmlStatement, ?> ctx) {
-        return new EmptyAnyxmlStatement(ctx.coerceStatementArgument());
+        return new EmptyAnyxmlStatement(ctx.getArgument());
     }
 
     @Override
index 95eed1c7f07be9b2a49949f8edc2c7e45ba47a18..51ed38e1ee6ba7b704db284ff12174f8c3d56330 100644 (file)
@@ -49,12 +49,12 @@ public final class ArgumentStatementSupport
     @Override
     protected ArgumentStatement createDeclared(final StmtContext<QName, ArgumentStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularArgumentStatement(ctx.coerceStatementArgument(), substatements);
+        return new RegularArgumentStatement(ctx.getArgument(), substatements);
     }
 
     @Override
     protected ArgumentStatement createEmptyDeclared(final StmtContext<QName, ArgumentStatement, ?> ctx) {
-        return new EmptyArgumentStatement(ctx.coerceStatementArgument());
+        return new EmptyArgumentStatement(ctx.getArgument());
     }
 
     @Override
index e51ae8cce6373e18ca0b64a1065ec3e7671d32d5..5dcf3bbc611ba828eb20cf5af3b1c7d81ae0cffb 100644 (file)
@@ -91,8 +91,7 @@ abstract class AbstractAugmentStatementSupport
         final ModelActionBuilder augmentAction = augmentNode.newInferenceAction(ModelProcessingPhase.EFFECTIVE_MODEL);
         augmentAction.requiresCtx(augmentNode, ModelProcessingPhase.EFFECTIVE_MODEL);
         final Prerequisite<Mutable<?, ?, EffectiveStatement<?, ?>>> 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<? extends StmtContext<?, ?, ?>> 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())
index 44dd2f300676dd017f373f207e8b3ffff8290995..1a351e4dd9f30a01093d805d0d877608ab991dc2 100644 (file)
@@ -52,7 +52,7 @@ public final class BaseStatementSupport extends BaseQNameStatementSupport<BaseSt
     public void onStatementDefinitionDeclared(final Mutable<QName, BaseStatement, BaseEffectiveStatement> 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<BaseSt
     @Override
     protected BaseStatement createDeclared(final StmtContext<QName, BaseStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularBaseStatement(ctx.coerceStatementArgument(), substatements);
+        return new RegularBaseStatement(ctx.getArgument(), substatements);
     }
 
     @Override
     protected BaseStatement createEmptyDeclared(final StmtContext<QName, BaseStatement, ?> ctx) {
-        return new EmptyBaseStatement(ctx.coerceStatementArgument());
+        return new EmptyBaseStatement(ctx.getArgument());
     }
 
     @Override
index 70883c80b15696456fcfaf7eb2b7fd9d8a451065..6a8ef1727c6fdf59aa438fef83e4140130954926 100644 (file)
@@ -59,8 +59,7 @@ public final class BelongsToStatementSupport
 
         final SourceIdentifier belongsToSourceIdentifier = getSourceIdentifier(belongsToCtx);
         final Prerequisite<StmtContext<?, ?, ?>> 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<String, BelongsToStatement,
             BelongsToEffectiveStatement> belongsToCtx) {
-        return RevisionSourceIdentifier.create(belongsToCtx.coerceStatementArgument());
+        return RevisionSourceIdentifier.create(belongsToCtx.getArgument());
     }
 
     @Override
index 3b20501a49379b7c42bb5ad8c63878950e609562..1d688b30f964ba4d39b21aa5a4b34c459477b8d6 100644 (file)
@@ -32,12 +32,12 @@ abstract class AbstractBitStatementSupport extends BaseStatementSupport<String,
     @Override
     protected final BitStatement createDeclared(final StmtContext<String, BitStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularBitStatement(ctx.coerceStatementArgument(), substatements);
+        return new RegularBitStatement(ctx.getArgument(), substatements);
     }
 
     @Override
     protected final BitStatement createEmptyDeclared(final StmtContext<String, BitStatement, ?> ctx) {
-        return new EmptyBitStatement(ctx.coerceStatementArgument());
+        return new EmptyBitStatement(ctx.getArgument());
     }
 
     @Override
index f1f4081595ef95c29ad7e39325c00b531e371f4a..f67c317ee0a93bc3d35878bbb838bf532b4df784 100644 (file)
@@ -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);
         }
index 89cd7112ad18f9207b4e44ae4a7d8d27773156f0..751fb7a8a0aa3db4d1bd4f23e6fd6559a9c44ff1 100644 (file)
@@ -49,12 +49,12 @@ abstract class AbstractChoiceStatementSupport
     @Override
     protected final ChoiceStatement createDeclared(@NonNull final StmtContext<QName, ChoiceStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularChoiceStatement(ctx.coerceStatementArgument(), substatements);
+        return new RegularChoiceStatement(ctx.getArgument(), substatements);
     }
 
     @Override
     protected final ChoiceStatement createEmptyDeclared(@NonNull final StmtContext<QName, ChoiceStatement, ?> ctx) {
-        return new EmptyChoiceStatement(ctx.coerceStatementArgument());
+        return new EmptyChoiceStatement(ctx.getArgument());
     }
 
     @Override
index aa3b533336ddabd7637a851543430d7d16e05a12..413f24e34761236d4977cbb3fe79638afafebdb1 100644 (file)
@@ -40,7 +40,7 @@ public final class ConfigStatementSupport
     @Override
     protected ConfigStatement createDeclared(final StmtContext<Boolean, ConfigStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularConfigStatement(ctx.coerceStatementArgument(), substatements);
+        return new RegularConfigStatement(ctx.getArgument(), substatements);
     }
 
     @Override
index cdae50b54382dee48d83ff328b3f978916b8caf8..d7fab2f83702b2002fa494cfec60af80636bdcda 100644 (file)
@@ -34,12 +34,12 @@ abstract class AbstractContainerStatementSupport
     @Override
     protected final ContainerStatement createDeclared(final StmtContext<QName, ContainerStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularContainerStatement(ctx.coerceStatementArgument(), substatements);
+        return new RegularContainerStatement(ctx.getArgument(), substatements);
     }
 
     @Override
     protected final ContainerStatement createEmptyDeclared(final StmtContext<QName, ContainerStatement, ?> ctx) {
-        return new EmptyContainerStatement(ctx.coerceStatementArgument());
+        return new EmptyContainerStatement(ctx.getArgument());
     }
 
     @Override
index 9250774c8bccecdffe802197442cedcfa8c303d6..bf30b3886a87f5a42682539f53c373a63d873bb1 100644 (file)
@@ -191,7 +191,7 @@ abstract class AbstractDeviateStatementSupport
     @Override
     protected final DeviateStatement createDeclared(final StmtContext<DeviateKind, DeviateStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new DeviateStatementImpl(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements);
+        return new DeviateStatementImpl(ctx.getRawArgument(), ctx.getArgument(), substatements);
     }
 
     @Override
index 6d880af4f48b037ea87ffdf7e8cb04bc6ee34c2b..6340eae3e853adee75e2009c8bc609b22896ee8f 100644 (file)
@@ -51,10 +51,8 @@ public final class DeviationStatementSupport
     @Override
     public void onFullDefinitionDeclared(
             final Mutable<Absolute, DeviationStatement, DeviationEffectiveStatement> 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<Absolute, DeviationStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new DeviationStatementImpl(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements);
+        return new DeviationStatementImpl(ctx.getRawArgument(), ctx.getArgument(), substatements);
     }
 
     @Override
index c3a62cc430f0e98903558b2e386a00ca34d07813..a2948dcc6ffb308802de12ef0325ae9baba1e8d8 100644 (file)
@@ -32,12 +32,12 @@ abstract class AbstractEnumStatementSupport
     @Override
     protected final EnumStatement createDeclared(final StmtContext<String, EnumStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularEnumStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements);
+        return new RegularEnumStatement(ctx.getRawArgument(), ctx.getArgument(), substatements);
     }
 
     @Override
     protected final EnumStatement createEmptyDeclared(final StmtContext<String, EnumStatement, ?> ctx) {
-        return new EmptyEnumStatement(ctx.getRawArgument(), ctx.coerceStatementArgument());
+        return new EmptyEnumStatement(ctx.getRawArgument(), ctx.getArgument());
     }
 
     @Override
index 147d9c2ac7c567823e449c05947cb47de7da2a92..02786890326c94d5fce28b9f0b4364b532f87c9b 100644 (file)
@@ -64,7 +64,7 @@ public final class ExtensionStatementSupport
             final Mutable<QName, ExtensionStatement, ExtensionEffectiveStatement> 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<QName, ExtensionStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularExtensionStatement(ctx.coerceStatementArgument(), substatements);
+        return new RegularExtensionStatement(ctx.getArgument(), substatements);
     }
 
     @Override
     protected ExtensionStatement createEmptyDeclared(final StmtContext<QName, ExtensionStatement, ?> ctx) {
-        return new EmptyExtensionStatement(ctx.coerceStatementArgument());
+        return new EmptyExtensionStatement(ctx.getArgument());
     }
 
     @Override
index 296af054b09e81d2a224173e11454e8e4b7073d1..ade9f5fe4abdc6e8b00a754128b81bf3b7ad4e7a 100644 (file)
@@ -54,7 +54,7 @@ public final class FeatureStatementSupport
     @Override
     public void onFullDefinitionDeclared(final Mutable<QName, FeatureStatement, FeatureEffectiveStatement> 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<QName, FeatureStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularFeatureStatement(ctx.coerceStatementArgument(), substatements);
+        return new RegularFeatureStatement(ctx.getArgument(), substatements);
     }
 
     @Override
     protected FeatureStatement createEmptyDeclared(@NonNull final StmtContext<QName, FeatureStatement, ?> ctx) {
-        return new EmptyFeatureStatement(ctx.coerceStatementArgument());
+        return new EmptyFeatureStatement(ctx.getArgument());
     }
 
     @Override
index 16fcefbf0d6e501bb7ba47689cfe3aa699269be3..693ef1f070530778311cfcaffebfdc97ba7491fe 100644 (file)
@@ -81,12 +81,12 @@ public final class FractionDigitsStatementSupport
     @Override
     protected FractionDigitsStatement createDeclared(final StmtContext<Integer, FractionDigitsStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularFractionDigitsStatement(ctx.coerceStatementArgument(), substatements);
+        return new RegularFractionDigitsStatement(ctx.getArgument(), substatements);
     }
 
     @Override
     protected FractionDigitsStatement createEmptyDeclared(final StmtContext<Integer, FractionDigitsStatement, ?> ctx) {
-        final Integer argument = ctx.coerceStatementArgument();
+        final Integer argument = ctx.getArgument();
         return verifyNotNull(EMPTY_DECLS.get(argument), "No declared instance for %s", argument);
     }
 
index 26ec9ea155772235288f3803cfda56bf7f6db765..7b2317bb4d57be5b04e9f16fffcadb50ea5f72bf 100644 (file)
@@ -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<QName, GroupingStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
         checkDeclaredConflict(ctx);
-        return new RegularGroupingStatement(ctx.coerceStatementArgument(), substatements);
+        return new RegularGroupingStatement(ctx.getArgument(), substatements);
     }
 
     @Override
     protected final GroupingStatement createEmptyDeclared(final StmtContext<QName, GroupingStatement, ?> 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<QName, ?, ?> 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);
     }
index cc7c9e458c5a2b090822fdc001b21a4c237ec5fe..705560e90258e6cbf0c2c4a63c198a6ac1652203 100644 (file)
@@ -49,7 +49,7 @@ abstract class AbstractIdentityStatementSupport
     @Override
     public final void onStatementDefinitionDeclared(
             final Mutable<QName, IdentityStatement, IdentityEffectiveStatement> 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<QName, IdentityStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularIdentityStatement(ctx.coerceStatementArgument(), substatements);
+        return new RegularIdentityStatement(ctx.getArgument(), substatements);
     }
 
     @Override
     protected final IdentityStatement createEmptyDeclared(@NonNull final StmtContext<QName, IdentityStatement, ?> ctx) {
-        return new EmptyIdentityStatement(ctx.coerceStatementArgument());
+        return new EmptyIdentityStatement(ctx.getArgument());
     }
 
     @Override
index 5ef538a8cb1b3ef08432cc5d85e3220db9b8031e..554f756dc779d1678d708cf00dbfe46011d915fe 100644 (file)
@@ -55,7 +55,7 @@ abstract class AbstractIfFeatureStatementSupport
 
         final ModelActionBuilder verifyFeatures = stmt.newInferenceAction(ModelProcessingPhase.EFFECTIVE_MODEL);
         final Map<Prerequisite<?>, 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<IfFeatureExpr, IfFeatureStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularIfFeatureStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements);
+        return new RegularIfFeatureStatement(ctx.getRawArgument(), ctx.getArgument(), substatements);
     }
 
     @Override
     protected final IfFeatureStatement createEmptyDeclared(
             final StmtContext<IfFeatureExpr, IfFeatureStatement, ?> ctx) {
-        return new EmptyIfFeatureStatement(ctx.getRawArgument(), ctx.coerceStatementArgument());
+        return new EmptyIfFeatureStatement(ctx.getRawArgument(), ctx.getArgument());
     }
 
     @Override
index d6acb373bd18a5c192ba3b04879b396337513207..5c7cfe0f6d76b4d5c731acfa71fe8d0d6864dced 100644 (file)
@@ -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<StmtContext<?, ?, ?>> imported = importAction.requiresCtx(stmt,
                 PreLinkageModuleNamespace.class, moduleName, SOURCE_PRE_LINKAGE);
index 0fc5e8b8cbacf27a9b6e47087d0c03b2d09339ce..f319b7b38c5b925eedc9e92f9d64fa29825282e7 100644 (file)
@@ -47,7 +47,7 @@ final class RevisionImport {
     static void onLinkageDeclared(final Mutable<String, ImportStatement, ImportEffectiveStatement> stmt) {
         final ModelActionBuilder importAction = stmt.newInferenceAction(SOURCE_LINKAGE);
         final Prerequisite<StmtContext<?, ?, ?>> 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,
index 13b394dfbbcd11b13c94174884cf92d5ad122241..a6872b8b9d0bdc2d08616aca03deb50c853606b6 100644 (file)
@@ -122,7 +122,7 @@ final class SemanticVersionImport {
 
     static void onLinkageDeclared(final Mutable<String, ImportStatement, ImportEffectiveStatement> 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)
index 74e612d1fd8c38b3baa4a364d604f57172b9445b..fb8e43e159d50518920ea0d11511c5e6b35c7bc0 100644 (file)
@@ -52,9 +52,8 @@ abstract class AbstractIncludeStatementSupport
 
     @Override
     public final void onLinkageDeclared(final Mutable<String, IncludeStatement, IncludeEffectiveStatement> stmt) {
-        final String submoduleName = stmt.coerceStatementArgument();
-        final StmtContext<Revision, ?, ?> revision = findFirstDeclaredSubstatement(stmt,
-            RevisionDateStatement.class);
+        final String submoduleName = stmt.getArgument();
+        final StmtContext<Revision, ?, ?> revision = findFirstDeclaredSubstatement(stmt, RevisionDateStatement.class);
 
         final ModelActionBuilder includeAction = stmt.newInferenceAction(SOURCE_LINKAGE);
         final Prerequisite<StmtContext<?, ?, ?>> 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<String, IncludeStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularIncludeStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements);
+        return new RegularIncludeStatement(ctx.getRawArgument(), ctx.getArgument(), substatements);
     }
 
     @Override
     protected final IncludeStatement createEmptyDeclared(final StmtContext<String, IncludeStatement, ?> ctx) {
-        return new EmptyIncludeStatement(ctx.getRawArgument(), ctx.coerceStatementArgument());
+        return new EmptyIncludeStatement(ctx.getRawArgument(), ctx.getArgument());
     }
 
     @Override
index b756f1d06fb3ebb1b29f3c3ca06f6e0a8ef2cd73..ed181e1d9b4c9d31ea6ae585f407ad86c0a6bee9 100644 (file)
@@ -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);
         }
index 724d86b4231c9f3af56a85b7b42f6f056d501be3..300e5f71b1ae9770e2111d8baa8709a17071f1d2 100644 (file)
@@ -66,7 +66,7 @@ public final class KeyStatementSupport
             final QNameModule targetModule) {
         final Builder<QName> 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<Set<QName>, KeyStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularKeyStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements);
+        return new RegularKeyStatement(ctx.getRawArgument(), ctx.getArgument(), substatements);
     }
 
     @Override
     protected KeyStatement createEmptyDeclared(final StmtContext<Set<QName>, KeyStatement, ?> ctx) {
-        return new EmptyKeyStatement(ctx.getRawArgument(), ctx.coerceStatementArgument());
+        return new EmptyKeyStatement(ctx.getRawArgument(), ctx.getArgument());
     }
 
     @Override
index e8fdff1d61c60f287467f9fad78ba0aa3961bf79..938505abd2e4bf20222666a744b459a2cb2da85a 100644 (file)
@@ -70,12 +70,12 @@ public final class LeafStatementSupport extends BaseSchemaTreeStatementSupport<L
     @Override
     protected LeafStatement createDeclared(final StmtContext<QName, LeafStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularLeafStatement(ctx.coerceStatementArgument(), substatements);
+        return new RegularLeafStatement(ctx.getArgument(), substatements);
     }
 
     @Override
     protected LeafStatement createEmptyDeclared(final StmtContext<QName, LeafStatement, ?> ctx) {
-        return new EmptyLeafStatement(ctx.coerceStatementArgument());
+        return new EmptyLeafStatement(ctx.getArgument());
     }
 
     @Override
index cd6a295f347deeda3a175caf5330a9bc7bfda2ab..c9db870bd1d024b93aa0c72af3232a548e9fd063 100644 (file)
@@ -41,12 +41,12 @@ abstract class AbstractLeafListStatementSupport
     @Override
     protected final LeafListStatement createDeclared(final StmtContext<QName, LeafListStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularLeafListStatement(ctx.coerceStatementArgument(), substatements);
+        return new RegularLeafListStatement(ctx.getArgument(), substatements);
     }
 
     @Override
     protected final LeafListStatement createEmptyDeclared(final StmtContext<QName, LeafListStatement, ?> ctx) {
-        return new EmptyLeafListStatement(ctx.coerceStatementArgument());
+        return new EmptyLeafListStatement(ctx.getArgument());
     }
 
     @Override
index 4c91a062a1d736ea5764188a47fc2c4ad85e4095..a619f0971b5352ad1103f073081b89abfe6d5a35 100644 (file)
@@ -86,12 +86,12 @@ public final class LengthStatementSupport
     @Override
     protected LengthStatement createDeclared(final StmtContext<List<ValueRange>, LengthStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularLengthStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements);
+        return new RegularLengthStatement(ctx.getRawArgument(), ctx.getArgument(), substatements);
     }
 
     @Override
     protected LengthStatement createEmptyDeclared(final StmtContext<List<ValueRange>, LengthStatement, ?> ctx) {
-        return new EmptyLengthStatement(ctx.getRawArgument(), ctx.coerceStatementArgument());
+        return new EmptyLengthStatement(ctx.getRawArgument(), ctx.getArgument());
     }
 
     @Override
index baa4bd5333399eac983e9f2e9b40be0b73d8de4a..2a825e90a1f618100f67621eccd085116d504d8d 100644 (file)
@@ -59,12 +59,12 @@ abstract class AbstractListStatementSupport extends
     @Override
     protected final ListStatement createDeclared(final StmtContext<QName, ListStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularListStatement(ctx.coerceStatementArgument(), substatements);
+        return new RegularListStatement(ctx.getArgument(), substatements);
     }
 
     @Override
     protected final ListStatement createEmptyDeclared(final StmtContext<QName, ListStatement, ?> ctx) {
-        return new EmptyListStatement(ctx.coerceStatementArgument());
+        return new EmptyListStatement(ctx.getArgument());
     }
 
     @Override
index 008955c9819ef0f72cf8e28b7bbf062d1e229cfd..8008a6a9cd4e58861dfd2726b31bd81af034af25 100644 (file)
@@ -41,7 +41,7 @@ public final class MandatoryStatementSupport extends
     @Override
     protected MandatoryStatement createDeclared(final StmtContext<Boolean, MandatoryStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularMandatoryStatement(ctx.coerceStatementArgument(), substatements);
+        return new RegularMandatoryStatement(ctx.getArgument(), substatements);
     }
 
     @Override
index 413ff3c264f8bf2ee6743a066496c16b427850e2..eb7c9f72006b2c9f6b00e01a1dce8538cbefa512 100644 (file)
@@ -46,12 +46,12 @@ public final class MaxElementsStatementSupport
     @Override
     protected MaxElementsStatement createDeclared(final StmtContext<String, MaxElementsStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularMaxElementsStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements);
+        return new RegularMaxElementsStatement(ctx.getRawArgument(), ctx.getArgument(), substatements);
     }
 
     @Override
     protected MaxElementsStatement createEmptyDeclared(final StmtContext<String, MaxElementsStatement, ?> ctx) {
-        return new EmptyMaxElementsStatement(ctx.getRawArgument(), ctx.coerceStatementArgument());
+        return new EmptyMaxElementsStatement(ctx.getRawArgument(), ctx.getArgument());
     }
 
     @Override
index a62659dfe6997e72034bdd9cd1d04611b9f50f67..467aa9884e0aa420b93f7fdcc3d3f9624bbb32c2 100644 (file)
@@ -53,12 +53,12 @@ public final class ModifierStatementSupport
     @Override
     protected ModifierStatement createDeclared(final StmtContext<ModifierKind, ModifierStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularModifierStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements);
+        return new RegularModifierStatement(ctx.getRawArgument(), ctx.getArgument(), substatements);
     }
 
     @Override
     protected ModifierStatement createEmptyDeclared(final StmtContext<ModifierKind, ModifierStatement, ?> ctx) {
-        return new EmptyModifierStatement(ctx.getRawArgument(), ctx.coerceStatementArgument());
+        return new EmptyModifierStatement(ctx.getRawArgument(), ctx.getArgument());
     }
 
     @Override
index 8aa3035ab6f22405a0aea1e568954ab8fe909d1a..7a497fa93119a8f9eb31373d845f37a863fbc517 100644 (file)
@@ -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<UnqualifiedQName, ModuleStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new ModuleStatementImpl(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements);
+        return new ModuleStatementImpl(ctx.getRawArgument(), ctx.getArgument(), substatements);
     }
 
     @Override
index ad5a36a0130e81fa6eb684bd3985d158057ca12b..f163b344e1b72f5f79b1bb70a7f97a768a00c7c0 100644 (file)
@@ -57,12 +57,12 @@ public final class MustStatementSupport
     @Override
     protected MustStatement createDeclared(final StmtContext<QualifiedBound, MustStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularMustStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements);
+        return new RegularMustStatement(ctx.getRawArgument(), ctx.getArgument(), substatements);
     }
 
     @Override
     protected MustStatement createEmptyDeclared(final StmtContext<QualifiedBound, MustStatement, ?> ctx) {
-        return new EmptyMustStatement(ctx.getRawArgument(), ctx.coerceStatementArgument());
+        return new EmptyMustStatement(ctx.getRawArgument(), ctx.getArgument());
     }
 
     @Override
index 548fb5ea0389456c4bde9359b458dafc2ef19574..322010299674592a339c4027f6fe137f54e814ec 100644 (file)
@@ -54,12 +54,12 @@ public final class NamespaceStatementSupport
     @Override
     protected NamespaceStatement createDeclared(@NonNull final StmtContext<URI, NamespaceStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularNamespaceStatement(ctx.coerceStatementArgument(), substatements);
+        return new RegularNamespaceStatement(ctx.getArgument(), substatements);
     }
 
     @Override
     protected NamespaceStatement createEmptyDeclared(final StmtContext<URI, NamespaceStatement, ?> ctx) {
-        return new EmptyNamespaceStatement(ctx.coerceStatementArgument());
+        return new EmptyNamespaceStatement(ctx.getArgument());
     }
 
     @Override
index 44b34afce0fe5472e2dac95702a50d2a69a5994b..a4a597383a32228adc9bd590a96aed5f0fd4edfa 100644 (file)
@@ -27,12 +27,12 @@ abstract class AbstractNotificationStatementSupport
     @Override
     protected final NotificationStatement createDeclared(final StmtContext<QName, NotificationStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularNotificationStatement(ctx.coerceStatementArgument(), substatements);
+        return new RegularNotificationStatement(ctx.getArgument(), substatements);
     }
 
     @Override
     protected final NotificationStatement createEmptyDeclared(final StmtContext<QName, NotificationStatement, ?> ctx) {
-        return new EmptyNotificationStatement(ctx.coerceStatementArgument());
+        return new EmptyNotificationStatement(ctx.getArgument());
     }
 
     @Override
index e1373b46052db47c26a9555730c3173531722fec..316b574293010b9796ab34d0667d5bcc83af8b16 100644 (file)
@@ -76,12 +76,12 @@ public final class OrderedByStatementSupport
     @Override
     protected OrderedByStatement createDeclared(final StmtContext<Ordering, OrderedByStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularOrderedByStatement(ctx.coerceStatementArgument(), substatements);
+        return new RegularOrderedByStatement(ctx.getArgument(), substatements);
     }
 
     @Override
     protected OrderedByStatement createEmptyDeclared(final StmtContext<Ordering, OrderedByStatement, ?> ctx) {
-        final Ordering argument = ctx.coerceStatementArgument();
+        final Ordering argument = ctx.getArgument();
         switch (argument) {
             case SYSTEM:
                 return EMPTY_SYSTEM_DECL;
index 8f368bf856f46bfce2399e161552b05a76857a73..8827681dd35784b745340dead94fec73243bf141 100644 (file)
@@ -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);
         }
index ff99dbcf0594ee6472304d97c025991d829e073b..9994c085062177f668c07b57ca5c2d4abc386c00 100644 (file)
@@ -58,12 +58,12 @@ public final class PathStatementSupport
     @Override
     protected PathStatement createDeclared(final StmtContext<PathExpression, PathStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularPathStatement(ctx.coerceStatementArgument(), substatements);
+        return new RegularPathStatement(ctx.getArgument(), substatements);
     }
 
     @Override
     protected PathStatement createEmptyDeclared(final StmtContext<PathExpression, PathStatement, ?> ctx) {
-        return new EmptyPathStatement(ctx.coerceStatementArgument());
+        return new EmptyPathStatement(ctx.getArgument());
     }
 
     @Override
index 9a8710b6db039e3290b7b700ed5372cd6e79733f..5e9fce833f17ccdb59ebe6e4498448a364284d85 100644 (file)
@@ -42,13 +42,13 @@ abstract class AbstractPatternStatementSupport
     @Override
     protected final PatternStatement createDeclared(final StmtContext<PatternExpression, PatternStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularPatternStatement(ctx.coerceStatementArgument(), substatements);
+        return new RegularPatternStatement(ctx.getArgument(), substatements);
     }
 
     @Override
     protected final PatternStatement createEmptyDeclared(
             final StmtContext<PatternExpression, PatternStatement, ?> ctx) {
-        return new EmptyPatternStatement(ctx.coerceStatementArgument());
+        return new EmptyPatternStatement(ctx.getArgument());
     }
 
     @Override
index e797235356faf8cd535d8d2de99ac9b9967af033..348913cccc2aea6e4fa36b503fe2ca482aa4d2e1 100644 (file)
@@ -82,12 +82,12 @@ public final class RangeStatementSupport
     @Override
     protected RangeStatement createDeclared(final StmtContext<List<ValueRange>, RangeStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularRangeStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements);
+        return new RegularRangeStatement(ctx.getRawArgument(), ctx.getArgument(), substatements);
     }
 
     @Override
     protected RangeStatement createEmptyDeclared(final StmtContext<List<ValueRange>, RangeStatement, ?> ctx) {
-        return new EmptyRangeStatement(ctx.getRawArgument(), ctx.coerceStatementArgument());
+        return new EmptyRangeStatement(ctx.getRawArgument(), ctx.getArgument());
     }
 
     @Override
index bf90524bccb61428e7675d32e0cfef441fc42038..50a2696ea201dcfc4f11d6eddb54cb9b920bd12d 100644 (file)
@@ -35,7 +35,7 @@ abstract class AbstractRefineStatementSupport
     @Override
     protected final RefineStatement createDeclared(final StmtContext<Descendant, RefineStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RefineStatementImpl(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements);
+        return new RefineStatementImpl(ctx.getRawArgument(), ctx.getArgument(), substatements);
     }
 
     @Override
index bcc30d6eaff125d14fbffb6d04585aefe7f37d06..f1ef050573be0cfef245950a7b159e6da4b020c0 100644 (file)
@@ -42,7 +42,7 @@ public final class RequireInstanceStatementSupport
     @Override
     protected RequireInstanceStatement createDeclared(final StmtContext<Boolean, RequireInstanceStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularRequireInstanceStatement(ctx.coerceStatementArgument(), substatements);
+        return new RegularRequireInstanceStatement(ctx.getArgument(), substatements);
     }
 
     @Override
index f6f83e7b9303abde4d8e843007a22152ed23cebc..89cceb540251255c15094639ba385ead1573d179 100644 (file)
@@ -56,12 +56,12 @@ public final class RevisionStatementSupport
     @Override
     protected RevisionStatement createDeclared(final StmtContext<Revision, RevisionStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularRevisionStatement(ctx.coerceStatementArgument(), substatements);
+        return new RegularRevisionStatement(ctx.getArgument(), substatements);
     }
 
     @Override
     protected RevisionStatement createEmptyDeclared(final StmtContext<Revision, RevisionStatement, ?> ctx) {
-        return new EmptyRevisionStatement(ctx.coerceStatementArgument());
+        return new EmptyRevisionStatement(ctx.getArgument());
     }
 
     @Override
index 4bbcacc13bea54650493b4f08c24532ccc087eef..1b75579cce48eb032f7d8fc8af02968ced7258b3 100644 (file)
@@ -53,12 +53,12 @@ public final class RevisionDateStatementSupport
     @Override
     protected RevisionDateStatement createDeclared(final StmtContext<Revision, RevisionDateStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularRevisionDateStatement(ctx.coerceStatementArgument(), substatements);
+        return new RegularRevisionDateStatement(ctx.getArgument(), substatements);
     }
 
     @Override
     protected RevisionDateStatement createEmptyDeclared(final StmtContext<Revision, RevisionDateStatement, ?> ctx) {
-        return new EmptyRevisionDateStatement(ctx.coerceStatementArgument());
+        return new EmptyRevisionDateStatement(ctx.getArgument());
     }
 
     @Override
index 2141ce2fb7402cfc0f2497a9dde792672bd8f31d..db99a6a7cb6d1a66827ef0262b9438a7ea17bda4 100644 (file)
@@ -67,12 +67,12 @@ abstract class AbstractRpcStatementSupport extends BaseSchemaTreeStatementSuppor
     @Override
     protected final RpcStatement createDeclared(final StmtContext<QName, RpcStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularRpcStatement(ctx.coerceStatementArgument(), substatements);
+        return new RegularRpcStatement(ctx.getArgument(), substatements);
     }
 
     @Override
     protected final RpcStatement createEmptyDeclared(final StmtContext<QName, RpcStatement, ?> ctx) {
-        return new EmptyRpcStatement(ctx.coerceStatementArgument());
+        return new EmptyRpcStatement(ctx.getArgument());
     }
 
     @Override
index 1673357ce1c235c36903466f13a2161ad0f70c1a..c0c6f6f6410d84c7718171286b716830b0fab9d8 100644 (file)
@@ -89,12 +89,12 @@ public final class StatusStatementSupport
     @Override
     protected StatusStatement createDeclared(final StmtContext<Status, StatusStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularStatusStatement(ctx.coerceStatementArgument(), substatements);
+        return new RegularStatusStatement(ctx.getArgument(), substatements);
     }
 
     @Override
     protected StatusStatement createEmptyDeclared(final StmtContext<Status, StatusStatement, ?> ctx) {
-        final Status argument = ctx.coerceStatementArgument();
+        final Status argument = ctx.getArgument();
         switch (argument) {
             case CURRENT:
                 return EMPTY_CURRENT_DECL;
index 2e33f9c32dd3bacb5277fde166bbfcae5c3affac..2b2cec244461fcbe4ccae55421081a51c9a051de 100644 (file)
@@ -81,7 +81,7 @@ abstract class AbstractSubmoduleStatementSupport
     @Override
     protected final SubmoduleStatement createDeclared(final StmtContext<UnqualifiedQName, SubmoduleStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new SubmoduleStatementImpl(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements);
+        return new SubmoduleStatementImpl(ctx.getRawArgument(), ctx.getArgument(), substatements);
     }
 
     @Override
index 4feb3654e299181053bb90e5ecf4990e6d8c1412..cd4456e04b08af9defc58880c50b4275f5fbd83c 100644 (file)
@@ -51,7 +51,7 @@ abstract class AbstractIdentityRefSpecificationSupport
         final Collection<StmtContext<QName, BaseStatement, ?>> baseStatements =
                 StmtContextUtils.findAllDeclaredSubstatements(stmt, BaseStatement.class);
         for (StmtContext<QName, BaseStatement, ?> 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)",
index b29fdf02cd45cbf01d4f770e80e7e3178e4c0262..4769a781f868e461b4f56434d6645a04ce67d697 100644 (file)
@@ -46,6 +46,6 @@ final class BuiltinTypeStatement extends WithRawStringArgument implements TypeSt
     }
 
     static @Nullable TypeStatement lookup(final StmtContext<String, TypeStatement, ?> ctx) {
-        return BUILTINS.get(ctx.coerceStatementArgument());
+        return BUILTINS.get(ctx.getArgument());
     }
 }
index a084a5ac1a1e99596f2127b219917d2163cdd9e3..b792eac6a0ce9c80ea0807fff7f36b4072d7aa78 100644 (file)
@@ -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<QName, TypedefStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
         checkDeclared(ctx);
-        return new RegularTypedefStatement(ctx.coerceStatementArgument(), substatements);
+        return new RegularTypedefStatement(ctx.getArgument(), substatements);
     }
 
     @Override
     protected TypedefStatement createEmptyDeclared(final StmtContext<QName, TypedefStatement, ?> 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<QName, ?, ?> 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);
index 15da737d431003da5cbd3520942439877866f4a0..4a190b8f9e9648156ee3c0b6532bd4f621792689 100644 (file)
@@ -69,13 +69,12 @@ public final class UniqueStatementSupport
     @Override
     protected UniqueStatement createDeclared(final StmtContext<Set<Descendant>, UniqueStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularUniqueStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(),
-            substatements);
+        return new RegularUniqueStatement(ctx.getRawArgument(), ctx.getArgument(), substatements);
     }
 
     @Override
     protected UniqueStatement createEmptyDeclared(final StmtContext<Set<Descendant>, UniqueStatement, ?> ctx) {
-        return new EmptyUniqueStatement(ctx.getRawArgument(), ctx.coerceStatementArgument());
+        return new EmptyUniqueStatement(ctx.getRawArgument(), ctx.getArgument());
     }
 
     @Override
index 6a3fd613483c011e65bd7cc162889ac1ae52fee2..a6e0b075d5ea2b43ba7fc745dfab94dcfaf27c58 100644 (file)
@@ -132,12 +132,12 @@ public final class UsesStatementSupport
     @Override
     protected UsesStatement createDeclared(final StmtContext<QName, UsesStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularUsesStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements);
+        return new RegularUsesStatement(ctx.getRawArgument(), ctx.getArgument(), substatements);
     }
 
     @Override
     protected UsesStatement createEmptyDeclared(final StmtContext<QName, UsesStatement, ?> ctx) {
-        return new EmptyUsesStatement(ctx.getRawArgument(), ctx.coerceStatementArgument());
+        return new EmptyUsesStatement(ctx.getRawArgument(), ctx.getArgument());
     }
 
     @Override
index aaba4c64625734d8cefe8cb802dd9f10751c72e0..aaa3190c755cbd3ded00f9a918dbec792c7c2e52 100644 (file)
@@ -55,12 +55,12 @@ public final class WhenStatementSupport
     @Override
     protected WhenStatement createDeclared(final StmtContext<QualifiedBound, WhenStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularWhenStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements);
+        return new RegularWhenStatement(ctx.getRawArgument(), ctx.getArgument(), substatements);
     }
 
     @Override
     protected WhenStatement createEmptyDeclared(final StmtContext<QualifiedBound, WhenStatement, ?> ctx) {
-        return new EmptyWhenStatement(ctx.getRawArgument(), ctx.coerceStatementArgument());
+        return new EmptyWhenStatement(ctx.getRawArgument(), ctx.getArgument());
     }
 
     @Override
index 81c7f60c97435618714c7b491473f1b902b56de4..c7676d4e4dfa206fc8e03746f8848b48cf3750de 100644 (file)
@@ -66,12 +66,12 @@ public final class YangVersionStatementSupport
     @Override
     protected YangVersionStatement createDeclared(final StmtContext<YangVersion, YangVersionStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularYangVersionStatement(ctx.coerceStatementArgument(), substatements);
+        return new RegularYangVersionStatement(ctx.getArgument(), substatements);
     }
 
     @Override
     protected YangVersionStatement createEmptyDeclared(final StmtContext<YangVersion, YangVersionStatement, ?> ctx) {
-        final YangVersion argument = ctx.coerceStatementArgument();
+        final YangVersion argument = ctx.getArgument();
         switch (argument) {
             case VERSION_1:
                 return EMPTY_VER1_DECL;
index df3ebedb8de2b9b0d134ff32a1e310a60fd0a43f..19c0252af019a98626a5012cfa59bb76b1cd7a97 100644 (file)
@@ -41,7 +41,7 @@ public final class YinElementStatementSupport
     @Override
     protected YinElementStatement createDeclared(final StmtContext<Boolean, YinElementStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularYinElementStatement(ctx.coerceStatementArgument(), substatements);
+        return new RegularYinElementStatement(ctx.getArgument(), substatements);
     }
 
     @Override
index c2116fded55a3acd5b2fbb9363c953e975c680a9..1bc1dbfceeb843a73016b36e966fc6c720c9fa2a 100644 (file)
@@ -92,8 +92,9 @@ public interface StmtContext<A, D extends DeclaredStatement<A>, 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();
     }
index 9d6bc7f6e4ee24e0d5eb23c2a0d8037624c584af..e885bf8dff331cc52cd4fc6c4a1f9ba2c823bc6b 100644 (file)
@@ -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());
     }
 
     /**
index 551f6011622b9de73e92cd8fc952d50fa0652496..e47b0052ecfe786424c43e219ba8c66cfdf18167 100644 (file)
@@ -248,7 +248,7 @@ public final class StmtContextUtils {
             if (YangStmtMapping.IF_FEATURE.equals(stmt.publicDefinition())) {
                 containsIfFeature = true;
                 @SuppressWarnings("unchecked")
-                final Predicate<Set<QName>> argument = (Predicate<Set<QName>>) stmt.coerceStatementArgument();
+                final Predicate<Set<QName>> argument = (Predicate<Set<QName>>) 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<Set<QName>, ?, ?> keyStmtCtx) {
-        return keyStmtCtx.coerceStatementArgument().contains(leafStmtCtx.argument());
+        return keyStmtCtx.getArgument().contains(leafStmtCtx.argument());
     }
 
     private static void disallowIfFeatureAndWhenOnListKeys(final StmtContext<?, ?, ?> leafStmtCtx) {