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

Collapse identical catch branches.

Browse Source 
Also take advantage of Java's try-with-resources feature.

Resolves #1248.
This commit is contained in:
hdulme
2022-04-30 14:46:25 +02:00
committed by Greg L. Turnquist
parent f347123170
commit fbc0fe4fd9
18 changed files with 36 additions and 98 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

@@ -611,11 +611,7 @@ public class WebServiceTemplate extends WebServiceAccessor implements WebService
} catch (TransformerException ex) {
triggerAfterCompletion(interceptorIndex, messageContext, ex);
throw new WebServiceTransformerException("Transformation error: " + ex.getMessage(), ex);
} catch (RuntimeException ex) {
// Trigger after-completion for thrown exception.
triggerAfterCompletion(interceptorIndex, messageContext, ex);
throw ex;
} catch (IOException ex) {
} catch (RuntimeException | IOException ex) {
// Trigger after-completion for thrown exception.
triggerAfterCompletion(interceptorIndex, messageContext, ex);
throw ex;

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

@@ -102,10 +102,8 @@ public abstract class AbstractStaxEventPayloadEndpoint extends AbstractStaxPaylo
if (eventReader == null) {
try {
eventReader = getInputFactory().createXMLEventReader(source);
} catch (XMLStreamException ex) {
eventReader = null;
} catch (UnsupportedOperationException ex) {
eventReader = null;
} catch (XMLStreamException | UnsupportedOperationException ex) {
// ignore
}
}
if (eventReader == null) {

6
spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxStreamPayloadEndpoint.java
View File

@@ -79,10 +79,8 @@ public abstract class AbstractStaxStreamPayloadEndpoint extends AbstractStaxPayl
if (streamReader == null) {
try {
streamReader = getInputFactory().createXMLStreamReader(source);
} catch (XMLStreamException ex) {
streamReader = null;
} catch (UnsupportedOperationException ex) {
streamReader = null;
} catch (XMLStreamException | UnsupportedOperationException ex) {
// ignore
}
}
if (streamReader == null) {

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

@@ -133,7 +133,7 @@ public abstract class AbstractXomPayloadEndpoint extends TransformerObjectSuppor
}
@Override
public void saxSource(XMLReader reader, InputSource inputSource) throws IOException, SAXException {
public void saxSource(XMLReader reader, InputSource inputSource) throws IOException, SAXException, ParsingException {
try {
Builder builder = new Builder(reader);
Document document;
@@ -148,8 +148,6 @@ public abstract class AbstractXomPayloadEndpoint extends TransformerObjectSuppor
element = document.getRootElement();
} catch (ValidityException ex) {
throw new XomParsingException(ex);
} catch (ParsingException ex) {
throw new XomParsingException(ex);
}
}

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

@@ -81,9 +81,7 @@ public class SourcePayloadMethodProcessor extends AbstractPayloadSourceMethodPro
XMLStreamReader streamReader;
try {
streamReader = inputFactory.createXMLStreamReader(requestPayload);
} catch (UnsupportedOperationException ignored) {
streamReader = null;
} catch (XMLStreamException ignored) {
} catch (UnsupportedOperationException | XMLStreamException ignored) {
streamReader = null;
}
if (streamReader == null) {

16
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) {
streamReader = null;
// ignore
}
}
}
@@ -89,10 +89,8 @@ public class StaxPayloadMethodArgumentResolver extends TransformerObjectSupport
if (streamReader == null) {
try {
streamReader = inputFactory.createXMLStreamReader(requestSource);
} catch (XMLStreamException ex) {
streamReader = null;
} catch (UnsupportedOperationException ex) {
streamReader = null;
} catch (XMLStreamException | UnsupportedOperationException ex) {
// ignore
}
}
if (streamReader == null) {
@@ -113,7 +111,7 @@ public class StaxPayloadMethodArgumentResolver extends TransformerObjectSupport
try {
eventReader = inputFactory.createXMLEventReader(streamReader);
} catch (XMLStreamException ex) {
eventReader = null;
// ignore
}
}
@@ -122,10 +120,8 @@ public class StaxPayloadMethodArgumentResolver extends TransformerObjectSupport
if (eventReader == null) {
try {
eventReader = inputFactory.createXMLEventReader(requestSource);
} catch (XMLStreamException ex) {
eventReader = null;
} catch (UnsupportedOperationException ex) {
eventReader = null;
} catch (XMLStreamException | UnsupportedOperationException ex) {
// ignore
}
}
if (eventReader == null) {

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

@@ -89,9 +89,7 @@ public class XmlRootElementEndpointMapping extends AbstractAnnotationMethodEndpo
if (result != null) {
return result;
}
} catch (InstantiationException e) {
// ignore
} catch (IllegalAccessException ex) {
} catch (InstantiationException | IllegalAccessException e) {
// ignore
}
return null;

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

@@ -147,16 +147,11 @@ class AddressingEndpointInterceptor implements SoapEndpointInterceptor {
for (WebServiceMessageSender messageSender : messageSenders) {
if (messageSender.supports(replyEpr.getAddress())) {
supported = true;
WebServiceConnection connection = null;
try {
connection = messageSender.createConnection(replyEpr.getAddress());
try (WebServiceConnection connection = messageSender.createConnection(replyEpr.getAddress())){
connection.send(messageContext.getResponse());
break;
} finally {
messageContext.clearResponse();
if (connection != null) {
connection.close();
}
}
}
}

8
spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessage.java
View File

@@ -194,9 +194,7 @@ public class SaajSoapMessage extends AbstractSoapMessage {
SOAPMessage saajMessage = messageFactory.createMessage(getSaajMessage().getMimeHeaders(), bis);
setSaajMessage(saajMessage);
return saajMessage.getSOAPPart();
} catch (SOAPException ex) {
throw new SaajSoapMessageException("Could not save changes", ex);
} catch (IOException ex) {
} catch (SOAPException | IOException ex) {
throw new SaajSoapMessageException("Could not save changes", ex);
}
}
@@ -221,9 +219,7 @@ public class SaajSoapMessage extends AbstractSoapMessage {
this.saajMessage = messageFactory.createMessage(saajMessage.getMimeHeaders(), bis);
} catch (SOAPException ex) {
throw new SaajSoapMessageException("Could not read input stream", ex);
} catch (IOException ex) {
} catch (SOAPException | IOException ex) {
throw new SaajSoapMessageException("Could not read input stream", ex);
}
}

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

@@ -173,14 +173,11 @@ public abstract class SaajUtils {
*/
public static SOAPMessage loadMessage(Resource resource, MessageFactory messageFactory)
throws SOAPException, IOException {
InputStream is = resource.getInputStream();
try {
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()));
return messageFactory.createMessage(mimeHeaders, is);
} finally {
is.close();
}
}

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

