You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2018/01/04 20:03:45 UTC
[cxf] 01/02: Bunch of whitespace changes to start making latest
Checkstyle happy
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit aa444e536669b8de9389a69c46e4eced747057df
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Thu Jan 4 12:13:43 2018 -0500
Bunch of whitespace changes to start making latest Checkstyle happy
---
.../test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java | 2 ++
.../java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java | 1 +
.../org/apache/cxf/configuration/spring/ConfigurerImplTest.java | 2 ++
.../cdi/src/main/java/org/apache/cxf/cdi/AbstractCXFBean.java | 1 +
.../java/org/apache/cxf/cdi/JAXRSCdiResourceExtensionTest.java | 1 +
.../jca/core/resourceadapter/AbstractManagedConnectionImpl.java | 1 +
.../org/apache/cxf/jca/core/resourceadapter/UriHandlerInit.java | 1 +
.../java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImpl.java | 1 -
.../src/main/java/org/apache/cxf/jca/cxf/ResourceAdapterImpl.java | 1 -
.../org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java | 1 -
.../apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java | 1 +
.../java/org/apache/cxf/jca/core/logging/LoggerHelperTest.java | 1 +
.../resourceadapter/ResourceAdapterInternalExceptionTest.java | 1 +
.../cxf/jca/cxf/AssociatedManagedConnectionFactoryImplTest.java | 6 +-----
.../src/test/java/org/apache/cxf/jca/cxf/JCABusFactoryTest.java | 1 +
.../org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java | 1 +
.../java/org/apache/cxf/jca/cxf/ManagedConnectionImplTest.java | 1 +
.../java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java | 3 +--
.../test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java | 1 +
.../cxf/jca/cxf/handlers/AbstractInvocationHandlerTest.java | 1 +
.../java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java | 1 +
.../apache/cxf/jca/cxf/handlers/InvocationHandlerFactoryTest.java | 1 +
.../cxf/jca/cxf/handlers/InvokingInvocationHandlerTest.java | 1 +
.../cxf/jca/cxf/handlers/ObjectMethodInvocationHandlerTest.java | 1 +
.../apache/cxf/jca/cxf/handlers/ProxyInvocationHandlerTest.java | 1 +
.../src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java | 1 +
.../org/apache/cxf/jca/outbound/ManagedConnectionImplTest.java | 1 +
.../cxf/spring/boot/autoconfigure/CxfAutoConfigurationTests.java | 4 ++--
.../apache/cxf/tracing/brave/AbstractBraveClientInterceptor.java | 1 -
.../org/apache/cxf/tracing/brave/AbstractBraveClientProvider.java | 1 -
.../org/apache/cxf/tracing/brave/AbstractBraveInterceptor.java | 1 -
.../java/org/apache/cxf/tracing/brave/AbstractBraveProvider.java | 1 -
.../java/org/apache/cxf/tracing/brave/BraveClientFeature.java | 1 -
.../org/apache/cxf/tracing/brave/BraveClientStartInterceptor.java | 1 -
.../org/apache/cxf/tracing/brave/BraveClientStopInterceptor.java | 1 -
.../src/main/java/org/apache/cxf/tracing/brave/BraveFeature.java | 1 -
.../java/org/apache/cxf/tracing/brave/BraveStartInterceptor.java | 1 -
.../java/org/apache/cxf/tracing/brave/BraveStopInterceptor.java | 1 -
.../java/org/apache/cxf/tracing/brave/BraveTracerContext.java | 1 -
.../java/org/apache/cxf/tracing/brave/HttpClientSpanParser.java | 1 -
.../java/org/apache/cxf/tracing/brave/HttpServerSpanParser.java | 1 -
.../org/apache/cxf/tracing/brave/jaxrs/BraveClientProvider.java | 1 -
.../org/apache/cxf/tracing/brave/jaxrs/BraveContextProvider.java | 1 -
.../java/org/apache/cxf/tracing/brave/jaxrs/BraveFeature.java | 1 -
.../java/org/apache/cxf/tracing/brave/jaxrs/BraveProvider.java | 1 -
.../org/apache/cxf/tracing/htrace/ext/LogbackSpanConverter.java | 1 -
.../test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java | 2 ++
.../java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java | 3 +++
.../java/org/apache/cxf/osgi/itests/soap/HttpServiceTest.java | 1 -
.../test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java | 1 +
.../org/apache/cxf/karaf/commands/completers/BusCompleter.java | 1 -
.../java/org/apache/cxf/binding/coloc/ColocInInterceptor.java | 2 --
.../java/org/apache/cxf/binding/coloc/ColocOutInterceptor.java | 2 --
.../org/apache/cxf/binding/coloc/ColocMessageObserverTest.java | 1 +
.../org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java | 2 +-
.../src/test/java/org/apache/cxf/binding/coloc/ColocUtilTest.java | 2 +-
.../src/main/java/org/apache/cxf/binding/corba/CorbaBinding.java | 1 -
.../main/java/org/apache/cxf/binding/corba/CorbaStreamable.java | 1 -
.../org/apache/cxf/binding/corba/runtime/CorbaStreamableImpl.java | 1 -
.../cxf/binding/corba/types/AbstractNoStartEndEventProducer.java | 1 -
.../cxf/binding/corba/types/AbstractStartEndEventProducer.java | 1 -
.../cxf/binding/corba/types/CorbaAnonStructEventProducer.java | 1 -
.../java/org/apache/cxf/binding/corba/types/CorbaAnyHandler.java | 1 -
.../apache/cxf/binding/corba/types/CorbaArrayEventProducer.java | 1 -
.../cxf/binding/corba/types/CorbaExceptionEventProducer.java | 1 -
.../org/apache/cxf/binding/corba/types/CorbaFixedHandler.java | 1 -
.../org/apache/cxf/binding/corba/types/CorbaObjectHandler.java | 1 -
.../cxf/binding/corba/types/CorbaObjectReferenceListener.java | 1 -
.../binding/corba/types/CorbaPrimitiveSequenceEventProducer.java | 1 -
.../cxf/binding/corba/types/CorbaSequenceEventProducer.java | 1 -
.../apache/cxf/binding/corba/types/CorbaTypeEventProducer.java | 1 -
.../org/apache/cxf/binding/corba/types/CorbaUnionHandler.java | 1 -
.../apache/cxf/binding/corba/types/ParameterEventProducer.java | 1 -
.../apache/cxf/binding/corba/types/SkipStartEndEventProducer.java | 1 -
.../corba/types/WrappedParameterSequenceEventProducer.java | 1 -
.../org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java | 3 +--
.../test/java/org/apache/cxf/binding/corba/CorbaBindingTest.java | 1 +
.../test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java | 1 +
.../java/org/apache/cxf/binding/corba/CorbaDestinationTest.java | 4 +---
.../test/java/org/apache/cxf/binding/corba/CorbaMessageTest.java | 1 +
.../java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java | 1 +
.../test/java/org/apache/cxf/binding/corba/CorbaTypeMapTest.java | 1 +
.../src/test/java/org/apache/cxf/binding/corba/TestUtils.java | 2 ++
.../org/apache/cxf/binding/corba/runtime/CorbaDSIServantTest.java | 1 +
.../apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java | 1 +
.../apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java | 1 +
.../apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java | 1 +
.../apache/cxf/binding/corba/runtime/CorbaStreamWriterTest.java | 1 +
.../org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java | 1 +
.../org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java | 1 +
.../org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java | 1 +
.../org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java | 1 +
.../apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java | 1 -
.../apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java | 3 +--
.../apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java | 3 +--
.../java/org/apache/cxf/binding/corba/utils/ContextUtilsTest.java | 1 +
.../java/org/apache/cxf/binding/corba/utils/CorbaUtilsTest.java | 1 +
.../org/apache/cxf/binding/soap/wsdl11/SoapAddressPlugin.java | 1 +
.../apache/cxf/binding/soap/MustUnderstandInterceptorTest.java | 1 +
.../java/org/apache/cxf/binding/soap/RPCInInterceptorTest.java | 1 +
.../java/org/apache/cxf/binding/soap/RPCOutInterceptorTest.java | 1 +
.../java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java | 1 +
.../org/apache/cxf/binding/soap/SoapActionInterceptorTest.java | 1 +
.../java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java | 2 +-
.../test/java/org/apache/cxf/binding/soap/SoapBindingTest.java | 1 +
.../java/org/apache/cxf/binding/soap/SoapOutInterceptorTest.java | 1 +
.../soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java | 1 +
.../cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java | 2 +-
.../soap/interceptor/SoapPreProtocolOutInterceptorTest.java | 2 +-
.../cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java | 2 +-
.../test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java | 1 +
.../org/apache/cxf/binding/soap/saaj/SAAJInInterceptorTest.java | 1 +
.../java/org/apache/cxf/binding/xml/wsdl11/XmlBindingPlugin.java | 1 +
.../main/java/org/apache/cxf/binding/xml/wsdl11/XmlIoPlugin.java | 1 +
.../java/org/apache/cxf/binding/xml/XMLBindingFactoryTest.java | 1 +
.../java/org/apache/cxf/binding/xml/interceptor/TestBase.java | 1 +
.../cxf/binding/xml/interceptor/XMLFaultOutInterceptorTest.java | 1 +
.../cxf/binding/xml/interceptor/XMLMessageOutInterceptorTest.java | 1 +
.../main/java/org/apache/cxf/aegis/AegisElementDataWriter.java | 1 +
.../main/java/org/apache/cxf/aegis/AegisXMLStreamDataReader.java | 1 +
.../src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java | 1 +
.../test/java/org/apache/cxf/aegis/exception/ExceptionTest.java | 1 +
.../apache/cxf/aegis/inheritance/ExceptionInheritanceTest.java | 1 +
.../cxf/aegis/inheritance/intf/InterfaceInheritanceTest.java | 1 +
.../org/apache/cxf/aegis/integration/ParameterMappingTest.java | 1 +
.../java/org/apache/cxf/aegis/namespaces/ExplicitPrefixTest.java | 1 +
.../org/apache/cxf/aegis/namespaces/impl/NameServiceImpl.java | 1 +
.../test/java/org/apache/cxf/aegis/override/OverrideTypeTest.java | 1 +
.../aegis/src/test/java/org/apache/cxf/aegis/proxy/ProxyTest.java | 1 +
.../java/org/apache/cxf/aegis/services/base64/BinaryDataTest.java | 1 +
.../java/org/apache/cxf/aegis/standalone/StandaloneReadTest.java | 2 ++
.../java/org/apache/cxf/aegis/type/array/DuplicateArrayTest.java | 1 +
.../src/test/java/org/apache/cxf/aegis/type/basic/BadXMLTest.java | 8 ++++----
.../java/org/apache/cxf/aegis/type/basic/DynamicProxyTest.java | 1 +
.../java/org/apache/cxf/aegis/type/encoded/SoapArrayTypeTest.java | 1 +
.../java/org/apache/cxf/aegis/type/encoded/StructTypeTest.java | 1 +
.../java/org/apache/cxf/aegis/type/java5/map/StudentTest.java | 1 +
.../src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java | 1 +
.../org/apache/cxf/aegis/type/missing/MissingTypeWSDLTest.java | 1 +
.../src/test/java/org/apache/cxf/aegis/xml/stax/ReaderTest.java | 1 +
.../src/test/java/org/apache/cxf/aegis/xml/stax/WriterTest.java | 1 +
.../jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java | 2 ++
.../src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java | 2 +-
.../src/test/java/org/apache/cxf/jaxb/BareOutInterceptorTest.java | 2 +-
.../java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java | 2 +-
.../src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java | 2 +-
.../src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java | 1 +
.../src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java | 1 +
.../jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java | 1 +
.../test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java | 1 +
.../org/apache/cxf/ext/logging/OldLoggingFactoryBeanListener.java | 1 -
.../org/apache/cxf/ext/logging/DefaultLogEventMapperTest.java | 1 +
.../java/org/apache/cxf/ext/logging/TestPrettyLoggingFilter.java | 1 +
.../main/java/org/apache/cxf/jaxrs/provider/SourceProvider.java | 1 +
.../java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java | 2 +-
.../java/org/apache/cxf/jaxrs/ext/MessageContextImplTest.java | 2 +-
.../java/org/apache/cxf/jaxrs/impl/AsyncResponseImplTest.java | 2 +-
.../test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java | 2 +-
.../java/org/apache/cxf/jaxrs/impl/RequestPreprocessorTest.java | 2 +-
.../src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java | 2 +-
.../src/test/java/org/apache/cxf/jaxrs/impl/UriInfoImplTest.java | 2 +-
.../cxf/jaxrs/lifecycle/PerRequestResourceProviderTest.java | 2 +-
.../org/apache/cxf/jaxrs/model/OperationResourceInfoTest.java | 2 +-
.../cxf/jaxrs/provider/AbstractConfigurableProviderTest.java | 1 +
.../org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java | 2 +-
.../jaxrs/provider/JavaTimeTypesParamConverterProviderTest.java | 1 +
.../java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java | 2 +-
.../java/org/apache/cxf/jaxrs/provider/XSLTJaxbProviderTest.java | 2 +-
.../apache/cxf/jaxrs/security/JAASAuthenticationFilterTest.java | 1 +
.../cxf/jaxrs/springmvc/SpringViewResolverProviderTest.java | 2 ++
.../java/org/apache/cxf/jaxrs/utils/AnnotationTestUtilsTest.java | 1 +
.../src/test/java/org/apache/cxf/jaxrs/utils/FormUtilsTest.java | 2 +-
.../src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java | 2 +-
.../test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java | 2 +-
.../src/test/java/org/apache/cxf/jaxrs/utils/JAXBUtilsTest.java | 1 +
.../src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java | 2 +-
.../java/org/apache/cxf/jaxws/binding/soap/SOAPBindingImpl.java | 1 +
.../org/apache/cxf/jaxws/blueprint/EndpointDefinitionParser.java | 2 ++
.../cxf/jaxws/spring/JaxWsProxyFactoryBeanDefinitionParser.java | 1 -
.../jaxws/spring/JaxWsWebServicePublisherBeanPostProcessor.java | 1 -
.../src/test/java/org/apache/cxf/jaxws/AbstractJaxWsTest.java | 1 +
.../jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java | 1 +
.../src/test/java/org/apache/cxf/jaxws/CodeFirstWSDLTest.java | 1 +
.../test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java | 1 +
.../jaxws/src/test/java/org/apache/cxf/jaxws/GreeterTest.java | 1 +
.../jaxws/src/test/java/org/apache/cxf/jaxws/HeaderTest.java | 1 +
.../test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java | 2 ++
.../jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java | 1 +
.../java/org/apache/cxf/jaxws/JaxWsServerFactoryBeanTest.java | 2 ++
.../src/test/java/org/apache/cxf/jaxws/MessageReplayObserver.java | 1 +
.../src/test/java/org/apache/cxf/jaxws/SEIWithJAXBAnnoTest.java | 1 +
.../jaxws/src/test/java/org/apache/cxf/jaxws/SOAPBindingTest.java | 1 +
.../jaxws/src/test/java/org/apache/cxf/jaxws/SchemaFirstTest.java | 1 +
.../jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java | 1 +
.../src/test/java/org/apache/cxf/jaxws/ServiceModelUtilsTest.java | 1 +
.../jaxws/src/test/java/org/apache/cxf/jaxws/SoapFaultTest.java | 1 +
.../test/java/org/apache/cxf/jaxws/WrapperClassGeneratorTest.java | 1 +
.../org/apache/cxf/jaxws/context/WebServiceContextImplTest.java | 1 +
.../test/java/org/apache/cxf/jaxws/dispatch/DispatchOpTest.java | 2 ++
.../cxf/jaxws/handler/AbstractProtocolHandlerInterceptorTest.java | 1 +
.../cxf/jaxws/handler/AnnotationHandlerChainBuilderTest.java | 1 +
.../org/apache/cxf/jaxws/handler/HandlerChainBuilderTest.java | 2 +-
.../org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java | 1 +
.../apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java | 1 +
.../java/org/apache/cxf/jaxws/handler/LogicalMessageImplTest.java | 1 +
.../apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java | 1 +
.../apache/cxf/jaxws/header/ProviderHeaderClientServerTest.java | 1 +
.../src/test/java/org/apache/cxf/jaxws/holder/HolderTest.java | 1 +
.../cxf/jaxws/interceptors/WebFaultOutInterceptorTestCase.java | 1 +
.../org/apache/cxf/jaxws/provider/ProviderServiceFactoryTest.java | 1 +
.../src/test/java/org/apache/cxf/jaxws/provider/ProviderTest.java | 1 +
.../test/java/org/apache/cxf/jaxws/service/ArrayServiceImpl.java | 1 +
.../test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java | 1 +
.../apache/cxf/jaxws/support/ContextPropertiesMappingTest.java | 1 +
.../apache/cxf/jaxws/support/JaxWsServiceConfigurationTest.java | 2 +-
.../org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java | 1 +
.../test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java | 4 +++-
.../cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestinationTest.java | 1 +
.../http_jaxws_spi/JAXWSHttpSpiTransportFactoryTest.java | 1 +
.../js/src/main/java/org/apache/cxf/js/rhino/ProviderFactory.java | 1 -
.../js/src/main/java/org/apache/cxf/js/rhino/ServerApp.java | 1 -
.../java/org/apache/cxf/js/rhino/AbstractDOMProviderTest.java | 2 +-
.../test/java/org/apache/cxf/js/rhino/ProviderFactoryTest.java | 2 +-
.../src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java | 2 ++
.../org/apache/cxf/frontend/soap/SoapBindingSelectionTest.java | 1 +
.../cxf/frontend/spring/AbstractSimpleFrontendSpringTest.java | 2 ++
.../java/org/apache/cxf/frontend/spring/ClientServerTest.java | 1 +
.../test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java | 1 +
.../apache/cxf/service/factory/AbstractSimpleFrontendTest.java | 1 +
.../org/apache/cxf/service/factory/ClientFactoryBeanTest.java | 1 +
.../apache/cxf/service/factory/ReflectionServiceFactoryTest.java | 1 +
.../test/java/org/apache/cxf/service/factory/RountripTest.java | 1 +
.../java/org/apache/cxf/service/factory/ServerFactoryTest.java | 1 +
.../java/org/apache/cxf/service/stax/StaxDatabindingTest.java | 1 +
.../src/test/java/org/apache/cxf/javascript/GenericAegisTest.java | 1 +
.../java/org/apache/cxf/javascript/JavascriptTestUtilities.java | 1 +
.../org/apache/cxf/management/jmx/InstrumentationManagerImpl.java | 1 -
.../management/jmx/export/runtime/ModelMBeanInfoSupporter.java | 2 --
.../org/apache/cxf/management/counters/CounterRepositoryTest.java | 1 +
.../management/interceptor/AbstractMessageResponseTestBase.java | 2 +-
.../interceptor/ResponseTimeMessageInInterceptorTest.java | 2 +-
.../interceptor/ResponseTimeMessageInvokerInterceptorTest.java | 1 +
.../interceptor/ResponseTimeMessageOutInterceptorTest.java | 1 +
.../apache/cxf/management/jmx/export/ModelMBeanAssemblerTest.java | 1 +
.../java/org/apache/cxf/jaxrs/client/logging/RESTLoggingTest.java | 1 +
.../cxf/jaxrs/client/spring/JAXRSClientFactoryBeanTest.java | 2 ++
.../main/java/org/apache/cxf/jaxrs/swagger/JaxRs2Extension.java | 1 +
.../org/apache/cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java | 2 +-
.../java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java | 2 +-
.../org/apache/cxf/jaxrs/provider/atom/AtomEntryProviderTest.java | 1 +
.../org/apache/cxf/jaxrs/provider/atom/AtomFeedProviderTest.java | 1 +
.../org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java | 2 +-
.../java/org/apache/cxf/jaxrs/resources/CollectionsResource.java | 1 +
.../org/apache/cxf/jaxrs/reactor/client/ReactorInvokerImpl.java | 3 +++
.../apache/cxf/jaxrs/reactor/client/ReactorInvokerProvider.java | 2 ++
.../java/org/apache/cxf/jaxrs/reactor/server/ReactorInvoker.java | 1 -
.../org/apache/cxf/jaxrs/rx/client/ObservableRxInvokerImpl.java | 1 -
.../java/org/apache/cxf/jaxrs/rx/server/ObservableInvoker.java | 1 -
.../jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitorTest.java | 1 +
.../cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorODataTest.java | 1 +
.../jaxrs/ext/search/lucene/AbstractLuceneQueryVisitorTest.java | 1 +
.../ext/search/lucene/LuceneQueryVisitorAnalyzerFiqlTest.java | 1 +
.../cxf/jaxrs/ext/search/lucene/LuceneQueryVisitorFiqlTest.java | 1 +
.../cxf/jaxrs/ext/search/lucene/LuceneQueryVisitorODataTest.java | 1 +
.../org/apache/cxf/rs/security/oauth/client/OAuthClientUtils.java | 1 -
.../apache/cxf/rs/security/oauth/filters/AbstractAuthFilter.java | 1 -
.../apache/cxf/rs/security/oauth/filters/OAuthRequestFilter.java | 1 -
.../apache/cxf/rs/security/oauth/filters/OAuthServletFilter.java | 1 -
.../cxf/rs/security/oauth/provider/DefaultOAuthValidator.java | 1 -
.../cxf/rs/security/oauth/services/AbstractOAuthService.java | 1 -
.../apache/cxf/rs/security/oauth/services/AccessTokenHandler.java | 1 -
.../rs/security/oauth/services/AuthorizationRequestHandler.java | 1 -
.../cxf/rs/security/oauth/services/OOBResponseProvider.java | 1 -
.../cxf/rs/security/oauth/services/RequestTokenHandler.java | 1 -
.../java/org/apache/cxf/rs/security/oauth/utils/OAuthUtils.java | 1 -
.../rs/security/oauth2/grants/saml/Saml2BearerGrantHandler.java | 1 +
.../oauth2/grants/code/DefaultEHCacheCodeDataProvider.java | 1 -
.../rs/security/oauth2/grants/code/JCacheCodeDataProvider.java | 1 +
.../security/oauth2/provider/DefaultEHCacheOAuthDataProvider.java | 1 -
.../rs/security/oauth2/provider/OAuthServerJoseJwtProducer.java | 1 +
.../java/org/apache/cxf/rs/security/oauth2/utils/EHCacheUtil.java | 1 -
.../security/oauth2/grants/code/JCacheCodeDataProviderTest.java | 1 +
.../security/oauth2/grants/code/JPACMTOAuthDataProviderTest.java | 2 ++
.../rs/security/oauth2/grants/code/JPACodeDataProviderTest.java | 2 ++
.../cxf/rs/security/oauth2/grants/jwt/AbstractJwtHandlerTest.java | 3 +--
.../rs/security/oauth2/provider/JCacheOAuthDataProviderTest.java | 1 +
.../cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java | 2 ++
.../security/oauth2/tokens/hawk/HawkAccessTokenValidatorTest.java | 2 +-
.../cxf/rs/security/oauth2/tokens/hawk/NonceVerifierImplTest.java | 2 +-
.../rs/security/oidc/idp/JPAOidcUserSubjectCMTOpenJPATest.java | 2 ++
.../cxf/rs/security/oidc/idp/JPAOidcUserSubjectCMTTest.java | 1 +
.../apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectTest.java | 2 ++
.../saml/sso/AbstractRequestAssertionConsumerHandler.java | 1 +
.../cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java | 1 +
.../apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java | 1 -
.../java/org/apache/cxf/rs/security/saml/sso/MetadataService.java | 1 +
.../cxf/rs/security/saml/sso/SAMLProtocolResponseValidator.java | 1 +
.../org/apache/cxf/rs/security/saml/sso/SSOValidatorResponse.java | 1 +
.../apache/cxf/rs/security/saml/sso/SamlPostBindingFilter.java | 1 +
.../cxf/rs/security/saml/sso/SamlRedirectBindingFilter.java | 1 +
.../cxf/rs/security/saml/sso/state/EHCacheSPStateManager.java | 1 -
.../apache/cxf/rs/security/saml/sso/AuthnRequestBuilderTest.java | 1 +
.../apache/cxf/rs/security/saml/sso/CombinedValidatorTest.java | 1 +
.../java/org/apache/cxf/rs/security/saml/sso/EHCacheUtilTest.java | 1 -
.../cxf/rs/security/saml/sso/SAMLResponseValidatorTest.java | 1 +
.../cxf/rs/security/saml/sso/SAMLSSOResponseValidatorTest.java | 1 +
.../java/org/apache/cxf/rs/security/common/RSSecurityUtils.java | 1 +
.../org/apache/cxf/rs/security/saml/AbstractSamlInHandler.java | 1 +
.../security/saml/authorization/SecurityContextProviderImpl.java | 1 +
.../org/apache/cxf/rs/security/xml/AbstractXmlEncInHandler.java | 1 +
.../org/apache/cxf/rs/security/xml/AbstractXmlSecInHandler.java | 1 +
.../apache/cxf/rs/security/xml/AbstractXmlSecOutInterceptor.java | 1 +
.../org/apache/cxf/rs/security/xml/AbstractXmlSigInHandler.java | 1 +
.../java/org/apache/cxf/rs/security/xml/XmlEncOutInterceptor.java | 1 +
.../java/org/apache/cxf/rs/security/xml/XmlSigOutInterceptor.java | 1 +
.../org/apache/cxf/jaxrs/sse/client/SseEventSourceImplTest.java | 1 +
.../apache/cxf/rt/security/saml/claims/SAMLSecurityContext.java | 1 +
.../cxf/rt/security/saml/interceptor/WSS4JBasicAuthValidator.java | 1 +
.../java/org/apache/cxf/rt/security/saml/utils/SAMLUtils.java | 1 +
.../org/apache/cxf/rt/security/saml/xacml/CXFMessageParser.java | 1 +
.../org/apache/cxf/rt/security/saml/claims/SAMLClaimsTest.java | 2 ++
.../saml/interceptor/ClaimsAuthorizingInterceptorTest.java | 1 +
.../cxf/rt/security/saml/xacml2/RequestComponentBuilderTest.java | 1 +
.../rt/security/saml/xacml2/SamlRequestComponentBuilderTest.java | 1 +
.../spring/JettyHTTPServerEngineBeanDefinitionParser.java | 1 +
.../spring/JettyHTTPServerEngineFactoryBeanDefinitionParser.java | 1 -
.../apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java | 3 +++
.../cxf/transport/http_jetty/JettyHTTPServerEngineTest.java | 3 +++
.../transport/http/netty/client/integration/NettyClientTest.java | 3 +++
.../cxf/transport/http/netty/server/NettyHttpContextHandler.java | 2 +-
.../apache/cxf/transport/http/netty/server/NettyHttpHandler.java | 2 ++
.../cxf/transport/http/netty/server/NettyHttpServerEngine.java | 3 ++-
.../http/netty/server/interceptor/ChannelInterceptor.java | 1 -
.../http/netty/server/interceptor/HttpSessionInterceptor.java | 1 +
.../http/netty/server/servlet/NettyHttpServletRequest.java | 1 +
.../server/spring/NettyHttpServerEngineBeanDefinitionParser.java | 1 -
.../cxf/transport/http/netty/server/NettyHttpDestinationTest.java | 2 +-
.../http/netty/server/NettyHttpServerEngineFactoryTest.java | 1 +
.../transport/http/netty/server/NettyHttpServerEngineTest.java | 1 +
.../cxf/transport/http/netty/server/NettyHttpTestHandler.java | 1 +
.../transport/http/netty/server/integration/NettyServerTest.java | 3 +++
.../http/netty/server/integration/SSLNettySpringServerTest.java | 3 +++
.../cxf/transport/http_undertow/UndertowHTTPDestination.java | 1 -
.../spring/UndertowHTTPServerEngineBeanDefinitionParser.java | 1 +
.../UndertowHTTPServerEngineFactoryBeanDefinitionParser.java | 1 -
.../cxf/transport/http_undertow/UndertowHTTPDestinationTest.java | 3 +--
.../cxf/transport/http_undertow/UndertowHTTPServerEngineTest.java | 1 +
.../http/spring/HttpAuthSupplierBeanDefinitionParser.java | 1 +
.../main/java/org/apache/cxf/transport/https/CertConstraints.java | 1 -
.../src/main/java/org/apache/cxf/transport/https/SSLUtils.java | 1 -
.../apache/cxf/transport/http/DestinationRegistryImplTest.java | 2 +-
.../apache/cxf/transport/http/HTTPConduitURLConnectionTest.java | 1 +
.../org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java | 1 +
.../src/test/java/org/apache/cxf/transport/http/HeadersTest.java | 2 +-
.../apache/cxf/transport/http/auth/DigestAuthSupplierTest.java | 2 +-
.../cxf/transport/http/policy/ClientPolicyCalculatorTest.java | 1 +
.../cxf/transport/http/policy/HTTPClientAssertionBuilderTest.java | 1 +
.../cxf/transport/http/policy/HTTPServerAssertionBuilderTest.java | 1 +
.../org/apache/cxf/transport/http/policy/PolicyUtilsTest.java | 1 +
.../cxf/transport/http/policy/ServerPolicyCalculatorTest.java | 1 +
.../apache/cxf/transport/https/HttpsURLConnectionFactoryTest.java | 2 ++
.../java/org/apache/cxf/transport/servlet/BaseUrlHelperTest.java | 1 -
.../org/apache/cxf/transport/servlet/ServletControllerTest.java | 2 +-
.../java/org/apache/cxf/transport/jms/JMSTransportFactory.java | 1 -
.../test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java | 1 +
.../test/java/org/apache/cxf/transport/jms/JMSConduitTest.java | 1 +
.../java/org/apache/cxf/transport/jms/JMSConfigFactoryTest.java | 1 +
.../java/org/apache/cxf/transport/jms/JMSDestinationTest.java | 1 +
.../test/java/org/apache/cxf/transport/jms/JMSHeaderTypeTest.java | 1 +
.../cxf/transport/jms/MessageIdAsCorrelationIdJMSConduitTest.java | 1 +
.../java/org/apache/cxf/transport/jms/RequestResponseTest.java | 1 +
.../transport/jms/continuations/JMSContinuationProviderTest.java | 1 +
.../cxf/transport/jms/continuations/JMSContinuationTest.java | 1 +
.../java/org/apache/cxf/transport/jms/uri/JMSEndpointTest.java | 1 +
.../apache/cxf/transport/jms/uri/URIConfiguredConduitTest.java | 1 +
.../test/java/org/apache/cxf/transport/jms/util/JMSUtilTest.java | 1 +
.../org/apache/cxf/transport/jms/util/MessageListenerTest.java | 1 +
.../org/apache/cxf/transport/local/LocalTransportFactoryTest.java | 2 +-
.../transport/websocket/jetty/JettyWebSocketDestinationTest.java | 2 +-
.../java/org/apache/cxf/ws/addressing/impl/ContextUtilsTest.java | 2 +-
.../java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java | 2 +-
.../apache/cxf/ws/addressing/soap/DecoupledFaultHandlerTest.java | 1 +
.../test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java | 2 +-
.../org/apache/cxf/ws/eventing/shared/faults/WSEventingFault.java | 1 +
.../shared/handlers/ReferenceParametersAddingHandler.java | 1 +
.../apache/cxf/ws/eventing/shared/utils/DurationAndDateUtil.java | 2 ++
.../cxf/ws/eventing/base/SimpleEventingIntegrationTest.java | 1 +
.../org/apache/cxf/ws/eventing/integration/NotificationTest.java | 1 +
.../apache/cxf/ws/eventing/integration/SubscriptionEndTest.java | 1 +
.../cxf/ws/eventing/integration/SubscriptionGrantingTest.java | 2 ++
.../cxf/ws/eventing/integration/SubscriptionManagementTest.java | 1 +
.../eventing/integration/eventsink/TestingEndToEndpointImpl.java | 1 +
.../ws/policy/attachment/external/ExternalAttachmentProvider.java | 1 +
.../cxf/ws/policy/attachment/external/PolicyAttachment.java | 1 +
.../apache/cxf/ws/policy/blueprint/PolicyBPDefinitionParser.java | 1 +
.../cxf/ws/policy/blueprint/PolicyFeatureBPDefinitionParser.java | 1 +
.../apache/cxf/ws/policy/AssertionBuilderRegistryImplTest.java | 1 +
.../test/java/org/apache/cxf/ws/policy/AssertionInfoMapTest.java | 1 +
.../java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java | 2 +-
.../java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java | 2 +-
.../src/test/java/org/apache/cxf/ws/policy/NormalizeTest.java | 1 +
.../java/org/apache/cxf/ws/policy/PolicyDataEngineImplTest.java | 1 +
.../src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java | 2 +-
.../cxf/ws/policy/PolicyInterceptorProviderRegistryImplTest.java | 1 +
.../java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java | 1 +
.../java/org/apache/cxf/ws/policy/PolicyRegistryImplTest.java | 1 +
.../cxf/ws/policy/PolicyVerificationInFaultInterceptorTest.java | 1 +
.../apache/cxf/ws/policy/PolicyVerificationInInterceptorTest.java | 1 +
.../cxf/ws/policy/PolicyVerificationOutInterceptorTest.java | 1 +
.../attachment/external/DomainExpressionBuilderRegistryTest.java | 1 +
.../external/EndpointReferenceDomainExpressionTest.java | 1 +
.../attachment/external/ExternalAttachmentProviderTest.java | 2 ++
.../cxf/ws/policy/attachment/external/PolicyAttachmentTest.java | 1 +
.../ws/policy/attachment/external/URIDomainExpressionTest.java | 1 +
.../cxf/ws/policy/attachment/reference/ReferenceResolverTest.java | 1 +
.../attachment/wsdl11/Wsdl11AttachmentPolicyProviderTest.java | 1 +
.../org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java | 1 +
.../cxf/ws/policy/selector/FirstAlternativeSelectorTest.java | 2 +-
.../ws/policy/selector/MinimalMaximalAlternativeSelectorTest.java | 2 +-
.../java/org/apache/cxf/ws/policy/spring/PolicyBeansTest.java | 1 +
.../src/test/java/org/apache/cxf/ws/rm/AbstractEndpointTest.java | 1 +
.../test/java/org/apache/cxf/ws/rm/AbstractRMInterceptorTest.java | 2 +-
.../test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java | 2 +-
rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationTest.java | 2 +-
.../src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java | 2 +-
rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java | 2 +-
.../rm/src/test/java/org/apache/cxf/ws/rm/RMContextUtilsTest.java | 1 +
rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMEndpointTest.java | 2 +-
.../src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java | 2 +-
rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java | 2 +-
.../src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java | 2 +-
rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java | 1 +
rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java | 2 +-
.../rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java | 1 +
.../cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java | 1 +
.../java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTest.java | 3 ++-
.../org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTestBase.java | 2 +-
.../cxf/ws/rm/persistence/jdbc/RMTxStoreTwoSchemasTest.java | 2 +-
.../test/java/org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java | 2 +-
.../org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java | 2 +-
.../test/java/org/apache/cxf/ws/rm/soap/SoapFaultFactoryTest.java | 2 +-
.../main/java/org/apache/cxf/ws/security/cache/EHCacheUtils.java | 1 -
.../apache/cxf/ws/security/policy/interceptors/STSInvoker.java | 1 +
.../policy/interceptors/SecureConversationInInterceptor.java | 1 +
.../org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java | 1 -
.../java/org/apache/cxf/ws/security/tokenstore/SecurityToken.java | 1 +
.../java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java | 2 +-
.../java/org/apache/cxf/ws/security/trust/STSLoginModule.java | 1 +
.../org/apache/cxf/ws/security/trust/STSStaxTokenValidator.java | 1 +
.../src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java | 1 +
.../security/trust/delegation/ReceivedTokenCallbackHandler.java | 1 +
.../ws/security/trust/delegation/WSSUsernameCallbackHandler.java | 1 +
.../cxf/ws/security/wss4j/BinarySecurityTokenInterceptor.java | 1 +
.../java/org/apache/cxf/ws/security/wss4j/CryptoCoverageUtil.java | 1 +
.../cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java | 1 +
.../cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java | 1 +
.../org/apache/cxf/ws/security/wss4j/SamlTokenInterceptor.java | 1 +
.../java/org/apache/cxf/ws/security/wss4j/StaxSerializer.java | 1 +
.../apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java | 1 +
.../java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java | 1 +
.../org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java | 1 +
.../ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java | 1 +
.../security/wss4j/policyhandlers/AsymmetricBindingHandler.java | 1 +
.../ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java | 1 +
.../ws/security/wss4j/policyhandlers/TransportBindingHandler.java | 1 +
.../wss4j/policyvalidators/AbstractBindingPolicyValidator.java | 1 +
.../policyvalidators/AbstractSupportingTokenPolicyValidator.java | 1 +
.../wss4j/policyvalidators/PolicyValidatorParameters.java | 1 +
.../wss4j/policyvalidators/SecuredElementsPolicyValidator.java | 1 +
.../java/org/apache/cxf/ws/security/cache/EHCacheUtilsTest.java | 2 +-
.../test/java/org/apache/cxf/ws/security/sts/STSClientTest.java | 2 ++
.../apache/cxf/ws/security/tokenstore/EHCacheTokenStoreTest.java | 1 +
.../apache/cxf/ws/security/tokenstore/MemoryTokenStoreTest.java | 1 +
.../apache/cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java | 2 ++
.../apache/cxf/ws/security/wss4j/CustomPolicyAlgorithmsTest.java | 1 +
.../cxf/ws/security/wss4j/DOMToStaxEncryptionIdentifierTest.java | 1 +
.../cxf/ws/security/wss4j/DOMToStaxSignatureIdentifierTest.java | 1 +
.../cxf/ws/security/wss4j/DefaultCryptoCoverageCheckerTest.java | 1 +
.../cxf/ws/security/wss4j/PluggablePolicyValidatorTest.java | 1 +
.../org/apache/cxf/ws/security/wss4j/SecurityActionTokenTest.java | 1 +
.../apache/cxf/ws/security/wss4j/SecurityVerificationOutTest.java | 1 +
.../cxf/ws/security/wss4j/UserNameTokenAuthorizationTest.java | 1 +
.../java/org/apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java | 1 +
.../java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java | 1 +
.../org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptorTest.java | 1 +
.../org/apache/cxf/ws/security/wss4j/saml/DOMToStaxSamlTest.java | 1 +
.../apache/cxf/ws/security/wss4j/saml/PolicyBasedSamlTest.java | 1 +
.../java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java | 1 +
.../org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java | 1 +
.../apache/cxf/ws/transfer/dialect/fragment/FragmentDialect.java | 2 ++
.../cxf/ws/transfer/dialect/fragment/faults/FragmentFault.java | 2 ++
.../ws/transfer/dialect/fragment/faults/InvalidExpression.java | 1 +
.../ws/transfer/dialect/fragment/faults/UnsupportedLanguage.java | 1 +
.../cxf/ws/transfer/dialect/fragment/faults/UnsupportedMode.java | 1 +
.../dialect/fragment/language/FragmentDialectLanguageQName.java | 3 +++
.../dialect/fragment/language/FragmentDialectLanguageXPath10.java | 3 +++
.../org/apache/cxf/ws/transfer/manager/MemoryResourceManager.java | 1 +
.../main/java/org/apache/cxf/ws/transfer/resource/Resource.java | 1 +
.../java/org/apache/cxf/ws/transfer/resource/ResourceLocal.java | 2 ++
.../apache/cxf/ws/transfer/resourcefactory/ResourceFactory.java | 1 +
.../cxf/ws/transfer/resourcefactory/ResourceFactoryImpl.java | 1 +
.../cxf/ws/transfer/shared/faults/InvalidRepresentation.java | 1 +
.../java/org/apache/cxf/ws/transfer/shared/faults/PutDenied.java | 1 +
.../org/apache/cxf/ws/transfer/shared/faults/UnknownDialect.java | 1 +
.../org/apache/cxf/ws/transfer/shared/faults/UnknownResource.java | 1 +
.../org/apache/cxf/ws/transfer/shared/faults/WSTransferFault.java | 2 ++
.../validationtransformation/ValidAndTransformHelper.java | 1 +
.../validationtransformation/XSDResourceTypeIdentifier.java | 2 ++
.../transfer/validationtransformation/XSDResourceValidator.java | 2 ++
.../validationtransformation/XSLTResourceTransformer.java | 1 +
.../apache/cxf/ws/transfer/integration/FragmentGetQNameTest.java | 2 ++
.../cxf/ws/transfer/integration/FragmentGetXPath10Test.java | 2 ++
.../apache/cxf/ws/transfer/integration/FragmentPutAddTest.java | 2 ++
.../cxf/ws/transfer/integration/FragmentPutInsertAfterTest.java | 2 ++
.../cxf/ws/transfer/integration/FragmentPutInsertBeforeTest.java | 2 ++
.../apache/cxf/ws/transfer/integration/FragmentPutRemoveTest.java | 2 ++
.../cxf/ws/transfer/integration/FragmentPutReplaceTest.java | 2 ++
.../apache/cxf/ws/transfer/integration/IntegrationBaseTest.java | 2 ++
.../apache/cxf/ws/transfer/integration/ResourceFactoryTest.java | 2 ++
.../java/org/apache/cxf/ws/transfer/integration/ResourceTest.java | 3 +++
.../apache/cxf/ws/transfer/unit/MemoryResourceManagerTest.java | 3 +++
.../org/apache/cxf/ws/transfer/unit/XSDResourceValidatorTest.java | 4 ++++
.../apache/cxf/ws/transfer/unit/XSLTResourceTransformerTest.java | 4 ++++
rt/wsdl/src/main/java/org/apache/cxf/wsdl/AbstractWSDLPlugin.java | 1 +
.../src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java | 1 +
.../main/java/org/apache/cxf/wsdl/WSDLExtensibilityPlugin.java | 1 +
rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLManager.java | 2 ++
.../java/org/apache/cxf/wsdl11/AbstractWrapperWSDLLocator.java | 1 +
.../src/main/java/org/apache/cxf/wsdl11/PartialWSDLProcessor.java | 2 --
.../java/org/apache/cxf/wsdl11/ResourceManagerWSDLLocator.java | 1 +
rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java | 1 +
rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java | 1 +
.../apache/cxf/wsdl/interceptors/DocLiteralInInterceptorTest.java | 2 +-
.../cxf/wsdl/service/factory/ReflectionServiceFactorBeanTest.java | 2 +-
.../test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java | 2 +-
.../src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java | 1 +
.../test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java | 2 +-
.../src/main/java/org/apache/cxf/sts/cache/CacheUtils.java | 1 +
.../main/java/org/apache/cxf/sts/cache/EHCacheIdentityCache.java | 1 -
.../src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java | 1 +
.../main/java/org/apache/cxf/sts/claims/IdentityClaimsParser.java | 1 +
.../src/main/java/org/apache/cxf/sts/claims/LdapUtils.java | 1 -
.../java/org/apache/cxf/sts/event/LoggerPatternLayoutLogback.java | 1 -
.../main/java/org/apache/cxf/sts/operation/AbstractOperation.java | 1 +
.../src/main/java/org/apache/cxf/sts/request/ReceivedToken.java | 1 +
.../src/main/java/org/apache/cxf/sts/request/RequestParser.java | 1 +
.../org/apache/cxf/sts/rest/RESTSecurityTokenServiceImpl.java | 1 +
.../java/org/apache/cxf/sts/token/canceller/SCTCanceller.java | 1 +
.../apache/cxf/sts/token/delegation/SAMLDelegationHandler.java | 1 +
.../java/org/apache/cxf/sts/token/provider/SAMLTokenProvider.java | 1 +
.../apache/cxf/sts/token/provider/SubjectProviderParameters.java | 1 +
.../java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java | 1 +
.../org/apache/cxf/sts/token/renewer/TokenRenewerResponse.java | 1 +
.../org/apache/cxf/sts/token/validator/SAMLTokenValidator.java | 1 +
.../apache/cxf/sts/token/validator/UsernameTokenValidator.java | 1 +
.../java/org/apache/cxf/sts/cache/HazelCastTokenStoreTest.java | 1 +
.../org/apache/cxf/sts/claims/mapper/JexlClaimsMapperTest.java | 1 +
.../test/java/org/apache/cxf/sts/common/CustomClaimParser.java | 1 +
.../java/org/apache/cxf/sts/common/PasswordCallbackHandler.java | 2 ++
.../java/org/apache/cxf/sts/common/RealmSupportClaimsHandler.java | 1 +
.../java/org/apache/cxf/sts/operation/DummyTokenProvider.java | 1 +
.../java/org/apache/cxf/sts/operation/IssueJWTClaimsUnitTest.java | 2 ++
.../org/apache/cxf/sts/operation/IssueJWTOnbehalfofUnitTest.java | 1 +
.../java/org/apache/cxf/sts/operation/IssueJWTRealmUnitTest.java | 1 +
.../test/java/org/apache/cxf/sts/operation/IssueJWTUnitTest.java | 1 +
.../org/apache/cxf/sts/operation/IssueSamlClaimsUnitTest.java | 1 +
.../java/org/apache/cxf/sts/operation/IssueSamlRealmUnitTest.java | 1 +
.../test/java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java | 1 +
.../test/java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java | 1 +
.../apache/cxf/sts/operation/ValidateJWTTransformationTest.java | 1 +
.../java/org/apache/cxf/sts/operation/ValidateJWTUnitTest.java | 1 +
.../cxf/sts/operation/ValidateTokenTransformationUnitTest.java | 1 +
.../java/org/apache/cxf/sts/request/RequestParserUnitTest.java | 1 +
.../org/apache/cxf/sts/token/provider/JWTProviderActAsTest.java | 1 +
.../apache/cxf/sts/token/provider/JWTProviderOnBehalfOfTest.java | 1 +
.../org/apache/cxf/sts/token/provider/JWTTokenProviderTest.java | 1 +
.../java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java | 1 +
.../org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java | 1 +
.../apache/cxf/sts/token/provider/SAMLProviderKeyTypeTest.java | 1 +
.../java/org/apache/cxf/sts/token/realm/RealmSupportTest.java | 1 +
.../cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java | 1 +
.../org/apache/cxf/sts/token/renewer/SAMLTokenRenewerPOPTest.java | 2 ++
.../apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java | 1 +
.../org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java | 1 +
.../sts/token/validator/SAMLTokenValidatorCachedRealmTest.java | 1 +
.../apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java | 2 ++
.../cxf/systest/sts/asymmetric_encr/AsymmetricEncryptionTest.java | 1 +
.../org/apache/cxf/systest/sts/basic_auth/JaxwsBasicAuthTest.java | 1 +
.../java/org/apache/cxf/systest/sts/batch/SAMLBatchUnitTest.java | 1 +
.../org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java | 1 +
.../systest/sts/binarysecuritytoken/BinarySecurityTokenTest.java | 1 +
.../test/java/org/apache/cxf/systest/sts/caching/CachingTest.java | 1 +
.../org/apache/cxf/systest/sts/caching/DoubleItPortTypeImpl.java | 1 -
.../org/apache/cxf/systest/sts/caching/ServerCachingTest.java | 1 +
.../test/java/org/apache/cxf/systest/sts/claims/ClaimsTest.java | 1 +
.../java/org/apache/cxf/systest/sts/claims/ClaimsValidator.java | 1 +
.../org/apache/cxf/systest/sts/claims/StaxClaimsValidator.java | 1 +
.../org/apache/cxf/systest/sts/common/CommonCallbackHandler.java | 2 ++
.../org/apache/cxf/systest/sts/common/DoubleItPortTypeImpl.java | 1 +
.../java/org/apache/cxf/systest/sts/common/TokenTestUtils.java | 1 +
.../org/apache/cxf/systest/sts/cross_domain/CrossDomainTest.java | 1 +
.../org/apache/cxf/systest/sts/custom/CustomParameterTest.java | 1 +
.../cxf/systest/sts/custom_onbehalfof/CustomOnBehalfOfTest.java | 2 +-
.../systest/sts/custom_onbehalfof/LocalDoubleItPortTypeImpl.java | 1 +
.../systest/sts/custom_onbehalfof/SAMLDoubleItPortTypeImpl.java | 1 +
.../org/apache/cxf/systest/sts/deployment/CustomClaimsParser.java | 1 +
.../systest/sts/distributed_caching/DistributedCachingTest.java | 2 +-
.../src/test/java/org/apache/cxf/systest/sts/jwt/JWTUnitTest.java | 1 +
.../test/java/org/apache/cxf/systest/sts/jwt/JaxrsJWTTest.java | 1 +
.../org/apache/cxf/systest/sts/kerberos/DoubleItPortTypeImpl.java | 1 +
.../apache/cxf/systest/sts/kerberos/IntermediaryPortTypeImpl.java | 1 +
.../cxf/systest/sts/kerberos/KerberosDelegationTokenTest.java | 1 +
.../org/apache/cxf/systest/sts/realms/DifferentRealmTest.java | 2 +-
.../test/java/org/apache/cxf/systest/sts/renew/SAMLRenewTest.java | 2 +-
.../java/org/apache/cxf/systest/sts/renew/SAMLRenewUnitTest.java | 1 +
.../apache/cxf/systest/sts/secure_conv/SCTSAMLTokenProvider.java | 1 +
.../cxf/systest/sts/secure_conv/SecureConversationTest.java | 2 +-
.../cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java | 1 +
.../test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java | 2 ++
.../cxf/systest/sts/sts_sender_vouches/STSSenderVouchesTest.java | 1 +
.../cxf/systest/sts/transformation/DoubleItPortTypeImpl.java | 1 +
.../apache/cxf/systest/sts/transformation/TransformationTest.java | 2 +-
.../apache/cxf/systest/sts/usernametoken/UsernameTokenTest.java | 1 +
.../apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java | 1 +
.../test/java/org/apache/cxf/systest/sts/bearer/BearerTest.java | 1 +
.../org/apache/cxf/systest/sts/common/CommonCallbackHandler.java | 2 ++
.../org/apache/cxf/systest/sts/common/DoubleItPortTypeImpl.java | 1 +
.../org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java | 2 ++
.../sts/intermediary_transformation/DoubleItPortTypeImpl.java | 1 +
.../IntermediaryCachingPortTypeImpl.java | 1 +
.../sts/intermediary_transformation/IntermediaryPortTypeImpl.java | 1 +
.../IntermediaryTransformationCachingTest.java | 1 +
.../IntermediaryTransformationTest.java | 1 +
.../test/java/org/apache/cxf/systest/sts/issuer/IssuerTest.java | 1 +
.../java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java | 2 ++
.../src/test/java/org/apache/cxf/systest/sts/jaas/JAASTest.java | 1 +
.../test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java | 1 +
.../apache/cxf/systest/sts/sendervouches/SenderVouchesTest.java | 1 +
.../java/org/apache/cxf/systest/sts/stsclient/STSClientTest.java | 1 +
.../java/org/apache/cxf/systest/sts/template/TemplateTest.java | 1 +
.../apache/cxf/systest/sts/transport/TransportBindingTest.java | 1 +
.../org/apache/cxf/systest/sts/username_actas/ActAsValidator.java | 1 +
.../cxf/systest/sts/username_actas/UsernameActAsCachingTest.java | 1 +
.../apache/cxf/systest/sts/username_actas/UsernameActAsTest.java | 1 +
.../sts/username_onbehalfof/UsernameOnBehalfOfCachingTest.java | 1 +
.../systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java | 1 +
.../apache/cxf/systest/sts/x509/X509AsymmetricBindingTest.java | 1 +
.../org/apache/cxf/systest/sts/x509/X509SymmetricBindingTest.java | 1 +
.../apache/cxf/systest/sts/itests/BasicSTSIntegrationTest.java | 1 +
.../apache/cxf/systest/sts/itests/unit/CommonCallbackHandler.java | 2 ++
.../java/org/apache/cxf/systest/sts/itests/unit/STSUnitTest.java | 1 +
.../org/apache/cxf/systest/sts/osgi/CommonCallbackHandler.java | 2 ++
.../src/main/java/org/apache/cxf/wsn/client/PullPoint.java | 1 +
.../src/main/java/org/apache/cxf/wsn/AbstractSubscription.java | 1 +
.../java/org/apache/cxf/wsn/services/JaxwsCreatePullPoint.java | 1 +
.../java/org/apache/cxf/xkms/cache/EHCacheXKMSClientCache.java | 1 -
.../java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java | 2 ++
.../cxf/xkms/itests/handlers/validator/ValidatorCRLTest.java | 1 +
.../apache/cxf/xkms/itests/handlers/validator/ValidatorTest.java | 1 +
.../java/org/apache/cxf/xkms/itests/service/XKMSServiceTest.java | 1 +
.../java/org/apache/cxf/xkms/itests/service/XKRSSDisableTest.java | 1 +
.../src/test/java/org/apache/cxf/xkms/service/CheckXKRSS.java | 1 +
.../java/org/apache/cxf/xkms/x509/handlers/X509LocatorTest.java | 1 +
.../apache/cxf/xkms/x509/repo/file/FileCertificateRepoTest.java | 1 +
.../test/java/org/apache/cxf/xkms/x509/utils/X509UtilsTest.java | 1 +
.../org/apache/cxf/xkms/x509/validator/BasicValidationTest.java | 1 +
.../org/apache/cxf/xkms/x509/validator/DateValidatorTest.java | 1 +
.../cxf/xkms/x509/validator/TrustedAuthorityValidatorCRLTest.java | 1 +
.../apache/cxf/xkms/x509/repo/ldap/LDAPCertificateRepoTest.java | 1 +
.../org/apache/cxf/systests/cdi/base/AbstractCdiMultiAppTest.java | 1 +
.../apache/cxf/systests/cdi/base/AbstractCdiSingleAppTest.java | 1 +
.../java/org/apache/cxf/systests/cdi/base/BookStoreByIds.java | 1 +
.../org/apache/cxf/systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java | 1 +
.../java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java | 1 +
.../org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java | 1 +
.../org/apache/cxf/systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java | 1 +
.../java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java | 1 +
.../org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java | 1 +
.../org/apache/cxf/systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java | 1 +
.../java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java | 1 +
.../org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java | 1 +
.../cxf/systest/jaxrs/cdi/unwrapper/ClassUnwrapperTest.java | 1 +
.../org/apache/cxf/systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java | 1 +
.../java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java | 1 +
.../org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java | 1 +
.../org/apache/cxf/systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java | 1 +
.../java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java | 1 +
.../org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java | 1 +
.../org/apache/cxf/systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java | 1 +
.../java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java | 1 +
.../org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java | 1 +
.../cxf/systest/jaxrs/cdi/unwrapper/ClassUnwrapperTest.java | 1 +
.../test/java/org/apache/cxf/systest/grizzly/EndpointAPITest.java | 1 +
.../test/java/org/apache/cxf/systest/aegis/AegisJaxWsWsdlNs.java | 1 +
.../cxf/systest/jaxb/validators/CustomValidatorJAXBTest.java | 1 +
.../apache/cxf/systest/jaxrs/AbstractJAXRSContinuationsTest.java | 1 +
.../org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java | 1 +
.../cxf/systest/jaxrs/JAXRSClientServerNonSpringBookTest.java | 1 +
.../cxf/systest/jaxrs/JAXRSClientServerODataSearchTest.java | 1 +
.../jaxrs/JAXRSClientServerResourceCreatedOutsideBookTest.java | 1 +
.../jaxrs/JAXRSClientServerResourceCreatedSpringBookTest.java | 1 +
.../apache/cxf/systest/jaxrs/JAXRSClientServerStreamingTest.java | 1 +
.../systest/jaxrs/JAXRSClientServerUserResourceAsteriskTest.java | 1 +
.../systest/jaxrs/JAXRSClientServerUserResourceDefaultTest.java | 1 +
.../cxf/systest/jaxrs/JAXRSClientServerUserResourceTest.java | 1 +
.../cxf/systest/jaxrs/JAXRSCxfContinuationsServlet3Test.java | 1 +
.../org/apache/cxf/systest/jaxrs/JAXRSCxfContinuationsTest.java | 1 +
.../java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java | 1 +
.../test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java | 1 +
.../jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/XXETest.java | 1 +
.../jaxrs/description/AbstractSwagger2ServiceDescriptionTest.java | 2 +-
.../openapi/AbstractOpenApiServiceDescriptionTest.java | 2 +-
.../cxf/systest/jaxrs/description/openapi/BookStoreOpenApi.java | 1 +
.../systest/jaxrs/discovery/JAXRSServerSpringDiscoveryTest.java | 1 +
.../cxf/systest/jaxrs/extraction/JAXRSClientServerTikaTest.java | 1 +
.../cxf/systest/jaxrs/failover/CircuitBreakerFailoverTest.java | 1 +
.../apache/cxf/systest/jaxrs/failover/FailoverWebClientTest.java | 1 +
.../cxf/systest/jaxrs/failover/LoadDistributorWebClientTest.java | 1 +
.../java/org/apache/cxf/systest/jaxrs/nio/NioBookStoreTest.java | 1 +
.../apache/cxf/systest/jaxrs/provider/JsrJsonpProviderTest.java | 1 +
.../org/apache/cxf/systest/jaxrs/reactor/FluxReactorTest.java | 3 +++
.../java/org/apache/cxf/systest/jaxrs/reactor/FluxService.java | 1 +
.../org/apache/cxf/systest/jaxrs/reactor/MonoReactorTest.java | 4 ++++
.../java/org/apache/cxf/systest/jaxrs/reactor/MonoService.java | 1 +
.../java/org/apache/cxf/systest/jaxrs/reactor/ReactorServer.java | 2 ++
.../dispatch/DispatchClientServerWithMalformedResponseTest.java | 1 +
.../org/apache/cxf/systest/handlers/AddNumbersServiceUnwrap.java | 1 +
.../cxf/systest/handlers/AddNumbersServiceWithAnnotation.java | 1 +
.../cxf/systest/handlers/DispatchHandlerInvocationTest.java | 2 +-
.../org/apache/cxf/systest/handlers/HandlerInvocationTest.java | 2 ++
.../systest/handlers/HandlerInvocationUsingAddNumbersTest.java | 2 +-
.../java/org/apache/cxf/systest/handlers/HandlerTestImpl.java | 2 +-
.../apache/cxf/systest/handlers/SpringConfiguredHandlerTest.java | 1 +
.../test/java/org/apache/cxf/systest/handlers/TestHandler.java | 1 -
.../java/org/apache/cxf/systest/jaxws/AnyClientServerTest.java | 1 +
.../java/org/apache/cxf/systest/jaxws/ArrayServiceServer.java | 1 +
.../src/test/java/org/apache/cxf/systest/jaxws/CXF5061Test.java | 1 +
.../src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java | 1 +
.../cxf/systest/jaxws/ClientServerGreeterBaseNoWsdlTest.java | 1 +
.../org/apache/cxf/systest/jaxws/ClientServerGreeterBaseTest.java | 1 +
.../apache/cxf/systest/jaxws/ClientServerGreeterNoWsdlTest.java | 1 +
.../org/apache/cxf/systest/jaxws/ClientServerMixedStyleTest.java | 1 +
.../org/apache/cxf/systest/jaxws/ClientServerPartialWsdlTest.java | 2 +-
.../cxf/systest/jaxws/ClientServerRPCLitDefatulAnnoTest.java | 1 +
.../java/org/apache/cxf/systest/jaxws/ClientServerRPCLitTest.java | 1 +
.../test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java | 1 +
.../org/apache/cxf/systest/jaxws/DocLitBareCodeFirstService.java | 1 -
.../apache/cxf/systest/jaxws/DocLitWrappedCodeFirstService.java | 1 -
.../java/org/apache/cxf/systest/jaxws/JaxWsClientThreadTest.java | 1 +
.../test/java/org/apache/cxf/systest/jaxws/JaxwsExecutorTest.java | 1 +
.../test/java/org/apache/cxf/systest/jaxws/OASISCatalogTest.java | 1 -
.../jaxws/schemavalidation/JavaFirstSchemaValidationTest.java | 1 +
.../test/java/org/apache/cxf/systest/provider/CXF4130Test.java | 1 +
.../test/java/org/apache/cxf/systest/provider/CXF4818Test.java | 1 +
.../apache/cxf/systest/provider/NBProviderClientServerTest.java | 1 +
.../org/apache/cxf/systest/provider/ProviderClientServerTest.java | 1 +
.../apache/cxf/systest/provider/ProviderRPCClientServerTest.java | 1 +
.../apache/cxf/systest/kerberos/common/DoubleItPortTypeImpl.java | 1 +
.../systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java | 1 +
.../cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java | 1 +
.../apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java | 1 +
.../test/java/org/apache/cxf/jaxrs/servlet/AbstractSciTest.java | 1 +
.../apache/cxf/jaxrs/servlet/jetty/JettyEmptyApplicationTest.java | 1 +
.../cxf/jaxrs/servlet/jetty/JettyEmptyPathApplicationTest.java | 1 +
.../apache/cxf/jaxrs/servlet/jetty/JettyNoApplicationTest.java | 1 +
.../servlet/jetty/JettySingleApplicationOnlyClassesTest.java | 1 +
.../servlet/jetty/JettySingleApplicationOnlySingletonsTest.java | 1 +
.../cxf/jaxrs/servlet/jetty/JettySingleApplicationTest.java | 1 +
.../systest/jaxrs/security/jose/jwejws/JweJwsAlgorithmTest.java | 1 +
.../systest/jaxrs/security/jose/jwejws/JweJwsReferenceTest.java | 1 +
.../cxf/systest/jaxrs/security/jose/jwt/BookStoreAuthn.java | 1 +
.../cxf/systest/jaxrs/security/jose/jwt/JWTPropertiesTest.java | 1 +
.../jaxrs/security/oauth/TemporaryCredentialServiceTest.java | 1 -
.../cxf/systest/jaxrs/security/oauth2/common/OAuth2TestUtils.java | 1 +
.../systest/jaxrs/security/oauth2/filters/OAuth2FiltersTest.java | 1 +
.../security/oauth2/grants/AuthorizationGrantNegativeTest.java | 1 +
.../jaxrs/security/oauth2/grants/AuthorizationGrantTest.java | 1 +
.../jaxrs/security/oauth2/grants/IntrospectionServiceTest.java | 1 +
.../cxf/systest/jaxrs/security/oauth2/tls/JAXRSOAuth2TlsTest.java | 1 -
.../org/apache/cxf/systest/jaxrs/security/oidc/OIDCFlowTest.java | 1 +
.../apache/cxf/systest/jaxrs/security/oidc/OIDCNegativeTest.java | 1 +
.../org/apache/cxf/systest/jaxrs/security/oidc/UserInfoTest.java | 1 +
.../cxf/systest/jaxrs/security/oidc/filters/OIDCFiltersTest.java | 1 +
.../org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java | 1 +
.../cxf/systest/jaxrs/security/saml/SamlRetrievalInterceptor.java | 1 -
.../apache/cxf/systest/jaxrs/security/samlsso/MetadataTest.java | 2 ++
.../org/apache/cxf/systest/jaxrs/sse/jetty/JettyEmbeddedTest.java | 1 +
.../java/org/apache/cxf/systest/jaxrs/sse/jetty/JettyWarTest.java | 1 +
.../apache/cxf/systest/jaxrs/sse/tomcat/TomcatEmbeddedTest.java | 1 +
.../org/apache/cxf/systest/jaxrs/sse/tomcat/TomcatWarTest.java | 1 +
.../cxf/systest/jaxrs/sse/undertow/UndertowEmbeddedTest.java | 1 +
.../java/org/apache/cxf/systest/jaxrs/tracing/brave/HasSpan.java | 1 -
.../cxf/systest/jaxrs/tracing/brave/IsAnnotationContaining.java | 1 -
.../systest/jaxrs/tracing/brave/IsBinaryAnnotationContaining.java | 1 -
.../jaxrs/tracing/htrace/HTraceTracingCustomHeadersTest.java | 1 +
.../cxf/systest/jaxrs/tracing/htrace/HTraceTracingTest.java | 1 +
.../systest/jaxrs/tracing/opentracing/OpenTracingTracingTest.java | 1 +
.../org/apache/cxf/systest/jaxws/tracing/brave/BookStore.java | 1 -
.../apache/cxf/systest/jaxws/tracing/brave/BraveTracingTest.java | 1 +
.../cxf/systest/jaxws/tracing/htrace/HTraceTracingTest.java | 1 +
.../systest/jaxws/tracing/opentracing/OpenTracingTracingTest.java | 1 +
.../apache/cxf/jms/testsuite/testcases/JavaFirstNoWsdlTest.java | 1 +
.../apache/cxf/jms/testsuite/testcases/SOAPJMSTestSuiteTest.java | 1 +
.../org/apache/cxf/jms/testsuite/testcases/SoapJmsSpecTest.java | 1 +
.../test/java/org/apache/cxf/systest/jms/AbstractVmJMSTest.java | 1 +
.../test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java | 2 ++
.../src/test/java/org/apache/cxf/systest/jms/JMSTestMtom.java | 1 +
.../src/test/java/org/apache/cxf/systest/jms/JaxWsAPITest.java | 1 +
.../continuations/HelloWorldContinuationsClientServerTest.java | 1 +
.../jms/continuations/HelloWorldContinuationsThrottleTest.java | 1 +
.../jms/continuations/JMSContinuationsClientServerTest.java | 1 +
.../systest/jms/continuations/ProviderJMSContinuationTest.java | 1 +
.../jms/multitransport/MultiTransportClientServerTest.java | 1 +
.../org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java | 1 +
.../org/apache/cxf/systest/jms/shared/JMSSharedQueueTest.java | 1 +
.../java/org/apache/cxf/systest/jms/swa/ClientServerSwaTest.java | 1 +
.../org/apache/cxf/systest/jms/tx/GreeterImplWithTransaction.java | 1 +
.../java/org/apache/cxf/systest/jms/tx/JMSTransactionTest.java | 1 +
.../java/org/apache/cxf/systest/http_undertow/ThreadPoolTest.java | 1 +
.../apache/cxf/systest/http_undertow/UndertowBasicAuthTest.java | 1 +
.../apache/cxf/systest/http_undertow/UndertowDigestAuthTest.java | 1 +
.../continuations/ClientServerWrappedContinuationTest.java | 1 +
.../src/test/java/org/apache/cxf/https/ssl3/SSLv3Test.java | 1 +
.../test/java/org/apache/cxf/systest/http/HTTPConduitTest.java | 1 +
.../java/org/apache/cxf/systest/http/HTTPProxyConduitTest.java | 1 +
.../org/apache/cxf/systest/http/PublishedEndpointUrlTest.java | 1 +
.../src/test/java/org/apache/cxf/systest/http/WSDLQueryTest.java | 1 +
.../java/org/apache/cxf/systest/http/auth/DigestAuthTest.java | 1 +
.../org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java | 5 -----
.../org/apache/cxf/systest/http_jetty/JettyBasicAuthTest.java | 1 +
.../org/apache/cxf/systest/http_jetty/JettyDigestAuthTest.java | 1 +
.../java/org/apache/cxf/systest/http_jetty/ThreadPoolTest.java | 1 +
.../continuations/ClientServerWrappedContinuationTest.java | 1 +
.../apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java | 1 +
.../org/apache/cxf/systest/https/clientauth/ClientAuthTest.java | 1 +
.../org/apache/cxf/systest/https/conduit/HTTPSClientTest.java | 1 +
.../org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java | 1 +
.../apache/cxf/systest/https/constraints/CertConstraintsTest.java | 1 +
.../cxf/systest/https/hostname/HostnameVerificationTest.java | 1 +
.../java/org/apache/cxf/systest/https/trust/TrustManagerTest.java | 1 +
.../org/apache/cxf/systest/servlet/ErrorContextSerletTest.java | 1 +
.../java/org/apache/cxf/cxf1226/MissingQualification1226Test.java | 1 +
.../apache/cxf/cxf2006/RespectBindingFeatureClientServerTest.java | 1 +
.../java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java | 1 +
.../src/test/java/org/apache/cxf/systest/bus/BusShutdownTest.java | 1 -
.../java/org/apache/cxf/systest/bus/SpringBusFactoryTest.java | 2 ++
.../org/apache/cxf/systest/callback/CallbackClientServerTest.java | 1 +
.../apache/cxf/systest/clustering/CircuitBreakerFailoverTest.java | 1 +
.../systest/clustering/LoadDistributorAddressOverrideTest.java | 3 ++-
.../cxf/systest/clustering/LoadDistributorSequentialStrategy.java | 1 +
.../cxf/systest/clustering/LoadDistributorStaticStrategy.java | 1 +
.../org/apache/cxf/systest/clustering/LoadDistributorTest.java | 3 +++
.../apache/cxf/systest/coloc/AbstractHeaderServiceDocLitTest.java | 1 -
.../apache/cxf/systest/coloc/AbstractHeaderServiceRpcLitTest.java | 1 -
.../org/apache/cxf/systest/coloc/AbstractWrappedDocLitTest.java | 2 +-
.../org/apache/cxf/systest/coloc/BaseHeaderTesterDocLitImpl.java | 2 +-
.../java/org/apache/cxf/systest/coloc/ColocHeaderDocLitTest.java | 1 +
.../java/org/apache/cxf/systest/coloc/ColocHeaderRpcLitTest.java | 1 +
.../java/org/apache/cxf/systest/coloc/ColocWrappedDocLitTest.java | 1 +
.../test/java/org/apache/cxf/systest/corba/BaseGreeterImpl.java | 1 +
.../java/org/apache/cxf/systest/corba/BaseGreeterTimeoutImpl.java | 1 +
.../cxf/systest/corba/CorbaBindingFactoryConfigurerTest.java | 1 +
.../src/test/java/org/apache/cxf/systest/corba/CorbaTest.java | 1 +
.../test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java | 2 ++
.../test/java/org/apache/cxf/systest/cxf6319/Cxf6319TestCase.java | 1 +
.../src/test/java/org/apache/cxf/systest/cxf993/Cxf993Test.java | 2 ++
.../java/org/apache/cxf/systest/jca/OutBoundConnectionTest.java | 1 +
.../test/java/org/apache/cxf/systest/js/JSClientServerTest.java | 1 +
.../apache/cxf/systest/management/CountersClientServerTest.java | 1 +
.../apache/cxf/systest/management/ManagedClientServerTest.java | 1 +
.../org/apache/cxf/systest/mtom/ClientMtomXopWithJMSTest.java | 1 +
.../org/apache/cxf/systest/mtom/TestAttachmentOutInterceptor.java | 1 +
.../apache/cxf/systest/mtom/TestMultipartMessageInterceptor.java | 1 +
.../java/org/apache/cxf/systest/mtom_bindingtype/HelloImpl.java | 1 +
.../apache/cxf/systest/mtom_bindingtype/MTOMBindingTypeTest.java | 1 +
.../test/java/org/apache/cxf/systest/mtom_feature/HelloImpl.java | 1 +
.../java/org/apache/cxf/systest/mtom_feature/ImageHelper.java | 1 +
.../cxf/systest/mtom_feature/MtomFeatureClientServerTest.java | 1 +
.../org/apache/cxf/systest/outofband/header/OOBHeaderTest.java | 4 +---
.../test/java/org/apache/cxf/systest/outofband/header/Server.java | 2 --
.../java/org/apache/cxf/systest/resolver/JarResolverTest.java | 1 +
.../org/apache/cxf/systest/schemaimport/sayhi2/SayHiArray.java | 1 +
.../cxf/systest/schemaimport/sayhi2/SayHiArrayResponse.java | 1 +
.../java/org/apache/cxf/systest/simple/SimpleFrontendTest.java | 1 +
.../src/test/java/org/apache/cxf/systest/soap/SoapActionTest.java | 1 +
.../org/apache/cxf/systest/soapheader/HeaderClientServerTest.java | 1 +
.../java/org/apache/cxf/systest/stringarray/StringArrayTest.java | 1 +
.../cxf/systest/type_substitution/AppleFindClientServerTest.java | 1 +
.../cxf/systest/type_substitution/TypeSubClientServerTest.java | 1 +
.../org/apache/cxf/systest/type_test/AbstractTypeTestClient2.java | 2 +-
.../org/apache/cxf/systest/type_test/AbstractTypeTestClient4.java | 1 +
.../org/apache/cxf/systest/type_test/AbstractTypeTestClient5.java | 1 +
.../cxf/systest/type_test/corba/CORBADocLitClientTypeTest.java | 1 +
.../apache/cxf/systest/versioning/ClientServerVersioningTest.java | 1 +
.../test/java/org/apache/cxf/systest/ws/rm/DecoupledBareTest.java | 1 +
.../apache/cxf/systest/ws/rm/DecoupledClientServerOnewayTest.java | 1 +
.../org/apache/cxf/systest/ws/rm/DecoupledClientServerTest.java | 1 +
.../cxf/systest/wssec/examples/common/DoubleItPortTypeImpl.java | 1 +
.../org/apache/cxf/systest/wssec/examples/saml/SamlTokenTest.java | 1 +
.../systest/wssec/examples/secconv/SecureConversationTest.java | 1 +
.../apache/cxf/systest/wssec/examples/ut/UsernameTokenTest.java | 1 +
.../org/apache/cxf/systest/wssec/examples/x509/X509TokenTest.java | 1 +
.../test/java/org/apache/cxf/systest/ws/action/ActionTest.java | 1 +
.../org/apache/cxf/systest/ws/action/SignatureWhitespaceTest.java | 1 +
.../org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java | 1 -
.../apache/cxf/systest/ws/algsuite/StaxAlgorithmSuiteTest.java | 1 -
.../java/org/apache/cxf/systest/ws/basicauth/BasicAuthTest.java | 1 +
.../org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java | 1 +
.../test/java/org/apache/cxf/systest/ws/cache/CachingTest.java | 1 +
.../org/apache/cxf/systest/ws/common/DoubleItPortTypeImpl.java | 1 +
.../systest/ws/coverage_checker/CryptoCoverageCheckerTest.java | 1 +
.../src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java | 1 +
.../java/org/apache/cxf/systest/ws/fault/ModifiedRequestTest.java | 2 ++
.../src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java | 1 +
.../org/apache/cxf/systest/ws/gcm/MGF256AlgorithmSuiteLoader.java | 1 +
.../test/java/org/apache/cxf/systest/ws/httpget/HTTPGetTest.java | 1 +
.../test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java | 1 +
.../java/org/apache/cxf/systest/ws/mtom/MTOMSecurityTest.java | 1 +
.../src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java | 1 +
.../apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java | 1 +
.../systest/ws/policy/JavaFirstURIDomainExpressionBuilder.java | 3 +++
.../org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java | 1 +
.../systest/ws/policy/handler/PolicyHandlerFaultResponseTest.java | 1 +
.../test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java | 1 +
.../cxf/systest/ws/saml/subjectconf/SamlSubjectConfTest.java | 1 +
.../org/apache/cxf/systest/ws/security/WSSecurityClientTest.java | 1 +
.../org/apache/cxf/systest/ws/security/handler/WSSecTest.java | 1 +
.../test/java/org/apache/cxf/systest/ws/swa/SWAActionTest.java | 1 +
.../test/java/org/apache/cxf/systest/ws/swa/SWAPolicyTest.java | 1 +
.../org/apache/cxf/systest/ws/tokens/BinarySecurityTokenTest.java | 2 ++
.../java/org/apache/cxf/systest/ws/tokens/DoubleItBSTImpl.java | 1 +
.../cxf/systest/ws/tokens/EndorsingSupportingTokenTest.java | 1 +
.../org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java | 1 +
.../org/apache/cxf/systest/ws/ut/UsernameTokenDerivedTest.java | 1 -
.../org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.java | 1 +
.../test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java | 1 +
.../test/java/org/apache/cxf/systest/ws/wssc/PingServiceImpl.java | 1 -
.../test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java | 1 +
.../java/org/apache/cxf/systest/ws/wssec10/WSSecurity10Test.java | 1 +
.../java/org/apache/cxf/systest/ws/wssec11/WSSecurity111Test.java | 1 +
.../java/org/apache/cxf/systest/ws/wssec11/WSSecurity112Test.java | 1 +
.../org/apache/cxf/systest/ws/wssec11/WSSecurity11Common.java | 1 -
.../org/apache/cxf/systest/ws/x509/DoubleItPropertiesImpl.java | 1 -
.../java/org/apache/cxf/systest/ws/x509/SHA512PolicyLoader.java | 1 +
.../test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java | 1 +
.../src/test/java/org/apache/cxf/systest/ws/xkms/XKMSTest.java | 1 +
.../apache/cxf/systest/ws/addr_feature/WSAClientServerTest.java | 2 ++
.../org/apache/cxf/systest/ws/addr_fromjava/WSAFromJavaTest.java | 1 +
.../systest/ws/addr_responses/WSAResponsesClientServerTest.java | 1 +
.../jaxwsmm/WSDLAddrPolicyAttachmentJaxwsMMProviderTest.java | 1 +
.../java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java | 1 +
.../apache/cxf/systest/ws/addressing/spring/WSAFeatureTest.java | 1 +
.../cxf/systest/ws/addressing/spring/WSAFeatureXmlTest.java | 1 +
.../src/test/java/org/apache/cxf/systest/ws/mex/MEXTest.java | 1 +
.../cxf/systest/ws/policy/AddressingAnonymousPolicyTest.java | 1 +
.../apache/cxf/systest/ws/policy/AddressingInlinePolicyTest.java | 1 +
.../ws/policy/AddressingPolicyExternalAttachmentWsdl11Test.java | 1 +
.../org/apache/cxf/systest/ws/policy/HTTPClientPolicyTest.java | 1 +
.../org/apache/cxf/systest/ws/policy/HTTPServerPolicyTest.java | 1 +
.../org/apache/cxf/systest/ws/transfer/CreateStudentTest.java | 3 +++
.../org/apache/cxf/systest/ws/transfer/CreateTeacherTest.java | 3 +++
.../test/java/org/apache/cxf/systest/ws/transfer/DeleteTest.java | 3 +++
.../src/test/java/org/apache/cxf/systest/ws/transfer/GetTest.java | 3 +++
.../src/test/java/org/apache/cxf/systest/ws/transfer/PutTest.java | 3 +++
.../test/java/org/apache/cxf/systest/ws/transfer/TestUtils.java | 1 +
.../cxf/systest/ws/transfer/resolver/MyResourceResolver.java | 1 +
.../ws/transfer/validator/StudentPutResourceValidator.java | 1 +
.../systest/ws/transfer/validator/TeacherResourceValidator.java | 1 +
.../src/main/java/org/apache/cxf/test/AbstractCXFSpringTest.java | 2 ++
testutils/src/main/java/org/apache/cxf/test/XPathAssert.java | 1 -
.../org/apache/cxf/testutil/common/AbstractTestServerBase.java | 1 +
.../java/org/apache/cxf/testutil/handler/TrivialSOAPHandler.java | 1 +
.../org/apache/hello_world_soap_http/AnnotatedGreeterImpl.java | 1 +
.../hello_world_soap_http/AnnotatedGreeterNoOverloadImpl.java | 1 +
.../java/org/apache/hello_world_soap_http/BaseGreeterImpl.java | 1 -
.../java/org/apache/hello_world_soap_http/DocLitBareImpl.java | 1 +
.../apache/cxf/testutils/header_test/rpc/TestRPCHeaderTest.java | 1 +
.../main/java/org/apache/cxf/tools/common/ProcessorTestBase.java | 1 +
tools/common/src/main/java/org/apache/cxf/tools/common/Tag.java | 1 +
.../java/org/apache/cxf/tools/common/model/JavaInterface.java | 1 +
.../src/main/java/org/apache/cxf/tools/common/model/JavaPort.java | 2 ++
.../src/main/java/org/apache/cxf/tools/common/model/JavaType.java | 1 +
.../java/org/apache/cxf/tools/common/toolspec/ToolContext.java | 6 +++++-
.../java/org/apache/cxf/tools/common/model/JAnnotationTest.java | 1 +
.../cxf/tools/common/toolspec/AbstractToolContainerTest.java | 1 +
.../org/apache/cxf/tools/common/toolspec/ToolExceptionTest.java | 1 +
.../java/org/apache/cxf/tools/common/toolspec/ToolSpecTest.java | 1 +
.../org/apache/cxf/tools/common/toolspec/ToolSupportTest.java | 1 +
.../cxf/tools/common/toolspec/parser/CommandLineParserTest.java | 1 +
.../src/test/java/org/apache/cxf/tools/util/StAXUtilTest.java | 1 +
.../test/java/org/apache/cxf/tools/util/URIParserUtilTest.java | 1 +
.../corba/src/main/java/org/apache/cxf/tools/corba/IDLToWSDL.java | 1 -
.../main/java/org/apache/cxf/tools/corba/common/WSDLUtils.java | 2 --
.../cxf/tools/corba/processors/idl/ConstrTypeSpecVisitor.java | 2 ++
.../cxf/tools/corba/processors/idl/ParamTypeSpecVisitor.java | 2 ++
.../cxf/tools/corba/processors/idl/SimpleTypeSpecVisitor.java | 2 ++
.../cxf/tools/corba/processors/idl/TemplateTypeSpecVisitor.java | 2 ++
.../apache/cxf/tools/corba/processors/WSDLToCorbaBindingTest.java | 1 +
.../cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java | 1 +
.../cxf/tools/corba/processors/WSDLToIDLGenerationTest.java | 1 +
.../org/apache/cxf/tools/corba/utils/TestWSDLCorbaWriterImpl.java | 1 -
.../cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGenerator.java | 1 +
.../java2wsdl/processor/internal/SpringServiceBuilderFactory.java | 1 -
.../src/test/java/org/apache/cxf/tools/fortest/ImageSender.java | 1 +
.../apache/cxf/tools/fortest/cxf523/Operation0ResponseType.java | 1 +
.../test/java/org/apache/cxf/tools/fortest/cxf774/ListTest.java | 1 -
.../java/org/apache/cxf/tools/fortest/cxf774/ListTestImpl.java | 2 ++
.../test/java/org/apache/cxf/tools/fortest/date/EchoCalendar.java | 1 +
.../src/test/java/org/apache/cxf/tools/fortest/date/EchoDate.java | 1 +
.../apache/cxf/tools/java2js/processor/JavaToJSProcessorTest.java | 1 +
.../java/org/apache/cxf/tools/java2wsdl/JavaToWSFlagTest.java | 1 +
.../java2wsdl/generator/wsdl11/DateTypeCustomGeneratorTest.java | 1 +
.../tools/java2wsdl/generator/wsdl11/FaultBeanGeneratorTest.java | 1 +
.../java2wsdl/generator/wsdl11/WrapperBeanGeneratorTest.java | 1 +
.../generator/wsdl11/annotator/WrapperBeanAnnotatorTest.java | 2 ++
.../generator/wsdl11/annotator/WrapperBeanFieldAnnotatorTest.java | 1 +
.../apache/cxf/tools/java2wsdl/processor/FrontendFactoryTest.java | 1 +
.../java2wsdl/processor/internal/ServiceBuilderFactoryTest.java | 1 +
.../tools/java2wsdl/processor/internal/jaxws/FaultBeanTest.java | 1 +
.../processor/internal/jaxws/JaxwsServiceBuilderNoAnnoTest.java | 1 +
.../processor/internal/jaxws/JaxwsServiceBuilderTest.java | 1 +
.../java2wsdl/processor/internal/jaxws/RequestWrapperTest.java | 1 +
.../java2wsdl/processor/internal/jaxws/ResponseWrapperTest.java | 1 +
.../cxf/tools/java2wsdl/processor/internal/jaxws/WrapperTest.java | 2 ++
tools/javato/ws/src/test/java/org/apache/xmladapter/Greeter.java | 1 -
.../java/org/apache/cxf/tools/validator/internal/Stax2DOM.java | 1 +
.../org/apache/cxf/tools/validator/internal/ValidationResult.java | 1 +
.../org/apache/cxf/tools/validator/internal/WSDL11Validator.java | 1 +
.../java/org/apache/cxf/tools/validator/internal/model/XNode.java | 1 +
.../java/org/apache/cxf/tools/validator/WSDLValidationTest.java | 1 +
.../apache/cxf/tools/validator/internal/WSDL11ValidatorTest.java | 1 +
.../java/org/apache/cxf/tools/wsdlto/core/FrontEndProfile.java | 1 +
.../java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainerTest.java | 1 +
.../org/apache/cxf/tools/wsdlto/core/AbstractGeneratorTest.java | 1 +
.../cxf/tools/wsdlto/databinding/jaxb/ClassNameAllocatorImpl.java | 1 +
.../apache/cxf/tools/wsdlto/javascript/WSDLToJavaScriptTest.java | 1 +
.../wsdlto/frontend/jaxws/customization/CustomNodeSelector.java | 1 +
.../wsdlto/frontend/jaxws/customization/CustomizationParser.java | 1 +
.../frontend/jaxws/customization/JAXWSBindingDeserializer.java | 7 +++++--
.../wsdlto/frontend/jaxws/processor/WSDLToJavaProcessor.java | 1 +
.../wsdlto/frontend/jaxws/validator/UniqueBodyValidator.java | 1 +
.../jaxws/validator/WrapperStyleNameCollisionValidator.java | 1 +
.../org/apache/cxf/tools/wsdlto/frontend/jaxws/CatalogTest.java | 1 +
.../frontend/jaxws/processor/internal/ParameterProcessorTest.java | 1 +
.../processor/internal/annotator/WebMethodAnnotatorTest.java | 1 +
.../jaxws/processor/internal/annotator/WebParamAnnotatorTest.java | 1 +
.../processor/internal/annotator/XmlSeeAlsoAnnotatorTest.java | 1 +
.../jaxws/processor/internal/mapper/InterfaceMapperTest.java | 1 +
.../jaxws/processor/internal/mapper/MethodMapperTest.java | 1 +
.../wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java | 2 ++
.../java/org/apache/cxf/tools/misc/processor/address/Address.java | 1 +
.../cxf/tools/misc/processor/WSDLToServiceProcessorTest.java | 1 +
.../apache/cxf/tools/misc/processor/WSDLToXMLProcessorTest.java | 1 +
.../apache/cxf/tools/misc/processor/XSDToWSDLProcessorTest.java | 1 +
.../java/org/apache/cxf/tools/wsdlto/AbstractCodeGenTest.java | 1 +
.../java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java | 1 +
.../org/apache/cxf/tools/wsdlto/jaxb/JAXBCodeGenOptionTest.java | 1 +
.../test/java/org/apache/cxf/tools/wsdlto/jaxws/CatalogTest.java | 1 +
.../java/org/apache/cxf/tools/wsdlto/jaxws/JAXWSBindingTest.java | 1 +
.../org/apache/cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java | 1 +
.../java/org/apache/cxf/tools/wsdlto/validator/ValidatorTest.java | 1 +
1061 files changed, 1082 insertions(+), 254 deletions(-)
diff --git a/core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java b/core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java
index 139d6e3..a9b1ac6 100644
--- a/core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java
@@ -30,11 +30,13 @@ import org.apache.cxf.endpoint.ClientLifeCycleManager;
import org.apache.cxf.endpoint.ServerLifeCycleListener;
import org.apache.cxf.endpoint.ServerLifeCycleManager;
import org.apache.cxf.feature.Feature;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
diff --git a/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java b/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
index b68545e..9103612 100644
--- a/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
@@ -32,6 +32,7 @@ import org.apache.cxf.feature.AbstractFeature;
import org.apache.cxf.feature.Feature;
import org.apache.cxf.interceptor.Interceptor;
import org.apache.cxf.message.Message;
+
import org.junit.Assert;
import org.junit.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
diff --git a/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java b/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java
index 853b8bc..bdbbd8e 100644
--- a/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java
+++ b/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java
@@ -30,8 +30,10 @@ import javax.xml.namespace.QName;
import org.apache.cxf.bus.spring.BusApplicationContext;
import org.apache.cxf.configuration.Configurable;
+
import org.junit.Assert;
import org.junit.Test;
+
import org.springframework.context.ApplicationContext;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
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 a40baa9..dea25bf 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
@@ -23,6 +23,7 @@ import java.lang.reflect.Type;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
+
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.Any;
import javax.enterprise.inject.Default;
diff --git a/integration/cdi/src/test/java/org/apache/cxf/cdi/JAXRSCdiResourceExtensionTest.java b/integration/cdi/src/test/java/org/apache/cxf/cdi/JAXRSCdiResourceExtensionTest.java
index 72c4d34..d7517c5 100644
--- a/integration/cdi/src/test/java/org/apache/cxf/cdi/JAXRSCdiResourceExtensionTest.java
+++ b/integration/cdi/src/test/java/org/apache/cxf/cdi/JAXRSCdiResourceExtensionTest.java
@@ -26,6 +26,7 @@ import javax.enterprise.inject.spi.ProcessBean;
import javax.ws.rs.Path;
import org.apache.cxf.Bus;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionImpl.java b/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionImpl.java
index 845c073..6f8933f 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionImpl.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionImpl.java
@@ -30,6 +30,7 @@ import javax.resource.spi.ConnectionRequestInfo;
import javax.resource.spi.ManagedConnection;
import javax.resource.spi.ManagedConnectionMetaData;
import javax.security.auth.Subject;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.jca.core.logging.LoggerHelper;
import org.apache.cxf.jca.cxf.CXFManagedConnectionMetaData;
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInit.java b/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInit.java
index 068908f..99f5bfa 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInit.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInit.java
@@ -20,6 +20,7 @@ package org.apache.cxf.jca.core.resourceadapter;
import java.util.*;
import java.util.logging.Logger;
+
import org.apache.cxf.common.logging.LogUtils;
public class UriHandlerInit {
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImpl.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImpl.java
index cfdcf23..6ff93f7 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImpl.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImpl.java
@@ -30,7 +30,6 @@ import javax.resource.spi.ManagedConnection;
import javax.security.auth.Subject;
import org.apache.cxf.Bus;
-//import org.apache.cxf.BusFactory;
import org.apache.cxf.common.i18n.BundleUtils;
import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.logging.LogUtils;
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ResourceAdapterImpl.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ResourceAdapterImpl.java
index e41670d..a6e90da 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ResourceAdapterImpl.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ResourceAdapterImpl.java
@@ -39,7 +39,6 @@ import javax.transaction.xa.XAResource;
import org.apache.cxf.Bus;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.jca.core.resourceadapter.ResourceBean;
-
import org.apache.cxf.jca.inbound.InboundEndpoint;
import org.apache.cxf.jca.inbound.MDBActivationSpec;
import org.apache.cxf.jca.inbound.MDBActivationWork;
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java
index 8aa6b39..e2607c1 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java
@@ -19,7 +19,6 @@
package org.apache.cxf.jca.outbound;
import java.io.PrintWriter;
-
import java.util.Iterator;
import java.util.Objects;
import java.util.Set;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java
index 48936b5..42221cc 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java
@@ -27,6 +27,7 @@ import java.util.logging.Logger;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.helpers.IOUtils;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/logging/LoggerHelperTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/logging/LoggerHelperTest.java
index 9c88d02..4bbf52d 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/logging/LoggerHelperTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/logging/LoggerHelperTest.java
@@ -24,6 +24,7 @@ import java.util.logging.Handler;
import java.util.logging.Logger;
import org.apache.cxf.common.logging.LogUtils;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalExceptionTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalExceptionTest.java
index 6f69e78..93245a0 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalExceptionTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalExceptionTest.java
@@ -22,6 +22,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.cxf.common.logging.LogUtils;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImplTest.java
index c038625..e1f884c 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImplTest.java
@@ -18,17 +18,13 @@
*/
package org.apache.cxf.jca.cxf;
-//import java.lang.reflect.Method;
import java.util.Properties;
import javax.resource.ResourceException;
-
-//import javax.resource.spi.ConnectionManager;
import javax.resource.spi.ResourceAdapter;
-
import org.apache.cxf.Bus;
-//import org.apache.cxf.jca.cxf.test.DummyBus;
+
import org.easymock.EasyMock;
import org.junit.Test;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/JCABusFactoryTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/JCABusFactoryTest.java
index 1793b42..a7b2436 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/JCABusFactoryTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/JCABusFactoryTest.java
@@ -28,6 +28,7 @@ import javax.resource.ResourceException;
import org.apache.cxf.Bus;
import org.apache.cxf.jca.core.resourceadapter.ResourceAdapterInternalException;
import org.apache.cxf.test.AbstractCXFTest;
+
import org.easymock.EasyMock;
import org.junit.Ignore;
import org.junit.Test;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
index 8278b4a..e285959 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
@@ -36,6 +36,7 @@ import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.connector.CXFConnectionFactory;
import org.apache.hello_world_soap_http.Greeter;
+
import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Before;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionImplTest.java
index 42a085b..79aa9c3 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionImplTest.java
@@ -34,6 +34,7 @@ import javax.xml.namespace.QName;
import org.apache.cxf.connector.Connection;
import org.apache.cxf.jca.cxf.handlers.ProxyInvocationHandler;
import org.apache.hello_world_soap_http.Greeter;
+
import org.easymock.EasyMock;
import org.junit.Ignore;
import org.junit.Test;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java
index 80a23f7..4361a08 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java
@@ -26,12 +26,11 @@ import javax.resource.spi.ConnectionEventListener;
import javax.security.auth.Subject;
import javax.xml.namespace.QName;
-
-
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
import org.apache.cxf.BusFactory;
import org.apache.hello_world_soap_http.Greeter;
+
import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Before;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java
index 3929e55..67e2d82 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java
@@ -33,6 +33,7 @@ import javax.resource.spi.ResourceAdapter;
import org.apache.cxf.Bus;
import org.apache.cxf.jca.core.resourceadapter.ResourceBean;
+
import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/AbstractInvocationHandlerTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/AbstractInvocationHandlerTest.java
index 276a8ee..67c6827 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/AbstractInvocationHandlerTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/AbstractInvocationHandlerTest.java
@@ -21,6 +21,7 @@ package org.apache.cxf.jca.cxf.handlers;
import org.apache.cxf.jca.cxf.CXFInvocationHandler;
import org.apache.cxf.jca.cxf.CXFManagedConnectionFactory;
+
import org.junit.Test;
public abstract class AbstractInvocationHandlerTest
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java
index f5acf2f..90627e6 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java
@@ -25,6 +25,7 @@ import org.apache.cxf.jca.cxf.CXFInvocationHandler;
import org.apache.cxf.jca.cxf.CXFManagedConnection;
import org.apache.cxf.jca.cxf.ManagedConnectionFactoryImpl;
import org.apache.cxf.jca.cxf.ManagedConnectionImpl;
+
import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Before;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactoryTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactoryTest.java
index 5df1b5e..5a9550e 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactoryTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactoryTest.java
@@ -28,6 +28,7 @@ import javax.security.auth.Subject;
import org.apache.cxf.jca.cxf.CXFInvocationHandler;
import org.apache.cxf.jca.cxf.CXFInvocationHandlerData;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandlerTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandlerTest.java
index 992f2c7..b6efceb 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandlerTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandlerTest.java
@@ -23,6 +23,7 @@ import java.lang.reflect.Proxy;
import org.apache.cxf.jca.cxf.CXFInvocationHandler;
import org.apache.cxf.jca.cxf.CXFInvocationHandlerData;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ObjectMethodInvocationHandlerTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ObjectMethodInvocationHandlerTest.java
index af7c8a0..2a5125c 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ObjectMethodInvocationHandlerTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ObjectMethodInvocationHandlerTest.java
@@ -23,6 +23,7 @@ import java.lang.reflect.Proxy;
import org.apache.cxf.jca.cxf.CXFInvocationHandler;
import org.apache.cxf.jca.cxf.CXFInvocationHandlerData;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandlerTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandlerTest.java
index a799b9d..fb532d4 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandlerTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandlerTest.java
@@ -22,6 +22,7 @@ import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.jca.cxf.CXFInvocationHandler;
import org.apache.cxf.jca.cxf.CXFInvocationHandlerData;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java
index 027117a..50d1e51 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java
@@ -23,6 +23,7 @@ import java.util.Map;
import java.util.logging.Logger;
import org.apache.cxf.common.logging.LogUtils;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/outbound/ManagedConnectionImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/outbound/ManagedConnectionImplTest.java
index 959274c..c03cce2 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/outbound/ManagedConnectionImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/outbound/ManagedConnectionImplTest.java
@@ -23,6 +23,7 @@ import javax.xml.namespace.QName;
import org.apache.cxf.BusFactory;
import org.apache.hello_world_soap_http.Greeter;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Test;
diff --git a/integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfigurationTests.java b/integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfigurationTests.java
index e5d85b4..5c139a8 100644
--- a/integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfigurationTests.java
+++ b/integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfigurationTests.java
@@ -19,10 +19,12 @@
package org.apache.cxf.spring.boot.autoconfigure;
import org.hamcrest.Matcher;
+
import org.junit.After;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
+
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.boot.test.util.EnvironmentTestUtils;
import org.springframework.boot.web.servlet.ServletRegistrationBean;
@@ -33,8 +35,6 @@ import org.springframework.web.context.support.AnnotationConfigWebApplicationCon
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasEntry;
import static org.hamcrest.Matchers.hasItem;
-
-
import static org.junit.Assert.assertThat;
/**
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientInterceptor.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientInterceptor.java
index 2e0c6a1..d230446 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientInterceptor.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientInterceptor.java
@@ -24,7 +24,6 @@ import java.util.Set;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.PhaseInterceptor;
-
import brave.http.HttpTracing;
public abstract class AbstractBraveClientInterceptor extends AbstractBraveClientProvider
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientProvider.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientProvider.java
index f5c190f..b16edb5 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientProvider.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientProvider.java
@@ -31,7 +31,6 @@ import org.apache.cxf.tracing.brave.internal.HttpAdapterFactory;
import org.apache.cxf.tracing.brave.internal.HttpAdapterFactory.Request;
import org.apache.cxf.tracing.brave.internal.HttpAdapterFactory.Response;
import org.apache.cxf.tracing.brave.internal.HttpClientAdapterFactory;
-
import brave.Span;
import brave.Tracer.SpanInScope;
import brave.http.HttpClientAdapter;
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveInterceptor.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveInterceptor.java
index 8a07bdb..a001d1b 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveInterceptor.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveInterceptor.java
@@ -32,7 +32,6 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageUtils;
import org.apache.cxf.phase.PhaseInterceptor;
import org.apache.cxf.tracing.AbstractTracingProvider;
-
import brave.http.HttpTracing;
public abstract class AbstractBraveInterceptor extends AbstractBraveProvider implements PhaseInterceptor<Message> {
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveProvider.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveProvider.java
index 64eac55..ac6f020 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveProvider.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveProvider.java
@@ -31,7 +31,6 @@ import org.apache.cxf.tracing.brave.internal.HttpAdapterFactory;
import org.apache.cxf.tracing.brave.internal.HttpAdapterFactory.Request;
import org.apache.cxf.tracing.brave.internal.HttpAdapterFactory.Response;
import org.apache.cxf.tracing.brave.internal.HttpServerAdapterFactory;
-
import brave.Span;
import brave.Tracer.SpanInScope;
import brave.http.HttpServerAdapter;
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientFeature.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientFeature.java
index 7e4a7c6..33f043b 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientFeature.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientFeature.java
@@ -25,7 +25,6 @@ import org.apache.cxf.annotations.Provider.Type;
import org.apache.cxf.common.injection.NoJSR250Annotations;
import org.apache.cxf.feature.AbstractFeature;
import org.apache.cxf.interceptor.InterceptorProvider;
-
import brave.Tracing;
import brave.http.HttpTracing;
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientStartInterceptor.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientStartInterceptor.java
index 34e944d..edc2da5 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientStartInterceptor.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientStartInterceptor.java
@@ -22,7 +22,6 @@ import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.Phase;
import org.apache.cxf.tracing.brave.AbstractBraveInterceptor.ParsedMessage;
-
import brave.http.HttpTracing;
public class BraveClientStartInterceptor extends AbstractBraveClientInterceptor {
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientStopInterceptor.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientStopInterceptor.java
index ebca21a..05a0111 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientStopInterceptor.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientStopInterceptor.java
@@ -21,7 +21,6 @@ package org.apache.cxf.tracing.brave;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.Phase;
-
import brave.http.HttpTracing;
public class BraveClientStopInterceptor extends AbstractBraveClientInterceptor {
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveFeature.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveFeature.java
index 5f1e010..fe54c11 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveFeature.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveFeature.java
@@ -27,7 +27,6 @@ import org.apache.cxf.annotations.Provider.Type;
import org.apache.cxf.common.injection.NoJSR250Annotations;
import org.apache.cxf.feature.AbstractFeature;
import org.apache.cxf.interceptor.InterceptorProvider;
-
import brave.Tracing;
import brave.http.HttpTracing;
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStartInterceptor.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStartInterceptor.java
index 4df7c7e..2790418 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStartInterceptor.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStartInterceptor.java
@@ -22,7 +22,6 @@ import org.apache.cxf.common.injection.NoJSR250Annotations;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.Phase;
-
import brave.http.HttpTracing;
@NoJSR250Annotations
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStopInterceptor.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStopInterceptor.java
index 75d1d3a..eed79e6 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStopInterceptor.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStopInterceptor.java
@@ -28,7 +28,6 @@ import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageUtils;
import org.apache.cxf.phase.Phase;
-
import brave.http.HttpTracing;
@NoJSR250Annotations
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveTracerContext.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveTracerContext.java
index 5fc7553..9bb628c 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveTracerContext.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveTracerContext.java
@@ -22,7 +22,6 @@ import java.util.concurrent.Callable;
import org.apache.cxf.tracing.Traceable;
import org.apache.cxf.tracing.TracerContext;
-
import brave.Span;
import brave.Tracer;
import brave.Tracer.SpanInScope;
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/HttpClientSpanParser.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/HttpClientSpanParser.java
index 978cbdd..b615c4f 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/HttpClientSpanParser.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/HttpClientSpanParser.java
@@ -19,7 +19,6 @@
package org.apache.cxf.tracing.brave;
import org.apache.cxf.common.util.StringUtils;
-
import brave.http.HttpAdapter;
import brave.http.HttpClientParser;
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/HttpServerSpanParser.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/HttpServerSpanParser.java
index 95c4d77..7200e61 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/HttpServerSpanParser.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/HttpServerSpanParser.java
@@ -19,7 +19,6 @@
package org.apache.cxf.tracing.brave;
import org.apache.cxf.common.util.StringUtils;
-
import brave.http.HttpAdapter;
import brave.http.HttpServerParser;
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveClientProvider.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveClientProvider.java
index e08553a..b42c01e 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveClientProvider.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveClientProvider.java
@@ -29,7 +29,6 @@ import javax.ws.rs.ext.Provider;
import org.apache.cxf.tracing.brave.AbstractBraveClientProvider;
import org.apache.cxf.tracing.brave.HttpClientSpanParser;
import org.apache.cxf.tracing.brave.TraceScope;
-
import brave.Tracing;
import brave.http.HttpTracing;
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveContextProvider.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveContextProvider.java
index 1f67112..ff179ee 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveContextProvider.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveContextProvider.java
@@ -22,7 +22,6 @@ import org.apache.cxf.jaxrs.ext.ContextProvider;
import org.apache.cxf.message.Message;
import org.apache.cxf.tracing.TracerContext;
import org.apache.cxf.tracing.brave.BraveTracerContext;
-
import brave.Span;
import brave.http.HttpTracing;
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveFeature.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveFeature.java
index 6652604..c2cac38 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveFeature.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveFeature.java
@@ -25,7 +25,6 @@ import javax.ws.rs.core.FeatureContext;
import javax.ws.rs.ext.Provider;
import org.apache.cxf.tracing.brave.HttpServerSpanParser;
-
import brave.Tracing;
import brave.http.HttpTracing;
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveProvider.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveProvider.java
index 7a21626..ea5705c 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveProvider.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveProvider.java
@@ -32,7 +32,6 @@ import javax.ws.rs.ext.Provider;
import org.apache.cxf.tracing.brave.AbstractBraveProvider;
import org.apache.cxf.tracing.brave.TraceScope;
-
import brave.http.HttpTracing;
@Provider
diff --git a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/ext/LogbackSpanConverter.java b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/ext/LogbackSpanConverter.java
index d0d84fb..c95d55f 100644
--- a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/ext/LogbackSpanConverter.java
+++ b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/ext/LogbackSpanConverter.java
@@ -21,7 +21,6 @@ package org.apache.cxf.tracing.htrace.ext;
import org.apache.htrace.core.Span;
import org.apache.htrace.core.Tracer;
-
import ch.qos.logback.classic.pattern.ClassicConverter;
import ch.qos.logback.classic.spi.ILoggingEvent;
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
index c99c225..a9636ce 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
@@ -31,6 +31,7 @@ import java.util.concurrent.Executors;
import javax.inject.Inject;
import org.apache.karaf.features.FeaturesService;
+
import org.junit.Assert;
import org.ops4j.pax.exam.MavenUtils;
import org.ops4j.pax.exam.Option;
@@ -39,6 +40,7 @@ import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Filter;
import org.osgi.util.tracker.ServiceTracker;
+
import static org.ops4j.pax.exam.CoreOptions.composite;
import static org.ops4j.pax.exam.CoreOptions.maven;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java
index 6d1a90a..7b2df2c 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java
@@ -28,6 +28,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
import org.apache.cxf.osgi.itests.CXFOSGiTestSupport;
+
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -37,8 +38,10 @@ import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel;
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
import org.ops4j.pax.exam.spi.reactors.PerClass;
+
import org.ops4j.pax.tinybundles.core.TinyBundles;
import org.osgi.framework.Constants;
+
import static org.ops4j.pax.exam.CoreOptions.provision;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.features;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel;
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpServiceTest.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpServiceTest.java
index ea2f0b8..68dc371 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpServiceTest.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpServiceTest.java
@@ -26,7 +26,6 @@ import org.apache.cxf.osgi.itests.CXFOSGiTestSupport;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
-
import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java
index 4dca812..e5f6b80 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java
@@ -27,6 +27,7 @@ import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.osgi.itests.CXFOSGiTestSupport;
import org.apache.cxf.transport.jms.ConnectionFactoryFeature;
+
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/completers/BusCompleter.java b/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/completers/BusCompleter.java
index 3d5cf76..48a6f4f 100644
--- a/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/completers/BusCompleter.java
+++ b/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/completers/BusCompleter.java
@@ -21,7 +21,6 @@ package org.apache.cxf.karaf.commands.completers;
import java.util.List;
import org.apache.cxf.Bus;
-
import org.apache.cxf.karaf.commands.internal.CXFController;
import org.apache.karaf.shell.api.action.lifecycle.Service;
import org.apache.karaf.shell.api.console.CommandLine;
diff --git a/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocInInterceptor.java b/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocInInterceptor.java
index bb61a6b..cfac595 100644
--- a/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocInInterceptor.java
+++ b/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocInInterceptor.java
@@ -20,12 +20,10 @@ package org.apache.cxf.binding.coloc;
import java.util.SortedSet;
import java.util.TreeSet;
-//import java.util.ResourceBundle;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.cxf.Bus;
-//import org.apache.cxf.common.i18n.BundleUtils;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.interceptor.InterceptorChain;
diff --git a/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocOutInterceptor.java b/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocOutInterceptor.java
index 7db48eb..1459333 100644
--- a/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocOutInterceptor.java
+++ b/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocOutInterceptor.java
@@ -41,12 +41,10 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.phase.AbstractPhaseInterceptor;
import org.apache.cxf.phase.Phase;
-//import org.apache.cxf.phase.PhaseInterceptorChain;
import org.apache.cxf.phase.PhaseManager;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.EndpointInfo;
-//import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.transport.MessageObserver;
public class ColocOutInterceptor extends AbstractPhaseInterceptor<Message> {
diff --git a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java
index 17c46fe..ef2199e 100644
--- a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java
+++ b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java
@@ -38,6 +38,7 @@ import org.apache.cxf.service.Service;
import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.EndpointInfo;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
diff --git a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java
index 00f83dc..d2db38d 100644
--- a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java
+++ b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java
@@ -50,9 +50,9 @@ import org.apache.cxf.service.model.MessageInfo;
import org.apache.cxf.service.model.MessagePartInfo;
import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.service.model.ServiceInfo;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocUtilTest.java b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocUtilTest.java
index 0a6b192..2d812fb 100644
--- a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocUtilTest.java
+++ b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocUtilTest.java
@@ -45,9 +45,9 @@ import org.apache.headers.coloc.types.FaultDetailT;
import org.apache.headers.coloc.types.InHeaderT;
import org.apache.headers.coloc.types.OutHeaderT;
import org.apache.headers.rpc_lit.PingMeFault;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBinding.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBinding.java
index ea541cd..8fcbeb2 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBinding.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBinding.java
@@ -26,7 +26,6 @@ import org.apache.cxf.interceptor.AbstractBasicInterceptorProvider;
import org.apache.cxf.interceptor.Interceptor;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
-
import org.apache.cxf.service.model.BindingInfo;
public class CorbaBinding extends AbstractBasicInterceptorProvider implements Binding {
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaStreamable.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaStreamable.java
index 4496838..4f2aef5 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaStreamable.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaStreamable.java
@@ -19,7 +19,6 @@
package org.apache.cxf.binding.corba;
import org.apache.cxf.binding.corba.types.CorbaObjectHandler;
-
import org.omg.CORBA.portable.Streamable;
public interface CorbaStreamable extends Streamable {
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableImpl.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableImpl.java
index b466d23..f3c45ee 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableImpl.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableImpl.java
@@ -23,7 +23,6 @@ import javax.xml.namespace.QName;
import org.apache.cxf.binding.corba.CorbaBindingException;
import org.apache.cxf.binding.corba.CorbaStreamable;
import org.apache.cxf.binding.corba.types.CorbaObjectHandler;
-
import org.omg.CORBA.TypeCode;
import org.omg.CORBA.portable.InputStream;
import org.omg.CORBA.portable.OutputStream;
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractNoStartEndEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractNoStartEndEventProducer.java
index cf57c2e..b60cec1 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractNoStartEndEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractNoStartEndEventProducer.java
@@ -26,7 +26,6 @@ import javax.xml.stream.events.Attribute;
import javax.xml.stream.events.Namespace;
import org.apache.cxf.service.model.ServiceInfo;
-
import org.omg.CORBA.ORB;
public abstract class AbstractNoStartEndEventProducer implements CorbaTypeEventProducer {
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractStartEndEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractStartEndEventProducer.java
index e68ed3c..43938b2 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractStartEndEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractStartEndEventProducer.java
@@ -27,7 +27,6 @@ import javax.xml.stream.events.Attribute;
import javax.xml.stream.events.Namespace;
import org.apache.cxf.service.model.ServiceInfo;
-
import org.omg.CORBA.ORB;
public abstract class AbstractStartEndEventProducer implements
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnonStructEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnonStructEventProducer.java
index 5a021db..13be501 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnonStructEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnonStructEventProducer.java
@@ -19,7 +19,6 @@
package org.apache.cxf.binding.corba.types;
import org.apache.cxf.service.model.ServiceInfo;
-
import org.omg.CORBA.ORB;
public class CorbaAnonStructEventProducer extends AbstractNoStartEndEventProducer {
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyHandler.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyHandler.java
index 42f90be..f0e18bb 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyHandler.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyHandler.java
@@ -23,7 +23,6 @@ import javax.xml.namespace.QName;
import org.apache.cxf.binding.corba.CorbaBindingException;
import org.apache.cxf.binding.corba.CorbaTypeMap;
-
import org.omg.CORBA.Any;
import org.omg.CORBA.TypeCode;
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaArrayEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaArrayEventProducer.java
index d75f64b..4597291 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaArrayEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaArrayEventProducer.java
@@ -19,7 +19,6 @@
package org.apache.cxf.binding.corba.types;
import org.apache.cxf.service.model.ServiceInfo;
-
import org.omg.CORBA.ORB;
public class CorbaArrayEventProducer extends AbstractStartEndEventProducer {
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaExceptionEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaExceptionEventProducer.java
index 85ca420..d85dc75 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaExceptionEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaExceptionEventProducer.java
@@ -19,7 +19,6 @@
package org.apache.cxf.binding.corba.types;
import org.apache.cxf.service.model.ServiceInfo;
-
import org.omg.CORBA.ORB;
public class CorbaExceptionEventProducer extends AbstractStartEndEventProducer {
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaFixedHandler.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaFixedHandler.java
index c628e6c..a8af93a 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaFixedHandler.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaFixedHandler.java
@@ -24,7 +24,6 @@ import javax.xml.namespace.QName;
import org.apache.cxf.binding.corba.wsdl.Anonfixed;
import org.apache.cxf.binding.corba.wsdl.Fixed;
-
import org.omg.CORBA.TypeCode;
public final class CorbaFixedHandler extends CorbaObjectHandler {
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectHandler.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectHandler.java
index 0e79543..3837b78 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectHandler.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectHandler.java
@@ -22,7 +22,6 @@ import javax.xml.namespace.QName;
import org.apache.cxf.binding.corba.CorbaStreamable;
import org.apache.cxf.binding.corba.wsdl.CorbaType;
-
import org.omg.CORBA.Any;
import org.omg.CORBA.TCKind;
import org.omg.CORBA.TypeCode;
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceListener.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceListener.java
index d236eae..80bc92d 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceListener.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceListener.java
@@ -21,7 +21,6 @@ package org.apache.cxf.binding.corba.types;
import org.apache.cxf.binding.corba.utils.CorbaObjectReferenceHelper;
import org.apache.cxf.binding.corba.utils.CorbaUtils;
-
import org.omg.CORBA.ORB;
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveSequenceEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveSequenceEventProducer.java
index 0753437..62d9fd9 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveSequenceEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveSequenceEventProducer.java
@@ -19,7 +19,6 @@
package org.apache.cxf.binding.corba.types;
import org.apache.cxf.service.model.ServiceInfo;
-
import org.omg.CORBA.ORB;
public class CorbaPrimitiveSequenceEventProducer extends AbstractNoStartEndEventProducer {
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaSequenceEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaSequenceEventProducer.java
index dd7393b..e83c523 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaSequenceEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaSequenceEventProducer.java
@@ -19,7 +19,6 @@
package org.apache.cxf.binding.corba.types;
import org.apache.cxf.service.model.ServiceInfo;
-
import org.omg.CORBA.ORB;
public class CorbaSequenceEventProducer extends AbstractStartEndEventProducer {
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaTypeEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaTypeEventProducer.java
index fd6a8fb..e0b9fc5 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaTypeEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaTypeEventProducer.java
@@ -21,7 +21,6 @@ package org.apache.cxf.binding.corba.types;
import java.util.List;
import javax.xml.namespace.QName;
-
import javax.xml.stream.events.Attribute;
import javax.xml.stream.events.Namespace;
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaUnionHandler.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaUnionHandler.java
index f7de2e1..496cf9b 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaUnionHandler.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaUnionHandler.java
@@ -29,7 +29,6 @@ import org.apache.cxf.binding.corba.wsdl.Enum;
import org.apache.cxf.binding.corba.wsdl.Enumerator;
import org.apache.cxf.binding.corba.wsdl.Union;
import org.apache.cxf.binding.corba.wsdl.Unionbranch;
-
import org.omg.CORBA.TCKind;
import org.omg.CORBA.TypeCode;
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/ParameterEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/ParameterEventProducer.java
index 0a36eb6..b0b4bc3 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/ParameterEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/ParameterEventProducer.java
@@ -26,7 +26,6 @@ import javax.xml.stream.events.Attribute;
import javax.xml.stream.events.Namespace;
import org.apache.cxf.service.model.ServiceInfo;
-
import org.omg.CORBA.ORB;
public class ParameterEventProducer implements CorbaTypeEventProducer {
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/SkipStartEndEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/SkipStartEndEventProducer.java
index 9f71e04..ed6481e 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/SkipStartEndEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/SkipStartEndEventProducer.java
@@ -21,7 +21,6 @@ package org.apache.cxf.binding.corba.types;
import java.util.List;
import javax.xml.namespace.QName;
-//import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.events.Attribute;
import javax.xml.stream.events.Namespace;
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/WrappedParameterSequenceEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/WrappedParameterSequenceEventProducer.java
index 51bb16f..9fe15b2 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/WrappedParameterSequenceEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/WrappedParameterSequenceEventProducer.java
@@ -21,7 +21,6 @@ package org.apache.cxf.binding.corba.types;
import javax.xml.namespace.QName;
import org.apache.cxf.service.model.ServiceInfo;
-
import org.omg.CORBA.ORB;
public class WrappedParameterSequenceEventProducer extends AbstractStartEndEventProducer {
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java
index d906115..2e6a36e 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java
@@ -25,8 +25,6 @@ import java.util.Set;
import javax.xml.namespace.QName;
-
-
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.binding.BindingFactoryManager;
@@ -41,6 +39,7 @@ import org.apache.cxf.transport.Destination;
import org.apache.cxf.transport.MessageObserver;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.wsdl11.WSDLServiceFactory;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingTest.java
index 82e1530..b07bc6d 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingTest.java
@@ -25,6 +25,7 @@ import java.util.List;
import org.apache.cxf.interceptor.Interceptor;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java
index 504fb13..29bc6f7 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java
@@ -46,6 +46,7 @@ import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.transport.MessageObserver;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.wsdl11.WSDLServiceFactory;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaDestinationTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaDestinationTest.java
index 0b37b79..bee0d79 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaDestinationTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaDestinationTest.java
@@ -18,15 +18,13 @@
*/
package org.apache.cxf.binding.corba;
-
-
-
import org.apache.cxf.binding.corba.utils.OrbConfig;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaMessageTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaMessageTest.java
index caad534..9374337 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaMessageTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaMessageTest.java
@@ -23,6 +23,7 @@ import javax.xml.namespace.QName;
import org.apache.cxf.binding.corba.types.CorbaPrimitiveHandler;
import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
import org.apache.cxf.message.Message;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java
index abf178c..687e05e 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java
@@ -38,6 +38,7 @@ import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.MessageObserver;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.wsdl11.WSDLServiceFactory;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaTypeMapTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaTypeMapTest.java
index 850034e..e122197 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaTypeMapTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaTypeMapTest.java
@@ -21,6 +21,7 @@ package org.apache.cxf.binding.corba;
import javax.xml.namespace.QName;
import org.apache.cxf.binding.corba.wsdl.CorbaType;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/TestUtils.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/TestUtils.java
index e42e6fd..3c0f036 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/TestUtils.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/TestUtils.java
@@ -19,7 +19,9 @@
package org.apache.cxf.binding.corba;
import java.net.URL;
+
import javax.xml.namespace.QName;
+
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
import org.apache.cxf.BusFactory;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServantTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServantTest.java
index 2a7897d..50670cb 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServantTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServantTest.java
@@ -31,6 +31,7 @@ import org.apache.cxf.binding.corba.CorbaDestination;
import org.apache.cxf.binding.corba.TestUtils;
import org.apache.cxf.message.Message;
import org.apache.cxf.transport.MessageObserver;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java
index 6b94e5b..2c204c8 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java
@@ -44,6 +44,7 @@ import org.apache.cxf.binding.corba.wsdl.MemberType;
import org.apache.cxf.binding.corba.wsdl.Sequence;
import org.apache.cxf.binding.corba.wsdl.Struct;
import org.apache.cxf.helpers.IOUtils;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java
index 910d4eb..d2f6542 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java
@@ -37,6 +37,7 @@ import org.apache.cxf.binding.corba.wsdl.MemberType;
import org.apache.cxf.binding.corba.wsdl.Sequence;
import org.apache.cxf.binding.corba.wsdl.Struct;
import org.apache.cxf.helpers.IOUtils;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java
index b69ddeb..eecadb6 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java
@@ -21,6 +21,7 @@ package org.apache.cxf.binding.corba.runtime;
import javax.xml.namespace.QName;
import org.apache.cxf.binding.corba.types.CorbaTypeEventProducer;
+
import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriterTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriterTest.java
index f38e5b3..cd772f9 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriterTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriterTest.java
@@ -21,6 +21,7 @@ package org.apache.cxf.binding.corba.runtime;
import javax.xml.stream.XMLStreamException;
import org.apache.cxf.binding.corba.types.AbstractCorbaTypeListener;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java
index 44e89a3..151e92a 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java
@@ -23,6 +23,7 @@ import javax.xml.namespace.QName;
import org.apache.cxf.binding.corba.CorbaStreamable;
import org.apache.cxf.binding.corba.types.CorbaPrimitiveHandler;
import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java
index 1ff2aca..e503c3d 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java
@@ -23,6 +23,7 @@ import javax.xml.namespace.QName;
import org.apache.cxf.binding.corba.CorbaTypeMap;
import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java
index 7555175..3c987ce 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java
@@ -22,6 +22,7 @@ import javax.xml.namespace.QName;
import org.apache.cxf.binding.corba.wsdl.Array;
import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java
index 38b9816..2b84f44 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java
@@ -34,6 +34,7 @@ import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
import org.apache.cxf.binding.corba.wsdl.TypeMappingType;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.service.model.ServiceInfo;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java
index 886fdd3..bf4d763 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java
@@ -21,7 +21,6 @@ package org.apache.cxf.binding.corba.types;
import javax.xml.namespace.QName;
-
import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
import org.junit.After;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java
index 0ed66ab..276c0f0 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java
@@ -20,9 +20,8 @@ package org.apache.cxf.binding.corba.types;
import javax.xml.namespace.QName;
-
-
import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java
index b5dd884..46c62b6 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java
@@ -20,10 +20,9 @@ package org.apache.cxf.binding.corba.types;
import javax.xml.namespace.QName;
-
-
import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
import org.apache.cxf.binding.corba.wsdl.Sequence;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/ContextUtilsTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/ContextUtilsTest.java
index 886534e..67e95d7 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/ContextUtilsTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/ContextUtilsTest.java
@@ -24,6 +24,7 @@ import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/CorbaUtilsTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/CorbaUtilsTest.java
index d063ac4..66532ce 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/CorbaUtilsTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/CorbaUtilsTest.java
@@ -26,6 +26,7 @@ import org.apache.cxf.binding.corba.CorbaBindingException;
import org.apache.cxf.binding.corba.CorbaTypeMap;
import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
import org.apache.cxf.binding.corba.wsdl.CorbaType;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/wsdl11/SoapAddressPlugin.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/wsdl11/SoapAddressPlugin.java
index 85aeba6..3892dba 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/wsdl11/SoapAddressPlugin.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/wsdl11/SoapAddressPlugin.java
@@ -20,6 +20,7 @@
package org.apache.cxf.binding.soap.wsdl11;
import java.util.Map;
+
import javax.wsdl.WSDLException;
import javax.wsdl.extensions.ExtensibilityElement;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MustUnderstandInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MustUnderstandInterceptorTest.java
index 73d8393..cff5940 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MustUnderstandInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MustUnderstandInterceptorTest.java
@@ -42,6 +42,7 @@ import org.apache.cxf.message.Attachment;
import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.ServiceInfo;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCInInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCInInterceptorTest.java
index 843a300..0687f39 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCInInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCInInterceptorTest.java
@@ -33,6 +33,7 @@ import org.apache.cxf.service.Service;
import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.ServiceInfo;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Before;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCOutInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCOutInterceptorTest.java
index 03e6646..28b5ea5 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCOutInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCOutInterceptorTest.java
@@ -39,6 +39,7 @@ import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.staxutils.DepthXMLStreamReader;
import org.apache.cxf.staxutils.StaxUtils;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java
index 85ad74f..2a8a04e 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java
@@ -39,6 +39,7 @@ import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.service.model.ServiceModelUtil;
import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.wsdl11.WSDLServiceBuilder;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java
index 945bb76..c97b262 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java
@@ -34,6 +34,7 @@ import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.InterfaceInfo;
import org.apache.cxf.service.model.ServiceInfo;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java
index bfbe03a..dc487ac 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java
@@ -45,8 +45,8 @@ import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.wsdl.WSDLConstants;
import org.apache.cxf.wsdl11.WSDLServiceBuilder;
-import org.easymock.IMocksControl;
+import org.easymock.IMocksControl;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingTest.java
index de975bf..f1e88c9 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingTest.java
@@ -22,6 +22,7 @@ package org.apache.cxf.binding.soap;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapOutInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapOutInterceptorTest.java
index d21a237..6eba973 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapOutInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapOutInterceptorTest.java
@@ -35,6 +35,7 @@ import org.apache.cxf.binding.soap.interceptor.SoapOutInterceptor;
import org.apache.cxf.binding.soap.interceptor.StartBodyInterceptor;
import org.apache.cxf.interceptor.StaxInInterceptor;
import org.apache.cxf.staxutils.StaxUtils;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java
index 9f6edac..997ffde 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java
@@ -44,6 +44,7 @@ import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.wsdl11.WSDLServiceBuilder;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java
index 62068cc..a18af63 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java
@@ -30,9 +30,9 @@ import org.apache.cxf.binding.soap.Soap12;
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.binding.soap.SoapVersion;
import org.apache.cxf.message.Message;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java
index fe9937e..9a2ac9f 100755
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java
@@ -37,9 +37,9 @@ import org.apache.cxf.service.model.InterfaceInfo;
import org.apache.cxf.service.model.MessageInfo.Type;
import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.service.model.ServiceInfo;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java
index 811402c..6575ced 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java
@@ -25,9 +25,9 @@ import org.apache.cxf.binding.soap.Soap11;
import org.apache.cxf.binding.soap.Soap12;
import org.apache.cxf.binding.soap.SoapBinding;
import org.apache.cxf.binding.soap.SoapFault;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
index f424a4d..102feee 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
@@ -41,6 +41,7 @@ import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.staxutils.StaxUtils;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptorTest.java
index d3d3d72..285247a 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptorTest.java
@@ -44,6 +44,7 @@ import org.apache.cxf.binding.soap.interceptor.ReadHeadersInterceptor;
import org.apache.cxf.binding.soap.interceptor.StartBodyInterceptor;
import org.apache.cxf.headers.Header;
import org.apache.cxf.interceptor.StaxInInterceptor;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XmlBindingPlugin.java b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XmlBindingPlugin.java
index 74a9b98..44f2fea 100644
--- a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XmlBindingPlugin.java
+++ b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XmlBindingPlugin.java
@@ -20,6 +20,7 @@
package org.apache.cxf.binding.xml.wsdl11;
import java.util.Map;
+
import javax.wsdl.Binding;
import javax.wsdl.WSDLException;
import javax.wsdl.extensions.ExtensibilityElement;
diff --git a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XmlIoPlugin.java b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XmlIoPlugin.java
index 447219b..7461133 100644
--- a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XmlIoPlugin.java
+++ b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XmlIoPlugin.java
@@ -20,6 +20,7 @@
package org.apache.cxf.binding.xml.wsdl11;
import java.util.Map;
+
import javax.wsdl.WSDLException;
import javax.wsdl.extensions.ExtensibilityElement;
import javax.xml.namespace.QName;
diff --git a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/XMLBindingFactoryTest.java b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/XMLBindingFactoryTest.java
index b530e87..313de85 100644
--- a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/XMLBindingFactoryTest.java
+++ b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/XMLBindingFactoryTest.java
@@ -24,6 +24,7 @@ import org.apache.cxf.interceptor.AttachmentInInterceptor;
import org.apache.cxf.interceptor.Interceptor;
import org.apache.cxf.message.Message;
import org.apache.cxf.service.model.BindingInfo;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java
index fac8011..055e800 100644
--- a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java
+++ b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java
@@ -51,6 +51,7 @@ import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.wsdl.WSDLManager;
import org.apache.cxf.wsdl11.WSDLManagerImpl;
import org.apache.cxf.wsdl11.WSDLServiceFactory;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
diff --git a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptorTest.java b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptorTest.java
index b54e65f..9aeba1b 100644
--- a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptorTest.java
+++ b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptorTest.java
@@ -38,6 +38,7 @@ import org.apache.cxf.staxutils.DepthXMLStreamReader;
import org.apache.cxf.staxutils.StaxUtils;
import org.apache.hello_world_doc_lit.PingMeFault;
import org.apache.hello_world_doc_lit.types.FaultDetail;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptorTest.java b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptorTest.java
index 90d7e9d..a64bd19 100644
--- a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptorTest.java
+++ b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptorTest.java
@@ -37,6 +37,7 @@ import org.apache.cxf.staxutils.DepthXMLStreamReader;
import org.apache.cxf.staxutils.StaxUtils;
import org.apache.hello_world_xml_http.bare.types.MyComplexStructType;
import org.apache.hello_world_xml_http.wrapped.types.GreetMe;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisElementDataWriter.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisElementDataWriter.java
index 7f58f00..1e9fefb 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisElementDataWriter.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisElementDataWriter.java
@@ -20,6 +20,7 @@
package org.apache.cxf.aegis;
import javax.xml.namespace.QName;
+
import org.w3c.dom.Element;
import org.apache.cxf.aegis.type.AegisType;
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisXMLStreamDataReader.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisXMLStreamDataReader.java
index 440e6f2..90ce27d 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisXMLStreamDataReader.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisXMLStreamDataReader.java
@@ -23,6 +23,7 @@ import java.util.logging.Logger;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamReader;
+
import org.apache.cxf.aegis.type.AegisType;
import org.apache.cxf.aegis.type.TypeUtil;
import org.apache.cxf.aegis.type.basic.ArrayType;
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java
index ed3de37..20ed34f 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java
@@ -74,6 +74,7 @@ import org.apache.cxf.wsdl11.WSDLManagerImpl;
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.constants.Constants;
import org.apache.ws.commons.schema.utils.NamespaceMap;
+
import org.junit.Before;
public abstract class AbstractAegisTest extends AbstractCXFTest {
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/ExceptionTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/ExceptionTest.java
index fec0079..e449925 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/ExceptionTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/ExceptionTest.java
@@ -28,6 +28,7 @@ import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.invoker.BeanInvoker;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ExceptionInheritanceTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ExceptionInheritanceTest.java
index fd1d5b4..244a3f9 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ExceptionInheritanceTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ExceptionInheritanceTest.java
@@ -35,6 +35,7 @@ import org.apache.cxf.endpoint.Server;
import org.apache.cxf.frontend.ClientProxyFactoryBean;
import org.apache.cxf.frontend.ServerFactoryBean;
import org.apache.cxf.service.invoker.BeanInvoker;
+
import org.junit.Test;
public class ExceptionInheritanceTest extends AbstractAegisTest {
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/intf/InterfaceInheritanceTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/intf/InterfaceInheritanceTest.java
index 28dec08..aeee74c 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/intf/InterfaceInheritanceTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/intf/InterfaceInheritanceTest.java
@@ -25,6 +25,7 @@ import org.apache.cxf.endpoint.Server;
import org.apache.cxf.frontend.ClientProxyFactoryBean;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.invoker.BeanInvoker;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/ParameterMappingTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/ParameterMappingTest.java
index d6e8c12..6b6831f 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/ParameterMappingTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/ParameterMappingTest.java
@@ -29,6 +29,7 @@ import org.w3c.dom.Node;
import org.apache.cxf.aegis.AbstractAegisTest;
import org.apache.cxf.aegis.services.AddNumbers;
import org.apache.cxf.aegis.services.ArrayService;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/ExplicitPrefixTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/ExplicitPrefixTest.java
index 8aa3ce3..488e75c 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/ExplicitPrefixTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/ExplicitPrefixTest.java
@@ -37,6 +37,7 @@ import org.apache.cxf.aegis.namespaces.impl.NameServiceImpl;
import org.apache.cxf.aegis.type.TypeMapping;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.service.Service;
+
import org.junit.Test;
/**
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/impl/NameServiceImpl.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/impl/NameServiceImpl.java
index e787394..d2c1844 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/impl/NameServiceImpl.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/impl/NameServiceImpl.java
@@ -21,6 +21,7 @@ package org.apache.cxf.aegis.namespaces.impl;
import java.util.ArrayList;
import java.util.List;
+
import javax.jws.WebService;
import org.apache.cxf.aegis.namespaces.data.Name;
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/override/OverrideTypeTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/override/OverrideTypeTest.java
index 8b71395..eb3e4a7 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/override/OverrideTypeTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/override/OverrideTypeTest.java
@@ -30,6 +30,7 @@ import org.apache.cxf.aegis.AbstractAegisTest;
import org.apache.cxf.aegis.databinding.AegisDatabinding;
import org.apache.cxf.aegis.inheritance.Employee;
import org.apache.cxf.databinding.DataReader;
+
import org.junit.Test;
/**
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/proxy/ProxyTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/proxy/ProxyTest.java
index 5a11185..50ddff0 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/proxy/ProxyTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/proxy/ProxyTest.java
@@ -24,6 +24,7 @@ import org.apache.cxf.aegis.databinding.AegisDatabinding;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.frontend.ClientProxyFactoryBean;
import org.apache.cxf.service.invoker.BeanInvoker;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/base64/BinaryDataTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/base64/BinaryDataTest.java
index 5da2bd5..a8c13eb 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/base64/BinaryDataTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/base64/BinaryDataTest.java
@@ -21,6 +21,7 @@ package org.apache.cxf.aegis.services.base64;
import org.w3c.dom.Node;
import org.apache.cxf.aegis.AbstractAegisTest;
+
import org.junit.Test;
public class BinaryDataTest extends AbstractAegisTest {
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneReadTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneReadTest.java
index 7f9c4a2..e166103 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneReadTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneReadTest.java
@@ -32,8 +32,10 @@ import org.apache.cxf.aegis.AegisReader;
import org.apache.cxf.aegis.services.SimpleBean;
import org.apache.cxf.aegis.type.AegisType;
import org.apache.cxf.test.TestUtilities;
+
import org.junit.Before;
import org.junit.Test;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayTest.java
index dcb62a8..1e8244f 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayTest.java
@@ -25,6 +25,7 @@ import org.apache.cxf.aegis.AbstractAegisTest;
import org.apache.cxf.aegis.databinding.AegisDatabinding;
import org.apache.cxf.aegis.type.TypeCreationOptions;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
+
import org.junit.Test;
public class DuplicateArrayTest extends AbstractAegisTest {
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BadXMLTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BadXMLTest.java
index 7bffacb..64523f8 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BadXMLTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BadXMLTest.java
@@ -18,14 +18,14 @@
*/
package org.apache.cxf.aegis.type.basic;
-import junit.framework.TestCase;
-
import org.apache.cxf.aegis.AegisContext;
import org.apache.cxf.aegis.DatabindingException;
import org.apache.cxf.aegis.type.TypeMapping;
+
+import org.junit.Assert;
import org.junit.Test;
-public class BadXMLTest extends TestCase {
+public class BadXMLTest {
TypeMapping mapping;
@@ -36,7 +36,7 @@ public class BadXMLTest extends TestCase {
mapping = context.getTypeMapping();
try {
mapping.getTypeCreator().createType(BadBeanDescriptor.class);
- fail("No exception was thrown");
+ Assert.fail("No exception was thrown");
} catch (DatabindingException e) {
// this is supposed to happen
}
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DynamicProxyTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DynamicProxyTest.java
index aa752dc..07159f2 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DynamicProxyTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DynamicProxyTest.java
@@ -24,6 +24,7 @@ import org.apache.cxf.aegis.AbstractAegisTest;
import org.apache.cxf.aegis.AegisContext;
import org.apache.cxf.aegis.type.TypeMapping;
import org.apache.cxf.aegis.xml.stax.ElementReader;
+
import org.junit.Test;
public class DynamicProxyTest extends AbstractAegisTest {
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/SoapArrayTypeTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/SoapArrayTypeTest.java
index f332d50..8d9d56f 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/SoapArrayTypeTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/SoapArrayTypeTest.java
@@ -27,6 +27,7 @@ import org.apache.cxf.aegis.Context;
import org.apache.cxf.aegis.type.AegisType;
import org.apache.cxf.aegis.type.basic.BeanTypeInfo;
import org.apache.cxf.aegis.xml.stax.ElementReader;
+
import org.junit.Test;
public class SoapArrayTypeTest extends AbstractEncodedTest {
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/StructTypeTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/StructTypeTest.java
index 9a93b11..0e90dac 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/StructTypeTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/StructTypeTest.java
@@ -20,6 +20,7 @@ package org.apache.cxf.aegis.type.encoded;
import java.util.Map;
import java.util.TreeMap;
+
import javax.xml.namespace.QName;
import org.w3c.dom.Attr;
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentTest.java
index 0758c74..3330df1 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentTest.java
@@ -29,6 +29,7 @@ import org.apache.cxf.frontend.ClientProxyFactoryBean;
import org.apache.cxf.frontend.ServerFactoryBean;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
+
import org.junit.Test;
public class StudentTest extends AbstractAegisTest {
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java
index a86e300..7952240 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java
@@ -36,6 +36,7 @@ import org.apache.cxf.aegis.type.map.ns2.ObjectWithAMapNs2;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/MissingTypeWSDLTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/MissingTypeWSDLTest.java
index 4317fe0..597982a 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/MissingTypeWSDLTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/MissingTypeWSDLTest.java
@@ -25,6 +25,7 @@ import org.apache.cxf.endpoint.Server;
import org.apache.cxf.frontend.ClientProxyFactoryBean;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.invoker.BeanInvoker;
+
import org.junit.Test;
public class MissingTypeWSDLTest extends AbstractAegisTest {
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/ReaderTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/ReaderTest.java
index 95132a8..1bcc34f 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/ReaderTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/ReaderTest.java
@@ -27,6 +27,7 @@ import org.apache.cxf.aegis.xml.MessageReader;
import org.apache.cxf.binding.soap.Soap11;
import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.test.AbstractCXFTest;
+
import org.junit.Test;
public class ReaderTest extends AbstractCXFTest {
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/WriterTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/WriterTest.java
index e702f3b..e1cb720 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/WriterTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/WriterTest.java
@@ -27,6 +27,7 @@ import org.apache.cxf.aegis.xml.MessageWriter;
import org.apache.cxf.test.AbstractCXFTest;
import org.jdom.Document;
import org.jdom.output.DOMOutputter;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
index 9a1a11d..928974c 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
@@ -59,7 +59,9 @@ import javax.xml.transform.dom.DOMSource;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
+
import org.xml.sax.InputSource;
+
import org.apache.cxf.common.injection.NoJSR250Annotations;
import org.apache.cxf.common.jaxb.JAXBBeanInfo;
import org.apache.cxf.common.jaxb.JAXBContextCache;
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java
index 6a94c59..e0798ef 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java
@@ -54,8 +54,8 @@ import org.apache.cxf.wsdl11.WSDLServiceFactory;
import org.apache.hello_world_doc_lit_bare.types.TradePriceData;
import org.apache.hello_world_soap_http.types.GreetMe;
import org.apache.hello_world_soap_http.types.GreetMeResponse;
-import org.easymock.IMocksControl;
+import org.easymock.IMocksControl;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareOutInterceptorTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareOutInterceptorTest.java
index e89ce67..0f7e001 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareOutInterceptorTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareOutInterceptorTest.java
@@ -36,9 +36,9 @@ import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.wsdl.interceptors.BareOutInterceptor;
import org.apache.hello_world_soap_http.types.GreetMe;
import org.apache.hello_world_soap_http.types.GreetMeResponse;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java
index 480b611..7acc1e1 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DocLiteralInInterceptorTest.java
@@ -53,8 +53,8 @@ import org.apache.cxf.wsdl11.WSDLServiceFactory;
import org.apache.hello_world_doc_lit_bare.types.TradePriceData;
import org.apache.hello_world_soap_http.types.GreetMe;
import org.apache.hello_world_soap_http.types.GreetMeResponse;
-import org.easymock.IMocksControl;
+import org.easymock.IMocksControl;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
index fff2bd3..4f8b5af 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
@@ -68,9 +68,9 @@ import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.wsdl11.WSDLServiceBuilder;
import org.apache.hello_world_soap_http.types.GreetMe;
import org.apache.hello_world_soap_http.types.GreetMeOneWay;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
index 2de9bcd..56f3a03 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
@@ -66,6 +66,7 @@ import org.apache.cxf.staxutils.StaxUtils;
import org.apache.hello_world_soap_http.types.GreetMe;
import org.apache.hello_world_soap_http.types.GreetMeResponse;
import org.apache.hello_world_soap_http.types.StringStruct;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java
index 6a16e09..f3393d2 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java
@@ -29,6 +29,7 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import org.apache.cxf.databinding.WrapperHelper;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java
index e70e4db..bda68df 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java
@@ -52,6 +52,7 @@ import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.wsdl11.WSDLServiceFactory;
import org.apache.hello_world_soap_http.types.GreetMe;
import org.apache.hello_world_soap_http.types.GreetMeResponse;
+
import org.easymock.IMocksControl;
import org.junit.After;
import org.junit.Assert;
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java
index 8b2d7a9..16849b7 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java
@@ -37,6 +37,7 @@ import org.apache.hello_world_doc_lit_bare.types.TradePriceData;
import org.apache.hello_world_rpclit.types.MyComplexStruct;
import org.apache.hello_world_soap_http.types.GreetMe;
import org.apache.hello_world_soap_http.types.GreetMeResponse;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/OldLoggingFactoryBeanListener.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/OldLoggingFactoryBeanListener.java
index 6160351..34c4ea1 100644
--- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/OldLoggingFactoryBeanListener.java
+++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/OldLoggingFactoryBeanListener.java
@@ -25,7 +25,6 @@ import java.io.PrintWriter;
import java.net.URI;
import org.apache.cxf.Bus;
-
import org.apache.cxf.annotations.Logging;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.endpoint.Endpoint;
diff --git a/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/DefaultLogEventMapperTest.java b/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/DefaultLogEventMapperTest.java
index eed4de1..229c9f7 100644
--- a/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/DefaultLogEventMapperTest.java
+++ b/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/DefaultLogEventMapperTest.java
@@ -24,6 +24,7 @@ import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/TestPrettyLoggingFilter.java b/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/TestPrettyLoggingFilter.java
index 9cc6179..38222c4 100644
--- a/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/TestPrettyLoggingFilter.java
+++ b/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/TestPrettyLoggingFilter.java
@@ -21,6 +21,7 @@ package org.apache.cxf.ext.logging;
import org.apache.cxf.ext.logging.event.LogEvent;
import org.apache.cxf.ext.logging.event.LogEventSender;
import org.apache.cxf.ext.logging.event.PrettyLoggingFilter;
+
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/SourceProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/SourceProvider.java
index c45d912..3177e25 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/SourceProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/SourceProvider.java
@@ -45,6 +45,7 @@ import javax.xml.transform.stream.StreamSource;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.io.CachedOutputStream;
import org.apache.cxf.jaxrs.ext.MessageContext;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java
index 0605024..bda14df 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java
@@ -56,8 +56,8 @@ import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/MessageContextImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/MessageContextImplTest.java
index 3201a5a..6a3e19f 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/MessageContextImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/MessageContextImplTest.java
@@ -47,8 +47,8 @@ import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.transport.http.AbstractHTTPDestination;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/AsyncResponseImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/AsyncResponseImplTest.java
index 89836dc..f1706f2 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/AsyncResponseImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/AsyncResponseImplTest.java
@@ -30,9 +30,9 @@ import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.transport.http.Servlet3ContinuationProvider;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java
index da5311d..e041834 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java
@@ -39,9 +39,9 @@ import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestPreprocessorTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestPreprocessorTest.java
index 9fd7061..1d4a3b0 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestPreprocessorTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestPreprocessorTest.java
@@ -33,9 +33,9 @@ import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.servlet.ServletDestination;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
index e7b2bc8..443952b 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
@@ -59,8 +59,8 @@ import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.staxutils.StaxUtils;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriInfoImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriInfoImplTest.java
index 5ffa682..bc36bb0 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriInfoImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriInfoImplTest.java
@@ -43,9 +43,9 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.servlet.ServletDestination;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/lifecycle/PerRequestResourceProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/lifecycle/PerRequestResourceProviderTest.java
index 8c0cb28..27ae60f 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/lifecycle/PerRequestResourceProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/lifecycle/PerRequestResourceProviderTest.java
@@ -28,8 +28,8 @@ import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/OperationResourceInfoTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/OperationResourceInfoTest.java
index 8f76a08..0d2fe95 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/OperationResourceInfoTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/OperationResourceInfoTest.java
@@ -31,8 +31,8 @@ import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/AbstractConfigurableProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/AbstractConfigurableProviderTest.java
index 7029e85..ef9ce9c 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/AbstractConfigurableProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/AbstractConfigurableProviderTest.java
@@ -20,6 +20,7 @@
package org.apache.cxf.jaxrs.provider;
import org.apache.cxf.Bus;
+
import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
index 361a11c..17fba83 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
@@ -95,8 +95,8 @@ import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JavaTimeTypesParamConverterProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JavaTimeTypesParamConverterProviderTest.java
index 6b4f4df..9f22b82 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JavaTimeTypesParamConverterProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JavaTimeTypesParamConverterProviderTest.java
@@ -26,6 +26,7 @@ import java.time.OffsetDateTime;
import java.time.OffsetTime;
import java.time.ZoneOffset;
import java.time.ZonedDateTime;
+
import javax.ws.rs.ext.ParamConverter;
import org.junit.Assert;
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 de657c0..c3756a7 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
@@ -71,8 +71,8 @@ import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProviderTest.java
index a48d578f..6f57ab1 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProviderTest.java
@@ -45,8 +45,8 @@ import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.staxutils.StaxUtils;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilterTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilterTest.java
index d92b090..b7b2db7 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilterTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilterTest.java
@@ -24,6 +24,7 @@ import javax.ws.rs.core.Response;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/springmvc/SpringViewResolverProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/springmvc/SpringViewResolverProviderTest.java
index f4941a6..0a9bb9a 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/springmvc/SpringViewResolverProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/springmvc/SpringViewResolverProviderTest.java
@@ -47,12 +47,14 @@ import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.MessageObserver;
import org.apache.cxf.transport.http.AbstractHTTPDestination;
+
import org.easymock.EasyMockRule;
import org.easymock.EasyMockSupport;
import org.easymock.Mock;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+
import org.springframework.web.servlet.LocaleResolver;
import org.springframework.web.servlet.View;
import org.springframework.web.servlet.ViewResolver;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/AnnotationTestUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/AnnotationTestUtilsTest.java
index 2830c28..1edb783 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/AnnotationTestUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/AnnotationTestUtilsTest.java
@@ -29,6 +29,7 @@ import javax.ws.rs.HttpMethod;
import javax.ws.rs.core.UriInfo;
import org.apache.cxf.jaxrs.Customer;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/FormUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/FormUtilsTest.java
index 954c56d..57b8d03 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/FormUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/FormUtilsTest.java
@@ -29,8 +29,8 @@ import javax.ws.rs.core.MultivaluedMap;
import org.apache.cxf.jaxrs.impl.MetadataMap;
import org.apache.cxf.message.Message;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
index 5aced11..bcac80d 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/HttpUtilsTest.java
@@ -33,8 +33,8 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.transport.Destination;
import org.apache.cxf.transport.http.AbstractHTTPDestination;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
index cc9ea7c..2302288 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
@@ -52,8 +52,8 @@ import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXBUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXBUtilsTest.java
index b96f974..665aeb4 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXBUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXBUtilsTest.java
@@ -30,6 +30,7 @@ import javax.xml.bind.annotation.adapters.XmlAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import com.migesok.jaxb.adapter.javatime.LocalDateXmlAdapter;
+
import org.junit.Assert;
import org.junit.Test;
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 abaf502..e04f181 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
@@ -105,8 +105,8 @@ import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.transport.http.AbstractHTTPDestination;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/soap/SOAPBindingImpl.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/soap/SOAPBindingImpl.java
index ca0fe16..de05df6 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/soap/SOAPBindingImpl.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/soap/SOAPBindingImpl.java
@@ -23,6 +23,7 @@ import java.util.HashSet;
import java.util.ResourceBundle;
import java.util.Set;
import java.util.logging.Logger;
+
import javax.xml.soap.MessageFactory;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPFactory;
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/EndpointDefinitionParser.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/EndpointDefinitionParser.java
index 3564647..c20ec09 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/EndpointDefinitionParser.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/EndpointDefinitionParser.java
@@ -21,7 +21,9 @@ package org.apache.cxf.jaxws.blueprint;
import java.util.StringTokenizer;
import java.util.UUID;
+
import javax.xml.namespace.QName;
+
import org.w3c.dom.Attr;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/JaxWsProxyFactoryBeanDefinitionParser.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/JaxWsProxyFactoryBeanDefinitionParser.java
index 80aa121..4d01412 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/JaxWsProxyFactoryBeanDefinitionParser.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/JaxWsProxyFactoryBeanDefinitionParser.java
@@ -27,7 +27,6 @@ import org.apache.cxf.frontend.ClientFactoryBean;
import org.apache.cxf.frontend.ClientProxy;
import org.apache.cxf.frontend.spring.ClientProxyFactoryBeanDefinitionParser;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
-
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.FactoryBean;
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/JaxWsWebServicePublisherBeanPostProcessor.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/JaxWsWebServicePublisherBeanPostProcessor.java
index cdebe20..21ef3b0 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/JaxWsWebServicePublisherBeanPostProcessor.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/JaxWsWebServicePublisherBeanPostProcessor.java
@@ -39,7 +39,6 @@ import org.apache.cxf.databinding.DataBinding;
import org.apache.cxf.frontend.ServerFactoryBean;
import org.apache.cxf.jaxb.JAXBDataBinding;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
-
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/AbstractJaxWsTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/AbstractJaxWsTest.java
index 9939b7b..d0549e5 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/AbstractJaxWsTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/AbstractJaxWsTest.java
@@ -30,6 +30,7 @@ import org.apache.cxf.test.AbstractCXFTest;
import org.apache.cxf.transport.ConduitInitiatorManager;
import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.transport.local.LocalTransportFactory;
+
import org.junit.Before;
import org.junit.BeforeClass;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java
index 20241da..3d395b5 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java
@@ -72,6 +72,7 @@ import org.apache.cxf.transport.local.LocalTransportFactory;
import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.wsdl11.ServiceWSDLBuilder;
import org.apache.ws.commons.schema.constants.Constants;
+
import org.junit.Test;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstWSDLTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstWSDLTest.java
index 2c2a9dd..4d2275c 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstWSDLTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstWSDLTest.java
@@ -46,6 +46,7 @@ import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.wsdl.WSDLManager;
import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.wsdl11.ServiceWSDLBuilder;
+
import org.junit.Test;
public class CodeFirstWSDLTest extends AbstractJaxWsTest {
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java
index 42a3b55..9e4c9f0 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java
@@ -45,6 +45,7 @@ import org.apache.cxf.transport.local.LocalTransportFactory;
import org.apache.hello_world_soap_http.Greeter;
import org.apache.hello_world_soap_http.GreeterImpl;
import org.apache.hello_world_soap_http.SOAPService;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/GreeterTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/GreeterTest.java
index 2da1927..a6d644b 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/GreeterTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/GreeterTest.java
@@ -30,6 +30,7 @@ import org.apache.cxf.service.invoker.BeanInvoker;
import org.apache.cxf.transport.local.LocalTransportFactory;
import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
import org.apache.hello_world_soap_http.GreeterImpl;
+
import org.junit.Test;
public class GreeterTest extends AbstractJaxWsTest {
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/HeaderTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/HeaderTest.java
index f407018..84100df 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/HeaderTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/HeaderTest.java
@@ -35,6 +35,7 @@ import org.apache.cxf.transport.local.LocalTransportFactory;
import org.apache.header_test.TestHeaderImpl;
import org.apache.header_test.types.TestHeader5;
import org.apache.header_test.types.TestHeader5ResponseBody;
+
import org.junit.Test;
public class HeaderTest extends AbstractJaxWsTest {
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java
index ea65f03..674c1fd 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java
@@ -34,6 +34,7 @@ import javax.xml.transform.stream.StreamSource;
import javax.xml.ws.Provider;
import org.w3c.dom.Document;
+
import org.xml.sax.SAXException;
import org.apache.cxf.binding.soap.SoapMessage;
@@ -52,6 +53,7 @@ import org.apache.cxf.service.Service;
import org.apache.cxf.service.invoker.Factory;
import org.apache.cxf.service.invoker.MethodDispatcher;
import org.apache.cxf.service.model.BindingOperationInfo;
+
import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java
index 7aaa08e..d8cab8d 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java
@@ -51,6 +51,7 @@ import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
import org.apache.hello_world_soap_http.BadRecordLitFault;
import org.apache.hello_world_soap_http.Greeter;
import org.apache.hello_world_soap_http.GreeterImpl;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsServerFactoryBeanTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsServerFactoryBeanTest.java
index 7932802..208301b 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsServerFactoryBeanTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsServerFactoryBeanTest.java
@@ -20,6 +20,7 @@ package org.apache.cxf.jaxws;
import java.util.HashMap;
import java.util.Map;
+
import javax.wsdl.Definition;
import javax.wsdl.xml.WSDLWriter;
import javax.xml.xpath.XPathConstants;
@@ -41,6 +42,7 @@ import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.wsdl.WSDLManager;
import org.apache.cxf.wsdl11.ServiceWSDLBuilder;
import org.apache.hello_world_doc_lit.GreeterImplDoc;
+
import org.junit.Test;
public class JaxWsServerFactoryBeanTest extends AbstractJaxWsTest {
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/MessageReplayObserver.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/MessageReplayObserver.java
index 0262e88..b231254 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/MessageReplayObserver.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/MessageReplayObserver.java
@@ -26,6 +26,7 @@ import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.message.Message;
import org.apache.cxf.transport.Conduit;
import org.apache.cxf.transport.MessageObserver;
+
import org.junit.Assert;
public class MessageReplayObserver implements MessageObserver {
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SEIWithJAXBAnnoTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SEIWithJAXBAnnoTest.java
index fe6f500..85c060b 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SEIWithJAXBAnnoTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SEIWithJAXBAnnoTest.java
@@ -30,6 +30,7 @@ import org.apache.cxf.ext.logging.LoggingOutInterceptor;
import org.apache.cxf.frontend.ClientProxy;
import org.apache.cxf.jaxws.service.AddNumbers;
import org.apache.cxf.jaxws.service.AddNumbersImpl;
+
import org.junit.Test;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SOAPBindingTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SOAPBindingTest.java
index 84683f7..978c332 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SOAPBindingTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SOAPBindingTest.java
@@ -29,6 +29,7 @@ import javax.xml.ws.soap.SOAPBinding;
import org.apache.cxf.binding.soap.Soap12;
import org.apache.cxf.calculator.CalculatorPortType;
+
import org.junit.Test;
public class SOAPBindingTest extends AbstractJaxWsTest {
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SchemaFirstTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SchemaFirstTest.java
index 2c604d3..4b9960b3 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SchemaFirstTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SchemaFirstTest.java
@@ -26,6 +26,7 @@ import org.w3c.dom.Document;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.jaxws.service.EchoFoo;
+
import org.junit.Test;
public class SchemaFirstTest extends AbstractJaxWsTest {
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 ff82ca2..461ee8a 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
@@ -50,6 +50,7 @@ import org.apache.cxf.jaxb.JAXBDataBinding;
import org.apache.cxf.jaxws.handler.PortInfoImpl;
import org.apache.hello_world_soap_http.Greeter;
import org.apache.hello_world_soap_http.SOAPService;
+
import org.junit.Test;
public class ServiceImplTest extends AbstractJaxWsTest {
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceModelUtilsTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceModelUtilsTest.java
index 337f975..013fac2 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceModelUtilsTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceModelUtilsTest.java
@@ -40,6 +40,7 @@ import org.apache.cxf.service.model.ServiceModelUtil;
import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
import org.apache.hello_world_soap_http.GreeterImpl;
import org.apache.hello_world_soap_http.RPCLitGreeterImpl;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SoapFaultTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SoapFaultTest.java
index a413b5c..4dae26c 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SoapFaultTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SoapFaultTest.java
@@ -35,6 +35,7 @@ import org.apache.cxf.service.invoker.BeanInvoker;
import org.apache.cxf.transport.local.LocalTransportFactory;
import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
import org.apache.hello_world_soap_http.GreeterImpl;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperClassGeneratorTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperClassGeneratorTest.java
index 224cc29..d59b230 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperClassGeneratorTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperClassGeneratorTest.java
@@ -36,6 +36,7 @@ import org.apache.cxf.service.Service;
import org.apache.cxf.service.model.InterfaceInfo;
import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.service.model.ServiceInfo;
+
import org.junit.After;
import org.junit.Assert;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java
index 70a4ddf..82daac9 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java
@@ -30,6 +30,7 @@ import javax.xml.ws.handler.MessageContext;
import javax.xml.ws.handler.MessageContext.Scope;
import org.apache.cxf.message.MessageImpl;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchOpTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchOpTest.java
index b789217..0c4890f 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchOpTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchOpTest.java
@@ -28,6 +28,7 @@ import javax.xml.ws.handler.MessageContext;
import javax.xml.ws.soap.AddressingFeature;
import org.w3c.dom.Document;
+
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.binding.soap.interceptor.AbstractSoapInterceptor;
import org.apache.cxf.interceptor.Fault;
@@ -40,6 +41,7 @@ import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.transport.Destination;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptorTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptorTest.java
index 84ee2b3..f8d043b 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptorTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptorTest.java
@@ -29,6 +29,7 @@ import javax.xml.ws.handler.MessageContext;
import org.apache.cxf.message.AbstractWrappedMessage;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.Message;
+
import org.easymock.IMocksControl;
import org.junit.After;
import org.junit.Assert;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilderTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilderTest.java
index 841eafa..bb72637 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilderTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilderTest.java
@@ -20,6 +20,7 @@
package org.apache.cxf.jaxws.handler;
import java.util.List;
+
import javax.jws.HandlerChain;
import javax.jws.WebService;
import javax.xml.namespace.QName;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainBuilderTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainBuilderTest.java
index 2bfa345..1d3a728 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainBuilderTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainBuilderTest.java
@@ -35,8 +35,8 @@ import org.apache.cxf.jaxws.handler.types.FullyQualifiedClassType;
import org.apache.cxf.jaxws.handler.types.ParamValueType;
import org.apache.cxf.jaxws.handler.types.PortComponentHandlerType;
import org.apache.cxf.jaxws.handler.types.XsdStringType;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java
index 6a1f997..edeeaba 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java
@@ -50,6 +50,7 @@ import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java
index ea10711..ce0c091 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java
@@ -38,6 +38,7 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.transport.MessageObserver;
import org.apache.handlers.types.AddNumbersResponse;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalMessageImplTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalMessageImplTest.java
index 48b22d0..4812e77 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalMessageImplTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalMessageImplTest.java
@@ -33,6 +33,7 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.handlers.types.AddNumbers;
import org.apache.handlers.types.ObjectFactory;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
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 cfb2cd5..a62c85b 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
@@ -71,6 +71,7 @@ import org.apache.cxf.phase.Phase;
import org.apache.cxf.phase.PhaseInterceptorChain;
import org.apache.cxf.staxutils.PartialXMLStreamReader;
import org.apache.cxf.staxutils.StaxUtils;
+
import org.easymock.IMocksControl;
import org.junit.After;
import org.junit.Assert;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/header/ProviderHeaderClientServerTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/header/ProviderHeaderClientServerTest.java
index 74aa024..c4120be 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/header/ProviderHeaderClientServerTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/header/ProviderHeaderClientServerTest.java
@@ -34,6 +34,7 @@ import javax.xml.ws.Service;
import org.apache.cxf.BusFactory;
import org.apache.cxf.jaxws.AbstractJaxWsTest;
import org.apache.header_test.rpc.SOAPRPCHeaderService;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/HolderTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/HolderTest.java
index c5450cd..fe46ea7 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/HolderTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/HolderTest.java
@@ -32,6 +32,7 @@ import org.apache.cxf.jaxws.MessageReplayObserver;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.Destination;
import org.apache.cxf.transport.local.LocalTransportFactory;
+
import org.junit.Test;
public class HolderTest extends AbstractJaxWsTest {
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 e6acae2..719dd4c 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
@@ -45,6 +45,7 @@ import org.apache.cxf.binding.soap.Soap12;
import org.apache.cxf.binding.soap.SoapFault;
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.message.Message;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderServiceFactoryTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderServiceFactoryTest.java
index ed69ccf..a07bf49 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderServiceFactoryTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderServiceFactoryTest.java
@@ -38,6 +38,7 @@ import org.apache.cxf.service.Service;
import org.apache.cxf.service.model.InterfaceInfo;
import org.apache.cxf.transport.local.LocalTransportFactory;
import org.apache.hello_world_soap_http.HWSoapMessageProvider;
+
import org.junit.Test;
public class ProviderServiceFactoryTest extends AbstractJaxWsTest {
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderTest.java
index 988895b..46f7c5b 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderTest.java
@@ -23,6 +23,7 @@ import org.w3c.dom.Node;
import org.apache.cxf.jaxws.AbstractJaxWsTest;
import org.apache.cxf.jaxws.EndpointImpl;
import org.apache.cxf.transport.local.LocalTransportFactory;
+
import org.junit.Test;
public class ProviderTest extends AbstractJaxWsTest {
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/ArrayServiceImpl.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/ArrayServiceImpl.java
index 67aa8c8..c0d4b33 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/ArrayServiceImpl.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/ArrayServiceImpl.java
@@ -21,6 +21,7 @@ package org.apache.cxf.jaxws.service;
import java.util.Arrays;
import java.util.List;
+
import javax.jws.WebParam;
import javax.jws.WebService;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java
index e42d376..9f57373 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java
@@ -54,6 +54,7 @@ import org.apache.cxf.jaxws.service.Hello;
import org.apache.cxf.jaxws.spring.NamespaceHandler.SpringServerFactoryBean;
import org.apache.cxf.message.Message;
import org.apache.hello_world_soap_http.Greeter;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java
index b791b16..886b92c 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java
@@ -39,6 +39,7 @@ import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceConfigurationTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceConfigurationTest.java
index f1d3069..adc262d 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceConfigurationTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceConfigurationTest.java
@@ -20,7 +20,6 @@
package org.apache.cxf.jaxws.support;
import java.lang.reflect.Method;
-
import java.util.Iterator;
import javax.jws.WebMethod;
@@ -40,6 +39,7 @@ import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.wsdl11.CatalogWSDLLocator;
import org.apache.cxf.wsdl11.WSDLServiceBuilder;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java
index d2605f1..4d63a3a 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java
@@ -56,6 +56,7 @@ import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.wsdl11.ServiceWSDLBuilder;
import org.apache.hello_world_soap_http.GreeterImpl;
import org.apache.ws.commons.schema.XmlSchemaElement;
+
import org.junit.Test;
public class JaxWsServiceFactoryBeanTest extends AbstractJaxWsTest {
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java
index f230cea..c290929 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java
@@ -24,14 +24,15 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.jws.WebMethod;
+import javax.jws.WebMethod;
import javax.jws.WebService;
import javax.wsdl.Definition;
import javax.wsdl.xml.WSDLWriter;
import javax.xml.xpath.XPathConstants;
import org.w3c.dom.Element;
+
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.annotations.Policies;
@@ -46,6 +47,7 @@ import org.apache.cxf.wsdl.WSDLConstants;
import org.apache.cxf.wsdl.WSDLManager;
import org.apache.cxf.wsdl11.ServiceWSDLBuilder;
import org.apache.neethi.Constants;
+
import org.junit.Assert;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestinationTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestinationTest.java
index 295ae19..bae3ced 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestinationTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestinationTest.java
@@ -32,6 +32,7 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.MessageObserver;
import org.apache.cxf.transport.http.DestinationRegistryImpl;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiTransportFactoryTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiTransportFactoryTest.java
index 03b8780..0c8a070 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiTransportFactoryTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiTransportFactoryTest.java
@@ -24,6 +24,7 @@ import javax.xml.ws.spi.http.HttpHandler;
import org.apache.cxf.Bus;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.Destination;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
diff --git a/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/ProviderFactory.java b/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/ProviderFactory.java
index 0ea0b4b..3c47b1e 100644
--- a/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/ProviderFactory.java
+++ b/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/ProviderFactory.java
@@ -22,7 +22,6 @@ package org.apache.cxf.js.rhino;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
-
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Level;
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 5f7218c..df4ccb5 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
@@ -21,7 +21,6 @@ package org.apache.cxf.js.rhino;
import java.io.File;
import java.io.FileFilter;
-
import java.net.MalformedURLException;
import java.net.URL;
diff --git a/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/AbstractDOMProviderTest.java b/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/AbstractDOMProviderTest.java
index 7e0ec69..a9997be 100644
--- a/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/AbstractDOMProviderTest.java
+++ b/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/AbstractDOMProviderTest.java
@@ -22,10 +22,10 @@ package org.apache.cxf.js.rhino;
import org.easymock.EasyMock;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+
import org.mozilla.javascript.Scriptable;
diff --git a/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ProviderFactoryTest.java b/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ProviderFactoryTest.java
index d9f8a6d..47973f6 100644
--- a/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ProviderFactoryTest.java
+++ b/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ProviderFactoryTest.java
@@ -25,10 +25,10 @@ import javax.xml.ws.Service;
import org.easymock.EasyMock;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+
import org.mozilla.javascript.EvaluatorException;
import org.mozilla.javascript.Scriptable;
diff --git a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
index c155ac7..83a0524 100644
--- a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
+++ b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
@@ -53,7 +53,9 @@ import javax.xml.transform.dom.DOMSource;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.xml.sax.InputSource;
+
import org.apache.cxf.Bus;
import org.apache.cxf.catalog.OASISCatalogManager;
import org.apache.cxf.catalog.OASISCatalogManagerHelper;
diff --git a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/soap/SoapBindingSelectionTest.java b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/soap/SoapBindingSelectionTest.java
index d9f5b43..84158cd 100644
--- a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/soap/SoapBindingSelectionTest.java
+++ b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/soap/SoapBindingSelectionTest.java
@@ -36,6 +36,7 @@ import org.apache.cxf.transport.Destination;
import org.apache.cxf.transport.MessageObserver;
import org.apache.cxf.transport.MultipleEndpointObserver;
import org.apache.cxf.transport.local.LocalTransportFactory;
+
import org.junit.Test;
public class SoapBindingSelectionTest extends AbstractSimpleFrontendTest {
diff --git a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/AbstractSimpleFrontendSpringTest.java b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/AbstractSimpleFrontendSpringTest.java
index ac167fd..93cffc5 100644
--- a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/AbstractSimpleFrontendSpringTest.java
+++ b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/AbstractSimpleFrontendSpringTest.java
@@ -19,8 +19,10 @@
package org.apache.cxf.frontend.spring;
import org.apache.cxf.BusFactory;
+
import org.junit.After;
import org.junit.Assert;
+
import org.springframework.context.support.AbstractApplicationContext;
public class AbstractSimpleFrontendSpringTest extends Assert {
diff --git a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/ClientServerTest.java b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/ClientServerTest.java
index 93af02f..fd97e66 100644
--- a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/ClientServerTest.java
+++ b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/ClientServerTest.java
@@ -28,6 +28,7 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.phase.AbstractPhaseInterceptor;
import org.apache.cxf.phase.Phase;
import org.apache.cxf.service.factory.HelloService;
+
import org.junit.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
diff --git a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java
index d5b1aaf..dfdd1f0 100644
--- a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java
+++ b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java
@@ -39,6 +39,7 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.service.factory.HelloService;
import org.apache.cxf.service.factory.HelloServiceImpl;
import org.apache.cxf.service.model.EndpointInfo;
+
import org.junit.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
diff --git a/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/AbstractSimpleFrontendTest.java b/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/AbstractSimpleFrontendTest.java
index 9d1fcf3..aad4572 100644
--- a/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/AbstractSimpleFrontendTest.java
+++ b/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/AbstractSimpleFrontendTest.java
@@ -26,6 +26,7 @@ import org.apache.cxf.test.AbstractCXFTest;
import org.apache.cxf.transport.ConduitInitiatorManager;
import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.transport.local.LocalTransportFactory;
+
import org.junit.Before;
public abstract class AbstractSimpleFrontendTest extends AbstractCXFTest {
diff --git a/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java b/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java
index 23a4c3f..bf4f930 100644
--- a/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java
+++ b/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java
@@ -35,6 +35,7 @@ import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.hello_world.types.GreetMe;
import org.apache.hello_world_soap_http.types.GreetMeOneWay;
+
import org.junit.Test;
public class ClientFactoryBeanTest extends AbstractSimpleFrontendTest {
diff --git a/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java b/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java
index c96f653..290feba 100644
--- a/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java
+++ b/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java
@@ -44,6 +44,7 @@ import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.wsdl.service.factory.AbstractServiceConfiguration;
import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
import org.apache.ws.commons.schema.XmlSchemaElement;
+
import org.junit.Test;
public class ReflectionServiceFactoryTest extends AbstractSimpleFrontendTest {
diff --git a/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/RountripTest.java b/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/RountripTest.java
index ab2c41b..1e902f9 100644
--- a/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/RountripTest.java
+++ b/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/RountripTest.java
@@ -25,6 +25,7 @@ import org.apache.cxf.frontend.ClientProxyFactoryBean;
import org.apache.cxf.frontend.ServerFactoryBean;
import org.apache.hello_world_doc_lit.Greeter;
import org.apache.hello_world_doc_lit.GreeterImplDoc;
+
import org.junit.Test;
public class RountripTest extends AbstractSimpleFrontendTest {
diff --git a/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java b/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java
index c957fc0..b91109c 100644
--- a/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java
+++ b/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java
@@ -38,6 +38,7 @@ import org.apache.cxf.transport.MessageObserver;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.hello_world.types.GreetMe;
import org.apache.hello_world_soap_http.types.GreetMeOneWay;
+
import org.junit.Test;
public class ServerFactoryTest extends AbstractSimpleFrontendTest {
diff --git a/rt/frontend/simple/src/test/java/org/apache/cxf/service/stax/StaxDatabindingTest.java b/rt/frontend/simple/src/test/java/org/apache/cxf/service/stax/StaxDatabindingTest.java
index 5e6c8ef..4aae7d9 100644
--- a/rt/frontend/simple/src/test/java/org/apache/cxf/service/stax/StaxDatabindingTest.java
+++ b/rt/frontend/simple/src/test/java/org/apache/cxf/service/stax/StaxDatabindingTest.java
@@ -33,6 +33,7 @@ import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.staxutils.FragmentStreamReader;
import org.apache.cxf.test.AbstractCXFTest;
import org.apache.cxf.transport.local.LocalTransportFactory;
+
import org.junit.Test;
public class StaxDatabindingTest extends AbstractCXFTest {
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/GenericAegisTest.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/GenericAegisTest.java
index 239d472..9a872dd 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/GenericAegisTest.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/GenericAegisTest.java
@@ -33,6 +33,7 @@ import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.testutil.common.TestUtil;
import org.junit.Test;
+
import static org.junit.Assert.assertNotNull;
/**
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JavascriptTestUtilities.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JavascriptTestUtilities.java
index 4e1fb7f..8f4d49e 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JavascriptTestUtilities.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JavascriptTestUtilities.java
@@ -36,6 +36,7 @@ import org.apache.cxf.javascript.types.SchemaJavascriptBuilder;
import org.apache.cxf.service.model.SchemaInfo;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.test.TestUtilities;
+
import org.junit.Assert;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.ContextFactory;
diff --git a/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java b/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java
index c7898c8..fab32f7 100644
--- a/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java
+++ b/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java
@@ -36,7 +36,6 @@ import javax.management.MBeanServer;
import javax.management.MBeanServerDelegate;
import javax.management.MBeanServerFactory;
import javax.management.MalformedObjectNameException;
-
import javax.management.NotCompliantMBeanException;
import javax.management.ObjectInstance;
import javax.management.ObjectName;
diff --git a/rt/management/src/main/java/org/apache/cxf/management/jmx/export/runtime/ModelMBeanInfoSupporter.java b/rt/management/src/main/java/org/apache/cxf/management/jmx/export/runtime/ModelMBeanInfoSupporter.java
index 4a5f5e4..73bd6fa 100644
--- a/rt/management/src/main/java/org/apache/cxf/management/jmx/export/runtime/ModelMBeanInfoSupporter.java
+++ b/rt/management/src/main/java/org/apache/cxf/management/jmx/export/runtime/ModelMBeanInfoSupporter.java
@@ -20,11 +20,9 @@
package org.apache.cxf.management.jmx.export.runtime;
import java.lang.reflect.Constructor;
-
import java.util.HashMap;
import java.util.Map;
-
import javax.management.Descriptor;
import javax.management.MBeanOperationInfo;
import javax.management.MBeanParameterInfo;
diff --git a/rt/management/src/test/java/org/apache/cxf/management/counters/CounterRepositoryTest.java b/rt/management/src/test/java/org/apache/cxf/management/counters/CounterRepositoryTest.java
index 714462a..7e88f99 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/counters/CounterRepositoryTest.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/counters/CounterRepositoryTest.java
@@ -27,6 +27,7 @@ import org.apache.cxf.Bus;
import org.apache.cxf.interceptor.Interceptor;
import org.apache.cxf.management.InstrumentationManager;
import org.apache.cxf.message.Message;
+
import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java b/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java
index 2981f45..8234a65 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java
@@ -33,8 +33,8 @@ import org.apache.cxf.service.Service;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.service.model.OperationInfo;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/management/src/test/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInInterceptorTest.java b/rt/management/src/test/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInInterceptorTest.java
index a0e0347..dae1e0b 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInInterceptorTest.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInInterceptorTest.java
@@ -23,8 +23,8 @@ import org.apache.cxf.management.counters.MessageHandlingTimeRecorder;
import org.apache.cxf.message.FaultMode;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Test;
public class ResponseTimeMessageInInterceptorTest extends AbstractMessageResponseTestBase {
diff --git a/rt/management/src/test/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInvokerInterceptorTest.java b/rt/management/src/test/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInvokerInterceptorTest.java
index 622c23b..06317e1 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInvokerInterceptorTest.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInvokerInterceptorTest.java
@@ -21,6 +21,7 @@ package org.apache.cxf.management.interceptor;
import org.apache.cxf.management.counters.MessageHandlingTimeRecorder;
import org.apache.cxf.message.Message;
+
import org.easymock.EasyMock;
import org.junit.Test;
diff --git a/rt/management/src/test/java/org/apache/cxf/management/interceptor/ResponseTimeMessageOutInterceptorTest.java b/rt/management/src/test/java/org/apache/cxf/management/interceptor/ResponseTimeMessageOutInterceptorTest.java
index af0be06..7ea8a24 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/interceptor/ResponseTimeMessageOutInterceptorTest.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/interceptor/ResponseTimeMessageOutInterceptorTest.java
@@ -23,6 +23,7 @@ import org.apache.cxf.interceptor.InterceptorChain;
import org.apache.cxf.management.counters.MessageHandlingTimeRecorder;
import org.apache.cxf.message.FaultMode;
import org.apache.cxf.message.Message;
+
import org.easymock.EasyMock;
import org.junit.Test;
diff --git a/rt/management/src/test/java/org/apache/cxf/management/jmx/export/ModelMBeanAssemblerTest.java b/rt/management/src/test/java/org/apache/cxf/management/jmx/export/ModelMBeanAssemblerTest.java
index 2815237..9119bbe 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/jmx/export/ModelMBeanAssemblerTest.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/jmx/export/ModelMBeanAssemblerTest.java
@@ -34,6 +34,7 @@ import javax.management.modelmbean.RequiredModelMBean;
import org.apache.cxf.management.jmx.export.runtime.ModelMBeanAssembler;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/logging/RESTLoggingTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/logging/RESTLoggingTest.java
index 1ec1f9e..7c635f9 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/logging/RESTLoggingTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/logging/RESTLoggingTest.java
@@ -34,6 +34,7 @@ import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.JAXRSClientFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.transport.local.LocalTransportFactory;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanTest.java
index 23460e6..0406f92 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanTest.java
@@ -22,9 +22,11 @@ import javax.xml.namespace.QName;
import org.apache.cxf.BusFactory;
import org.apache.cxf.jaxrs.client.JAXRSClientFactoryBean;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
+
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class JAXRSClientFactoryBeanTest extends Assert {
diff --git a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/JaxRs2Extension.java b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/JaxRs2Extension.java
index 940f50a..9730b84 100644
--- a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/JaxRs2Extension.java
+++ b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/JaxRs2Extension.java
@@ -27,6 +27,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
+
import javax.validation.constraints.DecimalMax;
import javax.validation.constraints.DecimalMin;
import javax.validation.constraints.Max;
diff --git a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java
index e8d9e5e..0eb86de 100644
--- a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java
+++ b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java
@@ -47,9 +47,9 @@ import org.apache.cxf.service.Service;
import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.servlet.ServletDestination;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
index 53768e4..d09343c 100644
--- a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
+++ b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
@@ -58,9 +58,9 @@ import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.transport.servlet.ServletDestination;
import org.apache.ws.commons.schema.constants.Constants;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomEntryProviderTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomEntryProviderTest.java
index b9b30cb..516ece7 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomEntryProviderTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomEntryProviderTest.java
@@ -30,6 +30,7 @@ import javax.ws.rs.core.MediaType;
import org.apache.abdera.model.Entry;
import org.apache.abdera.model.Feed;
import org.apache.abdera.parser.stax.FOMEntry;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomFeedProviderTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomFeedProviderTest.java
index 74c1c37..834e835 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomFeedProviderTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/atom/AtomFeedProviderTest.java
@@ -29,6 +29,7 @@ import javax.ws.rs.Produces;
import org.apache.abdera.model.Entry;
import org.apache.abdera.model.Feed;
import org.apache.abdera.parser.stax.FOMFeed;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java
index b69c5c1..8b641ba 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java
@@ -40,8 +40,8 @@ import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/CollectionsResource.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/CollectionsResource.java
index 9341ed8..83df9ec 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/CollectionsResource.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/CollectionsResource.java
@@ -19,6 +19,7 @@
package org.apache.cxf.jaxrs.resources;
import java.util.List;
+
import javax.ws.rs.GET;
import javax.ws.rs.POST;
diff --git a/rt/rs/extensions/reactor/src/main/java/org/apache/cxf/jaxrs/reactor/client/ReactorInvokerImpl.java b/rt/rs/extensions/reactor/src/main/java/org/apache/cxf/jaxrs/reactor/client/ReactorInvokerImpl.java
index 04f4628..2908afe 100644
--- a/rt/rs/extensions/reactor/src/main/java/org/apache/cxf/jaxrs/reactor/client/ReactorInvokerImpl.java
+++ b/rt/rs/extensions/reactor/src/main/java/org/apache/cxf/jaxrs/reactor/client/ReactorInvokerImpl.java
@@ -25,11 +25,14 @@ import java.util.concurrent.CompletionException;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
+
import javax.ws.rs.HttpMethod;
import javax.ws.rs.client.Entity;
import javax.ws.rs.core.GenericType;
import javax.ws.rs.core.Response;
+
import org.apache.cxf.jaxrs.client.WebClient;
+
import static org.apache.cxf.jaxrs.reactor.client.ReactorUtils.TRACE;
import static org.apache.cxf.jaxrs.reactor.client.ReactorUtils.toCompletableFuture;
diff --git a/rt/rs/extensions/reactor/src/main/java/org/apache/cxf/jaxrs/reactor/client/ReactorInvokerProvider.java b/rt/rs/extensions/reactor/src/main/java/org/apache/cxf/jaxrs/reactor/client/ReactorInvokerProvider.java
index f1553f7..2669072 100644
--- a/rt/rs/extensions/reactor/src/main/java/org/apache/cxf/jaxrs/reactor/client/ReactorInvokerProvider.java
+++ b/rt/rs/extensions/reactor/src/main/java/org/apache/cxf/jaxrs/reactor/client/ReactorInvokerProvider.java
@@ -19,9 +19,11 @@
package org.apache.cxf.jaxrs.reactor.client;
import java.util.concurrent.ExecutorService;
+
import javax.ws.rs.client.RxInvokerProvider;
import javax.ws.rs.client.SyncInvoker;
import javax.ws.rs.ext.Provider;
+
import org.apache.cxf.jaxrs.client.SyncInvokerImpl;
@Provider
diff --git a/rt/rs/extensions/reactor/src/main/java/org/apache/cxf/jaxrs/reactor/server/ReactorInvoker.java b/rt/rs/extensions/reactor/src/main/java/org/apache/cxf/jaxrs/reactor/server/ReactorInvoker.java
index 3d529f5..82ad81a 100644
--- a/rt/rs/extensions/reactor/src/main/java/org/apache/cxf/jaxrs/reactor/server/ReactorInvoker.java
+++ b/rt/rs/extensions/reactor/src/main/java/org/apache/cxf/jaxrs/reactor/server/ReactorInvoker.java
@@ -21,7 +21,6 @@ package org.apache.cxf.jaxrs.reactor.server;
import org.apache.cxf.jaxrs.impl.AsyncResponseImpl;
import org.apache.cxf.jaxrs.reactivestreams.server.AbstractReactiveInvoker;
import org.apache.cxf.message.Message;
-
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
diff --git a/rt/rs/extensions/rx/src/main/java/org/apache/cxf/jaxrs/rx/client/ObservableRxInvokerImpl.java b/rt/rs/extensions/rx/src/main/java/org/apache/cxf/jaxrs/rx/client/ObservableRxInvokerImpl.java
index 83e02f4..713aa9c 100644
--- a/rt/rs/extensions/rx/src/main/java/org/apache/cxf/jaxrs/rx/client/ObservableRxInvokerImpl.java
+++ b/rt/rs/extensions/rx/src/main/java/org/apache/cxf/jaxrs/rx/client/ObservableRxInvokerImpl.java
@@ -26,7 +26,6 @@ import javax.ws.rs.core.GenericType;
import javax.ws.rs.core.Response;
import org.apache.cxf.jaxrs.client.WebClient;
-
import rx.Observable;
import rx.Scheduler;
import rx.schedulers.Schedulers;
diff --git a/rt/rs/extensions/rx/src/main/java/org/apache/cxf/jaxrs/rx/server/ObservableInvoker.java b/rt/rs/extensions/rx/src/main/java/org/apache/cxf/jaxrs/rx/server/ObservableInvoker.java
index 59d0ca3..0aec128 100644
--- a/rt/rs/extensions/rx/src/main/java/org/apache/cxf/jaxrs/rx/server/ObservableInvoker.java
+++ b/rt/rs/extensions/rx/src/main/java/org/apache/cxf/jaxrs/rx/server/ObservableInvoker.java
@@ -21,7 +21,6 @@ package org.apache.cxf.jaxrs.rx.server;
import org.apache.cxf.jaxrs.JAXRSInvoker;
import org.apache.cxf.jaxrs.impl.AsyncResponseImpl;
import org.apache.cxf.message.Message;
-
import rx.Observable;
public class ObservableInvoker extends JAXRSInvoker {
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitorTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitorTest.java
index d9c96b8..e79d6c3 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitorTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitorTest.java
@@ -39,6 +39,7 @@ import org.apache.cxf.jaxrs.ext.search.SearchConditionParser;
import org.apache.cxf.jaxrs.ext.search.SearchConditionVisitor;
import org.apache.cxf.jaxrs.ext.search.SearchUtils;
import org.apache.cxf.jaxrs.ext.search.jpa.BookReview.Review;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorODataTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorODataTest.java
index 5cdc986..5debd6f 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorODataTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorODataTest.java
@@ -28,6 +28,7 @@ import javax.persistence.Tuple;
import org.apache.cxf.jaxrs.ext.search.SearchConditionParser;
import org.apache.cxf.jaxrs.ext.search.odata.ODataParser;
+
import org.junit.Test;
public class JPATypedQueryVisitorODataTest extends AbstractJPATypedQueryVisitorTest {
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/AbstractLuceneQueryVisitorTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/AbstractLuceneQueryVisitorTest.java
index f630b5a..3a9f642 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/AbstractLuceneQueryVisitorTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/AbstractLuceneQueryVisitorTest.java
@@ -40,6 +40,7 @@ import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.RAMDirectory;
import org.apache.lucene.util.Version;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/LuceneQueryVisitorAnalyzerFiqlTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/LuceneQueryVisitorAnalyzerFiqlTest.java
index 180d69e..588dbe5 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/LuceneQueryVisitorAnalyzerFiqlTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/LuceneQueryVisitorAnalyzerFiqlTest.java
@@ -22,6 +22,7 @@ import org.apache.cxf.jaxrs.ext.search.SearchBean;
import org.apache.cxf.jaxrs.ext.search.SearchConditionParser;
import org.apache.cxf.jaxrs.ext.search.fiql.FiqlParser;
import org.apache.lucene.search.Query;
+
import org.junit.Test;
public class LuceneQueryVisitorAnalyzerFiqlTest extends AbstractLuceneQueryVisitorTest {
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/LuceneQueryVisitorFiqlTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/LuceneQueryVisitorFiqlTest.java
index 314afe8..5e7222c 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/LuceneQueryVisitorFiqlTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/LuceneQueryVisitorFiqlTest.java
@@ -31,6 +31,7 @@ import org.apache.cxf.jaxrs.ext.search.SearchCondition;
import org.apache.cxf.jaxrs.ext.search.SearchConditionParser;
import org.apache.cxf.jaxrs.ext.search.fiql.FiqlParser;
import org.apache.lucene.search.Query;
+
import org.junit.Test;
import static org.hamcrest.CoreMatchers.equalTo;
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/LuceneQueryVisitorODataTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/LuceneQueryVisitorODataTest.java
index 79032d1..0ccb956 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/LuceneQueryVisitorODataTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/LuceneQueryVisitorODataTest.java
@@ -22,6 +22,7 @@ import org.apache.cxf.jaxrs.ext.search.SearchBean;
import org.apache.cxf.jaxrs.ext.search.SearchConditionParser;
import org.apache.cxf.jaxrs.ext.search.odata.ODataParser;
import org.apache.lucene.search.Query;
+
import org.junit.Test;
public class LuceneQueryVisitorODataTest extends AbstractLuceneQueryVisitorTest {
diff --git a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/client/OAuthClientUtils.java b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/client/OAuthClientUtils.java
index 58630d5..ce8c644 100644
--- a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/client/OAuthClientUtils.java
+++ b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/client/OAuthClientUtils.java
@@ -34,7 +34,6 @@ import net.oauth.OAuthAccessor;
import net.oauth.OAuthConsumer;
import net.oauth.OAuthMessage;
import net.oauth.signature.RSA_SHA1;
-
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.rs.security.oauth.provider.OAuthServiceException;
diff --git a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/AbstractAuthFilter.java b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/AbstractAuthFilter.java
index 054bc8a..25c9168 100644
--- a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/AbstractAuthFilter.java
+++ b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/AbstractAuthFilter.java
@@ -37,7 +37,6 @@ import net.oauth.OAuthMessage;
import net.oauth.OAuthProblemException;
import net.oauth.OAuthValidator;
import net.oauth.server.OAuthServlet;
-
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.security.SimplePrincipal;
import org.apache.cxf.configuration.security.AuthorizationPolicy;
diff --git a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/OAuthRequestFilter.java b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/OAuthRequestFilter.java
index 019be4e..8b60bb5 100644
--- a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/OAuthRequestFilter.java
+++ b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/OAuthRequestFilter.java
@@ -25,7 +25,6 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.ext.Provider;
import net.oauth.OAuthProblemException;
-
import org.apache.cxf.jaxrs.ext.MessageContext;
import org.apache.cxf.jaxrs.ext.MessageContextImpl;
import org.apache.cxf.jaxrs.utils.JAXRSUtils;
diff --git a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/OAuthServletFilter.java b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/OAuthServletFilter.java
index 6e51e22..7012b9a 100644
--- a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/OAuthServletFilter.java
+++ b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/OAuthServletFilter.java
@@ -33,7 +33,6 @@ import javax.servlet.http.HttpServletResponse;
import net.oauth.OAuthProblemException;
import net.oauth.server.OAuthServlet;
-
import org.apache.cxf.common.util.PropertyUtils;
import org.apache.cxf.rs.security.oauth.data.OAuthContext;
import org.apache.cxf.rs.security.oauth.utils.OAuthUtils;
diff --git a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/provider/DefaultOAuthValidator.java b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/provider/DefaultOAuthValidator.java
index cd4f120..28678d6 100644
--- a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/provider/DefaultOAuthValidator.java
+++ b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/provider/DefaultOAuthValidator.java
@@ -27,7 +27,6 @@ import net.oauth.OAuthException;
import net.oauth.OAuthMessage;
import net.oauth.OAuthProblemException;
import net.oauth.SimpleOAuthValidator;
-
import org.apache.cxf.rs.security.oauth.data.Token;
/**
diff --git a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AbstractOAuthService.java b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AbstractOAuthService.java
index b8ee3d6..aed1cb6 100644
--- a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AbstractOAuthService.java
+++ b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AbstractOAuthService.java
@@ -21,7 +21,6 @@ package org.apache.cxf.rs.security.oauth.services;
import javax.ws.rs.core.Context;
import net.oauth.OAuthValidator;
-
import org.apache.cxf.jaxrs.ext.MessageContext;
import org.apache.cxf.rs.security.oauth.provider.DefaultOAuthValidator;
import org.apache.cxf.rs.security.oauth.provider.OAuthDataProvider;
diff --git a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AccessTokenHandler.java b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AccessTokenHandler.java
index 28ce89a..02e0b57 100644
--- a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AccessTokenHandler.java
+++ b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AccessTokenHandler.java
@@ -30,7 +30,6 @@ import net.oauth.OAuth;
import net.oauth.OAuthMessage;
import net.oauth.OAuthProblemException;
import net.oauth.OAuthValidator;
-
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.jaxrs.ext.MessageContext;
diff --git a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java
index fa62e68d..10b1d17 100644
--- a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java
+++ b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java
@@ -42,7 +42,6 @@ import javax.ws.rs.core.UriBuilder;
import net.oauth.OAuth;
import net.oauth.OAuthMessage;
import net.oauth.OAuthProblemException;
-
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.jaxrs.ext.MessageContext;
diff --git a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/OOBResponseProvider.java b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/OOBResponseProvider.java
index 31992e1..977bd87 100644
--- a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/OOBResponseProvider.java
+++ b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/OOBResponseProvider.java
@@ -36,7 +36,6 @@ import javax.ws.rs.ext.MessageBodyWriter;
import javax.ws.rs.ext.Provider;
import net.oauth.OAuth;
-
import org.apache.cxf.jaxrs.impl.MetadataMap;
import org.apache.cxf.jaxrs.provider.FormEncodingProvider;
import org.apache.cxf.rs.security.oauth.utils.OAuthConstants;
diff --git a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/RequestTokenHandler.java b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/RequestTokenHandler.java
index 04b619a..8cd1c68 100644
--- a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/RequestTokenHandler.java
+++ b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/RequestTokenHandler.java
@@ -31,7 +31,6 @@ import net.oauth.OAuth;
import net.oauth.OAuthMessage;
import net.oauth.OAuthProblemException;
import net.oauth.OAuthValidator;
-
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.jaxrs.ext.MessageContext;
diff --git a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtils.java b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtils.java
index f2cf773..6f44c62 100644
--- a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtils.java
+++ b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtils.java
@@ -44,7 +44,6 @@ import net.oauth.OAuthMessage;
import net.oauth.OAuthProblemException;
import net.oauth.OAuthValidator;
import net.oauth.server.OAuthServlet;
-
import org.apache.cxf.common.classloader.ClassLoaderUtils;
import org.apache.cxf.common.util.PropertyUtils;
import org.apache.cxf.common.util.StringUtils;
diff --git a/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/grants/saml/Saml2BearerGrantHandler.java b/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/grants/saml/Saml2BearerGrantHandler.java
index c5c0768..c989109 100644
--- a/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/grants/saml/Saml2BearerGrantHandler.java
+++ b/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/grants/saml/Saml2BearerGrantHandler.java
@@ -34,6 +34,7 @@ import javax.ws.rs.core.MultivaluedMap;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.common.util.Base64Exception;
import org.apache.cxf.common.util.Base64UrlUtility;
import org.apache.cxf.jaxrs.utils.HttpUtils;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
index fd68c9e..7a114ab 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
@@ -22,7 +22,6 @@ import java.util.ArrayList;
import java.util.List;
import net.sf.ehcache.Ehcache;
-
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.helpers.CastUtils;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JCacheCodeDataProvider.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JCacheCodeDataProvider.java
index dfdab2a..82522a8 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JCacheCodeDataProvider.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JCacheCodeDataProvider.java
@@ -23,6 +23,7 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
+
import javax.cache.Cache;
import org.apache.cxf.Bus;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEHCacheOAuthDataProvider.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEHCacheOAuthDataProvider.java
index 363bff3..0f92f07 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEHCacheOAuthDataProvider.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEHCacheOAuthDataProvider.java
@@ -26,7 +26,6 @@ import net.sf.ehcache.CacheManager;
import net.sf.ehcache.Ehcache;
import net.sf.ehcache.Element;
import net.sf.ehcache.config.CacheConfiguration;
-
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.helpers.CastUtils;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/OAuthServerJoseJwtProducer.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/OAuthServerJoseJwtProducer.java
index 2cdadbd..a0bfaf1 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/OAuthServerJoseJwtProducer.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/OAuthServerJoseJwtProducer.java
@@ -19,6 +19,7 @@
package org.apache.cxf.rs.security.oauth2.provider;
import java.security.cert.X509Certificate;
+
import org.apache.cxf.rs.security.jose.jwa.ContentAlgorithm;
import org.apache.cxf.rs.security.jose.jwa.KeyAlgorithm;
import org.apache.cxf.rs.security.jose.jwe.JweEncryptionProvider;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/EHCacheUtil.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/EHCacheUtil.java
index e0f275f..037223e 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/EHCacheUtil.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/EHCacheUtil.java
@@ -29,7 +29,6 @@ import net.sf.ehcache.config.CacheConfiguration;
import net.sf.ehcache.config.Configuration;
import net.sf.ehcache.config.ConfigurationFactory;
import net.sf.ehcache.config.DiskStoreConfiguration;
-
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.jaxrs.utils.ResourceUtils;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JCacheCodeDataProviderTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JCacheCodeDataProviderTest.java
index 40eed36..f2d5558 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JCacheCodeDataProviderTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JCacheCodeDataProviderTest.java
@@ -23,6 +23,7 @@ import java.util.List;
import org.apache.cxf.rs.security.oauth2.common.Client;
import org.apache.cxf.rs.security.oauth2.common.UserSubject;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACMTOAuthDataProviderTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACMTOAuthDataProviderTest.java
index 2e86920..1786aaf 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACMTOAuthDataProviderTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACMTOAuthDataProviderTest.java
@@ -28,10 +28,12 @@ import org.apache.cxf.rs.security.oauth2.common.ServerAccessToken;
import org.apache.cxf.rs.security.oauth2.provider.JPAOAuthDataProvider;
import org.apache.cxf.rs.security.oauth2.provider.JPAOAuthDataProviderTest;
import org.apache.cxf.rs.security.oauth2.tokens.refresh.RefreshToken;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.annotation.DirtiesContext.ClassMode;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProviderTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProviderTest.java
index ad78456..8b59119 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProviderTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JPACodeDataProviderTest.java
@@ -22,11 +22,13 @@ import java.sql.Connection;
import java.sql.DriverManager;
import java.util.Collections;
import java.util.List;
+
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
import org.apache.cxf.rs.security.oauth2.common.Client;
import org.apache.cxf.rs.security.oauth2.common.UserSubject;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/jwt/AbstractJwtHandlerTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/jwt/AbstractJwtHandlerTest.java
index 59d8fe8..143d972 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/jwt/AbstractJwtHandlerTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/jwt/AbstractJwtHandlerTest.java
@@ -27,9 +27,9 @@ import org.apache.cxf.rs.security.jose.jws.JwsSignatureVerifier;
import org.apache.cxf.rs.security.oauth2.common.Client;
import org.apache.cxf.rs.security.oauth2.common.ServerAccessToken;
import org.apache.cxf.rs.security.oauth2.provider.OAuthServiceException;
+
import org.easymock.EasyMockRule;
import org.easymock.Mock;
-
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -37,7 +37,6 @@ import org.junit.Test;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.verify;
-
import static org.junit.Assert.fail;
public class AbstractJwtHandlerTest {
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JCacheOAuthDataProviderTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JCacheOAuthDataProviderTest.java
index 6e94cbd4..560223a 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JCacheOAuthDataProviderTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JCacheOAuthDataProviderTest.java
@@ -29,6 +29,7 @@ import org.apache.cxf.rs.security.oauth2.common.ServerAccessToken;
import org.apache.cxf.rs.security.oauth2.common.UserSubject;
import org.apache.cxf.rs.security.oauth2.tokens.refresh.RefreshToken;
import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java
index 23abcd1..5c15e43 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java
@@ -21,6 +21,7 @@ package org.apache.cxf.rs.security.oauth2.provider;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
@@ -31,6 +32,7 @@ import org.apache.cxf.rs.security.oauth2.common.ServerAccessToken;
import org.apache.cxf.rs.security.oauth2.common.UserSubject;
import org.apache.cxf.rs.security.oauth2.tokens.refresh.RefreshToken;
import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/HawkAccessTokenValidatorTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/HawkAccessTokenValidatorTest.java
index 8d7d098..1b35e87 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/HawkAccessTokenValidatorTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/HawkAccessTokenValidatorTest.java
@@ -29,8 +29,8 @@ import org.apache.cxf.rs.security.oauth2.common.AccessTokenValidation;
import org.apache.cxf.rs.security.oauth2.common.Client;
import org.apache.cxf.rs.security.oauth2.provider.OAuthDataProvider;
import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/NonceVerifierImplTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/NonceVerifierImplTest.java
index 2f99b6b..10be48e 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/NonceVerifierImplTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/NonceVerifierImplTest.java
@@ -19,8 +19,8 @@
package org.apache.cxf.rs.security.oauth2.tokens.hawk;
import org.apache.cxf.rs.security.oauth2.provider.OAuthServiceException;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectCMTOpenJPATest.java b/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectCMTOpenJPATest.java
index 50d0ddd..9aa68bc 100644
--- a/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectCMTOpenJPATest.java
+++ b/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectCMTOpenJPATest.java
@@ -19,9 +19,11 @@
package org.apache.cxf.rs.security.oidc.idp;
import org.apache.cxf.rs.security.oauth2.provider.JPAOAuthDataProvider;
+
import org.junit.After;
import org.junit.Before;
import org.junit.runner.RunWith;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ActiveProfiles;
diff --git a/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectCMTTest.java b/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectCMTTest.java
index 00495e1..fa210f4 100644
--- a/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectCMTTest.java
+++ b/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectCMTTest.java
@@ -19,6 +19,7 @@
package org.apache.cxf.rs.security.oidc.idp;
import org.apache.cxf.rs.security.oauth2.provider.JPAOAuthDataProvider;
+
import org.junit.After;
import org.junit.Before;
import org.junit.runner.RunWith;
diff --git a/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectTest.java b/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectTest.java
index 95e7874..1525cce 100644
--- a/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectTest.java
+++ b/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectTest.java
@@ -19,6 +19,7 @@
package org.apache.cxf.rs.security.oidc.idp;
import java.util.Collections;
+
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
@@ -27,6 +28,7 @@ import org.apache.cxf.rs.security.oauth2.common.Client;
import org.apache.cxf.rs.security.oauth2.common.ServerAccessToken;
import org.apache.cxf.rs.security.oauth2.provider.JPAOAuthDataProvider;
import org.apache.cxf.rs.security.oidc.common.IdToken;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractRequestAssertionConsumerHandler.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractRequestAssertionConsumerHandler.java
index dce003e..129caf8 100644
--- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractRequestAssertionConsumerHandler.java
+++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractRequestAssertionConsumerHandler.java
@@ -37,6 +37,7 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
import org.w3c.dom.Document;
+
import org.apache.cxf.Bus;
import org.apache.cxf.common.i18n.BundleUtils;
import org.apache.cxf.common.logging.LogUtils;
diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java
index 09b5d41..5aac1d2 100644
--- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java
+++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java
@@ -42,6 +42,7 @@ import javax.ws.rs.core.UriBuilder;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.common.i18n.BundleUtils;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.security.SimplePrincipal;
diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java
index 7486c39..4d9364b 100644
--- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java
+++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java
@@ -31,7 +31,6 @@ import net.sf.ehcache.config.CacheConfiguration;
import net.sf.ehcache.config.Configuration;
import net.sf.ehcache.config.ConfigurationFactory;
import net.sf.ehcache.config.DiskStoreConfiguration;
-
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.jaxrs.utils.ResourceUtils;
diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataService.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataService.java
index 7d10217..020394c 100644
--- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataService.java
+++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataService.java
@@ -30,6 +30,7 @@ import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import org.w3c.dom.Document;
+
import org.apache.cxf.common.i18n.BundleUtils;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.jaxrs.utils.ExceptionUtils;
diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLProtocolResponseValidator.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLProtocolResponseValidator.java
index 2383fde..a671317 100644
--- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLProtocolResponseValidator.java
+++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLProtocolResponseValidator.java
@@ -34,6 +34,7 @@ import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.Base64Exception;
import org.apache.cxf.common.util.Base64Utility;
diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SSOValidatorResponse.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SSOValidatorResponse.java
index e5eccd0..162a74d 100644
--- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SSOValidatorResponse.java
+++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SSOValidatorResponse.java
@@ -21,6 +21,7 @@ package org.apache.cxf.rs.security.saml.sso;
import java.time.Instant;
import org.w3c.dom.Element;
+
import org.opensaml.saml.saml2.core.Assertion;
/**
diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlPostBindingFilter.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlPostBindingFilter.java
index 9ec7fc6..f85902a 100644
--- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlPostBindingFilter.java
+++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlPostBindingFilter.java
@@ -29,6 +29,7 @@ import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;
import org.w3c.dom.Element;
+
import org.apache.cxf.common.util.Base64Utility;
import org.apache.cxf.jaxrs.ext.MessageContextImpl;
import org.apache.cxf.jaxrs.utils.ExceptionUtils;
diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlRedirectBindingFilter.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlRedirectBindingFilter.java
index 6826145..594c167 100644
--- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlRedirectBindingFilter.java
+++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlRedirectBindingFilter.java
@@ -34,6 +34,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriBuilder;
import org.w3c.dom.Element;
+
import org.apache.cxf.common.util.Base64Utility;
import org.apache.cxf.jaxrs.utils.ExceptionUtils;
import org.apache.cxf.jaxrs.utils.JAXRSUtils;
diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/EHCacheSPStateManager.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/EHCacheSPStateManager.java
index d500865..2ae0e06 100644
--- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/EHCacheSPStateManager.java
+++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/EHCacheSPStateManager.java
@@ -30,7 +30,6 @@ import net.sf.ehcache.config.CacheConfiguration;
import net.sf.ehcache.config.Configuration;
import net.sf.ehcache.config.ConfigurationFactory;
import net.sf.ehcache.config.DiskStoreConfiguration;
-
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.jaxrs.utils.ResourceUtils;
diff --git a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/AuthnRequestBuilderTest.java b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/AuthnRequestBuilderTest.java
index ff5caa8..f2fcc0b 100644
--- a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/AuthnRequestBuilderTest.java
+++ b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/AuthnRequestBuilderTest.java
@@ -23,6 +23,7 @@ import java.util.Collections;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
diff --git a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/CombinedValidatorTest.java b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/CombinedValidatorTest.java
index 1cb6061..5f4e096 100644
--- a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/CombinedValidatorTest.java
+++ b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/CombinedValidatorTest.java
@@ -27,6 +27,7 @@ import java.util.Collections;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.helpers.DOMUtils;
import org.apache.wss4j.common.WSS4JConstants;
import org.apache.wss4j.common.crypto.Crypto;
diff --git a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/EHCacheUtilTest.java b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/EHCacheUtilTest.java
index 1e2341b..d3d3bfe 100644
--- a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/EHCacheUtilTest.java
+++ b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/EHCacheUtilTest.java
@@ -21,7 +21,6 @@ package org.apache.cxf.rs.security.saml.sso;
import net.sf.ehcache.CacheManager;
import net.sf.ehcache.Status;
-
import net.sf.ehcache.config.Configuration;
import net.sf.ehcache.config.ConfigurationFactory;
diff --git a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLResponseValidatorTest.java b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLResponseValidatorTest.java
index ef4c6ba..85097a1 100644
--- a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLResponseValidatorTest.java
+++ b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLResponseValidatorTest.java
@@ -28,6 +28,7 @@ import java.util.List;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.helpers.DOMUtils;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoType;
diff --git a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidatorTest.java b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidatorTest.java
index 77da0df..9a9b44b 100644
--- a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidatorTest.java
+++ b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidatorTest.java
@@ -29,6 +29,7 @@ import java.util.List;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.helpers.DOMUtils;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoType;
diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/RSSecurityUtils.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/RSSecurityUtils.java
index fa549a2..efa4ce6 100644
--- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/RSSecurityUtils.java
+++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/RSSecurityUtils.java
@@ -28,6 +28,7 @@ import javax.security.auth.callback.CallbackHandler;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+
import org.apache.cxf.common.util.Base64Utility;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.interceptor.Fault;
diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/AbstractSamlInHandler.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/AbstractSamlInHandler.java
index d3d55b1..4fc4ff5 100644
--- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/AbstractSamlInHandler.java
+++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/AbstractSamlInHandler.java
@@ -37,6 +37,7 @@ import javax.ws.rs.core.Response;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.jaxrs.utils.ExceptionUtils;
import org.apache.cxf.jaxrs.utils.JAXRSUtils;
diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/SecurityContextProviderImpl.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/SecurityContextProviderImpl.java
index f80df06..0f5c7e8 100644
--- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/SecurityContextProviderImpl.java
+++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/SecurityContextProviderImpl.java
@@ -22,6 +22,7 @@ import java.security.Principal;
import java.util.Set;
import org.w3c.dom.Element;
+
import org.apache.cxf.message.Message;
import org.apache.cxf.rs.security.saml.assertion.Subject;
import org.apache.cxf.rt.security.SecurityConstants;
diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlEncInHandler.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlEncInHandler.java
index c9f38fb..5c02eaf 100644
--- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlEncInHandler.java
+++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlEncInHandler.java
@@ -33,6 +33,7 @@ import javax.xml.stream.XMLStreamReader;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.common.util.Base64Exception;
import org.apache.cxf.common.util.Base64Utility;
import org.apache.cxf.message.Message;
diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSecInHandler.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSecInHandler.java
index 182f097..ba4341a 100644
--- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSecInHandler.java
+++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSecInHandler.java
@@ -30,6 +30,7 @@ import javax.xml.stream.XMLStreamReader;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.jaxrs.utils.ExceptionUtils;
import org.apache.cxf.jaxrs.utils.JAXRSUtils;
diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSecOutInterceptor.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSecOutInterceptor.java
index 1c47c84..3a3288e 100644
--- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSecOutInterceptor.java
+++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSecOutInterceptor.java
@@ -30,6 +30,7 @@ import javax.xml.stream.XMLStreamWriter;
import javax.xml.transform.dom.DOMSource;
import org.w3c.dom.Document;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.jaxrs.provider.JAXBElementProvider;
diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSigInHandler.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSigInHandler.java
index c65798d..e0a2e53 100644
--- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSigInHandler.java
+++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSigInHandler.java
@@ -32,6 +32,7 @@ import javax.xml.stream.XMLStreamReader;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.message.Message;
import org.apache.cxf.rs.security.common.CryptoLoader;
diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlEncOutInterceptor.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlEncOutInterceptor.java
index 711390c..59b9536 100644
--- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlEncOutInterceptor.java
+++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlEncOutInterceptor.java
@@ -34,6 +34,7 @@ import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.Text;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.helpers.DOMUtils;
diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSigOutInterceptor.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSigOutInterceptor.java
index 9e8252b..413bef7 100644
--- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSigOutInterceptor.java
+++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSigOutInterceptor.java
@@ -30,6 +30,7 @@ import javax.xml.namespace.QName;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.helpers.DOMUtils;
diff --git a/rt/rs/sse/src/test/java/org/apache/cxf/jaxrs/sse/client/SseEventSourceImplTest.java b/rt/rs/sse/src/test/java/org/apache/cxf/jaxrs/sse/client/SseEventSourceImplTest.java
index 9db391f..c4e18fa 100644
--- a/rt/rs/sse/src/test/java/org/apache/cxf/jaxrs/sse/client/SseEventSourceImplTest.java
+++ b/rt/rs/sse/src/test/java/org/apache/cxf/jaxrs/sse/client/SseEventSourceImplTest.java
@@ -45,6 +45,7 @@ import org.apache.cxf.jaxrs.client.ClientConfiguration;
import org.apache.cxf.jaxrs.client.ClientProviderFactory;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.client.spec.ClientImpl.WebTargetImpl;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/claims/SAMLSecurityContext.java b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/claims/SAMLSecurityContext.java
index 3e4e7dd..439cb61 100644
--- a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/claims/SAMLSecurityContext.java
+++ b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/claims/SAMLSecurityContext.java
@@ -24,6 +24,7 @@ import java.util.HashSet;
import java.util.Set;
import org.w3c.dom.Element;
+
import org.apache.cxf.rt.security.claims.ClaimCollection;
import org.apache.cxf.rt.security.claims.ClaimsSecurityContext;
diff --git a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/interceptor/WSS4JBasicAuthValidator.java b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/interceptor/WSS4JBasicAuthValidator.java
index 0bdb608..77f4413 100644
--- a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/interceptor/WSS4JBasicAuthValidator.java
+++ b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/interceptor/WSS4JBasicAuthValidator.java
@@ -25,6 +25,7 @@ import java.util.logging.Logger;
import javax.security.auth.callback.CallbackHandler;
import org.w3c.dom.Document;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.configuration.security.AuthorizationPolicy;
import org.apache.cxf.helpers.DOMUtils;
diff --git a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/utils/SAMLUtils.java b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/utils/SAMLUtils.java
index cc27b05..7fb54c6 100644
--- a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/utils/SAMLUtils.java
+++ b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/utils/SAMLUtils.java
@@ -27,6 +27,7 @@ import java.util.List;
import java.util.Set;
import org.w3c.dom.Element;
+
import org.apache.cxf.common.security.SimpleGroup;
import org.apache.cxf.message.Message;
import org.apache.cxf.rt.security.SecurityConstants;
diff --git a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml/CXFMessageParser.java b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml/CXFMessageParser.java
index a8371a6..2613e3d 100644
--- a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml/CXFMessageParser.java
+++ b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml/CXFMessageParser.java
@@ -21,6 +21,7 @@ package org.apache.cxf.rt.security.saml.xacml;
import javax.xml.namespace.QName;
import org.w3c.dom.Element;
+
import org.apache.cxf.message.Message;
import org.apache.cxf.rt.security.saml.claims.SAMLSecurityContext;
import org.apache.cxf.security.SecurityContext;
diff --git a/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/claims/SAMLClaimsTest.java b/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/claims/SAMLClaimsTest.java
index 245172a..e998cfe 100644
--- a/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/claims/SAMLClaimsTest.java
+++ b/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/claims/SAMLClaimsTest.java
@@ -26,6 +26,7 @@ import java.util.List;
import java.util.Set;
import org.w3c.dom.Document;
+
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.rt.security.claims.Claim;
import org.apache.cxf.rt.security.claims.ClaimCollection;
@@ -35,6 +36,7 @@ import org.apache.wss4j.common.saml.SAMLUtil;
import org.apache.wss4j.common.saml.SamlAssertionWrapper;
import org.apache.wss4j.common.saml.bean.AttributeBean;
import org.apache.wss4j.common.saml.builder.SAML2Constants;
+
import org.junit.Assert;
public class SAMLClaimsTest extends Assert {
diff --git a/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/interceptor/ClaimsAuthorizingInterceptorTest.java b/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/interceptor/ClaimsAuthorizingInterceptorTest.java
index fcdc746..e35bb56 100644
--- a/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/interceptor/ClaimsAuthorizingInterceptorTest.java
+++ b/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/interceptor/ClaimsAuthorizingInterceptorTest.java
@@ -43,6 +43,7 @@ import org.apache.cxf.security.claims.authorization.Claim;
import org.apache.cxf.security.claims.authorization.ClaimMode;
import org.apache.cxf.security.claims.authorization.Claims;
import org.apache.wss4j.common.saml.builder.SAML2Constants;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/xacml2/RequestComponentBuilderTest.java b/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/xacml2/RequestComponentBuilderTest.java
index eb23d86..abc87e9 100644
--- a/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/xacml2/RequestComponentBuilderTest.java
+++ b/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/xacml2/RequestComponentBuilderTest.java
@@ -29,6 +29,7 @@ import javax.xml.parsers.ParserConfigurationException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.rt.security.saml.xacml.XACMLConstants;
import org.apache.wss4j.common.saml.OpenSAMLUtil;
import org.joda.time.DateTime;
diff --git a/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/xacml2/SamlRequestComponentBuilderTest.java b/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/xacml2/SamlRequestComponentBuilderTest.java
index 2ce84f4..b4ac130 100644
--- a/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/xacml2/SamlRequestComponentBuilderTest.java
+++ b/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/xacml2/SamlRequestComponentBuilderTest.java
@@ -29,6 +29,7 @@ import javax.xml.parsers.ParserConfigurationException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.rt.security.saml.xacml.XACMLConstants;
import org.apache.wss4j.common.saml.OpenSAMLUtil;
import org.opensaml.xacml.ctx.ActionType;
diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineBeanDefinitionParser.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineBeanDefinitionParser.java
index e3c51c9..5bf0274 100644
--- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineBeanDefinitionParser.java
+++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineBeanDefinitionParser.java
@@ -31,6 +31,7 @@ import org.w3c.dom.Attr;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
+
import org.apache.cxf.Bus;
import org.apache.cxf.bus.spring.BusWiringBeanFactoryPostProcessor;
import org.apache.cxf.common.injection.NoJSR250Annotations;
diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineFactoryBeanDefinitionParser.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineFactoryBeanDefinitionParser.java
index 2e9e1c0..366f144 100644
--- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineFactoryBeanDefinitionParser.java
+++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineFactoryBeanDefinitionParser.java
@@ -37,7 +37,6 @@ import org.apache.cxf.transport.http_jetty.JettyHTTPServerEngineFactory;
import org.apache.cxf.transport.http_jetty.ThreadingParameters;
import org.apache.cxf.transports.http_jetty.configuration.TLSServerParametersIdentifiedType;
import org.apache.cxf.transports.http_jetty.configuration.ThreadingParametersIdentifiedType;
-
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
diff --git a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
index 052afd7..7ecb54b 100644
--- a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
+++ b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
@@ -70,10 +70,13 @@ import org.apache.cxf.ws.addressing.AddressingProperties;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
import org.apache.cxf.ws.addressing.JAXWSAConstants;
+
import org.easymock.EasyMock;
+
import org.eclipse.jetty.http.HttpFields;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Response;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
index f3874f5..8a071e9 100644
--- a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
+++ b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
@@ -43,8 +43,10 @@ import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.management.InstrumentationManager;
import org.apache.cxf.testutil.common.TestUtil;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
+
import org.eclipse.jetty.server.ConnectionFactory;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Handler;
@@ -55,6 +57,7 @@ import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.eclipse.jetty.util.thread.ThreadPool;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
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 2d6c060..63586f0 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
@@ -20,9 +20,11 @@ package org.apache.cxf.transport.http.netty.client.integration;
import java.net.URL;
import java.util.concurrent.ExecutionException;
+
import javax.xml.ws.AsyncHandler;
import javax.xml.ws.Endpoint;
import javax.xml.ws.Response;
+
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
@@ -31,6 +33,7 @@ import org.apache.hello_world_soap_http.Greeter;
import org.apache.hello_world_soap_http.SOAPService;
import org.apache.hello_world_soap_http.types.GreetMeLaterResponse;
import org.apache.hello_world_soap_http.types.GreetMeResponse;
+
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpContextHandler.java b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpContextHandler.java
index a7a6da0..eede062 100644
--- a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpContextHandler.java
+++ b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpContextHandler.java
@@ -23,9 +23,9 @@ package org.apache.cxf.transport.http.netty.server;
import java.io.IOException;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
-
import java.util.logging.Level;
import java.util.logging.Logger;
+
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
diff --git a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpHandler.java b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpHandler.java
index 95fbdaa..b4e9e2c 100644
--- a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpHandler.java
+++ b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpHandler.java
@@ -20,10 +20,12 @@
package org.apache.cxf.transport.http.netty.server;
import java.io.IOException;
+
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
import org.apache.cxf.transport.http.HttpUrlUtil;
public class NettyHttpHandler {
diff --git a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngine.java b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngine.java
index deeee48..58f68fb 100644
--- a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngine.java
+++ b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngine.java
@@ -24,9 +24,9 @@ import java.net.URL;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Logger;
+
import javax.annotation.PostConstruct;
import org.apache.cxf.common.i18n.Message;
@@ -34,6 +34,7 @@ import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.configuration.jsse.TLSServerParameters;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.transport.HttpUriMapper;
+
import io.netty.bootstrap.ServerBootstrap;
import io.netty.channel.Channel;
import io.netty.channel.ChannelOption;
diff --git a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/interceptor/ChannelInterceptor.java b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/interceptor/ChannelInterceptor.java
index 8a503aa..a4ee2e6 100644
--- a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/interceptor/ChannelInterceptor.java
+++ b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/interceptor/ChannelInterceptor.java
@@ -22,7 +22,6 @@ package org.apache.cxf.transport.http.netty.server.interceptor;
import org.apache.cxf.transport.http.netty.server.servlet.ChannelThreadLocal;
import io.netty.channel.ChannelHandlerContext;
-
import io.netty.handler.codec.http.HttpRequest;
import io.netty.handler.codec.http.HttpResponse;
diff --git a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/interceptor/HttpSessionInterceptor.java b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/interceptor/HttpSessionInterceptor.java
index 514548c..89aff3b 100644
--- a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/interceptor/HttpSessionInterceptor.java
+++ b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/interceptor/HttpSessionInterceptor.java
@@ -25,6 +25,7 @@ import org.apache.cxf.transport.http.netty.server.servlet.HttpSessionThreadLocal
import org.apache.cxf.transport.http.netty.server.servlet.NettyHttpSession;
import org.apache.cxf.transport.http.netty.server.session.HttpSessionStore;
import org.apache.cxf.transport.http.netty.server.util.Utils;
+
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.http.HttpHeaders;
import io.netty.handler.codec.http.HttpHeaders.Names;
diff --git a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyHttpServletRequest.java b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyHttpServletRequest.java
index e2f54a8..869448c 100644
--- a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyHttpServletRequest.java
+++ b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyHttpServletRequest.java
@@ -43,6 +43,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import org.apache.cxf.transport.http.netty.server.util.Utils;
+
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.http.HttpContent;
import io.netty.handler.codec.http.HttpHeaders;
diff --git a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/spring/NettyHttpServerEngineBeanDefinitionParser.java b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/spring/NettyHttpServerEngineBeanDefinitionParser.java
index 6148b72..2ef975e 100644
--- a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/spring/NettyHttpServerEngineBeanDefinitionParser.java
+++ b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/spring/NettyHttpServerEngineBeanDefinitionParser.java
@@ -51,7 +51,6 @@ import org.apache.cxf.transport.http.netty.server.ThreadingParameters;
import org.apache.cxf.transports.http_netty_server.configuration.TLSServerParametersIdentifiedType;
import org.apache.cxf.transports.http_netty_server.configuration.ThreadingParametersIdentifiedType;
import org.apache.cxf.transports.http_netty_server.configuration.ThreadingParametersType;
-
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.config.ConstructorArgumentValues.ValueHolder;
diff --git a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java
index b76e15a..6f30eca 100644
--- a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java
+++ b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java
@@ -72,8 +72,8 @@ import org.apache.cxf.ws.addressing.AddressingProperties;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
import org.apache.cxf.ws.addressing.JAXWSAConstants;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactoryTest.java b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactoryTest.java
index d0200e7..be5c9cd 100644
--- a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactoryTest.java
+++ b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactoryTest.java
@@ -24,6 +24,7 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.transport.DestinationFactory;
import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.transport.http.HTTPTransportFactory;
+
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Assert;
diff --git a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineTest.java b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineTest.java
index cd23ad9..ef254e0 100644
--- a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineTest.java
+++ b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineTest.java
@@ -33,6 +33,7 @@ import org.apache.cxf.configuration.Configurer;
import org.apache.cxf.configuration.jsse.TLSServerParameters;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.testutil.common.TestUtil;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpTestHandler.java b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpTestHandler.java
index 1fb6e8b..8f64bb9 100644
--- a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpTestHandler.java
+++ b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpTestHandler.java
@@ -24,6 +24,7 @@ import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
import org.apache.cxf.transport.http.HttpUrlUtil;
diff --git a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/integration/NettyServerTest.java b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/integration/NettyServerTest.java
index b022e73..4471f6c 100644
--- a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/integration/NettyServerTest.java
+++ b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/integration/NettyServerTest.java
@@ -22,13 +22,16 @@ package org.apache.cxf.transport.http.netty.server.integration;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.net.URL;
+
import javax.xml.ws.Endpoint;
+
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.hello_world_soap_http.Greeter;
import org.apache.hello_world_soap_http.SOAPService;
+
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/integration/SSLNettySpringServerTest.java b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/integration/SSLNettySpringServerTest.java
index a1405b7..b70bd97 100644
--- a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/integration/SSLNettySpringServerTest.java
+++ b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/integration/SSLNettySpringServerTest.java
@@ -19,8 +19,11 @@
package org.apache.cxf.transport.http.netty.server.integration;
import java.net.URL;
+
import javax.xml.ws.Endpoint;
+
import org.apache.hello_world_soap_http.SOAPService;
+
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.springframework.context.ConfigurableApplicationContext;
diff --git a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestination.java b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestination.java
index 4a886c1..17603e0 100644
--- a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestination.java
+++ b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestination.java
@@ -38,7 +38,6 @@ import org.apache.cxf.common.classloader.ClassLoaderUtils.ClassLoaderHolder;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.message.Message;
import org.apache.cxf.service.model.EndpointInfo;
-
import org.apache.cxf.transport.http.DestinationRegistry;
import org.apache.cxf.transport.servlet.ServletDestination;
import org.apache.cxf.transports.http.configuration.HTTPServerPolicy;
diff --git a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/spring/UndertowHTTPServerEngineBeanDefinitionParser.java b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/spring/UndertowHTTPServerEngineBeanDefinitionParser.java
index e5bebb6..1efd18f 100644
--- a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/spring/UndertowHTTPServerEngineBeanDefinitionParser.java
+++ b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/spring/UndertowHTTPServerEngineBeanDefinitionParser.java
@@ -31,6 +31,7 @@ import org.w3c.dom.Attr;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
+
import org.apache.cxf.Bus;
import org.apache.cxf.bus.spring.BusWiringBeanFactoryPostProcessor;
import org.apache.cxf.common.injection.NoJSR250Annotations;
diff --git a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/spring/UndertowHTTPServerEngineFactoryBeanDefinitionParser.java b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/spring/UndertowHTTPServerEngineFactoryBeanDefinitionParser.java
index bc6ffb9..bbf1904 100644
--- a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/spring/UndertowHTTPServerEngineFactoryBeanDefinitionParser.java
+++ b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/spring/UndertowHTTPServerEngineFactoryBeanDefinitionParser.java
@@ -37,7 +37,6 @@ import org.apache.cxf.transport.http_undertow.ThreadingParameters;
import org.apache.cxf.transport.http_undertow.UndertowHTTPServerEngineFactory;
import org.apache.cxf.transports.http_undertow.configuration.TLSServerParametersIdentifiedType;
import org.apache.cxf.transports.http_undertow.configuration.ThreadingParametersIdentifiedType;
-
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
diff --git a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestinationTest.java b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestinationTest.java
index 22f6108..a2a6b38 100644
--- a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestinationTest.java
+++ b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestinationTest.java
@@ -71,9 +71,8 @@ import org.apache.cxf.ws.addressing.AddressingProperties;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
import org.apache.cxf.ws.addressing.JAXWSAConstants;
-import org.easymock.EasyMock;
-
+import org.easymock.EasyMock;
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineTest.java b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineTest.java
index 883728a..feeea9d 100644
--- a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineTest.java
+++ b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineTest.java
@@ -41,6 +41,7 @@ import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.management.InstrumentationManager;
import org.apache.cxf.testutil.common.TestUtil;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpAuthSupplierBeanDefinitionParser.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpAuthSupplierBeanDefinitionParser.java
index 8dc44f9..95e2d3f 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpAuthSupplierBeanDefinitionParser.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpAuthSupplierBeanDefinitionParser.java
@@ -21,6 +21,7 @@ package org.apache.cxf.transport.http.spring;
import org.w3c.dom.Element;
+
import org.apache.cxf.configuration.spring.AbstractBeanDefinitionParser;
import org.apache.cxf.transport.http.auth.HttpAuthSupplier;
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/CertConstraints.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/CertConstraints.java
index d49d5a1..5d093a6 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/CertConstraints.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/CertConstraints.java
@@ -21,7 +21,6 @@ package org.apache.cxf.transport.https;
import java.util.ArrayList;
import java.util.Collection;
-
import java.util.regex.Matcher;
import java.util.regex.Pattern;
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/SSLUtils.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/SSLUtils.java
index fff1c48..48a4b7c 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/SSLUtils.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/SSLUtils.java
@@ -32,7 +32,6 @@ import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.configuration.jsse.TLSClientParameters;
import org.apache.cxf.configuration.jsse.TLSParameterBase;
import org.apache.cxf.configuration.jsse.TLSServerParameters;
-
import org.apache.cxf.transport.https.httpclient.DefaultHostnameVerifier;
import org.apache.cxf.transport.https.httpclient.PublicSuffixMatcherLoader;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/DestinationRegistryImplTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/DestinationRegistryImplTest.java
index 7ce7d1b..279715f 100755
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/DestinationRegistryImplTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/DestinationRegistryImplTest.java
@@ -25,9 +25,9 @@ import javax.xml.namespace.QName;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.MessageObserver;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java
index ac70983..92963cd 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java
@@ -33,6 +33,7 @@ import org.apache.cxf.configuration.jsse.TLSClientParameters;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.service.model.EndpointInfo;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
index 9f38537..15a1ce0 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
@@ -48,6 +48,7 @@ import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.MessageObserver;
import org.apache.cxf.transport.https.HttpsURLConnectionFactory;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java
index bc86dda..968b039 100755
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java
@@ -33,9 +33,9 @@ import javax.servlet.http.HttpServletRequest;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/auth/DigestAuthSupplierTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/auth/DigestAuthSupplierTest.java
index 25cda2c..6bee107 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/auth/DigestAuthSupplierTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/auth/DigestAuthSupplierTest.java
@@ -26,9 +26,9 @@ import java.util.Map;
import org.apache.cxf.configuration.security.AuthorizationPolicy;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ClientPolicyCalculatorTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ClientPolicyCalculatorTest.java
index 053d18c..af7d68b 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ClientPolicyCalculatorTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ClientPolicyCalculatorTest.java
@@ -20,6 +20,7 @@ package org.apache.cxf.transport.http.policy;
import org.apache.cxf.transport.http.policy.impl.ClientPolicyCalculator;
import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPClientAssertionBuilderTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPClientAssertionBuilderTest.java
index 30fa6bc..a51dedb 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPClientAssertionBuilderTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPClientAssertionBuilderTest.java
@@ -23,6 +23,7 @@ import org.apache.cxf.transport.http.policy.impl.ClientPolicyCalculator;
import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
import org.apache.cxf.ws.policy.builder.jaxb.JaxbAssertion;
import org.apache.neethi.Assertion;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPServerAssertionBuilderTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPServerAssertionBuilderTest.java
index 3919ed9..34fcd74 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPServerAssertionBuilderTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/HTTPServerAssertionBuilderTest.java
@@ -23,6 +23,7 @@ import org.apache.cxf.transport.http.policy.impl.ServerPolicyCalculator;
import org.apache.cxf.transports.http.configuration.HTTPServerPolicy;
import org.apache.cxf.ws.policy.builder.jaxb.JaxbAssertion;
import org.apache.neethi.Assertion;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/PolicyUtilsTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/PolicyUtilsTest.java
index ba5696d..9d32ca6 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/PolicyUtilsTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/PolicyUtilsTest.java
@@ -36,6 +36,7 @@ import org.apache.cxf.ws.policy.AssertionInfoMap;
import org.apache.cxf.ws.policy.PolicyAssertion;
import org.apache.cxf.ws.policy.PolicyDataEngineImpl;
import org.apache.cxf.ws.policy.builder.jaxb.JaxbAssertion;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ServerPolicyCalculatorTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ServerPolicyCalculatorTest.java
index 138299b..fe534c9 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ServerPolicyCalculatorTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/ServerPolicyCalculatorTest.java
@@ -20,6 +20,7 @@ package org.apache.cxf.transport.http.policy;
import org.apache.cxf.transport.http.policy.impl.ServerPolicyCalculator;
import org.apache.cxf.transports.http.configuration.HTTPServerPolicy;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/https/HttpsURLConnectionFactoryTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/https/HttpsURLConnectionFactoryTest.java
index 0a7a17c..ebed529 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/https/HttpsURLConnectionFactoryTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/https/HttpsURLConnectionFactoryTest.java
@@ -19,11 +19,13 @@
package org.apache.cxf.transport.https;
import java.lang.reflect.Field;
+
import javax.net.ssl.HttpsURLConnection;
import org.apache.cxf.common.util.ReflectionUtil;
import org.apache.cxf.configuration.jsse.SSLUtils;
import org.apache.cxf.configuration.jsse.TLSClientParameters;
+
import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/servlet/BaseUrlHelperTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/servlet/BaseUrlHelperTest.java
index 0fe3792..fd936c1 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/servlet/BaseUrlHelperTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/servlet/BaseUrlHelperTest.java
@@ -21,7 +21,6 @@ package org.apache.cxf.transport.servlet;
import javax.servlet.http.HttpServletRequest;
import org.easymock.EasyMock;
-
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/servlet/ServletControllerTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/servlet/ServletControllerTest.java
index 4da5e78..a0c502c 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/servlet/ServletControllerTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/servlet/ServletControllerTest.java
@@ -30,8 +30,8 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.transport.MessageObserver;
import org.apache.cxf.transport.http.AbstractHTTPDestination;
import org.apache.cxf.transport.http.DestinationRegistry;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportFactory.java b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportFactory.java
index 6c9ca24..a382fc8 100644
--- a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportFactory.java
+++ b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportFactory.java
@@ -20,7 +20,6 @@
package org.apache.cxf.transport.jms;
import java.io.IOException;
-
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java
index c373665..807c4ec 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java
@@ -46,6 +46,7 @@ import org.apache.cxf.transport.Conduit;
import org.apache.cxf.transport.MessageObserver;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.wsdl11.WSDLServiceFactory;
+
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java
index 66becb9..2ae3640 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java
@@ -25,6 +25,7 @@ import java.io.Writer;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.service.model.EndpointInfo;
+
import org.junit.Test;
public class JMSConduitTest extends AbstractJMSTester {
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConfigFactoryTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConfigFactoryTest.java
index c432166..c15940f 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConfigFactoryTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConfigFactoryTest.java
@@ -30,6 +30,7 @@ import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.jms.uri.JMSEndpoint;
import org.apache.cxf.transport.jms.uri.MyBeanLocator;
import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
index 52e3f54..89e603b 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
@@ -44,6 +44,7 @@ import org.apache.cxf.transport.Conduit;
import org.apache.cxf.transport.MessageObserver;
import org.apache.cxf.transport.MultiplexDestination;
import org.apache.cxf.transport.jms.util.ResourceCloser;
+
import org.junit.Ignore;
import org.junit.Test;
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSHeaderTypeTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSHeaderTypeTest.java
index 955fd89..bc671d7 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSHeaderTypeTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSHeaderTypeTest.java
@@ -26,6 +26,7 @@ import javax.jms.Message;
import javax.jms.Session;
import org.apache.activemq.ActiveMQConnectionFactory;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/MessageIdAsCorrelationIdJMSConduitTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/MessageIdAsCorrelationIdJMSConduitTest.java
index f214649..9d3e37a 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/MessageIdAsCorrelationIdJMSConduitTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/MessageIdAsCorrelationIdJMSConduitTest.java
@@ -29,6 +29,7 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.transport.jms.util.TestReceiver;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/RequestResponseTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/RequestResponseTest.java
index 71adb96..f4c4414 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/RequestResponseTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/RequestResponseTest.java
@@ -30,6 +30,7 @@ import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.Conduit;
import org.apache.cxf.transport.MessageObserver;
+
import org.junit.Test;
public class RequestResponseTest extends AbstractJMSTester {
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationProviderTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationProviderTest.java
index ea5dec8..2996813 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationProviderTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationProviderTest.java
@@ -26,6 +26,7 @@ import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
+
import org.easymock.EasyMock;
import org.junit.AfterClass;
import org.junit.Assert;
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationTest.java
index 677d1e3..129989d 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationTest.java
@@ -29,6 +29,7 @@ import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.transport.MessageObserver;
+
import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/JMSEndpointTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/JMSEndpointTest.java
index df496f1..0c52d3f 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/JMSEndpointTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/JMSEndpointTest.java
@@ -23,6 +23,7 @@ import java.util.Map;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.jms.uri.JMSEndpoint.DeliveryModeType;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/URIConfiguredConduitTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/URIConfiguredConduitTest.java
index e270c09..b97a265 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/URIConfiguredConduitTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/URIConfiguredConduitTest.java
@@ -35,6 +35,7 @@ import org.apache.cxf.transport.jms.JMSConstants;
import org.apache.cxf.transport.jms.JMSMessageHeadersType;
import org.apache.cxf.transport.jms.util.TestReceiver;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
+
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/util/JMSUtilTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/util/JMSUtilTest.java
index 69f4d6d..9e36b6e 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/util/JMSUtilTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/util/JMSUtilTest.java
@@ -33,6 +33,7 @@ import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.cxf.transport.jms.JMSConfiguration;
import org.apache.cxf.transport.jms.JMSConstants;
import org.apache.cxf.transport.jms.JMSFactory;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/util/MessageListenerTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/util/MessageListenerTest.java
index 228ffa7..ccdb450 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/util/MessageListenerTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/util/MessageListenerTest.java
@@ -38,6 +38,7 @@ import org.apache.activemq.RedeliveryPolicy;
import org.apache.activemq.pool.XaPooledConnectionFactory;
import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
import org.awaitility.Awaitility;
+
import org.easymock.Capture;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalTransportFactoryTest.java b/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalTransportFactoryTest.java
index 66eb68e..8a7e541 100644
--- a/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalTransportFactoryTest.java
+++ b/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalTransportFactoryTest.java
@@ -33,8 +33,8 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.Conduit;
-
import org.apache.cxf.transport.MessageObserver;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestinationTest.java b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestinationTest.java
index 99f5ce9..cb7ee70 100644
--- a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestinationTest.java
+++ b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestinationTest.java
@@ -31,9 +31,9 @@ import org.apache.cxf.transport.http.HTTPTransportFactory;
import org.apache.cxf.transport.http_jetty.JettyHTTPServerEngine;
import org.apache.cxf.transport.http_jetty.JettyHTTPServerEngineFactory;
import org.apache.cxf.transport.websocket.jetty9.Jetty9WebSocketDestination;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/ContextUtilsTest.java b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/ContextUtilsTest.java
index 07eb9d0..3695235 100755
--- a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/ContextUtilsTest.java
+++ b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/ContextUtilsTest.java
@@ -41,9 +41,9 @@ import org.apache.cxf.ws.addressing.AttributedURIType;
import org.apache.cxf.ws.addressing.ContextUtils;
import org.apache.cxf.ws.addressing.JAXWSAConstants;
import org.apache.cxf.ws.addressing.Names;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
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 df62735..6073e33 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
@@ -73,9 +73,9 @@ import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
import org.apache.cxf.ws.addressing.JAXWSAConstants;
import org.apache.cxf.ws.addressing.Names;
import org.apache.cxf.ws.addressing.WSAContextUtils;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/DecoupledFaultHandlerTest.java b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/DecoupledFaultHandlerTest.java
index e922a30..b5c8590 100644
--- a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/DecoupledFaultHandlerTest.java
+++ b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/DecoupledFaultHandlerTest.java
@@ -30,6 +30,7 @@ import org.apache.cxf.ws.addressing.AddressingProperties;
import org.apache.cxf.ws.addressing.AttributedURIType;
import org.apache.cxf.ws.addressing.ContextUtils;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
+
import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
index 8971d1c..a487bb6 100644
--- a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
+++ b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
@@ -52,9 +52,9 @@ import org.apache.cxf.ws.addressing.VersionTransformer.Names200403;
import org.apache.cxf.ws.addressing.VersionTransformer.Names200408;
import org.apache.cxf.ws.addressing.v200408.AttributedURI;
import org.apache.cxf.ws.addressing.v200408.Relationship;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/WSEventingFault.java b/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/WSEventingFault.java
index 0082ee7..5c0b712 100644
--- a/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/WSEventingFault.java
+++ b/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/WSEventingFault.java
@@ -22,6 +22,7 @@ package org.apache.cxf.ws.eventing.shared.faults;
import javax.xml.namespace.QName;
import org.w3c.dom.Element;
+
import org.apache.cxf.binding.soap.SoapFault;
import org.apache.cxf.ws.addressing.FaultAction;
import org.apache.cxf.ws.eventing.shared.EventingConstants;
diff --git a/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/handlers/ReferenceParametersAddingHandler.java b/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/handlers/ReferenceParametersAddingHandler.java
index 4093f0b..6b33efa 100644
--- a/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/handlers/ReferenceParametersAddingHandler.java
+++ b/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/handlers/ReferenceParametersAddingHandler.java
@@ -20,6 +20,7 @@
package org.apache.cxf.ws.eventing.shared.handlers;
import java.util.Set;
+
import javax.xml.namespace.QName;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPException;
diff --git a/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/utils/DurationAndDateUtil.java b/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/utils/DurationAndDateUtil.java
index b90581e..8521fd0 100644
--- a/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/utils/DurationAndDateUtil.java
+++ b/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/utils/DurationAndDateUtil.java
@@ -20,10 +20,12 @@
package org.apache.cxf.ws.eventing.shared.utils;
import java.util.GregorianCalendar;
+
import javax.xml.datatype.DatatypeConfigurationException;
import javax.xml.datatype.DatatypeFactory;
import javax.xml.datatype.Duration;
import javax.xml.datatype.XMLGregorianCalendar;
+
import org.apache.cxf.ws.eventing.ExpirationType;
public final class DurationAndDateUtil {
diff --git a/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/base/SimpleEventingIntegrationTest.java b/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/base/SimpleEventingIntegrationTest.java
index ca5b2ca..4e49438 100644
--- a/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/base/SimpleEventingIntegrationTest.java
+++ b/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/base/SimpleEventingIntegrationTest.java
@@ -50,6 +50,7 @@ import org.apache.cxf.ws.eventing.integration.notificationapi.assertions.WSAActi
import org.apache.cxf.ws.eventing.manager.SubscriptionManagerEndpoint;
import org.apache.cxf.ws.eventing.shared.EventingConstants;
import org.apache.cxf.ws.eventing.shared.handlers.ReferenceParametersAddingHandler;
+
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
diff --git a/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/NotificationTest.java b/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/NotificationTest.java
index 35cf717..045803c 100644
--- a/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/NotificationTest.java
+++ b/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/NotificationTest.java
@@ -45,6 +45,7 @@ import org.apache.cxf.ws.eventing.integration.notificationapi.EarthquakeEvent;
import org.apache.cxf.ws.eventing.integration.notificationapi.FireEvent;
import org.apache.cxf.ws.eventing.shared.EventingConstants;
import org.apache.cxf.ws.eventing.shared.utils.DurationAndDateUtil;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/SubscriptionEndTest.java b/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/SubscriptionEndTest.java
index 84e2773..71f8d23 100644
--- a/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/SubscriptionEndTest.java
+++ b/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/SubscriptionEndTest.java
@@ -42,6 +42,7 @@ import org.apache.cxf.ws.eventing.base.SimpleEventingIntegrationTest;
import org.apache.cxf.ws.eventing.base.SingletonSubscriptionManagerContainer;
import org.apache.cxf.ws.eventing.base.TestUtil;
import org.apache.cxf.ws.eventing.integration.eventsink.TestingEndToEndpointImpl;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/SubscriptionGrantingTest.java b/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/SubscriptionGrantingTest.java
index db2d6ae..f1e5a15 100644
--- a/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/SubscriptionGrantingTest.java
+++ b/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/SubscriptionGrantingTest.java
@@ -20,6 +20,7 @@
package org.apache.cxf.ws.eventing.integration;
import java.io.IOException;
+
import javax.xml.datatype.XMLGregorianCalendar;
import javax.xml.ws.soap.SOAPFaultException;
@@ -32,6 +33,7 @@ import org.apache.cxf.ws.eventing.base.SimpleEventingIntegrationTest;
import org.apache.cxf.ws.eventing.shared.faults.CannotProcessFilter;
import org.apache.cxf.ws.eventing.shared.faults.NoDeliveryMechanismEstablished;
import org.apache.cxf.ws.eventing.shared.utils.DurationAndDateUtil;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/SubscriptionManagementTest.java b/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/SubscriptionManagementTest.java
index c6fdf2b..838659f 100644
--- a/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/SubscriptionManagementTest.java
+++ b/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/SubscriptionManagementTest.java
@@ -34,6 +34,7 @@ import org.apache.cxf.ws.eventing.base.SimpleEventingIntegrationTest;
import org.apache.cxf.ws.eventing.manager.SubscriptionManagerEndpoint;
import org.apache.cxf.ws.eventing.shared.faults.UnknownSubscription;
import org.apache.cxf.ws.eventing.shared.utils.DurationAndDateUtil;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/eventsink/TestingEndToEndpointImpl.java b/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/eventsink/TestingEndToEndpointImpl.java
index 8cf1faa..31f2487 100644
--- a/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/eventsink/TestingEndToEndpointImpl.java
+++ b/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/eventsink/TestingEndToEndpointImpl.java
@@ -21,6 +21,7 @@ package org.apache.cxf.ws.eventing.integration.eventsink;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.logging.Logger;
+
import javax.jws.WebParam;
import org.apache.cxf.common.logging.LogUtils;
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProvider.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProvider.java
index 963ecdb..ba40a64 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProvider.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProvider.java
@@ -29,6 +29,7 @@ import javax.xml.namespace.QName;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+
import org.apache.cxf.Bus;
import org.apache.cxf.common.i18n.BundleUtils;
import org.apache.cxf.common.injection.NoJSR250Annotations;
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/PolicyAttachment.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/PolicyAttachment.java
index 076d819..7fc044f 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/PolicyAttachment.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/PolicyAttachment.java
@@ -20,6 +20,7 @@
package org.apache.cxf.ws.policy.attachment.external;
import java.util.Collection;
+
import org.w3c.dom.Element;
import org.apache.cxf.service.model.BindingFaultInfo;
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyBPDefinitionParser.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyBPDefinitionParser.java
index 11181d0..5703c65 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyBPDefinitionParser.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyBPDefinitionParser.java
@@ -21,6 +21,7 @@ package org.apache.cxf.ws.policy.blueprint;
import java.util.UUID;
import java.util.concurrent.Callable;
+
import org.w3c.dom.Element;
import org.apache.aries.blueprint.ParserContext;
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyFeatureBPDefinitionParser.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyFeatureBPDefinitionParser.java
index adb84de..ecd03e4 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyFeatureBPDefinitionParser.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyFeatureBPDefinitionParser.java
@@ -20,6 +20,7 @@
package org.apache.cxf.ws.policy.blueprint;
import java.util.List;
+
import org.w3c.dom.Element;
import org.apache.aries.blueprint.ParserContext;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImplTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImplTest.java
index 5a5c538..633e779 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImplTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImplTest.java
@@ -26,6 +26,7 @@ import org.w3c.dom.Element;
import org.apache.cxf.Bus;
import org.apache.neethi.Assertion;
import org.apache.neethi.builders.PrimitiveAssertion;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionInfoMapTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionInfoMapTest.java
index d12da52..e9666c6 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionInfoMapTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionInfoMapTest.java
@@ -33,6 +33,7 @@ import org.apache.neethi.Assertion;
import org.apache.neethi.ExactlyOne;
import org.apache.neethi.Policy;
import org.apache.neethi.builders.PolicyContainingPrimitiveAssertion;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java
index b495c82..bc73bb7 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java
@@ -39,9 +39,9 @@ import org.apache.cxf.transport.Conduit;
import org.apache.cxf.transport.Destination;
import org.apache.neethi.Assertion;
import org.apache.neethi.Policy;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java
index 55f93cb..be330c7 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java
@@ -42,9 +42,9 @@ import org.apache.neethi.Constants;
import org.apache.neethi.ExactlyOne;
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyOperator;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/NormalizeTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/NormalizeTest.java
index f887f1d..0b03def 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/NormalizeTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/NormalizeTest.java
@@ -28,6 +28,7 @@ import org.apache.cxf.ws.policy.builder.primitive.PrimitiveAssertionBuilder;
import org.apache.neethi.Constants;
import org.apache.neethi.Policy;
import org.apache.neethi.util.PolicyComparator;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyDataEngineImplTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyDataEngineImplTest.java
index 3b1155f..2c458b0 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyDataEngineImplTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyDataEngineImplTest.java
@@ -28,6 +28,7 @@ import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.message.Message;
import org.apache.cxf.policy.PolicyCalculator;
import org.apache.cxf.ws.policy.builder.jaxb.JaxbAssertion;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java
index e2fe423..04aaeec 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java
@@ -51,9 +51,9 @@ import org.apache.neethi.Policy;
import org.apache.neethi.PolicyComponent;
import org.apache.neethi.PolicyReference;
import org.apache.neethi.PolicyRegistry;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImplTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImplTest.java
index 316701f..86f3caf 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImplTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImplTest.java
@@ -27,6 +27,7 @@ import javax.xml.namespace.QName;
import org.apache.cxf.interceptor.Interceptor;
import org.apache.cxf.message.Message;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java
index feb393e..ad5c66d 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java
@@ -42,6 +42,7 @@ import org.apache.cxf.transport.Conduit;
import org.apache.cxf.transport.Destination;
import org.apache.neethi.Assertion;
import org.apache.neethi.Policy;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyRegistryImplTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyRegistryImplTest.java
index e63a7b6..078319e 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyRegistryImplTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyRegistryImplTest.java
@@ -20,6 +20,7 @@
package org.apache.cxf.ws.policy;
import org.apache.neethi.Policy;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptorTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptorTest.java
index 59834f2..8f497f8 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptorTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptorTest.java
@@ -29,6 +29,7 @@ import org.apache.cxf.service.model.BindingFaultInfo;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.neethi.Policy;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptorTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptorTest.java
index 82858b2..270f120 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptorTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptorTest.java
@@ -28,6 +28,7 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.neethi.Policy;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationOutInterceptorTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationOutInterceptorTest.java
index 98c9f3c..8348fa8 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationOutInterceptorTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationOutInterceptorTest.java
@@ -22,6 +22,7 @@ package org.apache.cxf.ws.policy;
import java.lang.reflect.Method;
import org.apache.cxf.message.Message;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/DomainExpressionBuilderRegistryTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/DomainExpressionBuilderRegistryTest.java
index a562cdd..5de42b6 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/DomainExpressionBuilderRegistryTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/DomainExpressionBuilderRegistryTest.java
@@ -27,6 +27,7 @@ import javax.xml.namespace.QName;
import org.w3c.dom.Element;
import org.apache.cxf.ws.policy.PolicyException;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/EndpointReferenceDomainExpressionTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/EndpointReferenceDomainExpressionTest.java
index 493820e..4c036bd 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/EndpointReferenceDomainExpressionTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/EndpointReferenceDomainExpressionTest.java
@@ -26,6 +26,7 @@ import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.ws.addressing.AttributedURIType;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProviderTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProviderTest.java
index 8384264..4b32456 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProviderTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProviderTest.java
@@ -40,11 +40,13 @@ import org.apache.cxf.ws.policy.PolicyException;
import org.apache.cxf.ws.policy.builder.primitive.PrimitiveAssertion;
import org.apache.neethi.Assertion;
import org.apache.neethi.Policy;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+
import org.springframework.core.io.Resource;
import org.springframework.core.io.UrlResource;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/PolicyAttachmentTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/PolicyAttachmentTest.java
index c8640c4..78a7066 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/PolicyAttachmentTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/PolicyAttachmentTest.java
@@ -29,6 +29,7 @@ import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.neethi.Policy;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/URIDomainExpressionTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/URIDomainExpressionTest.java
index a39f3a4..5937585 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/URIDomainExpressionTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/URIDomainExpressionTest.java
@@ -32,6 +32,7 @@ import org.apache.cxf.service.model.MessageInfo;
import org.apache.cxf.service.model.MessageInfo.Type;
import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.service.model.ServiceInfo;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/ReferenceResolverTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/ReferenceResolverTest.java
index 8cd02dd..fe07351 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/ReferenceResolverTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/ReferenceResolverTest.java
@@ -33,6 +33,7 @@ import org.apache.cxf.ws.policy.PolicyBuilder;
import org.apache.cxf.ws.policy.PolicyConstants;
import org.apache.neethi.Constants;
import org.apache.neethi.Policy;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProviderTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProviderTest.java
index fd0eb30..4dea1bc 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProviderTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProviderTest.java
@@ -49,6 +49,7 @@ import org.apache.neethi.Constants;
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyComponent;
import org.apache.neethi.util.PolicyComparator;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java
index 5d5983b..8d39f3c 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java
@@ -32,6 +32,7 @@ import org.apache.neethi.Constants;
import org.apache.neethi.ExactlyOne;
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyComponent;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/FirstAlternativeSelectorTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/FirstAlternativeSelectorTest.java
index f930d47..33ea589 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/FirstAlternativeSelectorTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/FirstAlternativeSelectorTest.java
@@ -33,9 +33,9 @@ import org.apache.neethi.All;
import org.apache.neethi.Assertion;
import org.apache.neethi.ExactlyOne;
import org.apache.neethi.Policy;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/MinimalMaximalAlternativeSelectorTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/MinimalMaximalAlternativeSelectorTest.java
index 11c2e56..fd84c9f 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/MinimalMaximalAlternativeSelectorTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/selector/MinimalMaximalAlternativeSelectorTest.java
@@ -33,9 +33,9 @@ import org.apache.neethi.All;
import org.apache.neethi.Assertion;
import org.apache.neethi.ExactlyOne;
import org.apache.neethi.Policy;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/PolicyBeansTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/PolicyBeansTest.java
index 2d4d2b6..97868ff 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/PolicyBeansTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/PolicyBeansTest.java
@@ -27,6 +27,7 @@ import org.apache.cxf.ws.policy.PolicyEngineImpl;
import org.apache.cxf.ws.policy.PolicyProvider;
import org.apache.cxf.ws.policy.attachment.external.ExternalAttachmentProvider;
import org.apache.cxf.ws.policy.selector.MaximalAlternativeSelector;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractEndpointTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractEndpointTest.java
index 627f4ae..663569f 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractEndpointTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractEndpointTest.java
@@ -21,6 +21,7 @@ package org.apache.cxf.ws.rm;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.ws.rm.v200702.Identifier;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractRMInterceptorTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractRMInterceptorTest.java
index d01ecd2..51f068f 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractRMInterceptorTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractRMInterceptorTest.java
@@ -32,9 +32,9 @@ import org.apache.cxf.phase.Phase;
import org.apache.cxf.ws.policy.AssertionInfo;
import org.apache.cxf.ws.policy.AssertionInfoMap;
import org.apache.cxf.ws.policy.PolicyAssertion;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java
index fb022f8..c3e4c0b 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java
@@ -38,9 +38,9 @@ import org.apache.cxf.ws.rm.v200702.ObjectFactory;
import org.apache.cxf.ws.rm.v200702.SequenceAcknowledgement;
import org.apache.cxf.ws.rm.v200702.SequenceAcknowledgement.AcknowledgementRange;
import org.apache.cxf.ws.rm.v200702.SequenceType;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationTest.java
index 60a962f..6fff96e 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationTest.java
@@ -28,9 +28,9 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.ws.rm.persistence.RMStore;
import org.apache.cxf.ws.rm.v200702.Identifier;
import org.apache.cxf.ws.rm.v200702.SequenceType;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
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 b05d74e..399abd0 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
@@ -50,9 +50,9 @@ import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.ws.rm.v200702.Identifier;
import org.apache.cxf.ws.rm.v200702.SequenceAcknowledgement;
import org.apache.cxf.wsdl.WSDLConstants;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java
index 28cff0d..019bda8 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java
@@ -52,9 +52,9 @@ import org.apache.cxf.ws.addressing.WSAddressingFeature.WSAddressingFeatureAppli
import org.apache.cxf.ws.rm.manager.SourcePolicyType;
import org.apache.cxf.ws.rm.v200702.Identifier;
import org.apache.cxf.ws.rm.v200702.OfferType;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMContextUtilsTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMContextUtilsTest.java
index 1162cfc..e1fdbf6 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMContextUtilsTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMContextUtilsTest.java
@@ -23,6 +23,7 @@ import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.Message;
import org.apache.cxf.ws.addressing.AddressingProperties;
import org.apache.cxf.ws.addressing.JAXWSAConstants;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMEndpointTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMEndpointTest.java
index e84fdc0..1945285 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMEndpointTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMEndpointTest.java
@@ -47,9 +47,9 @@ import org.apache.cxf.ws.addressing.Names;
import org.apache.cxf.ws.policy.PolicyEngine;
import org.apache.cxf.ws.policy.PolicyEngineImpl;
import org.apache.cxf.ws.rm.v200702.Identifier;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java
index dcac179..48ca1a4 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java
@@ -45,9 +45,9 @@ import org.apache.cxf.ws.rm.manager.RetryPolicyType;
import org.apache.cxf.ws.rm.v200702.CreateSequenceResponseType;
import org.apache.cxf.ws.rm.v200702.Identifier;
import org.apache.cxf.ws.rm.v200702.SequenceAcknowledgement;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
index 1ee2eff..5b8b12d 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
@@ -63,10 +63,10 @@ import org.apache.cxf.ws.rm.persistence.RMMessage;
import org.apache.cxf.ws.rm.persistence.RMStore;
import org.apache.cxf.ws.rm.v200702.CreateSequenceResponseType;
import org.apache.cxf.ws.rm.v200702.Identifier;
+
import org.easymock.Capture;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java
index f56da5c..9b29afd 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java
@@ -32,9 +32,9 @@ import org.apache.cxf.ws.addressing.JAXWSAConstants;
import org.apache.cxf.ws.addressing.Names;
import org.apache.cxf.ws.addressing.VersionTransformer.Names200408;
import org.apache.cxf.ws.rm.v200702.Identifier;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java
index c41944d..e497da7 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java
@@ -26,6 +26,7 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.service.model.ServiceInfo;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java
index ef631bb..4df15c9 100755
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java
@@ -45,9 +45,9 @@ import org.apache.cxf.ws.rm.v200502.OfferType;
import org.apache.cxf.ws.rm.v200502.TerminateSequenceType;
import org.apache.cxf.ws.rm.v200702.CloseSequenceType;
import org.apache.cxf.ws.rm.v200702.TerminateSequenceResponseType;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java
index d8817b2..f8c33ca 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java
@@ -30,6 +30,7 @@ import org.apache.cxf.ws.rm.v200702.Expires;
import org.apache.cxf.ws.rm.v200702.Identifier;
import org.apache.cxf.ws.rm.v200702.ObjectFactory;
import org.apache.cxf.ws.rm.v200702.SequenceAcknowledgement;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java
index c66e67a..1583e68 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java
@@ -24,6 +24,7 @@ import java.sql.SQLException;
import org.apache.cxf.Bus;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.ws.rm.RMManager;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTest.java
index 5ade381..083b3f1 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTest.java
@@ -21,13 +21,14 @@ package org.apache.cxf.ws.rm.persistence.jdbc;
import java.sql.Connection;
import java.sql.SQLException;
+
import org.apache.cxf.ws.rm.ProtocolVariation;
import org.apache.cxf.ws.rm.RMUtils;
import org.apache.cxf.ws.rm.SourceSequence;
import org.apache.cxf.ws.rm.persistence.RMStoreException;
import org.apache.cxf.ws.rm.v200702.Identifier;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTestBase.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTestBase.java
index b057983..cb415ad 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTestBase.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTestBase.java
@@ -41,9 +41,9 @@ import org.apache.cxf.ws.rm.persistence.RMMessage;
import org.apache.cxf.ws.rm.persistence.RMStoreException;
import org.apache.cxf.ws.rm.v200702.Identifier;
import org.apache.cxf.ws.rm.v200702.SequenceAcknowledgement;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTwoSchemasTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTwoSchemasTest.java
index 06c64b4..723cc32 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTwoSchemasTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTwoSchemasTest.java
@@ -24,9 +24,9 @@ import java.text.MessageFormat;
import org.apache.cxf.ws.rm.ProtocolVariation;
import org.apache.cxf.ws.rm.SourceSequence;
import org.apache.cxf.ws.rm.v200702.Identifier;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java
index 86acd61..195ab00 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/policy/PolicyUtilsTest.java
@@ -33,9 +33,9 @@ import org.apache.cxf.ws.rmp.v200502.RMAssertion.AcknowledgementInterval;
import org.apache.cxf.ws.rmp.v200502.RMAssertion.BaseRetransmissionInterval;
import org.apache.cxf.ws.rmp.v200502.RMAssertion.ExponentialBackoff;
import org.apache.cxf.ws.rmp.v200502.RMAssertion.InactivityTimeout;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java
index 46db7d5..acb6507 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java
@@ -40,9 +40,9 @@ import org.apache.cxf.ws.rm.manager.SourcePolicyType;
import org.apache.cxf.ws.rm.persistence.RMStore;
import org.apache.cxf.ws.rm.v200702.Identifier;
import org.apache.cxf.ws.rm.v200702.SequenceType;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/SoapFaultFactoryTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/SoapFaultFactoryTest.java
index cbf55b30..730f3e2 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/SoapFaultFactoryTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/SoapFaultFactoryTest.java
@@ -37,9 +37,9 @@ import org.apache.cxf.ws.rm.SequenceFault;
import org.apache.cxf.ws.rm.v200702.Identifier;
import org.apache.cxf.ws.rm.v200702.SequenceAcknowledgement;
import org.apache.cxf.ws.rm.v200702.SequenceFaultType;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheUtils.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheUtils.java
index 2133044..37cf33d 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheUtils.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheUtils.java
@@ -22,7 +22,6 @@ package org.apache.cxf.ws.security.cache;
import java.net.URL;
import net.sf.ehcache.CacheManager;
-
import org.apache.cxf.Bus;
import org.apache.wss4j.common.cache.EHCacheManagerHolder;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSInvoker.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSInvoker.java
index 7f56164..874eb4a 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSInvoker.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSInvoker.java
@@ -31,6 +31,7 @@ import javax.xml.transform.dom.DOMSource;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.interceptor.Fault;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
index 648706f..79a1a21 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
@@ -30,6 +30,7 @@ import java.util.Map;
import javax.xml.namespace.QName;
import org.w3c.dom.Element;
+
import org.apache.cxf.binding.soap.SoapBindingConstants;
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.binding.soap.interceptor.SoapActionInInterceptor;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java
index 435de10..ba04e4b 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java
@@ -30,7 +30,6 @@ import net.sf.ehcache.Ehcache;
import net.sf.ehcache.Element;
import net.sf.ehcache.Status;
import net.sf.ehcache.config.CacheConfiguration;
-
import org.apache.cxf.Bus;
import org.apache.cxf.buslifecycle.BusLifeCycleListener;
import org.apache.cxf.buslifecycle.BusLifeCycleManager;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/SecurityToken.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/SecurityToken.java
index 7fa4a4c..0da6d98 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/SecurityToken.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/SecurityToken.java
@@ -35,6 +35,7 @@ import java.util.Map;
import javax.xml.stream.XMLStreamException;
import org.w3c.dom.Element;
+
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.security.SecurityContext;
import org.apache.cxf.staxutils.StaxUtils;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
index a1ef079..1cf5c39 100755
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
@@ -53,11 +53,11 @@ import javax.xml.transform.dom.DOMSource;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
import org.apache.cxf.binding.soap.SoapBindingConstants;
import org.apache.cxf.binding.soap.model.SoapOperationInfo;
-//import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.ModCountCopyOnWriteArrayList;
import org.apache.cxf.common.util.StringUtils;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSLoginModule.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSLoginModule.java
index c438593..7cf524a 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSLoginModule.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSLoginModule.java
@@ -41,6 +41,7 @@ import javax.security.auth.login.LoginException;
import javax.security.auth.spi.LoginModule;
import org.w3c.dom.Document;
+
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
import org.apache.cxf.BusFactory;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSStaxTokenValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSStaxTokenValidator.java
index 1fde85a..a630530 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSStaxTokenValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSStaxTokenValidator.java
@@ -20,6 +20,7 @@ package org.apache.cxf.ws.security.trust;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.commons.codec.binary.Base64;
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.helpers.DOMUtils;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
index 6495067..1aebced 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
@@ -26,6 +26,7 @@ import javax.xml.bind.JAXBException;
import javax.xml.namespace.QName;
import org.w3c.dom.Element;
+
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
import org.apache.cxf.binding.BindingFactory;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/ReceivedTokenCallbackHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/ReceivedTokenCallbackHandler.java
index 3ef5cfe..05d4bb9 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/ReceivedTokenCallbackHandler.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/ReceivedTokenCallbackHandler.java
@@ -28,6 +28,7 @@ import java.util.Map;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
+
import org.w3c.dom.Element;
import org.apache.cxf.binding.soap.SoapMessage;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/WSSUsernameCallbackHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/WSSUsernameCallbackHandler.java
index 884e8d0..2ea8b81 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/WSSUsernameCallbackHandler.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/WSSUsernameCallbackHandler.java
@@ -27,6 +27,7 @@ import javax.security.auth.callback.UnsupportedCallbackException;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
+
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.message.Message;
import org.apache.cxf.rt.security.utils.SecurityUtils;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/BinarySecurityTokenInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/BinarySecurityTokenInterceptor.java
index 3664da1..0928307 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/BinarySecurityTokenInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/BinarySecurityTokenInterceptor.java
@@ -25,6 +25,7 @@ import java.util.Collections;
import java.util.List;
import org.w3c.dom.Element;
+
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.headers.Header;
import org.apache.cxf.helpers.CastUtils;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageUtil.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageUtil.java
index d91df20..6cbbf1a 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageUtil.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageUtil.java
@@ -33,6 +33,7 @@ import javax.xml.xpath.XPathFactory;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
+
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.helpers.MapNamespaceContext;
import org.apache.wss4j.common.WSS4JConstants;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
index b821ff6..df67d25 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
@@ -30,6 +30,7 @@ import javax.xml.soap.SOAPException;
import javax.xml.stream.XMLStreamException;
import org.w3c.dom.Element;
+
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.interceptor.Fault;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
index 3400625..a0483c3 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
@@ -28,6 +28,7 @@ import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
import org.w3c.dom.Element;
+
import org.apache.cxf.binding.soap.SoapFault;
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/SamlTokenInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/SamlTokenInterceptor.java
index dd8506e..289d7ae 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/SamlTokenInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/SamlTokenInterceptor.java
@@ -32,6 +32,7 @@ import javax.security.auth.callback.CallbackHandler;
import javax.xml.namespace.QName;
import org.w3c.dom.Element;
+
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
import org.apache.cxf.common.util.StringUtils;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxSerializer.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxSerializer.java
index 2a9aafa..65a65d8 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxSerializer.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxSerializer.java
@@ -44,6 +44,7 @@ import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
+
import org.xml.sax.InputSource;
import org.apache.cxf.binding.soap.saaj.SAAJStreamWriter;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java
index 36f8f60..64fd8b8 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java
@@ -31,6 +31,7 @@ import javax.security.auth.Subject;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.headers.Header;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
index 41e8edc..9b47702 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
@@ -41,6 +41,7 @@ import javax.xml.transform.dom.DOMSource;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+
import org.apache.cxf.attachment.AttachmentUtil;
import org.apache.cxf.binding.soap.SoapFault;
import org.apache.cxf.binding.soap.SoapMessage;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
index ee10d88..d7ffc7b 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
@@ -30,6 +30,7 @@ import java.util.logging.Logger;
import javax.xml.soap.SOAPMessage;
import org.w3c.dom.Document;
+
import org.apache.cxf.attachment.AttachmentUtil;
import org.apache.cxf.binding.soap.SoapFault;
import org.apache.cxf.binding.soap.SoapMessage;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
index 96702dd..8d93ddd 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
@@ -54,6 +54,7 @@ import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+
import org.apache.cxf.attachment.AttachmentUtil;
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.binding.soap.saaj.SAAJUtils;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
index 824cc59..11624cb 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
@@ -34,6 +34,7 @@ import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
import org.w3c.dom.Element;
+
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.helpers.CastUtils;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java
index 1f12598..c4a6047 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java
@@ -32,6 +32,7 @@ import javax.xml.soap.SOAPMessage;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.helpers.CastUtils;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java
index 776c2ec..c01efa9 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java
@@ -30,6 +30,7 @@ import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
import org.w3c.dom.Element;
+
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.interceptor.Fault;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractBindingPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractBindingPolicyValidator.java
index d6e71ba..7d9a4a5 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractBindingPolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractBindingPolicyValidator.java
@@ -26,6 +26,7 @@ import java.util.List;
import javax.xml.namespace.QName;
import org.w3c.dom.Element;
+
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.message.Message;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java
index 0b5887a..5aa7a7b 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java
@@ -39,6 +39,7 @@ import javax.xml.xpath.XPathFactory;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.helpers.DOMUtils;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/PolicyValidatorParameters.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/PolicyValidatorParameters.java
index 3a10ee3..e7895f1 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/PolicyValidatorParameters.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/PolicyValidatorParameters.java
@@ -23,6 +23,7 @@ import java.util.Collection;
import java.util.List;
import org.w3c.dom.Element;
+
import org.apache.cxf.message.Message;
import org.apache.cxf.ws.policy.AssertionInfoMap;
import org.apache.wss4j.dom.WSDataRef;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecuredElementsPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecuredElementsPolicyValidator.java
index b0ad812..d1ace10 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecuredElementsPolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecuredElementsPolicyValidator.java
@@ -29,6 +29,7 @@ import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathFactory;
import org.w3c.dom.Element;
+
import org.apache.cxf.helpers.MapNamespaceContext;
import org.apache.cxf.ws.policy.AssertionInfo;
import org.apache.cxf.ws.security.wss4j.CryptoCoverageUtil;
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/cache/EHCacheUtilsTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/cache/EHCacheUtilsTest.java
index 9751d62..fc01a51 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/cache/EHCacheUtilsTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/cache/EHCacheUtilsTest.java
@@ -23,10 +23,10 @@ import net.sf.ehcache.CacheManager;
import net.sf.ehcache.Status;
import net.sf.ehcache.config.Configuration;
import net.sf.ehcache.config.ConfigurationFactory;
-
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.wss4j.common.cache.EHCacheManagerHolder;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/STSClientTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/STSClientTest.java
index 7aa9a85..b442d4c 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/STSClientTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/STSClientTest.java
@@ -37,6 +37,7 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.common.jaxb.JAXBContextCache;
@@ -48,6 +49,7 @@ import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.ws.security.trust.STSClient;
import org.apache.cxf.wsdl.WSDLManager;
import org.apache.cxf.wsdl11.WSDLServiceFactory;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStoreTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStoreTest.java
index 8494fce..3544892 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStoreTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStoreTest.java
@@ -23,6 +23,7 @@ import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.ws.security.SecurityConstants;
+
import org.junit.BeforeClass;
public class EHCacheTokenStoreTest extends org.junit.Assert {
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/tokenstore/MemoryTokenStoreTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/tokenstore/MemoryTokenStoreTest.java
index 2edfd87..562a68a 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/tokenstore/MemoryTokenStoreTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/tokenstore/MemoryTokenStoreTest.java
@@ -23,6 +23,7 @@ import java.time.Instant;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.ws.security.SecurityConstants;
+
import org.junit.BeforeClass;
public class MemoryTokenStoreTest extends org.junit.Assert {
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java
index 475e73a..eb12008 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java
@@ -28,6 +28,7 @@ import java.util.SortedSet;
import java.util.TreeSet;
import org.w3c.dom.Document;
+
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.binding.soap.interceptor.MustUnderstandInterceptor;
import org.apache.cxf.binding.soap.saaj.SAAJInInterceptor;
@@ -41,6 +42,7 @@ import org.apache.cxf.ws.security.wss4j.CryptoCoverageChecker.XPathExpression;
import org.apache.cxf.ws.security.wss4j.CryptoCoverageUtil.CoverageScope;
import org.apache.cxf.ws.security.wss4j.CryptoCoverageUtil.CoverageType;
import org.apache.wss4j.common.ConfigurationConstants;
+
import org.junit.Test;
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CustomPolicyAlgorithmsTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CustomPolicyAlgorithmsTest.java
index c30256f..ef7eb63 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CustomPolicyAlgorithmsTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CustomPolicyAlgorithmsTest.java
@@ -23,6 +23,7 @@ import org.apache.cxf.ws.policy.AssertionInfoMap;
import org.apache.neethi.Policy;
import org.apache.wss4j.policy.SP12Constants;
import org.apache.wss4j.policy.model.AsymmetricBinding;
+
import org.junit.Test;
public class CustomPolicyAlgorithmsTest extends AbstractPolicySecurityTest {
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxEncryptionIdentifierTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxEncryptionIdentifierTest.java
index 096f9c4..8f47a4c 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxEncryptionIdentifierTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxEncryptionIdentifierTest.java
@@ -34,6 +34,7 @@ import org.apache.cxf.transport.local.LocalTransportFactory;
import org.apache.wss4j.common.ConfigurationConstants;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.stax.ext.WSSSecurityProperties;
+
import org.junit.Test;
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxSignatureIdentifierTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxSignatureIdentifierTest.java
index 0b59b2b..bb5cf78 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxSignatureIdentifierTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxSignatureIdentifierTest.java
@@ -35,6 +35,7 @@ import org.apache.wss4j.common.ConfigurationConstants;
import org.apache.wss4j.common.bsp.BSPRule;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.stax.ext.WSSSecurityProperties;
+
import org.junit.Test;
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DefaultCryptoCoverageCheckerTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DefaultCryptoCoverageCheckerTest.java
index c88395a..0b856a0 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DefaultCryptoCoverageCheckerTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DefaultCryptoCoverageCheckerTest.java
@@ -33,6 +33,7 @@ import org.apache.cxf.ws.security.wss4j.CryptoCoverageChecker.XPathExpression;
import org.apache.cxf.ws.security.wss4j.CryptoCoverageUtil.CoverageScope;
import org.apache.cxf.ws.security.wss4j.CryptoCoverageUtil.CoverageType;
import org.apache.wss4j.common.ConfigurationConstants;
+
import org.junit.Test;
/**
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 5d107fb..fb74348 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
@@ -38,6 +38,7 @@ import org.apache.cxf.ws.security.wss4j.policyvalidators.PolicyValidatorParamete
import org.apache.cxf.ws.security.wss4j.policyvalidators.SecurityPolicyValidator;
import org.apache.neethi.Policy;
import org.apache.wss4j.policy.SP12Constants;
+
import org.junit.Test;
/**
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SecurityActionTokenTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SecurityActionTokenTest.java
index 073de42..e4c3444 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SecurityActionTokenTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SecurityActionTokenTest.java
@@ -39,6 +39,7 @@ import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.dom.handler.HandlerAction;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.dom.handler.WSHandlerResult;
+
import org.junit.Test;
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SecurityVerificationOutTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SecurityVerificationOutTest.java
index a1028ae..977610e 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SecurityVerificationOutTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SecurityVerificationOutTest.java
@@ -30,6 +30,7 @@ import org.apache.cxf.ws.policy.AssertionInfoMap;
import org.apache.cxf.ws.policy.PolicyException;
import org.apache.cxf.ws.security.policy.interceptors.SecurityVerificationOutInterceptor;
import org.apache.neethi.Policy;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Before;
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/UserNameTokenAuthorizationTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/UserNameTokenAuthorizationTest.java
index 6db3d82..a49456e 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/UserNameTokenAuthorizationTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/UserNameTokenAuthorizationTest.java
@@ -37,6 +37,7 @@ import org.apache.cxf.transport.local.LocalConduit;
import org.apache.cxf.transport.local.LocalTransportFactory;
import org.apache.wss4j.common.ConfigurationConstants;
import org.apache.wss4j.common.WSS4JConstants;
+
import org.junit.Test;
public class UserNameTokenAuthorizationTest extends AbstractSecurityTest {
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java
index c297388..48df80c 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java
@@ -40,6 +40,7 @@ import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.wss4j.common.ConfigurationConstants;
import org.apache.wss4j.common.WSS4JConstants;
+
import org.junit.Test;
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
index 3527cf4..37510c4 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
@@ -59,6 +59,7 @@ import org.apache.wss4j.dom.WSDataRef;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.dom.handler.WSHandlerResult;
+
import org.junit.Test;
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 852df86..4f7d0e3 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
@@ -36,6 +36,7 @@ import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.action.UsernameTokenAction;
import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.handler.WSHandler;
+
import org.junit.Test;
public class WSS4JOutInterceptorTest extends AbstractSecurityTest {
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/DOMToStaxSamlTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/DOMToStaxSamlTest.java
index 3afb585..8a3601a 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/DOMToStaxSamlTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/DOMToStaxSamlTest.java
@@ -42,6 +42,7 @@ import org.apache.wss4j.common.saml.builder.SAML1Constants;
import org.apache.wss4j.common.saml.builder.SAML2Constants;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.stax.ext.WSSSecurityProperties;
+
import org.junit.Test;
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/PolicyBasedSamlTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/PolicyBasedSamlTest.java
index f2f60b2..eb69724 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/PolicyBasedSamlTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/PolicyBasedSamlTest.java
@@ -32,6 +32,7 @@ import org.apache.cxf.ws.security.wss4j.CryptoCoverageUtil.CoverageType;
import org.apache.cxf.ws.security.wss4j.PolicyBasedWSS4JInInterceptor;
import org.apache.wss4j.dom.validate.SamlAssertionValidator;
import org.apache.wss4j.policy.SP12Constants;
+
import org.junit.Test;
/**
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java
index aa6d0a0..3945df6 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java
@@ -58,6 +58,7 @@ import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.dom.handler.WSHandlerResult;
+
import org.junit.Test;
/**
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java
index 4d35b94..df1d7b0 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java
@@ -49,6 +49,7 @@ import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.stax.ext.WSSConstants;
import org.apache.wss4j.stax.ext.WSSSecurityProperties;
import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants;
+
import org.junit.Test;
diff --git a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/FragmentDialect.java b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/FragmentDialect.java
index 2839f54..6cdce45 100644
--- a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/FragmentDialect.java
+++ b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/FragmentDialect.java
@@ -28,11 +28,13 @@ import java.util.regex.Pattern;
import javax.annotation.Resource;
import javax.xml.bind.JAXBElement;
import javax.xml.ws.WebServiceContext;
+
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+
import org.apache.cxf.binding.soap.SoapFault;
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.binding.soap.SoapVersion;
diff --git a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/faults/FragmentFault.java b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/faults/FragmentFault.java
index 632fa12..cc39fd9 100644
--- a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/faults/FragmentFault.java
+++ b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/faults/FragmentFault.java
@@ -19,8 +19,10 @@
package org.apache.cxf.ws.transfer.dialect.fragment.faults;
import javax.xml.namespace.QName;
+
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.binding.soap.SoapFault;
import org.apache.cxf.helpers.DOMUtils;
diff --git a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/faults/InvalidExpression.java b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/faults/InvalidExpression.java
index 23da1bc..2d59c48 100644
--- a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/faults/InvalidExpression.java
+++ b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/faults/InvalidExpression.java
@@ -19,6 +19,7 @@
package org.apache.cxf.ws.transfer.dialect.fragment.faults;
import javax.xml.namespace.QName;
+
import org.apache.cxf.ws.transfer.dialect.fragment.FragmentDialectConstants;
/**
diff --git a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/faults/UnsupportedLanguage.java b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/faults/UnsupportedLanguage.java
index bb13b4c..d4168ee 100644
--- a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/faults/UnsupportedLanguage.java
+++ b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/faults/UnsupportedLanguage.java
@@ -19,6 +19,7 @@
package org.apache.cxf.ws.transfer.dialect.fragment.faults;
import javax.xml.namespace.QName;
+
import org.apache.cxf.ws.transfer.dialect.fragment.FragmentDialectConstants;
/**
diff --git a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/faults/UnsupportedMode.java b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/faults/UnsupportedMode.java
index f38b912..c7ddc0e 100644
--- a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/faults/UnsupportedMode.java
+++ b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/faults/UnsupportedMode.java
@@ -19,6 +19,7 @@
package org.apache.cxf.ws.transfer.dialect.fragment.faults;
import javax.xml.namespace.QName;
+
import org.apache.cxf.ws.transfer.dialect.fragment.FragmentDialectConstants;
/**
diff --git a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/language/FragmentDialectLanguageQName.java b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/language/FragmentDialectLanguageQName.java
index 494b7c2..511a75c 100644
--- a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/language/FragmentDialectLanguageQName.java
+++ b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/language/FragmentDialectLanguageQName.java
@@ -21,10 +21,13 @@ package org.apache.cxf.ws.transfer.dialect.fragment.language;
import java.util.Iterator;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+
import javax.xml.namespace.NamespaceContext;
+
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+
import org.apache.cxf.helpers.XPathUtils;
import org.apache.cxf.ws.transfer.Representation;
import org.apache.cxf.ws.transfer.dialect.fragment.ExpressionType;
diff --git a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/language/FragmentDialectLanguageXPath10.java b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/language/FragmentDialectLanguageXPath10.java
index ad7271a..51c4da4 100644
--- a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/language/FragmentDialectLanguageXPath10.java
+++ b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/language/FragmentDialectLanguageXPath10.java
@@ -19,14 +19,17 @@
package org.apache.cxf.ws.transfer.dialect.fragment.language;
import java.util.Iterator;
+
import javax.xml.namespace.NamespaceContext;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathException;
import javax.xml.xpath.XPathFactory;
+
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.ws.transfer.Representation;
import org.apache.cxf.ws.transfer.dialect.fragment.ExpressionType;
diff --git a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/manager/MemoryResourceManager.java b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/manager/MemoryResourceManager.java
index 9aafa7f..09c95ec 100644
--- a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/manager/MemoryResourceManager.java
+++ b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/manager/MemoryResourceManager.java
@@ -33,6 +33,7 @@ import javax.xml.ws.WebServiceContext;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.binding.soap.SoapFault;
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.binding.soap.SoapVersion;
diff --git a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/resource/Resource.java b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/resource/Resource.java
index 3280e39..fc01ea7 100644
--- a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/resource/Resource.java
+++ b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/resource/Resource.java
@@ -26,6 +26,7 @@ import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
import javax.xml.ws.Action;
import javax.xml.ws.soap.Addressing;
+
import org.apache.cxf.ws.transfer.Delete;
import org.apache.cxf.ws.transfer.DeleteResponse;
import org.apache.cxf.ws.transfer.Get;
diff --git a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/resource/ResourceLocal.java b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/resource/ResourceLocal.java
index 47df2e3..471b3ea 100644
--- a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/resource/ResourceLocal.java
+++ b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/resource/ResourceLocal.java
@@ -23,7 +23,9 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+
import javax.xml.ws.WebServiceContext;
+
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.ws.addressing.AddressingProperties;
import org.apache.cxf.ws.addressing.JAXWSAConstants;
diff --git a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/resourcefactory/ResourceFactory.java b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/resourcefactory/ResourceFactory.java
index da28d43..20ff0ae 100644
--- a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/resourcefactory/ResourceFactory.java
+++ b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/resourcefactory/ResourceFactory.java
@@ -27,6 +27,7 @@ import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
import javax.xml.ws.Action;
import javax.xml.ws.soap.Addressing;
+
import org.apache.cxf.ws.transfer.Create;
import org.apache.cxf.ws.transfer.CreateResponse;
import org.apache.cxf.ws.transfer.shared.TransferConstants;
diff --git a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/resourcefactory/ResourceFactoryImpl.java b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/resourcefactory/ResourceFactoryImpl.java
index dc0163b..83db8d9 100644
--- a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/resourcefactory/ResourceFactoryImpl.java
+++ b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/resourcefactory/ResourceFactoryImpl.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.ws.addressing.AttributedURIType;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
diff --git a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/shared/faults/InvalidRepresentation.java b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/shared/faults/InvalidRepresentation.java
index 21ea6c3..81abfba 100644
--- a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/shared/faults/InvalidRepresentation.java
+++ b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/shared/faults/InvalidRepresentation.java
@@ -20,6 +20,7 @@
package org.apache.cxf.ws.transfer.shared.faults;
import javax.xml.namespace.QName;
+
import org.apache.cxf.ws.transfer.shared.TransferConstants;
/**
diff --git a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/shared/faults/PutDenied.java b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/shared/faults/PutDenied.java
index b0c6ad6..116a1c5 100644
--- a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/shared/faults/PutDenied.java
+++ b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/shared/faults/PutDenied.java
@@ -20,6 +20,7 @@
package org.apache.cxf.ws.transfer.shared.faults;
import javax.xml.namespace.QName;
+
import org.apache.cxf.ws.transfer.shared.TransferConstants;
/**
diff --git a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/shared/faults/UnknownDialect.java b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/shared/faults/UnknownDialect.java
index 5c9f9ea..1715085 100644
--- a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/shared/faults/UnknownDialect.java
+++ b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/shared/faults/UnknownDialect.java
@@ -20,6 +20,7 @@
package org.apache.cxf.ws.transfer.shared.faults;
import javax.xml.namespace.QName;
+
import org.apache.cxf.ws.transfer.shared.TransferConstants;
/**
diff --git a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/shared/faults/UnknownResource.java b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/shared/faults/UnknownResource.java
index 1b3c61d..8aa1a0b 100644
--- a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/shared/faults/UnknownResource.java
+++ b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/shared/faults/UnknownResource.java
@@ -20,6 +20,7 @@
package org.apache.cxf.ws.transfer.shared.faults;
import javax.xml.namespace.QName;
+
import org.apache.cxf.ws.transfer.shared.TransferConstants;
/**
diff --git a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/shared/faults/WSTransferFault.java b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/shared/faults/WSTransferFault.java
index 2e6fce7..7d1f167 100644
--- a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/shared/faults/WSTransferFault.java
+++ b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/shared/faults/WSTransferFault.java
@@ -20,8 +20,10 @@
package org.apache.cxf.ws.transfer.shared.faults;
import javax.xml.namespace.QName;
+
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.binding.soap.SoapFault;
import org.apache.cxf.helpers.DOMUtils;
diff --git a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/validationtransformation/ValidAndTransformHelper.java b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/validationtransformation/ValidAndTransformHelper.java
index d646d03..4aef6c9 100644
--- a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/validationtransformation/ValidAndTransformHelper.java
+++ b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/validationtransformation/ValidAndTransformHelper.java
@@ -20,6 +20,7 @@
package org.apache.cxf.ws.transfer.validationtransformation;
import java.util.List;
+
import org.apache.cxf.ws.transfer.Representation;
import org.apache.cxf.ws.transfer.shared.faults.InvalidRepresentation;
diff --git a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/validationtransformation/XSDResourceTypeIdentifier.java b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/validationtransformation/XSDResourceTypeIdentifier.java
index a6b5505..d6610c9 100644
--- a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/validationtransformation/XSDResourceTypeIdentifier.java
+++ b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/validationtransformation/XSDResourceTypeIdentifier.java
@@ -32,7 +32,9 @@ import javax.xml.validation.Validator;
import javax.xml.ws.WebServiceContext;
import org.w3c.dom.Node;
+
import org.xml.sax.SAXException;
+
import org.apache.cxf.binding.soap.SoapFault;
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.binding.soap.SoapVersion;
diff --git a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/validationtransformation/XSDResourceValidator.java b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/validationtransformation/XSDResourceValidator.java
index f5da781..7a597f9 100644
--- a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/validationtransformation/XSDResourceValidator.java
+++ b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/validationtransformation/XSDResourceValidator.java
@@ -32,7 +32,9 @@ import javax.xml.validation.Validator;
import javax.xml.ws.WebServiceContext;
import org.w3c.dom.Node;
+
import org.xml.sax.SAXException;
+
import org.apache.cxf.binding.soap.SoapFault;
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.binding.soap.SoapVersion;
diff --git a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/validationtransformation/XSLTResourceTransformer.java b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/validationtransformation/XSLTResourceTransformer.java
index 0538dd3..6094578 100644
--- a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/validationtransformation/XSLTResourceTransformer.java
+++ b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/validationtransformation/XSLTResourceTransformer.java
@@ -30,6 +30,7 @@ import javax.xml.ws.WebServiceContext;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
+
import org.apache.cxf.binding.soap.SoapFault;
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.binding.soap.SoapVersion;
diff --git a/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/FragmentGetQNameTest.java b/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/FragmentGetQNameTest.java
index d2151fa..18b42be 100644
--- a/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/FragmentGetQNameTest.java
+++ b/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/FragmentGetQNameTest.java
@@ -24,6 +24,7 @@ import javax.xml.stream.XMLStreamException;
import javax.xml.ws.soap.SOAPFaultException;
import org.w3c.dom.Element;
+
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.ws.addressing.ReferenceParametersType;
import org.apache.cxf.ws.transfer.Get;
@@ -35,6 +36,7 @@ import org.apache.cxf.ws.transfer.dialect.fragment.ValueType;
import org.apache.cxf.ws.transfer.manager.MemoryResourceManager;
import org.apache.cxf.ws.transfer.manager.ResourceManager;
import org.apache.cxf.ws.transfer.resource.Resource;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/FragmentGetXPath10Test.java b/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/FragmentGetXPath10Test.java
index caa23f0..8dc7282 100644
--- a/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/FragmentGetXPath10Test.java
+++ b/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/FragmentGetXPath10Test.java
@@ -22,6 +22,7 @@ import javax.xml.bind.JAXBElement;
import javax.xml.stream.XMLStreamException;
import org.w3c.dom.Element;
+
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.ws.addressing.ReferenceParametersType;
import org.apache.cxf.ws.transfer.Get;
@@ -33,6 +34,7 @@ import org.apache.cxf.ws.transfer.dialect.fragment.ValueType;
import org.apache.cxf.ws.transfer.manager.MemoryResourceManager;
import org.apache.cxf.ws.transfer.manager.ResourceManager;
import org.apache.cxf.ws.transfer.resource.Resource;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/FragmentPutAddTest.java b/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/FragmentPutAddTest.java
index 5587cff..8e9279b 100644
--- a/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/FragmentPutAddTest.java
+++ b/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/FragmentPutAddTest.java
@@ -23,6 +23,7 @@ import javax.xml.ws.soap.SOAPFaultException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.ws.addressing.ReferenceParametersType;
@@ -36,6 +37,7 @@ import org.apache.cxf.ws.transfer.dialect.fragment.ValueType;
import org.apache.cxf.ws.transfer.manager.MemoryResourceManager;
import org.apache.cxf.ws.transfer.manager.ResourceManager;
import org.apache.cxf.ws.transfer.resource.Resource;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/FragmentPutInsertAfterTest.java b/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/FragmentPutInsertAfterTest.java
index 2988786..3985751 100644
--- a/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/FragmentPutInsertAfterTest.java
+++ b/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/FragmentPutInsertAfterTest.java
@@ -22,6 +22,7 @@ import javax.xml.stream.XMLStreamException;
import javax.xml.ws.soap.SOAPFaultException;
import org.w3c.dom.Element;
+
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.ws.addressing.ReferenceParametersType;
@@ -35,6 +36,7 @@ import org.apache.cxf.ws.transfer.dialect.fragment.ValueType;
import org.apache.cxf.ws.transfer.manager.MemoryResourceManager;
import org.apache.cxf.ws.transfer.manager.ResourceManager;
import org.apache.cxf.ws.transfer.resource.Resource;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/FragmentPutInsertBeforeTest.java b/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/FragmentPutInsertBeforeTest.java
index 4b4de4b..14b946d 100644
--- a/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/FragmentPutInsertBeforeTest.java
+++ b/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/FragmentPutInsertBeforeTest.java
@@ -22,6 +22,7 @@ import javax.xml.stream.XMLStreamException;
import javax.xml.ws.soap.SOAPFaultException;
import org.w3c.dom.Element;
+
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.ws.addressing.ReferenceParametersType;
@@ -35,6 +36,7 @@ import org.apache.cxf.ws.transfer.dialect.fragment.ValueType;
import org.apache.cxf.ws.transfer.manager.MemoryResourceManager;
import org.apache.cxf.ws.transfer.manager.ResourceManager;
import org.apache.cxf.ws.transfer.resource.Resource;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/FragmentPutRemoveTest.java b/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/FragmentPutRemoveTest.java
index b18c75b..488e7a1 100644
--- a/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/FragmentPutRemoveTest.java
+++ b/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/FragmentPutRemoveTest.java
@@ -21,6 +21,7 @@ package org.apache.cxf.ws.transfer.integration;
import javax.xml.stream.XMLStreamException;
import org.w3c.dom.Element;
+
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.ws.addressing.ReferenceParametersType;
import org.apache.cxf.ws.transfer.Put;
@@ -31,6 +32,7 @@ import org.apache.cxf.ws.transfer.dialect.fragment.FragmentDialectConstants;
import org.apache.cxf.ws.transfer.manager.MemoryResourceManager;
import org.apache.cxf.ws.transfer.manager.ResourceManager;
import org.apache.cxf.ws.transfer.resource.Resource;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/FragmentPutReplaceTest.java b/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/FragmentPutReplaceTest.java
index e7375ab..e93e9d9 100644
--- a/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/FragmentPutReplaceTest.java
+++ b/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/FragmentPutReplaceTest.java
@@ -22,6 +22,7 @@ import javax.xml.stream.XMLStreamException;
import javax.xml.ws.soap.SOAPFaultException;
import org.w3c.dom.Element;
+
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.ws.addressing.ReferenceParametersType;
@@ -35,6 +36,7 @@ import org.apache.cxf.ws.transfer.dialect.fragment.ValueType;
import org.apache.cxf.ws.transfer.manager.MemoryResourceManager;
import org.apache.cxf.ws.transfer.manager.ResourceManager;
import org.apache.cxf.ws.transfer.resource.Resource;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/IntegrationBaseTest.java b/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/IntegrationBaseTest.java
index d9a3595..7b2cc21 100644
--- a/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/IntegrationBaseTest.java
+++ b/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/IntegrationBaseTest.java
@@ -30,6 +30,7 @@ import javax.xml.stream.XMLStreamException;
import javax.xml.ws.BindingProvider;
import org.w3c.dom.Document;
+
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.endpoint.Server;
@@ -51,6 +52,7 @@ import org.apache.cxf.ws.transfer.resourcefactory.ResourceFactory;
import org.apache.cxf.ws.transfer.resourcefactory.ResourceFactoryImpl;
import org.apache.cxf.ws.transfer.resourcefactory.resolver.SimpleResourceResolver;
import org.apache.cxf.ws.transfer.shared.TransferConstants;
+
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
diff --git a/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/ResourceFactoryTest.java b/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/ResourceFactoryTest.java
index 624a69f..e180d83 100644
--- a/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/ResourceFactoryTest.java
+++ b/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/ResourceFactoryTest.java
@@ -20,6 +20,7 @@
package org.apache.cxf.ws.transfer.integration;
import org.w3c.dom.Element;
+
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
@@ -29,6 +30,7 @@ import org.apache.cxf.ws.transfer.CreateResponse;
import org.apache.cxf.ws.transfer.Representation;
import org.apache.cxf.ws.transfer.manager.ResourceManager;
import org.apache.cxf.ws.transfer.resourcefactory.ResourceFactory;
+
import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/ResourceTest.java b/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/ResourceTest.java
index 6ff6c2f..d89feec 100644
--- a/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/ResourceTest.java
+++ b/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/ResourceTest.java
@@ -20,7 +20,9 @@
package org.apache.cxf.ws.transfer.integration;
import javax.xml.ws.BindingProvider;
+
import org.w3c.dom.Element;
+
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.ws.addressing.AddressingProperties;
@@ -37,6 +39,7 @@ import org.apache.cxf.ws.transfer.Representation;
import org.apache.cxf.ws.transfer.manager.MemoryResourceManager;
import org.apache.cxf.ws.transfer.manager.ResourceManager;
import org.apache.cxf.ws.transfer.resource.Resource;
+
import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/unit/MemoryResourceManagerTest.java b/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/unit/MemoryResourceManagerTest.java
index 3ac0c92..d2f0c6d 100644
--- a/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/unit/MemoryResourceManagerTest.java
+++ b/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/unit/MemoryResourceManagerTest.java
@@ -20,14 +20,17 @@
package org.apache.cxf.ws.transfer.unit;
import javax.xml.parsers.ParserConfigurationException;
+
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.ws.addressing.ReferenceParametersType;
import org.apache.cxf.ws.transfer.Representation;
import org.apache.cxf.ws.transfer.manager.MemoryResourceManager;
import org.apache.cxf.ws.transfer.manager.ResourceManager;
import org.apache.cxf.ws.transfer.shared.faults.UnknownResource;
+
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Assert;
diff --git a/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/unit/XSDResourceValidatorTest.java b/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/unit/XSDResourceValidatorTest.java
index ec74d9b..1e81a3d 100644
--- a/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/unit/XSDResourceValidatorTest.java
+++ b/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/unit/XSDResourceValidatorTest.java
@@ -20,12 +20,16 @@
package org.apache.cxf.ws.transfer.unit;
import java.io.InputStream;
+
import javax.xml.stream.XMLStreamException;
import javax.xml.transform.stream.StreamSource;
+
import org.w3c.dom.Document;
+
import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.ws.transfer.Representation;
import org.apache.cxf.ws.transfer.validationtransformation.XSDResourceValidator;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/unit/XSLTResourceTransformerTest.java b/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/unit/XSLTResourceTransformerTest.java
index 4eb3ba2..94714c5 100644
--- a/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/unit/XSLTResourceTransformerTest.java
+++ b/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/unit/XSLTResourceTransformerTest.java
@@ -20,14 +20,18 @@
package org.apache.cxf.ws.transfer.unit;
import java.io.InputStream;
+
import javax.xml.stream.XMLStreamException;
import javax.xml.transform.stream.StreamSource;
+
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.ws.transfer.Representation;
import org.apache.cxf.ws.transfer.validationtransformation.ResourceTransformer;
import org.apache.cxf.ws.transfer.validationtransformation.XSLTResourceTransformer;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/AbstractWSDLPlugin.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/AbstractWSDLPlugin.java
index dcea885..b3977c9 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/AbstractWSDLPlugin.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/AbstractWSDLPlugin.java
@@ -20,6 +20,7 @@
package org.apache.cxf.wsdl;
import java.util.Map;
+
import javax.wsdl.extensions.ExtensionRegistry;
public abstract class AbstractWSDLPlugin implements WSDLExtensibilityPlugin {
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java
index 162a6c4..a0902db 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java
@@ -62,6 +62,7 @@ import javax.xml.stream.XMLStreamWriter;
import javax.xml.stream.util.StreamReaderDelegate;
import org.w3c.dom.Element;
+
import org.apache.cxf.common.classloader.ClassLoaderUtils;
import org.apache.cxf.common.jaxb.JAXBContextCache;
import org.apache.cxf.common.jaxb.JAXBContextCache.CachedContextAndSchemas;
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLExtensibilityPlugin.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLExtensibilityPlugin.java
index 5742c29..9bbd8b4 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLExtensibilityPlugin.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLExtensibilityPlugin.java
@@ -20,6 +20,7 @@
package org.apache.cxf.wsdl;
import java.util.Map;
+
import javax.wsdl.WSDLException;
import javax.wsdl.extensions.ExtensibilityElement;
import javax.wsdl.extensions.ExtensionRegistry;
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLManager.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLManager.java
index bc4003a..38326fc 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLManager.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLManager.java
@@ -25,7 +25,9 @@ import javax.wsdl.Definition;
import javax.wsdl.WSDLException;
import javax.wsdl.extensions.ExtensionRegistry;
import javax.wsdl.factory.WSDLFactory;
+
import org.w3c.dom.Element;
+
import org.apache.cxf.service.model.ServiceSchemaInfo;
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/AbstractWrapperWSDLLocator.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/AbstractWrapperWSDLLocator.java
index 615d5c9..98c86de 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/AbstractWrapperWSDLLocator.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/AbstractWrapperWSDLLocator.java
@@ -21,6 +21,7 @@ package org.apache.cxf.wsdl11;
import java.io.IOException;
import javax.wsdl.xml.WSDLLocator;
+
import org.xml.sax.InputSource;
public abstract class AbstractWrapperWSDLLocator implements WSDLLocator {
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/PartialWSDLProcessor.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/PartialWSDLProcessor.java
index 801e20c..7aa7a58 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/PartialWSDLProcessor.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/PartialWSDLProcessor.java
@@ -41,10 +41,8 @@ import javax.wsdl.extensions.soap.SOAPBinding;
import javax.wsdl.extensions.soap.SOAPBody;
import javax.wsdl.extensions.soap.SOAPFault;
import javax.wsdl.extensions.soap.SOAPOperation;
-
import javax.xml.namespace.QName;
-
import org.apache.cxf.helpers.CastUtils;
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ResourceManagerWSDLLocator.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ResourceManagerWSDLLocator.java
index b5887d7..984ff0a 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ResourceManagerWSDLLocator.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ResourceManagerWSDLLocator.java
@@ -22,6 +22,7 @@ import java.io.InputStream;
import java.net.URL;
import javax.wsdl.xml.WSDLLocator;
+
import org.xml.sax.InputSource;
import org.apache.cxf.Bus;
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java
index 25c552d..0366d5e 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java
@@ -26,6 +26,7 @@ import java.util.IdentityHashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+
import javax.wsdl.Definition;
import javax.wsdl.Import;
import javax.wsdl.Types;
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
index fbb47f5..914ba4f 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
@@ -46,6 +46,7 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.xml.sax.InputSource;
+
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
import org.apache.cxf.common.injection.NoJSR250Annotations;
diff --git a/rt/wsdl/src/test/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptorTest.java b/rt/wsdl/src/test/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptorTest.java
index 8657098..5fd6ed6 100644
--- a/rt/wsdl/src/test/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptorTest.java
+++ b/rt/wsdl/src/test/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptorTest.java
@@ -50,9 +50,9 @@ import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.staxutils.PartialXMLStreamReader;
import org.apache.cxf.staxutils.StaxUtils;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/wsdl/src/test/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactorBeanTest.java b/rt/wsdl/src/test/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactorBeanTest.java
index 30bdf10..749ee7d 100644
--- a/rt/wsdl/src/test/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactorBeanTest.java
+++ b/rt/wsdl/src/test/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactorBeanTest.java
@@ -26,9 +26,9 @@ import org.apache.cxf.Bus;
import org.apache.cxf.service.factory.FactoryBeanListenerManager;
import org.apache.cxf.service.factory.ServiceConstructionException;
import org.apache.cxf.wsdl.WSDLManager;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java
index 497287d..9359a0e 100644
--- a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java
+++ b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java
@@ -61,9 +61,9 @@ import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.wsdl.WSDLManager;
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaCollection;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java
index a690c86..2aa4136 100644
--- a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java
+++ b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java
@@ -34,6 +34,7 @@ import javax.xml.stream.XMLStreamReader;
import org.apache.cxf.staxutils.PropertiesExpandingStreamReader;
import org.apache.cxf.staxutils.XMLStreamReaderWrapper;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
index 4f3c699..083b4f1 100644
--- a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
+++ b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
@@ -66,9 +66,9 @@ import org.apache.cxf.transport.DestinationFactory;
import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
import org.apache.ws.commons.schema.XmlSchemaElement;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Test;
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/CacheUtils.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/CacheUtils.java
index 9b52ef7..8f566ca 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/CacheUtils.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/CacheUtils.java
@@ -26,6 +26,7 @@ import java.util.HashMap;
import java.util.Map;
import org.w3c.dom.Element;
+
import org.apache.cxf.sts.STSConstants;
import org.apache.cxf.sts.request.Renewing;
import org.apache.cxf.ws.security.tokenstore.SecurityToken;
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/EHCacheIdentityCache.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/EHCacheIdentityCache.java
index 9ccf3da..4d1e643 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/EHCacheIdentityCache.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/EHCacheIdentityCache.java
@@ -34,7 +34,6 @@ import net.sf.ehcache.CacheManager;
import net.sf.ehcache.Ehcache;
import net.sf.ehcache.Element;
import net.sf.ehcache.config.CacheConfiguration;
-
import org.apache.cxf.Bus;
import org.apache.cxf.buslifecycle.BusLifeCycleListener;
import org.apache.cxf.buslifecycle.BusLifeCycleManager;
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java
index 9df1bc8..7a57219 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java
@@ -29,6 +29,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import org.w3c.dom.Element;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.rt.security.claims.Claim;
import org.apache.cxf.rt.security.claims.ClaimCollection;
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/IdentityClaimsParser.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/IdentityClaimsParser.java
index 8b3a7e8..7dcdcaa 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/IdentityClaimsParser.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/IdentityClaimsParser.java
@@ -26,6 +26,7 @@ import java.util.logging.Logger;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.rt.security.claims.Claim;
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapUtils.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapUtils.java
index 42a5f88..c6a8b45 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapUtils.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapUtils.java
@@ -32,7 +32,6 @@ import javax.naming.directory.SearchControls;
import javax.security.auth.x500.X500Principal;
import org.apache.cxf.helpers.CastUtils;
-
import org.springframework.ldap.core.AttributesMapper;
import org.springframework.ldap.core.ContextMapper;
import org.springframework.ldap.core.DirContextOperations;
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/LoggerPatternLayoutLogback.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/LoggerPatternLayoutLogback.java
index 98786f0..b789f4c 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/LoggerPatternLayoutLogback.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/LoggerPatternLayoutLogback.java
@@ -20,7 +20,6 @@
package org.apache.cxf.sts.event;
import org.apache.cxf.sts.event.map.MapEventLogger;
-
import ch.qos.logback.classic.PatternLayout;
public class LoggerPatternLayoutLogback extends PatternLayout {
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
index 129d2ac..a9cdf9e 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
@@ -34,6 +34,7 @@ import javax.xml.namespace.QName;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.rt.security.claims.ClaimCollection;
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/ReceivedToken.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/ReceivedToken.java
index 84a10bb..297f7ef 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/ReceivedToken.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/ReceivedToken.java
@@ -27,6 +27,7 @@ import javax.xml.bind.JAXBElement;
import javax.xml.namespace.QName;
import org.w3c.dom.Element;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.sts.QNameConstants;
import org.apache.cxf.ws.security.sts.provider.STSException;
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/RequestParser.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/RequestParser.java
index 256b8e3..bf794e2 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/RequestParser.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/RequestParser.java
@@ -44,6 +44,7 @@ import javax.xml.crypto.dsig.keyinfo.X509Data;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.Base64Utility;
import org.apache.cxf.helpers.CastUtils;
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/rest/RESTSecurityTokenServiceImpl.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/rest/RESTSecurityTokenServiceImpl.java
index 0e3f1d0..382b0b0 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/rest/RESTSecurityTokenServiceImpl.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/rest/RESTSecurityTokenServiceImpl.java
@@ -35,6 +35,7 @@ import javax.xml.bind.JAXBElement;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.Base64Exception;
import org.apache.cxf.common.util.Base64Utility;
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/canceller/SCTCanceller.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/canceller/SCTCanceller.java
index c7700b4..92c0917 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/canceller/SCTCanceller.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/canceller/SCTCanceller.java
@@ -29,6 +29,7 @@ import java.util.logging.Logger;
import javax.crypto.SecretKey;
import org.w3c.dom.Element;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.sts.request.ReceivedToken;
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/delegation/SAMLDelegationHandler.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/delegation/SAMLDelegationHandler.java
index e95fcb0..796b301 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/delegation/SAMLDelegationHandler.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/delegation/SAMLDelegationHandler.java
@@ -24,6 +24,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import org.w3c.dom.Element;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.sts.request.ReceivedToken;
import org.apache.cxf.sts.request.ReceivedToken.STATE;
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SAMLTokenProvider.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SAMLTokenProvider.java
index e4f86c6..c5918b6 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SAMLTokenProvider.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SAMLTokenProvider.java
@@ -29,6 +29,7 @@ import java.util.logging.Logger;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.sts.STSConstants;
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SubjectProviderParameters.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SubjectProviderParameters.java
index e097608..569a43f 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SubjectProviderParameters.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SubjectProviderParameters.java
@@ -19,6 +19,7 @@
package org.apache.cxf.sts.token.provider;
import java.util.List;
+
import org.w3c.dom.Document;
import org.apache.wss4j.common.saml.bean.AttributeStatementBean;
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 28bc0e8..ddd4aca 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
@@ -34,6 +34,7 @@ import javax.security.auth.callback.CallbackHandler;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.helpers.DOMUtils;
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/TokenRenewerResponse.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/TokenRenewerResponse.java
index b19cb5b..960825c 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/TokenRenewerResponse.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/TokenRenewerResponse.java
@@ -21,6 +21,7 @@ package org.apache.cxf.sts.token.renewer;
import java.time.Instant;
import org.w3c.dom.Element;
+
import org.apache.cxf.sts.token.provider.TokenReference;
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SAMLTokenValidator.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SAMLTokenValidator.java
index 3d04f98..30dd1f6 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SAMLTokenValidator.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SAMLTokenValidator.java
@@ -31,6 +31,7 @@ import java.util.logging.Logger;
import javax.security.auth.callback.CallbackHandler;
import org.w3c.dom.Element;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.sts.STSConstants;
import org.apache.cxf.sts.STSPropertiesMBean;
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/UsernameTokenValidator.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/UsernameTokenValidator.java
index fe1fc9f..70292ac 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/UsernameTokenValidator.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/UsernameTokenValidator.java
@@ -34,6 +34,7 @@ import javax.xml.bind.Marshaller;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.common.jaxb.JAXBContextCache;
import org.apache.cxf.common.jaxb.JAXBContextCache.CachedContextAndSchemas;
import org.apache.cxf.common.logging.LogUtils;
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/cache/HazelCastTokenStoreTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/cache/HazelCastTokenStoreTest.java
index c4b3729..53dd443 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/cache/HazelCastTokenStoreTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/cache/HazelCastTokenStoreTest.java
@@ -23,6 +23,7 @@ import java.time.ZonedDateTime;
import org.apache.cxf.ws.security.tokenstore.SecurityToken;
import org.apache.cxf.ws.security.tokenstore.TokenStore;
+
import org.junit.BeforeClass;
public class HazelCastTokenStoreTest extends org.junit.Assert {
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlClaimsMapperTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlClaimsMapperTest.java
index 694b32c..33d1cc4 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlClaimsMapperTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlClaimsMapperTest.java
@@ -29,6 +29,7 @@ import org.apache.cxf.sts.StaticSTSProperties;
import org.apache.cxf.sts.claims.ClaimsParameters;
import org.apache.cxf.sts.claims.ProcessedClaim;
import org.apache.cxf.sts.claims.ProcessedClaimCollection;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomClaimParser.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomClaimParser.java
index 7b5176d..036670d 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomClaimParser.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomClaimParser.java
@@ -21,6 +21,7 @@ package org.apache.cxf.sts.common;
import java.net.URI;
import org.w3c.dom.Element;
+
import org.apache.cxf.rt.security.claims.Claim;
import org.apache.cxf.sts.claims.ClaimsParser;
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/PasswordCallbackHandler.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/PasswordCallbackHandler.java
index 6567825..e0c76d9 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/PasswordCallbackHandler.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/PasswordCallbackHandler.java
@@ -19,9 +19,11 @@
package org.apache.cxf.sts.common;
import java.io.IOException;
+
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
+
import org.apache.wss4j.common.ext.WSPasswordCallback;
public class PasswordCallbackHandler implements CallbackHandler {
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/RealmSupportClaimsHandler.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/RealmSupportClaimsHandler.java
index 412d996..186821f 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/RealmSupportClaimsHandler.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/RealmSupportClaimsHandler.java
@@ -28,6 +28,7 @@ import org.apache.cxf.sts.claims.ClaimsParameters;
import org.apache.cxf.sts.claims.ProcessedClaim;
import org.apache.cxf.sts.claims.ProcessedClaimCollection;
import org.apache.cxf.sts.token.realm.RealmSupport;
+
import org.junit.Assert;
/**
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/DummyTokenProvider.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/DummyTokenProvider.java
index 36d3f69..0109b2f 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/DummyTokenProvider.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/DummyTokenProvider.java
@@ -21,6 +21,7 @@ package org.apache.cxf.sts.operation;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.sts.token.provider.TokenProvider;
import org.apache.cxf.sts.token.provider.TokenProviderParameters;
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTClaimsUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTClaimsUnitTest.java
index d72120a..7984c54 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTClaimsUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTClaimsUnitTest.java
@@ -34,6 +34,7 @@ import javax.xml.namespace.QName;
import org.w3c.dom.Document;
import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Element;
+
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
@@ -85,6 +86,7 @@ import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.apache.wss4j.common.saml.builder.SAML2Constants;
import org.apache.wss4j.common.util.DOM2Writer;
+
import org.junit.Assert;
/**
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTOnbehalfofUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTOnbehalfofUnitTest.java
index c9fca17..2ed09ff 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTOnbehalfofUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTOnbehalfofUnitTest.java
@@ -77,6 +77,7 @@ import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.crypto.CryptoType;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
+
import org.junit.Assert;
/**
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTRealmUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTRealmUnitTest.java
index 709a977..e46aac7 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTRealmUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTRealmUnitTest.java
@@ -61,6 +61,7 @@ import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.crypto.CryptoType;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
+
import org.junit.Assert;
/**
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTUnitTest.java
index 2536c55..87fda2d 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTUnitTest.java
@@ -59,6 +59,7 @@ import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.crypto.CryptoType;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
+
import org.junit.Assert;
/**
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlClaimsUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlClaimsUnitTest.java
index 368fb1c..86d48c2 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlClaimsUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlClaimsUnitTest.java
@@ -34,6 +34,7 @@ import javax.xml.namespace.QName;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlRealmUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlRealmUnitTest.java
index 4dc62f7..1a06497 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlRealmUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlRealmUnitTest.java
@@ -31,6 +31,7 @@ import javax.xml.namespace.QName;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java
index 56ddcd7..dbb9a3a 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java
@@ -33,6 +33,7 @@ import javax.xml.namespace.QName;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Text;
+
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java
index 43d02d3..b484889 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java
@@ -68,6 +68,7 @@ import org.apache.wss4j.common.saml.builder.SAML1Constants;
import org.apache.wss4j.common.saml.builder.SAML2Constants;
import org.apache.wss4j.common.util.DOM2Writer;
import org.apache.wss4j.common.util.DateUtil;
+
import org.junit.BeforeClass;
/**
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 446dcdb..2c950b4 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
@@ -79,6 +79,7 @@ import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.apache.wss4j.common.saml.builder.SAML2Constants;
import org.apache.wss4j.common.util.DOM2Writer;
+
import org.junit.Assert;
/**
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTUnitTest.java
index 11acf0a..e4a37f0 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTUnitTest.java
@@ -28,6 +28,7 @@ import javax.xml.namespace.QName;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateTokenTransformationUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateTokenTransformationUnitTest.java
index 40ebc21..c149130 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateTokenTransformationUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateTokenTransformationUnitTest.java
@@ -32,6 +32,7 @@ import javax.xml.namespace.QName;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/request/RequestParserUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/request/RequestParserUnitTest.java
index 8d1043d..ea0ec1a 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/request/RequestParserUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/request/RequestParserUnitTest.java
@@ -31,6 +31,7 @@ import javax.xml.parsers.DocumentBuilderFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.xml.sax.InputSource;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderActAsTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderActAsTest.java
index 3bc7620..60a3aed 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderActAsTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderActAsTest.java
@@ -46,6 +46,7 @@ import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
+
import org.junit.Assert;
/**
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderOnBehalfOfTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderOnBehalfOfTest.java
index 056a39a..6f6f798 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderOnBehalfOfTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTProviderOnBehalfOfTest.java
@@ -46,6 +46,7 @@ import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
+
import org.junit.Assert;
/**
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderTest.java
index 7c662d4..9028552 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderTest.java
@@ -54,6 +54,7 @@ import org.apache.wss4j.common.crypto.Merlin;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
+
import org.junit.Assert;
/**
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java
index b2cf53b..f951052 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java
@@ -27,6 +27,7 @@ import java.util.Map;
import java.util.Properties;
import org.w3c.dom.Element;
+
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.rt.security.claims.Claim;
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java
index 465689a..19c571b 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java
@@ -54,6 +54,7 @@ import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.apache.wss4j.common.saml.SamlAssertionWrapper;
import org.apache.wss4j.common.util.DOM2Writer;
+
import org.junit.Assert;
import org.opensaml.core.xml.XMLObject;
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderKeyTypeTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderKeyTypeTest.java
index 6e8fa10..4d31154 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderKeyTypeTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderKeyTypeTest.java
@@ -24,6 +24,7 @@ import java.util.List;
import java.util.Properties;
import org.w3c.dom.Element;
+
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.sts.STSConstants;
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/realm/RealmSupportTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/realm/RealmSupportTest.java
index 4046c57..ff38c0f 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/realm/RealmSupportTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/realm/RealmSupportTest.java
@@ -33,6 +33,7 @@ import org.apache.cxf.sts.claims.ProcessedClaimCollection;
import org.apache.cxf.sts.common.RealmSupportClaimsHandler;
import org.apache.cxf.sts.operation.CustomIdentityMapper;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
+
import org.junit.Assert;
public class RealmSupportTest extends org.junit.Assert {
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java
index 86b5a10..3343c68 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java
@@ -52,6 +52,7 @@ import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.apache.wss4j.common.util.DateUtil;
+
import org.junit.BeforeClass;
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerPOPTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerPOPTest.java
index d0aa911..ec490d0 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerPOPTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerPOPTest.java
@@ -30,6 +30,7 @@ import javax.security.auth.callback.CallbackHandler;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.sts.STSConstants;
@@ -64,6 +65,7 @@ import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.dom.handler.WSHandlerResult;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java
index 23b4809..d526793 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java
@@ -61,6 +61,7 @@ import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.apache.wss4j.common.util.DateUtil;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java
index fc34d7b..09c78fb 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java
@@ -57,6 +57,7 @@ import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.apache.wss4j.common.saml.SamlAssertionWrapper;
import org.apache.wss4j.common.util.DateUtil;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java
index c99061a..2d40123 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java
@@ -51,6 +51,7 @@ import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
+
import org.junit.BeforeClass;
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java
index ed4069c..e8b6740 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java
@@ -35,6 +35,7 @@ import javax.security.auth.callback.UnsupportedCallbackException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.rt.security.claims.Claim;
@@ -67,6 +68,7 @@ import org.apache.wss4j.common.ext.WSPasswordCallback;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
import org.apache.wss4j.common.util.DateUtil;
+
import org.junit.BeforeClass;
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/asymmetric_encr/AsymmetricEncryptionTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/asymmetric_encr/AsymmetricEncryptionTest.java
index be22d01..57c9d9e 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/asymmetric_encr/AsymmetricEncryptionTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/asymmetric_encr/AsymmetricEncryptionTest.java
@@ -34,6 +34,7 @@ import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.cxf.ws.security.tokenstore.SecurityToken;
import org.apache.cxf.ws.security.trust.STSClient;
+
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/JaxwsBasicAuthTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/JaxwsBasicAuthTest.java
index 096c2b1..4e8d642 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/JaxwsBasicAuthTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/JaxwsBasicAuthTest.java
@@ -34,6 +34,7 @@ import org.apache.cxf.systest.sts.deployment.STSServer;
import org.apache.cxf.systest.sts.deployment.StaxSTSServer;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SAMLBatchUnitTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SAMLBatchUnitTest.java
index 6636851..7d6ef2b 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SAMLBatchUnitTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SAMLBatchUnitTest.java
@@ -35,6 +35,7 @@ import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.cxf.ws.security.tokenstore.SecurityToken;
import org.apache.cxf.ws.security.trust.STSUtils;
+
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java
index 391a591..d458ee2 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java
@@ -44,6 +44,7 @@ import javax.xml.transform.dom.DOMSource;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
import org.apache.cxf.binding.soap.SoapBindingConstants;
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/binarysecuritytoken/BinarySecurityTokenTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/binarysecuritytoken/BinarySecurityTokenTest.java
index 4fe4515..14fa6ea 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/binarysecuritytoken/BinarySecurityTokenTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/binarysecuritytoken/BinarySecurityTokenTest.java
@@ -34,6 +34,7 @@ import org.apache.cxf.systest.sts.deployment.STSServer;
import org.apache.cxf.systest.sts.deployment.StaxSTSServer;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/CachingTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/CachingTest.java
index 79bd61d..91bb13c 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/CachingTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/CachingTest.java
@@ -42,6 +42,7 @@ import org.apache.cxf.ws.security.tokenstore.SecurityToken;
import org.apache.cxf.ws.security.tokenstore.TokenStore;
import org.apache.cxf.ws.security.trust.STSClient;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/DoubleItPortTypeImpl.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/DoubleItPortTypeImpl.java
index 542d22e..e2c8f86 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/DoubleItPortTypeImpl.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/DoubleItPortTypeImpl.java
@@ -28,7 +28,6 @@ import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.cxf.ws.security.trust.STSClient;
-
import org.example.contract.doubleit.DoubleItPortType;
@WebService(targetNamespace = "http://www.example.org/contract/DoubleIt",
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/ServerCachingTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/ServerCachingTest.java
index 8825aa7..529431a 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/ServerCachingTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/ServerCachingTest.java
@@ -42,6 +42,7 @@ import org.apache.cxf.ws.security.tokenstore.SecurityToken;
import org.apache.cxf.ws.security.tokenstore.TokenStore;
import org.apache.cxf.ws.security.trust.STSClient;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/ClaimsTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/ClaimsTest.java
index f3b1af4..e7e58ab 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/ClaimsTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/ClaimsTest.java
@@ -36,6 +36,7 @@ import org.apache.cxf.systest.sts.deployment.STSServer;
import org.apache.cxf.systest.sts.deployment.StaxSTSServer;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/ClaimsValidator.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/ClaimsValidator.java
index e7e70cb..d355e8a 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/ClaimsValidator.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/ClaimsValidator.java
@@ -21,6 +21,7 @@ package org.apache.cxf.systest.sts.claims;
import java.util.List;
import org.w3c.dom.Element;
+
import org.apache.cxf.sts.claims.ClaimTypes;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.saml.SamlAssertionWrapper;
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/StaxClaimsValidator.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/StaxClaimsValidator.java
index 86956f0..bf539e9 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/StaxClaimsValidator.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/StaxClaimsValidator.java
@@ -21,6 +21,7 @@ package org.apache.cxf.systest.sts.claims;
import java.util.List;
import org.w3c.dom.Element;
+
import org.apache.cxf.sts.claims.ClaimTypes;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.ext.WSSecurityException;
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/common/CommonCallbackHandler.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/common/CommonCallbackHandler.java
index 6e7735f..a91406c 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/common/CommonCallbackHandler.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/common/CommonCallbackHandler.java
@@ -19,9 +19,11 @@
package org.apache.cxf.systest.sts.common;
import java.io.IOException;
+
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
+
import org.apache.wss4j.common.ext.WSPasswordCallback;
public class CommonCallbackHandler implements CallbackHandler {
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/common/DoubleItPortTypeImpl.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/common/DoubleItPortTypeImpl.java
index c4dbd13..157df77 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/common/DoubleItPortTypeImpl.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/common/DoubleItPortTypeImpl.java
@@ -26,6 +26,7 @@ import javax.xml.ws.WebServiceContext;
import org.apache.cxf.feature.Features;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.Assert;
@WebService(targetNamespace = "http://www.example.org/contract/DoubleIt",
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/common/TokenTestUtils.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/common/TokenTestUtils.java
index dd8f5c6..adadaeb 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/common/TokenTestUtils.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/common/TokenTestUtils.java
@@ -23,6 +23,7 @@ import java.util.List;
import javax.xml.ws.BindingProvider;
import org.w3c.dom.Element;
+
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.frontend.ClientProxy;
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/cross_domain/CrossDomainTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/cross_domain/CrossDomainTest.java
index 4f68a23..1e3472c 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/cross_domain/CrossDomainTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/cross_domain/CrossDomainTest.java
@@ -31,6 +31,7 @@ import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.systest.sts.common.SecurityTestUtil;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/CustomParameterTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/CustomParameterTest.java
index 9859460..8f429b5 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/CustomParameterTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/CustomParameterTest.java
@@ -56,6 +56,7 @@ import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.processor.Processor;
import org.apache.wss4j.dom.processor.SAMLTokenProcessor;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/CustomOnBehalfOfTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/CustomOnBehalfOfTest.java
index 2d3546d..2f887eb 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/CustomOnBehalfOfTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/CustomOnBehalfOfTest.java
@@ -30,8 +30,8 @@ import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.rt.security.SecurityConstants;
import org.apache.cxf.systest.sts.common.SecurityTestUtil;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
-
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/LocalDoubleItPortTypeImpl.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/LocalDoubleItPortTypeImpl.java
index 295ea75..bd6ae3d 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/LocalDoubleItPortTypeImpl.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/LocalDoubleItPortTypeImpl.java
@@ -26,6 +26,7 @@ import javax.xml.ws.WebServiceContext;
import org.apache.cxf.feature.Features;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.Assert;
@WebService(targetNamespace = "http://www.example.org/contract/DoubleIt",
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/SAMLDoubleItPortTypeImpl.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/SAMLDoubleItPortTypeImpl.java
index d9fca2a..3f87910 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/SAMLDoubleItPortTypeImpl.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/SAMLDoubleItPortTypeImpl.java
@@ -26,6 +26,7 @@ import javax.xml.ws.WebServiceContext;
import org.apache.cxf.feature.Features;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.Assert;
@WebService(targetNamespace = "http://www.example.org/contract/DoubleIt",
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomClaimsParser.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomClaimsParser.java
index 1fd8a45..5be68ba 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomClaimsParser.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomClaimsParser.java
@@ -26,6 +26,7 @@ import java.util.logging.Logger;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.rt.security.claims.Claim;
import org.apache.cxf.sts.claims.ClaimsParser;
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/DistributedCachingTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/DistributedCachingTest.java
index a5717c8..c77e7a6 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/DistributedCachingTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/DistributedCachingTest.java
@@ -28,8 +28,8 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.systest.sts.common.SecurityTestUtil;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
-
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JWTUnitTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JWTUnitTest.java
index 2a6718a..ecb9434 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JWTUnitTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JWTUnitTest.java
@@ -31,6 +31,7 @@ import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.cxf.ws.security.tokenstore.SecurityToken;
import org.apache.cxf.ws.security.trust.STSClient;
+
import org.junit.BeforeClass;
/**
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 bc234e5..fdd0e28 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
@@ -44,6 +44,7 @@ import org.apache.cxf.ws.security.policy.interceptors.STSTokenOutInterceptor;
import org.apache.cxf.ws.security.tokenstore.SecurityToken;
import org.apache.cxf.ws.security.trust.STSClient;
import org.apache.cxf.ws.security.trust.STSTokenRetriever.TokenRequestParams;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/DoubleItPortTypeImpl.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/DoubleItPortTypeImpl.java
index bad9ed4..1d902ac 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/DoubleItPortTypeImpl.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/DoubleItPortTypeImpl.java
@@ -26,6 +26,7 @@ import javax.xml.ws.WebServiceContext;
import org.apache.cxf.feature.Features;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.Assert;
@WebService(targetNamespace = "http://www.example.org/contract/DoubleIt",
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/IntermediaryPortTypeImpl.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/IntermediaryPortTypeImpl.java
index 5473b40..7c6ec12 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/IntermediaryPortTypeImpl.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/IntermediaryPortTypeImpl.java
@@ -36,6 +36,7 @@ import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.cxf.ws.security.trust.STSClient;
import org.example.contract.doubleit.DoubleItPortType;
import org.ietf.jgss.GSSCredential;
+
import org.junit.Assert;
@WebService(targetNamespace = "http://www.example.org/contract/DoubleIt",
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosDelegationTokenTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosDelegationTokenTest.java
index d301e24..7a1fd06 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosDelegationTokenTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosDelegationTokenTest.java
@@ -36,6 +36,7 @@ import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.transport.http.auth.SpnegoAuthSupplier;
import org.example.contract.doubleit.DoubleItPortType;
import org.ietf.jgss.GSSName;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/realms/DifferentRealmTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/realms/DifferentRealmTest.java
index e987866..e1eed1e 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/realms/DifferentRealmTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/realms/DifferentRealmTest.java
@@ -28,8 +28,8 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.systest.sts.common.SecurityTestUtil;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
-
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewTest.java
index 8c89252..26cc91f 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewTest.java
@@ -31,8 +31,8 @@ import org.apache.cxf.systest.sts.common.SecurityTestUtil;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.cxf.ws.security.trust.STSClient;
-
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewUnitTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewUnitTest.java
index 2f999bc..91c6f69 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewUnitTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewUnitTest.java
@@ -35,6 +35,7 @@ import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.cxf.ws.security.tokenstore.SecurityToken;
import org.apache.cxf.ws.security.trust.STSClient;
import org.apache.wss4j.common.WSS4JConstants;
+
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SCTSAMLTokenProvider.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SCTSAMLTokenProvider.java
index 86d5c02..780dc13 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SCTSAMLTokenProvider.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SCTSAMLTokenProvider.java
@@ -26,6 +26,7 @@ import java.util.logging.Logger;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.sts.STSConstants;
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecureConversationTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecureConversationTest.java
index a96ae8f..a08a034 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecureConversationTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecureConversationTest.java
@@ -28,8 +28,8 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.systest.sts.common.SecurityTestUtil;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
-
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java
index 6dd611d..3b3d91e 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java
@@ -33,6 +33,7 @@ import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.cxf.ws.security.tokenstore.SecurityToken;
import org.apache.cxf.ws.security.trust.STSClient;
+
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java
index 0677e66..78518a9 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java
@@ -29,6 +29,7 @@ import javax.xml.ws.BindingProvider;
import javax.xml.ws.Service;
import org.w3c.dom.Element;
+
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.binding.soap.SoapFault;
@@ -43,6 +44,7 @@ import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.cxf.ws.security.tokenstore.SecurityToken;
import org.apache.cxf.ws.security.trust.STSClient;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/sts_sender_vouches/STSSenderVouchesTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/sts_sender_vouches/STSSenderVouchesTest.java
index 0dc54d5..bdf6103 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/sts_sender_vouches/STSSenderVouchesTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/sts_sender_vouches/STSSenderVouchesTest.java
@@ -34,6 +34,7 @@ import org.apache.cxf.systest.sts.common.TestParam;
import org.apache.cxf.systest.sts.common.TokenTestUtils;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/DoubleItPortTypeImpl.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/DoubleItPortTypeImpl.java
index d25482d..93eda84 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/DoubleItPortTypeImpl.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/DoubleItPortTypeImpl.java
@@ -33,6 +33,7 @@ import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.dom.handler.WSHandlerResult;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.Assert;
@WebService(targetNamespace = "http://www.example.org/contract/DoubleIt",
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/TransformationTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/TransformationTest.java
index 38c7827..0505883 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/TransformationTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/TransformationTest.java
@@ -29,8 +29,8 @@ import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.systest.sts.common.SecurityTestUtil;
import org.apache.cxf.systest.sts.deployment.STSServer;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
-
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/usernametoken/UsernameTokenTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/usernametoken/UsernameTokenTest.java
index f1707f3..d701cbe 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/usernametoken/UsernameTokenTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/usernametoken/UsernameTokenTest.java
@@ -34,6 +34,7 @@ import org.apache.cxf.systest.sts.deployment.STSServer;
import org.apache.cxf.systest.sts.deployment.StaxSTSServer;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java
index 397fe57..ab7c5b9 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java
@@ -42,6 +42,7 @@ import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.crypto.CryptoType;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/bearer/BearerTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/bearer/BearerTest.java
index 9b127a8..6782cb3 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/bearer/BearerTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/bearer/BearerTest.java
@@ -36,6 +36,7 @@ import org.apache.cxf.systest.sts.deployment.STSServer;
import org.apache.cxf.systest.sts.deployment.StaxSTSServer;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/CommonCallbackHandler.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/CommonCallbackHandler.java
index 6e7735f..a91406c 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/CommonCallbackHandler.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/CommonCallbackHandler.java
@@ -19,9 +19,11 @@
package org.apache.cxf.systest.sts.common;
import java.io.IOException;
+
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
+
import org.apache.wss4j.common.ext.WSPasswordCallback;
public class CommonCallbackHandler implements CallbackHandler {
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/DoubleItPortTypeImpl.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/DoubleItPortTypeImpl.java
index 228c31f..3769a4e 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/DoubleItPortTypeImpl.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/DoubleItPortTypeImpl.java
@@ -26,6 +26,7 @@ import javax.xml.ws.WebServiceContext;
import org.apache.cxf.feature.Features;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.Assert;
@WebService(targetNamespace = "http://www.example.org/contract/DoubleIt",
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java
index 8be3681..99e350f 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java
@@ -26,6 +26,7 @@ import java.util.Properties;
import javax.security.auth.callback.CallbackHandler;
import org.w3c.dom.Element;
+
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
@@ -50,6 +51,7 @@ import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.principal.CustomTokenPrincipal;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/DoubleItPortTypeImpl.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/DoubleItPortTypeImpl.java
index 42c02f5..9b98024 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/DoubleItPortTypeImpl.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/DoubleItPortTypeImpl.java
@@ -28,6 +28,7 @@ import javax.xml.ws.WebServiceContext;
import org.apache.cxf.feature.Features;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.Assert;
@WebService(targetNamespace = "http://www.example.org/contract/DoubleIt",
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryCachingPortTypeImpl.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryCachingPortTypeImpl.java
index 65cade9..c41b478 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryCachingPortTypeImpl.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryCachingPortTypeImpl.java
@@ -35,6 +35,7 @@ import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.cxf.ws.security.trust.STSClient;
import org.apache.cxf.ws.security.trust.delegation.ReceivedTokenCallbackHandler;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.Assert;
@WebService(targetNamespace = "http://www.example.org/contract/DoubleIt",
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryPortTypeImpl.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryPortTypeImpl.java
index 38cd091..a1a9e45 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryPortTypeImpl.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryPortTypeImpl.java
@@ -34,6 +34,7 @@ import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.cxf.ws.security.trust.STSClient;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.Assert;
@WebService(targetNamespace = "http://www.example.org/contract/DoubleIt",
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java
index b103512..e09bac8 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java
@@ -34,6 +34,7 @@ import org.apache.cxf.systest.sts.deployment.STSServer;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.ws.security.SecurityConstants;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationTest.java
index 40cc753..e4f1132 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationTest.java
@@ -33,6 +33,7 @@ import org.apache.cxf.systest.sts.deployment.STSServer;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.ws.security.SecurityConstants;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issuer/IssuerTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issuer/IssuerTest.java
index 3cdf8d5..afe6cd5 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issuer/IssuerTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issuer/IssuerTest.java
@@ -31,6 +31,7 @@ import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.systest.sts.common.SecurityTestUtil;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
index 5c65f16..00b3385 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
@@ -29,6 +29,7 @@ import javax.wsdl.Definition;
import javax.xml.namespace.QName;
import org.w3c.dom.Element;
+
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.binding.soap.SoapBindingConstants;
@@ -70,6 +71,7 @@ import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.processor.Processor;
import org.apache.wss4j.dom.processor.SAMLTokenProcessor;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/jaas/JAASTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/jaas/JAASTest.java
index d274219..8961d67 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/jaas/JAASTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/jaas/JAASTest.java
@@ -34,6 +34,7 @@ import org.apache.cxf.systest.sts.deployment.STSServer;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.ws.security.SecurityConstants;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java
index 59ad1a9..4f11cd0 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java
@@ -71,6 +71,7 @@ import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.processor.Processor;
import org.apache.wss4j.dom.processor.SAMLTokenProcessor;
+
import org.junit.Assert;
import org.junit.BeforeClass;
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/SenderVouchesTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/SenderVouchesTest.java
index 40a43da..ccc3857 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/SenderVouchesTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/SenderVouchesTest.java
@@ -32,6 +32,7 @@ import org.apache.cxf.systest.sts.common.SecurityTestUtil;
import org.apache.cxf.systest.sts.common.TestParam;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSClientTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSClientTest.java
index 92d4c14..b7f6b96 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSClientTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSClientTest.java
@@ -30,6 +30,7 @@ import org.apache.cxf.systest.sts.common.SecurityTestUtil;
import org.apache.cxf.systest.sts.deployment.STSServer;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/TemplateTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/TemplateTest.java
index 50ed170..11ed484 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/TemplateTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/TemplateTest.java
@@ -38,6 +38,7 @@ import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.cxf.ws.security.trust.STSClient;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
index f2c29d6..0eca7f7 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
@@ -51,6 +51,7 @@ import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.cxf.ws.security.trust.STSClient;
import org.apache.wss4j.common.WSS4JConstants;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/ActAsValidator.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/ActAsValidator.java
index 3195aa9..a904ac8 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/ActAsValidator.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/ActAsValidator.java
@@ -21,6 +21,7 @@ package org.apache.cxf.systest.sts.username_actas;
import java.util.List;
import org.w3c.dom.Element;
+
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.saml.SamlAssertionWrapper;
import org.apache.wss4j.dom.handler.RequestData;
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsCachingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsCachingTest.java
index 5fd6ad6..aaf1ee2 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsCachingTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsCachingTest.java
@@ -39,6 +39,7 @@ import org.apache.cxf.ws.security.tokenstore.SecurityToken;
import org.apache.cxf.ws.security.tokenstore.TokenStore;
import org.apache.cxf.ws.security.trust.STSClient;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java
index d24b394..6fc923c 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java
@@ -37,6 +37,7 @@ import org.apache.cxf.systest.sts.deployment.STSServer;
import org.apache.cxf.systest.sts.deployment.StaxSTSServer;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfCachingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfCachingTest.java
index d520dc7..2dd9c19 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfCachingTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfCachingTest.java
@@ -39,6 +39,7 @@ import org.apache.cxf.ws.security.tokenstore.SecurityToken;
import org.apache.cxf.ws.security.tokenstore.TokenStore;
import org.apache.cxf.ws.security.trust.STSClient;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java
index 3be8271..5c0fe61 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java
@@ -37,6 +37,7 @@ import org.apache.cxf.systest.sts.deployment.STSServer;
import org.apache.cxf.systest.sts.deployment.StaxSTSServer;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509AsymmetricBindingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509AsymmetricBindingTest.java
index 2911967..7237aa7 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509AsymmetricBindingTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509AsymmetricBindingTest.java
@@ -32,6 +32,7 @@ import org.apache.cxf.systest.sts.common.TokenTestUtils;
import org.apache.cxf.systest.sts.deployment.STSServer;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
/**
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509SymmetricBindingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509SymmetricBindingTest.java
index ea8f52d..aded347 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509SymmetricBindingTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509SymmetricBindingTest.java
@@ -36,6 +36,7 @@ import org.apache.cxf.systest.sts.deployment.STSServer;
import org.apache.cxf.systest.sts.deployment.StaxSTSServer;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.example.contract.doubleit.DoubleItPortType;
+
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
diff --git a/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/BasicSTSIntegrationTest.java b/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/BasicSTSIntegrationTest.java
index e8a2edf..c9c1c21 100644
--- a/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/BasicSTSIntegrationTest.java
+++ b/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/BasicSTSIntegrationTest.java
@@ -21,6 +21,7 @@ package org.apache.cxf.systest.sts.itests;
import java.io.File;
import org.apache.cxf.testutil.common.TestUtil;
+
import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.options.MavenArtifactUrlReference;
diff --git a/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/unit/CommonCallbackHandler.java b/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/unit/CommonCallbackHandler.java
index 1ba65db..1747528 100644
--- a/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/unit/CommonCallbackHandler.java
+++ b/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/unit/CommonCallbackHandler.java
@@ -19,9 +19,11 @@
package org.apache.cxf.systest.sts.itests.unit;
import java.io.IOException;
+
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
+
import org.apache.wss4j.common.ext.WSPasswordCallback;
public class CommonCallbackHandler implements CallbackHandler {
diff --git a/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/unit/STSUnitTest.java b/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/unit/STSUnitTest.java
index 15459ee..dd27b04 100644
--- a/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/unit/STSUnitTest.java
+++ b/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/unit/STSUnitTest.java
@@ -40,6 +40,7 @@ import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.processor.Processor;
import org.apache.wss4j.dom.processor.SAMLTokenProcessor;
+
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/services/sts/systests/sts-osgi/src/main/java/org/apache/cxf/systest/sts/osgi/CommonCallbackHandler.java b/services/sts/systests/sts-osgi/src/main/java/org/apache/cxf/systest/sts/osgi/CommonCallbackHandler.java
index 306c520..58e0aeb 100644
--- a/services/sts/systests/sts-osgi/src/main/java/org/apache/cxf/systest/sts/osgi/CommonCallbackHandler.java
+++ b/services/sts/systests/sts-osgi/src/main/java/org/apache/cxf/systest/sts/osgi/CommonCallbackHandler.java
@@ -19,9 +19,11 @@
package org.apache.cxf.systest.sts.osgi;
import java.io.IOException;
+
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
+
import org.apache.wss4j.common.ext.WSPasswordCallback;
public class CommonCallbackHandler implements CallbackHandler {
diff --git a/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/PullPoint.java b/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/PullPoint.java
index b103fc9..fa2a35d 100644
--- a/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/PullPoint.java
+++ b/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/PullPoint.java
@@ -20,6 +20,7 @@ package org.apache.cxf.wsn.client;
import java.math.BigInteger;
import java.util.List;
+
import javax.xml.ws.wsaddressing.W3CEndpointReference;
import org.apache.cxf.wsn.util.WSNHelper;
diff --git a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractSubscription.java b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractSubscription.java
index b344311..f8af823 100644
--- a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractSubscription.java
+++ b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractSubscription.java
@@ -19,6 +19,7 @@
package org.apache.cxf.wsn;
import java.util.GregorianCalendar;
+
import javax.jws.WebMethod;
import javax.jws.WebParam;
import javax.jws.WebResult;
diff --git a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsCreatePullPoint.java b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsCreatePullPoint.java
index 680c761..786b2b7 100644
--- a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsCreatePullPoint.java
+++ b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsCreatePullPoint.java
@@ -19,6 +19,7 @@
package org.apache.cxf.wsn.services;
import java.net.URI;
+
import javax.jms.ConnectionFactory;
import javax.jws.WebService;
import javax.xml.ws.BindingType;
diff --git a/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/cache/EHCacheXKMSClientCache.java b/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/cache/EHCacheXKMSClientCache.java
index 8731f80..c5c365c 100644
--- a/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/cache/EHCacheXKMSClientCache.java
+++ b/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/cache/EHCacheXKMSClientCache.java
@@ -30,7 +30,6 @@ import net.sf.ehcache.config.CacheConfiguration;
import net.sf.ehcache.config.Configuration;
import net.sf.ehcache.config.ConfigurationFactory;
import net.sf.ehcache.config.DiskStoreConfiguration;
-
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.buslifecycle.BusLifeCycleListener;
diff --git a/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java b/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java
index be4a054..f5d0b0a 100644
--- a/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java
+++ b/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java
@@ -28,12 +28,14 @@ import org.apache.cxf.xkms.model.extensions.ResultDetails;
import org.apache.cxf.xkms.model.xkms.LocateResultType;
import org.apache.cxf.xkms.model.xkms.MessageExtensionAbstractType;
import org.apache.cxf.xkms.model.xkms.ResultMajorEnum;
+
import org.junit.Assert;
import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.options.MavenArtifactUrlReference;
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
import org.ops4j.pax.exam.spi.reactors.PerClass;
+
import org.w3._2002._03.xkms_wsdl.XKMSPortType;
import static org.ops4j.pax.exam.CoreOptions.maven;
diff --git a/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/handlers/validator/ValidatorCRLTest.java b/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/handlers/validator/ValidatorCRLTest.java
index 12f848d..502eafc 100644
--- a/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/handlers/validator/ValidatorCRLTest.java
+++ b/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/handlers/validator/ValidatorCRLTest.java
@@ -37,6 +37,7 @@ import org.apache.cxf.xkms.model.xkms.StatusType;
import org.apache.cxf.xkms.model.xkms.ValidateRequestType;
import org.apache.cxf.xkms.model.xmldsig.KeyInfoType;
import org.apache.cxf.xkms.model.xmldsig.X509DataType;
+
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/handlers/validator/ValidatorTest.java b/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/handlers/validator/ValidatorTest.java
index 6240e3e..6c68088 100644
--- a/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/handlers/validator/ValidatorTest.java
+++ b/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/handlers/validator/ValidatorTest.java
@@ -39,6 +39,7 @@ import org.apache.cxf.xkms.model.xkms.StatusType;
import org.apache.cxf.xkms.model.xkms.ValidateRequestType;
import org.apache.cxf.xkms.model.xmldsig.KeyInfoType;
import org.apache.cxf.xkms.model.xmldsig.X509DataType;
+
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/service/XKMSServiceTest.java b/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/service/XKMSServiceTest.java
index 7d6e61c..a5e91d6 100644
--- a/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/service/XKMSServiceTest.java
+++ b/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/service/XKMSServiceTest.java
@@ -37,6 +37,7 @@ import org.apache.cxf.xkms.model.xkms.ResultMinorEnum;
import org.apache.cxf.xkms.model.xkms.UnverifiedKeyBindingType;
import org.apache.cxf.xkms.model.xkms.UseKeyWithType;
import org.apache.cxf.xkms.model.xmldsig.KeyInfoType;
+
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/service/XKRSSDisableTest.java b/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/service/XKRSSDisableTest.java
index 7b91d13..a151f42 100644
--- a/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/service/XKRSSDisableTest.java
+++ b/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/service/XKRSSDisableTest.java
@@ -27,6 +27,7 @@ import org.apache.cxf.xkms.model.xkms.RegisterRequestType;
import org.apache.cxf.xkms.model.xkms.RegisterResultType;
import org.apache.cxf.xkms.model.xkms.ResultMajorEnum;
import org.apache.cxf.xkms.model.xkms.ResultMinorEnum;
+
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/services/xkms/xkms-service/src/test/java/org/apache/cxf/xkms/service/CheckXKRSS.java b/services/xkms/xkms-service/src/test/java/org/apache/cxf/xkms/service/CheckXKRSS.java
index 76dced8..c1bf31e 100644
--- a/services/xkms/xkms-service/src/test/java/org/apache/cxf/xkms/service/CheckXKRSS.java
+++ b/services/xkms/xkms-service/src/test/java/org/apache/cxf/xkms/service/CheckXKRSS.java
@@ -36,6 +36,7 @@ import org.apache.cxf.xkms.model.xkms.ResultMinorEnum;
import org.apache.cxf.xkms.model.xkms.ResultType;
import org.apache.cxf.xkms.model.xkms.RevokeRequestType;
import org.apache.cxf.xkms.model.xkms.RevokeResultType;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/services/xkms/xkms-x509-handlers/src/test/java/org/apache/cxf/xkms/x509/handlers/X509LocatorTest.java b/services/xkms/xkms-x509-handlers/src/test/java/org/apache/cxf/xkms/x509/handlers/X509LocatorTest.java
index 0f776a5..2622444 100644
--- a/services/xkms/xkms-x509-handlers/src/test/java/org/apache/cxf/xkms/x509/handlers/X509LocatorTest.java
+++ b/services/xkms/xkms-x509-handlers/src/test/java/org/apache/cxf/xkms/x509/handlers/X509LocatorTest.java
@@ -32,6 +32,7 @@ import org.apache.cxf.xkms.model.xkms.QueryKeyBindingType;
import org.apache.cxf.xkms.model.xkms.UnverifiedKeyBindingType;
import org.apache.cxf.xkms.model.xkms.UseKeyWithType;
import org.apache.cxf.xkms.x509.repo.CertificateRepo;
+
import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
diff --git a/services/xkms/xkms-x509-handlers/src/test/java/org/apache/cxf/xkms/x509/repo/file/FileCertificateRepoTest.java b/services/xkms/xkms-x509-handlers/src/test/java/org/apache/cxf/xkms/x509/repo/file/FileCertificateRepoTest.java
index dff5317..00b3acd 100644
--- a/services/xkms/xkms-x509-handlers/src/test/java/org/apache/cxf/xkms/x509/repo/file/FileCertificateRepoTest.java
+++ b/services/xkms/xkms-x509-handlers/src/test/java/org/apache/cxf/xkms/x509/repo/file/FileCertificateRepoTest.java
@@ -35,6 +35,7 @@ import javax.xml.bind.DatatypeConverter;
import org.apache.cxf.xkms.handlers.Applications;
import org.apache.cxf.xkms.model.xkms.UseKeyWithType;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/services/xkms/xkms-x509-handlers/src/test/java/org/apache/cxf/xkms/x509/utils/X509UtilsTest.java b/services/xkms/xkms-x509-handlers/src/test/java/org/apache/cxf/xkms/x509/utils/X509UtilsTest.java
index b8fa0c3..6bd8197 100644
--- a/services/xkms/xkms-x509-handlers/src/test/java/org/apache/cxf/xkms/x509/utils/X509UtilsTest.java
+++ b/services/xkms/xkms-x509-handlers/src/test/java/org/apache/cxf/xkms/x509/utils/X509UtilsTest.java
@@ -30,6 +30,7 @@ import org.apache.cxf.xkms.exception.XKMSRequestException;
import org.apache.cxf.xkms.model.xkms.ValidateRequestType;
import org.apache.cxf.xkms.x509.validator.BasicValidationTest;
import org.apache.cxf.xkms.x509.validator.ValidateRequestParser;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/services/xkms/xkms-x509-handlers/src/test/java/org/apache/cxf/xkms/x509/validator/BasicValidationTest.java b/services/xkms/xkms-x509-handlers/src/test/java/org/apache/cxf/xkms/x509/validator/BasicValidationTest.java
index 5d7863f..1610e0a 100644
--- a/services/xkms/xkms-x509-handlers/src/test/java/org/apache/cxf/xkms/x509/validator/BasicValidationTest.java
+++ b/services/xkms/xkms-x509-handlers/src/test/java/org/apache/cxf/xkms/x509/validator/BasicValidationTest.java
@@ -24,6 +24,7 @@ import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
import org.apache.cxf.xkms.model.xkms.MessageAbstractType;
+
import org.junit.Before;
public class BasicValidationTest {
diff --git a/services/xkms/xkms-x509-handlers/src/test/java/org/apache/cxf/xkms/x509/validator/DateValidatorTest.java b/services/xkms/xkms-x509-handlers/src/test/java/org/apache/cxf/xkms/x509/validator/DateValidatorTest.java
index 789ec0d..9c6ff54 100644
--- a/services/xkms/xkms-x509-handlers/src/test/java/org/apache/cxf/xkms/x509/validator/DateValidatorTest.java
+++ b/services/xkms/xkms-x509-handlers/src/test/java/org/apache/cxf/xkms/x509/validator/DateValidatorTest.java
@@ -27,6 +27,7 @@ import org.apache.cxf.xkms.model.xkms.KeyBindingEnum;
import org.apache.cxf.xkms.model.xkms.ReasonEnum;
import org.apache.cxf.xkms.model.xkms.StatusType;
import org.apache.cxf.xkms.model.xkms.ValidateRequestType;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/services/xkms/xkms-x509-handlers/src/test/java/org/apache/cxf/xkms/x509/validator/TrustedAuthorityValidatorCRLTest.java b/services/xkms/xkms-x509-handlers/src/test/java/org/apache/cxf/xkms/x509/validator/TrustedAuthorityValidatorCRLTest.java
index c20b9bc..a34b5a6 100644
--- a/services/xkms/xkms-x509-handlers/src/test/java/org/apache/cxf/xkms/x509/validator/TrustedAuthorityValidatorCRLTest.java
+++ b/services/xkms/xkms-x509-handlers/src/test/java/org/apache/cxf/xkms/x509/validator/TrustedAuthorityValidatorCRLTest.java
@@ -32,6 +32,7 @@ import org.apache.cxf.helpers.FileUtils;
import org.apache.cxf.xkms.handlers.Applications;
import org.apache.cxf.xkms.model.xkms.UseKeyWithType;
import org.apache.cxf.xkms.x509.repo.file.FileCertificateRepo;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/services/xkms/xkms-x509-repo-ldap/src/test/java/org/apache/cxf/xkms/x509/repo/ldap/LDAPCertificateRepoTest.java b/services/xkms/xkms-x509-repo-ldap/src/test/java/org/apache/cxf/xkms/x509/repo/ldap/LDAPCertificateRepoTest.java
index d439e18..970b03b 100644
--- a/services/xkms/xkms-x509-repo-ldap/src/test/java/org/apache/cxf/xkms/x509/repo/ldap/LDAPCertificateRepoTest.java
+++ b/services/xkms/xkms-x509-repo-ldap/src/test/java/org/apache/cxf/xkms/x509/repo/ldap/LDAPCertificateRepoTest.java
@@ -33,6 +33,7 @@ import javax.naming.directory.Attributes;
import org.apache.cxf.xkms.handlers.Applications;
import org.apache.cxf.xkms.model.xkms.UseKeyWithType;
import org.apache.cxf.xkms.x509.repo.CertificateRepo;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/AbstractCdiMultiAppTest.java b/systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/AbstractCdiMultiAppTest.java
index c83ab14..524267f 100644
--- a/systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/AbstractCdiMultiAppTest.java
+++ b/systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/AbstractCdiMultiAppTest.java
@@ -29,6 +29,7 @@ import javax.ws.rs.core.Response;
import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
import org.apache.cxf.jaxrs.client.WebClient;
+
import org.junit.Test;
import static org.hamcrest.CoreMatchers.equalTo;
diff --git a/systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/AbstractCdiSingleAppTest.java b/systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/AbstractCdiSingleAppTest.java
index b2411eb..7a8f914 100644
--- a/systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/AbstractCdiSingleAppTest.java
+++ b/systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/AbstractCdiSingleAppTest.java
@@ -30,6 +30,7 @@ import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+
import org.junit.Test;
public abstract class AbstractCdiSingleAppTest extends AbstractBusClientServerTestBase {
diff --git a/systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/BookStoreByIds.java b/systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/BookStoreByIds.java
index 76193c4..5bd9aef 100644
--- a/systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/BookStoreByIds.java
+++ b/systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/BookStoreByIds.java
@@ -22,6 +22,7 @@ import java.util.Collection;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
+
import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
import javax.ws.rs.GET;
diff --git a/systests/cdi/cdi-owb/cdi-multiple-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java b/systests/cdi/cdi-owb/cdi-multiple-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java
index 7c7cf04..2534a5c 100644
--- a/systests/cdi/cdi-owb/cdi-multiple-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java
+++ b/systests/cdi/cdi-owb/cdi-multiple-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java
@@ -23,6 +23,7 @@ import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
import org.apache.cxf.systests.cdi.base.AbstractCdiMultiAppTest;
import org.apache.cxf.systests.cdi.base.jetty.AbstractJettyServer;
import org.apache.webbeans.servlet.WebBeansConfigurationListener;
+
import org.junit.BeforeClass;
public class JettyEmbeddedTest extends AbstractCdiMultiAppTest {
diff --git a/systests/cdi/cdi-owb/cdi-multiple-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java b/systests/cdi/cdi-owb/cdi-multiple-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
index ba6014c..67352de 100644
--- a/systests/cdi/cdi-owb/cdi-multiple-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
+++ b/systests/cdi/cdi-owb/cdi-multiple-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
@@ -23,6 +23,7 @@ import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
import org.apache.cxf.systests.cdi.base.AbstractCdiMultiAppTest;
import org.apache.cxf.systests.cdi.base.jetty.AbstractJettyServer;
import org.apache.webbeans.servlet.WebBeansConfigurationListener;
+
import org.junit.BeforeClass;
public class JettyWarTest extends AbstractCdiMultiAppTest {
diff --git a/systests/cdi/cdi-owb/cdi-multiple-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java b/systests/cdi/cdi-owb/cdi-multiple-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java
index 2772706..7ea8b6f 100644
--- a/systests/cdi/cdi-owb/cdi-multiple-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java
+++ b/systests/cdi/cdi-owb/cdi-multiple-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java
@@ -22,6 +22,7 @@ package org.apache.cxf.systest.jaxrs.cdi.tomcat;
import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
import org.apache.cxf.systests.cdi.base.AbstractCdiMultiAppTest;
import org.apache.cxf.systests.cdi.base.tomcat.AbstractTomcatServer;
+
import org.junit.BeforeClass;
public class TomcatWarTest extends AbstractCdiMultiAppTest {
diff --git a/systests/cdi/cdi-owb/cdi-no-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java b/systests/cdi/cdi-owb/cdi-no-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java
index 9abb2db..ee5e911 100644
--- a/systests/cdi/cdi-owb/cdi-no-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java
+++ b/systests/cdi/cdi-owb/cdi-no-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java
@@ -22,6 +22,7 @@ import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
import org.apache.cxf.systests.cdi.base.AbstractCdiSingleAppTest;
import org.apache.cxf.systests.cdi.base.jetty.AbstractJettyServer;
import org.apache.webbeans.servlet.WebBeansConfigurationListener;
+
import org.junit.BeforeClass;
public class JettyEmbeddedTest extends AbstractCdiSingleAppTest {
diff --git a/systests/cdi/cdi-owb/cdi-no-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java b/systests/cdi/cdi-owb/cdi-no-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
index 57353a9..6b5bd75 100644
--- a/systests/cdi/cdi-owb/cdi-no-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
+++ b/systests/cdi/cdi-owb/cdi-no-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
@@ -22,6 +22,7 @@ import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
import org.apache.cxf.systests.cdi.base.AbstractCdiSingleAppTest;
import org.apache.cxf.systests.cdi.base.jetty.AbstractJettyServer;
import org.apache.webbeans.servlet.WebBeansConfigurationListener;
+
import org.junit.BeforeClass;
public class JettyWarTest extends AbstractCdiSingleAppTest {
diff --git a/systests/cdi/cdi-owb/cdi-no-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java b/systests/cdi/cdi-owb/cdi-no-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java
index df8274c..ca9a883 100644
--- a/systests/cdi/cdi-owb/cdi-no-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java
+++ b/systests/cdi/cdi-owb/cdi-no-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java
@@ -21,6 +21,7 @@ package org.apache.cxf.systest.jaxrs.cdi.tomcat;
import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
... 4877 lines suppressed ...
--
To stop receiving notification emails like this one, please contact
"commits@cxf.apache.org" <co...@cxf.apache.org>.