Reuse cardinality constants

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

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AnyxmlStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AnyxmlStatementImpl.java
index db3dc9d211364055db2163bbc4514eb2c4653869..fe30481bbcd5ffc2ab84cc7788abd507253192cd 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AnyxmlStatementImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AnyxmlStatementImpl.java
@@ -7,8 +7,6 @@
  */
 package org.opendaylight.yangtools.yang.parser.stmt.rfc6020;
 
-import static org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator.MAX;
-
 import com.google.common.base.Optional;
 import java.util.Collection;
 import java.util.Map;
@@ -41,18 +39,18 @@ import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.YangModeled
 public class AnyxmlStatementImpl extends AbstractDeclaredStatement<QName> implements AnyxmlStatement {
     private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(Rfc6020Mapping
             .ANYXML)
-            .add(Rfc6020Mapping.CONFIG, 0, 1)
-            .add(Rfc6020Mapping.DESCRIPTION, 0, 1)
-            .add(Rfc6020Mapping.IF_FEATURE, 0, MAX)
-            .add(Rfc6020Mapping.MANDATORY, 0, 1)
-            .add(Rfc6020Mapping.MUST, 0, MAX)
-            .add(Rfc6020Mapping.REFERENCE, 0, 1)
-            .add(Rfc6020Mapping.STATUS, 0, 1)
-            .add(Rfc6020Mapping.WHEN, 0, 1)
-            .add(SupportedExtensionsMapping.ANYXML_SCHEMA_LOCATION, 0, 1)
+            .addOptional(Rfc6020Mapping.CONFIG)
+            .addOptional(Rfc6020Mapping.DESCRIPTION)
+            .addAny(Rfc6020Mapping.IF_FEATURE)
+            .addOptional(Rfc6020Mapping.MANDATORY)
+            .addAny(Rfc6020Mapping.MUST)
+            .addOptional(Rfc6020Mapping.REFERENCE)
+            .addOptional(Rfc6020Mapping.STATUS)
+            .addOptional(Rfc6020Mapping.WHEN)
+            .addOptional(SupportedExtensionsMapping.ANYXML_SCHEMA_LOCATION)
             .build();
 
-    protected AnyxmlStatementImpl(StmtContext<QName, AnyxmlStatement, ?> context) {
+    protected AnyxmlStatementImpl(final StmtContext<QName, AnyxmlStatement, ?> context) {
         super(context);
     }
 
@@ -64,17 +62,17 @@ public class AnyxmlStatementImpl extends AbstractDeclaredStatement<QName> implem
         }
 
         @Override
-        public QName parseArgumentValue(StmtContext<?, ?, ?> ctx, String value) {
+        public QName parseArgumentValue(final StmtContext<?, ?, ?> ctx, final String value) {
             return Utils.qNameFromArgument(ctx, value);
         }
 
         @Override
-        public void onStatementAdded(Mutable<QName, AnyxmlStatement, EffectiveStatement<QName, AnyxmlStatement>> stmt) {
+        public void onStatementAdded(final Mutable<QName, AnyxmlStatement, EffectiveStatement<QName, AnyxmlStatement>> stmt) {
             stmt.getParentContext().addToNs(ChildSchemaNodes.class, stmt.getStatementArgument(), stmt);
         }
 
         @Override
-        public AnyxmlStatement createDeclared(StmtContext<QName, AnyxmlStatement, ?> ctx) {
+        public AnyxmlStatement createDeclared(final StmtContext<QName, AnyxmlStatement, ?> ctx) {
             return new AnyxmlStatementImpl(ctx);
         }
 
@@ -95,15 +93,15 @@ public class AnyxmlStatementImpl extends AbstractDeclaredStatement<QName> implem
         }
 
         @Override
-        public void onFullDefinitionDeclared(Mutable<QName, AnyxmlStatement,
+        public void onFullDefinitionDeclared(final Mutable<QName, AnyxmlStatement,
                 EffectiveStatement<QName, AnyxmlStatement>> stmt) {
             super.onFullDefinitionDeclared(stmt);
             SUBSTATEMENT_VALIDATOR.validate(stmt);
         }
 
         private Optional<ContainerSchemaNode> getAnyXmlSchema(
-                StmtContext<QName, AnyxmlStatement, EffectiveStatement<QName, AnyxmlStatement>> ctx,
-                SchemaNodeIdentifier contentSchemaPath) {
+                final StmtContext<QName, AnyxmlStatement, EffectiveStatement<QName, AnyxmlStatement>> ctx,
+                final SchemaNodeIdentifier contentSchemaPath) {
             final StatementContextBase<?, ?, ?> findNode = Utils.findNode(ctx.getRoot(), contentSchemaPath);
             if (findNode != null) {
                 final EffectiveStatement<?, ?> anyXmlSchemaNode = findNode.buildEffective();