Merge branch '3.5.x'

snicoll · snicoll · commit d5f7423ba293 · 2025-08-06T16:43:29.000+02:00
Closes gh-46684
diff --git a/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/autoconfigure/reactive/ClientHttpConnectorAutoConfiguration.java b/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/autoconfigure/reactive/ClientHttpConnectorAutoConfiguration.java
@@ -30,6 +30,7 @@
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.http.client.reactive.ClientHttpConnectorBuilder;
 import org.springframework.boot.http.client.reactive.ClientHttpConnectorSettings;
+import org.springframework.boot.http.client.reactive.ReactorClientHttpConnectorBuilder;
 import org.springframework.boot.reactor.netty.autoconfigure.ReactorNettyConfigurations;
 import org.springframework.boot.ssl.SslBundles;
 import org.springframework.boot.util.LambdaSafe;
@@ -38,6 +39,8 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.Lazy;
+import org.springframework.core.annotation.Order;
+import org.springframework.http.client.ReactorResourceFactory;
 import org.springframework.http.client.reactive.ClientHttpConnector;
 
 /**
@@ -104,6 +107,13 @@ ClientHttpConnector clientHttpConnector(ClientHttpConnectorBuilder<?> clientHttp
 	@Import(ReactorNettyConfigurations.ReactorResourceFactoryConfiguration.class)
 	static class ReactorNetty {
 
+		@Bean
+		@Order(0)
+		ClientHttpConnectorBuilderCustomizer<ReactorClientHttpConnectorBuilder> reactorResourceFactoryClientHttpConnectorBuilderCustomizer(
+				ReactorResourceFactory reactorResourceFactory) {
+			return (builder) -> builder.withReactorResourceFactory(reactorResourceFactory);
+		}
+
 	}
 
 }
diff --git a/module/spring-boot-http-client/src/test/java/org/springframework/boot/http/client/autoconfigure/reactive/ClientHttpConnectorAutoConfigurationTests.java b/module/spring-boot-http-client/src/test/java/org/springframework/boot/http/client/autoconfigure/reactive/ClientHttpConnectorAutoConfigurationTests.java
@@ -23,6 +23,7 @@
 import org.apache.hc.client5.http.impl.async.HttpAsyncClients;
 import org.junit.jupiter.api.Test;
 import reactor.netty.http.client.HttpClient;
+import reactor.netty.resources.LoopResources;
 
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
@@ -114,6 +115,21 @@ void shouldUseCustomReactorResourceFactory() {
 			assertThat(context).hasSingleBean(ClientHttpConnector.class);
 			assertThat(context).hasSingleBean(ReactorResourceFactory.class);
 			assertThat(context).hasBean("customReactorResourceFactory");
+			ClientHttpConnector connector = context.getBean(ClientHttpConnector.class);
+			assertThat(connector).extracting("httpClient.config.loopResources")
+				.isEqualTo(context.getBean("customReactorResourceFactory", ReactorResourceFactory.class)
+					.getLoopResources());
+		});
+	}
+
+	@Test
+	void shouldUseReactorResourceFactory() {
+		this.contextRunner.run((context) -> {
+			assertThat(context).hasSingleBean(ClientHttpConnector.class);
+			assertThat(context).hasSingleBean(ReactorResourceFactory.class);
+			ClientHttpConnector connector = context.getBean(ClientHttpConnector.class);
+			assertThat(connector).extracting("httpClient.config.loopResources")
+				.isEqualTo(context.getBean(ReactorResourceFactory.class).getLoopResources());
 		});
 	}
 
@@ -190,7 +206,10 @@ static class CustomReactorResourceConfig {
 
 		@Bean
 		ReactorResourceFactory customReactorResourceFactory() {
-			return new ReactorResourceFactory();
+			ReactorResourceFactory reactorResourceFactory = new ReactorResourceFactory();
+			reactorResourceFactory.setUseGlobalResources(false);
+			reactorResourceFactory.setLoopResources(LoopResources.create("custom-loop", 1, true));
+			return reactorResourceFactory;
 		}
 
 	}
