Minor work for #4907: reduce _annotation_ introspection of JDK types …

…further (#4927)
FasterXML · Jan 26, 2025 · 3f6fbb4 · 3f6fbb4
1 parent 0e9db3d
commit 3f6fbb4
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/main/java/com/fasterxml/jackson/databind/introspect/AnnotatedClassResolver.java b/src/main/java/com/fasterxml/jackson/databind/introspect/AnnotatedClassResolver.java
@@ -58,8 +58,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) {
@@ -77,7 +77,7 @@ public class AnnotatedClassResolver
             _primaryMixin = (r == null) ? null : r.findMixInClassFor(_class);
         }
 
-        _collectAnnotations = (_intr != null);
+        _collectAnnotations = (_intr != null) && !ClassUtil.isJDKClass(_class);
     }
 
     public static AnnotatedClass resolve(MapperConfig<?> config, JavaType forType,
@@ -145,7 +145,6 @@ AnnotatedClass resolveFully() {
                 resolveClassAnnotations(superTypes),
                 _bindings, _intr, _mixInResolver, _config.getTypeFactory(),
                 _collectAnnotations);
-
     }
 
     AnnotatedClass resolveWithoutSuperTypes() {