[camel] branch master updated: Fixed CS issues in camel-core

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[camel] branch master updated: Fixed CS issues in camel-core

aldettinger
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 1a9e611  Fixed CS issues in camel-core
1a9e611 is described below

commit 1a9e61191bb6dc5cdeb81389cdba756c2b25e686
Author: aldettinger <[hidden email]>
AuthorDate: Thu Sep 13 21:47:28 2018 +0200

    Fixed CS issues in camel-core
---
 .../org/apache/camel/builder/DataFormatClause.java |  1 +
 .../org/apache/camel/builder/xml/XPathBuilder.java |  1 +
 .../org/apache/camel/builder/xml/XsltBuilder.java  |  1 +
 .../validator/DefaultLSResourceResolver.java       |  1 +
 .../DefaultValidatorResourceResolverFactory.java   |  1 +
 .../ValidatorResourceResolverFactory.java          |  1 +
 .../apache/camel/converter/jaxp/XmlConverter.java  |  1 +
 .../camel/impl/FileWatcherReloadStrategy.java      |  6 ++--
 .../camel/impl/cloud/CachingServiceDiscovery.java  |  1 -
 .../converter/AnnotationTypeConverterLoader.java   |  8 ++---
 .../management/mbean/ManagedCamelContext.java      |  3 +-
 .../camel/management/mbean/ManagedRoute.java       |  3 +-
 .../camel/management/mbean/ManagedThrottler.java   |  4 +--
 .../management/mbean/RouteCoverageXmlParser.java   |  8 +++--
 .../apache/camel/model/DataFormatDefinition.java   |  4 +--
 .../java/org/apache/camel/model/ModelHelper.java   | 13 ++++----
 .../apache/camel/model/RouteDefinitionHelper.java  |  4 +--
 .../org/apache/camel/model/SortDefinition.java     |  4 +--
 .../camel/model/cloud/ServiceCallDefinition.java   |  6 ++--
 .../model/dataformat/TidyMarkupDataFormat.java     |  3 +-
 .../apache/camel/processor/ChoiceProcessor.java    |  4 +--
 .../java/org/apache/camel/processor/Enricher.java  |  4 +--
 .../camel/processor/FatalFallbackErrorHandler.java |  4 +--
 .../org/apache/camel/processor/LoopProcessor.java  |  4 +--
 .../apache/camel/processor/MulticastProcessor.java |  4 +--
 .../camel/processor/OnCompletionProcessor.java     |  4 +--
 .../java/org/apache/camel/processor/Pipeline.java  |  4 +--
 .../org/apache/camel/processor/PipelineHelper.java |  4 +--
 .../org/apache/camel/processor/PollEnricher.java   |  4 +--
 .../org/apache/camel/processor/RecipientList.java  |  4 +--
 .../org/apache/camel/processor/RoutingSlip.java    |  6 ++--
 .../java/org/apache/camel/processor/Splitter.java  |  4 +--
 .../ShareUnitOfWorkAggregationStrategy.java        |  4 +--
 .../aggregate/UseLatestAggregationStrategy.java    |  4 +--
 .../validation/DefaultValidationErrorHandler.java  |  5 +--
 .../camel/processor/validation/SchemaReader.java   |  6 ++--
 .../validation/SchemaValidationException.java      |  3 +-
 .../processor/validation/ValidatingProcessor.java  | 14 +++++----
 .../validation/ValidatorErrorHandler.java          |  3 +-
 .../camel/runtimecatalog/AbstractCamelCatalog.java | 36 +++++++++++-----------
 .../runtimecatalog/EndpointValidationResult.java   |  4 +--
 .../camel/support/ReloadStrategySupport.java       |  7 +++--
 .../org/apache/camel/util/CamelContextHelper.java  |  8 ++---
 .../java/org/apache/camel/util/EndpointHelper.java |  4 +--
 .../apache/camel/util/IntrospectionSupport.java    |  4 +--
 .../main/java/org/apache/camel/util/LRUCache.java  |  5 ++-
 .../java/org/apache/camel/util/ObjectHelper.java   |  5 +--
 .../java/org/apache/camel/util/StringHelper.java   |  4 +--
 .../org/apache/camel/util/XmlLineNumberParser.java |  1 +
 .../camel/util/jsse/BaseSSLContextParameters.java  |  4 +--
 .../util/toolbox/FlexibleAggregationStrategy.java  |  4 +--
 .../util/toolbox/XsltAggregationStrategy.java      |  3 +-
 .../org/apache/camel/BodyAndHeaderConvertTest.java |  5 +--
 .../test/java/org/apache/camel/TestSupport.java    |  4 +--
 .../camel/builder/ExpressionBuilderTest.java       | 26 ++++++++--------
 .../camel/builder/ExpressionFunctionTest.java      |  4 +--
 .../apache/camel/builder/PredicateBuilderTest.java |  8 ++---
 .../apache/camel/builder/xml/XPathFeatureTest.java |  7 +++--
 .../apache/camel/builder/xml/XPathMockTest.java    |  6 ++--
 .../org/apache/camel/builder/xml/XPathTest.java    | 14 +++++----
 .../camel/builder/xml/XPathTransformRouteTest.java |  5 +--
 .../camel/builder/xml/XPathTransformTest.java      | 19 ++++++------
 .../xml/XPathWithNamespacesFromDomTest.java        |  5 +--
 .../apache/camel/builder/xml/XsltBuilderTest.java  |  6 ++--
 .../camel/builder/xml/XsltOutputFileTest.java      |  4 +--
 .../org/apache/camel/builder/xml/XsltTest.java     |  4 +--
 .../builder/xml/XsltTestErrorListenerTest.java     | 10 +++---
 .../camel/component/ComponentDiscoveryTest.java    |  6 ++--
 .../bean/BeanNoTypeConvertionPossibleTest.java     |  3 +-
 ...BeanNoTypeConvertionPossibleWhenHeaderTest.java |  3 +-
 .../BeanPrivateClassWithInterfaceMethodTest.java   | 10 +++---
 .../component/bean/BeanProxyNoBindingTest.java     |  3 +-
 .../apache/camel/component/bean/BeanProxyTest.java |  3 +-
 .../component/bean/BeanWithHeaderAnnotation.java   |  3 +-
 .../camel/component/bean/OrderServiceBean.java     |  3 +-
 .../file/FileConsumerFileExpressionTest.java       |  4 +--
 ...leConsumerFileExpressionThrowExceptionTest.java |  4 +--
 ...umerPollStrategyRollbackThrowExceptionTest.java |  4 +--
 .../camel/component/file/FileNoOpLockFileTest.java |  4 +--
 .../component/file/FileProducerExpressionTest.java |  4 +--
 .../camel/component/file/NewFileConsumerTest.java  |  4 +--
 .../camel/component/file/XPathToFileTest.java      |  3 +-
 .../camel/component/log/LogCustomLoggerTest.java   |  4 +--
 .../camel/component/rest/RestEndpointTest.java     |  4 +--
 .../rest/RestProducerBindingProcessorTest.java     | 14 ++++-----
 .../camel/component/rest/RestProducerTest.java     |  6 ++--
 .../seda/SedaConsumerSuspendResumeTest.java        |  4 +--
 .../ValidatorResourceResolverFactoryTest.java      |  9 +++---
 .../ValidatorWithResourceResolverRouteTest.java    |  3 +-
 .../org/apache/camel/component/xslt/MyXPath.java   |  3 +-
 .../camel/component/xslt/SAXSourceLogBodyTest.java |  7 +++--
 .../xslt/XsltCustomizeEntityResolverTest.java      |  7 +++--
 .../camel/component/xslt/XsltOutputDOMTest.java    |  3 +-
 .../apache/camel/component/xslt/XsltRouteTest.java |  3 +-
 .../component/xslt/XsltUriResolverFactoryTest.java |  4 +--
 .../apache/camel/converter/CamelConverterTest.java |  6 ++--
 .../camel/converter/DurationConverterTest.java     |  4 +--
 .../java/org/apache/camel/converter/JaxpTest.java  |  5 +--
 .../camel/converter/TimePatternConverterTest.java  |  4 +--
 .../camel/converter/jaxp/DomConverterTest.java     |  5 +--
 .../camel/converter/jaxp/StAX2SAXSourceTest.java   |  4 +--
 .../camel/converter/jaxp/XmlConverterTest.java     | 12 +++++---
 .../converter/stream/StreamCacheConverterTest.java |  3 +-
 .../camel/impl/CamelPostProcessorHelperTest.java   |  4 +--
 .../camel/impl/ComponentConfigurationTest.java     | 10 +++---
 .../apache/camel/impl/CompositeRegistryTest.java   |  6 ++--
 .../apache/camel/impl/ConfigurationHelperTest.java |  8 ++---
 .../camel/impl/ConsumerCacheZeroCapacityTest.java  |  4 +--
 .../DefaultAsyncProcessorAwaitManagerTest.java     |  8 ++---
 .../impl/DefaultCamelContextResolverTest.java      | 10 +++---
 .../camel/impl/DefaultConsumerTemplateTest.java    |  4 +--
 .../camel/impl/DefaultEndpointRegistryTest.java    |  4 +--
 .../camel/impl/DefaultFactoryFinderTest.java       | 20 ++++++------
 .../org/apache/camel/impl/DefaultMessageTest.java  |  8 ++---
 .../camel/impl/DurationRoutePolicyFactoryTest.java |  4 +--
 .../impl/DurationRoutePolicyMaxMessagesTest.java   |  4 +--
 .../impl/DurationRoutePolicyMaxSecondsTest.java    |  4 +--
 .../camel/impl/EndpointConfigurationTest.java      |  4 +--
 .../apache/camel/impl/FileStateRepositoryTest.java |  8 ++---
 .../camel/impl/FileWatcherReloadStrategyTest.java  |  4 +--
 .../camel/impl/MemoryStateRepositoryTest.java      |  4 +--
 .../camel/impl/RouteSedaSuspendResumeTest.java     |  4 +--
 .../camel/impl/TwoRouteSuspendResumeTest.java      |  4 +--
 .../impl/TypeConverterRegistryPerformanceTest.java |  3 +-
 .../apache/camel/impl/cloud/LoadBalancerTest.java  |  4 +--
 .../camel/impl/cloud/ServiceDefinitionTest.java    |  8 ++---
 .../impl/cluster/ClusterServiceSelectorTest.java   |  6 ++--
 .../camel/impl/converter/UriTypeConverterTest.java |  4 +--
 .../camel/impl/verifier/ResultErrorHelperTest.java |  6 ++--
 .../InterceptCustomPredicateAsFilterTest.java      |  4 +--
 .../RetryWhilePredicateExpressionIssueTest.java    |  6 ++--
 .../apache/camel/issues/XPathSplitStreamTest.java  |  3 +-
 .../apache/camel/language/XPathFunctionTest.java   |  5 +--
 .../camel/language/XPathOutFunctionTest.java       |  5 +--
 .../camel/management/BacklogDebuggerTest.java      |  4 +--
 .../apache/camel/management/BacklogTracerTest.java |  5 +--
 .../management/CamelChoiceWithManagementTest.java  |  4 +--
 .../management/DefaultManagementAgentMockTest.java | 12 ++++----
 .../camel/management/EndpointCompletionTest.java   |  3 +-
 .../management/EventNotifierExchangeSentTest.java  |  4 +--
 .../JmxInstrumentationUsingDefaultsTest.java       |  4 +--
 .../org/apache/camel/management/LoadTimerTest.java |  4 +--
 ...ManagedCamelContextDumpRoutesCoverageAsXml.java |  3 +-
 .../ManagedCamelContextDumpStatsAsXmlTest.java     |  3 +-
 .../management/ManagedInflightStatisticsTest.java  |  4 +--
 ...DumpStatsAsXmlAndResetWithCustomDomainTest.java |  3 +-
 ...ManagedRouteDumpStatsAsXmlCustomDomainTest.java |  3 +-
 .../management/ManagedRouteDumpStatsAsXmlTest.java |  3 +-
 .../management/ManagedRouteLoadstatisticsTest.java |  4 +--
 .../management/ManagedRouteNoAutoStartupTest.java  |  4 +--
 .../ManagedRoutePerformanceCounterTest.java        |  4 +--
 .../ManagedRouteStopAndStartCleanupTest.java       |  4 +--
 .../ManagedStreamCachingStrategyTest.java          |  4 +--
 .../management/ManagedSuspendedServiceTest.java    |  4 +--
 .../apache/camel/processor/ChoiceAsyncTest.java    |  4 +--
 .../processor/ChoiceCompoundPredicateTest.java     |  6 ++--
 .../org/apache/camel/processor/ChoiceTest.java     |  4 +--
 .../processor/ChoiceWhenNotPredicateTest.java      |  4 +--
 .../processor/CircuitBreakerLoadBalancerTest.java  |  4 +--
 .../org/apache/camel/processor/DataFormatTest.java |  4 +--
 ...eadLetterChannelRedeliveryDelayPatternTest.java |  4 +--
 .../processor/DefaultExchangeFormatterTest.java    |  8 ++---
 .../org/apache/camel/processor/DelayerTest.java    |  4 +--
 .../camel/processor/FailOverLoadBalanceTest.java   |  4 +--
 .../FileIdempotentConsumerCreateRepoTest.java      |  7 +++--
 .../org/apache/camel/processor/FilterNotTest.java  |  4 +--
 .../LogProcessorWithProvidedLoggerTest.java        |  4 +--
 .../MulticastGroupedExchangeExceptionTest.java     |  4 +--
 .../camel/processor/RoundRobinLoadBalanceTest.java |  4 +--
 .../java/org/apache/camel/processor/SagaTest.java  |  6 ++--
 .../apache/camel/processor/ShutdownDeferTest.java  |  4 +--
 .../camel/processor/ShutdownNotDeferTest.java      |  4 +--
 .../camel/processor/ThreadsInvalidConfigTest.java  |  4 +--
 .../camel/processor/ThreadsRejectedPolicyTest.java |  4 +--
 ...xceptionRoutePolicyHalfOpenHandlerSedaTest.java |  4 +--
 ...ingExceptionRoutePolicyHalfOpenHandlerTest.java |  4 +--
 ...ThrottlingExceptionRoutePolicyHalfOpenTest.java |  4 +--
 .../ThrottlingExceptionRoutePolicyTest.java        |  4 +--
 .../camel/processor/ThroughPutLoggerTest.java      | 12 ++++----
 .../apache/camel/processor/TransformXpathTest.java |  3 +-
 .../processor/WireTapBeanAsProcessorTest.java      |  4 +--
 .../camel/processor/WireTapShutdownBeanTest.java   |  4 +--
 .../camel/processor/WireTapShutdownRouteTest.java  |  4 +--
 .../camel/processor/WireTapUsingMulticastTest.java |  4 +--
 .../camel/processor/WireTapVoidBeanTest.java       |  4 +--
 .../apache/camel/processor/XPathChoiceTest.java    |  4 +--
 .../AggregateNewExchangeAndConfirmTest.java        |  4 +--
 .../aggregator/DistributedTimeoutTest.java         |  4 +--
 .../async/AsyncEndpointCustomRoutePolicyTest.java  |  4 +--
 .../apache/camel/processor/async/AsyncMDCTest.java | 10 +++---
 ...sorAwaitManagerInterruptWithRedeliveryTest.java |  8 ++---
 .../FileIdempotentStoreOrderingTest.java           |  6 ++--
 ...ScopedOnExceptionLoadBalancerStopRouteTest.java |  4 +--
 .../OnExceptionWrappedExceptionTest.java           |  4 +--
 .../resequencer/ResequencerEngineTest.java         |  4 +--
 .../validation/CatalogLSResourceResolver.java      |  4 ++-
 .../DefaultValidationErrorHandlerTest.java         |  5 +--
 .../runtimecatalog/AbstractCamelCatalogTest.java   |  8 ++---
 .../runtimecatalog/RuntimeCamelCatalogTest.java    | 10 +++---
 .../camel/support/DefaultTimeoutMapTest.java       |  4 +--
 .../support/XMLTokenExpressionIteratorTest.java    |  4 +--
 .../apache/camel/util/CamelVersionHelperTest.java  |  4 +--
 .../apache/camel/util/CreateModelFromXmlTest.java  |  4 +--
 .../camel/util/DumpModelAsXmlNamespaceTest.java    |  5 +--
 .../util/DumpModelAsXmlSplitBodyRouteTest.java     |  7 +++--
 ...umpModelAsXmlSplitNestedChoiceEndRouteTest.java |  7 +++--
 .../DumpModelAsXmlTransformRouteConstantTest.java  |  7 +++--
 .../DumpModelAsXmlTransformRouteLanguageTest.java  |  7 +++--
 .../util/DumpModelAsXmlTransformRouteTest.java     |  7 +++--
 .../org/apache/camel/util/EventHelperTest.java     |  4 +--
 .../java/org/apache/camel/util/GZIPHelperTest.java | 12 ++++----
 .../org/apache/camel/util/ObjectHelperTest.java    |  5 +--
 .../org/apache/camel/util/PlatformHelperTest.java  |  4 +--
 .../camel/util/PredicateAssertHelperTest.java      |  4 +--
 .../java/org/apache/camel/util/UnitUtilsTest.java  |  4 +--
 .../apache/camel/util/XmlLineNumberParserTest.java |  5 +--
 .../camel/util/component/ApiMethodHelperTest.java  | 10 +++---
 .../component/ApiMethodPropertiesHelperTest.java   |  4 +--
 .../component/ArgumentSubstitutionParserTest.java  |  4 +--
 .../toolbox/FlexibleAggregationStrategiesTest.java |  3 +-
 220 files changed, 613 insertions(+), 540 deletions(-)

diff --git a/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java b/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
index 15ff70d..f29ba8c 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
@@ -21,6 +21,7 @@ import java.util.Map;
 import java.util.zip.Deflater;
 
 import org.w3c.dom.Node;
+
 import org.apache.camel.model.DataFormatDefinition;
 import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.model.dataformat.ASN1DataFormat;
diff --git a/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
index ae1f3e1..2f3c3d9 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
@@ -43,6 +43,7 @@ import javax.xml.xpath.XPathFunctionResolver;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
+
 import org.xml.sax.InputSource;
 
 import org.apache.camel.CamelContext;
diff --git a/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
index 5a37e66..1ba741e 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
@@ -41,6 +41,7 @@ import javax.xml.transform.stax.StAXSource;
 import javax.xml.transform.stream.StreamSource;
 
 import org.w3c.dom.Node;
+
 import org.xml.sax.EntityResolver;
 
 import org.apache.camel.Exchange;
diff --git a/camel-core/src/main/java/org/apache/camel/component/validator/DefaultLSResourceResolver.java b/camel-core/src/main/java/org/apache/camel/component/validator/DefaultLSResourceResolver.java
index 5940fc6..d4e7f63 100644
--- a/camel-core/src/main/java/org/apache/camel/component/validator/DefaultLSResourceResolver.java
+++ b/camel-core/src/main/java/org/apache/camel/component/validator/DefaultLSResourceResolver.java
@@ -24,6 +24,7 @@ import java.util.Map;
 
 import org.w3c.dom.ls.LSInput;
 import org.w3c.dom.ls.LSResourceResolver;
+
 import org.apache.camel.CamelContext;
 import org.apache.camel.util.FileUtil;
 import org.apache.camel.util.ObjectHelper;
diff --git a/camel-core/src/main/java/org/apache/camel/component/validator/DefaultValidatorResourceResolverFactory.java b/camel-core/src/main/java/org/apache/camel/component/validator/DefaultValidatorResourceResolverFactory.java
index 3d9a5a3..ac06bd1 100644
--- a/camel-core/src/main/java/org/apache/camel/component/validator/DefaultValidatorResourceResolverFactory.java
+++ b/camel-core/src/main/java/org/apache/camel/component/validator/DefaultValidatorResourceResolverFactory.java
@@ -17,6 +17,7 @@
 package org.apache.camel.component.validator;
 
 import org.w3c.dom.ls.LSResourceResolver;
