Bug 4646: Parser accepts invalid models

[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 a06463a7d5e75aad6f838eb566bae3feb187f789..de9ea479bb9a98a884baf9253534996e8f1396fa 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
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.yangtools.yang.parser.stmt.rfc6020;
 
+import static org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator.MAX;
+
 import com.google.common.base.Verify;
 import java.util.Collection;
 import javax.annotation.Nonnull;
@@ -31,6 +33,7 @@ import org.opendaylight.yangtools.yang.model.api.type.LeafrefTypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.StringTypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.UnsignedIntegerTypeDefinition;
+import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator;
 import org.opendaylight.yangtools.yang.parser.spi.TypeNamespace;
 import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement;
 import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport;
@@ -60,6 +63,19 @@ import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.type.Unsign
 
 public class TypeStatementImpl extends AbstractDeclaredStatement<String>
         implements TypeStatement {
+    private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(Rfc6020Mapping
+            .TYPE)
+            .add(Rfc6020Mapping.BASE, 0, 1)
+            .add(Rfc6020Mapping.BIT, 0, MAX)
+            .add(Rfc6020Mapping.ENUM, 0, MAX)
+            .add(Rfc6020Mapping.FRACTION_DIGITS, 0, 1)
+            .add(Rfc6020Mapping.LENGTH, 0, 1)
+            .add(Rfc6020Mapping.PATH, 0, 1)
+            .add(Rfc6020Mapping.PATTERN, 0, MAX)
+            .add(Rfc6020Mapping.RANGE, 0, 1)
+            .add(Rfc6020Mapping.REQUIRE_INSTANCE, 0, 1)
+            .add(Rfc6020Mapping.TYPE, 0, MAX)
+            .build();
 
     protected TypeStatementImpl(final StmtContext<String, TypeStatement, ?> context) {
         super(context);
@@ -185,6 +201,7 @@ public class TypeStatementImpl extends AbstractDeclaredStatement<String>
         public void onFullDefinitionDeclared(
                 final Mutable<String, TypeStatement, EffectiveStatement<String, TypeStatement>> stmt)
                 throws SourceException {
+            SUBSTATEMENT_VALIDATOR.validate(stmt);
 
             // if it is yang built-in type, no prerequisite is needed, so simply return
             if (TypeUtils.isYangBuiltInTypeString(stmt.getStatementArgument())) {
@@ -224,4 +241,4 @@ public class TypeStatementImpl extends AbstractDeclaredStatement<String>
     public String getName() {
         return argument();
     }
-}
+}
\ No newline at end of file