From 1067f65ea79f8465bf90bee9e6af8b43adc8c4f4 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 27 Nov 2020 09:28:01 +0100 Subject: [PATCH] Migrate coerceRawStatementArgument() callers This is a mass migration of callers, deprecating the method in the process. Change-Id: I6a056f0cc9af2e872f85f41fb94c89035fa84ba4 Signed-off-by: Robert Varga --- .../yang/parser/stmt/reactor/BuildGlobalContext.java | 2 +- .../stmt/belongs_to/BelongsToStatementSupport.java | 4 ++-- .../rfc7950/stmt/contact/ContactStatementSupport.java | 4 ++-- .../rfc7950/stmt/default_/DefaultStatementSupport.java | 4 ++-- .../stmt/description/DescriptionStatementSupport.java | 4 ++-- .../stmt/deviate/AbstractDeviateStatementSupport.java | 2 +- .../rfc7950/stmt/deviation/DeviationStatementSupport.java | 3 +-- .../rfc7950/stmt/enum_/AbstractEnumStatementSupport.java | 4 ++-- .../stmt/error_app_tag/ErrorAppTagStatementSupport.java | 4 ++-- .../stmt/error_message/ErrorMessageStatementSupport.java | 4 ++-- .../if_feature/AbstractIfFeatureStatementSupport.java | 5 ++--- .../stmt/import_/AbstractImportStatementSupport.java | 4 ++-- .../stmt/include/AbstractIncludeStatementSupport.java | 5 ++--- .../yang/parser/rfc7950/stmt/key/KeyStatementSupport.java | 4 ++-- .../rfc7950/stmt/length/LengthStatementSupport.java | 5 ++--- .../stmt/max_elements/MaxElementsStatementSupport.java | 5 ++--- .../rfc7950/stmt/modifier/ModifierStatementSupport.java | 5 ++--- .../stmt/module/AbstractModuleStatementSupport.java | 8 ++++---- .../parser/rfc7950/stmt/must/MustStatementSupport.java | 4 ++-- .../stmt/organization/OrganizationStatementSupport.java | 4 ++-- .../rfc7950/stmt/prefix/PrefixStatementSupport.java | 4 ++-- .../rfc7950/stmt/presence/PresenceStatementSupport.java | 4 ++-- .../parser/rfc7950/stmt/range/RangeStatementSupport.java | 5 ++--- .../rfc7950/stmt/reference/ReferenceStatementSupport.java | 4 ++-- .../stmt/refine/AbstractRefineStatementSupport.java | 2 +- .../stmt/submodule/AbstractSubmoduleStatementSupport.java | 7 +++---- .../type/AbstractIdentityRefSpecificationSupport.java | 2 +- .../stmt/type/AbstractLeafrefSpecificationSupport.java | 2 +- .../rfc7950/stmt/type/AbstractTypeStatementSupport.java | 4 ++-- .../rfc7950/stmt/type/BitsSpecificationSupport.java | 2 +- .../rfc7950/stmt/type/Decimal64SpecificationSupport.java | 2 +- .../rfc7950/stmt/type/EnumSpecificationSupport.java | 2 +- .../stmt/type/InstanceIdentifierSpecificationSupport.java | 4 ++-- .../rfc7950/stmt/type/UnionSpecificationSupport.java | 2 +- .../rfc7950/stmt/unique/UniqueStatementSupport.java | 4 ++-- .../parser/rfc7950/stmt/units/UnitsStatementSupport.java | 4 ++-- .../parser/rfc7950/stmt/uses/UsesStatementSupport.java | 4 ++-- .../parser/rfc7950/stmt/when/WhenStatementSupport.java | 4 ++-- .../thirdparty/plugin/ThirdPartyExtensionSupport.java | 2 +- .../yangtools/yang/parser/spi/meta/StmtContext.java | 3 ++- 40 files changed, 72 insertions(+), 79 deletions(-) diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/BuildGlobalContext.java b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/BuildGlobalContext.java index fdec5deea8..5f0d52ac72 100644 --- a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/BuildGlobalContext.java +++ b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/BuildGlobalContext.java @@ -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()); diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/belongs_to/BelongsToStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/belongs_to/BelongsToStatementSupport.java index ce4a243a8c..70883c80b1 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/belongs_to/BelongsToStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/belongs_to/BelongsToStatementSupport.java @@ -86,12 +86,12 @@ public final class BelongsToStatementSupport @Override protected BelongsToStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularBelongsToStatement(ctx.coerceRawStatementArgument(), substatements); + return new RegularBelongsToStatement(ctx.getRawArgument(), substatements); } @Override protected BelongsToStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyBelongsToStatement(ctx.coerceRawStatementArgument()); + return new EmptyBelongsToStatement(ctx.getRawArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/contact/ContactStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/contact/ContactStatementSupport.java index 659ff40742..4070890a3c 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/contact/ContactStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/contact/ContactStatementSupport.java @@ -40,12 +40,12 @@ public final class ContactStatementSupport @Override protected ContactStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularContactStatement(ctx.coerceRawStatementArgument(), substatements); + return new RegularContactStatement(ctx.getRawArgument(), substatements); } @Override protected ContactStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyContactStatement(ctx.coerceRawStatementArgument()); + return new EmptyContactStatement(ctx.getRawArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/default_/DefaultStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/default_/DefaultStatementSupport.java index cbbd56d4a0..456f3ee2b3 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/default_/DefaultStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/default_/DefaultStatementSupport.java @@ -40,12 +40,12 @@ public final class DefaultStatementSupport @Override protected DefaultStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularDefaultStatement(ctx.coerceRawStatementArgument(), substatements); + return new RegularDefaultStatement(ctx.getRawArgument(), substatements); } @Override protected DefaultStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyDefaultStatement(ctx.coerceRawStatementArgument()); + return new EmptyDefaultStatement(ctx.getRawArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/description/DescriptionStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/description/DescriptionStatementSupport.java index 8f98ee8001..7bf1f666e2 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/description/DescriptionStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/description/DescriptionStatementSupport.java @@ -40,12 +40,12 @@ public final class DescriptionStatementSupport @Override protected DescriptionStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularDescriptionStatement(ctx.coerceRawStatementArgument(), substatements); + return new RegularDescriptionStatement(ctx.getRawArgument(), substatements); } @Override protected DescriptionStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyDescriptionStatement(ctx.coerceRawStatementArgument()); + return new EmptyDescriptionStatement(ctx.getRawArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviate/AbstractDeviateStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviate/AbstractDeviateStatementSupport.java index f2a16708b0..1c880d8ca3 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviate/AbstractDeviateStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviate/AbstractDeviateStatementSupport.java @@ -191,7 +191,7 @@ abstract class AbstractDeviateStatementSupport @Override protected final DeviateStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new DeviateStatementImpl(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument(), substatements); + return new DeviateStatementImpl(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviation/DeviationStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviation/DeviationStatementSupport.java index 3ba5d94fb0..6d880af4f4 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviation/DeviationStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviation/DeviationStatementSupport.java @@ -70,8 +70,7 @@ public final class DeviationStatementSupport @Override protected DeviationStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new DeviationStatementImpl(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument(), - substatements); + return new DeviationStatementImpl(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/enum_/AbstractEnumStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/enum_/AbstractEnumStatementSupport.java index ee2d2133d6..c3a62cc430 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/enum_/AbstractEnumStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/enum_/AbstractEnumStatementSupport.java @@ -32,12 +32,12 @@ abstract class AbstractEnumStatementSupport @Override protected final EnumStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularEnumStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument(), substatements); + return new RegularEnumStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements); } @Override protected final EnumStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyEnumStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument()); + return new EmptyEnumStatement(ctx.getRawArgument(), ctx.coerceStatementArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_app_tag/ErrorAppTagStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_app_tag/ErrorAppTagStatementSupport.java index abf7976e4f..245b9b043b 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_app_tag/ErrorAppTagStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_app_tag/ErrorAppTagStatementSupport.java @@ -40,12 +40,12 @@ public final class ErrorAppTagStatementSupport @Override protected ErrorAppTagStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularErrorAppTagStatement(ctx.coerceRawStatementArgument(), substatements); + return new RegularErrorAppTagStatement(ctx.getRawArgument(), substatements); } @Override protected ErrorAppTagStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyErrorAppTagStatement(ctx.coerceRawStatementArgument()); + return new EmptyErrorAppTagStatement(ctx.getRawArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_message/ErrorMessageStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_message/ErrorMessageStatementSupport.java index f1164b98a9..37b520f5d8 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_message/ErrorMessageStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_message/ErrorMessageStatementSupport.java @@ -40,12 +40,12 @@ public final class ErrorMessageStatementSupport @Override protected ErrorMessageStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularErrorMessageStatement(ctx.coerceRawStatementArgument(), substatements); + return new RegularErrorMessageStatement(ctx.getRawArgument(), substatements); } @Override protected ErrorMessageStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyErrorMessageStatement(ctx.coerceRawStatementArgument()); + return new EmptyErrorMessageStatement(ctx.getRawArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/if_feature/AbstractIfFeatureStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/if_feature/AbstractIfFeatureStatementSupport.java index b8ecc00bf1..5ef538a8cb 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/if_feature/AbstractIfFeatureStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/if_feature/AbstractIfFeatureStatementSupport.java @@ -87,14 +87,13 @@ abstract class AbstractIfFeatureStatementSupport @Override protected final IfFeatureStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularIfFeatureStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument(), - substatements); + return new RegularIfFeatureStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements); } @Override protected final IfFeatureStatement createEmptyDeclared( final StmtContext ctx) { - return new EmptyIfFeatureStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument()); + return new EmptyIfFeatureStatement(ctx.getRawArgument(), ctx.coerceStatementArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/AbstractImportStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/AbstractImportStatementSupport.java index bd81814fae..d6acb373bd 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/AbstractImportStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/AbstractImportStatementSupport.java @@ -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 ctx, final ImmutableList> substatements) { - return new ImportStatementImpl(ctx.coerceRawStatementArgument(), substatements); + return new ImportStatementImpl(ctx.getRawArgument(), substatements); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/include/AbstractIncludeStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/include/AbstractIncludeStatementSupport.java index d9a58e31c6..74885341c5 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/include/AbstractIncludeStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/include/AbstractIncludeStatementSupport.java @@ -90,13 +90,12 @@ abstract class AbstractIncludeStatementSupport @Override protected final IncludeStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularIncludeStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument(), - substatements); + return new RegularIncludeStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements); } @Override protected final IncludeStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyIncludeStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument()); + return new EmptyIncludeStatement(ctx.getRawArgument(), ctx.coerceStatementArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/key/KeyStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/key/KeyStatementSupport.java index 7d7190aa00..f6d12de1da 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/key/KeyStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/key/KeyStatementSupport.java @@ -89,12 +89,12 @@ public final class KeyStatementSupport @Override protected KeyStatement createDeclared(final StmtContext, KeyStatement, ?> ctx, final ImmutableList> substatements) { - return new RegularKeyStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument(), substatements); + return new RegularKeyStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements); } @Override protected KeyStatement createEmptyDeclared(final StmtContext, KeyStatement, ?> ctx) { - return new EmptyKeyStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument()); + return new EmptyKeyStatement(ctx.getRawArgument(), ctx.coerceStatementArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/length/LengthStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/length/LengthStatementSupport.java index fba826934f..4c91a062a1 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/length/LengthStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/length/LengthStatementSupport.java @@ -86,13 +86,12 @@ public final class LengthStatementSupport @Override protected LengthStatement createDeclared(final StmtContext, LengthStatement, ?> ctx, final ImmutableList> substatements) { - return new RegularLengthStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument(), - substatements); + return new RegularLengthStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements); } @Override protected LengthStatement createEmptyDeclared(final StmtContext, LengthStatement, ?> ctx) { - return new EmptyLengthStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument()); + return new EmptyLengthStatement(ctx.getRawArgument(), ctx.coerceStatementArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/max_elements/MaxElementsStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/max_elements/MaxElementsStatementSupport.java index 092331107e..413ff3c264 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/max_elements/MaxElementsStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/max_elements/MaxElementsStatementSupport.java @@ -46,13 +46,12 @@ public final class MaxElementsStatementSupport @Override protected MaxElementsStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularMaxElementsStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument(), - substatements); + return new RegularMaxElementsStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements); } @Override protected MaxElementsStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyMaxElementsStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument()); + return new EmptyMaxElementsStatement(ctx.getRawArgument(), ctx.coerceStatementArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/modifier/ModifierStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/modifier/ModifierStatementSupport.java index 2c2d6783e9..a62659dfe6 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/modifier/ModifierStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/modifier/ModifierStatementSupport.java @@ -53,13 +53,12 @@ public final class ModifierStatementSupport @Override protected ModifierStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularModifierStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument(), - substatements); + return new RegularModifierStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements); } @Override protected ModifierStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyModifierStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument()); + return new EmptyModifierStatement(ctx.getRawArgument(), ctx.coerceStatementArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/module/AbstractModuleStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/module/AbstractModuleStatementSupport.java index 54030aefeb..d8eabddeb0 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/module/AbstractModuleStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/module/AbstractModuleStatementSupport.java @@ -75,7 +75,7 @@ abstract class AbstractModuleStatementSupport @Override public final void onPreLinkageDeclared( final Mutable 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 ctx, final ImmutableList> 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 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); } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/must/MustStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/must/MustStatementSupport.java index 33ea81a6ba..ad5a36a013 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/must/MustStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/must/MustStatementSupport.java @@ -57,12 +57,12 @@ public final class MustStatementSupport @Override protected MustStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularMustStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument(), substatements); + return new RegularMustStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements); } @Override protected MustStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyMustStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument()); + return new EmptyMustStatement(ctx.getRawArgument(), ctx.coerceStatementArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/organization/OrganizationStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/organization/OrganizationStatementSupport.java index c324ca29c5..e6c4e16207 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/organization/OrganizationStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/organization/OrganizationStatementSupport.java @@ -41,12 +41,12 @@ public final class OrganizationStatementSupport @Override protected OrganizationStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularOrganizationStatement(ctx.coerceRawStatementArgument(), substatements); + return new RegularOrganizationStatement(ctx.getRawArgument(), substatements); } @Override protected OrganizationStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyOrganizationStatement(ctx.coerceRawStatementArgument()); + return new EmptyOrganizationStatement(ctx.getRawArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/prefix/PrefixStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/prefix/PrefixStatementSupport.java index 69f90439b0..0590062f64 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/prefix/PrefixStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/prefix/PrefixStatementSupport.java @@ -40,12 +40,12 @@ public final class PrefixStatementSupport @Override protected PrefixStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularPrefixStatement(ctx.coerceRawStatementArgument(), substatements); + return new RegularPrefixStatement(ctx.getRawArgument(), substatements); } @Override protected PrefixStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyPrefixStatement(ctx.coerceRawStatementArgument()); + return new EmptyPrefixStatement(ctx.getRawArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/presence/PresenceStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/presence/PresenceStatementSupport.java index 60840a9234..eb25cfe7b9 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/presence/PresenceStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/presence/PresenceStatementSupport.java @@ -40,12 +40,12 @@ public final class PresenceStatementSupport @Override protected PresenceStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularPresenceStatement(ctx.coerceRawStatementArgument(), substatements); + return new RegularPresenceStatement(ctx.getRawArgument(), substatements); } @Override protected PresenceStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyPresenceStatement(ctx.coerceRawStatementArgument()); + return new EmptyPresenceStatement(ctx.getRawArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/range/RangeStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/range/RangeStatementSupport.java index 71e5fa6add..e797235356 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/range/RangeStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/range/RangeStatementSupport.java @@ -82,13 +82,12 @@ public final class RangeStatementSupport @Override protected RangeStatement createDeclared(final StmtContext, RangeStatement, ?> ctx, final ImmutableList> substatements) { - return new RegularRangeStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument(), - substatements); + return new RegularRangeStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements); } @Override protected RangeStatement createEmptyDeclared(final StmtContext, RangeStatement, ?> ctx) { - return new EmptyRangeStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument()); + return new EmptyRangeStatement(ctx.getRawArgument(), ctx.coerceStatementArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/reference/ReferenceStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/reference/ReferenceStatementSupport.java index 6f71db77f1..de577bff5b 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/reference/ReferenceStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/reference/ReferenceStatementSupport.java @@ -41,12 +41,12 @@ public final class ReferenceStatementSupport @Override protected ReferenceStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularReferenceStatement(ctx.coerceRawStatementArgument(), substatements); + return new RegularReferenceStatement(ctx.getRawArgument(), substatements); } @Override protected ReferenceStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyReferenceStatement(ctx.coerceRawStatementArgument()); + return new EmptyReferenceStatement(ctx.getRawArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/refine/AbstractRefineStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/refine/AbstractRefineStatementSupport.java index a2f746d46e..bf90524bcc 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/refine/AbstractRefineStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/refine/AbstractRefineStatementSupport.java @@ -35,7 +35,7 @@ abstract class AbstractRefineStatementSupport @Override protected final RefineStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RefineStatementImpl(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument(), substatements); + return new RefineStatementImpl(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/submodule/AbstractSubmoduleStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/submodule/AbstractSubmoduleStatementSupport.java index ce87284615..2e33f9c32d 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/submodule/AbstractSubmoduleStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/submodule/AbstractSubmoduleStatementSupport.java @@ -49,14 +49,14 @@ abstract class AbstractSubmoduleStatementSupport @Override public final void onPreLinkageDeclared( final Mutable stmt) { - stmt.setRootIdentifier(RevisionSourceIdentifier.create(stmt.coerceRawStatementArgument(), + stmt.setRootIdentifier(RevisionSourceIdentifier.create(stmt.getRawArgument(), StmtContextUtils.getLatestRevision(stmt.declaredSubstatements()))); } @Override public final void onLinkageDeclared( final Mutable stmt) { - final SourceIdentifier submoduleIdentifier = RevisionSourceIdentifier.create(stmt.coerceRawStatementArgument(), + final SourceIdentifier submoduleIdentifier = RevisionSourceIdentifier.create(stmt.getRawArgument(), StmtContextUtils.getLatestRevision(stmt.declaredSubstatements())); final StmtContext @@ -81,8 +81,7 @@ abstract class AbstractSubmoduleStatementSupport @Override protected final SubmoduleStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new SubmoduleStatementImpl(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument(), - substatements); + return new SubmoduleStatementImpl(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractIdentityRefSpecificationSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractIdentityRefSpecificationSupport.java index 867afc24e7..4feb3654e2 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractIdentityRefSpecificationSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractIdentityRefSpecificationSupport.java @@ -62,7 +62,7 @@ abstract class AbstractIdentityRefSpecificationSupport @Override protected final IdentityRefSpecification createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new IdentityRefSpecificationImpl(ctx.coerceRawStatementArgument(), substatements); + return new IdentityRefSpecificationImpl(ctx.getRawArgument(), substatements); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractLeafrefSpecificationSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractLeafrefSpecificationSupport.java index 6fdc3b4126..1ab6a1c0c2 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractLeafrefSpecificationSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractLeafrefSpecificationSupport.java @@ -36,7 +36,7 @@ abstract class AbstractLeafrefSpecificationSupport @Override protected final LeafrefSpecification createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new LeafrefSpecificationImpl(ctx.coerceRawStatementArgument(), substatements); + return new LeafrefSpecificationImpl(ctx.getRawArgument(), substatements); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractTypeStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractTypeStatementSupport.java index d4cfade4b7..5f377dc226 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractTypeStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/AbstractTypeStatementSupport.java @@ -220,14 +220,14 @@ abstract class AbstractTypeStatementSupport @Override protected final TypeStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularTypeStatement(ctx.coerceRawStatementArgument(), substatements); + return new RegularTypeStatement(ctx.getRawArgument(), substatements); } @Override protected final TypeStatement createEmptyDeclared(final StmtContext ctx) { final TypeStatement builtin; return (builtin = BuiltinTypeStatement.lookup(ctx)) != null ? builtin - : new EmptyTypeStatement(ctx.coerceRawStatementArgument()); + : new EmptyTypeStatement(ctx.getRawArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BitsSpecificationSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BitsSpecificationSupport.java index 71cf68009e..61a004bdb3 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BitsSpecificationSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BitsSpecificationSupport.java @@ -49,7 +49,7 @@ final class BitsSpecificationSupport @Override protected BitsSpecification createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new BitsSpecificationImpl(ctx.coerceRawStatementArgument(), substatements); + return new BitsSpecificationImpl(ctx.getRawArgument(), substatements); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/Decimal64SpecificationSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/Decimal64SpecificationSupport.java index e40f70356b..3713c4583c 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/Decimal64SpecificationSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/Decimal64SpecificationSupport.java @@ -48,7 +48,7 @@ final class Decimal64SpecificationSupport extends BaseStatementSupport ctx, final ImmutableList> substatements) { - return new Decimal64SpecificationImpl(ctx.coerceRawStatementArgument(), substatements); + return new Decimal64SpecificationImpl(ctx.getRawArgument(), substatements); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EnumSpecificationSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EnumSpecificationSupport.java index e957feacd6..81f41987f4 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EnumSpecificationSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/EnumSpecificationSupport.java @@ -47,7 +47,7 @@ final class EnumSpecificationSupport @Override protected EnumSpecification createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new EnumSpecificationImpl(ctx.coerceRawStatementArgument(), substatements); + return new EnumSpecificationImpl(ctx.getRawArgument(), substatements); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/InstanceIdentifierSpecificationSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/InstanceIdentifierSpecificationSupport.java index 321bebfdcd..74851932c7 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/InstanceIdentifierSpecificationSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/InstanceIdentifierSpecificationSupport.java @@ -46,13 +46,13 @@ final class InstanceIdentifierSpecificationSupport extends BaseStatementSupport< protected InstanceIdentifierSpecification createDeclared( final StmtContext ctx, final ImmutableList> substatements) { - return new RegularInstanceIdentifierSpecification(ctx.coerceRawStatementArgument(), substatements); + return new RegularInstanceIdentifierSpecification(ctx.getRawArgument(), substatements); } @Override protected InstanceIdentifierSpecification createEmptyDeclared( final StmtContext ctx) { - return new EmptyIdentifierSpecification(ctx.coerceRawStatementArgument()); + return new EmptyIdentifierSpecification(ctx.getRawArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/UnionSpecificationSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/UnionSpecificationSupport.java index 6504bbd131..2fe4f3c281 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/UnionSpecificationSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/UnionSpecificationSupport.java @@ -47,7 +47,7 @@ final class UnionSpecificationSupport @Override protected UnionSpecification createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new UnionSpecificationImpl(ctx.coerceRawStatementArgument(), substatements); + return new UnionSpecificationImpl(ctx.getRawArgument(), substatements); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/unique/UniqueStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/unique/UniqueStatementSupport.java index 5e6763204a..15da737d43 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/unique/UniqueStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/unique/UniqueStatementSupport.java @@ -69,13 +69,13 @@ public final class UniqueStatementSupport @Override protected UniqueStatement createDeclared(final StmtContext, UniqueStatement, ?> ctx, final ImmutableList> substatements) { - return new RegularUniqueStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument(), + return new RegularUniqueStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements); } @Override protected UniqueStatement createEmptyDeclared(final StmtContext, UniqueStatement, ?> ctx) { - return new EmptyUniqueStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument()); + return new EmptyUniqueStatement(ctx.getRawArgument(), ctx.coerceStatementArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/units/UnitsStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/units/UnitsStatementSupport.java index 29713699e8..a149721d57 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/units/UnitsStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/units/UnitsStatementSupport.java @@ -41,12 +41,12 @@ public final class UnitsStatementSupport @Override protected UnitsStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularUnitsStatement(ctx.coerceRawStatementArgument(), substatements); + return new RegularUnitsStatement(ctx.getRawArgument(), substatements); } @Override protected UnitsStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyUnitsStatement(ctx.coerceRawStatementArgument()); + return new EmptyUnitsStatement(ctx.getRawArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/UsesStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/UsesStatementSupport.java index a3259f1d0d..a007952dac 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/UsesStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/uses/UsesStatementSupport.java @@ -132,12 +132,12 @@ public final class UsesStatementSupport @Override protected UsesStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularUsesStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument(), substatements); + return new RegularUsesStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements); } @Override protected UsesStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyUsesStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument()); + return new EmptyUsesStatement(ctx.getRawArgument(), ctx.coerceStatementArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/when/WhenStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/when/WhenStatementSupport.java index 2f6e06c7fa..aaba4c6462 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/when/WhenStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/when/WhenStatementSupport.java @@ -55,12 +55,12 @@ public final class WhenStatementSupport @Override protected WhenStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new RegularWhenStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument(), substatements); + return new RegularWhenStatement(ctx.getRawArgument(), ctx.coerceStatementArgument(), substatements); } @Override protected WhenStatement createEmptyDeclared(final StmtContext ctx) { - return new EmptyWhenStatement(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument()); + return new EmptyWhenStatement(ctx.getRawArgument(), ctx.coerceStatementArgument()); } @Override diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionSupport.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionSupport.java index 3f1516cd6a..2ffc4e4224 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionSupport.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionSupport.java @@ -45,7 +45,7 @@ public final class ThirdPartyExtensionSupport protected ThirdPartyExtensionStatement createDeclared( final StmtContext ctx, final ImmutableList> substatements) { - return new ThirdPartyExtensionStatementImpl(ctx.coerceRawStatementArgument(), substatements); + return new ThirdPartyExtensionStatementImpl(ctx.getRawArgument(), substatements); } @Override diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContext.java b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContext.java index e96b8530c3..ac1d22a8fd 100644 --- a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContext.java +++ b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContext.java @@ -69,8 +69,9 @@ public interface StmtContext, E extends Effect * * @return raw statement argument string * @throws VerifyException if this statement does not have an argument + * @deprecated Use {@link #getRawArgument()} instead. */ - // TODO: gradually migrate callers of this method + @Deprecated(forRemoval = true) default @NonNull String coerceRawStatementArgument() { return getRawArgument(); } -- 2.36.6