+
 import org.apache.camel.CamelContext;
 
 /**
diff --git a/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorResourceResolverFactory.java b/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorResourceResolverFactory.java
index 6c0df29..d052b0e 100644
--- a/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorResourceResolverFactory.java
+++ b/camel-core/src/main/java/org/apache/camel/component/validator/ValidatorResourceResolverFactory.java
@@ -17,6 +17,7 @@
 package org.apache.camel.component.validator;
 
 import org.w3c.dom.ls.LSResourceResolver;
+
 import org.apache.camel.CamelContext;
 
 /**
diff --git a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
index 93d3581..4f3125f 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
@@ -58,6 +58,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
+
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
diff --git a/camel-core/src/main/java/org/apache/camel/impl/FileWatcherReloadStrategy.java b/camel-core/src/main/java/org/apache/camel/impl/FileWatcherReloadStrategy.java
index 9adc866..70afa13 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/FileWatcherReloadStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/FileWatcherReloadStrategy.java
@@ -33,15 +33,15 @@ import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
 
+import static java.nio.file.StandardWatchEventKinds.ENTRY_CREATE;
+import static java.nio.file.StandardWatchEventKinds.ENTRY_MODIFY;
+
 import org.apache.camel.api.management.ManagedAttribute;
 import org.apache.camel.api.management.ManagedResource;
 import org.apache.camel.support.ReloadStrategySupport;
 import org.apache.camel.util.IOHelper;
 import org.apache.camel.util.ObjectHelper;
 
-import static java.nio.file.StandardWatchEventKinds.ENTRY_CREATE;
-import static java.nio.file.StandardWatchEventKinds.ENTRY_MODIFY;
-
 /**
  * A file based {@link org.apache.camel.spi.ReloadStrategy} which watches a file folder
  * for modified files and reload on file changes.
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cloud/CachingServiceDiscovery.java b/camel-core/src/main/java/org/apache/camel/impl/cloud/CachingServiceDiscovery.java
index 3ed5cfb..1e4a595 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/cloud/CachingServiceDiscovery.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/cloud/CachingServiceDiscovery.java
@@ -21,7 +21,6 @@ import java.util.concurrent.TimeUnit;
 
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
-
 import org.apache.camel.cloud.ServiceDefinition;
 import org.apache.camel.cloud.ServiceDiscovery;
 import org.apache.camel.util.ObjectHelper;
diff --git a/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java b/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
index 4037177..006aacd 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
@@ -30,6 +30,10 @@ import java.util.List;
 import java.util.Set;
 import java.util.StringTokenizer;
 
+import static java.lang.reflect.Modifier.isAbstract;
+import static java.lang.reflect.Modifier.isPublic;
+import static java.lang.reflect.Modifier.isStatic;
+
 import org.apache.camel.Converter;
 import org.apache.camel.Exchange;
 import org.apache.camel.FallbackConverter;
@@ -45,10 +49,6 @@ import org.apache.camel.util.StringHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static java.lang.reflect.Modifier.isAbstract;
-import static java.lang.reflect.Modifier.isPublic;
-import static java.lang.reflect.Modifier.isStatic;
-
 /**
  * A class which will auto-discover {@link Converter} objects and methods to pre-load
  * the {@link TypeConverterRegistry} of converters on startup.
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
index 23dce53..d3817b0 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
@@ -38,6 +38,8 @@ import javax.management.openmbean.CompositeType;
 import javax.management.openmbean.TabularData;
 import javax.management.openmbean.TabularDataSupport;
 
+import org.w3c.dom.Document;
+
 import org.apache.camel.CamelContext;
 import org.apache.camel.Component;
 import org.apache.camel.ComponentConfiguration;
@@ -65,7 +67,6 @@ import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.XmlLineNumberParser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.w3c.dom.Document;
 
 /**
  * @version
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java
index 0362c22..170c2ed 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java
@@ -40,6 +40,8 @@ import javax.management.openmbean.CompositeType;
 import javax.management.openmbean.TabularData;
 import javax.management.openmbean.TabularDataSupport;
 
+import org.w3c.dom.Document;
+
 import org.apache.camel.CamelContext;
 import org.apache.camel.ManagementStatisticsLevel;
 import org.apache.camel.Route;
@@ -60,7 +62,6 @@ import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.XmlLineNumberParser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.w3c.dom.Document;
 
 @ManagedResource(description = "Managed Route")
 public class ManagedRoute extends ManagedPerformanceCounter implements TimerListener, ManagedRouteMBean {
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThrottler.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThrottler.java
index 35ce278..6c5e977 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThrottler.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThrottler.java
@@ -16,14 +16,14 @@
  */
 package org.apache.camel.management.mbean;
 
-import static org.apache.camel.builder.Builder.constant;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.api.management.ManagedResource;
 import org.apache.camel.api.management.mbean.ManagedThrottlerMBean;
 import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.processor.Throttler;
 
+import static org.apache.camel.builder.Builder.constant;
+
 /**
  * @version
  */
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/RouteCoverageXmlParser.java b/camel-core/src/main/java/org/apache/camel/management/mbean/RouteCoverageXmlParser.java
index ef672ce..62bc649 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/RouteCoverageXmlParser.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/RouteCoverageXmlParser.java
@@ -24,17 +24,19 @@ import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
-import org.apache.camel.CamelContext;
-import org.apache.camel.api.management.mbean.ManagedProcessorMBean;
-import org.apache.camel.api.management.mbean.ManagedRouteMBean;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
+
 import org.xml.sax.Attributes;
 import org.xml.sax.Locator;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
 
+import org.apache.camel.CamelContext;
+import org.apache.camel.api.management.mbean.ManagedProcessorMBean;
+import org.apache.camel.api.management.mbean.ManagedRouteMBean;
+
 /**
  * An XML parser that uses SAX to enrich route stats in the route dump.
  * <p/>
diff --git a/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java b/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java
index d2d8f66..6eebb9b 100644
--- a/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.model;
 
-import static org.apache.camel.util.EndpointHelper.isReferenceParameter;
-
 import java.util.Map;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -35,6 +33,8 @@ import org.apache.camel.spi.RouteContext;
 import org.apache.camel.util.IntrospectionSupport;
 import org.apache.camel.util.ObjectHelper;
 
+import static org.apache.camel.util.EndpointHelper.isReferenceParameter;
+
 /**
  * Represents a Camel data format
  */
diff --git a/camel-core/src/main/java/org/apache/camel/model/ModelHelper.java b/camel-core/src/main/java/org/apache/camel/model/ModelHelper.java
index 0b8e5c7..476f15f 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ModelHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ModelHelper.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.model;
 
-import static org.apache.camel.model.ProcessorDefinitionHelper.filterTypeInOutputs;
-
 import java.io.InputStream;
 import java.io.StringWriter;
 import java.util.Iterator;
@@ -33,6 +31,11 @@ import javax.xml.bind.Marshaller;
 import javax.xml.transform.OutputKeys;
 import javax.xml.transform.TransformerException;
 
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
 import org.apache.camel.CamelContext;
 import org.apache.camel.Expression;
 import org.apache.camel.NamedNode;
@@ -42,10 +45,8 @@ import org.apache.camel.model.language.ExpressionDefinition;
 import org.apache.camel.spi.NamespaceAware;
 import org.apache.camel.spi.TypeConverterRegistry;
 import org.apache.camel.util.ObjectHelper;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
+
+import static org.apache.camel.model.ProcessorDefinitionHelper.filterTypeInOutputs;
 
 /**
  * Helper for the Camel {@link org.apache.camel.model model} classes.
diff --git a/camel-core/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java b/camel-core/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java
index e6f79c7..041bdc2 100644
--- a/camel-core/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.model;
 
-import static org.apache.camel.model.ProcessorDefinitionHelper.filterTypeInOutputs;
-
 import java.io.UnsupportedEncodingException;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
@@ -34,6 +32,8 @@ import org.apache.camel.util.EndpointHelper;
 import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.URISupport;
 
+import static org.apache.camel.model.ProcessorDefinitionHelper.filterTypeInOutputs;
+
 /**
  * Helper for {@link RouteDefinition}
  * <p/>
diff --git a/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java b/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java
index 46dc5cc..4e4c352 100644
--- a/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.model;
 
-import static org.apache.camel.builder.ExpressionBuilder.bodyExpression;
-
 import java.util.Comparator;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -34,6 +32,8 @@ import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.RouteContext;
 import org.apache.camel.util.ObjectHelper;
 
+import static org.apache.camel.builder.ExpressionBuilder.bodyExpression;
+
 /**
  * Sorts the contents of the message
  */
diff --git a/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinition.java b/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinition.java
index becfbad..ab45286 100644
--- a/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinition.java
@@ -16,9 +16,6 @@
  */
 package org.apache.camel.model.cloud;
 
-import static org.apache.camel.util.CamelContextHelper.findByType;
-import static org.apache.camel.util.CamelContextHelper.lookup;
-
 import java.util.Optional;
 import java.util.function.Function;
 import java.util.function.Supplier;
@@ -58,6 +55,9 @@ import org.apache.camel.util.CamelContextHelper;
 import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.function.Suppliers;
 
+import static org.apache.camel.util.CamelContextHelper.findByType;
+import static org.apache.camel.util.CamelContextHelper.lookup;
+
 /**
  * To call remote services
  */
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java
index 56138c2..b747f5d 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java
@@ -22,13 +22,14 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 
+import org.w3c.dom.Node;
+
 import org.apache.camel.CamelContext;
 import org.apache.camel.model.DataFormatDefinition;
 import org.apache.camel.spi.DataFormat;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.RouteContext;
 import org.apache.camel.util.ObjectHelper;
-import org.w3c.dom.Node;
 
 /**
  * TidyMarkup data format is used for parsing HTML and return it as pretty well-formed HTML.
diff --git a/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java
index 4e37bb2..1d3d6e0 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.processor;
 
-import static org.apache.camel.processor.PipelineHelper.continueProcessing;
-
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -36,6 +34,8 @@ import org.apache.camel.util.ServiceHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.apache.camel.processor.PipelineHelper.continueProcessing;
+
 /**
  * Implements a Choice structure where one or more predicates are used which if
  * they are true their processors are used, with a default otherwise clause used
diff --git a/camel-core/src/main/java/org/apache/camel/processor/Enricher.java b/camel-core/src/main/java/org/apache/camel/processor/Enricher.java
index 9c041b5..be85b4b 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/Enricher.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/Enricher.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.processor;
 
-import static org.apache.camel.util.ExchangeHelper.copyResultsPreservePattern;
-
 import org.apache.camel.AsyncCallback;
 import org.apache.camel.AsyncProcessor;
 import org.apache.camel.CamelContext;
@@ -44,6 +42,8 @@ import org.apache.camel.util.StopWatch;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.apache.camel.util.ExchangeHelper.copyResultsPreservePattern;
+
 /**
  * A content enricher that enriches input data by first obtaining additional
  * data from a <i>resource</i> represented by an endpoint <code>producer</code>
diff --git a/camel-core/src/main/java/org/apache/camel/processor/FatalFallbackErrorHandler.java b/camel-core/src/main/java/org/apache/camel/processor/FatalFallbackErrorHandler.java
index 51e215e..77cc9fa 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/FatalFallbackErrorHandler.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/FatalFallbackErrorHandler.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.processor;
 
-import static org.apache.camel.builder.ExpressionBuilder.routeIdExpression;
-
 import java.util.ArrayDeque;
 import java.util.Deque;
 
@@ -27,6 +25,8 @@ import org.apache.camel.Processor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.apache.camel.builder.ExpressionBuilder.routeIdExpression;
+
 /**
  * An {@link org.apache.camel.processor.ErrorHandler} used as a safe fallback when
  * processing by other error handlers such as the {@link org.apache.camel.model.OnExceptionDefinition}.
diff --git a/camel-core/src/main/java/org/apache/camel/processor/LoopProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/LoopProcessor.java
index 666f030..07bb255 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/LoopProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/LoopProcessor.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.processor;
 
-import static org.apache.camel.processor.PipelineHelper.continueProcessing;
-
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -32,6 +30,8 @@ import org.apache.camel.util.ExchangeHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.apache.camel.processor.PipelineHelper.continueProcessing;
+
 /**
  * The processor which sends messages in a loop.
  */
diff --git a/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
index aceaf5a..98f8abc 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.processor;
 
-import static org.apache.camel.util.ObjectHelper.notNull;
-
 import java.io.Closeable;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -75,6 +73,8 @@ import org.apache.camel.util.concurrent.SubmitOrderedCompletionService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.apache.camel.util.ObjectHelper.notNull;
+
 
 /**
  * Implements the Multicast pattern to send a message exchange to a number of
diff --git a/camel-core/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
index 1ba298e..4579235 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.processor;
 
-import static org.apache.camel.util.ObjectHelper.notNull;
-
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 
@@ -41,6 +39,8 @@ import org.apache.camel.util.ServiceHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.apache.camel.util.ObjectHelper.notNull;
+
 /**
  * Processor implementing <a href="http://camel.apache.org/oncompletion.html">onCompletion</a>.
  *
diff --git a/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java b/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java
index 07c9536..e75c20c 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.processor;
 
-import static org.apache.camel.processor.PipelineHelper.continueProcessing;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
@@ -34,6 +32,8 @@ import org.apache.camel.util.ExchangeHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.apache.camel.processor.PipelineHelper.continueProcessing;
+
 /**
  * Creates a Pipeline pattern where the output of the previous step is sent as
  * input to the next step, reusing the same message exchanges
diff --git a/camel-core/src/main/java/org/apache/camel/processor/PipelineHelper.java b/camel-core/src/main/java/org/apache/camel/processor/PipelineHelper.java
index 3642d7f..6c111e8 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/PipelineHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/PipelineHelper.java
@@ -16,12 +16,12 @@
  */
 package org.apache.camel.processor;
 
-import static org.apache.camel.util.ExchangeHelper.hasExceptionBeenHandledByErrorHandler;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.slf4j.Logger;
 
+import static org.apache.camel.util.ExchangeHelper.hasExceptionBeenHandledByErrorHandler;
+
 /**
  * Helper for processing {@link org.apache.camel.Exchange} in a
  * <a href="http://camel.apache.org/pipes-and-filters.html">pipeline</a>.
diff --git a/camel-core/src/main/java/org/apache/camel/processor/PollEnricher.java b/camel-core/src/main/java/org/apache/camel/processor/PollEnricher.java
index 499b455..33a353e 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/PollEnricher.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/PollEnricher.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.processor;
 
-import static org.apache.camel.util.ExchangeHelper.copyResultsPreservePattern;
-
 import org.apache.camel.AsyncCallback;
 import org.apache.camel.AsyncProcessor;
 import org.apache.camel.CamelContext;
@@ -44,6 +42,8 @@ import org.apache.camel.util.ServiceHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.apache.camel.util.ExchangeHelper.copyResultsPreservePattern;
+
 /**
  * A content enricher that enriches input data by first obtaining additional
  * data from a <i>resource</i> represented by an endpoint <code>producer</code>
diff --git a/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java b/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
index 1195596..fcbcc0c 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.processor;
 
-import static org.apache.camel.util.ObjectHelper.notNull;
-
 import java.util.Iterator;
 import java.util.concurrent.ExecutorService;
 
@@ -43,6 +41,8 @@ import org.apache.camel.util.StringHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.apache.camel.util.ObjectHelper.notNull;
+
 /**
  * Implements a dynamic <a
  * href="http://camel.apache.org/recipient-list.html">Recipient List</a>
diff --git a/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java b/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
index a62a494..dbfb8ad 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
@@ -16,9 +16,6 @@
  */
 package org.apache.camel.processor;
 
-import static org.apache.camel.processor.PipelineHelper.continueProcessing;
-import static org.apache.camel.util.ObjectHelper.notNull;
-
 import java.util.Iterator;
 
 import org.apache.camel.AsyncCallback;
@@ -49,6 +46,9 @@ import org.apache.camel.util.ServiceHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.apache.camel.processor.PipelineHelper.continueProcessing;
+import static org.apache.camel.util.ObjectHelper.notNull;
+
 /**
  * Implements a <a href="http://camel.apache.org/routing-slip.html">Routing Slip</a>
  * pattern where the list of actual endpoints to send a message exchange to are
diff --git a/camel-core/src/main/java/org/apache/camel/processor/Splitter.java b/camel-core/src/main/java/org/apache/camel/processor/Splitter.java
index dd63176..e0fb8ba 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/Splitter.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/Splitter.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.processor;
 
-import static org.apache.camel.util.ObjectHelper.notNull;
-
 import java.io.Closeable;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -45,6 +43,8 @@ import org.apache.camel.util.ExchangeHelper;
 import org.apache.camel.util.IOHelper;
 import org.apache.camel.util.ObjectHelper;
 
+import static org.apache.camel.util.ObjectHelper.notNull;
+
 /**
  * Implements a dynamic <a
  * href="http://camel.apache.org/splitter.html">Splitter</a> pattern
diff --git a/camel-core/src/main/java/org/apache/camel/processor/aggregate/ShareUnitOfWorkAggregationStrategy.java b/camel-core/src/main/java/org/apache/camel/processor/aggregate/ShareUnitOfWorkAggregationStrategy.java
index a7d2409..61d3dd5 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/aggregate/ShareUnitOfWorkAggregationStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/aggregate/ShareUnitOfWorkAggregationStrategy.java
@@ -16,12 +16,12 @@
  */
 package org.apache.camel.processor.aggregate;
 
-import static org.apache.camel.util.ExchangeHelper.hasExceptionBeenHandledByErrorHandler;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.support.ServiceSupport;
 import org.apache.camel.util.ServiceHelper;
 
+import static org.apache.camel.util.ExchangeHelper.hasExceptionBeenHandledByErrorHandler;
+
 /**
  * An {@link AggregationStrategy} which are used when the option <tt>shareUnitOfWork</tt> is enabled
  * on EIPs such as multicast, splitter or recipientList.
diff --git a/camel-core/src/main/java/org/apache/camel/processor/aggregate/UseLatestAggregationStrategy.java b/camel-core/src/main/java/org/apache/camel/processor/aggregate/UseLatestAggregationStrategy.java
index 2cc47c5..aee5772 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/aggregate/UseLatestAggregationStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/aggregate/UseLatestAggregationStrategy.java
@@ -16,10 +16,10 @@
  */
 package org.apache.camel.processor.aggregate;
 
-import static org.apache.camel.util.ExchangeHelper.hasExceptionBeenHandledByErrorHandler;
-
 import org.apache.camel.Exchange;
 
+import static org.apache.camel.util.ExchangeHelper.hasExceptionBeenHandledByErrorHandler;
+
 /**
  * An {@link AggregationStrategy} which just uses the latest exchange which is useful
  * for status messages where old status messages have no real value. Another example is things
diff --git a/camel-core/src/main/java/org/apache/camel/processor/validation/DefaultValidationErrorHandler.java b/camel-core/src/main/java/org/apache/camel/processor/validation/DefaultValidationErrorHandler.java
index 9530277..4185271 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/validation/DefaultValidationErrorHandler.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/validation/DefaultValidationErrorHandler.java
@@ -22,12 +22,13 @@ import java.util.List;
 import javax.xml.transform.Result;
 import javax.xml.validation.Schema;
 
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+
 import org.apache.camel.Exchange;
 import org.apache.camel.ValidationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
 
 /**
  * A default error handler which just stores all the errors so they can be reported or transformed.
diff --git a/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaReader.java b/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaReader.java
index a818410..e753501 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaReader.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaReader.java
@@ -28,6 +28,10 @@ import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
 
+import org.w3c.dom.ls.LSResourceResolver;
+
+import org.xml.sax.SAXException;
+
 import org.apache.camel.CamelContext;
 import org.apache.camel.converter.IOConverter;
 import org.apache.camel.util.IOHelper;
@@ -35,8 +39,6 @@ import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.ResourceHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.w3c.dom.ls.LSResourceResolver;
-import org.xml.sax.SAXException;
 
 /**
  * Reads the schema used in the processor {@link ValidatingProcessor}.
diff --git a/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaValidationException.java b/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaValidationException.java
index 7c37f18..6cd8566 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaValidationException.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaValidationException.java
@@ -18,9 +18,10 @@ package org.apache.camel.processor.validation;
 
 import java.util.List;
 
+import org.xml.sax.SAXParseException;
+
 import org.apache.camel.Exchange;
 import org.apache.camel.ValidationException;
-import org.xml.sax.SAXParseException;
 
 /**
  * A Schema validation exception occurred
diff --git a/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java
index 33b5d7c..8bba7e7 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatingProcessor.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.processor.validation;
 
-import static org.apache.camel.processor.validation.SchemaReader.ACCESS_EXTERNAL_DTD;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -38,6 +36,12 @@ import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
 import javax.xml.validation.Validator;
 
+import org.w3c.dom.Node;
+import org.w3c.dom.ls.LSResourceResolver;
+
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+
 import org.apache.camel.AsyncCallback;
 import org.apache.camel.AsyncProcessor;
 import org.apache.camel.Exchange;
@@ -49,10 +53,8 @@ import org.apache.camel.util.AsyncProcessorHelper;
 import org.apache.camel.util.IOHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.w3c.dom.Node;
-import org.w3c.dom.ls.LSResourceResolver;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
+
+import static org.apache.camel.processor.validation.SchemaReader.ACCESS_EXTERNAL_DTD;
 
 /**
  * A processor which validates the XML version of the inbound message body
diff --git a/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatorErrorHandler.java b/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatorErrorHandler.java
index e26371d..920fa7b 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatorErrorHandler.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/validation/ValidatorErrorHandler.java
@@ -19,9 +19,10 @@ package org.apache.camel.processor.validation;
 import javax.xml.transform.Result;
 import javax.xml.validation.Schema;
 
+import org.xml.sax.ErrorHandler;
+
 import org.apache.camel.Exchange;
 import org.apache.camel.ValidationException;
-import org.xml.sax.ErrorHandler;
 
 /**
  * Validator error handler.
diff --git a/camel-core/src/main/java/org/apache/camel/runtimecatalog/AbstractCamelCatalog.java b/camel-core/src/main/java/org/apache/camel/runtimecatalog/AbstractCamelCatalog.java
index 980f2e4..70590b0 100644
--- a/camel-core/src/main/java/org/apache/camel/runtimecatalog/AbstractCamelCatalog.java
+++ b/camel-core/src/main/java/org/apache/camel/runtimecatalog/AbstractCamelCatalog.java
@@ -16,6 +16,24 @@
  */
 package org.apache.camel.runtimecatalog;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 import static org.apache.camel.runtimecatalog.CatalogHelper.after;
 import static org.apache.camel.runtimecatalog.JSonSchemaHelper.getNames;
 import static org.apache.camel.runtimecatalog.JSonSchemaHelper.getPropertyDefaultValue;
