Migrate coerceRawStatementArgument() callers 53/93953/1
authorRobert Varga <robert.varga@pantheon.tech>
Fri, 27 Nov 2020 08:28:01 +0000 (09:28 +0100)
committerRobert Varga <robert.varga@pantheon.tech>
Fri, 27 Nov 2020 08:28:01 +0000 (09:28 +0100)
This is a mass migration of callers, deprecating the method
in the process.

Change-Id: I6a056f0cc9af2e872f85f41fb94c89035fa84ba4
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
40 files changed:
yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/BuildGlobalContext.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/contact/ContactStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/default_/DefaultStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/description/DescriptionStatementSupport.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/error_app_tag/ErrorAppTagStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_message/ErrorMessageStatementSupport.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/include/AbstractIncludeStatementSupport.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/length/LengthStatementSupport.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/organization/OrganizationStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/prefix/PrefixStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/presence/PresenceStatementSupport.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/reference/ReferenceStatementSupport.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/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/AbstractLeafrefSpecificationSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractTypeStatementSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BitsSpecificationSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/Decimal64SpecificationSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EnumSpecificationSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/InstanceIdentifierSpecificationSupport.java
yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/UnionSpecificationSupport.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/units/UnitsStatementSupport.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/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionSupport.java
yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContext.java

index fdec5deea86894fbce4ff061a61ced8b9455638d..5f0d52ac72100e37de93a2cb8edea07fb2423759 100644 (file)
@@ -261,7 +261,7 @@ final class BuildGlobalContext extends NamespaceStorageSupport implements Regist
 
     private static SourceIdentifier createSourceIdentifier(final StmtContext<?, ?, ?> root) {
         final QNameModule qNameModule = root.getFromNamespace(ModuleCtxToModuleQName.class, root);
-        final String arg = root.coerceRawStatementArgument();
+        final String arg = root.getRawArgument();
         if (qNameModule != null) {
             // creates SourceIdentifier for a module
             return RevisionSourceIdentifier.create(arg, qNameModule.getRevision());
index ce4a243a8c91303e73349d381744a509a16c4fcd..70883c80b15696456fcfaf7eb2b7fd9d8a451065 100644 (file)
@@ -86,12 +86,12 @@ public final class BelongsToStatementSupport
     @Override
     protected BelongsToStatement createDeclared(final StmtContext<String, BelongsToStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularBelongsToStatement(ctx.coerceRawStatementArgument(), substatements);
+        return new RegularBelongsToStatement(ctx.getRawArgument(), substatements);
     }
 
     @Override
     protected BelongsToStatement createEmptyDeclared(final StmtContext<String, BelongsToStatement, ?> ctx) {
-        return new EmptyBelongsToStatement(ctx.coerceRawStatementArgument());
+        return new EmptyBelongsToStatement(ctx.getRawArgument());
     }
 
     @Override
index 659ff40742aed56de91aea697950438b11dc6423..4070890a3c2b5052755ac86fd2b7b98446b5919f 100644 (file)
@@ -40,12 +40,12 @@ public final class ContactStatementSupport
     @Override
     protected ContactStatement createDeclared(final StmtContext<String, ContactStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularContactStatement(ctx.coerceRawStatementArgument(), substatements);
+        return new RegularContactStatement(ctx.getRawArgument(), substatements);
     }
 
     @Override
     protected ContactStatement createEmptyDeclared(final StmtContext<String, ContactStatement, ?> ctx) {
-        return new EmptyContactStatement(ctx.coerceRawStatementArgument());
+        return new EmptyContactStatement(ctx.getRawArgument());
     }
 
     @Override
index cbbd56d4a0f15281964244e8ee8329f4fe676408..456f3ee2b3b69936e8fccaee1e6bfd2c3d1aada8 100644 (file)
@@ -40,12 +40,12 @@ public final class DefaultStatementSupport
     @Override
     protected DefaultStatement createDeclared(final StmtContext<String, DefaultStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularDefaultStatement(ctx.coerceRawStatementArgument(), substatements);
+        return new RegularDefaultStatement(ctx.getRawArgument(), substatements);
     }
 
     @Override
     protected DefaultStatement createEmptyDeclared(final StmtContext<String, DefaultStatement, ?> ctx) {
-        return new EmptyDefaultStatement(ctx.coerceRawStatementArgument());
+        return new EmptyDefaultStatement(ctx.getRawArgument());
     }
 
     @Override
index 8f98ee80012ce7801a9296cd6a31051031b1161c..7bf1f666e29604bf48518bc9ab198fbf1392f51d 100644 (file)
@@ -40,12 +40,12 @@ public final class DescriptionStatementSupport
     @Override
     protected DescriptionStatement createDeclared(final StmtContext<String, DescriptionStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularDescriptionStatement(ctx.coerceRawStatementArgument(), substatements);
+        return new RegularDescriptionStatement(ctx.getRawArgument(), substatements);
     }
 
     @Override
     protected DescriptionStatement createEmptyDeclared(final StmtContext<String, DescriptionStatement, ?> ctx) {
-        return new EmptyDescriptionStatement(ctx.coerceRawStatementArgument());
+        return new EmptyDescriptionStatement(ctx.getRawArgument());
     }
 
     @Override
index f2a16708b087fe264bbc67007d924939076e2027..1c880d8ca3fc3e7e824c40120e738c9d562e8ce4 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.coerceRawStatementArgument(), ctx.coerceStatementArgument(), substatements);
+        return new DeviateStatementImpl(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements);
     }
 
     @Override
