You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by al...@apache.org on 2018/09/17 17:36:09 UTC

[camel] branch master updated: CAMEL-12816: Fixed CS issues in some components

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

aldettinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new cc70d07  CAMEL-12816: Fixed CS issues in some components
cc70d07 is described below

commit cc70d07ff5e1db4dba852317312fca1e344666c5
Author: aldettinger <al...@gmail.com>
AuthorDate: Mon Sep 17 19:12:23 2018 +0200

    CAMEL-12816: Fixed CS issues in some components
---
 .../org/apache/camel/component/disruptor/DisruptorProducer.java  | 1 -
 .../org/apache/camel/component/disruptor/DisruptorReference.java | 1 -
 .../component/disruptor/DisruptorWaitStrategyCreationTest.java   | 1 -
 .../disruptor/FileDisruptorShutdownCompleteAllTasksTest.java     | 3 +--
 .../camel/component/disruptor/SedaDisruptorCompareTest.java      | 3 ---
 .../disruptor/vm/DisruptorVmComponentReferenceEndpointTest.java  | 3 +--
 .../disruptor/vm/DisruptorVmConcurrentConsumersTest.java         | 3 +--
 .../component/disruptor/vm/DisruptorVmInOnlyChainedTest.java     | 3 +--
 .../camel/component/disruptor/vm/DisruptorVmInOnlyTest.java      | 3 +--
 .../component/disruptor/vm/DisruptorVmInOutChainedTest.java      | 3 +--
 .../disruptor/vm/DisruptorVmInOutChainedTimeoutTest.java         | 3 +--
 .../camel/component/disruptor/vm/DisruptorVmInOutTest.java       | 3 +--
 .../component/disruptor/vm/DisruptorVmInOutWithErrorTest.java    | 3 +--
 .../disruptor/vm/DisruptorVmMultipleConsumersIssueTest.java      | 3 +--
 .../disruptor/vm/DisruptorVmMultipleContextsStartStopTest.java   | 3 +--
 .../camel/component/disruptor/vm/DisruptorVmQueueTest.java       | 3 +--
 .../disruptor/vm/DisruptorVmShouldNotUseSameThreadTest.java      | 3 +--
 .../camel/component/disruptor/vm/DisruptorVmSplitterTest.java    | 3 +--
 .../component/disruptor/vm/DisruptorVmTimeoutIssueTest.java      | 3 +--
 .../component/disruptor/vm/DisruptorVmUseSameQueueTest.java      | 3 +--
 .../disruptor/vm/DisruptorVmWaitForTaskCompleteTest.java         | 3 +--
 .../disruptor/vm/DisruptorVmWaitForTaskIfReplyExpectedTest.java  | 3 +--
 .../component/disruptor/vm/DisruptorVmWaitForTaskNewerTest.java  | 3 +--
 .../disruptor/vm/SameDisruptorVmQueueSizeAndNoSizeTest.java      | 3 +--
 .../apache/camel/component/file/remote/DSAKeyPairIdentity.java   | 1 -
 .../org/apache/camel/component/file/remote/FtpsOperations.java   | 1 +
 .../apache/camel/component/file/remote/OsgiParserFactory.java    | 1 -
 .../apache/camel/component/file/remote/RSAKeyPairIdentity.java   | 1 -
 .../camel/component/file/remote/FromFtpRecursiveNoopTest.java    | 3 +--
 .../component/file/remote/FtpBadLoginConnectionLeakTest.java     | 1 +
 .../file/remote/FtpBadLoginInProducerConnectionLeakTest.java     | 1 +
 .../file/remote/FtpBadLoginMockNoopConnectionLeakTest.java       | 4 ++--
 .../camel/component/file/remote/FtpConsumerDisconnectTest.java   | 3 +--
 .../component/file/remote/FtpConsumerRelativeFileNameTest.java   | 3 +--
 .../remote/FtpProducerAllowNullBodyFileAlreadyExistTest.java     | 3 +--
 .../file/remote/FtpProducerDisconnectOnBatchCompleteTest.java    | 3 +--
 .../camel/component/file/remote/FtpProducerDisconnectTest.java   | 3 +--
 .../component/file/remote/FtpProducerFileWithCharsetTest.java    | 3 +--
 .../file/remote/FtpUtilsExtractDirNameFromAbsolutePathTest.java  | 1 +
 .../file/remote/RemoteFileProduceOverruleOnlyOnceTest.java       | 3 +--
 .../component/file/remote/manual/FtpConsumerCamelManualTest.java | 3 +--
 .../file/remote/manual/FtpConsumerCamelRecursiveManualTest.java  | 3 +--
 .../manual/FtpConsumerCamelRecursiveToAbsoluteManualTest.java    | 3 +--
 .../remote/manual/FtpConsumerNotStepwiseCamelManualTest.java     | 3 +--
 .../manual/FtpConsumerNotStepwiseCamelRecursiveManualTest.java   | 3 +--
 ...FtpConsumerNotStepwiseCamelRecursiveToAbsoluteManualTest.java | 3 +--
 .../component/file/remote/manual/FtpConsumerScottManualTest.java | 3 +--
 .../file/remote/manual/FtpConsumerScottRecursiveManualTest.java  | 3 +--
 .../component/file/remote/sftp/SftpChangedReadLockTest.java      | 3 +--
 .../hawtdb/HawtDBAggregateConcurrentDifferentGroupsTest.java     | 3 +--
 .../component/hawtdb/HawtDBAggregateConcurrentSameGroupTest.java | 3 +--
 .../component/hawtdb/HawtDBAggregateDiscardOnTimeoutTest.java    | 3 +--
 .../hawtdb/HawtDBAggregateForceCompletionHeaderTest.java         | 3 +--
 .../hawtdb/HawtDBAggregateNotLostRemovedWhenConfirmedTest.java   | 3 +--
 .../camel/component/hawtdb/HawtDBAggregateNotLostTest.java       | 3 +--
 .../HawtDBAggregateRecoverDeadLetterChannelFailedTest.java       | 3 +--
 .../hawtdb/HawtDBAggregateRecoverDeadLetterChannelTest.java      | 3 +--
 .../camel/component/hawtdb/HawtDBAggregateRecoverTest.java       | 3 +--
 .../hawtdb/HawtDBAggregateRecoverWithRedeliveryPolicyTest.java   | 3 +--
 .../component/hawtdb/HawtDBAggregateRecoverWithSedaTest.java     | 3 +--
 .../component/hawtdb/HawtDBAggregateSerializedHeadersTest.java   | 3 +--
 .../org/apache/camel/component/hawtdb/HawtDBAggregateTest.java   | 3 +--
 .../hawtdb/HawtDBAggregateTimeoutCompletionRestartTest.java      | 3 +--
 .../hawtdb/HawtDBAggregationRepositoryAlotDataTest.java          | 5 ++---
 .../hawtdb/HawtDBAggregationRepositoryLoadExistingTest.java      | 5 ++---
 .../hawtdb/HawtDBAggregationRepositoryMultipleRepoTest.java      | 5 ++---
 .../hawtdb/HawtDBAggregationRepositoryRecoverExistingTest.java   | 3 +--
 .../camel/component/hawtdb/HawtDBAggregationRepositoryTest.java  | 5 ++---
 .../camel/component/hawtdb/HawtDBExchangeSerializationTest.java  | 5 ++---
 .../org/apache/camel/component/hawtdb/HawtDBGetNotFoundTest.java | 5 ++---
 .../org/apache/camel/component/hawtdb/HawtDBGrowIssueTest.java   | 5 ++---
 .../HawtDBSpringAggregateRecoverWithRedeliveryPolicyTest.java    | 3 +--
 .../apache/camel/component/hawtdb/HawtDBSpringAggregateTest.java | 3 +--
 .../org/apache/camel/component/mail/DefaultJavaMailSender.java   | 1 +
 .../org/apache/camel/component/mail/DefaultMailUidGenerator.java | 1 +
 .../org/apache/camel/component/mail/DummySSLSocketFactory.java   | 1 +
 .../java/org/apache/camel/component/mail/JavaMailSender.java     | 1 +
 .../main/java/org/apache/camel/component/mail/MailComponent.java | 1 +
 .../java/org/apache/camel/component/mail/MailConfiguration.java  | 1 +
 .../main/java/org/apache/camel/component/mail/MailConsumer.java  | 1 +
 .../java/org/apache/camel/component/mail/MailConverters.java     | 1 -
 .../main/java/org/apache/camel/component/mail/MailMessage.java   | 1 +
 .../main/java/org/apache/camel/component/mail/NowSearchTerm.java | 1 +
 .../java/org/apache/camel/component/mail/SearchTermBuilder.java  | 1 +
 .../camel/dataformat/mime/multipart/MimeMultipartDataFormat.java | 1 +
 .../camel/component/mail/MailAttachmentRedeliveryTest.java       | 1 +
 .../org/apache/camel/component/mail/MailBatchConsumerTest.java   | 3 +--
 .../apache/camel/component/mail/MailCommitOnCompletionTest.java  | 3 +--
 .../camel/component/mail/MailConsumerUnsupportedCharsetTest.java | 3 +--
 .../apache/camel/component/mail/MailContentTypeResolverTest.java | 1 +
 .../java/org/apache/camel/component/mail/MailConvertersTest.java | 4 ++--
 .../java/org/apache/camel/component/mail/MailCopyToTest.java     | 3 +--
 .../apache/camel/component/mail/MailCustomMailSenderTest.java    | 1 +
 .../camel/component/mail/MailDoNotDeleteIfProcessFailsTest.java  | 3 +--
 .../java/org/apache/camel/component/mail/MailFetchSizeTest.java  | 3 +--
 .../org/apache/camel/component/mail/MailFetchSizeZeroTest.java   | 3 +--
 .../component/mail/MailIdempotentRepositoryDuplicateTest.java    | 3 +--
 .../camel/component/mail/MailIdempotentRepositoryTest.java       | 3 +--
 .../apache/camel/component/mail/MailMaxMessagesPerPollTest.java  | 3 +--
 .../component/mail/MailMultipleRecipientsUsingHeadersTest.java   | 1 +
 .../apache/camel/component/mail/MailPollEnrichNoMailTest.java    | 3 +--
 .../java/org/apache/camel/component/mail/MailPollEnrichTest.java | 3 +--
 .../apache/camel/component/mail/MailPostProcessActionTest.java   | 3 +--
 .../camel/component/mail/MailProcessOnlyUnseenMessagesTest.java  | 3 +--
 .../java/org/apache/camel/component/mail/MailSearchTermTest.java | 3 +--
 .../component/mail/MailSearchTermUriConfigLast24HoursTest.java   | 4 ++--
 .../apache/camel/component/mail/MailSearchTermUriConfigTest.java | 3 +--
 .../camel/component/mail/MailShutdownCompleteAllTasksTest.java   | 3 +--
 .../component/mail/MailShutdownCompleteCurrentTaskOnlyTest.java  | 3 +--
 .../java/org/apache/camel/component/mail/MailSortTermTest.java   | 4 +---
 .../org/apache/camel/component/mail/MailSortTermThreeTest.java   | 4 ++--
 .../org/apache/camel/component/mail/MailSortTermTwoTest.java     | 4 ++--
 .../apache/camel/component/mail/MailUsingCustomSessionTest.java  | 1 +
 .../camel/component/mail/MimeMultipartAlternativeTest.java       | 1 +
 .../mail/MimeMultipartAlternativeWithLongerFilenameTest.java     | 1 +
 .../java/org/apache/camel/component/mail/RawMailMessageTest.java | 4 ++--
 .../org/apache/camel/component/mail/SearchTermBuilderTest.java   | 4 ++--
 .../java/org/apache/camel/component/mail/mock/MyMockStore.java   | 1 +
 .../mail/security/SslContextParametersMailRouteTest.java         | 1 +
 .../camel/component/netty/http/JAASSecurityAuthenticator.java    | 1 +
 .../camel/component/netty/http/SecurityAuthenticatorSupport.java | 1 +
 .../component/netty/http/handlers/HttpServerChannelHandler.java  | 2 +-
 .../netty/http/handlers/HttpServerMultiplexChannelHandler.java   | 1 +
 .../org/apache/camel/component/netty/http/BaseNettyTest.java     | 3 ---
 .../camel/component/netty/http/ManagedNettyEndpointTest.java     | 1 +
 .../org/apache/camel/component/netty/http/MyLoginModule.java     | 1 +
 .../netty/http/NettyHttpBasicAuthConstraintMapperTest.java       | 5 ++---
 .../camel/component/netty/http/NettyHttpBasicAuthTest.java       | 5 ++---
 .../camel/component/netty/http/NettyHttpGlobalSSLTest.java       | 3 ---
 .../org/apache/camel/component/netty/http/NettyHttpSSLTest.java  | 4 ++--
 .../netty/http/NettyHttpSimpleBasicAuthConstraintMapperTest.java | 5 ++---
 .../camel/component/netty/http/NettyHttpSimpleBasicAuthTest.java | 5 ++---
 .../camel/component/netty/http/NettySharedHttpServerTest.java    | 3 +--
 .../component/netty/http/SecurityConstraintMappingTest.java      | 3 +--
 .../camel/component/netty/http/SpringNettyHttpBasicAuthTest.java | 5 +----
 .../camel/component/netty/http/SpringNettyHttpSSLTest.java       | 6 ++----
 .../camel/component/netty/http/rest/RestPathMatchingTest.java    | 5 ++---
 .../camel/component/netty4/http/HttpServerBootstrapFactory.java  | 2 --
 .../camel/component/netty4/http/JAASSecurityAuthenticator.java   | 1 +
 .../component/netty4/http/SecurityAuthenticatorSupport.java      | 1 +
 .../component/netty4/http/handlers/HttpClientChannelHandler.java | 1 -
 .../component/netty4/http/handlers/HttpServerChannelHandler.java | 1 -
 .../netty4/http/handlers/HttpServerMultiplexChannelHandler.java  | 1 -
 .../org/apache/camel/component/netty4/http/BaseNettyTest.java    | 4 ----
 .../org/apache/camel/component/netty4/http/LogCaptureTest.java   | 1 -
 .../camel/component/netty4/http/ManagedNettyEndpointTest.java    | 1 +
 .../org/apache/camel/component/netty4/http/MyLoginModule.java    | 1 +
 .../http/NettyHttpAccessHttpRequestAndResponseBeanTest.java      | 1 -
 .../component/netty4/http/NettyHttpAccessHttpRequestTest.java    | 2 --
 .../netty4/http/NettyHttpBasicAuthConstraintMapperTest.java      | 5 ++---
 .../camel/component/netty4/http/NettyHttpBasicAuthTest.java      | 5 ++---
 .../http/NettyHttpBindingPreservePostFormUrlEncodedBodyTest.java | 1 -
 .../netty4/http/NettyHttpBindingUseRelativePathInPostTest.java   | 1 -
 .../camel/component/netty4/http/NettyHttpCompressTest.java       | 1 -
 .../netty4/http/NettyHttpGetWithInvalidMessageTest.java          | 2 --
 .../netty4/http/NettyHttpOperationFailedExceptionTest.java       | 1 -
 .../camel/component/netty4/http/NettyHttpProducerSimpleTest.java | 2 --
 .../camel/component/netty4/http/NettyHttpRequestTimeoutTest.java | 2 --
 .../org/apache/camel/component/netty4/http/NettyHttpSSLTest.java | 4 ++--
 .../http/NettyHttpSimpleBasicAuthConstraintMapperTest.java       | 5 ++---
 .../component/netty4/http/NettyHttpSimpleBasicAuthTest.java      | 5 ++---
 .../camel/component/netty4/http/NettyRequestManagementTest.java  | 1 -
 .../camel/component/netty4/http/NettySharedHttpServerTest.java   | 3 +--
 .../component/netty4/http/SecurityConstraintMappingTest.java     | 3 +--
 .../component/netty4/http/SpringNettyHttpBasicAuthTest.java      | 5 +----
 .../camel/component/netty4/http/SpringNettyHttpSSLTest.java      | 6 ++----
 .../camel/component/netty4/http/rest/RestPathMatchingTest.java   | 5 ++---
 .../org/apache/camel/component/openshift/OpenShiftProducer.java  | 1 -
 .../apache/camel/component/openshift/OpenShiftAddAliasTest.java  | 3 +--
 .../component/openshift/OpenShiftAddEmbeddedCartridgeTest.java   | 3 +--
 .../component/openshift/OpenShiftAddEnvironmentVariableTest.java | 3 +--
 .../openshift/OpenShiftAddMultipleEnvironmentVariablesTest.java  | 3 +--
 .../camel/component/openshift/OpenShiftConsumerOnChangeTest.java | 3 +--
 .../apache/camel/component/openshift/OpenShiftConsumerTest.java  | 3 +--
 .../camel/component/openshift/OpenShiftGetAliasesTest.java       | 3 +--
 .../openshift/OpenShiftGetAllEnvironmentVariablesTest.java       | 3 +--
 .../component/openshift/OpenShiftGetDeploymentTypeTest.java      | 3 +--
 .../component/openshift/OpenShiftGetEmbeddedCartridgesTest.java  | 3 +--
 .../openshift/OpenShiftGetEnvironmentVariableValueTest.java      | 3 +--
 .../camel/component/openshift/OpenShiftGetGearProfileTest.java   | 3 +--
 .../apache/camel/component/openshift/OpenShiftGetGitUrlTest.java | 3 +--
 .../component/openshift/OpenShiftGetStandaloneCartridgeTest.java | 3 +--
 .../openshift/OpenShiftListApplicationsModeJsonTest.java         | 3 +--
 .../camel/component/openshift/OpenShiftListApplicationsTest.java | 3 +--
 .../camel/component/openshift/OpenShiftRemoveAliasTest.java      | 3 +--
 .../openshift/OpenShiftRemoveEmbeddedCartridgeTest.java          | 3 +--
 .../openshift/OpenShiftRemoveEnvironmentVariableTest.java        | 3 +--
 .../apache/camel/component/openshift/OpenShiftScaleDownTest.java | 3 +--
 .../apache/camel/component/openshift/OpenShiftScaleUpTest.java   | 3 +--
 .../component/openshift/OpenShiftSetDeploymentTypeTest.java      | 3 +--
 .../org/apache/camel/component/openshift/OpenShiftStateTest.java | 3 +--
 .../openshift/OpenShiftUpdateEnvironmentVariableTest.java        | 3 +--
 .../java/org/apache/camel/component/rabbitmq/RabbitConsumer.java | 1 -
 .../org/apache/camel/component/rabbitmq/RabbitMQComponent.java   | 1 +
 .../org/apache/camel/component/rabbitmq/RabbitMQConsumer.java    | 1 -
 .../org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java    | 1 -
 .../camel/component/rabbitmq/RabbitMQMessagePublisher.java       | 1 -
 .../org/apache/camel/component/rabbitmq/RabbitMQProducer.java    | 1 -
 .../org/apache/camel/component/rabbitmq/reply/ReplyHolder.java   | 1 -
 .../camel/component/rabbitmq/reply/ReplyManagerSupport.java      | 1 -
 .../component/rabbitmq/reply/TemporaryQueueReplyHandler.java     | 1 -
 .../component/rabbitmq/reply/TemporaryQueueReplyManager.java     | 1 -
 .../apache/camel/component/rabbitmq/AbstractRabbitMQIntTest.java | 1 +
 .../apache/camel/component/rabbitmq/RabbitMQComponentTest.java   | 1 -
 .../camel/component/rabbitmq/RabbitMQConsumerIntTestReplyTo.java | 1 -
 .../apache/camel/component/rabbitmq/RabbitMQConsumerTest.java    | 1 -
 .../apache/camel/component/rabbitmq/RabbitMQEndpointTest.java    | 7 +++++--
 .../apache/camel/component/rabbitmq/RabbitMQProducerTest.java    | 1 -
 .../camel/component/rabbitmq/RabbitMQReConnectionIntTest.java    | 1 -
 .../apache/camel/component/rabbitmq/RabbitMQSpringIntTest.java   | 1 -
 .../camel/component/rabbitmq/qpid/RabbitMQConsumerQpidTest.java  | 3 ---
 .../camel/component/rabbitmq/qpid/RabbitMQInOutQpidTest.java     | 3 ---
 .../camel/component/rabbitmq/qpid/RabbitMQLoadQpidTest.java      | 3 ---
 .../camel/component/rabbitmq/qpid/RabbitMQProducerQpidTest.java  | 3 ---
 .../component/rabbitmq/qpid/RabbitMQReConnectionQpidTest.java    | 3 ---
 .../camel/component/rabbitmq/qpid/RabbitMQRequeueQpidTest.java   | 6 +-----
 .../rabbitmq/qpid/RabbitMQRequeueUnhandledExceptionQpidTest.java | 3 ---
 .../component/rabbitmq/qpid/RabbitMQSupendResumeQpidTest.java    | 3 ---
 .../java/org/apache/camel/component/syslog/SyslogConverter.java  | 1 +
 .../apache/camel/component/syslog/netty/Rfc5425FrameDecoder.java | 1 -
 .../apache/camel/component/syslog/AutomatedConversionTest.java   | 2 --
 .../org/apache/camel/component/syslog/MinaDataFormatTest.java    | 2 --
 .../apache/camel/component/syslog/MinaManyUDPMessagesTest.java   | 2 --
 .../org/apache/camel/component/syslog/NettyDataFormatTest.java   | 2 --
 .../apache/camel/component/syslog/NettyManyUDPMessagesTest.java  | 2 --
 .../camel/component/syslog/NettyRfc5425LongMessageTest.java      | 3 ---
 .../java/org/apache/camel/component/syslog/NettyRfc5425Test.java | 2 --
 .../org/apache/camel/component/syslog/SyslogSpringMinaTest.java  | 2 --
 .../org/apache/camel/component/syslog/SyslogSpringNettyTest.java | 2 --
 .../apache/camel/component/xmpp/XmppDeferredConnectionTest.java  | 3 +--
 .../org/apache/camel/component/xmpp/XmppMultiUserChatTest.java   | 3 +--
 .../apache/camel/component/xmpp/XmppProducerConcurrentTest.java  | 3 +--
 .../apache/camel/component/xmpp/XmppRobustConnectionTest.java    | 5 ++---
 .../java/org/apache/camel/component/xmpp/XmppRouteChatTest.java  | 3 +--
 .../xmpp/XmppRouteMultipleProducersSingleConsumerTest.java       | 3 +--
 .../test/java/org/apache/camel/component/xmpp/XmppRouteTest.java | 9 +++++----
 236 files changed, 214 insertions(+), 410 deletions(-)

