Optimize path statement implementations

[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 4e9cc5098f46d35e6c33b0800743424db0f5c4ca..d6f2b7c2ce02de5757c821ceca826bf3b86084b3 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
@@ -7,49 +7,75 @@
  */
 package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.path;
 
-import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath;
+import static java.util.Objects.requireNonNull;
+
+import com.google.common.collect.ImmutableList;
+import org.opendaylight.yangtools.yang.model.api.PathExpression;
 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.PathEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.PathStatement;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.ArgumentUtils;
-import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.BaseStatementSupport;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
 import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator;
 
-public final class PathStatementSupport extends AbstractStatementSupport<RevisionAwareXPath, PathStatement,
-        EffectiveStatement<RevisionAwareXPath, PathStatement>> {
-    private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(YangStmtMapping
-        .PATH)
-        .build();
-    private static final PathStatementSupport INSTANCE = new PathStatementSupport();
+public final class PathStatementSupport
+        extends BaseStatementSupport<PathExpression, PathStatement, PathEffectiveStatement> {
+    private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(
+        YangStmtMapping.PATH).build();
+    private static final PathStatementSupport LENIENT_INSTANCE = new PathStatementSupport(
+        new PathExpressionParser.Lenient());
+    private static final PathStatementSupport STRICT_INSTANCE = new PathStatementSupport(
+        new PathExpressionParser());
+
+    private final PathExpressionParser parser;
 
-    private PathStatementSupport() {
+    private PathStatementSupport(final PathExpressionParser parser) {
         super(YangStmtMapping.PATH);
+        this.parser = requireNonNull(parser);
+    }
+
+    public static PathStatementSupport lenientInstance() {
+        return LENIENT_INSTANCE;
     }
 
-    public static PathStatementSupport getInstance() {
-        return INSTANCE;
+    public static PathStatementSupport strictInstance() {
+        return STRICT_INSTANCE;
     }
 
     @Override
-    public RevisionAwareXPath parseArgumentValue(final StmtContext<?, ?, ?> ctx, final String value) {
-        return ArgumentUtils.parseXPath(ctx, value);
+    public PathExpression parseArgumentValue(final StmtContext<?, ?, ?> ctx, final String value) {
+        return parser.parseExpression(ctx, value);
     }
 
     @Override
-    public PathStatement createDeclared(final StmtContext<RevisionAwareXPath, PathStatement, ?> ctx) {
-        return new PathStatementImpl(ctx);
+    protected SubstatementValidator getSubstatementValidator() {
+        return SUBSTATEMENT_VALIDATOR;
     }
 
     @Override
-    public EffectiveStatement<RevisionAwareXPath, PathStatement> createEffective(
-            final StmtContext<RevisionAwareXPath, PathStatement,
-            EffectiveStatement<RevisionAwareXPath, PathStatement>> ctx) {
-        return new PathEffectiveStatementImpl(ctx);
+    protected PathStatement createDeclared(final StmtContext<PathExpression, PathStatement, ?> ctx,
+            final ImmutableList<? extends DeclaredStatement<?>> substatements) {
+        return new RegularPathStatement(ctx.coerceStatementArgument(), substatements);
     }
 
     @Override
-    protected SubstatementValidator getSubstatementValidator() {
-        return SUBSTATEMENT_VALIDATOR;
+    protected PathStatement createEmptyDeclared(final StmtContext<PathExpression, PathStatement, ?> ctx) {
+        return new EmptyPathStatement(ctx.coerceStatementArgument());
+    }
+
+    @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);
     }
 }
\ No newline at end of file