forked from spring-projects/spring-framework
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Avoid FactoryBean initialization on isSingleton check for decorated b…
…ean definition Issue: SPR-14892 Issue: SPR-15042
- Loading branch information
Showing
6 changed files
with
97 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 9 additions & 9 deletions
18
.../resources/org/springframework/aop/scope/ScopedProxyAutowireTests-scopedAutowireFalse.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,16 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <beans xmlns="http://www.springframework.org/schema/beans" | ||
| xmlns:aop="http://www.springframework.org/schema/aop" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd | ||
| http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> | ||
| xmlns:aop="http://www.springframework.org/schema/aop" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd | ||
| http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> | ||
|
|
||
| <bean id="scoped" class="org.springframework.aop.scope.ScopedProxyAutowireTests$TestBean" autowire-candidate="false"> | ||
| <aop:scoped-proxy/> | ||
| </bean> | ||
| <bean id="scoped" class="org.springframework.aop.scope.ScopedProxyAutowireTests$TestBean" scope="prototype" autowire-candidate="false"> | ||
| <aop:scoped-proxy/> | ||
| </bean> | ||
|
|
||
| <bean id="unscoped" class="org.springframework.aop.scope.ScopedProxyAutowireTests$TestBean" autowire-candidate="true"/> | ||
| <bean id="unscoped" class="org.springframework.aop.scope.ScopedProxyAutowireTests$TestBean" autowire-candidate="true"/> | ||
|
|
||
| <bean id="autowired" class="org.springframework.aop.scope.ScopedProxyAutowireTests$TestBean" autowire="byType"/> | ||
| <bean id="autowired" class="org.springframework.aop.scope.ScopedProxyAutowireTests$TestBean" autowire="byType"/> | ||
|
|
||
| </beans> |
18 changes: 9 additions & 9 deletions
18
...t/resources/org/springframework/aop/scope/ScopedProxyAutowireTests-scopedAutowireTrue.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,16 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <beans xmlns="http://www.springframework.org/schema/beans" | ||
| xmlns:aop="http://www.springframework.org/schema/aop" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd | ||
| http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> | ||
| xmlns:aop="http://www.springframework.org/schema/aop" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd | ||
| http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> | ||
|
|
||
| <bean id="scoped" class="org.springframework.aop.scope.ScopedProxyAutowireTests$TestBean" autowire-candidate="true"> | ||
| <aop:scoped-proxy/> | ||
| </bean> | ||
| <bean id="scoped" class="org.springframework.aop.scope.ScopedProxyAutowireTests$TestBean" scope="singleton" autowire-candidate="true"> | ||
| <aop:scoped-proxy/> | ||
| </bean> | ||
|
|
||
| <bean id="unscoped" class="org.springframework.aop.scope.ScopedProxyAutowireTests$TestBean" autowire-candidate="false"/> | ||
| <bean id="unscoped" class="org.springframework.aop.scope.ScopedProxyAutowireTests$TestBean" autowire-candidate="false"/> | ||
|
|
||
| <bean id="autowired" class="org.springframework.aop.scope.ScopedProxyAutowireTests$TestBean" autowire="byType"/> | ||
| <bean id="autowired" class="org.springframework.aop.scope.ScopedProxyAutowireTests$TestBean" autowire="byType"/> | ||
|
|
||
| </beans> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
61 changes: 61 additions & 0 deletions
61
spring-context/src/test/java/org/springframework/context/annotation/Spr15042Tests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| /* | ||
| * Copyright 2002-2016 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. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.springframework.context.annotation; | ||
|
|
||
| import org.junit.Test; | ||
|
|
||
| import org.springframework.aop.framework.ProxyFactoryBean; | ||
| import org.springframework.aop.target.CommonsPool2TargetSource; | ||
|
|
||
| /** | ||
| * @author Juergen Hoeller | ||
| */ | ||
| public class Spr15042Tests { | ||
|
|
||
| @Test | ||
| public void poolingTargetSource() { | ||
| new AnnotationConfigApplicationContext(PoolingTargetSourceConfig.class); | ||
| } | ||
|
|
||
|
|
||
| @Configuration | ||
| static class PoolingTargetSourceConfig { | ||
|
|
||
| @Bean | ||
| @Scope(value = "request", proxyMode = ScopedProxyMode.TARGET_CLASS) | ||
| public ProxyFactoryBean myObject() { | ||
| ProxyFactoryBean pfb = new ProxyFactoryBean(); | ||
| pfb.setTargetSource(poolTargetSource()); | ||
| return pfb; | ||
| } | ||
|
|
||
| @Bean | ||
| public CommonsPool2TargetSource poolTargetSource() { | ||
| CommonsPool2TargetSource pool = new CommonsPool2TargetSource(); | ||
| pool.setMaxSize(3); | ||
| pool.setTargetBeanName("myObjectTarget"); | ||
| return pool; | ||
| } | ||
|
|
||
| @Bean(name = "myObjectTarget") | ||
| @Scope(scopeName = "prototype") | ||
| public Object myObjectTarget() { | ||
| return new Object(); | ||
| } | ||
| } | ||
|
|
||
| } |