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

Only proxy supported beans in BeanNameAutoProxyCreator

Browse Source 
Prior to this commit, if a BeanNameAutoProxyCreator was configured with
a custom TargetSourceCreator, the TargetSourceCreator was applied to
all beans in the ApplicationContext. Thus, the list of supported
beanNames was effectively ignored when applying any
TargetSourceCreator. Consequently, if a TargetSourceCreator returned a
non-null TargetSource for a given bean, the BeanNameAutoProxyCreator
proxied the bean even if the bean name had not been configured in the
beanNames list.

This commit addresses this issue by ensuring that a custom
TargetSourceCreator is only applied to beans whose names match the
configured beanNames list in a BeanNameAutoProxyCreator.

Closes gh-24915
This commit is contained in:
Sam Brannen
2020-05-11 19:48:43 +02:00
parent a07dc80d72
commit 3c3e8e6a8b
3 changed files with 80 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests.java
View File

@@ -155,6 +155,16 @@ class BeanNameAutoProxyCreatorTests {
assertThat(((Advised)testBean).isFrozen()).isTrue();
}
@Test
void customTargetSourceCreatorsApplyOnlyToConfiguredBeanNames() {
ITestBean lazy1 = beanFactory.getBean("lazy1", ITestBean.class);
ITestBean alias1 = beanFactory.getBean("lazy1alias", ITestBean.class);
ITestBean lazy2 = beanFactory.getBean("lazy2", ITestBean.class);
assertThat(AopUtils.isAopProxy(lazy1)).isTrue();
assertThat(AopUtils.isAopProxy(alias1)).isTrue();
assertThat(AopUtils.isAopProxy(lazy2)).isFalse();
}
private void jdkAssertions(ITestBean tb, int nopInterceptorCount) {
NopInterceptor nop = (NopInterceptor) beanFactory.getBean("nopInterceptor");

24
spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests-context.xml
View File

@@ -104,4 +104,28 @@
<property name="name" value="noproxy" />
</bean>
<bean id="lazy1" class="org.springframework.beans.testfixture.beans.TestBean" lazy-init="true">
<property name="name" value="lazy1" />
</bean>
<alias name="lazy1" alias="lazy1alias"/>
<bean id="lazy2" class="org.springframework.beans.testfixture.beans.TestBean" lazy-init="true">
<property name="name" value="lazy2" />
</bean>
<bean id="lazyBeanNameAutoProxyCreator" class="org.springframework.aop.framework.autoproxy.BeanNameAutoProxyCreator">
<property name="beanNames" value="lazy1" />
<property name="customTargetSourceCreators">
<bean class="org.springframework.aop.framework.autoproxy.target.LazyInitTargetSourceCreator" />
</property>
</bean>
<bean id="lazyAliasBeanNameAutoProxyCreator" class="org.springframework.aop.framework.autoproxy.BeanNameAutoProxyCreator">
<property name="beanNames" value="lazy1alias" />
<property name="customTargetSourceCreators">
<bean class="org.springframework.aop.framework.autoproxy.target.LazyInitTargetSourceCreator" />
</property>
</bean>
</beans>