Migrate coerceStatementArgument() callers

[yangtools.git] / yang / yang-parser-rfc7950 / src / main / java / org / opendaylight / yangtools / yang / parser / rfc7950 / stmt / belongs_to / BelongsToStatementSupport.java

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 9813dca4daa22550f2c35bfe30842862cc3e7579..6a8ef1727c6fdf59aa438fef83e4140130954926 100644 (file)
--- 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
@@ -20,6 +20,7 @@ import org.opendaylight.yangtools.yang.model.api.stmt.PrefixStatement;
 import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier;
 import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier;
 import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.BaseStringStatementSupport;
+import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current;
 import org.opendaylight.yangtools.yang.parser.spi.meta.InferenceException;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ModelActionBuilder;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ModelActionBuilder.InferenceAction;
@@ -58,8 +59,7 @@ public final class BelongsToStatementSupport
 
         final SourceIdentifier belongsToSourceIdentifier = getSourceIdentifier(belongsToCtx);
         final Prerequisite<StmtContext<?, ?, ?>> belongsToPrereq = belongsToAction.requiresCtx(belongsToCtx,
-            ModuleNamespaceForBelongsTo.class, belongsToCtx.coerceStatementArgument(),
-            ModelProcessingPhase.SOURCE_LINKAGE);
+            ModuleNamespaceForBelongsTo.class, belongsToCtx.getArgument(), ModelProcessingPhase.SOURCE_LINKAGE);
 
         belongsToAction.apply(new InferenceAction() {
             @Override
@@ -68,15 +68,15 @@ public final class BelongsToStatementSupport
 
                 belongsToCtx.addToNs(BelongsToModuleContext.class, belongsToSourceIdentifier, belongsToModuleCtx);
                 belongsToCtx.addToNs(BelongsToPrefixToModuleCtx.class,
-                    findFirstDeclaredSubstatement(belongsToCtx, PrefixStatement.class).coerceStatementArgument(),
+                    findFirstDeclaredSubstatement(belongsToCtx, PrefixStatement.class).getArgument(),
                     belongsToModuleCtx);
             }
 
             @Override
             public void prerequisiteFailed(final Collection<? extends Prerequisite<?>> failed) {
                 if (failed.contains(belongsToPrereq)) {
-                    throw new InferenceException(belongsToCtx.getStatementSourceReference(),
-                        "Module '%s' from belongs-to was not found", belongsToCtx.getStatementArgument());
+                    throw new InferenceException(belongsToCtx.sourceReference(),
+                        "Module '%s' from belongs-to was not found", belongsToCtx.argument());
                 }
             }
         });
@@ -85,31 +85,24 @@ 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
-    protected BelongsToEffectiveStatement createEffective(
-            final StmtContext<String, BelongsToStatement, BelongsToEffectiveStatement> ctx,
-            final BelongsToStatement declared, final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
-        return new RegularBelongsToEffectiveStatement(declared, substatements);
-    }
-
-    @Override
-    protected BelongsToEffectiveStatement createEmptyEffective(
-            final StmtContext<String, BelongsToStatement, BelongsToEffectiveStatement> ctx,
-            final BelongsToStatement declared) {
-        return new EmptyBelongsToEffectiveStatement(declared);
+    protected BelongsToEffectiveStatement createEffective(final Current<String, BelongsToStatement> stmt,
+            final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
+        return substatements.isEmpty() ? new EmptyBelongsToEffectiveStatement(stmt.declared())
+            : new RegularBelongsToEffectiveStatement(stmt.declared(), substatements);
     }
 
     private static SourceIdentifier getSourceIdentifier(final StmtContext<String, BelongsToStatement,
             BelongsToEffectiveStatement> belongsToCtx) {
-        return RevisionSourceIdentifier.create(belongsToCtx.coerceStatementArgument());
+        return RevisionSourceIdentifier.create(belongsToCtx.getArgument());
     }
 
     @Override