index 3ba5d94fb078d43b8297d0fb24b4b6454cebeafc..6d880af4f48b037ea87ffdf7e8cb04bc6ee34c2b 100644 (file)
@@ -70,8 +70,7 @@ public final class DeviationStatementSupport
     @Override
     protected DeviationStatement createDeclared(final StmtContext<Absolute, DeviationStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new DeviationStatementImpl(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument(),
-            substatements);
+        return new DeviationStatementImpl(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements);
     }
 
     @Override
index ee2d2133d69706756807afa438bcfb8144f72585..c3a62cc430f0e98903558b2e386a00ca34d07813 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.coerceRawStatementArgument(), ctx.coerceStatementArgument(), substatements);
+        return new RegularEnumStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements);
     }
 
     @Override
     protected final EnumStatement createEmptyDeclared(final StmtContext<String, EnumStatement, ?> ctx) {
-        return new EmptyEnumStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument());
+        return new EmptyEnumStatement(ctx.getRawArgument(), ctx.coerceStatementArgument());
     }
 
     @Override
index abf7976e4f955684431a21f5a47e1317e596e499..245b9b043be782af4c0d5bf8255aa0bd0c22d1ff 100644 (file)
@@ -40,12 +40,12 @@ public final class ErrorAppTagStatementSupport
     @Override
     protected ErrorAppTagStatement createDeclared(final StmtContext<String, ErrorAppTagStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularErrorAppTagStatement(ctx.coerceRawStatementArgument(), substatements);
+        return new RegularErrorAppTagStatement(ctx.getRawArgument(), substatements);
     }
 
     @Override
     protected ErrorAppTagStatement createEmptyDeclared(final StmtContext<String, ErrorAppTagStatement, ?> ctx) {
-        return new EmptyErrorAppTagStatement(ctx.coerceRawStatementArgument());
+        return new EmptyErrorAppTagStatement(ctx.getRawArgument());
     }
 
     @Override
