More deprecated method migration

Sweep extension supports for use of deprecated methods.

Change-Id: Ibe405e78f499cc1c1f213b02363a34fd2e224c55
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

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 771a46b264a23b4dd42f5fe6a64e8d3c49416f7d..a07093a84f42b7b8ab0e9837c5e28d0ae48c805a 100644 (file)
--- 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<SchemaNodeIdentifier, AnyxmlSchemaLocationStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> 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 237d7ba4ae813701be2af288363021689b16628c..e63e60d219d2cbec258d21b6ab8c18c24ff8e2f7 100644 (file)
--- 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<ContainerSchemaNode> 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 5c67784b1ade4a1e2fb374bf937308d9b91ce75e..1ddc8ed2fca01dfbc884c144e1ef25731beac265 100644 (file)
--- 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 234025a550f7188729e78c9cb11882114101d381..7dc966f19b06634ad10220ab863710fe106fce85 100644 (file)
--- 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<String, AliasStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> 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 a9659df947609739c284921f6de3940632dea8da..97954128df61d10c9f5ae7f3088a9473089785ab 100644 (file)
--- 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<String, DefValStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> 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 0bfa27dcdf4c76a89cdda7ca242e07d984ff8447..baf77f9d16ced430faa0eb435f50209ec30b88b3 100644 (file)
--- 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<String, DisplayHintStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> 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 787fdb0f943232f3840d3b0904e09bbd5df4da45..12dba310d122357039ad174db88153db835abf88 100644 (file)
--- 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<String, ImpliedStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> 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 2a8bdead01bd014b8076defaee87dcc518420bd4..23d260879fbe4791f2415c5b61a470a8196dd779 100644 (file)
--- 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<MaxAccess, MaxAccessStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> 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 832db8c838de735aded7aed109dc7723162d0480..858c80f81828c7abfad4fabd53e40bd3e3233e27 100644 (file)
--- 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<ObjectIdentifier, OidStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> 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 3b782e4966cb89698c84eee121695b577690e4a1..b90058069fb69cff30bcff95da19cad4eff74b37 100644 (file)
--- 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<Uint32, SubIdStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> 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 14b8783f6e0ea161f1112f2d19700f0076f8f85e..6436e44e0862bf51f18b3b85ff7685b3180cb140 100644 (file)
--- 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<String, ?, ?> 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<QName, AnnotationStatement, AnnotationEffectiveStatement> 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<QName, AnnotationStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> 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 7d35ddc8bd993b85de7007125f638b12081f1d44..ec6c27617a97813ce4484b9f21b1fd433c967590 100644 (file)
--- 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<String, YangDataStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> 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 8f399231dc2bef2d499ff47fbd67cab526bab90b..2785a07c04239ae9d4e438d7ea560cd2825c57d6 100644 (file)
--- 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<QName, MountPointStatement, MountPointEffectiveStatement> ctx,
             final QNameModule targetModule) {
-        return ctx.coerceStatementArgument().bindTo(targetModule).intern();
+        return ctx.getArgument().bindTo(targetModule).intern();
     }
 
     @Override
     public void onStatementAdded(final Mutable<QName, MountPointStatement, MountPointEffectiveStatement> 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<QName, MountPointStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new Declared(ctx.coerceStatementArgument(), substatements);
+        return new Declared(ctx.getArgument(), substatements);
     }
 
     @Override