Merge branch '2.19'

FasterXML · Jan 26, 2025 · 4b75cc8 · 4b75cc8
2 parents eb8c072 + 3f6fbb4
commit 4b75cc8
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/main/java/tools/jackson/databind/introspect/AnnotatedClassResolver.java b/src/main/java/tools/jackson/databind/introspect/AnnotatedClassResolver.java
@@ -56,8 +56,8 @@ public class AnnotatedClassResolver
 
         // Also... JDK types do not have annotations that are of interest to us
         // At least JDK container types
-        _collectAnnotations = (_intr != null) &&
-                (!ClassUtil.isJDKClass(_class) || !_type.isContainerType());
+        // 25-Jan-2025, tatu: [databind#4907] not just Container types, all JDK types
+        _collectAnnotations = (_intr != null) && !ClassUtil.isJDKClass(_class);
     }
 
     AnnotatedClassResolver(MapperConfig<?> config, Class<?> cls, MixInResolver r) {
@@ -70,7 +70,7 @@ public class AnnotatedClassResolver
                 ? config.getAnnotationIntrospector() : null;
         _primaryMixin = (r == null) ? null : r.findMixInClassFor(_class);
 
-        _collectAnnotations = (_intr != null);
+        _collectAnnotations = (_intr != null) && !ClassUtil.isJDKClass(_class);
     }
 
     /*
@@ -151,7 +151,6 @@ AnnotatedClass resolveFully() {
                 resolveClassAnnotations(superTypes),
                 _bindings, _mixInResolver,
                 _collectAnnotations);
-
     }
 
     AnnotatedClass resolveWithoutSuperTypes() {