From 3686e9a1111c6f19330801627ec11f79af1114b4 Mon Sep 17 00:00:00 2001 From: Dmitry Sulman Date: Sun, 30 Mar 2025 18:10:01 +0300 Subject: [PATCH 1/2] Auto-configure rest client when virtual threads are enabled Refine `RestClientAutoConfiguration` conditional so that it applies in reactive web applications if virtual threads are active and a task executor is configured. See gh-44952 Signed-off-by: Dmitry Sulman --- ...ationOrVirtualThreadsEnabledCondition.java | 47 +++++++++++++++++++ .../client/RestClientAutoConfiguration.java | 2 +- .../RestClientAutoConfigurationTests.java | 37 +++++++++++++++ 3 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/client/NotReactiveWebApplicationOrVirtualThreadsEnabledCondition.java diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/client/NotReactiveWebApplicationOrVirtualThreadsEnabledCondition.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/client/NotReactiveWebApplicationOrVirtualThreadsEnabledCondition.java new file mode 100644 index 0000000000..9e87fffbca --- /dev/null +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/client/NotReactiveWebApplicationOrVirtualThreadsEnabledCondition.java @@ -0,0 +1,47 @@ +/* + * 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.ConditionalOnThreading; +import org.springframework.boot.autoconfigure.condition.SpringBootCondition; +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 NotReactiveWebApplicationOrVirtualThreadsEnabledCondition extends AnyNestedCondition { + + NotReactiveWebApplicationOrVirtualThreadsEnabledCondition() { + super(ConfigurationPhase.PARSE_CONFIGURATION); + } + + @Conditional(NotReactiveWebApplicationCondition.class) + private static final class NotReactiveWebApplication { + + } + + @ConditionalOnThreading(Threading.VIRTUAL) + private static final class VirtualThreadsEnabled { + + } + +} diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/client/RestClientAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/client/RestClientAutoConfiguration.java index f50d99a271..6af0115e8d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/client/RestClientAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/client/RestClientAutoConfiguration.java @@ -53,7 +53,7 @@ import org.springframework.web.client.RestClient.Builder; @AutoConfiguration(after = { HttpClientAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class, SslAutoConfiguration.class }) @ConditionalOnClass(RestClient.class) -@Conditional(NotReactiveWebApplicationCondition.class) +@Conditional(NotReactiveWebApplicationOrVirtualThreadsEnabledCondition.class) public class RestClientAutoConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/client/RestClientAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/client/RestClientAutoConfigurationTests.java index b114f52f11..cbfa2ed28d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/client/RestClientAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/client/RestClientAutoConfigurationTests.java @@ -20,6 +20,8 @@ import java.time.Duration; 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; @@ -31,6 +33,8 @@ import org.springframework.boot.http.client.ClientHttpRequestFactorySettings.Red 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; @@ -260,6 +264,39 @@ class RestClientAutoConfigurationTests { }); } + @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 whenReactiveWebApplicationAndVirtualThreadsAreEnabledOnJava21AndLaterRestClientIsConfigured() { + new ReactiveWebApplicationContextRunner().withPropertyValues("spring.threads.virtual.enabled=true") + .withConfiguration(AutoConfigurations.of(RestClientAutoConfiguration.class)) + .run((context) -> { + assertThat(context).hasSingleBean(HttpMessageConvertersRestClientCustomizer.class); + assertThat(context).hasSingleBean(RestClientBuilderConfigurer.class); + assertThat(context).hasSingleBean(RestClient.Builder.class); + }); + } + @Configuration(proxyBeanMethods = false) static class CodecConfiguration { From ff3b4952be0ab553be6b1fcaf2999cc30275defb Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 14 Apr 2025 20:40:10 -0700 Subject: [PATCH 2/2] Polish 'Auto-configure rest client when virtual threads are enabled' See gh-44952 --- ...rtualThreadsExecutorEnabledCondition.java} | 9 ++++--- .../client/RestClientAutoConfiguration.java | 5 ++-- .../RestClientAutoConfigurationTests.java | 24 +++++++++++++++++-- 3 files changed, 31 insertions(+), 7 deletions(-) rename spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/client/{NotReactiveWebApplicationOrVirtualThreadsEnabledCondition.java => NotReactiveWebApplicationOrVirtualThreadsExecutorEnabledCondition.java} (75%) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/client/NotReactiveWebApplicationOrVirtualThreadsEnabledCondition.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/client/NotReactiveWebApplicationOrVirtualThreadsExecutorEnabledCondition.java similarity index 75% rename from spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/client/NotReactiveWebApplicationOrVirtualThreadsEnabledCondition.java rename to spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/client/NotReactiveWebApplicationOrVirtualThreadsExecutorEnabledCondition.java index 9e87fffbca..312e9dfa23 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/client/NotReactiveWebApplicationOrVirtualThreadsEnabledCondition.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/client/NotReactiveWebApplicationOrVirtualThreadsExecutorEnabledCondition.java @@ -17,8 +17,10 @@ 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; @@ -28,10 +30,10 @@ import org.springframework.context.annotation.Conditional; * * @author Dmitry Sulman */ -class NotReactiveWebApplicationOrVirtualThreadsEnabledCondition extends AnyNestedCondition { +class NotReactiveWebApplicationOrVirtualThreadsExecutorEnabledCondition extends AnyNestedCondition { - NotReactiveWebApplicationOrVirtualThreadsEnabledCondition() { - super(ConfigurationPhase.PARSE_CONFIGURATION); + NotReactiveWebApplicationOrVirtualThreadsExecutorEnabledCondition() { + super(ConfigurationPhase.REGISTER_BEAN); } @Conditional(NotReactiveWebApplicationCondition.class) @@ -40,6 +42,7 @@ class NotReactiveWebApplicationOrVirtualThreadsEnabledCondition extends AnyNeste } @ConditionalOnThreading(Threading.VIRTUAL) + @ConditionalOnBean(name = TaskExecutionAutoConfiguration.APPLICATION_TASK_EXECUTOR_BEAN_NAME) private static final class VirtualThreadsEnabled { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/client/RestClientAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/client/RestClientAutoConfiguration.java index 6af0115e8d..137943a3f1 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/client/RestClientAutoConfiguration.java +++ b/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.HttpMessageConverters; 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 @@ import org.springframework.web.client.RestClient.Builder; * @since 3.2.0 */ @AutoConfiguration(after = { HttpClientAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class, - SslAutoConfiguration.class }) + SslAutoConfiguration.class, TaskExecutionAutoConfiguration.class }) @ConditionalOnClass(RestClient.class) -@Conditional(NotReactiveWebApplicationOrVirtualThreadsEnabledCondition.class) +@Conditional(NotReactiveWebApplicationOrVirtualThreadsExecutorEnabledCondition.class) public class RestClientAutoConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/client/RestClientAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/client/RestClientAutoConfigurationTests.java index cbfa2ed28d..1e65ef6f68 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/client/RestClientAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/client/RestClientAutoConfigurationTests.java @@ -27,6 +27,7 @@ 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; @@ -57,6 +58,7 @@ import static org.mockito.Mockito.mock; * @author Arjen Poutsma * @author Moritz Halbritter * @author Dmytro Nosan + * @author Dmitry Sulman */ class RestClientAutoConfigurationTests { @@ -287,9 +289,10 @@ class RestClientAutoConfigurationTests { @Test @EnabledForJreRange(min = JRE.JAVA_21) - void whenReactiveWebApplicationAndVirtualThreadsAreEnabledOnJava21AndLaterRestClientIsConfigured() { + void whenReactiveWebApplicationAndVirtualThreadsEnabledAndTaskExecutorBean() { new ReactiveWebApplicationContextRunner().withPropertyValues("spring.threads.virtual.enabled=true") - .withConfiguration(AutoConfigurations.of(RestClientAutoConfiguration.class)) + .withConfiguration( + AutoConfigurations.of(RestClientAutoConfiguration.class, TaskExecutionAutoConfiguration.class)) .run((context) -> { assertThat(context).hasSingleBean(HttpMessageConvertersRestClientCustomizer.class); assertThat(context).hasSingleBean(RestClientBuilderConfigurer.class); @@ -297,6 +300,23 @@ class RestClientAutoConfigurationTests { }); } + @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 {