Bug 7051 - moving of SubstatementValidator into spi.meta package

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

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnitsStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnitsStatementImpl.java
index 2bdd91891cc20c1d92b0e5d58d7165573bde6c6c..153c24002fd7c5ca8e150e156b25c304d5460196 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnitsStatementImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnitsStatementImpl.java
@@ -7,23 +7,23 @@
  */
 package org.opendaylight.yangtools.yang.parser.stmt.rfc6020;
 
-import org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping;
+import javax.annotation.Nonnull;
+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.UnitsStatement;
-import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator;
 import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement;
 import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
-import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
+import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator;
 import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.UnitsEffectiveStatementImpl;
 
 public class UnitsStatementImpl extends AbstractDeclaredStatement<String>
         implements UnitsStatement {
-    private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(Rfc6020Mapping
+    private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(YangStmtMapping
             .UNITS)
             .build();
 
-    protected UnitsStatementImpl(StmtContext<String, UnitsStatement, ?> context) {
+    protected UnitsStatementImpl(final StmtContext<String, UnitsStatement, ?> context) {
         super(context);
     }
 
@@ -32,34 +32,33 @@ public class UnitsStatementImpl extends AbstractDeclaredStatement<String>
             AbstractStatementSupport<String, UnitsStatement, EffectiveStatement<String, UnitsStatement>> {
 
         public Definition() {
-            super(Rfc6020Mapping.UNITS);
+            super(YangStmtMapping.UNITS);
         }
 
         @Override
-        public String parseArgumentValue(StmtContext<?, ?, ?> ctx, String value) {
+        public String parseArgumentValue(final StmtContext<?, ?, ?> ctx, final String value) {
             return value;
         }
 
         @Override
         public UnitsStatement createDeclared(
-                StmtContext<String, UnitsStatement, ?> ctx) {
+                final StmtContext<String, UnitsStatement, ?> ctx) {
             return new UnitsStatementImpl(ctx);
         }
 
         @Override
         public EffectiveStatement<String, UnitsStatement> createEffective(
-                StmtContext<String, UnitsStatement, EffectiveStatement<String, UnitsStatement>> ctx) {
+                final StmtContext<String, UnitsStatement, EffectiveStatement<String, UnitsStatement>> ctx) {
             return new UnitsEffectiveStatementImpl(ctx);
         }
 
         @Override
-        public void onFullDefinitionDeclared(StmtContext.Mutable<String, UnitsStatement,
-                EffectiveStatement<String, UnitsStatement>> stmt) throws SourceException {
-            super.onFullDefinitionDeclared(stmt);
-            SUBSTATEMENT_VALIDATOR.validate(stmt);
+        protected SubstatementValidator getSubstatementValidator() {
+            return SUBSTATEMENT_VALIDATOR;
         }
     }
 
+    @Nonnull
     @Override
     public String getName() {
         return argument();