Migrate coerceStatementArgument() callers

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

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/status/StatusStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/status/StatusStatementSupport.java
index 3d45d44b05edade9e7ceb7c1984ca9ade8ed5672..c0c6f6f6410d84c7718171286b716830b0fab9d8 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/status/StatusStatementSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/status/StatusStatementSupport.java
@@ -16,6 +16,7 @@ import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.StatusEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.StatusStatement;
 import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.BaseStatementSupport;
+import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
 import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator;
 import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
@@ -62,7 +63,7 @@ public final class StatusStatementSupport
             case "obsolete":
                 return Status.OBSOLETE;
             default:
-                throw new SourceException(ctx.getStatementSourceReference(),
+                throw new SourceException(ctx.sourceReference(),
                     "Invalid status '%s', must be one of 'current', 'deprecated' or 'obsolete'", value);
         }
     }
@@ -88,12 +89,12 @@ public final class StatusStatementSupport
     @Override
     protected StatusStatement createDeclared(final StmtContext<Status, StatusStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularStatusStatement(ctx.coerceStatementArgument(), substatements);
+        return new RegularStatusStatement(ctx.getArgument(), substatements);
     }
 
     @Override
     protected StatusStatement createEmptyDeclared(final StmtContext<Status, StatusStatement, ?> ctx) {
-        final Status argument = ctx.coerceStatementArgument();
+        final Status argument = ctx.getArgument();
         switch (argument) {
             case CURRENT:
                 return EMPTY_CURRENT_DECL;
@@ -107,15 +108,13 @@ public final class StatusStatementSupport
     }
 
     @Override
-    protected StatusEffectiveStatement createEffective(
-            final StmtContext<Status, StatusStatement, StatusEffectiveStatement> ctx, final StatusStatement declared,
+    protected StatusEffectiveStatement createEffective(final Current<Status, StatusStatement> stmt,
             final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
-        return new RegularStatusEffectiveStatement(declared, substatements);
+        return substatements.isEmpty() ? createEmptyEffective(stmt.declared())
+            : new RegularStatusEffectiveStatement(stmt.declared(), substatements);
     }
 
-    @Override
-    protected StatusEffectiveStatement createEmptyEffective(
-            final StmtContext<Status, StatusStatement, StatusEffectiveStatement> ctx, final StatusStatement declared) {
+    private static @NonNull StatusEffectiveStatement createEmptyEffective(final StatusStatement declared) {
         // Aggressively reuse effective instances which are backed by the corresponding empty declared instance, as this
         // is the case unless there is a weird extension in use.
         if (EMPTY_DEPRECATED_DECL.equals(declared)) {