Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-15 01:07:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Alias auto-configured TaskExecutor to make async tasks use it

Browse Source 
See gh-15748
This commit is contained in:
Camille Vienot 2019-01-21 15:57:24 +01:00 committed by Stephane Nicoll
parent 9e0b1c297d
commit d0859f1569
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfiguration.java
View File

@ -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();

23
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/task/TaskExecutionAutoConfigurationTests.java
View File

@ -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