Merge branch '3.x' into 5405-map-format-shape-bug

Author: cowtowncoder

release-notes/VERSION

@@ -11,6 +11,10 @@ Versions: 3.x (for earlier see VERSION-2.x)
 #1196: Add opt-in error collection for deserialization
  (requested by @odrotbohm)
  (contributed by @sri-adarsh-kumar)
+#1654: @JsonDeserialize(contentUsing=...) is ignored if content
+  type is determined by @JsonTypeInfo
+ (reported by @pdegoeje)
+ (fix by @cowtowncoder, @JacksonJang)
 #1980: Add method `remove(JsonPointer)` in `ContainerNode`
  (fix by @cowtowncoder, w/ Claude code)
 #3964: Deserialization issue: MismatchedInputException, Bean not

src/main/java/tools/jackson/databind/BeanDescription.java

@@ -198,14 +198,22 @@ public AnnotatedMember findJsonKeyAccessor() {
      */
     public abstract AnnotatedMember findJsonValueAccessor();
 
+    /**
+     * Method used to locate the Method or Field of introspected class that
+     * is annotated with {@link com.fasterxml.jackson.annotation.JsonAnyGetter}
+     * (or equivalent annotation).
+     * If no such {@code AnnotatedMember} exists {@code null} is returned.
+     * If more than one are found, an exception is thrown.
+     */
     public abstract AnnotatedMember findAnyGetter();
 
     /**
      * Method used to locate a mutator (settable field, or 2-argument set method)
      * of introspected class that
-     * implements {@link com.fasterxml.jackson.annotation.JsonAnySetter}.
-     * If no such mutator exists null is returned. If more than one are found,
-     * an exception is thrown.
+     * is annotated with {@link com.fasterxml.jackson.annotation.JsonAnySetter}
+     * (or equivalent annotation).
+     * If no such mutator exists {@code null} is returned.
+     * If more than one are found an exception is thrown.
      * Additional checks are also made to see that method signature
      * is acceptable: needs to take 2 arguments, first one String or
      * Object; second any can be any type.

src/main/java/tools/jackson/databind/DatabindContext.java

@@ -23,7 +23,7 @@
 /**
  * Shared base class for {@link DeserializationContext} and
  * {@link SerializationContext}, context objects passed through data-binding
- * process. Designed so that some of implementations can rely on shared
+ * process. Designed so that some of the implementations can rely on shared
  * aspects like access to secondary contextual objects like type factories
  * or handler instantiators.
  */

src/main/java/tools/jackson/databind/ObjectMapper.java

@@ -186,11 +186,7 @@ protected Object readResolve() {
      */
 
     /**
-     * Factory used for constructing per-call {@link SerializationContext}s.
-     *<p>
-     * Note: while serializers are only exposed {@link SerializationContext},
-     * mappers and readers need to access additional API defined by
-     * {@link SerializationContextExt}
+     * Factory used for constructing per-call {@link SerializationContext} instances.
      */
     protected final SerializationContexts _serializationContexts;
 
@@ -207,7 +203,7 @@ protected Object readResolve() {
      */
 
     /**
-     * Factory used for constructing per-call {@link DeserializationContext}s.
+     * Factory used for constructing per-call {@link DeserializationContext} instances.
      */
     protected final DeserializationContexts _deserializationContexts;
 

src/main/java/tools/jackson/databind/ObjectWriter.java

@@ -54,7 +54,7 @@ public class ObjectWriter
      * Factory used for constructing per-call {@link SerializationContext}s.
      *<p>
      * Note: while serializers are only exposed {@link SerializationContext},
-     * mappers and readers need to access additional API defined by
+     * writers need to access additional API defined by
      * {@link SerializationContextExt}
      */
     protected final SerializationContexts _serializationContexts;
@@ -80,7 +80,7 @@ public class ObjectWriter
      * We may pre-fetch serializer if root type
      * is known (has been explicitly declared), and if so, reuse it afterwards.
      * This allows avoiding further serializer lookups and increases
-     * performance a bit on cases where readers are reused.
+     * performance a bit on cases where writers are reused.
      */
     protected final Prefetch _prefetch;
 
@@ -367,7 +367,7 @@ public ObjectWriter withoutFeatures(FormatFeature... features) {
      * as the root type for serialization, instead of runtime dynamic
      * type of the root object itself.
      *<p>
-     * Note that method does NOT change state of this reader, but
+     * Note that the method does NOT change the state of this writer, but
      * rather construct and returns a newly configured instance.
      */
     public ObjectWriter forType(JavaType rootType) {
@@ -403,7 +403,7 @@ public ObjectWriter forType(TypeReference<?> rootType) {
      * use specified date format for serializing dates; or if null passed, one
      * that will serialize dates as numeric timestamps.
      *<p>
-     * Note that the method does NOT change state of this reader, but
+     * Note that the method does NOT change the state of this writer, but
      * rather construct and returns a newly configured instance.
      */
     public ObjectWriter with(DateFormat df) {
@@ -442,7 +442,7 @@ public ObjectWriter with(PrettyPrinter pp) {
      * specifies what root name to use for "root element wrapping".
      * See {@link SerializationConfig#withRootName(String)} for details.
      *<p>
-     * Note that method does NOT change state of this reader, but
+     * Note that the method does NOT change the state of this writer, but
      * rather construct and returns a newly configured instance.
      *
      * @param rootName Root name to use, if non-empty; `null` for "use defaults",
@@ -472,7 +472,7 @@ public ObjectWriter withoutRootName() {
      * Method that will construct a new instance that uses specific format schema
      * for serialization.
      *<p>
-     * Note that method does NOT change state of this reader, but
+     * Note that the method does NOT change the state of this writer, but
      * rather construct and returns a newly configured instance.
      */
     public ObjectWriter with(FormatSchema schema) {
@@ -485,7 +485,7 @@ public ObjectWriter with(FormatSchema schema) {
      * serialization view for serialization (with null basically disables
      * view processing)
      *<p>
-     * Note that the method does NOT change state of this reader, but
+     * Note that the method does NOT change the state of this writer, but
      * rather construct and returns a newly configured instance.
      */
     public ObjectWriter withView(Class<?> view) {
@@ -1279,7 +1279,7 @@ public final static class Prefetch
          * We may pre-fetch serializer if {@link #rootType}
          * is known, and if so, reuse it afterwards.
          * This allows avoiding further serializer lookups and increases
-         * performance a bit on cases where readers are reused.
+         * performance a bit on cases where writers are reused.
          */
         private final ValueSerializer<Object> valueSerializer;
 

src/main/java/tools/jackson/databind/ValueSerializer.java

@@ -4,6 +4,7 @@
 import java.util.Set;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
 
 import tools.jackson.core.*;
 import tools.jackson.databind.jsonFormatVisitors.JsonFormatVisitable;
@@ -252,13 +253,20 @@ public void serializeWithType(T value, JsonGenerator gen, SerializationContext c
             TypeSerializer typeSer)
         throws JacksonException
     {
+        // 07-Dec-2025, tatu: [databind#1654] Check for "no-op" type serializer
+        //   indirectly
+        if (typeSer.getTypeInclusion() == As.NOTHING) {
+            serialize(value, gen, ctxt);
+            return;
+        }
+
         Class<?> clz = handledType();
         if (clz == null) {
             clz = value.getClass();
         }
         ctxt.reportBadDefinition(clz, String.format(
-                "Type id handling not implemented for type %s (by serializer of type %s)",
-                clz.getName(), getClass().getName()));
+"Type id handling (method `serializeWithType()`) not implemented for type %s (by serializer of type %s)",
+                ClassUtil.nameOf(clz), ClassUtil.nameOf(getClass())));
     }
 
     /*

src/main/java/tools/jackson/databind/cfg/MapperBuilder.java

@@ -1037,6 +1037,8 @@ public B withAllCoercionConfigs(Consumer<CoercionConfigs> handler) {
      */
     public B removeAllModules() {
         _modules = null;
+        // [databind#5481]: invalidate cached state when modules are modified
+        _savedState = null;
         return _this();
     }
 
@@ -1068,6 +1070,8 @@ public B addModule(JacksonModule module)
             _modules.putIfAbsent(dep.getRegistrationId(), dep);
         }
         _modules.put(moduleId, module);
+        // [databind#5481]: invalidate cached state when modules are modified
+        _savedState = null;
         return _this();
     }
 

src/main/java/tools/jackson/databind/cfg/SerializationContexts.java

@@ -10,13 +10,14 @@
 
 /**
  * Factory/builder class that replaces Jackson 2.x concept of "blueprint" instance
- * of {@link tools.jackson.databind.SerializationContext}. It will be constructed and configured during
- * {@link ObjectMapper} building phase, and will be called once per {@code writeValue}
- * call to construct actual stateful {@link tools.jackson.databind.SerializationContext} to use during
- * serialization.
+ * of {@link tools.jackson.databind.SerializationContext}. It will be constructed
+ * and configured during {@link ObjectMapper} building phase,
+ * and will be called once per {@code writeValue} call to construct actual stateful
+ * {@link tools.jackson.databind.SerializationContext} to use during serialization.
  *<p>
  * Note that since this object has to be serializable (to allow JDK serialization of
- * mapper instances), {@link tools.jackson.databind.SerializationContext} need not be serializable any more.
+ * mapper instances), {@link tools.jackson.databind.SerializationContext}
+ * need not be serializable any more.
  *
  * @since 3.0
  */

src/main/java/tools/jackson/databind/deser/BasicDeserializerFactory.java

@@ -24,6 +24,7 @@
 import tools.jackson.databind.ext.jdk8.OptionalLongDeserializer;
 import tools.jackson.databind.introspect.*;
 import tools.jackson.databind.jsontype.TypeDeserializer;
+import tools.jackson.databind.jsontype.impl.NoOpTypeDeserializer;
 import tools.jackson.databind.type.*;
 import tools.jackson.databind.util.*;
 
@@ -714,17 +715,14 @@ public ValueDeserializer<?> createArrayDeserializer(DeserializationContext ctxt,
             ArrayType type, BeanDescription.Supplier beanDescRef)
     {
         final DeserializationConfig config = ctxt.getConfig();
-        JavaType elemType = type.getContentType();
+        final JavaType elemType = type.getContentType();
 
         // Very first thing: is deserializer hard-coded for elements?
         @SuppressWarnings("unchecked")
-        ValueDeserializer<Object> contentDeser = (ValueDeserializer<Object>) elemType.getValueHandler();
+        final ValueDeserializer<Object> contentDeser = (ValueDeserializer<Object>) elemType.getValueHandler();
         // Then optional type info: if type has been resolved, we may already know type deserializer:
-        TypeDeserializer elemTypeDeser = (TypeDeserializer) elemType.getTypeHandler();
-        // but if not, may still be possible to find:
-        if (elemTypeDeser == null) {
-            elemTypeDeser = ctxt.findTypeDeserializer(elemType);
-        }
+        final TypeDeserializer elemTypeDeser = _findContentTypeDeserializer(ctxt, elemType);
+
         // 23-Nov-2010, tatu: Custom array deserializer?
         ValueDeserializer<?>  deser = _findCustomArrayDeserializer(type,
                 config, beanDescRef, elemTypeDeser, contentDeser);
@@ -760,17 +758,11 @@ public ValueDeserializer<?> createArrayDeserializer(DeserializationContext ctxt,
     public ValueDeserializer<?> createCollectionDeserializer(DeserializationContext ctxt,
             CollectionType type, BeanDescription.Supplier beanDescRef)
     {
-        JavaType contentType = type.getContentType();
-        // Very first thing: is deserializer hard-coded for elements?
-        ValueDeserializer<Object> contentDeser = (ValueDeserializer<Object>) contentType.getValueHandler();
+        final JavaType contentType = type.getContentType();
+        final ValueDeserializer<Object> contentDeser = (ValueDeserializer<Object>) contentType.getValueHandler();
+        final TypeDeserializer contentTypeDeser = _findContentTypeDeserializer(ctxt, contentType);
         final DeserializationConfig config = ctxt.getConfig();
 
-        // Then optional type info: if type has been resolved, we may already know type deserializer:
-        TypeDeserializer contentTypeDeser = (TypeDeserializer) contentType.getTypeHandler();
-        // but if not, may still be possible to find:
-        if (contentTypeDeser == null) {
-            contentTypeDeser = ctxt.findTypeDeserializer(contentType);
-        }
         // 23-Nov-2010, tatu: Custom deserializer?
         ValueDeserializer<?> deser = _findCustomCollectionDeserializer(type,
                 config, beanDescRef, contentTypeDeser, contentDeser);
@@ -853,18 +845,13 @@ protected CollectionType _mapAbstractCollectionType(JavaType type, Deserializati
     public ValueDeserializer<?> createCollectionLikeDeserializer(DeserializationContext ctxt,
             CollectionLikeType type, BeanDescription.Supplier beanDescRef)
     {
-        JavaType contentType = type.getContentType();
+        final JavaType contentType = type.getContentType();
         // Very first thing: is deserializer hard-coded for elements?
         @SuppressWarnings("unchecked")
         ValueDeserializer<Object> contentDeser = (ValueDeserializer<Object>) contentType.getValueHandler();
         final DeserializationConfig config = ctxt.getConfig();
+        final TypeDeserializer contentTypeDeser = _findContentTypeDeserializer(ctxt, contentType);
 
-        // Then optional type info: if type has been resolved, we may already know type deserializer:
-        TypeDeserializer contentTypeDeser = (TypeDeserializer)contentType.getTypeHandler();
-        // but if not, may still be possible to find:
-        if (contentTypeDeser == null) {
-            contentTypeDeser = ctxt.findTypeDeserializer(contentType);
-        }
         ValueDeserializer<?> deser = _findCustomCollectionLikeDeserializer(type, config, beanDescRef,
                 contentTypeDeser, contentDeser);
         if (deser != null) {
@@ -889,8 +876,8 @@ public ValueDeserializer<?> createMapDeserializer(DeserializationContext ctxt,
             MapType type, BeanDescription.Supplier beanDescRef)
     {
         final DeserializationConfig config = ctxt.getConfig();
-        JavaType keyType = type.getKeyType();
-        JavaType contentType = type.getContentType();
+        final JavaType keyType = type.getKeyType();
+        final JavaType contentType = type.getContentType();
 
         // First: is there annotation-specified deserializer for values?
         @SuppressWarnings("unchecked")
@@ -899,11 +886,7 @@ public ValueDeserializer<?> createMapDeserializer(DeserializationContext ctxt,
         // Ok: need a key deserializer (null indicates 'default' here)
         KeyDeserializer keyDes = (KeyDeserializer) keyType.getValueHandler();
         // Then optional type info; either attached to type, or resolved separately:
-        TypeDeserializer contentTypeDeser = (TypeDeserializer) contentType.getTypeHandler();
-        // but if not, may still be possible to find:
-        if (contentTypeDeser == null) {
-            contentTypeDeser = ctxt.findTypeDeserializer(contentType);
-        }
+        final TypeDeserializer contentTypeDeser = _findContentTypeDeserializer(ctxt, contentType);
 
         // 23-Nov-2010, tatu: Custom deserializer?
         ValueDeserializer<?> deser = _findCustomMapDeserializer(type, config, beanDescRef,
@@ -1007,8 +990,8 @@ protected MapType _mapAbstractMapType(JavaType type, DeserializationConfig confi
     public ValueDeserializer<?> createMapLikeDeserializer(DeserializationContext ctxt,
             MapLikeType type, BeanDescription.Supplier beanDescRef)
     {
-        JavaType keyType = type.getKeyType();
-        JavaType contentType = type.getContentType();
+        final JavaType keyType = type.getKeyType();
+        final JavaType contentType = type.getContentType();
         final DeserializationConfig config = ctxt.getConfig();
 
         // First: is there annotation-specified deserializer for values?
@@ -1023,11 +1006,7 @@ public ValueDeserializer<?> createMapLikeDeserializer(DeserializationContext ctx
         }
         */
         // Then optional type info; either attached to type, or resolve separately:
-        TypeDeserializer contentTypeDeser = (TypeDeserializer) contentType.getTypeHandler();
-        // but if not, may still be possible to find:
-        if (contentTypeDeser == null) {
-            contentTypeDeser = ctxt.findTypeDeserializer(contentType);
-        }
+        final TypeDeserializer contentTypeDeser = _findContentTypeDeserializer(ctxt, contentType);
         ValueDeserializer<?> deser = _findCustomMapLikeDeserializer(type, config,
                 beanDescRef, keyDes, contentTypeDeser, contentDeser);
         if (deser != null) {
@@ -1139,11 +1118,7 @@ public ValueDeserializer<?> createReferenceDeserializer(DeserializationContext c
         @SuppressWarnings("unchecked")
         ValueDeserializer<Object> contentDeser = (ValueDeserializer<Object>) contentType.getValueHandler();
         final DeserializationConfig config = ctxt.getConfig();
-        // Then optional type info: if type has been resolved, we may already know type deserializer:
-        TypeDeserializer contentTypeDeser = (TypeDeserializer) contentType.getTypeHandler();
-        if (contentTypeDeser == null) { // or if not, may be able to find:
-            contentTypeDeser = ctxt.findTypeDeserializer(contentType);
-        }
+        final TypeDeserializer contentTypeDeser = _findContentTypeDeserializer(ctxt, contentType);
         ValueDeserializer<?> deser = _findCustomReferenceDeserializer(type, config, beanDescRef,
                 contentTypeDeser, contentDeser);
 
@@ -1738,6 +1713,24 @@ protected boolean _hasCreatorAnnotation(MapperConfig<?> config,
         return false;
     }
 
+    // @since 3.1
+    protected TypeDeserializer _findContentTypeDeserializer(DeserializationContext ctxt,
+            JavaType contentType)
+    {
+        // Then optional type info: if type has been resolved, we may already know type deserializer:
+        TypeDeserializer contentTypeDeser = (TypeDeserializer) contentType.getTypeHandler();
+        // [databind#1654]: @JsonTypeInfo(use = Id.NONE) should not apply type deserializer
+        // when custom content deserializer is specified via @JsonDeserialize(contentUsing = ...)
+        if (contentTypeDeser instanceof NoOpTypeDeserializer) {
+            return null;
+        }
+        if (contentTypeDeser == null) {
+            // but if not, may still be possible to find:
+            contentTypeDeser = ctxt.findTypeDeserializer(contentType);
+        }
+        return contentTypeDeser;
+    }
+    
     /*
     /**********************************************************************
     /* Helper classes