Merge branch '2.15' into 2.16

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -132,6 +132,10 @@ Project: jackson-databind
   does not work
  (reported by @jonasho)
  (fix contributed by Joo-Hyuk K)
+#4303: `ObjectReader` is not serializable if it's configured for polymorphism
+ (reported by @asardaes)
+ (fix contributed by Joo-Hyuk K)
+
 
 2.15.3 (12-Oct-2023)
 

src/main/java/com/fasterxml/jackson/databind/jsontype/impl/ClassNameIdResolver.java

@@ -17,7 +17,10 @@
  */
 public class ClassNameIdResolver
     extends TypeIdResolverBase
+    implements java.io.Serializable // @since 2.17
 {
+    private static final long serialVersionUID = 1L;
+
     private final static String JAVA_UTIL_PKG = "java.util.";
 
     protected final PolymorphicTypeValidator _subTypeValidator;

src/main/java/com/fasterxml/jackson/databind/jsontype/impl/TypeNameIdResolver.java

@@ -18,7 +18,10 @@
  * defaults to fully-qualified {@link Class} names (obtained with {@link Class#getName()}
  */
 public class TypeNameIdResolver extends TypeIdResolverBase
+    implements java.io.Serializable // @since 2.17
 {
+    private static final long serialVersionUID = 1L;
+
     protected final MapperConfig<?> _config;
 
     /**

src/test/java/com/fasterxml/jackson/databind/TestJDKSerialization.java

@@ -1,11 +1,8 @@
 package com.fasterxml.jackson.databind;
 
-import java.io.*;
 import java.util.*;
 
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.annotation.*;
 
 import com.fasterxml.jackson.databind.type.TypeFactory;
 
@@ -59,6 +56,37 @@ public Map<String,Object> properties() {
         }
     }
 
+
+    @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS)
+    @JsonSubTypes({@JsonSubTypes.Type(value = FooClassImpl.class)})
+    public class FooClass { }
+    class FooClassImpl extends FooClass { }
+
+    @JsonTypeInfo(use = JsonTypeInfo.Id.DEDUCTION)
+    @JsonSubTypes({@JsonSubTypes.Type(value = FooDeductionImpl.class)})
+    public class FooDeduction { }
+    class FooDeductionImpl extends FooDeduction { }
+
+    @JsonTypeInfo(use = JsonTypeInfo.Id.NONE)
+    @JsonSubTypes({@JsonSubTypes.Type(value = FooNoneImpl.class)})
+    public class FooNone { }
+    class FooNoneImpl extends FooNone { }
+
+    @JsonTypeInfo(use = JsonTypeInfo.Id.CUSTOM)
+    @JsonSubTypes({@JsonSubTypes.Type(value = FooCustomImpl.class)})
+    public class FooCustom { }
+    class FooCustomImpl extends FooCustom { }
+
+    @JsonTypeInfo(use = JsonTypeInfo.Id.MINIMAL_CLASS)
+    @JsonSubTypes({@JsonSubTypes.Type(value = FooMinimalClassImpl.class)})
+    public class FooMinimalClass { }
+    class FooMinimalClassImpl extends FooMinimalClass { }
+
+    @JsonTypeInfo(use = JsonTypeInfo.Id.NAME)
+    @JsonSubTypes({@JsonSubTypes.Type(value = FooNameImpl.class)})
+    public class FooName { }
+    class FooNameImpl extends FooName { }
+
     /*
     /**********************************************************
     /* Tests for individual objects
@@ -71,7 +99,7 @@ public Map<String,Object> properties() {
      */
     private final ObjectMapper MAPPER = newJsonMapper();
 
-    public void testConfigs() throws IOException
+    public void testConfigs() throws Exception
     {
         byte[] base = jdkSerialize(MAPPER.getDeserializationConfig().getBaseSettings());
         assertNotNull(jdkDeserialize(base));
@@ -92,7 +120,7 @@ public void testConfigs() throws IOException
     }
 
     // for [databind#899]
-    public void testEnumHandlers() throws IOException
+    public void testEnumHandlers() throws Exception
     {
         ObjectMapper mapper = newJsonMapper();
         // ensure we have serializers and/or deserializers, first
@@ -125,7 +153,7 @@ public void testEnumHandlers() throws IOException
         assertNotNull(result2);
     }
 
-    public void testObjectWriter() throws IOException
+    public void testObjectWriter() throws Exception
     {
         ObjectWriter origWriter = MAPPER.writer();
         final String EXP_JSON = "{\"x\":2,\"y\":3}";
@@ -139,7 +167,7 @@ public void testObjectWriter() throws IOException
         assertEquals(EXP_JSON, writer2.writeValueAsString(p));
     }
 
-    public void testObjectReader() throws IOException
+    public void testObjectReader() throws Exception
     {
         ObjectReader origReader = MAPPER.readerFor(MyPojo.class);
         String JSON = "{\"x\":1,\"y\":2}";
@@ -159,7 +187,7 @@ public void testObjectReader() throws IOException
         assertEquals(Integer.valueOf(2), any2.properties().get("y"));
     }
 
-    public void testObjectMapper() throws IOException
+    public void testObjectMapper() throws Exception
     {
         final String EXP_JSON = "{\"x\":2,\"y\":3}";
         final MyPojo p = new MyPojo(2, 3);
@@ -191,4 +219,29 @@ public void testTypeFactory() throws Exception
         t = orig.constructType(JavaType.class);
         assertEquals(JavaType.class, t.getRawClass());
     }
+
+    // [databind#4303]
+    public void testObjectReaderSerializationWithPolymorphism()
+        throws Exception
+    {
+        Class<?>[] classes = new Class<?>[] {
+            FooClass.class,
+            FooDeduction.class,
+            FooNone.class,
+            FooCustom.class,
+            FooMinimalClass.class,
+            FooName.class
+        };
+
+        for (Class<?> clazz : classes) {
+            // Should be enough to ask for reader for polymorphic type
+            // (no need to actually serialize/deserialize)
+            ObjectReader reader = newJsonMapper()
+                .readerFor(clazz);
+
+            byte[] bytes = jdkSerialize(reader);
+            ObjectReader result = jdkDeserialize(bytes);
+            assertNotNull(result);
+        }
+    }
 }