Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
ee2022e5
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 搜索 >>
提交
ee2022e5
编写于
1月 05, 2014
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Polishing
上级
a0ccd65d
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
44 addition
and
63 deletion
+44
-63
spring-aspects/src/main/java/org/springframework/scheduling/aspectj/AspectJAsyncConfiguration.java
...amework/scheduling/aspectj/AspectJAsyncConfiguration.java
+2
-1
spring-context/src/main/java/org/springframework/scheduling/annotation/AbstractAsyncConfiguration.java
...ork/scheduling/annotation/AbstractAsyncConfiguration.java
+2
-1
spring-context/src/main/java/org/springframework/scheduling/annotation/ProxyAsyncConfiguration.java
...mework/scheduling/annotation/ProxyAsyncConfiguration.java
+1
-6
spring-core/src/test/java/org/springframework/core/annotation/AnnotationUtilsTests.java
...springframework/core/annotation/AnnotationUtilsTests.java
+39
-55
未找到文件。
spring-aspects/src/main/java/org/springframework/scheduling/aspectj/AspectJAsyncConfiguration.java
浏览文件 @
ee2022e5
/*
* Copyright 2002-201
2
the original author or authors.
* Copyright 2002-201
3
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.
...
...
@@ -32,6 +32,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
* @since 3.1
* @see EnableAsync
* @see org.springframework.scheduling.annotation.AsyncConfigurationSelector
* @see org.springframework.scheduling.annotation.ProxyAsyncConfiguration
*/
@Configuration
public
class
AspectJAsyncConfiguration
extends
AbstractAsyncConfiguration
{
...
...
spring-context/src/main/java/org/springframework/scheduling/annotation/AbstractAsyncConfiguration.java
浏览文件 @
ee2022e5
...
...
@@ -54,7 +54,7 @@ public abstract class AbstractAsyncConfiguration implements ImportAware {
/**
* Collect any {@link AsyncConfigurer} beans through autowiring.
*/
@Autowired
(
required
=
false
)
@Autowired
(
required
=
false
)
void
setConfigurers
(
Collection
<
AsyncConfigurer
>
configurers
)
{
if
(
CollectionUtils
.
isEmpty
(
configurers
))
{
return
;
...
...
@@ -65,4 +65,5 @@ public abstract class AbstractAsyncConfiguration implements ImportAware {
AsyncConfigurer
configurer
=
configurers
.
iterator
().
next
();
this
.
executor
=
configurer
.
getAsyncExecutor
();
}
}
spring-context/src/main/java/org/springframework/scheduling/annotation/ProxyAsyncConfiguration.java
浏览文件 @
ee2022e5
/*
* Copyright 2002-201
2
the original author or authors.
* Copyright 2002-201
3
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.
...
...
@@ -42,21 +42,16 @@ public class ProxyAsyncConfiguration extends AbstractAsyncConfiguration {
@Role
(
BeanDefinition
.
ROLE_INFRASTRUCTURE
)
public
AsyncAnnotationBeanPostProcessor
asyncAdvisor
()
{
Assert
.
notNull
(
this
.
enableAsync
,
"@EnableAsync annotation metadata was not injected"
);
AsyncAnnotationBeanPostProcessor
bpp
=
new
AsyncAnnotationBeanPostProcessor
();
Class
<?
extends
Annotation
>
customAsyncAnnotation
=
enableAsync
.
getClass
(
"annotation"
);
if
(
customAsyncAnnotation
!=
AnnotationUtils
.
getDefaultValue
(
EnableAsync
.
class
,
"annotation"
))
{
bpp
.
setAsyncAnnotationType
(
customAsyncAnnotation
);
}
if
(
this
.
executor
!=
null
)
{
bpp
.
setExecutor
(
this
.
executor
);
}
bpp
.
setProxyTargetClass
(
this
.
enableAsync
.
getBoolean
(
"proxyTargetClass"
));
bpp
.
setOrder
(
this
.
enableAsync
.<
Integer
>
getNumber
(
"order"
));
return
bpp
;
}
...
...
spring-core/src/test/java/org/springframework/core/annotation/AnnotationUtilsTests.java
浏览文件 @
ee2022e5
...
...
@@ -28,6 +28,7 @@ import java.util.List;
import
java.util.Set
;
import
org.junit.Test
;
import
org.springframework.core.Ordered
;
import
org.springframework.core.annotation.subpackage.NonPublicAnnotatedClass
;
import
org.springframework.stereotype.Component
;
...
...
@@ -37,6 +38,8 @@ import static org.junit.Assert.*;
import
static
org
.
springframework
.
core
.
annotation
.
AnnotationUtils
.*;
/**
* Unit tests for {@link AnnotationUtils}.
*
* @author Rod Johnson
* @author Juergen Hoeller
* @author Sam Brannen
...
...
@@ -97,9 +100,9 @@ public class AnnotationUtilsTests {
// }
@Test
public
void
findAnnotationPrefersInteracesOverLocalMetaAnnotations
()
{
public
void
findAnnotationPrefersInter
f
acesOverLocalMetaAnnotations
()
{
Component
component
=
AnnotationUtils
.
findAnnotation
(
ClassWithLocalMetaAnnotationAndMetaAnnotatedInterface
.
class
,
Component
.
class
);
ClassWithLocalMetaAnnotationAndMetaAnnotatedInterface
.
class
,
Component
.
class
);
// By inspecting ClassWithLocalMetaAnnotationAndMetaAnnotatedInterface, one
// might expect that "meta2" should be found; however, with the current
...
...
@@ -144,8 +147,7 @@ public class AnnotationUtilsTests {
// inherited class-level annotation; note: @Transactional is inherited
assertEquals
(
InheritedAnnotationInterface
.
class
,
findAnnotationDeclaringClassForTypes
(
transactionalCandidateList
,
InheritedAnnotationInterface
.
class
));
assertNull
(
findAnnotationDeclaringClassForTypes
(
transactionalCandidateList
,
SubInheritedAnnotationInterface
.
class
));
assertNull
(
findAnnotationDeclaringClassForTypes
(
transactionalCandidateList
,
SubInheritedAnnotationInterface
.
class
));
assertEquals
(
InheritedAnnotationClass
.
class
,
findAnnotationDeclaringClassForTypes
(
transactionalCandidateList
,
InheritedAnnotationClass
.
class
));
assertEquals
(
InheritedAnnotationClass
.
class
,
...
...
@@ -301,8 +303,7 @@ public class AnnotationUtilsTests {
}
@Test
public
void
findAnnotationFromInterfaceWhenSuperDoesNotImplementMethod
()
throws
Exception
{
public
void
findAnnotationFromInterfaceWhenSuperDoesNotImplementMethod
()
throws
Exception
{
Method
method
=
SubOfAbstractImplementsInterfaceWithAnnotatedMethod
.
class
.
getMethod
(
"foo"
);
Order
order
=
findAnnotation
(
method
,
Order
.
class
);
assertNotNull
(
order
);
...
...
@@ -322,13 +323,13 @@ public class AnnotationUtilsTests {
}
@Component
(
value
=
"meta1"
)
@Component
(
value
=
"meta1"
)
@Order
@Retention
(
RetentionPolicy
.
RUNTIME
)
@interface
Meta1
{
}
@Component
(
value
=
"meta2"
)
@Component
(
value
=
"meta2"
)
@Transactional
@Retention
(
RetentionPolicy
.
RUNTIME
)
@interface
Meta2
{
...
...
@@ -353,25 +354,20 @@ public class AnnotationUtilsTests {
@Order
(
27
)
public
void
annotatedOnRoot
()
{
}
public
void
overrideToAnnotate
()
{
}
@Order
(
27
)
public
void
overrideWithoutNewAnnotation
()
{
}
public
void
notAnnotated
()
{
}
@Override
public
void
fromInterfaceImplementedByRoot
()
{
}
}
...
...
@@ -379,21 +375,23 @@ public class AnnotationUtilsTests {
@Order
(
25
)
public
void
annotatedOnLeaf
()
{
}
@Override
@Order
(
1
)
public
void
overrideToAnnotate
()
{
}
@Override
public
void
overrideWithoutNewAnnotation
()
{
}
}
@Retention
(
RetentionPolicy
.
RUNTIME
)
@Inherited
@interface
Transactional
{
}
public
static
abstract
class
Foo
<
T
>
{
@Order
(
1
)
...
...
@@ -405,7 +403,6 @@ public class AnnotationUtilsTests {
@Override
@Transactional
public
void
something
(
final
String
arg
)
{
}
}
...
...
@@ -474,58 +471,45 @@ public class AnnotationUtilsTests {
}
}
public
abstract
static
class
AbstractDoesNotImplementInterfaceWithAnnotatedMethod
implements
InterfaceWithAnnotatedMethod
{
public
abstract
static
class
AbstractDoesNotImplementInterfaceWithAnnotatedMethod
implements
InterfaceWithAnnotatedMethod
{
}
public
static
class
SubOfAbstractImplementsInterfaceWithAnnotatedMethod
extends
AbstractDoesNotImplementInterfaceWithAnnotatedMethod
{
public
static
class
SubOfAbstractImplementsInterfaceWithAnnotatedMethod
extends
AbstractDoesNotImplementInterfaceWithAnnotatedMethod
{
@Override
public
void
foo
()
{
}
}
public
static
interface
InterfaceWithRepeated
{
@MyRepeatable
(
"a"
)
@MyRepeatableContainer
({
@MyRepeatable
(
"b"
),
@MyRepeatable
(
"c"
)
})
@MyRepeatableMeta
void
foo
();
@Retention
(
RetentionPolicy
.
RUNTIME
)
@Inherited
@interface
MyRepeatableContainer
{
MyRepeatable
[]
value
();
}
}
@Retention
(
RetentionPolicy
.
RUNTIME
)
@Inherited
@interface
Transactional
{
}
@Retention
(
RetentionPolicy
.
RUNTIME
)
@Inherited
@interface
MyRepeatableContainer
{
MyRepeatable
[]
value
();
}
@Retention
(
RetentionPolicy
.
RUNTIME
)
@Inherited
@Repeatable
(
MyRepeatableContainer
.
class
)
@interface
MyRepeatable
{
@Retention
(
RetentionPolicy
.
RUNTIME
)
@Inherited
@Repeatable
(
MyRepeatableContainer
.
class
)
@interface
MyRepeatable
{
String
value
();
}
String
value
();
@Retention
(
RetentionPolicy
.
RUNTIME
)
@Inherited
@MyRepeatable
(
"meta"
)
@interface
MyRepeatableMeta
{
}
}
public
static
interface
InterfaceWithRepeated
{
@MyRepeatable
(
"a"
)
@MyRepeatableContainer
({
@MyRepeatable
(
"b"
),
@MyRepeatable
(
"c"
)
})
@MyRepeatableMeta
void
foo
();
}
@Retention
(
RetentionPolicy
.
RUNTIME
)
@Inherited
@MyRepeatable
(
"meta"
)
@interface
MyRepeatableMeta
{
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录