Merge branch '2.17' into 2.17

Author: cowtowncoder

.github/workflows/codeql-analysis.yml

@@ -23,16 +23,16 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # v3.24.6
+      uses: github/codeql-action/init@3ab4101902695724f9365a384f86c1074d94e18c # v3.24.7
       with:
         languages: ${{ matrix.language }}
 
     - name: Autobuild
-      uses: github/codeql-action/autobuild@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # v3.24.6
+      uses: github/codeql-action/autobuild@3ab4101902695724f9365a384f86c1074d94e18c # v3.24.7
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # v3.24.6
+      uses: github/codeql-action/analyze@3ab4101902695724f9365a384f86c1074d94e18c # v3.24.7

.github/workflows/main.yml

@@ -30,9 +30,9 @@ jobs:
     env:
       JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
     steps:
-    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+    - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
     - name: Set up JDK
-      uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
+      uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java_version }}

.github/workflows/win.yml

@@ -29,9 +29,9 @@ jobs:
     env:
       JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
     steps:
-    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+    - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
     - name: Set up JDK
-      uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
+      uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java_version }}

release-notes/VERSION-2.x

@@ -12,7 +12,11 @@ Project: jackson-databind
 
 #4428: `ByteBuddy` scope went beyond `test` in version 2.17.0
  (reported by Miguel M-R)
- (fix contributed by Joo-Hyuk K)
+ (fix by Joo-Hyuk K)
+#4435: Cannot deserialize value of type `java.math.BigDecimal` from
+  String ".05": not a valid representation
+ (reported by @EAlf91)
+ (fix by @pjfanning)
 
 2.17.0 (12-Mar-2024)
 
@@ -99,7 +103,7 @@ Project: jackson-databind
 
 #1770: Incorrect deserialization for `BigDecimal` numbers
  (reported by @cristian-mocanu-mob)
- (fix contributed by @pjfanning)
+ (fix by @pjfanning)
 #2502: Add a way to configure caches Jackson uses
  (contributed by Joo-Hyuk K)
 #2787: Mix-ins do not work for `Enum`s

src/main/java/com/fasterxml/jackson/databind/deser/std/NumberDeserializers.java

@@ -657,9 +657,7 @@ protected final Float _parseFloat(JsonParser p, DeserializationContext ctxt)
                 p.streamReadConstraints().validateFPLength(text.length());
                 try {
                     return NumberInput.parseFloat(text, p.isEnabled(StreamReadFeature.USE_FAST_DOUBLE_PARSER));
-                } catch (IllegalArgumentException iae) {
-                    if (true) throw new Error();
-                }
+                } catch (IllegalArgumentException iae) { }
             }
             return (Float) ctxt.handleWeirdStringValue(_valueClass, text,
                     "not a valid `Float` value");

src/test/java/com/fasterxml/jackson/databind/deser/BigNumbersDeserTest.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/jdk/BigNumbersDeserTest.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.deser;
+package com.fasterxml.jackson.databind.deser.jdk;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -11,47 +11,26 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.json.JsonMapper;
-import com.fasterxml.jackson.databind.testutil.DatabindTestUtil.DoubleWrapper;
+import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.fail;
 
-import static com.fasterxml.jackson.databind.testutil.DatabindTestUtil.newJsonMapper;
-import static com.fasterxml.jackson.databind.testutil.DatabindTestUtil.verifyException;
-
 public class BigNumbersDeserTest
+    extends DatabindTestUtil
 {
-    static class BigDecimalWrapper {
-        BigDecimal number;
-
-        public BigDecimalWrapper() {}
-
-        public BigDecimalWrapper(BigDecimal number) {
-            this.number = number;
-        }
-
-        public void setNumber(BigDecimal number) {
-            this.number = number;
-        }
-    }
-
     static class BigIntegerWrapper {
-        BigInteger number;
-
-        public BigIntegerWrapper() {}
-
-        public BigIntegerWrapper(BigInteger number) {
-            this.number = number;
-        }
+        public BigInteger number;
+    }
 
-        public void setNumber(BigInteger number) {
-            this.number = number;
-        }
+    static class BigDecimalWrapper {
+        public BigDecimal number;
     }
 
     /*
     /**********************************************************
-    /* Tests
+    /* Test methods
     /**********************************************************
      */
 
@@ -123,6 +102,33 @@ public void testBigIntegerUnlimited() throws Exception
         assertNotNull(bdw);
     }
 
+    // [databind#4435]
+    @Test
+    public void testNumberStartingWithDot() throws Exception
+    {
+        String num = ".555555555555555555555555555555";
+        BigDecimalWrapper w = MAPPER.readValue("{\"number\":\"" + num + "\"}", BigDecimalWrapper.class);
+        assertEquals(new BigDecimal(num), w.number);
+    }
+
+    // [databind#4435]
+    @Test
+    public void testNumberStartingWithMinusDot() throws Exception
+    {
+        String num = "-.555555555555555555555555555555";
+        BigDecimalWrapper w = MAPPER.readValue("{\"number\":\"" + num + "\"}", BigDecimalWrapper.class);
+        assertEquals(new BigDecimal(num), w.number);
+    }
+
+    // [databind#4435]
+    @Test
+    public void testNumberStartingWithPlusDot() throws Exception
+    {
+        String num = "+.555555555555555555555555555555";
+        BigDecimalWrapper w = MAPPER.readValue("{\"number\":\"" + num + "\"}", BigDecimalWrapper.class);
+        assertEquals(new BigDecimal(num), w.number);
+    }
+
     private String generateJson(final String fieldName) {
         final int len = 1200;
         final StringBuilder sb = new StringBuilder();

src/test/java/com/fasterxml/jackson/databind/deser/jdk/JDKNumberDeserTest.java

@@ -16,12 +16,12 @@
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.exc.MismatchedInputException;
+import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import static com.fasterxml.jackson.databind.testutil.DatabindTestUtil.*;
-
 public class JDKNumberDeserTest
+    extends DatabindTestUtil
 {
     /*
     /**********************************************************************
@@ -104,7 +104,7 @@ public MyBeanValue deserialize(JsonParser jp, DeserializationContext ctxt)
     /**********************************************************************
      */
 
-    final ObjectMapper MAPPER = new ObjectMapper();
+    private final ObjectMapper MAPPER = new ObjectMapper();
 
     @Test
     public void testNaN() throws Exception