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

Renamed 'name' attribute to 'scopeName' (in order to avoid common override conflicts)

Browse Source 
Issue: SPR-13239
This commit is contained in:
Juergen Hoeller
2015-07-17 15:23:47 +02:00
parent 106cce58cc
commit 9f15f347bf
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-context/src/test/java/org/springframework/context/annotation/AnnotationScopeMetadataResolverTests.java
View File

@@ -44,6 +44,7 @@ public class AnnotationScopeMetadataResolverTests {
private AnnotationScopeMetadataResolver scopeMetadataResolver = new AnnotationScopeMetadataResolver();
@Test
public void resolveScopeMetadataShouldNotApplyScopedProxyModeToSingleton() {
AnnotatedBeanDefinition bd = new AnnotatedGenericBeanDefinition(AnnotatedWithSingletonScope.class);
@@ -65,7 +66,6 @@ public class AnnotationScopeMetadataResolverTests {
@Test
public void resolveScopeMetadataShouldReadScopedProxyModeFromAnnotation() {
this.scopeMetadataResolver = new AnnotationScopeMetadataResolver();
AnnotatedBeanDefinition bd = new AnnotatedGenericBeanDefinition(AnnotatedWithScopedProxy.class);
ScopeMetadata scopeMetadata = this.scopeMetadataResolver.resolveScopeMetadata(bd);
assertNotNull("resolveScopeMetadata(..) must *never* return null.", scopeMetadata);
@@ -133,6 +133,7 @@ public class AnnotationScopeMetadataResolverTests {
@Retention(RetentionPolicy.RUNTIME)
@Scope("request")
@interface CustomRequestScopeWithAttributeOverride {
ScopedProxyMode proxyMode();
}
@@ -144,7 +145,7 @@ public class AnnotationScopeMetadataResolverTests {
private static class AnnotatedWithPrototypeScope {
}
@Scope(name = "request", proxyMode = TARGET_CLASS)
@Scope(scopeName = "request", proxyMode = TARGET_CLASS)
private static class AnnotatedWithScopedProxy {
}

4
spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java
View File

@@ -787,7 +787,7 @@ public class ConfigurationClassPostProcessorTests {
public static class ScopedProxyRepositoryConfiguration {
@Bean
@Scope(name = "prototype", proxyMode = ScopedProxyMode.TARGET_CLASS)
@Scope(scopeName = "prototype", proxyMode = ScopedProxyMode.TARGET_CLASS)
public Repository<String> stringRepo() {
return new Repository<String>() {
@Override
@@ -798,7 +798,7 @@ public class ConfigurationClassPostProcessorTests {
}
@Bean
@Scope(name = "prototype", proxyMode = ScopedProxyMode.TARGET_CLASS)
@Scope(scopeName = "prototype", proxyMode = ScopedProxyMode.TARGET_CLASS)
public Repository<Integer> integerRepo() {
return new Repository<Integer>() {
@Override