Merge branch '3.x' into 5342-fix-prevent-name-conflict-JsonAnyGetter

Author: cowtowncoder

release-notes/VERSION

@@ -14,6 +14,7 @@ Versions: 3.x (for earlier see VERSION-2.x)
 #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/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/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

src/main/java/tools/jackson/databind/jsontype/TypeResolverProvider.java

@@ -119,6 +119,7 @@ public TypeSerializer findPropertyTypeSerializer(SerializationContext ctxt,
         if (b == NO_RESOLVER) {
             // 07-Dec-2025, tatu: Should we actually do this? (No test coverage yet)
             //return NoOpTypeSerializer.instance();
+
             return null;
         }
         Collection<NamedType> subtypes = config.getSubtypeResolver().collectAndResolveSubtypesByClass(

src/main/java/tools/jackson/databind/jsontype/TypeSerializer.java

@@ -92,6 +92,10 @@ public WritableTypeId typeId(Object value, JsonToken valueShape) {
         case WRAPPER_OBJECT:
             typeIdDef.include = WritableTypeId.Inclusion.WRAPPER_OBJECT;
             break;
+        case NOTHING:
+            // 07-Dec-2025, tatu: No suitable constant to use. Should add "NOTHING"?
+            typeIdDef.include = null;
+            break;
         default:
             VersionUtil.throwInternal();
         }

src/main/java/tools/jackson/databind/jsontype/impl/NoOpTypeDeserializer.java

@@ -48,8 +48,7 @@ public TypeDeserializer forProperty(BeanProperty prop) {
 
     @Override
     public JsonTypeInfo.As getTypeInclusion() {
-        // No proper value but need to return something
-        return JsonTypeInfo.As.EXISTING_PROPERTY;
+        return JsonTypeInfo.As.NOTHING;
     }
 
     @Override

src/main/java/tools/jackson/databind/jsontype/impl/NoOpTypeSerializer.java

@@ -38,8 +38,7 @@ public TypeSerializer forProperty(SerializationContext ctxt, BeanProperty prop)
 
     @Override
     public JsonTypeInfo.As getTypeInclusion() {
-        // No proper one to use but must return something:
-        return JsonTypeInfo.As.EXISTING_PROPERTY;
+        return JsonTypeInfo.As.NOTHING;
     }
 
     @Override