index f1164b98a98b5e47c68ae9f689a8a90cd1eed5f4..37b520f5d8c0f372d06f4ed609584f15253c7d52 100644 (file)
@@ -40,12 +40,12 @@ public final class ErrorMessageStatementSupport
     @Override
     protected ErrorMessageStatement createDeclared(final StmtContext<String, ErrorMessageStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularErrorMessageStatement(ctx.coerceRawStatementArgument(), substatements);
+        return new RegularErrorMessageStatement(ctx.getRawArgument(), substatements);
     }
 
     @Override
     protected ErrorMessageStatement createEmptyDeclared(final StmtContext<String, ErrorMessageStatement, ?> ctx) {
-        return new EmptyErrorMessageStatement(ctx.coerceRawStatementArgument());
+        return new EmptyErrorMessageStatement(ctx.getRawArgument());
     }
 
     @Override
index b8ecc00bf1d8c2dfa4aa688b267e9e896a225815..5ef538a8cb1b3ef08432cc5d85e3220db9b8031e 100644 (file)
@@ -87,14 +87,13 @@ abstract class AbstractIfFeatureStatementSupport
     @Override
     protected final IfFeatureStatement createDeclared(final StmtContext<IfFeatureExpr, IfFeatureStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularIfFeatureStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument(),
-            substatements);
+        return new RegularIfFeatureStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements);
     }
 
     @Override
     protected final IfFeatureStatement createEmptyDeclared(
             final StmtContext<IfFeatureExpr, IfFeatureStatement, ?> ctx) {
-        return new EmptyIfFeatureStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument());
+        return new EmptyIfFeatureStatement(ctx.getRawArgument(), ctx.coerceStatementArgument());
     }
 
     @Override
index bd81814faeb3b4c0719408b87e75c3a0edde0c08..d6acb373bd18a5c192ba3b04879b396337513207 100644 (file)
@@ -68,7 +68,7 @@ abstract class AbstractImportStatementSupport
             @Override
             public void apply(final InferenceContext ctx) {
                 final StmtContext<?, ?, ?> importedModuleContext = imported.resolve(ctx);
-                Verify.verify(moduleName.equals(importedModuleContext.coerceRawStatementArgument()));
+                Verify.verify(moduleName.equals(importedModuleContext.getRawArgument()));
                 final URI importedModuleNamespace = importedModuleContext.getFromNamespace(ModuleNameToNamespace.class,
                         moduleName);
                 Verify.verifyNotNull(importedModuleNamespace);
@@ -99,7 +99,7 @@ abstract class AbstractImportStatementSupport
     @Override
     protected final ImportStatement createDeclared(final StmtContext<String, ImportStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new ImportStatementImpl(ctx.coerceRawStatementArgument(), substatements);
+        return new ImportStatementImpl(ctx.getRawArgument(), substatements);
     }
 
     @Override
index d9a58e31c621e2a3f085f957f4924f86eeac6cb2..74885341c53699aa033b0f391ea86ae07cce2585 100644 (file)
@@ -90,13 +90,12 @@ abstract class AbstractIncludeStatementSupport
     @Override
     protected final IncludeStatement createDeclared(final StmtContext<String, IncludeStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularIncludeStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument(),
-            substatements);
+        return new RegularIncludeStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements);
     }
 
     @Override
     protected final IncludeStatement createEmptyDeclared(final StmtContext<String, IncludeStatement, ?> ctx) {
-        return new EmptyIncludeStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument());
+        return new EmptyIncludeStatement(ctx.getRawArgument(), ctx.coerceStatementArgument());
     }
 
     @Override
index 7d7190aa000ae5d335c696260382c4e78142ad5c..f6d12de1da17084a2a7bf7f51a812e13280040e1 100644 (file)
@@ -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.coerceRawStatementArgument(), ctx.coerceStatementArgument(), substatements);
+        return new RegularKeyStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements);
     }
 
     @Override
     protected KeyStatement createEmptyDeclared(final StmtContext<Set<QName>, KeyStatement, ?> ctx) {
-        return new EmptyKeyStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument());
+        return new EmptyKeyStatement(ctx.getRawArgument(), ctx.coerceStatementArgument());
     }
 
     @Override
