Remove AbstractStatementSupport.createEmptyDeclared()

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

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/InstanceIdentifierSpecificationSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/InstanceIdentifierSpecificationSupport.java
index 006b741f11f4b33e0f0bdfcaa171ff877e1ad141..785ae274a43871f0f6310e051fea4dea216fbe23 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/InstanceIdentifierSpecificationSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/InstanceIdentifierSpecificationSupport.java
@@ -13,28 +13,24 @@ 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.RequireInstanceEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.TypeStatement.InstanceIdentifierSpecification;
-import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
-import org.opendaylight.yangtools.yang.model.util.type.InstanceIdentifierTypeBuilder;
-import org.opendaylight.yangtools.yang.model.util.type.RestrictedTypes;
-import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport;
+import org.opendaylight.yangtools.yang.model.ri.type.BaseTypes;
+import org.opendaylight.yangtools.yang.model.ri.type.InstanceIdentifierTypeBuilder;
+import org.opendaylight.yangtools.yang.model.ri.type.RestrictedTypes;
+import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStringStatementSupport;
 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;
 
-final class InstanceIdentifierSpecificationSupport extends AbstractStatementSupport<String,
-        InstanceIdentifierSpecification, EffectiveStatement<String, InstanceIdentifierSpecification>> {
+final class InstanceIdentifierSpecificationSupport
+        extends AbstractStringStatementSupport<InstanceIdentifierSpecification,
+            EffectiveStatement<String, InstanceIdentifierSpecification>> {
     private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(
         YangStmtMapping.TYPE)
         .addOptional(YangStmtMapping.REQUIRE_INSTANCE)
         .build();
 
     InstanceIdentifierSpecificationSupport() {
-        super(YangStmtMapping.TYPE, StatementPolicy.contextIndependent());
-    }
-
-    @Override
-    public String parseArgumentValue(final StmtContext<?, ?, ?> ctx, final String value) {
-        return value;
+        super(YangStmtMapping.TYPE, StatementPolicy.exactReplica());
     }
 
     @Override
@@ -46,13 +42,8 @@ final class InstanceIdentifierSpecificationSupport extends AbstractStatementSupp
     protected InstanceIdentifierSpecification createDeclared(
             final StmtContext<String, InstanceIdentifierSpecification, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularInstanceIdentifierSpecification(ctx.getRawArgument(), substatements);
-    }
-
-    @Override
-    protected InstanceIdentifierSpecification createEmptyDeclared(
-            final StmtContext<String, InstanceIdentifierSpecification, ?> ctx) {
-        return new EmptyIdentifierSpecification(ctx.getRawArgument());
+        return substatements.isEmpty() ? new EmptyIdentifierSpecification(ctx.getRawArgument())
+            : new RegularInstanceIdentifierSpecification(ctx.getRawArgument(), substatements);
     }
 
     @Override