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 ce0145a4..68477da5 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
@@ -852,7 +852,8 @@ public class WebServiceTemplate extends WebServiceAccessor implements WebService
 	 * Adapter to enable use of a WebServiceMessageCallback inside a
 	 * WebServiceMessageExtractor.
 	 */
-	private static class WebServiceMessageCallbackMessageExtractor implements WebServiceMessageExtractor<Boolean> {
+	private static final class WebServiceMessageCallbackMessageExtractor
+			implements WebServiceMessageExtractor<Boolean> {
 
 		private final WebServiceMessageCallback callback;
 
@@ -869,7 +870,7 @@ public class WebServiceTemplate extends WebServiceAccessor implements WebService
 	}
 
 	/** Adapter to enable use of a SourceExtractor inside a WebServiceMessageExtractor. */
-	private static class SourceExtractorMessageExtractor<T> implements WebServiceMessageExtractor<T> {
+	private static final class SourceExtractorMessageExtractor<T> implements WebServiceMessageExtractor<T> {
 
 		private final SourceExtractor<T> sourceExtractor;
 
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/config/annotation/DelegatingWsConfiguration.java b/spring-ws-core/src/main/java/org/springframework/ws/config/annotation/DelegatingWsConfiguration.java
index d84568c9..dba0706d 100644
--- a/spring-ws-core/src/main/java/org/springframework/ws/config/annotation/DelegatingWsConfiguration.java
+++ b/spring-ws-core/src/main/java/org/springframework/ws/config/annotation/DelegatingWsConfiguration.java
@@ -69,7 +69,7 @@ public class DelegatingWsConfiguration extends WsConfigurationSupport {
 		this.configurers.addReturnValueHandlers(returnValueHandlers);
 	}
 
-	private static class WsConfigurers implements WsConfigurer {
+	private static final class WsConfigurers implements WsConfigurer {
 
 		private final Supplier<Stream<WsConfigurer>> delegates;
 
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/mime/AbstractMimeMessage.java b/spring-ws-core/src/main/java/org/springframework/ws/mime/AbstractMimeMessage.java
index b41dd434..630a018c 100644
--- a/spring-ws-core/src/main/java/org/springframework/ws/mime/AbstractMimeMessage.java
+++ b/spring-ws-core/src/main/java/org/springframework/ws/mime/AbstractMimeMessage.java
@@ -65,7 +65,7 @@ public abstract class AbstractMimeMessage implements MimeMessage {
 	 * @author Arjen Poutsma
 	 * @since 1.0.0
 	 */
-	private static class InputStreamSourceDataSource implements DataSource {
+	private static final class InputStreamSourceDataSource implements DataSource {
 
 		private final InputStreamSource inputStreamSource;
 
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 63325a14..23d66ea8 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
@@ -151,7 +151,7 @@ public abstract class AbstractStaxEventPayloadEndpoint extends AbstractStaxPaylo
 	 * {@code WebServiceMessage} as soon as any method is called, thus lazily creating the
 	 * response.
 	 */
-	private class ResponseCreatingEventWriter implements XMLEventWriter {
+	private final class ResponseCreatingEventWriter implements XMLEventWriter {
 
 		private XMLEventWriter eventWriter;
 
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 21bc0e84..571d879e 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
@@ -126,7 +126,7 @@ public abstract class AbstractStaxStreamPayloadEndpoint extends AbstractStaxPayl
 	 * {@code WebServiceMessage} as soon as any method is called, thus lazily creating the
 	 * response.
 	 */
-	private class ResponseCreatingStreamWriter implements XMLStreamWriter {
+	private final class ResponseCreatingStreamWriter implements XMLStreamWriter {
 
 		private MessageContext messageContext;
 
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 0e71ef69..d13467b0 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
@@ -116,7 +116,7 @@ public abstract class AbstractXomPayloadEndpoint extends TransformerObjectSuppor
 	 */
 	protected abstract Element invokeInternal(Element requestElement) throws Exception;
 
-	private static class XomSourceCallback implements TraxUtils.SourceCallback {
+	private static final class XomSourceCallback implements TraxUtils.SourceCallback {
 
 		private Element element;
 
@@ -206,7 +206,7 @@ public abstract class AbstractXomPayloadEndpoint extends TransformerObjectSuppor
 	}
 
 	@SuppressWarnings("serial")
-	private static class XomParsingException extends NestedRuntimeException {
+	private static final class XomParsingException extends NestedRuntimeException {
 
 		private XomParsingException(ParsingException ex) {
 			super(ex.getMessage(), ex);
@@ -214,7 +214,7 @@ public abstract class AbstractXomPayloadEndpoint extends TransformerObjectSuppor
 
 	}
 
-	private static class StaxStreamConverter {
+	private static final class StaxStreamConverter {
 
 		private static Document convert(XMLStreamReader streamReader) throws XMLStreamException {
 			NodeFactory nodeFactory = new NodeFactory();
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 7a540a7b..f4db1fe0 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
@@ -129,7 +129,7 @@ public class SourcePayloadMethodProcessor extends AbstractPayloadSourceMethodPro
 	}
 
 	/** Inner class to avoid a static JAXP 1.4 dependency. */
-	private static class Jaxp14StaxHandler {
+	private static final class Jaxp14StaxHandler {
 
 		private static boolean isStaxSource(Class<?> clazz) {
 			return StAXSource.class.isAssignableFrom(clazz);
@@ -141,7 +141,7 @@ public class SourcePayloadMethodProcessor extends AbstractPayloadSourceMethodPro
 
 	}
 
-	private static class SystemIdStreamReaderDelegate extends StreamReaderDelegate {
+	private static final class SystemIdStreamReaderDelegate extends StreamReaderDelegate {
 
 		private final String systemId;
 
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/AbstractJaxb2PayloadMethodProcessor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/AbstractJaxb2PayloadMethodProcessor.java
index 33190cac..cf9ace90 100644
--- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/AbstractJaxb2PayloadMethodProcessor.java
+++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/AbstractJaxb2PayloadMethodProcessor.java
@@ -233,7 +233,7 @@ public abstract class AbstractJaxb2PayloadMethodProcessor extends AbstractPayloa
 
 	// Callbacks
 
-	private class Jaxb2SourceCallback implements TraxUtils.SourceCallback {
+	private final class Jaxb2SourceCallback implements TraxUtils.SourceCallback {
 
 		private final Unmarshaller unmarshaller;
 
@@ -301,7 +301,7 @@ public abstract class AbstractJaxb2PayloadMethodProcessor extends AbstractPayloa
 
 	}
 
-	private class JaxbElementSourceCallback<T> implements TraxUtils.SourceCallback {
+	private final class JaxbElementSourceCallback<T> implements TraxUtils.SourceCallback {
 
 		private final Unmarshaller unmarshaller;
 
@@ -351,7 +351,7 @@ public abstract class AbstractJaxb2PayloadMethodProcessor extends AbstractPayloa
 
 	}
 
-	private class Jaxb2ResultCallback implements TraxUtils.ResultCallback {
+	private final class Jaxb2ResultCallback implements TraxUtils.ResultCallback {
 
 		private final Marshaller marshaller;
 
@@ -399,7 +399,7 @@ public abstract class AbstractJaxb2PayloadMethodProcessor extends AbstractPayloa
 
 	}
 
-	private class JaxbStreamingPayload implements StreamingPayload {
+	private final class JaxbStreamingPayload implements StreamingPayload {
 
 		private final Object jaxbElement;
 
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/support/PayloadRootUtils.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/support/PayloadRootUtils.java
index ed3fbc1f..de6dcc94 100644
--- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/support/PayloadRootUtils.java
+++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/support/PayloadRootUtils.java
@@ -89,7 +89,7 @@ public abstract class PayloadRootUtils {
 		}
 	}
 
-	private static class PayloadRootSourceCallback implements TraxUtils.SourceCallback {
+	private static final class PayloadRootSourceCallback implements TraxUtils.SourceCallback {
 
 		private QName result;
 
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapFaultDetail.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapFaultDetail.java
index f55acc48..e08884c2 100644
--- a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapFaultDetail.java
+++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapFaultDetail.java
@@ -71,7 +71,7 @@ class SaajSoapFaultDetail extends SaajSoapElement<SOAPFaultElement> implements S
 		return (Detail) getSaajElement();
 	}
 
-	private static class SaajSoapFaultDetailElementIterator implements Iterator<SoapFaultDetailElement> {
+	private static final class SaajSoapFaultDetailElementIterator implements Iterator<SoapFaultDetailElement> {
 
 		private final Iterator<DetailEntry> iterator;
 
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 e273a9bf..bfa0247d 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
@@ -364,7 +364,7 @@ public class SaajSoapMessage extends AbstractSoapMessage {
 		return builder.toString();
 	}
 
-	private static class SaajAttachmentIterator implements Iterator<Attachment> {
+	private static final class SaajAttachmentIterator implements Iterator<Attachment> {
 
 		private final Iterator<AttachmentPart> saajIterator;
 
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/support/MarshallingUtils.java b/spring-ws-core/src/main/java/org/springframework/ws/support/MarshallingUtils.java
index f5c7ae32..24febb7f 100644
--- a/spring-ws-core/src/main/java/org/springframework/ws/support/MarshallingUtils.java
+++ b/spring-ws-core/src/main/java/org/springframework/ws/support/MarshallingUtils.java
@@ -86,7 +86,7 @@ public abstract class MarshallingUtils {
 		}
 	}
 
-	private static class MimeMessageContainer implements MimeContainer {
+	private static final class MimeMessageContainer implements MimeContainer {
 
 		private final MimeMessage mimeMessage;
 
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/AbstractReceiverConnection.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/AbstractReceiverConnection.java
index 22dd9583..4943f11d 100644
--- a/spring-ws-core/src/main/java/org/springframework/ws/transport/AbstractReceiverConnection.java
+++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/AbstractReceiverConnection.java
@@ -67,7 +67,7 @@ public abstract class AbstractReceiverConnection extends AbstractWebServiceConne
 	protected abstract OutputStream getResponseOutputStream() throws IOException;
 
 	/** Implementation of {@code TransportInputStream} for receiving-side connections. */
-	private class RequestTransportInputStream extends TransportInputStream {
+	private final class RequestTransportInputStream extends TransportInputStream {
 
 		@Override
 		protected InputStream createInputStream() throws IOException {
@@ -87,7 +87,7 @@ public abstract class AbstractReceiverConnection extends AbstractWebServiceConne
 	}
 
 	/** Implementation of {@code TransportOutputStream} for sending-side connections. */
-	private class ResponseTransportOutputStream extends TransportOutputStream {
+	private final class ResponseTransportOutputStream extends TransportOutputStream {
 
 		@Override
 		public void addHeader(String name, String value) throws IOException {
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/context/TransportContextHolder.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/context/TransportContextHolder.java
index ca5f3d16..53f678e1 100644
--- a/spring-ws-core/src/main/java/org/springframework/ws/transport/context/TransportContextHolder.java
+++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/context/TransportContextHolder.java
@@ -46,7 +46,7 @@ public abstract class TransportContextHolder {
 		return transportContextHolder.get();
 	}
 
-	private static class TransportThreadLocal extends ThreadLocal<TransportContext> {
+	private static final class TransportThreadLocal extends ThreadLocal<TransportContext> {
 
 		public String toString() {
 			return "Transport State";
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/MockWebServiceMessage.java b/spring-ws-core/src/test/java/org/springframework/ws/MockWebServiceMessage.java
index 7ef5a4df..75a65504 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/MockWebServiceMessage.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/MockWebServiceMessage.java
@@ -171,7 +171,7 @@ public class MockWebServiceMessage implements FaultAwareWebServiceMessage {
 		return builder.toString();
 	}
 
-	private class StringBufferWriter extends Writer {
+	private final class StringBufferWriter extends Writer {
 
 		private StringBufferWriter() {
 			super(MockWebServiceMessage.this.content);
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap11WebServiceTemplateIntegrationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap11WebServiceTemplateIntegrationTest.java
index a9c89eb9..90ff6ebc 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap11WebServiceTemplateIntegrationTest.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap11WebServiceTemplateIntegrationTest.java
@@ -288,7 +288,7 @@ public abstract class AbstractSoap11WebServiceTemplateIntegrationTest {
 
 	/** Servlet that returns and error message for a given status code. */
 	@SuppressWarnings("serial")
-	private static class ErrorServlet extends HttpServlet {
+	private static final class ErrorServlet extends HttpServlet {
 
 		private int sc;
 
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/config/annotation/DefaultWsConfigurationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/config/annotation/DefaultWsConfigurationTest.java
index 6095a280..5d1e59dd 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/config/annotation/DefaultWsConfigurationTest.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/config/annotation/DefaultWsConfigurationTest.java
@@ -97,7 +97,7 @@ public class DefaultWsConfigurationTest {
 	}
 
 	@Endpoint
-	private static class TestEndpoint {
+	private static final class TestEndpoint {
 
 		@SoapAction("handle")
 		public void handle() {
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MarshallingPayloadEndpointTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MarshallingPayloadEndpointTest.java
index 88b9235b..44e787c3 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MarshallingPayloadEndpointTest.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MarshallingPayloadEndpointTest.java
@@ -258,7 +258,7 @@ public class MarshallingPayloadEndpointTest {
 		verify(this.factoryMock, unmarshaller, marshaller, request, response);
 	}
 
-	private static class SimpleMarshaller implements Marshaller, Unmarshaller {
+	static class SimpleMarshaller implements Marshaller, Unmarshaller {
 
 		@Override
 		public void marshal(Object graph, Result result) throws XmlMappingException {
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/SaxPayloadEndpointTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/SaxPayloadEndpointTest.java
index c044d6ab..252f4ce3 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/SaxPayloadEndpointTest.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/SaxPayloadEndpointTest.java
@@ -83,7 +83,7 @@ public class SaxPayloadEndpointTest extends AbstractPayloadEndpointTest {
 		};
 	}
 
-	private static class TestContentHandler extends DefaultHandler {
+	private static final class TestContentHandler extends DefaultHandler {
 
 		@Override
 		public void endElement(String uri, String localName, String qName) {
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapterTest.java
index 9ce544e7..42d4043c 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapterTest.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapterTest.java
@@ -224,11 +224,11 @@ public class GenericMarshallingMethodEndpointAdapterTest {
 		return s;
 	}
 
-	private static class MyType {
+	private static final class MyType {
 
 	}
 
-	private static class MyGenericType<T> {
+	private static final class MyGenericType<T> {
 
 	}
 
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapterTest.java
index ab22d852..dafa63d2 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapterTest.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapterTest.java
@@ -208,7 +208,7 @@ public class MarshallingMethodEndpointAdapterTest {
 		return s;
 	}
 
-	private static class MyType {
+	private static final class MyType {
 
 	}
 
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/EndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/EndpointMappingTest.java
index 1d044da5..e92e1974 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/EndpointMappingTest.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/EndpointMappingTest.java
@@ -192,7 +192,7 @@ public class EndpointMappingTest {
 		assertThat(MyEndpoint.constructorCount).isEqualTo(2);
 	}
 
-	private static class MyEndpoint {
+	private static final class MyEndpoint {
 
 		private static int constructorCount;
 
@@ -202,7 +202,7 @@ public class EndpointMappingTest {
 
 	}
 
-	private static class MySmartEndpointInterceptor extends DelegatingSmartEndpointInterceptor {
+	private static final class MySmartEndpointInterceptor extends DelegatingSmartEndpointInterceptor {
 
 		private MySmartEndpointInterceptor() {
 			super(new EndpointInterceptorAdapter());
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/MapBasedSoapEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/MapBasedSoapEndpointMappingTest.java
index 25ac5c15..b6d3e773 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/MapBasedSoapEndpointMappingTest.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/MapBasedSoapEndpointMappingTest.java
@@ -102,7 +102,7 @@ public class MapBasedSoapEndpointMappingTest {
 		assertThat(mapping.getEndpointInternal(null)).isNull();
 	}
 
-	private static class MyMapBasedEndpointMapping extends AbstractMapBasedEndpointMapping {
+	private static final class MyMapBasedEndpointMapping extends AbstractMapBasedEndpointMapping {
 
 		private String key;
 
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMappingTest.java
index 4161ff64..0a204990 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMappingTest.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMappingTest.java
@@ -69,7 +69,7 @@ public class SimpleMethodEndpointMappingTest {
 		assertThat(this.mapping.getLookupKeyForMessage(messageContext)).isEqualTo("MyRequest");
 	}
 
-	private static class MyBean {
+	private static final class MyBean {
 
 		public void prefixMyRequestSuffix() {
 
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTest.java
index 1244d75e..f8ce00bd 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTest.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTest.java
@@ -100,7 +100,7 @@ public class AnnotationActionMethodEndpointMappingTest {
 
 	@Endpoint
 	@Address("mailto:joe@fabrikam123.example")
-	private static class MyEndpoint {
+	private static final class MyEndpoint {
 
 		@Action("http://fabrikam123.example/mail/Delete")
 		public void doIt() {
@@ -109,7 +109,7 @@ public class AnnotationActionMethodEndpointMappingTest {
 
 	}
 
-	private static class MyInterceptor extends DelegatingSmartEndpointInterceptor {
+	private static final class MyInterceptor extends DelegatingSmartEndpointInterceptor {
 
 		public MyInterceptor() {
 			super(new PayloadLoggingInterceptor());
@@ -117,7 +117,7 @@ public class AnnotationActionMethodEndpointMappingTest {
 
 	}
 
-	private static class MySmartInterceptor extends DelegatingSmartEndpointInterceptor {
+	private static final class MySmartInterceptor extends DelegatingSmartEndpointInterceptor {
 
 		public MySmartInterceptor() {
 			super(new PayloadLoggingInterceptor());
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMappingTest.java
index 92c22c0e..14576ff5 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMappingTest.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMappingTest.java
@@ -92,11 +92,11 @@ public class SimpleActionEndpointMappingTest extends AbstractWsAddressingTest {
 		assertThat(endpoint).isNull();
 	}
 
-	private static class Endpoint1 {
+	private static final class Endpoint1 {
 
 	}
 
-	private static class Endpoint2 {
+	private static final class Endpoint2 {
 
 	}
 
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/FaultCreatingValidatingMarshallingPayloadEndpointTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/FaultCreatingValidatingMarshallingPayloadEndpointTest.java
index a182dcbb..22782c87 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/FaultCreatingValidatingMarshallingPayloadEndpointTest.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/FaultCreatingValidatingMarshallingPayloadEndpointTest.java
@@ -143,7 +143,7 @@ public class FaultCreatingValidatingMarshallingPayloadEndpointTest {
 		assertThat(response.getSOAPBody().hasFault()).isFalse();
 	}
 
-	private static class PersonValidator implements Validator {
+	private static final class PersonValidator implements Validator {
 
 		@Override
 		public boolean supports(Class<?> clazz) {
@@ -166,7 +166,7 @@ public class FaultCreatingValidatingMarshallingPayloadEndpointTest {
 
 	}
 
-	private static class Person {
+	private static final class Person {
 
 		private String name;
 
@@ -200,7 +200,7 @@ public class FaultCreatingValidatingMarshallingPayloadEndpointTest {
 
 	}
 
-	private static class PersonMarshaller implements Unmarshaller, Marshaller {
+	private static final class PersonMarshaller implements Unmarshaller, Marshaller {
 
 		private final Person person;
 
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMappingTest.java
index 70f747a2..c3e3118d 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMappingTest.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMappingTest.java
@@ -128,7 +128,7 @@ public class SoapActionAnnotationMethodEndpointMappingTest {
 	}
 
 	@Endpoint
-	private static class MyEndpoint {
+	private static final class MyEndpoint {
 
 		@SoapAction("http://springframework.org/spring-ws/SoapAction")
 		public void doIt() {
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/support/DefaultStrategiesHelperTest.java b/spring-ws-core/src/test/java/org/springframework/ws/support/DefaultStrategiesHelperTest.java
index 71c98a68..277bb6a4 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/support/DefaultStrategiesHelperTest.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/support/DefaultStrategiesHelperTest.java
@@ -105,11 +105,11 @@ public class DefaultStrategiesHelperTest {
 
 	}
 
-	private static class StrategyImpl implements Strategy {
+	private static final class StrategyImpl implements Strategy {
 
 	}
 
-	private static class ContextAwareStrategyImpl implements Strategy, ApplicationContextAware {
+	private static final class ContextAwareStrategyImpl implements Strategy, ApplicationContextAware {
 
 		private ApplicationContext applicationContext;
 
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletTest.java
index 185a587d..96db8e73 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletTest.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletTest.java
@@ -109,7 +109,7 @@ public class MessageDispatcherServletTest {
 		XmlAssert.assertThat(result).and(expected).ignoreWhitespace().areIdentical();
 	}
 
-	private static class DetectWebApplicationContext extends StaticWebApplicationContext {
+	private static final class DetectWebApplicationContext extends StaticWebApplicationContext {
 
 		@Override
 		public void refresh() throws BeansException, IllegalStateException {
@@ -123,7 +123,7 @@ public class MessageDispatcherServletTest {
 
 	}
 
-	private static class WsdlDefinitionWebApplicationContext extends StaticWebApplicationContext {
+	private static final class WsdlDefinitionWebApplicationContext extends StaticWebApplicationContext {
 
 		@Override
 		public void refresh() throws BeansException, IllegalStateException {
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupportTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupportTest.java
index 29558576..4be0821a 100644
--- a/spring-ws-core/src/test/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupportTest.java
+++ b/spring-ws-core/src/test/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupportTest.java
@@ -122,7 +122,7 @@ public class WebServiceMessageReceiverObjectSupportTest {
 		verify(this.connectionMock).receive(this.messageFactory);
 	}
 
-	private static class MyReceiverSupport extends WebServiceMessageReceiverObjectSupport {
+	private static final class MyReceiverSupport extends WebServiceMessageReceiverObjectSupport {
 
 	}
 
diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSamlTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSamlTest.java
index 784fdf3c..40a47275 100644
--- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSamlTest.java
+++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSamlTest.java
@@ -87,7 +87,7 @@ public abstract class Wss4jMessageInterceptorSamlTest extends Wss4jTest {
 		return new SamlCallbackHandler(crypto, userCert);
 	}
 
-	private static class SamlCallbackHandler implements CallbackHandler {
+	private static final class SamlCallbackHandler implements CallbackHandler {
 
 		private Crypto crypto;
 
diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailMessageReceiver.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailMessageReceiver.java
index 3ce12332..8e2e3dc3 100644
--- a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailMessageReceiver.java
+++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailMessageReceiver.java
@@ -219,7 +219,7 @@ public class MailMessageReceiver extends AbstractAsyncStandaloneMessageReceiver
 		MailTransportUtils.closeService(this.store);
 	}
 
-	private class MonitoringRunnable implements SchedulingAwareRunnable {
+	private final class MonitoringRunnable implements SchedulingAwareRunnable {
 
 		@Override
 		public void run() {
@@ -261,7 +261,7 @@ public class MailMessageReceiver extends AbstractAsyncStandaloneMessageReceiver
 
 	}
 
-	private class MessageHandler implements SchedulingAwareRunnable {
+	private final class MessageHandler implements SchedulingAwareRunnable {
 
 		private final Message message;
 
diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailReceiverConnection.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailReceiverConnection.java
index 6b4a485b..6d6315d9 100644
--- a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailReceiverConnection.java
+++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailReceiverConnection.java
@@ -229,7 +229,7 @@ public class MailReceiverConnection extends AbstractReceiverConnection {
 		}
 	}
 
-	private static class ByteArrayDataSource implements DataSource {
+	private static final class ByteArrayDataSource implements DataSource {
 
 		private byte[] data;
 
diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailSenderConnection.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailSenderConnection.java
index 996d20bf..5844ba27 100644
--- a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailSenderConnection.java
+++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailSenderConnection.java
@@ -307,7 +307,7 @@ public class MailSenderConnection extends AbstractSenderConnection {
 		MailTransportUtils.closeService(this.store);
 	}
 
-	private static class ByteArrayDataSource implements DataSource {
+	private static final class ByteArrayDataSource implements DataSource {
 
 		private byte[] data;
 
diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageReceiver.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageReceiver.java
index 2c101d3d..39455f5d 100644
--- a/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageReceiver.java
+++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageReceiver.java
@@ -106,7 +106,7 @@ public class XmppMessageReceiver extends AbstractStandaloneMessageReceiver {
 		}
 	}
 
-	private class WebServicePacketListener implements StanzaListener {
+	private final class WebServicePacketListener implements StanzaListener {
 
 		@Override
 		public void processStanza(Stanza packet) {
diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/client/ResponseCreators.java b/spring-ws-test/src/main/java/org/springframework/ws/test/client/ResponseCreators.java
index 80ff7e4e..045bdfcb 100644
--- a/spring-ws-test/src/main/java/org/springframework/ws/test/client/ResponseCreators.java
+++ b/spring-ws-test/src/main/java/org/springframework/ws/test/client/ResponseCreators.java
@@ -194,7 +194,7 @@ public abstract class ResponseCreators {
 	/**
 	 * Adapts a {@link WebServiceMessageCreator} to the {@link ResponseCreator} contract.
 	 */
-	private static class WebServiceMessageCreatorAdapter implements ResponseCreator {
+	private static final class WebServiceMessageCreatorAdapter implements ResponseCreator {
 
 		private final WebServiceMessageCreator adaptee;
 
diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/server/MockWebServiceClient.java b/spring-ws-test/src/main/java/org/springframework/ws/test/server/MockWebServiceClient.java
index 4484ac88..3c7b61b6 100644
--- a/spring-ws-test/src/main/java/org/springframework/ws/test/server/MockWebServiceClient.java
+++ b/spring-ws-test/src/main/java/org/springframework/ws/test/server/MockWebServiceClient.java
@@ -193,7 +193,7 @@ public class MockWebServiceClient {
 
 	// ResponseActions
 
-	private static class MockWebServiceClientResponseActions implements ResponseActions {
+	private static final class MockWebServiceClientResponseActions implements ResponseActions {
 
 		private final MessageContext messageContext;
 
diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/server/RequestCreators.java b/spring-ws-test/src/main/java/org/springframework/ws/test/server/RequestCreators.java
index 41713e74..d604af1c 100644
--- a/spring-ws-test/src/main/java/org/springframework/ws/test/server/RequestCreators.java
+++ b/spring-ws-test/src/main/java/org/springframework/ws/test/server/RequestCreators.java
@@ -90,7 +90,7 @@ public abstract class RequestCreators {
 	/**
 	 * Adapts a {@link WebServiceMessageCreator} to the {@link RequestCreator} contract.
 	 */
-	private static class WebServiceMessageCreatorAdapter implements RequestCreator {
+	private static final class WebServiceMessageCreatorAdapter implements RequestCreator {
 
 		private final WebServiceMessageCreator adaptee;
 
diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceServerTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceServerTest.java
index 2062c804..825e50bd 100644
--- a/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceServerTest.java
+++ b/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceServerTest.java
@@ -420,7 +420,7 @@ public class MockWebServiceServerTest {
 	}
 
 	@XmlRootElement(name = "EnvelopeMatcherRequest")
-	private static class EnvelopeMatcherRequest {
+	private static final class EnvelopeMatcherRequest {
 
 		private String myData;
 
@@ -435,7 +435,7 @@ public class MockWebServiceServerTest {
 	}
 
 	@XmlRootElement(name = "EnvelopeMatcherResponse")
-	private static class EnvelopeMatcherResponse {
+	private static final class EnvelopeMatcherResponse {
 
 		private String myData;
 
diff --git a/spring-xml/src/main/java/org/springframework/xml/validation/Jaxp13ValidatorFactory.java b/spring-xml/src/main/java/org/springframework/xml/validation/Jaxp13ValidatorFactory.java
index ae4d950e..351e63ab 100644
--- a/spring-xml/src/main/java/org/springframework/xml/validation/Jaxp13ValidatorFactory.java
+++ b/spring-xml/src/main/java/org/springframework/xml/validation/Jaxp13ValidatorFactory.java
@@ -48,7 +48,7 @@ abstract class Jaxp13ValidatorFactory {
 		}
 	}
 
-	private static class Jaxp13Validator implements XmlValidator {
+	private static final class Jaxp13Validator implements XmlValidator {
 
 		private Schema schema;
 
@@ -82,7 +82,7 @@ abstract class Jaxp13ValidatorFactory {
 	/**
 	 * {@code ErrorHandler} implementation that stores errors and fatal errors in a list.
 	 */
-	private static class DefaultValidationErrorHandler implements ValidationErrorHandler {
+	private static final class DefaultValidationErrorHandler implements ValidationErrorHandler {
 
 		private List<SAXParseException> errors = new ArrayList<>();
 
diff --git a/spring-xml/src/main/java/org/springframework/xml/validation/Jaxp15ValidatorFactory.java b/spring-xml/src/main/java/org/springframework/xml/validation/Jaxp15ValidatorFactory.java
index 626b7d8d..bfa20265 100644
--- a/spring-xml/src/main/java/org/springframework/xml/validation/Jaxp15ValidatorFactory.java
+++ b/spring-xml/src/main/java/org/springframework/xml/validation/Jaxp15ValidatorFactory.java
@@ -56,7 +56,7 @@ abstract class Jaxp15ValidatorFactory {
 		}
 	}
 
-	private static class Jaxp15Validator implements XmlValidator {
+	private static final class Jaxp15Validator implements XmlValidator {
 
 		private Schema schema;
 
@@ -111,7 +111,7 @@ abstract class Jaxp15ValidatorFactory {
 	/**
 	 * {@code ErrorHandler} implementation that stores errors and fatal errors in a list.
 	 */
-	private static class DefaultValidationErrorHandler implements ValidationErrorHandler {
+	private static final class DefaultValidationErrorHandler implements ValidationErrorHandler {
 
 		private List<SAXParseException> errors = new ArrayList<>();
 
diff --git a/spring-xml/src/main/java/org/springframework/xml/xpath/AbstractXPathTemplate.java b/spring-xml/src/main/java/org/springframework/xml/xpath/AbstractXPathTemplate.java
index 49f967a5..2dcdfe34 100644
--- a/spring-xml/src/main/java/org/springframework/xml/xpath/AbstractXPathTemplate.java
+++ b/spring-xml/src/main/java/org/springframework/xml/xpath/AbstractXPathTemplate.java
@@ -60,7 +60,7 @@ public abstract class AbstractXPathTemplate extends TransformerObjectSupport imp
 	 * Static inner class that adapts a {@link NodeCallbackHandler} to the interface of
 	 * {@link NodeMapper}.
 	 */
-	private static class NodeCallbackHandlerNodeMapper implements NodeMapper<Object> {
+	private static final class NodeCallbackHandlerNodeMapper implements NodeMapper<Object> {
 
 		private final NodeCallbackHandler callbackHandler;
 
diff --git a/spring-xml/src/main/java/org/springframework/xml/xpath/JaxenXPathExpressionFactory.java b/spring-xml/src/main/java/org/springframework/xml/xpath/JaxenXPathExpressionFactory.java
index 25725d98..95aace09 100644
--- a/spring-xml/src/main/java/org/springframework/xml/xpath/JaxenXPathExpressionFactory.java
+++ b/spring-xml/src/main/java/org/springframework/xml/xpath/JaxenXPathExpressionFactory.java
@@ -75,7 +75,7 @@ abstract class JaxenXPathExpressionFactory {
 	}
 
 	/** Jaxen implementation of the {@code XPathExpression} interface. */
-	private static class JaxenXpathExpression implements XPathExpression {
+	private static final class JaxenXpathExpression implements XPathExpression {
 
 		private XPath xpath;
 
diff --git a/spring-xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactory.java b/spring-xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactory.java
index 52315c4a..7cfa6051 100644
--- a/spring-xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactory.java
+++ b/spring-xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactory.java
@@ -90,7 +90,7 @@ abstract class Jaxp13XPathExpressionFactory {
 	}
 
 	/** JAXP 1.3 implementation of the {@code XPathExpression} interface. */
-	private static class Jaxp13XPathExpression implements XPathExpression {
+	private static final class Jaxp13XPathExpression implements XPathExpression {
 
 		private final javax.xml.xpath.XPathExpression xpathExpression;
 
diff --git a/spring-xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathTemplate.java b/spring-xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathTemplate.java
index f8076676..1f5c059a 100644
--- a/spring-xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathTemplate.java
+++ b/spring-xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathTemplate.java
@@ -164,7 +164,7 @@ public class Jaxp13XPathTemplate extends AbstractXPathTemplate {
 		return this.xpathFactory.newXPath();
 	}
 
-	private static class EvaluationCallback implements TraxUtils.SourceCallback {
+	private static final class EvaluationCallback implements TraxUtils.SourceCallback {
 
 		private final XPath xpath;
 
diff --git a/spring-xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollection.java b/spring-xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollection.java
index 99d58c3d..dc2859b3 100644
--- a/spring-xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollection.java
+++ b/spring-xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollection.java
@@ -236,7 +236,7 @@ public class CommonsXsdSchemaCollection implements XsdSchemaCollection, Initiali
 		return builder.toString();
 	}
 
-	private class ClasspathUriResolver extends DefaultURIResolver {
+	private final class ClasspathUriResolver extends DefaultURIResolver {
 
 		@Override
 		public InputSource resolveEntity(String namespace, String schemaLocation, String baseUri) {
diff --git a/spring-xml/src/test/java/org/springframework/xml/validation/XmlValidatorFactoryTest.java b/spring-xml/src/test/java/org/springframework/xml/validation/XmlValidatorFactoryTest.java
index bcbaff13..ad8329e8 100644
--- a/spring-xml/src/test/java/org/springframework/xml/validation/XmlValidatorFactoryTest.java
+++ b/spring-xml/src/test/java/org/springframework/xml/validation/XmlValidatorFactoryTest.java
@@ -56,7 +56,7 @@ public class XmlValidatorFactoryTest {
 			.createValidator(new ClassPathResource("schema.xsd", AbstractValidatorFactoryTest.class), "bla"));
 	}
 
-	private static class NonExistentResource extends AbstractResource {
+	private static final class NonExistentResource extends AbstractResource {
 
 		@Override
 		public Resource createRelative(String relativePath) throws IOException {