Fix #4337: support @JsonSerialize(contentConverter) with `AtomicRef…

…erence` (#4338)
FasterXML · Jan 24, 2024 · 215557b · 215557b
1 parent 93dd44f
commit 215557b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 0 deletions.
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -37,6 +37,7 @@ Project: jackson-databind
   deserialization with `READ_UNKNOWN_ENUM_VALUES_AS_NULL` and `FAIL_ON_INVALID_SUBTYPE` wrong
  (reported by @ivan-zaitsev)
  (fix contributed by Joo-Hyuk K)
+#4337: `AtomicReference` serializer does not support `@JsonSerialize(contentConverter=...)`
 
 2.16.2 (not yet released)
 

diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/ReferenceTypeSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/ReferenceTypeSerializer.java
@@ -216,6 +216,9 @@ public JsonSerializer<?> createContextual(SerializerProvider provider,
                 ser = provider.handlePrimaryContextualization(ser, property);
             }
         }
+        // 23-Jan-2024, tatu: May have a content converter:
+        ser = findContextualConvertingSerializer(provider, property, ser);
+
         // First, resolve wrt property, resolved serializers
         ReferenceTypeSerializer<?> refSer;
         if ((_property == property)

diff --git a/src/test/java/com/fasterxml/jackson/databind/convert/ConvertingSerializerTest.java b/src/test/java/com/fasterxml/jackson/databind/convert/ConvertingSerializerTest.java
@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
 
 import org.junit.jupiter.api.Test;
 
@@ -101,6 +102,15 @@ public PointListWrapperMap(String key, int x, int y) {
         }
     }
 
+    static class PointReferenceBean {
+        @JsonSerialize(contentConverter=PointConverter.class)
+        public AtomicReference<Point> ref;
+
+        public PointReferenceBean(int x, int y) {
+            ref = new AtomicReference<>(new Point(x, y));
+        }
+    }
+
     // [databind#357]
     static class Value { }
 
@@ -220,6 +230,12 @@ public void testPropertyAnnotationForMaps() throws Exception {
         assertEquals("{\"values\":{\"a\":[1,2]}}", json);
     }
 
+    @Test
+    public void testPropertyAnnotationForReferences() throws Exception {
+        String json = MAPPER.writeValueAsString(new PointReferenceBean(3, 4));
+        assertEquals("{\"ref\":[3,4]}", json);
+    }
+
     // [databind#357]
     @Test
     public void testConverterForList357() throws Exception {