Merge branch '2.20' into 2.x

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -12,6 +12,12 @@ Project: jackson-databind
 #5293: Fix minor typo in `PropertyBindingException.getMessageSuffix()`
  (reported by Johny L)
 
+2.20.1 (not yet released)
+
+#5292: `MapperFeature.FIX_FIELD_NAME_UPPER_CASE_PREFIX` does not work with
+  Constructor parameters
+ (reported by @bananayong)
+
 2.20.0 (28-Aug-2025)
 
 #2678: `@JacksonInject` added to property overrides value from the JSON

src/main/java/com/fasterxml/jackson/databind/introspect/POJOPropertiesCollector.java

@@ -1373,20 +1373,22 @@ protected void _fixLeadingFieldNameCase(Map<String, POJOPropertyBuilder> props)
 
         // First: find possible candidates where:
         //
-        // 1. Property only has Field
-        // 2. Field does NOT have explicit name (renaming)
-        // 3. Implicit name has upper-case for first and/or second character
+        // 1. Property has Field and/or Constructor Parameter
+        // 2. Property has no other accessors (no getters/setters)
+        // 3. Field/Constructor param does NOT have explicit name (renaming)
+        // 4. Implicit name has upper-case for first and/or second character
 
         Map<String, POJOPropertyBuilder> fieldsToCheck = null;
         for (Map.Entry<String, POJOPropertyBuilder> entry : props.entrySet()) {
             POJOPropertyBuilder  prop = entry.getValue();
 
-            // First: (1) and (2)
-            if (!prop.hasFieldAndNothingElse()
-                    || prop.isExplicitlyNamed()) {
+            // First: (1), (2) and 3
+            if (prop.isExplicitlyNamed() // (3)
+                    || !(prop.hasField() || prop.hasConstructorParameter()) // (1)
+                    || (prop.hasGetter() || prop.hasSetter())) { // 2
                 continue;
             }
-            // Second: (3)
+            // Second: (4)
             if (!_firstOrSecondCharUpperCase(entry.getKey())) {
                 continue;
             }

…FixFieldNameUpperCasePrefix5292Test.java …nd/misc/IPhoneStyleProperty5292Test.javasrc/test/java/com/fasterxml/jackson/databind/tofix/FixFieldNameUpperCasePrefix5292Test.java renamed to src/test/java/com/fasterxml/jackson/databind/misc/IPhoneStyleProperty5292Test.java src/test/java/com/fasterxml/jackson/databind/tofix/FixFieldNameUpperCasePrefix5292Test.java renamed to src/test/java/com/fasterxml/jackson/databind/misc/IPhoneStyleProperty5292Test.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.tofix;
+package com.fasterxml.jackson.databind.misc;
 
 import org.junit.jupiter.api.Test;
 
@@ -9,13 +9,12 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
-import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 // [databind#5292] Need support for creators `MapperFeature.FIX_FIELD_NAME_UPPER_CASE_PREFIX`
-public class FixFieldNameUpperCasePrefix5292Test
-        extends DatabindTestUtil
+public class IPhoneStyleProperty5292Test
+    extends DatabindTestUtil
 {
     static class AppleSingleNonTarget {
         private final String name;
@@ -45,17 +44,17 @@ public String getIPhone() {
     // Creator order should be used but just in case, define explicit order
     @JsonPropertyOrder({ "iPhone", "name" })
     static class AppleDouble {
-        private final String iPhone;
+        private final String _iphone;
         private final String name;
 
         public AppleDouble(@ImplicitName("iPhone") String iPhone,
                 @ImplicitName("name") String name) {
-            this.iPhone = iPhone;
+            this._iphone = iPhone;
             this.name = name;
         }
 
         public String getIPhone() {
-            return iPhone;
+            return _iphone;
         }
 
         public String getName() {
@@ -68,7 +67,6 @@ public String getName() {
         .enable(MapperFeature.FIX_FIELD_NAME_UPPER_CASE_PREFIX)
         .build();
 
-    @JacksonTestFailureExpected
     @Test
     public void testDeserDouble() throws Exception
     {
@@ -79,18 +77,18 @@ public void testDeserDouble() throws Exception
         AppleDouble result = MAPPER.readValue(json, AppleDouble.class); // Error thrown
 
         assertEquals("Jay", result.getName());
-        assertEquals("iPhone 15", result.getName());
+        assertEquals("iPhone 15", result.getIPhone());
     }
 
-    @JacksonTestFailureExpected
+
     @Test
     public void testSingleArgCase() throws Exception
     {
         AppleSingleIsTarget apple = new AppleSingleIsTarget("iPhone 15");
         String json = MAPPER.writeValueAsString(apple);
         assertEquals("{\"iPhone\":\"iPhone 15\"}", json);
 
-        AppleSingleIsTarget result = MAPPER.readValue(json, AppleSingleIsTarget.class); // Error thrown
+        AppleSingleIsTarget result = MAPPER.readValue(json, AppleSingleIsTarget.class);
         assertEquals("iPhone 15", result.getIPhone());
     }
 
@@ -102,7 +100,7 @@ public void testHappyCaseSingleArgString() throws Exception
         String json = MAPPER.writeValueAsString(apple);
         assertEquals("{\"name\":\"Jay\"}", json);
 
-        AppleSingleNonTarget result = MAPPER.readValue(json, AppleSingleNonTarget.class); // Error thrown
+        AppleSingleNonTarget result = MAPPER.readValue(json, AppleSingleNonTarget.class);
         assertEquals("Jay", result.getName());
     }
 }