Range: BigDecimal to Number

binding/src/main/java/org/jsonx/Codec.java

@@ -99,10 +99,11 @@ else if (value != null && !genericType.isInstance(value))
       throw new UnsupportedOperationException(e);
     }
     catch (final InvocationTargetException e) {
-      if (e.getCause() instanceof RuntimeException)
-        throw (RuntimeException)e.getCause();
+      final Throwable cause = e.getCause();
+      if (cause instanceof RuntimeException)
+        throw (RuntimeException)cause;
 
-      throw new RuntimeException(e.getCause());
+      throw new RuntimeException(cause);
     }
   }
 

binding/src/main/java/org/jsonx/JsdUtil.java

@@ -418,10 +418,11 @@ static Object invoke(final Executable executable, final Object arg) {
       throw new UnsupportedOperationException(e);
     }
     catch (final InvocationTargetException e) {
-      if (e.getCause() instanceof RuntimeException)
-        throw (RuntimeException)e.getCause();
+      final Throwable cause = e.getCause();
+      if (cause instanceof RuntimeException)
+        throw (RuntimeException)cause;
 
-      throw new RuntimeException(e.getCause());
+      throw new RuntimeException(cause);
     }
   }
 

binding/src/main/java/org/jsonx/JxDecoder.java

@@ -261,7 +261,7 @@ public final <T extends JxObject>T parseObject(final String json, final Class<?
   @SuppressWarnings({"null", "unchecked"})
   public final <T extends JxObject>T parseObject(final JsonReader reader, final TriPredicate<JxObject,String,Object> onPropertyDecode, final Class<? extends T> ... types) throws DecodeException, IOException, JsonParseException {
     DecodeException exception = null;
-    for (final Class<? extends T> type : assertNotEmpty(types)) {
+    for (final Class<? extends T> type : assertNotEmpty(types)) { // [A]
       final Object result = parseObject(reader, onPropertyDecode, type, exception);
       if (result instanceof DecodeException)
         exception = (DecodeException)result;
@@ -297,7 +297,7 @@ public final <T extends JxObject>T parseObject(final JsonReader reader, final Tr
   @SuppressWarnings({"null", "unchecked"})
   public final <T extends JxObject>T parseObject(final JsonReader reader, final TriPredicate<JxObject,String,Object> onPropertyDecode, final Collection<Class<? extends T>> types) throws DecodeException, IOException, JsonParseException {
     DecodeException exception = null;
-    for (final Class<? extends T> type : assertNotEmpty(types)) {
+    for (final Class<? extends T> type : assertNotEmpty(types)) { // [C]
       final Object result = parseObject(reader, onPropertyDecode, type, exception);
       if (result instanceof DecodeException)
         exception = (DecodeException)result;
@@ -531,7 +531,7 @@ public final ArrayList<?> parseArray(final String json, final Class<? extends An
   @SuppressWarnings("null")
   public final ArrayList<?> parseArray(final JsonReader reader, final Class<? extends Annotation> ... annotationTypes) throws DecodeException, JsonParseException, IOException {
     DecodeException exception = null;
-    for (final Class<? extends Annotation> annotationType : assertNotEmpty(annotationTypes)) {
+    for (final Class<? extends Annotation> annotationType : assertNotEmpty(annotationTypes)) { // [A]
       final Object result = parseArray(reader, annotationType, exception);
       if (result instanceof DecodeException)
         exception = (DecodeException)result;
@@ -562,7 +562,7 @@ public final ArrayList<?> parseArray(final JsonReader reader, final Class<? exte
   @SuppressWarnings("null")
   public final ArrayList<?> parseArray(final JsonReader reader, final Collection<Class<? extends Annotation>> annotationTypes) throws DecodeException, JsonParseException, IOException {
     DecodeException exception = null;
-    for (final Class<? extends Annotation> annotationType : assertNotEmpty(annotationTypes)) {
+    for (final Class<? extends Annotation> annotationType : assertNotEmpty(annotationTypes)) { // [C]
       final Object result = parseArray(reader, annotationType, exception);
       if (result instanceof DecodeException)
         exception = (DecodeException)result;

binding/src/main/java/org/jsonx/JxEncoder.java

@@ -180,7 +180,7 @@ protected JxEncoder(final int indent) {
    */
   JxEncoder(final int indent, final boolean validate) {
     if (indent < 0)
-      throw new IllegalArgumentException("Indent must be a non-negative: " + indent);
+      throw new IllegalArgumentException("Indent must be non-negative: " + indent);
 
     this.indent = indent;
     this.validate = validate;
@@ -217,10 +217,11 @@ private static Object getValue(final Object object, final Method getMethod, fina
       throw new RuntimeException(e);
     }
     catch (final InvocationTargetException e) {
-      if (e.getCause() instanceof RuntimeException)
-        throw (RuntimeException)e.getCause();
+      final Throwable cause = e.getCause();
+      if (cause instanceof RuntimeException)
+        throw (RuntimeException)cause;
 
-      throw new RuntimeException(e.getCause());
+      throw new RuntimeException(cause);
     }
   }
 
@@ -371,14 +372,16 @@ void beforePut(final Method[] methods) {
   Error toString(final JxObject object, final OnEncode onEncode, final StringBuilder b, final int depth) {
     b.append('{');
     boolean hasProperties = false;
+    Annotation[] annotations;
+    Annotation annotation = null;
+    String name;
+    boolean nullable = false;
+    Use use = null;
     for (final Method getMethod : classToOrderedMethods.get(object.getClass())) { // [A]
-      Annotation annotation = null;
-      String name = null;
-      boolean nullable = false;
-      Use use = null;
-      final Annotation[] annotations = Classes.getAnnotations(getMethod);
-      for (int j = 0, j$ = annotations.length; j < j$; ++j) { // [A]
-        annotation = annotations[j];
+      annotations = Classes.getAnnotations(getMethod);
+      name = null;
+      for (int i = 0, i$ = annotations.length; i < i$; ++i) { // [A]
+        annotation = annotations[i];
         if (annotation instanceof StringProperty) {
           final StringProperty property = (StringProperty)annotation;
           name = property.name();

binding/src/main/java/org/jsonx/NumberCodec.java

@@ -55,13 +55,17 @@ static String format(final Object object) {
    * @return The provided provided {@code double} as a string.
    * @implNote This method mimicks JavaScript's Double.toString() algorithm.
    */
-  private static String format(final double value) {
+  static String format(final double value) {
     return 0.000001 <= value && value <= 9.999999999999999E20 ? decimalFormatLocal.get().format(value) : Numbers.stripTrailingZeros(String.valueOf(value));
   }
 
+  static Class<? extends Number> getDefaultClass(final int scale) {
+    return scale == 0 ? Long.class : Double.class;
+  }
+
   private static Number parseDefaultNumber(final int scale, final String json, final boolean strict) {
     try {
-      return JsonUtil.parseNumber(scale == 0 ? Long.class : Double.class, json, strict);
+      return JsonUtil.parseNumber(getDefaultClass(scale), json, strict);
     }
     catch (final JsonParseException | NumberFormatException e) {
       return null;
@@ -144,7 +148,7 @@ else if (object.longValue() != object.doubleValue()) {
 
     if (range.length() > 0) {
       try {
-        if (!Range.from(range, type).isValid(object))
+        if (!Range.from(range, scale, type).isValid(object))
           return Error.RANGE_NOT_MATCHED(range, object, null);
       }
       catch (final ParseException e) {
@@ -167,7 +171,7 @@ else if (object.longValue() != object.doubleValue()) {
     }
     else {
       try {
-        this.range = Range.from(range, JsdUtil.getRealType(getMethod));
+        this.range = Range.from(range, scale, JsdUtil.getRealType(getMethod));
       }
       catch (final ParseException e) {
         throw new ValidationException("Invalid range attribute: " + Annotations.toSortedString(property, JsdUtil.ATTRIBUTES, true), e);