@@ -184,17 +184,12 @@ public abstract class AbstractHttpWebServiceMessageSenderIntegrationTestCase<T e
jettyContext.addServlet(new ServletHolder(servlet), "/");
jettyServer.start();
FaultAwareWebServiceConnection connection = (FaultAwareWebServiceConnection) messageSender
.createConnection(connectionUri);
SOAPMessage request = createRequest();
try {
connection.send(new SaajSoapMessage(request));
try (FaultAwareWebServiceConnection connection = (FaultAwareWebServiceConnection) messageSender
.createConnection(connectionUri)){
connection.send(new SaajSoapMessage(createRequest()));
connection.receive(messageFactory);
assertThat(connection.hasFault()).isTrue();
} finally {
connection.close();
}
}
@@ -202,12 +197,10 @@ public abstract class AbstractHttpWebServiceMessageSenderIntegrationTestCase<T e
jettyContext.addServlet(new ServletHolder(servlet), "/");
jettyServer.start();
FaultAwareWebServiceConnection connection = (FaultAwareWebServiceConnection) messageSender
.createConnection(connectionUri);
SOAPMessage request = createRequest();
try {
connection.send(new SaajSoapMessage(request));
try (FaultAwareWebServiceConnection connection = (FaultAwareWebServiceConnection) messageSender
.createConnection(connectionUri)){
connection.send(new SaajSoapMessage(createRequest()));
SaajSoapMessage response = (SaajSoapMessage) connection.receive(messageFactory);
assertThat(response).isNotNull();
@@ -224,8 +217,6 @@ public abstract class AbstractHttpWebServiceMessageSenderIntegrationTestCase<T e
transformer.transform(response.getPayloadSource(), result);
XmlAssert.assertThat(result.toString()).and(RESPONSE).ignoreWhitespace().areIdentical();
} finally {
connection.close();
}
}
@@ -234,16 +225,11 @@ public abstract class AbstractHttpWebServiceMessageSenderIntegrationTestCase<T e
jettyContext.addServlet(new ServletHolder(servlet), "/");
jettyServer.start();
WebServiceConnection connection = messageSender.createConnection(connectionUri);
SOAPMessage request = createRequest();
try {
connection.send(new SaajSoapMessage(request));
try (WebServiceConnection connection = messageSender.createConnection(connectionUri)){
connection.send(new SaajSoapMessage(createRequest()));
WebServiceMessage response = connection.receive(messageFactory);
assertThat(response).isNull();
} finally {
connection.close();
}
}

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

