Merge branch '3.0.x'

Closes gh-35381
spring-projects · May 10, 2023 · 9f78705 · 9f78705
2 parents 0ebb32e + 53d2a9f
commit 9f78705
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/spring-boot-project/spring-boot-autoconfigure/build.gradle b/spring-boot-project/spring-boot-autoconfigure/build.gradle
@@ -59,7 +59,7 @@ dependencies {
 		exclude group: "commons-logging", module: "commons-logging"
 	}
 	optional("org.apache.httpcomponents.client5:httpclient5")
-	optional("org.apache.httpcomponents.core5:httpcore5-reactive");
+	optional("org.apache.httpcomponents.core5:httpcore5-reactive")
 	optional("org.apache.kafka:kafka-streams")
 	optional("org.apache.tomcat.embed:tomcat-embed-core")
 	optional("org.apache.tomcat.embed:tomcat-embed-el")

diff --git a/...oconfigure/web/reactive/function/client/ClientHttpConnectorFactoryConfigurationTests.java b/...oconfigure/web/reactive/function/client/ClientHttpConnectorFactoryConfigurationTests.java
@@ -24,8 +24,10 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;
+import org.springframework.boot.test.context.FilteredClassLoader;
 import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
 import org.springframework.context.annotation.Bean;
+import org.springframework.http.client.reactive.HttpComponentsClientHttpConnector;
 import org.springframework.http.client.reactive.JettyClientHttpConnector;
 import org.springframework.http.client.reactive.JettyResourceFactory;
 import org.springframework.test.util.ReflectionTestUtils;
@@ -38,6 +40,7 @@
  *
  * @author Phillip Webb
  * @author Brian Clozel
+ * @author Moritz Halbritter
  */
 class ClientHttpConnectorFactoryConfigurationTests {
 
@@ -86,6 +89,14 @@ void shouldApplyHttpClientMapper() {
 			});
 	}
 
+	@Test
+	void shouldNotConfigureReactiveHttpClient5WhenHttpCore5ReactiveJarIsMissing() {
+		new ReactiveWebApplicationContextRunner()
+			.withClassLoader(new FilteredClassLoader("org.apache.hc.core5.reactive"))
+			.withConfiguration(AutoConfigurations.of(ClientHttpConnectorFactoryConfiguration.HttpClient5.class))
+			.run((context) -> assertThat(context).doesNotHaveBean(HttpComponentsClientHttpConnector.class));
+	}
+
 	static class CustomHttpClientMapper {
 
 		static boolean called = false;