Polish #54 : ClassUtils.resolveClassName

microsphere-projects · Jan 7, 2025 · 5bc7d09 · 5bc7d09
1 parent 1c8d3b5
commit 5bc7d09
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/BeanUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/beans/BeanUtils.java
@@ -53,7 +53,6 @@
 import static org.springframework.beans.factory.support.BeanDefinitionBuilder.rootBeanDefinition;
 import static org.springframework.beans.factory.support.BeanDefinitionReaderUtils.generateBeanName;
 import static org.springframework.util.ClassUtils.getUserClass;
-import static org.springframework.util.ClassUtils.resolveClassName;
 import static org.springframework.util.ObjectUtils.isEmpty;
 import static org.springframework.util.StringUtils.hasText;
 

diff --git a/...context/src/main/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtils.java b/...context/src/main/java/io/microsphere/spring/beans/factory/config/BeanDefinitionUtils.java
@@ -24,7 +24,6 @@
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.core.ResolvableType;
-import org.springframework.util.StringUtils;
 
 import javax.annotation.Nullable;
 import java.lang.invoke.MethodHandle;
@@ -40,13 +39,14 @@
 import static io.microsphere.util.ArrayUtils.EMPTY_OBJECT_ARRAY;
 import static io.microsphere.util.ArrayUtils.length;
 import static io.microsphere.util.ClassLoaderUtils.getDefaultClassLoader;
-import static io.microsphere.util.ClassLoaderUtils.resolveClass;
 import static java.util.Collections.emptySet;
 import static java.util.Collections.unmodifiableSet;
 import static org.springframework.beans.factory.config.BeanDefinition.ROLE_APPLICATION;
 import static org.springframework.beans.factory.config.BeanDefinition.ROLE_INFRASTRUCTURE;
 import static org.springframework.core.ResolvableType.forClass;
 import static org.springframework.core.ResolvableType.forMethodReturnType;
+import static org.springframework.util.ClassUtils.resolveClassName;
+import static org.springframework.util.StringUtils.hasText;
 
 /**
  * {@link BeanDefinition} Utilities class
@@ -172,9 +172,8 @@ public static Class<?> resolveBeanType(RootBeanDefinition beanDefinition, @Nulla
                 beanClass = beanDefinition.getBeanClass();
             } else {
                 String beanClassName = beanDefinition.getBeanClassName();
-                if (StringUtils.hasText(beanClassName)) {
-                    ClassLoader targetClassLoader = classLoader == null ? getDefaultClassLoader() : classLoader;
-                    beanClass = resolveClass(beanClassName, targetClassLoader, true);
+                if (hasText(beanClassName)) {
+                    beanClass = resolveClassName(beanClassName, classLoader);
                 }
             }
         } else {

diff --git a/...ring-context/src/main/java/io/microsphere/spring/beans/factory/support/BeanRegistrar.java b/...ring-context/src/main/java/io/microsphere/spring/beans/factory/support/BeanRegistrar.java
@@ -33,7 +33,6 @@
 import static io.microsphere.spring.beans.factory.config.BeanDefinitionUtils.genericBeanDefinition;
 import static io.microsphere.spring.beans.factory.config.BeanDefinitionUtils.setInstanceSupplier;
 import static java.beans.Introspector.decapitalize;
-
 import static org.springframework.beans.factory.config.BeanDefinition.ROLE_INFRASTRUCTURE;
 import static org.springframework.beans.factory.support.BeanDefinitionReaderUtils.generateBeanName;
 import static org.springframework.core.io.support.SpringFactoriesLoader.loadFactoryNames;

diff --git a/.../main/java/io/microsphere/spring/context/event/DependencyAnalysisBeanFactoryListener.java b/.../main/java/io/microsphere/spring/context/event/DependencyAnalysisBeanFactoryListener.java
@@ -57,11 +57,11 @@
 import static io.microsphere.spring.beans.factory.config.BeanDefinitionUtils.getInstanceSupplier;
 import static io.microsphere.spring.core.MethodParameterUtils.forParameter;
 import static io.microsphere.util.ArrayUtils.EMPTY_PARAMETER_ARRAY;
-import static io.microsphere.util.ClassLoaderUtils.resolveClass;
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyList;
 import static java.util.Collections.emptySet;
 import static java.util.Collections.singletonList;
+import static org.springframework.util.ClassUtils.resolveClassName;
 import static org.springframework.util.ObjectUtils.isEmpty;
 
 /**
@@ -395,7 +395,7 @@ private List<SmartInstantiationAwareBeanPostProcessor> getSmartInstantiationAwar
 
     private Class<?> getBeanClass(RootBeanDefinition beanDefinition, @Nullable ClassLoader classLoader) {
         return beanDefinition.hasBeanClass() ? beanDefinition.getBeanClass() :
-                resolveClass(beanDefinition.getBeanClassName(), classLoader);
+                resolveClassName(beanDefinition.getBeanClassName(), classLoader);
     }
 
     /**

diff --git a/.../src/main/java/io/microsphere/spring/context/event/EventPublishingBeanAfterProcessor.java b/.../src/main/java/io/microsphere/spring/context/event/EventPublishingBeanAfterProcessor.java
@@ -28,7 +28,6 @@
 import org.springframework.context.event.ContextClosedEvent;
 import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.core.ResolvableType;
-import org.springframework.util.ClassUtils;
 import org.springframework.util.ReflectionUtils;
 
 import java.util.Map;