From 67422e348d9490d2d725614ff3e8dd62470393e7 Mon Sep 17 00:00:00 2001 From: "Greg L. Turnquist" Date: Wed, 16 Nov 2022 11:01:18 -0600 Subject: [PATCH] Polishing. Related: #1248. --- .../ws/client/core/WebServiceTemplate.java | 6 +---- .../AbstractStaxEventPayloadEndpoint.java | 8 ++----- .../endpoint/AbstractXomPayloadEndpoint.java | 23 ++++--------------- .../StaxPayloadMethodArgumentResolver.java | 8 +++---- .../server/AddressingEndpointInterceptor.java | 2 +- .../ws/soap/saaj/support/SaajUtils.java | 11 ++------- ...rviceMessageSenderIntegrationTestCase.java | 23 +++++++++---------- .../ws/wsdl/wsdl11/Wsdl4jDefinitionTest.java | 10 ++++---- .../callback/KeyStoreCallbackHandler.java | 6 +---- .../http/HttpsUrlConnectionMessageSender.java | 7 +----- 10 files changed, 33 insertions(+), 71 deletions(-) diff --git a/spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java b/spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java index b8c7214b..96c8d198 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java @@ -21,11 +21,7 @@ import java.io.IOException; import java.net.URI; import java.util.List; -import javax.xml.transform.Result; -import javax.xml.transform.Source; -import javax.xml.transform.Transformer; -import javax.xml.transform.TransformerConfigurationException; -import javax.xml.transform.TransformerException; +import javax.xml.transform.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxEventPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxEventPayloadEndpoint.java index 0f789353..21b11746 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxEventPayloadEndpoint.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxEventPayloadEndpoint.java @@ -20,11 +20,7 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import javax.xml.namespace.NamespaceContext; -import javax.xml.stream.XMLEventFactory; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.XMLEventWriter; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamReader; +import javax.xml.stream.*; import javax.xml.stream.events.XMLEvent; import javax.xml.stream.util.XMLEventConsumer; import javax.xml.transform.Result; @@ -103,7 +99,7 @@ public abstract class AbstractStaxEventPayloadEndpoint extends AbstractStaxPaylo try { eventReader = getInputFactory().createXMLEventReader(source); } catch (XMLStreamException | UnsupportedOperationException ex) { - // ignore + eventReader = null; } } if (eventReader == null) { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractXomPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractXomPayloadEndpoint.java index 82507574..740a6336 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractXomPayloadEndpoint.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractXomPayloadEndpoint.java @@ -16,23 +16,10 @@ package org.springframework.ws.server.endpoint; -import nu.xom.Attribute; -import nu.xom.Builder; -import nu.xom.Document; -import nu.xom.Element; -import nu.xom.NodeFactory; -import nu.xom.ParentNode; -import nu.xom.ParsingException; -import nu.xom.Serializer; -import nu.xom.ValidityException; +import nu.xom.*; import nu.xom.converters.DOMConverter; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.Reader; +import java.io.*; import java.util.Locale; import javax.xml.stream.XMLEventReader; @@ -133,7 +120,7 @@ public abstract class AbstractXomPayloadEndpoint extends TransformerObjectSuppor } @Override - public void saxSource(XMLReader reader, InputSource inputSource) throws IOException, SAXException, ParsingException { + public void saxSource(XMLReader reader, InputSource inputSource) throws IOException, SAXException { try { Builder builder = new Builder(reader); Document document; @@ -146,8 +133,8 @@ public abstract class AbstractXomPayloadEndpoint extends TransformerObjectSuppor "InputSource in SAXSource contains neither byte stream nor character stream"); } element = document.getRootElement(); - } catch (ValidityException ex) { - throw new XomParsingException(ex); + } catch (ParsingException e) { + throw new XomParsingException(e); } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/StaxPayloadMethodArgumentResolver.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/StaxPayloadMethodArgumentResolver.java index b89522e7..e8779768 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/StaxPayloadMethodArgumentResolver.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/StaxPayloadMethodArgumentResolver.java @@ -81,7 +81,7 @@ public class StaxPayloadMethodArgumentResolver extends TransformerObjectSupport try { streamReader = StaxUtils.createEventStreamReader(eventReader); } catch (XMLStreamException ex) { - // ignore + streamReader = null; } } } @@ -90,7 +90,7 @@ public class StaxPayloadMethodArgumentResolver extends TransformerObjectSupport try { streamReader = inputFactory.createXMLStreamReader(requestSource); } catch (XMLStreamException | UnsupportedOperationException ex) { - // ignore + streamReader = null; } } if (streamReader == null) { @@ -111,7 +111,7 @@ public class StaxPayloadMethodArgumentResolver extends TransformerObjectSupport try { eventReader = inputFactory.createXMLEventReader(streamReader); } catch (XMLStreamException ex) { - // ignore + eventReader = null; } } @@ -121,7 +121,7 @@ public class StaxPayloadMethodArgumentResolver extends TransformerObjectSupport try { eventReader = inputFactory.createXMLEventReader(requestSource); } catch (XMLStreamException | UnsupportedOperationException ex) { - // ignore + eventReader = null; } } if (eventReader == null) { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AddressingEndpointInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AddressingEndpointInterceptor.java index 6443add1..b99879d9 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AddressingEndpointInterceptor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AddressingEndpointInterceptor.java @@ -147,7 +147,7 @@ class AddressingEndpointInterceptor implements SoapEndpointInterceptor { for (WebServiceMessageSender messageSender : messageSenders) { if (messageSender.supports(replyEpr.getAddress())) { supported = true; - try (WebServiceConnection connection = messageSender.createConnection(replyEpr.getAddress())){ + try (WebServiceConnection connection = messageSender.createConnection(replyEpr.getAddress())) { connection.send(messageContext.getResponse()); break; } finally { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajUtils.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajUtils.java index 97a89ffb..de0de8d5 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajUtils.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajUtils.java @@ -16,14 +16,7 @@ package org.springframework.ws.soap.saaj.support; -import jakarta.xml.soap.MessageFactory; -import jakarta.xml.soap.MimeHeaders; -import jakarta.xml.soap.Name; -import jakarta.xml.soap.SOAPBody; -import jakarta.xml.soap.SOAPElement; -import jakarta.xml.soap.SOAPEnvelope; -import jakarta.xml.soap.SOAPException; -import jakarta.xml.soap.SOAPMessage; +import jakarta.xml.soap.*; import java.io.IOException; import java.io.InputStream; @@ -174,7 +167,7 @@ public abstract class SaajUtils { */ public static SOAPMessage loadMessage(Resource resource, MessageFactory messageFactory) throws SOAPException, IOException { - try (InputStream is = resource.getInputStream()){ + try (InputStream is = resource.getInputStream()) { MimeHeaders mimeHeaders = new MimeHeaders(); mimeHeaders.addHeader(TransportConstants.HEADER_CONTENT_TYPE, "text/xml"); mimeHeaders.addHeader(TransportConstants.HEADER_CONTENT_LENGTH, Long.toString(resource.getFile().length())); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderIntegrationTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderIntegrationTestCase.java index 99b3d414..ae8ed826 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderIntegrationTestCase.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderIntegrationTestCase.java @@ -16,18 +16,14 @@ package org.springframework.ws.transport.http; -import static org.assertj.core.api.Assertions.*; +import static org.assertj.core.api.Assertions.assertThat; import jakarta.servlet.Servlet; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import jakarta.xml.soap.MessageFactory; -import jakarta.xml.soap.MimeHeaders; -import jakarta.xml.soap.SOAPConstants; -import jakarta.xml.soap.SOAPException; -import jakarta.xml.soap.SOAPMessage; +import jakarta.xml.soap.*; import java.io.OutputStream; import java.net.URI; @@ -195,8 +191,9 @@ public abstract class AbstractHttpWebServiceMessageSenderIntegrationTestCase