Skip to content

Commit e167639

Browse files
gregturngregturn
committed
Polishing.
Related: #1248.
1 parent fbc0fe4 commit e167639

File tree

10 files changed

+33
-71
lines changed

10 files changed

+33
-71
lines changed

‎spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,7 @@
2121
import java.net.URI;
2222
import java.util.List;
2323

24-
import javax.xml.transform.Result;
25-
import javax.xml.transform.Source;
26-
import javax.xml.transform.Transformer;
27-
import javax.xml.transform.TransformerConfigurationException;
28-
import javax.xml.transform.TransformerException;
24+
import javax.xml.transform.*;
2925

3026
import org.apache.commons.logging.Log;
3127
import org.apache.commons.logging.LogFactory;

‎spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxEventPayloadEndpoint.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@
2020
import java.io.ByteArrayOutputStream;
2121

2222
import javax.xml.namespace.NamespaceContext;
23-
import javax.xml.stream.XMLEventFactory;
24-
import javax.xml.stream.XMLEventReader;
25-
import javax.xml.stream.XMLEventWriter;
26-
import javax.xml.stream.XMLStreamException;
27-
import javax.xml.stream.XMLStreamReader;
23+
import javax.xml.stream.*;
2824
import javax.xml.stream.events.XMLEvent;
2925
import javax.xml.stream.util.XMLEventConsumer;
3026
import javax.xml.transform.Result;
@@ -103,7 +99,7 @@ private XMLEventReader getEventReader(Source source) throws XMLStreamException,
10399
try {
104100
eventReader = getInputFactory().createXMLEventReader(source);
105101
} catch (XMLStreamException | UnsupportedOperationException ex) {
106-
// ignore
102+
eventReader = null;
107103
}
108104
}
109105
if (eventReader == null) {

‎spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractXomPayloadEndpoint.java

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,10 @@
1616

1717
package org.springframework.ws.server.endpoint;
1818

19-
import nu.xom.Attribute;
20-
import nu.xom.Builder;
21-
import nu.xom.Document;
22-
import nu.xom.Element;
23-
import nu.xom.NodeFactory;
24-
import nu.xom.ParentNode;
25-
import nu.xom.ParsingException;
26-
import nu.xom.Serializer;
27-
import nu.xom.ValidityException;
19+
import nu.xom.*;
2820
import nu.xom.converters.DOMConverter;
2921

30-
import java.io.ByteArrayInputStream;
31-
import java.io.ByteArrayOutputStream;
32-
import java.io.IOException;
33-
import java.io.InputStream;
34-
import java.io.OutputStream;
35-
import java.io.Reader;
22+
import java.io.*;
3623
import java.util.Locale;
3724

3825
import javax.xml.stream.XMLEventReader;
@@ -133,7 +120,7 @@ public void domSource(Node node) {
133120
}
134121

135122
@Override
136-
public void saxSource(XMLReader reader, InputSource inputSource) throws IOException, SAXException, ParsingException {
123+
public void saxSource(XMLReader reader, InputSource inputSource) throws IOException, SAXException {
137124
try {
138125
Builder builder = new Builder(reader);
139126
Document document;
@@ -146,8 +133,8 @@ public void saxSource(XMLReader reader, InputSource inputSource) throws IOExcept
146133
"InputSource in SAXSource contains neither byte stream nor character stream");
147134
}
148135
element = document.getRootElement();
149-
} catch (ValidityException ex) {
150-
throw new XomParsingException(ex);
136+
} catch (ParsingException e) {
137+
throw new XomParsingException(e);
151138
}
152139
}
153140

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ private XMLStreamReader resolveStreamReader(Source requestSource) throws Transfo
8181
try {
8282
streamReader = StaxUtils.createEventStreamReader(eventReader);
8383
} catch (XMLStreamException ex) {
84-
// ignore
84+
streamReader = null;
8585
}
8686
}
8787
}
@@ -90,7 +90,7 @@ private XMLStreamReader resolveStreamReader(Source requestSource) throws Transfo
9090
try {
9191
streamReader = inputFactory.createXMLStreamReader(requestSource);
9292
} catch (XMLStreamException | UnsupportedOperationException ex) {
93-
// ignore
93+
streamReader = null;
9494
}
9595
}
9696
if (streamReader == null) {
@@ -111,7 +111,7 @@ private XMLEventReader resolveEventReader(Source requestSource) throws Transform
111111
try {
112112
eventReader = inputFactory.createXMLEventReader(streamReader);
113113
} catch (XMLStreamException ex) {
114-
// ignore
114+
eventReader = null;
115115
}
116116
}
117117