diff --git a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorProducer.java b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorProducer.java
index 1ae0ffd..3f5d854 100644
--- a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorProducer.java
+++ b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorProducer.java
@@ -21,7 +21,6 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
 import com.lmax.disruptor.InsufficientCapacityException;
-
 import org.apache.camel.AsyncCallback;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangeTimedOutException;
diff --git a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorReference.java b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorReference.java
index 35b2b62..4db2384 100644
--- a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorReference.java
+++ b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorReference.java
@@ -38,7 +38,6 @@ import java.util.concurrent.locks.LockSupport;
 import com.lmax.disruptor.InsufficientCapacityException;
 import com.lmax.disruptor.RingBuffer;
 import com.lmax.disruptor.dsl.Disruptor;
-
 import org.apache.camel.Exchange;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitStrategyCreationTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitStrategyCreationTest.java
index 7f29dae..96438d1 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitStrategyCreationTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitStrategyCreationTest.java
@@ -18,7 +18,6 @@
 package org.apache.camel.component.disruptor;
 
 import com.lmax.disruptor.WaitStrategy;
-
 import org.junit.Test;
 
 import static org.junit.Assert.assertNotNull;
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/FileDisruptorShutdownCompleteAllTasksTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/FileDisruptorShutdownCompleteAllTasksTest.java
index b8e8cc3..543ddf9 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/FileDisruptorShutdownCompleteAllTasksTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/FileDisruptorShutdownCompleteAllTasksTest.java
@@ -15,13 +15,12 @@
  * limitations under the License.
  */
 package org.apache.camel.component.disruptor;
-import org.junit.Before;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.ShutdownRunningTask;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 
 /**
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/SedaDisruptorCompareTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/SedaDisruptorCompareTest.java
index 0492651..b6fbb82 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/SedaDisruptorCompareTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/SedaDisruptorCompareTest.java
@@ -16,9 +16,6 @@
  */
 
 package org.apache.camel.component.disruptor;
-import org.junit.Before;
-
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmComponentReferenceEndpointTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmComponentReferenceEndpointTest.java
index bbf23e5..4d2e122 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmComponentReferenceEndpointTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmComponentReferenceEndpointTest.java
@@ -16,14 +16,13 @@
  */
 package org.apache.camel.component.disruptor.vm;
 
-import org.junit.Test;
-
 import java.util.Iterator;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.disruptor.DisruptorComponent;
 import org.apache.camel.component.disruptor.DisruptorReference;
+import org.junit.Test;
 
 /**
  *
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmConcurrentConsumersTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmConcurrentConsumersTest.java
index 129ab36..2860edb 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmConcurrentConsumersTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmConcurrentConsumersTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.component.disruptor.vm;
 
-import org.junit.Test;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.component.vm.AbstractVmTestSupport;
+import org.junit.Test;
 
 /**
  * @version
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOnlyChainedTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOnlyChainedTest.java
index e374a42..317da0f 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOnlyChainedTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOnlyChainedTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.component.disruptor.vm;
 
-import org.junit.Test;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.component.vm.AbstractVmTestSupport;
+import org.junit.Test;
 
 /**
  * @version
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOnlyTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOnlyTest.java
index 824dfab..0cb0ed1 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOnlyTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOnlyTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.component.disruptor.vm;
 
-import org.junit.Test;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.vm.AbstractVmTestSupport;
+import org.junit.Test;
 
 /**
  * @version
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutChainedTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutChainedTest.java
index fd3637f..e5fb6f3 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutChainedTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutChainedTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.component.disruptor.vm;
 
-import org.junit.Test;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.component.vm.AbstractVmTestSupport;
+import org.junit.Test;
 
 /**
  * @version
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutChainedTimeoutTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutChainedTimeoutTest.java
index b18720c..f1f7d25 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutChainedTimeoutTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutChainedTimeoutTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.component.disruptor.vm;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.ExchangeTimedOutException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.vm.AbstractVmTestSupport;
 import org.apache.camel.util.StopWatch;
+import org.junit.Test;
 
 /**
  * @version
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutTest.java
index 7977121..b8614c2 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.component.disruptor.vm;
 
-import org.junit.Test;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.vm.AbstractVmTestSupport;
+import org.junit.Test;
 
 /**
  * @version
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutWithErrorTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutWithErrorTest.java
index 63fe39e..e09ff87 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutWithErrorTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmInOutWithErrorTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.component.disruptor.vm;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.vm.AbstractVmTestSupport;
+import org.junit.Test;
 
 /**
  * @version
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmMultipleConsumersIssueTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmMultipleConsumersIssueTest.java
index 8ca725b..49abd57 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmMultipleConsumersIssueTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmMultipleConsumersIssueTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.component.disruptor.vm;
 
-import org.junit.Test;
-
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.ExchangePattern;
 import org.apache.camel.builder.RouteBuilder;
+import org.junit.Test;
 
 /**
  *
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmMultipleContextsStartStopTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmMultipleContextsStartStopTest.java
index 4dadf12..c9503c1 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmMultipleContextsStartStopTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmMultipleContextsStartStopTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.component.disruptor.vm;
 
-import org.junit.Test;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.component.vm.AbstractVmTestSupport;
+import org.junit.Test;
 
 /**
  * @version
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmQueueTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmQueueTest.java
index 8cdb0e0..35f7766 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmQueueTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmQueueTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.component.disruptor.vm;
 
-import org.junit.Test;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.component.vm.AbstractVmTestSupport;
+import org.junit.Test;
 
 /**
  * @version
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmShouldNotUseSameThreadTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmShouldNotUseSameThreadTest.java
index b8ad764..572a8ec 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmShouldNotUseSameThreadTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmShouldNotUseSameThreadTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.component.disruptor.vm;
 
-import org.junit.Test;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.component.vm.AbstractVmTestSupport;
+import org.junit.Test;
 
 /**
  * Unit test to verify continuing using NOT same thread on the consumer side.
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmSplitterTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmSplitterTest.java
index 618ccd8..8781467 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmSplitterTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmSplitterTest.java
@@ -17,8 +17,6 @@
 
 package org.apache.camel.component.disruptor.vm;
 
-import org.junit.Test;
-
 import java.util.Arrays;
 import java.util.List;
 
@@ -26,6 +24,7 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.component.vm.AbstractVmTestSupport;
 import org.apache.camel.impl.JndiRegistry;
+import org.junit.Test;
 
 public class DisruptorVmSplitterTest extends AbstractVmTestSupport {
 
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmTimeoutIssueTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmTimeoutIssueTest.java
index ca4d67c..25bdbf3 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmTimeoutIssueTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmTimeoutIssueTest.java
@@ -16,14 +16,13 @@
  */
 package org.apache.camel.component.disruptor.vm;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangeTimedOutException;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.vm.AbstractVmTestSupport;
