Revert back the fix: #5342 probably not fixable as it is (esp. without breaking #4388)

Author: cowtowncoder

src/main/java/tools/jackson/databind/ser/BeanSerializerFactory.java

@@ -383,49 +383,35 @@ protected ValueSerializer<Object> constructBeanOrAddOnSerializer(SerializationCo
             BeanProperty.Std anyProp = new BeanProperty.Std(name, valueType, null,
                     anyGetter, PropertyMetadata.STD_OPTIONAL);
 
-            // Check if there is an accessor exposed for the anyGetter
-            BeanPropertyWriter anyGetterProp = null;
-            int anyGetterIndex = -1;
-            for (int i = 0; i < props.size(); i++) {
-                BeanPropertyWriter prop = props.get(i);
-                AnnotatedMember propMember = prop.getMember();
-                if (propMember == null) {
-                    continue;
-                }
-
-                boolean matches = false;
-                // [databind#5342]: Match only when the BeanPropertyWriter uses the same underlying member
-                // (method or field) as the @JsonAnyGetter accessor.
-                if (Objects.equals(propMember.getMember(), anyGetter.getMember())) {
-                    matches = true;
-                } else if (anyGetter instanceof AnnotatedField
-                        && propMember instanceof AnnotatedMethod) {
-                    String anyName = anyGetter.getName();
-                    String mName = propMember.getName();
-                    String capitalized = "";
-
-                    if (anyName.isEmpty()) {
-                        capitalized = anyName;
-                    } else if (anyName.length() == 1) {
-                        capitalized = anyName.toUpperCase(Locale.ROOT);
-                    } else {
-                        capitalized = Character.toUpperCase(anyName.charAt(0)) + anyName.substring(1);
-                    }
-                    if (mName.equals("get" + capitalized) || mName.equals("is" + capitalized)) {
-                        matches = true;
+            // Check if there is an accessor exposed for the anyGetter.
+            // First: by physical accessor (same Getter method or Field)
+            final int propCount = props.size();
+            int ix = -1;
+            // [databind#5342]: First match only when the BeanPropertyWriter uses the same
+            // underlying member (method or field) as the @JsonAnyGetter accessor.
+            for (int i = 0; i < propCount; i++) {
+                AnnotatedMember propMember = props.get(i).getMember();
+                if (propMember != null) {
+                    if (Objects.equals(propMember.getMember(), anyGetter.getMember())) {
+                        ix = i;
+                        break;
                     }
                 }
-
-                if (matches) {
-                    anyGetterProp = prop;
-                    anyGetterIndex = i;
-                    break;
+            }
+            // If that doesn't work, try match by logical property name
+            if (ix < 0) {
+                final String anyName = anyGetter.getName();
+                for (int i = 0; i < propCount; i++) {
+                    if (Objects.equals(anyName, props.get(i).getName())) {
+                        ix = i;
+                        break;
+                    }
                 }
             }
-            if (anyGetterIndex != -1) {
-                // There is prop is already in place, just need to replace it
-                AnyGetterWriter anyGetterWriter = new AnyGetterWriter(anyGetterProp, anyProp, anyGetter, anySer);
-                props.set(anyGetterIndex, anyGetterWriter);
+            if (ix >= 0) {
+                BeanPropertyWriter anyGetterProp = props.get(ix);
+                // There is prop already in place, just need to replace it
+                props.set(ix, new AnyGetterWriter(anyGetterProp, anyProp, anyGetter, anySer));
             } else {
                 // Otherwise just add it at the end, but won't be sorted...
                 // This is case where JsonAnyGetter is private/protected,

src/test/java/tools/jackson/databind/ser/AnyGetterOrdering4388Test.java

@@ -140,9 +140,9 @@ public String getKey() {
         }
     }
 
-    @JsonPropertyOrder({ "firstProperty", "secondProperties", "thirdProperty", "forthProperty" })
+    @JsonPropertyOrder({ "firstProperty", "secondProperties", "thirdProperty", "fourthProperty" })
     static class PrivateAnyGetterPojo {
-        public int firstProperty = 1, forthProperty = 4, thirdProperty = 3;
+        public int firstProperty = 1, fourthProperty = 4, thirdProperty = 3;
 
         @JsonAnyGetter
         private Map<String, Object> secondProperties = new HashMap<>();
@@ -157,7 +157,7 @@ public Map<String, Object> secondProperties() {
         }
     }
 
-    @JsonPropertyOrder({ "firstProperty", "secondProperties", "thirdProperty", "forthProperty" })
+    @JsonPropertyOrder({ "firstProperty", "secondProperties", "thirdProperty", "fourthProperty" })
     static class PrivateAnyGetterPojoSorted extends PrivateAnyGetterPojo {
         public Map<String, Object> getSecondProperties() {
             return super.secondProperties;
@@ -338,7 +338,7 @@ public void testPrivateAnyGetter() throws Exception {
         assertEquals(a2q("{" +
                 "'firstProperty':1," +
                 "'thirdProperty':3," +
-                "'forthProperty':4," +
+                "'fourthProperty':4," +
                 "'secondProperty':2}"), // private accesor, wont' work here
             json);
     }
@@ -353,7 +353,7 @@ public void testPrivateAnyGetterSorted() throws Exception {
                 "'firstProperty':1," +
                 "'secondProperty':2," + // private accesor, wont' work here
                 "'thirdProperty':3," +
-                "'forthProperty':4}"),
+                "'fourthProperty':4}"),
             json);
     }
 

src/test/java/tools/jackson/databind/ser/AnyGetterNameConflictSerialization5342Test.java renamed to src/test/java/tools/jackson/databind/tofix/AnyGetterNameConflictSerialization5342Test.java

@@ -1,4 +1,4 @@
-package tools.jackson.databind.ser;
+package tools.jackson.databind.tofix;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -9,13 +9,17 @@
 
 import tools.jackson.databind.ObjectMapper;
 import tools.jackson.databind.testutil.DatabindTestUtil;
+import tools.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-// [databind#5342] JsonAnyGetter method serialization can override JsonProperty serialization on serialized name conflict
+// [databind#5342] JsonAnyGetter method serialization can override JsonProperty
+// serialization on serialized name conflict
+//
+// No plans to fix: left in place for now
 public class AnyGetterNameConflictSerialization5342Test
     extends DatabindTestUtil
 {
@@ -49,6 +53,7 @@ public void hidden(Map<String, Object> additionalPropertiesProperty) {
 
     private final ObjectMapper MAPPER = newJsonMapper();
 
+    @JacksonTestFailureExpected
     @Test
     public void anyGetter5342()
         throws Exception
@@ -60,7 +65,6 @@ public void anyGetter5342()
         hidden.put("fizz", "buzz");
         pojo.hidden(hidden);
 
-
         String JSON = MAPPER.writeValueAsString(pojo);
         // was in 2.18 : {"foo":"bar","additionalProperties": {"fizz":"buzz"}}
         // now in 2.19 : {"foo":"bar"}... need FIX!
@@ -76,5 +80,4 @@ public void anyGetter5342()
         assertNotNull(actual.hidden());
         assertEquals(1, actual.hidden().size());
     }
-
 }