Merge branch '3.1' into 3.2

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Author: cowtowncoder

release-notes/CREDITS

@@ -672,3 +672,7 @@ Sergey Lappo (@sergeylappo)
  * Reported #6227: `BeanDescription` is not thread-safe when called concurrently on the
    same instance (`findProperties()`, `findDefaultViews()`)
   [3.2.4]
+
+Sanha (@kimsanhaa)
+ * Fixed #6240: `@JsonValue` ignored on getter also annotated with `@JsonKey`
+  [3.2.4]

release-notes/CREDITS-2.x

@@ -2117,3 +2117,7 @@ Sergey Lappo (@sergeylappo)
  * Reported #6227: `BeanDescription` is not thread-safe when called concurrently on the
    same instance (`findProperties()`, `findDefaultViews()`)
   [2.21.8]
+
+Sanha (@kimsanhaa)
+ * Fixed #6240: `@JsonValue` ignored on getter also annotated with `@JsonKey`
+  [2.23.0]

release-notes/VERSION

@@ -24,6 +24,8 @@ No changes since 3.2
 #6236: Retain `JsonFormat.Shape` in `withFormat()` of `Month`, `MonthDay`, `Year`
   and `YearMonth` serializers
  (fix by @cowtowncoder, w/ Claude code)
+#6240: `@JsonValue` ignored on getter also annotated with `@JsonKey`
+ (fix by @kimsanhaa)
 
 3.2.3 (21-Sep-2026)
 
@@ -363,6 +365,8 @@ No changes since 3.2
 #6236: Retain `JsonFormat.Shape` in `withFormat()` of `Month`, `MonthDay`, `Year`
   and `YearMonth` serializers
  (fix by @cowtowncoder, w/ Claude code)
+#6240: `@JsonValue` ignored on getter also annotated with `@JsonKey`
+ (fix by @kimsanhaa)
 
 3.1.7 (21-Sep-2026)
 

release-notes/VERSION-2.x

@@ -6,7 +6,8 @@ Project: jackson-databind
 
 2.23.0 (not yet released)
 
-No changes since 2.22
+#6240: `@JsonValue` ignored on getter also annotated with `@JsonKey`
+ (fix by @kimsanhaa)
 
 2.22.4 (not yet released)
 

src/main/java/tools/jackson/databind/introspect/POJOPropertiesCollector.java

@@ -1258,21 +1258,27 @@ protected void _addGetterMethod(Map<String, POJOPropertyBuilder> props,
             // 07-Feb-2025: [databind#4775] Do not stop processing here
             //   (used to return)
         }
-        // @JsonKey?
-        else if (Boolean.TRUE.equals(_annotationIntrospector.hasAsKey(_config, m))) {
-            if (_jsonKeyAccessors == null) {
-                _jsonKeyAccessors = new LinkedList<>();
+        else {
+            // [databind#6240]: may have both (as with fields); neither is a regular property
+            boolean asKey = Boolean.TRUE.equals(_annotationIntrospector.hasAsKey(_config, m));
+            boolean asValue = Boolean.TRUE.equals(_annotationIntrospector.hasAsValue(_config, m));
+            // @JsonKey?
+            if (asKey) {
+                if (_jsonKeyAccessors == null) {
+                    _jsonKeyAccessors = new LinkedList<>();
+                }
+                _jsonKeyAccessors.add(m);
             }
-            _jsonKeyAccessors.add(m);
-            return;
-        }
-        // @JsonValue?
-        else if (Boolean.TRUE.equals(_annotationIntrospector.hasAsValue(_config, m))) {
-            if (_jsonValueAccessors == null) {
-                _jsonValueAccessors = new LinkedList<>();
+            // @JsonValue?
+            if (asValue) {
+                if (_jsonValueAccessors == null) {
+                    _jsonValueAccessors = new LinkedList<>();
+                }
+                _jsonValueAccessors.add(m);
+            }
+            if (asKey || asValue) {
+                return;
             }
-            _jsonValueAccessors.add(m);
-            return;
         }
         String implName; // from naming convention
         boolean visible;

src/test/java/tools/jackson/databind/ser/jdk/MapSerializationTest.java

@@ -168,6 +168,41 @@ public static class NoKeyOuter {
         }
     }
 
+    // [databind#6240]: same as `Outer2871`, but annotations on getter
+    static class OuterWithGetter6240 {
+        private final Inner2871 inner;
+
+        OuterWithGetter6240(Inner2871 inner) {
+            this.inner = inner;
+        }
+
+        @JsonKey
+        @JsonValue
+        public Inner2871 getInner() {
+            return inner;
+        }
+    }
+
+    // [databind#6240]
+    static class KeyOnlyGetter6240 {
+        public String name = "value";
+
+        @JsonKey
+        @JsonValue(false)
+        public String getId() {
+            return "a";
+        }
+    }
+
+    // [databind#6240]
+    static class ValueOnlyGetter6240 {
+        @JsonKey(false)
+        @JsonValue
+        public String getId() {
+            return "a";
+        }
+    }
+
     // // // Inner types from MapKeySerializationTest
 
     static class KarlSerializer extends ValueSerializer<String>
@@ -487,6 +522,37 @@ public void testNoKeyOuter() throws Exception {
         assertEquals("{\"key\":\"innerValue\"}", actual);
     }
 
+    // [databind#6240]
+    @Test
+    public void testClassAsKeyWithGetter() throws Exception {
+        OuterWithGetter6240 outer = new OuterWithGetter6240(new Inner2871("innerKey", "innerValue"));
+        assertEquals("{\"innerKey\":\"value\"}",
+                MAPPER.writeValueAsString(Collections.singletonMap(outer, "value")));
+    }
+
+    // [databind#6240]
+    @Test
+    public void testClassAsValueWithGetter() throws Exception {
+        OuterWithGetter6240 outer = new OuterWithGetter6240(new Inner2871("innerKey", "innerValue"));
+        assertEquals("\"innerValue\"", MAPPER.writeValueAsString(outer));
+        assertEquals("{\"key\":\"innerValue\"}",
+                MAPPER.writeValueAsString(Collections.singletonMap("key", outer)));
+    }
+
+    // [databind#6240]: disabled `@JsonValue` must not expose key getter as property
+    @Test
+    public void testKeyOnlyGetter() throws Exception {
+        assertEquals("{\"name\":\"value\"}", MAPPER.writeValueAsString(new KeyOnlyGetter6240()));
+        assertEquals("{\"a\":1}",
+                MAPPER.writeValueAsString(Collections.singletonMap(new KeyOnlyGetter6240(), 1)));
+    }
+
+    // [databind#6240]: disabled `@JsonKey` must not disable `@JsonValue`
+    @Test
+    public void testValueOnlyGetter() throws Exception {
+        assertEquals("\"a\"", MAPPER.writeValueAsString(new ValueOnlyGetter6240()));
+    }
+
     // // // Tests from MapKeySerializationTest
 
     @Test