Spring/spring-ws
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing.

Browse Source 
Related: #1248.
This commit is contained in:
Greg L. Turnquist
2022-11-16 11:01:18 -06:00
parent bde18f52af
commit 67422e348d
10 changed files with 33 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java
View File

@@ -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;

8
spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxEventPayloadEndpoint.java
View File

@@ -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) {

23
spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractXomPayloadEndpoint.java
View File

@@ -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);
}
}

8
spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/StaxPayloadMethodArgumentResolver.java
View File

@@ -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) {

2
spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AddressingEndpointInterceptor.java
View File

@@ -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 {

11
spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajUtils.java
View File

@@ -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()));

23
spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderIntegrationTestCase.java
View File

@@ -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<T e
jettyServer.start();
try (FaultAwareWebServiceConnection connection = (FaultAwareWebServiceConnection) messageSender
.createConnection(connectionUri)){
connection.send(new SaajSoapMessage(createRequest()));
.createConnection(connectionUri)) {
SOAPMessage request = createRequest();
connection.send(new SaajSoapMessage(request));
connection.receive(messageFactory);
assertThat(connection.hasFault()).isTrue();
@@ -210,8 +207,9 @@ public abstract class AbstractHttpWebServiceMessageSenderIntegrationTestCase<T e
jettyServer.start();
try (FaultAwareWebServiceConnection connection = (FaultAwareWebServiceConnection) messageSender
.createConnection(connectionUri)){
connection.send(new SaajSoapMessage(createRequest()));
.createConnection(connectionUri)) {
SOAPMessage request = createRequest();
connection.send(new SaajSoapMessage(request));
SaajSoapMessage response = (SaajSoapMessage) connection.receive(messageFactory);
assertThat(response).isNotNull();
@@ -237,8 +235,9 @@ public abstract class AbstractHttpWebServiceMessageSenderIntegrationTestCase<T e
jettyServer.setHandler(jettyContext);
jettyServer.start();
try (WebServiceConnection connection = messageSender.createConnection(connectionUri)){
connection.send(new SaajSoapMessage(createRequest()));
try (WebServiceConnection connection = messageSender.createConnection(connectionUri)) {
SOAPMessage request = createRequest();
connection.send(new SaajSoapMessage(request));
WebServiceMessage response = connection.receive(messageFactory);
assertThat(response).isNull();

10
spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/Wsdl4jDefinitionTest.java
View File

@@ -16,7 +16,7 @@
package org.springframework.ws.wsdl.wsdl11;
import static org.assertj.core.api.Assertions.*;
import static org.assertj.core.api.Assertions.assertThat;
import java.io.InputStream;
@@ -37,19 +37,19 @@ import org.w3c.dom.Document;
import org.xml.sax.InputSource;
import org.xmlunit.assertj.XmlAssert;
class Wsdl4jDefinitionTest {
public class Wsdl4jDefinitionTest {
private Wsdl4jDefinition definition;
private Transformer transformer;
@BeforeEach
void setUp() throws Exception {
public void setUp() throws Exception {
WSDLFactory factory = WSDLFactory.newInstance();
WSDLReader reader = factory.newWSDLReader();
try (InputStream is = getClass().getResourceAsStream("complete.wsdl")){
try (InputStream is = getClass().getResourceAsStream("complete.wsdl")) {
Definition wsdl4jDefinition = reader.readWSDL(null, new InputSource(is));
definition = new Wsdl4jDefinition(wsdl4jDefinition);
}
@@ -58,7 +58,7 @@ class Wsdl4jDefinitionTest {
}
@Test
void testGetSource() throws Exception {
public void testGetSource() throws Exception {
Source source = definition.getSource();

6
spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/KeyStoreCallbackHandler.java
View File

@@ -17,11 +17,7 @@
package org.springframework.ws.soap.security.wss4j2.callback;
import java.io.IOException;
import java.security.Key;
import java.security.KeyStore;
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
import java.security.UnrecoverableKeyException;
import java.security.*;
import javax.security.auth.callback.UnsupportedCallbackException;

7
spring-ws-support/src/main/java/org/springframework/ws/transport/http/HttpsUrlConnectionMessageSender.java
View File

@@ -23,12 +23,7 @@ import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
import java.security.SecureRandom;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.KeyManager;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManager;
import javax.net.ssl.*;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.util.Assert;