fix json-iterator#149, keep the number handling same as jackson, this will break jsoniter old behavior, as we are always using Double

Author: taowen

src/main/java/com/jsoniter/IterImpl.java

@@ -5,9 +5,15 @@
 import com.jsoniter.spi.Slice;
 
 import java.io.IOException;
+import java.math.BigInteger;
 
 class IterImpl {
 
+    private static BigInteger maxLong = BigInteger.valueOf(Long.MAX_VALUE);
+    private static BigInteger minLong = BigInteger.valueOf(Long.MIN_VALUE);
+    private static BigInteger maxInt = BigInteger.valueOf(Integer.MAX_VALUE);
+    private static BigInteger minInt = BigInteger.valueOf(Integer.MIN_VALUE);
+
     public static final int readObjectFieldAsHash(JsonIterator iter) throws IOException {
         if (readByte(iter) != '"') {
             if (nextToken(iter) != '"') {

src/main/java/com/jsoniter/JsonIterator.java

@@ -288,7 +288,15 @@ public final Object read() throws IOException {
                 case STRING:
                     return readString();
                 case NUMBER:
-                    return readDouble();
+                    double number = readDouble();
+                    if (number == Math.floor(number) && !Double.isInfinite(number)) {
+                        long longNumber = (long) number;
+                        if (longNumber <= Integer.MAX_VALUE && longNumber >= Integer.MIN_VALUE) {
+                            return (int) longNumber;
+                        }
+                        return longNumber;
+                    }
+                    return number;
                 case NULL:
                     IterImpl.skipFixedBytes(this, 4);
                     return null;

src/test/java/com/jsoniter/TestFloat.java

@@ -82,4 +82,9 @@ public void testBigDecimal() {
         BigDecimal number = JsonIterator.deserialize("100.1", BigDecimal.class);
         assertEquals(new BigDecimal("100.1"), number);
     }
+
+    public void testChooseDouble() {
+        Object number = JsonIterator.deserialize("1.1", Object.class);
+        assertEquals(1.1, number);
+    }
 }

src/test/java/com/jsoniter/TestInteger.java

@@ -199,4 +199,14 @@ public void testBigInteger() {
         BigInteger number = JsonIterator.deserialize("100", BigInteger.class);
         assertEquals(new BigInteger("100"), number);
     }
+
+    public void testChooseInteger() {
+        Object number = JsonIterator.deserialize("100", Object.class);
+        assertEquals(100, number);
+    }
+
+    public void testChooseLong() {
+        Object number = JsonIterator.deserialize(Long.valueOf(Long.MAX_VALUE).toString(), Object.class);
+        assertEquals(Long.MAX_VALUE, number);
+    }
 }