@@ -42,24 +60,6 @@ import static org.apache.camel.runtimecatalog.URISupport.isEmpty;
 import static org.apache.camel.runtimecatalog.URISupport.normalizeUri;
 import static org.apache.camel.runtimecatalog.URISupport.stripQuery;
 
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 /**
  * Base class for both the runtime RuntimeCamelCatalog from camel-core and the complete CamelCatalog from camel-catalog.
  */
diff --git a/camel-core/src/main/java/org/apache/camel/runtimecatalog/EndpointValidationResult.java b/camel-core/src/main/java/org/apache/camel/runtimecatalog/EndpointValidationResult.java
index 59537f9..891c3cf 100644
--- a/camel-core/src/main/java/org/apache/camel/runtimecatalog/EndpointValidationResult.java
+++ b/camel-core/src/main/java/org/apache/camel/runtimecatalog/EndpointValidationResult.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.runtimecatalog;
 
-import static org.apache.camel.runtimecatalog.URISupport.isEmpty;
-
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Collections;
@@ -27,6 +25,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import static org.apache.camel.runtimecatalog.URISupport.isEmpty;
+
 /**
  * Details result of validating endpoint uri.
  */
diff --git a/camel-core/src/main/java/org/apache/camel/support/ReloadStrategySupport.java b/camel-core/src/main/java/org/apache/camel/support/ReloadStrategySupport.java
index 990c0ee..37e4451 100644
--- a/camel-core/src/main/java/org/apache/camel/support/ReloadStrategySupport.java
+++ b/camel-core/src/main/java/org/apache/camel/support/ReloadStrategySupport.java
@@ -22,6 +22,10 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
 import org.apache.camel.CamelContext;
 import org.apache.camel.api.management.ManagedAttribute;
 import org.apache.camel.api.management.ManagedOperation;
@@ -36,9 +40,6 @@ import org.apache.camel.util.StringHelper;
 import org.apache.camel.util.XmlLineNumberParser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
 
 /**
  * Base class for implementing custom {@link ReloadStrategy} SPI plugins.
diff --git a/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java b/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java
index 5728e83..ade99d4 100644
--- a/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java
@@ -16,10 +16,6 @@
  */
 package org.apache.camel.util;
 
-import static org.apache.camel.util.ObjectHelper.isEmpty;
-import static org.apache.camel.util.ObjectHelper.isNotEmpty;
-import static org.apache.camel.util.ObjectHelper.notNull;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
@@ -51,6 +47,10 @@ import org.apache.camel.spi.RouteStartupOrder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.apache.camel.util.ObjectHelper.isEmpty;
+import static org.apache.camel.util.ObjectHelper.isNotEmpty;
+import static org.apache.camel.util.ObjectHelper.notNull;
+
 /**
  * A number of helper methods
  *
diff --git a/camel-core/src/main/java/org/apache/camel/util/EndpointHelper.java b/camel-core/src/main/java/org/apache/camel/util/EndpointHelper.java
index 04c2674..3810981 100644
--- a/camel-core/src/main/java/org/apache/camel/util/EndpointHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/EndpointHelper.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.util;
 
-import static org.apache.camel.util.StringHelper.after;
-
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -44,6 +42,8 @@ import org.apache.camel.spi.BrowsableEndpoint;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.apache.camel.util.StringHelper.after;
+
 /**
  * Some helper methods for working with {@link Endpoint} instances
  */
diff --git a/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java b/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
index 790873d..a552b11 100644
--- a/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.util;
 
-import static org.apache.camel.util.ObjectHelper.isAssignableFrom;
-
 import java.beans.PropertyEditor;
 import java.beans.PropertyEditorManager;
 import java.lang.reflect.InvocationTargetException;
@@ -49,6 +47,8 @@ import org.apache.camel.component.properties.PropertiesComponent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.apache.camel.util.ObjectHelper.isAssignableFrom;
+
 /**
  * Helper for introspections of beans.
  * <p/>
diff --git a/camel-core/src/main/java/org/apache/camel/util/LRUCache.java b/camel-core/src/main/java/org/apache/camel/util/LRUCache.java
index 7074ed9..efc3280 100644
--- a/camel-core/src/main/java/org/apache/camel/util/LRUCache.java
+++ b/camel-core/src/main/java/org/apache/camel/util/LRUCache.java
@@ -22,13 +22,12 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.atomic.LongAdder;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.RemovalCause;
 import com.github.benmanes.caffeine.cache.RemovalListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A cache that uses a near optional LRU Cache.
diff --git a/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java b/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
index d8cd3b8..1992e0a 100644
--- a/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
@@ -48,6 +48,9 @@ import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
 import org.apache.camel.CamelContext;
 import org.apache.camel.CamelContextAware;
 import org.apache.camel.CamelExecutionException;
@@ -62,8 +65,6 @@ import org.apache.camel.WrappedFile;
 import org.apache.camel.util.function.ThrowingFunction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
 
 /**
  * A number of useful helper methods for working with Objects
diff --git a/camel-core/src/main/java/org/apache/camel/util/StringHelper.java b/camel-core/src/main/java/org/apache/camel/util/StringHelper.java
index 2ad825e..0f7e0b4 100644
--- a/camel-core/src/main/java/org/apache/camel/util/StringHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/StringHelper.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.util;
 
-import static org.apache.camel.util.StringQuoteHelper.doubleQuote;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -28,6 +26,8 @@ import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import static org.apache.camel.util.StringQuoteHelper.doubleQuote;
+
 /**
  * Helper methods for working with Strings.
  */
diff --git a/camel-core/src/main/java/org/apache/camel/util/XmlLineNumberParser.java b/camel-core/src/main/java/org/apache/camel/util/XmlLineNumberParser.java
index 5b8a2f8..d80cb45 100644
--- a/camel-core/src/main/java/org/apache/camel/util/XmlLineNumberParser.java
+++ b/camel-core/src/main/java/org/apache/camel/util/XmlLineNumberParser.java
@@ -29,6 +29,7 @@ import javax.xml.parsers.SAXParserFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
+
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
 import org.xml.sax.Locator;
diff --git a/camel-core/src/main/java/org/apache/camel/util/jsse/BaseSSLContextParameters.java b/camel-core/src/main/java/org/apache/camel/util/jsse/BaseSSLContextParameters.java
index 07a0143..f4e3073 100644
--- a/camel-core/src/main/java/org/apache/camel/util/jsse/BaseSSLContextParameters.java
+++ b/camel-core/src/main/java/org/apache/camel/util/jsse/BaseSSLContextParameters.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.util.jsse;
 
-import static org.apache.camel.util.CollectionHelper.collectionAsCommaDelimitedString;
-
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.ServerSocket;
@@ -52,6 +50,8 @@ import org.apache.camel.util.jsse.FilterParameters.Patterns;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.apache.camel.util.CollectionHelper.collectionAsCommaDelimitedString;
+
 /**
  * Represents configuration options that can be applied in the client-side
  * or server-side context depending on what they are applied to.
diff --git a/camel-core/src/main/java/org/apache/camel/util/toolbox/FlexibleAggregationStrategy.java b/camel-core/src/main/java/org/apache/camel/util/toolbox/FlexibleAggregationStrategy.java
index fe12bdd..fb56a96 100644
--- a/camel-core/src/main/java/org/apache/camel/util/toolbox/FlexibleAggregationStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/util/toolbox/FlexibleAggregationStrategy.java
@@ -32,8 +32,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * The Flexible Aggregation Strategy is a highly customizable, fluently configurable aggregation strategy. It allows you to quickly whip up an {@link AggregationStrategy} that is capable of performing the most typical aggregation duties,
- * with zero Java code.
+ * The Flexible Aggregation Strategy is a highly customizable, fluently configurable aggregation strategy. It allows you to quickly whip up an {@link AggregationStrategy}
+ * that is capable of performing the most typical aggregation duties, with zero Java code.
  * <p/>
  * It can perform the following logic:
  * <ul>
diff --git a/camel-core/src/main/java/org/apache/camel/util/toolbox/XsltAggregationStrategy.java b/camel-core/src/main/java/org/apache/camel/util/toolbox/XsltAggregationStrategy.java
index 91d0e40..45cb64b 100644
--- a/camel-core/src/main/java/org/apache/camel/util/toolbox/XsltAggregationStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/util/toolbox/XsltAggregationStrategy.java
@@ -24,6 +24,8 @@ import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.URIResolver;
 
+import org.w3c.dom.Document;
+
 import org.apache.camel.CamelContext;
 import org.apache.camel.CamelContextAware;
 import org.apache.camel.Exchange;
@@ -36,7 +38,6 @@ import org.apache.camel.support.ServiceSupport;
 import org.apache.camel.util.ObjectHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.w3c.dom.Document;
 
 /**
  * The XSLT Aggregation Strategy enables you to use XSL stylesheets to aggregate messages.
diff --git a/camel-core/src/test/java/org/apache/camel/BodyAndHeaderConvertTest.java b/camel-core/src/test/java/org/apache/camel/BodyAndHeaderConvertTest.java
index 15ffbdf..8912c22 100644
--- a/camel-core/src/test/java/org/apache/camel/BodyAndHeaderConvertTest.java
+++ b/camel-core/src/test/java/org/apache/camel/BodyAndHeaderConvertTest.java
@@ -20,14 +20,15 @@ import java.net.URL;
 import javax.activation.DataHandler;
 import javax.activation.URLDataSource;
 
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
 import org.apache.camel.impl.DefaultAttachment;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.impl.DefaultExchange;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
 
 /**
  * @version
diff --git a/camel-core/src/test/java/org/apache/camel/TestSupport.java b/camel-core/src/test/java/org/apache/camel/TestSupport.java
index 993f889..ba13d02 100644
--- a/camel-core/src/test/java/org/apache/camel/TestSupport.java
+++ b/camel-core/src/test/java/org/apache/camel/TestSupport.java
@@ -45,11 +45,11 @@ public abstract class TestSupport extends Assert {
     protected static final String LS = System.lineSeparator();
     private static final Logger LOG = LoggerFactory.getLogger(TestSupport.class);
 
-    protected Logger log = LoggerFactory.getLogger(getClass());
-
     @Rule
     public TestName name = new TestName();
 
+    protected Logger log = LoggerFactory.getLogger(getClass());
+
     @Override
     public String toString() {
         return getName() + "(" + getClass().getName() + ")";
diff --git a/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java b/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java
index df8d75d..bb5bf52 100644
--- a/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java
+++ b/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java
@@ -15,19 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.builder;
-import static org.apache.camel.builder.ExpressionBuilder.bodyExpression;
-import static org.apache.camel.builder.ExpressionBuilder.camelContextPropertiesExpression;
-import static org.apache.camel.builder.ExpressionBuilder.camelContextPropertyExpression;
-import static org.apache.camel.builder.ExpressionBuilder.constantExpression;
-import static org.apache.camel.builder.ExpressionBuilder.headerExpression;
-import static org.apache.camel.builder.ExpressionBuilder.messageExpression;
-import static org.apache.camel.builder.ExpressionBuilder.parseSimpleOrFallbackToConstantExpression;
-import static org.apache.camel.builder.ExpressionBuilder.regexReplaceAll;
-import static org.apache.camel.builder.ExpressionBuilder.regexTokenizeExpression;
-import static org.apache.camel.builder.ExpressionBuilder.sortExpression;
-import static org.apache.camel.builder.ExpressionBuilder.tokenizeExpression;
-import static org.apache.camel.builder.PredicateBuilder.contains;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
@@ -45,6 +32,19 @@ import org.apache.camel.impl.DefaultExchange;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.apache.camel.builder.ExpressionBuilder.bodyExpression;
+import static org.apache.camel.builder.ExpressionBuilder.camelContextPropertiesExpression;
+import static org.apache.camel.builder.ExpressionBuilder.camelContextPropertyExpression;
+import static org.apache.camel.builder.ExpressionBuilder.constantExpression;
+import static org.apache.camel.builder.ExpressionBuilder.headerExpression;
+import static org.apache.camel.builder.ExpressionBuilder.messageExpression;
+import static org.apache.camel.builder.ExpressionBuilder.parseSimpleOrFallbackToConstantExpression;
+import static org.apache.camel.builder.ExpressionBuilder.regexReplaceAll;
+import static org.apache.camel.builder.ExpressionBuilder.regexTokenizeExpression;
+import static org.apache.camel.builder.ExpressionBuilder.sortExpression;
+import static org.apache.camel.builder.ExpressionBuilder.tokenizeExpression;
+import static org.apache.camel.builder.PredicateBuilder.contains;
+
 /**
  * @version
  */
diff --git a/camel-core/src/test/java/org/apache/camel/builder/ExpressionFunctionTest.java b/camel-core/src/test/java/org/apache/camel/builder/ExpressionFunctionTest.java
index 0c92865..d563551 100644
--- a/camel-core/src/test/java/org/apache/camel/builder/ExpressionFunctionTest.java
+++ b/camel-core/src/test/java/org/apache/camel/builder/ExpressionFunctionTest.java
@@ -17,12 +17,12 @@
 
 package org.apache.camel.builder;
 
-import static org.apache.camel.builder.ExpressionBuilder.messageExpression;
-
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
 
+import static org.apache.camel.builder.ExpressionBuilder.messageExpression;
+
 /**
  * @version
  */
diff --git a/camel-core/src/test/java/org/apache/camel/builder/PredicateBuilderTest.java b/camel-core/src/test/java/org/apache/camel/builder/PredicateBuilderTest.java
index 145b52d..72be469 100644
--- a/camel-core/src/test/java/org/apache/camel/builder/PredicateBuilderTest.java
+++ b/camel-core/src/test/java/org/apache/camel/builder/PredicateBuilderTest.java
@@ -15,10 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.builder;
-import static org.apache.camel.builder.Builder.constant;
-import static org.apache.camel.builder.PredicateBuilder.in;
-import static org.apache.camel.builder.PredicateBuilder.not;
-
 import java.util.Arrays;
 
 import org.apache.camel.Exchange;
