Reformulate StatementContextFactory.createEffective()

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

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/PathStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/PathStatementSupport.java
index d6f2b7c2ce02de5757c821ceca826bf3b86084b3..ff99dbcf0594ee6472304d97c025991d829e073b 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/PathStatementSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/PathStatementSupport.java
@@ -17,6 +17,7 @@ import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.PathEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.PathStatement;
 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;
 
@@ -66,16 +67,9 @@ public final class PathStatementSupport
     }
 
     @Override
-    protected PathEffectiveStatement createEffective(
-            final StmtContext<PathExpression, PathStatement, PathEffectiveStatement> ctx,
-            final PathStatement declared, final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
-        return new RegularPathEffectiveStatement(declared, substatements);
-    }
-
-    @Override
-    protected PathEffectiveStatement createEmptyEffective(
-            final StmtContext<PathExpression, PathStatement, PathEffectiveStatement> ctx,
-            final PathStatement declared) {
-        return new EmptyPathEffectiveStatement(declared);
+    protected PathEffectiveStatement createEffective(final Current<PathExpression, PathStatement> stmt,
+            final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
+        return substatements.isEmpty() ? new EmptyPathEffectiveStatement(stmt.declared())
+            : new RegularPathEffectiveStatement(stmt.declared(), substatements);
     }
 }
\ No newline at end of file