Merge pull request #43429 from nosan

* pr/43429: Don't replace existing defaultRequestConfigCustomizer Closes gh-43429
spring-projects · Dec 7, 2024 · 51c9925 · 51c9925
2 parents e394cad + 26ab0fe
commit 51c9925
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/...a/org/springframework/boot/http/client/HttpComponentsClientHttpRequestFactoryBuilder.java b/...a/org/springframework/boot/http/client/HttpComponentsClientHttpRequestFactoryBuilder.java
@@ -182,7 +182,8 @@ public HttpComponentsClientHttpRequestFactoryBuilder withDefaultRequestConfigCus
 			Consumer<RequestConfig.Builder> defaultRequestConfigCustomizer) {
 		Assert.notNull(defaultRequestConfigCustomizer, "'defaultRequestConfigCustomizer' must not be null");
 		return new HttpComponentsClientHttpRequestFactoryBuilder(getCustomizers(), this.httpClientCustomizer,
-				this.connectionManagerCustomizer, this.socketConfigCustomizer, defaultRequestConfigCustomizer,
+				this.connectionManagerCustomizer, this.socketConfigCustomizer,
+				this.defaultRequestConfigCustomizer.andThen(defaultRequestConfigCustomizer),
 				this.tlsSocketStrategyFactory);
 	}
 

diff --git a/.../springframework/boot/http/client/HttpComponentsClientHttpRequestFactoryBuilderTests.java b/.../springframework/boot/http/client/HttpComponentsClientHttpRequestFactoryBuilderTests.java
@@ -55,19 +55,25 @@ void withCustomizers() {
 		TestCustomizer<HttpClientBuilder> httpClientCustomizer2 = new TestCustomizer<>();
 		TestCustomizer<PoolingHttpClientConnectionManagerBuilder> connectionManagerCustomizer = new TestCustomizer<>();
 		TestCustomizer<SocketConfig.Builder> socketConfigCustomizer = new TestCustomizer<>();
+		TestCustomizer<SocketConfig.Builder> socketConfigCustomizer1 = new TestCustomizer<>();
 		TestCustomizer<RequestConfig.Builder> defaultRequestConfigCustomizer = new TestCustomizer<>();
+		TestCustomizer<RequestConfig.Builder> defaultRequestConfigCustomizer1 = new TestCustomizer<>();
 		ClientHttpRequestFactoryBuilder.httpComponents()
 			.withHttpClientCustomizer(httpClientCustomizer1)
 			.withHttpClientCustomizer(httpClientCustomizer2)
 			.withConnectionManagerCustomizer(connectionManagerCustomizer)
 			.withSocketConfigCustomizer(socketConfigCustomizer)
+			.withSocketConfigCustomizer(socketConfigCustomizer1)
 			.withDefaultRequestConfigCustomizer(defaultRequestConfigCustomizer)
+			.withDefaultRequestConfigCustomizer(defaultRequestConfigCustomizer1)
 			.build();
 		httpClientCustomizer1.assertCalled();
 		httpClientCustomizer2.assertCalled();
 		connectionManagerCustomizer.assertCalled();
 		socketConfigCustomizer.assertCalled();
+		socketConfigCustomizer1.assertCalled();
 		defaultRequestConfigCustomizer.assertCalled();
+		defaultRequestConfigCustomizer1.assertCalled();
 	}
 
 	@Test