Improvement wrt #333

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/node/JsonNodeFactory.java

@@ -83,7 +83,7 @@ public static JsonNodeFactory withExactBigDecimals(boolean bigDecimalExact)
     {
         return bigDecimalExact ? decimalsAsIs : decimalsNormalized;
     }
-
+    
     /*
     /**********************************************************
     /* Factory methods for literal values
@@ -171,16 +171,25 @@ public ValueNode numberNode(Integer value) {
      * that expresses given 64-bit integer value
      */
     @Override
-    public NumericNode numberNode(long v) { return LongNode.valueOf(v); }
-
+    public NumericNode numberNode(long v) {
+        if (_inIntRange(v)) {
+            return IntNode.valueOf((int) v);
+        }
+        return LongNode.valueOf(v);
+    }
+    
     /**
      * Alternate factory method that will handle wrapper value, which may be null.
      * Due to possibility of null, returning type is not guaranteed to be
      * {@link NumericNode}, but just {@link ValueNode}.
      */
     @Override
     public ValueNode numberNode(Long value) {
-        return (value == null) ? nullNode() : LongNode.valueOf(value.longValue());
+        long l = value.longValue();
+        if (_inIntRange(l)) {
+            return IntNode.valueOf((int) l);
+        }
+        return (value == null) ? nullNode() : LongNode.valueOf(l);
     }
 
     /**
@@ -322,5 +331,18 @@ public BinaryNode binaryNode(byte[] data, int offset, int length) {
      */
     @Deprecated
     public POJONode POJONode(Object pojo) { return new POJONode(pojo); }
+
+    /*
+    /**********************************************************
+    /* Helper methods
+    /**********************************************************
+     */
+    
+    protected boolean _inIntRange(long l)
+    {
+        int i = (int) l;
+        long l2 = (long) i;
+        return (l2 == l);
+    }
 }
 

src/test/java/com/fasterxml/jackson/databind/node/TestNumberNodes.java

@@ -241,4 +241,19 @@ public void testBigDecimalAsPlain() throws Exception
         // also via ObjectWriter:
         assertEquals("{\"x\":100}", mapper.writer().writeValueAsString(node));
     }
+
+    // Related to [Issue#333]
+    public void testCanonicalNumbers() throws Exception
+    {
+        JsonNodeFactory f = new JsonNodeFactory();
+        NumericNode n = f.numberNode(123);
+        assertTrue(n.isInt());
+        n = f.numberNode(1L + Integer.MAX_VALUE);
+        assertFalse(n.isInt());
+        assertTrue(n.isLong());
+        // but "too small" number will be 'int'...
+        n = f.numberNode(123L);
+        assertTrue(n.isInt());
+        assertFalse(n.isLong());
+    }
 }