Merge branch '2.12'

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/introspect/DefaultAccessorNamingStrategy.java

@@ -61,13 +61,17 @@ public String findNameForRegularGetter(AnnotatedMethod am, String name)
             // method "getCallbacks". Not sure of exact safe criteria to get decent
             // coverage without false matches; but for now let's assume there is
             // no reason to use any such getter from CGLib.
+
+            // 05-Oct-2020, tatu: Removed from Jackson 3.0
+            /*
             if ("getCallbacks".equals(name)) {
-                if (isCglibGetCallbacks(am)) {
+                if (_isCglibGetCallbacks(am)) {
                     return null;
                 }
-            } else if ("getMetaClass".equals(name)) {
+            } else */
+            if ("getMetaClass".equals(name)) {
                 // 30-Apr-2009, tatu: Need to suppress serialization of a cyclic reference
-                if (isGroovyMetaClassGetter(am)) {
+                if (_isGroovyMetaClassGetter(am)) {
                     return null;
                 }
             }
@@ -128,7 +132,7 @@ protected static String stdManglePropertyName(final String basename, final int o
 
     /*
     /**********************************************************************
-    /* Legacy methods copied in 2.12 from "BeanUtil" -- are these still needed?
+    /* Legacy methods moved in 2.12 from "BeanUtil" -- are these still needed?
     /**********************************************************************
      */
 
@@ -137,7 +141,10 @@ protected static String stdManglePropertyName(final String basename, final int o
     // At this point caller has detected a potential getter method with
     // name "getCallbacks" and we need to determine if it is indeed injected
     // by Cglib. We do this by verifying that the  result type is "net.sf.cglib.proxy.Callback[]"
-    private static boolean isCglibGetCallbacks(AnnotatedMethod am)
+
+    // 05-Oct-2020, tatu: Removed from 3.0
+    /*
+    protected boolean _isCglibGetCallbacks(AnnotatedMethod am)
     {
         Class<?> rt = am.getRawType();
         // Ok, first: must return an array type
@@ -159,9 +166,11 @@ private static boolean isCglibGetCallbacks(AnnotatedMethod am)
         }
         return false;
     }
+    */
 
+    // 05-Oct-2020, tatu: Left in 3.0 for now
     // Another helper method to deal with Groovy's problematic metadata accessors
-    private static boolean isGroovyMetaClassGetter(AnnotatedMethod am) {
+    protected boolean _isGroovyMetaClassGetter(AnnotatedMethod am) {
         return am.getRawType().getName().startsWith("groovy.lang");
     }