BUG-7052: remove StmtContext.createCopy()

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

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ValueStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ValueStatementImpl.java
index 6f78b55963c722ae673cab195acddfb862b79401..4782ea65449d8aa3ad0b4eb08017efa0d03e9f3d 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ValueStatementImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ValueStatementImpl.java
@@ -7,19 +7,19 @@
  */
 package org.opendaylight.yangtools.yang.parser.stmt.rfc6020;
 
-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.ValueStatement;
-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.meta.SubstatementValidator;
 import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
 import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.ValueEffectiveStatementImpl;
 
 public class ValueStatementImpl extends AbstractDeclaredStatement<Integer> implements ValueStatement {
     private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(
-        Rfc6020Mapping.VALUE).build();
+        YangStmtMapping.VALUE).build();
 
     protected ValueStatementImpl(final StmtContext<Integer, ValueStatement, ?> context) {
         super(context);
@@ -29,22 +29,17 @@ public class ValueStatementImpl extends AbstractDeclaredStatement<Integer> imple
             AbstractStatementSupport<Integer, ValueStatement, EffectiveStatement<Integer, ValueStatement>> {
 
         public Definition() {
-            super(Rfc6020Mapping.VALUE);
+            super(YangStmtMapping.VALUE);
         }
 
         @Override
         public Integer parseArgumentValue(final StmtContext<?, ?, ?> ctx, final String value) {
-            int valueNum;
-
             try {
-                valueNum = Integer.parseInt(value);
+                return Integer.valueOf(value);
             } catch (NumberFormatException e) {
-                throw new SourceException(String.format(
-                        "%s is not valid value statement integer argument in a range of -2147483648..2147483647", value),
-                        ctx.getStatementSourceReference(), e);
+                throw new SourceException(ctx.getStatementSourceReference(), e,
+                    "%s is not valid value statement integer argument in a range of -2147483648..2147483647", value);
             }
-
-            return valueNum;
         }
 
         @Override
@@ -59,10 +54,8 @@ public class ValueStatementImpl extends AbstractDeclaredStatement<Integer> imple
         }
 
         @Override
-        public void onFullDefinitionDeclared(
-                final StmtContext.Mutable<Integer, ValueStatement, EffectiveStatement<Integer, ValueStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            SUBSTATEMENT_VALIDATOR.validate(stmt);
+        protected SubstatementValidator getSubstatementValidator() {
+            return SUBSTATEMENT_VALIDATOR;
         }
     }