Fix a minor flaw in #90 implementation

FasterXML · Mar 24, 2024 · 9211fb2 · 9211fb2
1 parent 961480c
commit 9211fb2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/jr-stree/src/main/java/com/fasterxml/jackson/jr/stree/JacksonJrsTreeCodec.java b/jr-stree/src/main/java/com/fasterxml/jackson/jr/stree/JacksonJrsTreeCodec.java
@@ -58,6 +58,8 @@ private JrsValue nodeFrom(JsonParser p) throws IOException
         case JsonTokenId.ID_FALSE:
             return JrsBoolean.FALSE;
         case JsonTokenId.ID_NUMBER_INT:
+            // Important! No coercion to BigDecimal (wrt [jackson-jr#90]
+            return new JrsNumber(p.getNumberValue());
         case JsonTokenId.ID_NUMBER_FLOAT:
             if (_useBigDecimalForDouble) {
                 return new JrsNumber(p.getDecimalValue());

diff --git a/jr-stree/src/test/java/com/fasterxml/jackson/jr/stree/ReadAsBigDecimal90Test.java b/jr-stree/src/test/java/com/fasterxml/jackson/jr/stree/ReadAsBigDecimal90Test.java
@@ -15,16 +15,15 @@ public void testDefaultBehaviourReadAsDouble() throws Exception
                 .disable(JSON.Feature.USE_BIG_DECIMAL_FOR_FLOATS)
                 .register(new JrSimpleTreeExtension())
                 .build();
-
-        String input = "[1.1]";
-
-        TreeNode node = json.treeFrom(input);
+        TreeNode node = json.treeFrom("[1.1]");
         TreeNode elemNode = node.get(0);
 
         assertTrue(elemNode.isValueNode());
         assertTrue(elemNode instanceof JrsNumber);
         assertEquals(Double.class,
                 ((JrsNumber) elemNode).getValue().getClass());
+
+        _verifyInt(json);
     }
 
     // [jackson-jr#90]
@@ -34,15 +33,26 @@ public void testReadAsBigDecimal() throws Exception
                 .enable(JSON.Feature.USE_BIG_DECIMAL_FOR_FLOATS)
                 .register(new JrSimpleTreeExtension())
                 .build();
+        TreeNode node = json.treeFrom("[1.1]");
+        TreeNode elemNode = node.get(0);
+
+        assertTrue(elemNode.isValueNode());
+        assertTrue(elemNode instanceof JrsNumber);
+        assertEquals(BigDecimal.class,
+                ((JrsNumber) elemNode).getValue().getClass());
 
-        String input = "[1.1]";
+        _verifyInt(json);
+    }
 
-        TreeNode node = json.treeFrom(input);
+    private void _verifyInt(JSON json) throws Exception
+    {
+        TreeNode node = json.treeFrom("[123]");
         TreeNode elemNode = node.get(0);
 
         assertTrue(elemNode.isValueNode());
         assertTrue(elemNode instanceof JrsNumber);
-        assertEquals(BigDecimal.class,
+        assertEquals(Integer.class,
                 ((JrsNumber) elemNode).getValue().getClass());
+        assertEquals(123, ((JrsNumber) elemNode).getValue().intValue());
     }
 }