Deprecate a method from ClassUtil

cowtowncoder · cowtowncoder · commit 1182bcc53120 · 2020-08-17T14:28:02.000-07:00
diff --git a/src/main/java/com/fasterxml/jackson/databind/JsonMappingException.java b/src/main/java/com/fasterxml/jackson/databind/JsonMappingException.java
@@ -137,13 +137,6 @@ public String getDescription() {
                     while (--arrays >= 0) {
                         sb.append("[]");
                     }
-                    /* was:
-                    String pkgName = ClassUtil.getPackageName(cls);
-                    if (pkgName != null) {
-                        sb.append(pkgName);
-                        sb.append('.');
-                    }
-                    */
                 }
                 sb.append('[');
                 if (_fieldName != null) {
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializerModifier.java b/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializerModifier.java
@@ -3,8 +3,6 @@
 import java.util.List;
 
 import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.deser.BeanDeserializer;
-import com.fasterxml.jackson.databind.deser.BeanDeserializerFactory;
 import com.fasterxml.jackson.databind.introspect.BeanPropertyDefinition;
 import com.fasterxml.jackson.databind.type.ArrayType;
 import com.fasterxml.jackson.databind.type.CollectionLikeType;
diff --git a/src/main/java/com/fasterxml/jackson/databind/introspect/DefaultAccessorNamingStrategy.java b/src/main/java/com/fasterxml/jackson/databind/introspect/DefaultAccessorNamingStrategy.java
@@ -173,25 +173,21 @@ private static boolean isCglibGetCallbacks(AnnotatedMethod am)
 
             Class<?> compType = rt.getComponentType();
             // Actually, let's just verify it's a "net.sf.cglib.*" class/interface
-            String pkgName = ClassUtil.getPackageName(compType);
-            if (pkgName != null) {
-                if (pkgName.contains(".cglib")) {
-                    return pkgName.startsWith("net.sf.cglib")
-                        // also, as per [JACKSON-177]
-                        || pkgName.startsWith("org.hibernate.repackage.cglib")
-                        // and [core#674]
-                        || pkgName.startsWith("org.springframework.cglib");
-                }
+            final String className = compType.getName();
+            if (className.contains(".cglib")) {
+                return className.startsWith("net.sf.cglib")
+                    // also, as per [JACKSON-177]
+                    || className.startsWith("org.hibernate.repackage.cglib")
+                    // and [core#674]
+                    || className.startsWith("org.springframework.cglib");
             }
         }
         return false;
     }
 
     // Another helper method to deal with Groovy's problematic metadata accessors
