File tree Expand file tree Collapse file tree 2 files changed +2
-10
lines changed
spring-context/src/test/java/org/springframework Expand file tree Collapse file tree 2 files changed +2
-10
lines changed Original file line number Diff line number Diff line change 1
1
/*
2
- * Copyright 2002-2015 the original author or authors.
2
+ * Copyright 2002-2016 the original author or authors.
3
3
*
4
4
* Licensed under the Apache License, Version 2.0 (the "License");
5
5
* you may not use this file except in compliance with the License.
@@ -96,13 +96,11 @@ public void withAnnotationOnArgumentAndCglibProxy() {
96
96
}
97
97
98
98
99
- @ Configuration
100
99
@ ComponentScan ("example.scannable" )
101
100
@ EnableAspectJAutoProxy
102
101
static class ConfigWithJdkProxy {
103
102
}
104
103
105
- @ Configuration
106
104
@ ComponentScan ("example.scannable" )
107
105
@ EnableAspectJAutoProxy (proxyTargetClass = true )
108
106
static class ConfigWithCglibProxy {
Original file line number Diff line number Diff line change @@ -107,7 +107,7 @@ public void orderAttributeIsPropagated() {
107
107
@ Test
108
108
public void customAsyncAnnotationIsPropagated () {
109
109
AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext ();
110
- ctx .register (CustomAsyncAnnotationConfig .class );
110
+ ctx .register (CustomAsyncAnnotationConfig .class , CustomAsyncBean . class );
111
111
ctx .refresh ();
112
112
113
113
Object bean = ctx .getBean (CustomAsyncBean .class );
@@ -200,14 +200,8 @@ public Thread getThreadOfExecution() {
200
200
}
201
201
202
202
203
- @ Configuration
204
203
@ EnableAsync (annotation = CustomAsync .class )
205
204
static class CustomAsyncAnnotationConfig {
206
-
207
- @ Bean
208
- public CustomAsyncBean asyncBean () {
209
- return new CustomAsyncBean ();
210
- }
211
205
}
212
206
213
207
You can’t perform that action at this time.
0 commit comments