Fix split package between spring-ws-support and spring-ws-core

This commit moves the classes from the o.s.ws.transport.http and
o.s.ws.transport.support packages from spring-ws-support to
spring-ws-core. It turns out these classes don't bring extra
dependencies, which make the move quite straightforward.

Closes gh-1202

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

@@ -0,0 +1,34 @@
+/*
+ * 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 java.util.Locale;
+
+import org.springframework.ws.context.MessageContext;
+import org.springframework.ws.server.endpoint.MessageEndpoint;
+import org.springframework.ws.soap.SoapMessage;
+
+public class FaultEndpoint implements MessageEndpoint {
+
+	@Override
+	public void invoke(MessageContext messageContext) {
+
+		SoapMessage response = (SoapMessage) messageContext.getResponse();
+		response.getSoapBody().addServerOrReceiverFault("Something went wrong", Locale.ENGLISH);
+	}
+
+}

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

@@ -0,0 +1,31 @@
+/*
+ * 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.springframework.ws.context.MessageContext;
+import org.springframework.ws.server.endpoint.MessageEndpoint;
+
+/**
+ * @author Arjen Poutsma
+ */
+public class NoResponseEndpoint implements MessageEndpoint {
+
+	@Override
+	public void invoke(MessageContext messageContext) {
+	}
+
+}

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

@@ -0,0 +1,32 @@
+/*
+ * 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.springframework.ws.context.MessageContext;
+import org.springframework.ws.server.endpoint.MessageEndpoint;
+
+/**
+ * @author Arjen Poutsma
+ */
+public class ResponseEndpoint implements MessageEndpoint {
+
+	@Override
+	public void invoke(MessageContext messageContext) {
+		messageContext.getResponse();
+	}
+
+}

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

@@ -0,0 +1,172 @@
+/*
+ * 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 java.io.IOException;
+import java.net.InetSocketAddress;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Executor;
+
+import com.sun.net.httpserver.Authenticator;
+import com.sun.net.httpserver.Filter;
+import com.sun.net.httpserver.HttpContext;
+import com.sun.net.httpserver.HttpHandler;
+import com.sun.net.httpserver.HttpServer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.FactoryBean;
+import org.springframework.beans.factory.InitializingBean;
+
+/**
+ * Utility class ONLY used for testing SOAP interactions through the JRE's built-in
+ * {@link HttpServer}.
+ */
+class SimpleHttpServerFactoryBean implements FactoryBean<HttpServer>, InitializingBean, DisposableBean {
+
+	protected final Logger logger = LoggerFactory.getLogger(getClass());
+
+	private int port = 8080;
+
+	private String hostname;
+
+	private int backlog = -1;
+
+	private int shutdownDelay = 0;
+
+	private Executor executor;
+
+	private Map<String, HttpHandler> contexts;
+
+	private List<Filter> filters;
+
+	private Authenticator authenticator;
+
+	private HttpServer server;
+
+	/**
+	 * Specify the HTTP server's port. Default is 8080.
+	 */
+	public void setPort(int port) {
+		this.port = port;
+	}
+
+	/**
+	 * Specify the HTTP server's hostname to bind to. Default is localhost; can be
+	 * overridden with a specific network address to bind to.
+	 */
+	public void setHostname(String hostname) {
+		this.hostname = hostname;
+	}
+
+	/**
+	 * Specify the HTTP server's TCP backlog. Default is -1, indicating the system's
+	 * default value.
+	 */
+	public void setBacklog(int backlog) {
+		this.backlog = backlog;
+	}
+
+	/**
+	 * Specify the number of seconds to wait until HTTP exchanges have completed when
+	 * shutting down the HTTP server. Default is 0.
+	 */
+	public void setShutdownDelay(int shutdownDelay) {
+		this.shutdownDelay = shutdownDelay;
+	}
+
+	/**
+	 * Set the JDK concurrent executor to use for dispatching incoming requests.
+	 * @see HttpServer#setExecutor
+	 */
+	public void setExecutor(Executor executor) {
+		this.executor = executor;
+	}
+
+	/**
+	 * Register {@link HttpHandler HttpHandlers} for specific context paths.
+	 * @param contexts a Map with context paths as keys and HttpHandler objects as values
+	 */
+	public void setContexts(Map<String, HttpHandler> contexts) {
+		this.contexts = contexts;
+	}
+
+	/**
+	 * Register common {@link Filter Filters} to be applied to all locally registered
+	 * {@link #setContexts contexts}.
+	 */
+	public void setFilters(List<Filter> filters) {
+		this.filters = filters;
+	}
+
+	/**
+	 * Register a common {@link Authenticator} to be applied to all locally registered
+	 * {@link #setContexts contexts}.
+	 */
+	public void setAuthenticator(Authenticator authenticator) {
+		this.authenticator = authenticator;
+	}
+
+	@Override
+	public void afterPropertiesSet() throws IOException {
+		InetSocketAddress address = (this.hostname != null ? new InetSocketAddress(this.hostname, this.port)
+				: new InetSocketAddress(this.port));
+		this.server = HttpServer.create(address, this.backlog);
+		if (this.executor != null) {
+			this.server.setExecutor(this.executor);
+		}
+		if (this.contexts != null) {
+			this.contexts.forEach((key, context) -> {
+				HttpContext httpContext = this.server.createContext(key, context);
+				if (this.filters != null) {
+					httpContext.getFilters().addAll(this.filters);
+				}
+				if (this.authenticator != null) {
+					httpContext.setAuthenticator(this.authenticator);
+				}
+			});
+		}
+		if (this.logger.isInfoEnabled()) {
+			this.logger.info("Starting HttpServer at address " + address);
+		}
+		this.server.start();
+	}
+
+	@Override
+	public HttpServer getObject() {
+		return this.server;
+	}
+
+	@Override
+	public Class<? extends HttpServer> getObjectType() {
+		return (this.server != null ? this.server.getClass() : HttpServer.class);
+	}
+
+	@Override
+	public boolean isSingleton() {
+		return true;
+	}
+
+	@Override
+	public void destroy() {
+		this.logger.info("Stopping HttpServer");
+		this.server.stop(this.shutdownDelay);
+	}
+
+}

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

