Reformulate StatementContextFactory.createEffective()

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

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/default_/DefaultStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/default_/DefaultStatementSupport.java
index a038934eb93e928859629cdbf3310d6d1e4b01ec..cbbd56d4a0f15281964244e8ee8329f4fe676408 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/default_/DefaultStatementSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/default_/DefaultStatementSupport.java
@@ -9,10 +9,12 @@ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.default_;
 
 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.DefaultEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.DefaultStatement;
 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,31 +33,25 @@ public final class DefaultStatementSupport
     }
 
     @Override
-    public String parseArgumentValue(final StmtContext<?, ?, ?> ctx, final String value) {
-        return value;
-    }
-
-    @Override
-    public DefaultStatement createDeclared(final StmtContext<String, DefaultStatement, ?> ctx) {
-        return new DefaultStatementImpl(ctx);
+    protected SubstatementValidator getSubstatementValidator() {
+        return SUBSTATEMENT_VALIDATOR;
     }
 
     @Override
-    protected SubstatementValidator getSubstatementValidator() {
-        return SUBSTATEMENT_VALIDATOR;
+    protected DefaultStatement createDeclared(final StmtContext<String, DefaultStatement, ?> ctx,
+            final ImmutableList<? extends DeclaredStatement<?>> substatements) {
+        return new RegularDefaultStatement(ctx.coerceRawStatementArgument(), substatements);
     }
 
     @Override
-    protected DefaultEffectiveStatement createEffective(
-            final StmtContext<String, DefaultStatement, DefaultEffectiveStatement> ctx,
-            final DefaultStatement declared, final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
-        return new RegularDefaultEffectiveStatement(declared, substatements);
+    protected DefaultStatement createEmptyDeclared(final StmtContext<String, DefaultStatement, ?> ctx) {
+        return new EmptyDefaultStatement(ctx.coerceRawStatementArgument());
     }
 
     @Override
-    protected DefaultEffectiveStatement createEmptyEffective(
-            final StmtContext<String, DefaultStatement, DefaultEffectiveStatement> ctx,
-            final DefaultStatement declared) {
-        return new EmptyDefaultEffectiveStatement(declared);
+    protected DefaultEffectiveStatement createEffective(final Current<String, DefaultStatement> stmt,
+            final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
+        return substatements.isEmpty() ? new EmptyDefaultEffectiveStatement(stmt.declared())
+            : new RegularDefaultEffectiveStatement(stmt.declared(), substatements);
     }
 }
\ No newline at end of file