From f732fab8206f83e012fa0f6f6b05089ef3f4d0c8 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Sun, 3 Jul 2022 17:30:30 +0200 Subject: [PATCH] Delete unused imports and dead code in CGLIB fork --- .../main/java/org/springframework/cglib/beans/BulkBean.java | 4 ---- .../org/springframework/cglib/beans/BulkBeanEmitter.java | 2 -- .../org/springframework/cglib/beans/BulkBeanException.java | 2 -- .../java/org/springframework/cglib/core/ReflectUtils.java | 5 ----- .../main/java/org/springframework/cglib/proxy/Enhancer.java | 1 - 5 files changed, 14 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/cglib/beans/BulkBean.java b/spring-core/src/main/java/org/springframework/cglib/beans/BulkBean.java index fdcda8af01..7fdd702dbd 100644 --- a/spring-core/src/main/java/org/springframework/cglib/beans/BulkBean.java +++ b/spring-core/src/main/java/org/springframework/cglib/beans/BulkBean.java @@ -15,11 +15,7 @@ */ package org.springframework.cglib.beans; -import java.lang.reflect.Constructor; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; import java.security.ProtectionDomain; -import java.util.*; import org.springframework.cglib.core.*; import org.springframework.asm.ClassVisitor; diff --git a/spring-core/src/main/java/org/springframework/cglib/beans/BulkBeanEmitter.java b/spring-core/src/main/java/org/springframework/cglib/beans/BulkBeanEmitter.java index 0729361159..9502c3fa88 100644 --- a/spring-core/src/main/java/org/springframework/cglib/beans/BulkBeanEmitter.java +++ b/spring-core/src/main/java/org/springframework/cglib/beans/BulkBeanEmitter.java @@ -15,10 +15,8 @@ */ package org.springframework.cglib.beans; -import java.lang.reflect.Constructor; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import java.util.*; import org.springframework.cglib.core.*; import org.springframework.asm.ClassVisitor; import org.springframework.asm.Type; diff --git a/spring-core/src/main/java/org/springframework/cglib/beans/BulkBeanException.java b/spring-core/src/main/java/org/springframework/cglib/beans/BulkBeanException.java index 6ad290b7aa..20887f9383 100644 --- a/spring-core/src/main/java/org/springframework/cglib/beans/BulkBeanException.java +++ b/spring-core/src/main/java/org/springframework/cglib/beans/BulkBeanException.java @@ -15,8 +15,6 @@ */ package org.springframework.cglib.beans; -import org.springframework.cglib.core.CodeGenerationException; - @SuppressWarnings({"rawtypes", "unchecked", "serial"}) public class BulkBeanException extends RuntimeException { diff --git a/spring-core/src/main/java/org/springframework/cglib/core/ReflectUtils.java b/spring-core/src/main/java/org/springframework/cglib/core/ReflectUtils.java index f11a75fc06..b765ce12c0 100644 --- a/spring-core/src/main/java/org/springframework/cglib/core/ReflectUtils.java +++ b/spring-core/src/main/java/org/springframework/cglib/core/ReflectUtils.java @@ -38,7 +38,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.springframework.asm.Attribute; import org.springframework.asm.Type; /** @@ -626,10 +625,6 @@ public class ReflectUtils { public Type[] getExceptionTypes() { return ReflectUtils.getExceptionTypes(member); } - - public Attribute getAttribute() { - return null; - } }; } diff --git a/spring-core/src/main/java/org/springframework/cglib/proxy/Enhancer.java b/spring-core/src/main/java/org/springframework/cglib/proxy/Enhancer.java index 71c6a372d5..38920c8c21 100644 --- a/spring-core/src/main/java/org/springframework/cglib/proxy/Enhancer.java +++ b/spring-core/src/main/java/org/springframework/cglib/proxy/Enhancer.java @@ -1247,7 +1247,6 @@ public class Enhancer extends AbstractClassGenerator { se.invoke_constructor(THREAD_LOCAL, CSTRUCT_NULL); se.putfield(THREAD_CALLBACKS_FIELD); - final Object[] state = new Object[1]; CallbackGenerator.Context context = new CallbackGenerator.Context() { public ClassLoader getClassLoader() { return Enhancer.this.getClassLoader();