More merging

FasterXML · May 29, 2024 · 93128d6 · 93128d6
1 parent 05812cf
commit 93128d6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -24,6 +24,7 @@ Project: jackson-databind
  (contributed by @pjfanning)
 #4483: Remove `final` on method BeanSerializer.serialize()
  (contributed by Matthew L)
+#4515: Rewrite Bean Property Introspection logic in Jackson 2.x
 
 2.17.1 (04-May-2024)
 

diff --git a/src/main/java/tools/jackson/databind/introspect/BasicClassIntrospector.java b/src/main/java/tools/jackson/databind/introspect/BasicClassIntrospector.java
@@ -336,6 +336,11 @@ private boolean _isStdJDKCollection(JavaType type)
             //    of matches), or ambitious? Let's do latter for now.
             if (Collection.class.isAssignableFrom(raw)
                     || Map.class.isAssignableFrom(raw)) {
+                // 28-May-2024, tatu: Complications wrt [databind#4515] / [databind#2795]
+                //    mean that partial introspection NOT for inner classes
+                if (raw.toString().indexOf('$') > 0) {
+                    return false;
+                }
                 return true;
             }
         }