Reformulate StatementContextFactory.createEffective()

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

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/must/MustStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/must/MustStatementSupport.java
index 5b43cb6f259c010062e331847e1d3252b5f781f8..33ea81a6ba1bfd0fc99343d73d7256ac692259d8 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/must/MustStatementSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/must/MustStatementSupport.java
@@ -18,6 +18,7 @@ import org.opendaylight.yangtools.yang.model.api.stmt.MustEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.MustStatement;
 import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.BaseStatementSupport;
 import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.XPathSupport;
+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.xpath.api.YangXPathExpression.QualifiedBound;
@@ -65,16 +66,9 @@ public final class MustStatementSupport
     }
 
     @Override
-    protected MustEffectiveStatement createEffective(
-            final StmtContext<QualifiedBound, MustStatement, MustEffectiveStatement> ctx,
-            final MustStatement declared, final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
-        return new RegularMustEffectiveStatement(declared, substatements);
-    }
-
-    @Override
-    protected MustEffectiveStatement createEmptyEffective(
-            final StmtContext<QualifiedBound, MustStatement, MustEffectiveStatement> ctx,
-            final MustStatement declared) {
-        return new EmptyMustEffectiveStatement(declared);
+    protected MustEffectiveStatement createEffective(final Current<QualifiedBound, MustStatement> stmt,
+            final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
+        return substatements.isEmpty() ? new EmptyMustEffectiveStatement(stmt.declared())
+            : new RegularMustEffectiveStatement(stmt.declared(), substatements);
     }
 }
\ No newline at end of file