TaskExecutor should not back off for custom ExecutorService

TaskExecutor will back off for custom Executor before this commit, now it only back off for custom TaskExecutor.

Fix spring-projectsGH-44659

Signed-off-by: Yanming Zhou <[email protected]>

Author: quaff

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/task/TaskExecutorConfigurations.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 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.
@@ -46,7 +46,7 @@
 class TaskExecutorConfigurations {
 
 	@Configuration(proxyBeanMethods = false)
-	@ConditionalOnMissingBean(Executor.class)
+	@ConditionalOnMissingBean(TaskExecutor.class)
 	static class TaskExecutorConfiguration {
 
 		@Bean(name = { TaskExecutionAutoConfiguration.APPLICATION_TASK_EXECUTOR_BEAN_NAME,

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 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.
@@ -19,6 +19,8 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
@@ -210,6 +212,13 @@ void taskExecutorWhenHasCustomTaskExecutorShouldBackOff() {
 		});
 	}
 
+	@Test
+	void taskExecutorWhenHasCustomExecutorServiceShouldNotBackOff() {
+		this.contextRunner.withUserConfiguration(CustomExecutorServiceConfig.class).run((context) -> {
+			assertThat(context).hasSingleBean(TaskExecutor.class);
+		});
+	}
+
 	@Test
 	@EnabledForJreRange(min = JRE.JAVA_21)
 	void whenVirtualThreadsAreEnabledAndCustomTaskExecutorIsDefinedThenSimpleAsyncTaskExecutorThatUsesVirtualThreadsBacksOff() {
@@ -303,12 +312,22 @@ TaskDecorator mockTaskDecorator() {
 	static class CustomTaskExecutorConfig {
 
 		@Bean
-		Executor customTaskExecutor() {
+		TaskExecutor customTaskExecutor() {
 			return new SyncTaskExecutor();
 		}
 
 	}
 
+	@Configuration(proxyBeanMethods = false)
+	static class CustomExecutorServiceConfig {
+
+		@Bean
+		ExecutorService executorService() {
+			return Executors.newSingleThreadScheduledExecutor();
+		}
+
+	}
+
 	@Configuration(proxyBeanMethods = false)
 	@EnableAsync
 	static class AsyncConfiguration {