Centralize substatement validators
[yangtools.git] / yang / yang-parser-rfc7950 / src / main / java / org / opendaylight / yangtools / yang / parser / rfc7950 / stmt / meta / IdentityStatementSupport.java
index e8ed3225affc6f4771b37cbb316a12e6d5ed1c47..cf25d187402c7d9a62e9ea69298e73245b9cafa6 100644 (file)
@@ -9,7 +9,6 @@ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.meta;
 
 import static com.google.common.base.Verify.verify;
 import static com.google.common.base.Verify.verifyNotNull;
-import static java.util.Objects.requireNonNull;
 
 import com.google.common.annotations.Beta;
 import com.google.common.collect.ImmutableList;
@@ -61,11 +60,8 @@ public final class IdentityStatementSupport
             .addOptional(YangStmtMapping.STATUS)
             .build();
 
-    private final SubstatementValidator validator;
-
     private IdentityStatementSupport(final YangParserConfiguration config, final SubstatementValidator validator) {
-        super(YangStmtMapping.IDENTITY, StatementPolicy.reject(), config);
-        this.validator = requireNonNull(validator);
+        super(YangStmtMapping.IDENTITY, StatementPolicy.reject(), config, validator);
     }
 
     public static @NonNull IdentityStatementSupport rfc6020Instance(final YangParserConfiguration config) {
@@ -90,11 +86,6 @@ public final class IdentityStatementSupport
         stmt.addToNs(IdentityNamespace.class, qname, stmt);
     }
 
-    @Override
-    protected SubstatementValidator getSubstatementValidator() {
-        return validator;
-    }
-
     @Override
     protected IdentityStatement createDeclared(final StmtContext<QName, IdentityStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {