Merge pull request #42912 from quaff

* pr/42912: Polish Closes gh-42912
spring-projects · Oct 29, 2024 · 619b24a · 619b24a
2 parents e5ec380 + 46c40b4
commit 619b24a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/...src/main/java/org/springframework/boot/autoconfigure/task/TaskExecutorConfigurations.java b/...src/main/java/org/springframework/boot/autoconfigure/task/TaskExecutorConfigurations.java
@@ -70,7 +70,7 @@ ThreadPoolTaskExecutor applicationTaskExecutor(ThreadPoolTaskExecutorBuilder thr
 	static class ThreadPoolTaskExecutorBuilderConfiguration {
 
 		@Bean
-		@ConditionalOnMissingBean(ThreadPoolTaskExecutorBuilder.class)
+		@ConditionalOnMissingBean
 		ThreadPoolTaskExecutorBuilder threadPoolTaskExecutorBuilder(TaskExecutionProperties properties,
 				ObjectProvider<ThreadPoolTaskExecutorCustomizer> threadPoolTaskExecutorCustomizers,
 				ObjectProvider<TaskDecorator> taskDecorator) {
@@ -121,9 +121,7 @@ SimpleAsyncTaskExecutorBuilder simpleAsyncTaskExecutorBuilder() {
 		@ConditionalOnMissingBean
 		@ConditionalOnThreading(Threading.VIRTUAL)
 		SimpleAsyncTaskExecutorBuilder simpleAsyncTaskExecutorBuilderVirtualThreads() {
-			SimpleAsyncTaskExecutorBuilder builder = builder();
-			builder = builder.virtualThreads(true);
-			return builder;
+			return builder().virtualThreads(true);
 		}
 
 		private SimpleAsyncTaskExecutorBuilder builder() {

diff --git a/...c/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingConfigurations.java b/...c/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingConfigurations.java
@@ -65,7 +65,7 @@ ThreadPoolTaskScheduler taskScheduler(ThreadPoolTaskSchedulerBuilder threadPoolT
 	static class ThreadPoolTaskSchedulerBuilderConfiguration {
 
 		@Bean
-		@ConditionalOnMissingBean(ThreadPoolTaskSchedulerBuilder.class)
+		@ConditionalOnMissingBean
 		ThreadPoolTaskSchedulerBuilder threadPoolTaskSchedulerBuilder(TaskSchedulingProperties properties,
 				ObjectProvider<ThreadPoolTaskSchedulerCustomizer> threadPoolTaskSchedulerCustomizers) {
 			TaskSchedulingProperties.Shutdown shutdown = properties.getShutdown();
@@ -104,9 +104,7 @@ SimpleAsyncTaskSchedulerBuilder simpleAsyncTaskSchedulerBuilder() {
 		@ConditionalOnMissingBean
 		@ConditionalOnThreading(Threading.VIRTUAL)
 		SimpleAsyncTaskSchedulerBuilder simpleAsyncTaskSchedulerBuilderVirtualThreads() {
-			SimpleAsyncTaskSchedulerBuilder builder = builder();
-			builder = builder.virtualThreads(true);
-			return builder;
+			return builder().virtualThreads(true);
 		}
 
 		private SimpleAsyncTaskSchedulerBuilder builder() {