Bug 4540: Yang parser exceptions should follow consistent path

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

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/FractionDigitsStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/FractionDigitsStatementImpl.java
index 97886d78a2f804d179cadba9fef099f798ab544a..1e415ec9b531c6173b167b3ec92034fb4591f855 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/FractionDigitsStatementImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/FractionDigitsStatementImpl.java
@@ -7,6 +7,7 @@
  */
 package org.opendaylight.yangtools.yang.parser.stmt.rfc6020;
 
+import com.google.common.base.Preconditions;
 import com.google.common.collect.Range;
 import org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
@@ -25,51 +26,48 @@ public class FractionDigitsStatementImpl extends AbstractDeclaredStatement<Integ
 
     private static final Range<Integer> FRAC_DIGITS_ALLOWED = Range.closed(1, 18);
 
-    protected FractionDigitsStatementImpl(StmtContext<Integer, FractionDigitsStatement, ?> context) {
+    protected FractionDigitsStatementImpl(final StmtContext<Integer, FractionDigitsStatement, ?> context) {
         super(context);
     }
 
-    public static class Definition
-            extends
-            AbstractStatementSupport<Integer, FractionDigitsStatement, EffectiveStatement<Integer, FractionDigitsStatement>> {
+    public static class Definition extends AbstractStatementSupport<Integer, FractionDigitsStatement,
+            EffectiveStatement<Integer, FractionDigitsStatement>> {
 
         public Definition() {
             super(Rfc6020Mapping.FRACTION_DIGITS);
         }
 
         @Override
-        public Integer parseArgumentValue(StmtContext<?, ?, ?> ctx, String value) {
+        public Integer parseArgumentValue(final StmtContext<?, ?, ?> ctx, final String value) {
 
             int fractionDigits;
 
             try {
                 fractionDigits = Integer.parseInt(value);
             } catch (NumberFormatException e) {
-                throw new IllegalArgumentException(String.format("%s is not valid fraction-digits integer argument",
-                        value), e);
+                throw new SourceException(String.format("%s is not valid fraction-digits integer argument",
+                        value), ctx.getStatementSourceReference(), e);
             }
 
-            if (!FRAC_DIGITS_ALLOWED.contains(fractionDigits)) {
-                throw new IllegalArgumentException(String.format("fraction-digits argument should be integer within %s",
-                        FRAC_DIGITS_ALLOWED));
-            }
+            Preconditions.checkArgument(FRAC_DIGITS_ALLOWED.contains(fractionDigits),
+                "fraction-digits argument should be integer within %s", FRAC_DIGITS_ALLOWED);
 
             return fractionDigits;
         }
 
         @Override
-        public FractionDigitsStatement createDeclared(StmtContext<Integer, FractionDigitsStatement, ?> ctx) {
+        public FractionDigitsStatement createDeclared(final StmtContext<Integer, FractionDigitsStatement, ?> ctx) {
             return new FractionDigitsStatementImpl(ctx);
         }
 
         @Override
         public EffectiveStatement<Integer, FractionDigitsStatement> createEffective(
-                StmtContext<Integer, FractionDigitsStatement, EffectiveStatement<Integer, FractionDigitsStatement>> ctx) {
+                final StmtContext<Integer, FractionDigitsStatement, EffectiveStatement<Integer, FractionDigitsStatement>> ctx) {
             return new FractionDigitsEffectiveStatementImpl(ctx);
         }
 
         @Override
-        public void onFullDefinitionDeclared(StmtContext.Mutable<Integer, FractionDigitsStatement,
+        public void onFullDefinitionDeclared(final StmtContext.Mutable<Integer, FractionDigitsStatement,
                 EffectiveStatement<Integer, FractionDigitsStatement>> stmt) throws SourceException {
             super.onFullDefinitionDeclared(stmt);
             SUBSTATEMENT_VALIDATOR.validate(stmt);
@@ -77,7 +75,7 @@ public class FractionDigitsStatementImpl extends AbstractDeclaredStatement<Integ
     }
 
     @Override
-    public Integer getValue() {
+    public int getValue() {
         return argument();
     }
 }