You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by zr...@apache.org on 2019/11/15 12:18:17 UTC

[camel] branch CAMEL-14180 updated (dd8c516 -> 7ed676d)

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

zregvart pushed a change to branch CAMEL-14180
in repository https://gitbox.apache.org/repos/asf/camel.git.


    omit dd8c516  CAMEL-14180: use latest buildtools
    omit d784ba4  CAMEL-14180: Fix Checkstyle issues
    omit c06ba2d  CAMEL-14180: Upgrade Checkstyle
     add c679f91  Camel-VM: Fix link for SEDA
     add 4a512f2  Camel-VM: Regen docs
     add 5fd1c75  Camel-Disruptor: Fix link for SEDA
     add 871e5ed  Camel-Disruptor: Fixed link for SEDA
     add 9481876  CAMEL-14182: Make Hystrix EIP general as Circuit Breaker EIP and allow to plugin other implementations (#3342)
     add 35902ab  Upgrade Braintree to version 2.106.0
     new fea6f45  CAMEL-14180: use latest buildtools
     new 2bf8a26  CAMEL-14180: Upgrade Checkstyle
     new 7ed676d  CAMEL-14180: Fix Checkstyle issues

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (dd8c516)
            \
             N -- N -- N   refs/heads/CAMEL-14180 (7ed676d)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../resources/camel-checkstyle-suppressions.xml    |   7 +-
 .../src/main/docs/disruptor-component.adoc         |   2 +-
 .../hystrix/processor/HystrixProcessorFactory.java |   8 +-
 .../hystrix/processor/HystrixReifier.java          |  10 +-
 ...{HystrixDefinition => CircuitBreakerDefinition} |   0
 .../processor/HystrixBadRequestExceptionTest.java  |   2 +-
 .../hystrix/processor/HystrixCircuitOpenTest.java  |  38 +++----
 .../processor/HystrixHierarchicalConfigTest.java   |  20 ++--
 .../processor/HystrixInheritErrorHandlerTest.java  |   2 +-
 .../hystrix/processor/HystrixManagementTest.java   |   6 +-
 .../HystrixRouteConfigMaximumSizeTest.java         |  18 ++--
 .../hystrix/processor/HystrixRouteConfigTest.java  |  15 ++-
 .../processor/HystrixRouteFallbackTest.java        |   2 +-
 .../HystrixRouteFallbackViaNetworkTest.java        |   2 +-
 .../hystrix/processor/HystrixRouteOkTest.java      |   2 +-
 .../hystrix/processor/HystrixTimeoutTest.java      |   2 +-
 .../processor/HystrixTimeoutWithFallbackTest.java  |   2 +-
 .../SpringHystrixRouteHierarchicalConfigTest.java  |  14 +--
 .../BlueprintHystrixRouteFallbackTest.xml          |   4 +-
 .../processor/BlueprintHystrixRouteOkTest.xml      |   4 +-
 .../SpringHystrixRouteConfigMaximumSizeTest.xml    |   4 +-
 .../processor/SpringHystrixRouteConfigRefTest.xml  |   4 +-
 .../processor/SpringHystrixRouteConfigTest.xml     |   4 +-
 .../processor/SpringHystrixRouteFallbackTest.xml   |   4 +-
 .../SpringHystrixRouteHierarchicalConfigTest.xml   |   4 +-
 .../hystrix/processor/SpringHystrixRouteOkTest.xml |   4 +-
 .../pulsar/PulsarProducerHeadersInTest.java        |   1 +
 .../camel-vm/src/main/docs/vm-component.adoc       |   2 +-
 .../saxon/SaxonXmlSourceHandlerFactoryImpl.java    |   8 +-
 .../xslt/saxon/XsltSaxonAggregationStrategy.java   |   3 +-
 .../component/xslt/saxon/XsltSaxonEndpoint.java    |   1 +
 .../component/xslt/saxon/XsltSaxonHelper.java      |   1 +
 .../component/xslt/saxon/SAXSourceLogBodyTest.java |   8 +-
 .../camel/component/xslt/saxon/XsltSaxonTest.java  |   3 +-
 .../camel/impl/engine/DefaultProcessorFactory.java |  13 ++-
 .../src/main/docs/eips/hystrix-eip.adoc            | 115 ++++++++++++++-------
 .../src/main/docs/eips/onFallback-eip.adoc         |  17 +--
 ...finition.java => CircuitBreakerDefinition.java} |  75 +++++---------
 .../model/HystrixConfigurationDefinition.java      |   6 +-
 .../apache/camel/model/ProcessorDefinition.java    |  20 ++--
 ...trixReifier.java => CircuitBreakerReifier.java} |  10 +-
 .../org/apache/camel/reifier/ProcessorReifier.java |  16 ++-
 .../camel/main/MainConfigurationProperties.java    |   2 +-
 .../modules/ROOT/pages/disruptor-component.adoc    |   2 +-
 .../modules/ROOT/pages/vm-component.adoc           |   2 +-
 .../ROOT/pages/camel-3-migration-guide.adoc        |   8 ++
 .../modules/ROOT/pages/hystrix-eip.adoc            | 115 ++++++++++++++-------
 .../modules/ROOT/pages/onFallback-eip.adoc         |  17 +--
 .../src/main/java/sample/camel/ClientRoute.java    |   2 +-
 parent/pom.xml                                     |   2 +-
 .../HystrixHierarchicalConfiguration.java          |   5 +-
 .../HystrixHierarchicalConfigurationTest.java      |  12 +--
 .../processor/HystrixMultiConfiguration.java       |   9 +-
 .../org/apache/camel/itest/CamelHystrixTest.xml    |   4 +-
 54 files changed, 373 insertions(+), 290 deletions(-)
 rename components/camel-hystrix/src/main/resources/META-INF/services/org/apache/camel/model/{HystrixDefinition => CircuitBreakerDefinition} (100%)
 rename core/camel-core-engine/src/main/java/org/apache/camel/model/{HystrixDefinition.java => CircuitBreakerDefinition.java} (70%)
 rename core/camel-core-engine/src/main/java/org/apache/camel/reifier/{HystrixReifier.java => CircuitBreakerReifier.java} (77%)


[camel] 02/03: CAMEL-14180: Upgrade Checkstyle

Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

zregvart pushed a commit to branch CAMEL-14180
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 2bf8a26782f5461993a101a8eeccac334ae5d9a8
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Fri Nov 15 12:53:06 2019 +0100

    CAMEL-14180: Upgrade Checkstyle
    
    Upgrades Checkstyle to 8.26 and Checkstyle Maven plugin to 3.1.0.
---
 .../resources/camel-checkstyle-suppressions.xml    | 31 ++++++++++++++++++++--
 .../src/main/resources/camel-checkstyle.xml        | 31 +++++++++++-----------
 parent/pom.xml                                     |  4 +--
 platforms/spring-boot/spring-boot-dm/pom.xml       |  4 +--
 4 files changed, 49 insertions(+), 21 deletions(-)

diff --git a/buildingtools/src/main/resources/camel-checkstyle-suppressions.xml b/buildingtools/src/main/resources/camel-checkstyle-suppressions.xml
index 2ed9cfc..c8d7d69 100644
--- a/buildingtools/src/main/resources/camel-checkstyle-suppressions.xml
+++ b/buildingtools/src/main/resources/camel-checkstyle-suppressions.xml
@@ -25,12 +25,39 @@
               files=".+[\\\/]generated[\\\/].+\.java"
               />
     <suppress checks=".*"
+              files=".*/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/.*"
+              />
+    <suppress checks=".*"
+              files=".*/platforms/spring-boot/components-starter/camel-.+-starter/src/main/java/org/apache/camel/.*"
+              />
+    <suppress checks=".*"
               files=".+[\\\/]build[\\\/]src[\\\/].+\.java"
               />
     <suppress checks=".*"
               files=".+[\\\/]target[\\\/].+\.java"
-              />              
+              />
     <suppress checks=".*"
               files=".+[\\\/]contrib[\\\/].+\.java"
               />
-</suppressions>
\ No newline at end of file
+    <suppress checks="LineLength"
+              files=".*/features.xml"
+              />
+    <suppress checks="LineLength"
+              files=".*/main/resources/.*camel-context.xml"
+              />
+    <suppress checks="LineLength"
+              files=".*/test/resources/.*.xml"
+              />
+    <suppress checks="LineLength"
+              files=".*/test/resources/.*.properties"
+              />
+    <suppress checks="LineLength"
+              files=".*/resources/application.properties"
+              />
+    <suppress checks="LineLength"
+              files=".*/resources/example.properties"
+              />
+    <suppress checks="LineLength"
+              files=".*/resources/.*request.xml"
+              />
+</suppressions>
diff --git a/buildingtools/src/main/resources/camel-checkstyle.xml b/buildingtools/src/main/resources/camel-checkstyle.xml
index a546824..ed1361a 100644
--- a/buildingtools/src/main/resources/camel-checkstyle.xml
+++ b/buildingtools/src/main/resources/camel-checkstyle.xml
@@ -91,10 +91,11 @@ lengths, if/try depths, etc...
 	</module>
 	 -->
 
-    <module name="TreeWalker">
-        <!-- Enable FileContentsHolder to allow us to in turn turn on suppression comments -->
-        <module name="FileContentsHolder" />
+    <module name="LineLength">
+        <property name="max" value="250"/>
+    </module>
 
+    <module name="TreeWalker">
         <!-- Checks for Javadoc comments.                     -->
         <!-- See http://checkstyle.sf.net/config_javadoc.html -->
         <!--
@@ -138,6 +139,9 @@ lengths, if/try depths, etc...
         <module name="ImportOrder">
             <property name="groups" value="java,javax,org.w3c,org.xml,junit"/>
             <property name="ordered" value="true"/>
+            <property name="option" value="bottom"/>
+            <property name="separated" value="true"/>
+            <property name="separatedStaticGroups" value="true"/>
         </module>
         <!--
         <module name="ImportControl">
@@ -153,9 +157,6 @@ lengths, if/try depths, etc...
         <module name="ExecutableStatementCount">
             <property name="max" value="180"/>
         </module>
-        <module name="LineLength">
-            <property name="max" value="250"/>
-        </module>
         <module name="MethodLength">
             <property name="max" value="250"/>
             <property name="countEmpty" value="false"/>
@@ -366,14 +367,14 @@ lengths, if/try depths, etc...
             <property name="caseIndent" value="0"/>
         </module>
         <!--<module name="RequiredRegexp">-->
-    </module>
-    <module name="SuppressionCommentFilter">
-        <property name="offCommentFormat" value="CHECKSTYLE\:OFF"/>
-        <property name="onCommentFormat" value="CHECKSTYLE\:ON"/>
-    </module>
-    <module name="SuppressionCommentFilter">
-        <property name="offCommentFormat" value="CHECKSTYLE.OFF\:([\w\|]+)"/>
-        <property name="onCommentFormat" value="CHECKSTYLE.ON\:([\w\|]+)"/>
-        <property name="checkFormat" value="$1"/>
+        <module name="SuppressionCommentFilter">
+            <property name="offCommentFormat" value="CHECKSTYLE\:OFF"/>
+            <property name="onCommentFormat" value="CHECKSTYLE\:ON"/>
+        </module>
+        <module name="SuppressionCommentFilter">
+            <property name="offCommentFormat" value="CHECKSTYLE.OFF\:([\w\|]+)"/>
+            <property name="onCommentFormat" value="CHECKSTYLE.ON\:([\w\|]+)"/>
+            <property name="checkFormat" value="$1"/>
+        </module>
     </module>
 </module>
diff --git a/parent/pom.xml b/parent/pom.xml
index 6e2040d..ac85ad9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -434,8 +434,8 @@
         <maven-archetype-packaging-version>2.3</maven-archetype-packaging-version>
         <maven-assembly-plugin-version>3.0.0</maven-assembly-plugin-version>
         <maven-bundle-plugin-version>4.2.1</maven-bundle-plugin-version>
-        <maven-checkstyle-plugin-version>3.0.0</maven-checkstyle-plugin-version>
-        <maven-checkstyle-version>7.6.1</maven-checkstyle-version>
+        <maven-checkstyle-plugin-version>3.1.0</maven-checkstyle-plugin-version>
+        <maven-checkstyle-version>8.26</maven-checkstyle-version>
         <maven-owasp-plugin-version>5.2.4</maven-owasp-plugin-version>
         <maven-jar-plugin-version>3.1.2</maven-jar-plugin-version>
         <maven-javadoc-plugin-version>3.0.1</maven-javadoc-plugin-version>
diff --git a/platforms/spring-boot/spring-boot-dm/pom.xml b/platforms/spring-boot/spring-boot-dm/pom.xml
index 6a3a813..6dfaa6b 100644
--- a/platforms/spring-boot/spring-boot-dm/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/pom.xml
@@ -63,8 +63,8 @@
         <grpc-guava-version>26.0-android</grpc-guava-version>
 
         <!-- Plugin versions -->
-        <maven-checkstyle-plugin-version>3.0.0</maven-checkstyle-plugin-version>
-        <maven-checkstyle-version>7.6.1</maven-checkstyle-version>
+        <maven-checkstyle-plugin-version>3.1.0</maven-checkstyle-plugin-version>
+        <maven-checkstyle-version>8.26</maven-checkstyle-version>
 
         <camel.osgi.manifest></camel.osgi.manifest>
     </properties>


[camel] 03/03: CAMEL-14180: Fix Checkstyle issues

Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

zregvart pushed a commit to branch CAMEL-14180
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 7ed676dac195f9ec127f273209f11b3a2e9ba84c
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Fri Nov 15 13:16:31 2019 +0100

    CAMEL-14180: Fix Checkstyle issues
    
    Seems that previous versions of Checkstyle had few issues with checking
    import sort/grouping. So I've run impsort Maven plugin:
    
        mvn net.revelc.code:impsort-maven-plugin:sort -Dimpsort.groups=java,javax,org.w3c,org.xml,junit -Dimpsort.removeUnused=true -Dimpsort.staticAfter=true
    
    To sort all the imports according to the Checkstyle rule.
    
    Few remaining issues around indentation and unnecessary parentheses I
    fixed manually.
---
 .../springboot/SpringBootRuntimeProviderTest.java  |    1 +
 .../org/apache/camel/catalog/CamelCatalog.java     |    1 +
 .../java/org/apache/camel/maven/GenerateMojo.java  |    1 -
 .../parser/helper/CamelXmlTreeParserHelper.java    |    1 -
 .../camel/parser/helper/XmlLineNumberParser.java   |    1 +
 .../activemq/ActiveMQOriginalDestinationTest.java  |    1 -
 .../component/ahc/ws/WsProducerConsumerTest.java   |    1 +
 .../ahc/HttpProtocolHeaderFilterStrategy.java      |    1 -
 .../ahc/AhcComponentClientConfigTest.java          |    1 -
 .../component/amqp/AMQPConnectionDetails.java      |    2 +-
 .../component/amqp/AMQPRouteTraceFrameTest.java    |    1 +
 .../camel/dataformat/any23/Any23DataFormat.java    |    2 +-
 .../camel/dataformat/any23/utils/Any23Utils.java   |    1 +
 .../any23/Any23DataFormatConfigurationsTest.java   |    1 +
 .../any23/Any23DataFormatDefaultTest.java          |    1 +
 .../any23/Any23DataFormatExtractorsTest.java       |    1 +
 .../dataformat/any23/Any23DataFormatHTTPTest.java  |    1 +
 .../any23/Any23DataFormatMarshalTest.java          |    1 +
 .../dataformat/any23/Any23DataFormatModelTest.java |    1 +
 .../any23/Any23DataFormatOutputFormatTest.java     |    1 +
 .../any23/Any23DataFormatSpringTest.java           |    1 +
 .../camel/dataformat/any23/Any23TestSupport.java   |    1 +
 .../component/apns/factory/ApnsServiceFactory.java |    1 -
 .../camel/component/apns/util/ResourceUtils.java   |    1 -
 .../apns/ApnsConsumerIdleMessageTest.java          |    1 -
 .../camel/component/apns/ApnsConsumerTest.java     |    2 -
 .../camel/component/apns/ApnsProducerTest.java     |    1 -
 .../apns/ApnsProducerWithoutTokensHeaderTest.java  |    1 -
 .../apns/factory/ApnsServiceFactoryTest.java       |    1 -
 .../factory/ConfiguredApnsServiceFactoryTest.java  |    1 -
 .../apns/spring/SpringApnsConsumerTest.java        |    1 -
 .../camel/component/apns/util/ApnsUtils.java       |    2 +-
 .../component/as2/api/AS2SignedDataGenerator.java  |   16 -
 .../camel/component/as2/api/AS2MessageTest.java    |    1 +
 .../as2/AS2ClientManagerIntegrationTest.java       |    1 +
 .../camel/dataformat/asn1/ASN1DataFormat.java      |    3 +-
 .../component/atmos/dto/AtmosFileUploadResult.java |    1 -
 .../camel/component/atmos/dto/AtmosMoveResult.java |    1 -
 .../camel/component/atmos/dto/AtmosResult.java     |    1 -
 .../consumer/AtmosScheduledPollConsumer.java       |    1 -
 .../validator/AtmosConfigurationValidator.java     |    1 +
 .../atmos/integration/AtmosTestSupport.java        |    1 -
 .../consumer/AtmosConsumerGetSingleTest.java       |    1 -
 .../integration/producer/AtmosProducerDelTest.java |    1 -
 .../producer/AtmosProducerGetFolderTest.java       |    1 -
 .../producer/AtmosProducerGetSingleTest.java       |    1 -
 .../producer/AtmosProducerMoveTest.java            |    1 -
 .../AtmosProducerPutFolderWithRemotePathTest.java  |    2 -
 .../producer/AtmosProducerPutSingleFileTest.java   |    1 -
 ...mosProducerPutSingleFileWithRemotePathTest.java |    1 -
 .../websocket/CamelWebSocketServlet.java           |    1 +
 .../websocket/MemoryWebSocketStoreTest.java        |    1 -
 .../websocket/WebsocketRouteWithInitParamTest.java |    1 -
 .../AtomEntryPollingConsumerWithBasicAuthTest.java |    1 +
 .../atom/AtomPollingConsumerWithBasicAuthTest.java |    1 +
 .../camel/component/atom/AtomProducerTest.java     |    1 -
 .../client/AbstractAtomixClientEndpoint.java       |    1 -
 .../atomix/client/map/AtomixMapEndpoint.java       |    1 -
 .../client/messaging/AtomixMessagingEndpoint.java  |    1 -
 .../client/multimap/AtomixMultiMapEndpoint.java    |    1 -
 .../atomix/client/queue/AtomixQueueEndpoint.java   |    1 -
 .../atomix/client/set/AtomixSetEndpoint.java       |    1 -
 .../atomix/client/value/AtomixValueEndpoint.java   |    1 -
 .../atomix/client/map/AtomixMapConsumerTest.java   |    2 +-
 .../client/map/AtomixMapNodesProducerTest.java     |    1 +
 .../atomix/client/map/AtomixMapProducerTest.java   |    1 +
 .../client/messaging/AtomixMessagingTest.java      |    1 -
 .../multimap/AtomixMultiMapProducerTest.java       |    1 +
 .../client/queue/AtomixQueueConsumerTest.java      |    1 +
 .../client/queue/AtomixQueueProducerTest.java      |    1 +
 .../atomix/client/set/AtomixSetConsumerTest.java   |    1 +
 .../atomix/client/set/AtomixSetProducerTest.java   |    1 +
 .../client/value/AtomixValueConsumerTest.java      |    1 +
 .../client/value/AtomixValueProducerTest.java      |    1 +
 .../apache/camel/attachment/AttachmentMessage.java |    1 +
 .../camel/attachment/BodyAndHeaderConvertTest.java |    1 +
 .../MessageWithAttachmentRedeliveryIssueTest.java  |    1 +
 .../apache/camel/component/avro/AvroListener.java  |    1 -
 .../apache/camel/component/avro/AvroProducer.java  |    1 -
 .../avro/AvroNettySpringProducerTest.java          |    1 +
 .../avro/AvroGenericMarshaAndUnmarshaTest.java     |    2 +-
 .../apache/camel/component/aws/cw/CwComponent.java |    3 +-
 .../aws/cw/CwComponentVerifierExtension.java       |    1 -
 .../camel/component/aws/cw/CwConfiguration.java    |    3 +-
 .../apache/camel/component/aws/cw/CwEndpoint.java  |    1 -
 .../apache/camel/component/aws/cw/CwProducer.java  |    3 +-
 .../aws/cw/CwComponentConfigurationTest.java       |    3 +-
 .../aws/cw/CwComponentRegistryClientTest.java      |    3 +-
 .../camel/component/aws/cw/CwComponentTest.java    |    1 -
 .../cw/integration/CwComponentIntegrationTest.java |    4 +-
 .../component/aws/ddb/AbstractDdbCommand.java      |    2 +-
 .../component/aws/ddb/BatchGetItemsCommand.java    |    1 -
 .../camel/component/aws/ddb/DdbComponent.java      |    3 +-
 .../aws/ddb/DdbComponentVerifierExtension.java     |    1 -
 .../camel/component/aws/ddb/DdbConfiguration.java  |    1 -
 .../camel/component/aws/ddb/DdbEndpoint.java       |    1 -
 .../camel/component/aws/ddb/DeleteItemCommand.java |    1 -
 .../component/aws/ddb/DescribeTableCommand.java    |    1 -
 .../camel/component/aws/ddb/GetItemCommand.java    |    1 -
 .../camel/component/aws/ddb/PutItemCommand.java    |    1 -
 .../camel/component/aws/ddb/QueryCommand.java      |    1 -
 .../camel/component/aws/ddb/ScanCommand.java       |    1 -
 .../camel/component/aws/ddb/UpdateItemCommand.java |    1 -
 .../component/aws/ddb/UpdateTableCommand.java      |    1 -
 .../aws/ddbstream/DdbStreamComponent.java          |    1 -
 .../DdbStreamComponentVerifierExtension.java       |    1 -
 .../aws/ddbstream/DdbStreamConfiguration.java      |    1 -
 .../component/aws/ddbstream/DdbStreamEndpoint.java |    1 -
 .../component/aws/ddb/AmazonDDBClientMock.java     |    1 -
 .../aws/ddb/BatchGetItemsCommandTest.java          |    4 +-
 .../aws/ddb/DdbComponentConfigurationTest.java     |    3 +-
 .../component/aws/ddb/DeleteItemCommandTest.java   |    2 +-
 .../component/aws/ddb/DeleteTableCommandTest.java  |    4 +-
 .../aws/ddb/DescribeTableCommandTest.java          |    4 +-
 .../component/aws/ddb/GetItemCommandTest.java      |    2 +-
 .../component/aws/ddb/PutItemCommandTest.java      |    2 +-
 .../camel/component/aws/ddb/QueryCommandTest.java  |    2 +-
 .../camel/component/aws/ddb/ScanCommandTest.java   |    4 +-
 .../component/aws/ddb/UpdateItemCommandTest.java   |    2 +-
 .../component/aws/ddb/UpdateTableCommandTest.java  |    3 +-
 .../integration/DdbComponentIntegrationTest.java   |    2 +-
 .../DdbStreamComponentConfigurationTest.java       |    3 +-
 .../aws/ddbstream/DdbStreamConsumerTest.java       |    2 +-
 .../aws/ddbstream/DdbStreamEndpointTest.java       |    2 +-
 .../aws/ddbstream/ShardIteratorHandlerTest.java    |    2 +-
 .../component/aws/ddbstream/ShardListTest.java     |    3 +-
 .../camel/component/aws/ec2/EC2Component.java      |    1 -
 .../aws/ec2/EC2ComponentVerifierExtension.java     |    1 -
 .../camel/component/aws/ec2/EC2Configuration.java  |    1 -
 .../camel/component/aws/ec2/EC2Endpoint.java       |    1 -
 .../camel/component/aws/ec2/EC2Producer.java       |    3 +-
 .../component/aws/ec2/AmazonEC2ClientMock.java     |    3 +-
 .../aws/ec2/EC2ComponentConfigurationTest.java     |    1 -
 .../component/aws/ec2/EC2ComponentSpringTest.java  |    1 -
 .../camel/component/aws/ec2/EC2ProducerTest.java   |    3 +-
 .../integration/EC2ComponentIntegrationTest.java   |    1 -
 .../camel/component/aws/ecs/ECSComponent.java      |    1 -
 .../aws/ecs/ECSComponentVerifierExtension.java     |    1 -
 .../camel/component/aws/ecs/ECSConfiguration.java  |    1 -
 .../camel/component/aws/ecs/ECSEndpoint.java       |    1 -
 .../camel/component/aws/ecs/ECSProducer.java       |    3 +-
 .../aws/ecs/ECSComponentConfigurationTest.java     |    1 -
 .../component/aws/ecs/ECSProducerSpringTest.java   |    1 -
 .../camel/component/aws/ecs/ECSProducerTest.java   |    1 -
 .../camel/component/aws/eks/EKSComponent.java      |    1 -
 .../aws/eks/EKSComponentVerifierExtension.java     |    1 -
 .../camel/component/aws/eks/EKSConfiguration.java  |    1 -
 .../camel/component/aws/eks/EKSEndpoint.java       |    1 -
 .../camel/component/aws/eks/EKSProducer.java       |    3 +-
 .../aws/eks/EKSComponentConfigurationTest.java     |    1 -
 .../component/aws/eks/EKSProducerSpringTest.java   |    3 +-
 .../camel/component/aws/eks/EKSProducerTest.java   |    3 +-
 .../camel/component/aws/iam/IAMComponent.java      |    1 -
 .../aws/iam/IAMComponentVerifierExtension.java     |    1 -
 .../camel/component/aws/iam/IAMConfiguration.java  |    1 -
 .../camel/component/aws/iam/IAMEndpoint.java       |    1 -
 .../camel/component/aws/iam/IAMProducer.java       |    1 -
 .../aws/iam/IAMComponentConfigurationTest.java     |    1 -
 .../component/aws/iam/IAMProducerSpringTest.java   |    1 -
 .../camel/component/aws/iam/IAMProducerTest.java   |    1 -
 .../aws/firehose/KinesisFirehoseComponent.java     |    1 -
 .../KinesisFirehoseComponentVerifierExtension.java |    1 -
 .../aws/firehose/KinesisFirehoseConfiguration.java |    1 -
 .../aws/firehose/KinesisFirehoseEndpoint.java      |    3 +-
 .../aws/firehose/KinesisFirehoseProducer.java      |    2 +-
 .../component/aws/kinesis/KinesisComponent.java    |    1 -
 .../kinesis/KinesisComponentVerifierExtension.java |    1 -
 .../aws/kinesis/KinesisConfiguration.java          |    1 -
 .../component/aws/kinesis/KinesisConsumer.java     |    1 -
 .../component/aws/kinesis/KinesisEndpoint.java     |    1 -
 .../KinesisFirehoseComponentConfigurationTest.java |    5 +-
 .../KinesisFirehoseComponentIntegrationTest.java   |    1 -
 .../kinesis/KinesisComponentConfigurationTest.java |    3 +-
 .../KinesisConsumerClosedShardWithFailTest.java    |    1 -
 .../KinesisConsumerClosedShardWithSilentTest.java  |    2 +-
 .../component/aws/kinesis/KinesisConsumerTest.java |    2 +-
 .../component/aws/kinesis/KinesisProducerTest.java |    2 +-
 .../aws/kinesis/RecordStringConverterTest.java     |    2 +-
 .../KinesisComponentIntegrationTest.java           |    1 -
 .../camel/component/aws/kms/KMSComponent.java      |    1 -
 .../aws/kms/KMSComponentVerifierExtension.java     |    1 -
 .../camel/component/aws/kms/KMSConfiguration.java  |    1 -
 .../camel/component/aws/kms/KMSEndpoint.java       |    1 -
 .../camel/component/aws/kms/KMSProducer.java       |    3 +-
 .../component/aws/kms/AmazonKMSClientMock.java     |    1 -
 .../aws/kms/KMSComponentConfigurationTest.java     |    1 -
 .../component/aws/kms/KMSProducerSpringTest.java   |    3 +-
 .../camel/component/aws/kms/KMSProducerTest.java   |    3 +-
 .../component/aws/lambda/LambdaComponent.java      |    1 -
 .../lambda/LambdaComponentVerifierExtension.java   |    1 -
 .../component/aws/lambda/LambdaConfiguration.java  |    3 +-
 .../camel/component/aws/lambda/LambdaProducer.java |    1 -
 .../aws/lambda/AmazonLambdaClientMock.java         |    3 +-
 .../lambda/LambdaComponentClientRegistryTest.java  |    1 -
 .../lambda/LambdaComponentConfigurationTest.java   |    4 +-
 .../aws/lambda/LambdaComponentSpringTest.java      |    2 +-
 .../component/aws/lambda/LambdaOperationsTest.java |    2 -
 .../component/aws/lambda/LambdaProducerTest.java   |    1 -
 .../LambdaComponentIntegrationTest.java            |    3 +-
 .../apache/camel/component/aws/mq/MQComponent.java |    1 -
 .../aws/mq/MQComponentVerifierExtension.java       |    1 -
 .../camel/component/aws/mq/MQConfiguration.java    |    1 -
 .../apache/camel/component/aws/mq/MQEndpoint.java  |    1 -
 .../apache/camel/component/aws/mq/MQProducer.java  |    3 +-
 .../aws/mq/MQComponentConfigurationTest.java       |    1 -
 .../component/aws/mq/MQProducerSpringTest.java     |    3 +-
 .../camel/component/aws/mq/MQProducerTest.java     |    3 +-
 .../camel/component/aws/msk/MSKComponent.java      |    1 -
 .../aws/msk/MSKComponentVerifierExtension.java     |    1 -
 .../camel/component/aws/msk/MSKConfiguration.java  |    1 -
 .../camel/component/aws/msk/MSKEndpoint.java       |    1 -
 .../camel/component/aws/msk/MSKProducer.java       |    1 -
 .../aws/msk/MSKComponentConfigurationTest.java     |    1 -
 .../component/aws/msk/MSKProducerSpringTest.java   |    1 -
 .../camel/component/aws/msk/MSKProducerTest.java   |    1 -
 .../apache/camel/component/aws/s3/S3Component.java |    2 -
 .../aws/s3/S3ComponentVerifierExtension.java       |    1 -
 .../camel/component/aws/s3/S3Configuration.java    |    1 -
 .../apache/camel/component/aws/s3/S3Consumer.java  |    3 +-
 .../apache/camel/component/aws/s3/S3Producer.java  |    1 -
 .../camel/component/aws/s3/AmazonS3ClientMock.java |    3 +-
 .../aws/s3/AmazonS3EncryptionClientMock.java       |    3 +-
 .../s3/S3BatchConsumerMaxMessagesPerPollTest.java  |    1 -
 .../component/aws/s3/S3BatchConsumerTest.java      |    1 -
 .../aws/s3/S3ComponentConfigurationTest.java       |    1 -
 .../aws/s3/S3ComponentContentLengthFileTest.java   |    1 -
 .../aws/s3/S3ComponentExistingBucketTest.java      |    1 -
 .../component/aws/s3/S3ComponentFileTest.java      |    1 -
 .../aws/s3/S3ComponentKeyNameFileTest.java         |    1 -
 .../aws/s3/S3ComponentListBucketsSpringTest.java   |    1 -
 .../aws/s3/S3ComponentListBucketsTest.java         |    1 -
 .../aws/s3/S3ComponentListObjectTest.java          |    1 -
 .../aws/s3/S3ComponentListObjectsSpringTest.java   |    1 -
 .../aws/s3/S3ComponentNonExistingBucketTest.java   |    1 -
 .../component/aws/s3/S3ComponentStringTest.java    |    1 -
 .../component/aws/s3/S3ConsumerDelimiterTest.java  |    1 -
 .../component/aws/s3/S3ConsumerPrefixTest.java     |    1 -
 .../camel/component/aws/s3/S3IncludeBodyTest.java  |    1 -
 .../impl/IAMOptimizedAWSS3ClientImplTest.java      |    1 +
 .../client/impl/StandardAWSS3ClientImplTest.java   |    1 +
 .../component/aws/sdb/AbstractSdbCommand.java      |    3 +-
 .../aws/sdb/BatchDeleteAttributesCommand.java      |    3 +-
 .../aws/sdb/BatchPutAttributesCommand.java         |    1 -
 .../component/aws/sdb/DeleteAttributesCommand.java |    3 +-
 .../component/aws/sdb/DeleteDomainCommand.java     |    3 +-
 .../component/aws/sdb/DomainMetadataCommand.java   |    3 +-
 .../component/aws/sdb/GetAttributesCommand.java    |    3 +-
 .../component/aws/sdb/ListDomainsCommand.java      |    3 +-
 .../component/aws/sdb/PutAttributesCommand.java    |    3 +-
 .../aws/sdb/SdbComponentVerifierExtension.java     |    1 -
 .../camel/component/aws/sdb/SdbConfiguration.java  |    1 -
 .../camel/component/aws/sdb/SdbEndpoint.java       |    1 -
 .../camel/component/aws/sdb/SelectCommand.java     |    3 +-
 .../component/aws/sdb/AbstractSdbCommandTest.java  |    3 +-
 .../aws/sdb/BatchDeleteAttributesCommandTest.java  |    1 -
 .../aws/sdb/BatchPutAttributesCommandTest.java     |    3 +-
 .../aws/sdb/DeleteAttributesCommandTest.java       |    3 +-
 .../component/aws/sdb/DeleteDomainCommandTest.java |    2 +-
 .../aws/sdb/DomainMetadataCommandTest.java         |    2 +-
 .../aws/sdb/GetAttributesCommandTest.java          |    3 +-
 .../component/aws/sdb/ListDomainsCommandTest.java  |    2 +-
 .../aws/sdb/PutAttributesCommandTest.java          |    3 +-
 .../aws/sdb/SdbComponentConfigurationTest.java     |    3 +-
 .../component/aws/sdb/SdbComponentSpringTest.java  |    3 +-
 .../camel/component/aws/sdb/SdbComponentTest.java  |    3 +-
 .../camel/component/aws/sdb/SelectCommandTest.java |    3 +-
 .../integration/SdbComponentIntegrationTest.java   |    3 +-
 .../camel/component/aws/ses/SesComponent.java      |    1 -
 .../aws/ses/SesComponentVerifierExtension.java     |    1 -
 .../camel/component/aws/ses/SesConfiguration.java  |    1 -
 .../camel/component/aws/ses/SesEndpoint.java       |    1 -
 .../camel/component/aws/ses/SesProducer.java       |    1 -
 .../aws/ses/SesComponentConfigurationTest.java     |    3 +-
 .../component/aws/ses/SesComponentSpringTest.java  |    3 +-
 .../camel/component/aws/ses/SesComponentTest.java  |    3 +-
 .../camel/component/aws/sns/SnsComponent.java      |    1 -
 .../aws/sns/SnsComponentVerifierExtension.java     |    1 -
 .../camel/component/aws/sns/SnsConfiguration.java  |    1 -
 .../camel/component/aws/sns/SnsEndpoint.java       |    1 -
 .../camel/component/aws/sns/SnsProducer.java       |    3 +-
 .../component/aws/sns/AmazonSNSClientMock.java     |    3 +-
 .../aws/sns/SnsComponentConfigurationTest.java     |    1 -
 .../camel/component/aws/sns/SnsProducerTest.java   |    2 +-
 .../camel/component/aws/sqs/SqsComponent.java      |    1 -
 .../aws/sqs/SqsComponentVerifierExtension.java     |    1 -
 .../camel/component/aws/sqs/SqsConfiguration.java  |    1 -
 .../camel/component/aws/sqs/SqsConsumer.java       |    1 -
 .../camel/component/aws/sqs/SqsEndpoint.java       |    1 -
 .../component/aws/sqs/SqsBatchConsumerTest.java    |    1 -
 .../aws/sqs/SqsComponentConfigurationTest.java     |    1 -
 .../component/aws/sqs/SqsComponentSpringTest.java  |    1 -
 .../aws/sqs/SqsConcurrentConsumerTest.java         |    1 -
 .../aws/sqs/SqsConsumerIdleMessageTest.java        |    8 +-
 .../sqs/SqsDoesNotExtendMessageVisibilityTest.java |    1 -
 .../camel/component/aws/sqs/SqsEndpointTest.java   |    1 -
 .../aws/sqs/SqsEndpointUseExistingQueueTest.java   |    1 -
 .../aws/sqs/SqsExtendMessageVisibilityTest.java    |    1 -
 .../component/aws/sqs/SqsProducerBatchTest.java    |    1 -
 .../component/aws/sqs/SqsProducerDeleteTest.java   |    1 -
 .../aws/sqs/SqsProducerListQueuesTest.java         |    1 -
 .../camel/component/aws/sqs/SqsProducerTest.java   |    1 -
 .../camel/component/aws/swf/SWFComponent.java      |    1 -
 .../camel/component/aws/swf/SWFConfiguration.java  |    1 -
 .../component/aws/swf/SWFWorkflowConsumer.java     |    1 +
 .../component/aws/swf/SWFWorkflowProducer.java     |    1 -
 .../aws/swf/SwfComponentVerifierExtension.java     |    1 -
 .../aws/swf/CamelSWFActivityClientTest.java        |    2 -
 .../aws/swf/CamelSWFActivityConsumerTest.java      |    3 +-
 .../component/aws/swf/CamelSWFTestSupport.java     |    4 +-
 .../aws/swf/CamelSWFWorkflowClientTest.java        |    1 +
 .../aws/swf/CamelSWFWorkflowConsumerTest.java      |    3 +-
 .../aws/swf/CamelSWFWorkflowProducerTest.java      |    3 +-
 .../aws/swf/SWFComponentConfigurationTest.java     |    1 -
 .../aws/translate/TranslateComponent.java          |    1 -
 .../TranslateComponentVerifierExtension.java       |    1 -
 .../aws/translate/TranslateConfiguration.java      |    1 -
 .../component/aws/translate/TranslateEndpoint.java |    1 -
 .../component/aws/translate/TranslateProducer.java |    1 -
 .../component/aws/xray/EIPTracingStrategy.java     |    1 +
 .../aws/xray/TraceAnnotatedTracingStrategy.java    |    1 +
 .../camel/component/aws/xray/ABCRouteTest.java     |    2 +-
 .../camel/component/aws/xray/BeanTracingTest.java  |    2 +-
 .../aws/xray/ClientRecipientListRouteTest.java     |    2 +-
 .../camel/component/aws/xray/EIPTracingTest.java   |    2 +-
 .../component/aws/xray/ErrorHandlingTest.java      |    2 +-
 .../apache/camel/component/aws/xray/ErrorTest.java |    2 +-
 .../aws/xray/MulticastParallelRouteTest.java       |    2 +-
 .../component/aws/xray/MulticastRouteTest.java     |    2 +-
 .../component/aws/xray/Route2ConcurrentTest.java   |    3 +-
 .../component/aws/xray/RouteConcurrentTest.java    |    3 +-
 .../aws/xray/SpringAwsXRaySimpleRouteTest.java     |    2 +-
 .../apache/camel/component/aws/xray/TestUtils.java |    2 +-
 .../camel/component/aws/xray/TwoService2Test.java  |    2 +-
 .../camel/component/aws/xray/TwoServiceTest.java   |    2 +-
 .../aws/xray/TwoServiceWithExcludeTest.java        |    2 +-
 .../aws/xray/bean/SomeBackingService.java          |    1 -
 .../camel/component/aws/xray/bean/SomeBean.java    |    1 -
 .../azure/blob/BlobServiceConfiguration.java       |    3 +-
 .../component/azure/blob/BlobServiceConsumer.java  |    2 +-
 .../azure/common/AbstractConfiguration.java        |    2 +-
 .../azure/queue/QueueServiceComponent.java         |    1 -
 .../azure/queue/QueueServiceConfiguration.java     |    2 +-
 .../azure/queue/QueueServiceConsumer.java          |    2 +-
 .../azure/blob/BlobServiceAppendConsumerTest.java  |    2 +-
 .../dataformat/barcode/BarcodeDataFormat.java      |    1 +
 .../barcode/BarcodeDataFormatCamelTest.java        |    1 -
 .../dataformat/barcode/BarcodeDataFormatTest.java  |    1 -
 .../camel/dataformat/barcode/BarcodeTestBase.java  |    2 -
 .../base64/SpringBase64DataFormatDefaultsTest.java |    3 +-
 .../SpringBase64DataFormatLineEndingsTest.java     |    3 +-
 .../SpringBase64DataFormatLineLengthTest.java      |    3 +-
 .../bean/validator/BeanValidatorComponent.java     |    3 +-
 .../HibernateValidationProviderResolver.java       |    6 +-
 .../CustomValidationProviderResolverTest.java      |    3 +-
 .../beanio/BeanIODataFormatComplexTest.java        |    1 +
 .../beanstalk/ConsumerToProducerHeadersTest.java   |    3 +-
 .../camel/dataformat/bindy/FormatFactory.java      |    2 -
 .../bindy/annotation/BindyConverter.java           |    1 -
 .../dataformat/bindy/annotation/DataField.java     |   20 +-
 .../bindy/annotation/FormatFactories.java          |    1 -
 .../dataformat/bindy/csv/BindyCsvDataFormat.java   |    1 -
 .../bindy/csv/BindyCsvBigFileUnmarshallTest.java   |    1 -
 .../bindy/csv/BindyCsvSkipFieldTest.java           |    1 -
 .../csv/BindyMarshalOneToManyWithHeadersTest.java  |    1 -
 .../bindy/csv/BindyPojoSimpleCsvMarshallTest.java  |    3 +-
 .../csv/BindySimpleCsvBooleanUnmarshallTest.java   |    1 -
 ...BindySimpleCsvMarshallPositionModifiedTest.java |    1 -
 .../bindy/csv/BindySimpleCsvMarshallTest.java      |    1 -
 ...ndySimpleCsvRemoveWhitespaceUnmarshallTest.java |    1 -
 .../BindySimpleCsvUnmarshallBadIntegerTest.java    |    1 -
 .../bindy/fix/BindySimpleKeyValuePairFixTest.java  |    1 -
 ...eKeyValuePairWithoutSectionMarshallDslTest.java |    1 -
 .../bindy/fixed/converter/BindyConverterTest.java  |    1 -
 .../dynamic/BindyFixedLengthDynamicFieldTest.java  |    1 -
 .../bindy/fixed/implied/BindyImpliedTest.java      |    2 -
 .../link/BindySimpleFixedLengthWithLinkTest.java   |    2 +-
 .../simple/BindySimpleFixedLengthMarshallTest.java |    1 -
 .../BindySimpleFixedLengthOrdinalPosTest.java      |    1 -
 .../skipfields/BindySimpleSkipFieldsTest.java      |    1 -
 .../factories/BigDecimalFormatFactoryTest.java     |    2 +-
 .../factories/DefaultFactoryRegistryTest.java      |    2 +-
 .../BindyBigDecimalRoundingUnmarshallTest.java     |    1 -
 .../CamelConsumerTemplateFactoryBean.java          |    3 +-
 .../camel/blueprint/CamelContextFactoryBean.java   |    1 +
 .../camel/blueprint/CamelEndpointFactoryBean.java  |    1 +
 .../blueprint/CamelErrorHandlerFactoryBean.java    |    1 +
 .../CamelFluentProducerTemplateFactoryBean.java    |    1 +
 .../CamelProducerTemplateFactoryBean.java          |    1 +
 .../camel/blueprint/CamelProxyFactoryBean.java     |    1 +
 .../CamelRedeliveryPolicyFactoryBean.java          |    1 +
 .../blueprint/CamelRestContextFactoryBean.java     |    1 +
 .../blueprint/CamelRouteContextFactoryBean.java    |    1 +
 .../blueprint/CamelThreadPoolFactoryBean.java      |    3 +-
 .../blueprint/handler/CamelNamespaceHandler.java   |    1 +
 .../KeyManagersParametersFactoryBean.java          |    1 +
 .../blueprint/KeyStoreParametersFactoryBean.java   |    1 +
 .../SSLContextClientParametersFactoryBean.java     |    1 +
 .../blueprint/SSLContextParametersFactoryBean.java |    1 +
 .../SSLContextServerParametersFactoryBean.java     |    1 +
 .../SecureRandomParametersFactoryBean.java         |    1 +
 .../TrustManagersParametersFactoryBean.java        |    1 +
 .../camel/component/bonita/api/BonitaAPI.java      |    4 +-
 .../component/bonita/api/BonitaAPIBuilder.java     |    1 -
 .../component/bonita/api/util/BonitaAPIUtil.java   |    5 +-
 .../bonita/api/BonitaAuthFilterConnectionTest.java |    2 -
 .../bonita/api/util/BonitaAPIConfigTest.java       |    2 -
 .../box/api/BoxCollaborationsManager.java          |    1 -
 .../component/box/api/BoxCommentsManager.java      |    1 -
 .../component/box/api/BoxEventLogsManager.java     |    1 -
 .../camel/component/box/api/BoxEventsManager.java  |    1 -
 .../camel/component/box/api/BoxFoldersManager.java |    1 -
 .../camel/component/box/api/BoxGroupsManager.java  |    1 -
 .../camel/component/box/api/BoxSearchManager.java  |    1 -
 .../camel/component/box/api/BoxTasksManager.java   |    1 -
 .../camel/component/box/api/BoxUsersManager.java   |    1 -
 .../camel/component/box/BoxConfiguration.java      |    1 -
 .../apache/camel/component/box/BoxConsumer.java    |    1 -
 .../apache/camel/component/box/BoxProducer.java    |    1 -
 .../box/internal/BoxConnectionHelper.java          |    1 -
 .../BoxCollaborationsManagerIntegrationTest.java   |    1 -
 .../box/BoxCommentsManagerIntegrationTest.java     |    1 -
 .../box/BoxEventsManagerIntegrationTest.java       |    1 -
 .../box/BoxFilesManagerIntegrationTest.java        |    1 -
 .../box/BoxFoldersManagerIntegrationTest.java      |    1 -
 .../box/BoxTasksManagerIntegrationTest.java        |    1 -
 .../box/BoxUsersManagerIntegrationTest.java        |    1 -
 .../braintree/AddressGatewayIntegrationTest.java   |    2 +-
 .../ClientTokenGatewayIntegrationTest.java         |    1 -
 .../braintree/CustomerGatewayIntegrationTest.java  |    1 -
 .../PaymentMethodGatewayIntegrationTest.java       |    1 +
 .../TransactionGatewayIntegrationTest.java         |    1 +
 .../idempotent/CaffeineIdempotentRepository.java   |    2 +-
 .../CaffeineCacheFromScratchStatsCounterTest.java  |    1 -
 .../caffeine/cache/CaffeineCacheTestSupport.java   |    1 -
 .../loadcache/CaffeineLoadCacheTestSupport.java    |    1 -
 ...CaffeineAggregationRepositoryOperationTest.java |    1 +
 .../NamedCassandraAggregationRepository.java       |    1 -
 .../component/cassandra/BaseCassandraTest.java     |    1 +
 .../CassandraAggregationSerializedHeadersTest.java |    1 +
 .../cassandra/CassandraAggregationTest.java        |    1 +
 .../cassandra/CassandraIdempotentTest.java         |    1 +
 .../camel/component/cbor/CBORDataFormat.java       |    1 -
 .../cbor/CBORMarshalAllowJMSTypeTest.java          |    1 -
 .../component/cbor/CBORObjectListSplitTest.java    |    1 -
 .../org/apache/camel/cdi/AnnotatedDelegate.java    |    2 +-
 .../apache/camel/cdi/AnnotatedMemberDelegate.java  |    1 +
 .../apache/camel/cdi/AnnotatedMethodDelegate.java  |    1 +
 .../apache/camel/cdi/AnnotatedTypeDelegate.java    |    1 +
 .../java/org/apache/camel/cdi/BeanDelegate.java    |    1 +
 .../org/apache/camel/cdi/BeanManagerHelper.java    |    4 +-
 .../org/apache/camel/cdi/CamelContextProducer.java |    5 +-
 .../camel/cdi/CdiCamelBeanPostProcessor.java       |   78 +-
 .../apache/camel/cdi/CdiCamelBeanRepository.java   |    3 +-
 .../org/apache/camel/cdi/CdiCamelExtension.java    |   15 +-
 .../org/apache/camel/cdi/CdiCamelInjector.java     |    1 +
 .../org/apache/camel/cdi/CdiEventComponent.java    |    1 +
 .../org/apache/camel/cdi/CdiEventConsumer.java     |  142 +-
 .../org/apache/camel/cdi/CdiEventEndpoint.java     |    6 +-
 .../org/apache/camel/cdi/CdiEventNotifier.java     |  134 +-
 .../org/apache/camel/cdi/CdiEventProducer.java     |   94 +-
 .../java/org/apache/camel/cdi/CdiSpiHelper.java    |   16 +-
 .../org/apache/camel/cdi/DelegateProducer.java     |    1 +
 .../main/java/org/apache/camel/cdi/Excluded.java   |    6 +-
 .../apache/camel/cdi/ForwardingObserverMethod.java |  131 +-
 .../src/main/java/org/apache/camel/cdi/Main.java   |    5 +-
 .../main/java/org/apache/camel/cdi/Startup.java    |    1 +
 .../org/apache/camel/cdi/SyntheticAnnotated.java   |    5 +-
 .../java/org/apache/camel/cdi/SyntheticBean.java   |    1 +
 .../apache/camel/cdi/SyntheticBeanAttributes.java  |    5 +-
 .../apache/camel/cdi/SyntheticInjectionTarget.java |    1 +
 .../src/main/java/org/apache/camel/cdi/Uri.java    |    1 +
 .../src/main/java/org/apache/camel/cdi/Vetoed.java |    1 +
 .../org/apache/camel/cdi/XmlCdiBeanFactory.java    |   13 +-
 .../camel/cdi/XmlErrorHandlerFactoryBean.java      |    7 +-
 .../org/apache/camel/cdi/xml/ErrorHandlerType.java |    1 -
 .../camel/cdi/xml/ThreadPoolFactoryBean.java       |    3 +-
 .../camel/cdi/bean/EventProducingRouteCdi10.java   |    2 +-
 .../camel/cdi/bean/RecipientListMethodBean.java    |    1 +
 .../apache/camel/cdi/qualifier/BarQualifier.java   |   78 +-
 .../apache/camel/cdi/qualifier/FooQualifier.java   |   78 +-
 .../org/apache/camel/cdi/qualifier/Manual.java     |    4 +-
 .../apache/camel/cdi/rule/LogEventVerifier.java    |    1 -
 .../cdi/test/AdvisedMockEndpointProducerTest.java  |  193 +-
 .../apache/camel/cdi/test/AdvisedRouteTest.java    |  217 +-
 .../camel/cdi/test/AmbiguousCamelContextTest.java  |  110 +-
 .../org/apache/camel/cdi/test/BeanInjectTest.java  |  177 +-
 .../org/apache/camel/cdi/test/Camel9973Test.java   |  140 +-
 .../camel/cdi/test/CamelContextAwareTest.java      |  114 +-
 .../cdi/test/CamelContextProducerFieldTest.java    |  195 +-
 .../cdi/test/CamelContextProducerMethodTest.java   |  179 +-
 .../camel/cdi/test/CamelEventEndpointTest.java     |  159 +-
 .../camel/cdi/test/CamelEventNotifierTest.java     |  303 +--
 .../cdi/test/CamelRouteEventNotifierTest.java      |  510 ++---
 .../camel/cdi/test/CdiCamelConfigurationTest.java  |    2 +-
 .../apache/camel/cdi/test/ConsumeMethodTest.java   |  139 +-
 .../camel/cdi/test/ConsumerTemplateTest.java       |  129 +-
 .../camel/cdi/test/ContextComponentTest.java       |    1 +
 .../camel/cdi/test/CustomCamelContextTest.java     |  181 +-
 .../camel/cdi/test/DefaultCamelContextTest.java    |  139 +-
 .../cdi/test/DefaultProducerTemplateTest.java      |  137 +-
 .../camel/cdi/test/DeploymentDescriptorTest.java   |  137 +-
 .../apache/camel/cdi/test/EndpointInjectTest.java  |  139 +-
 .../apache/camel/cdi/test/EventComponentTest.java  |  182 +-
 .../camel/cdi/test/EventEndpointCdi12Test.java     |    1 +
 .../apache/camel/cdi/test/EventEndpointTest.java   |    1 +
 .../camel/cdi/test/InjectedEndpointTest.java       |  137 +-
 .../camel/cdi/test/InjectedTypeConverterTest.java  |  207 +-
 .../camel/cdi/test/ManualCamelContextTest.java     |  235 +--
 .../apache/camel/cdi/test/MockEndpointTest.java    |  167 +-
 .../apache/camel/cdi/test/NamedCamelBeanTest.java  |  138 +-
 .../camel/cdi/test/NamedCamelContextTest.java      |  228 +--
 .../apache/camel/cdi/test/NoCamelContextTest.java  |  117 +-
 .../org/apache/camel/cdi/test/NoTCCLSetTest.java   |    1 +
 .../apache/camel/cdi/test/ProduceTemplateTest.java |  152 +-
 .../camel/cdi/test/ProgrammaticLookupTest.java     |  179 +-
 .../camel/cdi/test/PropertiesLocationTest.java     |  204 +-
 .../camel/cdi/test/PropertyEndpointTest.java       |  181 +-
 .../apache/camel/cdi/test/PropertyInjectTest.java  |  203 +-
 .../camel/cdi/test/QualifiedCamelContextTest.java  |  201 +-
 .../camel/cdi/test/RawEventEndpointCdi12Test.java  |  221 +-
 .../camel/cdi/test/RecipientListMethodTest.java    |  155 +-
 .../cdi/test/RouteDefinitionsFromXmlTest.java      |  157 +-
 .../camel/cdi/test/UndefinedPropertyTest.java      |  172 +-
 .../cdi/test/UnstoppedCamelContextBeanTest.java    |  175 +-
 .../UnstoppedCamelContextProducerFieldTest.java    |  165 +-
 .../UnstoppedCamelContextProducerMethodTest.java   |  177 +-
 .../org/apache/camel/cdi/test/UriEndpointTest.java |  139 +-
 .../cdi/test/UriQualifierWithContextTest.java      |    1 +
 .../org/apache/camel/cdi/test/XmlBeansTest.java    |  154 +-
 .../camel/cdi/test/XmlConsumerTemplateTest.java    |  176 +-
 .../org/apache/camel/cdi/test/XmlEndpointTest.java |  220 +-
 .../camel/cdi/test/XmlErrorHandlerPolicyTest.java  |  277 +--
 .../apache/camel/cdi/test/XmlErrorHandlerTest.java |  208 +-
 .../camel/cdi/test/XmlProducerTemplateTest.java    |  188 +-
 .../camel/cdi/test/XmlPropertyPlaceholderTest.java |  122 +-
 .../apache/camel/cdi/test/XmlProxyFactoryTest.java |  138 +-
 .../apache/camel/cdi/test/XmlRestContextTest.java  |  208 +-
 .../camel/cdi/test/XmlRouteContextImportTest.java  |  196 +-
 .../cdi/test/XmlRouteContextResourceTest.java      |  160 +-
 .../camel/cdi/test/XmlRoutesDefinitionTest.java    |  148 +-
 .../cdi/test/XmlServiceCallConfigurationTest.java  |    1 +
 .../camel/cdi/test/XmlServiceExporterTest.java     |  160 +-
 .../camel/cdi/test/XmlThreadPoolProfileTest.java   |  160 +-
 .../apache/camel/cdi/test/XmlThreadPoolTest.java   |  153 +-
 .../camel/component/chatscript/ChatScriptBot.java  |    1 +
 .../component/chatscript/ChatScriptEndpoint.java   |    5 +-
 .../org/apache/camel/component/cm/CMComponent.java |  171 +-
 .../camel/component/cm/CMSenderOneMessageImpl.java |  518 ++---
 .../component/cm/test/CMConfigurationTest.java     |    1 +
 .../camel/component/cm/test/CMMessageTest.java     |  643 +++---
 .../org/apache/camel/component/cm/test/CMTest.java |  734 +++----
 .../camel/component/cm/test/SMSMessageTest.java    |  363 ++--
 .../java/org/apache/camel/coap/CoAPConsumer.java   |    1 -
 .../camel/component/cometd/CometdComponent.java    |    1 +
 .../component/cometd/CometdProducerConsumer.java   |    3 +-
 .../cometd/CometdCrossOriginConsumerTest.java      |    1 -
 .../component/consul/ConsulClientKeyValueTest.java |    1 -
 .../camel/component/consul/ConsulRegistryTest.java |    1 +
 .../camel/component/consul/ConsulTestSupport.java  |    1 -
 .../camel/component/corda/CordaComponent.java      |    2 +-
 .../camel/component/corda/CordaConsumer.java       |    1 +
 .../camel/component/corda/CordaEndpoint.java       |    2 +-
 .../component/corda/CordaConsumerTestSupport.java  |    1 -
 .../camel/component/corda/CordaProducerTest.java   |    1 +
 .../camel/component/corda/CordaTestSupport.java    |    1 -
 .../component/corda/IntegrationWhiteList.java      |    1 +
 .../component/couchbase/CouchbaseConsumer.java     |    1 -
 .../component/couchbase/CouchbaseEndpoint.java     |    1 -
 .../component/couchbase/CouchbaseProducer.java     |    2 -
 .../component/couchbase/CouchbaseEndpointTest.java |    1 -
 .../component/couchbase/CouchbaseProducerTest.java |    2 -
 .../component/crypto/cms/EnvelopedDataTest.java    |    1 +
 .../camel/component/crypto/cms/ProcessorsTest.java |  241 +--
 .../camel/component/crypto/cms/SignedDataTest.java |    1 +
 .../component/crypto/DigitalSignatureProducer.java |    1 +
 .../processor/DigitalSignatureProcessor.java       |    1 -
 .../crypto/processor/SigningProcessor.java         |    2 +-
 .../crypto/processor/VerifyingProcessor.java       |    1 -
 .../camel/converter/crypto/CryptoDataFormat.java   |    7 +-
 .../crypto/DefaultPGPPublicKeyAccessor.java        |    2 -
 .../camel/converter/crypto/HMACAccumulator.java    |    1 +
 .../camel/converter/crypto/PGPDataFormatUtil.java  |    2 -
 .../camel/dataformat/csv/CsvDataFormatTest.java    | 1042 +++++-----
 .../dataformat/csv/CsvMarshalCharsetTest.java      |  118 +-
 .../dataformat/csv/CsvRecordConvertersTest.java    |  136 +-
 .../apache/camel/dataformat/csv/CsvRouteTest.java  |  374 ++--
 .../camel/dataformat/csv/CsvUnmarshalTest.java     |  398 ++--
 .../blueprint/AbstractBeanDefinitionParser.java    |    3 -
 .../blueprint/CamelConduitDefinitionParser.java    |    2 -
 .../CamelDestinationDefinitionParser.java          |    1 -
 .../blueprint/CamelTransportNameSpaceHandler.java  |    2 -
 .../AbstractCamelContextBeanDefinitionParser.java  |    3 +-
 .../cxf/transport/JaxWSCamelDestinationTest.java   |    1 -
 .../apache/camel/component/cxf/CxfComponent.java   |    1 -
 .../apache/camel/component/cxf/CxfEndpoint.java    |    1 +
 .../org/apache/camel/component/cxf/CxfPayload.java |    1 -
 .../camel/component/cxf/DefaultCxfBinding.java     |    2 -
 .../component/cxf/HybridSourceDataBinding.java     |    1 -
 .../blueprint/AbstractBeanDefinitionParser.java    |    2 -
 .../cxf/blueprint/EndpointDefinitionParser.java    |    1 -
 .../cxf/blueprint/RsClientDefinitionParser.java    |    1 -
 .../CxfMessageSoapHeaderOutInterceptor.java        |    3 +-
 .../OneWayOutgoingChainInterceptor.java            |    1 -
 .../interceptors/RawMessageWSDLGetInterceptor.java |    1 -
 .../RawMessageWSDLGetOutInterceptor.java           |    1 -
 .../camel/component/cxf/jaxrs/CxfRsEndpoint.java   |    1 +
 .../component/cxf/jaxrs/DefaultModelResource.java  |    1 +
 .../jaxrs/SubResourceClassInvocationHandler.java   |    1 +
 .../spring/AbstractCxfBeanDefinitionParser.java    |    1 -
 .../spring/CxfEndpointBeanDefinitionParser.java    |    1 -
 .../CxfRsClientFactoryBeanDefinitionParser.java    |    1 -
 .../CxfRsServerFactoryBeanDefinitionParser.java    |    1 -
 .../component/cxf/util/DataInInterceptor.java      |    1 -
 .../component/cxf/util/ReaderInputStream.java      |    1 +
 .../camel/component/cxf/CXFGreeterEnrichTest.java  |    1 +
 .../camel/component/cxf/CXFGreeterRouterTest.java  |    1 +
 .../camel/component/cxf/CXFWsdlOnlyTest.java       |    1 +
 .../camel/component/cxf/CxfConsumerFaultTest.java  |    1 -
 .../component/cxf/CxfConsumerMessageTest.java      |    1 -
 .../cxf/CxfConsumerPayLoadConvertorTest.java       |    2 -
 .../cxf/CxfConsumerPayLoadMarshalFaultTest.java    |    2 -
 .../CxfConsumerPayloadFaultCauseEnabledTest.java   |    3 -
 .../component/cxf/CxfConsumerPayloadFaultTest.java |    3 -
 .../component/cxf/CxfConsumerPayloadTest.java      |    1 -
 .../CxfConsumerPayloadXPathClientServerTest.java   |    2 -
 .../component/cxf/CxfConsumerProviderTest.java     |    1 -
 .../component/cxf/CxfConsumerStreamCacheTest.java  |    1 -
 .../camel/component/cxf/CxfConsumerTest.java       |    1 -
 .../component/cxf/CxfConsumerWithTryCatchTest.java |    1 -
 .../component/cxf/CxfCustomerStartStopTest.java    |    1 +
 .../component/cxf/CxfDispatchMessageTest.java      |    5 +-
 .../component/cxf/CxfDispatchTestSupport.java      |    3 +-
 .../CxfGreeterCXFMessageWithoutSEIRouterTest.java  |    1 +
 .../cxf/CxfGreeterConverterRouterTest.java         |    2 +-
 .../cxf/CxfGreeterMessageCamelHttpRouterTest.java  |    1 +
 .../component/cxf/CxfGreeterMessageRouterTest.java |    1 +
 .../component/cxf/CxfGreeterPayLoadRouterTest.java |    1 +
 .../CxfGreeterPayLoadWithFeatureRouterTest.java    |    1 +
 .../cxf/CxfGreeterWSDLOnlyRouterTest.java          |    1 +
 .../cxf/CxfJavaOnlyCamelContextAwareTest.java      |    1 -
 .../component/cxf/CxfJavaOnlyPayloadModeTest.java  |    2 +-
 .../component/cxf/CxfMessageHeaderTimeoutTest.java |    1 +
 .../component/cxf/CxfMixedModeRouterTest.java      |    2 +-
 .../camel/component/cxf/CxfOneWayRouteTest.java    |    1 -
 .../component/cxf/CxfPayLoadBareSoapTest.java      |    2 +-
 ...CxfPayLoadMessageRouterAddressOverrideTest.java |    1 -
 .../component/cxf/CxfPayLoadMessageRouterTest.java |    1 -
 .../cxf/CxfPayLoadMessageXmlBindingRouterTest.java |    1 -
 .../cxf/CxfPayLoadSoapHeaderTestAbstract.java      |    1 -
 .../cxf/CxfPayloadProviderRouterTest.java          |    1 +
 .../cxf/CxfPayloadWsdlWithoutSEITest.java          |    1 +
 .../camel/component/cxf/CxfProducerRouterTest.java |    1 +
 .../cxf/CxfProducerSynchronousFalseTest.java       |    1 +
 .../component/cxf/CxfProducerSynchronousTest.java  |    1 +
 .../CxfRawMessageRouterAddressOverrideTest.java    |    1 -
 .../component/cxf/CxfSoapMessageProviderTest.java  |    1 -
 .../cxf/CxfSpringCustomizedExceptionTest.java      |    1 -
 .../apache/camel/component/cxf/CxfTimeoutTest.java |    3 +-
 .../component/cxf/CxfWsdlFirstPayloadModeTest.java |    1 +
 .../component/cxf/CxfWsdlFirstProcessorTest.java   |    1 +
 .../camel/component/cxf/CxfWsdlFirstTest.java      |    1 +
 .../camel/component/cxf/DefaultCxfBindingTest.java |    1 +
 .../camel/component/cxf/FailOverFeatureTest.java   |    1 +
 .../camel/component/cxf/HelloServiceImpl.java      |    1 -
 .../component/cxf/LoadDistributorFeatureTest.java  |    1 +
 .../cxf/LoggingInterceptorInMessageModeTest.java   |    3 +-
 .../camel/component/cxf/RouteBuilderCxfTracer.java |    3 +-
 .../apache/camel/component/cxf/SoapTargetBean.java |    1 -
 .../cxf/converter/MyCxfCustomerConverter.java      |    1 -
 .../component/cxf/jaxrs/CxfRsConsumerTest.java     |    2 +-
 .../cxf/jaxrs/CxfRsSslAsyncProducerTest.java       |    1 -
 .../component/cxf/jaxrs/CxfRsStreamCacheTest.java  |    1 -
 .../CxfRsConsumerSimpleBindingTest.java            |    1 +
 .../jaxrs/testbean/CustomerServiceResource.java    |    1 -
 .../cxf/mtom/CxfMtomConsumerPayloadModeTest.java   |    1 -
 .../component/cxf/mtom/CxfMtomConsumerTest.java    |    1 -
 .../CxfMtomDisabledProducerPayloadModeTest.java    |    1 -
 .../cxf/mtom/CxfMtomProducerPayloadModeTest.java   |    1 -
 .../cxf/mtom/CxfMtomRouterCxfMessageModeTest.java  |    1 -
 .../cxf/mtom/CxfMtomRouterRawModeTest.java         |    1 -
 .../camel/component/cxf/noparam/NoParamTest.java   |    1 +
 .../cxf/soap/headers/HeaderTesterImpl.java         |    2 -
 .../headers/HeaderTesterWithInsertionImpl.java     |    1 -
 .../cxf/spring/FileToCxfMessageDataFormatTest.java |    1 +
 .../apache/camel/component/cxf/ssl/SslTest.java    |    3 +-
 .../component/cxf/util/CxfUtilsTestHelper.java     |    1 +
 .../camel/component/cxf/wsa/WSAddressingTest.java  |    1 +
 .../apache/camel/component/cxf/wsdl/OrderTest.java |    1 +
 .../apache/camel/component/cxf/wsrm/WSRMTest.java  |    1 +
 .../cxf/wssecurity/camel/WSSecurityRouteTest.java  |    1 +
 .../component/cxf/wssecurity/client/Client.java    |    1 -
 .../cxf/wssecurity/client/UTPasswordCallback.java  |    2 -
 .../cxf/wssecurity/server/UTPasswordCallback.java  |    2 -
 .../component/debezium/DebeziumConstants.java      |    1 -
 .../camel/component/debezium/DebeziumConsumer.java |    1 -
 .../camel/component/debezium/DebeziumEndpoint.java |    3 +-
 .../EmbeddedDebeziumConfiguration.java             |    1 -
 .../component/debezium/DebeziumConsumerTest.java   |    3 +-
 .../component/debezium/DebeziumEndpointTest.java   |    3 +-
 .../debezium/DebeziumTypeConverterTest.java        |    2 +-
 .../EmbeddedDebeziumConfigurationTest.java         |    2 +-
 ...FileConnectorEmbeddedDebeziumConfiguration.java |    1 +
 .../maven/GenerateConnectorConfigMojoTest.java     |    2 +-
 .../maven/config/ConnectorConfigFieldTest.java     |    2 +-
 .../config/ConnectorConfigFieldsFactoryTest.java   |    3 +-
 .../maven/config/ConnectorConfigGeneratorTest.java |    2 +-
 .../debezium/DebeziumMongodbComponentTest.java     |    2 +-
 ...ConnectorEmbeddedDebeziumConfigurationTest.java |    2 +-
 .../debezium/DebeziumMySqlComponentTest.java       |    2 +-
 ...ConnectorEmbeddedDebeziumConfigurationTest.java |    2 +-
 .../debezium/DebeziumPostgresComponentTest.java    |    2 +-
 ...ConnectorEmbeddedDebeziumConfigurationTest.java |    2 +-
 .../debezium/DebeziumSqlserverComponentTest.java   |    2 +-
 ...ConnectorEmbeddedDebeziumConfigurationTest.java |    2 +-
 .../digitalocean/DigitalOceanConfiguration.java    |    1 -
 .../digitalocean/DigitalOceanComponentTest.java    |    1 -
 .../disruptor/AbstractSynchronizedExchange.java    |    2 +-
 .../LifecycleAwareExchangeEventHandler.java        |    3 +-
 .../DisruptorWaitForTaskIfReplyExpectedTest.java   |    1 -
 .../FileDisruptorShutdownCompleteAllTasksTest.java |    1 +
 .../disruptor/SedaDisruptorCompareTest.java        |    1 +
 .../camel/component/dns/DnsConfiguration.java      |    1 -
 .../component/dns/cloud/DnsServiceDiscovery.java   |    1 -
 .../camel/component/dns/policy/DnsActivation.java  |    2 -
 .../component/docker/DockerClientFactory.java      |    1 -
 .../camel/component/docker/DockerOperation.java    |    1 -
 .../component/docker/ssl/NoImplSslConfig.java      |    1 +
 .../component/docker/RemoveImageCmdUriTest.java    |    1 -
 .../docker/headers/AuthCmdHeaderTest.java          |    1 -
 .../docker/headers/BaseDockerHeaderTest.java       |    1 -
 .../docker/headers/BuildImageCmdHeaderTest.java    |    1 -
 .../headers/CommitContainerCmdHeaderTest.java      |    1 -
 .../headers/CopyFileContainerCmdHeaderTest.java    |    1 -
 .../headers/CreateContainerCmdHeaderTest.java      |    1 -
 .../docker/headers/CreateImageCmdHeaderTest.java   |    1 -
 .../docker/headers/DiffContainerCmdHeaderTest.java |    3 +-
 .../docker/headers/ExecCreateCmdHeaderTest.java    |    1 -
 .../docker/headers/InfoCmdHeaderTest.java          |    3 +-
 .../headers/InspectContainerCmdHeaderTest.java     |    1 -
 .../docker/headers/InspectImageCmdHeaderTest.java  |    1 -
 .../docker/headers/KillContainerCmdHeaderTest.java |    1 -
 .../headers/ListContainersCmdHeaderTest.java       |    1 -
 .../docker/headers/ListImagesCmdHeaderTest.java    |    1 -
 .../headers/PauseContainerCmdHeaderTest.java       |    1 -
 .../docker/headers/PingCmdHeaderTest.java          |    3 +-
 .../headers/RemoveContainerCmdHeaderTest.java      |    1 -
 .../docker/headers/RemoveImageCmdHeaderTest.java   |    1 -
 .../headers/RestartContainerCmdHeaderTest.java     |    1 -
 .../docker/headers/SearchImagesCmdHeaderTest.java  |    1 -
 .../headers/StartContainerCmdHeaderTest.java       |    1 -
 .../docker/headers/StopContainerCmdHeaderTest.java |    1 -
 .../docker/headers/TagImageCmdHeaderTest.java      |    1 -
 .../docker/headers/TopContainerCmdHeaderTest.java  |    1 -
 .../headers/UnpauseContainerCmdHeaderTest.java     |    1 -
 .../docker/headers/VersionCmdHeaderTest.java       |    3 +-
 .../it/DockerCustomCmdExecFactoryTestIT.java       |    1 -
 .../component/docker/it/DockerITTestSupport.java   |    2 +-
 .../docker/it/DockerNettyCmdExecFactoryTestIT.java |    1 -
 .../component/dozer/example/abc/ABCOrder.java      |    1 -
 .../component/dozer/example/abc/ObjectFactory.java |    1 -
 .../component/dozer/example/xyz/LineItem.java      |    1 -
 .../component/dozer/example/xyz/XYZOrder.java      |    1 -
 .../converter/dozer/DozerTypeConverterDTOTest.java |    1 +
 .../converter/dozer/DozerTypeConverterTest.java    |    1 +
 .../camel/converter/dozer/dto/CustomerDTO.java     |    1 -
 .../camel/component/drill/DrillEndpoint.java       |    1 -
 .../dropbox/DropboxComponentVerifierExtension.java |    1 -
 .../dropbox/dto/DropboxFileUploadResult.java       |    1 -
 .../consumer/DropboxScheduledPollConsumer.java     |    1 -
 .../dropbox/integration/DropboxTestSupport.java    |    2 +-
 .../producer/DropboxProducerDelTest.java           |    1 +
 .../producer/DropboxProducerGetFolderTest.java     |    1 +
 .../producer/DropboxProducerGetSingleTest.java     |    1 +
 .../producer/DropboxProducerMoveTest.java          |    1 +
 .../producer/DropboxProducerPutSingleFileTest.java |    1 +
 .../producer/DropboxProducerSearchQueryTest.java   |    1 +
 .../EhcacheAggregationRepositoryOperationTest.java |    1 +
 .../EhcacheAggregationRepositoryRoutesTest.java    |    1 -
 .../elasticsearch/ElasticsearchProducer.java       |    6 +-
 .../ElasticsearchScrollRequestIterator.java        |    2 +-
 .../ElasticsearchActionRequestConverter.java       |    1 +
 .../elasticsearch/ElasticsearchBulkTest.java       |    2 +
 .../camel/component/elsql/ElsqlComponent.java      |    1 +
 .../camel/component/elsql/ElsqlEndpoint.java       |    1 +
 .../camel/component/elsql/ElsqlProducer.java       |    1 +
 .../component/etcd/policy/EtcdRoutePolicy.java     |    2 +-
 .../etcd/cloud/EtcdServiceCallRouteTest.java       |    1 +
 .../etcd/cloud/EtcdServiceDiscoveryTest.java       |    1 +
 .../SpringEtcdServiceCallDefaultRouteTest.java     |    1 +
 .../etcd/cloud/SpringEtcdServiceCallRouteTest.java |    1 +
 .../component/eventadmin/EventAdminConsumer.java   |    1 +
 .../apache/camel/component/exec/ExecCommand.java   |    1 +
 .../apache/camel/component/exec/ExecException.java |    1 +
 .../component/exec/impl/DefaultExecBinding.java    |    1 +
 .../camel/component/exec/ExecEndpointTest.java     |    2 -
 .../camel/component/exec/ExecOutFileTest.java      |    2 -
 .../camel/component/exec/ExecProducerTest.java     |    2 -
 .../exec/impl/ExecDocumentationExamplesTest.java   |    1 -
 .../config/FacebookEndpointConfiguration.java      |    1 -
 .../facebook/data/FacebookMethodsTypeHelper.java   |    2 -
 .../facebook/FacebookComponentConsumerTest.java    |    1 -
 .../component/facebook/TestUserMethodsTest.java    |    3 -
 .../config/FacebookEndpointConfigurationTest.java  |    1 -
 .../data/FacebookMethodsTypeHelperTest.java        |    2 -
 .../facebook/data/FacebookMethodsTypeTest.java     |    2 -
 .../fastjson/FastjsonJsonDataFormatTest.java       |    3 +-
 .../camel/component/fhir/api/ExtraParameters.java  |    1 +
 .../camel/component/fhir/api/FhirCapabilities.java |    1 +
 .../camel/component/fhir/api/FhirCreate.java       |    1 +
 .../camel/component/fhir/api/FhirDelete.java       |    1 +
 .../camel/component/fhir/api/FhirHistory.java      |    1 +
 .../camel/component/fhir/api/FhirLoadPage.java     |    1 +
 .../apache/camel/component/fhir/api/FhirMeta.java  |    1 +
 .../camel/component/fhir/api/FhirOperation.java    |    3 +-
 .../apache/camel/component/fhir/api/FhirPatch.java |    1 +
 .../apache/camel/component/fhir/api/FhirRead.java  |    1 +
 .../camel/component/fhir/api/FhirSearch.java       |    1 +
 .../camel/component/fhir/api/FhirTransaction.java  |    3 +-
 .../camel/component/fhir/api/FhirUpdate.java       |    1 +
 .../camel/component/fhir/api/FhirValidate.java     |    1 +
 .../camel/component/fhir/FhirDataFormat.java       |    1 +
 .../apache/camel/component/fhir/FhirEndpoint.java  |    1 +
 .../camel/component/fhir/FhirJsonDataFormat.java   |    1 +
 .../camel/component/fhir/FhirXmlDataFormat.java    |    1 +
 .../component/fhir/AbstractFhirTestSupport.java    |    1 +
 .../camel/component/fhir/FhirCapabilitiesIT.java   |    1 +
 .../camel/component/fhir/FhirConfigurationIT.java  |    1 +
 .../apache/camel/component/fhir/FhirCreateIT.java  |    1 +
 .../fhir/FhirCustomClientConfigurationIT.java      |    2 +-
 .../apache/camel/component/fhir/FhirDeleteIT.java  |    1 +
 .../component/fhir/FhirExtraParametersIT.java      |    1 +
 .../apache/camel/component/fhir/FhirHistoryIT.java |    1 +
 .../camel/component/fhir/FhirLoadPageIT.java       |    1 +
 .../apache/camel/component/fhir/FhirMetaIT.java    |    1 +
 .../camel/component/fhir/FhirOperationIT.java      |    1 -
 .../apache/camel/component/fhir/FhirPatchIT.java   |    1 +
 .../apache/camel/component/fhir/FhirReadIT.java    |    1 +
 .../camel/component/fhir/FhirTransactionIT.java    |    1 +
 .../apache/camel/component/fhir/FhirUpdateIT.java  |    1 +
 .../Hl7v2PatientToFhirPatientIntegrationTest.java  |    1 +
 .../fhir/dataformat/FhirJsonDataFormatTest.java    |    3 +-
 .../spring/FhirDataformatConfigSpringTest.java     |    1 +
 .../spring/FhirJsonDataFormatSpringTest.java       |    3 +-
 .../spring/FhirXmlDataFormatSpringTest.java        |    3 +-
 .../component/file/watch/constants/FileEvent.java  |  109 +-
 .../camel/component/flatpack/CharsetTest.java      |    1 -
 .../component/flatpack/DelimitedAllowLongTest.java |    1 -
 .../flatpack/DelimitedErrorWithUnmarshalTest.java  |    1 -
 .../camel/component/flatpack/DelimitedTest.java    |    1 -
 .../flatpack/DelimitedWithUnmarshalTest.java       |    1 -
 .../flatpack/FixedLengthAllowLongTest.java         |    1 +
 .../flatpack/FixedLengthAllowShortTest.java        |    1 +
 .../camel/component/flatpack/FixedLengthTest.java  |    1 +
 .../flatpack/FixedLengthWithUnmarshalTest.java     |    1 +
 .../camel/component/flatpack/NoSplitRowsTest.java  |    1 +
 .../component/flink/ConvertingDataSetCallback.java |    6 +-
 .../component/flink/DataStreamFlinkProducer.java   |    3 +-
 .../camel/component/flink/FlinkProducerTest.java   |    1 -
 .../component/freemarker/FreemarkerEndpoint.java   |    3 +-
 .../freemarker/FreemarkerSetHeaderTest.java        |    4 +-
 .../component/file/remote/SftpOperations.java      |    1 -
 .../FtpChangedExclusiveReadLockStrategy.java       |    2 +-
 .../file/remote/FromFtpRecursiveNoopTest.java      |    1 +
 .../FtpBadLoginMockNoopConnectionLeakTest.java     |    1 +
 .../file/remote/FtpConsumerDisconnectTest.java     |    3 +-
 .../remote/FtpConsumerRelativeFileNameTest.java    |    3 +-
 ...pProducerAllowNullBodyFileAlreadyExistTest.java |    3 +-
 .../FtpProducerDisconnectOnBatchCompleteTest.java  |    3 +-
 .../file/remote/FtpProducerDisconnectTest.java     |    3 +-
 .../remote/FtpProducerFileWithCharsetTest.java     |    3 +-
 .../file/remote/OsgiParserFactoryTest.java         |    2 +-
 .../component/file/remote/PaddyRouteTest.java      |    3 +-
 .../RemoteFileProduceOverruleOnlyOnceTest.java     |    1 +
 .../remote/manual/FtpConsumerCamelManualTest.java  |    3 +-
 .../FtpConsumerCamelRecursiveManualTest.java       |    3 +-
 ...ConsumerCamelRecursiveToAbsoluteManualTest.java |    3 +-
 .../FtpConsumerNotStepwiseCamelManualTest.java     |    3 +-
 ...onsumerNotStepwiseCamelRecursiveManualTest.java |    3 +-
 ...StepwiseCamelRecursiveToAbsoluteManualTest.java |    3 +-
 .../remote/manual/FtpConsumerScottManualTest.java  |    1 +
 .../FtpConsumerScottRecursiveManualTest.java       |    3 +-
 .../file/remote/sftp/SftpChangedReadLockTest.java  |    1 +
 .../sftp/SftpSimpleConsumeThroughProxyTest.java    |    1 -
 .../sftp/SftpSimpleProduceThroughProxyTest.java    |    1 -
 .../component/ganglia/GangliaConfiguration.java    |    1 -
 .../component/ganglia/GangliaProducerTest.java     |    1 -
 .../ganglia/GangliaProtocolV30CamelTest.java       |    3 -
 .../ganglia/GangliaProtocolV31CamelTest.java       |    4 -
 .../component/geocoder/GeoCoderProxyTest.java      |    1 -
 .../bigquery/sql/GoogleBigQuerySQLComponent.java   |    1 +
 .../bigquery/sql/GoogleBigQuerySQLEndpoint.java    |    1 -
 .../bigquery/sql/GoogleBigQuerySQLProducer.java    |    1 -
 .../component/google/bigquery/sql/SqlHelper.java   |    1 -
 .../bigquery/integration/BigQueryTestSupport.java  |    1 -
 .../integration/sql/SqlQueryFromResourceTest.java  |    1 +
 .../bigquery/integration/sql/SqlQueryTest.java     |    1 +
 .../google/bigquery/unit/BaseBigQueryTest.java     |    1 -
 .../google/calendar/GoogleCalendarEndpoint.java    |    1 -
 .../stream/GoogleCalendarStreamConsumer.java       |    1 -
 .../AbstractGoogleCalendarTestSupport.java         |    1 -
 .../CalendarCalendarListIntegrationTest.java       |    2 -
 .../calendar/CalendarCalendarsIntegrationTest.java |    1 -
 .../calendar/CalendarEventsIntegrationTest.java    |    1 -
 .../calendar/CalendarFreebusyIntegrationTest.java  |    1 -
 .../drive/InteractiveGoogleDriveClientFactory.java |    2 +-
 .../google/drive/FileConverterIntegrationTest.java |    1 +
 .../google/drive/FilesConsumerIntegrationTest.java |    1 -
 .../google/mail/BatchGoogleMailClientFactory.java  |    1 -
 .../component/google/mail/GoogleMailComponent.java |    1 -
 .../mail/GoogleMailComponentVerifierExtension.java |    3 +-
 .../component/google/mail/GoogleMailEndpoint.java  |    1 -
 .../mail/stream/GoogleMailStreamComponent.java     |    1 -
 ...GoogleMailStreamComponentVerifierExtension.java |    3 +-
 .../mail/stream/GoogleMailStreamConsumer.java      |    1 -
 .../mail/GmailUsersLabelsIntegrationTest.java      |    1 -
 .../GmailUsersMessagesConsumerIntegrationTest.java |    1 -
 .../mail/GmailUsersMessagesIntegrationTest.java    |    1 -
 .../mail/GmailUsersThreadsIntegrationTest.java     |    1 -
 .../pubsub/consumer/PubsubAcknowledgement.java     |    1 -
 .../google/pubsub/integration/AckModeNoneTest.java |    1 +
 .../pubsub/integration/AcknowledgementTest.java    |    1 +
 .../google/pubsub/integration/BodyTypesTest.java   |    1 +
 .../integration/GroupedExchangeRoundtripTest.java  |    1 +
 .../integration/SingleExchangeRoundtripTest.java   |    1 +
 .../google/sheets/GoogleSheetsComponent.java       |    1 -
 .../google/sheets/GoogleSheetsConsumer.java        |    1 -
 .../sheets/AbstractGoogleSheetsTestSupport.java    |    1 -
 .../sheets/server/GoogleSheetsApiTestServer.java   |    1 -
 .../apache/camel/component/gora/GoraComponent.java |    2 +-
 .../apache/camel/component/gora/GoraConsumer.java  |    1 +
 .../camel/component/grape/GrapeComponent.java      |    1 -
 .../camel/component/grape/GrapeEndpoint.java       |    1 -
 .../camel/component/grape/GrapeProducer.java       |    1 -
 .../component/graphql/GraphqlComponentTest.java    |    1 -
 .../language/groovy/GroovySetFixedHeaderTest.java  |    2 +-
 .../org/apache/camel/component/grpc/GrpcUtils.java |    4 +-
 .../component/grpc/server/GrpcMethodHandler.java   |    4 +-
 .../GrpcRequestAggregationStreamObserver.java      |    4 +-
 .../GrpcRequestPropagationStreamObserver.java      |    4 +-
 .../component/grpc/GrpcConsumerSecurityTest.java   |    2 +-
 .../component/grpc/GrpcProducerAsyncTest.java      |    1 +
 .../component/grpc/GrpcProducerSecurityTest.java   |    1 +
 .../camel/component/grpc/GrpcProducerSyncTest.java |    1 +
 .../camel/component/gson/GsonDataFormatTest.java   |    1 +
 .../component/gson/GsonJsonDataFormatTest.java     |    3 +-
 .../camel/component/gson/GsonMarshalListTest.java  |    1 -
 .../guava/eventbus/CamelEventHandler.java          |    2 +-
 .../guava/eventbus/GuavaEventBusComponent.java     |    2 +-
 .../guava/eventbus/GuavaEventBusComponentTest.java |    1 -
 .../guava/eventbus/GuavaEventBusConsumerTest.java  |    1 -
 .../GuavaEventBusConsumingDeadEventsTest.java      |    1 -
 .../guava/eventbus/GuavaEventBusProducerTest.java  |    1 -
 .../hazelcast/HazelcastDefaultComponent.java       |    1 -
 .../HazelcastAtomicnumberComponent.java            |    1 -
 .../HazelcastAtomicnumberProducer.java             |    1 -
 .../instance/HazelcastInstanceComponent.java       |    1 -
 .../hazelcast/list/HazelcastListComponent.java     |    1 -
 .../hazelcast/list/HazelcastListConsumer.java      |    1 -
 .../hazelcast/list/HazelcastListEndpoint.java      |    2 +-
 .../hazelcast/list/HazelcastListProducer.java      |    1 -
 .../hazelcast/listener/CamelEntryListener.java     |    3 +-
 .../hazelcast/listener/CamelItemListener.java      |    1 -
 .../hazelcast/listener/CamelMapListener.java       |    2 +-
 .../hazelcast/map/HazelcastMapComponent.java       |    1 -
 .../hazelcast/map/HazelcastMapProducer.java        |    1 -
 .../multimap/HazelcastMultimapComponent.java       |    1 -
 .../multimap/HazelcastMultimapConsumer.java        |    1 -
 .../multimap/HazelcastMultimapProducer.java        |    1 -
 .../hazelcast/queue/HazelcastQueueComponent.java   |    1 -
 .../hazelcast/queue/HazelcastQueueConsumer.java    |    1 -
 .../hazelcast/queue/HazelcastQueueEndpoint.java    |    1 -
 .../hazelcast/queue/HazelcastQueueProducer.java    |    3 +-
 .../HazelcastReplicatedmapComponent.java           |    1 -
 .../HazelcastReplicatedmapConsumer.java            |    1 -
 .../HazelcastReplicatedmapProducer.java            |    1 -
 .../ringbuffer/HazelcastRingbufferComponent.java   |    1 -
 .../ringbuffer/HazelcastRingbufferProducer.java    |    1 -
 .../hazelcast/seda/HazelcastSedaComponent.java     |    1 -
 .../hazelcast/seda/HazelcastSedaConsumer.java      |    1 -
 .../hazelcast/set/HazelcastSetComponent.java       |    1 -
 .../hazelcast/set/HazelcastSetConsumer.java        |    1 -
 .../hazelcast/set/HazelcastSetEndpoint.java        |    2 +-
 .../hazelcast/set/HazelcastSetProducer.java        |    1 -
 .../hazelcast/topic/HazelcastTopicComponent.java   |    1 -
 .../hazelcast/HazelcastAggregationRepository.java  |    1 -
 ...HazelcastAtomicnumberProducerForSpringTest.java |    1 -
 .../HazelcastAtomicnumberProducerTest.java         |    1 -
 .../hazelcast/HazelcastCamelTestHelper.java        |    1 -
 .../hazelcast/HazelcastCamelTestSupport.java       |    1 +
 ...stComponentInstanceReferenceNameSpringTest.java |    1 -
 ...elcastComponentInstanceReferenceSpringTest.java |    1 -
 .../hazelcast/HazelcastInstanceConsumerTest.java   |    2 -
 .../hazelcast/HazelcastListProducerTest.java       |    1 -
 .../HazelcastMapProducerForSpringTest.java         |    1 -
 .../hazelcast/HazelcastMapProducerTest.java        |    1 -
 .../hazelcast/HazelcastMultimapConsumerTest.java   |    1 -
 .../HazelcastMultimapProducerForSpringTest.java    |    1 -
 .../hazelcast/HazelcastMultimapProducerTest.java   |    1 -
 .../hazelcast/HazelcastQueueProducerTest.java      |    3 +-
 .../HazelcastReplicatedmapConsumerTest.java        |    1 -
 ...azelcastReplicatedmapProducerForSpringTest.java |    1 -
 .../HazelcastReplicatedmapProducerTest.java        |    1 -
 .../HazelcastRingbufferProducerForSpringTest.java  |    1 -
 .../hazelcast/HazelcastRingbufferProducerTest.java |    1 -
 ...zelcastSedaRecoverableConsumerRollbackTest.java |    1 -
 .../hazelcast/HazelcastSetConsumerTest.java        |    1 -
 .../hazelcast/HazelcastSetProducerTest.java        |    1 -
 ...lcastAggregationRepositoryCamelTestSupport.java |    1 -
 ...lcastAggregationRepositoryConstructorsTest.java |    1 -
 ...zelcastAggregationRepositoryOperationsTest.java |    1 -
 ...AggregationRepositoryRecoverableRoutesTest.java |    1 -
 .../HazelcastAggregationRepositoryRoutesTest.java  |    1 -
 .../HazelcastIdempotentRepositoryTest.java         |    1 +
 .../apache/camel/component/hbase/HBaseHelper.java  |    1 +
 .../hbase/mapping/CellMappingStrategyFactory.java  |    1 +
 .../hbase/mapping/HeaderMappingStrategy.java       |    1 +
 .../camel/component/hbase/model/HBaseData.java     |    1 +
 .../camel/component/hbase/model/HBaseRow.java      |    1 +
 .../hdfs/kerberos/KerberosAuthentication.java      |    4 +-
 .../camel/component/hdfs/FromFileToHdfsTest.java   |    1 +
 .../apache/camel/component/hdfs/HdfsInfoTest.java  |    2 +-
 .../component/hdfs/HdfsProducerConsumerTest.java   |    1 +
 .../component/hdfs/HdfsProducerSplitTest.java      |    1 +
 .../camel/component/hdfs/HdfsProducerTest.java     |    1 +
 .../component/hdfs/integration/HdfsAppendTest.java |    1 +
 .../camel/component/hipchat/HipchatConsumer.java   |    1 -
 .../camel/component/hipchat/HipchatProducer.java   |    1 -
 .../HipchatXmlDefinedComponentProducerTest.java    |    2 +-
 .../camel/component/hl7/AckExpressionTest.java     |    1 +
 .../camel/component/hl7/HL7ByteArrayRouteTest.java |    1 -
 .../component/hl7/HL7MLLPCodecBoundaryTest.java    |    2 -
 .../camel/component/hl7/HL7MLLPCodecLongTest.java  |    1 -
 .../hl7/HL7MLLPCodecMessageFloodingTest.java       |    1 -
 .../hl7/HL7MLLPCodecStandAndEndBytesTest.java      |    1 -
 .../camel/component/hl7/HL7MLLPCodecTest.java      |    1 -
 .../hl7/HL7MLLPNettyCodecBoundaryTest.java         |    1 -
 .../hl7/HL7MLLPNettyCodecByteArrayRouteTest.java   |    1 -
 .../component/hl7/HL7MLLPNettyCodecLongTest.java   |    1 -
 .../hl7/HL7MLLPNettyCodecStandAndEndBytesTest.java |    1 -
 .../camel/component/hl7/HL7MLLPNettyCodecTest.java |    1 -
 .../hl7/HL7MLLPNettyDecoderResourceLeakTest.java   |    1 -
 .../component/hl7/HL7MLLPNettyRouteToTest.java     |    1 -
 .../camel/component/hl7/HL7NettyRouteTest.java     |    1 -
 .../apache/camel/component/hl7/HL7RouteTest.java   |    1 -
 .../camel/component/hl7/TerserExpressionTest.java  |    1 -
 .../camel/http/common/CamelFileDataSource.java     |    1 +
 .../org/apache/camel/http/common/CamelServlet.java |    1 +
 .../camel/http/common/DefaultHttpBinding.java      |    1 +
 .../org/apache/camel/http/common/HttpBinding.java  |    1 +
 .../apache/camel/http/common/HttpConverter.java    |    1 +
 .../org/apache/camel/http/common/HttpHelper.java   |    1 +
 .../org/apache/camel/http/common/HttpMessage.java  |    1 +
 .../HttpRestServletResolveConsumerStrategy.java    |    1 +
 .../common/HttpServletResolveConsumerStrategy.java |    1 +
 .../common/ServletResolveConsumerStrategy.java     |    1 +
 .../http/common/HttpSendDynamicAwareTest.java      |  165 +-
 .../apache/camel/component/http/HttpComponent.java |    1 +
 .../apache/camel/component/http/HttpEndpoint.java  |    1 +
 .../org/apache/camel/component/http/HttpUtil.java  |    1 -
 .../camel/component/http/HeaderFilteringTest.java  |    1 -
 .../apache/camel/component/http/HttpBodyTest.java  |    1 -
 .../component/http/HttpsServerTestSupport.java     |    1 +
 .../component/http/helper/HttpHelperTest.java      |    1 -
 .../hystrix/processor/HystrixManagementTest.java   |    1 +
 .../apache/camel/component/ical/ICalConverter.java |    1 -
 .../camel/component/ical/ICalDataFormat.java       |    1 -
 .../camel/component/ical/ICalDataFormatTest.java   |    1 -
 .../component/iec60870/AbstractIecComponent.java   |    4 +-
 .../component/iec60870/AbstractIecEndpoint.java    |    4 +-
 .../component/iec60870/client/ClientEndpoint.java  |    4 +-
 .../component/iec60870/server/ServerEndpoint.java  |    4 +-
 .../component/iec60870/server/ServerInstance.java  |    4 +-
 .../component/ignite/AbstractIgniteComponent.java  |    1 +
 .../ignite/IgniteCacheContinuousQueryTest.java     |    1 -
 .../camel/component/ignite/IgniteCacheTest.java    |    1 -
 .../camel/component/ignite/IgniteComputeTest.java  |    1 -
 .../camel/component/ignite/IgniteEventsTest.java   |    1 -
 .../component/ignite/IgniteMessagingTest.java      |    1 -
 .../camel/component/ignite/IgniteQueueTest.java    |    1 -
 .../camel/component/ignite/IgniteSetTest.java      |    1 -
 .../ignite/TestIgniteComputeResources.java         |    1 -
 .../InfinispanClusteredConsumerTest.java           |    1 +
 .../infinispan/InfinispanProducerTest.java         |    1 -
 ...anLocalAggregationRepositoryOperationsTest.java |    1 +
 .../InfinispanLocalAggregationRepositoryTest.java  |    1 -
 .../SpringInfinispanIdempotentRepositoryIT.java    |    2 +-
 .../influxdb/MockedInfluxDbConfiguration.java      |    4 +-
 .../converters/CamelInfluxDbConverterTest.java     |    1 -
 .../apache/camel/component/iota/IOTAEndpoint.java  |    2 -
 .../apache/camel/component/iota/IOTAProducer.java  |    2 -
 .../camel/component/ipfs/IPFSConfiguration.java    |    1 -
 .../apache/camel/component/ipfs/IPFSEndpoint.java  |    2 -
 .../apache/camel/component/ipfs/IPFSProducer.java  |    1 -
 .../camel/component/ipfs/SimpleIPFSTest.java       |    1 -
 .../apache/camel/component/irc/IrcComponent.java   |    1 -
 .../camel/component/irc/CodehausIrcChat.java       |    1 -
 .../irc/it/IrcIntegrationTestSupport.java          |    1 +
 .../component/irc/it/IrcMultiChannelRouteTest.java |    1 +
 .../camel/component/irc/it/IrcOnReplyTest.java     |    1 +
 .../apache/camel/component/ironmq/GsonUtil.java    |    1 -
 .../component/ironmq/IronMQConfiguration.java      |    1 -
 .../camel/component/ironmq/IronMQConsumer.java     |    1 -
 .../camel/component/ironmq/IronMQEndpoint.java     |    1 -
 .../camel/component/ironmq/IronMQProducer.java     |    1 -
 .../component/ironmq/FromQueueToQueueTest.java     |    1 -
 .../component/ironmq/IronMQBatchConsumerTest.java  |    2 -
 .../ironmq/IronMQBatchDeleteConsumerTest.java      |    2 -
 .../component/ironmq/IronMQBatchProducerTest.java  |    2 -
 .../JacksonNotUseDefaultObjectMapperTest.java      |    1 -
 .../jackson/JacksonObjectMapperRegistryTest.java   |    3 -
 .../component/jacksonxml/JacksonXMLDataFormat.java |    1 -
 .../component/jasypt/JasyptPropertiesParser.java   |    4 +-
 .../jasypt/JasyptPropertiesParserTest.java         |    5 +-
 .../converter/jaxb/FallbackTypeConverter.java      |    1 +
 .../apache/camel/converter/jaxb/JaxbHelper.java    |    1 +
 .../converter/jaxb/address/ObjectFactory.java      |    1 -
 .../converter/jaxb/message/ObjectFactory.java      |    1 -
 .../camel/converter/jaxb/person/ObjectFactory.java |    1 -
 .../apache/camel/converter/jaxb/person/Person.java |    2 +-
 .../camel/example/DataFormatConcurrentTest.java    |    3 +-
 .../ExplicitEncodingAndXMLCharFilteringTest.java   |    2 +-
 .../camel/example/ExplicitFileEncodingTest.java    |    1 +
 .../apache/camel/example/SpringDataFormatTest.java |    4 +-
 .../org/apache/camel/foo/bar/ObjectFactory.java    |    1 -
 .../java/org/apache/camel/foo/bar/PersonType.java  |    1 -
 ...melJaxbNoNamespaceSchemaLocationSpringTest.java |    1 -
 .../camel/jaxb/CamelJaxbNoNamespaceSchemaTest.java |    1 -
 .../org/apache/camel/jaxb/CamelJaxbSpringTest.java |    1 -
 .../java/org/apache/camel/jaxb/CamelJaxbTest.java  |    1 -
 ...backTypeConverterObjectFactoryDisabledTest.java |    3 +-
 ...lbackTypeConverterObjectFactoryEnabledTest.java |    3 +-
 ...lbackTypeConverterShouldThrowExceptionTest.java |    3 +-
 .../SplitterAndExceptionRouteTwistIssueTest.java   |    1 +
 .../workitem/GlobalContextCamelCommandTest.java    |    2 +-
 .../component/jcache/JCacheConfiguration.java      |    1 +
 .../component/jcache/JCacheEntryEventFilters.java  |    1 +
 .../camel/component/jcache/JCacheManager.java      |    1 +
 .../camel/component/jcache/JCacheProducer.java     |    1 +
 .../component/jcache/osgi/OSGiCacheManager.java    |    1 +
 .../component/jcache/policy/JCachePolicy.java      |    1 +
 .../jcache/policy/JCachePolicyProcessor.java       |    1 -
 .../aggregate/JCacheAggregationRepository.java     |    1 +
 .../jcache/JCacheComponentTestSupport.java         |    1 +
 .../component/jcache/JCacheConfigurationTest.java  |    1 +
 .../component/jcache/JCacheProducerClearTest.java  |    1 +
 .../component/jcache/JCacheProducerGetTest.java    |    1 +
 .../component/jcache/JCacheProducerInvokeTest.java |    1 +
 .../component/jcache/JCacheProducerPutTest.java    |    1 +
 .../component/jcache/JCacheProducerRemoveTest.java |    1 +
 .../jcache/JCacheProducerReplaceTest.java          |    1 +
 .../policy/CacheManagerFromRegistryTest.java       |    4 +-
 .../jcache/policy/JCachePolicyProcessorTest.java   |    9 +-
 .../component/jcache/policy/JCachePolicyTest.java  |    1 +
 .../jcache/policy/JCachePolicyTestBase.java        |    8 +-
 .../jcache/policy/SpringJCachePolicyTest.java      |    2 +-
 .../JCacheAggregationRepositoryRoutesTest.java     |    1 -
 .../aggregate/JCacheAggregationRepositoryTest.java |    1 -
 .../idempotent/JCacheIdempotentRepositoryTest.java |    1 -
 .../JcloudsFileConsumerStreamCachingIssueTest.java |    1 +
 .../jclouds/JcloudsSpringBlobstoreTest.java        |    1 +
 .../camel/component/jcr/EndpointEventListener.java |    1 +
 .../apache/camel/component/jcr/JcrEndpoint.java    |    1 +
 .../apache/camel/component/jcr/JcrProducer.java    |    1 +
 .../camel/component/jcr/JcrAuthTestBase.java       |    3 +-
 .../camel/component/jcr/JcrRouteTestSupport.java   |    1 +
 .../apache/camel/component/jdbc/JdbcComponent.java |    1 +
 .../apache/camel/component/jdbc/JdbcEndpoint.java  |    1 +
 .../apache/camel/component/jdbc/JdbcProducer.java  |    1 -
 .../camel/component/jdbc/JdbcColumnTypeTest.java   |    1 +
 .../component/jdbc/JdbcGeneratedKeysTest.java      |    1 -
 .../jdbc/JdbcProducerOutputTypeStreamListTest.java |    1 +
 .../component/jetty/CamelContinuationServlet.java  |    1 +
 .../camel/component/jetty/JettyHttpComponent.java  |    1 +
 .../camel/component/jetty/JettyHttpEndpoint.java   |    1 +
 .../camel/component/jetty/MultiPartFilter.java     |    1 -
 .../camel/component/jetty/HttpsAsyncRouteTest.java |    1 +
 .../camel/component/jetty/HttpsRouteTest.java      |    1 +
 .../component/jetty/JettyThreadPoolSizeTest.java   |    1 +
 .../jetty/MultiPartFormWithCustomFilterTest.java   |    1 -
 .../component/jetty/MultiThreadedHttpGetTest.java  |    1 -
 .../jgroups/raft/JGroupsRaftComponent.java         |    1 -
 .../jgroups/raft/JGroupsRaftEndpoint.java          |    3 +-
 .../raft/cluster/ClusterRoleChangeListener.java    |    1 -
 .../raft/cluster/JGroupsRaftClusterView.java       |    1 -
 .../jgroups/raft/JGroupsRaftConsumerTest.java      |    2 +-
 .../component/jgroups/CamelJGroupsReceiver.java    |    2 +-
 .../jgroups/cluster/JGroupsLockClusterView.java    |    1 -
 .../component/jgroups/JGroupsClusterRouteTest.java |    7 +-
 .../component/jgroups/JGroupsClusterTest.java      |    6 +-
 .../component/jgroups/JGroupsComponentTest.java    |    1 +
 .../JGroupsComponentWithChannelPropertiesTest.java |    1 +
 .../component/jgroups/JGroupsConsumerTest.java     |    3 +-
 .../component/jgroups/JGroupsProducerTest.java     |    1 +
 .../jgroups/cluster/JGroupsLockMasterTest.java     |    1 -
 .../component/validator/jing/JingValidator.java    |    1 -
 .../apache/camel/component/jira/JiraEndpoint.java  |    1 -
 .../apache/camel/component/jms/JmsComponent.java   |    1 +
 .../apache/camel/component/jms/JmsEndpoint.java    |    1 +
 .../apache/camel/component/jms/JmsProducer.java    |    3 +-
 .../jms/reply/MessageSelectorCreator.java          |    2 +-
 .../component/jms/ConsumeJmsBytesMessageTest.java  |    2 -
 .../jms/ConsumerTemplateJmsSelectorTest.java       |    2 +-
 .../jms/FileRouteJmsKeepLastModifiedTest.java      |    3 +-
 .../component/jms/FileRouteJmsPreMoveTest.java     |    3 +-
 .../camel/component/jms/FileRouteToJmsTest.java    |    2 +-
 .../component/jms/FileRouteToJmsToFileTest.java    |    2 +-
 .../component/jms/JmsAsyncStartListenerTest.java   |    2 +-
 .../jms/JmsAsyncStartStopListenerTest.java         |    2 +-
 .../component/jms/JmsAsyncStopListenerTest.java    |    2 +-
 .../jms/JmsBatchResequencerJMSPriorityTest.java    |    2 +-
 .../apache/camel/component/jms/JmsBindingTest.java |    1 -
 .../component/jms/JmsConsumeTemplateTest.java      |    2 +-
 .../component/jms/JmsDeadLetterQueueTest.java      |    2 +-
 ...msDeadLetterQueueUsingTransferExchangeTest.java |    2 +-
 .../camel/component/jms/JmsDurableTopicTest.java   |    2 +-
 .../jms/JmsEagerLoadingPropertiesTest.java         |    2 +-
 .../jms/JmsInOnlyWithReplyToHeaderTest.java        |    2 +-
 .../jms/JmsInOnlyWithReplyToHeaderTopicTest.java   |    2 +-
 .../component/jms/JmsInOutBeanReturnNullTest.java  |    2 +-
 .../component/jms/JmsInOutWithNoOutBodyTest.java   |    1 +
 .../component/jms/JmsLoadBalanceFailoverTest.java  |    2 +-
 .../component/jms/JmsMultipleConsumersTest.java    |    2 +-
 .../component/jms/JmsNoRequestTimeoutTest.java     |    2 +-
 .../camel/component/jms/JmsOnCompletionTest.java   |    2 +-
 .../jms/JmsProducerDisableReplyToTest.java         |    2 +-
 .../jms/JmsProduerConcurrentWithReplyTest.java     |    2 +-
 ...sRequestReplyExclusiveReplyToComponentTest.java |    2 +-
 ...RequestReplyExclusiveReplyToConcurrentTest.java |    2 +-
 ...estReplyExclusiveReplyToRemoveAddRouteTest.java |    2 +-
 .../jms/JmsRequestReplyExclusiveReplyToTest.java   |    2 +-
 .../JmsRequestReplyFixedReplyToInEndpointTest.java |    2 +-
 .../JmsRequestReplyManualWithJMSReplyToTest.java   |    2 +-
 ...lyProcessRepliesConcurrentUsingThreadsTest.java |    2 +-
 .../jms/JmsRequestReplySharedReplyToTest.java      |    2 +-
 .../jms/JmsRequestReplyTemporaryCacheNoneTest.java |    2 +-
 .../component/jms/JmsRouteRequestReplyTest.java    |    1 -
 .../jms/JmsRouteTimeoutCheckerIntervalTest.java    |    2 +-
 .../camel/component/jms/JmsRouteTimeoutTest.java   |    2 +-
 .../component/jms/JmsRouteUsingJMSXGroupTest.java  |    2 +-
 .../camel/component/jms/JmsSelectorTest.java       |    2 +-
 .../component/jms/JmsSimpleInOnlyNoMutateTest.java |    2 +-
 .../component/jms/JmsSimpleRequestReply2Test.java  |    2 +-
 .../JmsSimpleRequestReplyFixedReplyQueueTest.java  |    2 +-
 .../component/jms/JmsSimpleRequestReplyTest.java   |    2 +-
 .../component/jms/JmsStreamMessageTypeTest.java    |    1 +
 .../component/jms/JmsTransactedRouteTest.java      |    3 +-
 .../component/jms/JmsTransferExceptionTest.java    |    2 +-
 .../component/jms/JmsUseOriginalBodyTest.java      |    2 +-
 .../camel/component/jms/JmsXMLRouteTest.java       |    1 -
 .../camel/component/jms/JmsXPathHeaderTest.java    |    2 +-
 .../component/jms/PayloadByteArrayJmsTest.java     |    4 +-
 .../JmsEndpointWithCustomDestinationTest.java      |    1 -
 ...cRoutersWithJMSMessageLostHeadersIssueTest.java |    1 +
 ...derKeyFormatIssueWithContentTypeHeaderTest.java |    2 +-
 .../component/jms/issues/JmsInOnlyIssueTest.java   |    2 +-
 .../jms/issues/JmsInOnlyParameterTest.java         |    2 +-
 .../JmsInOutUseMessageIDasCorrelationIDTest.java   |    2 +-
 ...msJMSReplyToConsumerEndpointUsingInOutTest.java |    2 +-
 .../JmsJMSReplyToEndpointUsingInOutTest.java       |    2 +-
 .../issues/JmsMutateRemoveHeaderMessageTest.java   |    2 +-
 ...KeyFormatStrategyUsingJmsConfigurationTest.java |    2 +-
 .../jms/issues/JmsReplyToLoopIssueTest.java        |    2 +-
 ...etterChannelHandlerRollbackOnExceptionTest.java |    2 +-
 ...ansactedOnExceptionRollbackOnExceptionTest.java |    2 +-
 .../component/jms/issues/MQSeriesHeaderTest.java   |    2 +-
 ...tReplyTemporaryRefreshFailureOnStartupTest.java |    1 +
 .../component/jms/tuning/PerformanceRouteTest.java |    1 -
 .../JMSTransactionThrottlingRoutePolicyTest.java   |    3 +-
 .../jms/tx/XMLQueueToQueueTransactionTest.java     |    1 -
 .../apache/camel/component/jmx/JMXEndpoint.java    |    1 +
 .../component/jmx/NotificationXmlFormatter.java    |    1 +
 .../jmx/JMXMonitorTypeLongCounterTest.java         |    1 -
 .../component/jmx/JMXNotificationFilterTest.java   |    1 +
 .../jmx/JMXRobustRemoteConnectionTest.java         |    1 -
 .../org/apache/camel/component/jmx/XmlFixture.java |    1 +
 .../camel/component/jmx/beans/SimpleBean.java      |    1 +
 .../camel/component/johnzon/JohnzonDataFormat.java |    2 +-
 .../component/johnzon/JohnzonDataFormatTest.java   |    2 +-
 .../apache/camel/component/jolt/JoltEndpoint.java  |    1 -
 .../apache/camel/component/jpa/JpaComponent.java   |    1 +
 .../apache/camel/component/jpa/JpaEndpoint.java    |    1 +
 .../camel/component/jpa/JpaPollingConsumer.java    |    1 +
 .../camel/component/jpa/AbstractJpaMethodTest.java |    3 +-
 .../jpa/JpaWithNamedQueryAndParametersTest.java    |    1 +
 .../jpa/JpaPollingConsumerLockEntityTest.java      |    1 +
 .../jpa/JpaRouteSharedEntityManagerTest.java       |    1 +
 .../jpa/JpaRouteSkipLockedEntityTest.java          |    1 +
 .../camel/component/scp/ScpServerTestSupport.java  |    1 -
 .../camel/component/jsonapi/JsonApiDataFormat.java |    2 +-
 .../java/org/apache/camel/jsonpath/JsonPath.java   |    2 +-
 .../apache/camel/jsonpath/JsonPathSourceTest.java  |    2 +-
 .../org/apache/camel/jsonpath/JsonStreamTest.java  |    1 -
 .../component/jt400/Jt400SecureTestSupport.java    |    1 -
 .../camel/component/jt400/Jt400TestSupport.java    |    1 -
 .../component/kafka/KafkaProducerFullTest.java     |    1 +
 .../camel/component/kafka/embedded/TestUtils.java  |    1 -
 .../serde/DefaultKafkaHeaderDeserializerTest.java  |    2 +-
 .../serde/DefaultKafkaHeaderSerializerTest.java    |    2 +-
 .../kubernetes/AbstractKubernetesEndpoint.java     |    1 -
 .../kubernetes/KubernetesConfiguration.java        |    1 -
 .../component/kubernetes/KubernetesHelper.java     |    1 -
 .../cloud/KubernetesDnsSrvServiceDiscovery.java    |    1 +
 .../kubernetes/cluster/KubernetesClusterView.java  |    1 -
 .../cluster/lock/ConfigMapLockUtils.java           |    1 -
 .../lock/KubernetesLeadershipController.java       |    1 -
 .../config_maps/KubernetesConfigMapsConsumer.java  |    1 -
 .../config_maps/KubernetesConfigMapsProducer.java  |    1 -
 .../deployments/KubernetesDeploymentsConsumer.java |    1 -
 .../deployments/KubernetesDeploymentsProducer.java |    1 -
 .../kubernetes/hpa/KubernetesHPAConsumer.java      |    1 -
 .../kubernetes/hpa/KubernetesHPAProducer.java      |    1 -
 .../kubernetes/job/KubernetesJobProducer.java      |    1 -
 .../namespaces/KubernetesNamespacesConsumer.java   |    1 -
 .../namespaces/KubernetesNamespacesProducer.java   |    1 -
 .../kubernetes/nodes/KubernetesNodesConsumer.java  |    1 -
 .../kubernetes/nodes/KubernetesNodesProducer.java  |    1 -
 .../KubernetesPersistentVolumesProducer.java       |    1 -
 .../KubernetesPersistentVolumesClaimsProducer.java |    1 -
 .../kubernetes/pods/KubernetesPodsConsumer.java    |    1 -
 .../kubernetes/pods/KubernetesPodsProducer.java    |    1 -
 .../KubernetesReplicationControllersConsumer.java  |    1 -
 .../KubernetesReplicationControllersProducer.java  |    1 -
 .../KubernetesResourcesQuotaProducer.java          |    1 -
 .../secrets/KubernetesSecretsProducer.java         |    1 -
 .../KubernetesServiceAccountsProducer.java         |    1 -
 .../services/KubernetesServicesConsumer.java       |    1 -
 .../services/KubernetesServicesProducer.java       |    1 -
 .../OpenshiftBuildConfigsProducer.java             |    1 -
 .../openshift/builds/OpenshiftBuildsProducer.java  |    1 -
 .../cluster/KubernetesClusterServiceTest.java      |    1 -
 .../cluster/utils/ConfigMapLockSimulator.java      |    1 -
 .../kubernetes/cluster/utils/LockTestServer.java   |    2 -
 .../cluster/utils/LockTestServerTest.java          |    1 -
 .../consumer/KubernetesConfigMapsConsumerTest.java |    1 -
 .../consumer/KubernetesNamespacesConsumerTest.java |    1 -
 .../consumer/KubernetesNodesConsumerTest.java      |    1 -
 .../consumer/KubernetesPodsConsumerTest.java       |    1 -
 ...bernetesReplicationControllersConsumerTest.java |    1 -
 .../consumer/KubernetesServicesConsumerTest.java   |    1 -
 .../producer/KubernetesConfigMapsProducerTest.java |    1 -
 .../KubernetesDeploymentsProducerTest.java         |    1 -
 .../producer/KubernetesHPAProducerTest.java        |    1 -
 .../producer/KubernetesJobProducerTest.java        |    1 -
 .../producer/KubernetesNamespacesProducerTest.java |    1 -
 .../producer/KubernetesNodesProducerTest.java      |    1 -
 ...ernetesPersistentVolumesClaimsProducerTest.java |    1 -
 .../KubernetesPersistentVolumesProducerTest.java   |    1 -
 .../producer/KubernetesPodsProducerTest.java       |    1 -
 ...bernetesReplicationControllersProducerTest.java |    1 -
 .../KubernetesResourcesQuotaProducerTest.java      |    1 -
 .../producer/KubernetesSecretsProducerTest.java    |    1 -
 .../KubernetesServiceAccountsProducerTest.java     |    1 -
 .../producer/KubernetesServicesProducerTest.java   |    1 -
 .../OpenshiftBuildConfigsProducerTest.java         |    1 -
 .../producer/OpenshiftBuildsProducerTest.java      |    1 -
 .../apache/camel/component/kudu/KuduComponent.java |    1 +
 .../apache/camel/component/kudu/KuduEndpoint.java  |    1 +
 .../apache/camel/component/kudu/KuduProducer.java  |    1 +
 .../org/apache/camel/component/kudu/KuduUtils.java |    1 +
 .../camel/component/kudu/AbstractKuduTest.java     |    1 +
 .../camel/component/kudu/KuduProducerTest.java     |    1 +
 .../apache/camel/component/kudu/KuduScanTest.java  |    3 +-
 .../apache/camel/component/kura/KuraRouter.java    |    2 +-
 .../camel/component/kura/KuraRouterTest.java       |    2 +-
 .../apache/camel/component/ldap/LdapEndpoint.java  |    1 +
 .../apache/camel/component/ldap/LdapProducer.java  |    1 +
 .../camel/component/ldap/LdapRouteTwoTest.java     |    1 +
 .../camel/component/leveldb/LevelDBFile.java       |    1 +
 ...elDBAggregateConcurrentDifferentGroupsTest.java |    1 +
 .../LevelDBAggregateConcurrentSameGroupTest.java   |    1 +
 .../LevelDBAggregateDiscardOnTimeoutTest.java      |    1 +
 .../LevelDBAggregateForceCompletionHeaderTest.java |    1 +
 ...DBAggregateNotLostRemovedWhenConfirmedTest.java |    1 +
 .../leveldb/LevelDBAggregateNotLostTest.java       |    1 +
 ...ggregateRecoverDeadLetterChannelFailedTest.java |    1 +
 ...velDBAggregateRecoverDeadLetterChannelTest.java |    1 +
 .../leveldb/LevelDBAggregateRecoverTest.java       |    1 +
 ...DBAggregateRecoverWithRedeliveryPolicyTest.java |    1 +
 .../LevelDBAggregateRecoverWithSedaTest.java       |    1 +
 .../component/leveldb/LevelDBAggregateTest.java    |    1 +
 .../LevelDBAggregationRepositoryAlotDataTest.java  |    3 +-
 ...velDBAggregationRepositoryLoadExistingTest.java |    3 +-
 ...velDBAggregationRepositoryMultipleRepoTest.java |    3 +-
 ...DBAggregationRepositoryRecoverExistingTest.java |    3 +-
 .../leveldb/LevelDBAggregationRepositoryTest.java  |    1 +
 .../leveldb/LevelDBExchangeSerializationTest.java  |    3 +-
 .../component/leveldb/LevelDBGetNotFoundTest.java  |    3 +-
 ...ngAggregateRecoverWithRedeliveryPolicyTest.java |    1 +
 .../leveldb/LevelDBSpringAggregateTest.java        |    1 +
 .../org/apache/camel/service/lra/LRAClient.java    |    1 +
 .../camel/service/lra/AbstractLRATestSupport.java  |    3 +-
 .../LumberjackComponentGlobalSSLTest.java          |    1 +
 .../LumberjackComponentLifecycleTest.java          |    1 +
 .../lumberjack/LumberjackComponentSSLTest.java     |    1 +
 .../lumberjack/LumberjackComponentTest.java        |    1 +
 .../lumberjack/LumberjackDisconnectionTest.java    |    1 +
 .../apache/camel/component/mail/MailComponent.java |    1 +
 .../apache/camel/component/mail/MailConsumer.java  |    1 +
 .../apache/camel/component/mail/MailMessage.java   |    1 +
 .../component/mail/MailBatchConsumerTest.java      |    3 +-
 .../mail/MailBindingAttachmentFileTest.java        |    1 +
 .../component/mail/MailCommitOnCompletionTest.java |    1 +
 .../mail/MailConsumerUnsupportedCharsetTest.java   |    3 +-
 .../camel/component/mail/MailConvertersTest.java   |    1 +
 .../camel/component/mail/MailCopyToTest.java       |    1 +
 .../mail/MailDoNotDeleteIfProcessFailsTest.java    |    3 +-
 .../camel/component/mail/MailFetchSizeTest.java    |    1 +
 .../component/mail/MailFetchSizeZeroTest.java      |    1 +
 .../component/mail/MailMaxMessagesPerPollTest.java |    3 +-
 .../component/mail/MailPollEnrichNoMailTest.java   |    1 +
 .../camel/component/mail/MailPollEnrichTest.java   |    1 +
 .../mail/MailProcessOnlyUnseenMessagesTest.java    |    1 +
 .../MailSearchTermUriConfigLast24HoursTest.java    |    1 +
 .../mail/MailSearchTermUriConfigTest.java          |    1 +
 .../mail/MailShutdownCompleteAllTasksTest.java     |    3 +-
 .../MailShutdownCompleteCurrentTaskOnlyTest.java   |    3 +-
 .../camel/component/mail/MailSortTermTest.java     |    1 -
 .../component/mail/MailSortTermThreeTest.java      |    1 -
 .../camel/component/mail/MailSortTermTwoTest.java  |    1 -
 .../camel/component/mail/MailSorterTest.java       |  301 ++-
 ...imeMultipartAlternativeWithContentTypeTest.java |    2 +-
 ...MultipartAlternativeWithLongerFilenameTest.java |    2 +-
 .../camel/component/mail/RawMailMessageTest.java   |    3 +-
 .../multipart/MimeMultipartDataFormatTest.java     |    1 +
 .../component/master/MasterComponentTest.java      |    1 -
 .../MetricsMessageHistoryService.java              |    3 +-
 .../camel/component/metrics/MeterProducerTest.java |    2 +-
 .../messagehistory/ManagedMessageHistoryTest.java  |    2 +-
 .../routepolicy/ManagedMetricsRoutePolicyTest.java |    1 -
 .../micrometer/AbstractMicrometerProducer.java     |    2 +
 .../component/micrometer/CounterProducer.java      |    2 +
 .../DistributionStatisticConfigFilter.java         |    2 +
 .../micrometer/DistributionSummaryProducer.java    |    2 +
 .../component/micrometer/MicrometerComponent.java  |    1 +
 .../component/micrometer/MicrometerConstants.java  |    1 +
 .../component/micrometer/MicrometerUtils.java      |    1 +
 .../camel/component/micrometer/TimerProducer.java  |    1 +
 .../MicrometerRouteEventNotifier.java              |    1 -
 .../micrometer/json/AbstractMicrometerService.java |    1 +
 .../micrometer/json/MicrometerModule.java          |    1 +
 .../MicrometerMessageHistoryFactory.java           |    1 +
 .../MicrometerMessageHistoryNamingStrategy.java    |    2 +
 .../routepolicy/MicrometerRoutePolicyFactory.java  |    1 +
 .../MicrometerRoutePolicyNamingStrategy.java       |    2 +
 .../spi/TimedScheduledExecutorService.java         |    1 +
 .../component/micrometer/CounterEndpointTest.java  |    1 +
 .../component/micrometer/CounterRouteTest.java     |    1 +
 .../DistributionSummaryEndpointTest.java           |    1 +
 .../micrometer/DistributionSummaryRouteTest.java   |    1 +
 .../micrometer/MetricComponentSpringTest.java      |    1 +
 .../micrometer/MicrometerComponentRouteTest.java   |    1 +
 .../micrometer/MicrometerComponentTest.java        |    2 +
 .../micrometer/MicrometerEndpointTest.java         |    1 +
 .../component/micrometer/TimerEndpointTest.java    |    1 +
 .../camel/component/micrometer/TimerRouteTest.java |    2 +
 .../AbstractMicrometerEventNotifierTest.java       |    1 -
 .../MicrometerExchangeEventNotifierTest.java       |    2 +-
 .../MicrometerRouteEventNotifierTest.java          |    1 +
 .../messagehistory/ManagedMessageHistoryTest.java  |    3 +-
 .../MicrometerMessageHistoryTest.java              |    1 +
 .../SpringMicrometerMessageHistoryTest.java        |    1 +
 .../AbstractMicrometerRoutePolicyTest.java         |    1 -
 .../ManagedMicrometerRoutePolicyTest.java          |    2 +
 ...MicrometerRoutePolicyMulticastSubRouteTest.java |    1 +
 .../MicrometerRoutePolicySubRouteTest.java         |    1 +
 .../routepolicy/MicrometerRoutePolicyTest.java     |    2 +
 .../spi/InstrumentedThreadPoolFactoryTest.java     |    2 +
 ...CamelMicroProfileHealthCheckRepositoryTest.java |    1 -
 .../health/CamelMicroProfileHealthCheckTest.java   |    5 +-
 .../health/CamelMicroProfileHealthTestSupport.java |    1 -
 .../AbstractMicroProfileMetricsProducer.java       |    1 +
 ...MicroProfileMetricsConcurrentGaugeProducer.java |    1 +
 .../MicroProfileMetricsCounterProducer.java        |    1 +
 .../MicroProfileMetricsExchangeRecorder.java       |    1 +
 .../metrics/MicroProfileMetricsGaugeProducer.java  |    1 +
 .../metrics/MicroProfileMetricsHelper.java         |    1 +
 .../MicroProfileMetricsHistogramProducer.java      |    1 +
 .../MicroProfileMetricsMeteredProducer.java        |    1 +
 .../metrics/MicroProfileMetricsTimerProducer.java  |    1 +
 ...oProfileMetricsEventNotifierNamingStrategy.java |    1 +
 ...croProfileMetricsCamelContextEventNotifier.java |    1 +
 ...icsCamelContextEventNotifierNamingStrategy.java |    1 +
 .../MicroProfileMetricsExchangeEventNotifier.java  |    1 +
 ...MetricsExchangeEventNotifierNamingStrategy.java |    1 +
 .../MicroProfileMetricsRouteEventNotifier.java     |    1 +
 ...ileMetricsRouteEventNotifierNamingStrategy.java |    1 +
 .../history/MicroProfileMetricsMessageHistory.java |    1 +
 ...ProfileMetricsMessageHistoryNamingStrategy.java |    1 +
 .../policy/MicroProfileMetricsRoutePolicy.java     |    1 +
 ...croProfileMetricsRoutePolicyNamingStrategy.java |    1 +
 .../MicroProfileMetricsConcurrentGaugeTest.java    |    1 +
 .../metrics/MicroProfileMetricsCounterTest.java    |    1 +
 .../MicroProfileMetricsCustomRegistryTest.java     |    1 -
 .../metrics/MicroProfileMetricsEndpointTest.java   |    1 +
 .../MicroProfileMetricsExchangeRecorderTest.java   |    1 +
 .../metrics/MicroProfileMetricsGaugeTest.java      |    1 +
 .../metrics/MicroProfileMetricsHelperTest.java     |    2 +-
 .../metrics/MicroProfileMetricsHistogramTest.java  |    1 +
 .../metrics/MicroProfileMetricsMetadataTest.java   |    1 +
 .../metrics/MicroProfileMetricsMeterTest.java      |    1 +
 .../metrics/MicroProfileMetricsTagTest.java        |    1 +
 .../metrics/MicroProfileMetricsTestSupport.java    |    2 +-
 .../metrics/MicroProfileMetricsTimerTest.java      |    1 +
 ...rofileMetricsCamelContextEventNotifierTest.java |    1 +
 ...croProfileMetricsExchangeEventNotifierTest.java |    1 +
 .../MicroProfileMetricsRouteEventNotifierTest.java |    1 +
 ...eMetricsExceptionInRouteMessageHistoryTest.java |    1 -
 .../MicroProfileMetricsMessageHistoryTest.java     |    2 +-
 .../policy/MicroProfileMetricsRoutePolicyTest.java |    2 +-
 .../org/apache/camel/component/milo/NodeIds.java   |    3 +-
 .../milo/client/MiloClientConnection.java          |    4 +-
 .../component/milo/client/MiloClientConsumer.java  |    4 +-
 .../component/milo/client/MiloClientProducer.java  |    4 +-
 .../milo/client/internal/SubscriptionManager.java  |    3 +-
 .../component/milo/server/MiloServerComponent.java |    3 +-
 .../milo/MonitorItemMultiConnectionsCertTest.java  |    4 +-
 .../camel/component/milo/call/MockNamespace.java   |    4 +-
 .../server/ServerSetCertificateManagerTest.java    |    4 +-
 .../mina/MinaProducerShutdownMockTest.java         |    1 -
 .../component/mina/MinaSpringMinaEndpointTest.java |    1 -
 .../component/mllp/MllpTcpClientProducer.java      |    1 -
 .../component/mllp/MllpTcpServerConsumer.java      |    1 -
 .../Hl7AcknowledgementGenerationException.java     |    1 -
 .../MllpAcknowledgementDeliveryExceptionTest.java  |    2 +-
 .../mllp/MllpAcknowledgementExceptionTest.java     |    2 +-
 .../MllpAcknowledgementReceiveExceptionTest.java   |    2 +-
 .../MllpAcknowledgementTimeoutExceptionTest.java   |    2 +-
 ...plicationErrorAcknowledgementExceptionTest.java |    2 +-
 ...licationRejectAcknowledgementExceptionTest.java |    2 +-
 ...llpCommitErrorAcknowledgementExceptionTest.java |    2 +-
 ...lpCommitRejectAcknowledgementExceptionTest.java |    2 +-
 .../camel/component/mllp/MllpComponentTest.java    |    2 +-
 .../camel/component/mllp/MllpEndpointTest.java     |    2 +-
 .../camel/component/mllp/MllpExceptionTest.java    |    2 +-
 .../MllpInvalidAcknowledgementExceptionTest.java   |    2 +-
 .../mllp/MllpInvalidMessageExceptionTest.java      |    2 +-
 .../MllpNegativeAcknowledgementExceptionTest.java  |    2 +-
 .../mllp/MllpProducerConsumerLoopbackTest.java     |    1 -
 .../component/mllp/MllpReceiveExceptionTest.java   |    2 +-
 .../component/mllp/MllpSocketExceptionTest.java    |    2 +-
 ...TcpClientProducerIdleConnectionTimeoutTest.java |    1 -
 ...oAcknowledgementWithBridgeErrorHandlerTest.java |    1 -
 ...knowledgementWithoutBridgeErrorHandlerTest.java |    1 -
 ...lAcknowledgementWithBridgeErrorHandlerTest.java |    1 -
 ...knowledgementWithoutBridgeErrorHandlerTest.java |    1 -
 .../component/mllp/MllpWriteExceptionTest.java     |    2 +-
 ...cpServerConsumerAcknowledgementTestSupport.java |    1 -
 .../internal/MllpSocketBufferReadFromTest.java     |    2 +-
 .../mllp/internal/MllpSocketBufferTest.java        |    3 +-
 .../mllp/internal/MllpSocketBufferWriteTest.java   |    2 +-
 .../test/junit/rule/mllp/MllpClientResource.java   |    2 +-
 .../org/apache/camel/test/tcp/JavaSocketTests.java |    1 -
 .../component/mongodb/gridfs/GridFsComponent.java  |    1 -
 .../component/mongodb/gridfs/GridFsProducer.java   |    1 -
 .../mongodb/gridfs/AbstractMongoDbTest.java        |    2 +-
 .../mongodb/gridfs/EmbedMongoConfiguration.java    |    2 +-
 .../mongodb/MongoAbstractConsumerThread.java       |    1 -
 .../mongodb/MongoDbChangeStreamsConsumer.java      |    4 +-
 .../mongodb/MongoDbChangeStreamsThread.java        |    2 +-
 .../component/mongodb/MongoDbTailingThread.java    |    2 +-
 .../component/mongodb/EmbedMongoConfiguration.java |    1 -
 .../mongodb/MongoDbChangeStreamsConsumerTest.java  |    2 +-
 .../mongodb/MongoDbConnectionBeansTest.java        |    1 -
 .../component/mongodb/MongoDbOperationsTest.java   |    3 +-
 .../component/validator/msv/MsvComponent.java      |    1 +
 .../camel/component/validator/msv/MsvEndpoint.java |    1 -
 .../component/nagios/NagiosAsyncSendTest.java      |    3 +-
 .../component/nagios/NagiosEventNotifierTest.java  |    2 +-
 .../apache/camel/component/nagios/NagiosTest.java  |    3 +-
 .../component/nagios/NagiosXorEncryptionTest.java  |    2 +-
 .../camel/component/nats/NatsConfiguration.java    |    1 -
 .../apache/camel/component/nats/NatsConsumer.java  |    1 -
 .../apache/camel/component/nats/NatsEndpoint.java  |    1 -
 .../apache/camel/component/nats/NatsProducer.java  |    1 -
 .../component/nats/NatsAuthConsumerLoadTest.java   |    1 -
 .../nats/NatsAuthTokenConsumerLoadTest.java        |    1 -
 .../camel/component/nats/NatsConsumerLoadTest.java |    1 -
 .../nats/NatsConsumerWithConnectionLoadTest.java   |    1 -
 .../nats/NatsConsumerWithRedeliveryTest.java       |    1 -
 .../netty/http/DefaultNettyHttpBinding.java        |    1 -
 .../netty/http/HttpServerInitializerFactory.java   |    1 -
 .../component/netty/http/NettyHttpConverter.java   |    1 -
 .../component/netty/http/NettyHttpProducer.java    |    1 -
 .../netty/http/RestContextPathMatcher.java         |    1 -
 .../http/handlers/HttpInboundStreamHandler.java    |    2 +-
 .../HttpServerMultiplexChannelHandler.java         |    2 +-
 .../NettyHttpBasicAuthConstraintMapperTest.java    |    1 +
 .../netty/http/NettyHttpBasicAuthTest.java         |    1 +
 ...pBindingPreservePostFormUrlEncodedBodyTest.java |    1 -
 .../http/NettyHttpBindingUseAbsolutePathTest.java  |    1 -
 .../NettyHttpBindingUseRelativePathInPostTest.java |    1 -
 .../http/NettyHttpBindingUseRelativePathTest.java  |    1 -
 .../netty/http/NettyHttpCompressTest.java          |    1 -
 .../http/NettyHttpGetWithInvalidMessageTest.java   |    1 -
 .../NettyHttpHeaderFilterStrategyRemovalTest.java  |    3 +-
 .../component/netty/http/NettyHttpSSLTest.java     |    1 +
 ...ttyHttpSimpleBasicAuthConstraintMapperTest.java |    1 +
 .../netty/http/NettyHttpSimpleBasicAuthTest.java   |    1 +
 .../http/NettyHttpSwitchingStatus204Test.java      |    1 -
 .../netty/http/NettySharedHttpServerTest.java      |    1 +
 .../component/netty/http/ProxyProtocolTest.java    |    1 -
 .../netty/http/SpringNettyHttpBasicAuthTest.java   |    1 +
 .../netty/http/SpringNettyHttpSSLTest.java         |    1 +
 .../component/netty/ChannelHandlerFactories.java   |    1 -
 .../netty/NettyServerBootstrapFactory.java         |    1 +
 .../netty/NettyServerBossPoolBuilder.java          |    1 -
 .../component/netty/ServerInitializerFactory.java  |    1 -
 .../netty/codec/DatagramPacketObjectDecoder.java   |    2 -
 .../camel/component/netty/codec/ObjectDecoder.java |    1 -
 .../camel/component/netty/codec/ObjectEncoder.java |    1 -
 .../camel/component/netty/BaseNettyTest.java       |    1 -
 .../camel/component/netty/MultipleCodecsTest.java  |    1 -
 .../netty/NettyConsumerClientModeTest.java         |    1 -
 .../component/netty/NettyCustomCodecTest.java      |    1 -
 .../netty/NettyCustomCorrelationManagerTest.java   |    1 -
 .../NettyCustomPipelineFactoryAsynchTest.java      |    1 -
 .../netty/NettyCustomPipelineFactorySynchTest.java |    1 -
 .../camel/component/netty/NettyRedeliveryTest.java |    1 +
 .../netty/NettySSLConsumerClientModeTest.java      |    1 -
 .../component/netty/NettySingleCodecTest.java      |    1 -
 ...yUDPMessageLargerThanDefaultBufferSizeTest.java |    1 -
 ...ttyUseSharedWorkerThreadPoolManyRoutesTest.java |    1 -
 .../netty/NettyUseSharedWorkerThreadPoolTest.java  |    1 -
 .../camel/component/nitrite/NitriteProducer.java   |    2 +-
 .../repository/UpdateRepositoryOperation.java      |    1 -
 .../nitrite/NitriteProducerCollectionTest.java     |    1 -
 .../camel/component/nsq/NsqSynchronization.java    |    1 -
 .../camel/component/nsq/NsqConsumerTest.java       |    1 -
 .../camel/component/nsq/NsqProducerTest.java       |    5 +-
 .../camel/language/ognl/CamelClassResolver.java    |    1 +
 .../component/olingo2/api/impl/Olingo2AppImpl.java |    3 +-
 .../camel/component/olingo2/Olingo2Consumer.java   |    1 +
 .../olingo2/AbstractOlingo2AppAPITestSupport.java  |    1 +
 .../olingo2/Olingo2AppAPIETagEnabledTest.java      |    2 +
 .../camel/component/olingo2/Olingo2AppAPITest.java |    2 +
 .../olingo2/Olingo2ComponentConsumerTest.java      |    1 +
 .../olingo2/Olingo2ComponentProducerTest.java      |    1 +
 .../component/olingo4/api/impl/Olingo4AppImpl.java |    2 +-
 .../camel/component/olingo4/Olingo4AppAPITest.java |    1 +
 .../component/olingo4/Olingo4Configuration.java    |    1 +
 .../camel/component/olingo4/Olingo4Consumer.java   |    1 +
 .../camel/component/olingo4/Olingo4Producer.java   |    1 +
 .../olingo4/Olingo4ComponentConsumerTest.java      |    1 +
 .../olingo4/Olingo4ComponentProducerTest.java      |    1 +
 .../producer/AbstractKeystoneProducer.java         |    1 -
 .../camel/opentracing/ActiveSpanManager.java       |    1 -
 .../opentracing/decorators/CqlSpanDecorator.java   |    1 -
 .../decorators/ElasticsearchSpanDecorator.java     |    1 -
 .../opentracing/decorators/JdbcSpanDecorator.java  |    1 -
 .../opentracing/decorators/KafkaSpanDecorator.java |    1 -
 .../decorators/MongoDBSpanDecorator.java           |    1 -
 .../opentracing/decorators/RestSpanDecorator.java  |    1 -
 .../opentracing/decorators/SqlSpanDecorator.java   |    1 -
 .../camel/opentracing/ActiveSpanManagerTest.java   |    1 -
 .../OpentracingSpanCollectorInRegistryTest.java    |    1 -
 .../opentracing/TwoServiceWithExcludeTest.java     |    1 -
 .../agent/InstallOpenTracingTracerRuleTest.java    |    1 -
 .../decorators/CqlSpanDecoratorTest.java           |    1 -
 .../decorators/ElasticsearchSpanDecoratorTest.java |    1 -
 .../decorators/JdbcSpanDecoratorTest.java          |    1 -
 .../decorators/KafkaSpanDecoratorTest.java         |    1 -
 .../decorators/MongoDBSpanDecoratorTest.java       |    1 -
 .../decorators/RestSpanDecoratorTest.java          |    1 -
 .../decorators/SqlSpanDecoratorTest.java           |    1 -
 .../camel/component/paho/PahoConfiguration.java    |    1 +
 .../apache/camel/component/pdf/PdfProducer.java    |    2 +-
 .../camel/component/pdf/PdfCreationTest.java       |    2 +-
 .../pdf/text/PatternSplitStrategyTest.java         |    2 +-
 .../component/pdf/text/WordSplitStrategyTest.java  |    2 +-
 .../camel/component/pgevent/PgEventEndpoint.java   |    2 +-
 .../camel/component/pgevent/PgEventProducer.java   |    1 -
 .../apache/camel/pgevent/PgEventConsumerTest.java  |    1 -
 .../apache/camel/pgevent/PgEventHelperTest.java    |    2 +-
 .../apache/camel/pgevent/PgEventProducerTest.java  |    1 -
 ...gEventWithDefinedDatasourceIntegrationTest.java |    1 -
 .../camel/component/printer/PrintDocument.java     |    1 +
 .../component/printer/PrinterConfiguration.java    |    1 +
 .../camel/component/printer/PrinterOperations.java |    1 +
 .../camel/component/printer/PrinterProducer.java   |    1 +
 .../dataformat/protobuf/ProtobufConverterTest.java |    2 +-
 .../ProtobufMarshalAndUnmarshalSpringTest.java     |    1 -
 .../camel/component/pubnub/PubNubConsumer.java     |    2 -
 .../camel/component/pubnub/PubNubEndpoint.java     |    1 -
 .../camel/component/pubnub/PubNubProducer.java     |    1 -
 .../camel/component/pubnub/PubNubFireTest.java     |    1 -
 .../component/pubnub/PubNubOperationsTest.java     |    3 -
 .../camel/component/pubnub/PubNubPresenceTest.java |    3 -
 .../camel/component/pubnub/PubNubPublishTest.java  |    1 -
 .../component/pubnub/PubNubSubscriberTest.java     |    1 -
 .../camel/component/pubnub/PubNubTestBase.java     |    1 -
 .../pubnub/example/PubNubSensor2Example.java       |    1 -
 .../pubnub/example/PubNubStateExample.java         |    1 -
 .../pulsar/DefaultPulsarMessageReceipt.java        |    1 +
 .../component/pulsar/PulsarMessageReceipt.java     |    1 +
 .../consumers/CommonCreationStrategyImpl.java      |    1 +
 .../pulsar/utils/message/PulsarMessageUtils.java   |    1 +
 .../component/pulsar/PulsarComponentTest.java      |    2 +-
 .../pulsar/PulsarConsumerAcknowledgementTest.java  |    1 +
 .../pulsar/PulsarProducerHeadersInTest.java        |    1 +
 .../component/pulsar/utils/PulsarUtilsTest.java    |    1 +
 ...PersistentStoreRestartAppChangeOptionsTest.java |    1 +
 .../component/quartz/StatefulQuartzRouteTest.java  |    1 -
 .../FileConsumerQuartzSchedulerRestartTest.java    |    1 +
 .../quartz/FileConsumerQuartzSchedulerTest.java    |    1 +
 .../quartz/SpringMultiplePoliciesOnRouteTest.java  |    1 -
 .../quartz/SpringScheduledRoutePolicyTest.java     |    1 -
 .../component/quickfixj/QuickfixjSpringTest.java   |    1 +
 .../examples/routing/FixMessageRouter.java         |    2 +-
 .../quickfixj/examples/trading/TradeExecutor.java  |    2 +-
 .../transform/QuickfixjMessageJsonPrinter.java     |    2 +-
 .../examples/util/CountDownLatchDecrementer.java   |    2 +-
 .../component/rabbitmq/RabbitMQComponent.java      |    1 +
 .../camel/component/rabbitmq/RabbitMQEndpoint.java |    1 +
 .../rabbitmq/reply/MessageSentCallback.java        |    2 -
 .../component/rabbitmq/reply/ReplyHandler.java     |    1 -
 .../rabbitmq/RabbitMQConsumerIntTest.java          |    1 -
 .../rabbitmq/RabbitMQConsumerIntTestReplyTo.java   |    2 +-
 .../component/rabbitmq/RabbitMQSpringIntTest.java  |  282 +--
 .../rabbitmq/qpid/RabbitMQConsumerQpidTest.java    |    1 +
 .../rabbitmq/qpid/RabbitMQInOutQpidTest.java       |    1 +
 .../rabbitmq/qpid/RabbitMQLoadQpidTest.java        |    1 +
 .../rabbitmq/qpid/RabbitMQProducerQpidTest.java    |    3 +-
 .../qpid/RabbitMQReConnectionQpidTest.java         |    1 +
 .../rabbitmq/qpid/RabbitMQRequeueQpidTest.java     |    1 +
 .../RabbitMQRequeueUnhandledExceptionQpidTest.java |    1 +
 .../qpid/RabbitMQSupendResumeQpidTest.java         |    3 +-
 .../reactive/streams/ReactiveStreamsConverter.java |    1 -
 .../component/reactive/streams/BeanCallTest.java   |    1 -
 .../reactive/streams/CamelReactiveStreamsTest.java |    1 -
 .../reactive/streams/DelayedMonoPublisherTest.java |    1 -
 .../reactive/streams/DirectClientAPITest.java      |    1 -
 .../component/reactive/streams/EventTypeTest.java  |    1 -
 .../reactive/streams/ExchangeRequestTest.java      |    1 -
 .../streams/platforms/ReactorCorePlatformTest.java |    1 -
 .../streams/platforms/RxJavaPlatformTest.java      |    1 -
 .../reactor/engine/ReactorStreamsService.java      |    1 -
 .../ReactorStreamsServiceBackpressureTest.java     |    1 -
 .../rest/swagger/RestSwaggerEndpoint.java          |    5 +-
 .../camel/component/rest/swagger/HttpsTest.java    |    1 -
 .../rest/swagger/Jetty94ServerFactory.java         |    1 -
 .../rest/swagger/RestSwaggerComponentTest.java     |    1 -
 .../cloud/RibbonServiceCallUpdateRouteTest.java    |    1 +
 .../component/rss/AggregateRssFeedStrategy.java    |    1 -
 .../apache/camel/component/rss/RssEndpoint.java    |    1 -
 .../component/rss/RssEntryPollingConsumer.java     |    1 -
 .../org/apache/camel/component/rss/RssUtils.java   |    1 -
 .../camel/component/rss/UpdatedDateFilter.java     |    1 -
 .../apache/camel/dataformat/rss/RssConverter.java  |    1 -
 .../apache/camel/dataformat/rss/RssDataFormat.java |    1 -
 .../RssEntryPollingConsumerWithBasicAuthTest.java  |    1 +
 .../rss/RssEntryPollingConsumerWithFilterTest.java |    1 -
 .../camel/component/rss/RssEntrySortTest.java      |    1 -
 .../apache/camel/component/rss/RssFilterTest.java  |    1 -
 .../component/rss/RssPollingConsumerTest.java      |    1 -
 .../rss/RssPollingConsumerWithBasicAuthTest.java   |    1 +
 .../camel/component/rss/UpdatedDateFilterTest.java |    1 -
 .../camel/dataformat/rss/RssConverterTest.java     |    1 -
 .../camel/dataformat/rss/RssDataFormatTest.java    |    1 -
 .../rxjava/engine/RxJavaStreamsServiceTest.java    |    1 -
 .../component/salesforce/SalesforceConsumer.java   |    1 -
 .../salesforce/SalesforceEndpointConfig.java       |    1 -
 .../component/salesforce/SalesforceHttpClient.java |    4 +-
 .../salesforce/SalesforceMetaDataExtension.java    |    1 -
 .../component/salesforce/api/TypeReferences.java   |    1 -
 .../salesforce/api/dto/AbstractDTOBase.java        |    1 -
 .../camel/component/salesforce/api/dto/Limits.java |    1 -
 .../dto/analytics/reports/QueryRecordsReport.java  |    1 -
 .../api/dto/analytics/reports/Report.java          |    1 -
 .../api/dto/analytics/reports/SummaryValue.java    |    1 -
 .../api/dto/approval/ApprovalRequest.java          |    1 -
 .../api/dto/approval/ApprovalResult.java           |    1 -
 .../salesforce/api/dto/bulk/BatchInfoList.java     |    1 +
 .../salesforce/api/dto/bulk/BatchResult.java       |    1 +
 .../salesforce/api/dto/bulk/QueryResult.java       |    1 +
 .../salesforce/api/dto/bulk/QueryResultList.java   |    1 +
 .../component/salesforce/api/dto/bulk/Result.java  |    1 +
 .../salesforce/api/dto/bulk/ResultError.java       |    1 +
 .../component/salesforce/api/dto/bulk/SObject.java |    1 +
 .../salesforce/api/dto/composite/BatchRequest.java |    1 -
 .../api/dto/composite/CompositeRequest.java        |    1 -
 .../salesforce/api/dto/composite/ReferenceId.java  |    9 +-
 .../salesforce/api/dto/composite/SObjectBatch.java |    1 -
 .../api/dto/composite/SObjectComposite.java        |    1 -
 .../salesforce/api/dto/composite/SObjectNode.java  |    5 +-
 .../salesforce/api/dto/composite/SObjectTree.java  |    5 +-
 .../api/dto/composite/SObjectTreeResponse.java     |    1 -
 .../component/salesforce/api/utils/JsonUtils.java  |    6 +-
 .../salesforce/api/utils/XStreamUtils.java         |    1 -
 .../salesforce/internal/SalesforceSession.java     |    1 -
 .../internal/client/AbstractClientBase.java        |    1 -
 .../internal/client/DefaultAnalyticsApiClient.java |    1 -
 .../internal/client/DefaultCompositeApiClient.java |    1 -
 .../internal/client/DefaultRestClient.java         |    1 -
 .../salesforce/internal/dto/PushTopic.java         |    1 -
 .../internal/processor/JsonRestProcessor.java      |    1 -
 .../internal/processor/XmlRestProcessor.java       |    1 -
 .../internal/streaming/PushTopicHelper.java        |    1 -
 .../internal/streaming/SubscriptionHelper.java     |    5 +-
 .../salesforce/ApprovalIntegrationTest.java        |    1 -
 .../salesforce/BulkApiJobIntegrationTest.java      |    1 -
 .../CompositeApiBatchIntegrationTest.java          |    1 -
 .../salesforce/CompositeApiIntegrationTest.java    |    1 -
 .../CompositeApiTreeIntegrationTest.java           |    1 -
 .../salesforce/NotFoundIntegrationTest.java        |    1 -
 .../camel/component/salesforce/RawPayloadTest.java |    1 -
 .../salesforce/RecentIntegrationTest.java          |    1 -
 .../salesforce/RestApiIntegrationTest.java         |    9 +-
 .../salesforce/SalesforceConsumerTest.java         |    1 -
 .../salesforce/SalesforceEndpointTest.java         |    2 +-
 .../SalesforceMetaDataExtensionTest.java           |    1 -
 .../api/MultiSelectPicklistJsonTest.java           |    1 -
 .../salesforce/api/MultiSelectPicklistXmlTest.java |    1 -
 .../component/salesforce/api/dto/LimitsTest.java   |    1 -
 .../salesforce/api/dto/PlatformEventTest.java      |    1 -
 .../salesforce/api/dto/RecentItemTest.java         |    1 -
 .../salesforce/api/dto/RestErrorTest.java          |    1 -
 .../api/dto/approval/ApprovalRequestTest.java      |    1 -
 .../api/dto/approval/ApprovalRequestsTest.java     |    1 -
 .../api/dto/approval/ApprovalResultTest.java       |    1 -
 .../salesforce/api/dto/approval/ApprovalsTest.java |    1 -
 .../api/dto/composite/MapOfMapsConverterTest.java  |    1 -
 .../dto/composite/SObjectBatchResponseTest.java    |    1 -
 .../api/dto/composite/SObjectBatchTest.java        |    1 -
 .../composite/SObjectCompositeResponseTest.java    |    1 -
 .../api/dto/composite/SObjectCompositeTest.java    |    1 -
 .../api/dto/composite/SObjectTreeResponseTest.java |    1 -
 .../api/dto/composite/SObjectTreeTest.java         |    1 -
 .../salesforce/api/utils/JsonUtilsTest.java        |    1 -
 .../api/utils/SalesforceTimeFormatsTest.java       |    4 +-
 .../salesforce/dto/generated/Account.java          |    1 -
 .../salesforce/dto/generated/Contact.java          |    6 +-
 .../salesforce/dto/generated/Document.java         |    7 +-
 .../salesforce/dto/generated/Line_Item__c.java     |    7 +-
 .../salesforce/dto/generated/MSPTest.java          |    1 -
 .../salesforce/dto/generated/Merchandise__c.java   |    7 +-
 .../dto/generated/QueryRecordsAccount.java         |    4 +-
 .../dto/generated/QueryRecordsContact.java         |    4 +-
 .../salesforce/dto/generated/StringMSPTest.java    |    1 -
 .../component/salesforce/dto/generated/Task.java   |    1 -
 .../salesforce/internal/LoginTokenTest.java        |    1 -
 .../internal/client/AbstractClientBaseTest.java    |    5 +-
 .../org/apache/camel/maven/ObjectDescriptions.java |    1 -
 .../java/org/apache/camel/maven/SchemaMojo.java    |    1 -
 .../maven/CamelSalesforceMojoIntegrationTest.java  |    1 -
 .../camel/maven/CamelSalesforceMojoOutputTest.java |    1 -
 .../camel/maven/SchemaMojoIntegrationTest.java     |    1 -
 .../component/sap/netweaver/NetWeaverProducer.java |    1 -
 .../saxon/XPathSplitChoicePerformanceTest.java     |    1 +
 .../xquery/XQueryFromFileExceptionTest.java        |    1 +
 .../camel/component/xquery/XQueryFromFileTest.java |    1 +
 .../xquery/XQueryLanguageFromFileTest.java         |    1 +
 .../component/xquery/XQueryWithExtensionTest.java  |    3 +-
 .../camel/component/xslt/SaxonXsltDTDTest.java     |    1 -
 .../component/xslt/SaxonXsltFeatureRouteTest.java  |    1 -
 .../xslt/extensions/MyExtensionFunction1.java      |    2 +-
 .../xslt/extensions/MyExtensionFunction2.java      |    2 +-
 .../xpath/XPathLanguageDefaultSettingsTest.java    |    3 +-
 .../camel/language/xpath/XPathLanguageTest.java    |    3 +-
 .../schematron/processor/SchematronProcessor.java  |    2 -
 .../processor/SchematronProcessorFactory.java      |    1 -
 .../schematron/processor/TemplatesFactory.java     |    2 -
 .../schematron/SchematronEndpointTest.java         |    1 -
 .../schematron/SchematronProducerTest.java         |    2 +-
 .../camel/component/service/ServiceComponent.java  |    1 -
 .../camel/component/service/ServiceConsumer.java   |    1 -
 .../servicenow/AbstractServiceNowProcessor.java    |    1 +
 .../component/servicenow/ServiceNowClient.java     |    1 +
 .../ServiceNowComponentVerifierExtension.java      |    1 +
 .../component/servicenow/ServiceNowHelper.java     |    1 +
 .../servicenow/ServiceNowMetaDataExtension.java    |    1 +
 .../auth/AuthenticationRequestFilter.java          |    2 +-
 .../HelsinkiServiceNowAttachmentProcessor.java     |    1 +
 ...inkiServiceNowServiceCatalogCartsProcessor.java |    2 +-
 .../ServiceNowComponentVerifierExtensionTest.java  |    1 +
 .../ServiceNowComponentVerifierTest.java           |    1 +
 .../camel/maven/CamelServiceNowGenerateMojo.java   |    1 +
 .../component/servlet/AttachmentHttpBinding.java   |    1 +
 .../component/servlet/DefaultHttpRegistry.java     |    1 +
 .../servlet/osgi/OsgiServletRegisterer.java        |    1 +
 .../component/servlet/HttpClientRouteTest.java     |    1 +
 .../servlet/ServletAsyncArquillianTest.java        |    1 +
 .../servlet/ServletSwitchingStatusCode204Test.java |    1 -
 .../component/servlet/rest/RestServletGetTest.java |    1 -
 .../servlet/rest/RestServletGetWildcardsTest.java  |    1 -
 .../rest/RestServletMethodNotAllowedTest.java      |    1 -
 .../servlet/rest/RestServletOptionsTest.java       |    1 -
 .../camel/component/sip/PublishSubscribeTest.java  |    1 +
 .../camel/component/sjms/jms/JmsMessageHelper.java |    2 +-
 .../sjms/consumer/InOnlyConsumerQueueTest.java     |    1 -
 .../sjms/consumer/InOnlyConsumerTempQueueTest.java |    1 -
 .../camel/component/sjms/it/SyncJmsInOutIT.java    |    1 -
 .../component/sjms/it/SyncJmsInOutTempDestIT.java  |    1 -
 .../sjms/jms/DestinationNameParserTest.java        |    2 +-
 .../producer/InOutQueueProducerAsyncLoadTest.java  |    1 +
 .../producer/InOutQueueProducerSyncLoadTest.java   |    1 +
 .../sjms/producer/QueueProducerQoSTest.java        |    1 -
 .../camel/component/slack/SlackProducerTest.java   |    1 -
 .../camel/component/smpp/AbstractSmppCommand.java  |    2 +-
 .../smpp/MessageReceiverListenerImpl.java          |    2 +-
 .../apache/camel/component/smpp/SmppBinding.java   |    1 -
 .../apache/camel/component/smpp/SmppMessage.java   |    2 +-
 .../component/smpp/AbstractSmppCommandTest.java    |    2 +-
 .../camel/component/smpp/Smpp8BitSplitterTest.java |    2 +-
 .../camel/component/smpp/SmppBindingTest.java      |    1 -
 .../component/smpp/SmppCancelSmCommandTest.java    |    2 +-
 .../camel/component/smpp/SmppCommandTypeTest.java  |    2 +-
 .../camel/component/smpp/SmppConsumerTest.java     |    2 +-
 .../component/smpp/SmppDataSmCommandTest.java      |    1 +
 .../component/smpp/SmppDefaultSplitterTest.java    |    2 +-
 .../camel/component/smpp/SmppMessageTest.java      |    2 +-
 .../camel/component/smpp/SmppNLSTSplitterTest.java |    2 +-
 .../component/smpp/SmppReplaceSmCommandTest.java   |    1 +
 .../camel/component/smpp/SmppSplitterTest.java     |    2 +-
 .../component/smpp/SmppSubmitMultiCommandTest.java |    1 +
 .../component/smpp/SmppSubmitSmCommandTest.java    |    1 +
 .../camel/component/smpp/SmppUcs2SplitterTest.java |    3 +-
 .../apache/camel/component/smpp/SmppUtilsTest.java |    1 +
 .../apache/camel/component/snmp/WalkOIDTest.java   |    1 -
 .../camel/dataformat/soap/SoapCxfClientTest.java   |    1 +
 .../camel/dataformat/soap/SoapUnMarshalTest.java   |    2 +-
 .../dataformat/soap12/Soap12UnMarshalTest.java     |    2 +-
 .../apache/camel/component/solr/SolrProducer.java  |    1 +
 .../camel/component/solr/SolrTestSupport.java      |    1 -
 .../component/SoroushBotSendMessageProducer.java   |    2 +-
 .../camel/component/sparkrest/BaseSparkTest.java   |    1 +
 .../sparkrest/DefaultSparkBindingTest.java         |    6 +-
 .../component/spark/ConvertingRddCallback.java     |    4 +-
 .../component/spark/DataFrameSparkProducer.java    |    2 +-
 .../camel/component/spark/RddSparkProducer.java    |    2 +-
 .../apache/camel/component/spark/SparkMongos.java  |    2 +-
 .../annotations/AnnotatedRddCallbackProxy.java     |    3 +-
 .../camel/component/spark/SparkProducerTest.java   |    5 +-
 .../component/splunk/SplunkConfiguration.java      |    1 -
 .../component/splunk/SplunkConnectionFactory.java  |    1 -
 .../camel/component/splunk/SplunkEndpoint.java     |    1 +
 .../camel/component/splunk/SplunkProducer.java     |    1 -
 .../component/splunk/support/SplunkDataReader.java |    1 -
 .../component/splunk/support/SplunkDataWriter.java |    1 -
 .../component/splunk/support/StreamDataWriter.java |    1 -
 .../component/splunk/support/TcpDataWriter.java    |    1 -
 .../component/splunk/ConsumerStreamingTest.java    |    1 -
 .../camel/component/splunk/ConsumerTest.java       |    1 -
 .../org/apache/camel/component/splunk/Helper.java  |    1 -
 .../camel/component/splunk/ProducerTest.java       |    1 -
 .../camel/component/splunk/RawProducerTest.java    |    1 -
 .../splunk/SplunkComponentConfigurationTest.java   |    1 -
 .../boot/CamelSpringBootApplicationController.java |    3 +-
 .../spring/boot/TypeConversionConfiguration.java   |    4 +-
 .../boot/actuate/endpoint/CamelRoutesEndpoint.java |    1 -
 ...amelCloudServiceDiscoveryAutoConfiguration.java |    1 +
 .../health/HealthCheckRoutesAutoConfiguration.java |    1 -
 .../spring/boot/CamelAutoConfigurationTest.java    |    2 +-
 .../boot/CamelNonInvasiveCamelContextTest.java     |    2 +-
 .../boot/CamelSpringBootTemplateShutdownTest.java  |    2 +-
 .../endpoint/CamelRouteControllerEndpointTest.java |    1 -
 .../endpoint/CamelRoutesEndpointDisabledTest.java  |    1 -
 .../CamelCloudServiceCallConfigurationTest.java    |    5 +-
 .../spring/boot/issues/StreamCachingTest.java      |    6 +-
 .../security/CamelSSLAutoConfigurationTest.java    |    6 +-
 .../cloud/CamelSpringCloudServiceLoadBalancer.java |    2 +-
 .../adapter/config/CamelSourceAdapterParser.java   |    1 +
 .../adapter/config/CamelTargetAdapterParser.java   |    1 +
 .../spring/javaconfig/CamelConfiguration.java      |    4 +-
 .../autowire/LoadingRawCamelConfigurationTest.java |    1 +
 .../test/JavaConfigWithNestedConfigClassTest.java  |    3 +-
 .../test/JavaConfigWithPostProcessorTest.java      |    1 +
 .../component/springldap/SpringLdapProducer.java   |  271 +--
 .../springldap/SpringLdapComponentTest.java        |    1 +
 .../SpringSecurityAuthorizationPolicyTest.java     |    1 -
 .../spring/ws/SpringWebserviceConsumer.java        |    1 +
 .../spring/ws/SpringWebserviceHelper.java          |    1 +
 .../spring/ws/bean/CamelDirectConnection.java      |  174 +-
 .../spring/ws/bean/CamelEndpointMapping.java       |    1 +
 .../net/javacrumbs/calc/model/ObjectFactory.java   |    1 -
 .../net/javacrumbs/calc/model/PlusRequest.java     |    1 -
 .../net/javacrumbs/calc/model/PlusResponse.java    |    1 -
 .../spring/ws/ConsumerBreadcrumbIdTest.java        |    1 +
 .../ws/ConsumerExceptionPropagationRouteTest.java  |    2 +-
 .../spring/ws/ConsumerMarshallingRouteTest.java    |    3 +-
 .../spring/ws/SoapResponseAttachmentTest.java      |    1 +
 .../spring/ws/processor/OkResponseProcessor.java   |    2 -
 .../security/ProducerWss4JSecurityHeaderTest.java  |    1 +
 .../spring/SpringModelJAXBContextFactory.java      |    1 -
 ...pertiesComponentEIPChoiceConvertBodyToTest.java |    2 +-
 ...ingPropertiesComponentEIPConvertBodyToTest.java |    2 +-
 .../rest/SpringFromRestDuplicateTest.java          |    1 +
 .../apache/camel/spring/CamelContextAwareTest.java |    1 +
 .../camel/spring/CamelContextFactoryBeanTest.java  |    1 +
 .../spring/CustomProcessorWithNamespacesTest.java  |    1 +
 .../apache/camel/spring/DefaultJMXAgentTest.java   |    1 +
 .../java/org/apache/camel/spring/InjectedBean.java |    1 -
 .../org/apache/camel/spring/InjectedBeanTest.java  |    1 +
 .../java/org/apache/camel/spring/JMXAgentTest.java |    1 +
 .../RoutingUsingCamelContextFactoryTest.java       |    1 +
 .../spring/SendMessageOnRouteStartAndStopTest.java |    1 +
 .../org/apache/camel/spring/bind/BeanInfoTest.java |    1 +
 .../spring/config/CamelContextAutoStartupTest.java |    1 +
 .../ErrorHandlerRouteContextRefNotFoundTest.java   |    3 +-
 .../OnExceptionNoExceptionConfiguredTest.java      |    1 +
 .../config/RouteAutoStartupPropertiesTest.java     |    1 +
 .../camel/spring/config/SpringRouteNoFromTest.java |    1 +
 .../spring/config/SpringRouteNoOutputTest.java     |    1 +
 .../config/scan/SpringComponentScanTest.java       |    1 +
 ...ingComponentScanWithDeprecatedPackagesTest.java |    1 +
 .../spring/example/ContentBasedRouteTest.java      |    1 +
 .../camel/spring/example/PojoConsumerTest.java     |    1 +
 .../camel/spring/example/PojoSenderTest.java       |    1 +
 .../camel/spring/example/PojoVmConsumerTest.java   |    1 +
 .../file/SpringFileConsumerPreMoveIssueTest.java   |    2 +-
 .../spring/file/SpringFileLanguageCBRTest.java     |    1 +
 .../interceptor/ContainerWideInterceptorTest.java  |    1 +
 .../MixedPropagationTransactedTest.java            |    3 +-
 .../MixedTransactionPropagationTest.java           |    3 +-
 .../NoStreamCachingInterceptorTest.java            |    2 +-
 ...ransactionalClientDataSourceTransactedTest.java |    3 +-
 ...alClientDataSourceMinimalConfigurationTest.java |    3 +-
 ...ataSourceTransactedWithFileOnExceptionTest.java |    2 +-
 ...onalClientDataSourceTransactedWithFileTest.java |    1 +
 ...lientDataSourceWithDefaultErrorHandlerTest.java |    3 +-
 ...ClientDataSourceWithSpringRouteBuilderTest.java |    1 +
 .../TransactionalClientWithAnnotatedBeanTest.java  |    1 +
 .../TransactionalClientWithRollbackTest.java       |    1 +
 .../issues/FileWireTapWithXMLPayloadIssueTest.java |    1 +
 .../spring/issues/SpringCatchNestedFailTest.java   |    2 +-
 .../spring/issues/SpringFinallyNestedFailTest.java |    2 +-
 .../issues/SpringRenameFileOnCommitIssueTest.java  |    1 +
 ...andlerAndContextScopedOnExceptionIssueTest.java |    1 +
 .../SpringTryCatchFinallyAndErrorHandlerTest.java  |    2 +-
 .../spring/issues/SpringTryNestedFailTest.java     |    2 +-
 .../SpringDualLoggingEventNotifierTest.java        |    2 +-
 .../management/SpringLoggingEventNotifierTest.java |    2 +-
 .../management/SpringManagedErrorHandlerTest.java  |    2 +-
 ...SpringManagedStatisticsLevelRoutesOnlyTest.java |    2 +-
 .../management/SpringPublishEventNotifierTest.java |    2 +-
 .../FileConsumerSpringSchedulerTest.java           |    1 +
 .../processor/SpringAggregateFromWireTapTest.java  |    2 +-
 .../SpringAggregatorWithCustomStrategyTest.java    |    2 +-
 .../SpringBatchResequencerAllowDuplicatesTest.java |    2 +-
 .../SpringBatchResequencerJMSPriorityTest.java     |    2 +-
 .../processor/SpringCBRHeaderPredicateTest.java    |    2 +-
 .../camel/spring/processor/SpringChoiceTest.java   |    2 +-
 .../SpringClaimCheckEipGetAndRemoveSetTest.java    |    2 +-
 .../processor/SpringClaimCheckEipGetSetTest.java   |    2 +-
 .../SpringClaimCheckEipPushPopBodyTest.java        |    2 +-
 ...ringClaimCheckEipPushPopHeadersPatternTest.java |    2 +-
 .../SpringClaimCheckEipPushPopHeadersTest.java     |    2 +-
 ...SpringClaimCheckEipPushPopRemoveHeaderTest.java |    2 +-
 .../processor/SpringClaimCheckEipPushPopTest.java  |    2 +-
 .../SpringCustomProcessorFactoryTest.java          |    2 +-
 ...etterChannelLogExhaustedMessageHistoryTest.java |    2 +-
 .../SpringDeadLetterChannelNoRedeliveryTest.java   |    2 +-
 ...adLetterChannelUseOriginalBodyWithFileTest.java |    2 +-
 ...efaultErrorHandlerExchangeFormatterRefTest.java |    2 +-
 ...ErrorHandlerLogExhaustedMessageHistoryTest.java |    2 +-
 .../SpringDefaultErrorHandlerRetryWhileTest.java   |    2 +-
 .../processor/SpringDelayerPerRouteTest.java       |    2 +-
 ...ringDoubleLoadBalancerMisconfigurationTest.java |    2 +-
 .../spring/processor/SpringDynamicRouterTest.java  |    2 +-
 .../processor/SpringEnrichExpressionTest.java      |    2 +-
 .../spring/processor/SpringEnricherRefTest.java    |    3 +-
 .../camel/spring/processor/SpringEnricherTest.java |    1 +
 ...SpringEventNotifierExchangeSentExampleTest.java |    2 +-
 .../SpringFailoverMaximumFailoverAttemptsTest.java |    2 +-
 .../SpringFailoverRoundRobinStickyTest.java        |    2 +-
 .../processor/SpringFailoverRoundRobinTest.java    |    2 +-
 .../spring/processor/SpringFromEndpointTest.java   |    2 +-
 .../processor/SpringFromMultipleEndpointTest.java  |    2 +-
 .../SpringInheritErrorHandlerDefaultTest.java      |    2 +-
 .../SpringInheritErrorHandlerFalseTest.java        |    2 +-
 .../SpringInheritErrorHandlerTrueTest.java         |    2 +-
 .../processor/SpringInterceptFromUriRegexTest.java |    3 +-
 .../SpringInterceptFromUriSimpleLogTest.java       |    3 +-
 .../SpringInterceptFromUriWildcardTest.java        |    3 +-
 .../SpringInterceptFromWhenNoStopTest.java         |    2 +-
 .../processor/SpringInterceptFromWhenTest.java     |    2 +-
 .../SpringInterceptFromWhenWithChoiceTest.java     |    2 +-
 .../SpringInterceptSendToEndpointDynamicTest.java  |    2 +-
 .../SpringInterceptSendToEndpointSkipTest.java     |    2 +-
 .../SpringInterceptSendToEndpointTest.java         |    2 +-
 .../SpringInterceptSendToEndpointWhenTest.java     |    2 +-
 .../SpringInterceptSimpleRouteStopTest.java        |    3 +-
 .../processor/SpringInterceptSimpleRouteTest.java  |    2 +-
 .../SpringInterceptSimpleRouteWhenStopTest.java    |    3 +-
 .../SpringInterceptSimpleRouteWhenTest.java        |    3 +-
 .../spring/processor/SpringLogProcessorTest.java   |    2 +-
 .../SpringLogProcessorWithProvidedLoggerTest.java  |    2 +-
 .../processor/SpringMarkRollbackOnlyTest.java      |    2 +-
 .../SpringMessageHistoryDumpRoutingTest.java       |    2 +-
 .../SpringMulticastNoStopOnExceptionTest.java      |    2 +-
 .../processor/SpringMulticastOnPrepareTest.java    |    2 +-
 .../SpringMulticastStopOnExceptionTest.java        |    2 +-
 .../SpringMulticastSubUnitOfWorkTest.java          |    2 +-
 .../processor/SpringNestedChoiceIssueTest.java     |    2 +-
 ...letionAndInterceptAndOnExceptionGlobalTest.java |    2 +-
 .../SpringOnCompletionAndInterceptGlobalTest.java  |    2 +-
 .../SpringOnCompletionAndInterceptTest.java        |    2 +-
 .../processor/SpringOnCompletionGlobalTest.java    |    2 +-
 .../processor/SpringOnCompletionModeTest.java      |    2 +-
 .../SpringOnCompletionOnCompleteOnlyTest.java      |    2 +-
 .../SpringOnCompletionOnFailureOnlyTest.java       |    2 +-
 ...ompletionRouteScopeOverrideGlobalScopeTest.java |    2 +-
 .../spring/processor/SpringOnCompletionTest.java   |    2 +-
 .../SpringOnCompletionUseOriginalBodyTest.java     |    2 +-
 .../processor/SpringOnCompletionWhenTest.java      |    2 +-
 .../SpringOnExceptionContinueToRouteTest.java      |    2 +-
 .../processor/SpringPolicyPerProcessorTest.java    |    2 +-
 .../spring/processor/SpringPolicyPerRouteTest.java |    2 +-
 .../processor/SpringPollEnrichExpressionTest.java  |    2 +-
 .../processor/SpringPollEnricherRefTest.java       |    2 +-
 .../spring/processor/SpringPollEnricherTest.java   |    2 +-
 .../processor/SpringRandomLoadBalanceTest.java     |    2 +-
 ...SpringRecipientListAggregationStrategyTest.java |    2 +-
 ...pringRecipientListDoNotStopOnExceptionTest.java |    2 +-
 ...ingRecipientListIgnoreInvalidEndpointsTest.java |    2 +-
 .../SpringRecipientListOnPrepareTest.java          |    2 +-
 ...ecipientListParallelOptionalPropertiesTest.java |    2 +-
 .../SpringRecipientListParallelStreamingTest.java  |    2 +-
 .../processor/SpringRecipientListParallelTest.java |    2 +-
 .../SpringRecipientListStopOnExceptionTest.java    |    2 +-
 .../SpringRecipientListSubUnitOfWorkTest.java      |    2 +-
 ...RecipientListWithStringDelimitedHeaderTest.java |    2 +-
 ...cipientListWithStringDelimitedPropertyTest.java |    2 +-
 .../processor/SpringRedeliverToSubRouteTest.java   |    2 +-
 ...veryErrorHandlerNoRedeliveryOnShutdownTest.java |    2 +-
 .../processor/SpringRemoveHeadersExcludeTest.java  |    2 +-
 .../spring/processor/SpringRemoveHeadersTest.java  |    2 +-
 ...ringResequenceStreamRejectOldExchangesTest.java |    2 +-
 .../spring/processor/SpringResequencerTest.java    |    2 +-
 .../camel/spring/processor/SpringRollbackTest.java |    2 +-
 .../processor/SpringRouteNoAutoStartupTest.java    |    2 +-
 .../SpringRouteStartupOrderSimpleTest.java         |    2 +-
 .../processor/SpringRouteStartupOrderTest.java     |    2 +-
 .../SpringRouteStartupOrderWithDefaultTest.java    |    2 +-
 .../spring/processor/SpringRouteStopTest.java      |    3 +-
 .../SpringRouteTopLevelMisconfiguredTest.java      |    2 +-
 ...RouteWithConstantFieldFromExchangeFailTest.java |    2 +-
 ...ringRouteWithConstantFieldFromExchangeTest.java |    2 +-
 .../spring/processor/SpringScriptExternalTest.java |    3 +-
 .../camel/spring/processor/SpringScriptTest.java   |    3 +-
 .../processor/SpringSetExchangePatternTest.java    |    2 -
 .../SpringShutdownCompleteAllTasksTest.java        |    2 +-
 .../SpringShutdownCompleteCurrentTaskOnlyTest.java |    2 +-
 .../camel/spring/processor/SpringSortBodyTest.java |    2 +-
 .../spring/processor/SpringSortExpressionTest.java |    2 +-
 .../processor/SpringSplitCustomExpressionTest.java |    2 +-
 .../processor/SpringSplitGroupMultiLinesTest.java  |    2 +-
 .../processor/SpringSplitGroupSkipFirstTest.java   |    2 +-
 .../processor/SpringSplitSubUnitOfWorkTest.java    |    2 +-
 .../SpringSplitTokenizerGroupDynamicTest.java      |    2 +-
 .../processor/SpringSplitterMethodCallTest.java    |    2 +-
 .../SpringSplitterNoStopOnExceptionTest.java       |    2 +-
 .../processor/SpringSplitterOnPrepareTest.java     |    2 +-
 ...ngSplitterWithCustomThreadPoolExecutorTest.java |    2 +-
 .../processor/SpringStaticRecipientListTest.java   |    1 -
 .../camel/spring/processor/SpringStepTest.java     |    2 +-
 .../processor/SpringStickyLoadBalanceTest.java     |    2 +-
 .../processor/SpringStreamCachingPerRouteTest.java |    2 +-
 .../processor/SpringStreamCachingStrategyTest.java |    2 +-
 ...ringThreadsCoreAndMaxPoolKeepAliveTimeTest.java |    2 +-
 .../processor/SpringThreadsCoreAndMaxPoolTest.java |    2 +-
 .../processor/SpringThreadsCorePoolTest.java       |    2 +-
 .../spring/processor/SpringThreadsDefaultTest.java |    2 +-
 ...ngThreadsExternalThreadPoolFactoryBeanTest.java |    2 +-
 .../SpringThreadsThreadPoolFactoryBeanTest.java    |    2 +-
 .../SpringThrottlingInflightRoutePolicyTest.java   |    2 +-
 .../processor/SpringThrowExceptionMessageTest.java |    2 +-
 .../spring/processor/SpringThrowExceptionTest.java |    4 +-
 .../spring/processor/SpringTokenizerTest.java      |    2 +-
 .../processor/SpringTopicLoadBalanceTest.java      |    2 +-
 .../spring/processor/SpringTransformTest.java      |    2 +-
 .../processor/SpringTryCatchMisconfiguredTest.java |    2 +-
 ...ingTryCatchMustHaveExceptionConfiguredTest.java |    2 +-
 .../SpringTryProcessorMultipleExceptionTest.java   |    2 +-
 .../processor/SpringTryProcessorOnWhenTest.java    |    2 +-
 .../spring/processor/SpringValidateRegExpTest.java |    3 +-
 .../spring/processor/SpringValidateSimpleTest.java |    2 +-
 .../SpringWeightedRandomLoadBalanceTest.java       |    2 +-
 .../SpringWeightedRoundRobinLoadBalanceTest.java   |    2 +-
 .../processor/SpringWireTapOnPrepareTest.java      |    2 +-
 .../camel/spring/processor/SpringWireTapTest.java  |    2 +-
 .../SpringWireTapUsingFireAndForgetCopyTest.java   |    2 +-
 .../SpringWireTapUsingFireAndForgetTest.java       |    2 +-
 .../processor/SpringWireTapVoidBeanTest.java       |    2 +-
 ...ilterWithNamespaceOnImportRouteContextTest.java |    1 +
 ...XPathFilterWithNamespaceOnRouteContextTest.java |    1 +
 .../SpringXPathFilterWithNamespaceTest.java        |    3 +-
 .../spring/processor/SpringXPathHeaderTest.java    |    1 +
 .../processor/TransformWithExpressionTest.java     |    1 +
 .../SpringAggregateCompletionIntervalTest.java     |    2 +-
 .../SpringAggregateExpressionSizeFallbackTest.java |    2 +-
 .../SpringAggregateExpressionSizeTest.java         |    2 +-
 ...ringAggregateExpressionTimeoutFallbackTest.java |    2 +-
 ...ringAggregateExpressionTimeoutPerGroupTest.java |    2 +-
 .../SpringAggregateExpressionTimeoutTest.java      |    2 +-
 .../SpringAggregateForceCompletionOnStopTest.java  |    2 +-
 ...roupedExchangeCompletionExpressionSizeTest.java |    2 +-
 .../SpringAggregateSimplePredicateEagerTest.java   |    2 +-
 .../SpringAggregateSimplePredicateTest.java        |    2 +-
 .../SpringAggregateThreadPoolProfileTest.java      |    2 +-
 ...ggregationStrategyBeanAdapterAllowNullTest.java |    2 +-
 ...gationStrategyBeanAdapterRefMethodNameTest.java |    2 +-
 ...pringAggregationStrategyBeanAdapterRefTest.java |    2 +-
 .../processor/aggregator/SpringAggregatorTest.java |    2 +-
 .../FileConsumerIdempotentLoadStoreTest.java       |    1 +
 .../idempotent/FileConsumerIdempotentTest.java     |    1 +
 .../DeadLetterChannelHandledExampleTest.java       |    2 +-
 .../onexception/RedeliveryPolicyReTest.java        |    2 +-
 .../SpringContextScopeOnExceptionTest.java         |    2 +-
 ...adLetterChannelOnExceptionOnRedeliveryTest.java |    2 +-
 .../SpringOnExceptionContinueSubRouteTest.java     |    2 +-
 .../SpringOnExceptionContinueSubSubRouteTest.java  |    2 +-
 .../onexception/SpringOnExceptionContinueTest.java |    2 +-
 ...ringOnExceptionLoadBalancerDoubleIssueTest.java |    2 +-
 ...pringOnExceptionNotNormalizedClassNameTest.java |    2 +-
 ...nExceptionOccurredProcessorOnExceptionTest.java |    2 +-
 .../SpringOnExceptionOccurredProcessorTest.java    |    2 +-
 .../onexception/SpringOnExceptionSubRouteTest.java |    2 +-
 .../SpringOnExceptionUseOriginalBodyTest.java      |    2 +-
 .../SpringOnExceptionUseOriginalMessageTest.java   |    2 +-
 .../SpringOnExceptionWithRouteAndContinueTest.java |    2 +-
 .../spring/remoting/MyMultiArgumentService.java    |    4 +-
 .../scan/PatternBasedPackageScanFilterTest.java    |    1 +
 .../camel/component/sql/DefaultSqlEndpoint.java    |    1 +
 .../apache/camel/component/sql/SqlComponent.java   |    1 +
 .../BatchCallableStatementCreatorFactory.java      |    1 -
 .../component/sql/stored/SqlStoredComponent.java   |    1 +
 .../sql/stored/template/generated/SSPTParser.java  |    4 +-
 .../aggregate/jdbc/JdbcAggregationRepository.java  |    1 +
 .../idempotent/jdbc/JdbcMessageIdRepository.java   |    1 +
 .../camel/component/sql/SqlDataSourceRefTest.java  |    3 +-
 .../camel/component/sql/SqlDataSourceTest.java     |    3 +-
 .../sql/SqlProducerExpressionParameterTest.java    |    1 +
 .../DefaultSqlPrepareStatementStrategyTest.java    |    1 +
 .../ProducerUseMessageBodyForTemplateTest.java     |    1 -
 .../sql/stored/SqlFunctionDataSourceTest.java      |    1 -
 .../sql/stored/SqlStoredDataSourceTest.java        |    1 -
 .../jdbc/JdbcAggregateLoadAndRecoverTest.java      |    2 +-
 .../jdbc/JdbcAggregateLoadConcurrentTest.java      |    2 +-
 .../aggregate/jdbc/JdbcAggregateLoadTest.java      |    2 +-
 .../jdbc/JdbcAggregateSerializedHeadersTest.java   |    2 +-
 .../jdbc/JdbcAggregateStoreAsTextTest.java         |    1 +
 .../component/ssh/ResourceBasedSSHKeyVerifier.java |  386 ++--
 .../apache/camel/component/stax/StAXProcessor.java |    1 -
 .../camel/component/stax/StaxStreamXMLReader.java  |  964 ++++-----
 .../component/stax/IssueWithWrongEncodingTest.java |    2 -
 .../stax/SpringStAXJAXBIteratorExpressionTest.java |    1 +
 .../camel/component/stax/StAXComponentTest.java    |    1 +
 .../stax/StAXJAXBIteratorExpressionTest.java       |    1 +
 .../stax/StAXXPathSplitChoicePerformanceTest.java  |    1 +
 .../camel/component/stomp/StompBaseTest.java       |    1 +
 .../component/stream/FileWatcherStrategy.java      |    6 +-
 .../camel/component/stream/StreamConsumer.java     |    2 +-
 .../camel/component/stream/StreamEndpoint.java     |    1 -
 .../apache/camel/swagger/RestSwaggerReader.java    |    4 +-
 .../apache/camel/swagger/RestSwaggerSupport.java   |    1 +
 .../org/apache/camel/swagger/ParameterAssert.java  |    7 +-
 .../camel/swagger/RestSwaggerArrayEnumTest.java    |    1 -
 .../RestSwaggerReaderApiDocsOverrideTest.java      |    1 -
 .../swagger/RestSwaggerReaderApiDocsTest.java      |    1 -
 .../swagger/RestSwaggerReaderDayOfWeekTest.java    |    1 -
 ...RestSwaggerReaderEnableVendorExtensionTest.java |    1 -
 .../RestSwaggerReaderModelApiSecurityTest.java     |    1 -
 .../RestSwaggerReaderModelBookOrderTest.java       |    1 -
 .../camel/swagger/RestSwaggerReaderModelTest.java  |    1 -
 .../RestSwaggerReaderPropertyPlaceholderTest.java  |    1 -
 .../camel/swagger/RestSwaggerReaderTest.java       |    1 -
 .../camel/swagger/RestSwaggerSupportTest.java      |    1 -
 .../component/syslog/netty/Rfc5425Encoder.java     |    1 -
 .../component/syslog/AutomatedConversionTest.java  |    1 +
 .../camel/component/syslog/MinaDataFormatTest.java |    1 +
 .../component/syslog/MinaManyUDPMessagesTest.java  |    1 +
 .../component/syslog/NettyDataFormatTest.java      |    1 +
 .../component/syslog/NettyManyUDPMessagesTest.java |    1 +
 .../syslog/NettyRfc5425LongMessageTest.java        |    2 +-
 .../camel/component/syslog/NettyRfc5425Test.java   |    1 +
 .../component/syslog/SyslogSpringMinaTest.java     |    1 +
 .../component/syslog/SyslogSpringNettyTest.java    |    1 +
 .../tagsoup/TidyMarkupDataFormatAsStringTest.java  |    1 -
 .../camel/dataformat/tarfile/TarIterator.java      |    2 +-
 .../tarfile/SpringTarFileDataFormatTest.java       |    6 +-
 .../dataformat/tarfile/TarFileDataFormatTest.java  |    1 +
 .../tarfile/TarFileSplitAndDeleteTest.java         |    1 +
 .../tarfile/TarSplitterRouteIssueTest.java         |    1 +
 .../AggregationStrategyWithFilenameHeaderTest.java |    1 +
 .../AggregationStrategyWithPreservationTest.java   |    1 +
 .../tarfile/TarAggregationStrategyTest.java        |    1 +
 .../camel/component/telegram/TelegramEndpoint.java |    1 +
 .../telegram/model/UnixTimestampDeserializer.java  |    1 -
 .../component/telegram/service/RestBotAPI.java     |    3 +-
 .../service/TelegramServiceRestBotAPIAdapter.java  |    1 +
 .../component/telegram/TelegramChatBotTest.java    |    3 +-
 .../telegram/TelegramConsumerChannelPostTest.java  |    4 +-
 .../TelegramConsumerEmptyResponseTest.java         |    2 +-
 .../telegram/TelegramConsumerMappingTest.java      |    2 +-
 .../TelegramConsumerMediaDocumentTest.java         |    2 +-
 .../telegram/TelegramConsumerMediaPhotoTest.java   |    2 +-
 .../telegram/TelegramConsumerMediaVideoTest.java   |    2 +-
 .../telegram/TelegramConsumerMultipleTest.java     |    2 +-
 .../telegram/TelegramConsumerServiceErrorTest.java |    2 +-
 .../telegram/TelegramConsumerSingleTest.java       |    2 +-
 .../test/blueprint/CamelBlueprintTestSupport.java  |    1 +
 ...nfigAdminLoadConfigurationFileNotFoundTest.java |    2 +-
 ...gAdminNoDefaultValuesBlueprintCreationTest.java |    2 +-
 .../apache/camel/test/blueprint/MainNoPidTest.java |    1 -
 .../camel/test/blueprint/MainNoReloadTest.java     |    1 -
 .../org/apache/camel/test/blueprint/MainTest.java  |    2 -
 .../blueprint/component/rest/FromRestGetTest.java  |    1 +
 .../ManagedEndpointInjectRefEndpointTest.java      |    1 +
 .../management/ManagedRefEndpointTest.java         |    1 +
 .../apache/camel/test/cdi/AnnotatedDecorator.java  |    1 +
 .../camel/test/cdi/AnnotatedMethodDecorator.java   |    1 +
 .../camel/test/cdi/AnnotatedTypeDecorator.java     |    1 +
 .../org/apache/camel/test/cdi/CamelCdiContext.java |    1 +
 .../org/apache/camel/test/cdi/CamelCdiRunner.java  |    3 +-
 .../camel/test/cdi/CamelCdiTestExtension.java      |    1 +
 .../test/cdi/FrameworkAnnotatedParameter.java      |    3 +-
 .../test/cdi/FrameworkMethodCdiInjection.java      |    1 +
 .../main/java/org/apache/camel/test/cdi/Order.java |    3 +-
 .../camel/test/karaf/AbstractFeatureTest.java      |    1 +
 .../camel/test/karaf/CamelKarafTestSupport.java    |    1 +
 .../test/spring/junit5/CamelSpringTestHelper.java  |    1 -
 .../test/patterns/DebugSpringCamelContextTest.java |    1 -
 .../camel/test/spring/CamelSpringTestHelper.java   |    1 -
 .../test/patterns/DebugSpringCamelContextTest.java |    1 -
 ...pringRunnerDisableJmxInheritedOverrideTest.java |    2 +-
 .../CamelSpringRunnerProvidesBreakpointTest.java   |    2 +-
 ...RunnerShutdownTimeoutInheritedOverrideTest.java |    1 +
 .../CamelSpringRunnerShutdownTimeoutTest.java      |    1 +
 .../apache/camel/test/junit4/CamelTestSupport.java |    1 +
 .../test/patterns/IsMockEndpointsFileTest.java     |    1 +
 .../patterns/MockEndpointFailNoHeaderTest.java     |    1 +
 .../RouteBuilderConfigureExceptionTest.java        |    1 +
 .../RouteProcessorDumpRouteCoverageTest.java       |    1 +
 .../test/testcontainers/junit5/Containers.java     |    4 +-
 .../camel/test/testcontainers/Containers.java      |    4 +-
 .../thrift/server/ThriftThreadPoolServer.java      |    1 -
 .../thrift/ThriftConsumerConcurrentTest.java       |    1 -
 .../thrift/ThriftConsumerSecurityTest.java         |    2 +-
 .../thrift/ThriftConsumerZlibCompressionTest.java  |    2 +-
 .../component/thrift/ThriftProducerAsyncTest.java  |    1 -
 .../component/thrift/ThriftProducerSyncTest.java   |    1 -
 .../camel/component/tika/TikaDetectTest.java       |  169 +-
 .../apache/camel/component/tika/TikaParseTest.java |  394 ++--
 .../component/twilio/TwilioConfiguration.java      |    1 -
 .../twitter/AbstractTwitterComponent.java          |    1 +
 .../consumer/AbstractTwitterConsumerHandler.java   |    1 -
 .../directmessage/DirectMessageProducer.java       |    1 -
 .../AbstractComponentVerifierExtensionTest.java    |    1 -
 .../twitter/AbstractComponentVerifierTest.java     |    1 -
 .../component/twitter/DirectMessageDirectTest.java |    1 +
 .../twitter/DirectMessagePollingTest.java          |    1 +
 .../undertow/DefaultUndertowHttpBinding.java       |    2 +-
 .../component/undertow/UndertowClientCallback.java |    2 +-
 .../component/undertow/UndertowComponent.java      |    1 +
 .../camel/component/undertow/UndertowConsumer.java |    1 -
 .../camel/component/undertow/UndertowEndpoint.java |    1 +
 .../camel/component/undertow/UndertowProducer.java |    1 +
 .../undertow/handlers/CamelWebSocketHandler.java   |    1 -
 .../undertow/DefaultUndertowHttpBindingTest.java   |    2 +-
 .../component/undertow/MapIdentityManager.java     |    4 +-
 .../undertow/UndertowBasicAuthHandler.java         |    1 -
 .../undertow/UndertowHandlersSpringTest.java       |    2 +-
 .../undertow/UndertowHttpProducerSessionTest.java  |    1 +
 .../UndertowHttpProxyPreserveHostTest.java         |    1 +
 .../undertow/UndertowHttpsSpringTest.java          |    1 +
 .../undertow/UndertowMethodRestricTest.java        |    1 +
 .../undertow/ws/UndertowWsConsumerRouteTest.java   |    1 -
 .../undertow/ws/UndertowWssRouteTest.java          |    1 +
 .../univocity/AbstractUniVocityDataFormat.java     | 1212 +++++------
 .../camel/dataformat/univocity/Marshaller.java     |  233 ++-
 .../univocity/UniVocityCsvDataFormat.java          |  424 ++--
 .../univocity/UniVocityFixedWidthDataFormat.java   |  444 ++--
 .../univocity/UniVocityTsvDataFormat.java          |  214 +-
 .../camel/dataformat/univocity/Unmarshaller.java   |  393 ++--
 .../UniVocityCsvDataFormatMarshalSpringTest.java   |  255 ++-
 .../UniVocityCsvDataFormatMarshalTest.java         |  308 +--
 .../univocity/UniVocityCsvDataFormatTest.java      |  404 ++--
 .../UniVocityCsvDataFormatUnmarshalSpringTest.java |  312 +--
 .../UniVocityCsvDataFormatUnmarshalTest.java       |  394 ++--
 ...ocityFixedWidthDataFormatMarshalSpringTest.java |  254 +--
 .../UniVocityFixedWidthDataFormatMarshalTest.java  |  312 +--
 .../UniVocityFixedWidthDataFormatTest.java         |  520 ++---
 ...ityFixedWidthDataFormatUnmarshalSpringTest.java |  312 +--
 ...UniVocityFixedWidthDataFormatUnmarshalTest.java |  400 ++--
 .../dataformat/univocity/UniVocityTestHelper.java  |  136 +-
 .../UniVocityTsvDataFormatMarshalSpringTest.java   |  254 +--
 .../UniVocityTsvDataFormatMarshalTest.java         |  302 +--
 .../univocity/UniVocityTsvDataFormatTest.java      |  344 ++--
 .../UniVocityTsvDataFormatUnmarshalSpringTest.java |  312 +--
 .../UniVocityTsvDataFormatUnmarshalTest.java       |  390 ++--
 .../component/validator/ValidatorEndpoint.java     |    1 -
 .../camel/component/velocity/VelocityEndpoint.java |    1 -
 .../camel/component/weather/WeatherQuery.java      |    1 +
 .../geolocation/FreeGeoIpGeoLocationProvider.java  |    1 -
 .../http/AuthenticationHttpClientConfigurer.java   |    1 -
 .../weather/http/HttpClientConfigurer.java         |    1 -
 .../camel/component/web3j/Web3jProducer.java       |    2 -
 .../camel/component/web3j/Web3jProducerTest.java   |    1 -
 .../camel/websocket/jsr356/ClientSessions.java     |    4 +-
 .../camel/websocket/jsr356/JSR356Consumer.java     |    4 +-
 .../camel/websocket/jsr356/JSR356Producer.java     |    3 +-
 .../websocket/jsr356/JSR356WebSocketComponent.java |    5 +-
 .../camel/websocket/jsr356/ServletIntegration.java |    4 +-
 .../camel/websocket/jsr356/JSR356ProducerTest.java |    4 +-
 .../websocket/WebsocketConsumerRouteTest.java      |    1 -
 .../websocket/WebsocketTwoRoutesExampleTest.java   |    1 +
 ...SIndividualAndBroadcastEndpointExampleTest.java |    1 +
 ...ebsocketTwoRoutesToSameEndpointExampleTest.java |    1 +
 .../wordpress/api/WordpressAPIConfiguration.java   |    3 +-
 .../impl/WordpressServicePostsAdapterTest.java     |    1 +
 .../impl/WordpressServiceUsersAdapterTest.java     |    1 +
 .../apache/camel/component/xchange/XChange.java    |    1 -
 .../component/xchange/XChangeConfiguration.java    |    1 -
 .../camel/component/xj/JsonXmlStreamReader.java    |    1 +
 .../camel/component/xj/XmlJsonStreamWriter.java    |    1 +
 .../org/apache/camel/component/xj/XJTestUtils.java |    1 -
 .../xmlsecurity/XmlSignatureEndpoint.java          |  317 +--
 .../xmlsecurity/api/DefaultKeyAccessor.java        |  197 +-
 .../api/DefaultXmlSignature2Message.java           |    1 -
 .../xmlsecurity/api/XmlSignatureChecker.java       |    1 -
 .../xmlsecurity/processor/SantuarioUtil.java       |    3 +-
 .../processor/XmlSignatureConfiguration.java       |  383 ++--
 .../processor/XmlSignatureProcessor.java           |  272 +--
 .../xmlsecurity/processor/XmlSignerProcessor.java  | 2140 ++++++++++----------
 .../xmlsecurity/SignatureAlgorithmTest.java        |    3 +-
 .../xmlsecurity/SignatureDigestMethodTest.java     |    3 +-
 .../xmlsecurity/SpringXmlSignatureTest.java        |  261 ++-
 .../xmlsecurity/util/TimestampProperty.java        |    1 -
 .../xmlsecurity/EncryptionAlgorithmTest.java       |    1 +
 .../xmlsecurity/XMLEncryption11Test.java           |    1 +
 .../xmlsecurity/XMLSecurityDataFormatTest.java     |    2 +-
 .../component/xmpp/XmppDeferredConnectionTest.java |    1 +
 .../component/xmpp/XmppMultiUserChatTest.java      |    1 +
 .../component/xmpp/XmppProducerConcurrentTest.java |    1 +
 .../component/xmpp/XmppRobustConnectionTest.java   |    1 +
 .../camel/component/xmpp/XmppRouteChatTest.java    |    1 +
 ...ppRouteMultipleProducersSingleConsumerTest.java |    1 +
 .../apache/camel/language/xpath/XPathBuilder.java  |    3 +-
 .../saxon/SaxonXmlSourceHandlerFactoryImpl.java    |    8 +-
 .../xslt/saxon/XsltSaxonAggregationStrategy.java   |    3 +-
 .../component/xslt/saxon/XsltSaxonEndpoint.java    |    1 +
 .../component/xslt/saxon/XsltSaxonHelper.java      |    1 +
 .../component/xslt/saxon/SAXSourceLogBodyTest.java |    8 +-
 .../camel/component/xslt/saxon/XsltSaxonTest.java  |    3 +-
 .../component/xslt/XsltAggregationStrategy.java    |    3 +-
 .../apache/camel/component/xslt/XsltBuilder.java   |    1 +
 .../apache/camel/component/xslt/XsltComponent.java |    1 +
 .../apache/camel/component/xslt/XsltEndpoint.java  |    4 +-
 .../xstream/MarshalDomainObjectTest.java           |    2 +-
 .../xstream/XStreamConfigurationTest.java          |    3 +-
 ...eamDataFormatPermissionsSystemPropertyTest.java |    2 +-
 .../yammer/YammerMessagePollingConsumer.java       |    1 -
 .../component/yammer/YammerMessageProducer.java    |    1 -
 .../yammer/YammerUserPollingConsumer.java          |    1 -
 .../camel/component/yammer/model/Contact.java      |    1 +
 .../apache/camel/component/yammer/model/User.java  |    1 +
 .../yammer/YammerMessageAndUserRouteTest.java      |    1 -
 .../component/yammer/YammerMessageRouteTest.java   |    1 -
 .../component/yammer/YammerUserRouteTest.java      |    1 -
 .../camel/component/zendesk/ZendeskComponent.java  |    2 -
 .../camel/dataformat/zipfile/ZipIterator.java      |    2 +-
 .../zipfile/SpringZipSplitterRouteTest.java        |    1 -
 .../dataformat/zipfile/ZipFileDataFormatTest.java  |    1 +
 .../zipfile/ZipFileSplitAndDeleteTest.java         |    1 +
 .../zipfile/ZipFileSplitOneFileTest.java           |    1 +
 .../zipfile/ZipSplitterRouteIssueTest.java         |    1 +
 .../AggregationStrategyWithFilenameHeaderTest.java |    1 +
 .../AggregationStrategyWithPreservationTest.java   |    1 +
 .../ZipAggregationStrategyEmptyFileTest.java       |    1 +
 .../zipfile/ZipAggregationStrategyTest.java        |    1 +
 .../camel/zipkin/ZipkinClientRequestAdapter.java   |    1 -
 .../java/org/apache/camel/zipkin/ZipkinState.java  |    1 -
 .../java/org/apache/camel/zipkin/ZipkinTracer.java |    2 -
 .../apache/camel/zipkin/LogSpanReporterTest.java   |    1 -
 .../camel/zipkin/ZipkinClientCustomTagsTest.java   |    1 -
 .../camel/zipkin/ZipkinMDCScopeDecoratorTest.java  |    2 -
 .../apache/camel/zipkin/ZipkinTimerRouteTest.java  |    1 +
 .../component/zookeeper/ZooKeeperProducer.java     |    3 +-
 .../zookeeper/operations/CreateOperation.java      |    4 +-
 .../zookeeper/operations/DeleteOperation.java      |    4 +-
 .../operations/FutureEventDrivenOperation.java     |    4 +-
 .../zookeeper/operations/GetChildrenOperation.java |    4 +-
 .../zookeeper/operations/GetDataOperation.java     |    6 +-
 .../zookeeper/operations/SetDataOperation.java     |    4 +-
 .../zookeeper/ZooKeeperManagedEndpointTest.java    |    1 +
 .../cloud/SpringZooKeeperServiceCallRouteTest.java |    1 +
 .../cloud/ZooKeeperServiceCallRouteTest.java       |    1 +
 .../ZooKeeperServiceRegistrationTestBase.java      |    1 +
 .../operations/FutureEventDrivenOperationTest.java |    1 -
 .../org/apache/camel/cloud/ServiceDefinition.java  |    1 -
 .../org/apache/camel/spi/CamelContextTracker.java  |    2 +-
 .../converter/AnnotationTypeConverterLoader.java   |    8 +-
 .../camel/impl/engine/DefaultProducerTemplate.java |    2 +-
 .../org/apache/camel/processor/ContractAdvice.java |    2 +-
 .../apache/camel/processor/RestBindingAdvice.java  |    2 +-
 .../org/apache/camel/processor/StepProcessor.java  |    2 +-
 .../apache/camel/impl/cloud/LoadBalancerTest.java  |    1 +
 .../camel/impl/cloud/ServiceDefinitionTest.java    |    6 +-
 .../org/apache/camel/impl/DefaultCamelContext.java |    1 +
 .../java/org/apache/camel/impl/JndiRegistry.java   |    1 +
 .../camel/model/CircuitBreakerDefinition.java      |    9 +-
 .../apache/camel/model/ClaimCheckDefinition.java   |    1 +
 .../org/apache/camel/model/EnrichDefinition.java   |    1 +
 .../model/HystrixConfigurationDefinition.java      |    1 +
 .../camel/model/IdempotentConsumerDefinition.java  |    1 +
 .../apache/camel/model/OutputExpressionNode.java   |    1 +
 .../apache/camel/model/PollEnrichDefinition.java   |    1 +
 .../camel/model/ProcessorDefinitionHelper.java     |    1 +
 .../model/dataformat/DataFormatsDefinition.java    |    1 +
 .../model/rest/RestConfigurationDefinition.java    |    1 +
 .../reifier/dataformat/JaxbDataFormatReifier.java  |    1 +
 .../camel/reifier/rest/RestBindingReifier.java     |    1 +
 .../camel/core/osgi/OsgiEventAdminNotifier.java    |    1 -
 .../apache/camel/core/osgi/OsgiFactoryFinder.java  |    1 -
 .../core/xml/AbstractCamelContextFactoryBean.java  |    1 +
 .../core/xml/AbstractCamelEndpointFactoryBean.java |    1 +
 .../xml/AbstractCamelThreadPoolFactoryBean.java    |    3 +-
 .../xml/CamelPropertyPlaceholderDefinition.java    |    1 +
 .../jsse/CipherSuitesParametersDefinition.java     |    1 +
 .../core/xml/util/jsse/SNIHostNamesDefinition.java |    1 +
 .../SecureSocketProtocolsParametersDefinition.java |    1 +
 .../xml/AbstractCamelContextFactoryBeanTest.java   |    5 +-
 .../java/org/apache/camel/AutoCloseableTest.java   |    1 -
 .../apache/camel/builder/xml/XsltBuilderTest.java  |    1 +
 .../org/apache/camel/component/xslt/MyXPath.java   |    3 +-
 .../camel/converter/jaxp/XmlConverterTest.java     |    2 +
 .../apache/camel/impl/LazyStartProducerTest.java   |    1 -
 .../FileIdempotentConsumerCreateRepoTest.java      |    3 +-
 .../MultiCastParallelAndStreamCachingTest.java     |    1 +
 .../StreamSourceContentBasedRouterTest.java        |    1 +
 .../camel/reifier/DataFormatReifierTest.java       |    4 +-
 .../apache/camel/reifier/ProcessorReifierTest.java |    4 +-
 .../apache/camel/support/DefaultRegistryTest.java  |    1 +
 .../support/jsse/AbstractJsseParametersTest.java   |    1 +
 .../builder/endpoint/AbstractEndpointBuilder.java  |    1 +
 .../builder/endpoint/EndpointBuilderFactory.java   |    1 +
 .../camel/support/builder/xml/StAX2SAXSource.java  |    9 +-
 .../org/apache/camel/main/MainIoCAutowireTest.java |    1 -
 .../java/org/apache/camel/main/MainVetoTest.java   |    1 -
 .../DefaultManagementObjectStrategy.java           |    1 -
 .../camel/management/mbean/ManagedThrottler.java   |    1 +
 .../management/mbean/RouteCoverageXmlParser.java   |    1 +
 .../camel/component/xslt/XsltContentCacheTest.java |    1 +
 .../camel/management/AddEventNotifierTest.java     |    1 +
 .../camel/management/BacklogDebuggerTest.java      |    1 +
 .../management/CamelChoiceWithManagementTest.java  |    1 +
 .../management/CamelContextDisableJmxTest.java     |    1 -
 .../management/DefaultManagementAgentMockTest.java |    1 +
 ...ationOnlyRegisterProcessorWithCustomIdTest.java |    1 +
 .../JmxInstrumentationUsingDefaultsTest.java       |    1 +
 .../JmxInstrumentationUsingPlatformMBSTest.java    |    1 +
 .../JmxInstrumentationUsingPropertiesTest.java     |    1 +
 .../JmxInstrumentationWithConnectorTest.java       |    1 +
 .../org/apache/camel/management/LoadTimerTest.java |    1 +
 .../management/ManagedBeanIntrospectionTest.java   |    3 +-
 .../ManagedBrowsableEndpointAsXmlFileTest.java     |    1 +
 .../management/ManagedInflightStatisticsTest.java  |    1 +
 .../ManagedNamePatternJvmSystemPropertyTest.java   |    1 +
 .../management/ManagedRouteLoadstatisticsTest.java |    1 +
 .../management/ManagedRouteNoAutoStartupTest.java  |    3 +-
 .../ManagedRoutePerformanceCounterTest.java        |    1 +
 .../camel/management/ManagedRouteRemoveTest.java   |    1 +
 .../ManagedRouteShutdownAndStartTest.java          |    3 +-
 .../ManagedRouteStopAndStartCleanupTest.java       |    3 +-
 .../management/ManagedRouteStopAndStartTest.java   |    1 +
 .../ManagedRouteWithOnExceptionTest.java           |    1 +
 .../management/ManagedServiceUrlPathTest.java      |    3 +-
 .../camel/management/ManagedStartupFailedTest.java |    1 +
 .../ManagedStreamCachingStrategyTest.java          |    1 +
 .../management/ManagedSuspendedServiceTest.java    |    1 +
 .../management/ManagedTransformerRegistryTest.java |    2 +-
 .../management/ManagedValidatorRegistryTest.java   |    2 +-
 ...nagedCamelContextAutoAssignedNameClashTest.java |    1 +
 .../management/TwoManagedCamelContextTest.java     |    1 +
 .../management/TwoManagedNamePatternTest.java      |    1 +
 .../apache/camel/processor/NoErrorHandlerTest.java |    1 +
 .../apache/camel/support/DefaultTimeoutMap.java    |    3 +-
 .../org/apache/camel/support/PlatformHelper.java   |    2 +-
 .../camel/support/builder/PredicateBuilder.java    |    1 +
 .../camel/support/jndi/JndiBeanRepository.java     |    1 +
 .../support/management/MBeanInfoAssembler.java     |    1 +
 .../org/apache/camel/util/StringHelperTest.java    |    1 +
 .../SubmitOrderedCompletionServiceTest.java        |    1 +
 .../camel/example/any23/Any23RouteBuilder.java     |    1 +
 .../artemis/amqp/EmbeddedBrokerSupport.java        |    1 +
 .../apache/camel/example/artemis/ArtemisMain.java  |    1 -
 .../camel/example/bigxml/StaxTokenizerTest.java    |    1 -
 .../camel/example/bigxml/XmlTokenizerTest.java     |    1 -
 .../camel/example/billboard/BillboardAggrTest.java |    1 -
 .../apache/camel/example/cafe/stuff/Waiter.java    |    1 -
 .../apache/camel/example/cafe/stuff/Waiter.java    |    1 -
 .../camel/example/cdi/aws/s3/Application.java      |    1 +
 .../camel/example/cdi/cassandraql/Application.java |    1 +
 .../camel/example/cdi/kubernetes/Application.java  |    1 +
 .../camel/example/cdi/metrics/Application.java     |    1 +
 .../camel/example/cdi/metrics/CdiMetricsTest.java  |    1 +
 .../example/cdi/properties/CdiPropertiesTest.java  |    2 +-
 .../cdi/rest/servlet/CdiRestServletTest.java       |    2 +-
 .../camel/example/cdi/test/AlternativeTest.java    |    1 +
 .../example/cdi/test/ApplicationScopedTest.java    |    1 +
 .../camel/example/cdi/test/CustomContextTest.java  |    2 +-
 .../apache/camel/example/cdi/test/OrderTest.java   |    2 +-
 .../apache/camel/example/cdi/xml/Application.java  |    2 +-
 .../apache/camel/example/cdi/xml/CdiXmlTest.java   |  204 +-
 .../reportincident/ReportIncidentRoutesTest.java   |    2 +-
 .../apache/camel/example/cxf/CamelRouteClient.java |    1 -
 .../camel/example/camel/transport/Client.java      |    1 +
 .../apache/camel/example/cxf/httptojms/Client.java |    1 +
 .../camel/example/cxf/jaxrs/JAXRSClient.java       |    1 +
 .../camel/example/cxf/jaxrs/resources/Book.java    |    1 -
 .../example/cxf/jaxrs/resources/BookStoreImpl.java |    1 +
 .../example/cxf/provider/GreeterProvider.java      |    2 -
 .../camel/example/cxf/provider/TesterBean.java     |    1 +
 .../transport/CamelTransportClientServerTest.java  |    1 +
 .../example/cxf/jaxrs/JAXRSClientServerTest.java   |    1 +
 .../apache/camel/example/fhir/osgi/FhirOsgiIT.java |    2 +
 .../src/main/java/sample/camel/MyCamelRouter.java  |    2 -
 .../camel/examples/grpc/HelloCamelServer.java      |    1 -
 .../apache/camel/example/jdbc/RecordProcessor.java |    2 +-
 .../apache/camel/example/jmx/MyRouteBuilder.java   |    1 +
 .../org/apache/camel/example/jmx/SimpleBean.java   |    1 +
 .../kafka/avro/CustomKafkaAvroDeserializer.java    |    1 -
 .../kafka/avro/CustomKafkaAvroSerializer.java      |    4 +-
 .../kafka/avro/KafkaAvroMessageProcessor.java      |    1 -
 .../apache/camel/loanbroker/LoanBrokerWSTest.java  |    1 +
 .../example/management/ManagementExampleTest.java  |    1 +
 .../example/micrometer/CamelPrometheusExample.java |    2 +
 .../example/micrometer/ScheduledRouteBuilder.java  |    1 +
 .../mybatis/DatabaseInitializationBean.java        |    3 -
 .../blueprint/Olingo4TestConfiguration.java        |    1 +
 .../streams/BasicCamelToReactorExample.java        |    1 -
 .../streams/BasicCamelToReactorInOutExample.java   |    1 -
 .../streams/BasicReactorToCamelExample.java        |    2 +-
 .../streams/BasicReactorToCamelInOutExample.java   |    2 +-
 .../reactive/streams/ClientAPIRestExample.java     |    1 -
 .../reactive/streams/ClientAPIWorkflowExample.java |    2 +-
 .../example/reactive/streams/RestExample.java      |    1 -
 .../camel/example/RestSwaggerApplication.java      |    4 +-
 .../java/sample/camel/SampleAmqApplication.java    |    2 +-
 .../springboot/geocoder/ApplicationTest.java       |    2 +-
 .../camel/examples/grpc/HelloCamelServer.java      |    1 -
 .../spring/boot/rest/jpa/ApplicationTest.java      |    2 +-
 .../org/apache/camel/example/springboot/User.java  |    1 -
 .../example/SpringJmsClientRemotingServerTest.java |    1 +
 .../camel/example/SpringJmsClientServerTest.java   |    1 +
 .../org/apache/camel/example/cdi/UserService.java  |    1 +
 .../commands/AbstractLocalCamelController.java     |    1 +
 .../apache/camel/commands/ContextInfoCommand.java  |    1 +
 .../apache/camel/commands/RouteInfoCommand.java    |    1 +
 .../apache/camel/commands/RouteProfileCommand.java |    1 +
 .../apache/camel/commands/RouteStepCommand.java    |    1 +
 .../AtomixClusterServiceAutoConfiguration.java     |    1 -
 .../ConsulServiceDiscoveryAutoConfiguration.java   |    1 +
 .../ConstantLanguageAutoConfiguration.java         |    5 +-
 .../springboot/ConstantLanguageConfiguration.java  |    3 +-
 .../HeaderLanguageAutoConfiguration.java           |    5 +-
 .../springboot/HeaderLanguageConfiguration.java    |    3 +-
 .../ExchangePropertyLanguageAutoConfiguration.java |    5 +-
 .../ExchangePropertyLanguageConfiguration.java     |    3 +-
 .../springboot/RefLanguageAutoConfiguration.java   |    5 +-
 .../ref/springboot/RefLanguageConfiguration.java   |    3 +-
 .../springboot/FileLanguageAutoConfiguration.java  |    5 +-
 .../springboot/FileLanguageConfiguration.java      |    3 +-
 .../SimpleLanguageAutoConfiguration.java           |    5 +-
 .../springboot/SimpleLanguageConfiguration.java    |    3 +-
 .../TokenizeLanguageAutoConfiguration.java         |    5 +-
 .../springboot/TokenizeLanguageConfiguration.java  |    3 +-
 ...iceCallServiceDiscoveryConfigurationCommon.java |    3 +-
 ...allServiceDiscoveryConfigurationProperties.java |    4 +-
 ...iceCallServiceDiscoveryConfigurationCommon.java |    3 +-
 ...allServiceDiscoveryConfigurationProperties.java |    4 +-
 ...iceCallServiceDiscoveryConfigurationCommon.java |    3 +-
 ...allServiceDiscoveryConfigurationProperties.java |    4 +-
 ...iceCallServiceDiscoveryConfigurationCommon.java |    3 +-
 ...allServiceDiscoveryConfigurationProperties.java |    4 +-
 ...CallServiceLoadBalancerConfigurationCommon.java |    3 +-
 ...ServiceLoadBalancerConfigurationProperties.java |    4 +-
 ...stConfigurationDefinitionAutoConfiguration.java |    4 +-
 .../RestConfigurationDefinitionProperties.java     |    4 +-
 .../HystrixConfigurationDefinitionProperties.java  |    4 +-
 .../cloud/DnsCloudAutoConfiguration.java           |    1 +
 .../cloud/EtcdCloudAutoConfiguration.java          |    1 +
 .../springboot/HystrixAutoConfiguration.java       |    1 +
 .../processor/HystrixMultiConfigurationTest.java   |    2 -
 .../customizer/EmbeddedCacheManagerCustomizer.java |    1 -
 ...ManagerCustomizerWithInfinispanStarterTest.java |    3 +-
 ...ubernetesServiceDiscoveryAutoConfiguration.java |    1 +
 .../springboot/LraServiceAutoConfiguration.java    |    2 +-
 .../lra/springboot/LraServiceConfiguration.java    |    2 +-
 .../starter/OpenTracingAutoConfiguration.java      |    1 -
 .../ReactiveStreamsServiceAutoConfiguration.java   |    1 -
 .../test/ReactiveStreamsNamedEngineTest.java       |    3 -
 .../test/ReactiveStreamsRegistryEngineTest.java    |    3 -
 .../cloud/RibbonCloudAutoConfiguration.java        |    1 +
 .../springboot/cloud/RibbonLoadBalancerTest.java   |    1 -
 .../test/ServletMappingAutoConfigurationTest.java  |    1 -
 .../cxf/jaxrs/testbean/CustomerService.java        |    2 -
 .../jaxrs/testbean/CustomerServiceResource.java    |    1 -
 .../blueprint/CxfPayloadProviderRouterTest.java    |    1 +
 .../test/cxf/blueprint/CxfRsEndpointBeansTest.java |    2 +
 ...eprintResolveComponentFromCamelContextTest.java |    1 -
 .../itest/cdi/PropertiesConfigurationTest.java     |    1 +
 .../camel/itest/jms2/BaseJms2TestSupport.java      |    1 +
 .../CustomerServicesWsAddressingTest.java          |    1 +
 ...ipientListInterceptSendToEndpointIssueTest.java |    1 +
 .../itest/ftp/FtpInitialConnectTimeoutTest.java    |    2 +-
 .../org/apache/camel/itest/ftp/FtpXQueryTest.java  |    1 +
 ...ringFileAntPathMatcherRemoteFileFilterTest.java |    1 -
 .../itest/greeter/CamelFileGreeterOneWayTest.java  |    1 +
 .../itest/greeter/CamelGreeterConsumerTest.java    |    1 -
 .../itest/greeter/CamelGreeterFileDomTest.java     |    1 +
 .../camel/itest/greeter/CamelGreeterTest.java      |    1 +
 .../camel/itest/greeter/JmsToCxfInOutTest.java     |    1 -
 .../apache/camel/itest/http/HttpEndpointTest.java  |    3 +-
 .../itest/http/HttpMaxConnectionPerHostTest.java   |    3 +-
 .../itest/issues/AdviceWithWeaveFirstLastTest.java |    4 +-
 .../itest/issues/IntercepFromAndStrategyTest.java  |    1 -
 .../itest/issues/IsUseAdviceWithJUnit4Test.java    |    2 -
 .../camel/itest/issues/RemoveEndpointsTest.java    |    1 +
 .../itest/jetty/JettyMulticastJmsFileTest.java     |    2 +-
 .../apache/camel/itest/jms/JmsJettyAsyncTest.java  |    1 +
 .../apache/camel/itest/jms/JmsPerformanceTest.java |    1 +
 .../apache/camel/itest/jms/JmsResequencerTest.java |    1 +
 .../camel/itest/mail/SpringMailEndpointTest.java   |    3 +-
 .../itest/netty/NettyAsyncRequestReplyTest.java    |    1 +
 .../quartz/FtpCronScheduledRoutePolicyTest.java    |    1 +
 .../itest/security/MyAuthenticationAdapter.java    |    1 -
 .../apache/camel/itest/shiro/ShiroOverJmsTest.java |    1 +
 .../org/apache/camel/itest/tx/JmsToHttpTXTest.java |    1 +
 ...AndNoTransactionErrorHandlerConfiguredTest.java |    3 +-
 .../itest/tx/JmsToHttpTXWithOnExceptionTest.java   |    2 +-
 .../itest/tx/JmsToHttpTXWithRollbackTest.java      |    2 +-
 .../itest/validator/ValidatorSchemaImportTest.java |    1 -
 .../tools/apt/AbstractTypeConverterGenerator.java  |    1 +
 .../apt/ComponentPropertyConfigurerGenerator.java  |    1 +
 .../camel/tools/apt/ConstantProviderProcessor.java |    3 +-
 .../tools/apt/EndpointAnnotationProcessor.java     |    1 +
 .../apt/EndpointPropertyConfigurerGenerator.java   |    1 +
 .../tools/apt/PropertyPlaceholderGenerator.java    |    1 +
 .../tools/apt/TypeConverterLoaderGenerator.java    |    1 +
 .../camel/tools/apt/TypeConverterProcessor.java    |    2 +-
 .../camel/maven/JavadocApiMethodGeneratorMojo.java |    1 +
 .../java/org/apache/camel/maven/JavadocParser.java |    1 +
 .../org/apache/camel/maven/JavadocParserTest.java  |    1 +
 .../apache/camel/maven/CamelSpringNamespace.java   |    1 +
 .../camel/maven/EipDocumentationEnricherMojo.java  |    1 +
 .../java/org/apache/camel/maven/XmlHelper.java     |    1 +
 .../camel/maven/CamelSpringNamespaceTest.java      |    2 +-
 .../java/org/apache/camel/maven/DomFinderTest.java |    2 +-
 .../maven/EipDocumentationEnricherMojoTest.java    |    2 +-
 .../org/apache/camel/maven/PackageHelperTest.java  |    2 +-
 .../java/org/apache/camel/maven/XmlHelperTest.java |    2 +-
 .../integration/EIPDocumentationMojoTest.java      |    1 +
 .../main/parser/MyConfigurationParserTest.java     |    1 +
 .../camel/maven/packaging/PackageJaxbMojo.java     |    1 +
 .../maven/packaging/PrepareCatalogKarafMojo.java   |    4 +-
 .../packaging/UpdateDocComponentListMojo.java      |    3 +-
 ...pdateSpringBootAutoConfigurationReadmeMojo.java |    6 +-
 .../java/com/example/MyDestinationGenerator.java   |    1 -
 .../maven/generator/swagger/GenerateXmlMojo.java   |    1 -
 .../generator/swagger/AppendableGenerator.java     |    1 -
 .../camel/generator/swagger/FilerGenerator.java    |    1 -
 .../camel/generator/swagger/OperationVisitor.java  |    3 +-
 .../camel/generator/swagger/PathGenerator.java     |    1 -
 .../camel/generator/swagger/PathVisitor.java       |    3 +-
 .../swagger/RestDslDefinitionGenerator.java        |    1 -
 .../camel/generator/swagger/RestDslGenerator.java  |    1 +
 .../swagger/RestDslSourceCodeGenerator.java        |    6 +-
 .../generator/swagger/RestDslXmlGenerator.java     |    2 +-
 .../SpringBootProjectSourceCodeGenerator.java      |    1 +
 .../swagger/MethodBodySourceCodeEmitterTest.java   |    1 -
 .../generator/swagger/RestDslGeneratorTest.java    |    1 -
 .../swagger/RestDslSourceCodeGeneratorTest.java    |    1 -
 .../generator/swagger/RestDslXmlGeneratorTest.java |    2 +-
 2774 files changed, 17197 insertions(+), 17570 deletions(-)

diff --git a/catalog/camel-catalog-provider-springboot/src/test/java/org/apache/camel/catalog/springboot/SpringBootRuntimeProviderTest.java b/catalog/camel-catalog-provider-springboot/src/test/java/org/apache/camel/catalog/springboot/SpringBootRuntimeProviderTest.java
index 5afd845..1d6f54e 100644
--- a/catalog/camel-catalog-provider-springboot/src/test/java/org/apache/camel/catalog/springboot/SpringBootRuntimeProviderTest.java
+++ b/catalog/camel-catalog-provider-springboot/src/test/java/org/apache/camel/catalog/springboot/SpringBootRuntimeProviderTest.java
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 package org.apache.camel.catalog.springboot;
+
 import java.util.List;
 
 import org.apache.camel.catalog.CamelCatalog;
diff --git a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
index 6cc8523..c3760c5 100644
--- a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
+++ b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
@@ -20,6 +20,7 @@ import java.net.URISyntaxException;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import javax.management.MXBean;
 
 /**
diff --git a/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/GenerateMojo.java b/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/GenerateMojo.java
index c76cf89..a6946ff 100644
--- a/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/GenerateMojo.java
+++ b/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/GenerateMojo.java
@@ -49,7 +49,6 @@ import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.plugins.annotations.ResolutionScope;
-
 import org.jboss.forge.roaster.Roaster;
 import org.jboss.forge.roaster.model.Extendable;
 import org.jboss.forge.roaster.model.JavaType;
diff --git a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelXmlTreeParserHelper.java b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelXmlTreeParserHelper.java
index 435d94d..880db29 100644
--- a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelXmlTreeParserHelper.java
+++ b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelXmlTreeParserHelper.java
@@ -26,7 +26,6 @@ import org.w3c.dom.NodeList;
 import org.apache.camel.catalog.CamelCatalog;
 import org.apache.camel.catalog.DefaultCamelCatalog;
 import org.apache.camel.catalog.JSonSchemaHelper;
-
 import org.apache.camel.parser.model.CamelNodeDetails;
 import org.apache.camel.parser.model.CamelNodeDetailsFactory;
 
diff --git a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/XmlLineNumberParser.java b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/XmlLineNumberParser.java
index 329b3a9..76cbb80 100644
--- a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/XmlLineNumberParser.java
+++ b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/XmlLineNumberParser.java
@@ -35,6 +35,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/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQOriginalDestinationTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQOriginalDestinationTest.java
index 29ceea5..e23db5e 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQOriginalDestinationTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQOriginalDestinationTest.java
@@ -30,7 +30,6 @@ import org.junit.Test;
 
 import static org.apache.camel.component.activemq.ActiveMQComponent.activeMQComponent;
 
-
 public class ActiveMQOriginalDestinationTest extends CamelTestSupport {
 
     @Test
diff --git a/components/camel-ahc-ws/src/test/java/org/apache/camel/component/ahc/ws/WsProducerConsumerTest.java b/components/camel-ahc-ws/src/test/java/org/apache/camel/component/ahc/ws/WsProducerConsumerTest.java
index e556130..3026278 100644
--- a/components/camel-ahc-ws/src/test/java/org/apache/camel/component/ahc/ws/WsProducerConsumerTest.java
+++ b/components/camel-ahc-ws/src/test/java/org/apache/camel/component/ahc/ws/WsProducerConsumerTest.java
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 package org.apache.camel.component.ahc.ws;
+
 import java.util.List;
 
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/HttpProtocolHeaderFilterStrategy.java b/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/HttpProtocolHeaderFilterStrategy.java
index c665fb4..4d276df 100644
--- a/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/HttpProtocolHeaderFilterStrategy.java
+++ b/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/HttpProtocolHeaderFilterStrategy.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.ahc;
 
 import org.apache.camel.support.DefaultHeaderFilterStrategy;
 
-
 public class HttpProtocolHeaderFilterStrategy extends DefaultHeaderFilterStrategy {
     
     public HttpProtocolHeaderFilterStrategy() {
diff --git a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigTest.java b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigTest.java
index 6664ada..560e8b6 100644
--- a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigTest.java
+++ b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigTest.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.ahc;
 
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPConnectionDetails.java b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPConnectionDetails.java
index 07d1e9d..fa1e05f 100644
--- a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPConnectionDetails.java
+++ b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPConnectionDetails.java
@@ -104,4 +104,4 @@ public class AMQPConnectionDetails {
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTraceFrameTest.java b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTraceFrameTest.java
index 3f35ede..8912473 100644
--- a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTraceFrameTest.java
+++ b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTraceFrameTest.java
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 package org.apache.camel.component.amqp;
+
 import org.apache.activemq.broker.BrokerService;
 import org.apache.camel.CamelContext;
 import org.apache.camel.EndpointInject;
diff --git a/components/camel-any23/src/main/java/org/apache/camel/dataformat/any23/Any23DataFormat.java b/components/camel-any23/src/main/java/org/apache/camel/dataformat/any23/Any23DataFormat.java
index 57af357..c597b14 100644
--- a/components/camel-any23/src/main/java/org/apache/camel/dataformat/any23/Any23DataFormat.java
+++ b/components/camel-any23/src/main/java/org/apache/camel/dataformat/any23/Any23DataFormat.java
@@ -23,12 +23,12 @@ import java.io.OutputStreamWriter;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+
 import org.apache.any23.Any23;
 import org.apache.any23.configuration.DefaultConfiguration;
 import org.apache.any23.configuration.ModifiableConfiguration;
 import org.apache.any23.source.ByteArrayDocumentSource;
 import org.apache.any23.writer.TripleHandler;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.dataformat.any23.utils.Any23Utils;
 import org.apache.camel.dataformat.any23.writer.RDF4JModelWriter;
diff --git a/components/camel-any23/src/main/java/org/apache/camel/dataformat/any23/utils/Any23Utils.java b/components/camel-any23/src/main/java/org/apache/camel/dataformat/any23/utils/Any23Utils.java
index 7213a67..6b3ce65 100644
--- a/components/camel-any23/src/main/java/org/apache/camel/dataformat/any23/utils/Any23Utils.java
+++ b/components/camel-any23/src/main/java/org/apache/camel/dataformat/any23/utils/Any23Utils.java
@@ -17,6 +17,7 @@
 package org.apache.camel.dataformat.any23.utils;
 
 import java.io.OutputStream;
+
 import org.apache.any23.writer.JSONLDWriter;
 import org.apache.any23.writer.NQuadsWriter;
 import org.apache.any23.writer.NTriplesWriter;
diff --git a/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatConfigurationsTest.java b/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatConfigurationsTest.java
index ebf85a2..3262b11 100644
--- a/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatConfigurationsTest.java
+++ b/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatConfigurationsTest.java
@@ -22,6 +22,7 @@ import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatDefaultTest.java b/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatDefaultTest.java
index 7d032a7..c686c5a 100644
--- a/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatDefaultTest.java
+++ b/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatDefaultTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.dataformat.any23;
 
 import java.io.File;
 import java.util.List;
+
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatExtractorsTest.java b/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatExtractorsTest.java
index d1b8c60..9c085e5 100644
--- a/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatExtractorsTest.java
+++ b/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatExtractorsTest.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatHTTPTest.java b/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatHTTPTest.java
index dd4ab1f..ed5cef2 100644
--- a/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatHTTPTest.java
+++ b/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatHTTPTest.java
@@ -17,6 +17,7 @@
 package org.apache.camel.dataformat.any23;
 
 import java.util.List;
+
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatMarshalTest.java b/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatMarshalTest.java
index 356bd05..c7fd0d1 100644
--- a/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatMarshalTest.java
+++ b/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatMarshalTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.dataformat.any23;
 
 import java.io.File;
 import java.util.List;
+
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatModelTest.java b/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatModelTest.java
index 29702c3..9b6501b 100644
--- a/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatModelTest.java
+++ b/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatModelTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.dataformat.any23;
 
 import java.io.File;
 import java.util.List;
+
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatOutputFormatTest.java b/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatOutputFormatTest.java
index f53c71c..dea0687 100644
--- a/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatOutputFormatTest.java
+++ b/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatOutputFormatTest.java
@@ -20,6 +20,7 @@ import java.io.File;
 import java.io.InputStream;
 import java.nio.charset.Charset;
 import java.util.List;
+
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatSpringTest.java b/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatSpringTest.java
index e19ac47..03dbded 100644
--- a/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatSpringTest.java
+++ b/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatSpringTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.dataformat.any23;
 import java.io.InputStream;
 import java.nio.charset.Charset;
 import java.util.List;
+
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.component.mock.MockEndpoint;
diff --git a/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23TestSupport.java b/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23TestSupport.java
index 448a88e..4229b73 100644
--- a/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23TestSupport.java
+++ b/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23TestSupport.java
@@ -19,6 +19,7 @@ package org.apache.camel.dataformat.any23;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
+
 import org.apache.camel.util.IOHelper;
 
 public final class Any23TestSupport {
diff --git a/components/camel-apns/src/main/java/org/apache/camel/component/apns/factory/ApnsServiceFactory.java b/components/camel-apns/src/main/java/org/apache/camel/component/apns/factory/ApnsServiceFactory.java
index 3404d7f..bc6cd21 100644
--- a/components/camel-apns/src/main/java/org/apache/camel/component/apns/factory/ApnsServiceFactory.java
+++ b/components/camel-apns/src/main/java/org/apache/camel/component/apns/factory/ApnsServiceFactory.java
@@ -26,7 +26,6 @@ import com.notnoop.apns.ApnsService;
 import com.notnoop.apns.ApnsServiceBuilder;
 import com.notnoop.apns.ReconnectPolicy;
 import com.notnoop.apns.internal.Utilities;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.CamelContextAware;
 import org.apache.camel.RuntimeCamelException;
diff --git a/components/camel-apns/src/main/java/org/apache/camel/component/apns/util/ResourceUtils.java b/components/camel-apns/src/main/java/org/apache/camel/component/apns/util/ResourceUtils.java
index e147da0..b8a4c7c 100644
--- a/components/camel-apns/src/main/java/org/apache/camel/component/apns/util/ResourceUtils.java
+++ b/components/camel-apns/src/main/java/org/apache/camel/component/apns/util/ResourceUtils.java
@@ -23,7 +23,6 @@ import java.io.IOException;
 import java.io.InputStream;
 
 import com.notnoop.exceptions.RuntimeIOException;
-
 import org.apache.camel.util.IOHelper;
 
 public final class ResourceUtils {
diff --git a/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsConsumerIdleMessageTest.java b/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsConsumerIdleMessageTest.java
index f59cf06..62951ba 100644
--- a/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsConsumerIdleMessageTest.java
+++ b/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsConsumerIdleMessageTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.apns;
 
 import com.notnoop.apns.ApnsService;
 import com.notnoop.apns.utils.ApnsServerStub;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.apns.factory.ApnsServiceFactory;
diff --git a/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsConsumerTest.java b/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsConsumerTest.java
index a3f973a..d4b7102 100644
--- a/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsConsumerTest.java
+++ b/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsConsumerTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.apns;
 
 import com.notnoop.apns.ApnsService;
 import com.notnoop.apns.utils.ApnsServerStub;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.apns.factory.ApnsServiceFactory;
@@ -31,7 +30,6 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-
 /**
  * Unit test that we can produce JMS message from files
  */
diff --git a/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsProducerTest.java b/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsProducerTest.java
index 6a722ec..10775d8 100644
--- a/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsProducerTest.java
+++ b/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsProducerTest.java
@@ -20,7 +20,6 @@ import com.notnoop.apns.APNS;
 import com.notnoop.apns.ApnsService;
 import com.notnoop.apns.EnhancedApnsNotification;
 import com.notnoop.apns.utils.ApnsServerStub;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.apns.factory.ApnsServiceFactory;
diff --git a/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsProducerWithoutTokensHeaderTest.java b/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsProducerWithoutTokensHeaderTest.java
index 082d893..7f5383c 100644
--- a/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsProducerWithoutTokensHeaderTest.java
+++ b/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsProducerWithoutTokensHeaderTest.java
@@ -20,7 +20,6 @@ import com.notnoop.apns.APNS;
 import com.notnoop.apns.ApnsService;
 import com.notnoop.apns.EnhancedApnsNotification;
 import com.notnoop.apns.utils.ApnsServerStub;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.apns.factory.ApnsServiceFactory;
diff --git a/components/camel-apns/src/test/java/org/apache/camel/component/apns/factory/ApnsServiceFactoryTest.java b/components/camel-apns/src/test/java/org/apache/camel/component/apns/factory/ApnsServiceFactoryTest.java
index e60e425..8a4d7f9 100644
--- a/components/camel-apns/src/test/java/org/apache/camel/component/apns/factory/ApnsServiceFactoryTest.java
+++ b/components/camel-apns/src/test/java/org/apache/camel/component/apns/factory/ApnsServiceFactoryTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.apns.factory;
 
 import com.notnoop.apns.ApnsService;
-
 import org.apache.camel.component.apns.model.ConnectionStrategy;
 import org.apache.camel.component.apns.util.ApnsUtils;
 import org.apache.camel.component.apns.util.TestConstants;
diff --git a/components/camel-apns/src/test/java/org/apache/camel/component/apns/factory/ConfiguredApnsServiceFactoryTest.java b/components/camel-apns/src/test/java/org/apache/camel/component/apns/factory/ConfiguredApnsServiceFactoryTest.java
index 195cfa5..882ca23 100644
--- a/components/camel-apns/src/test/java/org/apache/camel/component/apns/factory/ConfiguredApnsServiceFactoryTest.java
+++ b/components/camel-apns/src/test/java/org/apache/camel/component/apns/factory/ConfiguredApnsServiceFactoryTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.apns.factory;
 import java.io.IOException;
 
 import com.notnoop.apns.ApnsServiceBuilder;
-
 import org.apache.camel.support.jsse.SSLContextParameters;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/components/camel-apns/src/test/java/org/apache/camel/component/apns/spring/SpringApnsConsumerTest.java b/components/camel-apns/src/test/java/org/apache/camel/component/apns/spring/SpringApnsConsumerTest.java
index 6f2af38..c2a4505 100644
--- a/components/camel-apns/src/test/java/org/apache/camel/component/apns/spring/SpringApnsConsumerTest.java
+++ b/components/camel-apns/src/test/java/org/apache/camel/component/apns/spring/SpringApnsConsumerTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.apns.spring;
 
 import com.notnoop.apns.utils.ApnsServerStub;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.component.apns.model.InactiveDevice;
diff --git a/components/camel-apns/src/test/java/org/apache/camel/component/apns/util/ApnsUtils.java b/components/camel-apns/src/test/java/org/apache/camel/component/apns/util/ApnsUtils.java
index b2b2b01..ef30f52 100644
--- a/components/camel-apns/src/test/java/org/apache/camel/component/apns/util/ApnsUtils.java
+++ b/components/camel-apns/src/test/java/org/apache/camel/component/apns/util/ApnsUtils.java
@@ -27,6 +27,7 @@ import java.security.cert.X509Certificate;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Random;
+
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
@@ -35,7 +36,6 @@ import com.notnoop.apns.internal.ApnsFeedbackParsingUtilsAcessor;
 import com.notnoop.apns.internal.Utilities;
 import com.notnoop.apns.utils.ApnsServerStub;
 import com.notnoop.apns.utils.FixedCertificates;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.component.apns.factory.ApnsServiceFactory;
 import org.apache.camel.support.jsse.KeyManagersParameters;
diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2SignedDataGenerator.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2SignedDataGenerator.java
index 9147776..a6944d9 100644
--- a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2SignedDataGenerator.java
+++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2SignedDataGenerator.java
@@ -17,22 +17,6 @@
 package org.apache.camel.component.as2.api;
 
 import java.security.Key;
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/AS2MessageTest.java b/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/AS2MessageTest.java
index db43751..84ebd96 100644
--- a/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/AS2MessageTest.java
+++ b/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/AS2MessageTest.java
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 package org.apache.camel.component.as2.api;
+
 import java.io.IOException;
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;
diff --git a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIntegrationTest.java b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIntegrationTest.java
index c3f2292..4830406 100644
--- a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIntegrationTest.java
+++ b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIntegrationTest.java
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 package org.apache.camel.component.as2;
+
 import java.io.IOException;
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;
diff --git a/components/camel-asn1/src/main/java/org/apache/camel/dataformat/asn1/ASN1DataFormat.java b/components/camel-asn1/src/main/java/org/apache/camel/dataformat/asn1/ASN1DataFormat.java
index 414651a..7b5d808 100644
--- a/components/camel-asn1/src/main/java/org/apache/camel/dataformat/asn1/ASN1DataFormat.java
+++ b/components/camel-asn1/src/main/java/org/apache/camel/dataformat/asn1/ASN1DataFormat.java
@@ -25,7 +25,6 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
 import com.beanit.jasn1.ber.ReverseByteArrayOutputStream;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.spi.DataFormat;
 import org.apache.camel.spi.DataFormatName;
@@ -148,4 +147,4 @@ public class ASN1DataFormat extends ServiceSupport implements DataFormat, DataFo
         // no op
     }
 
-}
\ No newline at end of file
+}
diff --git a/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/dto/AtmosFileUploadResult.java b/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/dto/AtmosFileUploadResult.java
index e25b485..f347cf1 100644
--- a/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/dto/AtmosFileUploadResult.java
+++ b/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/dto/AtmosFileUploadResult.java
@@ -22,7 +22,6 @@ import org.apache.camel.Exchange;
 import org.apache.camel.component.atmos.util.AtmosResultCode;
 import org.apache.camel.component.atmos.util.AtmosResultHeader;
 
-
 public class AtmosFileUploadResult extends AtmosResult {
 
     /**
diff --git a/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/dto/AtmosMoveResult.java b/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/dto/AtmosMoveResult.java
index ba41482..3f97213 100644
--- a/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/dto/AtmosMoveResult.java
+++ b/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/dto/AtmosMoveResult.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.atmos.dto;
 import org.apache.camel.Exchange;
 import org.apache.camel.component.atmos.util.AtmosResultHeader;
 
-
 public class AtmosMoveResult extends AtmosResult {
     
     /**
diff --git a/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/dto/AtmosResult.java b/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/dto/AtmosResult.java
index 6f95d13..a6d6b9e 100644
--- a/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/dto/AtmosResult.java
+++ b/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/dto/AtmosResult.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.atmos.dto;
 
 import org.apache.camel.Exchange;
 
-
 public abstract class AtmosResult {
 
     protected Object resultEntries;
diff --git a/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/integration/consumer/AtmosScheduledPollConsumer.java b/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/integration/consumer/AtmosScheduledPollConsumer.java
index a4b0d93..7f5108c 100644
--- a/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/integration/consumer/AtmosScheduledPollConsumer.java
+++ b/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/integration/consumer/AtmosScheduledPollConsumer.java
@@ -21,7 +21,6 @@ import org.apache.camel.component.atmos.AtmosConfiguration;
 import org.apache.camel.component.atmos.AtmosEndpoint;
 import org.apache.camel.support.ScheduledPollConsumer;
 
-
 public abstract class AtmosScheduledPollConsumer extends ScheduledPollConsumer {
 
     protected AtmosEndpoint endpoint;
diff --git a/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/validator/AtmosConfigurationValidator.java b/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/validator/AtmosConfigurationValidator.java
index 94a261a..99c5e0f 100644
--- a/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/validator/AtmosConfigurationValidator.java
+++ b/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/validator/AtmosConfigurationValidator.java
@@ -25,6 +25,7 @@ import java.util.regex.Pattern;
 import org.apache.camel.component.atmos.AtmosConfiguration;
 import org.apache.camel.component.atmos.util.AtmosException;
 import org.apache.camel.component.atmos.util.AtmosOperation;
+
 import static org.apache.camel.component.atmos.util.AtmosConstants.ATMOS_FILE_SEPARATOR;
 
 public final class AtmosConfigurationValidator {
diff --git a/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/AtmosTestSupport.java b/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/AtmosTestSupport.java
index e452665..a43721c 100644
--- a/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/AtmosTestSupport.java
+++ b/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/AtmosTestSupport.java
@@ -22,7 +22,6 @@ import org.apache.camel.CamelContext;
 import org.apache.camel.component.atmos.AtmosComponent;
 import org.apache.camel.test.junit4.CamelTestSupport;
 
-
 public class AtmosTestSupport extends CamelTestSupport {
 
     @Override
diff --git a/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/consumer/AtmosConsumerGetSingleTest.java b/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/consumer/AtmosConsumerGetSingleTest.java
index 21d700d..898583f 100644
--- a/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/consumer/AtmosConsumerGetSingleTest.java
+++ b/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/consumer/AtmosConsumerGetSingleTest.java
@@ -26,7 +26,6 @@ import org.apache.camel.component.atmos.util.AtmosResultHeader;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
 
-
 public class AtmosConsumerGetSingleTest extends AtmosTestSupport {
 
     public AtmosConsumerGetSingleTest() throws Exception { }
diff --git a/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerDelTest.java b/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerDelTest.java
index f8d70c0..dbed8bd 100644
--- a/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerDelTest.java
+++ b/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerDelTest.java
@@ -26,7 +26,6 @@ import org.apache.camel.component.atmos.util.AtmosResultHeader;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
 
-
 public class AtmosProducerDelTest extends AtmosTestSupport {
 
     public AtmosProducerDelTest() throws Exception { }
diff --git a/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerGetFolderTest.java b/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerGetFolderTest.java
index 657db68..98b2f6e 100644
--- a/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerGetFolderTest.java
+++ b/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerGetFolderTest.java
@@ -27,7 +27,6 @@ import org.apache.camel.component.atmos.util.AtmosResultHeader;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
 
-
 public class AtmosProducerGetFolderTest extends AtmosTestSupport {
 
     public AtmosProducerGetFolderTest() throws Exception { }
diff --git a/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerGetSingleTest.java b/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerGetSingleTest.java
index b652cc0..0fd3eb8 100644
--- a/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerGetSingleTest.java
+++ b/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerGetSingleTest.java
@@ -27,7 +27,6 @@ import org.apache.camel.component.atmos.util.AtmosResultHeader;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
 
-
 public class AtmosProducerGetSingleTest extends AtmosTestSupport {
 
     public AtmosProducerGetSingleTest() throws Exception { }
diff --git a/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerMoveTest.java b/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerMoveTest.java
index 6e495fd..9cc9beb 100644
--- a/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerMoveTest.java
+++ b/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerMoveTest.java
@@ -27,7 +27,6 @@ import org.apache.camel.component.atmos.util.AtmosResultHeader;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
 
-
 public class AtmosProducerMoveTest extends AtmosTestSupport {
 
     public AtmosProducerMoveTest() throws Exception { }
diff --git a/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerPutFolderWithRemotePathTest.java b/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerPutFolderWithRemotePathTest.java
index d62e078..59e50d5 100644
--- a/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerPutFolderWithRemotePathTest.java
+++ b/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerPutFolderWithRemotePathTest.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.atmos.integration.producer;
 
-
 import java.util.List;
 
 import org.apache.camel.Exchange;
@@ -27,7 +26,6 @@ import org.apache.camel.component.atmos.util.AtmosResultHeader;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
 
-
 public class AtmosProducerPutFolderWithRemotePathTest extends AtmosTestSupport {
 
     public AtmosProducerPutFolderWithRemotePathTest() throws Exception { }
diff --git a/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerPutSingleFileTest.java b/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerPutSingleFileTest.java
index a0c13ae..dc8dc0b 100644
--- a/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerPutSingleFileTest.java
+++ b/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerPutSingleFileTest.java
@@ -27,7 +27,6 @@ import org.apache.camel.component.atmos.util.AtmosResultHeader;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
 
-
 public class AtmosProducerPutSingleFileTest extends AtmosTestSupport {
 
     public AtmosProducerPutSingleFileTest() throws Exception { }
diff --git a/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerPutSingleFileWithRemotePathTest.java b/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerPutSingleFileWithRemotePathTest.java
index 9f99546..19da018 100644
--- a/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerPutSingleFileWithRemotePathTest.java
+++ b/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/integration/producer/AtmosProducerPutSingleFileWithRemotePathTest.java
@@ -27,7 +27,6 @@ import org.apache.camel.component.atmos.util.AtmosResultHeader;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
 
-
 public class AtmosProducerPutSingleFileWithRemotePathTest extends AtmosTestSupport {
 
     public AtmosProducerPutSingleFileWithRemotePathTest() throws Exception { }
diff --git a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/CamelWebSocketServlet.java b/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/CamelWebSocketServlet.java
index 46b2bec..01bacdf 100644
--- a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/CamelWebSocketServlet.java
+++ b/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/CamelWebSocketServlet.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.atmosphere.websocket;
 
 import java.io.IOException;
 import java.util.Map;
+
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
diff --git a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/MemoryWebSocketStoreTest.java b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/MemoryWebSocketStoreTest.java
index 097aa13..e4042e2 100644
--- a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/MemoryWebSocketStoreTest.java
+++ b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/MemoryWebSocketStoreTest.java
@@ -23,7 +23,6 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.mockito.Mockito;
 
-
 public class MemoryWebSocketStoreTest extends Assert {
     
     @Test
diff --git a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRouteWithInitParamTest.java b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRouteWithInitParamTest.java
index 538cf11..acb4ecf 100644
--- a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRouteWithInitParamTest.java
+++ b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRouteWithInitParamTest.java
@@ -24,7 +24,6 @@ import java.util.Map;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
-
 import org.junit.Test;
 
 public class WebsocketRouteWithInitParamTest extends WebsocketCamelRouterWithInitParamTestSupport {
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerWithBasicAuthTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerWithBasicAuthTest.java
index 3ed62cd..27d3633 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerWithBasicAuthTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerWithBasicAuthTest.java
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 package org.apache.camel.component.atom;
+
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerWithBasicAuthTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerWithBasicAuthTest.java
index 45c2590..9edbe71 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerWithBasicAuthTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerWithBasicAuthTest.java
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 package org.apache.camel.component.atom;
+
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomProducerTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomProducerTest.java
index 89d846d..f1c4d33 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomProducerTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomProducerTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.atom;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
-
 /**
  * Unit test for AtomProducer.
  */
diff --git a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/AbstractAtomixClientEndpoint.java b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/AbstractAtomixClientEndpoint.java
index f1750e6..4556f08 100644
--- a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/AbstractAtomixClientEndpoint.java
+++ b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/AbstractAtomixClientEndpoint.java
@@ -26,7 +26,6 @@ import org.apache.camel.spi.UriPath;
 import org.apache.camel.support.DefaultEndpoint;
 import org.apache.camel.util.ObjectHelper;
 
-
 public abstract class AbstractAtomixClientEndpoint<T extends AbstractAtomixClientComponent, C extends AtomixClientConfiguration> extends DefaultEndpoint {
     @UriPath(description = "The distributed resource name")
     @Metadata(required = true)
diff --git a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/map/AtomixMapEndpoint.java b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/map/AtomixMapEndpoint.java
index 99fab81..30cd724 100644
--- a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/map/AtomixMapEndpoint.java
+++ b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/map/AtomixMapEndpoint.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.atomix.client.map;
 
-
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
diff --git a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingEndpoint.java b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingEndpoint.java
index d0674e9..ac71440 100644
--- a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingEndpoint.java
+++ b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingEndpoint.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.atomix.client.messaging;
 
-
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
diff --git a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapEndpoint.java b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapEndpoint.java
index 0a0de4a..818a887 100644
--- a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapEndpoint.java
+++ b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapEndpoint.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.atomix.client.multimap;
 
-
 import org.apache.camel.Producer;
 import org.apache.camel.component.atomix.client.AbstractAtomixClientEndpoint;
 import org.apache.camel.spi.UriEndpoint;
diff --git a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/queue/AtomixQueueEndpoint.java b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/queue/AtomixQueueEndpoint.java
index 21fe107..b89cc58 100644
--- a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/queue/AtomixQueueEndpoint.java
+++ b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/queue/AtomixQueueEndpoint.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.atomix.client.queue;
 
-
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
diff --git a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/set/AtomixSetEndpoint.java b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/set/AtomixSetEndpoint.java
index 4a95a37..072780c 100644
--- a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/set/AtomixSetEndpoint.java
+++ b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/set/AtomixSetEndpoint.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.atomix.client.set;
 
-
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
diff --git a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/value/AtomixValueEndpoint.java b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/value/AtomixValueEndpoint.java
index 804404f..f25b95c 100644
--- a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/value/AtomixValueEndpoint.java
+++ b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/value/AtomixValueEndpoint.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.atomix.client.value;
 
-
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapConsumerTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapConsumerTest.java
index 8c2fa20..fb88aa6f 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapConsumerTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapConsumerTest.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 package org.apache.camel.component.atomix.client.map;
+
 import java.util.Collections;
 import java.util.Map;
 import java.util.UUID;
 
 import io.atomix.collections.DistributedMap;
-
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.Component;
 import org.apache.camel.RoutesBuilder;
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapNodesProducerTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapNodesProducerTest.java
index f0b268b..b43fb18 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapNodesProducerTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapNodesProducerTest.java
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 package org.apache.camel.component.atomix.client.map;
+
 import java.util.Collections;
 import java.util.Map;
 import java.util.UUID;
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapProducerTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapProducerTest.java
index f8d7552..2c4074b 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapProducerTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapProducerTest.java
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 package org.apache.camel.component.atomix.client.map;
+
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingTest.java
index 283e4fe..61818a9 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingTest.java
@@ -30,7 +30,6 @@ import org.apache.camel.component.atomix.client.AtomixClientTestSupport;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
 
-
 public class AtomixMessagingTest extends AtomixClientTestSupport {
     private static final String NODE_NAME = UUID.randomUUID().toString();
 
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapProducerTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapProducerTest.java
index d245c65..49ac0ad 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapProducerTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapProducerTest.java
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 package org.apache.camel.component.atomix.client.multimap;
+
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/queue/AtomixQueueConsumerTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/queue/AtomixQueueConsumerTest.java
index 64ca52a..8f08cef 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/queue/AtomixQueueConsumerTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/queue/AtomixQueueConsumerTest.java
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 package org.apache.camel.component.atomix.client.queue;
+
 import java.util.Collections;
 import java.util.Map;
 import java.util.UUID;
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/queue/AtomixQueueProducerTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/queue/AtomixQueueProducerTest.java
index f997c2d..2ded4a6 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/queue/AtomixQueueProducerTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/queue/AtomixQueueProducerTest.java
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 package org.apache.camel.component.atomix.client.queue;
+
 import java.util.Collections;
 import java.util.Map;
 import java.util.UUID;
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/set/AtomixSetConsumerTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/set/AtomixSetConsumerTest.java
index cfd7168..85d6a33 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/set/AtomixSetConsumerTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/set/AtomixSetConsumerTest.java
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 package org.apache.camel.component.atomix.client.set;
+
 import java.util.Collections;
 import java.util.Map;
 import java.util.UUID;
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/set/AtomixSetProducerTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/set/AtomixSetProducerTest.java
index b59fcd5..3977e6e 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/set/AtomixSetProducerTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/set/AtomixSetProducerTest.java
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 package org.apache.camel.component.atomix.client.set;
+
 import java.util.Collections;
 import java.util.Map;
 import java.util.UUID;
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/value/AtomixValueConsumerTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/value/AtomixValueConsumerTest.java
index ab390dd..3efc45f 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/value/AtomixValueConsumerTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/value/AtomixValueConsumerTest.java
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 package org.apache.camel.component.atomix.client.value;
+
 import java.util.Collections;
 import java.util.Map;
 import java.util.UUID;
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/value/AtomixValueProducerTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/value/AtomixValueProducerTest.java
index 9593493..770476b 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/value/AtomixValueProducerTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/value/AtomixValueProducerTest.java
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 package org.apache.camel.component.atomix.client.value;
+
 import java.util.Collections;
 import java.util.Map;
 import java.util.UUID;
diff --git a/components/camel-attachments/src/main/java/org/apache/camel/attachment/AttachmentMessage.java b/components/camel-attachments/src/main/java/org/apache/camel/attachment/AttachmentMessage.java
index dd89b35..e653935 100644
--- a/components/camel-attachments/src/main/java/org/apache/camel/attachment/AttachmentMessage.java
+++ b/components/camel-attachments/src/main/java/org/apache/camel/attachment/AttachmentMessage.java
@@ -18,6 +18,7 @@ package org.apache.camel.attachment;
 
 import java.util.Map;
 import java.util.Set;
+
 import javax.activation.DataHandler;
 
 import org.apache.camel.Message;
diff --git a/components/camel-attachments/src/test/java/org/apache/camel/attachment/BodyAndHeaderConvertTest.java b/components/camel-attachments/src/test/java/org/apache/camel/attachment/BodyAndHeaderConvertTest.java
index 640b78a..53265e4 100644
--- a/components/camel-attachments/src/test/java/org/apache/camel/attachment/BodyAndHeaderConvertTest.java
+++ b/components/camel-attachments/src/test/java/org/apache/camel/attachment/BodyAndHeaderConvertTest.java
@@ -17,6 +17,7 @@
 package org.apache.camel.attachment;
 
 import java.net.URL;
+
 import javax.activation.DataHandler;
 import javax.activation.URLDataSource;
 
diff --git a/components/camel-attachments/src/test/java/org/apache/camel/attachment/MessageWithAttachmentRedeliveryIssueTest.java b/components/camel-attachments/src/test/java/org/apache/camel/attachment/MessageWithAttachmentRedeliveryIssueTest.java
index c72c851..f15308f 100644
--- a/components/camel-attachments/src/test/java/org/apache/camel/attachment/MessageWithAttachmentRedeliveryIssueTest.java
+++ b/components/camel-attachments/src/test/java/org/apache/camel/attachment/MessageWithAttachmentRedeliveryIssueTest.java
@@ -17,6 +17,7 @@
 package org.apache.camel.attachment;
 
 import java.io.File;
+
 import javax.activation.DataHandler;
 import javax.activation.FileDataSource;
 
diff --git a/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroListener.java b/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroListener.java
index d259c58..793f14c 100644
--- a/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroListener.java
+++ b/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroListener.java
@@ -35,7 +35,6 @@ import org.eclipse.jetty.util.log.Log;
 import static org.apache.camel.component.avro.AvroConstants.AVRO_HTTP_TRANSPORT;
 import static org.apache.camel.component.avro.AvroConstants.AVRO_NETTY_TRANSPORT;
 
-
 /**
  * This class holds server that listen to given protocol:host:port combination and dispatches messages to
  * different routes mapped.
diff --git a/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroProducer.java b/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroProducer.java
index d062f1d..62b24e9 100644
--- a/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroProducer.java
+++ b/components/camel-avro/src/main/java/org/apache/camel/component/avro/AvroProducer.java
@@ -25,7 +25,6 @@ import org.apache.camel.Exchange;
 import org.apache.camel.support.DefaultAsyncProducer;
 import org.apache.commons.lang3.StringUtils;
 
-
 public abstract class AvroProducer extends DefaultAsyncProducer {
 
     Transceiver transceiver;
diff --git a/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettySpringProducerTest.java b/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettySpringProducerTest.java
index 95077ff..1b3d7d5 100644
--- a/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettySpringProducerTest.java
+++ b/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettySpringProducerTest.java
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 package org.apache.camel.component.avro;
+
 import org.apache.camel.CamelContext;
 import org.apache.camel.spring.SpringCamelContext;
 import org.apache.camel.util.IOHelper;
diff --git a/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroGenericMarshaAndUnmarshaTest.java b/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroGenericMarshaAndUnmarshaTest.java
index b1e98bd..04b77d3 100644
--- a/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroGenericMarshaAndUnmarshaTest.java
+++ b/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroGenericMarshaAndUnmarshaTest.java
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 package org.apache.camel.dataformat.avro;
+
 import java.io.File;
 import java.io.IOException;
 
@@ -27,7 +28,6 @@ import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Before;
 import org.junit.Test;
 
-
 public class AvroGenericMarshaAndUnmarshaTest extends CamelTestSupport {
 
     private Schema schema;
diff --git a/components/camel-aws-cw/src/main/java/org/apache/camel/component/aws/cw/CwComponent.java b/components/camel-aws-cw/src/main/java/org/apache/camel/component/aws/cw/CwComponent.java
index c391918..bced4d9 100644
--- a/components/camel-aws-cw/src/main/java/org/apache/camel/component/aws/cw/CwComponent.java
+++ b/components/camel-aws-cw/src/main/java/org/apache/camel/component/aws/cw/CwComponent.java
@@ -20,7 +20,6 @@ import java.util.Map;
 import java.util.Set;
 
 import com.amazonaws.services.cloudwatch.AmazonCloudWatch;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.spi.Metadata;
@@ -129,4 +128,4 @@ public class CwComponent extends DefaultComponent {
             configuration.setAmazonCwClient(clients.stream().findFirst().get());
         }
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-cw/src/main/java/org/apache/camel/component/aws/cw/CwComponentVerifierExtension.java b/components/camel-aws-cw/src/main/java/org/apache/camel/component/aws/cw/CwComponentVerifierExtension.java
index cb0a9bd..48f40d1 100644
--- a/components/camel-aws-cw/src/main/java/org/apache/camel/component/aws/cw/CwComponentVerifierExtension.java
+++ b/components/camel-aws-cw/src/main/java/org/apache/camel/component/aws/cw/CwComponentVerifierExtension.java
@@ -26,7 +26,6 @@ import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.cloudwatch.AmazonCloudWatch;
 import com.amazonaws.services.cloudwatch.AmazonCloudWatchClientBuilder;
-
 import org.apache.camel.component.extension.verifier.DefaultComponentVerifierExtension;
 import org.apache.camel.component.extension.verifier.ResultBuilder;
 import org.apache.camel.component.extension.verifier.ResultErrorBuilder;
diff --git a/components/camel-aws-cw/src/main/java/org/apache/camel/component/aws/cw/CwConfiguration.java b/components/camel-aws-cw/src/main/java/org/apache/camel/component/aws/cw/CwConfiguration.java
index 9aed890..76a57b0 100644
--- a/components/camel-aws-cw/src/main/java/org/apache/camel/component/aws/cw/CwConfiguration.java
+++ b/components/camel-aws-cw/src/main/java/org/apache/camel/component/aws/cw/CwConfiguration.java
@@ -20,7 +20,6 @@ import java.util.Date;
 
 import com.amazonaws.Protocol;
 import com.amazonaws.services.cloudwatch.AmazonCloudWatch;
-
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriParam;
@@ -199,4 +198,4 @@ public class CwConfiguration implements Cloneable {
             throw new RuntimeCamelException(e);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-cw/src/main/java/org/apache/camel/component/aws/cw/CwEndpoint.java b/components/camel-aws-cw/src/main/java/org/apache/camel/component/aws/cw/CwEndpoint.java
index f70800a..1a7239f 100644
--- a/components/camel-aws-cw/src/main/java/org/apache/camel/component/aws/cw/CwEndpoint.java
+++ b/components/camel-aws-cw/src/main/java/org/apache/camel/component/aws/cw/CwEndpoint.java
@@ -24,7 +24,6 @@ import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.cloudwatch.AmazonCloudWatch;
 import com.amazonaws.services.cloudwatch.AmazonCloudWatchClientBuilder;
-
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
diff --git a/components/camel-aws-cw/src/main/java/org/apache/camel/component/aws/cw/CwProducer.java b/components/camel-aws-cw/src/main/java/org/apache/camel/component/aws/cw/CwProducer.java
index 5079a52..28b6ae0 100644
--- a/components/camel-aws-cw/src/main/java/org/apache/camel/component/aws/cw/CwProducer.java
+++ b/components/camel-aws-cw/src/main/java/org/apache/camel/component/aws/cw/CwProducer.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.aws.cw;
 
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -150,4 +149,4 @@ public class CwProducer extends DefaultProducer {
     public CwEndpoint getEndpoint() {
         return (CwEndpoint) super.getEndpoint();
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-cw/src/test/java/org/apache/camel/component/aws/cw/CwComponentConfigurationTest.java b/components/camel-aws-cw/src/test/java/org/apache/camel/component/aws/cw/CwComponentConfigurationTest.java
index e4a1558..05a3ac1 100644
--- a/components/camel-aws-cw/src/test/java/org/apache/camel/component/aws/cw/CwComponentConfigurationTest.java
+++ b/components/camel-aws-cw/src/test/java/org/apache/camel/component/aws/cw/CwComponentConfigurationTest.java
@@ -21,7 +21,6 @@ import java.util.Date;
 import com.amazonaws.Protocol;
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.cloudwatch.AmazonCloudWatchClient;
-
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
@@ -107,4 +106,4 @@ public class CwComponentConfigurationTest extends CamelTestSupport {
         assertEquals(new Integer(9000), endpoint.getConfiguration().getProxyPort());
         assertEquals(Protocol.HTTPS, endpoint.getConfiguration().getProxyProtocol());
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-cw/src/test/java/org/apache/camel/component/aws/cw/CwComponentRegistryClientTest.java b/components/camel-aws-cw/src/test/java/org/apache/camel/component/aws/cw/CwComponentRegistryClientTest.java
index 065b63d..24754ea 100644
--- a/components/camel-aws-cw/src/test/java/org/apache/camel/component/aws/cw/CwComponentRegistryClientTest.java
+++ b/components/camel-aws-cw/src/test/java/org/apache/camel/component/aws/cw/CwComponentRegistryClientTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.aws.cw;
 import java.util.Date;
 
 import com.amazonaws.services.cloudwatch.AmazonCloudWatchClient;
-
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
@@ -51,4 +50,4 @@ public class CwComponentRegistryClientTest extends CamelTestSupport {
         CwComponent component = new CwComponent(context);
         CwEndpoint endpoint = (CwEndpoint)component.createEndpoint("aws-cw://camel.apache.org/test");
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-cw/src/test/java/org/apache/camel/component/aws/cw/CwComponentTest.java b/components/camel-aws-cw/src/test/java/org/apache/camel/component/aws/cw/CwComponentTest.java
index 4b1f8de..03dc265 100644
--- a/components/camel-aws-cw/src/test/java/org/apache/camel/component/aws/cw/CwComponentTest.java
+++ b/components/camel-aws-cw/src/test/java/org/apache/camel/component/aws/cw/CwComponentTest.java
@@ -26,7 +26,6 @@ import com.amazonaws.services.cloudwatch.model.Dimension;
 import com.amazonaws.services.cloudwatch.model.MetricDatum;
 import com.amazonaws.services.cloudwatch.model.PutMetricDataRequest;
 import com.amazonaws.services.cloudwatch.model.StandardUnit;
-
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
diff --git a/components/camel-aws-cw/src/test/java/org/apache/camel/component/aws/cw/integration/CwComponentIntegrationTest.java b/components/camel-aws-cw/src/test/java/org/apache/camel/component/aws/cw/integration/CwComponentIntegrationTest.java
index 6b9d3c3..bceed8f 100644
--- a/components/camel-aws-cw/src/test/java/org/apache/camel/component/aws/cw/integration/CwComponentIntegrationTest.java
+++ b/components/camel-aws-cw/src/test/java/org/apache/camel/component/aws/cw/integration/CwComponentIntegrationTest.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.aws.cw.integration;
 
-
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
@@ -28,7 +27,6 @@ import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Ignore;
 import org.junit.Test;
 
-
 @Ignore("Must be manually tested. Provide your own accessKey and secretKey!")
 public class CwComponentIntegrationTest extends CamelTestSupport {
 
@@ -61,4 +59,4 @@ public class CwComponentIntegrationTest extends CamelTestSupport {
             }
         };
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/AbstractDdbCommand.java b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/AbstractDdbCommand.java
index 5d4f4f6..02e8fa6 100644
--- a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/AbstractDdbCommand.java
+++ b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/AbstractDdbCommand.java
@@ -93,4 +93,4 @@ public abstract class AbstractDdbCommand {
     protected Boolean determineConsistentRead() {
         return exchange.getIn().getHeader(DdbConstants.CONSISTENT_READ, configuration.isConsistentRead(), Boolean.class);
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/BatchGetItemsCommand.java b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/BatchGetItemsCommand.java
index 3ba036e..7c93f78 100644
--- a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/BatchGetItemsCommand.java
+++ b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/BatchGetItemsCommand.java
@@ -23,7 +23,6 @@ import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
 import com.amazonaws.services.dynamodbv2.model.BatchGetItemRequest;
 import com.amazonaws.services.dynamodbv2.model.BatchGetItemResult;
 import com.amazonaws.services.dynamodbv2.model.KeysAndAttributes;
-
 import org.apache.camel.Exchange;
 
 public class BatchGetItemsCommand extends AbstractDdbCommand {
diff --git a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DdbComponent.java b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DdbComponent.java
index c2a8c79..7039f7a 100644
--- a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DdbComponent.java
+++ b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DdbComponent.java
@@ -20,7 +20,6 @@ import java.util.Map;
 import java.util.Set;
 
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.spi.Metadata;
@@ -129,4 +128,4 @@ public class DdbComponent extends DefaultComponent {
             configuration.setAmazonDDBClient(clients.stream().findFirst().get());
         }
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DdbComponentVerifierExtension.java b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DdbComponentVerifierExtension.java
index 874a847..9ee60ac 100644
--- a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DdbComponentVerifierExtension.java
+++ b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DdbComponentVerifierExtension.java
@@ -26,7 +26,6 @@ import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClientBuilder;
-
 import org.apache.camel.component.extension.verifier.DefaultComponentVerifierExtension;
 import org.apache.camel.component.extension.verifier.ResultBuilder;
 import org.apache.camel.component.extension.verifier.ResultErrorBuilder;
diff --git a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DdbConfiguration.java b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DdbConfiguration.java
index 4c7027a..4a8c3d4 100644
--- a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DdbConfiguration.java
+++ b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DdbConfiguration.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.aws.ddb;
 
 import com.amazonaws.Protocol;
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
-
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriParam;
diff --git a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DdbEndpoint.java b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DdbEndpoint.java
index fa9867a..d691148 100644
--- a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DdbEndpoint.java
+++ b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DdbEndpoint.java
@@ -32,7 +32,6 @@ import com.amazonaws.services.dynamodbv2.model.ProvisionedThroughput;
 import com.amazonaws.services.dynamodbv2.model.ResourceNotFoundException;
 import com.amazonaws.services.dynamodbv2.model.TableDescription;
 import com.amazonaws.services.dynamodbv2.model.TableStatus;
-
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
diff --git a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DeleteItemCommand.java b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DeleteItemCommand.java
index 2c616f5..140b2d6 100644
--- a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DeleteItemCommand.java
+++ b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DeleteItemCommand.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.aws.ddb;
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
 import com.amazonaws.services.dynamodbv2.model.DeleteItemRequest;
 import com.amazonaws.services.dynamodbv2.model.DeleteItemResult;
-
 import org.apache.camel.Exchange;
 
 public class DeleteItemCommand extends AbstractDdbCommand {
diff --git a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DescribeTableCommand.java b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DescribeTableCommand.java
index c16533d..a6e6b64 100644
--- a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DescribeTableCommand.java
+++ b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DescribeTableCommand.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.aws.ddb;
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
 import com.amazonaws.services.dynamodbv2.model.DescribeTableRequest;
 import com.amazonaws.services.dynamodbv2.model.DescribeTableResult;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 
diff --git a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/GetItemCommand.java b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/GetItemCommand.java
index 670e157..f023d86 100644
--- a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/GetItemCommand.java
+++ b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/GetItemCommand.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.aws.ddb;
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
 import com.amazonaws.services.dynamodbv2.model.GetItemRequest;
 import com.amazonaws.services.dynamodbv2.model.GetItemResult;
-
 import org.apache.camel.Exchange;
 
 public class GetItemCommand extends AbstractDdbCommand {
diff --git a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/PutItemCommand.java b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/PutItemCommand.java
index b0012bd..560565a 100644
--- a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/PutItemCommand.java
+++ b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/PutItemCommand.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.aws.ddb;
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
 import com.amazonaws.services.dynamodbv2.model.PutItemRequest;
 import com.amazonaws.services.dynamodbv2.model.PutItemResult;
-
 import org.apache.camel.Exchange;
 
 public class PutItemCommand extends AbstractDdbCommand {
diff --git a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/QueryCommand.java b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/QueryCommand.java
index df41e7b..dbeba63 100644
--- a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/QueryCommand.java
+++ b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/QueryCommand.java
@@ -23,7 +23,6 @@ import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
 import com.amazonaws.services.dynamodbv2.model.AttributeValue;
 import com.amazonaws.services.dynamodbv2.model.QueryRequest;
 import com.amazonaws.services.dynamodbv2.model.QueryResult;
-
 import org.apache.camel.Exchange;
 
 public class QueryCommand extends AbstractDdbCommand {
diff --git a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/ScanCommand.java b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/ScanCommand.java
index f9a04d3..672e8a4 100644
--- a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/ScanCommand.java
+++ b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/ScanCommand.java
@@ -23,7 +23,6 @@ import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
 import com.amazonaws.services.dynamodbv2.model.Condition;
 import com.amazonaws.services.dynamodbv2.model.ScanRequest;
 import com.amazonaws.services.dynamodbv2.model.ScanResult;
-
 import org.apache.camel.Exchange;
 
 public class ScanCommand extends AbstractDdbCommand {
diff --git a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/UpdateItemCommand.java b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/UpdateItemCommand.java
index d394992..4b015d3 100644
--- a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/UpdateItemCommand.java
+++ b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/UpdateItemCommand.java
@@ -22,7 +22,6 @@ import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
 import com.amazonaws.services.dynamodbv2.model.AttributeValueUpdate;
 import com.amazonaws.services.dynamodbv2.model.UpdateItemRequest;
 import com.amazonaws.services.dynamodbv2.model.UpdateItemResult;
-
 import org.apache.camel.Exchange;
 
 public class UpdateItemCommand extends AbstractDdbCommand {
diff --git a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/UpdateTableCommand.java b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/UpdateTableCommand.java
index 7891000..2172a5d 100644
--- a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/UpdateTableCommand.java
+++ b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/UpdateTableCommand.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.aws.ddb;
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
 import com.amazonaws.services.dynamodbv2.model.ProvisionedThroughput;
 import com.amazonaws.services.dynamodbv2.model.UpdateTableRequest;
-
 import org.apache.camel.Exchange;
 
 public class UpdateTableCommand extends AbstractDdbCommand {
diff --git a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddbstream/DdbStreamComponent.java b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddbstream/DdbStreamComponent.java
index b8f41da..39ac7c5 100644
--- a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddbstream/DdbStreamComponent.java
+++ b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddbstream/DdbStreamComponent.java
@@ -20,7 +20,6 @@ import java.util.Map;
 import java.util.Set;
 
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDBStreams;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.spi.Metadata;
diff --git a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddbstream/DdbStreamComponentVerifierExtension.java b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddbstream/DdbStreamComponentVerifierExtension.java
index bdf3d51..cef3ca6 100644
--- a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddbstream/DdbStreamComponentVerifierExtension.java
+++ b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddbstream/DdbStreamComponentVerifierExtension.java
@@ -27,7 +27,6 @@ import com.amazonaws.regions.Regions;
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDBStreams;
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDBStreamsClientBuilder;
 import com.amazonaws.services.dynamodbv2.model.ListStreamsRequest;
-
 import org.apache.camel.component.extension.verifier.DefaultComponentVerifierExtension;
 import org.apache.camel.component.extension.verifier.ResultBuilder;
 import org.apache.camel.component.extension.verifier.ResultErrorBuilder;
diff --git a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddbstream/DdbStreamConfiguration.java b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddbstream/DdbStreamConfiguration.java
index 36b3514..92af2f0 100644
--- a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddbstream/DdbStreamConfiguration.java
+++ b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddbstream/DdbStreamConfiguration.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.aws.ddbstream;
 import com.amazonaws.Protocol;
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDBStreams;
 import com.amazonaws.services.dynamodbv2.model.ShardIteratorType;
-
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriParam;
diff --git a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpoint.java b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpoint.java
index 02aa8ec..b09f897 100644
--- a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpoint.java
+++ b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpoint.java
@@ -25,7 +25,6 @@ import com.amazonaws.regions.Regions;
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDBStreams;
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDBStreamsClientBuilder;
 import com.amazonaws.services.dynamodbv2.model.Record;
-
 import org.apache.camel.Consumer;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/AmazonDDBClientMock.java b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/AmazonDDBClientMock.java
index 7e65fbf..bc7a035 100644
--- a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/AmazonDDBClientMock.java
+++ b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/AmazonDDBClientMock.java
@@ -54,7 +54,6 @@ import com.amazonaws.services.dynamodbv2.model.UpdateItemResult;
 import com.amazonaws.services.dynamodbv2.model.UpdateTableRequest;
 import com.amazonaws.services.dynamodbv2.model.UpdateTableResult;
 
-
 public class AmazonDDBClientMock extends AbstractAmazonDynamoDB {
     public static final long NOW = 1327709390233L;
     DescribeTableRequest describeTableRequest;
diff --git a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/BatchGetItemsCommandTest.java b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/BatchGetItemsCommandTest.java
index f2237d1..5a40121 100644
--- a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/BatchGetItemsCommandTest.java
+++ b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/BatchGetItemsCommandTest.java
@@ -22,12 +22,12 @@ import java.util.Map;
 
 import com.amazonaws.services.dynamodbv2.model.AttributeValue;
 import com.amazonaws.services.dynamodbv2.model.KeysAndAttributes;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.support.DefaultExchange;
 import org.junit.Before;
 import org.junit.Test;
+
 import static org.junit.Assert.assertEquals;
 
 public class BatchGetItemsCommandTest {
@@ -71,4 +71,4 @@ public class BatchGetItemsCommandTest {
         assertEquals(new AttributeValue("attrValue"), value);
         assertEquals(unprocessedKey, next);
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/DdbComponentConfigurationTest.java b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/DdbComponentConfigurationTest.java
index 4dbb0c9..9d37410 100644
--- a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/DdbComponentConfigurationTest.java
+++ b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/DdbComponentConfigurationTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.aws.ddb;
 
 import com.amazonaws.Protocol;
 import com.amazonaws.regions.Regions;
-
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
@@ -65,4 +64,4 @@ public class DdbComponentConfigurationTest extends CamelTestSupport {
         assertEquals(Protocol.HTTP, endpoint.getConfiguration().getProxyProtocol());
     }
     
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/DeleteItemCommandTest.java b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/DeleteItemCommandTest.java
index 9bf19ca..df315b9 100644
--- a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/DeleteItemCommandTest.java
+++ b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/DeleteItemCommandTest.java
@@ -21,12 +21,12 @@ import java.util.Map;
 
 import com.amazonaws.services.dynamodbv2.model.AttributeValue;
 import com.amazonaws.services.dynamodbv2.model.ExpectedAttributeValue;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.support.DefaultExchange;
 import org.junit.Before;
 import org.junit.Test;
+
 import static org.junit.Assert.assertEquals;
 
 public class DeleteItemCommandTest {
diff --git a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/DeleteTableCommandTest.java b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/DeleteTableCommandTest.java
index b120379..63fd070 100644
--- a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/DeleteTableCommandTest.java
+++ b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/DeleteTableCommandTest.java
@@ -22,12 +22,12 @@ import java.util.Date;
 import com.amazonaws.services.dynamodbv2.model.KeySchemaElement;
 import com.amazonaws.services.dynamodbv2.model.ProvisionedThroughputDescription;
 import com.amazonaws.services.dynamodbv2.model.TableStatus;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.support.DefaultExchange;
 import org.junit.Before;
 import org.junit.Test;
+
 import static org.junit.Assert.assertEquals;
 
 public class DeleteTableCommandTest {
@@ -61,4 +61,4 @@ public class DeleteTableCommandTest {
         assertEquals(Long.valueOf(20L), exchange.getIn().getHeader(DdbConstants.TABLE_SIZE, Long.class));
         assertEquals(TableStatus.ACTIVE, exchange.getIn().getHeader(DdbConstants.TABLE_STATUS, TableStatus.class));
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/DescribeTableCommandTest.java b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/DescribeTableCommandTest.java
index 6e05cee..af8a81c 100644
--- a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/DescribeTableCommandTest.java
+++ b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/DescribeTableCommandTest.java
@@ -21,12 +21,12 @@ import java.util.Date;
 import java.util.List;
 
 import com.amazonaws.services.dynamodbv2.model.KeySchemaElement;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.support.DefaultExchange;
 import org.junit.Before;
 import org.junit.Test;
+
 import static org.junit.Assert.assertEquals;
 
 public class DescribeTableCommandTest {
@@ -61,4 +61,4 @@ public class DescribeTableCommandTest {
         assertEquals(10L, exchange.getIn().getHeader(DdbConstants.WRITE_CAPACITY));
         assertEquals(1000L, exchange.getIn().getHeader(DdbConstants.TABLE_SIZE));
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/GetItemCommandTest.java b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/GetItemCommandTest.java
index 1cb5043..fe82447 100644
--- a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/GetItemCommandTest.java
+++ b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/GetItemCommandTest.java
@@ -22,12 +22,12 @@ import java.util.List;
 import java.util.Map;
 
 import com.amazonaws.services.dynamodbv2.model.AttributeValue;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.support.DefaultExchange;
 import org.junit.Before;
 import org.junit.Test;
+
 import static org.junit.Assert.assertEquals;
 
 public class GetItemCommandTest {
diff --git a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/PutItemCommandTest.java b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/PutItemCommandTest.java
index d62a0d8..d37e2ed 100644
--- a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/PutItemCommandTest.java
+++ b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/PutItemCommandTest.java
@@ -21,12 +21,12 @@ import java.util.Map;
 
 import com.amazonaws.services.dynamodbv2.model.AttributeValue;
 import com.amazonaws.services.dynamodbv2.model.ExpectedAttributeValue;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.support.DefaultExchange;
 import org.junit.Before;
 import org.junit.Test;
+
 import static org.junit.Assert.assertEquals;
 
 public class PutItemCommandTest {
diff --git a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/QueryCommandTest.java b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/QueryCommandTest.java
index 19b4983..1925fba 100644
--- a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/QueryCommandTest.java
+++ b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/QueryCommandTest.java
@@ -25,12 +25,12 @@ import com.amazonaws.services.dynamodbv2.model.AttributeValue;
 import com.amazonaws.services.dynamodbv2.model.ComparisonOperator;
 import com.amazonaws.services.dynamodbv2.model.Condition;
 import com.amazonaws.services.dynamodbv2.model.ConsumedCapacity;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.support.DefaultExchange;
 import org.junit.Before;
 import org.junit.Test;
+
 import static org.junit.Assert.assertEquals;
 
 public class QueryCommandTest {
diff --git a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/ScanCommandTest.java b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/ScanCommandTest.java
index 4190677..6e08867 100644
--- a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/ScanCommandTest.java
+++ b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/ScanCommandTest.java
@@ -24,12 +24,12 @@ import com.amazonaws.services.dynamodbv2.model.AttributeValue;
 import com.amazonaws.services.dynamodbv2.model.ComparisonOperator;
 import com.amazonaws.services.dynamodbv2.model.Condition;
 import com.amazonaws.services.dynamodbv2.model.ConsumedCapacity;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.support.DefaultExchange;
 import org.junit.Before;
 import org.junit.Test;
+
 import static org.junit.Assert.assertEquals;
 
 public class ScanCommandTest {
@@ -72,4 +72,4 @@ public class ScanCommandTest {
         Map<?, ?> items = (Map<?, ?>) exchange.getIn().getHeader(DdbConstants.ITEMS, List.class).get(0);
         assertEquals(new AttributeValue("attrValue"), items.get("attrName"));
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/UpdateItemCommandTest.java b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/UpdateItemCommandTest.java
index 7e1d174..76498e7 100644
--- a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/UpdateItemCommandTest.java
+++ b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/UpdateItemCommandTest.java
@@ -23,12 +23,12 @@ import com.amazonaws.services.dynamodbv2.model.AttributeAction;
 import com.amazonaws.services.dynamodbv2.model.AttributeValue;
 import com.amazonaws.services.dynamodbv2.model.AttributeValueUpdate;
 import com.amazonaws.services.dynamodbv2.model.ExpectedAttributeValue;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.support.DefaultExchange;
 import org.junit.Before;
 import org.junit.Test;
+
 import static org.junit.Assert.assertEquals;
 
 public class UpdateItemCommandTest {
diff --git a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/UpdateTableCommandTest.java b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/UpdateTableCommandTest.java
index 01f5387..b768bfa 100644
--- a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/UpdateTableCommandTest.java
+++ b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/UpdateTableCommandTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.aws.ddb;
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.support.DefaultExchange;
-
 import org.junit.Before;
 import org.junit.Test;
 
@@ -52,4 +51,4 @@ public class UpdateTableCommandTest {
         assertEquals(Long.valueOf(20), ddbClient.updateTableRequest.getProvisionedThroughput().getReadCapacityUnits());
         assertEquals(Long.valueOf(30), ddbClient.updateTableRequest.getProvisionedThroughput().getWriteCapacityUnits());
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/integration/DdbComponentIntegrationTest.java b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/integration/DdbComponentIntegrationTest.java
index 56b680d..06fa004 100644
--- a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/integration/DdbComponentIntegrationTest.java
+++ b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/integration/DdbComponentIntegrationTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.aws.ddb.integration;
 
 import java.util.HashMap;
 import java.util.Map;
+
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.dynamodbv2.model.AttributeValue;
 import com.amazonaws.services.dynamodbv2.model.ExpectedAttributeValue;
@@ -32,7 +33,6 @@ import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Ignore;
 import org.junit.Test;
 
-
 @Ignore("Must be manually tested. Provide your own credentials below!")
 public class DdbComponentIntegrationTest extends CamelTestSupport {
 
diff --git a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/DdbStreamComponentConfigurationTest.java b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/DdbStreamComponentConfigurationTest.java
index 774c562..17074aa 100644
--- a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/DdbStreamComponentConfigurationTest.java
+++ b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/DdbStreamComponentConfigurationTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.aws.ddbstream;
 
 import com.amazonaws.Protocol;
 import com.amazonaws.regions.Regions;
-
 import org.apache.camel.component.aws.ddb.DdbComponent;
 import org.apache.camel.component.aws.ddb.DdbEndpoint;
 import org.apache.camel.test.junit4.CamelTestSupport;
@@ -77,4 +76,4 @@ public class DdbStreamComponentConfigurationTest extends CamelTestSupport {
         assertEquals(Protocol.HTTP, endpoint.getConfiguration().getProxyProtocol());
     }
     
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/DdbStreamConsumerTest.java b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/DdbStreamConsumerTest.java
index 3752acf..3734583 100644
--- a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/DdbStreamConsumerTest.java
+++ b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/DdbStreamConsumerTest.java
@@ -204,4 +204,4 @@ public class DdbStreamConsumerTest {
                     .withNextShardIterator(nextShardIterator);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpointTest.java b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpointTest.java
index 747e6c2..d4c5dae 100644
--- a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpointTest.java
+++ b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpointTest.java
@@ -100,4 +100,4 @@ public class DdbStreamEndpointTest {
 
         undertest.getSequenceNumber();
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/ShardIteratorHandlerTest.java b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/ShardIteratorHandlerTest.java
index e025abe..67f0d12 100644
--- a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/ShardIteratorHandlerTest.java
+++ b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/ShardIteratorHandlerTest.java
@@ -187,4 +187,4 @@ public class ShardIteratorHandlerTest {
         assertThat(getIteratorCaptor.getValue().getShardIteratorType(), is(ShardIteratorType.AFTER_SEQUENCE_NUMBER.name()));
         assertThat(getIteratorCaptor.getValue().getSequenceNumber(), is("12"));
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/ShardListTest.java b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/ShardListTest.java
index 78e475f..c243d61 100644
--- a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/ShardListTest.java
+++ b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/ShardListTest.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.aws.ddbstream;
 
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -149,4 +148,4 @@ public class ShardListTest {
         }
         return result;
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2Component.java b/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2Component.java
index e3514cc..b5c060d 100644
--- a/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2Component.java
+++ b/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2Component.java
@@ -20,7 +20,6 @@ import java.util.Map;
 import java.util.Set;
 
 import com.amazonaws.services.ec2.AmazonEC2;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.spi.Metadata;
diff --git a/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2ComponentVerifierExtension.java b/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2ComponentVerifierExtension.java
index efb6548..a78dec3 100644
--- a/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2ComponentVerifierExtension.java
+++ b/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2ComponentVerifierExtension.java
@@ -26,7 +26,6 @@ import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.ec2.AmazonEC2;
 import com.amazonaws.services.ec2.AmazonEC2ClientBuilder;
-
 import org.apache.camel.component.extension.verifier.DefaultComponentVerifierExtension;
 import org.apache.camel.component.extension.verifier.ResultBuilder;
 import org.apache.camel.component.extension.verifier.ResultErrorBuilder;
diff --git a/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2Configuration.java b/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2Configuration.java
index ae4aa1e..9ae613a 100644
--- a/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2Configuration.java
+++ b/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2Configuration.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.aws.ec2;
 
 import com.amazonaws.Protocol;
 import com.amazonaws.services.ec2.AmazonEC2;
-
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriParam;
diff --git a/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2Endpoint.java b/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2Endpoint.java
index 0c73f78..61a09e8 100644
--- a/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2Endpoint.java
+++ b/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2Endpoint.java
@@ -25,7 +25,6 @@ import com.amazonaws.regions.Regions;
 import com.amazonaws.services.ec2.AmazonEC2;
 import com.amazonaws.services.ec2.AmazonEC2Client;
 import com.amazonaws.services.ec2.AmazonEC2ClientBuilder;
-
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
diff --git a/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2Producer.java b/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2Producer.java
index 9a21522..c9f3050 100644
--- a/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2Producer.java
+++ b/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2Producer.java
@@ -44,7 +44,6 @@ import com.amazonaws.services.ec2.model.TerminateInstancesRequest;
 import com.amazonaws.services.ec2.model.TerminateInstancesResult;
 import com.amazonaws.services.ec2.model.UnmonitorInstancesRequest;
 import com.amazonaws.services.ec2.model.UnmonitorInstancesResult;
-
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
@@ -425,4 +424,4 @@ public class EC2Producer extends DefaultProducer {
         }
         return exchange.getIn();
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/AmazonEC2ClientMock.java b/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/AmazonEC2ClientMock.java
index 410eae8..9bf3d9c 100644
--- a/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/AmazonEC2ClientMock.java
+++ b/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/AmazonEC2ClientMock.java
@@ -55,7 +55,6 @@ import com.amazonaws.services.ec2.model.TerminateInstancesRequest;
 import com.amazonaws.services.ec2.model.TerminateInstancesResult;
 import com.amazonaws.services.ec2.model.UnmonitorInstancesRequest;
 import com.amazonaws.services.ec2.model.UnmonitorInstancesResult;
-
 import org.apache.camel.util.ObjectHelper;
 
 public class AmazonEC2ClientMock extends AbstractAmazonEC2 {
@@ -307,4 +306,4 @@ public class AmazonEC2ClientMock extends AbstractAmazonEC2 {
     public DeleteTagsResult deleteTags(DeleteTagsRequest deleteTagsRequest) {
         return new DeleteTagsResult();
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/EC2ComponentConfigurationTest.java b/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/EC2ComponentConfigurationTest.java
index 2816520..cdffaa7 100644
--- a/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/EC2ComponentConfigurationTest.java
+++ b/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/EC2ComponentConfigurationTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.aws.ec2;
 import com.amazonaws.Protocol;
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.ec2.AmazonEC2Client;
-
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
diff --git a/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/EC2ComponentSpringTest.java b/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/EC2ComponentSpringTest.java
index 2894746..27c1be5 100644
--- a/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/EC2ComponentSpringTest.java
+++ b/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/EC2ComponentSpringTest.java
@@ -30,7 +30,6 @@ import com.amazonaws.services.ec2.model.StartInstancesResult;
 import com.amazonaws.services.ec2.model.StopInstancesResult;
 import com.amazonaws.services.ec2.model.TerminateInstancesResult;
 import com.amazonaws.services.ec2.model.UnmonitorInstancesResult;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.test.spring.CamelSpringTestSupport;
diff --git a/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/EC2ProducerTest.java b/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/EC2ProducerTest.java
index 74d00e7..f4a8660 100644
--- a/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/EC2ProducerTest.java
+++ b/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/EC2ProducerTest.java
@@ -32,7 +32,6 @@ import com.amazonaws.services.ec2.model.StartInstancesResult;
 import com.amazonaws.services.ec2.model.StopInstancesResult;
 import com.amazonaws.services.ec2.model.TerminateInstancesResult;
 import com.amazonaws.services.ec2.model.UnmonitorInstancesResult;
-
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
@@ -529,4 +528,4 @@ public class EC2ProducerTest extends CamelTestSupport {
             }
         };
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/integration/EC2ComponentIntegrationTest.java b/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/integration/EC2ComponentIntegrationTest.java
index 632e812..8dd301b 100644
--- a/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/integration/EC2ComponentIntegrationTest.java
+++ b/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/integration/EC2ComponentIntegrationTest.java
@@ -20,7 +20,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 
 import com.amazonaws.services.ec2.model.InstanceType;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSComponent.java b/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSComponent.java
index a4ee861..2b457ae 100644
--- a/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSComponent.java
+++ b/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSComponent.java
@@ -20,7 +20,6 @@ import java.util.Map;
 import java.util.Set;
 
 import com.amazonaws.services.ecs.AmazonECS;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.spi.Metadata;
diff --git a/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSComponentVerifierExtension.java b/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSComponentVerifierExtension.java
index c1f8c8d..8c3a0a8 100644
--- a/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSComponentVerifierExtension.java
+++ b/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSComponentVerifierExtension.java
@@ -27,7 +27,6 @@ import com.amazonaws.regions.Regions;
 import com.amazonaws.services.ecs.AmazonECS;
 import com.amazonaws.services.ecs.AmazonECSClientBuilder;
 import com.amazonaws.services.ecs.model.ListClustersRequest;
-
 import org.apache.camel.component.extension.verifier.DefaultComponentVerifierExtension;
 import org.apache.camel.component.extension.verifier.ResultBuilder;
 import org.apache.camel.component.extension.verifier.ResultErrorBuilder;
diff --git a/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSConfiguration.java b/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSConfiguration.java
index b0d400f..9277fad 100644
--- a/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSConfiguration.java
+++ b/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSConfiguration.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.aws.ecs;
 
 import com.amazonaws.Protocol;
 import com.amazonaws.services.ecs.AmazonECS;
-
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriParam;
diff --git a/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSEndpoint.java b/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSEndpoint.java
index 0ed4a52..845d231 100644
--- a/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSEndpoint.java
+++ b/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSEndpoint.java
@@ -24,7 +24,6 @@ import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.ecs.AmazonECS;
 import com.amazonaws.services.ecs.AmazonECSClientBuilder;
-
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
diff --git a/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSProducer.java b/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSProducer.java
index 0118e78..06e0e9d 100644
--- a/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSProducer.java
+++ b/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSProducer.java
@@ -26,7 +26,6 @@ import com.amazonaws.services.ecs.model.DescribeClustersRequest;
 import com.amazonaws.services.ecs.model.DescribeClustersResult;
 import com.amazonaws.services.ecs.model.ListClustersRequest;
 import com.amazonaws.services.ecs.model.ListClustersResult;
-
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
@@ -169,4 +168,4 @@ public class ECSProducer extends DefaultProducer {
         }
         return exchange.getIn();
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/ECSComponentConfigurationTest.java b/components/camel-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/ECSComponentConfigurationTest.java
index c8e0e0b..b596cd5 100644
--- a/components/camel-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/ECSComponentConfigurationTest.java
+++ b/components/camel-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/ECSComponentConfigurationTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.aws.ecs;
 
 import com.amazonaws.Protocol;
 import com.amazonaws.regions.Regions;
-
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
diff --git a/components/camel-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/ECSProducerSpringTest.java b/components/camel-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/ECSProducerSpringTest.java
index c57b6c5..331c038 100644
--- a/components/camel-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/ECSProducerSpringTest.java
+++ b/components/camel-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/ECSProducerSpringTest.java
@@ -20,7 +20,6 @@ import com.amazonaws.services.ecs.model.CreateClusterResult;
 import com.amazonaws.services.ecs.model.DeleteClusterResult;
 import com.amazonaws.services.ecs.model.DescribeClustersResult;
 import com.amazonaws.services.ecs.model.ListClustersResult;
-
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/ECSProducerTest.java b/components/camel-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/ECSProducerTest.java
index 5626367..7094b90 100644
--- a/components/camel-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/ECSProducerTest.java
+++ b/components/camel-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/ECSProducerTest.java
@@ -20,7 +20,6 @@ import com.amazonaws.services.ecs.model.CreateClusterResult;
 import com.amazonaws.services.ecs.model.DeleteClusterResult;
 import com.amazonaws.services.ecs.model.DescribeClustersResult;
 import com.amazonaws.services.ecs.model.ListClustersResult;
-
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
diff --git a/components/camel-aws-eks/src/main/java/org/apache/camel/component/aws/eks/EKSComponent.java b/components/camel-aws-eks/src/main/java/org/apache/camel/component/aws/eks/EKSComponent.java
index c0bf32b..f3710cc 100644
--- a/components/camel-aws-eks/src/main/java/org/apache/camel/component/aws/eks/EKSComponent.java
+++ b/components/camel-aws-eks/src/main/java/org/apache/camel/component/aws/eks/EKSComponent.java
@@ -20,7 +20,6 @@ import java.util.Map;
 import java.util.Set;
 
 import com.amazonaws.services.eks.AmazonEKS;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.spi.Metadata;
diff --git a/components/camel-aws-eks/src/main/java/org/apache/camel/component/aws/eks/EKSComponentVerifierExtension.java b/components/camel-aws-eks/src/main/java/org/apache/camel/component/aws/eks/EKSComponentVerifierExtension.java
index 14f83d0..6332f79 100644
--- a/components/camel-aws-eks/src/main/java/org/apache/camel/component/aws/eks/EKSComponentVerifierExtension.java
+++ b/components/camel-aws-eks/src/main/java/org/apache/camel/component/aws/eks/EKSComponentVerifierExtension.java
@@ -27,7 +27,6 @@ import com.amazonaws.regions.Regions;
 import com.amazonaws.services.eks.AmazonEKS;
 import com.amazonaws.services.eks.AmazonEKSClientBuilder;
 import com.amazonaws.services.eks.model.ListClustersRequest;
-
 import org.apache.camel.component.extension.verifier.DefaultComponentVerifierExtension;
 import org.apache.camel.component.extension.verifier.ResultBuilder;
 import org.apache.camel.component.extension.verifier.ResultErrorBuilder;
diff --git a/components/camel-aws-eks/src/main/java/org/apache/camel/component/aws/eks/EKSConfiguration.java b/components/camel-aws-eks/src/main/java/org/apache/camel/component/aws/eks/EKSConfiguration.java
index 26a6768..8ed11d2 100644
--- a/components/camel-aws-eks/src/main/java/org/apache/camel/component/aws/eks/EKSConfiguration.java
+++ b/components/camel-aws-eks/src/main/java/org/apache/camel/component/aws/eks/EKSConfiguration.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.aws.eks;
 
 import com.amazonaws.Protocol;
 import com.amazonaws.services.eks.AmazonEKS;
-
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriParam;
diff --git a/components/camel-aws-eks/src/main/java/org/apache/camel/component/aws/eks/EKSEndpoint.java b/components/camel-aws-eks/src/main/java/org/apache/camel/component/aws/eks/EKSEndpoint.java
index 510679c..42f7cd4 100644
--- a/components/camel-aws-eks/src/main/java/org/apache/camel/component/aws/eks/EKSEndpoint.java
+++ b/components/camel-aws-eks/src/main/java/org/apache/camel/component/aws/eks/EKSEndpoint.java
@@ -24,7 +24,6 @@ import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.eks.AmazonEKS;
 import com.amazonaws.services.eks.AmazonEKSClientBuilder;
-
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
diff --git a/components/camel-aws-eks/src/main/java/org/apache/camel/component/aws/eks/EKSProducer.java b/components/camel-aws-eks/src/main/java/org/apache/camel/component/aws/eks/EKSProducer.java
index 1929115..d65eeba 100644
--- a/components/camel-aws-eks/src/main/java/org/apache/camel/component/aws/eks/EKSProducer.java
+++ b/components/camel-aws-eks/src/main/java/org/apache/camel/component/aws/eks/EKSProducer.java
@@ -27,7 +27,6 @@ import com.amazonaws.services.eks.model.DescribeClusterResult;
 import com.amazonaws.services.eks.model.ListClustersRequest;
 import com.amazonaws.services.eks.model.ListClustersResult;
 import com.amazonaws.services.eks.model.VpcConfigRequest;
-
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
@@ -180,4 +179,4 @@ public class EKSProducer extends DefaultProducer {
         }
         return exchange.getIn();
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-eks/src/test/java/org/apache/camel/component/aws/eks/EKSComponentConfigurationTest.java b/components/camel-aws-eks/src/test/java/org/apache/camel/component/aws/eks/EKSComponentConfigurationTest.java
index cfd43dfd..9c82089 100644
--- a/components/camel-aws-eks/src/test/java/org/apache/camel/component/aws/eks/EKSComponentConfigurationTest.java
+++ b/components/camel-aws-eks/src/test/java/org/apache/camel/component/aws/eks/EKSComponentConfigurationTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.aws.eks;
 
 import com.amazonaws.Protocol;
 import com.amazonaws.regions.Regions;
-
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
diff --git a/components/camel-aws-eks/src/test/java/org/apache/camel/component/aws/eks/EKSProducerSpringTest.java b/components/camel-aws-eks/src/test/java/org/apache/camel/component/aws/eks/EKSProducerSpringTest.java
index e34f0f1..cf0aa56 100644
--- a/components/camel-aws-eks/src/test/java/org/apache/camel/component/aws/eks/EKSProducerSpringTest.java
+++ b/components/camel-aws-eks/src/test/java/org/apache/camel/component/aws/eks/EKSProducerSpringTest.java
@@ -21,7 +21,6 @@ import com.amazonaws.services.eks.model.DeleteClusterResult;
 import com.amazonaws.services.eks.model.DescribeClusterResult;
 import com.amazonaws.services.eks.model.ListClustersResult;
 import com.amazonaws.services.eks.model.VpcConfigRequest;
-
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
@@ -114,4 +113,4 @@ public class EKSProducerSpringTest extends CamelSpringTestSupport {
     protected ClassPathXmlApplicationContext createApplicationContext() {
         return new ClassPathXmlApplicationContext("org/apache/camel/component/aws/eks/EKSComponentSpringTest-context.xml");
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-eks/src/test/java/org/apache/camel/component/aws/eks/EKSProducerTest.java b/components/camel-aws-eks/src/test/java/org/apache/camel/component/aws/eks/EKSProducerTest.java
index 4aa0fd4..eff53b6 100644
--- a/components/camel-aws-eks/src/test/java/org/apache/camel/component/aws/eks/EKSProducerTest.java
+++ b/components/camel-aws-eks/src/test/java/org/apache/camel/component/aws/eks/EKSProducerTest.java
@@ -21,7 +21,6 @@ import com.amazonaws.services.eks.model.DeleteClusterResult;
 import com.amazonaws.services.eks.model.DescribeClusterResult;
 import com.amazonaws.services.eks.model.ListClustersResult;
 import com.amazonaws.services.eks.model.VpcConfigRequest;
-
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
@@ -134,4 +133,4 @@ public class EKSProducerTest extends CamelTestSupport {
             }
         };
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMComponent.java b/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMComponent.java
index 47f1b8e..856d99c 100644
--- a/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMComponent.java
+++ b/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMComponent.java
@@ -20,7 +20,6 @@ import java.util.Map;
 import java.util.Set;
 
 import com.amazonaws.services.identitymanagement.AmazonIdentityManagement;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.spi.Metadata;
diff --git a/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMComponentVerifierExtension.java b/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMComponentVerifierExtension.java
index 7d58e39..bf690d1 100644
--- a/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMComponentVerifierExtension.java
+++ b/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMComponentVerifierExtension.java
@@ -26,7 +26,6 @@ import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.identitymanagement.AmazonIdentityManagement;
 import com.amazonaws.services.identitymanagement.AmazonIdentityManagementClientBuilder;
-
 import org.apache.camel.component.extension.verifier.DefaultComponentVerifierExtension;
 import org.apache.camel.component.extension.verifier.ResultBuilder;
 import org.apache.camel.component.extension.verifier.ResultErrorBuilder;
diff --git a/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMConfiguration.java b/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMConfiguration.java
index ee665e4..c98830d 100644
--- a/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMConfiguration.java
+++ b/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMConfiguration.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.aws.iam;
 
 import com.amazonaws.Protocol;
 import com.amazonaws.services.identitymanagement.AmazonIdentityManagement;
-
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriParam;
diff --git a/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMEndpoint.java b/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMEndpoint.java
index 1106e90..b8cd550 100644
--- a/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMEndpoint.java
+++ b/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMEndpoint.java
@@ -24,7 +24,6 @@ import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.identitymanagement.AmazonIdentityManagement;
 import com.amazonaws.services.identitymanagement.AmazonIdentityManagementClientBuilder;
-
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
diff --git a/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMProducer.java b/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMProducer.java
index 2a036e7..1e0431f 100644
--- a/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMProducer.java
+++ b/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMProducer.java
@@ -42,7 +42,6 @@ import com.amazonaws.services.identitymanagement.model.RemoveUserFromGroupResult
 import com.amazonaws.services.identitymanagement.model.StatusType;
 import com.amazonaws.services.identitymanagement.model.UpdateAccessKeyRequest;
 import com.amazonaws.services.identitymanagement.model.UpdateAccessKeyResult;
-
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
diff --git a/components/camel-aws-iam/src/test/java/org/apache/camel/component/aws/iam/IAMComponentConfigurationTest.java b/components/camel-aws-iam/src/test/java/org/apache/camel/component/aws/iam/IAMComponentConfigurationTest.java
index 03d74af..eec6aa0 100644
--- a/components/camel-aws-iam/src/test/java/org/apache/camel/component/aws/iam/IAMComponentConfigurationTest.java
+++ b/components/camel-aws-iam/src/test/java/org/apache/camel/component/aws/iam/IAMComponentConfigurationTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.aws.iam;
 
 import com.amazonaws.Protocol;
 import com.amazonaws.regions.Regions;
-
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
diff --git a/components/camel-aws-iam/src/test/java/org/apache/camel/component/aws/iam/IAMProducerSpringTest.java b/components/camel-aws-iam/src/test/java/org/apache/camel/component/aws/iam/IAMProducerSpringTest.java
index 13b7c6c..4f734f5 100644
--- a/components/camel-aws-iam/src/test/java/org/apache/camel/component/aws/iam/IAMProducerSpringTest.java
+++ b/components/camel-aws-iam/src/test/java/org/apache/camel/component/aws/iam/IAMProducerSpringTest.java
@@ -30,7 +30,6 @@ import com.amazonaws.services.identitymanagement.model.ListUsersResult;
 import com.amazonaws.services.identitymanagement.model.RemoveUserFromGroupResult;
 import com.amazonaws.services.identitymanagement.model.StatusType;
 import com.amazonaws.services.identitymanagement.model.UpdateAccessKeyResult;
-
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-aws-iam/src/test/java/org/apache/camel/component/aws/iam/IAMProducerTest.java b/components/camel-aws-iam/src/test/java/org/apache/camel/component/aws/iam/IAMProducerTest.java
index 08ae571..cc4eb52 100644
--- a/components/camel-aws-iam/src/test/java/org/apache/camel/component/aws/iam/IAMProducerTest.java
+++ b/components/camel-aws-iam/src/test/java/org/apache/camel/component/aws/iam/IAMProducerTest.java
@@ -30,7 +30,6 @@ import com.amazonaws.services.identitymanagement.model.ListUsersResult;
 import com.amazonaws.services.identitymanagement.model.RemoveUserFromGroupResult;
 import com.amazonaws.services.identitymanagement.model.StatusType;
 import com.amazonaws.services.identitymanagement.model.UpdateAccessKeyResult;
-
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
diff --git a/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/firehose/KinesisFirehoseComponent.java b/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/firehose/KinesisFirehoseComponent.java
index 1876969..c41aeee 100644
--- a/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/firehose/KinesisFirehoseComponent.java
+++ b/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/firehose/KinesisFirehoseComponent.java
@@ -20,7 +20,6 @@ import java.util.Map;
 import java.util.Set;
 
 import com.amazonaws.services.kinesisfirehose.AmazonKinesisFirehose;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.spi.Metadata;
diff --git a/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/firehose/KinesisFirehoseComponentVerifierExtension.java b/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/firehose/KinesisFirehoseComponentVerifierExtension.java
index 24690c0..bb197e2 100644
--- a/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/firehose/KinesisFirehoseComponentVerifierExtension.java
+++ b/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/firehose/KinesisFirehoseComponentVerifierExtension.java
@@ -27,7 +27,6 @@ import com.amazonaws.regions.Regions;
 import com.amazonaws.services.kinesisfirehose.AmazonKinesisFirehose;
 import com.amazonaws.services.kinesisfirehose.AmazonKinesisFirehoseClientBuilder;
 import com.amazonaws.services.kinesisfirehose.model.ListDeliveryStreamsRequest;
-
 import org.apache.camel.component.extension.verifier.DefaultComponentVerifierExtension;
 import org.apache.camel.component.extension.verifier.ResultBuilder;
 import org.apache.camel.component.extension.verifier.ResultErrorBuilder;
diff --git a/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/firehose/KinesisFirehoseConfiguration.java b/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/firehose/KinesisFirehoseConfiguration.java
index fc99775..397a0ae 100644
--- a/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/firehose/KinesisFirehoseConfiguration.java
+++ b/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/firehose/KinesisFirehoseConfiguration.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.aws.firehose;
 
 import com.amazonaws.Protocol;
 import com.amazonaws.services.kinesisfirehose.AmazonKinesisFirehose;
-
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriParam;
diff --git a/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpoint.java b/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpoint.java
index 717fe90..4100253 100644
--- a/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpoint.java
+++ b/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpoint.java
@@ -24,7 +24,6 @@ import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.kinesisfirehose.AmazonKinesisFirehose;
 import com.amazonaws.services.kinesisfirehose.AmazonKinesisFirehoseClientBuilder;
-
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -118,4 +117,4 @@ public class KinesisFirehoseEndpoint extends DefaultEndpoint {
     public KinesisFirehoseConfiguration getConfiguration() {
         return configuration;
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/firehose/KinesisFirehoseProducer.java b/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/firehose/KinesisFirehoseProducer.java
index 474991b..fddf355 100644
--- a/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/firehose/KinesisFirehoseProducer.java
+++ b/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/firehose/KinesisFirehoseProducer.java
@@ -65,4 +65,4 @@ public class KinesisFirehoseProducer extends DefaultProducer {
         }
         return exchange.getIn();
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/kinesis/KinesisComponent.java b/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/kinesis/KinesisComponent.java
index 5428f77..d0d43f8 100644
--- a/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/kinesis/KinesisComponent.java
+++ b/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/kinesis/KinesisComponent.java
@@ -20,7 +20,6 @@ import java.util.Map;
 import java.util.Set;
 
 import com.amazonaws.services.kinesis.AmazonKinesis;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.spi.Metadata;
diff --git a/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/kinesis/KinesisComponentVerifierExtension.java b/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/kinesis/KinesisComponentVerifierExtension.java
index 4d3abe9..8c28a25 100644
--- a/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/kinesis/KinesisComponentVerifierExtension.java
+++ b/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/kinesis/KinesisComponentVerifierExtension.java
@@ -26,7 +26,6 @@ import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.kinesis.AmazonKinesis;
 import com.amazonaws.services.kinesis.AmazonKinesisClientBuilder;
-
 import org.apache.camel.component.extension.verifier.DefaultComponentVerifierExtension;
 import org.apache.camel.component.extension.verifier.ResultBuilder;
 import org.apache.camel.component.extension.verifier.ResultErrorBuilder;
diff --git a/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/kinesis/KinesisConfiguration.java b/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/kinesis/KinesisConfiguration.java
index 78f884a..25afb05 100644
--- a/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/kinesis/KinesisConfiguration.java
+++ b/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/kinesis/KinesisConfiguration.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.aws.kinesis;
 import com.amazonaws.Protocol;
 import com.amazonaws.services.kinesis.AmazonKinesis;
 import com.amazonaws.services.kinesis.model.ShardIteratorType;
-
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriParam;
diff --git a/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/kinesis/KinesisConsumer.java b/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/kinesis/KinesisConsumer.java
index 918c109..f836056 100644
--- a/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/kinesis/KinesisConsumer.java
+++ b/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/kinesis/KinesisConsumer.java
@@ -31,7 +31,6 @@ import com.amazonaws.services.kinesis.model.GetShardIteratorResult;
 import com.amazonaws.services.kinesis.model.Record;
 import com.amazonaws.services.kinesis.model.Shard;
 import com.amazonaws.services.kinesis.model.ShardIteratorType;
-
 import org.apache.camel.AsyncCallback;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/kinesis/KinesisEndpoint.java b/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/kinesis/KinesisEndpoint.java
index 38722f6..9fe8702 100644
--- a/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/kinesis/KinesisEndpoint.java
+++ b/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/kinesis/KinesisEndpoint.java
@@ -26,7 +26,6 @@ import com.amazonaws.services.kinesis.AmazonKinesis;
 import com.amazonaws.services.kinesis.AmazonKinesisClientBuilder;
 import com.amazonaws.services.kinesis.model.Record;
 import com.amazonaws.services.kinesis.model.ShardIteratorType;
-
 import org.apache.camel.Consumer;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/firehose/KinesisFirehoseComponentConfigurationTest.java b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/firehose/KinesisFirehoseComponentConfigurationTest.java
index f13d3d4..343d404 100644
--- a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/firehose/KinesisFirehoseComponentConfigurationTest.java
+++ b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/firehose/KinesisFirehoseComponentConfigurationTest.java
@@ -18,9 +18,6 @@ package org.apache.camel.component.aws.firehose;
 
 import com.amazonaws.Protocol;
 import com.amazonaws.regions.Regions;
-
-import org.apache.camel.component.aws.kinesis.KinesisComponent;
-import org.apache.camel.component.aws.kinesis.KinesisEndpoint;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
@@ -77,4 +74,4 @@ public class KinesisFirehoseComponentConfigurationTest extends CamelTestSupport
         assertEquals("localhost", endpoint.getConfiguration().getProxyHost());
         assertEquals(Integer.valueOf(9000), endpoint.getConfiguration().getProxyPort());
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/firehose/integration/KinesisFirehoseComponentIntegrationTest.java b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/firehose/integration/KinesisFirehoseComponentIntegrationTest.java
index a5977a2..01ff6db 100644
--- a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/firehose/integration/KinesisFirehoseComponentIntegrationTest.java
+++ b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/firehose/integration/KinesisFirehoseComponentIntegrationTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.aws.firehose.integration;
 
 import com.amazonaws.services.kinesisfirehose.AmazonKinesisFirehose;
 import com.amazonaws.services.kinesisfirehose.AmazonKinesisFirehoseAsyncClientBuilder;
-
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
diff --git a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisComponentConfigurationTest.java b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisComponentConfigurationTest.java
index 2105a86..a2a4d6b 100644
--- a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisComponentConfigurationTest.java
+++ b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisComponentConfigurationTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.aws.kinesis;
 
 import com.amazonaws.Protocol;
 import com.amazonaws.regions.Regions;
-
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
@@ -75,4 +74,4 @@ public class KinesisComponentConfigurationTest extends CamelTestSupport {
         assertEquals("localhost", endpoint.getConfiguration().getProxyHost());
         assertEquals(Integer.valueOf(9000), endpoint.getConfiguration().getProxyPort());
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisConsumerClosedShardWithFailTest.java b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisConsumerClosedShardWithFailTest.java
index 713127c..141d762 100644
--- a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisConsumerClosedShardWithFailTest.java
+++ b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisConsumerClosedShardWithFailTest.java
@@ -29,7 +29,6 @@ import com.amazonaws.services.kinesis.model.SequenceNumberRange;
 import com.amazonaws.services.kinesis.model.Shard;
 import com.amazonaws.services.kinesis.model.ShardIteratorType;
 import com.amazonaws.services.kinesis.model.StreamDescription;
-
 import org.apache.camel.AsyncProcessor;
 import org.apache.camel.CamelContext;
 import org.apache.camel.impl.DefaultCamelContext;
diff --git a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisConsumerClosedShardWithSilentTest.java b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisConsumerClosedShardWithSilentTest.java
index 9e06c84..a7eb3e2 100644
--- a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisConsumerClosedShardWithSilentTest.java
+++ b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisConsumerClosedShardWithSilentTest.java
@@ -212,4 +212,4 @@ public class KinesisConsumerClosedShardWithSilentTest {
         assertThat(exchangeCaptor.getValue().getIn().getHeader(KinesisConstants.PARTITION_KEY, String.class), is(partitionKey));
         assertThat(exchangeCaptor.getValue().getIn().getHeader(KinesisConstants.SEQUENCE_NUMBER, String.class), is(sequenceNumber));
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisConsumerTest.java b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisConsumerTest.java
index e3de94f..62b5b59 100644
--- a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisConsumerTest.java
+++ b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisConsumerTest.java
@@ -213,4 +213,4 @@ public class KinesisConsumerTest {
         assertThat(exchangeCaptor.getValue().getIn().getHeader(KinesisConstants.SEQUENCE_NUMBER, String.class), is(sequenceNumber));
     }
 
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisProducerTest.java b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisProducerTest.java
index 017a492..b253ad8 100644
--- a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisProducerTest.java
+++ b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisProducerTest.java
@@ -113,4 +113,4 @@ public class KinesisProducerTest {
         verify(outMessage).setHeader(KinesisConstants.SEQUENCE_NUMBER, SEQUENCE_NUMBER);
         verify(outMessage).setHeader(KinesisConstants.SHARD_ID, SHARD_ID);
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/RecordStringConverterTest.java b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/RecordStringConverterTest.java
index cfac1be..820098a 100644
--- a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/RecordStringConverterTest.java
+++ b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/RecordStringConverterTest.java
@@ -36,4 +36,4 @@ public class RecordStringConverterTest {
         String result = RecordStringConverter.toString(record);
         assertThat(result, is("this is a String"));
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java
index b437455..804c683 100644
--- a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java
+++ b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java
@@ -20,7 +20,6 @@ import com.amazonaws.regions.Regions;
 import com.amazonaws.services.kinesis.AmazonKinesis;
 import com.amazonaws.services.kinesis.AmazonKinesisClientBuilder;
 import com.amazonaws.services.kinesis.model.Record;
-
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
diff --git a/components/camel-aws-kms/src/main/java/org/apache/camel/component/aws/kms/KMSComponent.java b/components/camel-aws-kms/src/main/java/org/apache/camel/component/aws/kms/KMSComponent.java
index f286726..ce8fe7d 100644
--- a/components/camel-aws-kms/src/main/java/org/apache/camel/component/aws/kms/KMSComponent.java
+++ b/components/camel-aws-kms/src/main/java/org/apache/camel/component/aws/kms/KMSComponent.java
@@ -20,7 +20,6 @@ import java.util.Map;
 import java.util.Set;
 
 import com.amazonaws.services.kms.AWSKMS;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.spi.Metadata;
diff --git a/components/camel-aws-kms/src/main/java/org/apache/camel/component/aws/kms/KMSComponentVerifierExtension.java b/components/camel-aws-kms/src/main/java/org/apache/camel/component/aws/kms/KMSComponentVerifierExtension.java
index cf1c669..05e9f7a 100644
--- a/components/camel-aws-kms/src/main/java/org/apache/camel/component/aws/kms/KMSComponentVerifierExtension.java
+++ b/components/camel-aws-kms/src/main/java/org/apache/camel/component/aws/kms/KMSComponentVerifierExtension.java
@@ -26,7 +26,6 @@ import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.kms.AWSKMS;
 import com.amazonaws.services.kms.AWSKMSClientBuilder;
-
 import org.apache.camel.component.extension.verifier.DefaultComponentVerifierExtension;
 import org.apache.camel.component.extension.verifier.ResultBuilder;
 import org.apache.camel.component.extension.verifier.ResultErrorBuilder;
diff --git a/components/camel-aws-kms/src/main/java/org/apache/camel/component/aws/kms/KMSConfiguration.java b/components/camel-aws-kms/src/main/java/org/apache/camel/component/aws/kms/KMSConfiguration.java
index dfbf482..91847dc 100644
--- a/components/camel-aws-kms/src/main/java/org/apache/camel/component/aws/kms/KMSConfiguration.java
+++ b/components/camel-aws-kms/src/main/java/org/apache/camel/component/aws/kms/KMSConfiguration.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.aws.kms;
 
 import com.amazonaws.Protocol;
 import com.amazonaws.services.kms.AWSKMS;
-
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriParam;
diff --git a/components/camel-aws-kms/src/main/java/org/apache/camel/component/aws/kms/KMSEndpoint.java b/components/camel-aws-kms/src/main/java/org/apache/camel/component/aws/kms/KMSEndpoint.java
index 9dd3697..039542c 100644
--- a/components/camel-aws-kms/src/main/java/org/apache/camel/component/aws/kms/KMSEndpoint.java
+++ b/components/camel-aws-kms/src/main/java/org/apache/camel/component/aws/kms/KMSEndpoint.java
@@ -24,7 +24,6 @@ import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.kms.AWSKMS;
 import com.amazonaws.services.kms.AWSKMSClientBuilder;
-
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
diff --git a/components/camel-aws-kms/src/main/java/org/apache/camel/component/aws/kms/KMSProducer.java b/components/camel-aws-kms/src/main/java/org/apache/camel/component/aws/kms/KMSProducer.java
index 4cdcbdc..4247edc 100644
--- a/components/camel-aws-kms/src/main/java/org/apache/camel/component/aws/kms/KMSProducer.java
+++ b/components/camel-aws-kms/src/main/java/org/apache/camel/component/aws/kms/KMSProducer.java
@@ -30,7 +30,6 @@ import com.amazonaws.services.kms.model.ListKeysRequest;
 import com.amazonaws.services.kms.model.ListKeysResult;
 import com.amazonaws.services.kms.model.ScheduleKeyDeletionRequest;
 import com.amazonaws.services.kms.model.ScheduleKeyDeletionResult;
-
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
@@ -227,4 +226,4 @@ public class KMSProducer extends DefaultProducer {
         }
         return exchange.getIn();
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/AmazonKMSClientMock.java b/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/AmazonKMSClientMock.java
index 00647c4..b3ae713 100644
--- a/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/AmazonKMSClientMock.java
+++ b/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/AmazonKMSClientMock.java
@@ -96,7 +96,6 @@ import com.amazonaws.services.kms.model.UpdateAliasResult;
 import com.amazonaws.services.kms.model.UpdateKeyDescriptionRequest;
 import com.amazonaws.services.kms.model.UpdateKeyDescriptionResult;
 
-
 public class AmazonKMSClientMock extends AbstractAWSKMS {
 
     public AmazonKMSClientMock() {
diff --git a/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSComponentConfigurationTest.java b/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSComponentConfigurationTest.java
index 36f2c31..66e412e 100644
--- a/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSComponentConfigurationTest.java
+++ b/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSComponentConfigurationTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.aws.kms;
 
 import com.amazonaws.Protocol;
 import com.amazonaws.regions.Regions;
-
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
diff --git a/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSProducerSpringTest.java b/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSProducerSpringTest.java
index e55c1f0..c3affef 100644
--- a/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSProducerSpringTest.java
+++ b/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSProducerSpringTest.java
@@ -20,7 +20,6 @@ import com.amazonaws.services.kms.model.CreateKeyResult;
 import com.amazonaws.services.kms.model.DescribeKeyResult;
 import com.amazonaws.services.kms.model.ListKeysResult;
 import com.amazonaws.services.kms.model.ScheduleKeyDeletionResult;
-
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
@@ -144,4 +143,4 @@ public class KMSProducerSpringTest extends CamelSpringTestSupport {
     protected ClassPathXmlApplicationContext createApplicationContext() {
         return new ClassPathXmlApplicationContext("org/apache/camel/component/aws/kms/KMSComponentSpringTest-context.xml");
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSProducerTest.java b/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSProducerTest.java
index 1f483c3..0499e73 100644
--- a/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSProducerTest.java
+++ b/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSProducerTest.java
@@ -20,7 +20,6 @@ import com.amazonaws.services.kms.model.CreateKeyResult;
 import com.amazonaws.services.kms.model.DescribeKeyResult;
 import com.amazonaws.services.kms.model.ListKeysResult;
 import com.amazonaws.services.kms.model.ScheduleKeyDeletionResult;
-
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
@@ -170,4 +169,4 @@ public class KMSProducerTest extends CamelTestSupport {
             }
         };
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-lambda/src/main/java/org/apache/camel/component/aws/lambda/LambdaComponent.java b/components/camel-aws-lambda/src/main/java/org/apache/camel/component/aws/lambda/LambdaComponent.java
index e6ddbf5..04d0b19 100644
--- a/components/camel-aws-lambda/src/main/java/org/apache/camel/component/aws/lambda/LambdaComponent.java
+++ b/components/camel-aws-lambda/src/main/java/org/apache/camel/component/aws/lambda/LambdaComponent.java
@@ -20,7 +20,6 @@ import java.util.Map;
 import java.util.Set;
 
 import com.amazonaws.services.lambda.AWSLambda;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.spi.Metadata;
diff --git a/components/camel-aws-lambda/src/main/java/org/apache/camel/component/aws/lambda/LambdaComponentVerifierExtension.java b/components/camel-aws-lambda/src/main/java/org/apache/camel/component/aws/lambda/LambdaComponentVerifierExtension.java
index a707a5d..135b46d 100644
--- a/components/camel-aws-lambda/src/main/java/org/apache/camel/component/aws/lambda/LambdaComponentVerifierExtension.java
+++ b/components/camel-aws-lambda/src/main/java/org/apache/camel/component/aws/lambda/LambdaComponentVerifierExtension.java
@@ -26,7 +26,6 @@ import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.lambda.AWSLambda;
 import com.amazonaws.services.lambda.AWSLambdaClientBuilder;
-
 import org.apache.camel.component.extension.verifier.DefaultComponentVerifierExtension;
 import org.apache.camel.component.extension.verifier.ResultBuilder;
 import org.apache.camel.component.extension.verifier.ResultErrorBuilder;
diff --git a/components/camel-aws-lambda/src/main/java/org/apache/camel/component/aws/lambda/LambdaConfiguration.java b/components/camel-aws-lambda/src/main/java/org/apache/camel/component/aws/lambda/LambdaConfiguration.java
index f79e2cd..86afe2a 100644
--- a/components/camel-aws-lambda/src/main/java/org/apache/camel/component/aws/lambda/LambdaConfiguration.java
+++ b/components/camel-aws-lambda/src/main/java/org/apache/camel/component/aws/lambda/LambdaConfiguration.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.aws.lambda;
 
 import com.amazonaws.Protocol;
 import com.amazonaws.services.lambda.AWSLambda;
-
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriParam;
@@ -161,4 +160,4 @@ public class LambdaConfiguration implements Cloneable {
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-lambda/src/main/java/org/apache/camel/component/aws/lambda/LambdaProducer.java b/components/camel-aws-lambda/src/main/java/org/apache/camel/component/aws/lambda/LambdaProducer.java
index 5de9b7d..3058764 100644
--- a/components/camel-aws-lambda/src/main/java/org/apache/camel/component/aws/lambda/LambdaProducer.java
+++ b/components/camel-aws-lambda/src/main/java/org/apache/camel/component/aws/lambda/LambdaProducer.java
@@ -58,7 +58,6 @@ import com.amazonaws.services.lambda.model.UpdateFunctionCodeRequest;
 import com.amazonaws.services.lambda.model.UpdateFunctionCodeResult;
 import com.amazonaws.services.lambda.model.VpcConfig;
 import com.amazonaws.util.IOUtils;
-
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
diff --git a/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/AmazonLambdaClientMock.java b/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/AmazonLambdaClientMock.java
index b1707e9..145f116 100644
--- a/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/AmazonLambdaClientMock.java
+++ b/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/AmazonLambdaClientMock.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.aws.lambda;
 import java.nio.*;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
+
 import com.amazonaws.AmazonServiceException;
 import com.amazonaws.AmazonWebServiceRequest;
 import com.amazonaws.ResponseMetadata;
@@ -388,4 +389,4 @@ public class AmazonLambdaClientMock extends AbstractAWSLambda {
     public void shutdown() {
         throw new UnsupportedOperationException();        
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentClientRegistryTest.java b/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentClientRegistryTest.java
index 5ab2f29..1fb30be 100644
--- a/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentClientRegistryTest.java
+++ b/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentClientRegistryTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.aws.lambda;
 
 import com.amazonaws.services.lambda.AWSLambdaClient;
-
 import org.apache.camel.PropertyBindingException;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
diff --git a/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentConfigurationTest.java b/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentConfigurationTest.java
index 038fde7..0c0112b 100644
--- a/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentConfigurationTest.java
+++ b/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentConfigurationTest.java
@@ -19,9 +19,9 @@ package org.apache.camel.component.aws.lambda;
 import com.amazonaws.Protocol;
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.lambda.AWSLambdaClient;
-
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
+
 import static org.mockito.Mockito.mock;
 
 public class LambdaComponentConfigurationTest extends CamelTestSupport {
@@ -112,4 +112,4 @@ public class LambdaComponentConfigurationTest extends CamelTestSupport {
         assertEquals("localhost", endpoint.getConfiguration().getProxyHost());
         assertEquals(Integer.valueOf(9000), endpoint.getConfiguration().getProxyPort());
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentSpringTest.java b/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentSpringTest.java
index e7dcb06..7d9bc23 100644
--- a/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentSpringTest.java
+++ b/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentSpringTest.java
@@ -257,4 +257,4 @@ public class LambdaComponentSpringTest extends CamelSpringTestSupport {
         return new ClassPathXmlApplicationContext(
             "org/apache/camel/component/aws/lambda/LambdaComponentSpringTest-context.xml");
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaOperationsTest.java b/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaOperationsTest.java
index 14b6779..197abc2 100644
--- a/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaOperationsTest.java
+++ b/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaOperationsTest.java
@@ -20,8 +20,6 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-
-
 public class LambdaOperationsTest {
 
     @Test
diff --git a/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaProducerTest.java b/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaProducerTest.java
index 09264f7..b4a8a0b 100644
--- a/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaProducerTest.java
+++ b/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaProducerTest.java
@@ -37,7 +37,6 @@ import com.amazonaws.services.lambda.model.TagResourceResult;
 import com.amazonaws.services.lambda.model.UntagResourceResult;
 import com.amazonaws.services.lambda.model.UpdateFunctionCodeResult;
 import com.amazonaws.util.IOUtils;
-
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
diff --git a/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/integration/LambdaComponentIntegrationTest.java b/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/integration/LambdaComponentIntegrationTest.java
index 3cfaada..a2d4abe 100644
--- a/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/integration/LambdaComponentIntegrationTest.java
+++ b/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/integration/LambdaComponentIntegrationTest.java
@@ -17,6 +17,7 @@
 package org.apache.camel.component.aws.lambda.integration;
 
 import java.io.*;
+
 import com.amazonaws.services.lambda.model.CreateFunctionResult;
 import com.amazonaws.services.lambda.model.DeleteFunctionResult;
 import com.amazonaws.services.lambda.model.GetFunctionResult;
@@ -140,4 +141,4 @@ public class LambdaComponentIntegrationTest extends CamelTestSupport {
             }
         };
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQComponent.java b/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQComponent.java
index f8129ee..868806e 100644
--- a/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQComponent.java
+++ b/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQComponent.java
@@ -20,7 +20,6 @@ import java.util.Map;
 import java.util.Set;
 
 import com.amazonaws.services.mq.AmazonMQ;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.spi.Metadata;
diff --git a/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQComponentVerifierExtension.java b/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQComponentVerifierExtension.java
index cd68b26..92bc5ad 100644
--- a/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQComponentVerifierExtension.java
+++ b/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQComponentVerifierExtension.java
@@ -27,7 +27,6 @@ import com.amazonaws.regions.Regions;
 import com.amazonaws.services.mq.AmazonMQ;
 import com.amazonaws.services.mq.AmazonMQClientBuilder;
 import com.amazonaws.services.mq.model.ListBrokersRequest;
-
 import org.apache.camel.component.extension.verifier.DefaultComponentVerifierExtension;
 import org.apache.camel.component.extension.verifier.ResultBuilder;
 import org.apache.camel.component.extension.verifier.ResultErrorBuilder;
diff --git a/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQConfiguration.java b/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQConfiguration.java
index a2384cb..817589a 100644
--- a/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQConfiguration.java
+++ b/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQConfiguration.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.aws.mq;
 
 import com.amazonaws.Protocol;
 import com.amazonaws.services.mq.AmazonMQ;
-
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriParam;
diff --git a/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQEndpoint.java b/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQEndpoint.java
index efc2c2e..62b4659 100644
--- a/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQEndpoint.java
+++ b/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQEndpoint.java
@@ -25,7 +25,6 @@ import com.amazonaws.regions.Regions;
 import com.amazonaws.services.mq.AmazonMQ;
 import com.amazonaws.services.mq.AmazonMQClient;
 import com.amazonaws.services.mq.AmazonMQClientBuilder;
-
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
diff --git a/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQProducer.java b/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQProducer.java
index 8757feb..5b3415b 100644
--- a/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQProducer.java
+++ b/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQProducer.java
@@ -36,7 +36,6 @@ import com.amazonaws.services.mq.model.RebootBrokerResult;
 import com.amazonaws.services.mq.model.UpdateBrokerRequest;
 import com.amazonaws.services.mq.model.UpdateBrokerResult;
 import com.amazonaws.services.mq.model.User;
-
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
@@ -281,4 +280,4 @@ public class MQProducer extends DefaultProducer {
         }
         return exchange.getIn();
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQComponentConfigurationTest.java b/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQComponentConfigurationTest.java
index 941bad1..0617832 100644
--- a/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQComponentConfigurationTest.java
+++ b/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQComponentConfigurationTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.aws.mq;
 
 import com.amazonaws.Protocol;
 import com.amazonaws.regions.Regions;
-
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
diff --git a/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQProducerSpringTest.java b/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQProducerSpringTest.java
index 475715c..7a5a727 100644
--- a/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQProducerSpringTest.java
+++ b/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQProducerSpringTest.java
@@ -29,7 +29,6 @@ import com.amazonaws.services.mq.model.EngineType;
 import com.amazonaws.services.mq.model.ListBrokersResult;
 import com.amazonaws.services.mq.model.UpdateBrokerResult;
 import com.amazonaws.services.mq.model.User;
-
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
@@ -171,4 +170,4 @@ public class MQProducerSpringTest extends CamelSpringTestSupport {
     protected ClassPathXmlApplicationContext createApplicationContext() {
         return new ClassPathXmlApplicationContext("org/apache/camel/component/aws/mq/MQComponentSpringTest-context.xml");
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQProducerTest.java b/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQProducerTest.java
index 8a87346..a7cf82e 100644
--- a/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQProducerTest.java
+++ b/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQProducerTest.java
@@ -29,7 +29,6 @@ import com.amazonaws.services.mq.model.EngineType;
 import com.amazonaws.services.mq.model.ListBrokersResult;
 import com.amazonaws.services.mq.model.UpdateBrokerResult;
 import com.amazonaws.services.mq.model.User;
-
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
@@ -197,4 +196,4 @@ public class MQProducerTest extends CamelTestSupport {
             }
         };
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKComponent.java b/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKComponent.java
index 63a100e..a220477 100644
--- a/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKComponent.java
+++ b/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKComponent.java
@@ -20,7 +20,6 @@ import java.util.Map;
 import java.util.Set;
 
 import com.amazonaws.services.kafka.AWSKafka;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.spi.Metadata;
diff --git a/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKComponentVerifierExtension.java b/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKComponentVerifierExtension.java
index 35e2ea9..d2c29d0 100644
--- a/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKComponentVerifierExtension.java
+++ b/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKComponentVerifierExtension.java
@@ -27,7 +27,6 @@ import com.amazonaws.regions.Regions;
 import com.amazonaws.services.kafka.AWSKafka;
 import com.amazonaws.services.kafka.AWSKafkaClientBuilder;
 import com.amazonaws.services.kafka.model.ListClustersRequest;
-
 import org.apache.camel.component.extension.verifier.DefaultComponentVerifierExtension;
 import org.apache.camel.component.extension.verifier.ResultBuilder;
 import org.apache.camel.component.extension.verifier.ResultErrorBuilder;
diff --git a/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKConfiguration.java b/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKConfiguration.java
index 4c66c7c..a862034 100644
--- a/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKConfiguration.java
+++ b/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKConfiguration.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.aws.msk;
 
 import com.amazonaws.Protocol;
 import com.amazonaws.services.kafka.AWSKafka;
-
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriParam;
diff --git a/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKEndpoint.java b/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKEndpoint.java
index 6480e2e..b0b71aa 100644
--- a/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKEndpoint.java
+++ b/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKEndpoint.java
@@ -24,7 +24,6 @@ import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.kafka.AWSKafka;
 import com.amazonaws.services.kafka.AWSKafkaClientBuilder;
-
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
diff --git a/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKProducer.java b/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKProducer.java
index 81aa769..da5f783 100644
--- a/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKProducer.java
+++ b/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKProducer.java
@@ -27,7 +27,6 @@ import com.amazonaws.services.kafka.model.DescribeClusterRequest;
 import com.amazonaws.services.kafka.model.DescribeClusterResult;
 import com.amazonaws.services.kafka.model.ListClustersRequest;
 import com.amazonaws.services.kafka.model.ListClustersResult;
-
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
diff --git a/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKComponentConfigurationTest.java b/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKComponentConfigurationTest.java
index ac3ce9c..1e06de3 100644
--- a/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKComponentConfigurationTest.java
+++ b/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKComponentConfigurationTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.aws.msk;
 
 import com.amazonaws.Protocol;
 import com.amazonaws.regions.Regions;
-
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
diff --git a/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKProducerSpringTest.java b/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKProducerSpringTest.java
index 37f98c8..6efee6b 100644
--- a/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKProducerSpringTest.java
+++ b/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKProducerSpringTest.java
@@ -22,7 +22,6 @@ import com.amazonaws.services.kafka.model.CreateClusterResult;
 import com.amazonaws.services.kafka.model.DeleteClusterResult;
 import com.amazonaws.services.kafka.model.DescribeClusterResult;
 import com.amazonaws.services.kafka.model.ListClustersResult;
-
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKProducerTest.java b/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKProducerTest.java
index 2d2912e..f08bbfa 100644
--- a/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKProducerTest.java
+++ b/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKProducerTest.java
@@ -22,7 +22,6 @@ import com.amazonaws.services.kafka.model.CreateClusterResult;
 import com.amazonaws.services.kafka.model.DeleteClusterResult;
 import com.amazonaws.services.kafka.model.DescribeClusterResult;
 import com.amazonaws.services.kafka.model.ListClustersResult;
-
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
diff --git a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Component.java b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Component.java
index 17f6e68..abf249f 100644
--- a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Component.java
+++ b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Component.java
@@ -20,10 +20,8 @@ import java.util.Map;
 import java.util.Set;
 
 import com.amazonaws.services.s3.AmazonS3;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
-
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.annotations.Component;
 import org.apache.camel.support.DefaultComponent;
diff --git a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3ComponentVerifierExtension.java b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3ComponentVerifierExtension.java
index 6599089..44ef543 100644
--- a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3ComponentVerifierExtension.java
+++ b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3ComponentVerifierExtension.java
@@ -26,7 +26,6 @@ import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.s3.AmazonS3;
 import com.amazonaws.services.s3.AmazonS3ClientBuilder;
-
 import org.apache.camel.component.extension.verifier.DefaultComponentVerifierExtension;
 import org.apache.camel.component.extension.verifier.ResultBuilder;
 import org.apache.camel.component.extension.verifier.ResultErrorBuilder;
diff --git a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java
index 29fa780..74e210a 100644
--- a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java
+++ b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.aws.s3;
 import com.amazonaws.Protocol;
 import com.amazonaws.services.s3.AmazonS3;
 import com.amazonaws.services.s3.model.EncryptionMaterials;
-
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.spi.UriParams;
diff --git a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Consumer.java b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Consumer.java
index d67158e..86193f8 100644
--- a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Consumer.java
+++ b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Consumer.java
@@ -29,7 +29,6 @@ import com.amazonaws.services.s3.model.ListObjectsRequest;
 import com.amazonaws.services.s3.model.ObjectListing;
 import com.amazonaws.services.s3.model.S3Object;
 import com.amazonaws.services.s3.model.S3ObjectSummary;
-
 import org.apache.camel.AsyncCallback;
 import org.apache.camel.Exchange;
 import org.apache.camel.NoFactoryAvailableException;
@@ -235,4 +234,4 @@ public class S3Consumer extends ScheduledBatchPollingConsumer {
         }
         return s3ConsumerToString;
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java
index dc4f810..e5fc068 100644
--- a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java
+++ b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java
@@ -53,7 +53,6 @@ import com.amazonaws.services.s3.model.S3Object;
 import com.amazonaws.services.s3.model.SSEAwsKeyManagementParams;
 import com.amazonaws.services.s3.model.StorageClass;
 import com.amazonaws.services.s3.model.UploadPartRequest;
-
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java
index 92e769c..055d545 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java
@@ -75,7 +75,6 @@ import com.amazonaws.services.s3.model.StorageClass;
 import com.amazonaws.services.s3.model.UploadPartRequest;
 import com.amazonaws.services.s3.model.UploadPartResult;
 import com.amazonaws.services.s3.model.VersionListing;
-
 import org.apache.camel.util.ObjectHelper;
 import org.junit.Assert;
 
@@ -480,4 +479,4 @@ public class AmazonS3ClientMock extends AbstractAmazonS3 {
     public S3ResponseMetadata getCachedResponseMetadata(AmazonWebServiceRequest request) {
         throw new UnsupportedOperationException();
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/AmazonS3EncryptionClientMock.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/AmazonS3EncryptionClientMock.java
index 7fc475d..fdbf447 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/AmazonS3EncryptionClientMock.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/AmazonS3EncryptionClientMock.java
@@ -74,7 +74,6 @@ import com.amazonaws.services.s3.model.StorageClass;
 import com.amazonaws.services.s3.model.UploadPartRequest;
 import com.amazonaws.services.s3.model.UploadPartResult;
 import com.amazonaws.services.s3.model.VersionListing;
-
 import org.apache.camel.util.ObjectHelper;
 import org.junit.Assert;
 
@@ -464,4 +463,4 @@ public class AmazonS3EncryptionClientMock extends AbstractAmazonS3 {
     public S3ResponseMetadata getCachedResponseMetadata(AmazonWebServiceRequest request) {
         throw new UnsupportedOperationException();
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3BatchConsumerMaxMessagesPerPollTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3BatchConsumerMaxMessagesPerPollTest.java
index 36ebc71..3a218c5 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3BatchConsumerMaxMessagesPerPollTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3BatchConsumerMaxMessagesPerPollTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.aws.s3;
 
 import com.amazonaws.services.s3.model.S3Object;
-
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3BatchConsumerTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3BatchConsumerTest.java
index fe77d60..814b4f2 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3BatchConsumerTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3BatchConsumerTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.aws.s3;
 
 import com.amazonaws.services.s3.model.S3Object;
-
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentConfigurationTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentConfigurationTest.java
index 6d462f2..1376849 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentConfigurationTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentConfigurationTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.aws.s3;
 
 import com.amazonaws.regions.Regions;
-
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentContentLengthFileTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentContentLengthFileTest.java
index bd57cb1..1a9e7c2 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentContentLengthFileTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentContentLengthFileTest.java
@@ -23,7 +23,6 @@ import java.io.InputStream;
 import java.util.Map;
 
 import com.amazonaws.services.s3.model.PutObjectRequest;
-
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentExistingBucketTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentExistingBucketTest.java
index c30c42e..ef0f830 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentExistingBucketTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentExistingBucketTest.java
@@ -22,7 +22,6 @@ import java.util.HashMap;
 import java.util.Map;
 
 import com.amazonaws.services.s3.model.PutObjectRequest;
-
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentFileTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentFileTest.java
index 9fe3e8f..5427ca7 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentFileTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentFileTest.java
@@ -22,7 +22,6 @@ import java.io.InputStream;
 import java.util.Map;
 
 import com.amazonaws.services.s3.model.PutObjectRequest;
-
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentKeyNameFileTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentKeyNameFileTest.java
index ddf4242..e1ee26e 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentKeyNameFileTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentKeyNameFileTest.java
@@ -23,7 +23,6 @@ import java.io.InputStream;
 import java.util.Map;
 
 import com.amazonaws.services.s3.model.PutObjectRequest;
-
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsSpringTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsSpringTest.java
index 205ac62..4e2cb48 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsSpringTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsSpringTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.aws.s3;
 import java.util.List;
 
 import com.amazonaws.services.s3.model.Bucket;
-
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsTest.java
index 1d8f35a..39e0ed9 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.aws.s3;
 import java.util.List;
 
 import com.amazonaws.services.s3.model.Bucket;
-
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListObjectTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListObjectTest.java
index 6577709..07cd8ec 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListObjectTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListObjectTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.aws.s3;
 
 import com.amazonaws.services.s3.model.ObjectListing;
-
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListObjectsSpringTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListObjectsSpringTest.java
index cf85884..f8d1de6 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListObjectsSpringTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListObjectsSpringTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.aws.s3;
 
 import com.amazonaws.services.s3.model.ObjectListing;
-
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentNonExistingBucketTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentNonExistingBucketTest.java
index f201e24..34e9951 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentNonExistingBucketTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentNonExistingBucketTest.java
@@ -22,7 +22,6 @@ import java.util.HashMap;
 import java.util.Map;
 
 import com.amazonaws.services.s3.model.PutObjectRequest;
-
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentStringTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentStringTest.java
index 9e05d3d..94f5703 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentStringTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentStringTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.aws.s3;
 import java.io.File;
 
 import com.amazonaws.services.s3.model.PutObjectRequest;
-
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerDelimiterTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerDelimiterTest.java
index d04192a..0cfc75b 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerDelimiterTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerDelimiterTest.java
@@ -28,7 +28,6 @@ import com.amazonaws.services.s3.model.ObjectListing;
 import com.amazonaws.services.s3.model.S3Object;
 import com.amazonaws.services.s3.model.S3ObjectSummary;
 import com.amazonaws.util.StringInputStream;
-
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerPrefixTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerPrefixTest.java
index 6d109dd..52daf50 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerPrefixTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerPrefixTest.java
@@ -28,7 +28,6 @@ import com.amazonaws.services.s3.model.ObjectListing;
 import com.amazonaws.services.s3.model.S3Object;
 import com.amazonaws.services.s3.model.S3ObjectSummary;
 import com.amazonaws.util.StringInputStream;
-
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3IncludeBodyTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3IncludeBodyTest.java
index 65b6f88..50ad0fd 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3IncludeBodyTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3IncludeBodyTest.java
@@ -28,7 +28,6 @@ import com.amazonaws.services.s3.model.ObjectListing;
 import com.amazonaws.services.s3.model.S3Object;
 import com.amazonaws.services.s3.model.S3ObjectSummary;
 import com.amazonaws.util.StringInputStream;
-
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/client/impl/IAMOptimizedAWSS3ClientImplTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/client/impl/IAMOptimizedAWSS3ClientImplTest.java
index 4b39215..e1c3507 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/client/impl/IAMOptimizedAWSS3ClientImplTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/client/impl/IAMOptimizedAWSS3ClientImplTest.java
@@ -24,6 +24,7 @@ import com.amazonaws.services.s3.AmazonS3EncryptionClient;
 import org.apache.camel.component.aws.s3.S3Configuration;
 import org.junit.Assert;
 import org.junit.Test;
+
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/client/impl/StandardAWSS3ClientImplTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/client/impl/StandardAWSS3ClientImplTest.java
index d5002ae..9de88bb 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/client/impl/StandardAWSS3ClientImplTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/client/impl/StandardAWSS3ClientImplTest.java
@@ -24,6 +24,7 @@ import com.amazonaws.services.s3.AmazonS3EncryptionClient;
 import org.apache.camel.component.aws.s3.S3Configuration;
 import org.junit.Assert;
 import org.junit.Test;
+
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/AbstractSdbCommand.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/AbstractSdbCommand.java
index e95819c..7eba8ce 100644
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/AbstractSdbCommand.java
+++ b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/AbstractSdbCommand.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.aws.sdb;
 
 import com.amazonaws.services.simpledb.AmazonSimpleDB;
 import com.amazonaws.services.simpledb.model.UpdateCondition;
-
 import org.apache.camel.Exchange;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -63,4 +62,4 @@ public abstract class AbstractSdbCommand {
     protected String determineNextToken() {
         return exchange.getIn().getHeader(SdbConstants.NEXT_TOKEN, String.class);
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/BatchDeleteAttributesCommand.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/BatchDeleteAttributesCommand.java
index 76d1cec..1b0507f 100644
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/BatchDeleteAttributesCommand.java
+++ b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/BatchDeleteAttributesCommand.java
@@ -21,7 +21,6 @@ import java.util.Collection;
 import com.amazonaws.services.simpledb.AmazonSimpleDB;
 import com.amazonaws.services.simpledb.model.BatchDeleteAttributesRequest;
 import com.amazonaws.services.simpledb.model.DeletableItem;
-
 import org.apache.camel.Exchange;
 
 public class BatchDeleteAttributesCommand extends AbstractSdbCommand {
@@ -46,4 +45,4 @@ public class BatchDeleteAttributesCommand extends AbstractSdbCommand {
     protected Collection<DeletableItem> determineDeletableItems() {
         return exchange.getIn().getHeader(SdbConstants.DELETABLE_ITEMS, Collection.class);
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/BatchPutAttributesCommand.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/BatchPutAttributesCommand.java
index 52db2db..8476907 100644
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/BatchPutAttributesCommand.java
+++ b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/BatchPutAttributesCommand.java
@@ -21,7 +21,6 @@ import java.util.Collection;
 import com.amazonaws.services.simpledb.AmazonSimpleDB;
 import com.amazonaws.services.simpledb.model.BatchPutAttributesRequest;
 import com.amazonaws.services.simpledb.model.ReplaceableItem;
-
 import org.apache.camel.Exchange;
 
 public class BatchPutAttributesCommand extends AbstractSdbCommand {
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/DeleteAttributesCommand.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/DeleteAttributesCommand.java
index 128d554..84c05b0 100644
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/DeleteAttributesCommand.java
+++ b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/DeleteAttributesCommand.java
@@ -21,7 +21,6 @@ import java.util.Collection;
 import com.amazonaws.services.simpledb.AmazonSimpleDB;
 import com.amazonaws.services.simpledb.model.Attribute;
 import com.amazonaws.services.simpledb.model.DeleteAttributesRequest;
-
 import org.apache.camel.Exchange;
 
 public class DeleteAttributesCommand extends AbstractSdbCommand {
@@ -48,4 +47,4 @@ public class DeleteAttributesCommand extends AbstractSdbCommand {
     protected Collection<Attribute> determineAttributes() {
         return exchange.getIn().getHeader(SdbConstants.ATTRIBUTES, Collection.class);
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/DeleteDomainCommand.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/DeleteDomainCommand.java
index d07b15a..6527195 100644
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/DeleteDomainCommand.java
+++ b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/DeleteDomainCommand.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.aws.sdb;
 
 import com.amazonaws.services.simpledb.AmazonSimpleDB;
 import com.amazonaws.services.simpledb.model.DeleteDomainRequest;
-
 import org.apache.camel.Exchange;
 
 public class DeleteDomainCommand extends AbstractSdbCommand {
@@ -37,4 +36,4 @@ public class DeleteDomainCommand extends AbstractSdbCommand {
         
         log.trace("Request sent");
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/DomainMetadataCommand.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/DomainMetadataCommand.java
index 703fab0..7aa47ca 100644
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/DomainMetadataCommand.java
+++ b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/DomainMetadataCommand.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.aws.sdb;
 import com.amazonaws.services.simpledb.AmazonSimpleDB;
 import com.amazonaws.services.simpledb.model.DomainMetadataRequest;
 import com.amazonaws.services.simpledb.model.DomainMetadataResult;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 
@@ -57,4 +56,4 @@ public class DomainMetadataCommand extends AbstractSdbCommand {
         }
         return exchange.getIn();
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/GetAttributesCommand.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/GetAttributesCommand.java
index f867845..cd1900c 100644
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/GetAttributesCommand.java
+++ b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/GetAttributesCommand.java
@@ -21,7 +21,6 @@ import java.util.Collection;
 import com.amazonaws.services.simpledb.AmazonSimpleDB;
 import com.amazonaws.services.simpledb.model.GetAttributesRequest;
 import com.amazonaws.services.simpledb.model.GetAttributesResult;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 
@@ -61,4 +60,4 @@ public class GetAttributesCommand extends AbstractSdbCommand {
         }
         return exchange.getIn();
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/ListDomainsCommand.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/ListDomainsCommand.java
index ead7983..df4ec64 100644
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/ListDomainsCommand.java
+++ b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/ListDomainsCommand.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.aws.sdb;
 import com.amazonaws.services.simpledb.AmazonSimpleDB;
 import com.amazonaws.services.simpledb.model.ListDomainsRequest;
 import com.amazonaws.services.simpledb.model.ListDomainsResult;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 
@@ -61,4 +60,4 @@ public class ListDomainsCommand extends AbstractSdbCommand {
         }
         return exchange.getIn();
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/PutAttributesCommand.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/PutAttributesCommand.java
index f4f6ad1..2ca5d86 100644
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/PutAttributesCommand.java
+++ b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/PutAttributesCommand.java
@@ -21,7 +21,6 @@ import java.util.Collection;
 import com.amazonaws.services.simpledb.AmazonSimpleDB;
 import com.amazonaws.services.simpledb.model.PutAttributesRequest;
 import com.amazonaws.services.simpledb.model.ReplaceableAttribute;
-
 import org.apache.camel.Exchange;
 
 public class PutAttributesCommand extends AbstractSdbCommand {
@@ -48,4 +47,4 @@ public class PutAttributesCommand extends AbstractSdbCommand {
     protected Collection<ReplaceableAttribute> determineReplaceableAttributes() {
         return exchange.getIn().getHeader(SdbConstants.REPLACEABLE_ATTRIBUTES, Collection.class);
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbComponentVerifierExtension.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbComponentVerifierExtension.java
index 9e9efc0..22c8fd9 100644
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbComponentVerifierExtension.java
+++ b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbComponentVerifierExtension.java
@@ -26,7 +26,6 @@ import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.simpledb.AmazonSimpleDB;
 import com.amazonaws.services.simpledb.AmazonSimpleDBClientBuilder;
-
 import org.apache.camel.component.extension.verifier.DefaultComponentVerifierExtension;
 import org.apache.camel.component.extension.verifier.ResultBuilder;
 import org.apache.camel.component.extension.verifier.ResultErrorBuilder;
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbConfiguration.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbConfiguration.java
index a444ba4..c5d7367 100644
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbConfiguration.java
+++ b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbConfiguration.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.aws.sdb;
 
 import com.amazonaws.Protocol;
 import com.amazonaws.services.simpledb.AmazonSimpleDB;
-
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.spi.UriParams;
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java
index 1a567bd..05a0ca0 100644
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java
+++ b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java
@@ -27,7 +27,6 @@ import com.amazonaws.services.simpledb.AmazonSimpleDBClientBuilder;
 import com.amazonaws.services.simpledb.model.CreateDomainRequest;
 import com.amazonaws.services.simpledb.model.DomainMetadataRequest;
 import com.amazonaws.services.simpledb.model.NoSuchDomainException;
-
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Exchange;
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SelectCommand.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SelectCommand.java
index 0e0dcf5..9cce570 100644
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SelectCommand.java
+++ b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SelectCommand.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.aws.sdb;
 import com.amazonaws.services.simpledb.AmazonSimpleDB;
 import com.amazonaws.services.simpledb.model.SelectRequest;
 import com.amazonaws.services.simpledb.model.SelectResult;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 
@@ -58,4 +57,4 @@ public class SelectCommand extends AbstractSdbCommand {
         }
         return exchange.getIn();
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/AbstractSdbCommandTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/AbstractSdbCommandTest.java
index 69ae426..203b94e 100644
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/AbstractSdbCommandTest.java
+++ b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/AbstractSdbCommandTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.aws.sdb;
 
 import com.amazonaws.services.simpledb.AmazonSimpleDB;
 import com.amazonaws.services.simpledb.model.UpdateCondition;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.support.DefaultExchange;
@@ -103,4 +102,4 @@ public class AbstractSdbCommandTest {
         
         assertEquals("Token1", this.command.determineNextToken());
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/BatchDeleteAttributesCommandTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/BatchDeleteAttributesCommandTest.java
index 03b9572..21bacf8 100644
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/BatchDeleteAttributesCommandTest.java
+++ b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/BatchDeleteAttributesCommandTest.java
@@ -20,7 +20,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.amazonaws.services.simpledb.model.Item;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.support.DefaultExchange;
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/BatchPutAttributesCommandTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/BatchPutAttributesCommandTest.java
index 0113ba6..b48956c 100644
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/BatchPutAttributesCommandTest.java
+++ b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/BatchPutAttributesCommandTest.java
@@ -20,7 +20,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.amazonaws.services.simpledb.model.ReplaceableItem;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.support.DefaultExchange;
@@ -69,4 +68,4 @@ public class BatchPutAttributesCommandTest {
         
         assertEquals(replaceableItems, this.command.determineReplaceableItems());
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/DeleteAttributesCommandTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/DeleteAttributesCommandTest.java
index b047964..0af789f 100644
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/DeleteAttributesCommandTest.java
+++ b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/DeleteAttributesCommandTest.java
@@ -21,7 +21,6 @@ import java.util.List;
 
 import com.amazonaws.services.simpledb.model.Attribute;
 import com.amazonaws.services.simpledb.model.UpdateCondition;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.support.DefaultExchange;
@@ -86,4 +85,4 @@ public class DeleteAttributesCommandTest {
         
         assertEquals(attributes, this.command.determineAttributes());
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/DeleteDomainCommandTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/DeleteDomainCommandTest.java
index 0f5971f..d16622f 100644
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/DeleteDomainCommandTest.java
+++ b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/DeleteDomainCommandTest.java
@@ -47,4 +47,4 @@ public class DeleteDomainCommandTest {
         
         assertEquals("DOMAIN1", sdbClient.deleteDomainRequest.getDomainName());
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/DomainMetadataCommandTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/DomainMetadataCommandTest.java
index c4c45c4..2b9be94 100644
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/DomainMetadataCommandTest.java
+++ b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/DomainMetadataCommandTest.java
@@ -55,4 +55,4 @@ public class DomainMetadataCommandTest {
         assertEquals(new Long(2000000), exchange.getIn().getHeader(SdbConstants.ATTRIBUTE_VALUE_SIZE));
         assertEquals(new Long(3000000), exchange.getIn().getHeader(SdbConstants.ITEM_NAME_SIZE));
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/GetAttributesCommandTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/GetAttributesCommandTest.java
index d423e22..58d635d 100644
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/GetAttributesCommandTest.java
+++ b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/GetAttributesCommandTest.java
@@ -20,7 +20,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.amazonaws.services.simpledb.model.Attribute;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.support.DefaultExchange;
@@ -90,4 +89,4 @@ public class GetAttributesCommandTest {
         
         assertEquals(attributeNames, this.command.determineAttributeNames());
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/ListDomainsCommandTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/ListDomainsCommandTest.java
index f8a4a4c..08a3130 100644
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/ListDomainsCommandTest.java
+++ b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/ListDomainsCommandTest.java
@@ -70,4 +70,4 @@ public class ListDomainsCommandTest {
 
         assertEquals(new Integer(10), this.command.determineMaxNumberOfDomains());
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/PutAttributesCommandTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/PutAttributesCommandTest.java
index b86f301..19f2a55 100644
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/PutAttributesCommandTest.java
+++ b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/PutAttributesCommandTest.java
@@ -21,7 +21,6 @@ import java.util.List;
 
 import com.amazonaws.services.simpledb.model.ReplaceableAttribute;
 import com.amazonaws.services.simpledb.model.UpdateCondition;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.support.DefaultExchange;
@@ -86,4 +85,4 @@ public class PutAttributesCommandTest {
 
         assertEquals(replaceableAttributes, this.command.determineReplaceableAttributes());
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentConfigurationTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentConfigurationTest.java
index 93b50cf..f80e1df 100644
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentConfigurationTest.java
+++ b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentConfigurationTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.aws.sdb;
 
 import com.amazonaws.Protocol;
-
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
@@ -146,4 +145,4 @@ public class SdbComponentConfigurationTest extends CamelTestSupport {
         assertEquals("localhost", endpoint.getConfiguration().getProxyHost());
         assertEquals(Integer.valueOf(9000), endpoint.getConfiguration().getProxyPort());
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentSpringTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentSpringTest.java
index 856a5ce..a01e146 100644
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentSpringTest.java
+++ b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentSpringTest.java
@@ -25,7 +25,6 @@ import com.amazonaws.services.simpledb.model.Item;
 import com.amazonaws.services.simpledb.model.ReplaceableAttribute;
 import com.amazonaws.services.simpledb.model.ReplaceableItem;
 import com.amazonaws.services.simpledb.model.UpdateCondition;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.impl.engine.DefaultProducerTemplate;
@@ -292,4 +291,4 @@ public class SdbComponentSpringTest extends CamelSpringTestSupport {
         return new ClassPathXmlApplicationContext(
                 "org/apache/camel/component/aws/sdb/SDBComponentSpringTest-context.xml");
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentTest.java
index 35d26aa..58b92e6 100644
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentTest.java
+++ b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentTest.java
@@ -25,7 +25,6 @@ import com.amazonaws.services.simpledb.model.Item;
 import com.amazonaws.services.simpledb.model.ReplaceableAttribute;
 import com.amazonaws.services.simpledb.model.ReplaceableItem;
 import com.amazonaws.services.simpledb.model.UpdateCondition;
-
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
@@ -289,4 +288,4 @@ public class SdbComponentTest extends CamelTestSupport {
             }
         };
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SelectCommandTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SelectCommandTest.java
index 96ead43..69b4008 100644
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SelectCommandTest.java
+++ b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SelectCommandTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.aws.sdb;
 import java.util.List;
 
 import com.amazonaws.services.simpledb.model.Item;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.support.DefaultExchange;
@@ -74,4 +73,4 @@ public class SelectCommandTest {
 
         assertEquals("SELECT NAME1 FROM DOMAIN1 WHERE NAME1 LIKE 'VALUE1'", this.command.determineSelectExpression());
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/integration/SdbComponentIntegrationTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/integration/SdbComponentIntegrationTest.java
index e7bcb3a..7af1167 100644
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/integration/SdbComponentIntegrationTest.java
+++ b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/integration/SdbComponentIntegrationTest.java
@@ -24,7 +24,6 @@ import com.amazonaws.services.simpledb.model.DeletableItem;
 import com.amazonaws.services.simpledb.model.ReplaceableAttribute;
 import com.amazonaws.services.simpledb.model.ReplaceableItem;
 import com.amazonaws.services.simpledb.model.UpdateCondition;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
@@ -175,4 +174,4 @@ public class SdbComponentIntegrationTest extends CamelTestSupport {
             }
         };
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesComponent.java b/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesComponent.java
index 64af4c4..817453f 100644
--- a/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesComponent.java
+++ b/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesComponent.java
@@ -20,7 +20,6 @@ import java.util.Map;
 import java.util.Set;
 
 import com.amazonaws.services.simpleemail.AmazonSimpleEmailService;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.spi.Metadata;
diff --git a/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesComponentVerifierExtension.java b/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesComponentVerifierExtension.java
index b7efbeb..b136a9a 100644
--- a/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesComponentVerifierExtension.java
+++ b/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesComponentVerifierExtension.java
@@ -26,7 +26,6 @@ import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.simpleemail.AmazonSimpleEmailService;
 import com.amazonaws.services.simpleemail.AmazonSimpleEmailServiceClientBuilder;
-
 import org.apache.camel.component.extension.verifier.DefaultComponentVerifierExtension;
 import org.apache.camel.component.extension.verifier.ResultBuilder;
 import org.apache.camel.component.extension.verifier.ResultErrorBuilder;
diff --git a/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesConfiguration.java b/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesConfiguration.java
index db20a18..d3f16be 100644
--- a/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesConfiguration.java
+++ b/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesConfiguration.java
@@ -21,7 +21,6 @@ import java.util.List;
 
 import com.amazonaws.Protocol;
 import com.amazonaws.services.simpleemail.AmazonSimpleEmailService;
-
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriParam;
diff --git a/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesEndpoint.java b/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesEndpoint.java
index 1fb5e40..5ac6ac0 100644
--- a/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesEndpoint.java
+++ b/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesEndpoint.java
@@ -24,7 +24,6 @@ import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.simpleemail.AmazonSimpleEmailService;
 import com.amazonaws.services.simpleemail.AmazonSimpleEmailServiceClientBuilder;
-
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
diff --git a/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesProducer.java b/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesProducer.java
index eff6e7f..d9bfe47 100644
--- a/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesProducer.java
+++ b/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesProducer.java
@@ -29,7 +29,6 @@ import com.amazonaws.services.simpleemail.model.SendEmailRequest;
 import com.amazonaws.services.simpleemail.model.SendEmailResult;
 import com.amazonaws.services.simpleemail.model.SendRawEmailRequest;
 import com.amazonaws.services.simpleemail.model.SendRawEmailResult;
-
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
diff --git a/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/SesComponentConfigurationTest.java b/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/SesComponentConfigurationTest.java
index a3b9159..fdcb519 100644
--- a/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/SesComponentConfigurationTest.java
+++ b/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/SesComponentConfigurationTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.aws.ses;
 
 import com.amazonaws.Protocol;
 import com.amazonaws.regions.Regions;
-
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
@@ -178,4 +177,4 @@ public class SesComponentConfigurationTest extends CamelTestSupport {
         SesComponent component = new SesComponent(context);
         component.createEndpoint("aws-ses://from@example.com?amazonSESClient=#amazonSESClient");
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/SesComponentSpringTest.java b/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/SesComponentSpringTest.java
index 29a3ba2..dfbae05 100644
--- a/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/SesComponentSpringTest.java
+++ b/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/SesComponentSpringTest.java
@@ -21,7 +21,6 @@ import java.util.List;
 
 import com.amazonaws.services.simpleemail.model.SendEmailRequest;
 import com.amazonaws.services.simpleemail.model.SendRawEmailRequest;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.test.spring.CamelSpringTestSupport;
@@ -146,4 +145,4 @@ public class SesComponentSpringTest extends CamelSpringTestSupport {
     private List<String> getTo(SendRawEmailRequest sendEmailRequest) {
         return sendEmailRequest.getDestinations();
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/SesComponentTest.java b/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/SesComponentTest.java
index 5e1d632..79acf9d 100644
--- a/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/SesComponentTest.java
+++ b/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/SesComponentTest.java
@@ -20,7 +20,6 @@ import java.util.Arrays;
 import java.util.List;
 
 import com.amazonaws.services.simpleemail.model.SendEmailRequest;
-
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
@@ -126,4 +125,4 @@ public class SesComponentTest extends CamelTestSupport {
     private List<String> getTo(SendEmailRequest sendEmailRequest) {
         return sendEmailRequest.getDestination().getToAddresses();
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsComponent.java b/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsComponent.java
index 65e8ec6..f5772fe 100644
--- a/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsComponent.java
+++ b/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsComponent.java
@@ -21,7 +21,6 @@ import java.util.Set;
 
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.sns.AmazonSNS;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.spi.Metadata;
diff --git a/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsComponentVerifierExtension.java b/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsComponentVerifierExtension.java
index b3f3d87..83da971 100644
--- a/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsComponentVerifierExtension.java
+++ b/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsComponentVerifierExtension.java
@@ -26,7 +26,6 @@ import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.sns.AmazonSNS;
 import com.amazonaws.services.sns.AmazonSNSClientBuilder;
-
 import org.apache.camel.component.extension.verifier.DefaultComponentVerifierExtension;
 import org.apache.camel.component.extension.verifier.ResultBuilder;
 import org.apache.camel.component.extension.verifier.ResultErrorBuilder;
diff --git a/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsConfiguration.java b/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsConfiguration.java
index 617b718..f5b2334 100644
--- a/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsConfiguration.java
+++ b/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsConfiguration.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.aws.sns;
 import com.amazonaws.Protocol;
 import com.amazonaws.services.sns.AmazonSNS;
 import com.amazonaws.services.sqs.AmazonSQS;
-
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.spi.UriParams;
diff --git a/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java b/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java
index bdd4aab..4732651 100644
--- a/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java
+++ b/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java
@@ -34,7 +34,6 @@ import com.amazonaws.services.sns.model.ListTopicsResult;
 import com.amazonaws.services.sns.model.SetTopicAttributesRequest;
 import com.amazonaws.services.sns.model.Topic;
 import com.amazonaws.services.sns.util.Topics;
-
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
diff --git a/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsProducer.java b/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsProducer.java
index a89b468..64b76fd 100644
--- a/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsProducer.java
+++ b/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsProducer.java
@@ -35,7 +35,6 @@ import org.apache.camel.spi.HeaderFilterStrategy;
 import org.apache.camel.support.DefaultProducer;
 import org.apache.camel.util.URISupport;
 
-
 /**
  * A Producer which sends messages to the Amazon Web Service Simple Notification Service
  * <a href="http://aws.amazon.com/sns/">AWS SNS</a>
@@ -150,4 +149,4 @@ public class SnsProducer extends DefaultProducer {
         }
         return exchange.getIn();
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/AmazonSNSClientMock.java b/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/AmazonSNSClientMock.java
index c3a0764..3053088 100644
--- a/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/AmazonSNSClientMock.java
+++ b/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/AmazonSNSClientMock.java
@@ -51,7 +51,6 @@ import com.amazonaws.services.sns.model.SubscribeResult;
 import com.amazonaws.services.sns.model.Topic;
 import com.amazonaws.services.sns.model.UnsubscribeRequest;
 import com.amazonaws.services.sns.model.UnsubscribeResult;
-
 import org.junit.Assert;
 
 public class AmazonSNSClientMock extends AbstractAmazonSNS {
@@ -168,4 +167,4 @@ public class AmazonSNSClientMock extends AbstractAmazonSNS {
     public ResponseMetadata getCachedResponseMetadata(AmazonWebServiceRequest request) {
         throw new UnsupportedOperationException();
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SnsComponentConfigurationTest.java b/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SnsComponentConfigurationTest.java
index 78c6034..318790b 100644
--- a/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SnsComponentConfigurationTest.java
+++ b/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SnsComponentConfigurationTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.aws.sns;
 
 import com.amazonaws.Protocol;
 import com.amazonaws.regions.Regions;
-
 import org.apache.camel.component.aws.sqs.AmazonSQSClientMock;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
diff --git a/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SnsProducerTest.java b/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SnsProducerTest.java
index c33cdba..bb46c6e 100644
--- a/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SnsProducerTest.java
+++ b/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SnsProducerTest.java
@@ -70,4 +70,4 @@ public class SnsProducerTest {
         assertThat(translateAttributes.get("key6").getStringValue(), is("[10, null, 12]"));
         assertThat(translateAttributes.get("key7").getStringValue(), is("[true, null, false]"));
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsComponent.java b/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsComponent.java
index fd6b4c3..91e1f34 100644
--- a/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsComponent.java
+++ b/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsComponent.java
@@ -21,7 +21,6 @@ import java.util.Set;
 
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.sqs.AmazonSQS;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.spi.Metadata;
diff --git a/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsComponentVerifierExtension.java b/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsComponentVerifierExtension.java
index bb0e766..5a62fe7 100644
--- a/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsComponentVerifierExtension.java
+++ b/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsComponentVerifierExtension.java
@@ -26,7 +26,6 @@ import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.sqs.AmazonSQS;
 import com.amazonaws.services.sqs.AmazonSQSClientBuilder;
-
 import org.apache.camel.component.extension.verifier.DefaultComponentVerifierExtension;
 import org.apache.camel.component.extension.verifier.ResultBuilder;
 import org.apache.camel.component.extension.verifier.ResultErrorBuilder;
diff --git a/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java b/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java
index 4c5020d..e94e191 100644
--- a/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java
+++ b/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.aws.sqs;
 
 import com.amazonaws.Protocol;
 import com.amazonaws.services.sqs.AmazonSQS;
-
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.spi.UriParams;
diff --git a/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java b/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java
index 4458af5..2d57f97 100644
--- a/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java
+++ b/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java
@@ -36,7 +36,6 @@ import com.amazonaws.services.sqs.model.QueueDoesNotExistException;
 import com.amazonaws.services.sqs.model.ReceiptHandleIsInvalidException;
 import com.amazonaws.services.sqs.model.ReceiveMessageRequest;
 import com.amazonaws.services.sqs.model.ReceiveMessageResult;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.NoFactoryAvailableException;
 import org.apache.camel.Processor;
diff --git a/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java b/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
index 23a9cdc..2dcfd2f 100644
--- a/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
+++ b/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
@@ -37,7 +37,6 @@ import com.amazonaws.services.sqs.model.ListQueuesResult;
 import com.amazonaws.services.sqs.model.MessageAttributeValue;
 import com.amazonaws.services.sqs.model.QueueAttributeName;
 import com.amazonaws.services.sqs.model.SetQueueAttributesRequest;
-
 import org.apache.camel.Consumer;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsBatchConsumerTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsBatchConsumerTest.java
index 1516727..86601f7 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsBatchConsumerTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsBatchConsumerTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.aws.sqs;
 
 import com.amazonaws.services.sqs.model.Message;
-
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentConfigurationTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentConfigurationTest.java
index 01029ec..854a015 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentConfigurationTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentConfigurationTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.aws.sqs;
 
 import com.amazonaws.Protocol;
 import com.amazonaws.regions.Regions;
-
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentSpringTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentSpringTest.java
index f0c41a7..3b64810 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentSpringTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentSpringTest.java
@@ -21,7 +21,6 @@ import java.util.Collection;
 
 import com.amazonaws.services.sqs.model.DeleteMessageResult;
 import com.amazonaws.services.sqs.model.SendMessageBatchResult;
-
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsConcurrentConsumerTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsConcurrentConsumerTest.java
index e374461..5fefcfae 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsConcurrentConsumerTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsConcurrentConsumerTest.java
@@ -21,7 +21,6 @@ import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 import com.amazonaws.services.sqs.model.Message;
-
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsConsumerIdleMessageTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsConsumerIdleMessageTest.java
index c82048f..be0521b 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsConsumerIdleMessageTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsConsumerIdleMessageTest.java
@@ -17,15 +17,15 @@
 package org.apache.camel.component.aws.sqs;
 
 import org.apache.camel.BindToRegistry;
-/**
- * Test to verify that the polling consumer delivers an empty Exchange when the
- * sendEmptyMessageWhenIdle property is set and a polling event yields no results.
- */
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
+/**
+ * Test to verify that the polling consumer delivers an empty Exchange when the
+ * sendEmptyMessageWhenIdle property is set and a polling event yields no results.
+ */
 public class SqsConsumerIdleMessageTest extends CamelTestSupport {
 
     @BindToRegistry("amazonSQSClient")
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsDoesNotExtendMessageVisibilityTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsDoesNotExtendMessageVisibilityTest.java
index 5a08ffc..713cf22 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsDoesNotExtendMessageVisibilityTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsDoesNotExtendMessageVisibilityTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.aws.sqs;
 
 import com.amazonaws.services.sqs.model.Message;
-
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsEndpointTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsEndpointTest.java
index 4e953f0..013780e 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsEndpointTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsEndpointTest.java
@@ -23,7 +23,6 @@ import com.amazonaws.services.sqs.model.GetQueueUrlRequest;
 import com.amazonaws.services.sqs.model.GetQueueUrlResult;
 import com.amazonaws.services.sqs.model.ListQueuesResult;
 import com.amazonaws.services.sqs.model.QueueAttributeName;
-
 import org.apache.camel.impl.DefaultCamelContext;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsEndpointUseExistingQueueTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsEndpointUseExistingQueueTest.java
index e6a2b69..d55f6df 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsEndpointUseExistingQueueTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsEndpointUseExistingQueueTest.java
@@ -30,7 +30,6 @@ import com.amazonaws.services.sqs.model.ReceiveMessageRequest;
 import com.amazonaws.services.sqs.model.ReceiveMessageResult;
 import com.amazonaws.services.sqs.model.SetQueueAttributesRequest;
 import com.amazonaws.services.sqs.model.SetQueueAttributesResult;
-
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsExtendMessageVisibilityTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsExtendMessageVisibilityTest.java
index 1ba3be4..9da34c5 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsExtendMessageVisibilityTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsExtendMessageVisibilityTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.aws.sqs;
 
 import com.amazonaws.services.sqs.model.ChangeMessageVisibilityRequest;
 import com.amazonaws.services.sqs.model.Message;
-
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsProducerBatchTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsProducerBatchTest.java
index 8c36956..3d22a46 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsProducerBatchTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsProducerBatchTest.java
@@ -20,7 +20,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 
 import com.amazonaws.services.sqs.model.SendMessageBatchResult;
-
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsProducerDeleteTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsProducerDeleteTest.java
index 000ea68..fb4168a 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsProducerDeleteTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsProducerDeleteTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.aws.sqs;
 
 import com.amazonaws.services.sqs.model.DeleteMessageResult;
-
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsProducerListQueuesTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsProducerListQueuesTest.java
index b1badd1..a403f67 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsProducerListQueuesTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsProducerListQueuesTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.aws.sqs;
 
 import com.amazonaws.services.sqs.model.ListQueuesResult;
-
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsProducerTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsProducerTest.java
index 340e321..2f830a9 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsProducerTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsProducerTest.java
@@ -24,7 +24,6 @@ import com.amazonaws.services.sqs.AmazonSQSClient;
 import com.amazonaws.services.sqs.model.MessageAttributeValue;
 import com.amazonaws.services.sqs.model.SendMessageRequest;
 import com.amazonaws.services.sqs.model.SendMessageResult;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
 import org.apache.camel.Message;
diff --git a/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFComponent.java b/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFComponent.java
index 51cb967..f627e6c 100644
--- a/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFComponent.java
+++ b/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFComponent.java
@@ -20,7 +20,6 @@ import java.util.Map;
 import java.util.Set;
 
 import com.amazonaws.services.simpleworkflow.AmazonSimpleWorkflow;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.spi.Metadata;
diff --git a/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFConfiguration.java b/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFConfiguration.java
index 65e68d3..5505a62 100644
--- a/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFConfiguration.java
+++ b/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFConfiguration.java
@@ -24,7 +24,6 @@ import com.amazonaws.services.simpleworkflow.flow.DataConverter;
 import com.amazonaws.services.simpleworkflow.flow.WorkflowTypeRegistrationOptions;
 import com.amazonaws.services.simpleworkflow.flow.worker.ActivityTypeExecutionOptions;
 import com.amazonaws.services.simpleworkflow.flow.worker.ActivityTypeRegistrationOptions;
-
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriParam;
diff --git a/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFWorkflowConsumer.java b/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFWorkflowConsumer.java
index 90a8b0c..014dc0c 100644
--- a/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFWorkflowConsumer.java
+++ b/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFWorkflowConsumer.java
@@ -25,6 +25,7 @@ import org.apache.camel.support.DefaultConsumer;
 import org.apache.camel.util.URISupport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import static org.apache.camel.ExchangePattern.InOnly;
 
 public class SWFWorkflowConsumer extends DefaultConsumer {
diff --git a/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFWorkflowProducer.java b/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFWorkflowProducer.java
index 5c845a9..e01ada0 100644
--- a/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFWorkflowProducer.java
+++ b/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFWorkflowProducer.java
@@ -26,7 +26,6 @@ import org.apache.camel.util.URISupport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 public class SWFWorkflowProducer extends DefaultProducer {
     private static final transient Logger LOGGER = LoggerFactory.getLogger(SWFWorkflowProducer.class);
     private final CamelSWFWorkflowClient camelSWFClient;
diff --git a/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SwfComponentVerifierExtension.java b/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SwfComponentVerifierExtension.java
index a3a4e67..0fa94b9 100644
--- a/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SwfComponentVerifierExtension.java
+++ b/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SwfComponentVerifierExtension.java
@@ -27,7 +27,6 @@ import com.amazonaws.regions.Regions;
 import com.amazonaws.services.simpleworkflow.AmazonSimpleWorkflow;
 import com.amazonaws.services.simpleworkflow.AmazonSimpleWorkflowClientBuilder;
 import com.amazonaws.services.simpleworkflow.model.ListDomainsRequest;
-
 import org.apache.camel.component.extension.verifier.DefaultComponentVerifierExtension;
 import org.apache.camel.component.extension.verifier.ResultBuilder;
 import org.apache.camel.component.extension.verifier.ResultErrorBuilder;
diff --git a/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFActivityClientTest.java b/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFActivityClientTest.java
index 964d104..fd07cb5 100644
--- a/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFActivityClientTest.java
+++ b/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFActivityClientTest.java
@@ -19,12 +19,10 @@ package org.apache.camel.component.aws.swf;
 import com.amazonaws.services.simpleworkflow.flow.DynamicActivitiesClient;
 import com.amazonaws.services.simpleworkflow.flow.core.Promise;
 import com.amazonaws.services.simpleworkflow.model.ActivityType;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentMatchers;
 
-
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
diff --git a/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFActivityConsumerTest.java b/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFActivityConsumerTest.java
index f8461be..c54b4fb 100644
--- a/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFActivityConsumerTest.java
+++ b/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFActivityConsumerTest.java
@@ -22,6 +22,7 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Predicate;
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.Test;
+
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.verify;
@@ -65,4 +66,4 @@ public class CamelSWFActivityConsumerTest extends CamelSWFTestSupport {
         assertMockEndpointsSatisfied();
         verify(amazonSWClient, atLeastOnce()).pollForActivityTask(any(PollForActivityTaskRequest.class));
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFTestSupport.java b/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFTestSupport.java
index d427c9c..fc7c8b5 100644
--- a/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFTestSupport.java
+++ b/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFTestSupport.java
@@ -17,12 +17,12 @@
 package org.apache.camel.component.aws.swf;
 
 import com.amazonaws.services.simpleworkflow.AmazonSimpleWorkflowClient;
-
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.junit4.CamelTestSupport;
+
 import static org.mockito.Mockito.mock;
 
 public class CamelSWFTestSupport extends CamelTestSupport {
@@ -45,4 +45,4 @@ public class CamelSWFTestSupport extends CamelTestSupport {
 
     @BindToRegistry("amazonSWClient")
     protected AmazonSimpleWorkflowClient amazonSWClient = mock(AmazonSimpleWorkflowClient.class);
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFWorkflowClientTest.java b/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFWorkflowClientTest.java
index cd1e4bd..13bdb3d 100644
--- a/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFWorkflowClientTest.java
+++ b/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFWorkflowClientTest.java
@@ -30,6 +30,7 @@ import com.amazonaws.services.simpleworkflow.model.WorkflowExecutionDetail;
 import com.amazonaws.services.simpleworkflow.model.WorkflowExecutionInfo;
 import org.junit.Before;
 import org.junit.Test;
+
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
diff --git a/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFWorkflowConsumerTest.java b/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFWorkflowConsumerTest.java
index a9d8865..6cef5d4 100644
--- a/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFWorkflowConsumerTest.java
+++ b/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFWorkflowConsumerTest.java
@@ -22,6 +22,7 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Predicate;
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.Test;
+
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.verify;
@@ -64,4 +65,4 @@ public class CamelSWFWorkflowConsumerTest extends CamelSWFTestSupport {
         assertMockEndpointsSatisfied();
         verify(amazonSWClient, atLeastOnce()).pollForDecisionTask(any(PollForDecisionTaskRequest.class));
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFWorkflowProducerTest.java b/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFWorkflowProducerTest.java
index 666d4c7..eea9eb0 100644
--- a/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFWorkflowProducerTest.java
+++ b/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFWorkflowProducerTest.java
@@ -22,6 +22,7 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.Test;
+
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
@@ -57,4 +58,4 @@ public class CamelSWFWorkflowProducerTest extends CamelSWFTestSupport {
             }
         };
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/SWFComponentConfigurationTest.java b/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/SWFComponentConfigurationTest.java
index 20ccbfd..976a824 100644
--- a/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/SWFComponentConfigurationTest.java
+++ b/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/SWFComponentConfigurationTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.aws.swf;
 
 import com.amazonaws.regions.Regions;
-
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
diff --git a/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateComponent.java b/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateComponent.java
index a54bd0a..024aaf7 100644
--- a/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateComponent.java
+++ b/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateComponent.java
@@ -20,7 +20,6 @@ import java.util.Map;
 import java.util.Set;
 
 import com.amazonaws.services.translate.AmazonTranslate;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.spi.Metadata;
diff --git a/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateComponentVerifierExtension.java b/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateComponentVerifierExtension.java
index c7ed7ed..d03ba49 100644
--- a/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateComponentVerifierExtension.java
+++ b/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateComponentVerifierExtension.java
@@ -27,7 +27,6 @@ import com.amazonaws.regions.Regions;
 import com.amazonaws.services.translate.AmazonTranslate;
 import com.amazonaws.services.translate.AmazonTranslateClientBuilder;
 import com.amazonaws.services.translate.model.TranslateTextRequest;
-
 import org.apache.camel.component.extension.verifier.DefaultComponentVerifierExtension;
 import org.apache.camel.component.extension.verifier.ResultBuilder;
 import org.apache.camel.component.extension.verifier.ResultErrorBuilder;
diff --git a/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateConfiguration.java b/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateConfiguration.java
index aff98c9..b2a97bf 100644
--- a/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateConfiguration.java
+++ b/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateConfiguration.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.aws.translate;
 
 import com.amazonaws.Protocol;
 import com.amazonaws.services.translate.AmazonTranslate;
-
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriParam;
diff --git a/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateEndpoint.java b/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateEndpoint.java
index 8bc12c1..fd3cc8c 100644
--- a/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateEndpoint.java
+++ b/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateEndpoint.java
@@ -24,7 +24,6 @@ import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.translate.AmazonTranslate;
 import com.amazonaws.services.translate.AmazonTranslateClientBuilder;
-
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
diff --git a/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateProducer.java b/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateProducer.java
index 2cd33b2..4e251db 100644
--- a/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateProducer.java
+++ b/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateProducer.java
@@ -20,7 +20,6 @@ import com.amazonaws.AmazonServiceException;
 import com.amazonaws.services.translate.AmazonTranslate;
 import com.amazonaws.services.translate.model.TranslateTextRequest;
 import com.amazonaws.services.translate.model.TranslateTextResult;
-
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
diff --git a/components/camel-aws-xray/src/main/java/org/apache/camel/component/aws/xray/EIPTracingStrategy.java b/components/camel-aws-xray/src/main/java/org/apache/camel/component/aws/xray/EIPTracingStrategy.java
index b6bd99d..8efd127 100644
--- a/components/camel-aws-xray/src/main/java/org/apache/camel/component/aws/xray/EIPTracingStrategy.java
+++ b/components/camel-aws-xray/src/main/java/org/apache/camel/component/aws/xray/EIPTracingStrategy.java
@@ -17,6 +17,7 @@
 package org.apache.camel.component.aws.xray;
 
 import java.lang.invoke.MethodHandles;
+
 import com.amazonaws.xray.AWSXRay;
 import com.amazonaws.xray.entities.Subsegment;
 import org.apache.camel.CamelContext;
diff --git a/components/camel-aws-xray/src/main/java/org/apache/camel/component/aws/xray/TraceAnnotatedTracingStrategy.java b/components/camel-aws-xray/src/main/java/org/apache/camel/component/aws/xray/TraceAnnotatedTracingStrategy.java
index 9e7d497..8d31ca5 100644
--- a/components/camel-aws-xray/src/main/java/org/apache/camel/component/aws/xray/TraceAnnotatedTracingStrategy.java
+++ b/components/camel-aws-xray/src/main/java/org/apache/camel/component/aws/xray/TraceAnnotatedTracingStrategy.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.aws.xray;
 
 import java.lang.annotation.Annotation;
 import java.lang.invoke.MethodHandles;
+
 import com.amazonaws.xray.AWSXRay;
 import com.amazonaws.xray.entities.Subsegment;
 import org.apache.camel.CamelContext;
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ABCRouteTest.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ABCRouteTest.java
index b6a3097..567b510 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ABCRouteTest.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ABCRouteTest.java
@@ -88,4 +88,4 @@ public class ABCRouteTest extends CamelAwsXRayTestSupport {
             }
         };
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/BeanTracingTest.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/BeanTracingTest.java
index 4219e79..bb23b54 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/BeanTracingTest.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/BeanTracingTest.java
@@ -115,4 +115,4 @@ public class BeanTracingTest extends CamelAwsXRayTestSupport {
             exchange.getIn().setHeader("TEST", "done");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ClientRecipientListRouteTest.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ClientRecipientListRouteTest.java
index 0538b32..edf6dbc 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ClientRecipientListRouteTest.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ClientRecipientListRouteTest.java
@@ -74,4 +74,4 @@ public class ClientRecipientListRouteTest extends CamelAwsXRayTestSupport {
             }
         };
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/EIPTracingTest.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/EIPTracingTest.java
index 22bc2ce..c8f0a05 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/EIPTracingTest.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/EIPTracingTest.java
@@ -126,4 +126,4 @@ public class EIPTracingTest extends CamelAwsXRayTestSupport {
             exchange.getIn().setHeader("TEST", "done");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ErrorHandlingTest.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ErrorHandlingTest.java
index c813fc4..8605fa2 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ErrorHandlingTest.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ErrorHandlingTest.java
@@ -165,4 +165,4 @@ public class ErrorHandlingTest extends CamelAwsXRayTestSupport {
             return "ExceptionRetryProcessor";
         }
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ErrorTest.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ErrorTest.java
index ebd4dee..f0d7c95 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ErrorTest.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ErrorTest.java
@@ -146,4 +146,4 @@ public class ErrorTest extends CamelAwsXRayTestSupport {
             return "ExceptionRetryProcessor";
         }
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/MulticastParallelRouteTest.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/MulticastParallelRouteTest.java
index 5bb12f0..f3323c8 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/MulticastParallelRouteTest.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/MulticastParallelRouteTest.java
@@ -86,4 +86,4 @@ public class MulticastParallelRouteTest extends CamelAwsXRayTestSupport {
             }
         };
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/MulticastRouteTest.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/MulticastRouteTest.java
index 66f00ec..be9e66d 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/MulticastRouteTest.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/MulticastRouteTest.java
@@ -87,4 +87,4 @@ public class MulticastRouteTest extends CamelAwsXRayTestSupport {
             }
         };
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/Route2ConcurrentTest.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/Route2ConcurrentTest.java
index 61ef20b..b962826 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/Route2ConcurrentTest.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/Route2ConcurrentTest.java
@@ -17,6 +17,7 @@
 package org.apache.camel.component.aws.xray;
 
 import java.util.concurrent.TimeUnit;
+
 import org.apache.camel.builder.NotifyBuilder;
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.Test;
@@ -76,4 +77,4 @@ public class Route2ConcurrentTest extends CamelAwsXRayTestSupport {
             }
         };
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/RouteConcurrentTest.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/RouteConcurrentTest.java
index c42764a..955647f 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/RouteConcurrentTest.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/RouteConcurrentTest.java
@@ -17,6 +17,7 @@
 package org.apache.camel.component.aws.xray;
 
 import java.util.concurrent.TimeUnit;
+
 import org.apache.camel.builder.NotifyBuilder;
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.Test;
@@ -62,4 +63,4 @@ public class RouteConcurrentTest extends CamelAwsXRayTestSupport {
             }
         };
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/SpringAwsXRaySimpleRouteTest.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/SpringAwsXRaySimpleRouteTest.java
index 1bf4da7..2ea70e3 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/SpringAwsXRaySimpleRouteTest.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/SpringAwsXRaySimpleRouteTest.java
@@ -74,4 +74,4 @@ public class SpringAwsXRaySimpleRouteTest extends CamelSpringTestSupport {
 
         TestUtils.checkData(socketListener.getReceivedData(), testData);
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TestUtils.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TestUtils.java
index e05c0da..348c371 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TestUtils.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TestUtils.java
@@ -172,4 +172,4 @@ public final class TestUtils {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TwoService2Test.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TwoService2Test.java
index 878a061..465b005 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TwoService2Test.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TwoService2Test.java
@@ -64,4 +64,4 @@ public class TwoService2Test extends CamelAwsXRayTestSupport {
             }
         };
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TwoServiceTest.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TwoServiceTest.java
index d1aeee5..029d4c3 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TwoServiceTest.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TwoServiceTest.java
@@ -65,4 +65,4 @@ public class TwoServiceTest extends CamelAwsXRayTestSupport {
             }
         };
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TwoServiceWithExcludeTest.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TwoServiceWithExcludeTest.java
index be85aab..05c558d 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TwoServiceWithExcludeTest.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TwoServiceWithExcludeTest.java
@@ -72,4 +72,4 @@ public class TwoServiceWithExcludeTest extends CamelAwsXRayTestSupport {
             }
         };
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/bean/SomeBackingService.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/bean/SomeBackingService.java
index 76ba13c..4e2cb1b 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/bean/SomeBackingService.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/bean/SomeBackingService.java
@@ -20,7 +20,6 @@ import java.util.UUID;
 
 import com.amazonaws.xray.AWSXRay;
 import com.amazonaws.xray.entities.Entity;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/bean/SomeBean.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/bean/SomeBean.java
index 3f2e2a0..f29b36f 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/bean/SomeBean.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/bean/SomeBean.java
@@ -20,7 +20,6 @@ import java.util.HashMap;
 import java.util.Map;
 
 import com.amazonaws.xray.AWSXRay;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
diff --git a/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceConfiguration.java b/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceConfiguration.java
index 457edfd..882f4d0 100644
--- a/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceConfiguration.java
+++ b/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceConfiguration.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.azure.blob;
 import java.util.Map;
 
 import com.microsoft.azure.storage.blob.CloudBlob;
-
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.component.azure.common.AbstractConfiguration;
 import org.apache.camel.spi.UriParam;
@@ -262,4 +261,4 @@ public class BlobServiceConfiguration extends AbstractConfiguration {
             throw new RuntimeCamelException(e);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceConsumer.java b/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceConsumer.java
index 8926f19..1fa97b2 100644
--- a/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceConsumer.java
+++ b/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceConsumer.java
@@ -63,4 +63,4 @@ public class BlobServiceConsumer extends ScheduledPollConsumer {
         return (BlobServiceEndpoint) super.getEndpoint();
     }
 
-}
\ No newline at end of file
+}
diff --git a/components/camel-azure/src/main/java/org/apache/camel/component/azure/common/AbstractConfiguration.java b/components/camel-azure/src/main/java/org/apache/camel/component/azure/common/AbstractConfiguration.java
index f3163fc..4be7429 100644
--- a/components/camel-azure/src/main/java/org/apache/camel/component/azure/common/AbstractConfiguration.java
+++ b/components/camel-azure/src/main/java/org/apache/camel/component/azure/common/AbstractConfiguration.java
@@ -48,4 +48,4 @@ public abstract class AbstractConfiguration implements Cloneable {
     public void setCredentials(StorageCredentials credentials) {
         this.credentials = credentials;
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-azure/src/main/java/org/apache/camel/component/azure/queue/QueueServiceComponent.java b/components/camel-azure/src/main/java/org/apache/camel/component/azure/queue/QueueServiceComponent.java
index e47528c..3a2fea9 100644
--- a/components/camel-azure/src/main/java/org/apache/camel/component/azure/queue/QueueServiceComponent.java
+++ b/components/camel-azure/src/main/java/org/apache/camel/component/azure/queue/QueueServiceComponent.java
@@ -21,7 +21,6 @@ import java.util.Set;
 
 import com.microsoft.azure.storage.StorageCredentials;
 import com.microsoft.azure.storage.queue.CloudQueue;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.spi.Metadata;
diff --git a/components/camel-azure/src/main/java/org/apache/camel/component/azure/queue/QueueServiceConfiguration.java b/components/camel-azure/src/main/java/org/apache/camel/component/azure/queue/QueueServiceConfiguration.java
index 1a5e52e..eabdbb1 100644
--- a/components/camel-azure/src/main/java/org/apache/camel/component/azure/queue/QueueServiceConfiguration.java
+++ b/components/camel-azure/src/main/java/org/apache/camel/component/azure/queue/QueueServiceConfiguration.java
@@ -17,11 +17,11 @@
 package org.apache.camel.component.azure.queue;
 
 import com.microsoft.azure.storage.queue.CloudQueue;
-
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.component.azure.common.AbstractConfiguration;
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.spi.UriParams;
+
 @UriParams
 public class QueueServiceConfiguration extends AbstractConfiguration {
 
diff --git a/components/camel-azure/src/main/java/org/apache/camel/component/azure/queue/QueueServiceConsumer.java b/components/camel-azure/src/main/java/org/apache/camel/component/azure/queue/QueueServiceConsumer.java
index 5eb1d7a..e26ca47 100644
--- a/components/camel-azure/src/main/java/org/apache/camel/component/azure/queue/QueueServiceConsumer.java
+++ b/components/camel-azure/src/main/java/org/apache/camel/component/azure/queue/QueueServiceConsumer.java
@@ -64,4 +64,4 @@ public class QueueServiceConsumer extends ScheduledPollConsumer {
         return (QueueServiceEndpoint) super.getEndpoint();
     }
 
-}
\ No newline at end of file
+}
diff --git a/components/camel-azure/src/test/java/org/apache/camel/component/azure/blob/BlobServiceAppendConsumerTest.java b/components/camel-azure/src/test/java/org/apache/camel/component/azure/blob/BlobServiceAppendConsumerTest.java
index c297836..49b9b38 100644
--- a/components/camel-azure/src/test/java/org/apache/camel/component/azure/blob/BlobServiceAppendConsumerTest.java
+++ b/components/camel-azure/src/test/java/org/apache/camel/component/azure/blob/BlobServiceAppendConsumerTest.java
@@ -88,4 +88,4 @@ public class BlobServiceAppendConsumerTest extends CamelTestSupport {
             }
         };
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-barcode/src/main/java/org/apache/camel/dataformat/barcode/BarcodeDataFormat.java b/components/camel-barcode/src/main/java/org/apache/camel/dataformat/barcode/BarcodeDataFormat.java
index d0a8dbc..07b3ad9 100644
--- a/components/camel-barcode/src/main/java/org/apache/camel/dataformat/barcode/BarcodeDataFormat.java
+++ b/components/camel-barcode/src/main/java/org/apache/camel/dataformat/barcode/BarcodeDataFormat.java
@@ -21,6 +21,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.EnumMap;
 import java.util.Map;
+
 import javax.imageio.ImageIO;
 
 import com.google.zxing.BarcodeFormat;
diff --git a/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatCamelTest.java b/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatCamelTest.java
index 2ec894b..3c130e3 100644
--- a/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatCamelTest.java
+++ b/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatCamelTest.java
@@ -20,7 +20,6 @@ import java.io.File;
 import java.util.concurrent.TimeUnit;
 
 import com.google.zxing.BarcodeFormat;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.DataFormat;
 import org.junit.Before;
diff --git a/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatTest.java b/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatTest.java
index 855547b..9c4fced 100644
--- a/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatTest.java
+++ b/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatTest.java
@@ -21,7 +21,6 @@ import java.util.Map;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.DecodeHintType;
 import com.google.zxing.EncodeHintType;
-
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
diff --git a/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeTestBase.java b/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeTestBase.java
index 0c35312..e8bb986 100644
--- a/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeTestBase.java
+++ b/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeTestBase.java
@@ -33,7 +33,6 @@ import com.google.zxing.ReaderException;
 import com.google.zxing.Result;
 import com.google.zxing.client.j2se.BufferedImageLuminanceSource;
 import com.google.zxing.common.HybridBinarizer;
-
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
 import org.apache.camel.component.mock.MockEndpoint;
@@ -41,7 +40,6 @@ import org.apache.camel.test.junit4.CamelTestSupport;
 import org.apache.camel.util.FileUtil;
 import org.apache.camel.util.IOHelper;
 
-
 public class BarcodeTestBase extends CamelTestSupport {
 
     protected static final String MSG = "This is a testmessage!";
diff --git a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SpringBase64DataFormatDefaultsTest.java b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SpringBase64DataFormatDefaultsTest.java
index 26c5ee1..a296c6f 100644
--- a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SpringBase64DataFormatDefaultsTest.java
+++ b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SpringBase64DataFormatDefaultsTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.dataformat.base64;
 
-
-
 import org.junit.Test;
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
+
 import static org.apache.camel.dataformat.base64.Base64TestConstants.DECODED;
 
 public class SpringBase64DataFormatDefaultsTest extends SpringBase64DataFormatTestBase {
diff --git a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SpringBase64DataFormatLineEndingsTest.java b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SpringBase64DataFormatLineEndingsTest.java
index b096cb2..4c083ae 100644
--- a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SpringBase64DataFormatLineEndingsTest.java
+++ b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SpringBase64DataFormatLineEndingsTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.dataformat.base64;
 
-
-
 import org.junit.Test;
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
+
 import static org.apache.camel.dataformat.base64.Base64TestConstants.DECODED;
 
 public class SpringBase64DataFormatLineEndingsTest extends SpringBase64DataFormatTestBase {
diff --git a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SpringBase64DataFormatLineLengthTest.java b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SpringBase64DataFormatLineLengthTest.java
index 25cd3b5..188f733 100644
--- a/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SpringBase64DataFormatLineLengthTest.java
+++ b/components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/SpringBase64DataFormatLineLengthTest.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.dataformat.base64;
 
-
-
 import org.junit.Test;
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
+
 import static org.apache.camel.dataformat.base64.Base64TestConstants.DECODED;
 
 public class SpringBase64DataFormatLineLengthTest extends SpringBase64DataFormatTestBase {
diff --git a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorComponent.java b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorComponent.java
index ad4792c..8cf5137 100644
--- a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorComponent.java
+++ b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorComponent.java
@@ -17,6 +17,7 @@
 package org.apache.camel.component.bean.validator;
 
 import java.util.Map;
+
 import javax.validation.ConstraintValidatorFactory;
 import javax.validation.MessageInterpolator;
 import javax.validation.TraversableResolver;
@@ -118,4 +119,4 @@ public class BeanValidatorComponent extends DefaultComponent {
         this.constraintValidatorFactory = constraintValidatorFactory;
     }
 
-}
\ No newline at end of file
+}
diff --git a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolver.java b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolver.java
index 1b42fe9..81bbd89 100644
--- a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolver.java
+++ b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolver.java
@@ -18,12 +18,12 @@ package org.apache.camel.component.bean.validator;
 
 import java.util.List;
 
-import static java.util.Collections.singletonList;
-
 import javax.validation.ValidationProviderResolver;
 
 import org.hibernate.validator.HibernateValidator;
 
+import static java.util.Collections.singletonList;
+
 /**
  * OSGi-friendly implementation of {@code javax.validation.ValidationProviderResolver} returning
  * {@code org.hibernate.validator.HibernateValidator} instance.
@@ -35,4 +35,4 @@ public class HibernateValidationProviderResolver implements ValidationProviderRe
         return singletonList(new HibernateValidator());
     }
 
-}
\ No newline at end of file
+}
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CustomValidationProviderResolverTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CustomValidationProviderResolverTest.java
index 782792a..08bd77e 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CustomValidationProviderResolverTest.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CustomValidationProviderResolverTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.component.bean.validator;
 
 import java.util.List;
 
-import static java.util.Arrays.asList;
-
 import javax.validation.ValidationProviderResolver;
 import javax.validation.spi.ValidationProvider;
 
@@ -29,6 +27,7 @@ import org.apache.camel.test.junit4.CamelTestSupport;
 import org.hibernate.validator.HibernateValidator;
 import org.junit.Test;
 
+import static java.util.Arrays.asList;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.mock;
diff --git a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIODataFormatComplexTest.java b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIODataFormatComplexTest.java
index ecb286b..bf9c6f8 100644
--- a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIODataFormatComplexTest.java
+++ b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/BeanIODataFormatComplexTest.java
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 package org.apache.camel.dataformat.beanio;
+
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
diff --git a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/ConsumerToProducerHeadersTest.java b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/ConsumerToProducerHeadersTest.java
index 11ba9c5..509f7dd 100644
--- a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/ConsumerToProducerHeadersTest.java
+++ b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/ConsumerToProducerHeadersTest.java
@@ -18,13 +18,12 @@ package org.apache.camel.component.beanstalk;
 
 import java.util.HashMap;
 import java.util.Map;
-import com.surftools.BeanstalkClient.Job;
 
+import com.surftools.BeanstalkClient.Job;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-
 import org.junit.Test;
 
 import static org.mockito.ArgumentMatchers.anyInt;
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/FormatFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/FormatFactory.java
index 753bd7f..92610cd 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/FormatFactory.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/FormatFactory.java
@@ -16,10 +16,8 @@
  */
 package org.apache.camel.dataformat.bindy;
 
-
 import org.apache.camel.dataformat.bindy.format.factories.FactoryRegistry;
 
-
 /**
  * Factory to return {@link Format} classes for a given type.
  */
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/annotation/BindyConverter.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/annotation/BindyConverter.java
index 950271f..6fc033a 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/annotation/BindyConverter.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/annotation/BindyConverter.java
@@ -22,7 +22,6 @@ import java.lang.annotation.RetentionPolicy;
 
 import org.apache.camel.dataformat.bindy.Format;
 
-
 /**
  * An annotation used to identify which converter class will be used to convert
  * the String field to the attribute's data type.
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/annotation/DataField.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/annotation/DataField.java
index 2efc563..c800863 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/annotation/DataField.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/annotation/DataField.java
@@ -144,14 +144,14 @@ public @interface DataField {
      * e.g : Number = 123456.789, Precision = 2, Rounding =  CEILING
      * Result : 123456.79
      */
-     String rounding() default "CEILING";
-
-     /**
-      * Method name to call to apply such customization
-      * on DataField. This must be the method on the datafield
-      * itself or you must provide static fully qualified name of
-      * the class's method e.g: see unit test 
-      * org.apache.camel.dataformat.bindy.csv.BindySimpleCsvFunctionWithExternalMethodTest.replaceToBar
-      */
-     String method() default ""; 
+    String rounding() default "CEILING";
+
+    /**
+     * Method name to call to apply such customization
+     * on DataField. This must be the method on the datafield
+     * itself or you must provide static fully qualified name of
+     * the class's method e.g: see unit test 
+     * org.apache.camel.dataformat.bindy.csv.BindySimpleCsvFunctionWithExternalMethodTest.replaceToBar
+     */
+    String method() default ""; 
 }
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/annotation/FormatFactories.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/annotation/FormatFactories.java
index b65ada7..5abe8be 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/annotation/FormatFactories.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/annotation/FormatFactories.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.dataformat.bindy.annotation;
 
-
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java
index cf444a1..f7860df 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.dataformat.bindy.csv;
 
-
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvBigFileUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvBigFileUnmarshallTest.java
index 4a0d20f..e0fcd9e 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvBigFileUnmarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvBigFileUnmarshallTest.java
@@ -28,7 +28,6 @@ import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
 
 import static org.junit.Assert.assertEquals;
 
-
 @ContextConfiguration
 public class BindyCsvBigFileUnmarshallTest extends AbstractJUnit4SpringContextTests {
 
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvSkipFieldTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvSkipFieldTest.java
index e1e0dd5..f411295 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvSkipFieldTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvSkipFieldTest.java
@@ -30,7 +30,6 @@ import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
 
-
 @ContextConfiguration
 public class BindyCsvSkipFieldTest  extends AbstractJUnit4SpringContextTests {
 
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyMarshalOneToManyWithHeadersTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyMarshalOneToManyWithHeadersTest.java
index d977045..549a371 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyMarshalOneToManyWithHeadersTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyMarshalOneToManyWithHeadersTest.java
@@ -26,7 +26,6 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.dataformat.bindy.model.simple.linkonetomany.Order;
 import org.apache.camel.dataformat.bindy.model.simple.linkonetomany.OrderItem;
-
 import org.junit.Test;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPojoSimpleCsvMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPojoSimpleCsvMarshallTest.java
index 052ec4b..dbe91c9 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPojoSimpleCsvMarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPojoSimpleCsvMarshallTest.java
@@ -27,7 +27,6 @@ import org.apache.camel.ProducerTemplate;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.dataformat.bindy.model.simple.oneclass.Order;
-
 import org.junit.Test;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
@@ -107,4 +106,4 @@ public class BindyPojoSimpleCsvMarshallTest extends AbstractJUnit4SpringContextT
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanUnmarshallTest.java
index de48209..f0798b5 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanUnmarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanUnmarshallTest.java
@@ -24,7 +24,6 @@ import org.apache.camel.ProducerTemplate;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.dataformat.bindy.model.simple.bool.BooleanExample;
-
 import org.junit.Test;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallPositionModifiedTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallPositionModifiedTest.java
index fca2d3d..7dbcaff 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallPositionModifiedTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallPositionModifiedTest.java
@@ -27,7 +27,6 @@ import java.util.Map;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.dataformat.bindy.CommonBindyTest;
 import org.apache.camel.dataformat.bindy.model.simple.oneclassdifferentposition.Order;
-
 import org.junit.Test;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTest.java
index 0f50bdc..777509f 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTest.java
@@ -31,7 +31,6 @@ import org.apache.camel.ProducerTemplate;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.dataformat.bindy.model.simple.oneclass.Order;
-
 import org.junit.Test;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvRemoveWhitespaceUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvRemoveWhitespaceUnmarshallTest.java
index deedf6b..7e03b84 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvRemoveWhitespaceUnmarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvRemoveWhitespaceUnmarshallTest.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.dataformat.bindy.csv;
 
-
 import java.util.List;
 
 import org.apache.camel.EndpointInject;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallBadIntegerTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallBadIntegerTest.java
index fa0b44e..77ee164 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallBadIntegerTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallBadIntegerTest.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.dataformat.bindy.csv;
 
-
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
 import org.apache.camel.Produce;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairFixTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairFixTest.java
index aeca416..7280245 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairFixTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairFixTest.java
@@ -34,7 +34,6 @@ import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
 
-
 @ContextConfiguration
 public class BindySimpleKeyValuePairFixTest extends AbstractJUnit4SpringContextTests {
     private static final String[] FIX_REQUESTS = new String[] {
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairWithoutSectionMarshallDslTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairWithoutSectionMarshallDslTest.java
index 609a5fc..f698696 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairWithoutSectionMarshallDslTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairWithoutSectionMarshallDslTest.java
@@ -29,7 +29,6 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.dataformat.bindy.kvp.BindyKeyValuePairDataFormat;
 import org.apache.camel.dataformat.bindy.model.fix.withoutsection.Order;
-
 import org.junit.Test;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/converter/BindyConverterTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/converter/BindyConverterTest.java
index 835e275..4c6c3f6 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/converter/BindyConverterTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/converter/BindyConverterTest.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.dataformat.bindy.fixed.converter;
 
-
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
 import org.apache.camel.Produce;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/dynamic/BindyFixedLengthDynamicFieldTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/dynamic/BindyFixedLengthDynamicFieldTest.java
index bdb3f96..61c29e1 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/dynamic/BindyFixedLengthDynamicFieldTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/dynamic/BindyFixedLengthDynamicFieldTest.java
@@ -32,7 +32,6 @@ import org.apache.camel.model.dataformat.BindyType;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
-
 /**
  * This test validates the marshalling / unmarshalling of a fixed-length data field for which the length of the
  * field is defined by the value of another field in the record.
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/implied/BindyImpliedTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/implied/BindyImpliedTest.java
index c1ec726..1663648 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/implied/BindyImpliedTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/implied/BindyImpliedTest.java
@@ -34,8 +34,6 @@ import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
 
-
-
 @ContextConfiguration
 public class BindyImpliedTest extends AbstractJUnit4SpringContextTests {
 
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/link/BindySimpleFixedLengthWithLinkTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/link/BindySimpleFixedLengthWithLinkTest.java
index 4cfa0b6..10350ea 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/link/BindySimpleFixedLengthWithLinkTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/link/BindySimpleFixedLengthWithLinkTest.java
@@ -178,4 +178,4 @@ public class BindySimpleFixedLengthWithLinkTest extends CamelTestSupport {
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallTest.java
index 8ae44c6..ac033a1 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallTest.java
@@ -34,7 +34,6 @@ import org.apache.camel.dataformat.bindy.annotation.DataField;
 import org.apache.camel.dataformat.bindy.annotation.FixedLengthRecord;
 import org.apache.camel.model.dataformat.BindyDataFormat;
 import org.apache.camel.model.dataformat.BindyType;
-
 import org.junit.Test;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/ordinal/BindySimpleFixedLengthOrdinalPosTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/ordinal/BindySimpleFixedLengthOrdinalPosTest.java
index 0c13370..6a68c22 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/ordinal/BindySimpleFixedLengthOrdinalPosTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/ordinal/BindySimpleFixedLengthOrdinalPosTest.java
@@ -32,7 +32,6 @@ import org.apache.camel.model.dataformat.BindyType;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
-
 /**
  * This test validates that fixed length records can be defined and processed using ordinal 'pos' values, and 
  * lengths declared for each field.  Strict position calculations in FixedLength records is not necessary.  The
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/skipfields/BindySimpleSkipFieldsTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/skipfields/BindySimpleSkipFieldsTest.java
index aefe609..aa6e562 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/skipfields/BindySimpleSkipFieldsTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/skipfields/BindySimpleSkipFieldsTest.java
@@ -29,7 +29,6 @@ import org.apache.camel.model.dataformat.BindyType;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
-
 /**
  * This test validates that bindy can skip values in the fixed-length record when absolute pos
  * values are provided
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/format/factories/BigDecimalFormatFactoryTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/format/factories/BigDecimalFormatFactoryTest.java
index 0e8f0da..230c46a 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/format/factories/BigDecimalFormatFactoryTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/format/factories/BigDecimalFormatFactoryTest.java
@@ -46,4 +46,4 @@ public class BigDecimalFormatFactoryTest {
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/format/factories/DefaultFactoryRegistryTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/format/factories/DefaultFactoryRegistryTest.java
index 89897da..53d0ada 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/format/factories/DefaultFactoryRegistryTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/format/factories/DefaultFactoryRegistryTest.java
@@ -33,4 +33,4 @@ public class DefaultFactoryRegistryTest {
         reg.unregister(StringFormatFactory.class);        
         reg.findForFormattingOptions(formattingOptions);
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/number/rounding/BindyBigDecimalRoundingUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/number/rounding/BindyBigDecimalRoundingUnmarshallTest.java
index 4af44a7..29736df 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/number/rounding/BindyBigDecimalRoundingUnmarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/number/rounding/BindyBigDecimalRoundingUnmarshallTest.java
@@ -31,7 +31,6 @@ import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Assert;
 import org.junit.Test;
 
-
 public class BindyBigDecimalRoundingUnmarshallTest extends CamelTestSupport {
 
     private static final String URI_MOCK_RESULT = "mock:result";
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelConsumerTemplateFactoryBean.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelConsumerTemplateFactoryBean.java
index 9ae0231..2f8948a 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelConsumerTemplateFactoryBean.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelConsumerTemplateFactoryBean.java
@@ -17,6 +17,7 @@
 package org.apache.camel.blueprint;
 
 import java.util.Set;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
@@ -61,4 +62,4 @@ public class CamelConsumerTemplateFactoryBean extends AbstractCamelConsumerTempl
         return null;
     }
 
-}
\ No newline at end of file
+}
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
index cc3092c..113721f 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
@@ -20,6 +20,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Properties;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelEndpointFactoryBean.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelEndpointFactoryBean.java
index 0c36e41..d9710bd 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelEndpointFactoryBean.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelEndpointFactoryBean.java
@@ -17,6 +17,7 @@
 package org.apache.camel.blueprint;
 
 import java.util.Set;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelErrorHandlerFactoryBean.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelErrorHandlerFactoryBean.java
index 3a9cd7a..fd6e7de 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelErrorHandlerFactoryBean.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelErrorHandlerFactoryBean.java
@@ -17,6 +17,7 @@
 package org.apache.camel.blueprint;
 
 import java.util.Set;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelFluentProducerTemplateFactoryBean.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelFluentProducerTemplateFactoryBean.java
index 1c8e681..74a6f9d 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelFluentProducerTemplateFactoryBean.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelFluentProducerTemplateFactoryBean.java
@@ -17,6 +17,7 @@
 package org.apache.camel.blueprint;
 
 import java.util.Set;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelProducerTemplateFactoryBean.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelProducerTemplateFactoryBean.java
index f568407..0e37fc9 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelProducerTemplateFactoryBean.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelProducerTemplateFactoryBean.java
@@ -17,6 +17,7 @@
 package org.apache.camel.blueprint;
 
 import java.util.Set;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelProxyFactoryBean.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelProxyFactoryBean.java
index 7d59e73..cd42c74d 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelProxyFactoryBean.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelProxyFactoryBean.java
@@ -17,6 +17,7 @@
 package org.apache.camel.blueprint;
 
 import java.util.Set;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelRedeliveryPolicyFactoryBean.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelRedeliveryPolicyFactoryBean.java
index b401067..39aa341 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelRedeliveryPolicyFactoryBean.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelRedeliveryPolicyFactoryBean.java
@@ -17,6 +17,7 @@
 package org.apache.camel.blueprint;
 
 import java.util.Set;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelRestContextFactoryBean.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelRestContextFactoryBean.java
index 31bdfeb..452e715 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelRestContextFactoryBean.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelRestContextFactoryBean.java
@@ -18,6 +18,7 @@ package org.apache.camel.blueprint;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelRouteContextFactoryBean.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelRouteContextFactoryBean.java
index 1803f89..673de7b 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelRouteContextFactoryBean.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelRouteContextFactoryBean.java
@@ -18,6 +18,7 @@ package org.apache.camel.blueprint;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelThreadPoolFactoryBean.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelThreadPoolFactoryBean.java
index defaf7b..f64efa2 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelThreadPoolFactoryBean.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelThreadPoolFactoryBean.java
@@ -17,6 +17,7 @@
 package org.apache.camel.blueprint;
 
 import java.util.Set;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
@@ -60,4 +61,4 @@ public class CamelThreadPoolFactoryBean extends AbstractCamelThreadPoolFactoryBe
         return null;
     }
 
-}
\ No newline at end of file
+}
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
index 38ed198..c2e7076 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
@@ -29,6 +29,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.Callable;
+
 import javax.xml.bind.Binder;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/util/blueprint/KeyManagersParametersFactoryBean.java b/components/camel-blueprint/src/main/java/org/apache/camel/util/blueprint/KeyManagersParametersFactoryBean.java
index 27e1468..5df575b 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/util/blueprint/KeyManagersParametersFactoryBean.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/util/blueprint/KeyManagersParametersFactoryBean.java
@@ -17,6 +17,7 @@
 package org.apache.camel.util.blueprint;
 
 import java.util.Set;
+
 import javax.xml.bind.annotation.XmlTransient;
 
 import org.apache.camel.CamelContext;
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/util/blueprint/KeyStoreParametersFactoryBean.java b/components/camel-blueprint/src/main/java/org/apache/camel/util/blueprint/KeyStoreParametersFactoryBean.java
index 355e234..41fb3db 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/util/blueprint/KeyStoreParametersFactoryBean.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/util/blueprint/KeyStoreParametersFactoryBean.java
@@ -17,6 +17,7 @@
 package org.apache.camel.util.blueprint;
 
 import java.util.Set;
+
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/util/blueprint/SSLContextClientParametersFactoryBean.java b/components/camel-blueprint/src/main/java/org/apache/camel/util/blueprint/SSLContextClientParametersFactoryBean.java
index bb13b95..2d1deb5 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/util/blueprint/SSLContextClientParametersFactoryBean.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/util/blueprint/SSLContextClientParametersFactoryBean.java
@@ -17,6 +17,7 @@
 package org.apache.camel.util.blueprint;
 
 import java.util.Set;
+
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/util/blueprint/SSLContextParametersFactoryBean.java b/components/camel-blueprint/src/main/java/org/apache/camel/util/blueprint/SSLContextParametersFactoryBean.java
index 5a8f53d..e02048b 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/util/blueprint/SSLContextParametersFactoryBean.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/util/blueprint/SSLContextParametersFactoryBean.java
@@ -17,6 +17,7 @@
 package org.apache.camel.util.blueprint;
 
 import java.util.Set;
+
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/util/blueprint/SSLContextServerParametersFactoryBean.java b/components/camel-blueprint/src/main/java/org/apache/camel/util/blueprint/SSLContextServerParametersFactoryBean.java
index d0681d6..e544af8 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/util/blueprint/SSLContextServerParametersFactoryBean.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/util/blueprint/SSLContextServerParametersFactoryBean.java
@@ -17,6 +17,7 @@
 package org.apache.camel.util.blueprint;
 
 import java.util.Set;
+
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/util/blueprint/SecureRandomParametersFactoryBean.java b/components/camel-blueprint/src/main/java/org/apache/camel/util/blueprint/SecureRandomParametersFactoryBean.java
index b4d4f28..a43515c 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/util/blueprint/SecureRandomParametersFactoryBean.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/util/blueprint/SecureRandomParametersFactoryBean.java
@@ -17,6 +17,7 @@
 package org.apache.camel.util.blueprint;
 
 import java.util.Set;
+
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/util/blueprint/TrustManagersParametersFactoryBean.java b/components/camel-blueprint/src/main/java/org/apache/camel/util/blueprint/TrustManagersParametersFactoryBean.java
index 3936d4e..f463988 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/util/blueprint/TrustManagersParametersFactoryBean.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/util/blueprint/TrustManagersParametersFactoryBean.java
@@ -17,6 +17,7 @@
 package org.apache.camel.util.blueprint;
 
 import java.util.Set;
+
 import javax.xml.bind.annotation.XmlTransient;
 
 import org.apache.camel.CamelContext;
diff --git a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/BonitaAPI.java b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/BonitaAPI.java
index 34983b0..2003a10 100644
--- a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/BonitaAPI.java
+++ b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/BonitaAPI.java
@@ -24,15 +24,13 @@ import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.MediaType;
 
-import static javax.ws.rs.client.Entity.entity;
-
 import org.apache.camel.component.bonita.api.model.CaseCreationResponse;
 import org.apache.camel.component.bonita.api.model.ProcessDefinitionResponse;
 import org.apache.camel.component.bonita.api.util.BonitaAPIConfig;
 import org.apache.camel.component.bonita.api.util.BonitaAPIUtil;
 import org.apache.camel.util.ObjectHelper;
 
-
+import static javax.ws.rs.client.Entity.entity;
 
 public class BonitaAPI {
 
diff --git a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/BonitaAPIBuilder.java b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/BonitaAPIBuilder.java
index 462d091..311d77c 100644
--- a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/BonitaAPIBuilder.java
+++ b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/BonitaAPIBuilder.java
@@ -21,7 +21,6 @@ import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.WebTarget;
 
 import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
-
 import org.apache.camel.component.bonita.api.filter.BonitaAuthFilter;
 import org.apache.camel.component.bonita.api.util.BonitaAPIConfig;
 
diff --git a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/util/BonitaAPIUtil.java b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/util/BonitaAPIUtil.java
index af8ab3b..db901d5 100644
--- a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/util/BonitaAPIUtil.java
+++ b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/util/BonitaAPIUtil.java
@@ -30,10 +30,7 @@ import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 
-import static javax.ws.rs.client.Entity.entity;
-
 import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
-
 import org.apache.camel.component.bonita.api.filter.BonitaAuthFilter;
 import org.apache.camel.component.bonita.api.filter.JsonClientFilter;
 import org.apache.camel.component.bonita.api.model.FileInput;
@@ -43,6 +40,8 @@ import org.apache.cxf.jaxrs.ext.multipart.Attachment;
 import org.apache.cxf.jaxrs.ext.multipart.AttachmentBuilder;
 import org.apache.cxf.jaxrs.ext.multipart.ContentDisposition;
 
+import static javax.ws.rs.client.Entity.entity;
+
 public class BonitaAPIUtil {
 
     private static BonitaAPIUtil instance;
diff --git a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterConnectionTest.java b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterConnectionTest.java
index c9b4e5a..dc26992 100644
--- a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterConnectionTest.java
+++ b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterConnectionTest.java
@@ -23,7 +23,6 @@ import javax.ws.rs.core.Cookie;
 import javax.ws.rs.core.MultivaluedHashMap;
 
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
-
 import org.apache.camel.component.bonita.api.filter.BonitaAuthFilter;
 import org.apache.camel.component.bonita.api.util.BonitaAPIConfig;
 import org.junit.Before;
@@ -37,7 +36,6 @@ import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.post;
 import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
-
 import static org.junit.Assert.assertEquals;
 
 public class BonitaAuthFilterConnectionTest {
diff --git a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/util/BonitaAPIConfigTest.java b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/util/BonitaAPIConfigTest.java
index a557f75..6e82926 100644
--- a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/util/BonitaAPIConfigTest.java
+++ b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/util/BonitaAPIConfigTest.java
@@ -16,12 +16,10 @@
  */
 package org.apache.camel.component.bonita.api.util;
 
-
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-
 public class BonitaAPIConfigTest {
 
     @Test
diff --git a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxCollaborationsManager.java b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxCollaborationsManager.java
index e07460b..d076831 100644
--- a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxCollaborationsManager.java
+++ b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxCollaborationsManager.java
@@ -23,7 +23,6 @@ import com.box.sdk.BoxAPIException;
 import com.box.sdk.BoxCollaboration;
 import com.box.sdk.BoxCollaborator;
 import com.box.sdk.BoxFolder;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxCommentsManager.java b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxCommentsManager.java
index 553b985..a684508 100644
--- a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxCommentsManager.java
+++ b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxCommentsManager.java
@@ -22,7 +22,6 @@ import com.box.sdk.BoxAPIConnection;
 import com.box.sdk.BoxAPIException;
 import com.box.sdk.BoxComment;
 import com.box.sdk.BoxFile;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxEventLogsManager.java b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxEventLogsManager.java
index 236aded..9aa4025 100644
--- a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxEventLogsManager.java
+++ b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxEventLogsManager.java
@@ -25,7 +25,6 @@ import com.box.sdk.BoxAPIConnection;
 import com.box.sdk.BoxAPIException;
 import com.box.sdk.BoxEvent;
 import com.box.sdk.EventLog;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxEventsManager.java b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxEventsManager.java
index 84f19f6..b3ff85d 100644
--- a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxEventsManager.java
+++ b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxEventsManager.java
@@ -20,7 +20,6 @@ import com.box.sdk.BoxAPIConnection;
 import com.box.sdk.BoxAPIException;
 import com.box.sdk.EventListener;
 import com.box.sdk.EventStream;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxFoldersManager.java b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxFoldersManager.java
index cf99f8b..e916cfa 100644
--- a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxFoldersManager.java
+++ b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxFoldersManager.java
@@ -27,7 +27,6 @@ import com.box.sdk.BoxAPIException;
 import com.box.sdk.BoxFolder;
 import com.box.sdk.BoxItem;
 import com.box.sdk.BoxSharedLink;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxGroupsManager.java b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxGroupsManager.java
index dd983d9..c8d3b70 100644
--- a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxGroupsManager.java
+++ b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxGroupsManager.java
@@ -24,7 +24,6 @@ import com.box.sdk.BoxAPIException;
 import com.box.sdk.BoxGroup;
 import com.box.sdk.BoxGroupMembership;
 import com.box.sdk.BoxUser;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxSearchManager.java b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxSearchManager.java
index 944f2e3..4830f0b 100644
--- a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxSearchManager.java
+++ b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxSearchManager.java
@@ -23,7 +23,6 @@ import java.util.LinkedList;
 import com.box.sdk.BoxAPIConnection;
 import com.box.sdk.BoxAPIException;
 import com.box.sdk.BoxItem;
-
 import com.box.sdk.BoxSearch;
 import com.box.sdk.BoxSearchParameters;
 import com.box.sdk.PartialCollection;
diff --git a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxTasksManager.java b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxTasksManager.java
index aa405fa..0d86e34 100644
--- a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxTasksManager.java
+++ b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxTasksManager.java
@@ -25,7 +25,6 @@ import com.box.sdk.BoxFile;
 import com.box.sdk.BoxTask;
 import com.box.sdk.BoxTaskAssignment;
 import com.box.sdk.BoxUser;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxUsersManager.java b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxUsersManager.java
index 0125822..6c3ff00 100644
--- a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxUsersManager.java
+++ b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxUsersManager.java
@@ -26,7 +26,6 @@ import com.box.sdk.BoxFolder;
 import com.box.sdk.BoxUser;
 import com.box.sdk.CreateUserParams;
 import com.box.sdk.EmailAlias;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxConfiguration.java b/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxConfiguration.java
index 4347cff..2bf73a5 100644
--- a/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxConfiguration.java
+++ b/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxConfiguration.java
@@ -20,7 +20,6 @@ import java.util.Map;
 
 import com.box.sdk.EncryptionAlgorithm;
 import com.box.sdk.IAccessTokenCache;
-
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.component.box.internal.BoxApiName;
 import org.apache.camel.spi.Metadata;
diff --git a/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxConsumer.java b/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxConsumer.java
index 1fee59e..2732e27 100644
--- a/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxConsumer.java
+++ b/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxConsumer.java
@@ -23,7 +23,6 @@ import java.util.Set;
 import com.box.sdk.BoxAPIConnection;
 import com.box.sdk.BoxEvent;
 import com.box.sdk.EventListener;
-
 import org.apache.camel.Processor;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.component.box.api.BoxEventsManager;
diff --git a/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxProducer.java b/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxProducer.java
index 9402819..a6b56c9 100644
--- a/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxProducer.java
+++ b/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxProducer.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.box;
 
 import org.apache.camel.component.box.internal.BoxApiName;
 import org.apache.camel.component.box.internal.BoxPropertiesHelper;
-
 import org.apache.camel.support.component.AbstractApiProducer;
 
 /**
diff --git a/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/internal/BoxConnectionHelper.java b/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/internal/BoxConnectionHelper.java
index 52c477e..f95813a 100644
--- a/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/internal/BoxConnectionHelper.java
+++ b/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/internal/BoxConnectionHelper.java
@@ -34,7 +34,6 @@ import com.box.sdk.BoxDeveloperEditionAPIConnection;
 import com.box.sdk.IAccessTokenCache;
 import com.box.sdk.InMemoryLRUAccessTokenCache;
 import com.box.sdk.JWTEncryptionPreferences;
-
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.component.box.BoxConfiguration;
 import org.apache.http.HttpHost;
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxCollaborationsManagerIntegrationTest.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxCollaborationsManagerIntegrationTest.java
index eb21b72..bdce999 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxCollaborationsManagerIntegrationTest.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxCollaborationsManagerIntegrationTest.java
@@ -26,7 +26,6 @@ import com.box.sdk.BoxCollaboration;
 import com.box.sdk.BoxFolder;
 import com.box.sdk.BoxUser;
 import com.box.sdk.CreateUserParams;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.box.api.BoxCollaborationsManager;
 import org.apache.camel.component.box.internal.BoxApiCollection;
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxCommentsManagerIntegrationTest.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxCommentsManagerIntegrationTest.java
index 7998480..67e8942 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxCommentsManagerIntegrationTest.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxCommentsManagerIntegrationTest.java
@@ -25,7 +25,6 @@ import java.util.Map;
 import com.box.sdk.BoxAPIConnection;
 import com.box.sdk.BoxComment;
 import com.box.sdk.BoxFolder;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.box.api.BoxCommentsManager;
 import org.apache.camel.component.box.internal.BoxApiCollection;
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxEventsManagerIntegrationTest.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxEventsManagerIntegrationTest.java
index ca88aef..cd05555 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxEventsManagerIntegrationTest.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxEventsManagerIntegrationTest.java
@@ -23,7 +23,6 @@ import java.util.concurrent.TimeUnit;
 
 import com.box.sdk.BoxAPIConnection;
 import com.box.sdk.BoxFolder;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.box.api.BoxEventsManager;
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFilesManagerIntegrationTest.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFilesManagerIntegrationTest.java
index f371fb0..5293a10 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFilesManagerIntegrationTest.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFilesManagerIntegrationTest.java
@@ -31,7 +31,6 @@ import com.box.sdk.BoxFolder;
 import com.box.sdk.BoxItem;
 import com.box.sdk.BoxSharedLink;
 import com.box.sdk.Metadata;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.box.api.BoxFilesManager;
 import org.apache.camel.component.box.internal.BoxApiCollection;
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFoldersManagerIntegrationTest.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFoldersManagerIntegrationTest.java
index c5f0383..2cb03bc 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFoldersManagerIntegrationTest.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxFoldersManagerIntegrationTest.java
@@ -24,7 +24,6 @@ import com.box.sdk.BoxAPIConnection;
 import com.box.sdk.BoxFolder;
 import com.box.sdk.BoxItem;
 import com.box.sdk.BoxSharedLink;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.box.api.BoxFoldersManager;
 import org.apache.camel.component.box.internal.BoxApiCollection;
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxTasksManagerIntegrationTest.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxTasksManagerIntegrationTest.java
index 61026ac..64b5bdb 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxTasksManagerIntegrationTest.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxTasksManagerIntegrationTest.java
@@ -29,7 +29,6 @@ import com.box.sdk.BoxTask;
 import com.box.sdk.BoxTask.Action;
 import com.box.sdk.BoxTaskAssignment;
 import com.box.sdk.BoxUser;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.box.api.BoxTasksManager;
 import org.apache.camel.component.box.internal.BoxApiCollection;
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxUsersManagerIntegrationTest.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxUsersManagerIntegrationTest.java
index 157b702..82727f4 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxUsersManagerIntegrationTest.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxUsersManagerIntegrationTest.java
@@ -25,7 +25,6 @@ import com.box.sdk.BoxAPIException;
 import com.box.sdk.BoxUser;
 import com.box.sdk.CreateUserParams;
 import com.box.sdk.EmailAlias;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.box.api.BoxUsersManager;
 import org.apache.camel.component.box.internal.BoxApiCollection;
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/AddressGatewayIntegrationTest.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/AddressGatewayIntegrationTest.java
index 9eb6600..2d54a86 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/AddressGatewayIntegrationTest.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/AddressGatewayIntegrationTest.java
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 package org.apache.camel.component.braintree;
+
 import java.util.LinkedList;
 import java.util.List;
 import java.util.UUID;
@@ -33,7 +34,6 @@ import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 public class AddressGatewayIntegrationTest extends AbstractBraintreeTestSupport {
     private static final Logger LOG = LoggerFactory.getLogger(AddressGatewayIntegrationTest.class);
     private static final String PATH_PREFIX = BraintreeApiCollection.getCollection().getApiName(AddressGatewayApiMethod.class).getName();
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/ClientTokenGatewayIntegrationTest.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/ClientTokenGatewayIntegrationTest.java
index a9f8fbb..3526252 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/ClientTokenGatewayIntegrationTest.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/ClientTokenGatewayIntegrationTest.java
@@ -21,7 +21,6 @@ import org.apache.camel.component.braintree.internal.ClientTokenGatewayApiMethod
 import org.apache.camel.util.ObjectHelper;
 import org.junit.Test;
 
-
 public class ClientTokenGatewayIntegrationTest extends AbstractBraintreeTestSupport {
     private static final String PATH_PREFIX = getApiNameAsString(ClientTokenGatewayApiMethod.class);
 
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/CustomerGatewayIntegrationTest.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/CustomerGatewayIntegrationTest.java
index c7af158..9e81c1b 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/CustomerGatewayIntegrationTest.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/CustomerGatewayIntegrationTest.java
@@ -35,7 +35,6 @@ import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 public class CustomerGatewayIntegrationTest extends AbstractBraintreeTestSupport {
 
     private static final String PATH_PREFIX = getApiNameAsString(CustomerGatewayApiMethod.class);
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/PaymentMethodGatewayIntegrationTest.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/PaymentMethodGatewayIntegrationTest.java
index 2ec8ca0..ee8012b 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/PaymentMethodGatewayIntegrationTest.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/PaymentMethodGatewayIntegrationTest.java
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 package org.apache.camel.component.braintree;
+
 import java.util.LinkedList;
 import java.util.List;
 import java.util.UUID;
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/TransactionGatewayIntegrationTest.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/TransactionGatewayIntegrationTest.java
index 7f96114..1b8aed5 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/TransactionGatewayIntegrationTest.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/TransactionGatewayIntegrationTest.java
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 package org.apache.camel.component.braintree;
+
 import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.LinkedList;
diff --git a/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/processor/idempotent/CaffeineIdempotentRepository.java b/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/processor/idempotent/CaffeineIdempotentRepository.java
index 736ce05..77adb4c 100644
--- a/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/processor/idempotent/CaffeineIdempotentRepository.java
+++ b/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/processor/idempotent/CaffeineIdempotentRepository.java
@@ -93,4 +93,4 @@ public class CaffeineIdempotentRepository extends ServiceSupport implements Idem
     @Override
     protected void doStop() throws Exception {
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheFromScratchStatsCounterTest.java b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheFromScratchStatsCounterTest.java
index 3133322..2eb7d2a 100644
--- a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheFromScratchStatsCounterTest.java
+++ b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheFromScratchStatsCounterTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.caffeine.cache;
 
 import com.codahale.metrics.MetricRegistry;
-
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.caffeine.CaffeineConstants;
diff --git a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheTestSupport.java b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheTestSupport.java
index e2c2aa4..e0559aa 100644
--- a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheTestSupport.java
+++ b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheTestSupport.java
@@ -29,7 +29,6 @@ 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.apache.camel.BindToRegistry;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.slf4j.Logger;
diff --git a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/loadcache/CaffeineLoadCacheTestSupport.java b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/loadcache/CaffeineLoadCacheTestSupport.java
index 58a783b..aab2a45 100644
--- a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/loadcache/CaffeineLoadCacheTestSupport.java
+++ b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/loadcache/CaffeineLoadCacheTestSupport.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.caffeine.loadcache;
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.CacheLoader;
 import com.github.benmanes.caffeine.cache.Caffeine;
-
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.test.junit4.CamelTestSupport;
 
diff --git a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/processor/aggregate/CaffeineAggregationRepositoryOperationTest.java b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/processor/aggregate/CaffeineAggregationRepositoryOperationTest.java
index dde603f..debea95 100644
--- a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/processor/aggregate/CaffeineAggregationRepositoryOperationTest.java
+++ b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/processor/aggregate/CaffeineAggregationRepositoryOperationTest.java
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 package org.apache.camel.component.caffeine.processor.aggregate;
+
 import java.util.Set;
 
 import org.apache.camel.Exchange;
diff --git a/components/camel-cassandraql/src/main/java/org/apache/camel/processor/aggregate/cassandra/NamedCassandraAggregationRepository.java b/components/camel-cassandraql/src/main/java/org/apache/camel/processor/aggregate/cassandra/NamedCassandraAggregationRepository.java
index 3d2a84e..3cdcc6a 100644
--- a/components/camel-cassandraql/src/main/java/org/apache/camel/processor/aggregate/cassandra/NamedCassandraAggregationRepository.java
+++ b/components/camel-cassandraql/src/main/java/org/apache/camel/processor/aggregate/cassandra/NamedCassandraAggregationRepository.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.processor.aggregate.cassandra;
 
-
 import com.datastax.driver.core.Cluster;
 import com.datastax.driver.core.Session;
 
diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/BaseCassandraTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/BaseCassandraTest.java
index bb5867f..5ddd074 100644
--- a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/BaseCassandraTest.java
+++ b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/BaseCassandraTest.java
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 package org.apache.camel.component.cassandra;
+
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationSerializedHeadersTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationSerializedHeadersTest.java
index e20d7a6..73a7e8f 100644
--- a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationSerializedHeadersTest.java
+++ b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationSerializedHeadersTest.java
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 package org.apache.camel.processor.aggregate.cassandra;
+
 import com.datastax.driver.core.Cluster;
 import com.datastax.driver.core.Session;
 import org.apache.camel.AggregationStrategy;
diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationTest.java
index 425755c..e4120fb 100644
--- a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationTest.java
+++ b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationTest.java
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 package org.apache.camel.processor.aggregate.cassandra;
+
 import com.datastax.driver.core.Cluster;
 import com.datastax.driver.core.Session;
 import org.apache.camel.AggregationStrategy;
diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentTest.java
index bb6a068..1ee69f6 100644
--- a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentTest.java
+++ b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentTest.java
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 package org.apache.camel.processor.idempotent.cassandra;
+
 import com.datastax.driver.core.Cluster;
 import com.datastax.driver.core.Session;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-cbor/src/main/java/org/apache/camel/component/cbor/CBORDataFormat.java b/components/camel-cbor/src/main/java/org/apache/camel/component/cbor/CBORDataFormat.java
index 27ec345..7b257ed 100644
--- a/components/camel-cbor/src/main/java/org/apache/camel/component/cbor/CBORDataFormat.java
+++ b/components/camel-cbor/src/main/java/org/apache/camel/component/cbor/CBORDataFormat.java
@@ -32,7 +32,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.type.CollectionType;
 import com.fasterxml.jackson.dataformat.cbor.CBORFactory;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
 import org.apache.camel.spi.DataFormat;
diff --git a/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORMarshalAllowJMSTypeTest.java b/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORMarshalAllowJMSTypeTest.java
index 02a3b10..ca701b0 100644
--- a/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORMarshalAllowJMSTypeTest.java
+++ b/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORMarshalAllowJMSTypeTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.cbor;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.cbor.CBORFactory;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.junit4.CamelTestSupport;
diff --git a/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORObjectListSplitTest.java b/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORObjectListSplitTest.java
index 8bf7e30..122b2ce 100644
--- a/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORObjectListSplitTest.java
+++ b/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORObjectListSplitTest.java
@@ -22,7 +22,6 @@ import java.util.List;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.cbor.CBORFactory;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedDelegate.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedDelegate.java
index 7be5cbe..52425a5 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedDelegate.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedDelegate.java
@@ -20,10 +20,10 @@ import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 import java.util.HashSet;
 import java.util.Set;
-import static java.util.stream.Collectors.toSet;
 
 import javax.enterprise.inject.spi.Annotated;
 
+import static java.util.stream.Collectors.toSet;
 import static org.apache.camel.cdi.CdiSpiHelper.isAnnotationType;
 
 class AnnotatedDelegate implements Annotated {
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedMemberDelegate.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedMemberDelegate.java
index 6e63c50..cd85e6e 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedMemberDelegate.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedMemberDelegate.java
@@ -19,6 +19,7 @@ package org.apache.camel.cdi;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Member;
 import java.util.Set;
+
 import javax.enterprise.inject.spi.AnnotatedMember;
 import javax.enterprise.inject.spi.AnnotatedType;
 
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedMethodDelegate.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedMethodDelegate.java
index eef33d2..96ef4f4 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedMethodDelegate.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedMethodDelegate.java
@@ -20,6 +20,7 @@ import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.util.List;
 import java.util.Set;
+
 import javax.enterprise.inject.spi.AnnotatedMethod;
 import javax.enterprise.inject.spi.AnnotatedParameter;
 
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedTypeDelegate.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedTypeDelegate.java
index 0a9aa50..e3adc00 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedTypeDelegate.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedTypeDelegate.java
@@ -18,6 +18,7 @@ package org.apache.camel.cdi;
 
 import java.util.HashSet;
 import java.util.Set;
+
 import javax.enterprise.inject.spi.AnnotatedConstructor;
 import javax.enterprise.inject.spi.AnnotatedField;
 import javax.enterprise.inject.spi.AnnotatedMethod;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanDelegate.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanDelegate.java
index e808ada..0b2a6ae 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanDelegate.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanDelegate.java
@@ -21,6 +21,7 @@ import java.lang.reflect.Type;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
+
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.InjectionPoint;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanManagerHelper.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanManagerHelper.java
index af000e5..8342401 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanManagerHelper.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanManagerHelper.java
@@ -20,11 +20,11 @@ import java.lang.annotation.Annotation;
 import java.util.Optional;
 import java.util.Set;
 
-import static java.util.stream.Collectors.toSet;
-
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.BeanManager;
 
+import static java.util.stream.Collectors.toSet;
+
 @Vetoed
 final class BeanManagerHelper {
 
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelContextProducer.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelContextProducer.java
index fa4ff51..be2a56a 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelContextProducer.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelContextProducer.java
@@ -19,9 +19,6 @@ package org.apache.camel.cdi;
 import java.lang.annotation.Annotation;
 import java.util.Set;
 
-import static java.beans.Introspector.decapitalize;
-import static java.util.stream.Collectors.toSet;
-
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.InjectionException;
 import javax.enterprise.inject.spi.Annotated;
@@ -40,6 +37,8 @@ import org.apache.camel.support.DefaultRegistry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static java.beans.Introspector.decapitalize;
+import static java.util.stream.Collectors.toSet;
 import static org.apache.camel.RuntimeCamelException.wrapRuntimeCamelException;
 import static org.apache.camel.cdi.AnyLiteral.ANY;
 import static org.apache.camel.cdi.CdiSpiHelper.createCamelContextWithTCCL;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanPostProcessor.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanPostProcessor.java
index 3e45bdf..2d5839a 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanPostProcessor.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanPostProcessor.java
@@ -1,39 +1,39 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.cdi;
-
-import javax.enterprise.inject.spi.BeanManager;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.impl.engine.DefaultCamelBeanPostProcessor;
-
-import static org.apache.camel.cdi.BeanManagerHelper.getReferenceByType;
-
-@Vetoed
-final class CdiCamelBeanPostProcessor extends DefaultCamelBeanPostProcessor {
-
-    private final BeanManager manager;
-
-    CdiCamelBeanPostProcessor(BeanManager manager) {
-        this.manager = manager;
-    }
-
-    @Override
-    public CamelContext getOrLookupCamelContext() {
-        return getReferenceByType(manager, CamelContext.class).orElse(null);
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.cdi;
+
+import javax.enterprise.inject.spi.BeanManager;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.impl.engine.DefaultCamelBeanPostProcessor;
+
+import static org.apache.camel.cdi.BeanManagerHelper.getReferenceByType;
+
+@Vetoed
+final class CdiCamelBeanPostProcessor extends DefaultCamelBeanPostProcessor {
+
+    private final BeanManager manager;
+
+    CdiCamelBeanPostProcessor(BeanManager manager) {
+        this.manager = manager;
+    }
+
+    @Override
+    public CamelContext getOrLookupCamelContext() {
+        return getReferenceByType(manager, CamelContext.class).orElse(null);
+    }
+}
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanRepository.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanRepository.java
index fd74333..8fcddf7 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanRepository.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanRepository.java
@@ -19,8 +19,6 @@ package org.apache.camel.cdi;
 import java.util.Map;
 import java.util.Set;
 
-import static java.util.stream.Collectors.toMap;
-
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.BeanManager;
 
@@ -29,6 +27,7 @@ import org.apache.camel.spi.BeanRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static java.util.stream.Collectors.toMap;
 import static org.apache.camel.cdi.AnyLiteral.ANY;
 import static org.apache.camel.cdi.BeanManagerHelper.getReference;
 import static org.apache.camel.cdi.BeanManagerHelper.getReferenceByName;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
index d18ef64..4b4d7b2 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
@@ -23,21 +23,11 @@ import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static java.util.Collections.newSetFromMap;
-import static java.util.function.Predicate.isEqual;
-import static java.util.stream.Collectors.collectingAndThen;
-
-import static java.util.stream.Collectors.toSet;
-import static java.util.stream.Stream.concat;
-
 import javax.enterprise.event.Observes;
 import javax.enterprise.inject.Default;
 import javax.enterprise.inject.InjectionException;
@@ -82,6 +72,11 @@ import org.apache.camel.spi.CamelEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static java.util.Collections.newSetFromMap;
+import static java.util.function.Predicate.isEqual;
+import static java.util.stream.Collectors.collectingAndThen;
+import static java.util.stream.Collectors.toSet;
+import static java.util.stream.Stream.concat;
 import static org.apache.camel.cdi.AnyLiteral.ANY;
 import static org.apache.camel.cdi.ApplicationScopedLiteral.APPLICATION_SCOPED;
 import static org.apache.camel.cdi.BeanManagerHelper.getReference;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelInjector.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelInjector.java
index 3372793..d35d836 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelInjector.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelInjector.java
@@ -18,6 +18,7 @@ package org.apache.camel.cdi;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+
 import javax.enterprise.inject.spi.BeanManager;
 
 import org.apache.camel.RuntimeCamelException;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventComponent.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventComponent.java
index fdb1312..97e7a2a 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventComponent.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventComponent.java
@@ -17,6 +17,7 @@
 package org.apache.camel.cdi;
 
 import java.util.Map;
+
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Named;
 
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventConsumer.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventConsumer.java
index f33e6d8..fca2d6e 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventConsumer.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventConsumer.java
@@ -1,71 +1,71 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.cdi;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.RuntimeExchangeException;
-import org.apache.camel.spi.CamelEvent.ExchangeEvent;
-import org.apache.camel.support.DefaultConsumer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-final class CdiEventConsumer<T> extends DefaultConsumer {
-
-    private final Logger logger = LoggerFactory.getLogger(CdiEventConsumer.class);
-
-    private final CdiEventEndpoint<T> endpoint;
-
-    CdiEventConsumer(CdiEventEndpoint<T> endpoint, Processor processor) {
-        super(endpoint, processor);
-        this.endpoint = endpoint;
-    }
-
-    @Override
-    protected void doStart() throws Exception {
-        super.doStart();
-        endpoint.addConsumer(this);
-    }
-
-    @Override
-    protected void doStop() throws Exception {
-        endpoint.removeConsumer(this);
-        super.doStop();
-    }
-
-    void notify(T event) {
-        logger.debug("Consuming CDI event [{}] with {}", event, this);
-
-        Exchange exchange = getEndpoint().createExchange();
-        // TODO: would that be possible to propagate the event metadata?
-        exchange.getIn().setBody(event);
-
-        // Avoid infinite loop of exchange events
-        if (event instanceof ExchangeEvent) {
-            exchange.setProperty(Exchange.NOTIFY_EVENT, Boolean.TRUE);
-        }
-        try {
-            getProcessor().process(exchange);
-        } catch (Exception cause) {
-            throw new RuntimeExchangeException("Error while processing CDI event", exchange, cause);
-        } finally {
-            if (event instanceof ExchangeEvent) {
-                exchange.setProperty(Exchange.NOTIFY_EVENT, Boolean.FALSE);
-            }
-        }
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.cdi;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.RuntimeExchangeException;
+import org.apache.camel.spi.CamelEvent.ExchangeEvent;
+import org.apache.camel.support.DefaultConsumer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+final class CdiEventConsumer<T> extends DefaultConsumer {
+
+    private final Logger logger = LoggerFactory.getLogger(CdiEventConsumer.class);
+
+    private final CdiEventEndpoint<T> endpoint;
+
+    CdiEventConsumer(CdiEventEndpoint<T> endpoint, Processor processor) {
+        super(endpoint, processor);
+        this.endpoint = endpoint;
+    }
+
+    @Override
+    protected void doStart() throws Exception {
+        super.doStart();
+        endpoint.addConsumer(this);
+    }
+
+    @Override
+    protected void doStop() throws Exception {
+        endpoint.removeConsumer(this);
+        super.doStop();
+    }
+
+    void notify(T event) {
+        logger.debug("Consuming CDI event [{}] with {}", event, this);
+
+        Exchange exchange = getEndpoint().createExchange();
+        // TODO: would that be possible to propagate the event metadata?
+        exchange.getIn().setBody(event);
+
+        // Avoid infinite loop of exchange events
+        if (event instanceof ExchangeEvent) {
+            exchange.setProperty(Exchange.NOTIFY_EVENT, Boolean.TRUE);
+        }
+        try {
+            getProcessor().process(exchange);
+        } catch (Exception cause) {
+            throw new RuntimeExchangeException("Error while processing CDI event", exchange, cause);
+        } finally {
+            if (event instanceof ExchangeEvent) {
+                exchange.setProperty(Exchange.NOTIFY_EVENT, Boolean.FALSE);
+            }
+        }
+    }
+}
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventEndpoint.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventEndpoint.java
index ab9ad79..f5dc485 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventEndpoint.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventEndpoint.java
@@ -26,8 +26,6 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Stream;
 
-import static java.util.stream.Collectors.joining;
-
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.event.Event;
 import javax.enterprise.inject.Any;
@@ -42,6 +40,8 @@ import org.apache.camel.Processor;
 import org.apache.camel.Producer;
 import org.apache.camel.support.DefaultEndpoint;
 
+import static java.util.stream.Collectors.joining;
+
 /**
  * A Camel {@link Endpoint} that bridges the CDI events facility with Camel routes so that CDI events
  * can be seamlessly observed / consumed (respectively produced / fired) from Camel consumers (respectively by Camel producers).<p>
@@ -175,4 +175,4 @@ public final class CdiEventEndpoint<T> extends DefaultEndpoint {
             consumers.forEach(consumer -> consumer.notify(t));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventNotifier.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventNotifier.java
index f874ed0..4d42fab 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventNotifier.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventNotifier.java
@@ -1,67 +1,67 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.cdi;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import javax.enterprise.inject.spi.BeanManager;
-
-import org.apache.camel.spi.CamelEvent;
-import org.apache.camel.spi.CamelEvent.RouteEvent;
-import org.apache.camel.support.EventNotifierSupport;
-
-import static org.apache.camel.util.ObjectHelper.isNotEmpty;
-
-final class CdiEventNotifier extends EventNotifierSupport {
-
-    private final BeanManager manager;
-
-    private final Annotation[] qualifiers;
-
-    CdiEventNotifier(BeanManager manager, Collection<Annotation> qualifiers) {
-        this.manager = manager;
-        this.qualifiers = qualifiers.toArray(new Annotation[qualifiers.size()]);
-        // TODO: be more fine grained for the kind of events that are emitted depending on the observed event types
-    }
-
-    @Override
-    public void notify(CamelEvent event) {
-        String id = null;
-
-        if (event instanceof RouteEvent) {
-            id = ((RouteEvent) event).getRoute().getId();
-        }
-
-        if (isNotEmpty(id)) {
-            List<Annotation> annotations = new ArrayList<>();
-            Collections.addAll(annotations, qualifiers);
-            annotations.add(NamedLiteral.of(id));
-            manager.fireEvent(event, annotations.toArray(new Annotation[0]));
-        } else {
-            manager.fireEvent(event, qualifiers);
-        }
-    }
-
-    @Override
-    public boolean isEnabled(CamelEvent event) {
-        return true;
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.cdi;
+
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import javax.enterprise.inject.spi.BeanManager;
+
+import org.apache.camel.spi.CamelEvent;
+import org.apache.camel.spi.CamelEvent.RouteEvent;
+import org.apache.camel.support.EventNotifierSupport;
+
+import static org.apache.camel.util.ObjectHelper.isNotEmpty;
+
+final class CdiEventNotifier extends EventNotifierSupport {
+
+    private final BeanManager manager;
+
+    private final Annotation[] qualifiers;
+
+    CdiEventNotifier(BeanManager manager, Collection<Annotation> qualifiers) {
+        this.manager = manager;
+        this.qualifiers = qualifiers.toArray(new Annotation[qualifiers.size()]);
+        // TODO: be more fine grained for the kind of events that are emitted depending on the observed event types
+    }
+
+    @Override
+    public void notify(CamelEvent event) {
+        String id = null;
+
+        if (event instanceof RouteEvent) {
+            id = ((RouteEvent) event).getRoute().getId();
+        }
+
+        if (isNotEmpty(id)) {
+            List<Annotation> annotations = new ArrayList<>();
+            Collections.addAll(annotations, qualifiers);
+            annotations.add(NamedLiteral.of(id));
+            manager.fireEvent(event, annotations.toArray(new Annotation[0]));
+        } else {
+            manager.fireEvent(event, qualifiers);
+        }
+    }
+
+    @Override
+    public boolean isEnabled(CamelEvent event) {
+        return true;
+    }
+}
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventProducer.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventProducer.java
index 91d4540..19e17d1 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventProducer.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventProducer.java
@@ -1,47 +1,47 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.cdi;
-
-import javax.enterprise.event.Event;
-import org.apache.camel.Exchange;
-
-import org.apache.camel.support.DefaultProducer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-final class CdiEventProducer<T> extends DefaultProducer {
-
-    private final Logger logger = LoggerFactory.getLogger(CdiEventProducer.class);
-
-    private final Event<T> event;
-
-    CdiEventProducer(CdiEventEndpoint<T> endpoint, Event<T> event) {
-        super(endpoint);
-        this.event = event;
-    }
-
-    @Override
-    public void process(Exchange exchange) {
-        logger.debug("Firing CDI event [{}] with {}", event, this);
-        // TODO: leverage Camel type converter mechanism based on the endpoint type
-        // The EventMetadata injection point will be that of the event which is not very useful
-        // for the end user. Using BeanManager.fire would be a way to hide that internal though
-        // it will be necessary to check whether the exchange event type is assignable to the
-        // endpoint event type.
-        event.fire((T) exchange.getIn().getBody());
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.cdi;
+
+import javax.enterprise.event.Event;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.support.DefaultProducer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+final class CdiEventProducer<T> extends DefaultProducer {
+
+    private final Logger logger = LoggerFactory.getLogger(CdiEventProducer.class);
+
+    private final Event<T> event;
+
+    CdiEventProducer(CdiEventEndpoint<T> endpoint, Event<T> event) {
+        super(endpoint);
+        this.event = event;
+    }
+
+    @Override
+    public void process(Exchange exchange) {
+        logger.debug("Firing CDI event [{}] with {}", event, this);
+        // TODO: leverage Camel type converter mechanism based on the endpoint type
+        // The EventMetadata injection point will be that of the event which is not very useful
+        // for the end user. Using BeanManager.fire would be a way to hide that internal though
+        // it will be necessary to check whether the exchange event type is assignable to the
+        // endpoint event type.
+        event.fire((T) exchange.getIn().getBody());
+    }
+}
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiSpiHelper.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiSpiHelper.java
index 1653e1b..75bed28 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiSpiHelper.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiSpiHelper.java
@@ -34,13 +34,6 @@ import java.util.function.Predicate;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
 
-import static java.security.AccessController.doPrivileged;
-import static java.util.Comparator.comparing;
-import static java.util.Objects.requireNonNull;
-import static java.util.stream.Collectors.collectingAndThen;
-import static java.util.stream.Collectors.joining;
-import static java.util.stream.Collectors.toSet;
-
 import javax.enterprise.inject.spi.Annotated;
 import javax.enterprise.inject.spi.AnnotatedConstructor;
 import javax.enterprise.inject.spi.AnnotatedField;
@@ -52,6 +45,13 @@ import javax.enterprise.inject.spi.BeanManager;
 import javax.enterprise.util.Nonbinding;
 
 import org.apache.camel.CamelContext;
+
+import static java.security.AccessController.doPrivileged;
+import static java.util.Comparator.comparing;
+import static java.util.Objects.requireNonNull;
+import static java.util.stream.Collectors.collectingAndThen;
+import static java.util.stream.Collectors.joining;
+import static java.util.stream.Collectors.toSet;
 import static org.apache.camel.cdi.AnyLiteral.ANY;
 import static org.apache.camel.cdi.DefaultLiteral.DEFAULT;
 
@@ -271,4 +271,4 @@ final class CdiSpiHelper {
         // If no TCCL is available, use the ClassLoader of this class
         return CdiSpiHelper.class.getClassLoader();
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/DelegateProducer.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/DelegateProducer.java
index d9e4ab6..2d8168c 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/DelegateProducer.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/DelegateProducer.java
@@ -17,6 +17,7 @@
 package org.apache.camel.cdi;
 
 import java.util.Set;
+
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.InjectionPoint;
 import javax.enterprise.inject.spi.Producer;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/Excluded.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/Excluded.java
index a6e2bc8..32a9e2b 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/Excluded.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/Excluded.java
@@ -19,13 +19,15 @@ package org.apache.camel.cdi;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
+
+import javax.enterprise.util.AnnotationLiteral;
+import javax.inject.Qualifier;
+
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Qualifier;
 
 @Qualifier
 @Documented
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/ForwardingObserverMethod.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/ForwardingObserverMethod.java
index 76c02c1..8371c43 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/ForwardingObserverMethod.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/ForwardingObserverMethod.java
@@ -1,65 +1,66 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.cdi;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-import java.util.Set;
-import javax.enterprise.event.Reception;
-import javax.enterprise.event.TransactionPhase;
-import javax.enterprise.inject.spi.ObserverMethod;
-
-import org.apache.camel.CamelContext;
-
-final class ForwardingObserverMethod<T> implements ObserverMethod<T> {
-
-    private final CdiEventEndpoint<T> endpoint;
-
-    ForwardingObserverMethod(CdiEventEndpoint<T> endpoint) {
-        this.endpoint = endpoint;
-    }
-
-    @Override
-    public Class<?> getBeanClass() {
-        return CamelContext.class;
-    }
-
-    @Override
-    public Type getObservedType() {
-        return endpoint.getType();
-    }
-
-    @Override
-    public Set<Annotation> getObservedQualifiers() {
-        return endpoint.getQualifiers();
-    }
-
-    @Override
-    public Reception getReception() {
-        return Reception.ALWAYS;
-    }
-
-    @Override
-    public TransactionPhase getTransactionPhase() {
-        return TransactionPhase.IN_PROGRESS;
-    }
-
-    @Override
-    public void notify(T event) {
-        endpoint.notify(event);
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.cdi;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.Set;
+
+import javax.enterprise.event.Reception;
+import javax.enterprise.event.TransactionPhase;
+import javax.enterprise.inject.spi.ObserverMethod;
+
+import org.apache.camel.CamelContext;
+
+final class ForwardingObserverMethod<T> implements ObserverMethod<T> {
+
+    private final CdiEventEndpoint<T> endpoint;
+
+    ForwardingObserverMethod(CdiEventEndpoint<T> endpoint) {
+        this.endpoint = endpoint;
+    }
+
+    @Override
+    public Class<?> getBeanClass() {
+        return CamelContext.class;
+    }
+
+    @Override
+    public Type getObservedType() {
+        return endpoint.getType();
+    }
+
+    @Override
+    public Set<Annotation> getObservedQualifiers() {
+        return endpoint.getQualifiers();
+    }
+
+    @Override
+    public Reception getReception() {
+        return Reception.ALWAYS;
+    }
+
+    @Override
+    public TransactionPhase getTransactionPhase() {
+        return TransactionPhase.IN_PROGRESS;
+    }
+
+    @Override
+    public void notify(T event) {
+        endpoint.notify(event);
+    }
+}
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/Main.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/Main.java
index 65372e5..25ed9e7 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/Main.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/Main.java
@@ -19,9 +19,6 @@ package org.apache.camel.cdi;
 import java.util.Map;
 import java.util.Set;
 
-import static java.util.function.Function.identity;
-import static java.util.stream.Collectors.toMap;
-
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.BeanManager;
 
@@ -32,6 +29,8 @@ import org.apache.deltaspike.cdise.api.CdiContainer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static java.util.function.Function.identity;
+import static java.util.stream.Collectors.toMap;
 import static org.apache.camel.cdi.AnyLiteral.ANY;
 import static org.apache.camel.cdi.BeanManagerHelper.getReference;
 import static org.apache.deltaspike.cdise.api.CdiContainerLoader.getCdiContainer;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/Startup.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/Startup.java
index 976c743..fa2bac8 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/Startup.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/Startup.java
@@ -20,6 +20,7 @@ import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+
 import javax.enterprise.util.AnnotationLiteral;
 import javax.inject.Qualifier;
 
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticAnnotated.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticAnnotated.java
index 3c1e1a6..425777e 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticAnnotated.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticAnnotated.java
@@ -22,12 +22,11 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
+import javax.enterprise.inject.spi.Annotated;
+
 import static java.util.Arrays.asList;
 import static java.util.Collections.unmodifiableSet;
 import static java.util.stream.Collectors.toSet;
-
-import javax.enterprise.inject.spi.Annotated;
-
 import static org.apache.camel.cdi.CdiSpiHelper.isAnnotationType;
 
 @Vetoed
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBean.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBean.java
index 78de041..38c59be 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBean.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBean.java
@@ -20,6 +20,7 @@ import java.util.Collections;
 import java.util.Set;
 import java.util.StringJoiner;
 import java.util.function.Function;
+
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.CreationException;
 import javax.enterprise.inject.InjectionException;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBeanAttributes.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBeanAttributes.java
index cc9b700..288fe3f 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBeanAttributes.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBeanAttributes.java
@@ -20,13 +20,12 @@ import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 import java.util.Set;
 
-import static java.util.Collections.emptySet;
-import static java.util.stream.Collectors.toSet;
-
 import javax.enterprise.context.Dependent;
 import javax.enterprise.inject.spi.BeanManager;
 import javax.inject.Named;
 
+import static java.util.Collections.emptySet;
+import static java.util.stream.Collectors.toSet;
 import static org.apache.camel.cdi.CdiSpiHelper.isAnnotationType;
 
 class SyntheticBeanAttributes<T> {
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticInjectionTarget.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticInjectionTarget.java
index fde620a..852c134 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticInjectionTarget.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticInjectionTarget.java
@@ -20,6 +20,7 @@ import java.util.Collections;
 import java.util.Set;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
+
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.InjectionPoint;
 import javax.enterprise.inject.spi.InjectionTarget;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/Uri.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/Uri.java
index 6774aa1..e9c1726 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/Uri.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/Uri.java
@@ -20,6 +20,7 @@ import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+
 import javax.enterprise.util.AnnotationLiteral;
 import javax.enterprise.util.Nonbinding;
 import javax.inject.Qualifier;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/Vetoed.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/Vetoed.java
index c397a16..4a7f2bb 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/Vetoed.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/Vetoed.java
@@ -19,6 +19,7 @@ package org.apache.camel.cdi;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
+
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlCdiBeanFactory.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlCdiBeanFactory.java
index b807f54..ef16ad0 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlCdiBeanFactory.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlCdiBeanFactory.java
@@ -27,13 +27,6 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Stream;
 
-import static java.lang.String.format;
-import static java.util.Collections.addAll;
-import static java.util.Collections.emptySet;
-import static java.util.Collections.singleton;
-import static java.util.Objects.requireNonNull;
-import static java.util.stream.Collectors.toSet;
-
 import javax.enterprise.inject.CreationException;
 import javax.enterprise.inject.spi.AnnotatedType;
 import javax.enterprise.inject.spi.Bean;
@@ -60,6 +53,12 @@ import org.apache.camel.model.rest.RestDefinition;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static java.lang.String.format;
+import static java.util.Collections.addAll;
+import static java.util.Collections.emptySet;
+import static java.util.Collections.singleton;
+import static java.util.Objects.requireNonNull;
+import static java.util.stream.Collectors.toSet;
 import static org.apache.camel.cdi.AnyLiteral.ANY;
 import static org.apache.camel.cdi.ApplicationScopedLiteral.APPLICATION_SCOPED;
 import static org.apache.camel.cdi.CdiSpiHelper.createCamelContextWithTCCL;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlErrorHandlerFactoryBean.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlErrorHandlerFactoryBean.java
index 32827c8..4b73881 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlErrorHandlerFactoryBean.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlErrorHandlerFactoryBean.java
@@ -18,9 +18,6 @@ package org.apache.camel.cdi;
 
 import java.util.function.Function;
 
-import static java.lang.String.format;
-import static java.util.Objects.nonNull;
-
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.CreationException;
 import javax.enterprise.inject.UnsatisfiedResolutionException;
@@ -34,6 +31,8 @@ import org.apache.camel.cdi.xml.ErrorHandlerDefinition;
 import org.apache.camel.cdi.xml.RedeliveryPolicyFactoryBean;
 import org.apache.camel.processor.errorhandler.RedeliveryPolicy;
 
+import static java.lang.String.format;
+import static java.util.Objects.nonNull;
 import static org.apache.camel.cdi.BeanManagerHelper.getReferenceByName;
 import static org.apache.camel.util.ObjectHelper.isNotEmpty;
 
@@ -132,4 +131,4 @@ final class XmlErrorHandlerFactoryBean extends SyntheticBean<ErrorHandlerBuilder
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ErrorHandlerType.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ErrorHandlerType.java
index 323804d..8716dd5 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ErrorHandlerType.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ErrorHandlerType.java
@@ -23,7 +23,6 @@ import org.apache.camel.builder.DeadLetterChannelBuilder;
 import org.apache.camel.builder.DefaultErrorHandlerBuilder;
 import org.apache.camel.builder.ErrorHandlerBuilder;
 import org.apache.camel.builder.NoErrorHandlerBuilder;
-
 import org.apache.camel.cdi.transaction.JtaTransactionErrorHandlerBuilder;
 
 /**
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ThreadPoolFactoryBean.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ThreadPoolFactoryBean.java
index c7501d3..2feac59 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ThreadPoolFactoryBean.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ThreadPoolFactoryBean.java
@@ -17,7 +17,6 @@
 package org.apache.camel.cdi.xml;
 
 import javax.enterprise.inject.spi.BeanManager;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
@@ -50,4 +49,4 @@ public class ThreadPoolFactoryBean extends AbstractCamelThreadPoolFactoryBean im
     protected CamelContext discoverDefaultCamelContext() {
         return BeanManagerHelper.getDefaultCamelContext(manager);
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventProducingRouteCdi10.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventProducingRouteCdi10.java
index 4b11c6e..0c21c26 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventProducingRouteCdi10.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventProducingRouteCdi10.java
@@ -17,8 +17,8 @@
 package org.apache.camel.cdi.bean;
 
 import javax.enterprise.context.ApplicationScoped;
... 59608 lines suppressed ...


[camel] 01/03: CAMEL-14180: use latest buildtools

Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

zregvart pushed a commit to branch CAMEL-14180
in repository https://gitbox.apache.org/repos/asf/camel.git

commit fea6f45943bebfb806e124ae6f9125dc44cad9e2
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Thu Nov 14 14:45:02 2019 +0100

    CAMEL-14180: use latest buildtools
    
    Changes to the buildtools will be in effect only on the subsequent build
    and only if that build successfully published artifacts to the Maven
    repository.
    
    Make need to make sure we're using the latest buildtools when performing
    checks.
---
 Jenkinsfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index 41f1146..2c6a0ae 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -67,6 +67,7 @@ pipeline {
 
         stage('Checks') {
             steps {
+                sh "./mvnw $MAVEN_PARAMS -pl :camel-buildtools install"
                 sh "./mvnw $MAVEN_PARAMS -Psourcecheck -Dcheckstyle.failOnViolation=false checkstyle:check"
             }
             post {