Fix #5342: Prevent @JsonAnyGetter from overriding @JsonProperty conflicts

Author: JacksonJang

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

@@ -388,11 +388,35 @@ protected ValueSerializer<Object> constructBeanOrAddOnSerializer(SerializationCo
             int anyGetterIndex = -1;
             for (int i = 0; i < props.size(); i++) {
                 BeanPropertyWriter prop = props.get(i);
-                // Either any-getter as field...
-                if (Objects.equals(prop.getName(), anyGetter.getName())
-                    // or as method
-                    || Objects.equals(prop.getMember().getMember(), anyGetter.getMember()))
-                {
+                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;
+                    }
+                }
+
+                if (matches) {
                     anyGetterProp = prop;
                     anyGetterIndex = i;
                     break;

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

@@ -1,4 +1,4 @@
-package tools.jackson.databind.tofix;
+package tools.jackson.databind.ser;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -9,7 +9,6 @@
 
 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;
 
@@ -50,7 +49,6 @@ public void hidden(Map<String, Object> additionalPropertiesProperty) {
 
     private final ObjectMapper MAPPER = newJsonMapper();
 
-    @JacksonTestFailureExpected
     @Test
     public void anyGetter5342()
         throws Exception