@@ -37,31 +37,28 @@ import org.w3c.dom.Document;
import org.xml.sax.InputSource;
import org.xmlunit.assertj.XmlAssert;
public class Wsdl4jDefinitionTest {
class Wsdl4jDefinitionTest {
private Wsdl4jDefinition definition;
private Transformer transformer;
@BeforeEach
public void setUp() throws Exception {
void setUp() throws Exception {
WSDLFactory factory = WSDLFactory.newInstance();
WSDLReader reader = factory.newWSDLReader();
InputStream is = getClass().getResourceAsStream("complete.wsdl");
try {
try (InputStream is = getClass().getResourceAsStream("complete.wsdl")){
Definition wsdl4jDefinition = reader.readWSDL(null, new InputSource(is));
definition = new Wsdl4jDefinition(wsdl4jDefinition);
} finally {
is.close();
}
transformer = TransformerFactoryUtils.newInstance().newTransformer();
}
@Test
public void testGetSource() throws Exception {
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

@@ -72,11 +72,7 @@ public class KeyStoreCallbackHandler extends AbstractWsPasswordCallbackHandler i
try {
key = keyStore.getKey(id, symmetricKeyPassword != null ? symmetricKeyPassword : privateKeyPassword.toCharArray());
} catch (UnrecoverableKeyException e) {
throw new IOException("Could not get key", e);
} catch (KeyStoreException e) {
throw new IOException("Could not get key", e);
} catch (NoSuchAlgorithmException e) {
} catch (UnrecoverableKeyException | KeyStoreException | NoSuchAlgorithmException e) {
throw new IOException("Could not get key", e);
}

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

@@ -163,9 +163,7 @@ public class HttpsUrlConnectionMessageSender extends HttpUrlConnectionMessageSen
+ StringUtils.arrayToCommaDelimitedString(trustManagers) + "] secure random [" + rnd + "]");
}
return sslContext.getSocketFactory();
} catch (NoSuchAlgorithmException ex) {
throw new HttpsTransportException("Could not create SSLContext: " + ex.getMessage(), ex);
} catch (NoSuchProviderException ex) {
} catch (NoSuchAlgorithmException | NoSuchProviderException ex) {
throw new HttpsTransportException("Could not create SSLContext: " + ex.getMessage(), ex);
} catch (KeyManagementException ex) {
throw new HttpsTransportException("Could not initialize SSLContext: " + ex.getMessage(), ex);

4
spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppReceiverConnection.java
View File

@@ -142,9 +142,7 @@ public class XmppReceiverConnection extends AbstractReceiverConnection {
protected void onSendAfterWrite(WebServiceMessage message) throws IOException {
try {
connection.sendStanza(responseMessage);
} catch (SmackException.NotConnectedException e) {
throw new IOException(e);
} catch (InterruptedException e) {
} catch (SmackException.NotConnectedException | InterruptedException e) {
throw new IOException(e);
}
}

4
spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppSenderConnection.java
View File

@@ -137,9 +137,7 @@ public class XmppSenderConnection extends AbstractSenderConnection {
requestMessage.setFrom(connection.getUser());
try {
connection.sendStanza(requestMessage);
} catch (SmackException.NotConnectedException e) {
throw new IOException(e);
} catch (InterruptedException e) {
} catch (SmackException.NotConnectedException | InterruptedException e) {
throw new IOException(e);
}
}

5
spring-xml/src/main/java/org/springframework/xml/sax/SaxUtils.java
View File

@@ -55,10 +55,7 @@ public abstract class SaxUtils {
public static String getSystemId(Resource resource) {
try {
return new URI(resource.getURL().toExternalForm()).toString();
} catch (IOException ex) {
logger.debug("Could not get System ID from [" + resource + "], ex");
return null;
} catch (URISyntaxException e) {
} catch (IOException | URISyntaxException ex) {
logger.debug("Could not get System ID from [" + resource + "], ex");
return null;
}

4
spring-xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchema.java
View File

@@ -98,9 +98,7 @@ public class CommonsXsdSchema implements XsdSchema {
}
Document[] serializedSchemas = serializer.serializeSchema(schema, false);
return new DOMSource(serializedSchemas[0]);
} catch (BeanInstantiationException ex) {
// ignore
} catch (XmlSchemaSerializer.XmlSchemaSerializerException ex) {
} catch (BeanInstantiationException | XmlSchemaSerializer.XmlSchemaSerializerException ex) {
// ignore
}
ByteArrayOutputStream bos = new ByteArrayOutputStream();