Minor clean up

Author: cowtowncoder

release-notes/VERSION

@@ -11,6 +11,9 @@ 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)
 #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/jsontype/TypeResolverProvider.java

@@ -9,6 +9,8 @@
 import tools.jackson.databind.introspect.Annotated;
 import tools.jackson.databind.introspect.AnnotatedClass;
 import tools.jackson.databind.introspect.AnnotatedMember;
+import tools.jackson.databind.jsontype.impl.NoOpTypeDeserializer;
+import tools.jackson.databind.jsontype.impl.NoOpTypeSerializer;
 import tools.jackson.databind.jsontype.impl.StdTypeResolverBuilder;
 
 /**
@@ -172,7 +174,7 @@ public TypeSerializer findPropertyContentTypeSerializer(SerializationContext ctx
         }
         // [databind#1654]: Explicit `@JsonTypeInfo(Id.NONE)` should block class-level type info
         if (b == NO_RESOLVER) {
-            return tools.jackson.databind.jsontype.impl.NoOpTypeSerializer.instance();
+            return NoOpTypeSerializer.instance();
         }
         Collection<NamedType> subtypes = config.getSubtypeResolver().collectAndResolveSubtypesByClass(
                 config, accessor, contentType);
@@ -195,7 +197,7 @@ public TypeDeserializer findPropertyContentTypeDeserializer(DeserializationConte
         }
         // [databind#1654]: Explicit `@JsonTypeInfo(Id.NONE)` should block class-level type info
         if (b == NO_RESOLVER) {
-            return new tools.jackson.databind.jsontype.impl.NoOpTypeDeserializer(contentType);
+            return new NoOpTypeDeserializer(contentType, null);
         }
         Collection<NamedType> subtypes = config.getSubtypeResolver().collectAndResolveSubtypesByTypeId(config,
                 accessor, contentType);

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

@@ -22,21 +22,15 @@
 public class NoOpTypeDeserializer extends TypeDeserializer
 {
     private final JavaType _baseType;
-    private final ValueDeserializer<Object> _defaultDeserializer;
+    private final ValueDeserializer<Object> _deserializer;
 
-    public NoOpTypeDeserializer(JavaType baseType) {
+    public NoOpTypeDeserializer(JavaType baseType, ValueDeserializer<Object> deser) {
         _baseType = baseType;
-        _defaultDeserializer = null;
+        _deserializer = deser;
     }
 
-    private NoOpTypeDeserializer(JavaType baseType,
-            ValueDeserializer<Object> defaultDeserializer) {
-        _baseType = baseType;
-        _defaultDeserializer = defaultDeserializer;
-    }
-
-    public NoOpTypeDeserializer withDefaultImpl(ValueDeserializer<Object> deser) {
-        if (_defaultDeserializer == deser) {
+    public NoOpTypeDeserializer withDeserializer(ValueDeserializer<Object> deser) {
+        if (_deserializer == deser) {
             return this;
         }
         return new NoOpTypeDeserializer(_baseType, deser);
@@ -49,7 +43,8 @@ public TypeDeserializer forProperty(BeanProperty prop) {
 
     @Override
     public JsonTypeInfo.As getTypeInclusion() {
-        return JsonTypeInfo.As.PROPERTY;
+        // No proper value but need to return something
+        return JsonTypeInfo.As.EXISTING_PROPERTY;
     }
 
     @Override
@@ -102,15 +97,16 @@ public Object deserializeTypedFromAny(JsonParser p,
     protected Object _deserialize(JsonParser p, DeserializationContext ctxt)
         throws JacksonException
     {
-        if (_defaultDeserializer != null) {
-            return _defaultDeserializer.deserialize(p, ctxt);
-        }
+        ValueDeserializer<Object> deser = _deserializer;
+
         // Find deserializer for the base type (this will find custom deserializers
         // registered for this type, including those from @JsonDeserialize annotations)
-        ValueDeserializer<Object> deser = ctxt.findContextualValueDeserializer(_baseType, null);
         if (deser == null) {
-            ctxt.reportBadDefinition(_baseType,
-                    "Cannot find deserializer for type " + _baseType);
+            deser = ctxt.findContextualValueDeserializer(_baseType, null);
+            if (deser == null) {
+                ctxt.reportBadDefinition(_baseType,
+                        "Cannot find deserializer for type " + _baseType);
+            }
         }
         return deser.deserialize(p, ctxt);
     }

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

@@ -38,7 +38,8 @@ public TypeSerializer forProperty(SerializationContext ctxt, BeanProperty prop)
 
     @Override
     public JsonTypeInfo.As getTypeInclusion() {
-        return JsonTypeInfo.As.PROPERTY;
+        // No proper one to use but must return something:
+        return JsonTypeInfo.As.EXISTING_PROPERTY;
     }
 
     @Override
@@ -62,7 +63,8 @@ public WritableTypeId writeTypePrefix(JsonGenerator g,
         } else if (typeId.valueShape == JsonToken.START_ARRAY) {
             g.writeStartArray();
         }
-        // Mark as "already written" to prevent suffix from trying to close
+        // 1. Start marker (part of value) was written but
+        // 2. No value wrapper was written.
         typeId.wrapperWritten = false;
         return typeId;
     }
@@ -72,7 +74,7 @@ public WritableTypeId writeTypeSuffix(JsonGenerator g,
             SerializationContext ctxt, WritableTypeId typeId)
         throws JacksonException
     {
-        // Write the value end token if needed, but NO type information
+        // Write the value end token if needed, but no wrapper to close
         if (typeId.valueShape == JsonToken.START_OBJECT) {
             g.writeEndObject();
         } else if (typeId.valueShape == JsonToken.START_ARRAY) {