Reuse cardinality constants

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

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/StringRestrictionsImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/StringRestrictionsImpl.java
index 58a55cd70a500b72cf7c052de9bf1d541c618aec..b57bf59c80e29b91e719d4e8587e7db9becefd3a 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/StringRestrictionsImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/StringRestrictionsImpl.java
@@ -7,8 +7,6 @@
  */
 package org.opendaylight.yangtools.yang.parser.stmt.rfc6020;
 
-import static org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator.MAX;
-
 import java.util.Collection;
 import org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
@@ -25,11 +23,11 @@ public class StringRestrictionsImpl extends AbstractDeclaredStatement<String> im
         TypeStatement.StringRestrictions {
     private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(Rfc6020Mapping
             .TYPE)
-            .add(Rfc6020Mapping.LENGTH, 0, 1)
-            .add(Rfc6020Mapping.PATTERN, 0, MAX)
+            .addOptional(Rfc6020Mapping.LENGTH)
+            .addAny(Rfc6020Mapping.PATTERN)
             .build();
 
-    protected StringRestrictionsImpl(StmtContext<String, TypeStatement.StringRestrictions, ?> context) {
+    protected StringRestrictionsImpl(final StmtContext<String, TypeStatement.StringRestrictions, ?> context) {
         super(context);
     }
 
@@ -42,24 +40,24 @@ public class StringRestrictionsImpl extends AbstractDeclaredStatement<String> im
         }
 
         @Override
-        public String parseArgumentValue(StmtContext<?, ?, ?> ctx, String value) {
+        public String parseArgumentValue(final StmtContext<?, ?, ?> ctx, final String value) {
             return value;
         }
 
         @Override
         public TypeStatement.StringRestrictions createDeclared(
-                StmtContext<String, TypeStatement.StringRestrictions, ?> ctx) {
+                final StmtContext<String, TypeStatement.StringRestrictions, ?> ctx) {
             return new StringRestrictionsImpl(ctx);
         }
 
         @Override
         public EffectiveStatement<String, TypeStatement.StringRestrictions> createEffective(
-                StmtContext<String, TypeStatement.StringRestrictions, EffectiveStatement<String, TypeStatement.StringRestrictions>> ctx) {
+                final StmtContext<String, TypeStatement.StringRestrictions, EffectiveStatement<String, TypeStatement.StringRestrictions>> ctx) {
             return new StringRestrictionsEffectiveStatementImpl(ctx);
         }
 
         @Override
-        public void onFullDefinitionDeclared(StmtContext.Mutable<String, StringRestrictions,
+        public void onFullDefinitionDeclared(final StmtContext.Mutable<String, StringRestrictions,
                 EffectiveStatement<String, StringRestrictions>> stmt) {
             super.onFullDefinitionDeclared(stmt);
             SUBSTATEMENT_VALIDATOR.validate(stmt);