@@ -121,7 +121,7 @@ private XMLEventReader resolveEventReader(Source requestSource) throws Transform
121121
try {
122122
eventReader = inputFactory.createXMLEventReader(requestSource);
123123
} catch (XMLStreamException | UnsupportedOperationException ex) {
124-
// ignore
124+
eventReader = null;
125125
}
126126
}
127127
if (eventReader == null) {

‎spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AddressingEndpointInterceptor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ private void sendOutOfBand(MessageContext messageContext, EndpointReference repl
147147
for (WebServiceMessageSender messageSender : messageSenders) {
148148
if (messageSender.supports(replyEpr.getAddress())) {
149149
supported = true;
150-
try (WebServiceConnection connection = messageSender.createConnection(replyEpr.getAddress())){
150+
try (WebServiceConnection connection = messageSender.createConnection(replyEpr.getAddress())) {
151151
connection.send(messageContext.getResponse());
152152
break;
153153
} finally {

‎spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajUtils.java

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,7 @@
2121
import java.util.Iterator;
2222

2323
import javax.xml.namespace.QName;
24-
import javax.xml.soap.MessageFactory;
25-
import javax.xml.soap.MimeHeaders;
26-
import javax.xml.soap.Name;
27-
import javax.xml.soap.SOAPBody;
28-
import javax.xml.soap.SOAPElement;
29-
import javax.xml.soap.SOAPEnvelope;
30-
import javax.xml.soap.SOAPException;
31-
import javax.xml.soap.SOAPMessage;
24+
import javax.xml.soap.*;
3225

3326
import org.springframework.core.io.Resource;
3427
import org.springframework.util.Assert;
@@ -173,7 +166,7 @@ public static QName toQName(Name name) {
173166
*/
174167
public static SOAPMessage loadMessage(Resource resource, MessageFactory messageFactory)
175168
throws SOAPException, IOException {
176-
try (InputStream is = resource.getInputStream()){
169+
try (InputStream is = resource.getInputStream()) {
177170
MimeHeaders mimeHeaders = new MimeHeaders();
178171
mimeHeaders.addHeader(TransportConstants.HEADER_CONTENT_TYPE, "text/xml");
179172
mimeHeaders.addHeader(TransportConstants.HEADER_CONTENT_LENGTH, Long.toString(resource.getFile().length()));

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

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package org.springframework.ws.transport.http;
1818

19-
import static org.assertj.core.api.Assertions.*;
19+
import static org.assertj.core.api.Assertions.assertThat;
2020

2121
import java.io.OutputStream;
2222
import java.net.URI;
@@ -28,11 +28,7 @@
2828
import javax.servlet.http.HttpServlet;
2929
import javax.servlet.http.HttpServletRequest;
3030
import javax.servlet.http.HttpServletResponse;
31-
import javax.xml.soap.MessageFactory;
32-
import javax.xml.soap.MimeHeaders;
33-
import javax.xml.soap.SOAPConstants;
34-
import javax.xml.soap.SOAPException;
35-
import javax.xml.soap.SOAPMessage;
31+
import javax.xml.soap.*;
3632
import javax.xml.transform.Transformer;
3733
import javax.xml.transform.TransformerException;
3834
import javax.xml.transform.TransformerFactory;
@@ -185,8 +181,9 @@ public void testSendAndReceiveFault() throws Exception {
185181
jettyServer.start();
186182

187183
try (FaultAwareWebServiceConnection connection = (FaultAwareWebServiceConnection) messageSender
188-
.createConnection(connectionUri)){
189-
connection.send(new SaajSoapMessage(createRequest()));
184+
.createConnection(connectionUri)) {
185+
SOAPMessage request = createRequest();
186+
connection.send(new SaajSoapMessage(request));
190187
connection.receive(messageFactory);
191188

192189
assertThat(connection.hasFault()).isTrue();
@@ -199,8 +196,9 @@ private void validateResponse(Servlet servlet) throws Exception {
199196
jettyServer.start();
200197

201198
try (FaultAwareWebServiceConnection connection = (FaultAwareWebServiceConnection) messageSender
202-
.createConnection(connectionUri)){
203-
connection.send(new SaajSoapMessage(createRequest()));
199+
.createConnection(connectionUri)) {
200+
SOAPMessage request = createRequest();
201+
connection.send(new SaajSoapMessage(request));
204202
SaajSoapMessage response = (SaajSoapMessage) connection.receive(messageFactory);
205203

206204
assertThat(response).isNotNull();
@@ -225,8 +223,9 @@ private void validateNonResponse(Servlet servlet) throws Exception {
225223
jettyContext.addServlet(new ServletHolder(servlet), "/");
226224
jettyServer.start();
227225

228-
try (WebServiceConnection connection = messageSender.createConnection(connectionUri)){
229-
connection.send(new SaajSoapMessage(createRequest()));
226+
try (WebServiceConnection connection = messageSender.createConnection(connectionUri)) {
227+
SOAPMessage request = createRequest();
228+
connection.send(new SaajSoapMessage(request));
230229
WebServiceMessage response = connection.receive(messageFactory);
231230

232231
assertThat(response).isNull();

‎spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/Wsdl4jDefinitionTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package org.springframework.ws.wsdl.wsdl11;
1818

19-
import static org.assertj.core.api.Assertions.*;
19+
import static org.assertj.core.api.Assertions.assertThat;
2020

2121
import java.io.InputStream;
2222

@@ -37,19 +37,19 @@
3737
import org.xml.sax.InputSource;
3838
import org.xmlunit.assertj.XmlAssert;
3939

40-
class Wsdl4jDefinitionTest {
40+
public class Wsdl4jDefinitionTest {
4141

4242
private Wsdl4jDefinition definition;
4343

4444
private Transformer transformer;
4545

4646
@BeforeEach
47-
void setUp() throws Exception {
47+
public void setUp() throws Exception {
4848

4949
WSDLFactory factory = WSDLFactory.newInstance();
5050
WSDLReader reader = factory.newWSDLReader();
5151

52-
try (InputStream is = getClass().getResourceAsStream("complete.wsdl")){
52+
try (InputStream is = getClass().getResourceAsStream("complete.wsdl")) {
5353
Definition wsdl4jDefinition = reader.readWSDL(null, new InputSource(is));
5454
definition = new Wsdl4jDefinition(wsdl4jDefinition);
5555
}
@@ -58,7 +58,7 @@ void setUp() throws Exception {
5858
}
5959

6060
@Test
61-
void testGetSource() throws Exception {
61+
public void testGetSource() throws Exception {
6262

6363
Source source = definition.getSource();
6464

‎spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/KeyStoreCallbackHandler.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,7 @@
1717
package org.springframework.ws.soap.security.wss4j2.callback;
1818

1919
import java.io.IOException;
20-
import java.security.Key;
21-
import java.security.KeyStore;
22-
import java.security.KeyStoreException;
23-
import java.security.NoSuchAlgorithmException;
24-
import java.security.UnrecoverableKeyException;
20+
import java.security.*;
2521

2622
import javax.security.auth.callback.UnsupportedCallbackException;
2723

‎spring-ws-support/src/main/java/org/springframework/ws/transport/http/HttpsUrlConnectionMessageSender.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,7 @@
2323
import java.security.NoSuchProviderException;
2424
import java.security.SecureRandom;
2525

26-
import javax.net.ssl.HostnameVerifier;
27-
import javax.net.ssl.HttpsURLConnection;
28-
import javax.net.ssl.KeyManager;
29-
import javax.net.ssl.SSLContext;
30-
import javax.net.ssl.SSLSocketFactory;
31-
import javax.net.ssl.TrustManager;
26+
import javax.net.ssl.*;
3227

3328
import org.springframework.beans.factory.InitializingBean;
3429
import org.springframework.util.Assert;

0 commit comments

Comments
 (0)