Complete the fix, testing impovements

Author: cowtowncoder

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,6 +253,13 @@ 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();

src/main/java/tools/jackson/databind/ser/jdk/CollectionSerializer.java

@@ -11,7 +11,6 @@
 import tools.jackson.databind.SerializationContext;
 import tools.jackson.databind.ValueSerializer;
 import tools.jackson.databind.jsontype.TypeSerializer;
-import tools.jackson.databind.jsontype.impl.NoOpTypeSerializer;
 import tools.jackson.databind.ser.impl.PropertySerializerMap;
 import tools.jackson.databind.ser.std.AsArraySerializerBase;
 import tools.jackson.databind.ser.std.StdContainerSerializer;
@@ -172,8 +171,6 @@ public void serializeContentsUsing(Collection<?> value, JsonGenerator g, Seriali
                     } else {
                         if (typeSer == null) {
                             ser.serialize(elem, g, provider);
-                        } else if (typeSer instanceof NoOpTypeSerializer) {
-                            ser.serialize(elem, g, provider);
                         } else {
                             ser.serializeWithType(elem, g, provider, typeSer);
                         }