Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
9f15f347
S
spring-framework
项目概览
爱吃血肠
/
spring-framework
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
spring-framework
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
9f15f347
编写于
7月 17, 2015
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Renamed 'name' attribute to 'scopeName' (in order to avoid common override conflicts)
Issue: SPR-13239
上级
106cce58
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
12 addition
and
11 deletion
+12
-11
spring-context/src/main/java/org/springframework/context/annotation/Scope.java
...in/java/org/springframework/context/annotation/Scope.java
+4
-4
spring-context/src/test/java/org/springframework/context/annotation/AnnotationScopeMetadataResolverTests.java
...text/annotation/AnnotationScopeMetadataResolverTests.java
+3
-2
spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java
...text/annotation/ConfigurationClassPostProcessorTests.java
+2
-2
spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/RequestContextHolderTests.java
...st/web/servlet/samples/spr/RequestContextHolderTests.java
+3
-3
未找到文件。
spring-context/src/main/java/org/springframework/context/annotation/Scope.java
浏览文件 @
9f15f347
...
...
@@ -58,10 +58,10 @@ import org.springframework.core.annotation.AliasFor;
public
@interface
Scope
{
/**
* Alias for {@link #
n
ame}.
* @see #
n
ame
* Alias for {@link #
scopeN
ame}.
* @see #
scopeN
ame
*/
@AliasFor
(
attribute
=
"
n
ame"
)
@AliasFor
(
attribute
=
"
scopeN
ame"
)
String
value
()
default
""
;
/**
...
...
@@ -76,7 +76,7 @@ public @interface Scope {
* @see #value
*/
@AliasFor
(
attribute
=
"value"
)
String
n
ame
()
default
""
;
String
scopeN
ame
()
default
""
;
/**
* Specifies whether a component should be configured as a scoped proxy
...
...
spring-context/src/test/java/org/springframework/context/annotation/AnnotationScopeMetadataResolverTests.java
浏览文件 @
9f15f347
...
...
@@ -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
(
n
ame
=
"request"
,
proxyMode
=
TARGET_CLASS
)
@Scope
(
scopeN
ame
=
"request"
,
proxyMode
=
TARGET_CLASS
)
private
static
class
AnnotatedWithScopedProxy
{
}
...
...
spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java
浏览文件 @
9f15f347
...
...
@@ -787,7 +787,7 @@ public class ConfigurationClassPostProcessorTests {
public
static
class
ScopedProxyRepositoryConfiguration
{
@Bean
@Scope
(
n
ame
=
"prototype"
,
proxyMode
=
ScopedProxyMode
.
TARGET_CLASS
)
@Scope
(
scopeN
ame
=
"prototype"
,
proxyMode
=
ScopedProxyMode
.
TARGET_CLASS
)
public
Repository
<
String
>
stringRepo
()
{
return
new
Repository
<
String
>()
{
@Override
...
...
@@ -798,7 +798,7 @@ public class ConfigurationClassPostProcessorTests {
}
@Bean
@Scope
(
n
ame
=
"prototype"
,
proxyMode
=
ScopedProxyMode
.
TARGET_CLASS
)
@Scope
(
scopeN
ame
=
"prototype"
,
proxyMode
=
ScopedProxyMode
.
TARGET_CLASS
)
public
Repository
<
Integer
>
integerRepo
()
{
return
new
Repository
<
Integer
>()
{
@Override
...
...
spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/RequestContextHolderTests.java
浏览文件 @
9f15f347
...
...
@@ -143,13 +143,13 @@ public class RequestContextHolderTests {
}
@Bean
@Scope
(
n
ame
=
"request"
,
proxyMode
=
ScopedProxyMode
.
TARGET_CLASS
)
@Scope
(
scopeN
ame
=
"request"
,
proxyMode
=
ScopedProxyMode
.
TARGET_CLASS
)
public
RequestScopedController
requestScopedController
()
{
return
new
RequestScopedController
();
}
@Bean
@Scope
(
n
ame
=
"request"
,
proxyMode
=
ScopedProxyMode
.
TARGET_CLASS
)
@Scope
(
scopeN
ame
=
"request"
,
proxyMode
=
ScopedProxyMode
.
TARGET_CLASS
)
public
RequestScopedService
requestScopedService
()
{
return
new
RequestScopedService
();
}
...
...
@@ -160,7 +160,7 @@ public class RequestContextHolderTests {
}
@Bean
@Scope
(
n
ame
=
"session"
,
proxyMode
=
ScopedProxyMode
.
TARGET_CLASS
)
@Scope
(
scopeN
ame
=
"session"
,
proxyMode
=
ScopedProxyMode
.
TARGET_CLASS
)
public
SessionScopedService
sessionScopedService
()
{
return
new
SessionScopedService
();
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录