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/03 22:41:17 UTC
[cxf] branch master updated: Start adjusting import orders to match
what checkstyle 8.x requires. :(
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
The following commit(s) were added to refs/heads/master by this push:
new 7b44ad9 Start adjusting import orders to match what checkstyle 8.x requires. :(
7b44ad9 is described below
commit 7b44ad9a1f63e729622cdc0378eda4c268eefa44
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Wed Jan 3 17:40:44 2018 -0500
Start adjusting import orders to match what checkstyle 8.x requires. :(
---
.../org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java | 1 -
.../apache/cxf/bus/spring/BusApplicationContextResourceResolver.java | 1 -
.../java/org/apache/cxf/bus/spring/BusExtensionPostProcessor.java | 1 -
.../main/java/org/apache/cxf/common/injection/ResourceInjector.java | 1 +
.../java/org/apache/cxf/common/util/ReflectionInvokationHandler.java | 1 -
.../apache/cxf/configuration/jsse/MultiKeyPasswordKeyManager.java | 1 +
core/src/main/java/org/apache/cxf/helpers/MapNamespaceContext.java | 1 +
.../main/java/org/apache/cxf/interceptor/ClientFaultConverter.java | 1 +
.../main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java | 1 +
core/src/main/java/org/apache/cxf/resource/ClassLoaderResolver.java | 1 -
.../main/java/org/apache/cxf/security/transport/TLSSessionInfo.java | 1 +
core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java | 1 -
core/src/main/java/org/apache/cxf/staxutils/WoodstoxHelper.java | 1 +
.../java/org/apache/cxf/transport/AbstractMultiplexDestination.java | 1 +
core/src/main/java/org/apache/cxf/ws/addressing/Names.java | 1 +
.../main/java/org/apache/cxf/ws/addressing/VersionTransformer.java | 5 -----
.../java/org/apache/cxf/attachment/AttachmentSerializerTest.java | 1 +
core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java | 2 +-
.../test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java | 1 +
.../apache/cxf/bus/managers/EndpointResolverRegistryImplTest.java | 2 +-
.../cxf/bus/managers/ServiceContractResolverRegistryImplTest.java | 1 +
core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java | 2 +-
.../java/org/apache/cxf/bus/spring/BusApplicationListenerTest.java | 3 ++-
.../test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java | 4 ++--
.../test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java | 1 +
.../java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManagerTest.java | 1 +
.../java/org/apache/cxf/common/annotation/AnnotatedGreeterImpl.java | 1 +
.../org/apache/cxf/common/annotation/AnnotationProcessorTest.java | 2 ++
core/src/test/java/org/apache/cxf/common/i18n/MessageTest.java | 1 +
.../java/org/apache/cxf/common/injection/ResourceInjectorTest.java | 2 --
core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java | 1 +
.../java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java | 2 --
.../apache/cxf/continuations/SuspendedInvocationExceptionTest.java | 1 +
.../java/org/apache/cxf/feature/transform/XSLTInterceptorsTest.java | 2 ++
core/src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java | 1 +
.../java/org/apache/cxf/interceptor/LoggingInInterceptorTest.java | 1 -
.../java/org/apache/cxf/interceptor/LoggingOutInterceptorTest.java | 2 +-
.../org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java | 1 +
.../org/apache/cxf/interceptor/ServiceInvokerInterceptorTest.java | 1 +
.../apache/cxf/interceptor/security/JAASLoginInterceptorTest.java | 1 +
.../security/OperationInfoAuthorizingInterceptorTest.java | 2 +-
.../cxf/interceptor/security/SecureAnnotationsInterceptorTest.java | 2 +-
.../cxf/interceptor/security/SimpleAuthorizingInterceptorTest.java | 2 +-
core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java | 1 +
.../test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java | 2 +-
core/src/test/java/org/apache/cxf/resource/URIResolverTest.java | 1 +
.../apache/cxf/staxutils/PropertiesExpandingStreamReaderTest.java | 1 +
.../apache/cxf/staxutils/validation/Stax2ValidationUtilsTest.java | 2 ++
.../java/org/apache/cxf/transport/ChainInitiationObserverTest.java | 1 +
.../org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java | 2 +-
.../src/test/java/org/apache/cxf/ws/addressing/ContextUtilsTest.java | 1 +
.../apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java | 1 -
52 files changed, 46 insertions(+), 29 deletions(-)
diff --git a/core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java b/core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java
index 141154c..3a35525 100644
--- a/core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java
@@ -20,7 +20,6 @@
package org.apache.cxf.bus.managers;
import java.util.Map;
-
import java.util.ResourceBundle;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
diff --git a/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContextResourceResolver.java b/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContextResourceResolver.java
index 3f56a8c..607ec69 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContextResourceResolver.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContextResourceResolver.java
@@ -24,7 +24,6 @@ import java.net.URL;
import org.apache.cxf.common.injection.NoJSR250Annotations;
import org.apache.cxf.resource.ResourceResolver;
-
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.context.ApplicationContext;
diff --git a/core/src/main/java/org/apache/cxf/bus/spring/BusExtensionPostProcessor.java b/core/src/main/java/org/apache/cxf/bus/spring/BusExtensionPostProcessor.java
index 8ef72ef..a018217 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/BusExtensionPostProcessor.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/BusExtensionPostProcessor.java
@@ -22,7 +22,6 @@ package org.apache.cxf.bus.spring;
import org.apache.cxf.Bus;
import org.apache.cxf.common.injection.NoJSR250Annotations;
import org.apache.cxf.extension.BusExtension;
-
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.context.ApplicationContext;
diff --git a/core/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java b/core/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java
index c3d403a..8aa621f 100644
--- a/core/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java
+++ b/core/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java
@@ -30,6 +30,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
+
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import javax.annotation.Resource;
diff --git a/core/src/main/java/org/apache/cxf/common/util/ReflectionInvokationHandler.java b/core/src/main/java/org/apache/cxf/common/util/ReflectionInvokationHandler.java
index 4c10272..e4ca998 100644
--- a/core/src/main/java/org/apache/cxf/common/util/ReflectionInvokationHandler.java
+++ b/core/src/main/java/org/apache/cxf/common/util/ReflectionInvokationHandler.java
@@ -27,7 +27,6 @@ import java.lang.annotation.Target;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-
import java.lang.reflect.Proxy;
import java.util.Iterator;
diff --git a/core/src/main/java/org/apache/cxf/configuration/jsse/MultiKeyPasswordKeyManager.java b/core/src/main/java/org/apache/cxf/configuration/jsse/MultiKeyPasswordKeyManager.java
index c6dcbc9..f507ffe 100644
--- a/core/src/main/java/org/apache/cxf/configuration/jsse/MultiKeyPasswordKeyManager.java
+++ b/core/src/main/java/org/apache/cxf/configuration/jsse/MultiKeyPasswordKeyManager.java
@@ -26,6 +26,7 @@ import java.security.Principal;
import java.security.PrivateKey;
import java.security.cert.Certificate;
import java.security.cert.X509Certificate;
+
import javax.net.ssl.X509KeyManager;
public class MultiKeyPasswordKeyManager implements X509KeyManager {
diff --git a/core/src/main/java/org/apache/cxf/helpers/MapNamespaceContext.java b/core/src/main/java/org/apache/cxf/helpers/MapNamespaceContext.java
index 02f18b7..8b3cf47 100644
--- a/core/src/main/java/org/apache/cxf/helpers/MapNamespaceContext.java
+++ b/core/src/main/java/org/apache/cxf/helpers/MapNamespaceContext.java
@@ -21,6 +21,7 @@ package org.apache.cxf.helpers;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+
import javax.xml.XMLConstants;
import javax.xml.namespace.NamespaceContext;
diff --git a/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java b/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java
index 3e76995..2473c07 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java
@@ -39,6 +39,7 @@ import javax.xml.xpath.XPathConstants;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.ReflectionUtil;
import org.apache.cxf.common.util.StringUtils;
diff --git a/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java
index dff6bb6..2d99d92 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java
@@ -27,6 +27,7 @@ import java.io.StringWriter;
import java.io.Writer;
import java.util.logging.Level;
import java.util.logging.Logger;
+
import org.apache.cxf.common.injection.NoJSR250Annotations;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.io.CacheAndWriteOutputStream;
diff --git a/core/src/main/java/org/apache/cxf/resource/ClassLoaderResolver.java b/core/src/main/java/org/apache/cxf/resource/ClassLoaderResolver.java
index 2d8c05c..c7dbc3e 100644
--- a/core/src/main/java/org/apache/cxf/resource/ClassLoaderResolver.java
+++ b/core/src/main/java/org/apache/cxf/resource/ClassLoaderResolver.java
@@ -20,7 +20,6 @@
package org.apache.cxf.resource;
import java.io.InputStream;
-
import java.net.URL;
import org.apache.cxf.common.injection.NoJSR250Annotations;
diff --git a/core/src/main/java/org/apache/cxf/security/transport/TLSSessionInfo.java b/core/src/main/java/org/apache/cxf/security/transport/TLSSessionInfo.java
index 79a5316..b8dd8f9 100644
--- a/core/src/main/java/org/apache/cxf/security/transport/TLSSessionInfo.java
+++ b/core/src/main/java/org/apache/cxf/security/transport/TLSSessionInfo.java
@@ -20,6 +20,7 @@
package org.apache.cxf.security.transport;
import java.security.cert.Certificate;
+
import javax.net.ssl.SSLSession;
/**
diff --git a/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java b/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
index 53cc1ab..767894d 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
@@ -26,7 +26,6 @@ import javax.xml.stream.Location;
import javax.xml.stream.XMLStreamException;
import org.w3c.dom.Attr;
-
import org.w3c.dom.Comment;
import org.w3c.dom.Document;
import org.w3c.dom.DocumentFragment;
diff --git a/core/src/main/java/org/apache/cxf/staxutils/WoodstoxHelper.java b/core/src/main/java/org/apache/cxf/staxutils/WoodstoxHelper.java
index b389589..46873d5 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/WoodstoxHelper.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/WoodstoxHelper.java
@@ -25,6 +25,7 @@ import javax.xml.stream.XMLStreamReader;
import com.ctc.wstx.stax.WstxEventFactory;
import com.ctc.wstx.stax.WstxInputFactory;
+
import org.codehaus.stax2.XMLStreamReader2;
/**
diff --git a/core/src/main/java/org/apache/cxf/transport/AbstractMultiplexDestination.java b/core/src/main/java/org/apache/cxf/transport/AbstractMultiplexDestination.java
index 4974f81..9fca229 100644
--- a/core/src/main/java/org/apache/cxf/transport/AbstractMultiplexDestination.java
+++ b/core/src/main/java/org/apache/cxf/transport/AbstractMultiplexDestination.java
@@ -29,6 +29,7 @@ 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.ReferenceParametersType;
+
import static org.apache.cxf.ws.addressing.JAXWSAConstants.ADDRESSING_PROPERTIES_INBOUND;
public abstract class AbstractMultiplexDestination extends AbstractDestination implements
diff --git a/core/src/main/java/org/apache/cxf/ws/addressing/Names.java b/core/src/main/java/org/apache/cxf/ws/addressing/Names.java
index ead6946..5805c2b 100644
--- a/core/src/main/java/org/apache/cxf/ws/addressing/Names.java
+++ b/core/src/main/java/org/apache/cxf/ws/addressing/Names.java
@@ -23,6 +23,7 @@ package org.apache.cxf.ws.addressing;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
+
import javax.xml.namespace.QName;
diff --git a/core/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java b/core/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java
index 1fdca0b..68b98e5 100644
--- a/core/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java
+++ b/core/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java
@@ -31,14 +31,9 @@ import javax.xml.namespace.QName;
//import javax.xml.ws.EndpointReference;
//import javax.xml.ws.wsaddressing.W3CEndpointReference;
-
-
import org.w3c.dom.Element;
import org.apache.cxf.common.jaxb.JAXBUtils;
-// importation convention: if the same class name is used for
-// 2005/08 and 2004/08, then the former version is imported
-// and the latter is fully qualified when used
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.ws.addressing.v200408.AttributedQName;
import org.apache.cxf.ws.addressing.v200408.AttributedURI;
diff --git a/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java b/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java
index d2d4f98..66a2ec0 100644
--- a/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java
+++ b/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java
@@ -38,6 +38,7 @@ import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.message.Attachment;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java b/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java
index a473a0d..63892a1 100644
--- a/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java
@@ -33,9 +33,9 @@ import org.apache.cxf.management.InstrumentationManager;
import org.apache.cxf.phase.PhaseManager;
import org.apache.cxf.transport.ConduitInitiatorManager;
import org.apache.cxf.transport.DestinationFactoryManager;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.Assert;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java b/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java
index e9a4330..bf9660f 100644
--- a/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java
@@ -26,6 +26,7 @@ import org.apache.cxf.resource.DefaultResourceManager;
import org.apache.cxf.resource.ResourceManager;
import org.apache.cxf.resource.ResourceResolver;
import org.apache.cxf.resource.SinglePropertyResolver;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImplTest.java b/core/src/test/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImplTest.java
index a8cae96..4e2525e 100644
--- a/core/src/test/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImplTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImplTest.java
@@ -23,9 +23,9 @@ import javax.xml.namespace.QName;
import org.apache.cxf.endpoint.EndpointResolver;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/core/src/test/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImplTest.java b/core/src/test/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImplTest.java
index 5bb9f68..8ba8325 100644
--- a/core/src/test/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImplTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImplTest.java
@@ -25,6 +25,7 @@ import java.net.URISyntaxException;
import javax.xml.namespace.QName;
import org.apache.cxf.endpoint.ServiceContractResolver;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
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 17b8b33..139d6e3 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
@@ -35,11 +35,11 @@ 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/BusApplicationListenerTest.java b/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationListenerTest.java
index 8ebdcbb..4005303 100644
--- a/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationListenerTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationListenerTest.java
@@ -21,14 +21,15 @@ package org.apache.cxf.bus.spring;
import org.apache.cxf.Bus;
import org.apache.cxf.bus.managers.CXFBusLifeCycleManager;
import org.apache.cxf.buslifecycle.BusLifeCycleListener;
+
import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
+
import org.springframework.context.support.AbstractRefreshableApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-
public class BusApplicationListenerTest extends Assert {
@Test
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 b4f5e14..b68545e 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,12 +32,12 @@ 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;
+
+
public class BusDefinitionParserTest extends Assert {
@Test
diff --git a/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java b/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
index d366dbf..e32b6fa 100644
--- a/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
@@ -48,6 +48,7 @@ import org.apache.cxf.resource.ResourceManager;
import org.apache.cxf.transport.ConduitInitiatorManager;
import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.workqueue.WorkQueueManager;
+
import org.easymock.EasyMock;
import org.junit.After;
import org.junit.Assert;
diff --git a/core/src/test/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManagerTest.java b/core/src/test/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManagerTest.java
index 6e65590..08ac8d3 100644
--- a/core/src/test/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManagerTest.java
+++ b/core/src/test/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManagerTest.java
@@ -20,6 +20,7 @@
package org.apache.cxf.buslifecycle;
import org.apache.cxf.bus.managers.CXFBusLifeCycleManager;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/core/src/test/java/org/apache/cxf/common/annotation/AnnotatedGreeterImpl.java b/core/src/test/java/org/apache/cxf/common/annotation/AnnotatedGreeterImpl.java
index 77ab26b..bcc36b0 100644
--- a/core/src/test/java/org/apache/cxf/common/annotation/AnnotatedGreeterImpl.java
+++ b/core/src/test/java/org/apache/cxf/common/annotation/AnnotatedGreeterImpl.java
@@ -23,6 +23,7 @@ package org.apache.cxf.common.annotation;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Logger;
+
import javax.annotation.Resource;
import javax.jws.HandlerChain;
import javax.jws.WebMethod;
diff --git a/core/src/test/java/org/apache/cxf/common/annotation/AnnotationProcessorTest.java b/core/src/test/java/org/apache/cxf/common/annotation/AnnotationProcessorTest.java
index 7967cbe..c6ba10d 100644
--- a/core/src/test/java/org/apache/cxf/common/annotation/AnnotationProcessorTest.java
+++ b/core/src/test/java/org/apache/cxf/common/annotation/AnnotationProcessorTest.java
@@ -26,10 +26,12 @@ import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
+
import javax.annotation.Resource;
import javax.jws.WebMethod;
import javax.jws.WebService;
import javax.xml.ws.WebServiceContext;
+
import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Before;
diff --git a/core/src/test/java/org/apache/cxf/common/i18n/MessageTest.java b/core/src/test/java/org/apache/cxf/common/i18n/MessageTest.java
index 1585b48..4dd0127 100644
--- a/core/src/test/java/org/apache/cxf/common/i18n/MessageTest.java
+++ b/core/src/test/java/org/apache/cxf/common/i18n/MessageTest.java
@@ -27,6 +27,7 @@ import java.util.ResourceBundle;
import java.util.logging.Logger;
import org.apache.cxf.common.logging.LogUtils;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java b/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java
index c320a0a..e16e622 100644
--- a/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java
+++ b/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java
@@ -24,7 +24,6 @@ import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.lang.reflect.Proxy;
-
import java.util.ArrayList;
import java.util.List;
@@ -36,7 +35,6 @@ import javax.annotation.Resources;
import net.sf.cglib.proxy.Enhancer;
import net.sf.cglib.proxy.MethodInterceptor;
import net.sf.cglib.proxy.MethodProxy;
-
import org.apache.cxf.resource.ResourceManager;
import org.apache.cxf.resource.ResourceResolver;
diff --git a/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java
index 3a797b6..c5978e6 100644
--- a/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java
@@ -28,6 +28,7 @@ import java.util.Collections;
import org.apache.cxf.validation.BeanValidationProvider;
import org.apache.cxf.validation.ValidationConfiguration;
+
import org.junit.Assert;
import org.junit.Test;
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 40e4491..853b8bc 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
@@ -38,8 +38,6 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-
public class ConfigurerImplTest extends Assert {
static {
diff --git a/core/src/test/java/org/apache/cxf/continuations/SuspendedInvocationExceptionTest.java b/core/src/test/java/org/apache/cxf/continuations/SuspendedInvocationExceptionTest.java
index 273e715..19e15df 100644
--- a/core/src/test/java/org/apache/cxf/continuations/SuspendedInvocationExceptionTest.java
+++ b/core/src/test/java/org/apache/cxf/continuations/SuspendedInvocationExceptionTest.java
@@ -20,6 +20,7 @@
package org.apache.cxf.continuations;
import org.apache.cxf.common.i18n.UncheckedException;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/feature/transform/XSLTInterceptorsTest.java b/core/src/test/java/org/apache/cxf/feature/transform/XSLTInterceptorsTest.java
index 30cf74c..72f6b2b 100644
--- a/core/src/test/java/org/apache/cxf/feature/transform/XSLTInterceptorsTest.java
+++ b/core/src/test/java/org/apache/cxf/feature/transform/XSLTInterceptorsTest.java
@@ -35,6 +35,7 @@ import javax.xml.transform.stream.StreamSource;
import org.w3c.dom.Document;
import org.w3c.dom.NodeList;
+
import org.xml.sax.SAXException;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
@@ -44,6 +45,7 @@ import org.apache.cxf.io.CachedWriter;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.staxutils.StaxUtils;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java b/core/src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java
index 99cb297..c143dd1 100644
--- a/core/src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java
@@ -23,6 +23,7 @@ package org.apache.cxf.helpers;
import org.apache.cxf.annotations.SchemaValidation.SchemaValidationType;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.message.Message;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/core/src/test/java/org/apache/cxf/interceptor/LoggingInInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/LoggingInInterceptorTest.java
index ccf9aee..d2e981c 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/LoggingInInterceptorTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/LoggingInInterceptorTest.java
@@ -31,7 +31,6 @@ import org.apache.cxf.message.MessageImpl;
import org.easymock.EasyMock;
import org.easymock.IAnswer;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/core/src/test/java/org/apache/cxf/interceptor/LoggingOutInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/LoggingOutInterceptorTest.java
index 3b3158a..e9c3212 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/LoggingOutInterceptorTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/LoggingOutInterceptorTest.java
@@ -35,9 +35,9 @@ 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.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java
index ca29607..6b1d461 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java
@@ -37,6 +37,7 @@ import org.apache.cxf.service.model.BindingMessageInfo;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.MessageInfo;
import org.apache.cxf.service.model.OperationInfo;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
diff --git a/core/src/test/java/org/apache/cxf/interceptor/ServiceInvokerInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/ServiceInvokerInterceptorTest.java
index d1e40be..ab28a58 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/ServiceInvokerInterceptorTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/ServiceInvokerInterceptorTest.java
@@ -31,6 +31,7 @@ import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.service.ServiceImpl;
import org.apache.cxf.service.invoker.Invoker;
import org.apache.cxf.service.model.ServiceInfo;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/core/src/test/java/org/apache/cxf/interceptor/security/JAASLoginInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/security/JAASLoginInterceptorTest.java
index ac1eb0a..acb184e 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/security/JAASLoginInterceptorTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/security/JAASLoginInterceptorTest.java
@@ -38,6 +38,7 @@ import org.apache.cxf.interceptor.security.callback.CertKeyToUserNameMapper;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.security.transport.TLSSessionInfo;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/interceptor/security/OperationInfoAuthorizingInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/security/OperationInfoAuthorizingInterceptorTest.java
index 21b783a..ce8d599 100755
--- a/core/src/test/java/org/apache/cxf/interceptor/security/OperationInfoAuthorizingInterceptorTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/security/OperationInfoAuthorizingInterceptorTest.java
@@ -28,8 +28,8 @@ import org.apache.cxf.service.Service;
import org.apache.cxf.service.invoker.MethodDispatcher;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.OperationInfo;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Before;
public class OperationInfoAuthorizingInterceptorTest extends SimpleAuthorizingInterceptorTest {
diff --git a/core/src/test/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptorTest.java
index 60cff9e..90dd52f 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptorTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptorTest.java
@@ -34,8 +34,8 @@ import org.apache.cxf.security.SecurityContext;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.invoker.MethodDispatcher;
import org.apache.cxf.service.model.BindingOperationInfo;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptorTest.java
index 73e79cd..1b8f10b 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptorTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptorTest.java
@@ -31,8 +31,8 @@ import org.apache.cxf.security.SecurityContext;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.invoker.MethodDispatcher;
import org.apache.cxf.service.model.BindingOperationInfo;
-import org.easymock.EasyMock;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java b/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
index e898f00..0bf6a79 100755
--- a/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
+++ b/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
@@ -31,6 +31,7 @@ import java.nio.charset.StandardCharsets;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.helpers.IOUtils;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
diff --git a/core/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java b/core/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java
index a8fa5ec..07c931b 100644
--- a/core/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java
+++ b/core/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java
@@ -34,9 +34,9 @@ import org.apache.cxf.interceptor.InterceptorChain;
import org.apache.cxf.logging.FaultListener;
import org.apache.cxf.message.FaultMode;
import org.apache.cxf.message.Message;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/core/src/test/java/org/apache/cxf/resource/URIResolverTest.java b/core/src/test/java/org/apache/cxf/resource/URIResolverTest.java
index 4ef6338..9834c1a 100644
--- a/core/src/test/java/org/apache/cxf/resource/URIResolverTest.java
+++ b/core/src/test/java/org/apache/cxf/resource/URIResolverTest.java
@@ -23,6 +23,7 @@ import java.io.InputStream;
import java.net.URL;
import org.apache.cxf.helpers.IOUtils;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/staxutils/PropertiesExpandingStreamReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/PropertiesExpandingStreamReaderTest.java
index fc16421..2478415 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/PropertiesExpandingStreamReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/PropertiesExpandingStreamReaderTest.java
@@ -29,6 +29,7 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.apache.cxf.helpers.DOMUtils;
+
import org.junit.Assert;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/staxutils/validation/Stax2ValidationUtilsTest.java b/core/src/test/java/org/apache/cxf/staxutils/validation/Stax2ValidationUtilsTest.java
index e21bbf9..d6cc958 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/validation/Stax2ValidationUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/validation/Stax2ValidationUtilsTest.java
@@ -26,6 +26,7 @@ import java.io.StringReader;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
@@ -35,6 +36,7 @@ import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.service.model.SchemaInfo;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.ws.commons.schema.XmlSchemaCollection;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/transport/ChainInitiationObserverTest.java b/core/src/test/java/org/apache/cxf/transport/ChainInitiationObserverTest.java
index 5caf301..10d4055 100644
--- a/core/src/test/java/org/apache/cxf/transport/ChainInitiationObserverTest.java
+++ b/core/src/test/java/org/apache/cxf/transport/ChainInitiationObserverTest.java
@@ -25,6 +25,7 @@ import java.util.TreeSet;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.Phase;
import org.apache.cxf.phase.PhaseInterceptorChain;
+
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.After;
diff --git a/core/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java b/core/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java
index c82416e..c23dfb9 100644
--- a/core/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java
+++ b/core/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java
@@ -34,8 +34,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/core/src/test/java/org/apache/cxf/ws/addressing/ContextUtilsTest.java b/core/src/test/java/org/apache/cxf/ws/addressing/ContextUtilsTest.java
index c66f3d2..d9d634c 100644
--- a/core/src/test/java/org/apache/cxf/ws/addressing/ContextUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/ws/addressing/ContextUtilsTest.java
@@ -24,6 +24,7 @@ import java.util.Random;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
+
import org.junit.Test;
import static org.apache.cxf.ws.addressing.ContextUtils.getAttributedURI;
diff --git a/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java b/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java
index 079e236..92a7e8f 100644
--- a/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java
+++ b/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java
@@ -24,7 +24,6 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.cxf.tools.corba.IDLToWSDL;
-
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
--
To stop receiving notification emails like this one, please contact
['"commits@cxf.apache.org" <co...@cxf.apache.org>'].