Merge branch '2.19'

FasterXML · Oct 3, 2024 · a836f57 · a836f57
2 parents 6ac2120 + 1ad5ea8
commit a836f57
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 64 deletions.
diff --git a/release-notes/CREDITS-2.x b/release-notes/CREDITS-2.x
@@ -1838,6 +1838,10 @@ Maxim Valeev (@MaximValeev)
  * Reported #4508: Deserialized JsonAnySetter field in Kotlin data class is null
   (2.18.1)
 
+@SandeepGaur2016
+
+ * Contributed fix for #2461: Nested `@JsonUnwrapped` property names not correctly handled
+  (2.19.0)
 
 Lars Benedetto (@lbenedetto)
  * Contributed #4676: Support other enum naming strategies than camelCase

diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -6,9 +6,12 @@ Project: jackson-databind
 
 2.19.0 (not yet released)
 
+#2461: Nested `@JsonUnwrapped` property names not correctly handled
+ (reported by @plovell)
+ (fix contributed by @SandeepGaur2016)
 #4676: Support other enum naming strategies than camelCase
  (requested by @hajdamak)
- (contributed by Lars B)
+ (contributed by Lars 
 
 2.18.1 (WIP-2024)
 

diff --git a/src/main/java/tools/jackson/databind/ser/BeanPropertyWriter.java b/src/main/java/tools/jackson/databind/ser/BeanPropertyWriter.java
@@ -214,8 +214,7 @@ public BeanPropertyWriter(BeanPropertyDefinition propDef,
 
         _declaredType = declaredType;
         _serializer = (ValueSerializer<Object>) ser;
-        _dynamicSerializers = (ser == null) ? PropertySerializerMap
-                .emptyForProperties() : null;
+        _dynamicSerializers = (ser == null) ? PropertySerializerMap.emptyForProperties() : null;
         _typeSerializer = typeSer;
         _cfgSerializationType = serType;
 
@@ -298,7 +297,7 @@ protected BeanPropertyWriter(BeanPropertyWriter base, PropertyName name) {
                     base._internalSettings);
         }
         _cfgSerializationType = base._cfgSerializationType;
-        _dynamicSerializers = base._dynamicSerializers;
+        _dynamicSerializers = PropertySerializerMap.emptyForProperties();
         _suppressNulls = base._suppressNulls;
         _suppressableValue = base._suppressableValue;
         _includeInViews = base._includeInViews;
@@ -323,7 +322,7 @@ protected BeanPropertyWriter(BeanPropertyWriter base, SerializedString name) {
                     base._internalSettings);
         }
         _cfgSerializationType = base._cfgSerializationType;
-        _dynamicSerializers = base._dynamicSerializers;
+        _dynamicSerializers = PropertySerializerMap.emptyForProperties();
         _suppressNulls = base._suppressNulls;
         _suppressableValue = base._suppressableValue;
         _includeInViews = base._includeInViews;

diff --git a/...est/java/tools/jackson/databind/tofix/JsonUnwrappedInconsistentSerialization4697Test.java b/...est/java/tools/jackson/databind/tofix/JsonUnwrappedInconsistentSerialization4697Test.java
diff --git a/src/test/java/tools/jackson/databind/tofix/UnwrappedCaching2461Test.java b/src/test/java/tools/jackson/databind/tofix/UnwrappedCaching2461Test.java
@@ -39,7 +39,6 @@ static class OuterContainer {
     }
 
     // [databind#2461]
-    @JacksonTestFailureExpected
     @Test
     void unwrappedCaching() throws Exception {
         final InnerContainer inner = new InnerContainer(new Base("12345"));