Make TypeIdResolvers serializable for Jackson 2.15 (FasterXML#4304)

Philzen · Apr 26, 2024 · 7a6ac8e · 7a6ac8e
1 parent a35faea
commit 7a6ac8e
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 3 deletions.
diff --git a/src/main/java/com/fasterxml/jackson/databind/jsontype/impl/ClassNameIdResolver.java b/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;

diff --git a/src/main/java/com/fasterxml/jackson/databind/jsontype/impl/TypeNameIdResolver.java b/src/main/java/com/fasterxml/jackson/databind/jsontype/impl/TypeNameIdResolver.java
@@ -12,7 +12,10 @@
 import com.fasterxml.jackson.databind.jsontype.NamedType;
 
 public class TypeNameIdResolver extends TypeIdResolverBase
+    implements java.io.Serializable // @since 2.17
 {
+    private static final long serialVersionUID = 1L;
+
     protected final MapperConfig<?> _config;
 
     /**

diff --git a/src/test/java/com/fasterxml/jackson/databind/TestJDKSerialization.java b/src/test/java/com/fasterxml/jackson/databind/TestJDKSerialization.java
@@ -3,9 +3,8 @@
 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 org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.databind.type.TypeFactory;
 
@@ -59,6 +58,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
@@ -191,4 +221,28 @@ 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) {
+            ObjectReader reader = newJsonMapper()
+                .readerFor(clazz);
+
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            ObjectOutputStream oos = new ObjectOutputStream(baos);
+            oos.writeObject(reader); // This line should throw NotSerializableException
+            oos.close();
+        }
+    }
 }