+import org.junit.Test;
 
 /**
  * @version
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmUseSameQueueTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmUseSameQueueTest.java
index 06641e9..d4e33a0 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmUseSameQueueTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmUseSameQueueTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.component.disruptor.vm;
 
-import org.junit.Test;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.vm.AbstractVmTestSupport;
+import org.junit.Test;
 
 /**
  * @version
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmWaitForTaskCompleteTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmWaitForTaskCompleteTest.java
index d4f1542..0d0ee45 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmWaitForTaskCompleteTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmWaitForTaskCompleteTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.component.disruptor.vm;
 
-import org.junit.Test;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.vm.AbstractVmTestSupport;
+import org.junit.Test;
 
 /**
  * @version
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmWaitForTaskIfReplyExpectedTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmWaitForTaskIfReplyExpectedTest.java
index 3e58e1f..000ba4e 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmWaitForTaskIfReplyExpectedTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmWaitForTaskIfReplyExpectedTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.component.disruptor.vm;
 
-import org.junit.Test;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.vm.AbstractVmTestSupport;
+import org.junit.Test;
 
 /**
  * @version
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmWaitForTaskNewerTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmWaitForTaskNewerTest.java
index c50c936..0daf813 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmWaitForTaskNewerTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmWaitForTaskNewerTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.component.disruptor.vm;
 
-import org.junit.Test;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.vm.AbstractVmTestSupport;
+import org.junit.Test;
 
 /**
  * @version
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/SameDisruptorVmQueueSizeAndNoSizeTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/SameDisruptorVmQueueSizeAndNoSizeTest.java
index a087bab..6ad835f 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/SameDisruptorVmQueueSizeAndNoSizeTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/SameDisruptorVmQueueSizeAndNoSizeTest.java
@@ -16,12 +16,11 @@
  */
 package org.apache.camel.component.disruptor.vm;
 
-import org.junit.Test;
-
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.ResolveEndpointFailedException;
 import org.apache.camel.builder.RouteBuilder;
+import org.junit.Test;
 
 /**
  *
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/DSAKeyPairIdentity.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/DSAKeyPairIdentity.java
index 86c84e3..82f7312 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/DSAKeyPairIdentity.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/DSAKeyPairIdentity.java
@@ -28,7 +28,6 @@ import java.security.interfaces.DSAPublicKey;
 
 import com.jcraft.jsch.Identity;
 import com.jcraft.jsch.JSchException;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsOperations.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsOperations.java
index d8e493c..1f16524 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsOperations.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsOperations.java
@@ -17,6 +17,7 @@
 package org.apache.camel.component.file.remote;
 
 import java.io.IOException;
+
 import javax.net.ssl.SSLException;
 
 import org.apache.camel.component.file.GenericFileOperationFailedException;
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/OsgiParserFactory.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/OsgiParserFactory.java
index 4cce490..ad602ce 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/OsgiParserFactory.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/OsgiParserFactory.java
@@ -20,7 +20,6 @@ import java.util.Locale;
 import java.util.regex.Pattern;
 
 import org.apache.camel.spi.ClassResolver;
-
 import org.apache.commons.net.ftp.Configurable;
 import org.apache.commons.net.ftp.FTPClientConfig;
 import org.apache.commons.net.ftp.FTPFileEntryParser;
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RSAKeyPairIdentity.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RSAKeyPairIdentity.java
index e1825fd..25b1fd6 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RSAKeyPairIdentity.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RSAKeyPairIdentity.java
@@ -27,7 +27,6 @@ import java.security.interfaces.RSAPublicKey;
 
 import com.jcraft.jsch.Identity;
 import com.jcraft.jsch.JSchException;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRecursiveNoopTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRecursiveNoopTest.java
index cdec037..4c8156f 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRecursiveNoopTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRecursiveNoopTest.java
@@ -15,11 +15,10 @@
  * limitations under the License.
  */
 package org.apache.camel.component.file.remote;
-import org.junit.Before;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Before;
 import org.junit.Test;
 
 /**
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginConnectionLeakTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginConnectionLeakTest.java
index 8cbd434..60462d4 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginConnectionLeakTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginConnectionLeakTest.java
@@ -22,6 +22,7 @@ import java.net.Socket;
 import java.net.SocketAddress;
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.net.SocketFactory;
 
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginInProducerConnectionLeakTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginInProducerConnectionLeakTest.java
index cfea7e0..332a43c 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginInProducerConnectionLeakTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginInProducerConnectionLeakTest.java
@@ -22,6 +22,7 @@ import java.net.Socket;
 import java.net.SocketAddress;
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.net.SocketFactory;
 
 import org.apache.camel.impl.JndiRegistry;
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginMockNoopConnectionLeakTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginMockNoopConnectionLeakTest.java
index ff33bc3..d90f039 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginMockNoopConnectionLeakTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginMockNoopConnectionLeakTest.java
@@ -15,20 +15,20 @@
  * limitations under the License.
  */
 package org.apache.camel.component.file.remote;
-import org.junit.Before;
-
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.Socket;
 import java.net.SocketAddress;
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.net.SocketFactory;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.impl.JndiRegistry;
 import org.apache.commons.net.ftp.FTPClient;
+import org.junit.Before;
 import org.junit.Test;
 
 /**
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDisconnectTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDisconnectTest.java
index c4e08ce..a7246c3 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDisconnectTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDisconnectTest.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 package org.apache.camel.component.file.remote;
-import org.junit.Before;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.commons.net.ftp.FTPClient;
+import org.junit.Before;
 import org.junit.Test;
 
 public class FtpConsumerDisconnectTest extends FtpServerTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerRelativeFileNameTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerRelativeFileNameTest.java
index c9af0ab..e253f78 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerRelativeFileNameTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerRelativeFileNameTest.java
@@ -15,11 +15,10 @@
  * limitations under the License.
  */
 package org.apache.camel.component.file.remote;
-import org.junit.Before;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Before;
 import org.junit.Test;
 
 public class FtpConsumerRelativeFileNameTest extends FtpServerTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerAllowNullBodyFileAlreadyExistTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerAllowNullBodyFileAlreadyExistTest.java
index c40b7d9..9e87c41 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerAllowNullBodyFileAlreadyExistTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerAllowNullBodyFileAlreadyExistTest.java
@@ -15,11 +15,10 @@
  * limitations under the License.
  */
 package org.apache.camel.component.file.remote;
-import org.junit.Before;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Before;
 import org.junit.Test;
 
 public class FtpProducerAllowNullBodyFileAlreadyExistTest extends FtpServerTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerDisconnectOnBatchCompleteTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerDisconnectOnBatchCompleteTest.java
index e93ddc1..f3d981d 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerDisconnectOnBatchCompleteTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerDisconnectOnBatchCompleteTest.java
@@ -15,11 +15,10 @@
  * limitations under the License.
  */
 package org.apache.camel.component.file.remote;
-import org.junit.Before;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.commons.net.ftp.FTPClient;
+import org.junit.Before;
 import org.junit.Test;
 
 import static org.apache.camel.language.simple.SimpleLanguage.simple;
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerDisconnectTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerDisconnectTest.java
index 7b1e1c3..bdd7945 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerDisconnectTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerDisconnectTest.java
@@ -15,9 +15,8 @@
  * limitations under the License.
  */
 package org.apache.camel.component.file.remote;
-import org.junit.Before;
-
 import org.apache.commons.net.ftp.FTPClient;
+import org.junit.Before;
 import org.junit.Test;
 
 public class FtpProducerDisconnectTest extends FtpServerTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithCharsetTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithCharsetTest.java
index 6eb70cb..364b639 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithCharsetTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithCharsetTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.file.remote;
-import org.junit.Before;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
@@ -24,6 +22,7 @@ import java.nio.charset.Charset;
 
 import org.apache.camel.converter.IOConverter;
 import org.apache.camel.util.IOHelper;
+import org.junit.Before;
 import org.junit.Test;
 
 public class FtpProducerFileWithCharsetTest extends FtpServerTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpUtilsExtractDirNameFromAbsolutePathTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpUtilsExtractDirNameFromAbsolutePathTest.java
index 10a9a7f..70595cb 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpUtilsExtractDirNameFromAbsolutePathTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpUtilsExtractDirNameFromAbsolutePathTest.java
@@ -17,6 +17,7 @@
 package org.apache.camel.component.file.remote;
 
 import org.junit.Test;