@@ -30,6 +26,10 @@ import org.apache.camel.impl.DefaultExchange;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.apache.camel.builder.Builder.constant;
+import static org.apache.camel.builder.PredicateBuilder.in;
+import static org.apache.camel.builder.PredicateBuilder.not;
+
 public class PredicateBuilderTest extends TestSupport {
 
     protected Exchange exchange = new DefaultExchange(new DefaultCamelContext());
diff --git a/camel-core/src/test/java/org/apache/camel/builder/xml/XPathFeatureTest.java b/camel-core/src/test/java/org/apache/camel/builder/xml/XPathFeatureTest.java
index fbda928..d745d8e 100644
--- a/camel-core/src/test/java/org/apache/camel/builder/xml/XPathFeatureTest.java
+++ b/camel-core/src/test/java/org/apache/camel/builder/xml/XPathFeatureTest.java
@@ -16,10 +16,10 @@
  */
 package org.apache.camel.builder.xml;
 
-import static org.apache.camel.builder.xml.XPathBuilder.xpath;
-
 import java.io.FileNotFoundException;
 
+import org.xml.sax.SAXParseException;
+
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.NoTypeConversionAvailableException;
@@ -27,7 +27,8 @@ import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.TypeConversionException;
 import org.apache.camel.converter.jaxp.XmlConverter;
 import org.junit.Test;
-import org.xml.sax.SAXParseException;
+
+import static org.apache.camel.builder.xml.XPathBuilder.xpath;
 
 public class XPathFeatureTest extends ContextTestSupport {
     public static final String DOM_BUILDER_FACTORY_FEATURE = XmlConverter.DOCUMENT_BUILDER_FACTORY_FEATURE;
diff --git a/camel-core/src/test/java/org/apache/camel/builder/xml/XPathMockTest.java b/camel-core/src/test/java/org/apache/camel/builder/xml/XPathMockTest.java
index d19e94f..3ee7072 100644
--- a/camel-core/src/test/java/org/apache/camel/builder/xml/XPathMockTest.java
+++ b/camel-core/src/test/java/org/apache/camel/builder/xml/XPathMockTest.java
@@ -16,14 +16,14 @@
  */
 package org.apache.camel.builder.xml;
 
-import static org.apache.camel.builder.PredicateBuilder.not;
-import static org.apache.camel.builder.xml.XPathBuilder.xpath;
-
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
 
+import static org.apache.camel.builder.PredicateBuilder.not;
+import static org.apache.camel.builder.xml.XPathBuilder.xpath;
+
 /**
  * @version
  */
diff --git a/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTest.java b/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTest.java
index ab392f7..d6a10c7 100644
--- a/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTest.java
+++ b/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.builder.xml;
 
-import static org.apache.camel.builder.xml.XPathBuilder.xpath;
-
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -33,16 +31,20 @@ import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFunctionResolver;
 
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import org.xml.sax.InputSource;
+
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.Expression;
 import org.apache.camel.Predicate;
 import org.apache.camel.util.StringHelper;
 import org.junit.Test;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
+
+import static org.apache.camel.builder.xml.XPathBuilder.xpath;
 
 /**
  * @version
diff --git a/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTransformRouteTest.java b/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTransformRouteTest.java
index 5929513..543ca0a 100644
--- a/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTransformRouteTest.java
+++ b/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTransformRouteTest.java
@@ -16,12 +16,13 @@
  */
 package org.apache.camel.builder.xml;
 
+import org.w3c.dom.Document;
+import org.w3c.dom.NodeList;
+
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
-import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
 
 
 /**
diff --git a/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTransformTest.java b/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTransformTest.java
index 956fa3d..66d36c3 100644
--- a/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTransformTest.java
+++ b/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTransformTest.java
@@ -16,6 +16,16 @@
  */
 package org.apache.camel.builder.xml;
 
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.NodeList;
+
+import org.apache.camel.ContextTestSupport;
+import org.junit.Test;
+import org.slf4j.Logger;
+
 import static org.hamcrest.Matchers.containsString;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
@@ -24,15 +34,6 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.mockito.hamcrest.MockitoHamcrest.argThat;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-
-import org.apache.camel.ContextTestSupport;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
-
 
 /**
  * @version
diff --git a/camel-core/src/test/java/org/apache/camel/builder/xml/XPathWithNamespacesFromDomTest.java b/camel-core/src/test/java/org/apache/camel/builder/xml/XPathWithNamespacesFromDomTest.java
index 6a13428..6653cdd 100644
--- a/camel-core/src/test/java/org/apache/camel/builder/xml/XPathWithNamespacesFromDomTest.java
+++ b/camel-core/src/test/java/org/apache/camel/builder/xml/XPathWithNamespacesFromDomTest.java
@@ -16,11 +16,12 @@
  */
 package org.apache.camel.builder.xml;
 
-import org.apache.camel.ContextTestSupport;
-import org.junit.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
+import org.apache.camel.ContextTestSupport;
+import org.junit.Test;
+
 /**
  * @version
  */
diff --git a/camel-core/src/test/java/org/apache/camel/builder/xml/XsltBuilderTest.java b/camel-core/src/test/java/org/apache/camel/builder/xml/XsltBuilderTest.java
index 58f928c..5901f02 100644
--- a/camel-core/src/test/java/org/apache/camel/builder/xml/XsltBuilderTest.java
+++ b/camel-core/src/test/java/org/apache/camel/builder/xml/XsltBuilderTest.java
@@ -25,6 +25,10 @@ import javax.xml.transform.Source;
 import javax.xml.transform.Templates;
 import javax.xml.transform.sax.SAXSource;
 
+import org.w3c.dom.Document;
+
+import org.xml.sax.InputSource;
+
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExpectedBodyTypeException;
@@ -34,8 +38,6 @@ import org.apache.camel.spi.Synchronization;
 import org.apache.camel.util.UnitOfWorkHelper;
 import org.junit.Before;
 import org.junit.Test;
-import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
 
 /**
  * @version
diff --git a/camel-core/src/test/java/org/apache/camel/builder/xml/XsltOutputFileTest.java b/camel-core/src/test/java/org/apache/camel/builder/xml/XsltOutputFileTest.java
index 35a8b74..50c37a4 100644
--- a/camel-core/src/test/java/org/apache/camel/builder/xml/XsltOutputFileTest.java
+++ b/camel-core/src/test/java/org/apache/camel/builder/xml/XsltOutputFileTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.builder.xml;
 
-import static org.apache.camel.builder.xml.XsltBuilder.xslt;
-
 import java.io.File;
 import java.net.URL;
 
@@ -29,6 +27,8 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
 
+import static org.apache.camel.builder.xml.XsltBuilder.xslt;
+
 /**
  * @version
  */
diff --git a/camel-core/src/test/java/org/apache/camel/builder/xml/XsltTest.java b/camel-core/src/test/java/org/apache/camel/builder/xml/XsltTest.java
index 4578de6..bb13658 100644
--- a/camel-core/src/test/java/org/apache/camel/builder/xml/XsltTest.java
+++ b/camel-core/src/test/java/org/apache/camel/builder/xml/XsltTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.builder.xml;
 
-import static org.apache.camel.builder.xml.XsltBuilder.xslt;
-
 import java.net.URL;
 
 import org.apache.camel.ContextTestSupport;
@@ -25,6 +23,8 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
 
+import static org.apache.camel.builder.xml.XsltBuilder.xslt;
+
 /**
  * @version
  */
diff --git a/camel-core/src/test/java/org/apache/camel/builder/xml/XsltTestErrorListenerTest.java b/camel-core/src/test/java/org/apache/camel/builder/xml/XsltTestErrorListenerTest.java
index 478c423..233882c 100644
--- a/camel-core/src/test/java/org/apache/camel/builder/xml/XsltTestErrorListenerTest.java
+++ b/camel-core/src/test/java/org/apache/camel/builder/xml/XsltTestErrorListenerTest.java
@@ -16,11 +16,6 @@
  */
 package org.apache.camel.builder.xml;
 
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
 import java.net.URL;
 
 import javax.xml.transform.ErrorListener;
@@ -28,6 +23,11 @@ import javax.xml.transform.ErrorListener;
 import org.junit.Assert;
 import org.junit.Test;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
 public class XsltTestErrorListenerTest extends Assert {
 
     private XsltBuilder xsltBuilder = new XsltBuilder();
diff --git a/camel-core/src/test/java/org/apache/camel/component/ComponentDiscoveryTest.java b/camel-core/src/test/java/org/apache/camel/component/ComponentDiscoveryTest.java
index ff52dbb..09fa527 100644
--- a/camel-core/src/test/java/org/apache/camel/component/ComponentDiscoveryTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/ComponentDiscoveryTest.java
@@ -16,9 +16,6 @@
  */
 package org.apache.camel.component;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
@@ -31,6 +28,9 @@ import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 /**
  * Test we can auto discover components on the classpath
  */
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanNoTypeConvertionPossibleTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanNoTypeConvertionPossibleTest.java
index 7a40b46..aaaafb1 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanNoTypeConvertionPossibleTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanNoTypeConvertionPossibleTest.java
@@ -18,13 +18,14 @@ package org.apache.camel.component.bean;
 
 import java.util.Date;
 
+import org.w3c.dom.Document;
+
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.NoTypeConversionAvailableException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
-import org.w3c.dom.Document;
 
 /**
  * @version
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanNoTypeConvertionPossibleWhenHeaderTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanNoTypeConvertionPossibleWhenHeaderTest.java
index d524362..4aa461b 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanNoTypeConvertionPossibleWhenHeaderTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanNoTypeConvertionPossibleWhenHeaderTest.java
@@ -16,13 +16,14 @@
  */
 package org.apache.camel.component.bean;
 
+import org.w3c.dom.Document;
+
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.NoTypeConversionAvailableException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
-import org.w3c.dom.Document;
 
 /**
  * @version
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanPrivateClassWithInterfaceMethodTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanPrivateClassWithInterfaceMethodTest.java
index e1d65fc..b43e7df 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanPrivateClassWithInterfaceMethodTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanPrivateClassWithInterfaceMethodTest.java
@@ -16,17 +16,17 @@
  */
 package org.apache.camel.component.bean;
 
-import static org.apache.camel.component.bean.issues.PrivateClasses.EXPECTED_OUTPUT;
-import static org.apache.camel.component.bean.issues.PrivateClasses.METHOD_NAME;
-import static org.apache.camel.component.bean.issues.PrivateClasses.newPackagePrivateHelloCamel;
-import static org.apache.camel.component.bean.issues.PrivateClasses.newPrivateHelloCamel;
-
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.bean.issues.PrivateClasses.HelloCamel;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
 
+import static org.apache.camel.component.bean.issues.PrivateClasses.EXPECTED_OUTPUT;
+import static org.apache.camel.component.bean.issues.PrivateClasses.METHOD_NAME;
+import static org.apache.camel.component.bean.issues.PrivateClasses.newPackagePrivateHelloCamel;
+import static org.apache.camel.component.bean.issues.PrivateClasses.newPrivateHelloCamel;
+
 /**
  * Tests Bean binding for private & package-private classes where the target method is accessible through an interface.
  */
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanProxyNoBindingTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanProxyNoBindingTest.java
index 7f9033e..a72c28a 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanProxyNoBindingTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanProxyNoBindingTest.java
@@ -16,13 +16,14 @@
  */
 package org.apache.camel.component.bean;
 
+import org.w3c.dom.Document;
+
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Endpoint;
 import org.apache.camel.InvalidPayloadException;
 import org.apache.camel.builder.ProxyBuilder;
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.Test;
-import org.w3c.dom.Document;
 
 /**
  * @version
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanProxyTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanProxyTest.java
index 4bdb238..5e4d2ce 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanProxyTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanProxyTest.java
@@ -16,13 +16,14 @@
  */
 package org.apache.camel.component.bean;
 
+import org.w3c.dom.Document;
+
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Endpoint;
 import org.apache.camel.InvalidPayloadException;
 import org.apache.camel.builder.ProxyBuilder;
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.Test;
-import org.w3c.dom.Document;
 
 
 /**
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeaderAnnotation.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeaderAnnotation.java
index 51168f5..7f49ae8 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeaderAnnotation.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeaderAnnotation.java
@@ -16,9 +16,10 @@
  */
 package org.apache.camel.component.bean;
 
-import org.apache.camel.Header;
 import org.w3c.dom.Document;
 
+import org.apache.camel.Header;
+
 /**
  * @version
  */
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/OrderServiceBean.java b/camel-core/src/test/java/org/apache/camel/component/bean/OrderServiceBean.java
index 43063e7..294ec9a 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/OrderServiceBean.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/OrderServiceBean.java
@@ -16,10 +16,11 @@
  */
 package org.apache.camel.component.bean;
 
+import org.w3c.dom.Document;
+
 import org.apache.camel.TypeConverter;
 import org.apache.camel.component.file.GenericFile;
 import org.apache.camel.util.FileUtil;
-import org.w3c.dom.Document;
 
 /**
  * @version
diff --git a/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionTest.java b/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionTest.java
index 284234d..954d2af 100644
--- a/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.file;
-import static org.apache.camel.language.simple.SimpleLanguage.simple;
-
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
@@ -25,6 +23,8 @@ import org.apache.camel.impl.JndiRegistry;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.apache.camel.language.simple.SimpleLanguage.simple;
+
 /**
  * Unit test for expression option for file consumer.
  */
diff --git a/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionThrowExceptionTest.java b/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionThrowExceptionTest.java
index 0aa8f1b..78881eb 100644
--- a/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionThrowExceptionTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionThrowExceptionTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.file;
-import static org.awaitility.Awaitility.await;
-
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -31,6 +29,8 @@ import org.apache.camel.spi.PollingConsumerPollStrategy;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.awaitility.Awaitility.await;
+
 /**
  * Unit test for expression option for file consumer.
  */
diff --git a/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyRollbackThrowExceptionTest.java b/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyRollbackThrowExceptionTest.java
index 2cf6c1c..7a62da3 100644
--- a/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyRollbackThrowExceptionTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyRollbackThrowExceptionTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.file;
-import static org.awaitility.Awaitility.await;
-
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -30,6 +28,8 @@ import org.apache.camel.spi.PollingConsumerPollStrategy;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.awaitility.Awaitility.await;
+
 /**
  * Unit test for poll strategy
  */
diff --git a/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpLockFileTest.java b/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpLockFileTest.java
index 67f1516..0827ad1 100644
--- a/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpLockFileTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpLockFileTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.file;
-import static org.awaitility.Awaitility.await;
-
 import java.io.File;
 import java.util.concurrent.TimeUnit;
 
@@ -28,6 +26,8 @@ import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.After;
 import org.junit.Test;
 
+import static org.awaitility.Awaitility.await;
+
 /**
  * Unit test to verify that the noop file strategy usage of lock files.
  */
diff --git a/camel-core/src/test/java/org/apache/camel/component/file/FileProducerExpressionTest.java b/camel-core/src/test/java/org/apache/camel/component/file/FileProducerExpressionTest.java
index aaf1f75..9907f7c 100644
--- a/camel-core/src/test/java/org/apache/camel/component/file/FileProducerExpressionTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/file/FileProducerExpressionTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.file;
-import static org.apache.camel.language.simple.SimpleLanguage.simple;
-
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
@@ -27,6 +25,8 @@ import org.apache.camel.impl.JndiRegistry;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.apache.camel.language.simple.SimpleLanguage.simple;
+
 /**
  * Unit test for expression option for file producer.
  */
diff --git a/camel-core/src/test/java/org/apache/camel/component/file/NewFileConsumerTest.java b/camel-core/src/test/java/org/apache/camel/component/file/NewFileConsumerTest.java
index e9680ea..c18583a 100644
--- a/camel-core/src/test/java/org/apache/camel/component/file/NewFileConsumerTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/file/NewFileConsumerTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.component.file;
-import static org.awaitility.Awaitility.await;
-
 import java.io.File;
 import java.util.concurrent.TimeUnit;
 
@@ -27,6 +25,8 @@ import org.apache.camel.builder.RouteBuilder;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.awaitility.Awaitility.await;
+
 /**
  *
  */
diff --git a/camel-core/src/test/java/org/apache/camel/component/file/XPathToFileTest.java b/camel-core/src/test/java/org/apache/camel/component/file/XPathToFileTest.java
index 786caea..10f69b8 100644
--- a/camel-core/src/test/java/org/apache/camel/component/file/XPathToFileTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/file/XPathToFileTest.java
@@ -17,12 +17,13 @@
 package org.apache.camel.component.file;
 import java.io.File;
 
+import org.w3c.dom.Document;
+
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Before;
 import org.junit.Test;
-import org.w3c.dom.Document;
 
 /**
  * @version
diff --git a/camel-core/src/test/java/org/apache/camel/component/log/LogCustomLoggerTest.java b/camel-core/src/test/java/org/apache/camel/component/log/LogCustomLoggerTest.java
index 280f129..4a9045b 100644
--- a/camel-core/src/test/java/org/apache/camel/component/log/LogCustomLoggerTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/log/LogCustomLoggerTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.component.log;
 
-import static org.hamcrest.CoreMatchers.equalTo;
-
 import java.io.StringWriter;
 
 import org.apache.camel.CamelContext;
@@ -31,6 +29,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.slf4j.LoggerFactory;
 
+import static org.hamcrest.CoreMatchers.equalTo;
+
 /**
  * Custom Logger test.
  */
diff --git a/camel-core/src/test/java/org/apache/camel/component/rest/RestEndpointTest.java b/camel-core/src/test/java/org/apache/camel/component/rest/RestEndpointTest.java
index 95a5ac4..3d8f175 100644
--- a/camel-core/src/test/java/org/apache/camel/component/rest/RestEndpointTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/rest/RestEndpointTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.component.rest;
 
-import static org.junit.Assert.assertEquals;
-
 import java.util.HashMap;
 import java.util.Map;
 
@@ -32,6 +30,8 @@ import org.apache.camel.spi.RestProducerFactory;
 import org.junit.Assert;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+
 public class RestEndpointTest {
 
     public static class MockRest extends DefaultComponent implements RestProducerFactory {
diff --git a/camel-core/src/test/java/org/apache/camel/component/rest/RestProducerBindingProcessorTest.java b/camel-core/src/test/java/org/apache/camel/component/rest/RestProducerBindingProcessorTest.java
index 4792431..efc2d91 100644
--- a/camel-core/src/test/java/org/apache/camel/component/rest/RestProducerBindingProcessorTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/rest/RestProducerBindingProcessorTest.java
@@ -16,13 +16,6 @@
  */
 package org.apache.camel.component.rest;
 
-import static org.junit.Assert.assertNotNull;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.same;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 import java.io.InputStream;
 import java.io.OutputStream;
 
@@ -39,6 +32,13 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.same;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 public class RestProducerBindingProcessorTest {
 
     public static class RequestPojo {
diff --git a/camel-core/src/test/java/org/apache/camel/component/rest/RestProducerTest.java b/camel-core/src/test/java/org/apache/camel/component/rest/RestProducerTest.java
index e0689b6..50ce942 100644
--- a/camel-core/src/test/java/org/apache/camel/component/rest/RestProducerTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/rest/RestProducerTest.java
@@ -16,9 +16,6 @@
  */
 package org.apache.camel.component.rest;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
 import java.io.UnsupportedEncodingException;
 import java.net.URISyntaxException;
 
@@ -27,6 +24,9 @@ import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.impl.DefaultMessage;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
 public class RestProducerTest {
 
     private CamelContext camelContext = new DefaultCamelContext();
diff --git a/camel-core/src/test/java/org/apache/camel/component/seda/SedaConsumerSuspendResumeTest.java b/camel-core/src/test/java/org/apache/camel/component/seda/SedaConsumerSuspendResumeTest.java
index dcea5d8..e23d57f 100644
--- a/camel-core/src/test/java/org/apache/camel/component/seda/SedaConsumerSuspendResumeTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/seda/SedaConsumerSuspendResumeTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.component.seda;
 
-import static org.awaitility.Awaitility.await;
-
 import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.ContextTestSupport;
@@ -26,6 +24,8 @@ import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.util.ServiceHelper;
 import org.junit.Test;
 
+import static org.awaitility.Awaitility.await;
+
 /**
  *
  */
diff --git a/camel-core/src/test/java/org/apache/camel/component/validator/ValidatorResourceResolverFactoryTest.java b/camel-core/src/test/java/org/apache/camel/component/validator/ValidatorResourceResolverFactoryTest.java
index 4399a02..9e52c70 100644
--- a/camel-core/src/test/java/org/apache/camel/component/validator/ValidatorResourceResolverFactoryTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/validator/ValidatorResourceResolverFactoryTest.java
@@ -16,12 +16,13 @@
  */
 package org.apache.camel.component.validator;
 
-import static org.awaitility.Awaitility.await;
-
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
+import org.w3c.dom.ls.LSInput;
+import org.w3c.dom.ls.LSResourceResolver;
+
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
@@ -31,8 +32,8 @@ import org.apache.camel.model.language.ConstantExpression;
 import org.apache.camel.model.language.SimpleExpression;
 import org.junit.Assert;
 import org.junit.Test;
-import org.w3c.dom.ls.LSInput;
-import org.w3c.dom.ls.LSResourceResolver;
+
+import static org.awaitility.Awaitility.await;
 
 public class ValidatorResourceResolverFactoryTest extends ContextTestSupport {
 
diff --git a/camel-core/src/test/java/org/apache/camel/component/validator/ValidatorWithResourceResolverRouteTest.java b/camel-core/src/test/java/org/apache/camel/component/validator/ValidatorWithResourceResolverRouteTest.java
index 3263845..ac5a85c 100644
--- a/camel-core/src/test/java/org/apache/camel/component/validator/ValidatorWithResourceResolverRouteTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/validator/ValidatorWithResourceResolverRouteTest.java
@@ -17,6 +17,8 @@
 package org.apache.camel.component.validator;
 import java.net.URL;
 
+import org.w3c.dom.ls.LSResourceResolver;
+
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.ValidationException;
 import org.apache.camel.builder.RouteBuilder;
@@ -29,7 +31,6 @@ import org.apache.xml.resolver.CatalogManager;
 import org.apache.xml.resolver.tools.CatalogResolver;
 import org.junit.Before;
 import org.junit.Test;
-import org.w3c.dom.ls.LSResourceResolver;
 
 public class ValidatorWithResourceResolverRouteTest extends ContextTestSupport {
 
diff --git a/camel-core/src/test/java/org/apache/camel/component/xslt/MyXPath.java b/camel-core/src/test/java/org/apache/camel/component/xslt/MyXPath.java
index 3e777d0..f25c263 100644
--- a/camel-core/src/test/java/org/apache/camel/component/xslt/MyXPath.java
+++ b/camel-core/src/test/java/org/apache/camel/component/xslt/MyXPath.java
@@ -22,10 +22,11 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.w3c.dom.NodeList;
+
 import org.apache.camel.component.bean.XPathAnnotationExpressionFactory;
 import org.apache.camel.language.LanguageAnnotation;
 import org.apache.camel.language.NamespacePrefix;
-import org.w3c.dom.NodeList;
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
diff --git a/camel-core/src/test/java/org/apache/camel/component/xslt/SAXSourceLogBodyTest.java b/camel-core/src/test/java/org/apache/camel/component/xslt/SAXSourceLogBodyTest.java
index 76a013e..26bc0d5 100644
--- a/camel-core/src/test/java/org/apache/camel/component/xslt/SAXSourceLogBodyTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/xslt/SAXSourceLogBodyTest.java
@@ -21,15 +21,16 @@ import java.io.InputStream;
 
 import javax.xml.transform.sax.SAXSource;
 
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.XMLReaderFactory;
+
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.LoggingLevel;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.Test;
-import org.xml.sax.InputSource;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
 
 /**
  *
diff --git a/camel-core/src/test/java/org/apache/camel/component/xslt/XsltCustomizeEntityResolverTest.java b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltCustomizeEntityResolverTest.java
index 8456eb3..f439bd8 100644
--- a/camel-core/src/test/java/org/apache/camel/component/xslt/XsltCustomizeEntityResolverTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltCustomizeEntityResolverTest.java
@@ -19,14 +19,15 @@ package org.apache.camel.component.xslt;
 import java.io.IOException;
 import java.io.StringReader;
 
+import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.impl.JndiRegistry;
 import org.junit.Test;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
 
 public class XsltCustomizeEntityResolverTest extends ContextTestSupport {
 
diff --git a/camel-core/src/test/java/org/apache/camel/component/xslt/XsltOutputDOMTest.java b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltOutputDOMTest.java
index eb2f878..90120c9 100644
--- a/camel-core/src/test/java/org/apache/camel/component/xslt/XsltOutputDOMTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltOutputDOMTest.java
@@ -16,11 +16,12 @@
  */
 package org.apache.camel.component.xslt;
 
+import org.w3c.dom.Document;
+
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
-import org.w3c.dom.Document;
 
 /**
  *
diff --git a/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java
index 5cf1829..7c65ca4 100644
--- a/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java
@@ -18,6 +18,8 @@ package org.apache.camel.component.xslt;
 
 import java.util.List;
 
+import org.w3c.dom.Document;
+
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
@@ -25,7 +27,6 @@ import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.converter.jaxp.XmlConverter;
 import org.apache.camel.impl.JndiRegistry;
 import org.junit.Test;
-import org.w3c.dom.Document;
 
 public class XsltRouteTest extends ContextTestSupport {
     
diff --git a/camel-core/src/test/java/org/apache/camel/component/xslt/XsltUriResolverFactoryTest.java b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltUriResolverFactoryTest.java
index e52c2c4..7ff4f4a 100644
--- a/camel-core/src/test/java/org/apache/camel/component/xslt/XsltUriResolverFactoryTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltUriResolverFactoryTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.component.xslt;
 
-import static org.awaitility.Awaitility.await;
-
 import java.io.InputStream;
 import java.util.HashSet;
 import java.util.Set;
@@ -38,6 +36,8 @@ import org.apache.camel.model.language.SimpleExpression;
 import org.junit.Assert;
 import org.junit.Test;
 
+import static org.awaitility.Awaitility.await;
+
 /**
  *
  */
diff --git a/camel-core/src/test/java/org/apache/camel/converter/CamelConverterTest.java b/camel-core/src/test/java/org/apache/camel/converter/CamelConverterTest.java
index a534f53..f219b3f 100644
--- a/camel-core/src/test/java/org/apache/camel/converter/CamelConverterTest.java
+++ b/camel-core/src/test/java/org/apache/camel/converter/CamelConverterTest.java
@@ -16,9 +16,6 @@
  */
 package org.apache.camel.converter;
 
-import static org.apache.camel.builder.Builder.constant;
-import static org.apache.camel.builder.ExpressionBuilder.headerExpression;
-
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.Expression;
@@ -29,6 +26,9 @@ import org.apache.camel.builder.PredicateBuilder;
 import org.apache.camel.impl.DefaultExchange;
 import org.junit.Test;
 
+import static org.apache.camel.builder.Builder.constant;
+import static org.apache.camel.builder.ExpressionBuilder.headerExpression;
+
 /**
  * @version
  */
diff --git a/camel-core/src/test/java/org/apache/camel/converter/DurationConverterTest.java b/camel-core/src/test/java/org/apache/camel/converter/DurationConverterTest.java
index 6077df6..86ad5f0 100644
--- a/camel-core/src/test/java/org/apache/camel/converter/DurationConverterTest.java
+++ b/camel-core/src/test/java/org/apache/camel/converter/DurationConverterTest.java
@@ -16,14 +16,14 @@
  */
 package org.apache.camel.converter;
 
-import static org.hamcrest.core.Is.is;
-
 import java.time.Duration;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.TypeConversionException;
 import org.junit.Test;
 
+import static org.hamcrest.core.Is.is;
+
 public class DurationConverterTest extends ContextTestSupport {
 
     @Test
diff --git a/camel-core/src/test/java/org/apache/camel/converter/JaxpTest.java b/camel-core/src/test/java/org/apache/camel/converter/JaxpTest.java
index 8d79880..a44cf15 100644
--- a/camel-core/src/test/java/org/apache/camel/converter/JaxpTest.java
+++ b/camel-core/src/test/java/org/apache/camel/converter/JaxpTest.java
@@ -22,6 +22,9 @@ import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamSource;
 
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
 import org.apache.camel.TypeConverter;
 import org.apache.camel.impl.DefaultClassResolver;
 import org.apache.camel.impl.DefaultFactoryFinderResolver;
@@ -34,8 +37,6 @@ import org.junit.Before;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
 
 /**
  * @version
diff --git a/camel-core/src/test/java/org/apache/camel/converter/TimePatternConverterTest.java b/camel-core/src/test/java/org/apache/camel/converter/TimePatternConverterTest.java
index b5e93c7..d046643 100644
--- a/camel-core/src/test/java/org/apache/camel/converter/TimePatternConverterTest.java
+++ b/camel-core/src/test/java/org/apache/camel/converter/TimePatternConverterTest.java
@@ -16,11 +16,11 @@
  */
 package org.apache.camel.converter;
 
-import static org.hamcrest.core.Is.is;
-
 import org.apache.camel.ContextTestSupport;
 import org.junit.Test;
 
+import static org.hamcrest.core.Is.is;
+
 public class TimePatternConverterTest extends ContextTestSupport {
 
     @Test
diff --git a/camel-core/src/test/java/org/apache/camel/converter/jaxp/DomConverterTest.java b/camel-core/src/test/java/org/apache/camel/converter/jaxp/DomConverterTest.java
index 1009d23..c14d3c0 100644
--- a/camel-core/src/test/java/org/apache/camel/converter/jaxp/DomConverterTest.java
+++ b/camel-core/src/test/java/org/apache/camel/converter/jaxp/DomConverterTest.java
@@ -19,11 +19,12 @@ package org.apache.camel.converter.jaxp;
 import java.io.InputStream;
 import java.util.List;
 
+import org.w3c.dom.Document;
+import org.w3c.dom.NodeList;
+
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.util.ObjectHelper;
 import org.junit.Test;
-import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
 
 /**
  * @version
diff --git a/camel-core/src/test/java/org/apache/camel/converter/jaxp/StAX2SAXSourceTest.java b/camel-core/src/test/java/org/apache/camel/converter/jaxp/StAX2SAXSourceTest.java
index 92d9b4e..1bbed22 100644
--- a/camel-core/src/test/java/org/apache/camel/converter/jaxp/StAX2SAXSourceTest.java
+++ b/camel-core/src/test/java/org/apache/camel/converter/jaxp/StAX2SAXSourceTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.converter.jaxp;
 
-import static org.hamcrest.core.IsEqual.equalTo;
-
 import java.io.ByteArrayOutputStream;
 import java.io.StringReader;
 import java.nio.charset.Charset;
@@ -35,6 +33,8 @@ import org.apache.camel.Exchange;
 import org.apache.camel.impl.DefaultExchange;
 import org.junit.Test;
 
+import static org.hamcrest.core.IsEqual.equalTo;
+
 public class StAX2SAXSourceTest extends ContextTestSupport {
 
     private static final String TEST_XML = "<root xmlns=\"urn:org.apache.camel:test\">Text</root>";
diff --git a/camel-core/src/test/java/org/apache/camel/converter/jaxp/XmlConverterTest.java b/camel-core/src/test/java/org/apache/camel/converter/jaxp/XmlConverterTest.java
index 5902e9a..d0731b1 100644
--- a/camel-core/src/test/java/org/apache/camel/converter/jaxp/XmlConverterTest.java
+++ b/camel-core/src/test/java/org/apache/camel/converter/jaxp/XmlConverterTest.java
@@ -28,6 +28,13 @@ import javax.xml.transform.sax.SAXSource;
 import javax.xml.transform.stax.StAXSource;
 import javax.xml.transform.stream.StreamSource;
 
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import org.xml.sax.InputSource;
+
 import org.apache.camel.BytesSource;
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
@@ -36,11 +43,6 @@ import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.impl.DefaultExchange;
 import org.junit.Before;
 import org.junit.Test;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
 
 /**
  * @version
diff --git a/camel-core/src/test/java/org/apache/camel/converter/stream/StreamCacheConverterTest.java b/camel-core/src/test/java/org/apache/camel/converter/stream/StreamCacheConverterTest.java
index b08501f..6959db4 100644
--- a/camel-core/src/test/java/org/apache/camel/converter/stream/StreamCacheConverterTest.java
+++ b/camel-core/src/test/java/org/apache/camel/converter/stream/StreamCacheConverterTest.java
@@ -23,6 +23,8 @@ import javax.xml.transform.Source;
 import javax.xml.transform.sax.SAXSource;
 import javax.xml.transform.stream.StreamSource;
 
+import org.xml.sax.InputSource;
+
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.StreamCache;
@@ -31,7 +33,6 @@ import org.apache.camel.converter.jaxp.XmlConverter;
 import org.apache.camel.impl.DefaultExchange;
 import org.junit.Before;
 import org.junit.Test;
-import org.xml.sax.InputSource;
 
 /**
  * Test cases for {@link StreamCacheConverter}
diff --git a/camel-core/src/test/java/org/apache/camel/impl/CamelPostProcessorHelperTest.java b/camel-core/src/test/java/org/apache/camel/impl/CamelPostProcessorHelperTest.java
index 1fce95a..615afca 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/CamelPostProcessorHelperTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/CamelPostProcessorHelperTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.impl;
 
-import static org.awaitility.Awaitility.await;
-
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.Properties;
@@ -44,6 +42,8 @@ import org.apache.camel.support.SynchronizationAdapter;
 import org.apache.camel.util.ObjectHelper;
 import org.junit.Test;
 
+import static org.awaitility.Awaitility.await;
+
 /**
  * @version
  */
diff --git a/camel-core/src/test/java/org/apache/camel/impl/ComponentConfigurationTest.java b/camel-core/src/test/java/org/apache/camel/impl/ComponentConfigurationTest.java
index a9962f8..4d1a80b 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/ComponentConfigurationTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/ComponentConfigurationTest.java
@@ -16,11 +16,6 @@
  */
 package org.apache.camel.impl;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
 import java.util.Map;
 import java.util.SortedMap;
 
@@ -42,6 +37,11 @@ import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 /**
  * Tests the use of {@link ComponentConfiguration} both from the URI string approach or for creating and mutating Endpoint instances
  * with both regular Components/Endpoints and {@link UriEndpointComponent} instances which have Endpoints annotated
diff --git a/camel-core/src/test/java/org/apache/camel/impl/CompositeRegistryTest.java b/camel-core/src/test/java/org/apache/camel/impl/CompositeRegistryTest.java
index 35d6a26..9d828fd 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/CompositeRegistryTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/CompositeRegistryTest.java
@@ -16,13 +16,13 @@
  */
 package org.apache.camel.impl;
 
+import org.junit.Before;
+import org.junit.Test;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
-import org.junit.Before;
-import org.junit.Test;
-
 public class CompositeRegistryTest {
     private CompositeRegistry registry;
     @Before
diff --git a/camel-core/src/test/java/org/apache/camel/impl/ConfigurationHelperTest.java b/camel-core/src/test/java/org/apache/camel/impl/ConfigurationHelperTest.java
index bb0471f..3a474e9 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/ConfigurationHelperTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/ConfigurationHelperTest.java
@@ -16,10 +16,6 @@
  */
 package org.apache.camel.impl;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
 import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.Map;
@@ -36,6 +32,10 @@ import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 /**
  * @see ComponentConfigurationTest for tests using the {@link ComponentConfiguration} mechanism
  */
diff --git a/camel-core/src/test/java/org/apache/camel/impl/ConsumerCacheZeroCapacityTest.java b/camel-core/src/test/java/org/apache/camel/impl/ConsumerCacheZeroCapacityTest.java
index 527e1d8..071b823 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/ConsumerCacheZeroCapacityTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/ConsumerCacheZeroCapacityTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.impl;
 
-import static org.awaitility.Awaitility.await;
-
 import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.ContextTestSupport;
@@ -26,6 +24,8 @@ import org.apache.camel.PollingConsumer;
 import org.apache.camel.support.ServiceSupport;
 import org.junit.Test;
 
+import static org.awaitility.Awaitility.await;
+
 /**
  * @version
  */
diff --git a/camel-core/src/test/java/org/apache/camel/impl/DefaultAsyncProcessorAwaitManagerTest.java b/camel-core/src/test/java/org/apache/camel/impl/DefaultAsyncProcessorAwaitManagerTest.java
index e90acd6..ed4de4c 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/DefaultAsyncProcessorAwaitManagerTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/DefaultAsyncProcessorAwaitManagerTest.java
@@ -16,10 +16,6 @@
  */
 package org.apache.camel.impl;
 
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.IsNull.nullValue;
-import static org.junit.Assert.assertThat;
-
 import java.util.LinkedList;
 import java.util.concurrent.CountDownLatch;
 
@@ -30,6 +26,10 @@ import org.apache.camel.spi.AsyncProcessorAwaitManager;
 import org.apache.camel.spi.MessageHistoryFactory;
 import org.junit.Test;
 
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsNull.nullValue;
+import static org.junit.Assert.assertThat;
+
 public class DefaultAsyncProcessorAwaitManagerTest {
 
     private static final MessageHistoryFactory MESSAGE_HISTORY_FACTORY = new DefaultMessageHistoryFactory();
diff --git a/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextResolverTest.java b/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextResolverTest.java
index 5c2941d..7ea13ea 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextResolverTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextResolverTest.java
@@ -15,11 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.impl;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Map;
@@ -37,6 +32,11 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
 /**
  * Tests if the default camel context is able to resolve components and data formats using both their real names and/or fallback names.
  * Fallback names have been introduced to avoid name clash in some registries (eg. Spring application context) between components and other camel features.
diff --git a/camel-core/src/test/java/org/apache/camel/impl/DefaultConsumerTemplateTest.java b/camel-core/src/test/java/org/apache/camel/impl/DefaultConsumerTemplateTest.java
index 107480c..b519596 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/DefaultConsumerTemplateTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/DefaultConsumerTemplateTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.impl;
-import static org.awaitility.Awaitility.await;
-
 import java.io.File;
 import java.util.concurrent.TimeUnit;
 
@@ -29,6 +27,8 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.awaitility.Awaitility.await;
+
 /**
  * @version
  */
diff --git a/camel-core/src/test/java/org/apache/camel/impl/DefaultEndpointRegistryTest.java b/camel-core/src/test/java/org/apache/camel/impl/DefaultEndpointRegistryTest.java
index 3476d7f..e5c78e0 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/DefaultEndpointRegistryTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/DefaultEndpointRegistryTest.java
@@ -16,10 +16,10 @@
  */
 package org.apache.camel.impl;
 
-import static org.junit.Assert.assertTrue;
-
 import org.junit.Test;
 
+import static org.junit.Assert.assertTrue;
+
 public class DefaultEndpointRegistryTest {
 
     @Test
diff --git a/camel-core/src/test/java/org/apache/camel/impl/DefaultFactoryFinderTest.java b/camel-core/src/test/java/org/apache/camel/impl/DefaultFactoryFinderTest.java
index 068fe50..88f67ee 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/DefaultFactoryFinderTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/DefaultFactoryFinderTest.java
@@ -16,16 +16,6 @@
  */
 package org.apache.camel.impl;
 
-import static org.hamcrest.Matchers.matchesPattern;
-import static org.hamcrest.core.IsCollectionContaining.hasItem;
-import static org.hamcrest.core.IsInstanceOf.instanceOf;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.net.URL;
@@ -36,6 +26,16 @@ import org.apache.camel.spi.ClassResolver;
 import org.apache.camel.spi.Injector;
 import org.junit.Test;
 
+import static org.hamcrest.Matchers.matchesPattern;
+import static org.hamcrest.core.IsCollectionContaining.hasItem;
+import static org.hamcrest.core.IsInstanceOf.instanceOf;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 public class DefaultFactoryFinderTest {
 
     public static class TestImplA implements TestType {
diff --git a/camel-core/src/test/java/org/apache/camel/impl/DefaultMessageTest.java b/camel-core/src/test/java/org/apache/camel/impl/DefaultMessageTest.java
index 0ca6463..06bece8 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/DefaultMessageTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/DefaultMessageTest.java
@@ -16,16 +16,16 @@
  */
 package org.apache.camel.impl;
 
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
-
 import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.apache.camel.Attachment;
 import org.junit.Test;
 
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+
 public class DefaultMessageTest {
 
     @Test
diff --git a/camel-core/src/test/java/org/apache/camel/impl/DurationRoutePolicyFactoryTest.java b/camel-core/src/test/java/org/apache/camel/impl/DurationRoutePolicyFactoryTest.java
index b97c9d5..4ba516a 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/DurationRoutePolicyFactoryTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/DurationRoutePolicyFactoryTest.java
@@ -16,14 +16,14 @@
  */
 package org.apache.camel.impl;
 
-import static org.awaitility.Awaitility.await;
-
 import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.Test;
 
+import static org.awaitility.Awaitility.await;
+
 public class DurationRoutePolicyFactoryTest extends ContextTestSupport {
 
     @Test
diff --git a/camel-core/src/test/java/org/apache/camel/impl/DurationRoutePolicyMaxMessagesTest.java b/camel-core/src/test/java/org/apache/camel/impl/DurationRoutePolicyMaxMessagesTest.java
index 69b7bc4..1854d9e 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/DurationRoutePolicyMaxMessagesTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/DurationRoutePolicyMaxMessagesTest.java
@@ -16,14 +16,14 @@
  */
 package org.apache.camel.impl;
 
-import static org.awaitility.Awaitility.await;
-
 import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.Test;
 
+import static org.awaitility.Awaitility.await;
+
 public class DurationRoutePolicyMaxMessagesTest extends ContextTestSupport {
 
     @Test
diff --git a/camel-core/src/test/java/org/apache/camel/impl/DurationRoutePolicyMaxSecondsTest.java b/camel-core/src/test/java/org/apache/camel/impl/DurationRoutePolicyMaxSecondsTest.java
index ead08f5..3fb9a37 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/DurationRoutePolicyMaxSecondsTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/DurationRoutePolicyMaxSecondsTest.java
@@ -16,14 +16,14 @@
  */
 package org.apache.camel.impl;
 
-import static org.awaitility.Awaitility.await;
-
 import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.Test;
 
+import static org.awaitility.Awaitility.await;
+
 public class DurationRoutePolicyMaxSecondsTest extends ContextTestSupport {
 
     @Test
diff --git a/camel-core/src/test/java/org/apache/camel/impl/EndpointConfigurationTest.java b/camel-core/src/test/java/org/apache/camel/impl/EndpointConfigurationTest.java
index cd2fe9c..cc9ca0b 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/EndpointConfigurationTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/EndpointConfigurationTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.impl;
-import static org.junit.Assert.assertEquals;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.Component;
 import org.apache.camel.ComponentConfiguration;
@@ -27,6 +25,8 @@ import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+
 public class EndpointConfigurationTest {
 
     private static final String MAPPED_SCHEME = "mapped";    
diff --git a/camel-core/src/test/java/org/apache/camel/impl/FileStateRepositoryTest.java b/camel-core/src/test/java/org/apache/camel/impl/FileStateRepositoryTest.java
index 76e144c..97b63c2 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/FileStateRepositoryTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/FileStateRepositoryTest.java
@@ -16,16 +16,16 @@
  */
 package org.apache.camel.impl;
 
-import static org.apache.camel.impl.FileStateRepository.fileStateRepository;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 import java.io.File;
 import java.nio.file.Files;
 
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.apache.camel.impl.FileStateRepository.fileStateRepository;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 public class FileStateRepositoryTest {
     private final File repositoryStore = new File("target/file-state-repository.dat");
 
diff --git a/camel-core/src/test/java/org/apache/camel/impl/FileWatcherReloadStrategyTest.java b/camel-core/src/test/java/org/apache/camel/impl/FileWatcherReloadStrategyTest.java
index daaddb7..661e2c3 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/FileWatcherReloadStrategyTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/FileWatcherReloadStrategyTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.impl;
 
-import static org.awaitility.Awaitility.await;
-
 import java.io.File;
 import java.util.EventObject;
 import java.util.concurrent.CountDownLatch;
@@ -31,6 +29,8 @@ import org.apache.camel.support.EventNotifierSupport;
 import org.apache.camel.util.FileUtil;
 import org.junit.Test;
 
+import static org.awaitility.Awaitility.await;
+
 public class FileWatcherReloadStrategyTest extends ContextTestSupport {
 
     private FileWatcherReloadStrategy reloadStrategy;
diff --git a/camel-core/src/test/java/org/apache/camel/impl/MemoryStateRepositoryTest.java b/camel-core/src/test/java/org/apache/camel/impl/MemoryStateRepositoryTest.java
index 11c56e8..52e2f42 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/MemoryStateRepositoryTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/MemoryStateRepositoryTest.java
@@ -16,10 +16,10 @@
  */
 package org.apache.camel.impl;
 
-import static org.junit.Assert.assertEquals;
-
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+
 public class MemoryStateRepositoryTest {
     @Test
     public void shouldSaveState() throws Exception {
diff --git a/camel-core/src/test/java/org/apache/camel/impl/RouteSedaSuspendResumeTest.java b/camel-core/src/test/java/org/apache/camel/impl/RouteSedaSuspendResumeTest.java
index 4441be9..b06eb01 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/RouteSedaSuspendResumeTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/RouteSedaSuspendResumeTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.impl;
 
-import static org.awaitility.Awaitility.await;
-
 import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.ContextTestSupport;
@@ -28,6 +26,8 @@ import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.component.seda.SedaEndpoint;
 import org.junit.Test;
 
+import static org.awaitility.Awaitility.await;
+
 /**
  * @version
  */
diff --git a/camel-core/src/test/java/org/apache/camel/impl/TwoRouteSuspendResumeTest.java b/camel-core/src/test/java/org/apache/camel/impl/TwoRouteSuspendResumeTest.java
index 0e5eabd..dc393d1 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/TwoRouteSuspendResumeTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/TwoRouteSuspendResumeTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.impl;
 
-import static org.awaitility.Awaitility.await;
-
 import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.ContextTestSupport;
@@ -26,6 +24,8 @@ import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.component.seda.SedaEndpoint;
 import org.junit.Test;
 
+import static org.awaitility.Awaitility.await;
+
 /**
  * @version
  */
diff --git a/camel-core/src/test/java/org/apache/camel/impl/TypeConverterRegistryPerformanceTest.java b/camel-core/src/test/java/org/apache/camel/impl/TypeConverterRegistryPerformanceTest.java
index 4440985..b40bd65 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/TypeConverterRegistryPerformanceTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/TypeConverterRegistryPerformanceTest.java
@@ -21,10 +21,11 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
+import org.w3c.dom.Document;
+
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.util.StopWatch;
 import org.junit.Test;
-import org.w3c.dom.Document;
 
 public class TypeConverterRegistryPerformanceTest extends ContextTestSupport {
 
diff --git a/camel-core/src/test/java/org/apache/camel/impl/cloud/LoadBalancerTest.java b/camel-core/src/test/java/org/apache/camel/impl/cloud/LoadBalancerTest.java
index 5ac86d8..119c6fc 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/cloud/LoadBalancerTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/cloud/LoadBalancerTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.impl.cloud;
-import static org.junit.Assert.assertEquals;
-
 import java.util.concurrent.RejectedExecutionException;
 import java.util.stream.Collectors;
 
@@ -24,6 +22,8 @@ import org.apache.camel.impl.DefaultCamelContext;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+
 public class LoadBalancerTest {
 
     private static StaticServiceDiscovery serviceDiscovery = new StaticServiceDiscovery();
diff --git a/camel-core/src/test/java/org/apache/camel/impl/cloud/ServiceDefinitionTest.java b/camel-core/src/test/java/org/apache/camel/impl/cloud/ServiceDefinitionTest.java
index 3418104..c44263a 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/cloud/ServiceDefinitionTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/cloud/ServiceDefinitionTest.java
@@ -16,15 +16,15 @@
  */
 package org.apache.camel.impl.cloud;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
 import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertFalse;
 import static junit.framework.TestCase.assertNull;
 import static junit.framework.TestCase.assertTrue;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
 import org.apache.camel.cloud.ServiceDefinition;
 import org.junit.Test;
 
diff --git a/camel-core/src/test/java/org/apache/camel/impl/cluster/ClusterServiceSelectorTest.java b/camel-core/src/test/java/org/apache/camel/impl/cluster/ClusterServiceSelectorTest.java
index 041e8f2..318e1fc 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/cluster/ClusterServiceSelectorTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/cluster/ClusterServiceSelectorTest.java
@@ -16,9 +16,6 @@
  */
 package org.apache.camel.impl.cluster;
 
-import static org.apache.camel.impl.cluster.ClusterServiceHelper.lookupService;
-import static org.apache.camel.impl.cluster.ClusterServiceHelper.mandatoryLookupService;
-
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
@@ -32,6 +29,9 @@ import org.apache.camel.impl.DefaultCamelContext;
 import org.junit.Assert;
 import org.junit.Test;
 
+import static org.apache.camel.impl.cluster.ClusterServiceHelper.lookupService;
+import static org.apache.camel.impl.cluster.ClusterServiceHelper.mandatoryLookupService;
+
 
 public class ClusterServiceSelectorTest {
 
diff --git a/camel-core/src/test/java/org/apache/camel/impl/converter/UriTypeConverterTest.java b/camel-core/src/test/java/org/apache/camel/impl/converter/UriTypeConverterTest.java
index c285058..5b6a9d0 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/converter/UriTypeConverterTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/converter/UriTypeConverterTest.java
@@ -16,13 +16,13 @@
  */
 package org.apache.camel.impl.converter;
 
-import static org.junit.Assert.assertEquals;
-
 import java.net.URI;
 
 import org.apache.camel.TypeConversionException;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+
 public class UriTypeConverterTest {
 
     static final String EXAMPLE = "http://www.example.com";
diff --git a/camel-core/src/test/java/org/apache/camel/impl/verifier/ResultErrorHelperTest.java b/camel-core/src/test/java/org/apache/camel/impl/verifier/ResultErrorHelperTest.java
index 82a74fe..0c72829 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/verifier/ResultErrorHelperTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/verifier/ResultErrorHelperTest.java
@@ -16,9 +16,6 @@
  */
 package org.apache.camel.impl.verifier;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -31,6 +28,9 @@ import org.apache.camel.component.extension.verifier.OptionsGroup;
 import org.apache.camel.component.extension.verifier.ResultErrorHelper;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 public class ResultErrorHelperTest {
 
     OptionsGroup[] groups = new OptionsGroup[] {OptionsGroup.withName("optionA").options("param1", "param2", "!param3"),
diff --git a/camel-core/src/test/java/org/apache/camel/issues/InterceptCustomPredicateAsFilterTest.java b/camel-core/src/test/java/org/apache/camel/issues/InterceptCustomPredicateAsFilterTest.java
index 984003c..dee9b5c 100644
--- a/camel-core/src/test/java/org/apache/camel/issues/InterceptCustomPredicateAsFilterTest.java
+++ b/camel-core/src/test/java/org/apache/camel/issues/InterceptCustomPredicateAsFilterTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.issues;
 
-import static org.apache.camel.builder.PredicateBuilder.not;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -27,6 +25,8 @@ import org.apache.camel.Predicate;
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.Test;
 
+import static org.apache.camel.builder.PredicateBuilder.not;
+
 /**
  * @version
  */
diff --git a/camel-core/src/test/java/org/apache/camel/issues/RetryWhilePredicateExpressionIssueTest.java b/camel-core/src/test/java/org/apache/camel/issues/RetryWhilePredicateExpressionIssueTest.java
index 34a0662..a2571be 100644
--- a/camel-core/src/test/java/org/apache/camel/issues/RetryWhilePredicateExpressionIssueTest.java
+++ b/camel-core/src/test/java/org/apache/camel/issues/RetryWhilePredicateExpressionIssueTest.java
@@ -16,15 +16,15 @@
  */
 package org.apache.camel.issues;
 
-import static org.apache.camel.builder.PredicateBuilder.and;
-import static org.apache.camel.builder.PredicateBuilder.isNotNull;
-
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.Predicate;
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.Test;
 
+import static org.apache.camel.builder.PredicateBuilder.and;
+import static org.apache.camel.builder.PredicateBuilder.isNotNull;
+
 /**
  *
  */
diff --git a/camel-core/src/test/java/org/apache/camel/issues/XPathSplitStreamTest.java b/camel-core/src/test/java/org/apache/camel/issues/XPathSplitStreamTest.java
index 0bdb4c6..1561151 100644
--- a/camel-core/src/test/java/org/apache/camel/issues/XPathSplitStreamTest.java
+++ b/camel-core/src/test/java/org/apache/camel/issues/XPathSplitStreamTest.java
@@ -15,13 +15,14 @@
  * limitations under the License.
  */
 package org.apache.camel.issues;
+import org.xml.sax.InputSource;
+
 import org.apache.camel.ContextTestSupport;
 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;
-import org.xml.sax.InputSource;
 
 /**
  * @version
diff --git a/camel-core/src/test/java/org/apache/camel/language/XPathFunctionTest.java b/camel-core/src/test/java/org/apache/camel/language/XPathFunctionTest.java
index f7a2cfc..751dd71 100644
--- a/camel-core/src/test/java/org/apache/camel/language/XPathFunctionTest.java
+++ b/camel-core/src/test/java/org/apache/camel/language/XPathFunctionTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 package org.apache.camel.language;
-import static org.apache.camel.component.mock.MockEndpoint.expectsMessageCount;
+import org.w3c.dom.NodeList;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
@@ -23,7 +23,8 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Before;
 import org.junit.Test;
-import org.w3c.dom.NodeList;
+
+import static org.apache.camel.component.mock.MockEndpoint.expectsMessageCount;
 
 /**
  * @version
diff --git a/camel-core/src/test/java/org/apache/camel/language/XPathOutFunctionTest.java b/camel-core/src/test/java/org/apache/camel/language/XPathOutFunctionTest.java
index 7db47ff..76c7126 100644
--- a/camel-core/src/test/java/org/apache/camel/language/XPathOutFunctionTest.java
+++ b/camel-core/src/test/java/org/apache/camel/language/XPathOutFunctionTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 package org.apache.camel.language;
-import static org.apache.camel.component.mock.MockEndpoint.expectsMessageCount;
+import org.w3c.dom.NodeList;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
@@ -24,7 +24,8 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Before;
 import org.junit.Test;
-import org.w3c.dom.NodeList;
+
+import static org.apache.camel.component.mock.MockEndpoint.expectsMessageCount;
 
 /**
  * @version
diff --git a/camel-core/src/test/java/org/apache/camel/management/BacklogDebuggerTest.java b/camel-core/src/test/java/org/apache/camel/management/BacklogDebuggerTest.java
index cb74058..c4f49e7 100644
--- a/camel-core/src/test/java/org/apache/camel/management/BacklogDebuggerTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/BacklogDebuggerTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.management;
 
-import static org.awaitility.Awaitility.await;
-
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
@@ -28,6 +26,8 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
 
+import static org.awaitility.Awaitility.await;
+
 public class BacklogDebuggerTest extends ManagementTestSupport {
 
     @SuppressWarnings("unchecked")
diff --git a/camel-core/src/test/java/org/apache/camel/management/BacklogTracerTest.java b/camel-core/src/test/java/org/apache/camel/management/BacklogTracerTest.java
index fceaba3c..fa52b4b 100644
--- a/camel-core/src/test/java/org/apache/camel/management/BacklogTracerTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/BacklogTracerTest.java
@@ -22,12 +22,13 @@ import javax.management.Attribute;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
+import org.w3c.dom.Document;
+import org.w3c.dom.NodeList;
+
 import org.apache.camel.Exchange;
 import org.apache.camel.api.management.mbean.BacklogTracerEventMessage;
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.Test;
-import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
 
 public class BacklogTracerTest extends ManagementTestSupport {
 
diff --git a/camel-core/src/test/java/org/apache/camel/management/CamelChoiceWithManagementTest.java b/camel-core/src/test/java/org/apache/camel/management/CamelChoiceWithManagementTest.java
index 68e1b39..25408e9 100644
--- a/camel-core/src/test/java/org/apache/camel/management/CamelChoiceWithManagementTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/CamelChoiceWithManagementTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.management;
-import static org.apache.camel.component.mock.MockEndpoint.expectsMessageCount;
-
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
@@ -25,6 +23,8 @@ import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.apache.camel.component.mock.MockEndpoint.expectsMessageCount;
+
 /**
  * @version
  */
diff --git a/camel-core/src/test/java/org/apache/camel/management/DefaultManagementAgentMockTest.java b/camel-core/src/test/java/org/apache/camel/management/DefaultManagementAgentMockTest.java
index b4e9e8e..5066a63 100644
--- a/camel-core/src/test/java/org/apache/camel/management/DefaultManagementAgentMockTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/DefaultManagementAgentMockTest.java
@@ -16,12 +16,6 @@
  */
 package org.apache.camel.management;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.when;
-
 import javax.management.JMException;
 import javax.management.MBeanServer;
 import javax.management.ObjectInstance;
@@ -32,6 +26,12 @@ import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.spi.ManagementAgent;
 import org.junit.Test;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.when;
+
 /**
  * Tests proper behavior of DefaultManagementAgent when
  * {@link MBeanServer#registerMBean(Object, ObjectName)} returns an
diff --git a/camel-core/src/test/java/org/apache/camel/management/EndpointCompletionTest.java b/camel-core/src/test/java/org/apache/camel/management/EndpointCompletionTest.java
index 973d9d9..5e46df0 100644
--- a/camel-core/src/test/java/org/apache/camel/management/EndpointCompletionTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/EndpointCompletionTest.java
@@ -23,13 +23,12 @@ import java.util.Map;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 public class EndpointCompletionTest extends ManagementTestSupport {
     private static final Logger LOG = LoggerFactory.getLogger(EndpointCompletionTest.class);
 
diff --git a/camel-core/src/test/java/org/apache/camel/management/EventNotifierExchangeSentTest.java b/camel-core/src/test/java/org/apache/camel/management/EventNotifierExchangeSentTest.java
index c8a20d1..91d7488 100644
--- a/camel-core/src/test/java/org/apache/camel/management/EventNotifierExchangeSentTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/EventNotifierExchangeSentTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.management;
-import static org.awaitility.Awaitility.await;
-
 import java.util.ArrayList;
 import java.util.EventObject;
 import java.util.List;
@@ -32,6 +30,8 @@ import org.apache.camel.support.EventNotifierSupport;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.awaitility.Awaitility.await;
+
 /**
  * @version
  */
diff --git a/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java b/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java
index 62a68ee..07696b5 100644
--- a/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.management;
-import static org.awaitility.Awaitility.await;
-
 import java.io.IOException;
 import java.lang.management.ManagementFactory;
 import java.util.Iterator;
@@ -35,6 +33,8 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.awaitility.Awaitility.await;
+
 /**
  * This test verifies JMX is enabled by default and it uses local mbean
  * server to conduct the test as connector server is not enabled by default.
diff --git a/camel-core/src/test/java/org/apache/camel/management/LoadTimerTest.java b/camel-core/src/test/java/org/apache/camel/management/LoadTimerTest.java
index 278836c..3072e59 100644
--- a/camel-core/src/test/java/org/apache/camel/management/LoadTimerTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/LoadTimerTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.management;
 
-import static org.awaitility.Awaitility.await;
-
 import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.ContextTestSupport;
@@ -26,6 +24,8 @@ import org.apache.camel.management.mbean.LoadTriplet;
 import org.apache.camel.support.TimerListenerManager;
 import org.junit.Test;
 
+import static org.awaitility.Awaitility.await;
+
 public class LoadTimerTest extends ContextTestSupport {
 
     private static final int SAMPLES = 2;
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextDumpRoutesCoverageAsXml.java b/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextDumpRoutesCoverageAsXml.java
index 9a1c6d1..829a582 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextDumpRoutesCoverageAsXml.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextDumpRoutesCoverageAsXml.java
@@ -19,9 +19,10 @@ package org.apache.camel.management;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
-import org.apache.camel.builder.RouteBuilder;
 import org.w3c.dom.Document;
 
+import org.apache.camel.builder.RouteBuilder;
+
 /**
  * @version
  */
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextDumpStatsAsXmlTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextDumpStatsAsXmlTest.java
index 02b4bce..8569807 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextDumpStatsAsXmlTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextDumpStatsAsXmlTest.java
@@ -19,9 +19,10 @@ package org.apache.camel.management;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
+import org.w3c.dom.Document;
+
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.Test;
-import org.w3c.dom.Document;
 
 /**
  * @version
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedInflightStatisticsTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedInflightStatisticsTest.java
index 4519556..3b8c0bc 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedInflightStatisticsTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedInflightStatisticsTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.management;
 
-import static org.awaitility.Awaitility.await;
-
 import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
@@ -32,6 +30,8 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
 
+import static org.awaitility.Awaitility.await;
+
 /**
  * @version
  */
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedRouteDumpStatsAsXmlAndResetWithCustomDomainTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedRouteDumpStatsAsXmlAndResetWithCustomDomainTest.java
index 86420fa..55646dd 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedRouteDumpStatsAsXmlAndResetWithCustomDomainTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedRouteDumpStatsAsXmlAndResetWithCustomDomainTest.java
@@ -19,9 +19,10 @@ package org.apache.camel.management;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
+import org.w3c.dom.Document;
+
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.Test;
-import org.w3c.dom.Document;
 
 /**
  * @version
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedRouteDumpStatsAsXmlCustomDomainTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedRouteDumpStatsAsXmlCustomDomainTest.java
index 966d3ca..7388639 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedRouteDumpStatsAsXmlCustomDomainTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedRouteDumpStatsAsXmlCustomDomainTest.java
@@ -19,9 +19,10 @@ package org.apache.camel.management;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
+import org.w3c.dom.Document;
+
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.Test;
-import org.w3c.dom.Document;
 
 /**
  * @version
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedRouteDumpStatsAsXmlTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedRouteDumpStatsAsXmlTest.java
index a36239f..6cda937 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedRouteDumpStatsAsXmlTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedRouteDumpStatsAsXmlTest.java
@@ -19,9 +19,10 @@ package org.apache.camel.management;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
+import org.w3c.dom.Document;
+
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.Test;
-import org.w3c.dom.Document;
 
 /**
  * @version
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedRouteLoadstatisticsTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedRouteLoadstatisticsTest.java
index 322f889..06358d3 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedRouteLoadstatisticsTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedRouteLoadstatisticsTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.management;
 
-import static org.awaitility.Awaitility.await;
-
 import java.util.concurrent.TimeUnit;
 
 import javax.management.MBeanServer;
@@ -26,6 +24,8 @@ import javax.management.ObjectName;
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.Test;
 
+import static org.awaitility.Awaitility.await;
+
 /**
  * @version
  */
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedRouteNoAutoStartupTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedRouteNoAutoStartupTest.java
index 97b14a5..f600876 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedRouteNoAutoStartupTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedRouteNoAutoStartupTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.management;
 
-import static org.awaitility.Awaitility.await;
-
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
@@ -29,6 +27,8 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
 
+import static org.awaitility.Awaitility.await;
+
 /**
  * Extended test to see if mbeans is removed and stats are correct
  *
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedRoutePerformanceCounterTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedRoutePerformanceCounterTest.java
index c0d1281..25b615e 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedRoutePerformanceCounterTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedRoutePerformanceCounterTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.management;
 
-import static org.awaitility.Awaitility.await;
-
 import java.util.Date;
 import java.util.concurrent.TimeUnit;
 
@@ -27,6 +25,8 @@ import javax.management.ObjectName;
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.Test;
 
+import static org.awaitility.Awaitility.await;
+
 /**
  * @version
  */
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedRouteStopAndStartCleanupTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedRouteStopAndStartCleanupTest.java
index e3ae52c..4bddf1a 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedRouteStopAndStartCleanupTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedRouteStopAndStartCleanupTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.management;
 
-import static org.awaitility.Awaitility.await;
-
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
@@ -29,6 +27,8 @@ import org.apache.camel.ServiceStatus;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
 
+import static org.awaitility.Awaitility.await;
+
 /**
  * Extended test to see if mbeans is removed and stats are correct
  *
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedStreamCachingStrategyTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedStreamCachingStrategyTest.java
index bd05397..6020d5f 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedStreamCachingStrategyTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedStreamCachingStrategyTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.management;
 
-import static org.apache.camel.util.FileUtil.normalizePath;
-
 import java.util.Set;
 
 import javax.management.MBeanServer;
@@ -29,6 +27,8 @@ import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.util.IOHelper;
 import org.junit.Test;
 
+import static org.apache.camel.util.FileUtil.normalizePath;
+
 /**
  * @version
  */
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedSuspendedServiceTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedSuspendedServiceTest.java
index c9f95da..188392f 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedSuspendedServiceTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedSuspendedServiceTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.management;
-import static org.awaitility.Awaitility.await;
-
 import java.io.File;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
@@ -32,6 +30,8 @@ import org.apache.camel.support.RoutePolicySupport;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.awaitility.Awaitility.await;
+
 /**
  * @version
  */
diff --git a/camel-core/src/test/java/org/apache/camel/processor/ChoiceAsyncTest.java b/camel-core/src/test/java/org/apache/camel/processor/ChoiceAsyncTest.java
index d39da80..c9f2c3c 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/ChoiceAsyncTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/ChoiceAsyncTest.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 package org.apache.camel.processor;
-import static org.apache.camel.component.mock.MockEndpoint.expectsMessageCount;
-
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.apache.camel.component.mock.MockEndpoint.expectsMessageCount;
+
 /**
  * @version
  */
diff --git a/camel-core/src/test/java/org/apache/camel/processor/ChoiceCompoundPredicateTest.java b/camel-core/src/test/java/org/apache/camel/processor/ChoiceCompoundPredicateTest.java
index 85c40ec..6cfeea1 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/ChoiceCompoundPredicateTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/ChoiceCompoundPredicateTest.java
@@ -16,9 +16,6 @@
  */
 package org.apache.camel.processor;
 
-import static org.apache.camel.builder.PredicateBuilder.and;
-import static org.apache.camel.builder.PredicateBuilder.or;
-
 import java.util.HashMap;
 import java.util.Map;
 
@@ -28,6 +25,9 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
 
+import static org.apache.camel.builder.PredicateBuilder.and;
+import static org.apache.camel.builder.PredicateBuilder.or;
+
 /**
  * @version
  */
diff --git a/camel-core/src/test/java/org/apache/camel/processor/ChoiceTest.java b/camel-core/src/test/java/org/apache/camel/processor/ChoiceTest.java
index 98e0942..eafa02c 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/ChoiceTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/ChoiceTest.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 package org.apache.camel.processor;
-import static org.apache.camel.component.mock.MockEndpoint.expectsMessageCount;
-
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.apache.camel.component.mock.MockEndpoint.expectsMessageCount;
+
 /**
  * @version
  */
diff --git a/camel-core/src/test/java/org/apache/camel/processor/ChoiceWhenNotPredicateTest.java b/camel-core/src/test/java/org/apache/camel/processor/ChoiceWhenNotPredicateTest.java
index 02c775d..7609c88 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/ChoiceWhenNotPredicateTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/ChoiceWhenNotPredicateTest.java
@@ -16,13 +16,13 @@
  */
 package org.apache.camel.processor;
 
-import static org.apache.camel.builder.PredicateBuilder.not;
-
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
 
+import static org.apache.camel.builder.PredicateBuilder.not;
+
 /**
  * @version
  */
diff --git a/camel-core/src/test/java/org/apache/camel/processor/CircuitBreakerLoadBalancerTest.java b/camel-core/src/test/java/org/apache/camel/processor/CircuitBreakerLoadBalancerTest.java
index 20f0c9d..4ddfa1b 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/CircuitBreakerLoadBalancerTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/CircuitBreakerLoadBalancerTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.processor;
-import static org.apache.camel.component.mock.MockEndpoint.expectsMessageCount;
-
 import java.util.concurrent.RejectedExecutionException;
 
 import org.apache.camel.ContextTestSupport;
@@ -27,6 +25,8 @@ import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.apache.camel.component.mock.MockEndpoint.expectsMessageCount;
+
 public class CircuitBreakerLoadBalancerTest extends ContextTestSupport {
 
     private static class MyCustomException extends RuntimeException {
diff --git a/camel-core/src/test/java/org/apache/camel/processor/DataFormatTest.java b/camel-core/src/test/java/org/apache/camel/processor/DataFormatTest.java
index 23175f4..7774c18 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/DataFormatTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/DataFormatTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.processor;
 
-import static org.apache.camel.util.ObjectHelper.equal;
-
 import java.io.NotSerializableException;
 import java.io.Serializable;
 
@@ -27,6 +25,8 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
 
+import static org.apache.camel.util.ObjectHelper.equal;
+
 /**
  * @version
  */
diff --git a/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelRedeliveryDelayPatternTest.java b/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelRedeliveryDelayPatternTest.java
index 5aab3c3..3ac54a8 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelRedeliveryDelayPatternTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelRedeliveryDelayPatternTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.processor;
 
-import static org.apache.camel.builder.ProcessorBuilder.throwException;
-
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
@@ -25,6 +23,8 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
 
+import static org.apache.camel.builder.ProcessorBuilder.throwException;
+
 /**
  * Unit test to verify delay pattern
  */
diff --git a/camel-core/src/test/java/org/apache/camel/processor/DefaultExchangeFormatterTest.java b/camel-core/src/test/java/org/apache/camel/processor/DefaultExchangeFormatterTest.java
index 0513c74..f5f0cc2 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/DefaultExchangeFormatterTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/DefaultExchangeFormatterTest.java
@@ -16,10 +16,6 @@
  */
 package org.apache.camel.processor;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.impl.DefaultCamelContext;
@@ -28,6 +24,10 @@ import org.apache.camel.impl.DefaultMessage;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 public class DefaultExchangeFormatterTest {
     private DefaultCamelContext camelContext;
     private Exchange exchange;
diff --git a/camel-core/src/test/java/org/apache/camel/processor/DelayerTest.java b/camel-core/src/test/java/org/apache/camel/processor/DelayerTest.java
index ac70ca8..280d467 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/DelayerTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/DelayerTest.java
@@ -16,13 +16,13 @@
  */
 package org.apache.camel.processor;
 
-import static org.apache.camel.processor.ExchangeAwareDelayCalcBean.BEAN_DELAYER_HEADER;
-
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
 
+import static org.apache.camel.processor.ExchangeAwareDelayCalcBean.BEAN_DELAYER_HEADER;
+
 /**
  * @version
  */
diff --git a/camel-core/src/test/java/org/apache/camel/processor/FailOverLoadBalanceTest.java b/camel-core/src/test/java/org/apache/camel/processor/FailOverLoadBalanceTest.java
index 95b5b19..16d116e 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/FailOverLoadBalanceTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/FailOverLoadBalanceTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.processor;
-import static org.apache.camel.component.mock.MockEndpoint.expectsMessageCount;
-
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
@@ -26,6 +24,8 @@ import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.apache.camel.component.mock.MockEndpoint.expectsMessageCount;
+
 public class FailOverLoadBalanceTest extends ContextTestSupport {
 
     protected MockEndpoint x;
diff --git a/camel-core/src/test/java/org/apache/camel/processor/FileIdempotentConsumerCreateRepoTest.java b/camel-core/src/test/java/org/apache/camel/processor/FileIdempotentConsumerCreateRepoTest.java
index 9c482eb..698f8b0 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/FileIdempotentConsumerCreateRepoTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/FileIdempotentConsumerCreateRepoTest.java
@@ -16,17 +16,18 @@
  */
 package org.apache.camel.processor;
 
-import static java.util.UUID.randomUUID;
-import static org.apache.camel.processor.idempotent.FileIdempotentRepository.fileIdempotentRepository;
-
 import java.io.File;
 
+import static java.util.UUID.randomUUID;
+
 import org.apache.camel.spi.IdempotentRepository;
 import org.apache.camel.util.FileUtil;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Test;
 
+import static org.apache.camel.processor.idempotent.FileIdempotentRepository.fileIdempotentRepository;
+
 public class FileIdempotentConsumerCreateRepoTest extends Assert {
 
     File store;
diff --git a/camel-core/src/test/java/org/apache/camel/processor/FilterNotTest.java b/camel-core/src/test/java/org/apache/camel/processor/FilterNotTest.java
index 93c80de..eb442ee 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/FilterNotTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/FilterNotTest.java
@@ -16,14 +16,14 @@
  */
 package org.apache.camel.processor;
 
-import static org.apache.camel.builder.PredicateBuilder.not;
-
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
 
+import static org.apache.camel.builder.PredicateBuilder.not;
+
 /**
  * @version
  */
diff --git a/camel-core/src/test/java/org/apache/camel/processor/LogProcessorWithProvidedLoggerTest.java b/camel-core/src/test/java/org/apache/camel/processor/LogProcessorWithProvidedLoggerTest.java
index ad0ce5b..ba161a4 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/LogProcessorWithProvidedLoggerTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/LogProcessorWithProvidedLoggerTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.processor;
 
-import static org.hamcrest.CoreMatchers.equalTo;
-
 import java.io.StringWriter;
 
 import org.apache.camel.CamelContext;
@@ -32,6 +30,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.slf4j.LoggerFactory;
 
+import static org.hamcrest.CoreMatchers.equalTo;
+
 /**
  * @version
  */
diff --git a/camel-core/src/test/java/org/apache/camel/processor/MulticastGroupedExchangeExceptionTest.java b/camel-core/src/test/java/org/apache/camel/processor/MulticastGroupedExchangeExceptionTest.java
index 20d105a..d08d2bf 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/MulticastGroupedExchangeExceptionTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/MulticastGroupedExchangeExceptionTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.processor;
 
-import static org.hamcrest.CoreMatchers.is;
-
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
@@ -26,6 +24,8 @@ import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.processor.aggregate.GroupedExchangeAggregationStrategy;
 import org.junit.Test;
 
+import static org.hamcrest.CoreMatchers.is;
+
 public class MulticastGroupedExchangeExceptionTest extends ContextTestSupport {
 
     @Test
diff --git a/camel-core/src/test/java/org/apache/camel/processor/RoundRobinLoadBalanceTest.java b/camel-core/src/test/java/org/apache/camel/processor/RoundRobinLoadBalanceTest.java
index e669bc2..13009a9 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/RoundRobinLoadBalanceTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/RoundRobinLoadBalanceTest.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 package org.apache.camel.processor;
-import static org.apache.camel.component.mock.MockEndpoint.expectsMessageCount;
-
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.apache.camel.component.mock.MockEndpoint.expectsMessageCount;
+
 public class RoundRobinLoadBalanceTest extends ContextTestSupport {
     protected MockEndpoint x;
     protected MockEndpoint y;
diff --git a/camel-core/src/test/java/org/apache/camel/processor/SagaTest.java b/camel-core/src/test/java/org/apache/camel/processor/SagaTest.java
index f5255d5..0a8ff40 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/SagaTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/SagaTest.java
@@ -16,9 +16,6 @@
  */
 package org.apache.camel.processor;
 
-import static org.awaitility.Awaitility.await;
-import static org.hamcrest.Matchers.equalTo;
-
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -35,6 +32,9 @@ import org.apache.camel.saga.CamelSagaService;
 import org.junit.Assert;
 import org.junit.Test;
 
+import static org.awaitility.Awaitility.await;
+import static org.hamcrest.Matchers.equalTo;
+
 public class SagaTest extends ContextTestSupport {
 
     private OrderManagerService orderManagerService;
diff --git a/camel-core/src/test/java/org/apache/camel/processor/ShutdownDeferTest.java b/camel-core/src/test/java/org/apache/camel/processor/ShutdownDeferTest.java
index cf2f1e8..b4c37f4 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/ShutdownDeferTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/ShutdownDeferTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.processor;
-import static org.apache.camel.ShutdownRoute.Defer;
-
 import java.io.File;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -31,6 +29,8 @@ import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.apache.camel.ShutdownRoute.Defer;
+
 /**
  * @version
  */
diff --git a/camel-core/src/test/java/org/apache/camel/processor/ShutdownNotDeferTest.java b/camel-core/src/test/java/org/apache/camel/processor/ShutdownNotDeferTest.java
index c60f3ba..2f1efff 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/ShutdownNotDeferTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/ShutdownNotDeferTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.processor;
-import static org.apache.camel.ShutdownRoute.Default;
-
 import java.io.File;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -31,6 +29,8 @@ import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.apache.camel.ShutdownRoute.Default;
+
 /**
  * @version
  */
diff --git a/camel-core/src/test/java/org/apache/camel/processor/ThreadsInvalidConfigTest.java b/camel-core/src/test/java/org/apache/camel/processor/ThreadsInvalidConfigTest.java
index d400837..83085ab 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/ThreadsInvalidConfigTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/ThreadsInvalidConfigTest.java
@@ -16,14 +16,14 @@
  */
 package org.apache.camel.processor;
 
-import static org.apache.camel.ThreadPoolRejectedPolicy.Abort;
-
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.FailedToCreateRouteException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.ThreadPoolProfile;
 import org.junit.Test;
 
+import static org.apache.camel.ThreadPoolRejectedPolicy.Abort;
+
 public class ThreadsInvalidConfigTest extends ContextTestSupport {
 
     ThreadPoolProfile threadPoolProfile = new ThreadPoolProfile("poll");
diff --git a/camel-core/src/test/java/org/apache/camel/processor/ThreadsRejectedPolicyTest.java b/camel-core/src/test/java/org/apache/camel/processor/ThreadsRejectedPolicyTest.java
index 9e1dcb3..7bee8b7 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/ThreadsRejectedPolicyTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/ThreadsRejectedPolicyTest.java
@@ -16,12 +16,12 @@
  */
 package org.apache.camel.processor;
 
-import static org.apache.camel.ThreadPoolRejectedPolicy.DiscardOldest;
-
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.Test;
 
+import static org.apache.camel.ThreadPoolRejectedPolicy.DiscardOldest;
+
 /**
  * @version
  */
diff --git a/camel-core/src/test/java/org/apache/camel/processor/ThrottlingExceptionRoutePolicyHalfOpenHandlerSedaTest.java b/camel-core/src/test/java/org/apache/camel/processor/ThrottlingExceptionRoutePolicyHalfOpenHandlerSedaTest.java
index 97bbd74..44b89c5 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/ThrottlingExceptionRoutePolicyHalfOpenHandlerSedaTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/ThrottlingExceptionRoutePolicyHalfOpenHandlerSedaTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.processor;
 
-import static org.awaitility.Awaitility.await;
-
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -35,6 +33,8 @@ import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.awaitility.Awaitility.await;
+
 public class ThrottlingExceptionRoutePolicyHalfOpenHandlerSedaTest extends ContextTestSupport {
     private static Logger log = LoggerFactory.getLogger(ThrottlingExceptionRoutePolicyHalfOpenHandlerSedaTest.class);
     
diff --git a/camel-core/src/test/java/org/apache/camel/processor/ThrottlingExceptionRoutePolicyHalfOpenHandlerTest.java b/camel-core/src/test/java/org/apache/camel/processor/ThrottlingExceptionRoutePolicyHalfOpenHandlerTest.java
index 31d19da..24e2f5f 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/ThrottlingExceptionRoutePolicyHalfOpenHandlerTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/ThrottlingExceptionRoutePolicyHalfOpenHandlerTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.processor;
 
-import static org.awaitility.Awaitility.await;
-
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -35,6 +33,8 @@ import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.awaitility.Awaitility.await;
+
 public class ThrottlingExceptionRoutePolicyHalfOpenHandlerTest extends ContextTestSupport {
     private static Logger log = LoggerFactory.getLogger(ThrottlingExceptionRoutePolicyHalfOpenHandlerTest.class);
     
diff --git a/camel-core/src/test/java/org/apache/camel/processor/ThrottlingExceptionRoutePolicyHalfOpenTest.java b/camel-core/src/test/java/org/apache/camel/processor/ThrottlingExceptionRoutePolicyHalfOpenTest.java
index 73aa102..49ff49a 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/ThrottlingExceptionRoutePolicyHalfOpenTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/ThrottlingExceptionRoutePolicyHalfOpenTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.processor;
 
-import static org.awaitility.Awaitility.await;
-
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -34,6 +32,8 @@ import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.awaitility.Awaitility.await;
+
 public class ThrottlingExceptionRoutePolicyHalfOpenTest extends ContextTestSupport {
     private static Logger log = LoggerFactory.getLogger(ThrottlingExceptionRoutePolicyHalfOpenTest.class);
     
diff --git a/camel-core/src/test/java/org/apache/camel/processor/ThrottlingExceptionRoutePolicyTest.java b/camel-core/src/test/java/org/apache/camel/processor/ThrottlingExceptionRoutePolicyTest.java
index bdb0c5b..c944576 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/ThrottlingExceptionRoutePolicyTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/ThrottlingExceptionRoutePolicyTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.processor;
 
-import static org.awaitility.Awaitility.await;
-
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -35,6 +33,8 @@ import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.awaitility.Awaitility.await;
+
 public class ThrottlingExceptionRoutePolicyTest extends ContextTestSupport {
     private static Logger log = LoggerFactory.getLogger(ThrottlingExceptionRoutePolicyTest.class);
     
diff --git a/camel-core/src/test/java/org/apache/camel/processor/ThroughPutLoggerTest.java b/camel-core/src/test/java/org/apache/camel/processor/ThroughPutLoggerTest.java
index f5cf22c..dcd0128 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/ThroughPutLoggerTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/ThroughPutLoggerTest.java
@@ -16,12 +16,6 @@
  */
 package org.apache.camel.processor;
 
-import static org.hamcrest.Matchers.startsWith;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.mockito.hamcrest.MockitoHamcrest.argThat;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.impl.DefaultExchange;
@@ -30,6 +24,12 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
 
+import static org.hamcrest.Matchers.startsWith;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.mockito.hamcrest.MockitoHamcrest.argThat;
+
 public class ThroughPutLoggerTest extends Assert {
 
     @Test
diff --git a/camel-core/src/test/java/org/apache/camel/processor/TransformXpathTest.java b/camel-core/src/test/java/org/apache/camel/processor/TransformXpathTest.java
index 47bcb5e..9fc71f6 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/TransformXpathTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/TransformXpathTest.java
@@ -18,11 +18,12 @@ package org.apache.camel.processor;
 
 import java.io.File;
 
+import org.w3c.dom.NodeList;
+
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
-import org.w3c.dom.NodeList;
 
 /**
  * Based on user forum trouble
diff --git a/camel-core/src/test/java/org/apache/camel/processor/WireTapBeanAsProcessorTest.java b/camel-core/src/test/java/org/apache/camel/processor/WireTapBeanAsProcessorTest.java
index cc218dd..b6ace5b 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/WireTapBeanAsProcessorTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/WireTapBeanAsProcessorTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.processor;
-import static org.awaitility.Awaitility.await;
-
 import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.ContextTestSupport;
@@ -28,6 +26,8 @@ import org.apache.camel.impl.JndiRegistry;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.awaitility.Awaitility.await;
+
 /**
  * Wire tap unit test
  *
diff --git a/camel-core/src/test/java/org/apache/camel/processor/WireTapShutdownBeanTest.java b/camel-core/src/test/java/org/apache/camel/processor/WireTapShutdownBeanTest.java
index 4b1cb86..879cd63 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/WireTapShutdownBeanTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/WireTapShutdownBeanTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.processor;
 
-import static org.awaitility.Awaitility.await;
-
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -28,6 +26,8 @@ import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.awaitility.Awaitility.await;
+
 /**
  * Wire tap unit test
  */
diff --git a/camel-core/src/test/java/org/apache/camel/processor/WireTapShutdownRouteTest.java b/camel-core/src/test/java/org/apache/camel/processor/WireTapShutdownRouteTest.java
index db86549..d5aebfd 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/WireTapShutdownRouteTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/WireTapShutdownRouteTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.processor;
 
-import static org.awaitility.Awaitility.await;
-
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -28,6 +26,8 @@ import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.awaitility.Awaitility.await;
+
 /**
  * Wire tap unit test
  */
diff --git a/camel-core/src/test/java/org/apache/camel/processor/WireTapUsingMulticastTest.java b/camel-core/src/test/java/org/apache/camel/processor/WireTapUsingMulticastTest.java
index 321537e..6491fe9 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/WireTapUsingMulticastTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/WireTapUsingMulticastTest.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 package org.apache.camel.processor;
-import static org.apache.camel.component.mock.MockEndpoint.expectsMessageCount;
-
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.apache.camel.component.mock.MockEndpoint.expectsMessageCount;
+
 public class WireTapUsingMulticastTest extends ContextTestSupport {
     protected MockEndpoint tap;
     protected MockEndpoint result;
diff --git a/camel-core/src/test/java/org/apache/camel/processor/WireTapVoidBeanTest.java b/camel-core/src/test/java/org/apache/camel/processor/WireTapVoidBeanTest.java
index aa775f2..ccd2f04 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/WireTapVoidBeanTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/WireTapVoidBeanTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.processor;
 
-import static org.awaitility.Awaitility.await;
-
 import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.ContextTestSupport;
@@ -27,6 +25,8 @@ import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.awaitility.Awaitility.await;
+
 /**
  * Wire tap unit test
  */
diff --git a/camel-core/src/test/java/org/apache/camel/processor/XPathChoiceTest.java b/camel-core/src/test/java/org/apache/camel/processor/XPathChoiceTest.java
index 5dcd551..1f2e5b3 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/XPathChoiceTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/XPathChoiceTest.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 package org.apache.camel.processor;
-import static org.apache.camel.component.mock.MockEndpoint.expectsMessageCount;
-
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.apache.camel.component.mock.MockEndpoint.expectsMessageCount;
+
 /**
  * @version
  */
diff --git a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateNewExchangeAndConfirmTest.java b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateNewExchangeAndConfirmTest.java
index 026360f..17c2472 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateNewExchangeAndConfirmTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateNewExchangeAndConfirmTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.processor.aggregator;
 
-import static org.awaitility.Awaitility.await;
-
 import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.CamelContext;
@@ -29,6 +27,8 @@ import org.apache.camel.processor.aggregate.AggregationStrategy;
 import org.apache.camel.processor.aggregate.MemoryAggregationRepository;
 import org.junit.Test;
 
+import static org.awaitility.Awaitility.await;
+
 /**
  * Testing CAMEL-3139
  *
diff --git a/camel-core/src/test/java/org/apache/camel/processor/aggregator/DistributedTimeoutTest.java b/camel-core/src/test/java/org/apache/camel/processor/aggregator/DistributedTimeoutTest.java
index 27e1a42..a8fc2df 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/aggregator/DistributedTimeoutTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/aggregator/DistributedTimeoutTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.processor.aggregator;
 
-import static org.awaitility.Awaitility.await;
-
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -28,6 +26,8 @@ import org.apache.camel.processor.aggregate.MemoryAggregationRepository;
 import org.apache.camel.processor.aggregate.TimeoutAwareAggregationStrategy;
 import org.junit.Test;
 
+import static org.awaitility.Awaitility.await;
+
 /**
  * @version
  */
diff --git a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointCustomRoutePolicyTest.java b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointCustomRoutePolicyTest.java
index 487a0c7..2078fe3 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointCustomRoutePolicyTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointCustomRoutePolicyTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.processor.async;
 
-import static org.awaitility.Awaitility.await;
-
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -30,6 +28,8 @@ import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.support.RoutePolicySupport;
 import org.junit.Test;
 
+import static org.awaitility.Awaitility.await;
+
 /**
  * @version
  */
diff --git a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncMDCTest.java b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncMDCTest.java
index ba4eb8b..d12e99f 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncMDCTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncMDCTest.java
@@ -16,11 +16,6 @@
  */
 package org.apache.camel.processor.async;
 
-import static org.apache.camel.impl.MDCUnitOfWork.MDC_BREADCRUMB_ID;
-import static org.apache.camel.impl.MDCUnitOfWork.MDC_CAMEL_CONTEXT_ID;
-import static org.apache.camel.impl.MDCUnitOfWork.MDC_EXCHANGE_ID;
-import static org.apache.camel.impl.MDCUnitOfWork.MDC_ROUTE_ID;
-
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
@@ -29,6 +24,11 @@ import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
 import org.slf4j.MDC;
 
+import static org.apache.camel.impl.MDCUnitOfWork.MDC_BREADCRUMB_ID;
+import static org.apache.camel.impl.MDCUnitOfWork.MDC_CAMEL_CONTEXT_ID;
+import static org.apache.camel.impl.MDCUnitOfWork.MDC_EXCHANGE_ID;
+import static org.apache.camel.impl.MDCUnitOfWork.MDC_ROUTE_ID;
+
 /**
  * @version
  */
diff --git a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncProcessorAwaitManagerInterruptWithRedeliveryTest.java b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncProcessorAwaitManagerInterruptWithRedeliveryTest.java
index 8c7dfd4..c1b5ec9 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncProcessorAwaitManagerInterruptWithRedeliveryTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncProcessorAwaitManagerInterruptWithRedeliveryTest.java
@@ -15,10 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.processor.async;
-import static org.mockito.Mockito.atMost;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
 import java.util.Collection;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.RejectedExecutionException;
@@ -34,6 +30,10 @@ import org.apache.camel.util.jndi.JndiContext;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.mockito.Mockito.atMost;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
 public class AsyncProcessorAwaitManagerInterruptWithRedeliveryTest extends ContextTestSupport {
     private CountDownLatch latch;
     private MyBean bean;
diff --git a/camel-core/src/test/java/org/apache/camel/processor/idempotent/FileIdempotentStoreOrderingTest.java b/camel-core/src/test/java/org/apache/camel/processor/idempotent/FileIdempotentStoreOrderingTest.java
index 3b37f9a..da7d572 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/idempotent/FileIdempotentStoreOrderingTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/idempotent/FileIdempotentStoreOrderingTest.java
@@ -16,9 +16,6 @@
  */
 package org.apache.camel.processor.idempotent;
 
-import static org.apache.camel.TestSupport.createDirectory;
-import static org.apache.camel.TestSupport.deleteDirectory;
-
 import java.io.File;
 import java.nio.file.Files;
 import java.util.Arrays;
@@ -31,6 +28,9 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.apache.camel.TestSupport.createDirectory;
+import static org.apache.camel.TestSupport.deleteDirectory;
+
 public class FileIdempotentStoreOrderingTest {
 
     private FileIdempotentRepository fileIdempotentRepository;
diff --git a/camel-core/src/test/java/org/apache/camel/processor/onexception/ContextScopedOnExceptionLoadBalancerStopRouteTest.java b/camel-core/src/test/java/org/apache/camel/processor/onexception/ContextScopedOnExceptionLoadBalancerStopRouteTest.java
index aea9fcd..477d4a2 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/onexception/ContextScopedOnExceptionLoadBalancerStopRouteTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/onexception/ContextScopedOnExceptionLoadBalancerStopRouteTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.processor.onexception;
 
-import static org.awaitility.Awaitility.await;
-
 import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.ContextTestSupport;
@@ -26,6 +24,8 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.seda.SedaEndpoint;
 import org.junit.Test;
 
+import static org.awaitility.Awaitility.await;
+
 public class ContextScopedOnExceptionLoadBalancerStopRouteTest extends ContextTestSupport {
 
     @Test
diff --git a/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionWrappedExceptionTest.java b/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionWrappedExceptionTest.java
index 171c53f..31fc1c5 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionWrappedExceptionTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionWrappedExceptionTest.java
@@ -16,14 +16,14 @@
  */
 package org.apache.camel.processor.onexception;
 
-import static org.apache.camel.util.ObjectHelper.wrapRuntimeCamelException;
-
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.support.TypeConverterSupport;
 import org.junit.Test;
 
+import static org.apache.camel.util.ObjectHelper.wrapRuntimeCamelException;
+
 /**
  * Unit test to test that onException handles wrapped exceptions
  */
diff --git a/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerEngineTest.java b/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerEngineTest.java
index 2c6adcc..67c09f7 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerEngineTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerEngineTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.processor.resequencer;
-import static org.awaitility.Awaitility.await;
-
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Random;
@@ -27,6 +25,8 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.awaitility.Awaitility.await;
+
 public class ResequencerEngineTest extends TestSupport {
 
     private static final boolean IGNORE_LOAD_TESTS = Boolean.parseBoolean(System.getProperty("ignore.load.tests", "true"));
diff --git a/camel-core/src/test/java/org/apache/camel/processor/validation/CatalogLSResourceResolver.java b/camel-core/src/test/java/org/apache/camel/processor/validation/CatalogLSResourceResolver.java
index dc41ee4..39b639c 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/validation/CatalogLSResourceResolver.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/validation/CatalogLSResourceResolver.java
@@ -19,11 +19,13 @@ package org.apache.camel.processor.validation;
 import java.io.InputStream;
 import java.io.Reader;
 
-import org.apache.xml.resolver.tools.CatalogResolver;
 import org.w3c.dom.ls.LSInput;
 import org.w3c.dom.ls.LSResourceResolver;
+
 import org.xml.sax.InputSource;
 
+import org.apache.xml.resolver.tools.CatalogResolver;
+
 public class CatalogLSResourceResolver implements LSResourceResolver {
 
     CatalogResolver catalogResolver;
diff --git a/camel-core/src/test/java/org/apache/camel/processor/validation/DefaultValidationErrorHandlerTest.java b/camel-core/src/test/java/org/apache/camel/processor/validation/DefaultValidationErrorHandlerTest.java
index 6039dbe..079213e 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/validation/DefaultValidationErrorHandlerTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/validation/DefaultValidationErrorHandlerTest.java
@@ -21,12 +21,13 @@ import javax.xml.validation.Schema;
 import javax.xml.validation.Validator;
 import javax.xml.validation.ValidatorHandler;
 
+import org.xml.sax.Locator;
+import org.xml.sax.SAXParseException;
+
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.DefaultExchange;
 import org.junit.Test;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXParseException;
 
 /**
  * @version
diff --git a/camel-core/src/test/java/org/apache/camel/runtimecatalog/AbstractCamelCatalogTest.java b/camel-core/src/test/java/org/apache/camel/runtimecatalog/AbstractCamelCatalogTest.java
index f00a8df..cdd9cf7 100644
--- a/camel-core/src/test/java/org/apache/camel/runtimecatalog/AbstractCamelCatalogTest.java
+++ b/camel-core/src/test/java/org/apache/camel/runtimecatalog/AbstractCamelCatalogTest.java
@@ -16,10 +16,6 @@
  */
 package org.apache.camel.runtimecatalog;
 
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
 import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
@@ -27,6 +23,10 @@ import java.util.Map;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 public class AbstractCamelCatalogTest {
 
     AbstractCamelCatalog catalog = new AbstractCamelCatalog() {
diff --git a/camel-core/src/test/java/org/apache/camel/runtimecatalog/RuntimeCamelCatalogTest.java b/camel-core/src/test/java/org/apache/camel/runtimecatalog/RuntimeCamelCatalogTest.java
index cca1506..cf66796 100644
--- a/camel-core/src/test/java/org/apache/camel/runtimecatalog/RuntimeCamelCatalogTest.java
+++ b/camel-core/src/test/java/org/apache/camel/runtimecatalog/RuntimeCamelCatalogTest.java
@@ -15,11 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.runtimecatalog;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
 import java.util.HashMap;
 import java.util.Map;
 
@@ -29,6 +24,11 @@ import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 public class RuntimeCamelCatalogTest {
 
     static RuntimeCamelCatalog catalog;
diff --git a/camel-core/src/test/java/org/apache/camel/support/DefaultTimeoutMapTest.java b/camel-core/src/test/java/org/apache/camel/support/DefaultTimeoutMapTest.java
index 9a0f998..d33573d 100644
--- a/camel-core/src/test/java/org/apache/camel/support/DefaultTimeoutMapTest.java
+++ b/camel-core/src/test/java/org/apache/camel/support/DefaultTimeoutMapTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.support;
 
-import static org.awaitility.Awaitility.await;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Executors;
@@ -30,6 +28,8 @@ import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.awaitility.Awaitility.await;
+
 /**
  * @version
  */
diff --git a/camel-core/src/test/java/org/apache/camel/support/XMLTokenExpressionIteratorTest.java b/camel-core/src/test/java/org/apache/camel/support/XMLTokenExpressionIteratorTest.java
index 3a330c7..fbcb5fc 100644
--- a/camel-core/src/test/java/org/apache/camel/support/XMLTokenExpressionIteratorTest.java
+++ b/camel-core/src/test/java/org/apache/camel/support/XMLTokenExpressionIteratorTest.java
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 package org.apache.camel.support;
-import static org.apache.camel.TestSupport.getJavaMajorVersion;
-
 import java.io.ByteArrayInputStream;
 import java.io.Closeable;
 import java.io.InputStream;
@@ -30,6 +28,8 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.apache.camel.TestSupport.getJavaMajorVersion;
+
 /**
  *
  */
diff --git a/camel-core/src/test/java/org/apache/camel/util/CamelVersionHelperTest.java b/camel-core/src/test/java/org/apache/camel/util/CamelVersionHelperTest.java
index e607434..ed8a193 100644
--- a/camel-core/src/test/java/org/apache/camel/util/CamelVersionHelperTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/CamelVersionHelperTest.java
@@ -16,11 +16,11 @@
  */
 package org.apache.camel.util;
 
-import static org.apache.camel.util.CamelVersionHelper.isGE;
-
 import org.junit.Assert;
 import org.junit.Test;
 
+import static org.apache.camel.util.CamelVersionHelper.isGE;
+
 public class CamelVersionHelperTest extends Assert {
 
     @Test
diff --git a/camel-core/src/test/java/org/apache/camel/util/CreateModelFromXmlTest.java b/camel-core/src/test/java/org/apache/camel/util/CreateModelFromXmlTest.java
index b98ace5..5bc819e 100644
--- a/camel-core/src/test/java/org/apache/camel/util/CreateModelFromXmlTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/CreateModelFromXmlTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.util;
 
-import static org.apache.camel.model.ProcessorDefinitionHelper.filterTypeInOutputs;
-
 import java.io.InputStream;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -33,6 +31,8 @@ import org.apache.camel.model.language.ExpressionDefinition;
 import org.apache.camel.spi.NamespaceAware;
 import org.junit.Test;
 
+import static org.apache.camel.model.ProcessorDefinitionHelper.filterTypeInOutputs;
+
 public class CreateModelFromXmlTest extends ContextTestSupport {
 
     public static final String NS_CAMEL = "http://camel.apache.org/schema/spring";
diff --git a/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlNamespaceTest.java b/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlNamespaceTest.java
index f17c940..3d51f20 100644
--- a/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlNamespaceTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlNamespaceTest.java
@@ -16,12 +16,13 @@
  */
 package org.apache.camel.util;
 
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.model.ModelHelper;
 import org.junit.Test;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
 
 public class DumpModelAsXmlNamespaceTest extends ContextTestSupport {
 
diff --git a/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlSplitBodyRouteTest.java b/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlSplitBodyRouteTest.java
index cbc961b..15f0531 100644
--- a/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlSplitBodyRouteTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlSplitBodyRouteTest.java
@@ -16,14 +16,15 @@
  */
 package org.apache.camel.util;
 
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.converter.jaxp.XmlConverter;
 import org.apache.camel.model.ModelHelper;
 import org.junit.Test;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
 
 /**
  *
diff --git a/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlSplitNestedChoiceEndRouteTest.java b/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlSplitNestedChoiceEndRouteTest.java
index f5988fe..2bd1239 100644
--- a/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlSplitNestedChoiceEndRouteTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlSplitNestedChoiceEndRouteTest.java
@@ -16,14 +16,15 @@
  */
 package org.apache.camel.util;
 
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.converter.jaxp.XmlConverter;
 import org.apache.camel.model.ModelHelper;
 import org.junit.Test;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
 
 /**
  *
diff --git a/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlTransformRouteConstantTest.java b/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlTransformRouteConstantTest.java
index 664ca3e..39d2a5f 100644
--- a/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlTransformRouteConstantTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlTransformRouteConstantTest.java
@@ -16,14 +16,15 @@
  */
 package org.apache.camel.util;
 
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.converter.jaxp.XmlConverter;
 import org.apache.camel.model.ModelHelper;
 import org.junit.Test;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
 
 /**
  *
diff --git a/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlTransformRouteLanguageTest.java b/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlTransformRouteLanguageTest.java
index 8b09ff7..427528f 100644
--- a/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlTransformRouteLanguageTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlTransformRouteLanguageTest.java
@@ -16,14 +16,15 @@
  */
 package org.apache.camel.util;
 
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.converter.jaxp.XmlConverter;
 import org.apache.camel.model.ModelHelper;
 import org.junit.Test;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
 
 /**
  *
diff --git a/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlTransformRouteTest.java b/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlTransformRouteTest.java
index 9444289..41379d5 100644
--- a/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlTransformRouteTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlTransformRouteTest.java
@@ -16,14 +16,15 @@
  */
 package org.apache.camel.util;
 
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.converter.jaxp.XmlConverter;
 import org.apache.camel.model.ModelHelper;
 import org.junit.Test;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
 
 /**
  *
diff --git a/camel-core/src/test/java/org/apache/camel/util/EventHelperTest.java b/camel-core/src/test/java/org/apache/camel/util/EventHelperTest.java
index 41992ab..113b4fa 100644
--- a/camel-core/src/test/java/org/apache/camel/util/EventHelperTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/EventHelperTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.util;
 
-import static org.junit.Assert.assertEquals;
-
 import java.util.EventObject;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -30,6 +28,8 @@ import org.apache.camel.management.event.RouteStoppedEvent;
 import org.apache.camel.support.EventNotifierSupport;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+
 public class EventHelperTest {
     
     @Test
diff --git a/camel-core/src/test/java/org/apache/camel/util/GZIPHelperTest.java b/camel-core/src/test/java/org/apache/camel/util/GZIPHelperTest.java
index 0d89f34..f2894ed 100644
--- a/camel-core/src/test/java/org/apache/camel/util/GZIPHelperTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/GZIPHelperTest.java
@@ -16,12 +16,6 @@
  */
 package org.apache.camel.util;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -32,6 +26,12 @@ import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.impl.DefaultMessage;
 import org.junit.Test;
 
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 public class GZIPHelperTest {
 
     private static byte[] sampleBytes = new byte[]{1, 2, 3, 1, 2, 3};
diff --git a/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java b/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java
index a9a7753..ba7ec1a 100644
--- a/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java
@@ -29,6 +29,9 @@ import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Properties;
 
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
@@ -41,8 +44,6 @@ import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.impl.DefaultMessage;
 import org.junit.Assert;
 import org.junit.Test;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
 
 /**
  * @version
diff --git a/camel-core/src/test/java/org/apache/camel/util/PlatformHelperTest.java b/camel-core/src/test/java/org/apache/camel/util/PlatformHelperTest.java
index 6c3116a..d70cec5 100644
--- a/camel-core/src/test/java/org/apache/camel/util/PlatformHelperTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/PlatformHelperTest.java
@@ -16,12 +16,12 @@
  */
 package org.apache.camel.util;
 
-import static org.apache.camel.util.PlatformHelper.isOsgiContext;
-
 import org.apache.camel.impl.DefaultCamelContext;
 import org.junit.Assert;
 import org.junit.Test;
 
+import static org.apache.camel.util.PlatformHelper.isOsgiContext;
+
 public class PlatformHelperTest extends Assert {
 
     @Test
diff --git a/camel-core/src/test/java/org/apache/camel/util/PredicateAssertHelperTest.java b/camel-core/src/test/java/org/apache/camel/util/PredicateAssertHelperTest.java
index ffa6c3b..5d52181 100644
--- a/camel-core/src/test/java/org/apache/camel/util/PredicateAssertHelperTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/PredicateAssertHelperTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.util;
 
-import static org.apache.camel.builder.Builder.constant;
-
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.Predicate;
@@ -25,6 +23,8 @@ import org.apache.camel.builder.PredicateBuilder;
 import org.apache.camel.impl.DefaultExchange;
 import org.junit.Test;
 
+import static org.apache.camel.builder.Builder.constant;
+
 /**
  * @version
  */
diff --git a/camel-core/src/test/java/org/apache/camel/util/UnitUtilsTest.java b/camel-core/src/test/java/org/apache/camel/util/UnitUtilsTest.java
index 5100c13..be88c42 100644
--- a/camel-core/src/test/java/org/apache/camel/util/UnitUtilsTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/UnitUtilsTest.java
@@ -16,13 +16,13 @@
  */
 package org.apache.camel.util;
 
-import static org.apache.camel.util.UnitUtils.printUnitFromBytes;
-
 import java.text.DecimalFormatSymbols;
 
 import org.junit.Assert;
 import org.junit.Test;
 
+import static org.apache.camel.util.UnitUtils.printUnitFromBytes;
+
 public class UnitUtilsTest extends Assert {
 
     @Test
diff --git a/camel-core/src/test/java/org/apache/camel/util/XmlLineNumberParserTest.java b/camel-core/src/test/java/org/apache/camel/util/XmlLineNumberParserTest.java
index 36b8206..43e24b0 100644
--- a/camel-core/src/test/java/org/apache/camel/util/XmlLineNumberParserTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/XmlLineNumberParserTest.java
@@ -20,12 +20,13 @@ import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 
-import org.junit.Assert;
-import org.junit.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
+import org.junit.Assert;
+import org.junit.Test;
+
 public class XmlLineNumberParserTest extends Assert {
 
     @Test
diff --git a/camel-core/src/test/java/org/apache/camel/util/component/ApiMethodHelperTest.java b/camel-core/src/test/java/org/apache/camel/util/component/ApiMethodHelperTest.java
index 35958a8..a6f9dfc 100644
--- a/camel-core/src/test/java/org/apache/camel/util/component/ApiMethodHelperTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/component/ApiMethodHelperTest.java
@@ -16,11 +16,6 @@
  */
 package org.apache.camel.util.component;
 
-import static org.apache.camel.util.component.ApiMethodArg.arg;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.Collections;
@@ -31,6 +26,11 @@ import java.util.Map;
 
 import org.junit.Test;
 
+import static org.apache.camel.util.component.ApiMethodArg.arg;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 public class ApiMethodHelperTest {
 
     private static TestMethod[] sayHis = new TestMethod[] {TestMethod.SAYHI, TestMethod.SAYHI_1};
diff --git a/camel-core/src/test/java/org/apache/camel/util/component/ApiMethodPropertiesHelperTest.java b/camel-core/src/test/java/org/apache/camel/util/component/ApiMethodPropertiesHelperTest.java
index 3b8445f..e293b31 100644
--- a/camel-core/src/test/java/org/apache/camel/util/component/ApiMethodPropertiesHelperTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/component/ApiMethodPropertiesHelperTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.util.component;
 
-import static org.junit.Assert.assertEquals;
-
 import java.util.HashMap;
 
 import org.apache.camel.CamelContext;
@@ -26,6 +24,8 @@ import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.impl.DefaultExchange;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+
 public class ApiMethodPropertiesHelperTest {
 
     private static final String TEST_PREFIX = "CamelTest.";
diff --git a/camel-core/src/test/java/org/apache/camel/util/component/ArgumentSubstitutionParserTest.java b/camel-core/src/test/java/org/apache/camel/util/component/ArgumentSubstitutionParserTest.java
index 9443454..092ef08 100644
--- a/camel-core/src/test/java/org/apache/camel/util/component/ArgumentSubstitutionParserTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/component/ArgumentSubstitutionParserTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.util.component;
 
-import static org.junit.Assert.assertEquals;
-
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -25,6 +23,8 @@ import java.util.List;
 import org.apache.camel.util.component.ArgumentSubstitutionParser.Substitution;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+
 public class ArgumentSubstitutionParserTest {
 
     private static final String PERSON = "person";
diff --git a/camel-core/src/test/java/org/apache/camel/util/toolbox/FlexibleAggregationStrategiesTest.java b/camel-core/src/test/java/org/apache/camel/util/toolbox/FlexibleAggregationStrategiesTest.java
index c99c328..789d458 100644
--- a/camel-core/src/test/java/org/apache/camel/util/toolbox/FlexibleAggregationStrategiesTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/toolbox/FlexibleAggregationStrategiesTest.java
@@ -25,6 +25,8 @@ import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
+import org.w3c.dom.Node;
+
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.LoggingLevel;
@@ -34,7 +36,6 @@ import org.apache.camel.processor.aggregate.AggregationStrategy;
 import org.apache.camel.util.toolbox.FlexibleAggregationStrategy.CompletionAwareMixin;
 import org.apache.camel.util.toolbox.FlexibleAggregationStrategy.TimeoutAwareMixin;
 import org.junit.Test;
-import org.w3c.dom.Node;
 
 /**
  * Unit tests for the {@link FlexibleAggregationStrategy}.