Remove @ConditionalOnVirtualThreads

See gh-36624
See gh-35892

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnVirtualThreads.java

@@ -1,42 +0,0 @@
-/*
- * Copyright 2012-2023 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.boot.autoconfigure.condition;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.boot.system.JavaVersion;
-import org.springframework.context.annotation.Conditional;
-
-/**
- * {@link Conditional @Conditional} that only matches when virtual threads are available
- * and enabled.
- *
- * @author Moritz Halbritter
- * @since 3.2.0
- */
-@Target({ ElementType.TYPE, ElementType.METHOD })
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@ConditionalOnJava(JavaVersion.TWENTY_ONE)
-@ConditionalOnProperty(name = "spring.threads.virtual.enabled", havingValue = "true")
-public @interface ConditionalOnVirtualThreads {
-
-}

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

@@ -20,7 +20,8 @@ import java.util.concurrent.Executor;
 
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnVirtualThreads;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnThreading;
+import org.springframework.boot.autoconfigure.thread.Threading;
 import org.springframework.boot.task.TaskExecutorBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -39,7 +40,7 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
  */
 class TaskExecutorConfigurations {
 
-	@ConditionalOnVirtualThreads
+	@ConditionalOnThreading(Threading.VIRTUAL)
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnMissingBean(Executor.class)
 	static class VirtualThreadTaskExecutorConfiguration {

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/EmbeddedWebServerFactoryCustomizerAutoConfiguration.java

@@ -29,8 +29,9 @@ import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnNotWarDeployment;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnVirtualThreads;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnThreading;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
+import org.springframework.boot.autoconfigure.thread.Threading;
 import org.springframework.boot.autoconfigure.web.ServerProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -64,7 +65,7 @@ public class EmbeddedWebServerFactoryCustomizerAutoConfiguration {
 		}
 
 		@Bean
-		@ConditionalOnVirtualThreads
+		@ConditionalOnThreading(Threading.VIRTUAL)
 		TomcatVirtualThreadsWebServerFactoryCustomizer tomcatVirtualThreadsProtocolHandlerCustomizer() {
 			return new TomcatVirtualThreadsWebServerFactoryCustomizer();
 		}
@@ -85,7 +86,7 @@ public class EmbeddedWebServerFactoryCustomizerAutoConfiguration {
 		}
 
 		@Bean
-		@ConditionalOnVirtualThreads
+		@ConditionalOnThreading(Threading.VIRTUAL)
 		JettyVirtualThreadsWebServerFactoryCustomizer jettyVirtualThreadsWebServerFactoryCustomizer(
 				ServerProperties serverProperties) {
 			return new JettyVirtualThreadsWebServerFactoryCustomizer(serverProperties);

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnVirtualThreadsTests.java

@@ -1,70 +0,0 @@
-/*
- * Copyright 2012-2023 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.boot.autoconfigure.condition;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledForJreRange;
-import org.junit.jupiter.api.condition.JRE;
-
-import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * Tests for {@link ConditionalOnVirtualThreads @ConditionalOnVirtualThreads}.
- *
- * @author Moritz Halbritter
- */
-class ConditionalOnVirtualThreadsTests {
-
-	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-		.withUserConfiguration(BasicConfiguration.class);
-
-	@Test
-	@EnabledForJreRange(max = JRE.JAVA_20)
-	void isDisabledOnJdkBelow21EvenIfPropertyIsSet() {
-		this.contextRunner.withPropertyValues("spring.threads.virtual.enabled=true")
-			.run((context) -> assertThat(context).doesNotHaveBean("someBean"));
-	}
-
-	@Test
-	@EnabledForJreRange(min = JRE.JAVA_21)
-	void isDisabledOnJdk21IfPropertyIsNotSet() {
-		this.contextRunner.run((context) -> assertThat(context).doesNotHaveBean("someBean"));
-	}
-
-	@Test
-	@EnabledForJreRange(min = JRE.JAVA_21)
-	void isEnabledOnJdk21IfPropertyIsSet() {
-		this.contextRunner.withPropertyValues("spring.threads.virtual.enabled=true")
-			.run((context) -> assertThat(context).hasBean("someBean"));
-	}
-
-	@Configuration(proxyBeanMethods = false)
-	static class BasicConfiguration {
-
-		@Bean
-		@ConditionalOnVirtualThreads
-		String someBean() {
-			return "someBean";
-		}
-
-	}
-
-}