Resolve CGLIB core<->transform package cycle

See gh-28955

spring-core/src/main/java/org/springframework/cglib/core/ClassEmitter.java

@@ -15,8 +15,6 @@
  */
 package org.springframework.cglib.core;
 
-import org.springframework.cglib.transform.ClassTransformer;
-
 import org.springframework.asm.ClassVisitor;
 import org.springframework.asm.FieldVisitor;
 import org.springframework.asm.MethodVisitor;

spring-core/src/main/java/org/springframework/cglib/core/ClassTransformer.java

@@ -13,9 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cglib.transform;
+package org.springframework.cglib.core;
 
-import org.springframework.cglib.core.Constants;
 import org.springframework.asm.ClassVisitor;
 
 public abstract class ClassTransformer extends ClassVisitor {

spring-core/src/main/java/org/springframework/cglib/transform/AbstractClassFilterTransformer.java

@@ -15,7 +15,12 @@
  */
 package org.springframework.cglib.transform;
 
-import org.springframework.asm.*;
+import org.springframework.asm.AnnotationVisitor;
+import org.springframework.asm.Attribute;
+import org.springframework.asm.ClassVisitor;
+import org.springframework.asm.FieldVisitor;
+import org.springframework.asm.MethodVisitor;
+import org.springframework.cglib.core.ClassTransformer;
 
 abstract public class AbstractClassFilterTransformer extends AbstractClassTransformer {
     private ClassTransformer pass;

spring-core/src/main/java/org/springframework/cglib/transform/AbstractClassTransformer.java

@@ -15,6 +15,7 @@
  */
 package org.springframework.cglib.transform;
 
+import org.springframework.cglib.core.ClassTransformer;
 import org.springframework.cglib.core.Constants;
 import org.springframework.asm.ClassVisitor;
 

spring-core/src/main/java/org/springframework/cglib/transform/ClassFilterTransformer.java

@@ -16,6 +16,8 @@
 
 package org.springframework.cglib.transform;
 
+import org.springframework.cglib.core.ClassTransformer;
+
 public class ClassFilterTransformer extends AbstractClassFilterTransformer {
     private ClassFilter filter;
 

spring-core/src/main/java/org/springframework/cglib/transform/ClassTransformerChain.java

@@ -15,7 +15,9 @@
  */
 package org.springframework.cglib.transform;
 
-import org.springframework.asm.*;
+import org.springframework.asm.ClassVisitor;
+import org.springframework.asm.MethodVisitor;
+import org.springframework.cglib.core.ClassTransformer;
 
 public class ClassTransformerChain extends AbstractClassTransformer {
     private ClassTransformer[] chain;

spring-core/src/main/java/org/springframework/cglib/transform/ClassTransformerFactory.java

@@ -15,6 +15,8 @@
  */
 package org.springframework.cglib.transform;
 
+import org.springframework.cglib.core.ClassTransformer;
+
 public interface ClassTransformerFactory {
     ClassTransformer newInstance();
 }

spring-core/src/main/java/org/springframework/cglib/transform/ClassTransformerTee.java

@@ -15,6 +15,7 @@
  */
 package org.springframework.cglib.transform;
 
+import org.springframework.cglib.core.ClassTransformer;
 import org.springframework.cglib.core.Constants;
 import org.springframework.asm.ClassVisitor;
 

spring-core/src/main/java/org/springframework/cglib/transform/ClassVisitorTee.java

@@ -15,8 +15,13 @@
  */
 package org.springframework.cglib.transform;
 
+import org.springframework.asm.AnnotationVisitor;
+import org.springframework.asm.Attribute;
+import org.springframework.asm.ClassVisitor;
+import org.springframework.asm.FieldVisitor;
+import org.springframework.asm.MethodVisitor;
+import org.springframework.asm.TypePath;
 import org.springframework.cglib.core.Constants;
-import org.springframework.asm.*;
 
 public class ClassVisitorTee extends ClassVisitor {
     private ClassVisitor cv1, cv2;

spring-core/src/main/java/org/springframework/cglib/transform/MethodFilterTransformer.java

@@ -15,7 +15,9 @@
  */
 package org.springframework.cglib.transform;
 
-import org.springframework.asm.*;
+import org.springframework.asm.ClassVisitor;
+import org.springframework.asm.MethodVisitor;
+import org.springframework.cglib.core.ClassTransformer;
 
 public class MethodFilterTransformer extends AbstractClassTransformer {
     private MethodFilter filter;

spring-core/src/main/java/org/springframework/cglib/transform/MethodVisitorTee.java

@@ -15,8 +15,13 @@
  */
 package org.springframework.cglib.transform;
 
+import org.springframework.asm.AnnotationVisitor;
+import org.springframework.asm.Attribute;
+import org.springframework.asm.Handle;
+import org.springframework.asm.Label;
+import org.springframework.asm.MethodVisitor;
+import org.springframework.asm.TypePath;
 import org.springframework.cglib.core.Constants;
-import org.springframework.asm.*;
 
 @SuppressWarnings("deprecation")
 public class MethodVisitorTee extends MethodVisitor {

spring-core/src/main/java/org/springframework/cglib/transform/TransformingClassGenerator.java

@@ -18,6 +18,7 @@ package org.springframework.cglib.transform;
 
 import org.springframework.asm.ClassVisitor;
 import org.springframework.cglib.core.ClassGenerator;
+import org.springframework.cglib.core.ClassTransformer;
 
 public class TransformingClassGenerator implements ClassGenerator {
     private final ClassGenerator gen;

spring-core/src/main/java/org/springframework/cglib/transform/TransformingClassLoader.java

@@ -18,6 +18,7 @@ package org.springframework.cglib.transform;
 
 import org.springframework.asm.ClassReader;
 import org.springframework.cglib.core.ClassGenerator;
+import org.springframework.cglib.core.ClassTransformer;
 
 public class TransformingClassLoader extends AbstractClassLoader {
     private final ClassTransformerFactory t;

spring-core/src/main/java/org/springframework/cglib/transform/impl/UndeclaredThrowableStrategy.java

@@ -19,7 +19,7 @@ import org.springframework.cglib.core.ClassGenerator;
 import org.springframework.cglib.core.DefaultGeneratorStrategy;
 import org.springframework.cglib.core.GeneratorStrategy;
 import org.springframework.cglib.core.TypeUtils;
-import org.springframework.cglib.transform.ClassTransformer;
+import org.springframework.cglib.core.ClassTransformer;
 import org.springframework.cglib.transform.MethodFilter;
 import org.springframework.cglib.transform.MethodFilterTransformer;
 import org.springframework.cglib.transform.TransformingClassGenerator;