Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
d0859f15
Commit
d0859f15
authored
Jan 21, 2019
by
Camille Vienot
Committed by
Stephane Nicoll
Jan 28, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Alias auto-configured `TaskExecutor` to make async tasks use it
See gh-15748
parent
9e0b1c29
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
1 deletion
+27
-1
TaskExecutionAutoConfiguration.java
...ot/autoconfigure/task/TaskExecutionAutoConfiguration.java
+4
-1
TaskExecutionAutoConfigurationTests.java
...toconfigure/task/TaskExecutionAutoConfigurationTests.java
+23
-0
No files found.
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfiguration.java
View file @
d0859f15
...
...
@@ -36,6 +36,7 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
* {@link EnableAutoConfiguration Auto-configuration} for {@link TaskExecutor}.
*
* @author Stephane Nicoll
* @author Camille Vienot
* @since 2.1.0
*/
@ConditionalOnClass
(
ThreadPoolTaskExecutor
.
class
)
...
...
@@ -48,6 +49,8 @@ public class TaskExecutionAutoConfiguration {
*/
public
static
final
String
APPLICATION_TASK_EXECUTOR_BEAN_NAME
=
"applicationTaskExecutor"
;
public
static
final
String
ASYNC_TASK_EXECUTOR_BEAN_NAME
=
"taskExecutor"
;
private
final
TaskExecutionProperties
properties
;
private
final
ObjectProvider
<
TaskExecutorCustomizer
>
taskExecutorCustomizers
;
...
...
@@ -79,7 +82,7 @@ public class TaskExecutionAutoConfiguration {
}
@Lazy
@Bean
(
name
=
APPLICATION_TASK_EXECUTOR_BEAN_NAME
)
@Bean
(
name
=
{
APPLICATION_TASK_EXECUTOR_BEAN_NAME
,
ASYNC_TASK_EXECUTOR_BEAN_NAME
}
)
@ConditionalOnMissingBean
(
Executor
.
class
)
public
ThreadPoolTaskExecutor
applicationTaskExecutor
(
TaskExecutorBuilder
builder
)
{
return
builder
.
build
();
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfigurationTests.java
View file @
d0859f15
...
...
@@ -38,6 +38,7 @@ import org.springframework.core.task.TaskExecutor;
import
org.springframework.scheduling.annotation.Async
;
import
org.springframework.scheduling.annotation.AsyncResult
;
import
org.springframework.scheduling.annotation.EnableAsync
;
import
org.springframework.scheduling.annotation.EnableScheduling
;
import
org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor
;
import
org.springframework.test.util.ReflectionTestUtils
;
...
...
@@ -49,6 +50,7 @@ import static org.mockito.Mockito.verify;
* Tests for {@link TaskExecutionAutoConfiguration}.
*
* @author Stephane Nicoll
* @author Camille Vienot
*/
public
class
TaskExecutionAutoConfigurationTests
{
...
...
@@ -152,6 +154,21 @@ public class TaskExecutionAutoConfigurationTests {
});
}
@Test
public
void
enableAsyncUsesAutoConfiguredOneByDefaultEvenThoughSchedulingIsConfigured
()
{
this
.
contextRunner
.
withPropertyValues
(
"spring.task.execution.thread-name-prefix=task-test-"
)
.
withConfiguration
(
AutoConfigurations
.
of
(
TaskSchedulingAutoConfiguration
.
class
))
.
withUserConfiguration
(
AsyncConfiguration
.
class
,
SchedulingConfiguration
.
class
,
TestBean
.
class
)
.
run
((
context
)
->
{
TestBean
bean
=
context
.
getBean
(
TestBean
.
class
);
String
text
=
bean
.
echo
(
"something"
).
get
();
assertThat
(
text
).
contains
(
"task-test-"
).
contains
(
"something"
);
});
}
private
ContextConsumer
<
AssertableApplicationContext
>
assertTaskExecutor
(
Consumer
<
ThreadPoolTaskExecutor
>
taskExecutor
)
{
return
(
context
)
->
{
...
...
@@ -209,6 +226,12 @@ public class TaskExecutionAutoConfigurationTests {
}
@Configuration
@EnableScheduling
static
class
SchedulingConfiguration
{
}
static
class
TestBean
{
@Async
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment