This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit bd37392705c0d616cec6588d52299729d92b3eda
Author: Andriy Redko <drr...@gmail.com>
AuthorDate: Tue Aug 1 21:27:41 2023 -0400

    Fix checkstyle violations
---
 ...ontrolledValidationXmlBeanDefinitionReader.java |  2 +-
 .../java/org/apache/cxf/staxutils/StaxUtils.java   |  2 +-
 .../cxf/validation/BeanValidationProvider.java     |  2 +-
 .../security/SecureAnnotationsInterceptorTest.java |  6 +--
 .../security/SimpleAuthorizingInterceptorTest.java |  6 +--
 .../transform/OutTransformWriterTest.java          |  2 +-
 .../java/org/apache/cxf/cdi/AbstractCXFBean.java   |  4 +-
 .../apache/cxf/cdi/JAXRSCdiResourceExtension.java  |  2 +-
 .../cxf/maven_plugin/AbstractCodegenMojo.java      |  2 +-
 .../cxf/binding/corba/CorbaServerConduit.java      |  2 +-
 .../DefaultExceptionClassProviderTest.java         |  2 +-
 .../org/apache/cxf/jaxrs/impl/MetadataMap.java     |  2 +-
 .../org/apache/cxf/jaxrs/impl/RequestImpl.java     |  2 +-
 .../cxf/jaxrs/provider/JAXRSDataBinding.java       |  4 +-
 .../apache/cxf/jaxrs/provider/ProviderFactory.java |  9 +++--
 .../org/apache/cxf/jaxrs/utils/JAXRSUtils.java     |  2 +-
 .../cxf/jaxrs/JAXRSServerFactoryBeanTest.java      |  4 +-
 .../apache/cxf/jaxrs/ext/xml/XMLSourceTest.java    |  6 +--
 .../impl/tl/ThreadLocalInvocationHandlerTest.java  |  2 +-
 .../cxf/jaxrs/provider/BinaryDataProviderTest.java |  2 +-
 .../jaxrs/provider/FormEncodingProviderTest.java   |  2 +-
 .../ProviderFactoryExceptionMapperTest.java        |  8 ++--
 .../cxf/jaxrs/provider/ProviderFactoryTest.java    | 46 +++++++++++-----------
 .../org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java |  4 +-
 .../apache/cxf/jaxrs/utils/ResourceUtilsTest.java  |  4 +-
 .../java/org/apache/cxf/jaxws/ServiceImplTest.java |  2 +-
 .../handler/soap/SOAPHandlerInterceptorTest.java   |  2 +-
 .../WebFaultOutInterceptorTestCase.java            |  2 +-
 .../java/org/apache/cxf/js/rhino/ServerApp.java    |  4 +-
 .../frontend/AbstractWSDLBasedEndpointFactory.java |  2 +-
 .../apache/cxf/jaxrs/client/AbstractClient.java    |  2 +-
 .../org/apache/cxf/jaxrs/client/WebClient.java     |  2 +-
 .../jaxrs/client/JAXRSClientFactoryBeanTest.java   |  2 +-
 .../org/apache/cxf/jaxrs/client/WebClientTest.java |  6 +--
 .../cxf/jaxrs/client/spec/ClientImplTest.java      |  2 +-
 .../apache/cxf/jaxrs/swagger/Swagger2Feature.java  |  2 +-
 .../apache/cxf/jaxrs/model/wadl/WadlGenerator.java |  6 +--
 .../model/wadl/ServerProviderFactoryTest.java      |  2 +-
 .../json/basic/JsonMapObjectReaderWriter.java      |  2 +-
 .../jaxrs/provider/jsrjsonb/JsrJsonbProvider.java  |  2 +-
 .../server/StreamingAsyncSubscriber.java           |  2 +-
 .../ext/search/DefaultParamConverterProvider.java  | 10 ++---
 .../ext/search/tika/TikaContentExtractor.java      |  2 +-
 .../search/SearchContextImplCustomParserTest.java  |  2 +-
 .../client/MicroProfileClientProviderFactory.java  |  2 +-
 .../org/apache/cxf/microprofile/client/Utils.java  |  2 +-
 .../jose/jws/NoneJwsSignatureProvider.java         |  2 +-
 .../jose/jws/NoneJwsSignatureVerifier.java         |  2 +-
 .../http_jetty/JettyHTTPServerEngineFactory.java   |  2 +-
 .../netty/client/integration/NettyClientTest.java  |  2 +-
 .../client/integration/SSLNettyClientTest.java     |  2 +-
 .../server/NettyHttpServletPipelineFactory.java    |  2 +-
 .../UndertowHTTPServerEngineFactory.java           |  2 +-
 .../jms/util/PollingMessageListenerContainer.java  |  4 +-
 .../AtmosphereWebSocketJettyDestination.java       |  2 +-
 .../AtmosphereWebSocketServletDestination.java     |  2 +-
 .../AtmosphereWebSocketUndertowDestination.java    |  2 +-
 .../jetty/WebSocketVirtualServletResponse.java     |  2 +-
 .../jetty9/Jetty9WebSocketDestination.java         |  2 +-
 .../undertow/WebSocketUndertowServletResponse.java |  2 +-
 .../AtmosphereWebSocketJettyDestinationTest.java   |  4 +-
 .../AtmosphereWebSocketServletDestinationTest.java |  4 +-
 .../cxf/ws/addressing/impl/MAPAggregatorTest.java  |  8 ++--
 .../org/apache/cxf/ws/rm/ManagedRMManagerTest.java |  2 +-
 ...ractUsernameTokenAuthenticatingInterceptor.java |  2 +-
 .../wss4j/PluggablePolicyValidatorTest.java        |  2 +-
 .../cxf/ws/security/wss4j/StaxRoundTripTest.java   |  2 +-
 .../ws/security/wss4j/WSS4JOutInterceptorTest.java |  2 +-
 .../cxf/sts/token/renewer/SAMLTokenRenewer.java    |  2 +-
 .../operation/ValidateJWTTransformationTest.java   |  2 +-
 .../validator/JWTTokenValidatorRealmTest.java      |  2 +-
 .../apache/cxf/systest/sts/jwt/JaxrsJWTTest.java   |  2 +-
 .../apache/cxf/systest/jaxrs/AsyncResource.java    |  2 +-
 .../cxf/systest/jaxrs/BookContinuationStore.java   |  4 +-
 .../org/apache/cxf/systest/jaxrs/BookServer.java   | 10 ++---
 .../org/apache/cxf/systest/jaxrs/BookServer20.java | 18 ++++-----
 .../cxf/systest/jaxrs/BookServerThrottled.java     |  2 +-
 .../org/apache/cxf/systest/jaxrs/BookStore.java    |  2 +-
 .../systest/jaxrs/JAXRS20ClientServerBookTest.java | 12 +++---
 .../cxf/systest/jaxrs/JAXRSAsyncClientTest.java    |  6 +--
 .../systest/jaxrs/JAXRSClientServerBookTest.java   |  2 +-
 .../JAXRSClientServerUserResourceDefaultTest.java  |  2 +-
 .../jaxrs/failover/AbstractFailoverTest.java       |  2 +-
 .../cxf/systest/jaxrs/failover/FailoverTest.java   |  2 +-
 .../security/jose/jwejws/JAXRSJweJwsTest.java      |  4 +-
 .../security/oauth2/grants/JAXRSOAuth2Test.java    |  2 +-
 .../security/oauth2/tls/JAXRSOAuth2TlsTest.java    |  2 +-
 .../apache/cxf/systest/hc5/jaxrs/BookStore.java    |  2 +-
 .../systest/hc5/jaxrs/JAXRSAsyncClientTest.java    |  6 +--
 .../http_undertow/UndertowBasicAuthTest.java       |  2 +-
 .../http_undertow/UndertowDigestAuthTest.java      |  2 +-
 .../cxf/systest/http_jetty/JettyBasicAuthTest.java |  2 +-
 .../systest/http_jetty/JettyDigestAuthTest.java    |  2 +-
 .../cxf/systest/bus/BusExtensionLoadingTest.java   |  2 +-
 .../cxf/systest/ws/rm/ManagedEndpointsTest.java    |  2 +-
 .../systest/ws/rm/MessageCallbackOnewayTest.java   |  2 +-
 .../cxf/systest/ws/rm/MessageLossSimulator.java    |  2 +-
 .../apache/cxf/systest/ws/rm/RedeliveryTest.java   |  2 +-
 .../systest/ws/rm/RobustServiceAtMostOnceTest.java |  2 +-
 .../systest/ws/rm/RobustServiceWithFaultTest.java  |  2 +-
 .../org/apache/cxf/systest/ws/rm/SequenceTest.java |  2 +-
 .../cxf/systest/ws/fault/ModifiedRequestTest.java  |  8 ++--
 .../apache/cxf/systest/ws/wssc/WSSCUnitTest.java   |  2 +-
 .../idlpreprocessor/IdlPreprocessorReaderTest.java |  2 +-
 .../cxf/tools/wadlto/jaxrs/SourceGenerator.java    |  4 +-
 105 files changed, 187 insertions(+), 186 deletions(-)

diff --git 
a/core/src/main/java/org/apache/cxf/bus/spring/ControlledValidationXmlBeanDefinitionReader.java
 
b/core/src/main/java/org/apache/cxf/bus/spring/ControlledValidationXmlBeanDefinitionReader.java
index 168673ce98..a47ff6f94e 100644
--- 
a/core/src/main/java/org/apache/cxf/bus/spring/ControlledValidationXmlBeanDefinitionReader.java
+++ 
b/core/src/main/java/org/apache/cxf/bus/spring/ControlledValidationXmlBeanDefinitionReader.java
@@ -69,7 +69,7 @@ public class ControlledValidationXmlBeanDefinitionReader 
extends XmlBeanDefiniti
     /**
      * Exception class used to avoid reading old FastInfoset files.
      */
-    private static class StaleFastinfosetException extends Exception {
+    private static final class StaleFastinfosetException extends Exception {
 
         private static final long serialVersionUID = -3594973504794187383L;
 
diff --git a/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java 
b/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
index 440968ce63..1062d3daf4 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
@@ -1640,7 +1640,7 @@ public final class StaxUtils {
         return addLocation(doc, node, reader.getLocation(), recordLoc);
     }
 
-    private static class LocationUserDataHandler implements UserDataHandler {
+    private static final class LocationUserDataHandler implements 
UserDataHandler {
         public static final LocationUserDataHandler INSTANCE = new 
LocationUserDataHandler();
 
         public void handle(short operation, String key, Object data, Node src, 
Node dst) {
diff --git 
a/core/src/main/java/org/apache/cxf/validation/BeanValidationProvider.java 
b/core/src/main/java/org/apache/cxf/validation/BeanValidationProvider.java
index 9652d481dd..14e4b74f2c 100644
--- a/core/src/main/java/org/apache/cxf/validation/BeanValidationProvider.java
+++ b/core/src/main/java/org/apache/cxf/validation/BeanValidationProvider.java
@@ -199,7 +199,7 @@ public class BeanValidationProvider implements 
AutoCloseable {
 
     // only created when there is a single validator/factory so it is safe to 
cache
     // note: the validator is passed as param to avoid to create useless ones
-    private static class RuntimeCache {
+    private static final class RuntimeCache {
         private final ConcurrentMap<Class<?>, Boolean> types = new 
ConcurrentHashMap<>();
         private final ConcurrentMap<Method, Boolean> params = new 
ConcurrentHashMap<>();
         private final ConcurrentMap<Method, Boolean> returnedValues = new 
ConcurrentHashMap<>();
diff --git 
a/core/src/test/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptorTest.java
 
b/core/src/test/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptorTest.java
index bb5c254056..64b7547f62 100644
--- 
a/core/src/test/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptorTest.java
+++ 
b/core/src/test/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptorTest.java
@@ -91,19 +91,19 @@ public class SecureAnnotationsInterceptorTest {
         String[] value();
     }
 
-    private static class TestService {
+    private static final class TestService {
         @SecureRolesAllowed("testRole")
         public void echo() {
         }
     }
 
-    private static class TestService2 {
+    private static final class TestService2 {
         @SecureRolesAllowed("baz")
         public void echo() {
         }
     }
 
-    private static class TestSecurityContext implements SecurityContext {
+    private static final class TestSecurityContext implements SecurityContext {
 
         public Principal getUserPrincipal() {
             return new SimplePrincipal("user");
diff --git 
a/core/src/test/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptorTest.java
 
b/core/src/test/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptorTest.java
index f8c63df455..0948f04278 100644
--- 
a/core/src/test/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptorTest.java
+++ 
b/core/src/test/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptorTest.java
@@ -191,14 +191,14 @@ public class SimpleAuthorizingInterceptorTest {
         in.handleMessage(message);
     }
 
-    private static class TestService {
+    private static final class TestService {
         @SuppressWarnings("unused")
         public void echo() {
 
         }
     }
 
-    private static class IncompleteSecurityContext implements SecurityContext {
+    private static final class IncompleteSecurityContext implements 
SecurityContext {
 
         public Principal getUserPrincipal() {
             return null;
@@ -210,7 +210,7 @@ public class SimpleAuthorizingInterceptorTest {
 
     }
 
-    private static class TestSecurityContext implements SecurityContext {
+    private static final class TestSecurityContext implements SecurityContext {
 
         public Principal getUserPrincipal() {
             return new Principal() {
diff --git 
a/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java
 
b/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java
index 435dded623..f7cd95a36a 100644
--- 
a/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java
+++ 
b/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java
@@ -141,7 +141,7 @@ public class OutTransformWriterTest {
         }
     }
 
-    private static class TestBean2 {
+    private static final class TestBean2 {
     }
 
     // additional test cases
diff --git 
a/integration/cdi/src/main/java/org/apache/cxf/cdi/AbstractCXFBean.java 
b/integration/cdi/src/main/java/org/apache/cxf/cdi/AbstractCXFBean.java
index 687f3a8c86..68d6052949 100644
--- a/integration/cdi/src/main/java/org/apache/cxf/cdi/AbstractCXFBean.java
+++ b/integration/cdi/src/main/java/org/apache/cxf/cdi/AbstractCXFBean.java
@@ -81,11 +81,11 @@ abstract class AbstractCXFBean<T> implements Bean<T> {
         return Collections.emptySet();
     }
 
-    private static class DefaultLiteral extends AnnotationLiteral<Default> 
implements Default {
+    private static final class DefaultLiteral extends 
AnnotationLiteral<Default> implements Default {
         private static final long serialVersionUID = 1L;
     }
 
-    private static class AnyLiteral extends AnnotationLiteral<Any> implements 
Any {
+    private static final class AnyLiteral extends AnnotationLiteral<Any> 
implements Any {
         private static final long serialVersionUID = 1L;
     }
 }
diff --git 
a/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java
 
b/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java
index 8f07435cb8..42dada4b72 100644
--- 
a/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java
+++ 
b/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java
@@ -98,7 +98,7 @@ public class JAXRSCdiResourceExtension implements Extension {
      * Holder of the classified resource classes, converted to appropriate 
instance
      * representations.
      */
-    private static class ClassifiedClasses {
+    private static final class ClassifiedClasses {
         private List< Object > providers = new ArrayList<>();
         private List< Feature > features = new ArrayList<>();
         private List<ResourceProvider> resourceProviders = new ArrayList<>();
diff --git 
a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMojo.java
 
b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMojo.java
index fdbc84c3fe..6c4c8a905d 100644
--- 
a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMojo.java
+++ 
b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMojo.java
@@ -735,7 +735,7 @@ public abstract class AbstractCodegenMojo extends 
AbstractMojo {
     /**
      * Parse each line of the output for "java.version" and see if the version 
is >= 9
      */
-    private static class Java9StreamConsumer implements StreamConsumer {
+    private static final class Java9StreamConsumer implements StreamConsumer {
         boolean java9;
 
         public void consumeLine(String line) {
diff --git 
a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaServerConduit.java
 
b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaServerConduit.java
index 5fa9273a46..f02636f381 100644
--- 
a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaServerConduit.java
+++ 
b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaServerConduit.java
@@ -152,7 +152,7 @@ public class CorbaServerConduit implements Conduit {
         }
     }
 
-    private class CorbaOutputStream extends CachedOutputStream {
+    private final class CorbaOutputStream extends CachedOutputStream {
 
         /**
          * Perform any actions required on stream flush (freeze headers, reset
diff --git 
a/rt/features/metrics/src/test/java/org/apache/cxf/metrics/micrometer/provider/DefaultExceptionClassProviderTest.java
 
b/rt/features/metrics/src/test/java/org/apache/cxf/metrics/micrometer/provider/DefaultExceptionClassProviderTest.java
index b99f79ad70..5e0dcb8fa3 100644
--- 
a/rt/features/metrics/src/test/java/org/apache/cxf/metrics/micrometer/provider/DefaultExceptionClassProviderTest.java
+++ 
b/rt/features/metrics/src/test/java/org/apache/cxf/metrics/micrometer/provider/DefaultExceptionClassProviderTest.java
@@ -122,7 +122,7 @@ public class DefaultExceptionClassProviderTest {
         assertThat(actual, is(nullValue()));
     }
 
-    private static class CauseException extends RuntimeException {
+    private static final class CauseException extends RuntimeException {
         private static final long serialVersionUID = 5321136931639340427L;
     }
 }
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MetadataMap.java 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MetadataMap.java
index 03283b2957..e424ce9696 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MetadataMap.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MetadataMap.java
@@ -225,7 +225,7 @@ public class MetadataMap<K, V> implements MultivaluedMap<K, 
V> {
         return m.toString();
     }
 
-    private static class KeyComparator<K> implements Comparator<K> {
+    private static final class KeyComparator<K> implements Comparator<K> {
 
         public int compare(K k1, K k2) {
             String s1 = k1.toString();
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
index 5921f1a071..5ea7cb16e6 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
@@ -338,7 +338,7 @@ public class RequestImpl implements Request {
         return null;
     }
 
-    private static class VariantComparator implements Comparator<Variant> {
+    private static final class VariantComparator implements 
Comparator<Variant> {
 
         static final VariantComparator INSTANCE = new VariantComparator();
 
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXRSDataBinding.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXRSDataBinding.java
index 54e60493ee..49371d7dac 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXRSDataBinding.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXRSDataBinding.java
@@ -106,7 +106,7 @@ public class JAXRSDataBinding extends AbstractDataBinding {
             (Map<String, List<Object>>)message.get(Message.PROTOCOL_HEADERS), 
true, true);
     }
 
-    private class MessageBodyDataWriter implements DataWriter<XMLStreamWriter> 
{
+    private final class MessageBodyDataWriter implements 
DataWriter<XMLStreamWriter> {
 
         public void write(Object obj, XMLStreamWriter output) {
             write(obj, null, output);
@@ -143,7 +143,7 @@ public class JAXRSDataBinding extends AbstractDataBinding {
         }
     }
 
-    private class MessageBodyDataReader implements DataReader<XMLStreamReader> 
{
+    private final class MessageBodyDataReader implements 
DataReader<XMLStreamReader> {
 
         public Object read(XMLStreamReader input) {
             throw new UnsupportedOperationException();
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
index 10341d6e10..c63cc628d6 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
@@ -869,7 +869,7 @@ public abstract class ProviderFactory {
         setProviders(true, false, userProviders.toArray());
     }
 
-    private static class MessageBodyReaderComparator
+    private static final class MessageBodyReaderComparator
         implements Comparator<ProviderInfo<MessageBodyReader<?>>> {
 
         public int compare(ProviderInfo<MessageBodyReader<?>> p1,
@@ -898,7 +898,7 @@ public abstract class ProviderFactory {
         }
     }
 
-    private static class MessageBodyWriterComparator
+    private static final class MessageBodyWriterComparator
         implements Comparator<ProviderInfo<MessageBodyWriter<?>>> {
 
         public int compare(ProviderInfo<MessageBodyWriter<?>> p1,
@@ -929,7 +929,8 @@ public abstract class ProviderFactory {
         }
     }
 
-    private static class ParamConverterProviderComparator implements 
Comparator<ProviderInfo<ParamConverterProvider>> {
+    private static final class ParamConverterProviderComparator
+            implements Comparator<ProviderInfo<ParamConverterProvider>> {
         private final Bus bus;
         
         ParamConverterProviderComparator(Bus bus) {
@@ -963,7 +964,7 @@ public abstract class ProviderFactory {
         return Integer.compare(AnnotationUtils.getBindingPriority(cl1), 
AnnotationUtils.getBindingPriority(cl2));
     }
 
-    private static class ContextResolverComparator
+    private static final class ContextResolverComparator
         implements Comparator<ProviderInfo<ContextResolver<?>>> {
 
         public int compare(ProviderInfo<ContextResolver<?>> p1,
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
index a97938fc19..3682a3c4d0 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
@@ -1009,7 +1009,7 @@ public final class JAXRSUtils {
         return Arrays.asList(params);
     }
 
-    private static class ParamTuple {
+    private static final class ParamTuple {
         private Class<?> param;
         private Type genericParam;
         private Annotation[] paramAnns;
diff --git 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBeanTest.java
 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBeanTest.java
index 18ea4b0e78..5b2cdeed8b 100644
--- 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBeanTest.java
+++ 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBeanTest.java
@@ -68,7 +68,7 @@ public class JAXRSServerFactoryBeanTest {
     }
 
 
-    private static class CustomExceptionMapper implements 
ExceptionMapper<Exception> {
+    private static final class CustomExceptionMapper implements 
ExceptionMapper<Exception> {
 
         public Response toResponse(Exception exception) {
             return null;
@@ -76,7 +76,7 @@ public class JAXRSServerFactoryBeanTest {
 
     }
 
-    private static class RuntimeExceptionMapper implements 
ExceptionMapper<RuntimeException> {
+    private static final class RuntimeExceptionMapper implements 
ExceptionMapper<RuntimeException> {
 
         public Response toResponse(RuntimeException exception) {
             return null;
diff --git 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/xml/XMLSourceTest.java
 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/xml/XMLSourceTest.java
index eea34d56ef..1fea195acc 100644
--- 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/xml/XMLSourceTest.java
+++ 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/xml/XMLSourceTest.java
@@ -281,16 +281,16 @@ public class XMLSourceTest {
     }
 
     @XmlRootElement
-    private static class Bar {
+    private static final class Bar {
 
     }
 
     @XmlRootElement(name = "bar", namespace = "http://baz";)
-    private static class Bar2 {
+    private static final class Bar2 {
 
     }
 
-    private static class Bar3 {
+    private static final class Bar3 {
 
         @XmlAttribute
         private String name;
diff --git 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalInvocationHandlerTest.java
 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalInvocationHandlerTest.java
index 8cf176e6cf..cc534b9c8b 100644
--- 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalInvocationHandlerTest.java
+++ 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalInvocationHandlerTest.java
@@ -95,7 +95,7 @@ public class ThreadLocalInvocationHandlerTest {
         void throwThrowable() throws Throwable;
     }
 
-    private class TestClass implements TestIface {
+    private final class TestClass implements TestIface {
 
         @Override
         public void throwCheckedException() throws Exception {
diff --git 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/BinaryDataProviderTest.java
 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/BinaryDataProviderTest.java
index 260e65bbd6..c8f1301080 100644
--- 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/BinaryDataProviderTest.java
+++ 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/BinaryDataProviderTest.java
@@ -134,7 +134,7 @@ public class BinaryDataProviderTest {
     }
 
 
-    private static class StreamingOutputImpl implements StreamingOutput {
+    private static final class StreamingOutputImpl implements StreamingOutput {
 
         public void write(OutputStream output) throws IOException {
             output.write("hi".getBytes());
diff --git 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java
 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java
index 86d900d8b9..aa225d3458 100644
--- 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java
+++ 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java
@@ -314,7 +314,7 @@ public class FormEncodingProviderTest {
 
     }
 
-    private static class CustomFormValidator implements FormValidator {
+    private static final class CustomFormValidator implements FormValidator {
 
         public void validate(MultivaluedMap<String, ? extends Object> params) {
             throw new WebApplicationException();
diff --git 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryExceptionMapperTest.java
 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryExceptionMapperTest.java
index 60fbcaa66d..7d532186c2 100644
--- 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryExceptionMapperTest.java
+++ 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryExceptionMapperTest.java
@@ -64,21 +64,21 @@ public class ProviderFactoryExceptionMapperTest {
                      exceptionMapper.getClass());
     }
 
-    private static class RuntimeExceptionMapper implements 
ExceptionMapper<RuntimeException> {
+    private static final class RuntimeExceptionMapper implements 
ExceptionMapper<RuntimeException> {
         @Override
         public Response toResponse(RuntimeException ex) {
             return null;
         }
     }
 
-    private static class RuntimeExceptionMapper1 implements 
ExceptionMapper<RuntimeException1> {
+    private static final class RuntimeExceptionMapper1 implements 
ExceptionMapper<RuntimeException1> {
         @Override
         public Response toResponse(RuntimeException1 ex) {
             return null;
         }
     }
 
-    private static class RuntimeExceptionMapper2 implements 
ExceptionMapper<RuntimeException2> {
+    private static final class RuntimeExceptionMapper2 implements 
ExceptionMapper<RuntimeException2> {
         @Override
         public Response toResponse(RuntimeException2 ex) {
             return null;
@@ -91,7 +91,7 @@ public class ProviderFactoryExceptionMapperTest {
     }
 
     @SuppressWarnings("serial")
-    private static class RuntimeException2 extends RuntimeException1 {
+    private static final class RuntimeException2 extends RuntimeException1 {
 
     }
 }
diff --git 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
index 191c0454aa..4ec08ade94 100644
--- 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
+++ 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
@@ -359,7 +359,7 @@ public class ProviderFactoryTest {
         assertEquals(DWriterInterceptor.class, 
iterator.next().getProvider().getClass());
     }
 
-    private static class AWriterInterceptor implements WriterInterceptor {
+    private static final class AWriterInterceptor implements WriterInterceptor 
{
         @Override
         public void aroundWriteTo(WriterInterceptorContext context) throws
             IOException, WebApplicationException {
@@ -367,7 +367,7 @@ public class ProviderFactoryTest {
         }
     }
 
-    private static class BWriterInterceptor implements WriterInterceptor {
+    private static final class BWriterInterceptor implements WriterInterceptor 
{
         @Override
         public void aroundWriteTo(WriterInterceptorContext context) throws
             IOException, WebApplicationException {
@@ -375,7 +375,7 @@ public class ProviderFactoryTest {
         }
     }
 
-    private static class CWriterInterceptor implements WriterInterceptor {
+    private static final class CWriterInterceptor implements WriterInterceptor 
{
         @Override
         public void aroundWriteTo(WriterInterceptorContext context) throws
             IOException, WebApplicationException {
@@ -383,7 +383,7 @@ public class ProviderFactoryTest {
         }
     }
 
-    private static class DWriterInterceptor implements WriterInterceptor {
+    private static final class DWriterInterceptor implements WriterInterceptor 
{
         @Override
         public void aroundWriteTo(WriterInterceptorContext context) throws
             IOException, WebApplicationException {
@@ -1207,7 +1207,7 @@ public class ProviderFactoryTest {
     }
 
     @Priority(1001)
-    private static class HighPriorityExceptionMapper implements 
ExceptionMapper<Exception> {
+    private static final class HighPriorityExceptionMapper implements 
ExceptionMapper<Exception> {
 
         @Override
         public Response toResponse(Exception exception) {
@@ -1216,7 +1216,7 @@ public class ProviderFactoryTest {
     }
 
     @Priority(2001)
-    private static class LowPriorityExceptionMapper implements 
ExceptionMapper<Exception> {
+    private static final class LowPriorityExceptionMapper implements 
ExceptionMapper<Exception> {
 
         @Override
         public Response toResponse(Exception exception) {
@@ -1224,7 +1224,7 @@ public class ProviderFactoryTest {
         }
     }
 
-    private static class TestRuntimeExceptionMapper implements 
ExceptionMapper<RuntimeException> {
+    private static final class TestRuntimeExceptionMapper implements 
ExceptionMapper<RuntimeException> {
 
         public Response toResponse(RuntimeException exception) {
             return null;
@@ -1233,7 +1233,7 @@ public class ProviderFactoryTest {
     }
 
     @Priority(100)
-    private static class LowPriorityContextResolver implements 
ContextResolver<String> {
+    private static final class LowPriorityContextResolver implements 
ContextResolver<String> {
 
         @Override
         public String getContext(Class<?> paramClass) {
@@ -1242,7 +1242,7 @@ public class ProviderFactoryTest {
     }
 
     @Priority(1)
-    private static class HighPriorityContextResolver implements 
ContextResolver<String> {
+    private static final class HighPriorityContextResolver implements 
ContextResolver<String> {
 
         @Override
         public String getContext(Class<?> paramClass) {
@@ -1253,7 +1253,7 @@ public class ProviderFactoryTest {
     @Priority(Priorities.USER - 10)
     @Produces("application/xml")
     @Consumes("application/xml")
-    private static class HighPriorityBookReaderWriter
+    private static final class HighPriorityBookReaderWriter
         implements MessageBodyReader<Book>, MessageBodyWriter<Book> {
 
         public boolean isReadable(Class<?> type, Type genericType, 
Annotation[] annotations,
@@ -1286,7 +1286,7 @@ public class ProviderFactoryTest {
 
     @Produces("application/xml")
     @Consumes("application/xml")
-    private static class BookReaderWriter
+    private static final class BookReaderWriter
         implements MessageBodyReader<Book>, MessageBodyWriter<Book> {
 
         public boolean isReadable(Class<?> type, Type genericType, 
Annotation[] annotations,
@@ -1319,7 +1319,7 @@ public class ProviderFactoryTest {
 
     @Produces("application/xml")
     @Consumes("application/xml")
-    private static class SuperBookReaderWriter
+    private static final class SuperBookReaderWriter
         implements MessageBodyReader<SuperBook>, MessageBodyWriter<SuperBook> {
 
         public boolean isReadable(Class<?> type, Type genericType, 
Annotation[] annotations,
@@ -1353,7 +1353,7 @@ public class ProviderFactoryTest {
 
     @Produces("application/xml")
     @Consumes("application/xml")
-    private static class SuperBookReaderWriter2<T>
+    private static final class SuperBookReaderWriter2<T>
         implements MessageBodyReader<T>, MessageBodyWriter<T> {
 
         public boolean isReadable(Class<?> type, Type genericType, 
Annotation[] annotations,
@@ -1404,7 +1404,7 @@ public class ProviderFactoryTest {
     }
     @Produces("*/*")
     @Consumes("*/*")
-    private static class WildcardReader2 implements MessageBodyReader<Object> {
+    private static final class WildcardReader2 implements 
MessageBodyReader<Object> {
 
         public boolean isReadable(Class<?> type, Type genericType, 
Annotation[] annotations,
                                   MediaType mediaType) {
@@ -1419,12 +1419,12 @@ public class ProviderFactoryTest {
 
     }
 
-    private static class RuntimeExceptionMapper1
+    private static final class RuntimeExceptionMapper1
         extends AbstractTestExceptionMapper<RuntimeException> {
 
     }
 
-    private static class RuntimeExceptionMapper2
+    private static final class RuntimeExceptionMapper2
         extends AbstractTestExceptionMapper<WebApplicationException> {
 
     }
@@ -1438,7 +1438,7 @@ public class ProviderFactoryTest {
 
     }
 
-    private static class ComplexMessageBodyReader extends ProviderBase<AClass> 
{
+    private static final class ComplexMessageBodyReader extends 
ProviderBase<AClass> {
     }
     private abstract static class ProviderBase<A> implements
         MessageBodyReader<Object>, MessageBodyWriter<Object> {
@@ -1474,10 +1474,10 @@ public class ProviderFactoryTest {
     public static class AClass {
     }
 
-    private static class SecurityExceptionMapper
+    private static final class SecurityExceptionMapper
         extends AbstractBadRequestExceptionMapper<SecurityException> {
     }
-    private static class CustomWebApplicationExceptionMapper
+    private static final class CustomWebApplicationExceptionMapper
         extends AbstractBadRequestExceptionMapper<WebApplicationException> {
     }
     private abstract static class AbstractBadRequestExceptionMapper<T extends 
Throwable>
@@ -1558,23 +1558,23 @@ public class ProviderFactoryTest {
     private static class RuntimeExceptionA extends RuntimeException {
         private static final long serialVersionUID = 1L;
     }
-    private static class RuntimeExceptionAA extends RuntimeExceptionA {
+    private static final class RuntimeExceptionAA extends RuntimeExceptionA {
         private static final long serialVersionUID = 1L;
     }
     private static class RuntimeExceptionB extends RuntimeException {
         private static final long serialVersionUID = 1L;
     }
-    private static class RuntimeExceptionBB extends RuntimeExceptionB {
+    private static final class RuntimeExceptionBB extends RuntimeExceptionB {
         private static final long serialVersionUID = 1L;
     }
-    private static class GoodRuntimeExceptionAMapper implements 
ExceptionMapper<RuntimeExceptionA> {
+    private static final class GoodRuntimeExceptionAMapper implements 
ExceptionMapper<RuntimeExceptionA> {
 
         @Override
         public Response toResponse(RuntimeExceptionA exception) {
             return null;
         }
     }
-    private static class GoodRuntimeExceptionBMapper implements 
ExceptionMapper<RuntimeExceptionB> {
+    private static final class GoodRuntimeExceptionBMapper implements 
ExceptionMapper<RuntimeExceptionB> {
 
         @Override
         public Response toResponse(RuntimeExceptionB exception) {
diff --git 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
index e4df29c7a5..ca8bd25583 100644
--- 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
+++ 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
@@ -2215,7 +2215,7 @@ public class JAXRSUtilsTest {
         }
 
     }
-    private static class LocaleParameterHandler implements 
ParamConverterProvider, ParamConverter<Locale> {
+    private static final class LocaleParameterHandler implements 
ParamConverterProvider, ParamConverter<Locale> {
 
         @SuppressWarnings("unchecked")
         @Override
@@ -2238,7 +2238,7 @@ public class JAXRSUtilsTest {
 
     }
 
-    private static class GenericObjectParameterHandler implements 
ParamConverterProvider,
+    private static final class GenericObjectParameterHandler implements 
ParamConverterProvider,
         ParamConverter<Query<String>> {
 
         @SuppressWarnings("unchecked")
diff --git 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java
 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java
index f3e89b3f9a..a584bd4414 100644
--- 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java
+++ 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java
@@ -439,12 +439,12 @@ public class ResourceUtilsTest {
 
     }
 
-    private static class SuperApplication extends BaseApplication {
+    private static final class SuperApplication extends BaseApplication {
 
     }
 
     @ApplicationPath("/custom")
-    private static class CustomApplication extends BaseApplication {
+    private static final class CustomApplication extends BaseApplication {
 
     }
 }
\ No newline at end of file
diff --git 
a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java 
b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java
index 5855f824d5..2b1fff2a03 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java
@@ -277,7 +277,7 @@ public class ServiceImplTest extends AbstractJaxWsTest {
         assertEquals(SOAPBinding.SOAP12HTTP_BINDING, info.getBindingID());
     }
 
-    private static class TestHandlerResolver implements HandlerResolver {
+    private static final class TestHandlerResolver implements HandlerResolver {
         private PortInfo info;
 
         public PortInfo getPortInfo() {
diff --git 
a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java
 
b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java
index e9af573baf..3a94ad9f69 100644
--- 
a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java
+++ 
b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java
@@ -556,7 +556,7 @@ public class SOAPHandlerInterceptorTest {
     }
 
 
-    private class CachedStream extends CachedOutputStream {
+    private final class CachedStream extends CachedOutputStream {
         protected void doFlush() throws IOException {
             currentStream.flush();
         }
diff --git 
a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptorTestCase.java
 
b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptorTestCase.java
index 9bc55ff794..e998be4b22 100644
--- 
a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptorTestCase.java
+++ 
b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptorTestCase.java
@@ -132,7 +132,7 @@ public class WebFaultOutInterceptorTestCase {
     }
 
     @SuppressWarnings("rawtypes") // old SAAJ API doesn't have generics
-    private class SOAPFaultStub implements SOAPFault {
+    private final class SOAPFaultStub implements SOAPFault {
 
         @Override
         public void setFaultCode(Name name) throws SOAPException {
diff --git 
a/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/ServerApp.java 
b/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/ServerApp.java
index df4ccb5041..78cf23b45f 100644
--- a/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/ServerApp.java
+++ b/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/ServerApp.java
@@ -134,8 +134,8 @@ public class ServerApp {
         return index;
     }
 
-    private static class JSFilter implements FileFilter {
-        public final boolean accept(File f) {
+    private static final class JSFilter implements FileFilter {
+        public boolean accept(File f) {
             if (f.isFile()) {
                 String name = f.getName();
                 return name.endsWith(".js") || name.endsWith(".jsx");
diff --git 
a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
 
b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
index 9d5715d8b5..952d04a98b 100644
--- 
a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
+++ 
b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
@@ -68,7 +68,7 @@ public abstract class AbstractWSDLBasedEndpointFactory 
extends AbstractEndpointF
     }
 
 
-    private class SoapBindingServiceConfiguration extends 
AbstractServiceConfiguration {
+    private final class SoapBindingServiceConfiguration extends 
AbstractServiceConfiguration {
         public String getStyle() {
             if (getBindingConfig() instanceof SoapBindingConfiguration
                 && 
((SoapBindingConfiguration)getBindingConfig()).isSetStyle()) {
diff --git 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
index dd42e677e0..8018f4b5be 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
@@ -1230,7 +1230,7 @@ public abstract class AbstractClient implements Client {
                                             OutputStream os) throws Fault;
     }
 
-    private class RetryableImpl implements Retryable {
+    private final class RetryableImpl implements Retryable {
 
         @Override
         public Object[] invoke(BindingOperationInfo oi, Object[] params, 
Map<String, Object> context,
diff --git 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java
index eaedd4b07a..9f5de1bf05 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java
@@ -1198,7 +1198,7 @@ public class WebClient extends AbstractClient {
     }
 
 
-    private class BodyWriter extends AbstractBodyWriter {
+    private final class BodyWriter extends AbstractBodyWriter {
 
         protected void doWriteBody(Message outMessage,
                                    Object body,
diff --git 
a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java
 
b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java
index c705fcb4b5..b13061fd88 100644
--- 
a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java
+++ 
b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java
@@ -270,7 +270,7 @@ public class JAXRSClientFactoryBeanTest {
     }
 
 
-    private class TestFeature extends AbstractFeature {
+    private final class TestFeature extends AbstractFeature {
         private TestInterceptor testInterceptor;
 
         @Override
diff --git 
a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/WebClientTest.java 
b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/WebClientTest.java
index d37a6b98c9..cf7037d4c3 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/WebClientTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/WebClientTest.java
@@ -344,7 +344,7 @@ public class WebClientTest {
         assertEquals("en_CA", 
wc.getHeaders().getFirst(HttpHeaders.CONTENT_LANGUAGE));
     }
 
-    private static class ParamConverterProviderImpl implements 
ParamConverterProvider {
+    private static final class ParamConverterProviderImpl implements 
ParamConverterProvider {
 
         @SuppressWarnings("unchecked")
         @Override
@@ -354,7 +354,7 @@ public class WebClientTest {
 
     }
 
-    private static class ParamConverterImpl implements 
ParamConverter<ComplexObject> {
+    private static final class ParamConverterImpl implements 
ParamConverter<ComplexObject> {
 
         @Override
         public ComplexObject fromString(String value) throws 
IllegalArgumentException {
@@ -367,7 +367,7 @@ public class WebClientTest {
         }
     }
 
-    private static class ComplexObject {
+    private static final class ComplexObject {
 
     }
 }
\ No newline at end of file
diff --git 
a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientImplTest.java
 
b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientImplTest.java
index 3aa3cdb393..1c123ed135 100644
--- 
a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientImplTest.java
+++ 
b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spec/ClientImplTest.java
@@ -57,7 +57,7 @@ public class ClientImplTest {
 
     private static final String MY_INTERCEPTOR_NAME = "MyInterceptor";
 
-    private static class MyInterceptor implements Interceptor<Message> {
+    private static final class MyInterceptor implements Interceptor<Message> {
         @Override
         public String toString() {
             return MY_INTERCEPTOR_NAME;
diff --git 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
index 64200b3267..972f7ad4b0 100644
--- 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
+++ 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
@@ -575,7 +575,7 @@ public class Swagger2Feature extends 
AbstractSwaggerFeature<Swagger2Feature.Port
             return SwaggerUi.findSwaggerUiRoot(swaggerUiMavenGroupAndArtifact, 
swaggerUiVersion);
         }
 
-        private class ServletConfigProvider implements 
ContextProvider<ServletConfig> {
+        private final class ServletConfigProvider implements 
ContextProvider<ServletConfig> {
 
             private String id = UUID.randomUUID().toString();
 
diff --git 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
 
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
index 240c1f0ade..7d8ea7096d 100644
--- 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
+++ 
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
@@ -2121,7 +2121,7 @@ public class WadlGenerator implements 
ContainerRequestFilter {
 
     }
 
-    private class XMLNameQNameResolver implements ElementQNameResolver {
+    private final class XMLNameQNameResolver implements ElementQNameResolver {
 
         @Override
         public QName resolve(Class<?> type, Annotation[] annotations, 
Map<Class<?>, QName> clsMap) {
@@ -2141,7 +2141,7 @@ public class WadlGenerator implements 
ContainerRequestFilter {
 
     }
 
-    private class SchemaQNameResolver implements ElementQNameResolver {
+    private final class SchemaQNameResolver implements ElementQNameResolver {
         private final Map<String, List<String>> map;
 
         SchemaQNameResolver(Map<String, List<String>> map) {
@@ -2331,7 +2331,7 @@ public class WadlGenerator implements 
ContainerRequestFilter {
     }
 
 
-    private class ResourceIdGeneratorImpl implements ResourceIdGenerator {
+    private final class ResourceIdGeneratorImpl implements ResourceIdGenerator 
{
 
         @Override
         public String getClassResourceId(ClassResourceInfo cri) {
diff --git 
a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/ServerProviderFactoryTest.java
 
b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/ServerProviderFactoryTest.java
index d90d6cd40b..752c101485 100644
--- 
a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/ServerProviderFactoryTest.java
+++ 
b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/ServerProviderFactoryTest.java
@@ -91,7 +91,7 @@ public class ServerProviderFactoryTest {
     }
 
     @PreMatching
-    private static class TestHandler implements ContainerRequestFilter {
+    private static final class TestHandler implements ContainerRequestFilter {
 
         @Override
         public void filter(ContainerRequestContext context) {
diff --git 
a/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriter.java
 
b/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriter.java
index 195b3275bd..a88e9bb211 100644
--- 
a/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriter.java
+++ 
b/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriter.java
@@ -321,7 +321,7 @@ public class JsonMapObjectReaderWriter {
     private interface Settable {
         void put(String key, Object value);
     }
-    private static class MapSettable implements Settable {
+    private static final class MapSettable implements Settable {
         private Map<String, Object> map = new LinkedHashMap<>();
         public void put(String key, Object value) {
             map.put(key, value);
diff --git 
a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsrjsonb/JsrJsonbProvider.java
 
b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsrjsonb/JsrJsonbProvider.java
index 2c4a037904..4e8baa95a6 100644
--- 
a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsrjsonb/JsrJsonbProvider.java
+++ 
b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsrjsonb/JsrJsonbProvider.java
@@ -62,7 +62,7 @@ public class JsrJsonbProvider implements 
MessageBodyReader<Object>, MessageBodyW
     /**
      * Create and capture only singleton instance of the Jsonb, if needed.
      */
-    private static class DefaultJsonbSupplier {
+    private static final class DefaultJsonbSupplier {
         private static final Jsonb INSTANCE = JsonbBuilder.create();
     }
      
diff --git 
a/rt/rs/extensions/reactivestreams/src/main/java/org/apache/cxf/jaxrs/reactivestreams/server/StreamingAsyncSubscriber.java
 
b/rt/rs/extensions/reactivestreams/src/main/java/org/apache/cxf/jaxrs/reactivestreams/server/StreamingAsyncSubscriber.java
index 680de9dd94..9843d39746 100644
--- 
a/rt/rs/extensions/reactivestreams/src/main/java/org/apache/cxf/jaxrs/reactivestreams/server/StreamingAsyncSubscriber.java
+++ 
b/rt/rs/extensions/reactivestreams/src/main/java/org/apache/cxf/jaxrs/reactivestreams/server/StreamingAsyncSubscriber.java
@@ -97,7 +97,7 @@ public class StreamingAsyncSubscriber<T> extends 
AbstractSubscriber<T> {
         queue.add(bean);
         super.requestNext();
     }
-    private class StreamingResponseImpl implements StreamingResponse<T> {
+    private final class StreamingResponseImpl implements StreamingResponse<T> {
 
         @Override
         public void writeTo(Writer<T> writer) throws IOException {
diff --git 
a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/DefaultParamConverterProvider.java
 
b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/DefaultParamConverterProvider.java
index 84f53df12f..a5e31bb7dd 100644
--- 
a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/DefaultParamConverterProvider.java
+++ 
b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/DefaultParamConverterProvider.java
@@ -41,7 +41,7 @@ public class DefaultParamConverterProvider implements 
ParamConverterProvider {
     /**
      * Date type converter.
      */
-    private static class DateParamConverter implements ParamConverter< Date > {
+    private static final class DateParamConverter implements ParamConverter< 
Date > {
         @Override
         public Date fromString(final String value) {
             return SearchUtils.dateFromStringWithDefaultFormats(value);
@@ -56,7 +56,7 @@ public class DefaultParamConverterProvider implements 
ParamConverterProvider {
     /**
      * Long type converter.
      */
-    private static class LongParamConverter implements ParamConverter< Long > {
+    private static final class LongParamConverter implements ParamConverter< 
Long > {
         @Override
         public Long fromString(final String value) {
             return Long.valueOf(value);
@@ -71,7 +71,7 @@ public class DefaultParamConverterProvider implements 
ParamConverterProvider {
     /**
      * Double type converter.
      */
-    private static class DoubleParamConverter implements ParamConverter< 
Double > {
+    private static final class DoubleParamConverter implements ParamConverter< 
Double > {
         @Override
         public Double fromString(final String value) {
             return Double.valueOf(value);
@@ -86,7 +86,7 @@ public class DefaultParamConverterProvider implements 
ParamConverterProvider {
     /**
      * Float type converter.
      */
-    private static class FloatParamConverter implements ParamConverter< Float 
> {
+    private static final class FloatParamConverter implements ParamConverter< 
Float > {
         @Override
         public Float fromString(final String value) {
             return Float.valueOf(value);
@@ -101,7 +101,7 @@ public class DefaultParamConverterProvider implements 
ParamConverterProvider {
     /**
      * Integer type converter.
      */
-    private static class IntegerParamConverter implements ParamConverter< 
Integer > {
+    private static final class IntegerParamConverter implements 
ParamConverter< Integer > {
         @Override
         public Integer fromString(final String value) {
             return Integer.valueOf(value);
diff --git 
a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/tika/TikaContentExtractor.java
 
b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/tika/TikaContentExtractor.java
index 128c12dd81..77460087e9 100644
--- 
a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/tika/TikaContentExtractor.java
+++ 
b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/tika/TikaContentExtractor.java
@@ -303,7 +303,7 @@ public class TikaContentExtractor {
         }
     }
 
-    private static class IgnoreContentHandler extends ToTextContentHandler {
+    private static final class IgnoreContentHandler extends 
ToTextContentHandler {
         @Override
         public void characters(char[] ch, int start, int length) throws 
SAXException {
             // Complete
diff --git 
a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchContextImplCustomParserTest.java
 
b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchContextImplCustomParserTest.java
index 506e3fbb4f..235f382c08 100644
--- 
a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchContextImplCustomParserTest.java
+++ 
b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SearchContextImplCustomParserTest.java
@@ -40,7 +40,7 @@ public class SearchContextImplCustomParserTest {
         assertFalse(sc.isMet(new Color("blue")));
     }
 
-    private static class CustomParser implements SearchConditionParser<Color> {
+    private static final class CustomParser implements 
SearchConditionParser<Color> {
 
         @Override
         public SearchCondition<Color> parse(String searchExpression) throws 
SearchParseException {
diff --git 
a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/MicroProfileClientProviderFactory.java
 
b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/MicroProfileClientProviderFactory.java
index e73991d509..05d0af82a7 100644
--- 
a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/MicroProfileClientProviderFactory.java
+++ 
b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/MicroProfileClientProviderFactory.java
@@ -149,7 +149,7 @@ public final class MicroProfileClientProviderFactory 
extends ProviderFactory {
                 .getContextualProperty(Configuration.class.getName());
     }
 
-    private class ResponseExceptionMapperComparator implements 
Comparator<ResponseExceptionMapper<?>> {
+    private final class ResponseExceptionMapperComparator implements 
Comparator<ResponseExceptionMapper<?>> {
 
         @Override
         public int compare(ResponseExceptionMapper<?> oLeft, 
ResponseExceptionMapper<?> oRight) {
diff --git 
a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/Utils.java
 
b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/Utils.java
index 7b1edadcc1..5e6d7086b6 100644
--- 
a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/Utils.java
+++ 
b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/Utils.java
@@ -51,7 +51,7 @@ public final class Utils {
         return new LazyForkJoinExecutor();
     }
     
-    private static class LazyForkJoinExecutor implements ExecutorService {
+    private static final class LazyForkJoinExecutor implements ExecutorService 
{
         @Override
         public void execute(Runnable command) {
             getCommonPool().execute(command);
diff --git 
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/NoneJwsSignatureProvider.java
 
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/NoneJwsSignatureProvider.java
index ed95713f7c..7acc86b52b 100644
--- 
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/NoneJwsSignatureProvider.java
+++ 
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/NoneJwsSignatureProvider.java
@@ -37,7 +37,7 @@ public class NoneJwsSignatureProvider implements 
JwsSignatureProvider {
     public byte[] sign(JwsHeaders headers, byte[] content) {
         return EMPTY_BYTE_ARRAY;
     }
-    private static class NoneJwsSignature implements JwsSignature {
+    private static final class NoneJwsSignature implements JwsSignature {
 
         @Override
         public void update(byte[] src, int off, int len) {
diff --git 
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/NoneJwsSignatureVerifier.java
 
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/NoneJwsSignatureVerifier.java
index 22b51a51a0..a0708dc52e 100644
--- 
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/NoneJwsSignatureVerifier.java
+++ 
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/NoneJwsSignatureVerifier.java
@@ -38,7 +38,7 @@ public class NoneJwsSignatureVerifier implements 
JwsSignatureVerifier {
         return new NoneJwsVerificationSignature();
     }
 
-    private static class NoneJwsVerificationSignature implements 
JwsVerificationSignature {
+    private static final class NoneJwsVerificationSignature implements 
JwsVerificationSignature {
 
         @Override
         public void update(byte[] src, int off, int len) {
diff --git 
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
 
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
index 375a817eb6..db5bf20475 100644
--- 
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
+++ 
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
@@ -142,7 +142,7 @@ public class JettyHTTPServerEngineFactory {
             }
         }
     }
-    private class JettyBusLifeCycleListener implements BusLifeCycleListener {
+    private final class JettyBusLifeCycleListener implements 
BusLifeCycleListener {
         public void initComplete() {
             JettyHTTPServerEngineFactory.this.initComplete();
         }
diff --git 
a/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/integration/NettyClientTest.java
 
b/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/integration/NettyClientTest.java
index f0db95f25a..005844e227 100644
--- 
a/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/integration/NettyClientTest.java
+++ 
b/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/integration/NettyClientTest.java
@@ -131,7 +131,7 @@ public class NettyClientTest extends 
AbstractBusClientServerTestBase {
 
     }
 
-    private class MyLaterResponseHandler implements 
AsyncHandler<GreetMeLaterResponse> {
+    private final class MyLaterResponseHandler implements 
AsyncHandler<GreetMeLaterResponse> {
         GreetMeLaterResponse response;
         @Override
         public void handleResponse(Response<GreetMeLaterResponse> res) {
diff --git 
a/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/integration/SSLNettyClientTest.java
 
b/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/integration/SSLNettyClientTest.java
index 94c6cf4003..6b11326f94 100644
--- 
a/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/integration/SSLNettyClientTest.java
+++ 
b/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/integration/SSLNettyClientTest.java
@@ -164,7 +164,7 @@ public class SSLNettyClientTest extends 
AbstractBusClientServerTestBase {
         return fac.getKeyManagers();
     }
 
-    private class MyLaterResponseHandler implements 
AsyncHandler<GreetMeLaterResponse> {
+    private final class MyLaterResponseHandler implements 
AsyncHandler<GreetMeLaterResponse> {
         GreetMeLaterResponse response;
         @Override
         public void handleResponse(Response<GreetMeLaterResponse> res) {
diff --git 
a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServletPipelineFactory.java
 
b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServletPipelineFactory.java
index cdc93500ca..5b28c2355f 100644
--- 
a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServletPipelineFactory.java
+++ 
b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServletPipelineFactory.java
@@ -285,7 +285,7 @@ public class NettyHttpServletPipelineFactory extends 
ChannelInitializer<Channel>
         return null;
     }
 
-    private class HttpSessionWatchdog implements Runnable {
+    private final class HttpSessionWatchdog implements Runnable {
 
         private boolean shouldStopWatching;
 
diff --git 
a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineFactory.java
 
b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineFactory.java
index ac269e4fa1..ebc1d28fc1 100644
--- 
a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineFactory.java
+++ 
b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineFactory.java
@@ -137,7 +137,7 @@ public class UndertowHTTPServerEngineFactory {
             }
         }
     }
-    private class UndertowBusLifeCycleListener implements BusLifeCycleListener 
{
+    private final class UndertowBusLifeCycleListener implements 
BusLifeCycleListener {
         public void initComplete() {
             UndertowHTTPServerEngineFactory.this.initComplete();
         }
diff --git 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
index 8b2d24a774..8ce260eddf 100644
--- 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
+++ 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/PollingMessageListenerContainer.java
@@ -65,7 +65,7 @@ public class PollingMessageListenerContainer extends 
AbstractMessageListenerCont
         this.exceptionListener = exceptionListener;
     }
 
-    private class Poller implements Runnable {
+    private final class Poller implements Runnable {
 
         @Override
         public void run() {
@@ -120,7 +120,7 @@ public class PollingMessageListenerContainer extends 
AbstractMessageListenerCont
 
     }
 
-    private class XAPoller implements Runnable {
+    private final class XAPoller implements Runnable {
 
         @Override
         public void run() {
diff --git 
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestination.java
 
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestination.java
index 6f32514bb8..ae0b48f854 100644
--- 
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestination.java
+++ 
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestination.java
@@ -180,7 +180,7 @@ public class AtmosphereWebSocketJettyDestination extends 
JettyHTTPDestination im
         }
     }
 
-    private class DestinationHandler extends 
AbstractReflectorAtmosphereHandler {
+    private final class DestinationHandler extends 
AbstractReflectorAtmosphereHandler {
 
         @Override
         public void onRequest(final AtmosphereResource resource) throws 
IOException {
diff --git 
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketServletDestination.java
 
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketServletDestination.java
index 28bea32897..04973f9071 100644
--- 
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketServletDestination.java
+++ 
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketServletDestination.java
@@ -181,7 +181,7 @@ public class AtmosphereWebSocketServletDestination extends 
ServletDestination im
         }
     }
 
-    private class DestinationHandler extends 
AbstractReflectorAtmosphereHandler {
+    private final class DestinationHandler extends 
AbstractReflectorAtmosphereHandler {
 
         @Override
         public void onRequest(final AtmosphereResource resource) throws 
IOException {
diff --git 
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketUndertowDestination.java
 
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketUndertowDestination.java
index dafb898cec..e49d45dc60 100644
--- 
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketUndertowDestination.java
+++ 
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketUndertowDestination.java
@@ -279,7 +279,7 @@ public class AtmosphereWebSocketUndertowDestination extends 
UndertowHTTPDestinat
         }
     }
 
-    private class DestinationHandler extends 
AbstractReflectorAtmosphereHandler {
+    private final class DestinationHandler extends 
AbstractReflectorAtmosphereHandler {
 
         @Override
         public void onRequest(final AtmosphereResource resource) throws 
IOException {
diff --git 
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/WebSocketVirtualServletResponse.java
 
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/WebSocketVirtualServletResponse.java
index 68c35861b4..846127ec90 100644
--- 
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/WebSocketVirtualServletResponse.java
+++ 
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/WebSocketVirtualServletResponse.java
@@ -374,7 +374,7 @@ public class WebSocketVirtualServletResponse implements 
HttpServletResponse {
         //CHECKSTYLE:ON
     }
 
-    private static class InternalByteArrayOutputStream extends 
ByteArrayOutputStream {
+    private static final class InternalByteArrayOutputStream extends 
ByteArrayOutputStream {
         public byte[] getBytes() {
             return buf;
         }
diff --git 
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty9/Jetty9WebSocketDestination.java
 
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty9/Jetty9WebSocketDestination.java
index 20e4f8cf1c..db6c862c8d 100644
--- 
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty9/Jetty9WebSocketDestination.java
+++ 
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty9/Jetty9WebSocketDestination.java
@@ -233,7 +233,7 @@ public class Jetty9WebSocketDestination extends 
JettyHTTPDestination implements
     }
 
     // hide this jetty9 interface here to avoid CNFE on WebSocketCreator
-    private class Creator implements WebSocketCreator {
+    private final class Creator implements WebSocketCreator {
 
         @Override
         public Object createWebSocket(ServletUpgradeRequest req, 
ServletUpgradeResponse resp) {
diff --git 
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/undertow/WebSocketUndertowServletResponse.java
 
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/undertow/WebSocketUndertowServletResponse.java
index 2df92580d0..3492abb275 100644
--- 
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/undertow/WebSocketUndertowServletResponse.java
+++ 
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/undertow/WebSocketUndertowServletResponse.java
@@ -378,7 +378,7 @@ public class WebSocketUndertowServletResponse implements 
HttpServletResponse {
         //CHECKSTYLE:ON
     }
 
-    private static class InternalByteArrayOutputStream extends 
ByteArrayOutputStream {
+    private static final class InternalByteArrayOutputStream extends 
ByteArrayOutputStream {
         public byte[] getBytes() {
             return buf;
         }
diff --git 
a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestinationTest.java
 
b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestinationTest.java
index 93116165f2..39210f72b5 100644
--- 
a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestinationTest.java
+++ 
b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketJettyDestinationTest.java
@@ -112,8 +112,8 @@ public class AtmosphereWebSocketJettyDestinationTest {
         assertEquals(2, added);
     }
 
-    private static class CustomInterceptor1 extends DefaultProtocolInterceptor 
{
+    private static final class CustomInterceptor1 extends 
DefaultProtocolInterceptor {
     }
-    private static class CustomInterceptor2 extends DefaultProtocolInterceptor 
{
+    private static final class CustomInterceptor2 extends 
DefaultProtocolInterceptor {
     }
 }
\ No newline at end of file
diff --git 
a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketServletDestinationTest.java
 
b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketServletDestinationTest.java
index 2bc8870b35..fc7018d358 100644
--- 
a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketServletDestinationTest.java
+++ 
b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketServletDestinationTest.java
@@ -154,8 +154,8 @@ public class AtmosphereWebSocketServletDestinationTest {
         }
     }
 
-    private static class CustomInterceptor1 extends DefaultProtocolInterceptor 
{
+    private static final class CustomInterceptor1 extends 
DefaultProtocolInterceptor {
     }
-    private static class CustomInterceptor2 extends DefaultProtocolInterceptor 
{
+    private static final class CustomInterceptor2 extends 
DefaultProtocolInterceptor {
     }
 }
\ No newline at end of file
diff --git 
a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java
 
b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java
index c00d9fb0ff..01793182fa 100644
--- 
a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java
+++ 
b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java
@@ -1020,10 +1020,10 @@ public class MAPAggregatorTest {
         String op();
     }
 
-    private static class TestBindingMessageInfo extends BindingMessageInfo {
+    private static final class TestBindingMessageInfo extends 
BindingMessageInfo {
     }
 
-    private static class TestBindingOperationInfo extends BindingOperationInfo 
{
+    private static final class TestBindingOperationInfo extends 
BindingOperationInfo {
         private Map<QName, BindingFaultInfo> faults;
 
         TestBindingOperationInfo(OperationInfo oi) {
@@ -1052,7 +1052,7 @@ public class MAPAggregatorTest {
         }
     }
 
-    private static class SetupMessageArgs {
+    private static final class SetupMessageArgs {
         boolean requestor;
         boolean outbound;
         boolean oneway;
@@ -1064,7 +1064,7 @@ public class MAPAggregatorTest {
         boolean noMessageId;
     }
 
-    private static class SetupResponderArgs {
+    private static final class SetupResponderArgs {
         boolean outbound;
         boolean oneway;
         boolean decoupled;
diff --git 
a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java 
b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java
index 9238408334..0f0af6c48d 100755
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java
@@ -549,7 +549,7 @@ public class ManagedRMManagerTest {
         }
     }
 
-    private static class TestRetransmissionStatus implements RetryStatus {
+    private static final class TestRetransmissionStatus implements RetryStatus 
{
         private long interval = 300000L;
         private Date next = new Date(System.currentTimeMillis() + interval / 
2);
         private Date previous = new Date(next.getTime() - interval);
diff --git 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractUsernameTokenAuthenticatingInterceptor.java
 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractUsernameTokenAuthenticatingInterceptor.java
index af3f4fb509..2999cd9d2b 100644
--- 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractUsernameTokenAuthenticatingInterceptor.java
+++ 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractUsernameTokenAuthenticatingInterceptor.java
@@ -255,7 +255,7 @@ public abstract class 
AbstractUsernameTokenAuthenticatingInterceptor extends WSS
 
     }
 
-    private static class UsernameTokenSecurityContextCreator extends 
DefaultWSS4JSecurityContextCreator {
+    private static final class UsernameTokenSecurityContextCreator extends 
DefaultWSS4JSecurityContextCreator {
 
         @Override
         protected SecurityContext createSecurityContext(final Principal p) {
diff --git 
a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/PluggablePolicyValidatorTest.java
 
b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/PluggablePolicyValidatorTest.java
index c84ef8c2e4..77733e40a8 100644
--- 
a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/PluggablePolicyValidatorTest.java
+++ 
b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/PluggablePolicyValidatorTest.java
@@ -164,7 +164,7 @@ public class PluggablePolicyValidatorTest extends 
AbstractPolicySecurityTest {
         }
     }
 
-    private static class NOOpPolicyValidator implements 
SecurityPolicyValidator {
+    private static final class NOOpPolicyValidator implements 
SecurityPolicyValidator {
 
         @Override
         public boolean canValidatePolicy(AssertionInfo assertionInfo) {
diff --git 
a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripTest.java
 
b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripTest.java
index 8986d0e261..663cad540a 100644
--- 
a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripTest.java
+++ 
b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripTest.java
@@ -1157,7 +1157,7 @@ public class StaxRoundTripTest extends 
AbstractSecurityTest {
         return (Echo)proxyFac.create();
     }
 
-    private static class UnknownUserPasswordCallbackHandler implements 
CallbackHandler {
+    private static final class UnknownUserPasswordCallbackHandler implements 
CallbackHandler {
 
         private static Map<String, String> passwords = new HashMap<>();
 
diff --git 
a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptorTest.java
 
b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptorTest.java
index 02345ba390..1edd545e74 100644
--- 
a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptorTest.java
+++ 
b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptorTest.java
@@ -223,7 +223,7 @@ public class WSS4JOutInterceptorTest extends 
AbstractSecurityTest {
         assertEquals(1, action.getExecutions());
     }
 
-    private static class CountingUsernameTokenAction extends 
UsernameTokenAction {
+    private static final class CountingUsernameTokenAction extends 
UsernameTokenAction {
 
         private int executions;
 
diff --git 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java
 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java
index ac1e004965..24db986cf7 100644
--- 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java
+++ 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java
@@ -537,7 +537,7 @@ public class SAMLTokenRenewer extends 
AbstractSAMLTokenProvider implements Token
         return assertion.getSaml1().getConditions().getNotOnOrAfter();
     }
 
-    private static class ProofOfPossessionValidator {
+    private static final class ProofOfPossessionValidator {
 
         public boolean checkProofOfPossession(
             TokenRenewerParameters tokenParameters,
diff --git 
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTTransformationTest.java
 
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTTransformationTest.java
index f48834b8e5..36427a1d9c 100644
--- 
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTTransformationTest.java
+++ 
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTTransformationTest.java
@@ -417,7 +417,7 @@ public class ValidateJWTTransformationTest {
         return samlRealms;
     }
 
-    private static class CustomJWTRealmCodec implements JWTRealmCodec {
+    private static final class CustomJWTRealmCodec implements JWTRealmCodec {
 
         public String getRealmFromToken(JwtToken token) {
             if ("alice".equals(token.getClaim(JwtConstants.CLAIM_SUBJECT))) {
diff --git 
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorRealmTest.java
 
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorRealmTest.java
index 281481e074..14be6e7851 100644
--- 
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorRealmTest.java
+++ 
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorRealmTest.java
@@ -275,7 +275,7 @@ public class JWTTokenValidatorRealmTest {
     /**
      * This class returns a realm associated with a JWTToken depending on the 
issuer.
      */
-    private static class IssuerJWTRealmCodec implements JWTRealmCodec {
+    private static final class IssuerJWTRealmCodec implements JWTRealmCodec {
 
         public String getRealmFromToken(JwtToken token) {
             if ("A-Issuer".equals(token.getClaim(JwtConstants.CLAIM_ISSUER))) {
diff --git 
a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JaxrsJWTTest.java
 
b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JaxrsJWTTest.java
index 846a0b1c80..cf440e37d7 100644
--- 
a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JaxrsJWTTest.java
+++ 
b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JaxrsJWTTest.java
@@ -110,7 +110,7 @@ public class JaxrsJWTTest extends 
AbstractBusClientServerTestBase {
         return stsClient;
     }
 
-    private static class JwtOutFilter implements ClientRequestFilter {
+    private static final class JwtOutFilter implements ClientRequestFilter {
 
         @Override
         public void filter(ClientRequestContext requestContext) throws 
IOException {
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AsyncResource.java 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AsyncResource.java
index 1f700e3022..55aba091fa 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AsyncResource.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AsyncResource.java
@@ -95,7 +95,7 @@ public class AsyncResource {
         return Response.status(Status.EXPECTATION_FAILED);
     }
 
-    private static class AsyncResponseQueue {
+    private static final class AsyncResponseQueue {
         BlockingQueue<AsyncResponse> queue = new ArrayBlockingQueue<>(1);
 
         public void add(AsyncResponse asyncResponse) {
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookContinuationStore.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookContinuationStore.java
index 4013c909bc..5ac92073f2 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookContinuationStore.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookContinuationStore.java
@@ -282,7 +282,7 @@ public class BookContinuationStore implements 
BookAsyncInterface {
 
     }
 
-    private class CancelTimeoutHandlerImpl implements TimeoutHandler {
+    private final class CancelTimeoutHandlerImpl implements TimeoutHandler {
 
         @Override
         public void handleTimeout(AsyncResponse asyncResponse) {
@@ -292,7 +292,7 @@ public class BookContinuationStore implements 
BookAsyncInterface {
 
     }
 
-    private class CallbackImpl implements CompletionCallback {
+    private final class CallbackImpl implements CompletionCallback {
 
         @Override
         public void onComplete(Throwable throwable) {
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java
index f062b40ace..11980aa227 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java
@@ -149,7 +149,7 @@ public class BookServer extends 
AbstractServerTestServerBase {
         new BookServer().start();
     }
 
-    private static class BusMapperExceptionMapper implements 
ExceptionMapper<BusMapperException> {
+    private static final class BusMapperExceptionMapper implements 
ExceptionMapper<BusMapperException> {
 
         public Response toResponse(BusMapperException exception) {
             return 
Response.serverError().type("text/plain;charset=utf-8").header("BusMapper", 
"the-mapper")
@@ -158,7 +158,7 @@ public class BookServer extends 
AbstractServerTestServerBase {
 
     }
     @PreMatching
-    private static class BlockingRequestFilter implements 
ContainerRequestFilter {
+    private static final class BlockingRequestFilter implements 
ContainerRequestFilter {
 
         @Override
         public void filter(ContainerRequestContext requestContext) throws 
IOException {
@@ -169,7 +169,7 @@ public class BookServer extends 
AbstractServerTestServerBase {
         }
 
     }
-    private static class FaultyResponseFilter implements 
ContainerResponseFilter {
+    private static final class FaultyResponseFilter implements 
ContainerResponseFilter {
         @Override
         public void filter(ContainerRequestContext requestContext, 
ContainerResponseContext responseContext)
             throws IOException {
@@ -179,7 +179,7 @@ public class BookServer extends 
AbstractServerTestServerBase {
         }
 
     }
-    private static class BlockedExceptionMapper implements 
ExceptionMapper<BlockedException> {
+    private static final class BlockedExceptionMapper implements 
ExceptionMapper<BlockedException> {
 
         @Override
         public Response toResponse(BlockedException exception) {
@@ -272,7 +272,7 @@ public class BookServer extends 
AbstractServerTestServerBase {
             }
 
         }
-        private static class ByteConverter implements ParamConverter<Byte> {
+        private static final class ByteConverter implements 
ParamConverter<Byte> {
             @Override
             public Byte fromString(String t) {
                 return Byte.valueOf(t);
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer20.java 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer20.java
index 8a052540a5..764cfa7a0e 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer20.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer20.java
@@ -125,7 +125,7 @@ public class BookServer20 extends 
AbstractServerTestServerBase {
 
     @PreMatching
     @Priority(1)
-    private static class PreMatchContainerRequestFilter implements 
ContainerRequestFilter {
+    private static final class PreMatchContainerRequestFilter implements 
ContainerRequestFilter {
 
         @Override
         public void filter(ContainerRequestContext context) throws IOException 
{
@@ -182,7 +182,7 @@ public class BookServer20 extends 
AbstractServerTestServerBase {
 
     @PreMatching
     @Priority(3)
-    private static class PreMatchContainerRequestFilter2 implements 
ContainerRequestFilter {
+    private static final class PreMatchContainerRequestFilter2 implements 
ContainerRequestFilter {
         @Context
         private HttpServletRequest servletRequest;
         @Override
@@ -199,7 +199,7 @@ public class BookServer20 extends 
AbstractServerTestServerBase {
     }
 
     @PreMatching
-    private static class PreMatchReplaceStreamOrAddress implements 
ContainerRequestFilter {
+    private static final class PreMatchReplaceStreamOrAddress implements 
ContainerRequestFilter {
         @Context
         private UriInfo ui;
         @Override
@@ -233,7 +233,7 @@ public class BookServer20 extends 
AbstractServerTestServerBase {
 
     @PreMatching
     @Priority(2)
-    private static class PreMatchDynamicContainerRequestFilter implements 
ContainerRequestFilter {
+    private static final class PreMatchDynamicContainerRequestFilter 
implements ContainerRequestFilter {
 
         @Override
         public void filter(ContainerRequestContext context) throws IOException 
{
@@ -246,7 +246,7 @@ public class BookServer20 extends 
AbstractServerTestServerBase {
     }
 
     @CustomHeaderAdded
-    private static class PostMatchContainerRequestFilter implements 
ContainerRequestFilter {
+    private static final class PostMatchContainerRequestFilter implements 
ContainerRequestFilter {
         @Context
         private UriInfo ui;
         @Override
@@ -267,7 +267,7 @@ public class BookServer20 extends 
AbstractServerTestServerBase {
 
     @Faulty
     @CustomHeaderAdded
-    private static class FaultyContainerRequestFilter implements 
ContainerRequestFilter {
+    private static final class FaultyContainerRequestFilter implements 
ContainerRequestFilter {
 
         @Override
         public void filter(ContainerRequestContext context) throws IOException 
{
@@ -525,7 +525,7 @@ public class BookServer20 extends 
AbstractServerTestServerBase {
         }
 
     }
-    private static class ServerTestFeature implements Feature {
+    private static final class ServerTestFeature implements Feature {
 
         @Context
         private Application app;
@@ -540,7 +540,7 @@ public class BookServer20 extends 
AbstractServerTestServerBase {
         }
 
     }
-    private static class IOExceptionMapper implements 
ExceptionMapper<IOException> {
+    private static final class IOExceptionMapper implements 
ExceptionMapper<IOException> {
 
         @Override
         public Response toResponse(IOException ex) {
@@ -551,7 +551,7 @@ public class BookServer20 extends 
AbstractServerTestServerBase {
     }
     
     @Provider
-    private class GregorianCalendarMessageBodyWriter implements 
MessageBodyWriter<GregorianCalendar> {
+    private final class GregorianCalendarMessageBodyWriter implements 
MessageBodyWriter<GregorianCalendar> {
         @Override
         public boolean isWriteable(Class<?> type, Type genericType, 
Annotation[] annotations, MediaType mediaType) {
             return GregorianCalendar.class.equals(type);
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerThrottled.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerThrottled.java
index d9a3d50d5e..0f120e8892 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerThrottled.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerThrottled.java
@@ -55,7 +55,7 @@ public class BookServerThrottled extends 
AbstractServerTestServerBase {
         new BookServerThrottled().start();
     }
 
-    private static class ThrottlingManagerImpl implements ThrottlingManager {
+    private static final class ThrottlingManagerImpl implements 
ThrottlingManager {
 
         @Override
         public List<String> getDecisionPhases() {
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
index 67bd97f8fa..7e620d9767 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
@@ -1959,7 +1959,7 @@ public class BookStore {
         }
 
     }
-    private class ResponseStreamingOutputImpl implements StreamingOutput {
+    private final class ResponseStreamingOutputImpl implements StreamingOutput 
{
         public void write(OutputStream output) throws IOException, 
WebApplicationException {
             if 
(!"text/plain".equals(BookStore.this.messageContext.get("Content-Type"))) {
                 throw new RuntimeException();
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
index 7d9dae6af6..2f4bb40996 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
@@ -980,7 +980,7 @@ public class JAXRS20ClientServerBookTest extends 
AbstractBusClientServerTestBase
             + "javax.ws.rs.ext.Provider,javax.ws.rs.Consumes}"));
     }
     
-    private static class ReplaceBodyFilter implements ClientRequestFilter {
+    private static final class ReplaceBodyFilter implements 
ClientRequestFilter {
 
         @Override
         public void filter(ClientRequestContext rc) throws IOException {
@@ -1012,7 +1012,7 @@ public class JAXRS20ClientServerBookTest extends 
AbstractBusClientServerTestBase
 
     }
 
-    private static class ClientCacheRequestFilter implements 
ClientRequestFilter {
+    private static final class ClientCacheRequestFilter implements 
ClientRequestFilter {
 
         @Override
         public void filter(ClientRequestContext context) throws IOException {
@@ -1020,7 +1020,7 @@ public class JAXRS20ClientServerBookTest extends 
AbstractBusClientServerTestBase
         }
     }
 
-    private static class ClientHeaderRequestFilter implements 
ClientRequestFilter {
+    private static final class ClientHeaderRequestFilter implements 
ClientRequestFilter {
 
         @Override
         public void filter(ClientRequestContext context) throws IOException {
@@ -1092,7 +1092,7 @@ public class JAXRS20ClientServerBookTest extends 
AbstractBusClientServerTestBase
 
     }
 
-    private static class BookInfoInjectableReader implements 
MessageBodyReader<BookInfo> {
+    private static final class BookInfoInjectableReader implements 
MessageBodyReader<BookInfo> {
         @Context private ResourceContext resourceContext;
 
         @Override
@@ -1115,7 +1115,7 @@ public class JAXRS20ClientServerBookTest extends 
AbstractBusClientServerTestBase
 
     }
     
-    private static class BookInfoReader implements MessageBodyReader<BookInfo> 
{
+    private static final class BookInfoReader implements 
MessageBodyReader<BookInfo> {
         @Override
         public boolean isReadable(Class<?> arg0, Type arg1, Annotation[] arg2, 
MediaType arg3) {
             return true;
@@ -1131,7 +1131,7 @@ public class JAXRS20ClientServerBookTest extends 
AbstractBusClientServerTestBase
 
     }
 
-    private static class ClientTestFeature implements Feature {
+    private static final class ClientTestFeature implements Feature {
 
         @Override
         public boolean configure(FeatureContext context) {
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
index c8c8add00f..8d9268c6b2 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
@@ -564,7 +564,7 @@ public class JAXRSAsyncClientTest extends 
AbstractBusClientServerTestBase {
     }
 
     @Produces("application/xml")
-    private static class FaultyBookWriter implements MessageBodyWriter<Book> {
+    private static final class FaultyBookWriter implements 
MessageBodyWriter<Book> {
 
         @Override
         public long getSize(Book arg0, Class<?> arg1, Type arg2, Annotation[] 
arg3, MediaType arg4) {
@@ -586,7 +586,7 @@ public class JAXRSAsyncClientTest extends 
AbstractBusClientServerTestBase {
     }
     
     @Consumes("application/xml")
-    private static class FaultyBookReader implements MessageBodyReader<Book> {
+    private static final class FaultyBookReader implements 
MessageBodyReader<Book> {
 
         @Override
         public boolean isReadable(Class<?> arg0, Type arg1, Annotation[] arg2, 
MediaType arg3) {
@@ -611,7 +611,7 @@ public class JAXRSAsyncClientTest extends 
AbstractBusClientServerTestBase {
         }
     }
     
-    private static class GenericInvocationCallback<T> implements 
InvocationCallback<T> {
+    private static final class GenericInvocationCallback<T> implements 
InvocationCallback<T> {
         private Object result;
 
         @Override
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
index fb5260e369..f034cb58bc 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
@@ -2973,7 +2973,7 @@ public class JAXRSClientServerBookTest extends 
AbstractBusClientServerTestBase {
     }
     
     @Provider
-    private static class TestClientResponseFilter implements 
ClientResponseFilter {
+    private static final class TestClientResponseFilter implements 
ClientResponseFilter {
         @Override
         public void filter(ClientRequestContext requestContext,
                 ClientResponseContext responseContext) throws IOException {
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceDefaultTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceDefaultTest.java
index d43c4a25e0..796df85069 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceDefaultTest.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceDefaultTest.java
@@ -234,7 +234,7 @@ public class JAXRSClientServerUserResourceDefaultTest 
extends AbstractBusClientS
         }
     }
     @PreMatching
-    private static class PreMatchContainerRequestFilter implements 
ContainerRequestFilter {
+    private static final class PreMatchContainerRequestFilter implements 
ContainerRequestFilter {
         public void filter(ContainerRequestContext context) throws IOException 
{
             String path = context.getUriInfo().getPath();
             if (path.endsWith("123")) {
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/AbstractFailoverTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/AbstractFailoverTest.java
index 8c1c3cd9b4..5a433bf36e 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/AbstractFailoverTest.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/AbstractFailoverTest.java
@@ -366,7 +366,7 @@ public abstract class AbstractFailoverTest extends 
AbstractBusClientServerTestBa
         }
     }
 
-    private static class CustomRetryStrategy extends RetryStrategy {
+    private static final class CustomRetryStrategy extends RetryStrategy {
         private int totalCount;
         private Map<String, Integer> map = new HashMap<>();
         @Override
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverTest.java
index b7cb4bc417..ecbd224568 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverTest.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverTest.java
@@ -77,7 +77,7 @@ public class FailoverTest extends AbstractFailoverTest {
         return feature;
     }
 
-    private static class ReplaceInitialAddressSelector extends 
FailoverTargetSelector {
+    private static final class ReplaceInitialAddressSelector extends 
FailoverTargetSelector {
         @Override
         public synchronized void prepare(Message message) {
             EndpointInfo ei = getEndpoint().getEndpointInfo();
diff --git 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJweJwsTest.java
 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJweJwsTest.java
index 3f51809f58..b696515c1c 100644
--- 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJweJwsTest.java
+++ 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJweJwsTest.java
@@ -544,13 +544,13 @@ public class JAXRSJweJwsTest extends 
AbstractBusClientServerTestBase {
 
     // Switch the priorities to have encryption run before signature
     @Priority(Priorities.JWS_WRITE_PRIORITY)
-    private static class EncrSignJweWriterInterceptor extends 
JweWriterInterceptor {
+    private static final class EncrSignJweWriterInterceptor extends 
JweWriterInterceptor {
 
     }
 
     // Switch the priorities to have encryption run before signature
     @Priority(Priorities.JWE_WRITE_PRIORITY)
-    private static class EncrSignJwsWriterInterceptor extends 
JwsWriterInterceptor {
+    private static final class EncrSignJwsWriterInterceptor extends 
JwsWriterInterceptor {
 
     }
 }
diff --git 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/JAXRSOAuth2Test.java
 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/JAXRSOAuth2Test.java
index a22887564d..17a6493c2b 100644
--- 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/JAXRSOAuth2Test.java
+++ 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/JAXRSOAuth2Test.java
@@ -618,7 +618,7 @@ public class JAXRSOAuth2Test extends 
AbstractBusClientServerTestBase {
         return wc;
     }
 
-    private static class CustomGrant implements AccessTokenGrant {
+    private static final class CustomGrant implements AccessTokenGrant {
 
         private static final long serialVersionUID = -4007538779198315873L;
 
diff --git 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/tls/JAXRSOAuth2TlsTest.java
 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/tls/JAXRSOAuth2TlsTest.java
index 99864e696b..9421303711 100644
--- 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/tls/JAXRSOAuth2TlsTest.java
+++ 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/tls/JAXRSOAuth2TlsTest.java
@@ -247,7 +247,7 @@ public class JAXRSOAuth2TlsTest extends 
AbstractBusClientServerTestBase {
     }
 
 
-    private static class CustomGrant implements AccessTokenGrant {
+    private static final class CustomGrant implements AccessTokenGrant {
 
         private static final long serialVersionUID = -4007538779198315873L;
 
diff --git 
a/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/jaxrs/BookStore.java
 
b/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/jaxrs/BookStore.java
index dc4d583fc7..178f302c08 100644
--- 
a/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/jaxrs/BookStore.java
+++ 
b/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/jaxrs/BookStore.java
@@ -201,7 +201,7 @@ public class BookStore {
         return "OK";
     }
 
-    private class ResponseStreamingOutputImpl implements StreamingOutput {
+    private final class ResponseStreamingOutputImpl implements StreamingOutput 
{
         public void write(OutputStream output) throws IOException, 
WebApplicationException {
             if 
(!"text/plain".equals(BookStore.this.messageContext.get("Content-Type"))) {
                 throw new RuntimeException();
diff --git 
a/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/jaxrs/JAXRSAsyncClientTest.java
 
b/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/jaxrs/JAXRSAsyncClientTest.java
index fd1cd7de65..fb914bb68d 100644
--- 
a/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/jaxrs/JAXRSAsyncClientTest.java
+++ 
b/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/jaxrs/JAXRSAsyncClientTest.java
@@ -555,7 +555,7 @@ public class JAXRSAsyncClientTest extends 
AbstractBusClientServerTestBase {
     }
 
     @Produces("application/xml")
-    private static class FaultyBookWriter implements MessageBodyWriter<Book> {
+    private static final class FaultyBookWriter implements 
MessageBodyWriter<Book> {
         @Override
         public long getSize(Book arg0, Class<?> arg1, Type arg2, Annotation[] 
arg3, MediaType arg4) {
             return 0;
@@ -574,7 +574,7 @@ public class JAXRSAsyncClientTest extends 
AbstractBusClientServerTestBase {
     }
 
     @Consumes("application/xml")
-    private static class FaultyBookReader implements MessageBodyReader<Book> {
+    private static final class FaultyBookReader implements 
MessageBodyReader<Book> {
         @Override
         public boolean isReadable(Class<?> arg0, Type arg1, Annotation[] arg2, 
MediaType arg3) {
             return true;
@@ -595,7 +595,7 @@ public class JAXRSAsyncClientTest extends 
AbstractBusClientServerTestBase {
         }
     }
 
-    private static class GenericInvocationCallback<T> implements 
InvocationCallback<T> {
+    private static final class GenericInvocationCallback<T> implements 
InvocationCallback<T> {
         private Object result;
 
         @Override
diff --git 
a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/UndertowBasicAuthTest.java
 
b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/UndertowBasicAuthTest.java
index b9483a5992..a46641c086 100644
--- 
a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/UndertowBasicAuthTest.java
+++ 
b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/UndertowBasicAuthTest.java
@@ -137,7 +137,7 @@ public class UndertowBasicAuthTest extends 
AbstractClientServerTestBase {
         factory.createClient(ADDRESS + "?wsdl");
     }
 
-    private static class MyHTTPConduitConfigurer implements 
HTTPConduitConfigurer {
+    private static final class MyHTTPConduitConfigurer implements 
HTTPConduitConfigurer {
         public void configure(String name, String address, HTTPConduit c) {
 
             AuthorizationPolicy authorizationPolicy = new 
AuthorizationPolicy();
diff --git 
a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/UndertowDigestAuthTest.java
 
b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/UndertowDigestAuthTest.java
index 6f3f214a8d..206a558530 100644
--- 
a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/UndertowDigestAuthTest.java
+++ 
b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/UndertowDigestAuthTest.java
@@ -192,7 +192,7 @@ public class UndertowDigestAuthTest extends 
AbstractClientServerTestBase {
         factory.createClient(ADDRESS + "?wsdl");
     }
 
-    private static class MyHTTPConduitConfigurer implements 
HTTPConduitConfigurer {
+    private static final class MyHTTPConduitConfigurer implements 
HTTPConduitConfigurer {
         public void configure(String name, String address, HTTPConduit c) {
 
             AuthorizationPolicy authorizationPolicy = new 
AuthorizationPolicy();
diff --git 
a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyBasicAuthTest.java
 
b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyBasicAuthTest.java
index 3aae31996c..55415cf492 100644
--- 
a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyBasicAuthTest.java
+++ 
b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyBasicAuthTest.java
@@ -91,7 +91,7 @@ public class JettyBasicAuthTest extends 
AbstractClientServerTestBase {
         factory.createClient(ADDRESS + "?wsdl");
     }
 
-    private static class MyHTTPConduitConfigurer implements 
HTTPConduitConfigurer {
+    private static final class MyHTTPConduitConfigurer implements 
HTTPConduitConfigurer {
         public void configure(String name, String address, HTTPConduit c) {
 
             AuthorizationPolicy authorizationPolicy = new 
AuthorizationPolicy();
diff --git 
a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyDigestAuthTest.java
 
b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyDigestAuthTest.java
index 5e50d81125..93ec297f7c 100644
--- 
a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyDigestAuthTest.java
+++ 
b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyDigestAuthTest.java
@@ -190,7 +190,7 @@ public class JettyDigestAuthTest extends 
AbstractClientServerTestBase {
         factory.createClient(ADDRESS + "?wsdl");
     }
 
-    private static class MyHTTPConduitConfigurer implements 
HTTPConduitConfigurer {
+    private static final class MyHTTPConduitConfigurer implements 
HTTPConduitConfigurer {
         public void configure(String name, String address, HTTPConduit c) {
 
             AuthorizationPolicy authorizationPolicy = new 
AuthorizationPolicy();
diff --git 
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java
 
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java
index 05e0009516..a108936ede 100644
--- 
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java
+++ 
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java
@@ -85,7 +85,7 @@ public class BusExtensionLoadingTest {
         assertNotNull(bus.getExtension(HeaderManager.class));
     }
 
-    private static class TestClassLoader extends ClassLoader {
+    private static final class TestClassLoader extends ClassLoader {
         @Override
         public Class<?> loadClass(final String className) throws 
ClassNotFoundException {
             if (className.contains("cxf")) {
diff --git 
a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ManagedEndpointsTest.java
 
b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ManagedEndpointsTest.java
index 46c9951bd4..50df1a4f98 100755
--- 
a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ManagedEndpointsTest.java
+++ 
b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ManagedEndpointsTest.java
@@ -492,7 +492,7 @@ public class ManagedEndpointsTest extends 
AbstractClientServerTestBase {
         return (ObjectName)it.next();
     }
 
-    private static class AcknowledgementListener implements 
NotificationListener {
+    private static final class AcknowledgementListener implements 
NotificationListener {
         private AtomicLong lastAcknowledgement = new AtomicLong();
 
         @Override
diff --git 
a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/MessageCallbackOnewayTest.java
 
b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/MessageCallbackOnewayTest.java
index 8f6386cc46..c0f6a5af67 100644
--- 
a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/MessageCallbackOnewayTest.java
+++ 
b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/MessageCallbackOnewayTest.java
@@ -300,7 +300,7 @@ public class MessageCallbackOnewayTest extends 
AbstractBusClientServerTestBase {
         }
     }
 
-    private static class RecordingMessageCallback implements MessageCallback {
+    private static final class RecordingMessageCallback implements 
MessageCallback {
 
         private BlockingQueue<Callback> callbacks = new 
LinkedBlockingQueue<>();
 
diff --git 
a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/MessageLossSimulator.java
 
b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/MessageLossSimulator.java
index 16c920ae15..7b6afeb718 100644
--- 
a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/MessageLossSimulator.java
+++ 
b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/MessageLossSimulator.java
@@ -161,7 +161,7 @@ public class MessageLossSimulator extends 
AbstractPhaseInterceptor<Message> {
         }
     }
 
-    private class DummyOutputStream extends OutputStream {
+    private final class DummyOutputStream extends OutputStream {
 
         @Override
         public void write(int b) throws IOException {
diff --git 
a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RedeliveryTest.java 
b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RedeliveryTest.java
index db60a48b1b..9fac9a57e7 100644
--- 
a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RedeliveryTest.java
+++ 
b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RedeliveryTest.java
@@ -166,7 +166,7 @@ public class RedeliveryTest extends 
AbstractBusClientServerTestBase {
         assertTrue("redelivery running", 
serverManager.getRedeliveryQueue().isEmpty());
     }
 
-    private static class GreeterRecorderImpl extends GreeterImpl {
+    private static final class GreeterRecorderImpl extends GreeterImpl {
         private String value;
         private boolean ex;
 
diff --git 
a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RobustServiceAtMostOnceTest.java
 
b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RobustServiceAtMostOnceTest.java
index 843006890a..0a0803ad05 100644
--- 
a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RobustServiceAtMostOnceTest.java
+++ 
b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RobustServiceAtMostOnceTest.java
@@ -112,7 +112,7 @@ public class RobustServiceAtMostOnceTest extends 
AbstractBusClientServerTestBase
         assertTrue("still in retransmission", 
manager.getRetransmissionQueue().isEmpty());
     }
 
-    private static class GreeterCounterImpl extends GreeterImpl {
+    private static final class GreeterCounterImpl extends GreeterImpl {
         private int count;
 
         public void greetMeOneWay(String arg0) {
diff --git 
a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RobustServiceWithFaultTest.java
 
b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RobustServiceWithFaultTest.java
index a258eb3de0..1e45f95445 100644
--- 
a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RobustServiceWithFaultTest.java
+++ 
b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RobustServiceWithFaultTest.java
@@ -144,7 +144,7 @@ public class RobustServiceWithFaultTest extends 
AbstractBusClientServerTestBase
         assertTrue("still in retransmission", 
manager.getRetransmissionQueue().isEmpty());
     }
 
-    private static class GreeterCounterImpl extends GreeterImpl {
+    private static final class GreeterCounterImpl extends GreeterImpl {
         private int count;
         private boolean throwAlways;
 
diff --git 
a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java 
b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
index 01ae591ab2..f350df3558 100644
--- 
a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
+++ 
b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
@@ -1718,7 +1718,7 @@ public class SequenceTest extends 
AbstractBusClientServerTestBase {
         return null;
     }
 
-    private static class RMMemoryStore implements RMStore {
+    private static final class RMMemoryStore implements RMStore {
         // during this particular test, the operations are expected to be 
invoked sequentially so use just HashMap
         Map<Identifier, SourceSequence> ssmap = new HashMap<>();
         Map<Identifier, DestinationSequence> dsmap = new HashMap<>();
diff --git 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/ModifiedRequestTest.java
 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/ModifiedRequestTest.java
index a3a61d9335..1544f0f269 100644
--- 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/ModifiedRequestTest.java
+++ 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/ModifiedRequestTest.java
@@ -305,7 +305,7 @@ public class ModifiedRequestTest extends 
AbstractBusClientServerTestBase {
         }
     }
 
-    private static class ModifiedTimestampInterceptor extends 
AbstractModifyRequestInterceptor {
+    private static final class ModifiedTimestampInterceptor extends 
AbstractModifyRequestInterceptor {
 
         @Override
         public void modifySecurityHeader(Element securityHeader) {
@@ -328,7 +328,7 @@ public class ModifiedRequestTest extends 
AbstractBusClientServerTestBase {
         }
     }
 
-    private static class ModifiedSignatureInterceptor extends 
AbstractModifyRequestInterceptor {
+    private static final class ModifiedSignatureInterceptor extends 
AbstractModifyRequestInterceptor {
 
         @Override
         public void modifySecurityHeader(Element securityHeader) {
@@ -349,7 +349,7 @@ public class ModifiedRequestTest extends 
AbstractBusClientServerTestBase {
         }
     }
 
-    private static class ModifiedEncryptedKeyInterceptor extends 
AbstractModifyRequestInterceptor {
+    private static final class ModifiedEncryptedKeyInterceptor extends 
AbstractModifyRequestInterceptor {
 
         @Override
         public void modifySecurityHeader(Element securityHeader) {
@@ -379,7 +379,7 @@ public class ModifiedRequestTest extends 
AbstractBusClientServerTestBase {
 
     }
 
-    private static class ModifiedEncryptedSOAPBody extends 
AbstractModifyRequestInterceptor {
+    private static final class ModifiedEncryptedSOAPBody extends 
AbstractModifyRequestInterceptor {
 
         @Override
         public void modifySecurityHeader(Element securityHeader) {
diff --git 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java
 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java
index c8c20d6d94..27bb79174c 100644
--- 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java
+++ 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java
@@ -382,7 +382,7 @@ public class WSSCUnitTest extends 
AbstractBusClientServerTestBase {
         return p;
     }
 
-    private static class TokenCallbackHandler implements CallbackHandler {
+    private static final class TokenCallbackHandler implements CallbackHandler 
{
 
         private SecurityToken securityToken;
 
diff --git 
a/tools/corba/src/test/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReaderTest.java
 
b/tools/corba/src/test/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReaderTest.java
index 33107e2ffa..3d37a2420a 100644
--- 
a/tools/corba/src/test/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReaderTest.java
+++ 
b/tools/corba/src/test/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReaderTest.java
@@ -42,7 +42,7 @@ public class IdlPreprocessorReaderTest {
         return getClass().getResource(location);
     }
 
-    private class ClassPathIncludeResolver implements IncludeResolver {
+    private final class ClassPathIncludeResolver implements IncludeResolver {
         public URL findSystemInclude(String spec) {
             return findUserInclude(spec);
         }
diff --git 
a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
 
b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
index b2e942c1ee..bc81fb1701 100644
--- 
a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
+++ 
b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
@@ -2059,7 +2059,7 @@ public class SourceGenerator {
         }
     }
 
-    private static class DefaultImportsComparator implements 
Comparator<String> {
+    private static final class DefaultImportsComparator implements 
Comparator<String> {
         private static final String JAVAX_PREFIX = "javax";
         public int compare(String s1, String s2) {
             boolean javax1 = s1.startsWith(JAVAX_PREFIX);
@@ -2158,7 +2158,7 @@ public class SourceGenerator {
 
     }
 
-    private static class WadlValidationErrorHandler implements ErrorHandler {
+    private static final class WadlValidationErrorHandler implements 
ErrorHandler {
         private int fatalErrors;
         private int errors;
         @Override

Reply via email to