Eliminate superfluous onFullDefinitionDeclared overrides

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

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IdentityRefSpecificationImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IdentityRefSpecificationImpl.java
index 2deb59dc921133516e27ae36c1d72de7e9855275..de0c513b93f2413e7174dc366a58853b215b2a49 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IdentityRefSpecificationImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IdentityRefSpecificationImpl.java
@@ -10,7 +10,7 @@ package org.opendaylight.yangtools.yang.parser.stmt.rfc6020;
 import com.google.common.base.Preconditions;
 import javax.annotation.Nonnull;
 import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping;
+import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.BaseStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.IdentityStatement;
@@ -24,13 +24,13 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils;
 import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.type.IdentityRefSpecificationEffectiveStatementImpl;
 
 public class IdentityRefSpecificationImpl extends AbstractDeclaredStatement<String> implements TypeStatement.IdentityRefSpecification {
-    private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(Rfc6020Mapping
+    private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(YangStmtMapping
             .TYPE)
-            .add(Rfc6020Mapping.BASE, 1, 1)
+            .addMandatory(YangStmtMapping.BASE)
             .build();
 
     protected IdentityRefSpecificationImpl(
-            StmtContext<String, TypeStatement.IdentityRefSpecification, ?> context) {
+            final StmtContext<String, TypeStatement.IdentityRefSpecification, ?> context) {
         super(context);
     }
 
@@ -39,30 +39,32 @@ public class IdentityRefSpecificationImpl extends AbstractDeclaredStatement<Stri
             AbstractStatementSupport<String, TypeStatement.IdentityRefSpecification, EffectiveStatement<String, TypeStatement.IdentityRefSpecification>> {
 
         public Definition() {
-            super(Rfc6020Mapping.TYPE);
+            super(YangStmtMapping.TYPE);
         }
 
         @Override
-        public String parseArgumentValue(StmtContext<?, ?, ?> ctx, String value) {
+        public String parseArgumentValue(final StmtContext<?, ?, ?> ctx, final String value) {
             return value;
         }
 
         @Override
         public TypeStatement.IdentityRefSpecification createDeclared(
-                StmtContext<String, TypeStatement.IdentityRefSpecification, ?> ctx) {
+                final StmtContext<String, TypeStatement.IdentityRefSpecification, ?> ctx) {
             return new IdentityRefSpecificationImpl(ctx);
         }
 
         @Override
         public EffectiveStatement<String, TypeStatement.IdentityRefSpecification> createEffective(
-                StmtContext<String, TypeStatement.IdentityRefSpecification, EffectiveStatement<String, TypeStatement
+                final StmtContext<String, TypeStatement.IdentityRefSpecification, EffectiveStatement<String, TypeStatement
                         .IdentityRefSpecification>> ctx) {
             return new IdentityRefSpecificationEffectiveStatementImpl(ctx);
         }
 
         @Override
-        public void onFullDefinitionDeclared(StmtContext.Mutable<String, IdentityRefSpecification,
+        public void onFullDefinitionDeclared(final StmtContext.Mutable<String, IdentityRefSpecification,
                 EffectiveStatement<String, IdentityRefSpecification>> stmt) {
+            super.onFullDefinitionDeclared(stmt);
+
             final StmtContext<QName, ?, ?> baseStmt = StmtContextUtils.findFirstDeclaredSubstatement(stmt,
                     BaseStatement.class);
             Preconditions.checkArgument(baseStmt != null, "The \"base\" statement, which is a substatement to the " +
@@ -77,13 +79,12 @@ public class IdentityRefSpecificationImpl extends AbstractDeclaredStatement<Stri
         }
 
         @Override
-        public void onStatementDefinitionDeclared(StmtContext.Mutable<String, IdentityRefSpecification,
-                EffectiveStatement<String, IdentityRefSpecification>> stmt) {
-            super.onStatementDefinitionDeclared(stmt);
-            SUBSTATEMENT_VALIDATOR.validate(stmt);
+        protected SubstatementValidator getSubstatementValidator() {
+            return SUBSTATEMENT_VALIDATOR;
         }
     }
 
+    @Nonnull
     @Override
     public String getName() {
         return argument();