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 4c1a959040b683135c3082e0da2d84b38a907fd3..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,22 +7,21 @@
  */
 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();
+    private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(
+        YangStmtMapping.VALUE).build();
 
-    protected ValueStatementImpl(StmtContext<Integer, ValueStatement, ?> context) {
+    protected ValueStatementImpl(final StmtContext<Integer, ValueStatement, ?> context) {
         super(context);
     }
 
@@ -30,47 +29,38 @@ 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(StmtContext<?, ?, ?> ctx, String value) {
-            int valueNum;
-
+        public Integer parseArgumentValue(final StmtContext<?, ?, ?> ctx, final String value) {
             try {
-                valueNum = Integer.parseInt(value);
+                return Integer.valueOf(value);
             } catch (NumberFormatException e) {
-                throw new IllegalArgumentException(
-                        String.format(
-                                "%s is not valid value statement integer argument in a range of -2147483648..2147483647",
-                                value), 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
-        public ValueStatement createDeclared(StmtContext<Integer, ValueStatement, ?> ctx) {
+        public ValueStatement createDeclared(final StmtContext<Integer, ValueStatement, ?> ctx) {
             return new ValueStatementImpl(ctx);
         }
 
         @Override
         public EffectiveStatement<Integer, ValueStatement> createEffective(
-                StmtContext<Integer, ValueStatement, EffectiveStatement<Integer, ValueStatement>> ctx) {
+                final StmtContext<Integer, ValueStatement, EffectiveStatement<Integer, ValueStatement>> ctx) {
             return new ValueEffectiveStatementImpl(ctx);
         }
 
         @Override
-        public void onFullDefinitionDeclared(StmtContext.Mutable<Integer, ValueStatement,
-                EffectiveStatement<Integer, ValueStatement>> stmt) throws SourceException {
-            super.onFullDefinitionDeclared(stmt);
-            SUBSTATEMENT_VALIDATOR.validate(stmt);
+        protected SubstatementValidator getSubstatementValidator() {
+            return SUBSTATEMENT_VALIDATOR;
         }
     }
 
     @Override
-    public Integer getValue() {
+    public int getValue() {
         return argument();
     }
-
 }