BUG-7052: Move qnameFromArgument to StmtContextUtils

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

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ErrorAppTagStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ErrorAppTagStatementImpl.java
index 9cb51810af076a3fde4375f3f491aa3557e9bfc0..2258992d29f40094f3247c3cbef44772e9aadac4 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ErrorAppTagStatementImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ErrorAppTagStatementImpl.java
@@ -7,7 +7,8 @@
  */
 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.ErrorAppTagStatement;
 import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator;
@@ -18,48 +19,46 @@ import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.ErrorAppTag
 
 public class ErrorAppTagStatementImpl extends AbstractDeclaredStatement<String>
         implements ErrorAppTagStatement {
-    private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(Rfc6020Mapping
+    private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(YangStmtMapping
             .ERROR_APP_TAG)
             .build();
 
     protected ErrorAppTagStatementImpl(
-            StmtContext<String, ErrorAppTagStatement, ?> context) {
+            final StmtContext<String, ErrorAppTagStatement, ?> context) {
         super(context);
     }
 
-    public static class Definition
-            extends
+    public static class Definition extends
             AbstractStatementSupport<String, ErrorAppTagStatement, EffectiveStatement<String, ErrorAppTagStatement>> {
 
         public Definition() {
-            super(Rfc6020Mapping.ERROR_APP_TAG);
+            super(YangStmtMapping.ERROR_APP_TAG);
         }
 
         @Override
-        public String parseArgumentValue(StmtContext<?, ?, ?> ctx, String value) {
+        public String parseArgumentValue(final StmtContext<?, ?, ?> ctx, final String value) {
             return value;
         }
 
         @Override
         public ErrorAppTagStatement createDeclared(
-                StmtContext<String, ErrorAppTagStatement, ?> ctx) {
+                final StmtContext<String, ErrorAppTagStatement, ?> ctx) {
             return new ErrorAppTagStatementImpl(ctx);
         }
 
         @Override
         public EffectiveStatement<String, ErrorAppTagStatement> createEffective(
-                StmtContext<String, ErrorAppTagStatement, EffectiveStatement<String, ErrorAppTagStatement>> ctx) {
+                final StmtContext<String, ErrorAppTagStatement, EffectiveStatement<String, ErrorAppTagStatement>> ctx) {
             return new ErrorAppTagEffectiveStatementImpl(ctx);
         }
 
         @Override
-        public void onFullDefinitionDeclared(StmtContext.Mutable<String, ErrorAppTagStatement,
-                EffectiveStatement<String, ErrorAppTagStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            SUBSTATEMENT_VALIDATOR.validate(stmt);
+        protected SubstatementValidator getSubstatementValidator() {
+            return SUBSTATEMENT_VALIDATOR;
         }
     }
 
+    @Nonnull
     @Override
     public String getValue() {
         return argument();