BUG-7052: Move qnameFromArgument to StmtContextUtils

[yangtools.git] / yang / yang-parser-impl / src / main / java / org / opendaylight / yangtools / yang / parser / stmt / rfc6020 / TypeStatementImpl.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/TypeStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/TypeStatementImpl.java
index 31555969d7c920ecb531d24759b37bb1e4901472..86f4ef8c58be7bd7e54ceda86ad8d626904f1559 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/TypeStatementImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/TypeStatementImpl.java
@@ -8,7 +8,9 @@
 package org.opendaylight.yangtools.yang.parser.stmt.rfc6020;
 
 import com.google.common.base.Verify;
+import com.google.common.collect.ImmutableMap;
 import java.util.Collection;
+import java.util.Map;
 import javax.annotation.Nonnull;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
@@ -38,10 +40,13 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport;
 import org.opendaylight.yangtools.yang.parser.spi.meta.InferenceException;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ModelActionBuilder;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ModelActionBuilder.InferenceAction;
+import org.opendaylight.yangtools.yang.parser.spi.meta.ModelActionBuilder.InferenceContext;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ModelActionBuilder.Prerequisite;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ModelProcessingPhase;
+import org.opendaylight.yangtools.yang.parser.spi.meta.StatementSupport;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable;
+import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils;
 import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
 import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.TypeDefEffectiveStatementImpl;
 import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.type.BinaryTypeEffectiveStatementImpl;
@@ -83,6 +88,16 @@ public class TypeStatementImpl extends AbstractDeclaredStatement<String>
             extends
             AbstractStatementSupport<String, TypeStatement, EffectiveStatement<String, TypeStatement>> {
 
+        private static final Map<String, StatementSupport<?, ?, ?>> ARGUMENT_SPECIFIC_SUPPORTS = ImmutableMap
+                .<String, StatementSupport<?, ?, ?>> builder()
+                .put(TypeUtils.DECIMAL64, new Decimal64SpecificationImpl.Definition())
+                .put(TypeUtils.UNION, new UnionSpecificationImpl.Definition())
+                .put(TypeUtils.ENUMERATION, new EnumSpecificationImpl.Definition())
+                .put(TypeUtils.LEAF_REF, new LeafrefSpecificationImpl.Definition())
+                .put(TypeUtils.BITS, new BitsSpecificationImpl.Definition())
+                .put(TypeUtils.IDENTITY_REF, new IdentityRefSpecificationImpl.Definition())
+                .put(TypeUtils.INSTANCE_IDENTIFIER, new InstanceIdentifierSpecificationImpl.Definition()).build();
+
         public Definition() {
             super(YangStmtMapping.TYPE);
         }
@@ -144,7 +159,7 @@ public class TypeStatementImpl extends AbstractDeclaredStatement<String>
                 typeStmt = BuiltinEffectiveStatements.UINT64;
                 break;
             default:
-                final QName qname = Utils.qNameFromArgument(ctx, ctx.getStatementArgument());
+                final QName qname = StmtContextUtils.qnameFromArgument(ctx, ctx.getStatementArgument());
                 final StmtContext<?, TypedefStatement, TypedefEffectiveStatement> typedef =
                         ctx.getFromNamespace(TypeNamespace.class, qname);
                 SourceException.throwIfNull(typedef, ctx.getStatementSourceReference(), "Type '%s' not found", qname);
@@ -194,14 +209,14 @@ public class TypeStatementImpl extends AbstractDeclaredStatement<String>
         @Override
         public void onFullDefinitionDeclared(
                 final Mutable<String, TypeStatement, EffectiveStatement<String, TypeStatement>> stmt) {
-            getSubstatementValidator().validate(stmt);
+            super.onFullDefinitionDeclared(stmt);
 
             // if it is yang built-in type, no prerequisite is needed, so simply return
             if (TypeUtils.isYangBuiltInTypeString(stmt.getStatementArgument())) {
                 return;
             }
 
-            final QName typeQName = Utils.qNameFromArgument(stmt, stmt.getStatementArgument());
+            final QName typeQName = StmtContextUtils.qnameFromArgument(stmt, stmt.getStatementArgument());
             final ModelActionBuilder typeAction = stmt.newInferenceAction(ModelProcessingPhase.EFFECTIVE_MODEL);
             final Prerequisite<StmtContext<?, ?, ?>> typePrereq = typeAction.requiresCtx(stmt, TypeNamespace.class,
                     typeQName, ModelProcessingPhase.EFFECTIVE_MODEL);
@@ -213,7 +228,7 @@ public class TypeStatementImpl extends AbstractDeclaredStatement<String>
              */
             typeAction.apply(new InferenceAction() {
                 @Override
-                public void apply() {
+                public void apply(final InferenceContext ctx) {
                     // Intentional NOOP
                 }
 
@@ -229,6 +244,22 @@ public class TypeStatementImpl extends AbstractDeclaredStatement<String>
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;
         }
+
+        @Override
+        public boolean hasArgumentSpecificSupports() {
+            return !ARGUMENT_SPECIFIC_SUPPORTS.isEmpty();
+        }
+
+        @Override
+        public StatementSupport<?, ?, ?> getSupportSpecificForArgument(final String argument) {
+            return ARGUMENT_SPECIFIC_SUPPORTS.get(argument);
+        }
+
+        @Override
+        public String internArgument(final String rawArgument) {
+            final String found = TypeUtils.findBuiltinString(rawArgument);
+            return found != null ? found : rawArgument;
+        }
     }
 
     @Nonnull