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 00cc1a7e..b8c7214b 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
@@ -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;
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 198ad3ce..0f789353 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
@@ -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) {
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxStreamPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxStreamPayloadEndpoint.java
index 09b93ee2..387d4d9a 100644
--- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxStreamPayloadEndpoint.java
+++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxStreamPayloadEndpoint.java
@@ -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) {
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 a3440b4a..82507574 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
@@ -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);
 			}
 		}
 
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessor.java
index 692098a8..a2a981af 100644
--- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessor.java
+++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessor.java
@@ -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) {
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 168e335e..b89522e7 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) {
-						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) {
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/jaxb/XmlRootElementEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/jaxb/XmlRootElementEndpointMapping.java
index ebeb8bb4..4ff5cd17 100644
--- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/jaxb/XmlRootElementEndpointMapping.java
+++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/jaxb/XmlRootElementEndpointMapping.java
@@ -90,9 +90,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;
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 188eeebe..6443add1 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,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();
-					}
 				}
 			}
 		}
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessage.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessage.java
index 128a44f7..32a10df0 100644
--- a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessage.java
+++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessage.java
@@ -185,9 +185,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);
 		}
 	}
@@ -212,9 +210,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);
 			}
 		}
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 d35b4a1d..97a89ffb 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
@@ -174,14 +174,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();
 		}
 	}
 
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 986adff4..99b3d414 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
@@ -194,17 +194,12 @@ public abstract class AbstractHttpWebServiceMessageSenderIntegrationTestCase<T e
 		jettyServer.setHandler(jettyContext);
 		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();
 		}
 	}
 
@@ -213,12 +208,10 @@ public abstract class AbstractHttpWebServiceMessageSenderIntegrationTestCase<T e
 		jettyContext.addServlet(new ServletHolder(servlet), "/");
 		jettyServer.setHandler(jettyContext);
 		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();
@@ -235,8 +228,6 @@ public abstract class AbstractHttpWebServiceMessageSenderIntegrationTestCase<T e
 			transformer.transform(response.getPayloadSource(), result);
 
 			XmlAssert.assertThat(result.toString()).and(RESPONSE).ignoreWhitespace().areIdentical();
-		} finally {
-			connection.close();
 		}
 	}
 
@@ -246,16 +237,11 @@ public abstract class AbstractHttpWebServiceMessageSenderIntegrationTestCase<T e
 		jettyServer.setHandler(jettyContext);
 		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();
 		}
 	}
 
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/Wsdl4jDefinitionTest.java b/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/Wsdl4jDefinitionTest.java
index da4039dd..24da5f7a 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/Wsdl4jDefinitionTest.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/Wsdl4jDefinitionTest.java
@@ -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();
 
diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/KeyStoreCallbackHandler.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/KeyStoreCallbackHandler.java
index 8f797d76..a9876c3e 100644
--- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/KeyStoreCallbackHandler.java
+++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/KeyStoreCallbackHandler.java
@@ -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);
 		}
 
diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/http/HttpsUrlConnectionMessageSender.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/http/HttpsUrlConnectionMessageSender.java
index 3b6c688d..0d49f362 100644
--- a/spring-ws-support/src/main/java/org/springframework/ws/transport/http/HttpsUrlConnectionMessageSender.java
+++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/http/HttpsUrlConnectionMessageSender.java
@@ -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);
diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppReceiverConnection.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppReceiverConnection.java
index bd4175c5..94d1ba06 100644
--- a/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppReceiverConnection.java
+++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppReceiverConnection.java
@@ -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);
 		}
 	}
diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppSenderConnection.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppSenderConnection.java
index fa21ea65..9fd72936 100644
--- a/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppSenderConnection.java
+++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppSenderConnection.java
@@ -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);
 		}
 	}
diff --git a/spring-xml/src/main/java/org/springframework/xml/sax/SaxUtils.java b/spring-xml/src/main/java/org/springframework/xml/sax/SaxUtils.java
index 4e5a7329..6711c83c 100644
--- a/spring-xml/src/main/java/org/springframework/xml/sax/SaxUtils.java
+++ b/spring-xml/src/main/java/org/springframework/xml/sax/SaxUtils.java
@@ -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;
 		}
diff --git a/spring-xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchema.java b/spring-xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchema.java
index f843e294..c268c38c 100644
--- a/spring-xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchema.java
+++ b/spring-xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchema.java
@@ -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();