Merge branch '2.11' into 2.12

Author: cowtowncoder

release-notes/CREDITS-2.x

@@ -1117,19 +1117,21 @@ Michael Cramer (BigMichi1@github)
    fails randomly
   (2.11.1)
 
-Oleg Chtchoukine (oshatrk@github)
-  * Reported #2759: Rearranging of props when property-based generator is in use leads
-    to incorrect output
+Frank Schmager (fschmager@github)
+  * Reported #2757: "Conflicting setter definitions for property" exception for `Map`
+   subtype during deserialization
   (2.11.1)
 
 Johannes Kuhn (DasBrain@github)
+  * Reported #2758: Fail to deserialize local Records
+  (2.11.1)
   * Reported #2760: Jackson doesn't respect `CAN_OVERRIDE_ACCESS_MODIFIERS=false` for
     deserializer properties
   (2.11.1)
 
-Frank Schmager (fschmager@github)
-  * Reported #2757: "Conflicting setter definitions for property" exception for `Map`
-   subtype during deserialization
+Oleg Chtchoukine (oshatrk@github)
+  * Reported #2759: Rearranging of props when property-based generator is in use leads
+    to incorrect output
   (2.11.1)
 
 Mike Gilbode (gilbode@github)

release-notes/VERSION-2.x

@@ -50,6 +50,8 @@ Project: jackson-databind
 #2757: "Conflicting setter definitions for property" exception for `Map`
   subtype during deserialization
  (reported by Frank S)
+#2758: Fail to deserialize local Records
+ (reported by Johannes K)
 #2759: Rearranging of props when property-based generator is in use leads
   to incorrect output
  (reported by Oleg C)

src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializerFactory.java

@@ -908,9 +908,8 @@ protected boolean isPotentialBeanType(Class<?> type)
         if (ClassUtil.isProxyType(type)) {
             throw new IllegalArgumentException("Cannot deserialize Proxy class "+type.getName()+" as a Bean");
         }
-        /* also: can't deserialize some local classes: static are ok; in-method not;
-         * other non-static inner classes are ok
-         */
+        // also: can't deserialize some local classes: static are ok; in-method not;
+        // other non-static inner classes are ok
         typeStr = ClassUtil.isLocalType(type, true);
         if (typeStr != null) {
             throw new IllegalArgumentException("Cannot deserialize Class "+type.getName()+" (of type "+typeStr+") as a Bean");

src/main/java/com/fasterxml/jackson/databind/util/ClassUtil.java

@@ -184,19 +184,23 @@ public static String isLocalType(Class<?> type, boolean allowNonStatic)
     {
         /* As per [JACKSON-187], GAE seems to throw SecurityExceptions
          * here and there... and GAE itself has a bug, too
-         * (see []). Bah. So we need to catch some wayward exceptions on GAE
+         * Bah. So we need to catch some wayward exceptions on GAE
          */
         try {
+            final boolean isStatic = Modifier.isStatic(type.getModifiers());
+
             // one more: method locals, anonymous, are not good:
-            if (hasEnclosingMethod(type)) {
+            // 23-Jun-2020, tatu: [databind#2758] With JDK14+ should allow
+            //    local Record types, however
+            if (!isStatic && hasEnclosingMethod(type)) {
                 return "local/anonymous";
             }
             /* But how about non-static inner classes? Can't construct
              * easily (theoretically, we could try to check if parent
              * happens to be enclosing... but that gets convoluted)
              */
             if (!allowNonStatic) {
-                if (isNonStaticInnerClass(type)) {
+                if (!isStatic && getEnclosingClass(type) != null) {
                     return "non-static member class";
                 }
             }