From 04dd1d67d5c101f0051caff633045a791c600668 Mon Sep 17 00:00:00 2001 From: dejavuhuh Date: Sun, 9 Aug 2020 21:25:52 +0800 Subject: [PATCH] =?UTF-8?q?Add:=20SpringUtil.getBean(TypeReference)=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0Spring=E5=B7=A5=E5=85=B7=E7=B1=BB=E9=9D=99?= =?UTF-8?q?=E6=80=81=E6=96=B9=E6=B3=95=EF=BC=8C=E9=80=9A=E8=BF=87=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=8F=82=E8=80=83=EF=BC=88TypeReference=EF=BC=89?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=B8=A6=E6=B3=9B=E5=9E=8B=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E7=9A=84Bean=EF=BC=8C=E5=90=8C=E6=97=B6=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BA=86=E4=B8=80=E4=B8=AA=E5=B0=8F=E7=9A=84=E5=8D=95=E5=85=83?= =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/hutool/extra/spring/SpringUtil.java | 4 +--- .../src/test/java/cn/hutool/extra/spring/SpringUtilTest.java | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) 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)