index fba826934f500a49fc94c87c5358f049bec731a0..4c91a062a1d736ea5764188a47fc2c4ad85e4095 100644 (file)
@@ -86,13 +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.coerceRawStatementArgument(), ctx.coerceStatementArgument(),
-            substatements);
+        return new RegularLengthStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements);
     }
 
     @Override
     protected LengthStatement createEmptyDeclared(final StmtContext<List<ValueRange>, LengthStatement, ?> ctx) {
-        return new EmptyLengthStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument());
+        return new EmptyLengthStatement(ctx.getRawArgument(), ctx.coerceStatementArgument());
     }
 
     @Override
index 092331107e1494ae3fd6d8bf8cf7924c84f5386e..413ff3c264f8bf2ee6743a066496c16b427850e2 100644 (file)
@@ -46,13 +46,12 @@ public final class MaxElementsStatementSupport
     @Override
     protected MaxElementsStatement createDeclared(final StmtContext<String, MaxElementsStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularMaxElementsStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument(),
-            substatements);
+        return new RegularMaxElementsStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements);
     }
 
     @Override
     protected MaxElementsStatement createEmptyDeclared(final StmtContext<String, MaxElementsStatement, ?> ctx) {
-        return new EmptyMaxElementsStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument());
+        return new EmptyMaxElementsStatement(ctx.getRawArgument(), ctx.coerceStatementArgument());
     }
 
     @Override
index 2c2d6783e97229e6646468305d0dbdf4f1570fdf..a62659dfe6997e72034bdd9cd1d04611b9f50f67 100644 (file)
@@ -53,13 +53,12 @@ public final class ModifierStatementSupport
     @Override
     protected ModifierStatement createDeclared(final StmtContext<ModifierKind, ModifierStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularModifierStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument(),
-            substatements);
+        return new RegularModifierStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements);
     }
 
     @Override
     protected ModifierStatement createEmptyDeclared(final StmtContext<ModifierKind, ModifierStatement, ?> ctx) {
-        return new EmptyModifierStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument());
+        return new EmptyModifierStatement(ctx.getRawArgument(), ctx.coerceStatementArgument());
     }
 
     @Override
index 54030aefebbd6925dbe0f4aaf09fec26d633cd29..d8eabddeb07a7aa8835aac9c0654efc0f3cf534e 100644 (file)
@@ -75,7 +75,7 @@ abstract class AbstractModuleStatementSupport
     @Override
     public final void onPreLinkageDeclared(
             final Mutable<UnqualifiedQName, ModuleStatement, ModuleEffectiveStatement> stmt) {
-        final String moduleName = stmt.coerceRawStatementArgument();
+        final String moduleName = stmt.getRawArgument();
 
         final URI moduleNs = firstAttributeOf(stmt.declaredSubstatements(), NamespaceStatement.class);
         SourceException.throwIfNull(moduleNs, stmt.sourceReference(),
@@ -115,7 +115,7 @@ abstract class AbstractModuleStatementSupport
                     qNameModule.getNamespace(), possibleDuplicateModule.sourceReference());
         }
 
-        final String moduleName = stmt.coerceRawStatementArgument();
+        final String moduleName = stmt.getRawArgument();
         final SourceIdentifier moduleIdentifier = RevisionSourceIdentifier.create(moduleName, revisionDate);
 
         stmt.addContext(ModuleNamespace.class, moduleIdentifier, stmt);
@@ -168,7 +168,7 @@ abstract class AbstractModuleStatementSupport
     @Override
     protected final ModuleStatement createDeclared(final StmtContext<UnqualifiedQName, ModuleStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new ModuleStatementImpl(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument(), substatements);
+        return new ModuleStatementImpl(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements);
     }
 
     @Override
