Migrate coerceRawStatementArgument() callers

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

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 2fd845bf93b261d5f9c42db33948228883fe5c0d..eb25cfe7b9dd9a935da8f8b54d0fadbbc1315a88 100644 (file)
--- 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
@@ -9,10 +9,12 @@ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.presence;
 
 import com.google.common.collect.ImmutableList;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
+import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.PresenceEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.PresenceStatement;
 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.StmtContext;
 import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator;
 
@@ -31,32 +33,25 @@ public final class PresenceStatementSupport
     }
 
     @Override
-    public String parseArgumentValue(final StmtContext<?, ?, ?> ctx, final String value) {
-        return value;
+    protected SubstatementValidator getSubstatementValidator() {
+        return SUBSTATEMENT_VALIDATOR;
     }
 
     @Override
-    public PresenceStatement createDeclared(final StmtContext<String, PresenceStatement, ?> ctx) {
-        return new PresenceStatementImpl(ctx);
+    protected PresenceStatement createDeclared(final StmtContext<String, PresenceStatement, ?> ctx,
+            final ImmutableList<? extends DeclaredStatement<?>> substatements) {
+        return new RegularPresenceStatement(ctx.getRawArgument(), substatements);
     }
 
     @Override
-    protected SubstatementValidator getSubstatementValidator() {
-        return SUBSTATEMENT_VALIDATOR;
+    protected PresenceStatement createEmptyDeclared(final StmtContext<String, PresenceStatement, ?> ctx) {
+        return new EmptyPresenceStatement(ctx.getRawArgument());
     }
 
     @Override
-    protected PresenceEffectiveStatement createEffective(
-            final StmtContext<String, PresenceStatement, PresenceEffectiveStatement> ctx,
-            final PresenceStatement declared,
+    protected PresenceEffectiveStatement createEffective(final Current<String, PresenceStatement> stmt,
             final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
-        return new RegularPresenceEffectiveStatement(declared, substatements);
-    }
-
-    @Override
-    protected PresenceEffectiveStatement createEmptyEffective(
-            final StmtContext<String, PresenceStatement, PresenceEffectiveStatement> ctx,
-            final PresenceStatement declared) {
-        return new EmptyPresenceEffectiveStatement(declared);
+        return substatements.isEmpty() ? new EmptyPresenceEffectiveStatement(stmt.declared())
+            : new RegularPresenceEffectiveStatement(stmt.declared(), substatements);
     }
 }
\ No newline at end of file