+
 import static org.junit.Assert.assertEquals;
 
 public class FtpUtilsExtractDirNameFromAbsolutePathTest {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/RemoteFileProduceOverruleOnlyOnceTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/RemoteFileProduceOverruleOnlyOnceTest.java
index 9613550..9fd43be 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/RemoteFileProduceOverruleOnlyOnceTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/RemoteFileProduceOverruleOnlyOnceTest.java
@@ -15,14 +15,13 @@
  * limitations under the License.
  */
 package org.apache.camel.component.file.remote;
-import org.junit.Before;
-
 import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Before;
 import org.junit.Test;
 
 /**
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelManualTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelManualTest.java
index e06b971..fb5cf27 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelManualTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelManualTest.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 package org.apache.camel.component.file.remote.manual;
-import org.junit.Before;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelRecursiveManualTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelRecursiveManualTest.java
index ec5fdd7..583fc97 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelRecursiveManualTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelRecursiveManualTest.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 package org.apache.camel.component.file.remote.manual;
-import org.junit.Before;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelRecursiveToAbsoluteManualTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelRecursiveToAbsoluteManualTest.java
index e0559c5..4ab5a25 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelRecursiveToAbsoluteManualTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelRecursiveToAbsoluteManualTest.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 package org.apache.camel.component.file.remote.manual;
-import org.junit.Before;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelManualTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelManualTest.java
index 3276ed9..27a157a 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelManualTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelManualTest.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 package org.apache.camel.component.file.remote.manual;
-import org.junit.Before;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelRecursiveManualTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelRecursiveManualTest.java
index 0e85d1b..47aba5d 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelRecursiveManualTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelRecursiveManualTest.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 package org.apache.camel.component.file.remote.manual;
-import org.junit.Before;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelRecursiveToAbsoluteManualTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelRecursiveToAbsoluteManualTest.java
index 6299479..6eb3afe 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelRecursiveToAbsoluteManualTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelRecursiveToAbsoluteManualTest.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 package org.apache.camel.component.file.remote.manual;
-import org.junit.Before;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerScottManualTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerScottManualTest.java
index 0529123..e4b69e7 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerScottManualTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerScottManualTest.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 package org.apache.camel.component.file.remote.manual;
-import org.junit.Before;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerScottRecursiveManualTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerScottRecursiveManualTest.java
index 3d09e68..324426e 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerScottRecursiveManualTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerScottRecursiveManualTest.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 package org.apache.camel.component.file.remote.manual;
-import org.junit.Before;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpChangedReadLockTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpChangedReadLockTest.java
index ba09774..d417d55 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpChangedReadLockTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpChangedReadLockTest.java
@@ -15,13 +15,12 @@
  * limitations under the License.
  */
 package org.apache.camel.component.file.remote.sftp;
-import org.junit.Before;
-
 import java.io.File;
 import java.io.FileOutputStream;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Before;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateConcurrentDifferentGroupsTest.java b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateConcurrentDifferentGroupsTest.java
index b1af61b..d8b5d35 100644
--- a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateConcurrentDifferentGroupsTest.java
+++ b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateConcurrentDifferentGroupsTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.hawtdb;
-import org.junit.Before;
-
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -26,6 +24,7 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.processor.aggregate.AggregationStrategy;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 
 /**
diff --git a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateConcurrentSameGroupTest.java b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateConcurrentSameGroupTest.java
index 159abf4..f0358a9 100644
--- a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateConcurrentSameGroupTest.java
+++ b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateConcurrentSameGroupTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.hawtdb;
-import org.junit.Before;
-
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -26,6 +24,7 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.processor.aggregate.AggregationStrategy;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 
 /**
diff --git a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateDiscardOnTimeoutTest.java b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateDiscardOnTimeoutTest.java
index 6a0ed4f..14cdeba 100644
--- a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateDiscardOnTimeoutTest.java
+++ b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateDiscardOnTimeoutTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.hawtdb;
-import org.junit.Before;
-
 import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.Exchange;
@@ -24,6 +22,7 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.processor.aggregate.AggregationStrategy;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 
 public class HawtDBAggregateDiscardOnTimeoutTest extends CamelTestSupport {
diff --git a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateForceCompletionHeaderTest.java b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateForceCompletionHeaderTest.java
index dea2bc1..8fd453f 100644
--- a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateForceCompletionHeaderTest.java
+++ b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateForceCompletionHeaderTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.hawtdb;
-import org.junit.Before;
-
 import java.util.HashMap;
 import java.util.Map;
 
@@ -24,6 +22,7 @@ import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.processor.aggregate.AggregationStrategy;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 
 /**
diff --git a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateNotLostRemovedWhenConfirmedTest.java b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateNotLostRemovedWhenConfirmedTest.java
index 9091804..eea6be8 100644
--- a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateNotLostRemovedWhenConfirmedTest.java
+++ b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateNotLostRemovedWhenConfirmedTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.hawtdb;
-import org.junit.Before;
-
 import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.Exchange;
@@ -26,6 +24,7 @@ import org.apache.camel.test.junit4.CamelTestSupport;
 import org.fusesource.hawtbuf.Buffer;
 import org.fusesource.hawtdb.api.Index;
 import org.fusesource.hawtdb.api.Transaction;
+import org.junit.Before;
 import org.junit.Test;
 
 public class HawtDBAggregateNotLostRemovedWhenConfirmedTest extends CamelTestSupport {
diff --git a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateNotLostTest.java b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateNotLostTest.java
index a904710..4fe989f 100644
--- a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateNotLostTest.java
+++ b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateNotLostTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.hawtdb;
-import org.junit.Before;
-
 import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.Exchange;
@@ -26,6 +24,7 @@ import org.apache.camel.test.junit4.CamelTestSupport;
 import org.fusesource.hawtbuf.Buffer;
 import org.fusesource.hawtdb.api.Index;
 import org.fusesource.hawtdb.api.Transaction;
+import org.junit.Before;
 import org.junit.Test;
 
 public class HawtDBAggregateNotLostTest extends CamelTestSupport {
diff --git a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverDeadLetterChannelFailedTest.java b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverDeadLetterChannelFailedTest.java
index c0202cf..9acc1ca 100644
--- a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverDeadLetterChannelFailedTest.java
+++ b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverDeadLetterChannelFailedTest.java
@@ -15,14 +15,13 @@
  * limitations under the License.
  */
 package org.apache.camel.component.hawtdb;
-import org.junit.Before;
-
 import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.processor.aggregate.AggregationStrategy;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 
 public class HawtDBAggregateRecoverDeadLetterChannelFailedTest extends CamelTestSupport {
diff --git a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverDeadLetterChannelTest.java b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverDeadLetterChannelTest.java
index 56b2033..f6635d0 100644
--- a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverDeadLetterChannelTest.java
+++ b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverDeadLetterChannelTest.java
@@ -15,14 +15,13 @@
  * limitations under the License.
  */
 package org.apache.camel.component.hawtdb;
-import org.junit.Before;
-
 import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.processor.aggregate.AggregationStrategy;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 
 public class HawtDBAggregateRecoverDeadLetterChannelTest extends CamelTestSupport {
diff --git a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverTest.java b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverTest.java
index 7f23cd5..c30ce98 100644
--- a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverTest.java
+++ b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.hawtdb;
-import org.junit.Before;
-
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -25,6 +23,7 @@ import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.processor.aggregate.AggregationStrategy;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 
 public class HawtDBAggregateRecoverTest extends CamelTestSupport {
diff --git a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverWithRedeliveryPolicyTest.java b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverWithRedeliveryPolicyTest.java
index 50413c0..3027e24 100644
--- a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverWithRedeliveryPolicyTest.java
+++ b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverWithRedeliveryPolicyTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.hawtdb;
-import org.junit.Before;
-
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -25,6 +23,7 @@ import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.processor.aggregate.AggregationStrategy;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 
 public class HawtDBAggregateRecoverWithRedeliveryPolicyTest extends CamelTestSupport {
diff --git a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverWithSedaTest.java b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverWithSedaTest.java
index 5910891..d5476e6 100644
--- a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverWithSedaTest.java
+++ b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateRecoverWithSedaTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.hawtdb;
-import org.junit.Before;
-
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -25,6 +23,7 @@ import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.processor.aggregate.AggregationStrategy;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 
 public class HawtDBAggregateRecoverWithSedaTest extends CamelTestSupport {
diff --git a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateSerializedHeadersTest.java b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateSerializedHeadersTest.java
index df67acc..7232eb4 100644
--- a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateSerializedHeadersTest.java
+++ b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateSerializedHeadersTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.hawtdb;
-import org.junit.Before;
-
 import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.Exchange;
@@ -25,6 +23,7 @@ import org.apache.camel.component.hawtdb.util.HeaderDto;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.processor.aggregate.AggregationStrategy;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 
 public class HawtDBAggregateSerializedHeadersTest extends CamelTestSupport {
diff --git a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateTest.java b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateTest.java
index 336630d..c75d0bb 100644
--- a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateTest.java
+++ b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.hawtdb;
-import org.junit.Before;
-
 import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.Exchange;
@@ -24,6 +22,7 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.processor.aggregate.AggregationStrategy;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 
 public class HawtDBAggregateTest extends CamelTestSupport {
diff --git a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateTimeoutCompletionRestartTest.java b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateTimeoutCompletionRestartTest.java
index 36c435b..99908ba 100644
--- a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateTimeoutCompletionRestartTest.java
+++ b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateTimeoutCompletionRestartTest.java
@@ -15,13 +15,12 @@
  * limitations under the License.
  */
 package org.apache.camel.component.hawtdb;
-import org.junit.Before;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.processor.aggregate.AggregationStrategy;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
diff --git a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryAlotDataTest.java b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryAlotDataTest.java
index 982c4fa..bc8bc95 100644
--- a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryAlotDataTest.java
+++ b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryAlotDataTest.java
@@ -15,14 +15,13 @@
  * limitations under the License.
  */
 package org.apache.camel.component.hawtdb;
-import org.junit.Before;
-import org.junit.After;
-
 import java.io.File;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.DefaultExchange;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 public class HawtDBAggregationRepositoryAlotDataTest extends CamelTestSupport {
diff --git a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryLoadExistingTest.java b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryLoadExistingTest.java
index 673ca86..d67350e 100644
--- a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryLoadExistingTest.java
+++ b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryLoadExistingTest.java
@@ -15,14 +15,13 @@
  * limitations under the License.
  */
 package org.apache.camel.component.hawtdb;
-import org.junit.Before;
-import org.junit.After;
-
 import java.io.File;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.DefaultExchange;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 public class HawtDBAggregationRepositoryLoadExistingTest extends CamelTestSupport {
diff --git a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryMultipleRepoTest.java b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryMultipleRepoTest.java
index 7be6389..b06c550 100644
--- a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryMultipleRepoTest.java
+++ b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryMultipleRepoTest.java
@@ -15,14 +15,13 @@
  * limitations under the License.
  */
 package org.apache.camel.component.hawtdb;
-import org.junit.Before;
-import org.junit.After;
-
 import java.io.File;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.DefaultExchange;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 public class HawtDBAggregationRepositoryMultipleRepoTest extends CamelTestSupport {
diff --git a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryRecoverExistingTest.java b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryRecoverExistingTest.java
index 13be4f4..be59b5c 100644
--- a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryRecoverExistingTest.java
+++ b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryRecoverExistingTest.java
@@ -15,13 +15,12 @@
  * limitations under the License.
  */
 package org.apache.camel.component.hawtdb;
-import org.junit.Before;
-
 import java.io.File;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.DefaultExchange;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 
 public class HawtDBAggregationRepositoryRecoverExistingTest extends CamelTestSupport {
diff --git a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryTest.java b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryTest.java
index 220a778..4c4bb68 100644
--- a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryTest.java
+++ b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepositoryTest.java
@@ -15,14 +15,13 @@
  * limitations under the License.
  */
 package org.apache.camel.component.hawtdb;
-import org.junit.Before;
-import org.junit.After;
-
 import java.io.File;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.DefaultExchange;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 public class HawtDBAggregationRepositoryTest extends CamelTestSupport {
diff --git a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBExchangeSerializationTest.java b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBExchangeSerializationTest.java
index 64a72c8..b1a1d27 100644
--- a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBExchangeSerializationTest.java
+++ b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBExchangeSerializationTest.java
@@ -15,15 +15,14 @@
  * limitations under the License.
  */
 package org.apache.camel.component.hawtdb;
-import org.junit.Before;
-import org.junit.After;
-
 import java.io.File;
 import java.util.Date;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.DefaultExchange;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 public class HawtDBExchangeSerializationTest extends CamelTestSupport {
diff --git a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBGetNotFoundTest.java b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBGetNotFoundTest.java
index 43b814c..0710c0a 100644
--- a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBGetNotFoundTest.java
+++ b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBGetNotFoundTest.java
@@ -15,14 +15,13 @@
  * limitations under the License.
  */
 package org.apache.camel.component.hawtdb;
-import org.junit.Before;
-import org.junit.After;
-
 import java.io.File;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.DefaultExchange;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 public class HawtDBGetNotFoundTest extends CamelTestSupport {
diff --git a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBGrowIssueTest.java b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBGrowIssueTest.java
index 23d711f..e59f778 100644
--- a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBGrowIssueTest.java
+++ b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBGrowIssueTest.java
@@ -15,15 +15,14 @@
  * limitations under the License.
  */
 package org.apache.camel.component.hawtdb;
-import org.junit.Before;
-import org.junit.After;
-
 import java.io.File;
 
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.fusesource.hawtbuf.Buffer;
 import org.fusesource.hawtdb.api.SortedIndex;
 import org.fusesource.hawtdb.api.Transaction;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 /**
diff --git a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBSpringAggregateRecoverWithRedeliveryPolicyTest.java b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBSpringAggregateRecoverWithRedeliveryPolicyTest.java
index eca961f..e19de33 100644
--- a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBSpringAggregateRecoverWithRedeliveryPolicyTest.java
+++ b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBSpringAggregateRecoverWithRedeliveryPolicyTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.hawtdb;
-import org.junit.Before;
-
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -24,6 +22,7 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.processor.aggregate.AggregationStrategy;
 import org.apache.camel.test.spring.CamelSpringTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
diff --git a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBSpringAggregateTest.java b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBSpringAggregateTest.java
index d1ae732..7bc0687 100644
--- a/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBSpringAggregateTest.java
+++ b/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBSpringAggregateTest.java
@@ -15,14 +15,13 @@
  * limitations under the License.
  */
 package org.apache.camel.component.hawtdb;
-import org.junit.Before;
-
 import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.processor.aggregate.AggregationStrategy;
 import org.apache.camel.test.spring.CamelSpringTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/DefaultJavaMailSender.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/DefaultJavaMailSender.java
index 9198ef1..71c27b8 100644
--- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/DefaultJavaMailSender.java
+++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/DefaultJavaMailSender.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.mail;
 
 import java.util.Date;
 import java.util.Properties;
+
 import javax.mail.MessagingException;
 import javax.mail.NoSuchProviderException;
 import javax.mail.Session;
diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/DefaultMailUidGenerator.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/DefaultMailUidGenerator.java
index 829d408..4bf92b9 100644
--- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/DefaultMailUidGenerator.java
+++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/DefaultMailUidGenerator.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.mail;
 
 import java.util.Enumeration;
 import java.util.UUID;
+
 import javax.mail.Header;
 import javax.mail.Message;
 import javax.mail.MessagingException;
diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/DummySSLSocketFactory.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/DummySSLSocketFactory.java
index 6d3c682..a87b8a3 100644
--- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/DummySSLSocketFactory.java
+++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/DummySSLSocketFactory.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.mail;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.Socket;
+
 import javax.net.SocketFactory;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocketFactory;
diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/JavaMailSender.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/JavaMailSender.java
index 345dde2..6be1bec 100644
--- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/JavaMailSender.java
+++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/JavaMailSender.java
@@ -17,6 +17,7 @@
 package org.apache.camel.component.mail;
 
 import java.util.Properties;
+
 import javax.mail.MessagingException;
 import javax.mail.Session;
 import javax.mail.internet.MimeMessage;
diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java
index 82b32f2..abbccd0 100644
--- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java
+++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java
@@ -20,6 +20,7 @@ import java.net.URI;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+
 import javax.mail.search.SearchTerm;
 
 import com.sun.mail.imap.SortTerm;
diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
index 0e48865..b3413fa 100644
--- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
+++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
@@ -20,6 +20,7 @@ import java.net.URI;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
+
 import javax.mail.Message;
 import javax.mail.Session;
 import javax.net.ssl.SSLContext;
diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java
index 64e661c..bf178da 100644
--- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java
+++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java
@@ -20,6 +20,7 @@ import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Queue;
+
 import javax.mail.Flags;
 import javax.mail.Folder;
 import javax.mail.FolderNotFoundException;
diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConverters.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConverters.java
index 33c28fd..4628e38 100644
--- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConverters.java
+++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConverters.java
@@ -33,7 +33,6 @@ import javax.mail.internet.MimeMultipart;
 import javax.mail.search.SearchTerm;
 
 import com.sun.mail.imap.SortTerm;
-
 import org.apache.camel.Converter;
 import org.apache.camel.Exchange;
 import org.apache.camel.FallbackConverter;
diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailMessage.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailMessage.java
index fed52ea..ddc27a8 100644
--- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailMessage.java
+++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailMessage.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.mail;
 
 import java.io.IOException;
 import java.util.Map;
+
 import javax.mail.Message;
 import javax.mail.MessagingException;
 
diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/NowSearchTerm.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/NowSearchTerm.java
index bf570c9..2dedb86 100644
--- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/NowSearchTerm.java
+++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/NowSearchTerm.java
@@ -17,6 +17,7 @@
 package org.apache.camel.component.mail;
 
 import java.util.Date;
+
 import javax.mail.Message;
 import javax.mail.search.ComparisonTerm;
 import javax.mail.search.DateTerm;
diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/SearchTermBuilder.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/SearchTermBuilder.java
index 55996f0..2e29a43 100644
--- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/SearchTermBuilder.java
+++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/SearchTermBuilder.java
@@ -17,6 +17,7 @@
 package org.apache.camel.component.mail;
 
 import java.util.Date;
+
 import javax.mail.Flags;
 import javax.mail.Message;
 import javax.mail.search.AndTerm;
diff --git a/components/camel-mail/src/main/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormat.java b/components/camel-mail/src/main/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormat.java
index 836c728..0c7b518 100644
--- a/components/camel-mail/src/main/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormat.java
+++ b/components/camel-mail/src/main/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormat.java
@@ -27,6 +27,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import java.util.regex.Pattern;
+
 import javax.activation.DataHandler;
 import javax.activation.DataSource;
 import javax.mail.BodyPart;
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java
index 7927afe..9561509 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.mail;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+
 import javax.activation.DataHandler;
 import javax.activation.FileDataSource;
 
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailBatchConsumerTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailBatchConsumerTest.java
index 65ad57b..d11eb00 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailBatchConsumerTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailBatchConsumerTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.mail;
-import org.junit.Before;
-
 import javax.mail.Folder;
 import javax.mail.Message;
 import javax.mail.Store;
@@ -26,6 +24,7 @@ import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 import org.jvnet.mock_javamail.Mailbox;
 
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCommitOnCompletionTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCommitOnCompletionTest.java
index 9e55a62..18ee6f3 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCommitOnCompletionTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCommitOnCompletionTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.mail;
-import org.junit.Before;
-
 import javax.mail.Folder;
 import javax.mail.Message;
 import javax.mail.Store;
@@ -27,6 +25,7 @@ import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 import org.jvnet.mock_javamail.Mailbox;
 
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerUnsupportedCharsetTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerUnsupportedCharsetTest.java
index b2be0ed..fb6cfec 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerUnsupportedCharsetTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerUnsupportedCharsetTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.mail;
-import org.junit.Before;
-
 import javax.mail.Folder;
 import javax.mail.Message;
 import javax.mail.Store;
@@ -25,6 +23,7 @@ import javax.mail.internet.MimeMessage;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 import org.jvnet.mock_javamail.Mailbox;
 
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeResolverTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeResolverTest.java
index 0e07375..29e6969 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeResolverTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeResolverTest.java
@@ -17,6 +17,7 @@
 package org.apache.camel.component.mail;
 
 import java.util.Map;
+
 import javax.activation.DataHandler;
 import javax.activation.FileDataSource;
 
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConvertersTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConvertersTest.java
index 0140da6..d03a677 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConvertersTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConvertersTest.java
@@ -15,9 +15,8 @@
  * limitations under the License.
  */
 package org.apache.camel.component.mail;
-import org.junit.Before;
-
 import java.io.InputStream;
+
 import javax.mail.Message;
 import javax.mail.Multipart;
 
@@ -26,6 +25,7 @@ import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 import org.jvnet.mock_javamail.Mailbox;
 
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCopyToTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCopyToTest.java
index 62ca50c..4acb262 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCopyToTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCopyToTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.mail;
-import org.junit.Before;
-
 import javax.mail.Folder;
 import javax.mail.Message;
 import javax.mail.Store;
@@ -25,6 +23,7 @@ import javax.mail.internet.MimeMessage;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 import org.jvnet.mock_javamail.Mailbox;
 
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomMailSenderTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomMailSenderTest.java
index 8241f87..cad32e6 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomMailSenderTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomMailSenderTest.java
@@ -17,6 +17,7 @@
 package org.apache.camel.component.mail;
 
 import java.util.Properties;
+
 import javax.mail.MessagingException;
 import javax.mail.Session;
 import javax.mail.internet.MimeMessage;
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDoNotDeleteIfProcessFailsTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDoNotDeleteIfProcessFailsTest.java
index 206aa58..31fe8f2 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDoNotDeleteIfProcessFailsTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDoNotDeleteIfProcessFailsTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.mail;
-import org.junit.Before;
-
 import javax.mail.Flags;
 import javax.mail.Folder;
 import javax.mail.Message;
@@ -27,6 +25,7 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 import org.jvnet.mock_javamail.Mailbox;
 
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeTest.java
index a1c8dc6..0ecce6c 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.mail;
-import org.junit.Before;
-
 import javax.mail.Folder;
 import javax.mail.Message;
 import javax.mail.Store;
@@ -25,6 +23,7 @@ import javax.mail.internet.MimeMessage;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 import org.jvnet.mock_javamail.Mailbox;
 
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeZeroTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeZeroTest.java
index cd7ad2a..198b7d1 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeZeroTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeZeroTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.mail;
-import org.junit.Before;
-
 import javax.mail.Folder;
 import javax.mail.Message;
 import javax.mail.Store;
@@ -25,6 +23,7 @@ import javax.mail.internet.MimeMessage;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 import org.jvnet.mock_javamail.Mailbox;
 
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateTest.java
index 5d63198..7f70a56 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.mail;
-import org.junit.Before;
-
 import javax.mail.Folder;
 import javax.mail.Message;
 import javax.mail.Store;
@@ -27,6 +25,7 @@ import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.impl.JndiRegistry;
 import org.apache.camel.processor.idempotent.MemoryIdempotentRepository;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 import org.jvnet.mock_javamail.Mailbox;
 
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryTest.java
index b89592f..9601949 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.mail;
-import org.junit.Before;
-
 import javax.mail.Folder;
 import javax.mail.Message;
 import javax.mail.Store;
@@ -27,6 +25,7 @@ import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.impl.JndiRegistry;
 import org.apache.camel.processor.idempotent.MemoryIdempotentRepository;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 import org.jvnet.mock_javamail.Mailbox;
 
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMaxMessagesPerPollTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMaxMessagesPerPollTest.java
index cf61706..b96980d 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMaxMessagesPerPollTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMaxMessagesPerPollTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.mail;
-import org.junit.Before;
-
 import javax.mail.Folder;
 import javax.mail.Message;
 import javax.mail.Store;
@@ -26,6 +24,7 @@ import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 import org.jvnet.mock_javamail.Mailbox;
 
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsUsingHeadersTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsUsingHeadersTest.java
index e267f9c..5ecefc2 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsUsingHeadersTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsUsingHeadersTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.mail;
 
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.mail.Message;
 
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichNoMailTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichNoMailTest.java
index 45e39de..e5f4a2e 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichNoMailTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichNoMailTest.java
@@ -15,14 +15,13 @@
  * limitations under the License.
  */
 package org.apache.camel.component.mail;
-import org.junit.Before;
-
 import javax.mail.Folder;
 import javax.mail.Store;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 import org.jvnet.mock_javamail.Mailbox;
 
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichTest.java
index f4e2cea..e969769 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.mail;
-import org.junit.Before;
-
 import javax.mail.Folder;
 import javax.mail.Message;
 import javax.mail.Store;
@@ -25,6 +23,7 @@ import javax.mail.internet.MimeMessage;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 import org.jvnet.mock_javamail.Mailbox;
 
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPostProcessActionTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPostProcessActionTest.java
index 04cd3c2..4495d8d 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPostProcessActionTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPostProcessActionTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.mail;
-import org.junit.Before;
-
 import javax.mail.Folder;
 import javax.mail.Message;
 import javax.mail.Store;
@@ -26,6 +24,7 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.impl.JndiRegistry;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 import org.jvnet.mock_javamail.Mailbox;
 import org.slf4j.Logger;
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProcessOnlyUnseenMessagesTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProcessOnlyUnseenMessagesTest.java
index 2864309..14a8a5c 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProcessOnlyUnseenMessagesTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProcessOnlyUnseenMessagesTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.mail;
-import org.junit.Before;
-
 import javax.mail.Flags;
 import javax.mail.Folder;
 import javax.mail.Message;
@@ -26,6 +24,7 @@ import javax.mail.internet.MimeMessage;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 import org.jvnet.mock_javamail.Mailbox;
 
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermTest.java
index 760d3f8..6ad14a6 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.mail;
-import org.junit.Before;
-
 import javax.mail.Folder;
 import javax.mail.Message;
 import javax.mail.Store;
@@ -28,6 +26,7 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.impl.JndiRegistry;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 import org.jvnet.mock_javamail.Mailbox;
 
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigLast24HoursTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigLast24HoursTest.java
index 3081b7e..fbb7583 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigLast24HoursTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigLast24HoursTest.java
@@ -15,9 +15,8 @@
  * limitations under the License.
  */
 package org.apache.camel.component.mail;
-import org.junit.Before;
-
 import java.util.Date;
+
 import javax.mail.Folder;
 import javax.mail.Message;
 import javax.mail.Store;
@@ -27,6 +26,7 @@ import javax.mail.internet.MimeMessage;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 import org.jvnet.mock_javamail.Mailbox;
 
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigTest.java
index 4ecb545..29b0ac5 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.mail;
-import org.junit.Before;
-
 import javax.mail.Folder;
 import javax.mail.Message;
 import javax.mail.Store;
@@ -26,6 +24,7 @@ import javax.mail.internet.MimeMessage;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 import org.jvnet.mock_javamail.Mailbox;
 
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteAllTasksTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteAllTasksTest.java
index 931d747..2b556da 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteAllTasksTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteAllTasksTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.mail;
-import org.junit.Before;
-
 import javax.mail.Folder;
 import javax.mail.Message;
 import javax.mail.Store;
@@ -27,6 +25,7 @@ import org.apache.camel.ShutdownRunningTask;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 import org.jvnet.mock_javamail.Mailbox;
 
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteCurrentTaskOnlyTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteCurrentTaskOnlyTest.java
index a5bc109..4a5514f 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteCurrentTaskOnlyTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteCurrentTaskOnlyTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.mail;
-import org.junit.Before;
-
 import javax.mail.Folder;
 import javax.mail.Message;
 import javax.mail.Store;
@@ -26,6 +24,7 @@ import org.apache.camel.ShutdownRunningTask;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 import org.jvnet.mock_javamail.Mailbox;
 
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTest.java
index 855852b..6f3f5ba 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.mail;
-import org.junit.Before;
-
 import java.util.Date;
 
 import javax.mail.Folder;
@@ -25,11 +23,11 @@ import javax.mail.Store;
 import javax.mail.internet.MimeMessage;
 
 import com.sun.mail.imap.SortTerm;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.impl.JndiRegistry;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 import org.jvnet.mock_javamail.Mailbox;
 
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermThreeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermThreeTest.java
index 0444b59..292b59c 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermThreeTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermThreeTest.java
@@ -15,9 +15,8 @@
  * limitations under the License.
  */
 package org.apache.camel.component.mail;
-import org.junit.Before;
-
 import java.util.Date;
+
 import javax.mail.Folder;
 import javax.mail.Message;
 import javax.mail.Store;
@@ -28,6 +27,7 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.impl.JndiRegistry;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 import org.jvnet.mock_javamail.Mailbox;
 
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTwoTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTwoTest.java
index b802223..ab6767e 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTwoTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTwoTest.java
@@ -15,9 +15,8 @@
  * limitations under the License.
  */
 package org.apache.camel.component.mail;
-import org.junit.Before;
-
 import java.util.Date;
+
 import javax.mail.Folder;
 import javax.mail.Message;
 import javax.mail.Store;
@@ -28,6 +27,7 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.impl.JndiRegistry;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 import org.jvnet.mock_javamail.Mailbox;
 
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingCustomSessionTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingCustomSessionTest.java
index 87d0dca..a51743c 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingCustomSessionTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingCustomSessionTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.mail;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
+
 import javax.mail.Message;
 import javax.mail.Session;
 
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java
index 92e38f0..5e65ced 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.mail;
 
 import java.io.ByteArrayOutputStream;
 import java.util.Map;
+
 import javax.activation.DataHandler;
 import javax.activation.FileDataSource;
 import javax.mail.internet.MimeMultipart;
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithLongerFilenameTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithLongerFilenameTest.java
index 64e88f1..fb6798d 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithLongerFilenameTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithLongerFilenameTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.mail;
 
 import java.io.ByteArrayOutputStream;
 import java.util.Map;
+
 import javax.activation.DataHandler;
 import javax.activation.FileDataSource;
 import javax.mail.internet.MimeMultipart;
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java
index f75e9e8..56374e8 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java
@@ -15,12 +15,11 @@
  * limitations under the License.
  */
 package org.apache.camel.component.mail;
-import org.junit.Before;
-
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.mail.Folder;
 import javax.mail.Message;
 import javax.mail.Store;
@@ -30,6 +29,7 @@ import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 import org.jvnet.mock_javamail.Mailbox;
 
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/SearchTermBuilderTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/SearchTermBuilderTest.java
index 9a47d28..280276b 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/SearchTermBuilderTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/SearchTermBuilderTest.java
@@ -16,14 +16,14 @@
  */
 package org.apache.camel.component.mail;
 
-import org.junit.Test;
-
 import java.util.Date;
+
 import javax.mail.internet.InternetAddress;
 import javax.mail.internet.MimeMessage;
 import javax.mail.search.SearchTerm;
 
 import org.junit.Assert;
+import org.junit.Test;
 import org.jvnet.mock_javamail.Mailbox;
 
 import static org.apache.camel.component.mail.SearchTermBuilder.Comparison;
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/mock/MyMockStore.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/mock/MyMockStore.java
index c68f958..0a1572a 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/mock/MyMockStore.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/mock/MyMockStore.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.mail.mock;
 
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.mail.Folder;
 import javax.mail.MessagingException;
 import javax.mail.Session;
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/SslContextParametersMailRouteTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/SslContextParametersMailRouteTest.java
index f590763..3353c02 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/SslContextParametersMailRouteTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/SslContextParametersMailRouteTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.mail.security;
 
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.net.ssl.SSLHandshakeException;
 
 import org.apache.camel.CamelExecutionException;
diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/JAASSecurityAuthenticator.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/JAASSecurityAuthenticator.java
index 09204dd..109b526 100644
--- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/JAASSecurityAuthenticator.java
+++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/JAASSecurityAuthenticator.java
@@ -17,6 +17,7 @@
 package org.apache.camel.component.netty.http;
 
 import java.security.Principal;
+
 import javax.security.auth.Subject;
 import javax.security.auth.login.LoginContext;
 import javax.security.auth.login.LoginException;
diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/SecurityAuthenticatorSupport.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/SecurityAuthenticatorSupport.java
index 048ac00..faf3f7e 100644
--- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/SecurityAuthenticatorSupport.java
+++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/SecurityAuthenticatorSupport.java
@@ -20,6 +20,7 @@ import java.io.IOException;
 import java.security.Principal;
 import java.util.Iterator;
 import java.util.Locale;
+
 import javax.security.auth.Subject;
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerChannelHandler.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerChannelHandler.java
index 2affc2e..893bc9e 100644
--- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerChannelHandler.java
+++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerChannelHandler.java
@@ -46,9 +46,9 @@ import org.jboss.netty.handler.codec.http.DefaultHttpResponse;
 import org.jboss.netty.handler.codec.http.HttpHeaders;
 import org.jboss.netty.handler.codec.http.HttpRequest;
 import org.jboss.netty.handler.codec.http.HttpResponse;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import static org.jboss.netty.handler.codec.http.HttpResponseStatus.BAD_REQUEST;
 import static org.jboss.netty.handler.codec.http.HttpResponseStatus.METHOD_NOT_ALLOWED;
 import static org.jboss.netty.handler.codec.http.HttpResponseStatus.OK;
diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerMultiplexChannelHandler.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerMultiplexChannelHandler.java
index d454ec5..fc34b71 100644
--- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerMultiplexChannelHandler.java
+++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerMultiplexChannelHandler.java
@@ -42,6 +42,7 @@ import org.jboss.netty.handler.codec.http.HttpRequest;
 import org.jboss.netty.handler.codec.http.HttpResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import static org.jboss.netty.handler.codec.http.HttpResponseStatus.NOT_FOUND;
 import static org.jboss.netty.handler.codec.http.HttpVersion.HTTP_1_1;
 
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/BaseNettyTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/BaseNettyTest.java
index 02ed907..66feae5 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/BaseNettyTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/BaseNettyTest.java
@@ -15,9 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.netty.http;
-import org.junit.Before;
-import org.junit.After;
-
 import java.io.File;
 import java.io.FileOutputStream;
 import java.util.Properties;
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/ManagedNettyEndpointTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/ManagedNettyEndpointTest.java
index 8e7d785..4ac32fd 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/ManagedNettyEndpointTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/ManagedNettyEndpointTest.java
@@ -17,6 +17,7 @@
 package org.apache.camel.component.netty.http;
 
 import java.util.Set;
+
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/MyLoginModule.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/MyLoginModule.java
index f2bd5c9..f57263b 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/MyLoginModule.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/MyLoginModule.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.netty.http;
 
 import java.io.IOException;
 import java.util.Map;
+
 import javax.security.auth.Subject;
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBasicAuthConstraintMapperTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBasicAuthConstraintMapperTest.java
index c7f46c1..ee3f0e7 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBasicAuthConstraintMapperTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBasicAuthConstraintMapperTest.java
@@ -15,12 +15,11 @@
  * limitations under the License.
  */
 package org.apache.camel.component.netty.http;
-import org.junit.Before;
-import org.junit.After;
-
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.impl.JndiRegistry;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 public class NettyHttpBasicAuthConstraintMapperTest extends BaseNettyTest {
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBasicAuthTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBasicAuthTest.java
index e980b6e..be1d8d3 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBasicAuthTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBasicAuthTest.java
@@ -15,12 +15,11 @@
  * limitations under the License.
  */
 package org.apache.camel.component.netty.http;
-import org.junit.Before;
-import org.junit.After;
-
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.impl.JndiRegistry;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 public class NettyHttpBasicAuthTest extends BaseNettyTest {
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpGlobalSSLTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpGlobalSSLTest.java
index a351464..cb77e69 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpGlobalSSLTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpGlobalSSLTest.java
@@ -15,9 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.netty.http;
-import org.junit.Before;
-import org.junit.After;
-
 import java.net.URL;
 
 import org.apache.camel.CamelContext;
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLTest.java
index a3c3771..754d628 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLTest.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 package org.apache.camel.component.netty.http;
-import org.junit.Before;
-
 import java.net.URL;
 import java.util.Properties;
+
 import javax.net.ssl.SSLSession;
 
 import org.apache.camel.Exchange;
@@ -27,6 +26,7 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.netty.NettyConstants;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 public class NettyHttpSSLTest extends BaseNettyTest {
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSimpleBasicAuthConstraintMapperTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSimpleBasicAuthConstraintMapperTest.java
index daf77a6..afb0acb 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSimpleBasicAuthConstraintMapperTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSimpleBasicAuthConstraintMapperTest.java
@@ -15,12 +15,11 @@
  * limitations under the License.
  */
 package org.apache.camel.component.netty.http;
-import org.junit.Before;
-import org.junit.After;
-
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.impl.JndiRegistry;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 public class NettyHttpSimpleBasicAuthConstraintMapperTest extends BaseNettyTest {
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSimpleBasicAuthTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSimpleBasicAuthTest.java
index ffbb750..945c482 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSimpleBasicAuthTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSimpleBasicAuthTest.java
@@ -15,11 +15,10 @@
  * limitations under the License.
  */
 package org.apache.camel.component.netty.http;
-import org.junit.Before;
-import org.junit.After;
-
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.builder.RouteBuilder;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 public class NettyHttpSimpleBasicAuthTest extends BaseNettyTest {
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettySharedHttpServerTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettySharedHttpServerTest.java
index 6e79bd8..6c2cea5 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettySharedHttpServerTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettySharedHttpServerTest.java
@@ -15,11 +15,10 @@
  * limitations under the License.
  */
 package org.apache.camel.component.netty.http;
-import org.junit.After;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.impl.DefaultClassResolver;
 import org.apache.camel.impl.JndiRegistry;
+import org.junit.After;
 import org.junit.Test;
 
 public class NettySharedHttpServerTest extends BaseNettyTest {
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/SecurityConstraintMappingTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/SecurityConstraintMappingTest.java
index 220e19e..4d39758 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/SecurityConstraintMappingTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/SecurityConstraintMappingTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.component.netty.http;
 
-import org.junit.Test;
-
 import org.junit.Assert;
+import org.junit.Test;
 
 public class SecurityConstraintMappingTest extends Assert {
 
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/SpringNettyHttpBasicAuthTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/SpringNettyHttpBasicAuthTest.java
index cc44412..5a43fc5 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/SpringNettyHttpBasicAuthTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/SpringNettyHttpBasicAuthTest.java
@@ -15,18 +15,15 @@
  * limitations under the License.
  */
 package org.apache.camel.component.netty.http;
-import org.junit.Before;
-import org.junit.After;
-
 import javax.annotation.Resource;
 
-import org.junit.Assert;
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Produce;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.AfterClass;
+import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/SpringNettyHttpSSLTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/SpringNettyHttpSSLTest.java
index faca0b4..43e3c2d 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/SpringNettyHttpSSLTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/SpringNettyHttpSSLTest.java
@@ -15,18 +15,16 @@
  * limitations under the License.
  */
 package org.apache.camel.component.netty.http;
-import org.junit.Before;
-import org.junit.After;
-
 import java.net.URL;
+
 import javax.annotation.Resource;
 
-import org.junit.Assert;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Produce;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.AfterClass;
+import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestPathMatchingTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestPathMatchingTest.java
index 3ade00d..abbc05b 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestPathMatchingTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestPathMatchingTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.component.netty.http.rest;
 
-import org.junit.Test;
-
-import org.junit.Assert;
 import org.apache.camel.component.netty.http.RestContextPathMatcher;
+import org.junit.Assert;
+import org.junit.Test;
 
 public class RestPathMatchingTest extends Assert {
 
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/HttpServerBootstrapFactory.java b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/HttpServerBootstrapFactory.java
index be4c9e1..44346e6 100644
--- a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/HttpServerBootstrapFactory.java
+++ b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/HttpServerBootstrapFactory.java
@@ -18,12 +18,10 @@ package org.apache.camel.component.netty4.http;
 
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelInitializer;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.component.netty4.NettyConsumer;
 import org.apache.camel.component.netty4.NettyServerBootstrapConfiguration;
 import org.apache.camel.component.netty4.SingleTCPNettyServerBootstrapFactory;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/JAASSecurityAuthenticator.java b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/JAASSecurityAuthenticator.java
index 4f21def..67da211 100644
--- a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/JAASSecurityAuthenticator.java
+++ b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/JAASSecurityAuthenticator.java
@@ -17,6 +17,7 @@
 package org.apache.camel.component.netty4.http;
 
 import java.security.Principal;
+
 import javax.security.auth.Subject;
 import javax.security.auth.login.LoginContext;
 import javax.security.auth.login.LoginException;
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/SecurityAuthenticatorSupport.java b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/SecurityAuthenticatorSupport.java
index f4622b4..2ececc8 100644
--- a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/SecurityAuthenticatorSupport.java
+++ b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/SecurityAuthenticatorSupport.java
@@ -20,6 +20,7 @@ import java.io.IOException;
 import java.security.Principal;
 import java.util.Iterator;
 import java.util.Locale;
+
 import javax.security.auth.Subject;
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/handlers/HttpClientChannelHandler.java b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/handlers/HttpClientChannelHandler.java
index 1ced798..d068d53 100644
--- a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/handlers/HttpClientChannelHandler.java
+++ b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/handlers/HttpClientChannelHandler.java
@@ -24,7 +24,6 @@ import java.util.Map;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.http.FullHttpResponse;
 import io.netty.handler.codec.http.HttpUtil;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.component.netty4.NettyConstants;
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/handlers/HttpServerChannelHandler.java b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/handlers/HttpServerChannelHandler.java
index 4cd02c4..99b4845 100644
--- a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/handlers/HttpServerChannelHandler.java
+++ b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/handlers/HttpServerChannelHandler.java
@@ -34,7 +34,6 @@ import io.netty.handler.codec.http.HttpHeaderValues;
 import io.netty.handler.codec.http.HttpRequest;
 import io.netty.handler.codec.http.HttpResponse;
 import io.netty.handler.codec.http.HttpUtil;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.LoggingLevel;
 import org.apache.camel.component.netty4.NettyConverter;
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/handlers/HttpServerMultiplexChannelHandler.java b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/handlers/HttpServerMultiplexChannelHandler.java
index 0fddb8b..dc4bae5 100644
--- a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/handlers/HttpServerMultiplexChannelHandler.java
+++ b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/handlers/HttpServerMultiplexChannelHandler.java
@@ -24,7 +24,6 @@ import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.stream.Collectors;
 
-
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandler.Sharable;
 import io.netty.channel.ChannelHandlerContext;
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/BaseNettyTest.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/BaseNettyTest.java
index 525df53..4e6f23e 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/BaseNettyTest.java
+++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/BaseNettyTest.java
@@ -15,9 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.netty4.http;
-import org.junit.Before;
-import org.junit.After;
-
 import java.io.File;
 import java.io.FileOutputStream;
 import java.util.Collection;
@@ -25,7 +22,6 @@ import java.util.Properties;
 
 import io.netty.buffer.ByteBufAllocator;
 import io.netty.util.ResourceLeakDetector;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.component.properties.PropertiesComponent;
 import org.apache.camel.converter.IOConverter;
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/LogCaptureTest.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/LogCaptureTest.java
index dfa38d2..990f8be 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/LogCaptureTest.java
+++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/LogCaptureTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.netty4.http;
 
 import io.netty.util.ResourceLeakDetector;
 import io.netty.util.internal.logging.InternalLoggerFactory;
-
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/ManagedNettyEndpointTest.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/ManagedNettyEndpointTest.java
index 0363450..0c08c63 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/ManagedNettyEndpointTest.java
+++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/ManagedNettyEndpointTest.java
@@ -17,6 +17,7 @@
 package org.apache.camel.component.netty4.http;
 
 import java.util.Set;
+
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/MyLoginModule.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/MyLoginModule.java
index 2954688..6656aa6 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/MyLoginModule.java
+++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/MyLoginModule.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.netty4.http;
 
 import java.io.IOException;
 import java.util.Map;
+
 import javax.security.auth.Subject;
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestAndResponseBeanTest.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestAndResponseBeanTest.java
index 78c766a..80a2c52 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestAndResponseBeanTest.java
+++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestAndResponseBeanTest.java
@@ -24,7 +24,6 @@ import io.netty.handler.codec.http.HttpHeaderNames;
 import io.netty.handler.codec.http.HttpResponse;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.handler.codec.http.HttpVersion;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.netty4.NettyConverter;
 import org.junit.Test;
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestTest.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestTest.java
index aa3ce53..7ecec97 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestTest.java
+++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestTest.java
@@ -17,11 +17,9 @@
 package org.apache.camel.component.netty4.http;
 
 import io.netty.handler.codec.http.HttpRequest;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
-
 import org.junit.Test;
 
 public class NettyHttpAccessHttpRequestTest extends BaseNettyTest {
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBasicAuthConstraintMapperTest.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBasicAuthConstraintMapperTest.java
index 44a67a0..a0f8e86 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBasicAuthConstraintMapperTest.java
+++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBasicAuthConstraintMapperTest.java
@@ -15,12 +15,11 @@
  * limitations under the License.
  */
 package org.apache.camel.component.netty4.http;
-import org.junit.Before;
-import org.junit.After;
-
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.impl.JndiRegistry;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 public class NettyHttpBasicAuthConstraintMapperTest extends BaseNettyTest {
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBasicAuthTest.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBasicAuthTest.java
index d539525..9d3f3ea 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBasicAuthTest.java
+++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBasicAuthTest.java
@@ -15,12 +15,11 @@
  * limitations under the License.
  */
 package org.apache.camel.component.netty4.http;
-import org.junit.Before;
-import org.junit.After;
-
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.impl.JndiRegistry;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 public class NettyHttpBasicAuthTest extends BaseNettyTest {
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingPreservePostFormUrlEncodedBodyTest.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingPreservePostFormUrlEncodedBodyTest.java
index 2d7daa7..5f6eef8 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingPreservePostFormUrlEncodedBodyTest.java
+++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingPreservePostFormUrlEncodedBodyTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.netty4.http;
 
 import io.netty.handler.codec.http.FullHttpRequest;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingUseRelativePathInPostTest.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingUseRelativePathInPostTest.java
index 8d2ffe6..bd25744 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingUseRelativePathInPostTest.java
+++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingUseRelativePathInPostTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.netty4.http;
 
 import io.netty.handler.codec.http.FullHttpRequest;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpCompressTest.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpCompressTest.java
index 5f32a5f..e1cbe5e 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpCompressTest.java
+++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpCompressTest.java
@@ -24,7 +24,6 @@ import java.util.Map;
 
 import io.netty.channel.ChannelHandler;
 import io.netty.handler.codec.http.HttpContentDecompressor;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.impl.JndiRegistry;
 import org.junit.Test;
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpGetWithInvalidMessageTest.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpGetWithInvalidMessageTest.java
index 85c3bb9..48d3bc0 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpGetWithInvalidMessageTest.java
+++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpGetWithInvalidMessageTest.java
@@ -22,14 +22,12 @@ import java.util.List;
 import io.netty.channel.ChannelHandler;
 import io.netty.handler.codec.string.StringDecoder;
 import io.netty.handler.codec.string.StringEncoder;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.impl.JndiRegistry;
 import org.apache.camel.test.AvailablePortFinder;
 import org.apache.camel.test.junit4.CamelTestSupport;
-
 import org.junit.Test;
 
 public class NettyHttpGetWithInvalidMessageTest extends CamelTestSupport {
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpOperationFailedExceptionTest.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpOperationFailedExceptionTest.java
index c032318..100971e 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpOperationFailedExceptionTest.java
+++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpOperationFailedExceptionTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.netty4.http;
 
 import io.netty.handler.codec.http.DefaultLastHttpContent;
-
 import org.junit.Test;
 
 import static org.hamcrest.core.IsNot.not;
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerSimpleTest.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerSimpleTest.java
index 6eadd97..4e9dd7f 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerSimpleTest.java
+++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerSimpleTest.java
@@ -17,11 +17,9 @@
 package org.apache.camel.component.netty4.http;
 
 import io.netty.handler.codec.http.HttpResponse;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
-
 import org.junit.Test;
 
 public class NettyHttpProducerSimpleTest extends BaseNettyTest {
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRequestTimeoutTest.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRequestTimeoutTest.java
index 12cb819..66e43f6 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRequestTimeoutTest.java
+++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRequestTimeoutTest.java
@@ -17,12 +17,10 @@
 package org.apache.camel.component.netty4.http;
 
 import io.netty.handler.timeout.ReadTimeoutException;
-
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
-
 import org.junit.Test;
 
 public class NettyHttpRequestTimeoutTest extends BaseNettyTest {
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSSLTest.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSSLTest.java
index d235dfa..7d51465 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSSLTest.java
+++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSSLTest.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 package org.apache.camel.component.netty4.http;
-import org.junit.Before;
-
 import java.net.URL;
 import java.util.Properties;
+
 import javax.net.ssl.SSLSession;
 
 import org.apache.camel.Exchange;
@@ -27,6 +26,7 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.netty4.NettyConstants;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 public class NettyHttpSSLTest extends BaseNettyTest {
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSimpleBasicAuthConstraintMapperTest.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSimpleBasicAuthConstraintMapperTest.java
index 0e5f931..1856831 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSimpleBasicAuthConstraintMapperTest.java
+++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSimpleBasicAuthConstraintMapperTest.java
@@ -15,12 +15,11 @@
  * limitations under the License.
  */
 package org.apache.camel.component.netty4.http;
-import org.junit.Before;
-import org.junit.After;
-
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.impl.JndiRegistry;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 public class NettyHttpSimpleBasicAuthConstraintMapperTest extends BaseNettyTest {
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSimpleBasicAuthTest.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSimpleBasicAuthTest.java
index 362ba60..7c08eda 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSimpleBasicAuthTest.java
+++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSimpleBasicAuthTest.java
@@ -15,11 +15,10 @@
  * limitations under the License.
  */
 package org.apache.camel.component.netty4.http;
-import org.junit.Before;
-import org.junit.After;
-
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.builder.RouteBuilder;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 public class NettyHttpSimpleBasicAuthTest extends BaseNettyTest {
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyRequestManagementTest.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyRequestManagementTest.java
index eec5537..79a29e7 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyRequestManagementTest.java
+++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyRequestManagementTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.netty4.http;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.PooledByteBufAllocator;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.Assert;
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettySharedHttpServerTest.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettySharedHttpServerTest.java
index c86dd55..11441e6 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettySharedHttpServerTest.java
+++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettySharedHttpServerTest.java
@@ -15,11 +15,10 @@
  * limitations under the License.
  */
 package org.apache.camel.component.netty4.http;
-import org.junit.After;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.impl.DefaultClassResolver;
 import org.apache.camel.impl.JndiRegistry;
+import org.junit.After;
 import org.junit.Test;
 
 public class NettySharedHttpServerTest extends BaseNettyTest {
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/SecurityConstraintMappingTest.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/SecurityConstraintMappingTest.java
index 66f3d64..281fe4d 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/SecurityConstraintMappingTest.java
+++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/SecurityConstraintMappingTest.java
@@ -16,9 +16,8 @@
  */
 package org.apache.camel.component.netty4.http;
 
-import org.junit.Test;
-
 import org.junit.Assert;
+import org.junit.Test;
 
 public class SecurityConstraintMappingTest extends Assert {
 
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/SpringNettyHttpBasicAuthTest.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/SpringNettyHttpBasicAuthTest.java
index 252243c..f02075e 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/SpringNettyHttpBasicAuthTest.java
+++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/SpringNettyHttpBasicAuthTest.java
@@ -15,18 +15,15 @@
  * limitations under the License.
  */
 package org.apache.camel.component.netty4.http;
-import org.junit.Before;
-import org.junit.After;
-
 import javax.annotation.Resource;
 
-import org.junit.Assert;
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Produce;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.AfterClass;
+import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/SpringNettyHttpSSLTest.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/SpringNettyHttpSSLTest.java
index 827c560..2b05458 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/SpringNettyHttpSSLTest.java
+++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/SpringNettyHttpSSLTest.java
@@ -15,18 +15,16 @@
  * limitations under the License.
  */
 package org.apache.camel.component.netty4.http;
-import org.junit.Before;
-import org.junit.After;
-
 import java.net.URL;
+
 import javax.annotation.Resource;
 
-import org.junit.Assert;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Produce;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.AfterClass;
+import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestPathMatchingTest.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestPathMatchingTest.java
index 674aa60..07024d2 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestPathMatchingTest.java
+++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestPathMatchingTest.java
@@ -16,10 +16,9 @@
  */
 package org.apache.camel.component.netty4.http.rest;
 
-import org.junit.Test;
-
-import org.junit.Assert;
 import org.apache.camel.component.netty4.http.RestContextPathMatcher;
+import org.junit.Assert;
+import org.junit.Test;
 
 public class RestPathMatchingTest extends Assert {
 
diff --git a/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftProducer.java b/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftProducer.java
index bdc3727..4bb1875 100644
--- a/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftProducer.java
+++ b/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/OpenShiftProducer.java
@@ -34,7 +34,6 @@ import com.openshift.client.cartridge.IDeployedStandaloneCartridge;
 import com.openshift.client.cartridge.IEmbeddableCartridge;
 import com.openshift.client.cartridge.IEmbeddedCartridge;
 import com.openshift.client.cartridge.query.LatestEmbeddableCartridge;
-
 import org.apache.camel.CamelExchangeException;
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
diff --git a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftAddAliasTest.java b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftAddAliasTest.java
index 0be8355..87b1f08 100644
--- a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftAddAliasTest.java
+++ b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftAddAliasTest.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 package org.apache.camel.component.openshift;
-import org.junit.Before;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 
 public class OpenShiftAddAliasTest extends CamelTestSupport {
diff --git a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftAddEmbeddedCartridgeTest.java b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftAddEmbeddedCartridgeTest.java
index e2a668a..879d06c 100644
--- a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftAddEmbeddedCartridgeTest.java
+++ b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftAddEmbeddedCartridgeTest.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 package org.apache.camel.component.openshift;
-import org.junit.Before;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 
 public class OpenShiftAddEmbeddedCartridgeTest extends CamelTestSupport {
diff --git a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftAddEnvironmentVariableTest.java b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftAddEnvironmentVariableTest.java
index ac9260d..640a411 100644
--- a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftAddEnvironmentVariableTest.java
+++ b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftAddEnvironmentVariableTest.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 package org.apache.camel.component.openshift;
-import org.junit.Before;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 
 public class OpenShiftAddEnvironmentVariableTest extends CamelTestSupport {
diff --git a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftAddMultipleEnvironmentVariablesTest.java b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftAddMultipleEnvironmentVariablesTest.java
index dafd4f8..91cdc2f 100644
--- a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftAddMultipleEnvironmentVariablesTest.java
+++ b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftAddMultipleEnvironmentVariablesTest.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 package org.apache.camel.component.openshift;
-import org.junit.Before;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 
 public class OpenShiftAddMultipleEnvironmentVariablesTest extends CamelTestSupport {
diff --git a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftConsumerOnChangeTest.java b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftConsumerOnChangeTest.java
index d5c6f31..353666e 100644
--- a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftConsumerOnChangeTest.java
+++ b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftConsumerOnChangeTest.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 package org.apache.camel.component.openshift;
-import org.junit.Before;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 
 public class OpenShiftConsumerOnChangeTest extends CamelTestSupport {
diff --git a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftConsumerTest.java b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftConsumerTest.java
index 97bd140..2ff97fe3 100644
--- a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftConsumerTest.java
+++ b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftConsumerTest.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 package org.apache.camel.component.openshift;
-import org.junit.Before;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 
 public class OpenShiftConsumerTest extends CamelTestSupport {
diff --git a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftGetAliasesTest.java b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftGetAliasesTest.java
index 5d1c90d..66156f3 100644
--- a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftGetAliasesTest.java
+++ b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftGetAliasesTest.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 package org.apache.camel.component.openshift;
-import org.junit.Before;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 
 public class OpenShiftGetAliasesTest extends CamelTestSupport {
diff --git a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftGetAllEnvironmentVariablesTest.java b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftGetAllEnvironmentVariablesTest.java
index b86c043..924a12f 100644
--- a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftGetAllEnvironmentVariablesTest.java
+++ b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftGetAllEnvironmentVariablesTest.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 package org.apache.camel.component.openshift;
-import org.junit.Before;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 
 public class OpenShiftGetAllEnvironmentVariablesTest extends CamelTestSupport {
diff --git a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftGetDeploymentTypeTest.java b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftGetDeploymentTypeTest.java
index 83b7063..a28b34c 100644
--- a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftGetDeploymentTypeTest.java
+++ b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftGetDeploymentTypeTest.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 package org.apache.camel.component.openshift;
-import org.junit.Before;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 
 public class OpenShiftGetDeploymentTypeTest extends CamelTestSupport {
diff --git a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftGetEmbeddedCartridgesTest.java b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftGetEmbeddedCartridgesTest.java
index ae3626b..2476856 100644
--- a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftGetEmbeddedCartridgesTest.java
+++ b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftGetEmbeddedCartridgesTest.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 package org.apache.camel.component.openshift;
-import org.junit.Before;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 
 public class OpenShiftGetEmbeddedCartridgesTest extends CamelTestSupport {
diff --git a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftGetEnvironmentVariableValueTest.java b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftGetEnvironmentVariableValueTest.java
index 4f974ed..e0b83f8 100644
--- a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftGetEnvironmentVariableValueTest.java
+++ b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftGetEnvironmentVariableValueTest.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 package org.apache.camel.component.openshift;
-import org.junit.Before;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 
 public class OpenShiftGetEnvironmentVariableValueTest extends CamelTestSupport {
diff --git a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftGetGearProfileTest.java b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftGetGearProfileTest.java
index b1f839b..50a8fd0 100644
--- a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftGetGearProfileTest.java
+++ b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftGetGearProfileTest.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 package org.apache.camel.component.openshift;
-import org.junit.Before;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 
 public class OpenShiftGetGearProfileTest extends CamelTestSupport {
diff --git a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftGetGitUrlTest.java b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftGetGitUrlTest.java
index 0e2ce63..181fb04 100644
--- a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftGetGitUrlTest.java
+++ b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftGetGitUrlTest.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 package org.apache.camel.component.openshift;
-import org.junit.Before;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 
 public class OpenShiftGetGitUrlTest extends CamelTestSupport {
diff --git a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftGetStandaloneCartridgeTest.java b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftGetStandaloneCartridgeTest.java
index 82e0237..2961f5f 100644
--- a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftGetStandaloneCartridgeTest.java
+++ b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftGetStandaloneCartridgeTest.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 package org.apache.camel.component.openshift;
-import org.junit.Before;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 
 public class OpenShiftGetStandaloneCartridgeTest extends CamelTestSupport {
diff --git a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftListApplicationsModeJsonTest.java b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftListApplicationsModeJsonTest.java
index f0ead3c..7b04d2f 100644
--- a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftListApplicationsModeJsonTest.java
+++ b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftListApplicationsModeJsonTest.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 package org.apache.camel.component.openshift;
-import org.junit.Before;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 
 public class OpenShiftListApplicationsModeJsonTest extends CamelTestSupport {
diff --git a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftListApplicationsTest.java b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftListApplicationsTest.java
index 5b73a4b..d141ccf 100644
--- a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftListApplicationsTest.java
+++ b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftListApplicationsTest.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 package org.apache.camel.component.openshift;
-import org.junit.Before;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 
 public class OpenShiftListApplicationsTest extends CamelTestSupport {
diff --git a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftRemoveAliasTest.java b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftRemoveAliasTest.java
index 4f0fe7a..2e2117a 100644
--- a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftRemoveAliasTest.java
+++ b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftRemoveAliasTest.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 package org.apache.camel.component.openshift;
-import org.junit.Before;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 
 public class OpenShiftRemoveAliasTest extends CamelTestSupport {
diff --git a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftRemoveEmbeddedCartridgeTest.java b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftRemoveEmbeddedCartridgeTest.java
index 0301841..87e62dd 100644
--- a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftRemoveEmbeddedCartridgeTest.java
+++ b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftRemoveEmbeddedCartridgeTest.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 package org.apache.camel.component.openshift;
-import org.junit.Before;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 
 public class OpenShiftRemoveEmbeddedCartridgeTest extends CamelTestSupport {
diff --git a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftRemoveEnvironmentVariableTest.java b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftRemoveEnvironmentVariableTest.java
index 830ed98..d6d4e8f 100644
--- a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftRemoveEnvironmentVariableTest.java
+++ b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftRemoveEnvironmentVariableTest.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 package org.apache.camel.component.openshift;
-import org.junit.Before;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 
 public class OpenShiftRemoveEnvironmentVariableTest extends CamelTestSupport {
diff --git a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftScaleDownTest.java b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftScaleDownTest.java
index 21f9d9c..79b3c5d 100644
--- a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftScaleDownTest.java
+++ b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftScaleDownTest.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 package org.apache.camel.component.openshift;
-import org.junit.Before;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 
 public class OpenShiftScaleDownTest extends CamelTestSupport {
diff --git a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftScaleUpTest.java b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftScaleUpTest.java
index 976fdb5..af8ebb0 100644
--- a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftScaleUpTest.java
+++ b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftScaleUpTest.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 package org.apache.camel.component.openshift;
-import org.junit.Before;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 
 public class OpenShiftScaleUpTest extends CamelTestSupport {
diff --git a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftSetDeploymentTypeTest.java b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftSetDeploymentTypeTest.java
index d6e6318..2bcb2fb 100644
--- a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftSetDeploymentTypeTest.java
+++ b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftSetDeploymentTypeTest.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 package org.apache.camel.component.openshift;
-import org.junit.Before;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 
 public class OpenShiftSetDeploymentTypeTest extends CamelTestSupport {
diff --git a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftStateTest.java b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftStateTest.java
index 355829f..cbc26e8 100644
--- a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftStateTest.java
+++ b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftStateTest.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 package org.apache.camel.component.openshift;
-import org.junit.Before;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 
 public class OpenShiftStateTest extends CamelTestSupport {
diff --git a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftUpdateEnvironmentVariableTest.java b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftUpdateEnvironmentVariableTest.java
index a415e2c..f73e011 100644
--- a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftUpdateEnvironmentVariableTest.java
+++ b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftUpdateEnvironmentVariableTest.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 package org.apache.camel.component.openshift;
-import org.junit.Before;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 
 public class OpenShiftUpdateEnvironmentVariableTest extends CamelTestSupport {
diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitConsumer.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitConsumer.java
index 3541562..e46dd2a 100644
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitConsumer.java
+++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitConsumer.java
@@ -31,7 +31,6 @@ import org.apache.camel.ExchangePattern;
 import org.apache.camel.Message;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.support.ServiceSupport;
-import org.apache.camel.util.ObjectHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQComponent.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQComponent.java
index 69a3e8a..72b6cb3 100644
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQComponent.java
+++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQComponent.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.rabbitmq;
 import java.net.URI;
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.net.ssl.TrustManager;
 
 import com.rabbitmq.client.Address;
diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConsumer.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConsumer.java
index 9aba524..c11597a 100644
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConsumer.java
+++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConsumer.java
@@ -25,7 +25,6 @@ import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import com.rabbitmq.client.Connection;
-
 import org.apache.camel.Processor;
 import org.apache.camel.Suspendable;
 import org.apache.camel.impl.DefaultConsumer;
diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
index 9cdbf34..c715514 100644
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
+++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
@@ -32,7 +32,6 @@ import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.ConnectionFactory;
 import com.rabbitmq.client.Envelope;
-
 import org.apache.camel.AsyncEndpoint;
 import org.apache.camel.Consumer;
 import org.apache.camel.Exchange;
diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQMessagePublisher.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQMessagePublisher.java
index f5f3bb9..5c52ead 100644
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQMessagePublisher.java
+++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQMessagePublisher.java
@@ -26,7 +26,6 @@ import java.util.concurrent.TimeoutException;
 import com.rabbitmq.client.AMQP;
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.ReturnListener;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.NoTypeConversionAvailableException;
diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQProducer.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQProducer.java
index 024daf6..23e7fe2 100644
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQProducer.java
+++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQProducer.java
@@ -25,7 +25,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import com.rabbitmq.client.AMQP;
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Connection;
-
 import org.apache.camel.AsyncCallback;
 import org.apache.camel.Exchange;
 import org.apache.camel.FailedToCreateProducerException;
diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/reply/ReplyHolder.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/reply/ReplyHolder.java
index 7ed0975..fa168db 100644
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/reply/ReplyHolder.java
+++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/reply/ReplyHolder.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.rabbitmq.reply;
 
 import com.rabbitmq.client.AMQP;
-
 import org.apache.camel.AsyncCallback;
 import org.apache.camel.Exchange;
 
diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/reply/ReplyManagerSupport.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/reply/ReplyManagerSupport.java
index 1ddf056..1c204af 100644
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/reply/ReplyManagerSupport.java
+++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/reply/ReplyManagerSupport.java
@@ -22,7 +22,6 @@ import java.util.concurrent.TimeUnit;
 
 import com.rabbitmq.client.AMQP;
 import com.rabbitmq.client.Connection;
-
 import org.apache.camel.AsyncCallback;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/reply/TemporaryQueueReplyHandler.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/reply/TemporaryQueueReplyHandler.java
index 716c2cb..f3b0648 100644
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/reply/TemporaryQueueReplyHandler.java
+++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/reply/TemporaryQueueReplyHandler.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.rabbitmq.reply;
 
 import com.rabbitmq.client.AMQP;
-
 import org.apache.camel.AsyncCallback;
 import org.apache.camel.Exchange;
 import org.slf4j.Logger;
diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/reply/TemporaryQueueReplyManager.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/reply/TemporaryQueueReplyManager.java
index 760cc47..b375e22 100644
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/reply/TemporaryQueueReplyManager.java
+++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/reply/TemporaryQueueReplyManager.java
@@ -24,7 +24,6 @@ import com.rabbitmq.client.AMQP.Queue.DeclareOk;
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.Envelope;
-
 import org.apache.camel.AsyncCallback;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/AbstractRabbitMQIntTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/AbstractRabbitMQIntTest.java
index 8439cfb..79ae2f3 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/AbstractRabbitMQIntTest.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/AbstractRabbitMQIntTest.java
@@ -21,6 +21,7 @@ import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeoutException;
+
 import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.ConnectionFactory;
 import org.apache.camel.test.junit4.CamelTestSupport;
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQComponentTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQComponentTest.java
index f732e6e..0e9e8bc 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQComponentTest.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQComponentTest.java
@@ -20,7 +20,6 @@ import java.util.HashMap;
 import java.util.Map;
 
 import com.rabbitmq.client.ConnectionFactory;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.impl.SimpleRegistry;
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerIntTestReplyTo.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerIntTestReplyTo.java
index 1f3bd86..d1807f6 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerIntTestReplyTo.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerIntTestReplyTo.java
@@ -26,7 +26,6 @@ import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.DefaultConsumer;
 import com.rabbitmq.client.Envelope;
-
 import org.apache.camel.Endpoint;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerTest.java
index 00c6d1e..5e2cf03 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerTest.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerTest.java
@@ -23,7 +23,6 @@ import java.util.concurrent.ThreadPoolExecutor;
 import com.rabbitmq.client.AlreadyClosedException;
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Connection;
-
 import com.rabbitmq.client.Consumer;
 import org.apache.camel.Processor;
 import org.junit.Test;
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointTest.java
index 914173a..9308460 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointTest.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointTest.java
@@ -19,7 +19,11 @@ package org.apache.camel.component.rabbitmq;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.sql.Timestamp;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Random;
+import java.util.UUID;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeoutException;
@@ -29,7 +33,6 @@ import com.rabbitmq.client.Address;
 import com.rabbitmq.client.ConnectionFactory;
 import com.rabbitmq.client.Envelope;
 import com.rabbitmq.client.impl.LongStringHelper;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.JndiRegistry;
 import org.apache.camel.test.junit4.CamelTestSupport;
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQProducerTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQProducerTest.java
index 4e1bb5a..d955ccb 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQProducerTest.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQProducerTest.java
@@ -27,7 +27,6 @@ import java.util.concurrent.TimeoutException;
 
 import com.rabbitmq.client.AMQP;
 import com.rabbitmq.client.Connection;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.impl.DefaultCamelContext;
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQReConnectionIntTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQReConnectionIntTest.java
index b8cccb8..8a1ec64 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQReConnectionIntTest.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQReConnectionIntTest.java
@@ -20,7 +20,6 @@ import java.net.ConnectException;
 import java.util.concurrent.TimeUnit;
 
 import com.rabbitmq.client.AlreadyClosedException;
-
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.Endpoint;
 import org.apache.camel.EndpointInject;
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQSpringIntTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQSpringIntTest.java
index 5a397fe..a182b63 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQSpringIntTest.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQSpringIntTest.java
@@ -25,7 +25,6 @@ import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.ConnectionFactory;
 import com.rabbitmq.client.DefaultConsumer;
 import com.rabbitmq.client.Envelope;
-
 import org.apache.camel.Produce;
 import org.apache.camel.ProducerTemplate;
 import org.junit.After;
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQConsumerQpidTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQConsumerQpidTest.java
index 8b0dc69..f4f2396 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQConsumerQpidTest.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQConsumerQpidTest.java
@@ -15,9 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.rabbitmq.qpid;
-import org.junit.Before;
-import org.junit.After;
-
 import org.apache.camel.component.rabbitmq.RabbitMQConsumerIntTest;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQInOutQpidTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQInOutQpidTest.java
index 25807be..01573aa 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQInOutQpidTest.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQInOutQpidTest.java
@@ -15,9 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.rabbitmq.qpid;
-import org.junit.Before;
-import org.junit.After;
-
 import org.apache.camel.component.rabbitmq.RabbitMQInOutIntTest;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQLoadQpidTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQLoadQpidTest.java
index bfed5b7..d1a8591 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQLoadQpidTest.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQLoadQpidTest.java
@@ -15,9 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.rabbitmq.qpid;
-import org.junit.Before;
-import org.junit.After;
-
 import org.apache.camel.component.rabbitmq.RabbitMQLoadIntTest;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQProducerQpidTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQProducerQpidTest.java
index 5a53924..93f7802 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQProducerQpidTest.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQProducerQpidTest.java
@@ -15,9 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.rabbitmq.qpid;
-import org.junit.Before;
-import org.junit.After;
-
 import java.io.IOException;
 import java.util.concurrent.TimeoutException;
 
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQReConnectionQpidTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQReConnectionQpidTest.java
index 6003ef1..5c611a1 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQReConnectionQpidTest.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQReConnectionQpidTest.java
@@ -15,9 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.rabbitmq.qpid;
-import org.junit.Before;
-import org.junit.After;
-
 import org.apache.camel.component.rabbitmq.RabbitMQReConnectionIntTest;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQRequeueQpidTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQRequeueQpidTest.java
index 05b0bb9..cc3bf73 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQRequeueQpidTest.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQRequeueQpidTest.java
@@ -15,15 +15,11 @@
  * limitations under the License.
  */
 package org.apache.camel.component.rabbitmq.qpid;
-import org.junit.Before;
-import org.junit.After;
-
-import org.junit.Test;
-
 import org.apache.camel.component.rabbitmq.RabbitMQRequeueIntTest;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
+import org.junit.Test;
 
 public class RabbitMQRequeueQpidTest extends RabbitMQRequeueIntTest {
     @BeforeClass
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQRequeueUnhandledExceptionQpidTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQRequeueUnhandledExceptionQpidTest.java
index acc5208..269e563 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQRequeueUnhandledExceptionQpidTest.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQRequeueUnhandledExceptionQpidTest.java
@@ -15,9 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.rabbitmq.qpid;
-import org.junit.Before;
-import org.junit.After;
-
 import org.apache.camel.component.rabbitmq.RabbitMQRequeueUnhandledExceptionIntTest;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQSupendResumeQpidTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQSupendResumeQpidTest.java
index a08640b..9635c75 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQSupendResumeQpidTest.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQSupendResumeQpidTest.java
@@ -15,9 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.rabbitmq.qpid;
-import org.junit.Before;
-import org.junit.After;
-
 import org.apache.camel.component.rabbitmq.RabbitMQSupendResumeIntTest;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
diff --git a/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/SyslogConverter.java b/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/SyslogConverter.java
index a493eee..9cba73b 100644
--- a/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/SyslogConverter.java
+++ b/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/SyslogConverter.java
@@ -23,6 +23,7 @@ import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.xml.bind.DatatypeConverter;
 
 import org.apache.camel.Converter;
diff --git a/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/netty/Rfc5425FrameDecoder.java b/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/netty/Rfc5425FrameDecoder.java
index e384530..a97e123 100644
--- a/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/netty/Rfc5425FrameDecoder.java
+++ b/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/netty/Rfc5425FrameDecoder.java
@@ -23,7 +23,6 @@ import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.ByteToMessageDecoder;
-
 import org.apache.camel.component.netty4.ChannelHandlerFactory;
 
 public class Rfc5425FrameDecoder extends ByteToMessageDecoder implements ChannelHandlerFactory {
diff --git a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/AutomatedConversionTest.java b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/AutomatedConversionTest.java
index 10b8d6e..a3b950c 100644
--- a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/AutomatedConversionTest.java
+++ b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/AutomatedConversionTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.syslog;
-import org.junit.Before;
-
 import java.io.IOException;
 import java.net.DatagramPacket;
 import java.net.DatagramSocket;
diff --git a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaDataFormatTest.java b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaDataFormatTest.java
index b3cd048..ee3224e 100644
--- a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaDataFormatTest.java
+++ b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaDataFormatTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.syslog;
-import org.junit.Before;
-
 import java.io.IOException;
 import java.net.DatagramPacket;
 import java.net.DatagramSocket;
diff --git a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaManyUDPMessagesTest.java b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaManyUDPMessagesTest.java
index 9e4e284..5b035db 100644
--- a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaManyUDPMessagesTest.java
+++ b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaManyUDPMessagesTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.syslog;
-import org.junit.Before;
-
 import java.net.DatagramPacket;
 import java.net.DatagramSocket;
 import java.net.InetAddress;
diff --git a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyDataFormatTest.java b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyDataFormatTest.java
index 8b4609a..6177418 100644
--- a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyDataFormatTest.java
+++ b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyDataFormatTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.syslog;
-import org.junit.Before;
-
 import java.io.IOException;
 import java.net.DatagramPacket;
 import java.net.DatagramSocket;
diff --git a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyManyUDPMessagesTest.java b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyManyUDPMessagesTest.java
index f2105f2..c17d8a7 100644
--- a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyManyUDPMessagesTest.java
+++ b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyManyUDPMessagesTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.syslog;
-import org.junit.Before;
-
 import java.net.DatagramPacket;
 import java.net.DatagramSocket;
 import java.net.InetAddress;
diff --git a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425LongMessageTest.java b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425LongMessageTest.java
index 38a574a..8bee50c 100644
--- a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425LongMessageTest.java
+++ b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425LongMessageTest.java
@@ -15,10 +15,7 @@
  * limitations under the License.
  */
 package org.apache.camel.component.syslog;
-import org.junit.Before;
-
 import io.netty.buffer.ByteBuf;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425Test.java b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425Test.java
index e820596..0b88fd9 100644
--- a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425Test.java
+++ b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425Test.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.syslog;
-import org.junit.Before;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringMinaTest.java b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringMinaTest.java
index 40a006c..773e835 100644
--- a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringMinaTest.java
+++ b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringMinaTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.syslog;
-import org.junit.Before;
-
 import java.io.IOException;
 import java.net.DatagramPacket;
 import java.net.DatagramSocket;
diff --git a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringNettyTest.java b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringNettyTest.java
index 0a8cac8..7ee4438 100644
--- a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringNettyTest.java
+++ b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringNettyTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.syslog;
-import org.junit.Before;
-
 import java.io.IOException;
 import java.net.DatagramPacket;
 import java.net.DatagramSocket;
diff --git a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppDeferredConnectionTest.java b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppDeferredConnectionTest.java
index 95ca61c..09e8a49 100644
--- a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppDeferredConnectionTest.java
+++ b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppDeferredConnectionTest.java
@@ -15,12 +15,11 @@
  * limitations under the License.
  */
 package org.apache.camel.component.xmpp;
-import org.junit.After;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.impl.JndiRegistry;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.After;
 import org.junit.Test;
 
 /**
diff --git a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppMultiUserChatTest.java b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppMultiUserChatTest.java
index a7f8f68..a9d6b4e 100644
--- a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppMultiUserChatTest.java
+++ b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppMultiUserChatTest.java
@@ -15,12 +15,11 @@
  * limitations under the License.
  */
 package org.apache.camel.component.xmpp;
-import org.junit.After;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.impl.JndiRegistry;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.After;
 import org.junit.Test;
 
 /**
diff --git a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppProducerConcurrentTest.java b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppProducerConcurrentTest.java
index a29b810..daf5bd4 100644
--- a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppProducerConcurrentTest.java
+++ b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppProducerConcurrentTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.xmpp;
-import org.junit.After;
-
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -24,6 +22,7 @@ import java.util.concurrent.Executors;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.impl.JndiRegistry;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.After;
 import org.junit.Test;
 
 /**
diff --git a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRobustConnectionTest.java b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRobustConnectionTest.java
index c93be54..b46efcd 100644
--- a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRobustConnectionTest.java
+++ b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRobustConnectionTest.java
@@ -15,13 +15,12 @@
  * limitations under the License.
  */
 package org.apache.camel.component.xmpp;
-import org.junit.Before;
-import org.junit.After;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.impl.JndiRegistry;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
diff --git a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteChatTest.java b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteChatTest.java
index 6466437..bc9f080 100644
--- a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteChatTest.java
+++ b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteChatTest.java
@@ -15,12 +15,11 @@
  * limitations under the License.
  */
 package org.apache.camel.component.xmpp;
-import org.junit.After;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.impl.JndiRegistry;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.After;
 import org.junit.Ignore;
 import org.junit.Test;
 
diff --git a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteMultipleProducersSingleConsumerTest.java b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteMultipleProducersSingleConsumerTest.java
index 1c08519..78fa8c2 100644
--- a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteMultipleProducersSingleConsumerTest.java
+++ b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteMultipleProducersSingleConsumerTest.java
@@ -15,12 +15,11 @@
  * limitations under the License.
  */
 package org.apache.camel.component.xmpp;
-import org.junit.After;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.impl.JndiRegistry;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.After;
 import org.junit.Ignore;
 import org.junit.Test;
 
diff --git a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java
index b86a4dc..f0f9fbf 100644
--- a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java
+++ b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java
@@ -21,6 +21,7 @@ import java.util.concurrent.TimeUnit;
 
 import junit.framework.TestCase;
 import junit.textui.TestRunner;
+
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
@@ -90,8 +91,8 @@ public class XmppRouteTest extends TestCase {
         return body;
     }
 
-   @Override
-   protected void setUp() throws Exception {
+    @Override
+    protected void setUp() throws Exception {
         client = new ProducerCache(this, container, 10);
 
         String uriPrefix = getUriPrefix();
@@ -125,8 +126,8 @@ public class XmppRouteTest extends TestCase {
         return "xmpp://localhost:" + embeddedXmppTestServer.getXmppPort() + "/camel?login=false&room=camel-anon";
     }
 
-   @Override
-   protected void tearDown() throws Exception {
+    @Override
+    protected void tearDown() throws Exception {
         client.stop();
         container.stop();
         embeddedXmppTestServer.stop();