@@ -206,7 +206,7 @@ abstract class AbstractModuleStatementSupport
     private static void addToSemVerModuleNamespace(
             final Mutable<UnqualifiedQName, ModuleStatement, ModuleEffectiveStatement> stmt,
             final SourceIdentifier moduleIdentifier) {
-        final SemVerSourceIdentifier id = SemVerSourceIdentifier.create(stmt.coerceRawStatementArgument(),
+        final SemVerSourceIdentifier id = SemVerSourceIdentifier.create(stmt.getRawArgument(),
             stmt.getFromNamespace(SemanticVersionNamespace.class, stmt));
         stmt.addToNs(SemanticVersionModuleNamespace.class, id, stmt);
     }
index 33ea81a6ba1bfd0fc99343d73d7256ac692259d8..ad5a36a0130e81fa6eb684bd3985d158057ca12b 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.coerceRawStatementArgument(), ctx.coerceStatementArgument(), substatements);
+        return new RegularMustStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements);
     }
 
     @Override
     protected MustStatement createEmptyDeclared(final StmtContext<QualifiedBound, MustStatement, ?> ctx) {
-        return new EmptyMustStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument());
+        return new EmptyMustStatement(ctx.getRawArgument(), ctx.coerceStatementArgument());
     }
 
     @Override
index c324ca29c5315910bc8201e75d6afc8ce6e84864..e6c4e162078c25797d6460d0a00d9bad134f8cf5 100644 (file)
@@ -41,12 +41,12 @@ public final class OrganizationStatementSupport
     @Override
     protected OrganizationStatement createDeclared(final StmtContext<String, OrganizationStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularOrganizationStatement(ctx.coerceRawStatementArgument(), substatements);
+        return new RegularOrganizationStatement(ctx.getRawArgument(), substatements);
     }
 
     @Override
     protected OrganizationStatement createEmptyDeclared(final StmtContext<String, OrganizationStatement, ?> ctx) {
-        return new EmptyOrganizationStatement(ctx.coerceRawStatementArgument());
+        return new EmptyOrganizationStatement(ctx.getRawArgument());
     }
 
     @Override
index 69f90439b0ffd2dd4e594c8897d9056c5a264705..0590062f649fd9528350e2b31f5819d1b8269c06 100644 (file)
@@ -40,12 +40,12 @@ public final class PrefixStatementSupport
     @Override
     protected PrefixStatement createDeclared(final StmtContext<String, PrefixStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularPrefixStatement(ctx.coerceRawStatementArgument(), substatements);
+        return new RegularPrefixStatement(ctx.getRawArgument(), substatements);
     }
 
     @Override
     protected PrefixStatement createEmptyDeclared(final StmtContext<String, PrefixStatement, ?> ctx) {
-        return new EmptyPrefixStatement(ctx.coerceRawStatementArgument());
+        return new EmptyPrefixStatement(ctx.getRawArgument());
     }
 
     @Override
index 60840a923474d8f6821bd0027726114472f893c4..eb25cfe7b9dd9a935da8f8b54d0fadbbc1315a88 100644 (file)
@@ -40,12 +40,12 @@ public final class PresenceStatementSupport
     @Override
     protected PresenceStatement createDeclared(final StmtContext<String, PresenceStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularPresenceStatement(ctx.coerceRawStatementArgument(), substatements);
+        return new RegularPresenceStatement(ctx.getRawArgument(), substatements);
     }
 
     @Override
     protected PresenceStatement createEmptyDeclared(final StmtContext<String, PresenceStatement, ?> ctx) {
-        return new EmptyPresenceStatement(ctx.coerceRawStatementArgument());
+        return new EmptyPresenceStatement(ctx.getRawArgument());
     }
 
     @Override
index 71e5fa6add098e855583a76249ba4d96808ca102..e797235356faf8cd535d8d2de99ac9b9967af033 100644 (file)
@@ -82,13 +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.coerceRawStatementArgument(), ctx.coerceStatementArgument(),
-            substatements);
+        return new RegularRangeStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements);
     }
 
     @Override
     protected RangeStatement createEmptyDeclared(final StmtContext<List<ValueRange>, RangeStatement, ?> ctx) {
-        return new EmptyRangeStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument());
+        return new EmptyRangeStatement(ctx.getRawArgument(), ctx.coerceStatementArgument());
     }
 
     @Override
