Adapt to deprecation

spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/XPathParam.java

@@ -35,7 +35,7 @@
  * </ul>
  *
  * @author Arjen Poutsma
- * @see org.springframework.ws.server.endpoint.adapter.XPathParamAnnotationMethodEndpointAdapter
+ * @see org.springframework.ws.server.endpoint.adapter.method.XPathParamMethodArgumentResolver
  * @since 1.0.0
  */
 @Target(ElementType.PARAMETER)

spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptor.java

@@ -19,6 +19,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 
+import javax.xml.parsers.SAXParserFactory;
 import javax.xml.transform.Source;
 import javax.xml.transform.Templates;
 import javax.xml.transform.Transformer;
@@ -30,7 +31,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.core.io.Resource;
@@ -139,7 +139,9 @@ public void afterPropertiesSet() throws Exception {
 			throw new IllegalArgumentException("Setting either 'requestXslt' or 'responseXslt' is required");
 		}
 		TransformerFactory transformerFactory = getTransformerFactory();
-		XMLReader xmlReader = XMLReaderFactory.createXMLReader();
+		SAXParserFactory parserFactory = SAXParserFactory.newInstance();
+		parserFactory.setNamespaceAware(true);
+		XMLReader xmlReader = parserFactory.newSAXParser().getXMLReader();
 		xmlReader.setFeature("http://xml.org/sax/features/namespace-prefixes", true);
 		if (requestXslt != null) {
 			Assert.isTrue(requestXslt.exists(), "requestXslt \"" + requestXslt + "\" does not exit");

spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/jaxb/XmlRootElementEndpointMapping.java

@@ -16,6 +16,7 @@
 
 package org.springframework.ws.server.endpoint.mapping.jaxb;
 
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
 import javax.xml.namespace.QName;
@@ -86,13 +87,13 @@ protected QName getLookupKeyForMethod(Method method) {
 
 	private QName handleRootElement(Class<?> parameterType) {
 		try {
-			Object param = parameterType.newInstance();
+			Object param = parameterType.getDeclaredConstructor().newInstance();
 			QName result = getElementName(parameterType, param);
 			if (result != null) {
 				return result;
 			}
 		}
-		catch (InstantiationException | IllegalAccessException e) {
+		catch (InvocationTargetException | NoSuchMethodException | InstantiationException | IllegalAccessException e) {
 			// ignore
 		}
 		return null;

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

@@ -323,6 +323,7 @@ protected void onRefresh(ApplicationContext context) {
 	}
 
 	@Override
+	@SuppressWarnings("deprecation")
 	protected long getLastModified(HttpServletRequest httpServletRequest) {
 		WsdlDefinition definition = getWsdlDefinition(httpServletRequest);
 		if (definition != null) {

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

@@ -49,6 +49,7 @@ public class WebServiceMessageReceiverHandlerAdapter extends WebServiceMessageRe
 		implements HandlerAdapter {
 
 	@Override
+	@Deprecated
 	public long getLastModified(HttpServletRequest request, Object handler) {
 		return -1L;
 	}

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

@@ -140,6 +140,7 @@ public void setTransformSchemaLocations(boolean transformSchemaLocations) {
 	}
 
 	@Override
+	@Deprecated
 	public long getLastModified(HttpServletRequest request, Object handler) {
 		Source definitionSource = ((WsdlDefinition) handler).getSource();
 		return LastModifiedHelper.getLastModified(definitionSource);

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

@@ -88,6 +88,7 @@ public void setTransformSchemaLocations(boolean transformSchemaLocations) {
 	}
 
 	@Override
+	@Deprecated
 	public long getLastModified(HttpServletRequest request, Object handler) {
 		Source schemaSource = ((XsdSchema) handler).getSource();
 		return LastModifiedHelper.getLastModified(schemaSource);

spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/SimpleWsdl11Definition.java

@@ -18,11 +18,12 @@
 
 import java.io.IOException;
 
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParserFactory;
 import javax.xml.transform.Source;
 
 import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.core.io.Resource;
@@ -72,11 +73,13 @@ public void afterPropertiesSet() throws Exception {
 	@Override
 	public Source getSource() {
 		try {
-			XMLReader xmlReader = XMLReaderFactory.createXMLReader();
+			SAXParserFactory parserFactory = SAXParserFactory.newInstance();
+			parserFactory.setNamespaceAware(true);
+			XMLReader xmlReader = parserFactory.newSAXParser().getXMLReader();
 			xmlReader.setFeature("http://xml.org/sax/features/namespace-prefixes", true);
 			return new ResourceSource(xmlReader, wsdlResource);
 		}
-		catch (SAXException ex) {
+		catch (SAXException | ParserConfigurationException ex) {
 			throw new WsdlDefinitionException("Could not create XMLReader", ex);
 		}
 		catch (IOException ex) {

spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTest.java

@@ -26,6 +26,7 @@
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.SAXParserFactory;
 import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLEventWriter;
 import javax.xml.stream.XMLInputFactory;
@@ -48,7 +49,6 @@
 import org.xml.sax.InputSource;
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.DefaultHandler;
-import org.xml.sax.helpers.XMLReaderFactory;
 
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
@@ -187,8 +187,9 @@ public void testStreamReaderPayload() throws Exception {
 	}
 
 	private void validateMessage() throws Exception {
-
-		XMLReader xmlReader = XMLReaderFactory.createXMLReader();
+		SAXParserFactory parserFactory = SAXParserFactory.newInstance();
+		parserFactory.setNamespaceAware(true);
+		XMLReader xmlReader = parserFactory.newSAXParser().getXMLReader();
 		xmlReader.setContentHandler(new DefaultHandler());
 		ByteArrayOutputStream os = new ByteArrayOutputStream();
 		webServiceMessage.writeTo(os);

spring-ws-core/src/test/java/org/springframework/ws/config/WebServiceNamespaceHandlerTest.java

@@ -27,6 +27,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+@Deprecated
 public class WebServiceNamespaceHandlerTest {
 
 	private ApplicationContext applicationContext;

spring-ws-core/src/test/java/org/springframework/ws/config/WebServicesNamespaceHandlerTigerTest.java

@@ -28,6 +28,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+@Deprecated
 public class WebServicesNamespaceHandlerTigerTest {
 
 	private ApplicationContext applicationContext;

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractEndpointTest.java

@@ -24,6 +24,7 @@
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.SAXParserFactory;
 import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamReader;
@@ -36,7 +37,6 @@
 import org.w3c.dom.Document;
 import org.xml.sax.InputSource;
 import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
 
 import org.springframework.util.xml.StaxUtils;
 import org.springframework.xml.DocumentBuilderFactoryUtils;
@@ -67,8 +67,9 @@ public void testDomSource() throws Exception {
 
 	@Test
 	public void testSaxSource() throws Exception {
-
-		XMLReader reader = XMLReaderFactory.createXMLReader();
+		SAXParserFactory parserFactory = SAXParserFactory.newInstance();
+		parserFactory.setNamespaceAware(true);
+		XMLReader reader = parserFactory.newSAXParser().getXMLReader();
 		InputSource inputSource = new InputSource(new StringReader(REQUEST));
 		testSource(new SAXSource(reader, inputSource));
 	}

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/Dom4jPayloadEndpointTest.java

@@ -16,11 +16,12 @@
 
 package org.springframework.ws.server.endpoint;
 
-import static org.assertj.core.api.Assertions.*;
-
 import org.dom4j.Document;
 import org.dom4j.Element;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
+@Deprecated
 public class Dom4jPayloadEndpointTest extends AbstractPayloadEndpointTest {
 
 	@Override

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/DomPayloadEndpointTest.java

@@ -21,6 +21,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+@Deprecated
 public class DomPayloadEndpointTest extends AbstractPayloadEndpointTest {
 
 	@Override

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/JDomPayloadEndpointTest.java

@@ -21,6 +21,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+@Deprecated
 public class JDomPayloadEndpointTest extends AbstractPayloadEndpointTest {
 
 	@Override

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MarshallingPayloadEndpointTest.java

@@ -55,6 +55,7 @@
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
 
+@Deprecated
 public class MarshallingPayloadEndpointTest {
 
 	private Transformer transformer;

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/SaxPayloadEndpointTest.java

@@ -27,6 +27,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
+@Deprecated
 public class SaxPayloadEndpointTest extends AbstractPayloadEndpointTest {
 
 	@Override

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/StaxEventPayloadEndpointTest.java

@@ -33,7 +33,7 @@
  *
  * @see AbstractStaxEventPayloadEndpoint
  */
-@SuppressWarnings("Since15")
+@Deprecated
 public class StaxEventPayloadEndpointTest extends AbstractMessageEndpointTest {
 
 	@Override

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/StaxStreamPayloadEndpointTest.java

@@ -16,32 +16,32 @@
 
 package org.springframework.ws.server.endpoint;
 
-import static org.assertj.core.api.Assertions.*;
-
-import jakarta.xml.soap.MessageFactory;
-
 import javax.xml.stream.XMLOutputFactory;
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
 import javax.xml.transform.Transformer;
 
+import jakarta.xml.soap.MessageFactory;
 import org.junit.jupiter.api.Test;
+import org.xmlunit.assertj.XmlAssert;
+
 import org.springframework.ws.context.DefaultMessageContext;
 import org.springframework.ws.context.MessageContext;
 import org.springframework.ws.soap.saaj.SaajSoapMessage;
 import org.springframework.ws.soap.saaj.SaajSoapMessageFactory;
 import org.springframework.xml.transform.StringResult;
 import org.springframework.xml.transform.StringSource;
 import org.springframework.xml.transform.TransformerFactoryUtils;
-import org.xmlunit.assertj.XmlAssert;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Test case for AbstractStaxStreamPayloadEndpoint.
  *
  * @see AbstractStaxStreamPayloadEndpoint
  */
-@SuppressWarnings("Since15")
+@Deprecated
 public class StaxStreamPayloadEndpointTest extends AbstractMessageEndpointTest {
 
 	@Override

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/XomPayloadEndpointTest.java

@@ -16,10 +16,11 @@
 
 package org.springframework.ws.server.endpoint;
 
-import static org.assertj.core.api.Assertions.*;
-
 import nu.xom.Element;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
+@Deprecated
 public class XomPayloadEndpointTest extends AbstractPayloadEndpointTest {
 
 	@Override

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapterTest.java

@@ -41,6 +41,7 @@
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
 
+@Deprecated
 public class GenericMarshallingMethodEndpointAdapterTest {
 
 	private GenericMarshallingMethodEndpointAdapter adapter;

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapterTest.java

@@ -39,6 +39,7 @@
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
 
+@Deprecated
 public class MarshallingMethodEndpointAdapterTest {
 
 	private MarshallingMethodEndpointAdapter adapter;

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageMethodEndpointAdapterTest.java

@@ -26,6 +26,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+@Deprecated
 public class MessageMethodEndpointAdapterTest {
 
 	private MessageMethodEndpointAdapter adapter;

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadMethodEndpointAdapterTest.java

@@ -32,6 +32,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+@Deprecated
 public class PayloadMethodEndpointAdapterTest {
 
 	private PayloadMethodEndpointAdapter adapter;

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapterTest.java

@@ -48,6 +48,7 @@
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
 
+@Deprecated
 public class XPathParamAnnotationMethodEndpointAdapterTest {
 
 	private static final String CONTENTS = "<root><child><text>text</text><number>42.0</number></child></root>";

spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/FaultCreatingValidatingMarshallingPayloadEndpointTest.java

@@ -46,6 +46,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
+@Deprecated
 public class FaultCreatingValidatingMarshallingPayloadEndpointTest {
 
 	private MessageContext messageContext;

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

@@ -22,7 +22,7 @@
 import java.util.Random;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.io.input.CountingInputStream;
+import org.apache.commons.io.input.BoundedInputStream;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 
@@ -46,11 +46,11 @@ public class AbstractHttpSenderConnectionTest {
 	 * enabled.
 	 */
 	private void testSupportsStreaming(boolean chunking) throws Exception {
-
 		byte[] content = new byte[16 * 1024];
 		new Random().nextBytes(content);
-		CountingInputStream rawInputStream = new CountingInputStream(new ByteArrayInputStream(content));
-
+		BoundedInputStream rawInputStream = BoundedInputStream.builder()
+			.setInputStream(new ByteArrayInputStream(content))
+			.get();
 		AbstractHttpSenderConnection connection = spy(AbstractHttpSenderConnection.class);
 		when(connection.getResponseCode()).thenReturn(200);
 		// Simulate response with chunking enabled

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

@@ -39,6 +39,7 @@
 import org.springframework.ws.transport.WebServiceConnection;
 import org.springframework.ws.transport.support.FreePortScanner;
 
+@Deprecated
 public class CommonsHttpMessageSenderIntegrationTest
 		extends AbstractHttpWebServiceMessageSenderIntegrationTest<CommonsHttpMessageSender> {
 
@@ -52,7 +53,7 @@ public void testMaxConnections() throws URIException {
 
 		CommonsHttpMessageSender messageSender = new CommonsHttpMessageSender();
 		messageSender.setMaxTotalConnections(2);
-		Map<String, String> maxConnectionsPerHost = new HashMap<String, String>();
+		Map<String, String> maxConnectionsPerHost = new HashMap<>();
 		maxConnectionsPerHost.put("https://www.example.com", "1");
 		maxConnectionsPerHost.put("http://www.example.com:8080", "7");
 		maxConnectionsPerHost.put("www.springframework.org", "10");

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

@@ -45,6 +45,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+@SuppressWarnings("deprecation")
 public class HttpComponentsMessageSenderIntegrationTest
 		extends AbstractHttpWebServiceMessageSenderIntegrationTest<HttpComponentsMessageSender> {