Polish #54 : ClassUtils.resolveClassName

microsphere-projects · Jan 7, 2025 · 6dd20aa · 6dd20aa
1 parent 5bc7d09
commit 6dd20aa
Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/...n/java/io/microsphere/spring/context/annotation/AnnotatedBeanDefinitionRegistryUtils.java b/...n/java/io/microsphere/spring/context/annotation/AnnotatedBeanDefinitionRegistryUtils.java
@@ -28,7 +28,6 @@
 import static io.microsphere.util.ArrayUtils.EMPTY_CLASS_ARRAY;
 import static io.microsphere.util.ArrayUtils.isEmpty;
 import static io.microsphere.util.ArrayUtils.isNotEmpty;
-import static io.microsphere.util.ClassLoaderUtils.resolveClass;
 import static java.util.Arrays.asList;
 import static org.springframework.context.annotation.AnnotationConfigUtils.CONFIGURATION_BEAN_NAME_GENERATOR;
 import static org.springframework.util.ObjectUtils.nullSafeEquals;
@@ -64,7 +63,7 @@ public static boolean isPresentBean(BeanDefinitionRegistry registry, Class<?> an
             if (beanDefinition instanceof AnnotatedBeanDefinition) {
                 AnnotationMetadata annotationMetadata = ((AnnotatedBeanDefinition) beanDefinition).getMetadata();
                 String className = annotationMetadata.getClassName();
-                Class<?> targetClass = resolveClass(className, classLoader);
+                Class<?> targetClass = resolveClassName(className, classLoader);
                 present = nullSafeEquals(targetClass, annotatedClass);
                 if (present) {
                     if (logger.isTraceEnabled()) {

diff --git a/microsphere-spring-context/src/main/java/io/microsphere/spring/core/io/ResourceUtils.java b/microsphere-spring-context/src/main/java/io/microsphere/spring/core/io/ResourceUtils.java
@@ -43,7 +43,7 @@ public abstract class ResourceUtils extends BaseUtils {
      *
      * @since Spring Framework 5.0.2
      */
-    public static final Class FILE_URL_RESOURCE_CLASS = resolveClass(FILE_URL_RESOURCE_CLASS_NAME, ResourceUtils.class.getClassLoader());
+    public static final Class FILE_URL_RESOURCE_CLASS = resolveClass(FILE_URL_RESOURCE_CLASS_NAME);
 
     /**
      * Determine whether the specified {@link Resource} is a {@linkplain org.springframework.core.io.FileUrlResource}

diff --git a/...ntext/src/main/java/io/microsphere/spring/core/io/support/SpringFactoriesLoaderUtils.java b/...ntext/src/main/java/io/microsphere/spring/core/io/support/SpringFactoriesLoaderUtils.java
@@ -41,7 +41,6 @@
 import static io.microsphere.spring.context.ApplicationContextUtils.asApplicationContext;
 import static io.microsphere.spring.context.ApplicationContextUtils.asConfigurableApplicationContext;
 import static io.microsphere.util.ClassLoaderUtils.getDefaultClassLoader;
-import static io.microsphere.util.ClassLoaderUtils.resolveClass;
 import static java.util.Collections.emptyList;
 import static java.util.Collections.unmodifiableList;
 import static org.springframework.beans.BeanUtils.instantiateClass;
@@ -75,7 +74,7 @@ public static void registerFactories(@Nullable BeanFactory bf, Class<?> factoryT
         ClassLoader classLoader = beanClassLoader == null ? getDefaultClassLoader() : beanClassLoader;
         List<String> factoryNames = loadFactoryNames(factoryType, classLoader);
         for (String factoryName : factoryNames) {
-            Class<?> beanClass = resolveClass(factoryName, classLoader);
+            Class<?> beanClass = resolveClassName(factoryName, classLoader);
             registerBeanDefinition(registry, beanClass);
         }
     }