index 6f71db77f1d9ffc6a1bf233770522eca3e8f7527..de577bff5bd43d1ef792324e4d9527cc9a9f23c7 100644 (file)
@@ -41,12 +41,12 @@ public final class ReferenceStatementSupport
     @Override
     protected ReferenceStatement createDeclared(final StmtContext<String, ReferenceStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularReferenceStatement(ctx.coerceRawStatementArgument(), substatements);
+        return new RegularReferenceStatement(ctx.getRawArgument(), substatements);
     }
 
     @Override
     protected ReferenceStatement createEmptyDeclared(final StmtContext<String, ReferenceStatement, ?> ctx) {
-        return new EmptyReferenceStatement(ctx.coerceRawStatementArgument());
+        return new EmptyReferenceStatement(ctx.getRawArgument());
     }
 
     @Override
index a2f746d46eb2964eb2a728227bdd92e5b01f96d1..bf90524bccb61428e7675d32e0cfef441fc42038 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.coerceRawStatementArgument(), ctx.coerceStatementArgument(), substatements);
+        return new RefineStatementImpl(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements);
     }
 
     @Override
index ce8728461579dd5614388e9cc8da5953ff3c4f15..2e33f9c32dd3bacb5277fde166bbfcae5c3affac 100644 (file)
@@ -49,14 +49,14 @@ abstract class AbstractSubmoduleStatementSupport
     @Override
     public final void onPreLinkageDeclared(
             final Mutable<UnqualifiedQName, SubmoduleStatement, SubmoduleEffectiveStatement> stmt) {
-        stmt.setRootIdentifier(RevisionSourceIdentifier.create(stmt.coerceRawStatementArgument(),
+        stmt.setRootIdentifier(RevisionSourceIdentifier.create(stmt.getRawArgument(),
             StmtContextUtils.getLatestRevision(stmt.declaredSubstatements())));
     }
 
     @Override
     public final void onLinkageDeclared(
             final Mutable<UnqualifiedQName, SubmoduleStatement, SubmoduleEffectiveStatement> stmt) {
-        final SourceIdentifier submoduleIdentifier = RevisionSourceIdentifier.create(stmt.coerceRawStatementArgument(),
+        final SourceIdentifier submoduleIdentifier = RevisionSourceIdentifier.create(stmt.getRawArgument(),
             StmtContextUtils.getLatestRevision(stmt.declaredSubstatements()));
 
         final StmtContext<?, SubmoduleStatement, SubmoduleEffectiveStatement>
@@ -81,8 +81,7 @@ abstract class AbstractSubmoduleStatementSupport
     @Override
     protected final SubmoduleStatement createDeclared(final StmtContext<UnqualifiedQName, SubmoduleStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new SubmoduleStatementImpl(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument(),
-            substatements);
+        return new SubmoduleStatementImpl(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements);
     }
 
     @Override
index 867afc24e7cd525692a11f3b0539f73adcf5cbed..4feb3654e299181053bb90e5ecf4990e6d8c1412 100644 (file)
@@ -62,7 +62,7 @@ abstract class AbstractIdentityRefSpecificationSupport
     @Override
     protected final IdentityRefSpecification createDeclared(final StmtContext<String, IdentityRefSpecification, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new IdentityRefSpecificationImpl(ctx.coerceRawStatementArgument(), substatements);
+        return new IdentityRefSpecificationImpl(ctx.getRawArgument(), substatements);
     }
 
     @Override
index 6fdc3b41263f9efee2991392ef78dcaaddc6f3c6..1ab6a1c0c215dbcba38baee08e975087ce822fde 100644 (file)
@@ -36,7 +36,7 @@ abstract class AbstractLeafrefSpecificationSupport
     @Override
     protected final LeafrefSpecification createDeclared(final StmtContext<String, LeafrefSpecification, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new LeafrefSpecificationImpl(ctx.coerceRawStatementArgument(), substatements);
+        return new LeafrefSpecificationImpl(ctx.getRawArgument(), substatements);
     }
 
     @Override
index d4cfade4b74e139f04497fc032afab6e6e1f480b..5f377dc22637646efde78d1eee72b26cea63548a 100644 (file)
@@ -220,14 +220,14 @@ abstract class AbstractTypeStatementSupport
     @Override
     protected final TypeStatement createDeclared(final StmtContext<String, TypeStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularTypeStatement(ctx.coerceRawStatementArgument(), substatements);
+        return new RegularTypeStatement(ctx.getRawArgument(), substatements);
     }
 
     @Override
     protected final TypeStatement createEmptyDeclared(final StmtContext<String, TypeStatement, ?> ctx) {
         final TypeStatement builtin;
         return (builtin = BuiltinTypeStatement.lookup(ctx)) != null ? builtin
-            : new EmptyTypeStatement(ctx.coerceRawStatementArgument());
+            : new EmptyTypeStatement(ctx.getRawArgument());
     }
 
     @Override
index 71cf68009eb1f5ded0c50a513c303859068a6a15..61a004bdb38a3c09e9c9d241f774106468ea5d31 100644 (file)
@@ -49,7 +49,7 @@ final class BitsSpecificationSupport
     @Override
     protected BitsSpecification createDeclared(final StmtContext<String, BitsSpecification, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new BitsSpecificationImpl(ctx.coerceRawStatementArgument(), substatements);
+        return new BitsSpecificationImpl(ctx.getRawArgument(), substatements);
     }
 
     @Override
index e40f70356b5e85c869b54f592912d361060732fe..3713c4583c395eae407d729ddb277c73b025392a 100644 (file)
@@ -48,7 +48,7 @@ final class Decimal64SpecificationSupport extends BaseStatementSupport<String, D
     @Override
     protected Decimal64Specification createDeclared(final StmtContext<String, Decimal64Specification, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new Decimal64SpecificationImpl(ctx.coerceRawStatementArgument(), substatements);
+        return new Decimal64SpecificationImpl(ctx.getRawArgument(), substatements);
     }
 
     @Override
index e957feacd6f67e67298c0a0d2038f2fcef27dd37..81f41987f41f61ee83077ef33064bcb86938b099 100644 (file)
@@ -47,7 +47,7 @@ final class EnumSpecificationSupport
     @Override
     protected EnumSpecification createDeclared(final StmtContext<String, EnumSpecification, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new EnumSpecificationImpl(ctx.coerceRawStatementArgument(), substatements);
+        return new EnumSpecificationImpl(ctx.getRawArgument(), substatements);
     }
 
     @Override
index 321bebfdcdd0eeee0c8704fda8413bcd9f2951f8..74851932c7447e992b9669463204d284b6c7b2d1 100644 (file)
@@ -46,13 +46,13 @@ final class InstanceIdentifierSpecificationSupport extends BaseStatementSupport<
     protected InstanceIdentifierSpecification createDeclared(
             final StmtContext<String, InstanceIdentifierSpecification, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularInstanceIdentifierSpecification(ctx.coerceRawStatementArgument(), substatements);
+        return new RegularInstanceIdentifierSpecification(ctx.getRawArgument(), substatements);
     }
 
     @Override
     protected InstanceIdentifierSpecification createEmptyDeclared(
             final StmtContext<String, InstanceIdentifierSpecification, ?> ctx) {
-        return new EmptyIdentifierSpecification(ctx.coerceRawStatementArgument());
+        return new EmptyIdentifierSpecification(ctx.getRawArgument());
     }
 
     @Override
index 6504bbd131e6da7cb8abe583ca8035f4637c8839..2fe4f3c281a6258fa5a3c1478a7721023737e502 100644 (file)
@@ -47,7 +47,7 @@ final class UnionSpecificationSupport
     @Override
     protected UnionSpecification createDeclared(final StmtContext<String, UnionSpecification, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new UnionSpecificationImpl(ctx.coerceRawStatementArgument(), substatements);
+        return new UnionSpecificationImpl(ctx.getRawArgument(), substatements);
     }
 
     @Override
index 5e6763204af26b2004f6c15d12ab15573839789e..15da737d431003da5cbd3520942439877866f4a0 100644 (file)
@@ -69,13 +69,13 @@ public final class UniqueStatementSupport
     @Override
     protected UniqueStatement createDeclared(final StmtContext<Set<Descendant>, UniqueStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularUniqueStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument(),
+        return new RegularUniqueStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(),
             substatements);
     }
 
     @Override
     protected UniqueStatement createEmptyDeclared(final StmtContext<Set<Descendant>, UniqueStatement, ?> ctx) {
-        return new EmptyUniqueStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument());
+        return new EmptyUniqueStatement(ctx.getRawArgument(), ctx.coerceStatementArgument());
     }
 
     @Override
index 29713699e8c263432f3067e4b47df48f09eaecab..a149721d57f383c65a9c3c29fbcdcebee8f01cdc 100644 (file)
@@ -41,12 +41,12 @@ public final class UnitsStatementSupport
     @Override
     protected UnitsStatement createDeclared(final StmtContext<String, UnitsStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularUnitsStatement(ctx.coerceRawStatementArgument(), substatements);
+        return new RegularUnitsStatement(ctx.getRawArgument(), substatements);
     }
 
     @Override
     protected UnitsStatement createEmptyDeclared(final StmtContext<String, UnitsStatement, ?> ctx) {
-        return new EmptyUnitsStatement(ctx.coerceRawStatementArgument());
+        return new EmptyUnitsStatement(ctx.getRawArgument());
     }
 
     @Override
index a3259f1d0df123c5ab057b5b7be741c0d497664e..a007952dacce9e7501cc4b1d3cf7854e590513e4 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.coerceRawStatementArgument(), ctx.coerceStatementArgument(), substatements);
+        return new RegularUsesStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements);
     }
 
     @Override
     protected UsesStatement createEmptyDeclared(final StmtContext<QName, UsesStatement, ?> ctx) {
-        return new EmptyUsesStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument());
+        return new EmptyUsesStatement(ctx.getRawArgument(), ctx.coerceStatementArgument());
     }
 
     @Override
