Skip to content

Commit 94215d3

Browse files
committed
Move Threading enum from spring-boot-autoconfigure to spring-boot
The enum itself is not specifically tied to auto-configuration so spring-boot is a better place for it. The related condition, `@ConditionalOnThreading`, remains in spring-boot-autoconfigure. This aligns things with the similar `CloudPlatform` and `@ConditionalOnCloudPlatform`. Closes gh-46406
1 parent 14f8609 commit 94215d3

File tree

19 files changed

+19
-19
lines changed

19 files changed

+19
-19
lines changed

core/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnThreading.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import java.lang.annotation.RetentionPolicy;
2323
import java.lang.annotation.Target;
2424

25-
import org.springframework.boot.autoconfigure.thread.Threading;
25+
import org.springframework.boot.thread.Threading;
2626
import org.springframework.context.annotation.Conditional;
2727

2828
/**

core/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnThreadingCondition.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import java.util.Map;
2020

21-
import org.springframework.boot.autoconfigure.thread.Threading;
21+
import org.springframework.boot.thread.Threading;
2222
import org.springframework.context.annotation.Condition;
2323
import org.springframework.context.annotation.ConditionContext;
2424
import org.springframework.core.env.Environment;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2727
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
2828
import org.springframework.boot.autoconfigure.condition.ConditionalOnThreading;
29-
import org.springframework.boot.autoconfigure.thread.Threading;
3029
import org.springframework.boot.task.SimpleAsyncTaskExecutorBuilder;
3130
import org.springframework.boot.task.SimpleAsyncTaskExecutorCustomizer;
3231
import org.springframework.boot.task.ThreadPoolTaskExecutorBuilder;
3332
import org.springframework.boot.task.ThreadPoolTaskExecutorCustomizer;
33+
import org.springframework.boot.thread.Threading;
3434
import org.springframework.context.ConfigurableApplicationContext;
3535
import org.springframework.context.annotation.Bean;
3636
import org.springframework.context.annotation.Conditional;

core/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/task/TaskSchedulingConfigurations.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
2424
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2525
import org.springframework.boot.autoconfigure.condition.ConditionalOnThreading;
26-
import org.springframework.boot.autoconfigure.thread.Threading;
2726
import org.springframework.boot.task.SimpleAsyncTaskSchedulerBuilder;
2827
import org.springframework.boot.task.SimpleAsyncTaskSchedulerCustomizer;
2928
import org.springframework.boot.task.ThreadPoolTaskSchedulerBuilder;
3029
import org.springframework.boot.task.ThreadPoolTaskSchedulerCustomizer;
30+
import org.springframework.boot.thread.Threading;
3131
import org.springframework.context.annotation.Bean;
3232
import org.springframework.context.annotation.Configuration;
3333
import org.springframework.core.task.TaskDecorator;

core/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnThreadingTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
import org.junit.jupiter.api.condition.EnabledForJreRange;
2121
import org.junit.jupiter.api.condition.JRE;
2222

23-
import org.springframework.boot.autoconfigure.thread.Threading;
2423
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
24+
import org.springframework.boot.thread.Threading;
2525
import org.springframework.context.annotation.Bean;
2626
import org.springframework.context.annotation.Configuration;
2727

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.autoconfigure.thread;
17+
package org.springframework.boot.thread;
1818

1919
import org.springframework.boot.system.JavaVersion;
2020
import org.springframework.core.env.Environment;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
/**
1818
* Classes related to threads.
1919
*/
20-
package org.springframework.boot.autoconfigure.thread;
20+
package org.springframework.boot.thread;

module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitAnnotationDrivenConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
3232
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
3333
import org.springframework.boot.autoconfigure.condition.ConditionalOnThreading;
34-
import org.springframework.boot.autoconfigure.thread.Threading;
34+
import org.springframework.boot.thread.Threading;
3535
import org.springframework.context.annotation.Bean;
3636
import org.springframework.context.annotation.Configuration;
3737
import org.springframework.core.task.VirtualThreadTaskExecutor;

module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/JedisConnectionConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2828
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
2929
import org.springframework.boot.autoconfigure.condition.ConditionalOnThreading;
30-
import org.springframework.boot.autoconfigure.thread.Threading;
3130
import org.springframework.boot.context.properties.PropertyMapper;
3231
import org.springframework.boot.ssl.SslBundle;
3332
import org.springframework.boot.ssl.SslOptions;
33+
import org.springframework.boot.thread.Threading;
3434
import org.springframework.context.annotation.Bean;
3535
import org.springframework.context.annotation.Configuration;
3636
import org.springframework.core.task.SimpleAsyncTaskExecutor;

module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/LettuceConnectionConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@
3636
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
3737
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
3838
import org.springframework.boot.autoconfigure.condition.ConditionalOnThreading;
39-
import org.springframework.boot.autoconfigure.thread.Threading;
4039
import org.springframework.boot.data.redis.autoconfigure.RedisProperties.Lettuce.Cluster.Refresh;
4140
import org.springframework.boot.data.redis.autoconfigure.RedisProperties.Pool;
4241
import org.springframework.boot.ssl.SslBundle;
4342
import org.springframework.boot.ssl.SslOptions;
43+
import org.springframework.boot.thread.Threading;
4444
import org.springframework.context.annotation.Bean;
4545
import org.springframework.context.annotation.Configuration;
4646
import org.springframework.core.task.SimpleAsyncTaskExecutor;

0 commit comments

Comments
 (0)