Split out yang-model-ri

[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 9994c085062177f668c07b57ca5c2d4abc386c00..ed276a453ad0201ac39635a519526f4002d326cf 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
@@ -16,13 +16,15 @@ 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.PathEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.PathStatement;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.BaseStatementSupport;
+import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements;
+import org.opendaylight.yangtools.yang.model.ri.stmt.EffectiveStatements;
+import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport;
 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;
 
 public final class PathStatementSupport
-        extends BaseStatementSupport<PathExpression, PathStatement, PathEffectiveStatement> {
+        extends AbstractStatementSupport<PathExpression, PathStatement, PathEffectiveStatement> {
     private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(
         YangStmtMapping.PATH).build();
     private static final PathStatementSupport LENIENT_INSTANCE = new PathStatementSupport(
@@ -33,7 +35,8 @@ public final class PathStatementSupport
     private final PathExpressionParser parser;
 
     private PathStatementSupport(final PathExpressionParser parser) {
-        super(YangStmtMapping.PATH);
+        // TODO: can 'path' really be copied?
+        super(YangStmtMapping.PATH, StatementPolicy.contextIndependent());
         this.parser = requireNonNull(parser);
     }
 
@@ -58,18 +61,17 @@ public final class PathStatementSupport
     @Override
     protected PathStatement createDeclared(final StmtContext<PathExpression, PathStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularPathStatement(ctx.getArgument(), substatements);
+        return DeclaredStatements.createPath(ctx.getArgument(), substatements);
     }
 
     @Override
     protected PathStatement createEmptyDeclared(final StmtContext<PathExpression, PathStatement, ?> ctx) {
-        return new EmptyPathStatement(ctx.getArgument());
+        return DeclaredStatements.createPath(ctx.getArgument());
     }
 
     @Override
     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);
+        return EffectiveStatements.createPath(stmt.declared(), substatements);
     }
 }
\ No newline at end of file