index 2f6e06c7fa4eb69517fc0c9062c6c211fd024389..aaba4c64625734d8cefe8cb802dd9f10751c72e0 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.coerceRawStatementArgument(), ctx.coerceStatementArgument(), substatements);
+        return new RegularWhenStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements);
     }
 
     @Override
     protected WhenStatement createEmptyDeclared(final StmtContext<QualifiedBound, WhenStatement, ?> ctx) {
-        return new EmptyWhenStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument());
+        return new EmptyWhenStatement(ctx.getRawArgument(), ctx.coerceStatementArgument());
     }
 
     @Override
index 3f1516cd6a4de7250a6abf31c930d884a6c3c9b0..2ffc4e4224f8b4988608cf342e0abcfdf69ff74c 100644 (file)
@@ -45,7 +45,7 @@ public final class ThirdPartyExtensionSupport
     protected ThirdPartyExtensionStatement createDeclared(
             final StmtContext<String, ThirdPartyExtensionStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new ThirdPartyExtensionStatementImpl(ctx.coerceRawStatementArgument(), substatements);
+        return new ThirdPartyExtensionStatementImpl(ctx.getRawArgument(), substatements);
     }
 
     @Override
index e96b8530c3da9cf38f3040ba49a61b317f3f752a..ac1d22a8fd7b6d188ba5ff043de01fe156316922 100644 (file)
@@ -69,8 +69,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 #getRawArgument()} instead.
      */
-    // TODO: gradually migrate callers of this method
+    @Deprecated(forRemoval = true)
     default @NonNull String coerceRawStatementArgument() {
         return getRawArgument();
     }