From 99f08f31a49febbc65ab8efbbea43aabf0de0f6f Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 27 Nov 2020 19:20:46 +0100 Subject: [PATCH] More deprecated method migration Sweep extension supports for use of deprecated methods. Change-Id: Ibe405e78f499cc1c1f213b02363a34fd2e224c55 Signed-off-by: Robert Varga --- .../parser/AnyxmlSchemaLocationStatementSupport.java | 3 +-- .../odlext/parser/AnyxmlStatementSupportOverride.java | 2 +- .../GetFilterElementAttributesStatementSupport.java | 10 +++++----- .../rfc6643/parser/AliasStatementSupport.java | 2 +- .../rfc6643/parser/DefValStatementSupport.java | 2 +- .../rfc6643/parser/DisplayHintStatementSupport.java | 2 +- .../rfc6643/parser/ImpliedStatementSupport.java | 2 +- .../rfc6643/parser/MaxAccessStatementSupport.java | 4 ++-- .../yangtools/rfc6643/parser/OidStatementSupport.java | 4 ++-- .../rfc6643/parser/SubIdStatementSupport.java | 2 +- .../rfc7952/parser/AnnotationStatementSupport.java | 9 ++++----- .../rfc8040/parser/YangDataStatementSupport.java | 2 +- .../rfc8528/parser/MountPointStatementSupport.java | 8 ++++---- 13 files changed, 25 insertions(+), 27 deletions(-) diff --git a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/AnyxmlSchemaLocationStatementSupport.java b/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/AnyxmlSchemaLocationStatementSupport.java index 771a46b264..a07093a84f 100644 --- a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/AnyxmlSchemaLocationStatementSupport.java +++ b/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/AnyxmlSchemaLocationStatementSupport.java @@ -61,8 +61,7 @@ public final class AnyxmlSchemaLocationStatementSupport protected AnyxmlSchemaLocationStatement createDeclared( final StmtContext ctx, final ImmutableList> substatements) { - return new AnyxmlSchemaLocationStatementImpl(ctx.coerceRawStatementArgument(), ctx.coerceStatementArgument(), - substatements); + return new AnyxmlSchemaLocationStatementImpl(ctx.getRawArgument(), ctx.getArgument(), substatements); } @Override diff --git a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/AnyxmlStatementSupportOverride.java b/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/AnyxmlStatementSupportOverride.java index 237d7ba4ae..e63e60d219 100644 --- a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/AnyxmlStatementSupportOverride.java +++ b/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/AnyxmlStatementSupportOverride.java @@ -62,7 +62,7 @@ public final class AnyxmlStatementSupportOverride stmt.getAllFromCurrentStmtCtxNamespace(AnyxmlSchemaLocationNamespace.class); if (schemaLocations != null && !schemaLocations.isEmpty()) { final SchemaNodeIdentifier anyXmlSchemaNodeIdentifier = schemaLocations.values().iterator().next() - .getStatementArgument(); + .argument(); final Optional anyXmlSchema = getAnyXmlSchema(stmt, anyXmlSchemaNodeIdentifier); if (anyXmlSchema.isPresent()) { return new YangModeledAnyxmlEffectiveStatementImpl(delegateStatement, anyXmlSchema.get()); diff --git a/yang/rfc6241-parser-support/src/main/java/org/opendaylight/yangtools/rfc6241/parser/GetFilterElementAttributesStatementSupport.java b/yang/rfc6241-parser-support/src/main/java/org/opendaylight/yangtools/rfc6241/parser/GetFilterElementAttributesStatementSupport.java index 5c67784b1a..1ddc8ed2fc 100644 --- a/yang/rfc6241-parser-support/src/main/java/org/opendaylight/yangtools/rfc6241/parser/GetFilterElementAttributesStatementSupport.java +++ b/yang/rfc6241-parser-support/src/main/java/org/opendaylight/yangtools/rfc6241/parser/GetFilterElementAttributesStatementSupport.java @@ -123,11 +123,11 @@ public final class GetFilterElementAttributesStatementSupport extends BaseVoidSt LOG.debug("No parent, ignoring get-filter-element-attributes statement"); return false; } - if (parent.getPublicDefinition() != YangStmtMapping.ANYXML) { + if (parent.publicDefinition() != YangStmtMapping.ANYXML) { LOG.debug("Parent is not an anyxml node, ignoring get-filter-element-attributes statement"); return false; } - if (!"filter".equals(parent.rawStatementArgument())) { + if (!"filter".equals(parent.rawArgument())) { LOG.debug("Parent is not named 'filter', ignoring get-filter-element-attributes statement"); return false; } @@ -137,7 +137,7 @@ public final class GetFilterElementAttributesStatementSupport extends BaseVoidSt LOG.debug("No grandparent, ignoring get-filter-element-attributes statement"); return false; } - if (grandParent.getPublicDefinition() != YangStmtMapping.INPUT) { + if (grandParent.publicDefinition() != YangStmtMapping.INPUT) { LOG.debug("Grandparent is not an input node, ignoring get-filter-element-attributes statement"); return false; } @@ -147,12 +147,12 @@ public final class GetFilterElementAttributesStatementSupport extends BaseVoidSt LOG.debug("No grandparent, ignoring get-filter-element-attributes statement"); return false; } - if (greatGrandParent.getPublicDefinition() != YangStmtMapping.RPC) { + if (greatGrandParent.publicDefinition() != YangStmtMapping.RPC) { LOG.debug("Grandparent is not an RPC node, ignoring get-filter-element-attributes statement"); return false; } - switch (greatGrandParent.rawStatementArgument()) { + switch (greatGrandParent.getRawArgument()) { case "get": case "get-config": return true; diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/AliasStatementSupport.java b/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/AliasStatementSupport.java index 234025a550..7dc966f19b 100644 --- a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/AliasStatementSupport.java +++ b/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/AliasStatementSupport.java @@ -48,7 +48,7 @@ public final class AliasStatementSupport @Override protected AliasStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new AliasStatementImpl(ctx.coerceRawStatementArgument(), substatements); + return new AliasStatementImpl(ctx.getRawArgument(), substatements); } @Override diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DefValStatementSupport.java b/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DefValStatementSupport.java index a9659df947..97954128df 100644 --- a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DefValStatementSupport.java +++ b/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DefValStatementSupport.java @@ -42,7 +42,7 @@ public final class DefValStatementSupport @Override protected DefValStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new DefValStatementImpl(ctx.coerceRawStatementArgument(), substatements); + return new DefValStatementImpl(ctx.getRawArgument(), substatements); } @Override diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DisplayHintStatementSupport.java b/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DisplayHintStatementSupport.java index 0bfa27dcdf..baf77f9d16 100644 --- a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DisplayHintStatementSupport.java +++ b/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DisplayHintStatementSupport.java @@ -42,7 +42,7 @@ public final class DisplayHintStatementSupport @Override protected DisplayHintStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new DisplayHintStatementImpl(ctx.coerceRawStatementArgument(), substatements); + return new DisplayHintStatementImpl(ctx.getRawArgument(), substatements); } @Override diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/ImpliedStatementSupport.java b/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/ImpliedStatementSupport.java index 787fdb0f94..12dba310d1 100644 --- a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/ImpliedStatementSupport.java +++ b/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/ImpliedStatementSupport.java @@ -42,7 +42,7 @@ public final class ImpliedStatementSupport @Override protected ImpliedStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new ImpliedStatementImpl(ctx.coerceRawStatementArgument(), substatements); + return new ImpliedStatementImpl(ctx.getRawArgument(), substatements); } @Override diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/MaxAccessStatementSupport.java b/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/MaxAccessStatementSupport.java index 2a8bdead01..23d260879f 100644 --- a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/MaxAccessStatementSupport.java +++ b/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/MaxAccessStatementSupport.java @@ -40,7 +40,7 @@ public final class MaxAccessStatementSupport public MaxAccess parseArgumentValue(final StmtContext ctx, final String value) { final MaxAccess val = MaxAccess.forStringLiteral(value); if (val == null) { - throw new SourceException(ctx.getStatementSourceReference(), "Invalid max-access value '%s'", value); + throw new SourceException(ctx.sourceReference(), "Invalid max-access value '%s'", value); } return val; } @@ -59,7 +59,7 @@ public final class MaxAccessStatementSupport @Override protected MaxAccessStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new MaxAccessStatementImpl(ctx.coerceStatementArgument(), substatements); + return new MaxAccessStatementImpl(ctx.getArgument(), substatements); } @Override diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/OidStatementSupport.java b/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/OidStatementSupport.java index 832db8c838..858c80f818 100644 --- a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/OidStatementSupport.java +++ b/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/OidStatementSupport.java @@ -41,7 +41,7 @@ public final class OidStatementSupport try { return ObjectIdentifier.forString(value); } catch (IllegalArgumentException e) { - throw new SourceException(ctx.getStatementSourceReference(), e, "Invalid object identifier '%s'", value); + throw new SourceException(ctx.sourceReference(), e, "Invalid object identifier '%s'", value); } } @@ -53,7 +53,7 @@ public final class OidStatementSupport @Override protected OidStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new OidIdStatementImpl(ctx.coerceStatementArgument(), substatements); + return new OidIdStatementImpl(ctx.getArgument(), substatements); } @Override diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/SubIdStatementSupport.java b/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/SubIdStatementSupport.java index 3b782e4966..b90058069f 100644 --- a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/SubIdStatementSupport.java +++ b/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/SubIdStatementSupport.java @@ -48,7 +48,7 @@ public final class SubIdStatementSupport @Override protected SubIdStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new SubIdStatementImpl(ctx.coerceStatementArgument(), substatements); + return new SubIdStatementImpl(ctx.getArgument(), substatements); } @Override diff --git a/yang/rfc7952-parser-support/src/main/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationStatementSupport.java b/yang/rfc7952-parser-support/src/main/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationStatementSupport.java index 14b8783f6e..6436e44e08 100644 --- a/yang/rfc7952-parser-support/src/main/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationStatementSupport.java +++ b/yang/rfc7952-parser-support/src/main/java/org/opendaylight/yangtools/rfc7952/parser/AnnotationStatementSupport.java @@ -63,7 +63,7 @@ public final class AnnotationStatementSupport final StmtContext unitsStmt = StmtContextUtils.findFirstEffectiveSubstatement( stmt.caerbannog(), UnitsStatement.class); if (unitsStmt != null) { - builder.setUnits(unitsStmt.getStatementArgument()); + builder.setUnits(unitsStmt.argument()); } type = builder.build(); } @@ -123,10 +123,9 @@ public final class AnnotationStatementSupport @Override public void onStatementAdded(final Mutable stmt) { - final StatementDefinition parentDef = stmt.coerceParentContext().getPublicDefinition(); + final StatementDefinition parentDef = stmt.coerceParentContext().publicDefinition(); SourceException.throwIf(YangStmtMapping.MODULE != parentDef && YangStmtMapping.SUBMODULE != parentDef, - stmt.getStatementSourceReference(), - "Annotations may only be defined at root of either a module or a submodule"); + stmt.sourceReference(), "Annotations may only be defined at root of either a module or a submodule"); } @Override @@ -137,7 +136,7 @@ public final class AnnotationStatementSupport @Override protected AnnotationStatement createDeclared(final StmtContext ctx, final ImmutableList> substatements) { - return new Declared(ctx.coerceStatementArgument(), substatements); + return new Declared(ctx.getArgument(), substatements); } @Override diff --git a/yang/rfc8040-parser-support/src/main/java/org/opendaylight/yangtools/rfc8040/parser/YangDataStatementSupport.java b/yang/rfc8040-parser-support/src/main/java/org/opendaylight/yangtools/rfc8040/parser/YangDataStatementSupport.java index 7d35ddc8bd..ec6c27617a 100644 --- a/yang/rfc8040-parser-support/src/main/java/org/opendaylight/yangtools/rfc8040/parser/YangDataStatementSupport.java +++ b/yang/rfc8040-parser-support/src/main/java/org/opendaylight/yangtools/rfc8040/parser/YangDataStatementSupport.java @@ -80,7 +80,7 @@ public final class YangDataStatementSupport @Override protected YangDataStatement createDeclared(@NonNull final StmtContext ctx, final ImmutableList> substatements) { - return new Declared(ctx.coerceRawStatementArgument(), substatements); + return new Declared(ctx.getRawArgument(), substatements); } @Override diff --git a/yang/rfc8528-parser-support/src/main/java/org/opendaylight/yangtools/rfc8528/parser/MountPointStatementSupport.java b/yang/rfc8528-parser-support/src/main/java/org/opendaylight/yangtools/rfc8528/parser/MountPointStatementSupport.java index 8f399231dc..2785a07c04 100644 --- a/yang/rfc8528-parser-support/src/main/java/org/opendaylight/yangtools/rfc8528/parser/MountPointStatementSupport.java +++ b/yang/rfc8528-parser-support/src/main/java/org/opendaylight/yangtools/rfc8528/parser/MountPointStatementSupport.java @@ -94,14 +94,14 @@ public final class MountPointStatementSupport @Override public QName adaptArgumentValue(final StmtContext ctx, final QNameModule targetModule) { - return ctx.coerceStatementArgument().bindTo(targetModule).intern(); + return ctx.getArgument().bindTo(targetModule).intern(); } @Override public void onStatementAdded(final Mutable stmt) { - final StatementDefinition parentDef = stmt.coerceParentContext().getPublicDefinition(); + final StatementDefinition parentDef = stmt.coerceParentContext().publicDefinition(); SourceException.throwIf(YangStmtMapping.CONTAINER != parentDef && YangStmtMapping.LIST != parentDef, - stmt.getStatementSourceReference(), "Mount points may only be defined at either a container or a list"); + stmt.sourceReference(), "Mount points may only be defined at either a container or a list"); } @Override @@ -112,7 +112,7 @@ public final class MountPointStatementSupport @Override protected MountPointStatement createDeclared(@NonNull final StmtContext ctx, final ImmutableList> substatements) { - return new Declared(ctx.coerceStatementArgument(), substatements); + return new Declared(ctx.getArgument(), substatements); } @Override -- 2.36.6