Merge branch '2.15' into 2.16

JooHyukKim · May 18, 2023 · 63a7b1d · 63a7b1d
2 parents 559cd04 + 3140bb7
commit 63a7b1d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -9,6 +9,10 @@ Project: jackson-databind
 #3928: `@JsonProperty` on constructor parameter changes default field serialization order
  (contributed by @pjfanning)
 
+2.15.2 (not yet released)
+
+#3938: Record setter not included from interface (2.15 regression)
+
 2.15.1 (16-May-2023)
 
 #3882: Error in creating nested `ArrayNode`s with `JsonNode.withArray()`

diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializer.java
@@ -470,7 +470,9 @@ protected Object _deserializeUsingPropertyBased(final JsonParser p, final Deseri
             // weren't removed (to help in creating constructor-backed PropertyCreator)
             // so they ended up in _beanProperties, unlike POJO (whose ignored
             // props are removed)
-            if ((prop != null) && !_beanType.isRecordType()) {
+            if ((prop != null) &&
+                // [databind#3938]: except if it's MethodProperty
+                (!_beanType.isRecordType() || (prop instanceof MethodProperty))) {
                 try {
                     buffer.bufferProperty(prop, _deserializeWithErrorWrapping(p, ctxt, prop));
                 } catch (UnresolvedForwardReference reference) {