Don't rely on a Java 1.8 feature during number conversion.

Increases compatibility, e.g. for Anrdoid.
jimblackler · Apr 2, 2021 · 59a7fda · 59a7fda
1 parent f9e0d1a
commit 59a7fda
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/library/build.gradle b/library/build.gradle
@@ -24,7 +24,7 @@ afterEvaluate {
             release(MavenPublication) {
                 group = 'net.jimblackler'
                 artifactId = 'usejson'
-                version = '0.2.0'
+                version = '0.2.1'
                 artifact(sourceJar)
                 from components.java
             }

diff --git a/library/src/main/java/net/jimblackler/usejson/NumberUtils.java b/library/src/main/java/net/jimblackler/usejson/NumberUtils.java
@@ -4,21 +4,24 @@
 
 public class NumberUtils {
   public static Object toBestObject(BigInteger bigInteger) {
-    try {
-      return bigInteger.byteValueExact();
-    } catch (ArithmeticException ignored) {
+    if (bigInteger.compareTo(BigInteger.valueOf(Byte.MIN_VALUE)) >= 0
+        && bigInteger.compareTo(BigInteger.valueOf(Byte.MAX_VALUE)) <= 0) {
+      return bigInteger.byteValue();
     }
-    try {
-      return bigInteger.shortValueExact();
-    } catch (ArithmeticException ignored) {
+
+    if (bigInteger.compareTo(BigInteger.valueOf(Short.MIN_VALUE)) >= 0
+        && bigInteger.compareTo(BigInteger.valueOf(Short.MAX_VALUE)) <= 0) {
+      return bigInteger.shortValue();
     }
-    try {
-      return bigInteger.intValueExact();
-    } catch (ArithmeticException ignored) {
+
+    if (bigInteger.compareTo(BigInteger.valueOf(Integer.MIN_VALUE)) >= 0
+        && bigInteger.compareTo(BigInteger.valueOf(Integer.MAX_VALUE)) <= 0) {
+      return bigInteger.intValue();
     }
-    try {
-      return bigInteger.longValueExact();
-    } catch (ArithmeticException ignored) {
+
+    if (bigInteger.compareTo(BigInteger.valueOf(Long.MIN_VALUE)) >= 0
+        && bigInteger.compareTo(BigInteger.valueOf(Long.MAX_VALUE)) <= 0) {
+      return bigInteger.longValue();
     }
     return bigInteger;
   }