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

@Resource injection points support @Lazy as well

Browse Source 
Issue: SPR-12654
This commit is contained in:
Juergen Hoeller
2015-02-20 21:53:34 +01:00
parent b94c6fdf7a
commit e3d1a1dda2
2 changed files with 131 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2014 the original author or authors.
* Copyright 2002-2015 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.
@@ -437,6 +437,60 @@ public class CommonAnnotationBeanPostProcessorTests {
assertTrue(bean.destroy2Called);
}
@Test
public void testLazyResolutionWithResourceField() {
DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
CommonAnnotationBeanPostProcessor bpp = new CommonAnnotationBeanPostProcessor();
bpp.setBeanFactory(bf);
bf.addBeanPostProcessor(bpp);
bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(LazyResourceFieldInjectionBean.class));
bf.registerBeanDefinition("testBean", new RootBeanDefinition(TestBean.class));
LazyResourceFieldInjectionBean bean = (LazyResourceFieldInjectionBean) bf.getBean("annotatedBean");
assertFalse(bf.containsSingleton("testBean"));
bean.testBean.setName("notLazyAnymore");
assertTrue(bf.containsSingleton("testBean"));
TestBean tb = (TestBean) bf.getBean("testBean");
assertEquals("notLazyAnymore", tb.getName());
}
@Test
public void testLazyResolutionWithResourceMethod() {
DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
CommonAnnotationBeanPostProcessor bpp = new CommonAnnotationBeanPostProcessor();
bpp.setBeanFactory(bf);
bf.addBeanPostProcessor(bpp);
bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(LazyResourceMethodInjectionBean.class));
bf.registerBeanDefinition("testBean", new RootBeanDefinition(TestBean.class));
LazyResourceMethodInjectionBean bean = (LazyResourceMethodInjectionBean) bf.getBean("annotatedBean");
assertFalse(bf.containsSingleton("testBean"));
bean.testBean.setName("notLazyAnymore");
assertTrue(bf.containsSingleton("testBean"));
TestBean tb = (TestBean) bf.getBean("testBean");
assertEquals("notLazyAnymore", tb.getName());
}
@Test
public void testLazyResolutionWithCglibProxy() {
DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
CommonAnnotationBeanPostProcessor bpp = new CommonAnnotationBeanPostProcessor();
bpp.setBeanFactory(bf);
bf.addBeanPostProcessor(bpp);
bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(LazyResourceCglibInjectionBean.class));
bf.registerBeanDefinition("testBean", new RootBeanDefinition(TestBean.class));
LazyResourceCglibInjectionBean bean = (LazyResourceCglibInjectionBean) bf.getBean("annotatedBean");
assertFalse(bf.containsSingleton("testBean"));
bean.testBean.setName("notLazyAnymore");
assertTrue(bf.containsSingleton("testBean"));
TestBean tb = (TestBean) bf.getBean("testBean");
assertEquals("notLazyAnymore", tb.getName());
}
public static class AnnotatedInitDestroyBean {
@@ -716,6 +770,35 @@ public class CommonAnnotationBeanPostProcessorTests {
}
private static class LazyResourceFieldInjectionBean {
@Resource @Lazy
private ITestBean testBean;
}
private static class LazyResourceMethodInjectionBean {
private ITestBean testBean;
@Resource @Lazy
public void setTestBean(ITestBean testBean) {
this.testBean = testBean;
}
}
private static class LazyResourceCglibInjectionBean {
private TestBean testBean;
@Resource @Lazy
public void setTestBean(TestBean testBean) {
this.testBean = testBean;
}
}
@SuppressWarnings("unused")
private static class NullFactory {