diff --git a/hutool-extra/src/main/java/cn/hutool/extra/spring/SpringUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/spring/SpringUtil.java index 535b34d74..dad9236a6 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/spring/SpringUtil.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/spring/SpringUtil.java @@ -1,6 +1,5 @@ package cn.hutool.extra.spring; -import cn.hutool.core.lang.ParameterizedTypeImpl; import cn.hutool.core.lang.TypeReference; import cn.hutool.core.util.ArrayUtil; import org.springframework.context.ApplicationContext; @@ -9,7 +8,6 @@ import org.springframework.core.ResolvableType; import org.springframework.stereotype.Component; import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; import java.util.Arrays; import java.util.Map; @@ -92,7 +90,7 @@ public class SpringUtil implements ApplicationContextAware { Class rawType = (Class) parameterizedType.getRawType(); Class[] genericTypes = Arrays.stream(parameterizedType.getActualTypeArguments()).map(type -> (Class) type).toArray(Class[]::new); String[] beanNames = applicationContext.getBeanNamesForType(ResolvableType.forClassWithGenerics(rawType, genericTypes)); - return applicationContext.getBean(beanNames[0], rawType); + return getBean(beanNames[0], rawType); } /** diff --git a/hutool-extra/src/test/java/cn/hutool/extra/spring/SpringUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/spring/SpringUtilTest.java index ed1074771..e7fbaed87 100644 --- a/hutool-extra/src/test/java/cn/hutool/extra/spring/SpringUtilTest.java +++ b/hutool-extra/src/test/java/cn/hutool/extra/spring/SpringUtilTest.java @@ -10,9 +10,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import java.lang.reflect.Type; import java.util.HashMap; -import java.util.LinkedHashMap; import java.util.Map; @RunWith(SpringJUnit4ClassRunner.class)