Improve creation of HttpClient with HttpComponents5ClientFactory

This commit improves HttpComponents5ClientFactory so that it is easier
to apply custom configuration to the HttpClient it creates.

Closes gh-1035

spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpComponents5ClientFactoryTest.java

@@ -0,0 +1,65 @@
+/*
+ * Copyright 2005-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.ws.transport.http;
+
+import org.junit.jupiter.api.Test;
+import org.mockito.InOrder;
+
+import org.springframework.ws.transport.http.HttpComponents5ClientFactory.HttpClientBuilderCustomizer;
+import org.springframework.ws.transport.http.HttpComponents5ClientFactory.PoolingHttpClientConnectionManagerBuilderCustomizer;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.mock;
+
+/**
+ * Tests for {@link HttpComponents5ClientFactory}.
+ *
+ * @author Stephane Nicoll
+ */
+class HttpComponents5ClientFactoryTest {
+
+	@Test
+	void httpclientBuilderCustomizersAreCalledInOrder() {
+		HttpClientBuilderCustomizer first = mock(HttpClientBuilderCustomizer.class);
+		HttpClientBuilderCustomizer second = mock(HttpClientBuilderCustomizer.class);
+		HttpComponents5ClientFactory factory = new HttpComponents5ClientFactory();
+		factory.addClientBuilderCustomizer(first);
+		factory.addClientBuilderCustomizer(second);
+		assertThat(factory.build()).isNotNull();
+		InOrder inOrder = inOrder(first, second);
+		inOrder.verify(first).customize(any());
+		inOrder.verify(second).customize(any());
+	}
+
+	@Test
+	void connectionManagerBuilderCustomizerCustomizersAreCalledInOrder() {
+		PoolingHttpClientConnectionManagerBuilderCustomizer first = mock(
+				PoolingHttpClientConnectionManagerBuilderCustomizer.class);
+		PoolingHttpClientConnectionManagerBuilderCustomizer second = mock(
+				PoolingHttpClientConnectionManagerBuilderCustomizer.class);
+		HttpComponents5ClientFactory factory = new HttpComponents5ClientFactory();
+		factory.addConnectionManagerBuilderCustomizer(first);
+		factory.addConnectionManagerBuilderCustomizer(second);
+		assertThat(factory.build()).isNotNull();
+		InOrder inOrder = inOrder(first, second);
+		inOrder.verify(first).customize(any());
+		inOrder.verify(second).customize(any());
+	}
+
+}

spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpComponents5ContentTypeIntegrationTest.java

@@ -17,8 +17,6 @@
 package org.springframework.ws.transport.http;
 
 import org.apache.hc.client5.http.classic.ExecChainHandler;
-import org.apache.hc.client5.http.classic.HttpClient;
-import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
@@ -31,11 +29,10 @@ class HttpComponents5ContentTypeIntegrationTest
 			assertThat(request.getEntity().getContentType()).isNotBlank();
 			return chain.proceed(request, scope);
 		};
-		HttpClient client = HttpClientBuilder.create()
-			.addRequestInterceptorFirst(new HttpComponents5MessageSender.RemoveSoapHeadersInterceptor())
-			.addExecInterceptorFirst("handler with assertion", testHandler)
-			.build();
-		return new SimpleHttpComponents5MessageSender(client);
+		HttpComponents5ClientFactory factory = HttpComponents5ClientFactory.withDefaults();
+		factory.addClientBuilderCustomizer(
+				builder -> builder.addExecInterceptorFirst("handler with assertion", testHandler));
+		return new SimpleHttpComponents5MessageSender(factory.build());
 	}
 
 }

spring-ws-core/src/test/java/org/springframework/ws/transport/http/SimpleHttpComponents5MessageSenderTest.java

@@ -51,10 +51,10 @@ class SimpleHttpComponents5MessageSenderTest {
 	}
 
 	@Test
-	void createWithFactory() throws Exception {
+	void createWithFactory() {
 		HttpComponents5ClientFactory factory = new HttpComponents5ClientFactory();
 		HttpClientBuilderCustomizer builderCustomizer = mock(HttpClientBuilderCustomizer.class);
-		factory.setClientBuilderCustomizer(builderCustomizer);
+		factory.addClientBuilderCustomizer(builderCustomizer);
 		new SimpleHttpComponents5MessageSender(factory);
 		verify(builderCustomizer).customize(any());
 	}