From f1cc75b64eef128fa745b454f1be8f86ab28ca8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=99=B4=E9=9B=A8=E5=A4=9C?= <758366855@qq.com> Date: Fri, 4 Sep 2020 11:59:59 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"Add:=20SpringUtil.getBean(TypeReferen?= =?UTF-8?q?ce)=20=E6=B7=BB=E5=8A=A0Spring=E5=B7=A5=E5=85=B7=E7=B1=BB?= =?UTF-8?q?=E9=9D=99=E6=80=81=E6=96=B9=E6=B3=95=EF=BC=8C=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=8F=82=E8=80=83=EF=BC=88TypeReference?= =?UTF-8?q?=EF=BC=89=E8=8E=B7=E5=8F=96=E5=B8=A6=E6=B3=9B=E5=9E=8B=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E7=9A=84Bean=EF=BC=8C=E5=90=8C=E6=97=B6=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=BA=86=E4=B8=80=E4=B8=AA=E5=B0=8F=E7=9A=84=E5=8D=95?= =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 04dd1d67 --- .../hutool/extra/spring/SpringUtilTest.java | 34 ++++--------------- 1 file changed, 6 insertions(+), 28 deletions(-) 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 50553751c..ed1074771 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,8 +10,9 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import javax.swing.*; +import java.lang.reflect.Type; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; @RunWith(SpringJUnit4ClassRunner.class) @@ -19,34 +20,11 @@ import java.util.Map; //@Import(cn.hutool.extra.spring.SpringUtil.class) public class SpringUtilTest { - /** - * 注册bean - * - * 为了保证顺序采用顺序abcdef...形式命名方法 - */ - @Test - public void a() { - Demo2 registerBean = new Demo2(); - registerBean.id = 123; - registerBean.name = "222"; - SpringUtil.registerBean("registerBean", registerBean); - } - - /** - * 验证注册的bean - */ - @Test - public void b() { - Demo2 registerBean = SpringUtil.getBean("registerBean"); - Assert.assertEquals(123, registerBean.id); - Assert.assertEquals("222", registerBean.name); - } - @Test public void getBeanTest(){ final Demo2 testDemo = SpringUtil.getBean("testDemo"); - Assert.assertEquals(12345, testDemo.id); - Assert.assertEquals("test", testDemo.name); + Assert.assertEquals(12345, testDemo.getId()); + Assert.assertEquals("test", testDemo.getName()); } @Test @@ -65,8 +43,8 @@ public class SpringUtilTest { @Bean(name="testDemo") public Demo2 generateDemo() { Demo2 demo = new Demo2(); - demo.id = 12345; - demo.name= "test"; + demo.setId(12345); + demo.setName("test"); return demo; }