@@ -0,0 +1,127 @@
+/*
+ * 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 java.io.IOException;
+
+import org.apache.hc.client5.http.classic.methods.HttpGet;
+import org.apache.hc.client5.http.classic.methods.HttpPost;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.core5.http.ClassicHttpRequest;
+import org.apache.hc.core5.http.ClassicHttpResponse;
+import org.apache.hc.core5.http.ContentType;
+import org.apache.hc.core5.http.HttpHeaders;
+import org.apache.hc.core5.http.io.HttpClientResponseHandler;
+import org.apache.hc.core5.http.io.entity.InputStreamEntity;
+import org.assertj.core.api.ThrowingConsumer;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.ws.transport.TransportConstants;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@ExtendWith(SpringExtension.class)
+@ContextConfiguration("httpserver-applicationContext.xml")
+public class WebServiceHttpHandlerIntegrationTest {
+
+	@Autowired
+	private int port;
+
+	@Test
+	public void testInvalidMethod() {
+		HttpGet httpRequest = new HttpGet(serviceUrl());
+		execute(httpRequest, response -> {
+			assertThat(response.getCode()).isEqualTo(HttpTransportConstants.STATUS_METHOD_NOT_ALLOWED);
+			assertThat(response.containsHeader(HttpHeaders.CONTENT_LENGTH)).isTrue();
+			assertThat(response.getHeader(HttpHeaders.CONTENT_LENGTH).getValue()).isEqualTo("0");
+		});
+	}
+
+	@Test
+	public void testNoResponse() throws IOException {
+		HttpPost httpRequest = new HttpPost(serviceUrl());
+		httpRequest.addHeader(TransportConstants.HEADER_SOAP_ACTION, "http://springframework.org/spring-ws/NoResponse");
+		Resource soapRequest = new ClassPathResource("soapRequest.xml", WebServiceHttpHandlerIntegrationTest.class);
+		httpRequest.setEntity(new InputStreamEntity(soapRequest.getInputStream(), ContentType.TEXT_XML));
+		execute(httpRequest, response -> {
+			assertThat(response.getCode()).isEqualTo(HttpTransportConstants.STATUS_ACCEPTED);
+			assertThat(response.containsHeader(HttpHeaders.CONTENT_LENGTH)).isTrue();
+			assertThat(response.getHeader(HttpHeaders.CONTENT_LENGTH).getValue()).isEqualTo("0");
+		});
+	}
+
+	@Test
+	public void testResponse() throws IOException {
+		HttpPost httpRequest = new HttpPost(serviceUrl());
+		httpRequest.addHeader(TransportConstants.HEADER_SOAP_ACTION, "http://springframework.org/spring-ws/Response");
+		Resource soapRequest = new ClassPathResource("soapRequest.xml", WebServiceHttpHandlerIntegrationTest.class);
+		httpRequest.setEntity(new InputStreamEntity(soapRequest.getInputStream(), ContentType.TEXT_XML));
+		execute(httpRequest, response -> {
+			assertThat(response.getCode()).isEqualTo(HttpTransportConstants.STATUS_OK);
+			assertThat(response.containsHeader(HttpHeaders.CONTENT_LENGTH)).isTrue();
+			assertThat(response.getHeader(HttpHeaders.CONTENT_LENGTH).getValue()).asInt().isGreaterThan(0);
+		});
+	}
+
+	@Test
+	public void testNoEndpoint() throws IOException {
+		HttpPost httpRequest = new HttpPost(serviceUrl());
+		httpRequest.addHeader(TransportConstants.HEADER_SOAP_ACTION, "http://springframework.org/spring-ws/NoEndpoint");
+		Resource soapRequest = new ClassPathResource("soapRequest.xml", WebServiceHttpHandlerIntegrationTest.class);
+		httpRequest.setEntity(new InputStreamEntity(soapRequest.getInputStream(), ContentType.TEXT_XML));
+		execute(httpRequest, response -> {
+			assertThat(response.getCode()).isEqualTo(HttpTransportConstants.STATUS_NOT_FOUND);
+			assertThat(response.containsHeader(HttpHeaders.CONTENT_LENGTH)).isTrue();
+			assertThat(response.getHeader(HttpHeaders.CONTENT_LENGTH).getValue()).isEqualTo("0");
+		});
+	}
+
+	@Test
+	public void testFault() throws IOException {
+		HttpPost httpRequest = new HttpPost(serviceUrl());
+		httpRequest.addHeader(TransportConstants.HEADER_SOAP_ACTION, "http://springframework.org/spring-ws/Fault");
+		Resource soapRequest = new ClassPathResource("soapRequest.xml", WebServiceHttpHandlerIntegrationTest.class);
+		httpRequest.setEntity(new InputStreamEntity(soapRequest.getInputStream(), ContentType.TEXT_XML));
+		execute(httpRequest, response -> assertThat(response.getCode())
+			.isEqualTo(HttpTransportConstants.STATUS_INTERNAL_SERVER_ERROR));
+	}
+
+	private String serviceUrl() {
+		return "http://localhost:%s/service".formatted(this.port);
+	}
+
+	private void execute(ClassicHttpRequest request, ThrowingConsumer<ClassicHttpResponse> responseHandler) {
+		try (CloseableHttpClient httpclient = HttpClients.createDefault()) {
+			HttpClientResponseHandler<Object> rh = httpResponse -> {
+				responseHandler.accept(httpResponse);
+				return null;
+			};
+			httpclient.execute(request, rh);
+		}
+		catch (IOException ex) {
+			throw new IllegalStateException(ex);
+		}
+	}
+
+}

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

@@ -0,0 +1,104 @@
+/*
+ * 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.test;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+import java.util.Random;
+
+import org.springframework.util.Assert;
+
+/**
+ * Utility class that finds free BSD ports for use in testing scenario's.
+ *
+ * @author Ben Hale
+ * @author Arjen Poutsma
+ */
+public abstract class FreePortScanner {
+
+	private static final int MIN_SAFE_PORT = 1024;
+
+	private static final int MAX_PORT = 65535;
+
+	private static final Random random = new Random();
+
+	/**
+	 * Returns the number of a free port in the default range.
+	 */
+	public static int getFreePort() {
+		return getFreePort(MIN_SAFE_PORT, MAX_PORT);
+	}
+
+	/**
+	 * Returns the number of a free port in the given range.
+	 */
+	public static int getFreePort(int minPort, int maxPort) {
+
+		Assert.isTrue(minPort > 0, "'minPort' must be larger than 0");
+		Assert.isTrue(maxPort > minPort, "'maxPort' must be larger than minPort");
+
+		int portRange = maxPort - minPort;
+		int candidatePort;
+		int searchCounter = 0;
+
+		do {
+			if (++searchCounter > portRange) {
+				throw new IllegalStateException(
+						String.format("There were no ports available in the range %d to %d", minPort, maxPort));
+			}
+			candidatePort = getRandomPort(minPort, portRange);
+		}
+		while (!isPortAvailable(candidatePort));
+
+		return candidatePort;
+	}
+
+	private static int getRandomPort(int minPort, int portRange) {
+		return minPort + random.nextInt(portRange);
+	}
+
+	private static boolean isPortAvailable(int port) {
+
+		ServerSocket serverSocket;
+
+		try {
+			serverSocket = new ServerSocket();
+		}
+		catch (IOException ex) {
+			throw new IllegalStateException("Unable to create ServerSocket.", ex);
+		}
+
+		try {
+			InetSocketAddress sa = new InetSocketAddress(port);
+			serverSocket.bind(sa);
+			return true;
+		}
+		catch (IOException ex) {
+			return false;
+		}
+		finally {
+			try {
+				serverSocket.close();
+			}
+			catch (IOException ex) {
+				// ignore
+			}
+		}
+	}
+
+}

