Polishing.

See #1368.

Author: gregturn

spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponents5Connection.java

@@ -27,7 +27,12 @@
 
 import org.apache.hc.client5.http.classic.HttpClient;
 import org.apache.hc.client5.http.classic.methods.HttpPost;
-import org.apache.hc.core5.http.*;
+import org.apache.hc.core5.http.ClassicHttpResponse;
+import org.apache.hc.core5.http.ContentType;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpHeaders;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.NameValuePair;
 import org.apache.hc.core5.http.io.entity.ByteArrayEntity;
 import org.apache.hc.core5.http.io.entity.EntityUtils;
 import org.apache.hc.core5.http.protocol.HttpContext;
@@ -116,8 +121,10 @@ protected OutputStream getRequestOutputStream() throws IOException {
 
 	@Override
 	protected void onSendAfterWrite(WebServiceMessage message) throws IOException {
-		var contentType = ContentType.parse(httpPost.getFirstHeader(HttpHeaders.CONTENT_TYPE).getValue());
-		httpPost.setEntity(new ByteArrayEntity(requestBuffer.toByteArray(), contentType));
+
+		String contentType = httpPost.getFirstHeader(HttpHeaders.CONTENT_TYPE).getValue();
+		httpPost.setEntity(new ByteArrayEntity(requestBuffer.toByteArray(), ContentType.parse(contentType)));
+
 		requestBuffer = null;
 
 		if (httpContext != null) {

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

@@ -0,0 +1,43 @@
+/*
+ * Copyright 2005-2022 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
+ *
+ *      http://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 static org.assertj.core.api.AssertionsForClassTypes.*;
+
+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;
+
+class HttpComponents5ContentTypeIntegrationTest
+		extends AbstractHttpWebServiceMessageSenderIntegrationTestCase<HttpComponents5MessageSender> {
+
+	@Override
+	protected HttpComponents5MessageSender createMessageSender() {
+
+		ExecChainHandler testHandler = (request, scope, chain) -> {
+			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 HttpComponents5MessageSender(client);
+	}
+}

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

@@ -16,14 +16,21 @@
 
 package org.springframework.ws.transport.http;
 
+import static org.assertj.core.api.AssertionsForClassTypes.*;
+import static org.springframework.ws.transport.http.HttpComponents5ClientFactory.*;
+
 import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.xml.soap.MessageFactory;
+
+import java.io.IOException;
+import java.net.URI;
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.hc.client5.http.HttpRoute;
-import org.apache.hc.client5.http.classic.ExecChainHandler;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
-import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
 import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
 import org.apache.hc.core5.http.HttpHost;
 import org.eclipse.jetty.server.Connector;
@@ -38,33 +45,12 @@
 import org.springframework.ws.transport.WebServiceConnection;
 import org.springframework.ws.transport.support.FreePortScanner;
 
-import java.io.IOException;
-import java.net.URI;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-import static org.springframework.ws.transport.http.HttpComponents5ClientFactory.getPort;
-
 class HttpComponents5MessageSenderIntegrationTest
 		extends AbstractHttpWebServiceMessageSenderIntegrationTestCase<HttpComponents5MessageSender> {
 
-	private static CloseableHttpClient createHttpClientWithAssertion() {
-		ExecChainHandler handler = (request, scope, chain) -> {
-			assertThat(request.getEntity().getContentType())
-					.describedAs("Exec interceptors are supposed to receive content type. Verify that HttpEntity class is instantiated correctly")
-					.isNotBlank();
-			return chain.proceed(request, scope);
-		};
-		return HttpClientBuilder.create()
-				.addRequestInterceptorFirst(new HttpComponents5MessageSender.RemoveSoapHeadersInterceptor())
-				.addExecInterceptorFirst("logbook-alike exec interceptor", handler)
-				.build();
-	}
-
 	@Override
 	protected HttpComponents5MessageSender createMessageSender() {
-		return new HttpComponents5MessageSender(createHttpClientWithAssertion());
+		return new HttpComponents5MessageSender();
 	}
 
 	@Test // GH-1164