Merge pull request #44952 from dmitrysulman

* pr/44952:
  Polish 'Auto-configure rest client when virtual threads are enabled'
  Auto-configure rest client when virtual threads are enabled

Closes gh-44952

Author: philwebb

Diff for: spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/client/NotReactiveWebApplicationOrVirtualThreadsExecutorEnabledCondition.java

@@ -0,0 +1,50 @@
+/*
+ * 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.
+ * 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.web.client;
+
+import org.springframework.boot.autoconfigure.condition.AnyNestedCondition;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnThreading;
+import org.springframework.boot.autoconfigure.condition.SpringBootCondition;
+import org.springframework.boot.autoconfigure.task.TaskExecutionAutoConfiguration;
+import org.springframework.boot.autoconfigure.thread.Threading;
+import org.springframework.context.annotation.Conditional;
+
+/**
+ * {@link SpringBootCondition} that applies when running in a non-reactive web application
+ * or virtual threads are enabled.
+ *
+ * @author Dmitry Sulman
+ */
+class NotReactiveWebApplicationOrVirtualThreadsExecutorEnabledCondition extends AnyNestedCondition {
+
+	NotReactiveWebApplicationOrVirtualThreadsExecutorEnabledCondition() {
+		super(ConfigurationPhase.REGISTER_BEAN);
+	}
+
+	@Conditional(NotReactiveWebApplicationCondition.class)
+	private static final class NotReactiveWebApplication {
+
+	}
+
+	@ConditionalOnThreading(Threading.VIRTUAL)
+	@ConditionalOnBean(name = TaskExecutionAutoConfiguration.APPLICATION_TASK_EXECUTOR_BEAN_NAME)
+	private static final class VirtualThreadsEnabled {
+
+	}
+
+}

Diff for: spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/client/RestClientAutoConfiguration.java

@@ -27,6 +27,7 @@
 import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration;
 import org.springframework.boot.autoconfigure.http.client.HttpClientAutoConfiguration;
 import org.springframework.boot.autoconfigure.ssl.SslAutoConfiguration;
+import org.springframework.boot.autoconfigure.task.TaskExecutionAutoConfiguration;
 import org.springframework.boot.http.client.ClientHttpRequestFactoryBuilder;
 import org.springframework.boot.http.client.ClientHttpRequestFactorySettings;
 import org.springframework.boot.ssl.SslBundles;
@@ -51,9 +52,9 @@
  * @since 3.2.0
  */
 @AutoConfiguration(after = { HttpClientAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class,
-		SslAutoConfiguration.class })
+		SslAutoConfiguration.class, TaskExecutionAutoConfiguration.class })
 @ConditionalOnClass(RestClient.class)
-@Conditional(NotReactiveWebApplicationCondition.class)
+@Conditional(NotReactiveWebApplicationOrVirtualThreadsExecutorEnabledCondition.class)
 public class RestClientAutoConfiguration {
 
 	@Bean

Diff for: spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/client/RestClientAutoConfigurationTests.java

@@ -20,17 +20,22 @@
 import java.util.List;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledForJreRange;
+import org.junit.jupiter.api.condition.JRE;
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration;
 import org.springframework.boot.autoconfigure.http.client.HttpClientAutoConfiguration;
+import org.springframework.boot.autoconfigure.task.TaskExecutionAutoConfiguration;
 import org.springframework.boot.http.client.ClientHttpRequestFactoryBuilder;
 import org.springframework.boot.http.client.ClientHttpRequestFactorySettings;
 import org.springframework.boot.http.client.ClientHttpRequestFactorySettings.Redirects;
 import org.springframework.boot.ssl.SslBundle;
 import org.springframework.boot.ssl.SslBundles;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
+import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
 import org.springframework.boot.web.client.RestClientCustomizer;
 import org.springframework.boot.web.codec.CodecCustomizer;
 import org.springframework.context.annotation.Bean;
@@ -53,6 +58,7 @@
  * @author Arjen Poutsma
  * @author Moritz Halbritter
  * @author Dmytro Nosan
+ * @author Dmitry Sulman
  */
 class RestClientAutoConfigurationTests {
 
@@ -260,6 +266,57 @@ void shouldSupplyRestClientBuilderConfigurerWithAutoConfiguredHttpSettings() {
 			});
 	}
 
+	@Test
+	void whenReactiveWebApplicationRestClientIsNotConfigured() {
+		new ReactiveWebApplicationContextRunner()
+			.withConfiguration(AutoConfigurations.of(RestClientAutoConfiguration.class))
+			.run((context) -> {
+				assertThat(context).doesNotHaveBean(HttpMessageConvertersRestClientCustomizer.class);
+				assertThat(context).doesNotHaveBean(RestClientBuilderConfigurer.class);
+				assertThat(context).doesNotHaveBean(RestClient.Builder.class);
+			});
+	}
+
+	@Test
+	void whenServletWebApplicationRestClientIsConfigured() {
+		new WebApplicationContextRunner().withConfiguration(AutoConfigurations.of(RestClientAutoConfiguration.class))
+			.run((context) -> {
+				assertThat(context).hasSingleBean(HttpMessageConvertersRestClientCustomizer.class);
+				assertThat(context).hasSingleBean(RestClientBuilderConfigurer.class);
+				assertThat(context).hasSingleBean(RestClient.Builder.class);
+			});
+	}
+
+	@Test
+	@EnabledForJreRange(min = JRE.JAVA_21)
+	void whenReactiveWebApplicationAndVirtualThreadsEnabledAndTaskExecutorBean() {
+		new ReactiveWebApplicationContextRunner().withPropertyValues("spring.threads.virtual.enabled=true")
+			.withConfiguration(
+					AutoConfigurations.of(RestClientAutoConfiguration.class, TaskExecutionAutoConfiguration.class))
+			.run((context) -> {
+				assertThat(context).hasSingleBean(HttpMessageConvertersRestClientCustomizer.class);
+				assertThat(context).hasSingleBean(RestClientBuilderConfigurer.class);
+				assertThat(context).hasSingleBean(RestClient.Builder.class);
+			});
+	}
+
+	@Test
+	@EnabledForJreRange(min = JRE.JAVA_21)
+	void whenReactiveWebApplicationAndVirtualThreadsDisabled() {
+		new ReactiveWebApplicationContextRunner().withPropertyValues("spring.threads.virtual.enabled=false")
+			.withConfiguration(
+					AutoConfigurations.of(RestClientAutoConfiguration.class, TaskExecutionAutoConfiguration.class))
+			.run((context) -> assertThat(context).doesNotHaveBean(RestClient.Builder.class));
+	}
+
+	@Test
+	@EnabledForJreRange(min = JRE.JAVA_21)
+	void whenReactiveWebApplicationAndVirtualThreadsEnabledAndNoTaskExecutorBean() {
+		new ReactiveWebApplicationContextRunner().withPropertyValues("spring.threads.virtual.enabled=true")
+			.withConfiguration(AutoConfigurations.of(RestClientAutoConfiguration.class))
+			.run((context) -> assertThat(context).doesNotHaveBean(RestClient.Builder.class));
+	}
+
 	@Configuration(proxyBeanMethods = false)
 	static class CodecConfiguration {