-    private static boolean isGroovyMetaClassGetter(AnnotatedMethod am)
-    {
-        String pkgName = ClassUtil.getPackageName(am.getRawType());
-        return (pkgName != null) && pkgName.startsWith("groovy.lang");
+    private static boolean isGroovyMetaClassGetter(AnnotatedMethod am) {
+        return am.getRawType().getName().startsWith("groovy.lang");
     }
 
     /*
diff --git a/src/main/java/com/fasterxml/jackson/databind/util/BeanUtil.java b/src/main/java/com/fasterxml/jackson/databind/util/BeanUtil.java
@@ -175,21 +175,18 @@ protected static boolean isCglibGetCallbacks(AnnotatedMethod am)
         Class<?> rt = am.getRawType();
         // Ok, first: must return an array type
         if (rt.isArray()) {
-            /* And that type needs to be "net.sf.cglib.proxy.Callback".
-             * Theoretically could just be a type that implements it, but
-             * for now let's keep things simple, fix if need be.
-             */
+            // And that type needs to be "net.sf.cglib.proxy.Callback".
+            // Theoretically could just be a type that implements it, but
+            // for now let's keep things simple, fix if need be.
             Class<?> compType = rt.getComponentType();
             // Actually, let's just verify it's a "net.sf.cglib.*" class/interface
-            String pkgName = ClassUtil.getPackageName(compType);
-            if (pkgName != null) {
-                if (pkgName.contains(".cglib")) {
-                    return pkgName.startsWith("net.sf.cglib")
-                        // also, as per [JACKSON-177]
-                        || pkgName.startsWith("org.hibernate.repackage.cglib")
-                        // and [core#674]
-                        || pkgName.startsWith("org.springframework.cglib");
-                }
+            final String className = compType.getName();
+            if (className.contains(".cglib")) {
+                return className.startsWith("net.sf.cglib")
+                    // also, as per [JACKSON-177]
+                    || className.startsWith("org.hibernate.repackage.cglib")
+                    // and [core#674]
+                    || className.startsWith("org.springframework.cglib");
             }
         }
         return false;
@@ -198,10 +195,8 @@ protected static boolean isCglibGetCallbacks(AnnotatedMethod am)
     /**
      * Another helper method to deal with Groovy's problematic metadata accessors
      */
-    protected static boolean isGroovyMetaClassGetter(AnnotatedMethod am)
-    {
-        String pkgName = ClassUtil.getPackageName(am.getRawType());
-        return (pkgName != null) && pkgName.startsWith("groovy.lang");
+    protected static boolean isGroovyMetaClassGetter(AnnotatedMethod am) {
+        return am.getRawType().getName().startsWith("groovy.lang");
     }
 
     /*
diff --git a/src/test/java/com/fasterxml/jackson/databind/deser/impl/BeanPropertyMapTest.java b/src/test/java/com/fasterxml/jackson/databind/deser/impl/BeanPropertyMapTest.java
@@ -4,9 +4,6 @@
 
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.deser.SettableBeanProperty;
-import com.fasterxml.jackson.databind.deser.impl.BeanPropertyMap;
-import com.fasterxml.jackson.databind.deser.impl.ObjectIdReader;
-import com.fasterxml.jackson.databind.deser.impl.ObjectIdValueProperty;
 import com.fasterxml.jackson.databind.type.TypeFactory;
 
 // for [databind#884]
diff --git a/src/test/java/com/fasterxml/jackson/databind/node/ArrayNodeTest.java b/src/test/java/com/fasterxml/jackson/databind/node/ArrayNodeTest.java
@@ -8,10 +8,7 @@
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.exc.MismatchedInputException;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import com.fasterxml.jackson.databind.node.TextNode;
-import com.fasterxml.jackson.databind.node.TreeTraversingParser;
+
 import static java.util.Arrays.asList;
 
 /**
diff --git a/src/test/java/com/fasterxml/jackson/databind/ser/BeanSerializerModifier1612Test.java b/src/test/java/com/fasterxml/jackson/databind/ser/BeanSerializerModifier1612Test.java
@@ -7,9 +7,6 @@
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.exc.InvalidDefinitionException;
 import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.fasterxml.jackson.databind.ser.BeanPropertyWriter;
-import com.fasterxml.jackson.databind.ser.BeanSerializerBuilder;
-import com.fasterxml.jackson.databind.ser.BeanSerializerModifier;
 
 public class BeanSerializerModifier1612Test extends BaseMapTest
 {
diff --git a/src/test/java/com/fasterxml/jackson/databind/ser/BeanSerializerModifierTest.java b/src/test/java/com/fasterxml/jackson/databind/ser/BeanSerializerModifierTest.java
@@ -9,10 +9,6 @@
 import com.fasterxml.jackson.databind.introspect.AnnotatedField;
 import com.fasterxml.jackson.databind.introspect.POJOPropertyBuilder;
 import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.fasterxml.jackson.databind.ser.BeanPropertyWriter;
-import com.fasterxml.jackson.databind.ser.BeanSerializer;
-import com.fasterxml.jackson.databind.ser.BeanSerializerBuilder;
-import com.fasterxml.jackson.databind.ser.BeanSerializerModifier;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
 import com.fasterxml.jackson.databind.type.ArrayType;
 import com.fasterxml.jackson.databind.type.CollectionType;

Original file line number	Diff line number	Diff line change
`@@ -137,13 +137,6 @@ public String getDescription() {`
`137`	`137`	`while (--arrays >= 0) {`
`138`	`138`	`sb.append("[]");`
`139`	`139`	`}`
`140`		`- /* was:`
`141`		`- String pkgName = ClassUtil.getPackageName(cls);`
`142`		`- if (pkgName != null) {`
`143`		`- sb.append(pkgName);`
`144`		`- sb.append('.');`
`145`		`- }`
`146`		`- */`
`147`	`140`	`}`
`148`	`141`	`sb.append('[');`
`149`	`142`	`if (_fieldName != null) {`
Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,6 @@`
`7`	`7`	`import com.fasterxml.jackson.databind.*;`
`8`	`8`	`import com.fasterxml.jackson.databind.exc.InvalidDefinitionException;`
`9`	`9`	`import com.fasterxml.jackson.databind.module.SimpleModule;`
`10`		`-import com.fasterxml.jackson.databind.ser.BeanPropertyWriter;`
`11`		`-import com.fasterxml.jackson.databind.ser.BeanSerializerBuilder;`
`12`		`-import com.fasterxml.jackson.databind.ser.BeanSerializerModifier;`
`13`	`10`
`14`	`11`	`public class BeanSerializerModifier1612Test extends BaseMapTest`
`15`	`12`	`{`