Bug 6414: Fixed DataNodeIterator's traverseModule method

[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 558f4c079622ff232503768eda1289595a6df00b..6f78b55963c722ae673cab195acddfb862b79401 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
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2015 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -7,52 +7,67 @@
  */
 package org.opendaylight.yangtools.yang.parser.stmt.rfc6020;
 
-import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.ValueEffectiveStatementImpl;
-
 import org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping;
 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.source.SourceException;
+import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.ValueEffectiveStatementImpl;
 
-public class ValueStatementImpl extends AbstractDeclaredStatement<String>
-        implements ValueStatement {
+public class ValueStatementImpl extends AbstractDeclaredStatement<Integer> implements ValueStatement {
+    private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(
+        Rfc6020Mapping.VALUE).build();
 
-    protected ValueStatementImpl(StmtContext<String, ValueStatement, ?> context) {
+    protected ValueStatementImpl(final StmtContext<Integer, ValueStatement, ?> context) {
         super(context);
     }
 
-    public static class Definition
-            extends
-            AbstractStatementSupport<String, ValueStatement, EffectiveStatement<String, ValueStatement>> {
+    public static class Definition extends
+            AbstractStatementSupport<Integer, ValueStatement, EffectiveStatement<Integer, ValueStatement>> {
 
         public Definition() {
             super(Rfc6020Mapping.VALUE);
         }
 
         @Override
-        public String parseArgumentValue(StmtContext<?, ?, ?> ctx, String value) {
-            return value;
+        public Integer parseArgumentValue(final StmtContext<?, ?, ?> ctx, final String value) {
+            int valueNum;
+
+            try {
+                valueNum = Integer.parseInt(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);
+            }
+
+            return valueNum;
         }
 
         @Override
-        public ValueStatement createDeclared(
-                StmtContext<String, ValueStatement, ?> ctx) {
+        public ValueStatement createDeclared(final StmtContext<Integer, ValueStatement, ?> ctx) {
             return new ValueStatementImpl(ctx);
         }
 
         @Override
-        public EffectiveStatement<String, ValueStatement> createEffective(
-                StmtContext<String, ValueStatement, EffectiveStatement<String, ValueStatement>> ctx) {
+        public EffectiveStatement<Integer, ValueStatement> createEffective(
+                final StmtContext<Integer, ValueStatement, EffectiveStatement<Integer, ValueStatement>> ctx) {
             return new ValueEffectiveStatementImpl(ctx);
         }
 
+        @Override
+        public void onFullDefinitionDeclared(
+                final StmtContext.Mutable<Integer, ValueStatement, EffectiveStatement<Integer, ValueStatement>> stmt) {
+            super.onFullDefinitionDeclared(stmt);
+            SUBSTATEMENT_VALIDATOR.validate(stmt);
+        }
     }
 
     @Override
-    public String getValue() {
+    public int getValue() {
         return argument();
     }
-
 }