spring-ws-core/src/test/resources/org/springframework/ws/transport/http/httpserver-applicationContext.xml

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+
+	<bean id="port"
+		  class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+		<property name="targetClass"
+				  value="org.springframework.ws.transport.http.test.FreePortScanner"/>
+		<property name="targetMethod" value="getFreePort"/>
+	</bean>
+
+	<bean id="httpServer"
+		  class="org.springframework.ws.transport.http.SimpleHttpServerFactoryBean">
+		<property name="port" ref="port"/>
+		<property name="contexts">
+			<map>
+				<entry key="/service" value-ref="webServiceHandler"/>
+			</map>
+		</property>
+	</bean>
+
+	<bean id="webServiceHandler"
+		  class="org.springframework.ws.transport.http.WebServiceMessageReceiverHttpHandler">
+		<property name="chunkedEncoding" value="true"/>
+		<property name="messageFactory" ref="messageFactory"/>
+		<property name="messageReceiver" ref="messageDispatcher"/>
+	</bean>
+
+	<bean id="messageFactory"
+		  class="org.springframework.ws.soap.saaj.SaajSoapMessageFactory"/>
+
+	<bean id="messageDispatcher"
+		  class="org.springframework.ws.soap.server.SoapMessageDispatcher">
+		<property name="endpointMappings" ref="payloadMapping"/>
+	</bean>
+
+	<bean id="payloadMapping"
+		  class="org.springframework.ws.soap.server.endpoint.mapping.SoapActionEndpointMapping">
+		<property name="mappings">
+			<props>
+				<prop key="http://springframework.org/spring-ws/NoResponse">
+					noResponseEndpoint
+				</prop>
+				<prop key="http://springframework.org/spring-ws/Response">
+					responseEndpoint
+				</prop>
+				<prop key="http://springframework.org/spring-ws/Fault">faultEndpoint
+				</prop>
+			</props>
+		</property>
+	</bean>
+
+	<bean id="noResponseEndpoint"
+		  class="org.springframework.ws.transport.http.NoResponseEndpoint"/>
+
+	<bean id="responseEndpoint"
+		  class="org.springframework.ws.transport.http.ResponseEndpoint"/>
+
+	<bean id="faultEndpoint"
+		  class="org.springframework.ws.transport.http.FaultEndpoint"/>
+
+
+</beans>