Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BeanFactoryUtils caches transformedBeanName results for factory beans

Browse Source 
Issue: SPR-17151
This commit is contained in:
Juergen Hoeller
2018-08-09 16:06:05 +02:00
parent 6b6384a09e
commit eddbf13d5d
2 changed files with 39 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2015 the original author or authors.
* Copyright 2002-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -42,30 +42,33 @@ import static org.junit.Assert.*;
* @author Juergen Hoeller
* @since 09.11.2003
*/
@SuppressWarnings({ "rawtypes", "unchecked" })
@SuppressWarnings({"rawtypes", "unchecked"})
public class XmlListableBeanFactoryTests extends AbstractListableBeanFactoryTests {
private DefaultListableBeanFactory parent;
private DefaultListableBeanFactory factory;
@Before
public void setUp() {
public void setup() {
parent = new DefaultListableBeanFactory();
Map m = new HashMap();
m.put("name", "Albert");
Map map = new HashMap();
map.put("name", "Albert");
RootBeanDefinition bd1 = new RootBeanDefinition(TestBean.class);
bd1.setPropertyValues(new MutablePropertyValues(m));
bd1.setPropertyValues(new MutablePropertyValues(map));
parent.registerBeanDefinition("father", bd1);
m = new HashMap();
m.put("name", "Roderick");
map = new HashMap();
map.put("name", "Roderick");
RootBeanDefinition bd2 = new RootBeanDefinition(TestBean.class);
bd2.setPropertyValues(new MutablePropertyValues(m));
bd2.setPropertyValues(new MutablePropertyValues(map));
parent.registerBeanDefinition("rod", bd2);
this.factory = new DefaultListableBeanFactory(parent);
new XmlBeanDefinitionReader(this.factory).loadBeanDefinitions(
new ClassPathResource("test.xml", getClass()));
new XmlBeanDefinitionReader(this.factory).loadBeanDefinitions(new ClassPathResource("test.xml", getClass()));
this.factory.addBeanPostProcessor(new BeanPostProcessor() {
@Override
public Object postProcessBeforeInitialization(Object bean, String name) throws BeansException {
@@ -82,9 +85,10 @@ public class XmlListableBeanFactoryTests extends AbstractListableBeanFactoryTest
return bean;
}
});
this.factory.addBeanPostProcessor(new LifecycleBean.PostProcessor());
this.factory.addBeanPostProcessor(new ProtectedLifecycleBean.PostProcessor());
//this.factory.preInstantiateSingletons();
// this.factory.preInstantiateSingletons();
}
@Override
@@ -92,6 +96,7 @@ public class XmlListableBeanFactoryTests extends AbstractListableBeanFactoryTest
return factory;
}
@Test
@Override
public void count() {
@@ -104,19 +109,19 @@ public class XmlListableBeanFactoryTests extends AbstractListableBeanFactoryTest
}
@Test
public void lifecycleMethods() throws Exception {
public void lifecycleMethods() {
LifecycleBean bean = (LifecycleBean) getBeanFactory().getBean("lifecycle");
bean.businessMethod();
}
@Test
public void protectedLifecycleMethods() throws Exception {
public void protectedLifecycleMethods() {
ProtectedLifecycleBean bean = (ProtectedLifecycleBean) getBeanFactory().getBean("protectedLifecycle");
bean.businessMethod();
}
@Test
public void descriptionButNoProperties() throws Exception {
public void descriptionButNoProperties() {
TestBean validEmpty = (TestBean) getBeanFactory().getBean("validEmptyWithDescription");
assertEquals(0, validEmpty.getAge());
}
@@ -125,7 +130,7 @@ public class XmlListableBeanFactoryTests extends AbstractListableBeanFactoryTest
* Test that properties with name as well as id creating an alias up front.
*/
@Test
public void autoAliasing() throws Exception {
public void autoAliasing() {
List beanNames = Arrays.asList(getListableBeanFactory().getBeanDefinitionNames());
TestBean tb1 = (TestBean) getBeanFactory().getBean("aliased");
@@ -224,7 +229,7 @@ public class XmlListableBeanFactoryTests extends AbstractListableBeanFactoryTest
}
@Test
public void beanPostProcessor() throws Exception {
public void beanPostProcessor() {
TestBean kerry = (TestBean) getBeanFactory().getBean("kerry");
TestBean kathy = (TestBean) getBeanFactory().getBean("kathy");
DummyFactory factory = (DummyFactory) getBeanFactory().getBean("&singletonFactory");