You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2020/03/04 16:54:40 UTC

[camel] branch master updated (d812ac7 -> 4eb0449)

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

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


    from d812ac7  CAMEL-14640: Upgrade nimbus
     new 2d434b3  CS: Fix all imports
     new 4eb0449  Add a profile to run the impsort plugin (sort and remove unused imports)

The 2 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:
 .../org/apache/camel/catalog/CamelCatalogTest.java |   2 +-
 .../client/AbstractAtomixClientProducer.java       |   1 -
 .../client/messaging/AtomixMessagingConsumer.java  |   1 -
 .../AtomixClientRoutePolicyFactoryTestSupport.java |   2 +-
 .../AtomixClientRoutePolicyTestSupport.java        |   2 +-
 .../cluster/AtomixRoutePolicyFactoryTest.java      |   2 +-
 .../atomix/cluster/AtomixRoutePolicyTest.java      |   2 +-
 .../component/avro/AvroConsumerTestSupport.java    |   3 +-
 .../DdbStreamComponentConfigurationTest.java       |   1 -
 .../aws/firehose/KinesisFirehoseComponent.java     |   2 -
 .../aws/firehose/KinesisFirehoseProducerTest.java  |   1 -
 .../component/aws/kinesis/KinesisProducerTest.java |   1 -
 .../camel/component/aws/sqs/SqsProducerTest.java   |   1 -
 .../camel/component/aws/swf/SWFComponent.java      |   1 -
 .../camel/component/aws/swf/SWFEndpoint.java       |   1 -
 .../aws/translate/TranslateComponent.java          |   1 -
 .../component/aws2/ddb/AmazonDDBClientMock.java    |   2 -
 .../firehose/KinesisFirehose2Configuration.java    |   1 -
 .../aws2/sns/SnsComponentConfigurationTest.java    |   1 -
 .../component/aws2/sqs/SqsComponentSpringTest.java |   1 -
 .../azure/queue/QueueServiceComponent.java         |   1 -
 .../java/org/apache/camel/language/bean/Bean.java  |   2 +-
 .../integration/PutProducerIntegrationTest.java    |   1 -
 .../camel/dataformat/bindy/UnicodeHelperTest.java  |   1 -
 .../bindy/csv/BindySimpleCsvMarshallDslTest.java   |   1 -
 .../BlueprintModelJAXBContextFactory.java          |   4 +-
 .../camel/component/browse/BrowseComponent.java    |   2 +-
 .../JtaTransactionErrorHandlerReifier.java         |   2 +-
 .../cdi/transaction/JtaTransactionPolicy.java      |   2 +-
 .../camel/cdi/xml/ErrorHandlerDefinition.java      |   1 -
 .../camel/coap/CoAPRestComponentTestBase.java      |   1 -
 .../ConsulClusteredRoutePolicyFactoryTest.java     |   2 +-
 .../cluster/ConsulClusteredRoutePolicyTest.java    |   2 +-
 .../camel/component/corda/CordaComponent.java      |   1 -
 .../component/couchbase/CouchbaseConsumer.java     |   1 -
 .../component/couchbase/CouchbaseProducer.java     |   1 -
 .../crypto/cms/sig/SignedDataVerifier.java         |   1 -
 .../camel/component/cxf/ssl/SslGlobalTest.java     |   1 -
 .../camel/component/dataset/DataSetComponent.java  |   2 +-
 .../component/dataset/DataSetTestComponent.java    |   2 +-
 .../component/debezium/DebeziumComponent.java      |   2 +-
 .../it/DockerCustomCmdExecFactoryTestIT.java       |   2 -
 .../elasticsearch/ElasticsearchProducer.java       |   1 -
 .../elasticsearch/ElasticsearchBaseTest.java       |   1 -
 .../camel/component/elytron/ElytronConsumer.java   |   2 -
 .../camel/component/elytron/BaseElytronTest.java   |   2 -
 .../apache/camel/component/etcd/EtcdKeysTest.java  |   1 -
 .../camel/component/facebook/FacebookConsumer.java |   1 -
 .../camel/component/facebook/FacebookEndpoint.java |   1 -
 .../camel/component/fhir/FhirConfigurationIT.java  |   1 -
 .../fhir/FhirCustomClientConfigurationIT.java      |   2 -
 .../camel/component/fhir/FhirOperationIT.java      |   1 -
 .../camel/component/file/GenericFileEndpoint.java  |   1 -
 .../camel/component/file/remote/FtpsEndpoint.java  |   1 -
 .../FromFtpConsumerTemplateRollbackTest.java       |   2 +-
 ...FtpConsumerThrowExceptionOnLoginFailedTest.java |   2 +-
 .../file/remote/FtpProducerDoneFileNameTest.java   |   2 +-
 .../file/remote/FtpProducerFileExistFailTest.java  |   2 +-
 .../file/remote/OsgiParserFactoryTest.java         |   2 +-
 .../component/file/remote/sftp/SftpChmodTest.java  |   3 +-
 .../stream/GoogleCalendarStreamConsumer.java       |   1 -
 .../mail/stream/GoogleMailStreamConsumer.java      |   1 -
 .../google/pubsub/GooglePubsubEndpoint.java        |   6 -
 .../pubsub/integration/AcknowledgementTest.java    |   1 -
 .../integration/GroupedExchangeRoundtripTest.java  |   1 -
 .../integration/SingleExchangeRoundtripTest.java   |   1 -
 .../camel/component/grpc/GrpcConfiguration.java    |   1 -
 .../hazelcast/set/HazelcastSetEndpoint.java        |   1 -
 .../camel/component/hbase/HBaseProducerTest.java   |   1 -
 .../camel/component/hdfs/HdfsConsumerTest.java     |   1 -
 .../camel/component/hipchat/HipchatProducer.java   |   1 -
 .../camel/component/hl7/HL7MLLPCodecLongTest.java  |   2 -
 .../hl7/HL7MLLPCodecMessageFloodingTest.java       |   2 -
 .../component/hl7/HL7MLLPCodecPlainStringTest.java |   2 -
 .../hl7/HL7MLLPCodecStandAndEndBytesTest.java      |   2 -
 .../camel/component/hl7/HL7MLLPCodecTest.java      |   2 -
 .../http/base/HttpOperationFailedException.java    |   2 +-
 .../apache/camel/component/http/HttpProducer.java  |   1 -
 .../HttpProducerExplicitConnectionCloseTest.java   |   1 -
 .../hystrix/processor/HystrixProcessorFactory.java |   2 +-
 .../hystrix/processor/HystrixReifier.java          |   2 +-
 .../processor/HystrixHierarchicalConfigTest.java   |   2 +-
 .../SpringHystrixRouteHierarchicalConfigTest.java  |   2 +-
 .../component/iec60870/AbstractIecComponent.java   |   1 -
 .../camel/component/ipfs/SimpleIPFSTest.java       |   1 +
 .../camel/component/irc/IrcConfiguration.java      |   2 -
 .../camel/component/irc/CodehausIrcChat.java       |   2 -
 .../camel/component/irc/IrcConfigurationTest.java  |   2 -
 .../JacksonMarshalContentTypeHeaderTest.java       |   1 -
 .../component/jcache/JCacheConfiguration.java      |   2 -
 .../camel/component/jcache/JCacheManager.java      |   2 -
 .../component/jcache/policy/JCachePolicy.java      |   2 +-
 .../JGroupsRaftClusteredRoutePolicyTest.java       |   2 +-
 .../camel/component/jmx/SimpleBeanFixture.java     |   2 +-
 .../camel/component/jolt/JoltDefaultrTest.java     |   1 -
 .../camel/component/jolt/JoltRemovrTest.java       |   1 -
 .../apache/camel/component/jslt/JsltQueryTest.java |   2 -
 .../apache/camel/jsonpath/JsonPathCharsetTest.java |   1 -
 .../camel/component/kafka/KafkaComponent.java      |   2 -
 .../camel/component/kafka/KafkaComponentTest.java  |   1 -
 .../camel/component/metrics/GaugeProducer.java     |   1 -
 .../camel/component/metrics/HistogramProducer.java |   1 -
 .../camel/component/metrics/TimerProducer.java     |   1 -
 .../camel/component/micrometer/TimerProducer.java  |   1 -
 .../camel/component/mongodb/MongoDbEndpoint.java   |   1 -
 .../mongodb/MongoDbAggregateOperationTest.java     |   2 +-
 .../camel/component/mongodb/MongoDbContainer.java  |   1 -
 .../mongodb/MongoDbReadPreferenceOptionTest.java   |   1 -
 .../mongodb/MongoDbTailableCursorConsumerTest.java |   2 +-
 .../camel/component/nagios/NagiosProducer.java     |   1 -
 .../apache/camel/component/nats/NatsComponent.java |   1 -
 .../nats/NatsConsumerWithRedeliveryTest.java       |   4 -
 .../netty/http/NettyHttp500ErrorTest.java          |   1 -
 ...pBindingPreservePostFormUrlEncodedBodyTest.java |   1 -
 .../http/NettyHttpBindingUseAbsolutePathTest.java  |   1 -
 .../NettyHttpBindingUseRelativePathInPostTest.java |   1 -
 .../http/NettyHttpBindingUseRelativePathTest.java  |   1 -
 .../NettyHttpEndpointUriEncodingIssueTest.java     |   2 -
 .../http/NettyHttpFilterCamelHeadersTest.java      |   1 -
 .../netty/http/NettyHttpHandle404Test.java         |   2 -
 .../netty/http/NettyHttpHeaderCaseTest.java        |   2 -
 .../netty/http/NettyHttpMapHeadersFalseTest.java   |   2 -
 .../netty/http/NettyHttpProducerSimpleTest.java    |   1 -
 ...tyHttpProducerTwoParametersWithSameKeyTest.java |   1 -
 .../netty/http/NettyHttpRedirectTest.java          |   1 -
 .../netty/http/NettyHttpRestOptionsAllowTest.java  |   1 -
 ...ttpReturnDataNotInputStreamConvertableTest.java |   2 -
 .../component/netty/http/NettyHttpSSLTest.java     |   2 -
 .../netty/http/rest/RestNettyHttpGetCorsTest.java  |   1 -
 .../netty/http/rest/RestNettyHttpGetTest.java      |   2 -
 .../http/rest/RestNettyHttpGetWildcardsTest.java   |   2 -
 .../netty/http/rest/RestNettyHttpOptionsTest.java  |   1 -
 .../netty/http/rest/RestNettyProducerGetTest.java  |   2 -
 .../rest/RestNettyProducerGetUriParameterTest.java |   2 -
 .../RestNettyProducerThrowExceptionErrorTest.java  |   1 -
 .../rest/RestNettyProducerVerbUpperCaseTest.java   |   1 -
 .../netty/handlers/ClientChannelHandler.java       |   1 -
 .../java/org/apache/camel/openapi/BeanConfig.java  |   1 -
 .../org/apache/camel/openapi/OpenApiHelper.java    |   1 -
 .../camel/openapi/OpenApiRestProducerFactory.java  |   1 -
 .../apache/camel/openapi/RestOpenApiProcessor.java |   1 -
 .../apache/camel/openapi/RestOpenApiReader.java    |   1 +
 .../openapi/RestOpenApiReaderApiDocsTest.java      |   3 -
 .../openapi/RestOpenApiReaderDayOfWeekTest.java    |   1 -
 .../camel/openapi/RestOpenApiReaderModelTest.java  |   1 -
 .../RestOpenApiReaderPropertyPlaceholderTest.java  |   2 -
 .../camel/openapi/RestOpenApiReaderTest.java       |   1 -
 .../openstack/AbstractProducerTestSupport.java     |   1 -
 .../osgi/activator/CamelOsgiActivatorIT.java       |   3 +-
 .../apache/camel/component/pdf/PdfProducer.java    |   1 -
 .../camel/component/pubnub/PubNubConsumer.java     |   1 -
 .../pulsar/PulsarConsumerDeadLetterPolicyTest.java |   1 -
 .../RabbitMQRequeueHandledExceptionIntTest.java    |   1 -
 .../resilience4j/ResilienceProcessorFactory.java   |   2 +-
 .../component/resilience4j/ResilienceReifier.java  |   2 +-
 .../rest/openapi/RestOpenApiEndpointV3Test.java    |   2 -
 .../rest/openapi/RestOpenApiGlobalHttpsTest.java   |   1 -
 .../rest/openapi/RestOpenApiHelperTest.java        |   2 -
 .../apache/camel/component/rest/RestEndpoint.java  |   1 -
 .../component/salesforce/SalesforceComponent.java  |   1 -
 .../internal/client/DefaultCompositeApiClient.java |   1 -
 .../component/sap/netweaver/NetWeaverProducer.java |   1 -
 .../component/schematron/SchematronEndpoint.java   |   1 -
 .../camel/component/seda/QueueReference.java       |   2 +-
 .../shiro/security/ShiroSecurityPolicy.java        |   2 +-
 .../apache/camel/component/sjms/SjmsEndpoint.java  |   3 -
 .../jms/DefaultDestinationCreationStrategy.java    |   2 +-
 .../sjms/SjmsDestinationCreationStrategyTest.java  |   2 +-
 .../DefaultDestinationCreationStrategyTest.java    |   2 +-
 .../sjms/producer/NoConnectionFactoryTest.java     |   1 -
 .../sjms/tx/TransactedProducerInOutErrorTest.java  |   1 -
 .../camel/component/smpp/SmppComponentTest.java    |   4 -
 .../component/SoroushBotAbstractConsumer.java      |   1 -
 .../SpringSecurityAuthorizationPolicy.java         |   2 +-
 .../java/org/apache/camel/language/spel/SpEL.java  |   2 +-
 .../spring/CamelConsumerTemplateFactoryBean.java   |   2 +-
 .../spring/CamelRedeliveryPolicyFactoryBean.java   |   2 +-
 .../camel/spring/CamelThreadPoolFactoryBean.java   |   2 +-
 .../camel/spring/spi/SpringTransactionPolicy.java  |   2 +-
 .../spring/spi/TransactionErrorHandlerReifier.java |   2 +-
 .../camel/spring/CamelContextFactoryBeanTest.java  |   2 +-
 .../spring/config/DummyErrorHandlerBuilder.java    |   2 +-
 ...erTemplateAutoRegisterTwoCamelContextsTest.java |   2 +-
 ...plateMixedAutoRegisterTwoCamelContextsTest.java |   2 +-
 .../interceptor/AnnotatedBookServiceImpl.java      |   2 +-
 .../TransactionClientDataSourceSupport.java        |   2 +-
 .../apache/camel/spring/produce/ProduceTest.java   |   2 +-
 .../component/ssh/TestEchoCommandFactory.java      |   2 +-
 .../stream/ScanStreamFileWithFilterTest.java       |   2 +-
 .../camel/component/stream/StreamFileTest.java     |   2 +-
 .../apache/camel/swagger/RestSwaggerReader.java    |   1 -
 .../telegram/model/InlineKeyboardButton.java       |   1 -
 .../telegram/model/InlineKeyboardMarkup.java       |   1 -
 .../camel/component/telegram/model/InputMedia.java |   1 -
 .../camel/component/telegram/model/LoginUrl.java   |   1 -
 .../telegram/model/OutgoingAnswerInlineQuery.java  |   1 -
 .../telegram/model/OutgoingAudioMessage.java       |   2 -
 .../telegram/model/OutgoingGameMessage.java        |   1 -
 .../model/OutgoingSetGameScoreMessage.java         |   1 -
 .../component/telegram/TelegramChatBotTest.java    |   1 -
 .../telegram/TelegramConsumerChannelPostTest.java  |   2 -
 .../TelegramConsumerIncomingInlineQueryTest.java   |   1 -
 .../component/telegram/util/TelegramTestUtil.java  |   1 -
 .../org/apache/camel/test/AvailablePortFinder.java |   2 +-
 .../org/apache/camel/test/AvailablePortFinder.java |   2 +-
 .../AvailablePortFinderPropertiesFunction.java     |   1 -
 .../apache/camel/test/AvailablePortFinderTest.java |   1 -
 .../rest/RestUndertowHttpGetWildcardsTest.java     |   2 -
 .../component/validator/ValidatorComponent.java    |   2 +-
 .../camel/component/web3j/Web3jConsumer.java       |   1 -
 .../camel/component/web3j/Web3jProducer.java       |   1 -
 .../component/webhook/WebhookCapableEndpoint.java  |   1 -
 .../component/webhook/WebhookUriEncodingTest.java  |   2 -
 .../camel/websocket/jsr356/JSR356ProducerTest.java |   1 -
 .../camel/component/weka/WekaTypeConverters.java   |   2 +-
 .../component/wordpress/WordpressComponent.java    |   1 -
 .../camel/component/workday/WorkdayComponent.java  |   1 -
 .../org/apache/camel/component/xj/XJComponent.java |   2 -
 .../processor/XmlSignatureConfiguration.java       |   2 -
 .../org/apache/camel/language/xpath/XPath.java     |   2 +-
 .../camel/component/yammer/YammerEndpoint.java     |   1 -
 .../yammer/YammerMessageAndUserRouteTest.java      |   1 -
 .../component/zookeeper/ZooKeeperProducer.java     |   1 -
 .../ZooKeeperClusteredRoutePolicyFactoryTest.java  |   2 +-
 .../cluster/ZooKeeperClusteredRoutePolicyTest.java |   2 +-
 .../src/main/java/org/apache/camel/Exchange.java   |   2 -
 .../org/apache/camel/ExtendedCamelContext.java     |   1 -
 .../extension/ComponentVerifierExtension.java      |   2 +-
 .../java/org/apache/camel/spi/InvokeOnHeader.java  |   2 +-
 .../camel/impl/converter/EnumTypeConverter.java    |   2 +-
 .../InstanceMethodFallbackTypeConverter.java       |   2 +-
 .../StaticMethodFallbackTypeConverter.java         |   2 +-
 .../camel/impl/engine/AbstractCamelContext.java    |   1 -
 .../camel/impl/engine/DefaultConsumerTemplate.java |   1 -
 .../impl/engine/DefaultManagementNameStrategy.java |   1 -
 .../camel/impl/engine/FileStateRepository.java     |   1 -
 .../engine/InterceptSendToEndpointProcessor.java   |   1 -
 .../camel/impl/engine/JavaUuidGenerator.java       |   2 +-
 .../impl/event/ServiceStartupFailureEvent.java     |   2 +-
 .../camel/impl/event/ServiceStopFailureEvent.java  |   2 +-
 .../apache/camel/processor/ChoiceProcessor.java    |   1 -
 .../java/org/apache/camel/processor/Enricher.java  |   1 -
 .../org/apache/camel/processor/LoopProcessor.java  |   1 -
 .../camel/processor/OnCompletionProcessor.java     |   1 -
 .../org/apache/camel/processor/PollEnricher.java   |   1 -
 .../org/apache/camel/processor/RecipientList.java  |   1 -
 .../camel/processor/RecipientListProcessor.java    |   2 -
 .../org/apache/camel/processor/SendProcessor.java  |   4 -
 .../DefaultExceptionPolicyStrategy.java            |   1 -
 .../errorhandler/RedeliveryErrorHandler.java       |   1 -
 .../processor/idempotent/IdempotentConsumer.java   |   1 -
 .../DefaultBacklogTracerEventMessage.java          |   1 -
 .../loadbalancer/FailOverLoadBalancer.java         |   1 -
 .../camel/impl/cloud/DefaultServiceDefinition.java |   2 +-
 .../camel/impl/cloud/DefaultServiceHealth.java     |   2 +-
 .../camel/builder/ErrorHandlerBuilderSupport.java  |   1 -
 .../apache/camel/model/AggregateDefinition.java    |   1 -
 .../camel/model/CircuitBreakerDefinition.java      |   1 -
 .../camel/model/InterceptFromDefinition.java       |   3 -
 .../apache/camel/model/LoadBalanceDefinition.java  |   1 -
 .../apache/camel/model/OnCompletionDefinition.java |   1 -
 .../org/apache/camel/model/OutputDefinition.java   |   2 -
 .../apache/camel/model/ProcessorDefinition.java    |   4 -
 .../apache/camel/model/ResequenceDefinition.java   |   1 -
 .../org/apache/camel/model/SamplingDefinition.java |   1 -
 .../camel/model/ThreadPoolProfileDefinition.java   |   1 -
 ...ngServiceCallServiceDiscoveryConfiguration.java |   1 -
 .../camel/model/dataformat/BindyDataFormat.java    |   1 -
 .../model/language/NamespaceAwareExpression.java   |   3 -
 .../model/language/XMLTokenizerExpression.java     |   6 -
 .../camel/model/language/XPathExpression.java      |   5 -
 .../camel/model/language/XQueryExpression.java     |   6 -
 .../language/MethodCallExpressionReifier.java      |   2 -
 .../org/apache/camel/language/simple/Simple.java   |   2 +-
 .../org/apache/camel/core/osgi/impl/Activator.java |   2 -
 .../AbstractCamelConsumerTemplateFactoryBean.java  |   2 +-
 .../AbstractCamelRedeliveryPolicyFactoryBean.java  |   2 +-
 .../camel/core/xml/CamelJMXAgentDefinition.java    |   2 +-
 .../xml/CamelStreamCachingStrategyDefinition.java  |   2 +-
 .../camel/builder/xml/XsltUriResolverTest.java     |  74 ++---
 .../camel/catalog/RuntimeCamelCatalogTest.java     |   2 +-
 .../OptionalPropertiesDslInvalidSyntaxTest.java    |   1 -
 .../camel/impl/DefaultMessageHeaderTest.java       |   1 -
 .../camel/impl/DefaultProducerCacheTest.java       |   3 -
 .../camel/impl/DefaultProducerTemplateTest.java    |   1 +
 ...ProducerTemplateWithCustomCacheMaxSizeTest.java |   1 +
 .../DefaultPackageScanResourceResolverTest.java    |   1 -
 .../camel/impl/health/RouteHealthCheckTest.java    | 102 +++----
 .../camel/model/OnFallbackDefinitionTest.java      |   1 -
 .../CamelCaseInsentiveHeadersTrueTest.java         |   1 -
 .../processor/ExchangeCreatedTimestampTest.java    |   3 -
 .../camel/processor/RecipientListNoCacheTest.java  |   1 -
 .../org/apache/camel/processor/RouteStopTest.java  |   1 -
 ...RouteWithConstantFieldFromExchangeFailTest.java |   1 -
 ...ustomListAggregationStrategyEmptySplitTest.java | 156 +++++------
 .../camel/builder/endpoint/LogToDAdvancedTest.java |   1 -
 .../camel/builder/endpoint/TimerAdvancedTest.java  |   1 -
 .../src/main/java/org/apache/camel/main/Main.java  |   1 -
 .../java/org/apache/camel/main/MainBeansTest.java  |   1 -
 .../mbean/ComponentVerifierExtension.java          |   2 +-
 .../management/mbean/ManagedCamelHealthMBean.java  |   2 +-
 .../api/management/mbean/ManagedChoiceMBean.java   |   2 +-
 .../mbean/ManagedClusterServiceMBean.java          |   2 +-
 .../api/management/mbean/ManagedCounterMBean.java  |   2 +-
 .../mbean/ManagedDynamicRouterMBean.java           |   2 +-
 .../mbean/ManagedEndpointRegistryMBean.java        |   2 +-
 .../api/management/mbean/ManagedEnricherMBean.java |   2 +-
 .../mbean/ManagedFailoverLoadBalancerMBean.java    |   2 +-
 .../mbean/ManagedPerformanceCounterMBean.java      |   2 +-
 .../management/mbean/ManagedPollEnricherMBean.java |   2 +-
 .../mbean/ManagedRecipientListMBean.java           |   2 +-
 .../mbean/ManagedRouteControllerMBean.java         |   2 +-
 .../api/management/mbean/ManagedRouteMBean.java    |   2 +-
 .../management/mbean/ManagedRoutingSlipMBean.java  |   2 +-
 .../mbean/ManagedSendDynamicProcessorMBean.java    |   2 +-
 .../mbean/ManagedSendProcessorMBean.java           |   2 +-
 .../mbean/ManagedTransformerRegistryMBean.java     |   2 +-
 .../mbean/ManagedValidatorRegistryMBean.java       |   2 +-
 .../api/management/mbean/ManagedWireTapMBean.java  |   2 +-
 .../camel/management/mbean/ManagedChoice.java      |   2 +-
 .../DualManagedThreadPoolProfileTest.java          |   2 +-
 .../DualManagedThreadPoolWithIdTest.java           |   2 +-
 ...mxInstrumentationDisableOnCamelContextTest.java |   2 +-
 .../JmxNotificationEventNotifierTest.java          |   2 +-
 .../management/ManagedAggregateControllerTest.java |   2 +-
 .../ManagedBrowsableEndpointEmptyTest.java         |   2 +-
 .../camel/management/ManagedConsumerCacheTest.java |   2 +-
 .../camel/management/ManagedDataFormatTest.java    |   2 +-
 .../management/ManagedDualCamelContextTest.java    |   2 +-
 .../management/ManagedEndpointBaseUriTest.java     |   2 +-
 .../management/ManagedEndpointExplainTest.java     |   2 +-
 .../management/ManagedEndpointRegistryTest.java    |   2 +-
 .../camel/management/ManagedEndpointTest.java      |   2 +-
 .../ManagedEndpointUtilizationStatisticsTest.java  |   2 +-
 .../management/ManagedInflightRepositoryTest.java  |   2 -
 ...gedProducerRecipientListRegisterAlwaysTest.java |   2 +-
 .../ManagedProducerRecipientListTest.java          |   2 +-
 ...edProducerRouteAddRemoveRegisterAlwaysTest.java |   2 +-
 .../camel/management/ManagedProducerTest.java      |   2 +-
 .../camel/management/ManagedRefProducerTest.java   |   2 +-
 .../ManagedResetIncludeProcessorsTest.java         |   2 +-
 .../management/ManagedResetIncludeRoutesTest.java  |   2 +-
 ...outeAddSecondRouteNotRegisterNewRoutesTest.java |   2 +-
 .../management/ManagedRouteAddSecondRouteTest.java |   2 +-
 ...DumpStatsAsXmlAndResetWithCustomDomainTest.java | 180 ++++++------
 ...ManagedRouteDumpStatsAsXmlCustomDomainTest.java | 150 +++++-----
 .../camel/management/ManagedRouteRestartTest.java  |   2 +-
 .../camel/management/ManagedRouteStopTest.java     |   2 +-
 .../ManagedRouteStopUsingMBeanAPITest.java         |   2 +-
 .../ManagedScheduledPollConsumerTest.java          |   2 +-
 ...ManagedSetAndRemoveHeaderAndPropertiesTest.java |   2 +-
 .../management/ManagedShutdownStrategyTest.java    |   2 +-
 .../management/ManagedStatisticsDisabledTest.java  |   2 +-
 .../management/ManagedStatisticsLevelOffTest.java  |   2 +-
 .../ManagedStatisticsLevelRoutesOnlyTest.java      |   2 +-
 .../camel/management/ManagedStatisticsTest.java    |   2 +-
 .../ManagedStatisticsWithSplitterTest.java         |   2 +-
 .../management/ManagedThreadPoolProfileTest.java   |   2 +-
 .../camel/management/ManagedThreadPoolTest.java    |   2 +-
 .../management/ManagedThreadPoolWithIdTest.java    |   2 +-
 .../management/ManagedUnregisterProcessorTest.java |   2 +-
 .../management/ManagedUnregisterProducerTest.java  |   2 +-
 .../management/RemoveRouteDefinitionTest.java      |   2 +-
 .../camel/management/util/AvailablePortFinder.java |   2 +-
 .../DefaultComponentVerifierExtension.java         |   1 -
 .../camel/support/CamelObjectInputStream.java      |   2 +-
 .../org/apache/camel/support/EndpointHelper.java   |   1 -
 .../java/org/apache/camel/support/EventHelper.java |   2 +-
 .../camel/support/ExpressionListComparator.java    |   2 +-
 .../apache/camel/support/RestComponentHelper.java  | 308 ++++++++++-----------
 .../apache/camel/support/SimpleUuidGenerator.java  |   2 +-
 .../org/apache/camel/support/TimeoutMapEntry.java  |   2 +-
 .../camel/support/builder/OutputStreamBuilder.java |   2 +-
 .../management/NotificationSenderAdapter.java      |   2 +-
 .../support/processor/UnmarshalProcessor.java      |   2 +-
 .../camel/util/concurrent/CamelThreadFactory.java  |   2 +-
 .../java/org/apache/camel/xml/io/MXParser.java     |   5 +-
 .../org/apache/camel/xml/io/XmlPullParser.java     |   4 +-
 .../org/apache/camel/xml/io/XmlStreamReader.java   |   3 +-
 .../camel/xml/io/XmlStreamReaderException.java     |   5 +-
 .../camel/xml/jaxb/JaxbModelToXMLDumper.java       |   1 -
 .../converter/jaxp/StreamSourceConverter.java      |   2 +-
 .../camel/converter/jaxp/XmlErrorListener.java     |   2 +-
 .../org/apache/camel/util/xml/SourceCache.java     |   2 +-
 .../apache/camel/util/xml/StreamSourceCache.java   |   2 +-
 parent/pom.xml                                     |  29 ++
 .../itest/jaxb/SpringLoadRouteFromXmlTest.java     |   2 +-
 .../camel/tooling/util/srcgen/JavaClass.java       |   1 -
 .../camel/tooling/util/PackageHelperTest.java      |   6 +-
 .../org/apache/camel/tooling/util/StringsTest.java |   6 -
 .../maven/plugins/javadoc/AbstractJavadocMojo.java |   4 +-
 .../camel/maven/packaging/ComponentDslMojo.java    |   1 -
 .../maven/packaging/PackageComponentMojo.java      |   3 -
 .../camel/maven/packaging/PackageJandexMojo.java   |   1 -
 .../camel/maven/packaging/PackageJaxbMojo.java     |   1 -
 .../camel/maven/packaging/PackageModelMojo.java    |   3 -
 .../camel/maven/packaging/PackageOtherMojo.java    |   1 -
 .../camel/maven/packaging/SchemaGeneratorMojo.java |   2 -
 .../camel/maven/packaging/UpdateReadmeMojo.java    |   2 -
 .../maven/packaging/ValidateComponentMojo.java     |   5 -
 .../ComponentDslInnerImplBuilderGenerator.java     |   1 -
 .../ComponentDslBuilderFactoryGeneratorTest.java   |   4 +-
 .../ComponentDslInnerBuilderGeneratorTest.java     |   2 +-
 .../ComponentDslInnerImplBuilderGeneratorTest.java |   4 +-
 .../ComponentsBuilderFactoryGeneratorTest.java     |   4 +-
 .../ComponentsDslMetadataRegistryTest.java         |   6 +-
 .../maven/generator/openapi/GenerateMojo.java      |   1 -
 .../maven/generator/openapi/GenerateXmlMojo.java   |   2 -
 .../generator/openapi/AppendableGenerator.java     |   1 -
 .../generator/openapi/DirectToOperationId.java     |   1 -
 .../camel/generator/openapi/FilerGenerator.java    |   1 -
 .../camel/generator/openapi/OperationVisitor.java  |   2 +-
 .../camel/generator/openapi/PathGenerator.java     |   1 -
 .../camel/generator/openapi/PathVisitor.java       |   5 +-
 .../openapi/RestDslDefinitionGenerator.java        |   1 -
 .../camel/generator/openapi/RestDslGenerator.java  |   2 -
 .../generator/openapi/RestDslXmlGenerator.java     |   3 -
 .../openapi/RestDefinitionEmitterTest.java         |   1 -
 .../generator/openapi/RestDslGeneratorTest.java    |   2 -
 .../generator/openapi/RestDslGeneratorV3Test.java  |   2 -
 .../openapi/RestDslSourceCodeGeneratorV3Test.java  |   3 -
 .../generator/openapi/RestDslXmlGeneratorTest.java |   1 -
 .../openapi/RestDslXmlGeneratorV3Test.java         |   1 -
 423 files changed, 699 insertions(+), 1027 deletions(-)


[camel] 01/02: CS: Fix all imports

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

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

commit 2d434b372af1e2e4c9b96360d377fb519bef90bd
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Wed Mar 4 17:34:02 2020 +0100

    CS: Fix all imports
---
 .../org/apache/camel/catalog/CamelCatalogTest.java |   2 +-
 .../client/AbstractAtomixClientProducer.java       |   1 -
 .../client/messaging/AtomixMessagingConsumer.java  |   1 -
 .../AtomixClientRoutePolicyFactoryTestSupport.java |   2 +-
 .../AtomixClientRoutePolicyTestSupport.java        |   2 +-
 .../cluster/AtomixRoutePolicyFactoryTest.java      |   2 +-
 .../atomix/cluster/AtomixRoutePolicyTest.java      |   2 +-
 .../component/avro/AvroConsumerTestSupport.java    |   3 +-
 .../DdbStreamComponentConfigurationTest.java       |   1 -
 .../aws/firehose/KinesisFirehoseComponent.java     |   2 -
 .../aws/firehose/KinesisFirehoseProducerTest.java  |   1 -
 .../component/aws/kinesis/KinesisProducerTest.java |   1 -
 .../camel/component/aws/sqs/SqsProducerTest.java   |   1 -
 .../camel/component/aws/swf/SWFComponent.java      |   1 -
 .../camel/component/aws/swf/SWFEndpoint.java       |   1 -
 .../aws/translate/TranslateComponent.java          |   1 -
 .../component/aws2/ddb/AmazonDDBClientMock.java    |   2 -
 .../firehose/KinesisFirehose2Configuration.java    |   1 -
 .../aws2/sns/SnsComponentConfigurationTest.java    |   1 -
 .../component/aws2/sqs/SqsComponentSpringTest.java |   1 -
 .../azure/queue/QueueServiceComponent.java         |   1 -
 .../java/org/apache/camel/language/bean/Bean.java  |   2 +-
 .../integration/PutProducerIntegrationTest.java    |   1 -
 .../camel/dataformat/bindy/UnicodeHelperTest.java  |   1 -
 .../bindy/csv/BindySimpleCsvMarshallDslTest.java   |   1 -
 .../BlueprintModelJAXBContextFactory.java          |   4 +-
 .../camel/component/browse/BrowseComponent.java    |   2 +-
 .../JtaTransactionErrorHandlerReifier.java         |   2 +-
 .../cdi/transaction/JtaTransactionPolicy.java      |   2 +-
 .../camel/cdi/xml/ErrorHandlerDefinition.java      |   1 -
 .../camel/coap/CoAPRestComponentTestBase.java      |   1 -
 .../ConsulClusteredRoutePolicyFactoryTest.java     |   2 +-
 .../cluster/ConsulClusteredRoutePolicyTest.java    |   2 +-
 .../camel/component/corda/CordaComponent.java      |   1 -
 .../component/couchbase/CouchbaseConsumer.java     |   1 -
 .../component/couchbase/CouchbaseProducer.java     |   1 -
 .../crypto/cms/sig/SignedDataVerifier.java         |   1 -
 .../camel/component/cxf/ssl/SslGlobalTest.java     |   1 -
 .../camel/component/dataset/DataSetComponent.java  |   2 +-
 .../component/dataset/DataSetTestComponent.java    |   2 +-
 .../component/debezium/DebeziumComponent.java      |   2 +-
 .../it/DockerCustomCmdExecFactoryTestIT.java       |   2 -
 .../elasticsearch/ElasticsearchProducer.java       |   1 -
 .../elasticsearch/ElasticsearchBaseTest.java       |   1 -
 .../camel/component/elytron/ElytronConsumer.java   |   2 -
 .../camel/component/elytron/BaseElytronTest.java   |   2 -
 .../apache/camel/component/etcd/EtcdKeysTest.java  |   1 -
 .../camel/component/facebook/FacebookConsumer.java |   1 -
 .../camel/component/facebook/FacebookEndpoint.java |   1 -
 .../camel/component/fhir/FhirConfigurationIT.java  |   1 -
 .../fhir/FhirCustomClientConfigurationIT.java      |   2 -
 .../camel/component/fhir/FhirOperationIT.java      |   1 -
 .../camel/component/file/GenericFileEndpoint.java  |   1 -
 .../camel/component/file/remote/FtpsEndpoint.java  |   1 -
 .../FromFtpConsumerTemplateRollbackTest.java       |   2 +-
 ...FtpConsumerThrowExceptionOnLoginFailedTest.java |   2 +-
 .../file/remote/FtpProducerDoneFileNameTest.java   |   2 +-
 .../file/remote/FtpProducerFileExistFailTest.java  |   2 +-
 .../file/remote/OsgiParserFactoryTest.java         |   2 +-
 .../component/file/remote/sftp/SftpChmodTest.java  |   3 +-
 .../stream/GoogleCalendarStreamConsumer.java       |   1 -
 .../mail/stream/GoogleMailStreamConsumer.java      |   1 -
 .../google/pubsub/GooglePubsubEndpoint.java        |   6 -
 .../pubsub/integration/AcknowledgementTest.java    |   1 -
 .../integration/GroupedExchangeRoundtripTest.java  |   1 -
 .../integration/SingleExchangeRoundtripTest.java   |   1 -
 .../camel/component/grpc/GrpcConfiguration.java    |   1 -
 .../hazelcast/set/HazelcastSetEndpoint.java        |   1 -
 .../camel/component/hbase/HBaseProducerTest.java   |   1 -
 .../camel/component/hdfs/HdfsConsumerTest.java     |   1 -
 .../camel/component/hipchat/HipchatProducer.java   |   1 -
 .../camel/component/hl7/HL7MLLPCodecLongTest.java  |   2 -
 .../hl7/HL7MLLPCodecMessageFloodingTest.java       |   2 -
 .../component/hl7/HL7MLLPCodecPlainStringTest.java |   2 -
 .../hl7/HL7MLLPCodecStandAndEndBytesTest.java      |   2 -
 .../camel/component/hl7/HL7MLLPCodecTest.java      |   2 -
 .../http/base/HttpOperationFailedException.java    |   2 +-
 .../apache/camel/component/http/HttpProducer.java  |   1 -
 .../HttpProducerExplicitConnectionCloseTest.java   |   1 -
 .../hystrix/processor/HystrixProcessorFactory.java |   2 +-
 .../hystrix/processor/HystrixReifier.java          |   2 +-
 .../processor/HystrixHierarchicalConfigTest.java   |   2 +-
 .../SpringHystrixRouteHierarchicalConfigTest.java  |   2 +-
 .../component/iec60870/AbstractIecComponent.java   |   1 -
 .../camel/component/ipfs/SimpleIPFSTest.java       |   1 +
 .../camel/component/irc/IrcConfiguration.java      |   2 -
 .../camel/component/irc/CodehausIrcChat.java       |   2 -
 .../camel/component/irc/IrcConfigurationTest.java  |   2 -
 .../JacksonMarshalContentTypeHeaderTest.java       |   1 -
 .../component/jcache/JCacheConfiguration.java      |   2 -
 .../camel/component/jcache/JCacheManager.java      |   2 -
 .../component/jcache/policy/JCachePolicy.java      |   2 +-
 .../JGroupsRaftClusteredRoutePolicyTest.java       |   2 +-
 .../camel/component/jmx/SimpleBeanFixture.java     |   2 +-
 .../camel/component/jolt/JoltDefaultrTest.java     |   1 -
 .../camel/component/jolt/JoltRemovrTest.java       |   1 -
 .../apache/camel/component/jslt/JsltQueryTest.java |   2 -
 .../apache/camel/jsonpath/JsonPathCharsetTest.java |   1 -
 .../camel/component/kafka/KafkaComponent.java      |   2 -
 .../camel/component/kafka/KafkaComponentTest.java  |   1 -
 .../camel/component/metrics/GaugeProducer.java     |   1 -
 .../camel/component/metrics/HistogramProducer.java |   1 -
 .../camel/component/metrics/TimerProducer.java     |   1 -
 .../camel/component/micrometer/TimerProducer.java  |   1 -
 .../camel/component/mongodb/MongoDbEndpoint.java   |   1 -
 .../mongodb/MongoDbAggregateOperationTest.java     |   2 +-
 .../camel/component/mongodb/MongoDbContainer.java  |   1 -
 .../mongodb/MongoDbReadPreferenceOptionTest.java   |   1 -
 .../mongodb/MongoDbTailableCursorConsumerTest.java |   2 +-
 .../camel/component/nagios/NagiosProducer.java     |   1 -
 .../apache/camel/component/nats/NatsComponent.java |   1 -
 .../nats/NatsConsumerWithRedeliveryTest.java       |   4 -
 .../netty/http/NettyHttp500ErrorTest.java          |   1 -
 ...pBindingPreservePostFormUrlEncodedBodyTest.java |   1 -
 .../http/NettyHttpBindingUseAbsolutePathTest.java  |   1 -
 .../NettyHttpBindingUseRelativePathInPostTest.java |   1 -
 .../http/NettyHttpBindingUseRelativePathTest.java  |   1 -
 .../NettyHttpEndpointUriEncodingIssueTest.java     |   2 -
 .../http/NettyHttpFilterCamelHeadersTest.java      |   1 -
 .../netty/http/NettyHttpHandle404Test.java         |   2 -
 .../netty/http/NettyHttpHeaderCaseTest.java        |   2 -
 .../netty/http/NettyHttpMapHeadersFalseTest.java   |   2 -
 .../netty/http/NettyHttpProducerSimpleTest.java    |   1 -
 ...tyHttpProducerTwoParametersWithSameKeyTest.java |   1 -
 .../netty/http/NettyHttpRedirectTest.java          |   1 -
 .../netty/http/NettyHttpRestOptionsAllowTest.java  |   1 -
 ...ttpReturnDataNotInputStreamConvertableTest.java |   2 -
 .../component/netty/http/NettyHttpSSLTest.java     |   2 -
 .../netty/http/rest/RestNettyHttpGetCorsTest.java  |   1 -
 .../netty/http/rest/RestNettyHttpGetTest.java      |   2 -
 .../http/rest/RestNettyHttpGetWildcardsTest.java   |   2 -
 .../netty/http/rest/RestNettyHttpOptionsTest.java  |   1 -
 .../netty/http/rest/RestNettyProducerGetTest.java  |   2 -
 .../rest/RestNettyProducerGetUriParameterTest.java |   2 -
 .../RestNettyProducerThrowExceptionErrorTest.java  |   1 -
 .../rest/RestNettyProducerVerbUpperCaseTest.java   |   1 -
 .../netty/handlers/ClientChannelHandler.java       |   1 -
 .../java/org/apache/camel/openapi/BeanConfig.java  |   1 -
 .../org/apache/camel/openapi/OpenApiHelper.java    |   1 -
 .../camel/openapi/OpenApiRestProducerFactory.java  |   1 -
 .../apache/camel/openapi/RestOpenApiProcessor.java |   1 -
 .../apache/camel/openapi/RestOpenApiReader.java    |   1 +
 .../openapi/RestOpenApiReaderApiDocsTest.java      |   3 -
 .../openapi/RestOpenApiReaderDayOfWeekTest.java    |   1 -
 .../camel/openapi/RestOpenApiReaderModelTest.java  |   1 -
 .../RestOpenApiReaderPropertyPlaceholderTest.java  |   2 -
 .../camel/openapi/RestOpenApiReaderTest.java       |   1 -
 .../openstack/AbstractProducerTestSupport.java     |   1 -
 .../osgi/activator/CamelOsgiActivatorIT.java       |   3 +-
 .../apache/camel/component/pdf/PdfProducer.java    |   1 -
 .../camel/component/pubnub/PubNubConsumer.java     |   1 -
 .../pulsar/PulsarConsumerDeadLetterPolicyTest.java |   1 -
 .../RabbitMQRequeueHandledExceptionIntTest.java    |   1 -
 .../resilience4j/ResilienceProcessorFactory.java   |   2 +-
 .../component/resilience4j/ResilienceReifier.java  |   2 +-
 .../rest/openapi/RestOpenApiEndpointV3Test.java    |   2 -
 .../rest/openapi/RestOpenApiGlobalHttpsTest.java   |   1 -
 .../rest/openapi/RestOpenApiHelperTest.java        |   2 -
 .../apache/camel/component/rest/RestEndpoint.java  |   1 -
 .../component/salesforce/SalesforceComponent.java  |   1 -
 .../internal/client/DefaultCompositeApiClient.java |   1 -
 .../component/sap/netweaver/NetWeaverProducer.java |   1 -
 .../component/schematron/SchematronEndpoint.java   |   1 -
 .../camel/component/seda/QueueReference.java       |   2 +-
 .../shiro/security/ShiroSecurityPolicy.java        |   2 +-
 .../apache/camel/component/sjms/SjmsEndpoint.java  |   3 -
 .../jms/DefaultDestinationCreationStrategy.java    |   2 +-
 .../sjms/SjmsDestinationCreationStrategyTest.java  |   2 +-
 .../DefaultDestinationCreationStrategyTest.java    |   2 +-
 .../sjms/producer/NoConnectionFactoryTest.java     |   1 -
 .../sjms/tx/TransactedProducerInOutErrorTest.java  |   1 -
 .../camel/component/smpp/SmppComponentTest.java    |   4 -
 .../component/SoroushBotAbstractConsumer.java      |   1 -
 .../SpringSecurityAuthorizationPolicy.java         |   2 +-
 .../java/org/apache/camel/language/spel/SpEL.java  |   2 +-
 .../spring/CamelConsumerTemplateFactoryBean.java   |   2 +-
 .../spring/CamelRedeliveryPolicyFactoryBean.java   |   2 +-
 .../camel/spring/CamelThreadPoolFactoryBean.java   |   2 +-
 .../camel/spring/spi/SpringTransactionPolicy.java  |   2 +-
 .../spring/spi/TransactionErrorHandlerReifier.java |   2 +-
 .../camel/spring/CamelContextFactoryBeanTest.java  |   2 +-
 .../spring/config/DummyErrorHandlerBuilder.java    |   2 +-
 ...erTemplateAutoRegisterTwoCamelContextsTest.java |   2 +-
 ...plateMixedAutoRegisterTwoCamelContextsTest.java |   2 +-
 .../interceptor/AnnotatedBookServiceImpl.java      |   2 +-
 .../TransactionClientDataSourceSupport.java        |   2 +-
 .../apache/camel/spring/produce/ProduceTest.java   |   2 +-
 .../component/ssh/TestEchoCommandFactory.java      |   2 +-
 .../stream/ScanStreamFileWithFilterTest.java       |   2 +-
 .../camel/component/stream/StreamFileTest.java     |   2 +-
 .../apache/camel/swagger/RestSwaggerReader.java    |   1 -
 .../telegram/model/InlineKeyboardButton.java       |   1 -
 .../telegram/model/InlineKeyboardMarkup.java       |   1 -
 .../camel/component/telegram/model/InputMedia.java |   1 -
 .../camel/component/telegram/model/LoginUrl.java   |   1 -
 .../telegram/model/OutgoingAnswerInlineQuery.java  |   1 -
 .../telegram/model/OutgoingAudioMessage.java       |   2 -
 .../telegram/model/OutgoingGameMessage.java        |   1 -
 .../model/OutgoingSetGameScoreMessage.java         |   1 -
 .../component/telegram/TelegramChatBotTest.java    |   1 -
 .../telegram/TelegramConsumerChannelPostTest.java  |   2 -
 .../TelegramConsumerIncomingInlineQueryTest.java   |   1 -
 .../component/telegram/util/TelegramTestUtil.java  |   1 -
 .../org/apache/camel/test/AvailablePortFinder.java |   2 +-
 .../org/apache/camel/test/AvailablePortFinder.java |   2 +-
 .../AvailablePortFinderPropertiesFunction.java     |   1 -
 .../apache/camel/test/AvailablePortFinderTest.java |   1 -
 .../rest/RestUndertowHttpGetWildcardsTest.java     |   2 -
 .../component/validator/ValidatorComponent.java    |   2 +-
 .../camel/component/web3j/Web3jConsumer.java       |   1 -
 .../camel/component/web3j/Web3jProducer.java       |   1 -
 .../component/webhook/WebhookCapableEndpoint.java  |   1 -
 .../component/webhook/WebhookUriEncodingTest.java  |   2 -
 .../camel/websocket/jsr356/JSR356ProducerTest.java |   1 -
 .../camel/component/weka/WekaTypeConverters.java   |   2 +-
 .../component/wordpress/WordpressComponent.java    |   1 -
 .../camel/component/workday/WorkdayComponent.java  |   1 -
 .../org/apache/camel/component/xj/XJComponent.java |   2 -
 .../processor/XmlSignatureConfiguration.java       |   2 -
 .../org/apache/camel/language/xpath/XPath.java     |   2 +-
 .../camel/component/yammer/YammerEndpoint.java     |   1 -
 .../yammer/YammerMessageAndUserRouteTest.java      |   1 -
 .../component/zookeeper/ZooKeeperProducer.java     |   1 -
 .../ZooKeeperClusteredRoutePolicyFactoryTest.java  |   2 +-
 .../cluster/ZooKeeperClusteredRoutePolicyTest.java |   2 +-
 .../src/main/java/org/apache/camel/Exchange.java   |   2 -
 .../org/apache/camel/ExtendedCamelContext.java     |   1 -
 .../extension/ComponentVerifierExtension.java      |   2 +-
 .../java/org/apache/camel/spi/InvokeOnHeader.java  |   2 +-
 .../camel/impl/converter/EnumTypeConverter.java    |   2 +-
 .../InstanceMethodFallbackTypeConverter.java       |   2 +-
 .../StaticMethodFallbackTypeConverter.java         |   2 +-
 .../camel/impl/engine/AbstractCamelContext.java    |   1 -
 .../camel/impl/engine/DefaultConsumerTemplate.java |   1 -
 .../impl/engine/DefaultManagementNameStrategy.java |   1 -
 .../camel/impl/engine/FileStateRepository.java     |   1 -
 .../engine/InterceptSendToEndpointProcessor.java   |   1 -
 .../camel/impl/engine/JavaUuidGenerator.java       |   2 +-
 .../impl/event/ServiceStartupFailureEvent.java     |   2 +-
 .../camel/impl/event/ServiceStopFailureEvent.java  |   2 +-
 .../apache/camel/processor/ChoiceProcessor.java    |   1 -
 .../java/org/apache/camel/processor/Enricher.java  |   1 -
 .../org/apache/camel/processor/LoopProcessor.java  |   1 -
 .../camel/processor/OnCompletionProcessor.java     |   1 -
 .../org/apache/camel/processor/PollEnricher.java   |   1 -
 .../org/apache/camel/processor/RecipientList.java  |   1 -
 .../camel/processor/RecipientListProcessor.java    |   2 -
 .../org/apache/camel/processor/SendProcessor.java  |   4 -
 .../DefaultExceptionPolicyStrategy.java            |   1 -
 .../errorhandler/RedeliveryErrorHandler.java       |   1 -
 .../processor/idempotent/IdempotentConsumer.java   |   1 -
 .../DefaultBacklogTracerEventMessage.java          |   1 -
 .../loadbalancer/FailOverLoadBalancer.java         |   1 -
 .../camel/impl/cloud/DefaultServiceDefinition.java |   2 +-
 .../camel/impl/cloud/DefaultServiceHealth.java     |   2 +-
 .../camel/builder/ErrorHandlerBuilderSupport.java  |   1 -
 .../apache/camel/model/AggregateDefinition.java    |   1 -
 .../camel/model/CircuitBreakerDefinition.java      |   1 -
 .../camel/model/InterceptFromDefinition.java       |   3 -
 .../apache/camel/model/LoadBalanceDefinition.java  |   1 -
 .../apache/camel/model/OnCompletionDefinition.java |   1 -
 .../org/apache/camel/model/OutputDefinition.java   |   2 -
 .../apache/camel/model/ProcessorDefinition.java    |   4 -
 .../apache/camel/model/ResequenceDefinition.java   |   1 -
 .../org/apache/camel/model/SamplingDefinition.java |   1 -
 .../camel/model/ThreadPoolProfileDefinition.java   |   1 -
 ...ngServiceCallServiceDiscoveryConfiguration.java |   1 -
 .../camel/model/dataformat/BindyDataFormat.java    |   1 -
 .../model/language/NamespaceAwareExpression.java   |   3 -
 .../model/language/XMLTokenizerExpression.java     |   6 -
 .../camel/model/language/XPathExpression.java      |   5 -
 .../camel/model/language/XQueryExpression.java     |   6 -
 .../language/MethodCallExpressionReifier.java      |   2 -
 .../org/apache/camel/language/simple/Simple.java   |   2 +-
 .../org/apache/camel/core/osgi/impl/Activator.java |   2 -
 .../AbstractCamelConsumerTemplateFactoryBean.java  |   2 +-
 .../AbstractCamelRedeliveryPolicyFactoryBean.java  |   2 +-
 .../camel/core/xml/CamelJMXAgentDefinition.java    |   2 +-
 .../xml/CamelStreamCachingStrategyDefinition.java  |   2 +-
 .../camel/builder/xml/XsltUriResolverTest.java     |  74 ++---
 .../camel/catalog/RuntimeCamelCatalogTest.java     |   2 +-
 .../OptionalPropertiesDslInvalidSyntaxTest.java    |   1 -
 .../camel/impl/DefaultMessageHeaderTest.java       |   1 -
 .../camel/impl/DefaultProducerCacheTest.java       |   3 -
 .../camel/impl/DefaultProducerTemplateTest.java    |   1 +
 ...ProducerTemplateWithCustomCacheMaxSizeTest.java |   1 +
 .../DefaultPackageScanResourceResolverTest.java    |   1 -
 .../camel/impl/health/RouteHealthCheckTest.java    | 102 +++----
 .../camel/model/OnFallbackDefinitionTest.java      |   1 -
 .../CamelCaseInsentiveHeadersTrueTest.java         |   1 -
 .../processor/ExchangeCreatedTimestampTest.java    |   3 -
 .../camel/processor/RecipientListNoCacheTest.java  |   1 -
 .../org/apache/camel/processor/RouteStopTest.java  |   1 -
 ...RouteWithConstantFieldFromExchangeFailTest.java |   1 -
 ...ustomListAggregationStrategyEmptySplitTest.java | 156 +++++------
 .../camel/builder/endpoint/LogToDAdvancedTest.java |   1 -
 .../camel/builder/endpoint/TimerAdvancedTest.java  |   1 -
 .../src/main/java/org/apache/camel/main/Main.java  |   1 -
 .../java/org/apache/camel/main/MainBeansTest.java  |   1 -
 .../mbean/ComponentVerifierExtension.java          |   2 +-
 .../management/mbean/ManagedCamelHealthMBean.java  |   2 +-
 .../api/management/mbean/ManagedChoiceMBean.java   |   2 +-
 .../mbean/ManagedClusterServiceMBean.java          |   2 +-
 .../api/management/mbean/ManagedCounterMBean.java  |   2 +-
 .../mbean/ManagedDynamicRouterMBean.java           |   2 +-
 .../mbean/ManagedEndpointRegistryMBean.java        |   2 +-
 .../api/management/mbean/ManagedEnricherMBean.java |   2 +-
 .../mbean/ManagedFailoverLoadBalancerMBean.java    |   2 +-
 .../mbean/ManagedPerformanceCounterMBean.java      |   2 +-
 .../management/mbean/ManagedPollEnricherMBean.java |   2 +-
 .../mbean/ManagedRecipientListMBean.java           |   2 +-
 .../mbean/ManagedRouteControllerMBean.java         |   2 +-
 .../api/management/mbean/ManagedRouteMBean.java    |   2 +-
 .../management/mbean/ManagedRoutingSlipMBean.java  |   2 +-
 .../mbean/ManagedSendDynamicProcessorMBean.java    |   2 +-
 .../mbean/ManagedSendProcessorMBean.java           |   2 +-
 .../mbean/ManagedTransformerRegistryMBean.java     |   2 +-
 .../mbean/ManagedValidatorRegistryMBean.java       |   2 +-
 .../api/management/mbean/ManagedWireTapMBean.java  |   2 +-
 .../camel/management/mbean/ManagedChoice.java      |   2 +-
 .../DualManagedThreadPoolProfileTest.java          |   2 +-
 .../DualManagedThreadPoolWithIdTest.java           |   2 +-
 ...mxInstrumentationDisableOnCamelContextTest.java |   2 +-
 .../JmxNotificationEventNotifierTest.java          |   2 +-
 .../management/ManagedAggregateControllerTest.java |   2 +-
 .../ManagedBrowsableEndpointEmptyTest.java         |   2 +-
 .../camel/management/ManagedConsumerCacheTest.java |   2 +-
 .../camel/management/ManagedDataFormatTest.java    |   2 +-
 .../management/ManagedDualCamelContextTest.java    |   2 +-
 .../management/ManagedEndpointBaseUriTest.java     |   2 +-
 .../management/ManagedEndpointExplainTest.java     |   2 +-
 .../management/ManagedEndpointRegistryTest.java    |   2 +-
 .../camel/management/ManagedEndpointTest.java      |   2 +-
 .../ManagedEndpointUtilizationStatisticsTest.java  |   2 +-
 .../management/ManagedInflightRepositoryTest.java  |   2 -
 ...gedProducerRecipientListRegisterAlwaysTest.java |   2 +-
 .../ManagedProducerRecipientListTest.java          |   2 +-
 ...edProducerRouteAddRemoveRegisterAlwaysTest.java |   2 +-
 .../camel/management/ManagedProducerTest.java      |   2 +-
 .../camel/management/ManagedRefProducerTest.java   |   2 +-
 .../ManagedResetIncludeProcessorsTest.java         |   2 +-
 .../management/ManagedResetIncludeRoutesTest.java  |   2 +-
 ...outeAddSecondRouteNotRegisterNewRoutesTest.java |   2 +-
 .../management/ManagedRouteAddSecondRouteTest.java |   2 +-
 ...DumpStatsAsXmlAndResetWithCustomDomainTest.java | 180 ++++++------
 ...ManagedRouteDumpStatsAsXmlCustomDomainTest.java | 150 +++++-----
 .../camel/management/ManagedRouteRestartTest.java  |   2 +-
 .../camel/management/ManagedRouteStopTest.java     |   2 +-
 .../ManagedRouteStopUsingMBeanAPITest.java         |   2 +-
 .../ManagedScheduledPollConsumerTest.java          |   2 +-
 ...ManagedSetAndRemoveHeaderAndPropertiesTest.java |   2 +-
 .../management/ManagedShutdownStrategyTest.java    |   2 +-
 .../management/ManagedStatisticsDisabledTest.java  |   2 +-
 .../management/ManagedStatisticsLevelOffTest.java  |   2 +-
 .../ManagedStatisticsLevelRoutesOnlyTest.java      |   2 +-
 .../camel/management/ManagedStatisticsTest.java    |   2 +-
 .../ManagedStatisticsWithSplitterTest.java         |   2 +-
 .../management/ManagedThreadPoolProfileTest.java   |   2 +-
 .../camel/management/ManagedThreadPoolTest.java    |   2 +-
 .../management/ManagedThreadPoolWithIdTest.java    |   2 +-
 .../management/ManagedUnregisterProcessorTest.java |   2 +-
 .../management/ManagedUnregisterProducerTest.java  |   2 +-
 .../management/RemoveRouteDefinitionTest.java      |   2 +-
 .../camel/management/util/AvailablePortFinder.java |   2 +-
 .../DefaultComponentVerifierExtension.java         |   1 -
 .../camel/support/CamelObjectInputStream.java      |   2 +-
 .../org/apache/camel/support/EndpointHelper.java   |   1 -
 .../java/org/apache/camel/support/EventHelper.java |   2 +-
 .../camel/support/ExpressionListComparator.java    |   2 +-
 .../apache/camel/support/RestComponentHelper.java  | 308 ++++++++++-----------
 .../apache/camel/support/SimpleUuidGenerator.java  |   2 +-
 .../org/apache/camel/support/TimeoutMapEntry.java  |   2 +-
 .../camel/support/builder/OutputStreamBuilder.java |   2 +-
 .../management/NotificationSenderAdapter.java      |   2 +-
 .../support/processor/UnmarshalProcessor.java      |   2 +-
 .../camel/util/concurrent/CamelThreadFactory.java  |   2 +-
 .../java/org/apache/camel/xml/io/MXParser.java     |   5 +-
 .../org/apache/camel/xml/io/XmlPullParser.java     |   4 +-
 .../org/apache/camel/xml/io/XmlStreamReader.java   |   3 +-
 .../camel/xml/io/XmlStreamReaderException.java     |   5 +-
 .../camel/xml/jaxb/JaxbModelToXMLDumper.java       |   1 -
 .../converter/jaxp/StreamSourceConverter.java      |   2 +-
 .../camel/converter/jaxp/XmlErrorListener.java     |   2 +-
 .../org/apache/camel/util/xml/SourceCache.java     |   2 +-
 .../apache/camel/util/xml/StreamSourceCache.java   |   2 +-
 .../itest/jaxb/SpringLoadRouteFromXmlTest.java     |   2 +-
 .../camel/tooling/util/srcgen/JavaClass.java       |   1 -
 .../camel/tooling/util/PackageHelperTest.java      |   6 +-
 .../org/apache/camel/tooling/util/StringsTest.java |   6 -
 .../maven/plugins/javadoc/AbstractJavadocMojo.java |   4 +-
 .../camel/maven/packaging/ComponentDslMojo.java    |   1 -
 .../maven/packaging/PackageComponentMojo.java      |   3 -
 .../camel/maven/packaging/PackageJandexMojo.java   |   1 -
 .../camel/maven/packaging/PackageJaxbMojo.java     |   1 -
 .../camel/maven/packaging/PackageModelMojo.java    |   3 -
 .../camel/maven/packaging/PackageOtherMojo.java    |   1 -
 .../camel/maven/packaging/SchemaGeneratorMojo.java |   2 -
 .../camel/maven/packaging/UpdateReadmeMojo.java    |   2 -
 .../maven/packaging/ValidateComponentMojo.java     |   5 -
 .../ComponentDslInnerImplBuilderGenerator.java     |   1 -
 .../ComponentDslBuilderFactoryGeneratorTest.java   |   4 +-
 .../ComponentDslInnerBuilderGeneratorTest.java     |   2 +-
 .../ComponentDslInnerImplBuilderGeneratorTest.java |   4 +-
 .../ComponentsBuilderFactoryGeneratorTest.java     |   4 +-
 .../ComponentsDslMetadataRegistryTest.java         |   6 +-
 .../maven/generator/openapi/GenerateMojo.java      |   1 -
 .../maven/generator/openapi/GenerateXmlMojo.java   |   2 -
 .../generator/openapi/AppendableGenerator.java     |   1 -
 .../generator/openapi/DirectToOperationId.java     |   1 -
 .../camel/generator/openapi/FilerGenerator.java    |   1 -
 .../camel/generator/openapi/OperationVisitor.java  |   2 +-
 .../camel/generator/openapi/PathGenerator.java     |   1 -
 .../camel/generator/openapi/PathVisitor.java       |   5 +-
 .../openapi/RestDslDefinitionGenerator.java        |   1 -
 .../camel/generator/openapi/RestDslGenerator.java  |   2 -
 .../generator/openapi/RestDslXmlGenerator.java     |   3 -
 .../openapi/RestDefinitionEmitterTest.java         |   1 -
 .../generator/openapi/RestDslGeneratorTest.java    |   2 -
 .../generator/openapi/RestDslGeneratorV3Test.java  |   2 -
 .../openapi/RestDslSourceCodeGeneratorV3Test.java  |   3 -
 .../generator/openapi/RestDslXmlGeneratorTest.java |   1 -
 .../openapi/RestDslXmlGeneratorV3Test.java         |   1 -
 422 files changed, 670 insertions(+), 1027 deletions(-)

diff --git a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
index 9eb071f..0f0b0c7 100644
--- a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
+++ b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
@@ -29,12 +29,12 @@ import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.apache.camel.catalog.impl.CatalogHelper.loadText;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import static org.apache.camel.catalog.impl.CatalogHelper.loadText;
 
 public class CamelCatalogTest {
 
diff --git a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/AbstractAtomixClientProducer.java b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/AbstractAtomixClientProducer.java
index 47086dd..711894d 100644
--- a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/AbstractAtomixClientProducer.java
+++ b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/AbstractAtomixClientProducer.java
@@ -34,7 +34,6 @@ import org.apache.camel.util.ObjectHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 import static org.apache.camel.component.atomix.client.AtomixClientConstants.RESOURCE_ACTION_HAS_RESULT;
 import static org.apache.camel.component.atomix.client.AtomixClientConstants.RESOURCE_NAME;
 import static org.apache.camel.support.ObjectHelper.invokeMethodSafe;
diff --git a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingConsumer.java b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingConsumer.java
index f4beedd..10a319f 100644
--- a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingConsumer.java
+++ b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingConsumer.java
@@ -32,7 +32,6 @@ import org.apache.camel.util.ObjectHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 import static org.apache.camel.component.atomix.client.AtomixClientConstants.CHANNEL_NAME;
 import static org.apache.camel.component.atomix.client.AtomixClientConstants.MEMBER_NAME;
 import static org.apache.camel.component.atomix.client.AtomixClientConstants.RESOURCE_NAME;
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyFactoryTestSupport.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyFactoryTestSupport.java
index ccb46fd..95b79c9 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyFactoryTestSupport.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyFactoryTestSupport.java
@@ -30,9 +30,9 @@ import io.atomix.AtomixReplica;
 import io.atomix.catalyst.transport.Address;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.cluster.CamelClusterService;
+import org.apache.camel.cluster.ClusteredRoutePolicyFactory;
 import org.apache.camel.component.atomix.client.AtomixFactory;
 import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.cluster.ClusteredRoutePolicyFactory;
 import org.apache.camel.test.AvailablePortFinder;
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyTestSupport.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyTestSupport.java
index 6fc34cf..bfe7c2a 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyTestSupport.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyTestSupport.java
@@ -30,9 +30,9 @@ import io.atomix.AtomixReplica;
 import io.atomix.catalyst.transport.Address;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.cluster.CamelClusterService;
+import org.apache.camel.cluster.ClusteredRoutePolicy;
 import org.apache.camel.component.atomix.client.AtomixFactory;
 import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.cluster.ClusteredRoutePolicy;
 import org.apache.camel.test.AvailablePortFinder;
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixRoutePolicyFactoryTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixRoutePolicyFactoryTest.java
index 61de3e4..6fd4326 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixRoutePolicyFactoryTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixRoutePolicyFactoryTest.java
@@ -29,8 +29,8 @@ import java.util.concurrent.TimeUnit;
 import io.atomix.catalyst.transport.Address;
 import io.atomix.copycat.server.storage.StorageLevel;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.cluster.ClusteredRoutePolicyFactory;
+import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.test.AvailablePortFinder;
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixRoutePolicyTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixRoutePolicyTest.java
index 6d00d99..d11bfa0 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixRoutePolicyTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixRoutePolicyTest.java
@@ -29,8 +29,8 @@ import java.util.concurrent.TimeUnit;
 import io.atomix.catalyst.transport.Address;
 import io.atomix.copycat.server.storage.StorageLevel;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.cluster.ClusteredRoutePolicy;
+import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.test.AvailablePortFinder;
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroConsumerTestSupport.java b/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroConsumerTestSupport.java
index 0194c69..22de0de 100644
--- a/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroConsumerTestSupport.java
+++ b/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroConsumerTestSupport.java
@@ -28,7 +28,6 @@ import org.apache.camel.avro.test.TestPojo;
 import org.apache.camel.avro.test.TestReflection;
 import org.apache.camel.avro.test.TestReflectionImpl;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -189,4 +188,4 @@ public abstract class AvroConsumerTestSupport extends AvroTestSupport {
         Object response = reflectRequestor.request("getTestPojo", request);
         assertEquals(testPojo.getPojoName(), ((TestPojo) response).getPojoName());
     }
-}
\ No newline at end of file
+}
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 ba1e382..8c53c48 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.DdbEndpoint;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
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 4048c22..e19a253 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
@@ -22,11 +22,9 @@ import java.util.Set;
 import com.amazonaws.services.kinesisfirehose.AmazonKinesisFirehose;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
-import org.apache.camel.component.aws.kinesis.KinesisConfiguration;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.annotations.Component;
 import org.apache.camel.support.DefaultComponent;
-import org.apache.camel.util.ObjectHelper;
 
 @Component("aws-kinesis-firehose")
 public class KinesisFirehoseComponent extends DefaultComponent {
diff --git a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/firehose/KinesisFirehoseProducerTest.java b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/firehose/KinesisFirehoseProducerTest.java
index ea018b8..f1ce348 100644
--- a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/firehose/KinesisFirehoseProducerTest.java
+++ b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/firehose/KinesisFirehoseProducerTest.java
@@ -22,7 +22,6 @@ import com.amazonaws.services.kinesisfirehose.AmazonKinesisFirehose;
 import com.amazonaws.services.kinesisfirehose.model.PutRecordRequest;
 import com.amazonaws.services.kinesisfirehose.model.PutRecordResult;
 import org.apache.camel.Exchange;
-import org.apache.camel.ExchangePattern;
 import org.apache.camel.Message;
 import org.junit.Before;
 import org.junit.Test;
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 9f70af7..991c5dc 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
@@ -22,7 +22,6 @@ import com.amazonaws.services.kinesis.AmazonKinesis;
 import com.amazonaws.services.kinesis.model.PutRecordRequest;
 import com.amazonaws.services.kinesis.model.PutRecordResult;
 import org.apache.camel.Exchange;
-import org.apache.camel.ExchangePattern;
 import org.apache.camel.Message;
 import org.junit.Before;
 import org.junit.Test;
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 60bf115..0e2c638 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
@@ -25,7 +25,6 @@ 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;
 import org.junit.Before;
 import org.junit.Test;
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 ddff81a..a49e72e 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
@@ -25,7 +25,6 @@ import org.apache.camel.Endpoint;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.annotations.Component;
 import org.apache.camel.support.DefaultComponent;
-import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.PropertiesHelper;
 
 @Component("aws-swf")
diff --git a/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFEndpoint.java b/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFEndpoint.java
index 69c266e..0c0a40b 100644
--- a/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFEndpoint.java
+++ b/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFEndpoint.java
@@ -34,7 +34,6 @@ import org.apache.camel.Producer;
 import org.apache.camel.spi.UriEndpoint;
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.support.DefaultEndpoint;
-import org.apache.camel.support.ExchangeHelper;
 import org.apache.camel.support.PropertyBindingSupport;
 import org.apache.camel.util.ObjectHelper;
 
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 b38d791..1a84b02 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
@@ -25,7 +25,6 @@ import org.apache.camel.Endpoint;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.annotations.Component;
 import org.apache.camel.support.DefaultComponent;
-import org.apache.camel.util.ObjectHelper;
 
 /**
  * For working with Amazon Translate.
diff --git a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/AmazonDDBClientMock.java b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/AmazonDDBClientMock.java
index fcf1dde..53429d9 100644
--- a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/AmazonDDBClientMock.java
+++ b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/AmazonDDBClientMock.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.aws2.ddb;
 
 import java.time.Instant;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -47,7 +46,6 @@ import software.amazon.awssdk.services.dynamodb.model.PutItemRequest;
 import software.amazon.awssdk.services.dynamodb.model.PutItemResponse;
 import software.amazon.awssdk.services.dynamodb.model.QueryRequest;
 import software.amazon.awssdk.services.dynamodb.model.QueryResponse;
-import software.amazon.awssdk.services.dynamodb.model.ResourceNotFoundException;
 import software.amazon.awssdk.services.dynamodb.model.ScanRequest;
 import software.amazon.awssdk.services.dynamodb.model.ScanResponse;
 import software.amazon.awssdk.services.dynamodb.model.TableDescription;
diff --git a/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Configuration.java b/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Configuration.java
index 0733d93..04c8f8a 100644
--- a/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Configuration.java
+++ b/components/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Configuration.java
@@ -24,7 +24,6 @@ import org.apache.camel.spi.UriPath;
 import software.amazon.awssdk.core.Protocol;
 import software.amazon.awssdk.services.firehose.FirehoseClient;
 
-
 @UriParams
 public class KinesisFirehose2Configuration implements Cloneable {
 
diff --git a/components/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/SnsComponentConfigurationTest.java b/components/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/SnsComponentConfigurationTest.java
index eed68bc..431c717 100644
--- a/components/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/SnsComponentConfigurationTest.java
+++ b/components/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/SnsComponentConfigurationTest.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.aws2.sns;
 
-
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 import software.amazon.awssdk.core.Protocol;
diff --git a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentSpringTest.java b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentSpringTest.java
index 20ba9a1..b738066 100644
--- a/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentSpringTest.java
+++ b/components/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentSpringTest.java
@@ -31,7 +31,6 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 import software.amazon.awssdk.services.sqs.model.DeleteMessageResponse;
 import software.amazon.awssdk.services.sqs.model.SendMessageBatchResponse;
 
-
 public class SqsComponentSpringTest extends CamelSpringTestSupport {
 
     @EndpointInject("direct:start")
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 ad8e245..d0a2493 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;
 import org.apache.camel.spi.annotations.Component;
diff --git a/components/camel-bean/src/main/java/org/apache/camel/language/bean/Bean.java b/components/camel-bean/src/main/java/org/apache/camel/language/bean/Bean.java
index 7d494d1..b093ed4 100644
--- a/components/camel-bean/src/main/java/org/apache/camel/language/bean/Bean.java
+++ b/components/camel-bean/src/main/java/org/apache/camel/language/bean/Bean.java
@@ -36,4 +36,4 @@ import org.apache.camel.support.language.LanguageAnnotation;
 public @interface Bean {
     String ref();
     String method() default "";
-}
\ No newline at end of file
+}
diff --git a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/PutProducerIntegrationTest.java b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/PutProducerIntegrationTest.java
index 1637c01..bbbe84b 100644
--- a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/PutProducerIntegrationTest.java
+++ b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/PutProducerIntegrationTest.java
@@ -24,7 +24,6 @@ import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
 import org.apache.camel.Message;
-import org.apache.camel.Processor;
 import org.apache.camel.Produce;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/UnicodeHelperTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/UnicodeHelperTest.java
index fad38e9..6765887 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/UnicodeHelperTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/UnicodeHelperTest.java
@@ -27,7 +27,6 @@ import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 @SuppressWarnings("javadoc")
 public class UnicodeHelperTest {
     
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallDslTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallDslTest.java
index f72c730..a9fb7ef 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallDslTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallDslTest.java
@@ -32,7 +32,6 @@ 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.apache.camel.model.dataformat.BindyDataFormat;
-import org.apache.camel.model.dataformat.BindyType;
 import org.junit.Test;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintModelJAXBContextFactory.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintModelJAXBContextFactory.java
index dd296bf..7a10282 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintModelJAXBContextFactory.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintModelJAXBContextFactory.java
@@ -20,8 +20,8 @@ import java.util.LinkedHashSet;
 import java.util.Set;
 
 import org.apache.camel.core.xml.AbstractCamelContextFactoryBean;
-import org.apache.camel.xml.jaxb.DefaultModelJAXBContextFactory;
 import org.apache.camel.util.blueprint.SSLContextParametersFactoryBean;
+import org.apache.camel.xml.jaxb.DefaultModelJAXBContextFactory;
 
 public class BlueprintModelJAXBContextFactory extends DefaultModelJAXBContextFactory {
 
@@ -63,4 +63,4 @@ public class BlueprintModelJAXBContextFactory extends DefaultModelJAXBContextFac
         return packages.toString();
     }
 
-}
\ No newline at end of file
+}
diff --git a/components/camel-browse/src/main/java/org/apache/camel/component/browse/BrowseComponent.java b/components/camel-browse/src/main/java/org/apache/camel/component/browse/BrowseComponent.java
index 1fe1661..8f6be24 100644
--- a/components/camel-browse/src/main/java/org/apache/camel/component/browse/BrowseComponent.java
+++ b/components/camel-browse/src/main/java/org/apache/camel/component/browse/BrowseComponent.java
@@ -38,4 +38,4 @@ public class BrowseComponent extends DefaultComponent {
         setProperties(endpoint, parameters);
         return endpoint;
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionErrorHandlerReifier.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionErrorHandlerReifier.java
index 012d113..40a244f 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionErrorHandlerReifier.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionErrorHandlerReifier.java
@@ -22,13 +22,13 @@ import java.util.concurrent.ScheduledExecutorService;
 import org.apache.camel.ErrorHandlerFactory;
 import org.apache.camel.LoggingLevel;
 import org.apache.camel.Processor;
+import org.apache.camel.Route;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.model.TransactedDefinition;
 import org.apache.camel.reifier.TransactedReifier;
 import org.apache.camel.reifier.errorhandler.ErrorHandlerReifier;
 import org.apache.camel.spi.ExecutorServiceManager;
 import org.apache.camel.spi.Policy;
-import org.apache.camel.Route;
 import org.apache.camel.spi.ThreadPoolProfile;
 import org.apache.camel.spi.TransactedPolicy;
 import org.apache.camel.util.ObjectHelper;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionPolicy.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionPolicy.java
index 9add464..74ecaa3 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionPolicy.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionPolicy.java
@@ -21,13 +21,13 @@ import javax.transaction.TransactionManager;
 
 import org.apache.camel.NamedNode;
 import org.apache.camel.Processor;
+import org.apache.camel.Route;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.builder.ErrorHandlerBuilder;
 import org.apache.camel.builder.ErrorHandlerBuilderRef;
 import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.model.RouteDefinition;
 import org.apache.camel.reifier.errorhandler.ErrorHandlerReifier;
-import org.apache.camel.Route;
 import org.apache.camel.spi.TransactedPolicy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ErrorHandlerDefinition.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ErrorHandlerDefinition.java
index 81015da..3246a7f 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ErrorHandlerDefinition.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ErrorHandlerDefinition.java
@@ -22,7 +22,6 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.camel.LoggingLevel;
 import org.apache.camel.model.IdentifiedType;
 
 /**
diff --git a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTestBase.java b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTestBase.java
index 9138bce..228cd12 100644
--- a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTestBase.java
+++ b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTestBase.java
@@ -20,7 +20,6 @@ import java.io.IOException;
 import java.security.GeneralSecurityException;
 
 import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
 import org.apache.camel.Produce;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryTest.java
index ffbeb38..e549ff4 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryTest.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryTest.java
@@ -28,9 +28,9 @@ import java.util.stream.IntStream;
 
 import com.orbitz.consul.Consul;
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.cluster.ClusteredRoutePolicyFactory;
 import org.apache.camel.component.consul.ConsulTestSupport;
 import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.cluster.ClusteredRoutePolicyFactory;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyTest.java
index 4d15d53..2aa9370 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyTest.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyTest.java
@@ -28,9 +28,9 @@ import java.util.stream.IntStream;
 
 import com.orbitz.consul.Consul;
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.cluster.ClusteredRoutePolicy;
 import org.apache.camel.component.consul.ConsulTestSupport;
 import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.cluster.ClusteredRoutePolicy;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
diff --git a/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaComponent.java b/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaComponent.java
index ea1131d..a087f9a 100644
--- a/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaComponent.java
+++ b/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaComponent.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.corda;
 
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.annotations.Component;
diff --git a/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseConsumer.java b/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseConsumer.java
index 5202d04..bc7b979 100644
--- a/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseConsumer.java
+++ b/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseConsumer.java
@@ -27,7 +27,6 @@ import org.apache.camel.support.DefaultScheduledPollConsumer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 import static org.apache.camel.component.couchbase.CouchbaseConstants.HEADER_DESIGN_DOCUMENT_NAME;
 import static org.apache.camel.component.couchbase.CouchbaseConstants.HEADER_ID;
 import static org.apache.camel.component.couchbase.CouchbaseConstants.HEADER_KEY;
diff --git a/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseProducer.java b/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseProducer.java
index b7cf88d..befbf32 100644
--- a/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseProducer.java
+++ b/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseProducer.java
@@ -28,7 +28,6 @@ import org.apache.camel.support.DefaultProducer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 import static org.apache.camel.component.couchbase.CouchbaseConstants.COUCHBASE_DELETE;
 import static org.apache.camel.component.couchbase.CouchbaseConstants.COUCHBASE_GET;
 import static org.apache.camel.component.couchbase.CouchbaseConstants.COUCHBASE_PUT;
diff --git a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/SignedDataVerifier.java b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/SignedDataVerifier.java
index 35de904..0c45ee5 100644
--- a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/SignedDataVerifier.java
+++ b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/SignedDataVerifier.java
@@ -40,7 +40,6 @@ import org.bouncycastle.asn1.cms.CMSAttributes;
 import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
 import org.bouncycastle.cert.X509CertificateHolder;
 import org.bouncycastle.cert.jcajce.JcaCertStore;
-import org.bouncycastle.cms.CMSAttributeTableGenerator;
 import org.bouncycastle.cms.CMSException;
 import org.bouncycastle.cms.CMSSignedDataParser;
 import org.bouncycastle.cms.CMSSignerDigestMismatchException;
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/ssl/SslGlobalTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/ssl/SslGlobalTest.java
index 011eee7..d8fab7a 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/ssl/SslGlobalTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/ssl/SslGlobalTest.java
@@ -31,7 +31,6 @@ import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-
 import static org.hamcrest.core.Is.is;
 
 public class SslGlobalTest extends CamelSpringTestSupport {
diff --git a/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetComponent.java b/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetComponent.java
index 521757c..357a626 100644
--- a/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetComponent.java
+++ b/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetComponent.java
@@ -36,4 +36,4 @@ public class DataSetComponent extends DefaultComponent {
         DataSet dataSet = CamelContextHelper.mandatoryLookup(getCamelContext(), remaining, DataSet.class);
         return new DataSetEndpoint(uri, this, dataSet);
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetTestComponent.java b/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetTestComponent.java
index bfbf244..b8d784f 100644
--- a/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetTestComponent.java
+++ b/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetTestComponent.java
@@ -51,4 +51,4 @@ public class DataSetTestComponent extends DefaultComponent {
         return answer;
     }
 
-}
\ No newline at end of file
+}
diff --git a/components/camel-debezium-common/camel-debezium-common-component/src/main/java/org/apache/camel/component/debezium/DebeziumComponent.java b/components/camel-debezium-common/camel-debezium-common-component/src/main/java/org/apache/camel/component/debezium/DebeziumComponent.java
index 18919df..1647c0a 100644
--- a/components/camel-debezium-common/camel-debezium-common-component/src/main/java/org/apache/camel/component/debezium/DebeziumComponent.java
+++ b/components/camel-debezium-common/camel-debezium-common-component/src/main/java/org/apache/camel/component/debezium/DebeziumComponent.java
@@ -77,4 +77,4 @@ public abstract class DebeziumComponent<C extends EmbeddedDebeziumConfiguration>
     public abstract C getConfiguration();
 
     public abstract void setConfiguration(C configuration);
-}
\ No newline at end of file
+}
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerCustomCmdExecFactoryTestIT.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerCustomCmdExecFactoryTestIT.java
index 552259a..021d20c 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerCustomCmdExecFactoryTestIT.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerCustomCmdExecFactoryTestIT.java
@@ -19,8 +19,6 @@ package org.apache.camel.component.docker.it;
 import java.util.concurrent.TimeUnit;
 
 import com.github.dockerjava.api.model.Version;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
diff --git a/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java b/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java
index 9f817d5..7948443 100644
--- a/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java
+++ b/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java
@@ -50,7 +50,6 @@ import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 import static org.apache.camel.component.elasticsearch.ElasticsearchConstants.PARAM_SCROLL;
 import static org.apache.camel.component.elasticsearch.ElasticsearchConstants.PARAM_SCROLL_KEEP_ALIVE_MS;
 
diff --git a/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchBaseTest.java b/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchBaseTest.java
index fd56991..367a112 100644
--- a/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchBaseTest.java
+++ b/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchBaseTest.java
@@ -34,7 +34,6 @@ import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
 import org.testcontainers.utility.Base58;
 
-
 public class ElasticsearchBaseTest extends CamelTestSupport {
     public static final String ELASTICSEARCH_IMAGE = "elasticsearch:7.3.2";
     public static final int ELASTICSEARCH_DEFAULT_PORT = 9200;
diff --git a/components/camel-elytron/src/main/java/org/apache/camel/component/elytron/ElytronConsumer.java b/components/camel-elytron/src/main/java/org/apache/camel/component/elytron/ElytronConsumer.java
index 9454fd8..f81e33b 100644
--- a/components/camel-elytron/src/main/java/org/apache/camel/component/elytron/ElytronConsumer.java
+++ b/components/camel-elytron/src/main/java/org/apache/camel/component/elytron/ElytronConsumer.java
@@ -28,8 +28,6 @@ import org.apache.camel.component.undertow.UndertowEndpoint;
 import org.wildfly.security.auth.server.SecurityIdentity;
 import org.wildfly.security.authz.Roles;
 
-
-
 /**
  * Consumer contains decides if request contains required roles (which are defined for endpoint)
  *
diff --git a/components/camel-elytron/src/test/java/org/apache/camel/component/elytron/BaseElytronTest.java b/components/camel-elytron/src/test/java/org/apache/camel/component/elytron/BaseElytronTest.java
index 3a24744..902009c 100644
--- a/components/camel-elytron/src/test/java/org/apache/camel/component/elytron/BaseElytronTest.java
+++ b/components/camel-elytron/src/test/java/org/apache/camel/component/elytron/BaseElytronTest.java
@@ -30,11 +30,9 @@ import org.junit.BeforeClass;
 import org.wildfly.security.WildFlyElytronBaseProvider;
 import org.wildfly.security.auth.permission.LoginPermission;
 import org.wildfly.security.auth.realm.token.TokenSecurityRealm;
-import org.wildfly.security.auth.realm.token.validator.JwtValidator;
 import org.wildfly.security.auth.server.SecurityDomain;
 import org.wildfly.security.authz.RoleMapper;
 import org.wildfly.security.authz.Roles;
-import org.wildfly.security.http.HttpConstants;
 import org.wildfly.security.permission.PermissionVerifier;
 
 /**
diff --git a/components/camel-etcd/src/test/java/org/apache/camel/component/etcd/EtcdKeysTest.java b/components/camel-etcd/src/test/java/org/apache/camel/component/etcd/EtcdKeysTest.java
index 9ca98fa..7c7a310 100644
--- a/components/camel-etcd/src/test/java/org/apache/camel/component/etcd/EtcdKeysTest.java
+++ b/components/camel-etcd/src/test/java/org/apache/camel/component/etcd/EtcdKeysTest.java
@@ -32,7 +32,6 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.fail;
 
 public class EtcdKeysTest extends EtcdTestSupport {
 
diff --git a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookConsumer.java b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookConsumer.java
index 54b41ea..4183b8d 100644
--- a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookConsumer.java
+++ b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookConsumer.java
@@ -44,7 +44,6 @@ import org.apache.camel.support.ScheduledPollConsumer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 import static org.apache.camel.component.facebook.FacebookConstants.FACEBOOK_DATE_FORMAT;
 import static org.apache.camel.component.facebook.FacebookConstants.READING_PREFIX;
 import static org.apache.camel.component.facebook.FacebookConstants.READING_PROPERTY;
diff --git a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookEndpoint.java b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookEndpoint.java
index dbce597..fc99cf0 100644
--- a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookEndpoint.java
+++ b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookEndpoint.java
@@ -41,7 +41,6 @@ import org.apache.camel.util.ObjectHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 import static org.apache.camel.component.facebook.data.FacebookMethodsTypeHelper.convertToGetMethod;
 import static org.apache.camel.component.facebook.data.FacebookMethodsTypeHelper.convertToSearchMethod;
 import static org.apache.camel.component.facebook.data.FacebookMethodsTypeHelper.getCandidateMethods;
diff --git a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirConfigurationIT.java b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirConfigurationIT.java
index e3d0f85..7388522 100644
--- a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirConfigurationIT.java
+++ b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirConfigurationIT.java
@@ -20,7 +20,6 @@ import java.util.List;
 
 import ca.uhn.fhir.rest.api.EncodingEnum;
 import ca.uhn.fhir.rest.api.SummaryEnum;
-import ca.uhn.fhir.rest.client.api.IClientInterceptor;
 import ca.uhn.fhir.rest.client.impl.GenericClient;
 import org.apache.camel.CamelContext;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirCustomClientConfigurationIT.java b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirCustomClientConfigurationIT.java
index 28cfe9b..5214566 100644
--- a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirCustomClientConfigurationIT.java
+++ b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirCustomClientConfigurationIT.java
@@ -50,11 +50,9 @@ import ca.uhn.fhir.rest.gclient.IUntypedQuery;
 import ca.uhn.fhir.rest.gclient.IUpdate;
 import ca.uhn.fhir.rest.gclient.IValidate;
 import org.apache.camel.BindToRegistry;
-import org.apache.camel.CamelContext;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.fhir.internal.FhirApiCollection;
 import org.apache.camel.component.fhir.internal.FhirCreateApiMethod;
-import org.apache.camel.impl.DefaultCamelContext;
 import org.hl7.fhir.instance.model.api.IBaseBundle;
 import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.junit.Test;
diff --git a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirOperationIT.java b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirOperationIT.java
index 77bc3fe..d33ea3b 100644
--- a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirOperationIT.java
+++ b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirOperationIT.java
@@ -24,7 +24,6 @@ import org.apache.camel.component.fhir.internal.FhirApiCollection;
 import org.apache.camel.component.fhir.internal.FhirOperationApiMethod;
 import org.hl7.fhir.dstu3.model.Bundle;
 import org.hl7.fhir.dstu3.model.IdType;
-import org.hl7.fhir.dstu3.model.IntegerType;
 import org.hl7.fhir.dstu3.model.Parameters;
 import org.hl7.fhir.dstu3.model.Patient;
 import org.junit.Ignore;
diff --git a/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java b/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
index 81c5e3d..83890b0 100644
--- a/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
+++ b/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.file;
 
-import java.io.IOException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Comparator;
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsEndpoint.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsEndpoint.java
index 995524f..cf4b8f9 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsEndpoint.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsEndpoint.java
@@ -28,7 +28,6 @@ import javax.net.ssl.SSLSocket;
 import javax.net.ssl.TrustManagerFactory;
 
 import org.apache.camel.api.management.ManagedResource;
-import org.apache.camel.component.file.GenericFileEndpoint;
 import org.apache.camel.spi.UriEndpoint;
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.support.jsse.SSLContextParameters;
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpConsumerTemplateRollbackTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpConsumerTemplateRollbackTest.java
index 6c04a5b..1609522 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpConsumerTemplateRollbackTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpConsumerTemplateRollbackTest.java
@@ -25,10 +25,10 @@ import org.apache.camel.component.file.GenericFileOperationFailedException;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
-import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
 
 public class FromFtpConsumerTemplateRollbackTest extends FtpServerTestSupport {
 
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerThrowExceptionOnLoginFailedTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerThrowExceptionOnLoginFailedTest.java
index c258922..8184fc1 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerThrowExceptionOnLoginFailedTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerThrowExceptionOnLoginFailedTest.java
@@ -28,9 +28,9 @@ import org.apache.camel.spi.PollingConsumerPollStrategy;
 import org.apache.camel.support.service.ServiceSupport;
 import org.junit.jupiter.api.Test;
 
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
 
 /**
  * Unit test for login failure due bad password and no re connect attempts
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerDoneFileNameTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerDoneFileNameTest.java
index fabe335..6ab0163 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerDoneFileNameTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerDoneFileNameTest.java
@@ -23,10 +23,10 @@ import org.apache.camel.Exchange;
 import org.apache.camel.ExpressionIllegalSyntaxException;
 import org.junit.jupiter.api.Test;
 
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
-import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
 
 public class FtpProducerDoneFileNameTest extends FtpServerTestSupport {
 
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistFailTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistFailTest.java
index 54a9370..5834829 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistFailTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistFailTest.java
@@ -24,8 +24,8 @@ import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
 import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
 
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/OsgiParserFactoryTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/OsgiParserFactoryTest.java
index b39ea41..8179634 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/OsgiParserFactoryTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/OsgiParserFactoryTest.java
@@ -33,8 +33,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import static org.hamcrest.core.IsInstanceOf.instanceOf;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.IsInstanceOf.instanceOf;
 import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpChmodTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpChmodTest.java
index c8f4076..7f7fd18 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpChmodTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpChmodTest.java
@@ -20,10 +20,9 @@ import java.io.File;
 
 import org.apache.camel.Exchange;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledOnJre;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class SftpChmodTest extends SftpServerTestSupport {
 
diff --git a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamConsumer.java b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamConsumer.java
index 27f24dd..9fb9844 100644
--- a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamConsumer.java
+++ b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamConsumer.java
@@ -26,7 +26,6 @@ import com.google.api.client.util.DateTime;
 import com.google.api.services.calendar.Calendar;
 import com.google.api.services.calendar.model.Event;
 import com.google.api.services.calendar.model.Events;
-import org.apache.camel.AsyncCallback;
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamConsumer.java b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamConsumer.java
index d3c25fb..8f90e0f 100644
--- a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamConsumer.java
+++ b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamConsumer.java
@@ -26,7 +26,6 @@ import com.google.api.services.gmail.Gmail;
 import com.google.api.services.gmail.model.ListMessagesResponse;
 import com.google.api.services.gmail.model.Message;
 import com.google.api.services.gmail.model.ModifyMessageRequest;
-import org.apache.camel.AsyncCallback;
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExtendedExchange;
diff --git a/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpoint.java b/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpoint.java
index 73e34f4..fef727d 100644
--- a/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpoint.java
+++ b/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpoint.java
@@ -16,14 +16,8 @@
  */
 package org.apache.camel.component.google.pubsub;
 
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
 
-import com.google.cloud.pubsub.v1.Publisher;
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.RemovalListener;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.ExchangePattern;
diff --git a/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/AcknowledgementTest.java b/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/AcknowledgementTest.java
index a8636e2..8d5a80c 100644
--- a/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/AcknowledgementTest.java
+++ b/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/AcknowledgementTest.java
@@ -26,7 +26,6 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.google.pubsub.PubsubTestSupport;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.support.DefaultExchange;
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 public class AcknowledgementTest extends PubsubTestSupport {
diff --git a/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/GroupedExchangeRoundtripTest.java b/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/GroupedExchangeRoundtripTest.java
index 62ddc1e..a5b98f6 100644
--- a/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/GroupedExchangeRoundtripTest.java
+++ b/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/GroupedExchangeRoundtripTest.java
@@ -28,7 +28,6 @@ import org.apache.camel.component.google.pubsub.PubsubTestSupport;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.processor.aggregate.GroupedExchangeAggregationStrategy;
 import org.apache.camel.support.DefaultExchange;
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 public class GroupedExchangeRoundtripTest extends PubsubTestSupport {
diff --git a/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/SingleExchangeRoundtripTest.java b/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/SingleExchangeRoundtripTest.java
index d3de77c..1354fc9 100644
--- a/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/SingleExchangeRoundtripTest.java
+++ b/components/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/SingleExchangeRoundtripTest.java
@@ -30,7 +30,6 @@ import org.apache.camel.component.google.pubsub.GooglePubsubConstants;
 import org.apache.camel.component.google.pubsub.PubsubTestSupport;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.support.DefaultExchange;
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 public class SingleExchangeRoundtripTest extends PubsubTestSupport {
diff --git a/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/GrpcConfiguration.java b/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/GrpcConfiguration.java
index be5709a..5f7dc68 100644
--- a/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/GrpcConfiguration.java
+++ b/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/GrpcConfiguration.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.grpc;
 
 import java.net.URI;
-import java.util.Map;
 
 import io.grpc.internal.GrpcUtil;
 import io.grpc.netty.NegotiationType;
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/set/HazelcastSetEndpoint.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/set/HazelcastSetEndpoint.java
index 3d6d8f1..13d90c3 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/set/HazelcastSetEndpoint.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/set/HazelcastSetEndpoint.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.hazelcast.set;
 import com.hazelcast.core.HazelcastInstance;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
-import org.apache.camel.Endpoint;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
 import org.apache.camel.component.hazelcast.HazelcastCommand;
diff --git a/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java b/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java
index 9c9c069..ac1c92e 100644
--- a/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java
+++ b/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java
@@ -22,7 +22,6 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.util.IOHelper;
 import org.apache.hadoop.conf.Configuration;
diff --git a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsConsumerTest.java b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsConsumerTest.java
index 47d8ef6..15b4bd6 100644
--- a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsConsumerTest.java
+++ b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsConsumerTest.java
@@ -30,7 +30,6 @@ import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 
diff --git a/components/camel-hipchat/src/main/java/org/apache/camel/component/hipchat/HipchatProducer.java b/components/camel-hipchat/src/main/java/org/apache/camel/component/hipchat/HipchatProducer.java
index d2140e8..131ff5b 100644
--- a/components/camel-hipchat/src/main/java/org/apache/camel/component/hipchat/HipchatProducer.java
+++ b/components/camel-hipchat/src/main/java/org/apache/camel/component/hipchat/HipchatProducer.java
@@ -34,7 +34,6 @@ import org.apache.http.entity.StringEntity;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 import static org.apache.camel.util.UnsafeUriCharactersEncoder.encodeHttpURI;
 
 /**
diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecLongTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecLongTest.java
index dddb6bb..5be4a17 100644
--- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecLongTest.java
+++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecLongTest.java
@@ -23,8 +23,6 @@ import ca.uhn.hl7v2.model.Message;
 import ca.uhn.hl7v2.model.v25.message.MDM_T02;
 import ca.uhn.hl7v2.model.v25.segment.MSH;
 import org.apache.camel.BindToRegistry;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.util.IOHelper;
 import org.junit.Test;
diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecMessageFloodingTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecMessageFloodingTest.java
index badaa3d..183201f 100644
--- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecMessageFloodingTest.java
+++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecMessageFloodingTest.java
@@ -27,8 +27,6 @@ import java.util.concurrent.TimeUnit;
 
 import ca.uhn.hl7v2.model.Message;
 import org.apache.camel.BindToRegistry;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.Test;
 
diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecPlainStringTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecPlainStringTest.java
index 03d87c1..df6e0d9 100644
--- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecPlainStringTest.java
+++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecPlainStringTest.java
@@ -17,8 +17,6 @@
 package org.apache.camel.component.hl7;
 
 import org.apache.camel.BindToRegistry;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecStandAndEndBytesTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecStandAndEndBytesTest.java
index afbc852..28da793 100644
--- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecStandAndEndBytesTest.java
+++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecStandAndEndBytesTest.java
@@ -22,8 +22,6 @@ import ca.uhn.hl7v2.model.v24.segment.MSA;
 import ca.uhn.hl7v2.model.v24.segment.MSH;
 import ca.uhn.hl7v2.model.v24.segment.QRD;
 import org.apache.camel.BindToRegistry;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.Test;
 
diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecTest.java
index 4c0b73b..40ebcbd 100644
--- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecTest.java
+++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecTest.java
@@ -22,8 +22,6 @@ import ca.uhn.hl7v2.model.v24.segment.MSA;
 import ca.uhn.hl7v2.model.v24.segment.MSH;
 import ca.uhn.hl7v2.model.v24.segment.QRD;
 import org.apache.camel.BindToRegistry;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.Test;
 
diff --git a/components/camel-http-base/src/main/java/org/apache/camel/http/base/HttpOperationFailedException.java b/components/camel-http-base/src/main/java/org/apache/camel/http/base/HttpOperationFailedException.java
index a26e891..6070ee4 100644
--- a/components/camel-http-base/src/main/java/org/apache/camel/http/base/HttpOperationFailedException.java
+++ b/components/camel-http-base/src/main/java/org/apache/camel/http/base/HttpOperationFailedException.java
@@ -74,4 +74,4 @@ public class HttpOperationFailedException extends CamelException {
         return responseBody;
     }
 
-}
\ No newline at end of file
+}
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
index 500a153..9d58cbb 100644
--- a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
+++ b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
@@ -75,7 +75,6 @@ import org.apache.http.util.EntityUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 import static org.apache.http.HttpHeaders.HOST;
 
 public class HttpProducer extends DefaultProducer {
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerExplicitConnectionCloseTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerExplicitConnectionCloseTest.java
index fc85195..d38e60b 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerExplicitConnectionCloseTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerExplicitConnectionCloseTest.java
@@ -29,7 +29,6 @@ import org.junit.Test;
 
 import static org.apache.camel.component.http.HttpMethods.GET;
 
-
 /**
  * Unit test that show custom header filter useful to send Connection Close header
  */
diff --git a/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorFactory.java b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorFactory.java
index 12bd23f..0d848a7 100644
--- a/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorFactory.java
+++ b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorFactory.java
@@ -17,9 +17,9 @@
 package org.apache.camel.component.hystrix.processor;
 
 import org.apache.camel.Processor;
+import org.apache.camel.Route;
 import org.apache.camel.impl.engine.TypedProcessorFactory;
 import org.apache.camel.model.CircuitBreakerDefinition;
-import org.apache.camel.Route;
 
 /**
  * To integrate camel-hystrix with the Camel routes using the Hystrix EIP.
diff --git a/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixReifier.java b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixReifier.java
index 524ce45..46c026e 100644
--- a/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixReifier.java
+++ b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixReifier.java
@@ -29,12 +29,12 @@ import com.netflix.hystrix.HystrixThreadPoolProperties;
 import org.apache.camel.CamelContext;
 import org.apache.camel.ExtendedCamelContext;
 import org.apache.camel.Processor;
+import org.apache.camel.Route;
 import org.apache.camel.model.CircuitBreakerDefinition;
 import org.apache.camel.model.HystrixConfigurationDefinition;
 import org.apache.camel.model.Model;
 import org.apache.camel.reifier.ProcessorReifier;
 import org.apache.camel.spi.BeanIntrospection;
-import org.apache.camel.Route;
 import org.apache.camel.support.PropertyBindingSupport;
 import org.apache.camel.util.function.Suppliers;
 
diff --git a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixHierarchicalConfigTest.java b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixHierarchicalConfigTest.java
index 1d2a06f..f07c4fd 100644
--- a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixHierarchicalConfigTest.java
+++ b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixHierarchicalConfigTest.java
@@ -17,12 +17,12 @@
 package org.apache.camel.component.hystrix.processor;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.Route;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.impl.engine.DefaultRoute;
 import org.apache.camel.model.CircuitBreakerDefinition;
 import org.apache.camel.model.HystrixConfigurationDefinition;
 import org.apache.camel.model.Model;
-import org.apache.camel.Route;
 import org.apache.camel.support.SimpleRegistry;
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/SpringHystrixRouteHierarchicalConfigTest.java b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/SpringHystrixRouteHierarchicalConfigTest.java
index bf254bd..267dfdf 100644
--- a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/SpringHystrixRouteHierarchicalConfigTest.java
+++ b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/SpringHystrixRouteHierarchicalConfigTest.java
@@ -17,11 +17,11 @@
 package org.apache.camel.component.hystrix.processor;
 
 import org.apache.camel.ExtendedCamelContext;
+import org.apache.camel.Route;
 import org.apache.camel.impl.engine.DefaultRoute;
 import org.apache.camel.model.CircuitBreakerDefinition;
 import org.apache.camel.model.HystrixConfigurationDefinition;
 import org.apache.camel.model.RouteDefinition;
-import org.apache.camel.Route;
 import org.apache.camel.test.spring.CamelSpringTestSupport;
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/AbstractIecComponent.java b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/AbstractIecComponent.java
index 5ccb58b..356273a 100644
--- a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/AbstractIecComponent.java
+++ b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/AbstractIecComponent.java
@@ -28,7 +28,6 @@ import org.eclipse.neoscada.protocol.iec60870.ProtocolOptions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 import static java.util.Objects.requireNonNull;
 
 public abstract class AbstractIecComponent<T1, T2 extends BaseOptions<T2>> extends DefaultComponent {
diff --git a/components/camel-ipfs/src/test/java/org/apache/camel/component/ipfs/SimpleIPFSTest.java b/components/camel-ipfs/src/test/java/org/apache/camel/component/ipfs/SimpleIPFSTest.java
index 162fdaf..3852173 100644
--- a/components/camel-ipfs/src/test/java/org/apache/camel/component/ipfs/SimpleIPFSTest.java
+++ b/components/camel-ipfs/src/test/java/org/apache/camel/component/ipfs/SimpleIPFSTest.java
@@ -32,6 +32,7 @@ import org.apache.camel.impl.DefaultCamelContext;
 import org.junit.Assert;
 import org.junit.Assume;
 import org.junit.Test;
+
 /*
 
 > ipfs config Addresses.Gateway /ip4/127.0.0.1/tcp/8088
diff --git a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConfiguration.java b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConfiguration.java
index 5fa573e..5443e2d 100644
--- a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConfiguration.java
+++ b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConfiguration.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.irc;
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -32,7 +31,6 @@ import org.apache.camel.spi.UriParams;
 import org.apache.camel.spi.UriPath;
 import org.apache.camel.support.jsse.SSLContextParameters;
 import org.apache.camel.util.StringHelper;
-import org.apache.camel.util.URISupport;
 import org.apache.camel.util.UnsafeUriCharactersEncoder;
 import org.schwering.irc.lib.ssl.SSLDefaultTrustManager;
 import org.schwering.irc.lib.ssl.SSLTrustManager;
diff --git a/components/camel-irc/src/test/java/org/apache/camel/component/irc/CodehausIrcChat.java b/components/camel-irc/src/test/java/org/apache/camel/component/irc/CodehausIrcChat.java
index 9fee67f..201a1fe 100644
--- a/components/camel-irc/src/test/java/org/apache/camel/component/irc/CodehausIrcChat.java
+++ b/components/camel-irc/src/test/java/org/apache/camel/component/irc/CodehausIrcChat.java
@@ -17,8 +17,6 @@
 package org.apache.camel.component.irc;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 
 import org.schwering.irc.lib.IRCConnection;
 import org.schwering.irc.lib.IRCEventAdapter;
diff --git a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcConfigurationTest.java b/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcConfigurationTest.java
index 024e675..e484927 100644
--- a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcConfigurationTest.java
+++ b/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcConfigurationTest.java
@@ -16,10 +16,8 @@
  */
 package org.apache.camel.component.irc;
 
-import java.net.URI;
 import java.util.List;
 
-import org.apache.camel.Endpoint;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalContentTypeHeaderTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalContentTypeHeaderTest.java
index cdec23a..f84a0c7 100644
--- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalContentTypeHeaderTest.java
+++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalContentTypeHeaderTest.java
@@ -20,7 +20,6 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.model.dataformat.JsonLibrary;
 import org.apache.camel.test.junit4.CamelTestSupport;
diff --git a/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheConfiguration.java b/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheConfiguration.java
index 1a830cf..aaf28d2 100644
--- a/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheConfiguration.java
+++ b/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheConfiguration.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.jcache;
 
-import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Properties;
@@ -26,7 +25,6 @@ import javax.cache.CacheManager;
 import javax.cache.configuration.Configuration;
 import javax.cache.configuration.Factory;
 import javax.cache.event.CacheEntryEventFilter;
-import javax.cache.event.EventType;
 import javax.cache.expiry.ExpiryPolicy;
 import javax.cache.integration.CacheLoader;
 import javax.cache.integration.CacheWriter;
diff --git a/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheManager.java b/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheManager.java
index fa379a5..d8f07af 100644
--- a/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheManager.java
+++ b/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheManager.java
@@ -27,9 +27,7 @@ import javax.cache.CacheManager;
 import javax.cache.Caching;
 import javax.cache.configuration.Configuration;
 import javax.cache.configuration.MutableConfiguration;
-import javax.cache.event.CacheEntryEvent;
 import javax.cache.event.CacheEntryEventFilter;
-import javax.cache.event.CacheEntryListenerException;
 import javax.cache.event.EventType;
 import javax.cache.spi.CachingProvider;
 
diff --git a/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/policy/JCachePolicy.java b/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/policy/JCachePolicy.java
index 981f20e..cc6d76e 100644
--- a/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/policy/JCachePolicy.java
+++ b/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/policy/JCachePolicy.java
@@ -27,8 +27,8 @@ import javax.cache.configuration.MutableConfiguration;
 import org.apache.camel.Expression;
 import org.apache.camel.NamedNode;
 import org.apache.camel.Processor;
-import org.apache.camel.spi.Policy;
 import org.apache.camel.Route;
+import org.apache.camel.spi.Policy;
 import org.apache.camel.util.ObjectHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftClusteredRoutePolicyTest.java b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftClusteredRoutePolicyTest.java
index 991eaea..8160142 100644
--- a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftClusteredRoutePolicyTest.java
+++ b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftClusteredRoutePolicyTest.java
@@ -21,9 +21,9 @@ import java.util.ArrayList;
 import org.apache.camel.CamelContext;
 import org.apache.camel.ServiceStatus;
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.cluster.ClusteredRoutePolicy;
 import org.apache.camel.component.jgroups.raft.utils.NopStateMachine;
 import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.cluster.ClusteredRoutePolicy;
 import org.jgroups.JChannel;
 import org.jgroups.raft.RaftHandle;
 import org.junit.Test;
diff --git a/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/SimpleBeanFixture.java b/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/SimpleBeanFixture.java
index c8809e1..c8aaa8a 100644
--- a/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/SimpleBeanFixture.java
+++ b/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/SimpleBeanFixture.java
@@ -207,4 +207,4 @@ public class SimpleBeanFixture {
     protected MockEndpointFixture getMockFixture() {
         return mMockEndpoint;
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltDefaultrTest.java b/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltDefaultrTest.java
index df23077..04acaed 100644
--- a/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltDefaultrTest.java
+++ b/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltDefaultrTest.java
@@ -20,7 +20,6 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
diff --git a/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltRemovrTest.java b/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltRemovrTest.java
index fc029e9..2ed030d 100644
--- a/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltRemovrTest.java
+++ b/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltRemovrTest.java
@@ -20,7 +20,6 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
diff --git a/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltQueryTest.java b/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltQueryTest.java
index 4f16d35..e62acc7 100644
--- a/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltQueryTest.java
+++ b/components/camel-jslt/src/test/java/org/apache/camel/component/jslt/JsltQueryTest.java
@@ -24,8 +24,6 @@ import org.apache.camel.test.junit4.CamelTestSupport;
 import org.apache.camel.util.IOHelper;
 import org.junit.Test;
 
-
-
 /**
  * Test using query expressions
  */
diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathCharsetTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathCharsetTest.java
index 27cde61..bd345f2 100644
--- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathCharsetTest.java
+++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathCharsetTest.java
@@ -24,7 +24,6 @@ import java.util.List;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit5.CamelTestSupport;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaComponent.java b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaComponent.java
index 710fa20..b5facc5 100644
--- a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaComponent.java
+++ b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaComponent.java
@@ -17,10 +17,8 @@
 package org.apache.camel.component.kafka;
 
 import java.util.Map;
-import java.util.concurrent.ExecutorService;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.Exchange;
 import org.apache.camel.SSLContextParametersAware;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.annotations.Component;
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaComponentTest.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaComponentTest.java
index ad2aaeb..8182dce 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaComponentTest.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaComponentTest.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.kafka;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
diff --git a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/GaugeProducer.java b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/GaugeProducer.java
index 4c5d440..4c5bdf4 100644
--- a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/GaugeProducer.java
+++ b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/GaugeProducer.java
@@ -22,7 +22,6 @@ import org.apache.camel.Exchange;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 import static org.apache.camel.component.metrics.MetricsConstants.HEADER_GAUGE_SUBJECT;
 
 public class GaugeProducer extends AbstractMetricsProducer {
diff --git a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/HistogramProducer.java b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/HistogramProducer.java
index 3bad444..79bddb3 100644
--- a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/HistogramProducer.java
+++ b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/HistogramProducer.java
@@ -23,7 +23,6 @@ import org.apache.camel.Message;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 import static org.apache.camel.component.metrics.MetricsConstants.HEADER_HISTOGRAM_VALUE;
 
 public class HistogramProducer extends AbstractMetricsProducer {
diff --git a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/TimerProducer.java b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/TimerProducer.java
index ad49c6b..4a596a6 100644
--- a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/TimerProducer.java
+++ b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/TimerProducer.java
@@ -23,7 +23,6 @@ import org.apache.camel.Message;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 import static org.apache.camel.component.metrics.MetricsConstants.HEADER_TIMER_ACTION;
 
 public class TimerProducer extends AbstractMetricsProducer {
diff --git a/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/TimerProducer.java b/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/TimerProducer.java
index dd4492f..e720549 100644
--- a/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/TimerProducer.java
+++ b/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/TimerProducer.java
@@ -26,7 +26,6 @@ import org.apache.camel.Message;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 import static org.apache.camel.component.micrometer.MicrometerConstants.HEADER_TIMER_ACTION;
 
 public class TimerProducer extends AbstractMicrometerProducer<Timer> {
diff --git a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
index 8bd7b81..87c66bd 100644
--- a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
+++ b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
@@ -47,7 +47,6 @@ import org.bson.conversions.Bson;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 import static org.apache.camel.component.mongodb.MongoDbOperation.command;
 import static org.apache.camel.component.mongodb.MongoDbOperation.findAll;
 import static org.apache.camel.component.mongodb.MongoDbOperation.getDbStats;
diff --git a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbAggregateOperationTest.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbAggregateOperationTest.java
index 6d1fcc3..ded75b1 100644
--- a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbAggregateOperationTest.java
+++ b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbAggregateOperationTest.java
@@ -25,10 +25,10 @@ import org.apache.camel.builder.RouteBuilder;
 import org.bson.Document;
 import org.junit.jupiter.api.Test;
 
+import static org.apache.camel.test.junit5.TestSupport.assertListSize;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.apache.camel.test.junit5.TestSupport.assertListSize;
 
 public class MongoDbAggregateOperationTest extends AbstractMongoDbTest {
 
diff --git a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbContainer.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbContainer.java
index 1329805..18bfc09 100644
--- a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbContainer.java
+++ b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbContainer.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.mongodb;
 
-
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoClients;
 import org.bson.Document;
diff --git a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbReadPreferenceOptionTest.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbReadPreferenceOptionTest.java
index 11375d6..9f09642 100644
--- a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbReadPreferenceOptionTest.java
+++ b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbReadPreferenceOptionTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.mongodb;
 
 import com.mongodb.ReadPreference;
 import org.apache.camel.Endpoint;
-import org.apache.camel.ResolveEndpointFailedException;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertSame;
diff --git a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbTailableCursorConsumerTest.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbTailableCursorConsumerTest.java
index f6c09ef..9c4d2d7 100644
--- a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbTailableCursorConsumerTest.java
+++ b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbTailableCursorConsumerTest.java
@@ -26,9 +26,9 @@ import org.apache.camel.component.mock.MockEndpoint;
 import org.bson.Document;
 import org.junit.jupiter.api.Test;
 
+import static com.mongodb.client.model.Filters.eq;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static com.mongodb.client.model.Filters.eq;
 
 public class MongoDbTailableCursorConsumerTest extends AbstractMongoDbTest {
 
diff --git a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosProducer.java b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosProducer.java
index f652bb2..4b057af 100644
--- a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosProducer.java
+++ b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosProducer.java
@@ -27,7 +27,6 @@ import org.apache.camel.support.DefaultProducer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 import static org.apache.camel.component.nagios.NagiosConstants.HOST_NAME;
 import static org.apache.camel.component.nagios.NagiosConstants.LEVEL;
 import static org.apache.camel.component.nagios.NagiosConstants.SERVICE_NAME;
diff --git a/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsComponent.java b/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsComponent.java
index 61ea686..fc18780 100644
--- a/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsComponent.java
+++ b/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsComponent.java
@@ -21,7 +21,6 @@ import java.util.Map;
 import org.apache.camel.Endpoint;
 import org.apache.camel.SSLContextParametersAware;
 import org.apache.camel.spi.Metadata;
-import org.apache.camel.spi.UriPath;
 import org.apache.camel.spi.annotations.Component;
 import org.apache.camel.support.DefaultComponent;
 
diff --git a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerWithRedeliveryTest.java b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerWithRedeliveryTest.java
index c418744..f6ea7b8 100644
--- a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerWithRedeliveryTest.java
+++ b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerWithRedeliveryTest.java
@@ -16,12 +16,8 @@
  */
 package org.apache.camel.component.nats;
 
-import java.io.IOException;
-
 import org.apache.camel.EndpointInject;
-import org.apache.camel.Exchange;
 import org.apache.camel.LoggingLevel;
-import org.apache.camel.Predicate;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttp500ErrorTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttp500ErrorTest.java
index 3cc98c7..948cb4d 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttp500ErrorTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttp500ErrorTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.netty.http;
 
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.Test;
 
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBindingPreservePostFormUrlEncodedBodyTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBindingPreservePostFormUrlEncodedBodyTest.java
index 4a98de9..28ee256 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBindingPreservePostFormUrlEncodedBodyTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBindingPreservePostFormUrlEncodedBodyTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.netty.http;
 
 import io.netty.handler.codec.http.FullHttpRequest;
 import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.http.HttpMethods;
 import org.junit.Test;
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBindingUseAbsolutePathTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBindingUseAbsolutePathTest.java
index 6465e60..0fb6c41 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBindingUseAbsolutePathTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBindingUseAbsolutePathTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.netty.http;
 
 import io.netty.handler.codec.http.FullHttpRequest;
 import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.http.HttpMethods;
 import org.junit.Test;
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBindingUseRelativePathInPostTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBindingUseRelativePathInPostTest.java
index 1fb0f6b..d0bcf41 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBindingUseRelativePathInPostTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBindingUseRelativePathInPostTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.netty.http;
 
 import io.netty.handler.codec.http.FullHttpRequest;
 import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.http.HttpMethods;
 import org.junit.Test;
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBindingUseRelativePathTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBindingUseRelativePathTest.java
index ec26ea2..c7cd03f 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBindingUseRelativePathTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBindingUseRelativePathTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.netty.http;
 
 import io.netty.handler.codec.http.FullHttpRequest;
 import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.http.HttpMethods;
 import org.junit.Test;
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriEncodingIssueTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriEncodingIssueTest.java
index c10f9fe..3ead990 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriEncodingIssueTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriEncodingIssueTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.component.netty.http;
 
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.Test;
 
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpFilterCamelHeadersTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpFilterCamelHeadersTest.java
index 24a18a4..2a89e43 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpFilterCamelHeadersTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpFilterCamelHeadersTest.java
@@ -20,7 +20,6 @@ import java.util.Map;
 
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.Test;
 
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpHandle404Test.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpHandle404Test.java
index 8341a58..de0f47d 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpHandle404Test.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpHandle404Test.java
@@ -16,9 +16,7 @@
  */
 package org.apache.camel.component.netty.http;
 
-import org.apache.camel.AggregationStrategy;
 import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpHeaderCaseTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpHeaderCaseTest.java
index 7fc9536..f67e1d8 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpHeaderCaseTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpHeaderCaseTest.java
@@ -19,8 +19,6 @@ package org.apache.camel.component.netty.http;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.HttpMethod;
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpMapHeadersFalseTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpMapHeadersFalseTest.java
index b67a715..7b17510 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpMapHeadersFalseTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpMapHeadersFalseTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.component.netty.http;
 
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.HttpMethod;
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpProducerSimpleTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpProducerSimpleTest.java
index b93ef17..7450c19 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpProducerSimpleTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpProducerSimpleTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.netty.http;
 
 import io.netty.handler.codec.http.HttpResponse;
 import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.Test;
 
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpProducerTwoParametersWithSameKeyTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpProducerTwoParametersWithSameKeyTest.java
index 4e6080e..990b2d3 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpProducerTwoParametersWithSameKeyTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpProducerTwoParametersWithSameKeyTest.java
@@ -20,7 +20,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.Test;
 
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpRedirectTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpRedirectTest.java
index d61d8a4..e7a742f 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpRedirectTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpRedirectTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.netty.http;
 
 import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.Test;
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpRestOptionsAllowTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpRestOptionsAllowTest.java
index ca817f2..3c4db3a 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpRestOptionsAllowTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpRestOptionsAllowTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.netty.http;
 
 import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.http.common.HttpMethods;
 import org.junit.Test;
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpReturnDataNotInputStreamConvertableTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpReturnDataNotInputStreamConvertableTest.java
index 0ac98e6..3fd45c5 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpReturnDataNotInputStreamConvertableTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpReturnDataNotInputStreamConvertableTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.component.netty.http;
 
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.Test;
 
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLTest.java
index 358f2b6..33795ab 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLTest.java
@@ -21,8 +21,6 @@ import java.util.Properties;
 
 import javax.net.ssl.SSLSession;
 
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.netty.NettyConstants;
 import org.apache.camel.test.junit4.CamelTestSupport;
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpGetCorsTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpGetCorsTest.java
index f00ab4d..87b693c 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpGetCorsTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpGetCorsTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.netty.http.rest;
 
 import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.netty.http.BaseNettyTest;
 import org.apache.camel.spi.RestConfiguration;
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpGetTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpGetTest.java
index 198b5fb..9853bf6 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpGetTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpGetTest.java
@@ -17,8 +17,6 @@
 package org.apache.camel.component.netty.http.rest;
 
 import org.apache.camel.BindToRegistry;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.netty.http.BaseNettyTest;
 import org.apache.camel.component.netty.http.RestNettyHttpBinding;
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpGetWildcardsTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpGetWildcardsTest.java
index 84f50ce..3e0a439 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpGetWildcardsTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpGetWildcardsTest.java
@@ -17,8 +17,6 @@
 package org.apache.camel.component.netty.http.rest;
 
 import org.apache.camel.BindToRegistry;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.netty.http.BaseNettyTest;
 import org.apache.camel.component.netty.http.RestNettyHttpBinding;
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpOptionsTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpOptionsTest.java
index ecd14ba..84f7888 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpOptionsTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpOptionsTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.netty.http.rest;
 
 import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.netty.http.BaseNettyTest;
 import org.junit.Test;
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyProducerGetTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyProducerGetTest.java
index 2f4baff..6c238e2 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyProducerGetTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyProducerGetTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.component.netty.http.rest;
 
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.netty.http.BaseNettyTest;
 import org.junit.Test;
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyProducerGetUriParameterTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyProducerGetUriParameterTest.java
index a7381df..181eea1 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyProducerGetUriParameterTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyProducerGetUriParameterTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.component.netty.http.rest;
 
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.netty.http.BaseNettyTest;
 import org.junit.Test;
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyProducerThrowExceptionErrorTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyProducerThrowExceptionErrorTest.java
index 204abfd..f7dd60a 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyProducerThrowExceptionErrorTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyProducerThrowExceptionErrorTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.netty.http.rest;
 
 import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.netty.http.BaseNettyTest;
 import org.junit.Test;
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyProducerVerbUpperCaseTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyProducerVerbUpperCaseTest.java
index 71b2d9c..eba7504 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyProducerVerbUpperCaseTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyProducerVerbUpperCaseTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.netty.http.rest;
 
 import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.netty.http.BaseNettyTest;
 import org.junit.Test;
diff --git a/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java
index 08a7fb2..a2bbb21 100644
--- a/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java
+++ b/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.netty.handlers;
 
-import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
 import org.apache.camel.AsyncCallback;
diff --git a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/BeanConfig.java b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/BeanConfig.java
index a439106..02406bc 100644
--- a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/BeanConfig.java
+++ b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/BeanConfig.java
@@ -24,7 +24,6 @@ import io.apicurio.datamodels.openapi.models.OasDocument;
 import io.apicurio.datamodels.openapi.v2.models.Oas20Document;
 import io.apicurio.datamodels.openapi.v3.models.Oas30Document;
 
-
 public class BeanConfig {
     String[] schemes;
     String title;
diff --git a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/OpenApiHelper.java b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/OpenApiHelper.java
index d84189c..92f26fe 100644
--- a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/OpenApiHelper.java
+++ b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/OpenApiHelper.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.openapi;
 
-
 import java.util.LinkedHashMap;
 import java.util.Map;
 
diff --git a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/OpenApiRestProducerFactory.java b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/OpenApiRestProducerFactory.java
index d5081a2..1cf1c3b 100644
--- a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/OpenApiRestProducerFactory.java
+++ b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/OpenApiRestProducerFactory.java
@@ -42,7 +42,6 @@ import org.apache.camel.util.IOHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 import static org.apache.camel.support.ResourceHelper.resolveMandatoryResourceAsInputStream;
 
 public class OpenApiRestProducerFactory implements RestProducerFactory {
diff --git a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiProcessor.java b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiProcessor.java
index 1cd0c07..feb355a 100644
--- a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiProcessor.java
+++ b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiProcessor.java
@@ -28,7 +28,6 @@ import org.apache.camel.util.ObjectHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 public class RestOpenApiProcessor implements Processor {
 
     private static final Logger LOG = LoggerFactory.getLogger(RestOpenApiProcessor.class);
diff --git a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
index dc74fe1..b390a04 100644
--- a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
+++ b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
@@ -77,6 +77,7 @@ import org.apache.camel.support.ObjectHelper;
 import org.apache.camel.util.FileUtil;
 
 import static java.lang.invoke.MethodHandles.publicLookup;
+
 /**
  * A Camel REST-DSL openApi reader that parse the rest-dsl into a openApi model representation.
  * <p/>
diff --git a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderApiDocsTest.java b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderApiDocsTest.java
index b0913f1..e749460 100644
--- a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderApiDocsTest.java
+++ b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderApiDocsTest.java
@@ -28,9 +28,6 @@ import org.apache.camel.model.rest.RestParamType;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
-
-
-
 public class RestOpenApiReaderApiDocsTest extends CamelTestSupport {
 
     @BindToRegistry("dummy-rest")
diff --git a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderDayOfWeekTest.java b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderDayOfWeekTest.java
index 5ad046d..b7f99cd 100644
--- a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderDayOfWeekTest.java
+++ b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderDayOfWeekTest.java
@@ -28,7 +28,6 @@ import org.apache.camel.model.rest.RestParamType;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
-
 public class RestOpenApiReaderDayOfWeekTest extends CamelTestSupport {
 
     @BindToRegistry("dummy-rest")
diff --git a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelTest.java b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelTest.java
index df611f8..f5fb126 100644
--- a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelTest.java
+++ b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelTest.java
@@ -28,7 +28,6 @@ import org.apache.camel.model.rest.RestParamType;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
-
 public class RestOpenApiReaderModelTest extends CamelTestSupport {
 
     @BindToRegistry("dummy-rest")
diff --git a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderPropertyPlaceholderTest.java b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderPropertyPlaceholderTest.java
index 6c6ece5..f500bd1 100644
--- a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderPropertyPlaceholderTest.java
+++ b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderPropertyPlaceholderTest.java
@@ -34,8 +34,6 @@ import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Ignore;
 import org.junit.Test;
 
-   
-
 @Ignore("Does not run well on CI due test uses JMX mbeans")
 public class RestOpenApiReaderPropertyPlaceholderTest extends CamelTestSupport {
 
diff --git a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderTest.java b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderTest.java
index 192ab0f..b74ba3d 100644
--- a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderTest.java
+++ b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderTest.java
@@ -30,7 +30,6 @@ import org.apache.camel.model.rest.RestParamType;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
-
 public class RestOpenApiReaderTest extends CamelTestSupport {
 
     @BindToRegistry("dummy-rest")
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/AbstractProducerTestSupport.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/AbstractProducerTestSupport.java
index 8406e84..78a1b1e 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/AbstractProducerTestSupport.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/AbstractProducerTestSupport.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.openstack;
 
 import java.io.IOException;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExtendedCamelContext;
 import org.apache.camel.Message;
diff --git a/components/camel-osgi-activator/src/test/java/org/apache/camel/component/osgi/activator/CamelOsgiActivatorIT.java b/components/camel-osgi-activator/src/test/java/org/apache/camel/component/osgi/activator/CamelOsgiActivatorIT.java
index 00e2c1b..d08df32 100644
--- a/components/camel-osgi-activator/src/test/java/org/apache/camel/component/osgi/activator/CamelOsgiActivatorIT.java
+++ b/components/camel-osgi-activator/src/test/java/org/apache/camel/component/osgi/activator/CamelOsgiActivatorIT.java
@@ -30,7 +30,6 @@ import javax.inject.Inject;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.osgi.activator.CamelRoutesActivator;
 import org.apache.camel.osgi.activator.CamelRoutesActivatorConstants;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -47,8 +46,8 @@ import org.osgi.framework.ServiceRegistration;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.ops4j.pax.exam.CoreOptions.junitBundles;
-import static org.ops4j.pax.exam.CoreOptions.streamBundle;
 import static org.ops4j.pax.exam.CoreOptions.options;
+import static org.ops4j.pax.exam.CoreOptions.streamBundle;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
diff --git a/components/camel-pdf/src/main/java/org/apache/camel/component/pdf/PdfProducer.java b/components/camel-pdf/src/main/java/org/apache/camel/component/pdf/PdfProducer.java
index 4940a5b..74674e6 100644
--- a/components/camel-pdf/src/main/java/org/apache/camel/component/pdf/PdfProducer.java
+++ b/components/camel-pdf/src/main/java/org/apache/camel/component/pdf/PdfProducer.java
@@ -36,7 +36,6 @@ import org.apache.pdfbox.text.PDFTextStripper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 import static org.apache.camel.component.pdf.PdfHeaderConstants.*;
 
 public class PdfProducer extends DefaultProducer {
diff --git a/components/camel-pubnub/src/main/java/org/apache/camel/component/pubnub/PubNubConsumer.java b/components/camel-pubnub/src/main/java/org/apache/camel/component/pubnub/PubNubConsumer.java
index 33112c3..243aeb0 100644
--- a/components/camel-pubnub/src/main/java/org/apache/camel/component/pubnub/PubNubConsumer.java
+++ b/components/camel-pubnub/src/main/java/org/apache/camel/component/pubnub/PubNubConsumer.java
@@ -30,7 +30,6 @@ import org.apache.camel.support.DefaultConsumer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 import static com.pubnub.api.enums.PNStatusCategory.PNTimeoutCategory;
 import static com.pubnub.api.enums.PNStatusCategory.PNUnexpectedDisconnectCategory;
 import static org.apache.camel.component.pubnub.PubNubConstants.CHANNEL;
diff --git a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConsumerDeadLetterPolicyTest.java b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConsumerDeadLetterPolicyTest.java
index 9c171a0..fc0ebdb 100644
--- a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConsumerDeadLetterPolicyTest.java
+++ b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConsumerDeadLetterPolicyTest.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.pulsar;
 
-
 import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.EndpointInject;
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQRequeueHandledExceptionIntTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQRequeueHandledExceptionIntTest.java
index 0a11a04..a64de97 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQRequeueHandledExceptionIntTest.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQRequeueHandledExceptionIntTest.java
@@ -23,7 +23,6 @@ import org.apache.camel.ProducerTemplate;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.component.rabbitmq.RabbitMQConstants;
-import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
 /**
diff --git a/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceProcessorFactory.java b/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceProcessorFactory.java
index 3da7d3c..82835b6 100644
--- a/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceProcessorFactory.java
+++ b/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceProcessorFactory.java
@@ -17,9 +17,9 @@
 package org.apache.camel.component.resilience4j;
 
 import org.apache.camel.Processor;
+import org.apache.camel.Route;
 import org.apache.camel.impl.engine.TypedProcessorFactory;
 import org.apache.camel.model.CircuitBreakerDefinition;
-import org.apache.camel.Route;
 
 /**
  * To integrate camel-resilience4j with the Camel routes using the Circuit
diff --git a/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceReifier.java b/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceReifier.java
index 0d10156..fa4a394 100644
--- a/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceReifier.java
+++ b/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceReifier.java
@@ -28,13 +28,13 @@ import io.github.resilience4j.circuitbreaker.CircuitBreakerConfig;
 import io.github.resilience4j.timelimiter.TimeLimiterConfig;
 import org.apache.camel.ExtendedCamelContext;
 import org.apache.camel.Processor;
+import org.apache.camel.Route;
 import org.apache.camel.model.CircuitBreakerDefinition;
 import org.apache.camel.model.Model;
 import org.apache.camel.model.Resilience4jConfigurationCommon;
 import org.apache.camel.model.Resilience4jConfigurationDefinition;
 import org.apache.camel.reifier.ProcessorReifier;
 import org.apache.camel.spi.BeanIntrospection;
-import org.apache.camel.Route;
 import org.apache.camel.support.PropertyBindingSupport;
 import org.apache.camel.util.function.Suppliers;
 
diff --git a/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpointV3Test.java b/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpointV3Test.java
index fdc6633..ec9f76a 100644
--- a/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpointV3Test.java
+++ b/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpointV3Test.java
@@ -38,8 +38,6 @@ import org.apache.camel.impl.engine.DefaultClassResolver;
 import org.apache.camel.spi.RestConfiguration;
 import org.junit.Test;
 
-
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.entry;
 import static org.mockito.Mockito.mock;
diff --git a/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiGlobalHttpsTest.java b/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiGlobalHttpsTest.java
index bbbca82..064b0cb 100644
--- a/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiGlobalHttpsTest.java
+++ b/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiGlobalHttpsTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.rest.openapi;
 
 import org.apache.camel.CamelContext;
 
-
 public class RestOpenApiGlobalHttpsTest extends HttpsTest {
 
     @Override
diff --git a/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiHelperTest.java b/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiHelperTest.java
index 26cb47d..9104ba0 100644
--- a/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiHelperTest.java
+++ b/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiHelperTest.java
@@ -20,8 +20,6 @@ import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-
-
 public class RestOpenApiHelperTest {
 
     @Test(expected = IllegalArgumentException.class)
diff --git a/components/camel-rest/src/main/java/org/apache/camel/component/rest/RestEndpoint.java b/components/camel-rest/src/main/java/org/apache/camel/component/rest/RestEndpoint.java
index 018100d..d814060 100644
--- a/components/camel-rest/src/main/java/org/apache/camel/component/rest/RestEndpoint.java
+++ b/components/camel-rest/src/main/java/org/apache/camel/component/rest/RestEndpoint.java
@@ -42,7 +42,6 @@ import org.apache.camel.util.ObjectHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 import static org.apache.camel.support.RestProducerFactoryHelper.setupComponent;
 
 /**
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
index 9f82a40..0a7fe56 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
@@ -59,7 +59,6 @@ import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 import static org.apache.camel.component.salesforce.SalesforceLoginConfig.DEFAULT_LOGIN_URL;
 
 /**
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultCompositeApiClient.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultCompositeApiClient.java
index a399b9a..470dea2 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultCompositeApiClient.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultCompositeApiClient.java
@@ -20,7 +20,6 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
diff --git a/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverProducer.java b/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverProducer.java
index 16d9d84..5ae9e73 100644
--- a/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverProducer.java
+++ b/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverProducer.java
@@ -22,7 +22,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.Producer;
-import org.apache.camel.component.file.GenericFileEndpoint;
 import org.apache.camel.support.DefaultProducer;
 import org.apache.camel.support.ExchangeHelper;
 import org.apache.camel.support.service.ServiceHelper;
diff --git a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronEndpoint.java b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronEndpoint.java
index 5d44163..3689388 100644
--- a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronEndpoint.java
+++ b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronEndpoint.java
@@ -41,7 +41,6 @@ import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 import static org.apache.camel.component.schematron.constant.Constants.LINE_NUMBERING;
 import static org.apache.camel.component.schematron.constant.Constants.SAXON_TRANSFORMER_FACTORY_CLASS_NAME;
 
diff --git a/components/camel-seda/src/main/java/org/apache/camel/component/seda/QueueReference.java b/components/camel-seda/src/main/java/org/apache/camel/component/seda/QueueReference.java
index b88cd71..e6a648d 100644
--- a/components/camel-seda/src/main/java/org/apache/camel/component/seda/QueueReference.java
+++ b/components/camel-seda/src/main/java/org/apache/camel/component/seda/QueueReference.java
@@ -94,4 +94,4 @@ public final class QueueReference {
 
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-shiro/src/main/java/org/apache/camel/component/shiro/security/ShiroSecurityPolicy.java b/components/camel-shiro/src/main/java/org/apache/camel/component/shiro/security/ShiroSecurityPolicy.java
index 568bc9b..56e5629 100644
--- a/components/camel-shiro/src/main/java/org/apache/camel/component/shiro/security/ShiroSecurityPolicy.java
+++ b/components/camel-shiro/src/main/java/org/apache/camel/component/shiro/security/ShiroSecurityPolicy.java
@@ -21,8 +21,8 @@ import java.util.List;
 
 import org.apache.camel.NamedNode;
 import org.apache.camel.Processor;
-import org.apache.camel.spi.AuthorizationPolicy;
 import org.apache.camel.Route;
+import org.apache.camel.spi.AuthorizationPolicy;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.Permission;
 import org.apache.shiro.config.Ini;
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java
index acd538a..6ce8854 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.component.sjms;
 
-import java.time.Duration;
-
 import javax.jms.ConnectionFactory;
 import javax.jms.ExceptionListener;
 import javax.jms.Message;
@@ -56,7 +54,6 @@ import org.apache.camel.spi.UriPath;
 import org.apache.camel.support.DefaultEndpoint;
 import org.apache.camel.support.EndpointHelper;
 import org.apache.camel.support.LoggingExceptionHandler;
-import org.apache.camel.util.backoff.BackOff;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/DefaultDestinationCreationStrategy.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/DefaultDestinationCreationStrategy.java
index f4a129c..fbafb34 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/DefaultDestinationCreationStrategy.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/DefaultDestinationCreationStrategy.java
@@ -56,4 +56,4 @@ public class DefaultDestinationCreationStrategy implements DestinationCreationSt
             return session.createTemporaryQueue();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsDestinationCreationStrategyTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsDestinationCreationStrategyTest.java
index 8bd341b..0a7efc2 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsDestinationCreationStrategyTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsDestinationCreationStrategyTest.java
@@ -83,4 +83,4 @@ public class SjmsDestinationCreationStrategyTest extends JmsTestSupport {
             return super.createTemporaryDestination(session, topic);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/DefaultDestinationCreationStrategyTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/DefaultDestinationCreationStrategyTest.java
index a61080d..72825f2 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/DefaultDestinationCreationStrategyTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/DefaultDestinationCreationStrategyTest.java
@@ -71,4 +71,4 @@ public class DefaultDestinationCreationStrategyTest extends JmsTestSupport {
         assertNotNull(destination);
         assertNotNull(destination.getTopicName());
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/NoConnectionFactoryTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/NoConnectionFactoryTest.java
index 7647a12..ce291ac 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/NoConnectionFactoryTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/NoConnectionFactoryTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.sjms.producer;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.FailedToCreateProducerException;
 import org.apache.camel.FailedToStartRouteException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.impl.DefaultCamelContext;
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedProducerInOutErrorTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedProducerInOutErrorTest.java
index 2fbc6e0..4caf0f5 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedProducerInOutErrorTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedProducerInOutErrorTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.sjms.tx;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.FailedToCreateProducerException;
 import org.apache.camel.FailedToStartRouteException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.sjms.CamelJmsTestHelper;
diff --git a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppComponentTest.java b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppComponentTest.java
index f246754..9262414 100644
--- a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppComponentTest.java
+++ b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppComponentTest.java
@@ -23,10 +23,6 @@ import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.ExchangePattern;
 import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.support.SimpleRegistry;
-import org.jsmpp.extra.SessionState;
-import org.jsmpp.session.Session;
-import org.jsmpp.session.SessionStateListener;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/components/camel-soroush/src/main/java/org/apache/camel/component/soroushbot/component/SoroushBotAbstractConsumer.java b/components/camel-soroush/src/main/java/org/apache/camel/component/soroushbot/component/SoroushBotAbstractConsumer.java
index 86386bb..2358bf0 100644
--- a/components/camel-soroush/src/main/java/org/apache/camel/component/soroushbot/component/SoroushBotAbstractConsumer.java
+++ b/components/camel-soroush/src/main/java/org/apache/camel/component/soroushbot/component/SoroushBotAbstractConsumer.java
@@ -35,7 +35,6 @@ import org.apache.camel.support.DefaultConsumer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 import static org.apache.camel.component.soroushbot.utils.StringUtils.ordinal;
 
 /**
diff --git a/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicy.java b/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicy.java
index 143d6ab..d76aaa8 100644
--- a/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicy.java
+++ b/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicy.java
@@ -25,9 +25,9 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.NamedNode;
 import org.apache.camel.Processor;
+import org.apache.camel.Route;
 import org.apache.camel.model.IdentifiedType;
 import org.apache.camel.spi.AuthorizationPolicy;
-import org.apache.camel.Route;
 import org.apache.camel.support.processor.DelegateProcessor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/components/camel-spring/src/main/java/org/apache/camel/language/spel/SpEL.java b/components/camel-spring/src/main/java/org/apache/camel/language/spel/SpEL.java
index b861807..04cc02c 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/language/spel/SpEL.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/language/spel/SpEL.java
@@ -36,4 +36,4 @@ import org.apache.camel.support.language.LanguageAnnotation;
 @LanguageAnnotation(language = "spel")
 public @interface SpEL {
     String value();
-}
\ No newline at end of file
+}
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelConsumerTemplateFactoryBean.java b/components/camel-spring/src/main/java/org/apache/camel/spring/CamelConsumerTemplateFactoryBean.java
index cd0813e..21342ee 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelConsumerTemplateFactoryBean.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/spring/CamelConsumerTemplateFactoryBean.java
@@ -54,4 +54,4 @@ public class CamelConsumerTemplateFactoryBean extends AbstractCamelConsumerTempl
         this.applicationContext = applicationContext;
     }
 
-}
\ No newline at end of file
+}
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelRedeliveryPolicyFactoryBean.java b/components/camel-spring/src/main/java/org/apache/camel/spring/CamelRedeliveryPolicyFactoryBean.java
index b5442f2..50f433e 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelRedeliveryPolicyFactoryBean.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/spring/CamelRedeliveryPolicyFactoryBean.java
@@ -50,4 +50,4 @@ public class CamelRedeliveryPolicyFactoryBean extends AbstractCamelRedeliveryPol
     public void setApplicationContext(ApplicationContext applicationContext) {
         this.applicationContext = applicationContext;
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelThreadPoolFactoryBean.java b/components/camel-spring/src/main/java/org/apache/camel/spring/CamelThreadPoolFactoryBean.java
index 20dc034..7695f81 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelThreadPoolFactoryBean.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/spring/CamelThreadPoolFactoryBean.java
@@ -51,4 +51,4 @@ public class CamelThreadPoolFactoryBean extends AbstractCamelThreadPoolFactoryBe
     public void setApplicationContext(ApplicationContext applicationContext) {
         this.applicationContext = applicationContext;
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionPolicy.java b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionPolicy.java
index 1226359..2e3ba76 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionPolicy.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionPolicy.java
@@ -18,12 +18,12 @@ package org.apache.camel.spring.spi;
 
 import org.apache.camel.NamedNode;
 import org.apache.camel.Processor;
+import org.apache.camel.Route;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.builder.ErrorHandlerBuilder;
 import org.apache.camel.builder.ErrorHandlerBuilderRef;
 import org.apache.camel.model.RouteDefinition;
 import org.apache.camel.reifier.errorhandler.ErrorHandlerReifier;
-import org.apache.camel.Route;
 import org.apache.camel.spi.TransactedPolicy;
 import org.apache.camel.util.ObjectHelper;
 import org.slf4j.Logger;
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerReifier.java b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerReifier.java
index 82a2de7..3df76c3 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerReifier.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerReifier.java
@@ -20,8 +20,8 @@ import java.util.Map;
 
 import org.apache.camel.ErrorHandlerFactory;
 import org.apache.camel.Processor;
-import org.apache.camel.reifier.errorhandler.DefaultErrorHandlerReifier;
 import org.apache.camel.Route;
+import org.apache.camel.reifier.errorhandler.DefaultErrorHandlerReifier;
 import org.apache.camel.spi.TransactedPolicy;
 import org.apache.camel.util.ObjectHelper;
 import org.slf4j.Logger;
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java
index 56b9898..2fb6c9f 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java
@@ -20,11 +20,11 @@ import java.net.URL;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.apache.camel.xml.jaxb.DefaultModelJAXBContextFactory;
 import org.apache.camel.impl.engine.DefaultUuidGenerator;
 import org.apache.camel.spi.ModelJAXBContextFactory;
 import org.apache.camel.spi.UuidGenerator;
 import org.apache.camel.support.SimpleUuidGenerator;
+import org.apache.camel.xml.jaxb.DefaultModelJAXBContextFactory;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/DummyErrorHandlerBuilder.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/DummyErrorHandlerBuilder.java
index 614c970..176813b 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/DummyErrorHandlerBuilder.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/DummyErrorHandlerBuilder.java
@@ -19,10 +19,10 @@ package org.apache.camel.spring.config;
 import org.apache.camel.ErrorHandlerFactory;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
+import org.apache.camel.Route;
 import org.apache.camel.builder.ErrorHandlerBuilder;
 import org.apache.camel.builder.ErrorHandlerBuilderSupport;
 import org.apache.camel.reifier.errorhandler.ErrorHandlerReifier;
-import org.apache.camel.Route;
 import org.apache.camel.support.processor.DelegateProcessor;
 import org.springframework.beans.factory.BeanNameAware;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTwoCamelContextsTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTwoCamelContextsTest.java
index c17d6ba..b0203b3 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTwoCamelContextsTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTwoCamelContextsTest.java
@@ -57,4 +57,4 @@ public class ProducerTemplateAutoRegisterTwoCamelContextsTest extends SpringRunW
         ConsumerTemplate lookup = context2.getRegistry().lookupByNameAndType("consumerTemplate", ConsumerTemplate.class);
         assertNull("Should NOT lookup consumer template", lookup);
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateMixedAutoRegisterTwoCamelContextsTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateMixedAutoRegisterTwoCamelContextsTest.java
index 2e386c0..ad0c1eb 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateMixedAutoRegisterTwoCamelContextsTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateMixedAutoRegisterTwoCamelContextsTest.java
@@ -59,4 +59,4 @@ public class ProducerTemplateMixedAutoRegisterTwoCamelContextsTest extends Sprin
         ConsumerTemplate lookup = context2.getRegistry().lookupByNameAndType("consumerTemplate", ConsumerTemplate.class);
         assertNull("Should NOT lookup consumer template", lookup);
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/AnnotatedBookServiceImpl.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/AnnotatedBookServiceImpl.java
index 6791b7e..ab4f5a8 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/AnnotatedBookServiceImpl.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/AnnotatedBookServiceImpl.java
@@ -57,4 +57,4 @@ public class AnnotatedBookServiceImpl implements AnnotatedBookStore {
 
         template.sendBody(title);
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionClientDataSourceSupport.java b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionClientDataSourceSupport.java
index a6cd8de..289eab8 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionClientDataSourceSupport.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionClientDataSourceSupport.java
@@ -50,4 +50,4 @@ public class TransactionClientDataSourceSupport extends SpringTestSupport {
         return useTransactionErrorHandler;
     }
 
-}
\ No newline at end of file
+}
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/produce/ProduceTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/produce/ProduceTest.java
index c70949f..25ff9e4 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/produce/ProduceTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/produce/ProduceTest.java
@@ -37,4 +37,4 @@ public class ProduceTest extends SpringRunWithTestSupport {
         String response = producer.greet(headers, "Willem");
         assertEquals("response is wrong", "Nihao Willem", response);
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/TestEchoCommandFactory.java b/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/TestEchoCommandFactory.java
index 4492c98..72e315f 100644
--- a/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/TestEchoCommandFactory.java
+++ b/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/TestEchoCommandFactory.java
@@ -42,4 +42,4 @@ public class TestEchoCommandFactory extends EchoCommandFactory {
             super.destroy();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamFileWithFilterTest.java b/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamFileWithFilterTest.java
index 4603877..5246d0f 100644
--- a/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamFileWithFilterTest.java
+++ b/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamFileWithFilterTest.java
@@ -82,4 +82,4 @@ public class ScanStreamFileWithFilterTest extends CamelTestSupport {
         };
     }
 
-}
\ No newline at end of file
+}
diff --git a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamFileTest.java b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamFileTest.java
index b7ba651..51ce3ce 100644
--- a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamFileTest.java
+++ b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamFileTest.java
@@ -105,4 +105,4 @@ public class StreamFileTest extends CamelTestSupport {
         assertMockEndpointsSatisfied();
         context.stop();
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
index 2d47678..c9b75bf 100644
--- a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
+++ b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
@@ -19,7 +19,6 @@ package org.apache.camel.swagger;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodType;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.LinkedHashSet;
 import java.util.List;
diff --git a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/InlineKeyboardButton.java b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/InlineKeyboardButton.java
index f50af0f..4a5c5a4 100644
--- a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/InlineKeyboardButton.java
+++ b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/InlineKeyboardButton.java
@@ -23,7 +23,6 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 /**
  * Represents one button of an inline keyboard. You must use exactly one of the optional fields.
  *
diff --git a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/InlineKeyboardMarkup.java b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/InlineKeyboardMarkup.java
index 4c2888a..2f041f8 100644
--- a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/InlineKeyboardMarkup.java
+++ b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/InlineKeyboardMarkup.java
@@ -24,7 +24,6 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 /**
  * This object represents an inline keyboard that appears right next to the message it belongs to.
  */
diff --git a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/InputMedia.java b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/InputMedia.java
index 5f49ccc..97f7df0 100644
--- a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/InputMedia.java
+++ b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/InputMedia.java
@@ -21,7 +21,6 @@ import java.io.Serializable;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 /**
  * Represents the content of a media message to be sent.
  */
diff --git a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/LoginUrl.java b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/LoginUrl.java
index 204af90..9ad67aa 100644
--- a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/LoginUrl.java
+++ b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/LoginUrl.java
@@ -22,7 +22,6 @@ import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 /**
  * Represents a parameter of the inline keyboard button used to automatically authorize a user.
  */
diff --git a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/OutgoingAnswerInlineQuery.java b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/OutgoingAnswerInlineQuery.java
index b739664..f5311bf 100644
--- a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/OutgoingAnswerInlineQuery.java
+++ b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/OutgoingAnswerInlineQuery.java
@@ -21,7 +21,6 @@ import java.util.List;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 /**
  * Object to send when answering to an inline query.
  *
diff --git a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/OutgoingAudioMessage.java b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/OutgoingAudioMessage.java
index e90bab1..80c7e1f 100644
--- a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/OutgoingAudioMessage.java
+++ b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/OutgoingAudioMessage.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.component.telegram.model;
 
-import java.util.Arrays;
-
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/OutgoingGameMessage.java b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/OutgoingGameMessage.java
index ea270c0..7049ae6 100644
--- a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/OutgoingGameMessage.java
+++ b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/OutgoingGameMessage.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.telegram.model;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 /**
  * Used to send a game.
  *
diff --git a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/OutgoingSetGameScoreMessage.java b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/OutgoingSetGameScoreMessage.java
index 13e9263..05cdb0a 100644
--- a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/OutgoingSetGameScoreMessage.java
+++ b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/OutgoingSetGameScoreMessage.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.telegram.model;
 
-
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramChatBotTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramChatBotTest.java
index d8685ca..e18b1f3 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramChatBotTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramChatBotTest.java
@@ -34,7 +34,6 @@ import org.junit.jupiter.api.Test;
 import static org.apache.camel.test.junit5.TestSupport.assertCollectionSize;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-
 /**
  * Tests a chain made of a consumer and a producer to create a direct chat-bot.
  */
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerChannelPostTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerChannelPostTest.java
index 78078b7..7bf52d3 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerChannelPostTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerChannelPostTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.telegram;
 
 import java.time.Instant;
-import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
@@ -34,7 +33,6 @@ import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-
 /**
  *
  * Test channel data updates are converted by camel application.
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerIncomingInlineQueryTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerIncomingInlineQueryTest.java
index fb52528..8a07165 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerIncomingInlineQueryTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerIncomingInlineQueryTest.java
@@ -30,7 +30,6 @@ import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-
 /**
  *
  * Test channel data updates are converted by camel application.
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/util/TelegramTestUtil.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/util/TelegramTestUtil.java
index 3c08005..189c8da 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/util/TelegramTestUtil.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/util/TelegramTestUtil.java
@@ -25,7 +25,6 @@ import java.nio.charset.StandardCharsets;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.camel.component.telegram.model.UpdateResult;
 import org.apache.camel.util.IOHelper;
 
 /**
diff --git a/components/camel-test-junit5/src/main/java/org/apache/camel/test/AvailablePortFinder.java b/components/camel-test-junit5/src/main/java/org/apache/camel/test/AvailablePortFinder.java
index 9861ce7..a6a38bd 100644
--- a/components/camel-test-junit5/src/main/java/org/apache/camel/test/AvailablePortFinder.java
+++ b/components/camel-test-junit5/src/main/java/org/apache/camel/test/AvailablePortFinder.java
@@ -55,4 +55,4 @@ public final class AvailablePortFinder {
             throw new IllegalStateException("Cannot find free port", e);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-test/src/main/java/org/apache/camel/test/AvailablePortFinder.java b/components/camel-test/src/main/java/org/apache/camel/test/AvailablePortFinder.java
index 53b6054..4d7b126 100644
--- a/components/camel-test/src/main/java/org/apache/camel/test/AvailablePortFinder.java
+++ b/components/camel-test/src/main/java/org/apache/camel/test/AvailablePortFinder.java
@@ -78,4 +78,4 @@ public final class AvailablePortFinder {
 
         throw new IllegalStateException("Cannot find free port");
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-test/src/main/java/org/apache/camel/test/AvailablePortFinderPropertiesFunction.java b/components/camel-test/src/main/java/org/apache/camel/test/AvailablePortFinderPropertiesFunction.java
index accc5e6..ceba743 100644
--- a/components/camel-test/src/main/java/org/apache/camel/test/AvailablePortFinderPropertiesFunction.java
+++ b/components/camel-test/src/main/java/org/apache/camel/test/AvailablePortFinderPropertiesFunction.java
@@ -23,7 +23,6 @@ import org.apache.camel.component.properties.PropertiesFunction;
 import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.StringHelper;
 
-
 /**
  * A {@link PropertiesFunction} that reserves network ports and place them in a cache for reuse.
  * <p/>
diff --git a/components/camel-test/src/test/java/org/apache/camel/test/AvailablePortFinderTest.java b/components/camel-test/src/test/java/org/apache/camel/test/AvailablePortFinderTest.java
index 972ff57..a118660 100644
--- a/components/camel-test/src/test/java/org/apache/camel/test/AvailablePortFinderTest.java
+++ b/components/camel-test/src/test/java/org/apache/camel/test/AvailablePortFinderTest.java
@@ -28,7 +28,6 @@ import org.junit.Test;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-
 public class AvailablePortFinderTest {
 
     @Test
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetWildcardsTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetWildcardsTest.java
index ccc62b7..d2b2571 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetWildcardsTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetWildcardsTest.java
@@ -17,8 +17,6 @@
 package org.apache.camel.component.undertow.rest;
 
 import org.apache.camel.BindToRegistry;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.undertow.BaseUndertowTest;
 import org.apache.camel.component.undertow.DefaultUndertowHttpBinding;
diff --git a/components/camel-validator/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java b/components/camel-validator/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java
index 6fd3c40..52c0071 100644
--- a/components/camel-validator/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java
+++ b/components/camel-validator/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java
@@ -63,4 +63,4 @@ public class ValidatorComponent extends DefaultComponent {
         this.resourceResolverFactory = resourceResolverFactory;
     }
 
-}
\ No newline at end of file
+}
diff --git a/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jConsumer.java b/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jConsumer.java
index 19a6ccd..497bcf5 100644
--- a/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jConsumer.java
+++ b/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jConsumer.java
@@ -28,7 +28,6 @@ import org.web3j.protocol.core.methods.response.Log;
 import org.web3j.protocol.core.methods.response.Transaction;
 import rx.Subscription;
 
-
 import static org.apache.camel.component.web3j.Web3jHelper.toDefaultBlockParameter;
 
 /**
diff --git a/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jProducer.java b/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jProducer.java
index 2409181..7d7ec43 100644
--- a/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jProducer.java
+++ b/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jProducer.java
@@ -92,7 +92,6 @@ import org.web3j.quorum.methods.response.QuorumNodeInfo;
 import org.web3j.quorum.methods.response.Vote;
 import org.web3j.quorum.methods.response.Voter;
 
-
 import static org.apache.camel.component.web3j.Web3jHelper.toDefaultBlockParameter;
 
 public class Web3jProducer extends HeaderSelectorProducer {
diff --git a/components/camel-webhook/src/main/java/org/apache/camel/component/webhook/WebhookCapableEndpoint.java b/components/camel-webhook/src/main/java/org/apache/camel/component/webhook/WebhookCapableEndpoint.java
index 7fab370..07ccb6b 100644
--- a/components/camel-webhook/src/main/java/org/apache/camel/component/webhook/WebhookCapableEndpoint.java
+++ b/components/camel-webhook/src/main/java/org/apache/camel/component/webhook/WebhookCapableEndpoint.java
@@ -20,7 +20,6 @@ import java.util.List;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.Processor;
-import org.apache.camel.spi.RestConfiguration;
 
 /**
  * A {@code WebhookCapableEndpoint} is a special kind of endpoint that is able to operate in webhook mode if required.
diff --git a/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookUriEncodingTest.java b/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookUriEncodingTest.java
index f951a1d..574f9a0 100644
--- a/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookUriEncodingTest.java
+++ b/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookUriEncodingTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.component.webhook;
 
-import org.apache.camel.CamelContext;
-import org.apache.camel.CamelExecutionException;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
 import org.apache.camel.Message;
diff --git a/components/camel-websocket-jsr356/src/test/java/org/apache/camel/websocket/jsr356/JSR356ProducerTest.java b/components/camel-websocket-jsr356/src/test/java/org/apache/camel/websocket/jsr356/JSR356ProducerTest.java
index f224aeb..c370e8e 100644
--- a/components/camel-websocket-jsr356/src/test/java/org/apache/camel/websocket/jsr356/JSR356ProducerTest.java
+++ b/components/camel-websocket-jsr356/src/test/java/org/apache/camel/websocket/jsr356/JSR356ProducerTest.java
@@ -33,7 +33,6 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestName;
 
-
 public class JSR356ProducerTest extends CamelTestSupport {
 
     private static LinkedBlockingQueue<String> messages = new LinkedBlockingQueue<>();
diff --git a/components/camel-weka/src/main/java/org/apache/camel/component/weka/WekaTypeConverters.java b/components/camel-weka/src/main/java/org/apache/camel/component/weka/WekaTypeConverters.java
index 1f51c59..727d7d1 100644
--- a/components/camel-weka/src/main/java/org/apache/camel/component/weka/WekaTypeConverters.java
+++ b/components/camel-weka/src/main/java/org/apache/camel/component/weka/WekaTypeConverters.java
@@ -68,4 +68,4 @@ public final class WekaTypeConverters {
     public static Dataset toDataset(URL url) {
         return Dataset.create(url);
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/WordpressComponent.java b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/WordpressComponent.java
index 0ee13d8..2192f21 100644
--- a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/WordpressComponent.java
+++ b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/WordpressComponent.java
@@ -26,7 +26,6 @@ import org.apache.camel.spi.BeanIntrospection;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.annotations.Component;
 import org.apache.camel.support.DefaultComponent;
-import org.apache.camel.support.PropertyBindingSupport;
 
 /**
  * Represents the component that manages {@link WordpressEndpoint}.
diff --git a/components/camel-workday/src/main/java/org/apache/camel/component/workday/WorkdayComponent.java b/components/camel-workday/src/main/java/org/apache/camel/component/workday/WorkdayComponent.java
index 44c4089..52d0b63 100644
--- a/components/camel-workday/src/main/java/org/apache/camel/component/workday/WorkdayComponent.java
+++ b/components/camel-workday/src/main/java/org/apache/camel/component/workday/WorkdayComponent.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.workday;
 import java.util.Map;
 
 import org.apache.camel.Endpoint;
-import org.apache.camel.ResolveEndpointFailedException;
 import org.apache.camel.spi.annotations.Component;
 import org.apache.camel.support.DefaultComponent;
 import org.apache.camel.util.ObjectHelper;
diff --git a/components/camel-xj/src/main/java/org/apache/camel/component/xj/XJComponent.java b/components/camel-xj/src/main/java/org/apache/camel/component/xj/XJComponent.java
index 516ff56..921c69a 100644
--- a/components/camel-xj/src/main/java/org/apache/camel/component/xj/XJComponent.java
+++ b/components/camel-xj/src/main/java/org/apache/camel/component/xj/XJComponent.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.component.xj;
 
-import org.apache.camel.component.xslt.XsltComponent;
-import org.apache.camel.component.xslt.XsltEndpoint;
 import org.apache.camel.component.xslt.saxon.XsltSaxonComponent;
 import org.apache.camel.spi.annotations.Component;
 
diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignatureConfiguration.java b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignatureConfiguration.java
index d25fb0b..a122d32 100644
--- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignatureConfiguration.java
+++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignatureConfiguration.java
@@ -23,8 +23,6 @@ import javax.xml.crypto.XMLCryptoContext;
 import javax.xml.crypto.dsig.XMLSignContext;
 import javax.xml.crypto.dsig.XMLValidateContext;
 
-import org.apache.camel.CamelContext;
-import org.apache.camel.CamelContextAware;
 import org.apache.camel.component.xmlsecurity.api.XmlSignatureConstants;
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.spi.UriParams;
diff --git a/components/camel-xpath/src/main/java/org/apache/camel/language/xpath/XPath.java b/components/camel-xpath/src/main/java/org/apache/camel/language/xpath/XPath.java
index 053d8a7..2efd759 100644
--- a/components/camel-xpath/src/main/java/org/apache/camel/language/xpath/XPath.java
+++ b/components/camel-xpath/src/main/java/org/apache/camel/language/xpath/XPath.java
@@ -58,4 +58,4 @@ public @interface XPath {
      * If this is empty then the XPath expression will be applied to the body instead.
      */
     String headerName() default "";
-}
\ No newline at end of file
+}
diff --git a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerEndpoint.java b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerEndpoint.java
index c8b4d23..886c891 100644
--- a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerEndpoint.java
+++ b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerEndpoint.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.yammer;
 
-import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
diff --git a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessageAndUserRouteTest.java b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessageAndUserRouteTest.java
index 24bcac2..8df242a 100644
--- a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessageAndUserRouteTest.java
+++ b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessageAndUserRouteTest.java
@@ -23,7 +23,6 @@ import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.component.yammer.model.Messages;
 import org.apache.camel.component.yammer.model.User;
 import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
 import org.junit.Test;
 
 public class YammerMessageAndUserRouteTest extends CamelTestSupport {
diff --git a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperProducer.java b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperProducer.java
index 63d98e0..c85b727 100644
--- a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperProducer.java
+++ b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperProducer.java
@@ -34,7 +34,6 @@ import org.apache.zookeeper.data.Stat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 import static java.lang.String.format;
 import static org.apache.camel.component.zookeeper.ZooKeeperUtils.getAclListFromMessage;
 import static org.apache.camel.component.zookeeper.ZooKeeperUtils.getCreateMode;
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyFactoryTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyFactoryTest.java
index 147e4f9..1b18580 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyFactoryTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyFactoryTest.java
@@ -27,9 +27,9 @@ import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.cluster.ClusteredRoutePolicyFactory;
 import org.apache.camel.component.zookeeper.ZooKeeperContainer;
 import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.cluster.ClusteredRoutePolicyFactory;
 import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyTest.java
index 0f21fe9..94aaffa 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyTest.java
@@ -27,9 +27,9 @@ import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.cluster.ClusteredRoutePolicy;
 import org.apache.camel.component.zookeeper.ZooKeeperContainer;
 import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.cluster.ClusteredRoutePolicy;
 import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
diff --git a/core/camel-api/src/main/java/org/apache/camel/Exchange.java b/core/camel-api/src/main/java/org/apache/camel/Exchange.java
index d2d8a14..0aeaae7 100644
--- a/core/camel-api/src/main/java/org/apache/camel/Exchange.java
+++ b/core/camel-api/src/main/java/org/apache/camel/Exchange.java
@@ -16,10 +16,8 @@
  */
 package org.apache.camel;
 
-import java.util.List;
 import java.util.Map;
 
-import org.apache.camel.spi.Synchronization;
 import org.apache.camel.spi.UnitOfWork;
 import org.apache.camel.spi.annotations.ConstantProvider;
 
diff --git a/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java b/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java
index 3e7dad2..9326154 100644
--- a/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java
+++ b/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java
@@ -52,7 +52,6 @@ import org.apache.camel.spi.PackageScanResourceResolver;
 import org.apache.camel.spi.ProcessorFactory;
 import org.apache.camel.spi.ReactiveExecutor;
 import org.apache.camel.spi.Registry;
-import org.apache.camel.spi.ReifierStrategy;
 import org.apache.camel.spi.RouteStartupOrder;
 import org.apache.camel.spi.UnitOfWorkFactory;
 import org.apache.camel.spi.XMLRoutesDefinitionLoader;
diff --git a/core/camel-api/src/main/java/org/apache/camel/component/extension/ComponentVerifierExtension.java b/core/camel-api/src/main/java/org/apache/camel/component/extension/ComponentVerifierExtension.java
index 1a00a4f..0095c10 100644
--- a/core/camel-api/src/main/java/org/apache/camel/component/extension/ComponentVerifierExtension.java
+++ b/core/camel-api/src/main/java/org/apache/camel/component/extension/ComponentVerifierExtension.java
@@ -380,4 +380,4 @@ public interface ComponentVerifierExtension extends ComponentExtension {
             GroupAttribute GROUP_OPTIONS = new GroupErrorAttribute("GROUP_OPTIONS");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/InvokeOnHeader.java b/core/camel-api/src/main/java/org/apache/camel/spi/InvokeOnHeader.java
index f444485..bae2c71 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/InvokeOnHeader.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/InvokeOnHeader.java
@@ -40,4 +40,4 @@ public @interface InvokeOnHeader {
      * Name of header.
      */
     String value();
-}
\ No newline at end of file
+}
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/converter/EnumTypeConverter.java b/core/camel-base/src/main/java/org/apache/camel/impl/converter/EnumTypeConverter.java
index 9dcf79c..8890fe7 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/converter/EnumTypeConverter.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/converter/EnumTypeConverter.java
@@ -58,4 +58,4 @@ public class EnumTypeConverter extends TypeConverterSupport {
         return null;
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/converter/InstanceMethodFallbackTypeConverter.java b/core/camel-base/src/main/java/org/apache/camel/impl/converter/InstanceMethodFallbackTypeConverter.java
index d27430e..7910379 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/converter/InstanceMethodFallbackTypeConverter.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/converter/InstanceMethodFallbackTypeConverter.java
@@ -65,4 +65,4 @@ public class InstanceMethodFallbackTypeConverter extends TypeConverterSupport {
                 .invokeMethod(method, instance, type, value, registry);
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/converter/StaticMethodFallbackTypeConverter.java b/core/camel-base/src/main/java/org/apache/camel/impl/converter/StaticMethodFallbackTypeConverter.java
index 2a86f01..0814177 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/converter/StaticMethodFallbackTypeConverter.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/converter/StaticMethodFallbackTypeConverter.java
@@ -57,4 +57,4 @@ public class StaticMethodFallbackTypeConverter extends TypeConverterSupport {
             : (T) ObjectHelper.invokeMethod(method, null, type, value, registry);
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index 3b61952..bca2019 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -168,7 +168,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
 
-
 import static org.apache.camel.spi.UnitOfWork.MDC_CAMEL_CONTEXT_ID;
 
 /**
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultConsumerTemplate.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultConsumerTemplate.java
index 0424399..cabf240 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultConsumerTemplate.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultConsumerTemplate.java
@@ -32,7 +32,6 @@ import org.apache.camel.support.service.ServiceSupport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 import static org.apache.camel.RuntimeCamelException.wrapRuntimeCamelException;
 
 /**
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultManagementNameStrategy.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultManagementNameStrategy.java
index feec156..ff19fe4 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultManagementNameStrategy.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultManagementNameStrategy.java
@@ -17,7 +17,6 @@
 package org.apache.camel.impl.engine;
 
 import java.util.concurrent.atomic.AtomicLong;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.apache.camel.CamelContext;
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/FileStateRepository.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/FileStateRepository.java
index c7e1dc8..72e58a2 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/FileStateRepository.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/FileStateRepository.java
@@ -28,7 +28,6 @@ import org.apache.camel.api.management.ManagedAttribute;
 import org.apache.camel.api.management.ManagedOperation;
 import org.apache.camel.api.management.ManagedResource;
 import org.apache.camel.spi.StateRepository;
-import org.apache.camel.support.DefaultConsumer;
 import org.apache.camel.support.service.ServiceSupport;
 import org.apache.camel.util.FileUtil;
 import org.apache.camel.util.IOHelper;
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/InterceptSendToEndpointProcessor.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/InterceptSendToEndpointProcessor.java
index aea4983..c4f6bd0 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/InterceptSendToEndpointProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/InterceptSendToEndpointProcessor.java
@@ -31,7 +31,6 @@ import org.apache.camel.support.service.ServiceHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 import static org.apache.camel.processor.PipelineHelper.continueProcessing;
 
 /**
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/JavaUuidGenerator.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/JavaUuidGenerator.java
index 6338bbe..687d51e 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/JavaUuidGenerator.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/JavaUuidGenerator.java
@@ -32,4 +32,4 @@ public class JavaUuidGenerator implements UuidGenerator {
     public String generateUuid() {
         return UUID.randomUUID().toString();
     }
-}
\ No newline at end of file
+}
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/event/ServiceStartupFailureEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/ServiceStartupFailureEvent.java
index 696517f..515b878 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/event/ServiceStartupFailureEvent.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/event/ServiceStartupFailureEvent.java
@@ -53,4 +53,4 @@ public class ServiceStartupFailureEvent extends EventObject implements CamelEven
     public String toString() {
         return "Failure to start service: " + service + " due to " + cause.getMessage();
     }
-}
\ No newline at end of file
+}
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/event/ServiceStopFailureEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/ServiceStopFailureEvent.java
index 8a614cf..f512d26 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/event/ServiceStopFailureEvent.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/event/ServiceStopFailureEvent.java
@@ -53,4 +53,4 @@ public class ServiceStopFailureEvent extends EventObject implements CamelEvent.S
     public String toString() {
         return "Failure to stop service: " + service + " due to " + cause.getMessage();
     }
-}
\ No newline at end of file
+}
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/ChoiceProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/ChoiceProcessor.java
index 9222650..b2705ef 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/ChoiceProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/ChoiceProcessor.java
@@ -34,7 +34,6 @@ import org.apache.camel.support.service.ServiceHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 import static org.apache.camel.processor.PipelineHelper.continueProcessing;
 
 /**
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/Enricher.java b/core/camel-base/src/main/java/org/apache/camel/processor/Enricher.java
index d29a42b..9a5615e 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/Enricher.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/Enricher.java
@@ -47,7 +47,6 @@ import org.apache.camel.util.StopWatch;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 import static org.apache.camel.support.ExchangeHelper.copyResultsPreservePattern;
 
 /**
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/LoopProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/LoopProcessor.java
index 278a507..4db9be2 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/LoopProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/LoopProcessor.java
@@ -33,7 +33,6 @@ import org.apache.camel.support.processor.DelegateAsyncProcessor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 import static org.apache.camel.processor.PipelineHelper.continueProcessing;
 
 /**
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
index 1205847..d56bc26 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
@@ -39,7 +39,6 @@ import org.apache.camel.support.service.ServiceHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 import static org.apache.camel.util.ObjectHelper.notNull;
 
 /**
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/PollEnricher.java b/core/camel-base/src/main/java/org/apache/camel/processor/PollEnricher.java
index a608b90..9483665 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/PollEnricher.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/PollEnricher.java
@@ -45,7 +45,6 @@ import org.apache.camel.support.service.ServiceHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 import static org.apache.camel.support.ExchangeHelper.copyResultsPreservePattern;
 
 /**
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/RecipientList.java b/core/camel-base/src/main/java/org/apache/camel/processor/RecipientList.java
index f473dfc..43d58c6 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/RecipientList.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/RecipientList.java
@@ -40,7 +40,6 @@ import org.apache.camel.util.StringHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 import static org.apache.camel.util.ObjectHelper.notNull;
 
 /**
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/RecipientListProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/RecipientListProcessor.java
index a637ced..c78f13d 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/RecipientListProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/RecipientListProcessor.java
@@ -28,7 +28,6 @@ import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
 import org.apache.camel.ExtendedCamelContext;
-import org.apache.camel.ExtendedExchange;
 import org.apache.camel.NoTypeConversionAvailableException;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -39,7 +38,6 @@ import org.apache.camel.support.AsyncProcessorConverterHelper;
 import org.apache.camel.support.EndpointHelper;
 import org.apache.camel.support.ExchangeHelper;
 import org.apache.camel.support.MessageHelper;
-import org.apache.camel.support.SynchronizationAdapter;
 import org.apache.camel.support.service.ServiceHelper;
 import org.apache.camel.util.ObjectHelper;
 import org.slf4j.Logger;
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/SendProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/SendProcessor.java
index 1abbc08..0fbe798 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/SendProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/SendProcessor.java
@@ -16,17 +16,13 @@
  */
 package org.apache.camel.processor;
 
-import java.net.URISyntaxException;
-
 import org.apache.camel.AsyncCallback;
 import org.apache.camel.AsyncProducer;
-import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.EndpointAware;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
 import org.apache.camel.ExtendedCamelContext;
-import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.Traceable;
 import org.apache.camel.impl.engine.DefaultProducerCache;
 import org.apache.camel.spi.IdAware;
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/DefaultExceptionPolicyStrategy.java b/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/DefaultExceptionPolicyStrategy.java
index 04a1467..c298d71 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/DefaultExceptionPolicyStrategy.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/DefaultExceptionPolicyStrategy.java
@@ -23,7 +23,6 @@ import java.util.Set;
 import java.util.TreeMap;
 
 import org.apache.camel.Exchange;
-import org.apache.camel.Route;
 import org.apache.camel.support.ExchangeHelper;
 import org.apache.camel.util.ObjectHelper;
 import org.slf4j.Logger;
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java b/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java
index 9976a77..5a62994 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java
@@ -44,7 +44,6 @@ import org.apache.camel.spi.ExchangeFormatter;
 import org.apache.camel.spi.ReactiveExecutor;
 import org.apache.camel.spi.ShutdownPrepared;
 import org.apache.camel.spi.ShutdownStrategy;
-import org.apache.camel.spi.UnitOfWork;
 import org.apache.camel.support.AsyncCallbackToCompletableFutureAdapter;
 import org.apache.camel.support.AsyncProcessorConverterHelper;
 import org.apache.camel.support.CamelContextHelper;
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java b/core/camel-base/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java
index ee07060..4af8f74 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java
@@ -35,7 +35,6 @@ import org.apache.camel.spi.RouteIdAware;
 import org.apache.camel.spi.Synchronization;
 import org.apache.camel.support.AsyncProcessorConverterHelper;
 import org.apache.camel.support.AsyncProcessorSupport;
-import org.apache.camel.support.DefaultConsumer;
 import org.apache.camel.support.service.ServiceHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/interceptor/DefaultBacklogTracerEventMessage.java b/core/camel-base/src/main/java/org/apache/camel/processor/interceptor/DefaultBacklogTracerEventMessage.java
index 1ffb7fd..233b17d 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/interceptor/DefaultBacklogTracerEventMessage.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/interceptor/DefaultBacklogTracerEventMessage.java
@@ -17,7 +17,6 @@
 package org.apache.camel.processor.interceptor;
 
 import java.text.SimpleDateFormat;
-import java.util.Date;
 
 import org.apache.camel.api.management.mbean.BacklogTracerEventMessage;
 
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/FailOverLoadBalancer.java b/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/FailOverLoadBalancer.java
index 6a8f900..9c9318b 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/FailOverLoadBalancer.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/FailOverLoadBalancer.java
@@ -27,7 +27,6 @@ import org.apache.camel.CamelContextAware;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExtendedCamelContext;
 import org.apache.camel.Traceable;
-import org.apache.camel.support.DefaultConsumer;
 import org.apache.camel.support.ExchangeHelper;
 import org.apache.camel.util.ObjectHelper;
 import org.slf4j.Logger;
diff --git a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceDefinition.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceDefinition.java
index ba73553..8b5e4ac 100644
--- a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceDefinition.java
+++ b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceDefinition.java
@@ -294,4 +294,4 @@ public class DefaultServiceDefinition implements ServiceDefinition {
             return new DefaultServiceDefinition(id, name, host, port != null ? port : -1, meta, health);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceHealth.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceHealth.java
index 8a7c4ee..379ee4e 100644
--- a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceHealth.java
+++ b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceHealth.java
@@ -51,4 +51,4 @@ public class DefaultServiceHealth implements ServiceHealth {
     public Map<String, String> getMetadata() {
         return this.meta;
     }
-}
\ No newline at end of file
+}
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java b/core/camel-core-engine/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java
index 66a042b..c77de1c 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.builder;
 
-import org.apache.camel.ErrorHandlerFactory;
 import org.apache.camel.processor.errorhandler.ExceptionPolicyStrategy;
 import org.apache.camel.util.ObjectHelper;
 
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/AggregateDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/AggregateDefinition.java
index 17c99d3..099e710 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/model/AggregateDefinition.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/AggregateDefinition.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.model;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ScheduledExecutorService;
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/CircuitBreakerDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/CircuitBreakerDefinition.java
index 122eb29..8ef4b07 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/model/CircuitBreakerDefinition.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/CircuitBreakerDefinition.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.model;
 
-import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/InterceptFromDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/InterceptFromDefinition.java
index e99c6da..c39e088 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/model/InterceptFromDefinition.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/InterceptFromDefinition.java
@@ -16,12 +16,9 @@
  */
 package org.apache.camel.model;
 
-import java.util.List;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElementRef;
 import javax.xml.bind.annotation.XmlRootElement;
 
 import org.apache.camel.spi.Metadata;
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
index c46716d..8e150f4 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.model;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/OnCompletionDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/OnCompletionDefinition.java
index dcd993a..42ab99a 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/model/OnCompletionDefinition.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/OnCompletionDefinition.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.model;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/OutputDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/OutputDefinition.java
index 6ad7880..83534885 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/model/OutputDefinition.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/OutputDefinition.java
@@ -21,8 +21,6 @@ import java.util.List;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 
 import org.apache.camel.spi.Metadata;
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/ProcessorDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/ProcessorDefinition.java
index 4e5da0f..b5b46d1 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/model/ProcessorDefinition.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/ProcessorDefinition.java
@@ -20,10 +20,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Comparator;
-import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
@@ -31,10 +29,8 @@ import java.util.function.Supplier;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyAttribute;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.namespace.QName;
 
 import org.apache.camel.AggregationStrategy;
 import org.apache.camel.BeanScope;
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/ResequenceDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/ResequenceDefinition.java
index ef0ece2..d1f928e 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/model/ResequenceDefinition.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/ResequenceDefinition.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.model;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import javax.xml.bind.annotation.XmlAccessType;
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/SamplingDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/SamplingDefinition.java
index 05e488d..a3a2a08 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/model/SamplingDefinition.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/SamplingDefinition.java
@@ -23,7 +23,6 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.camel.spi.Metadata;
 
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java
index 9d872b8..d77d4cf 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java
@@ -22,7 +22,6 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy;
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/CachingServiceCallServiceDiscoveryConfiguration.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/CachingServiceCallServiceDiscoveryConfiguration.java
index c58f5b6..ae9307d 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/CachingServiceCallServiceDiscoveryConfiguration.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/cloud/CachingServiceCallServiceDiscoveryConfiguration.java
@@ -25,7 +25,6 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElements;
 import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.spi.Metadata;
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java
index c9118f6..ca0a53d 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java
@@ -17,7 +17,6 @@
 package org.apache.camel.model.dataformat;
 
 import java.util.Locale;
-import java.util.Objects;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java
index 66c7d59..1e3c374 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java
@@ -22,9 +22,6 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlTransient;
 
-import org.apache.camel.CamelContext;
-import org.apache.camel.Expression;
-import org.apache.camel.Predicate;
 import org.apache.camel.spi.NamespaceAware;
 
 /**
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/language/XMLTokenizerExpression.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/language/XMLTokenizerExpression.java
index d206a4e..1218bfc 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/model/language/XMLTokenizerExpression.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/language/XMLTokenizerExpression.java
@@ -16,17 +16,11 @@
  */
 package org.apache.camel.model.language;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.camel.CamelContext;
-import org.apache.camel.Expression;
-import org.apache.camel.Predicate;
 import org.apache.camel.spi.Metadata;
 
 /**
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/language/XPathExpression.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/language/XPathExpression.java
index 8acd6da..53bf195 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/model/language/XPathExpression.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/language/XPathExpression.java
@@ -16,9 +16,6 @@
  */
 package org.apache.camel.model.language;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
@@ -28,8 +25,6 @@ import javax.xml.xpath.XPathFactory;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Expression;
-import org.apache.camel.Predicate;
-import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.util.ObjectHelper;
 
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/language/XQueryExpression.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/language/XQueryExpression.java
index eaa9e27..4b97a43 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/model/language/XQueryExpression.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/language/XQueryExpression.java
@@ -16,18 +16,12 @@
  */
 package org.apache.camel.model.language;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 
-import org.apache.camel.CamelContext;
-import org.apache.camel.Expression;
-import org.apache.camel.Predicate;
 import org.apache.camel.spi.Metadata;
 
 /**
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/language/MethodCallExpressionReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/language/MethodCallExpressionReifier.java
index 013d493..b736416 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/language/MethodCallExpressionReifier.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/language/MethodCallExpressionReifier.java
@@ -19,9 +19,7 @@ package org.apache.camel.reifier.language;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.AfterPropertiesConfigured;
 import org.apache.camel.CamelContext;
-import org.apache.camel.Expression;
 import org.apache.camel.Predicate;
 import org.apache.camel.model.language.ExpressionDefinition;
 import org.apache.camel.model.language.MethodCallExpression;
diff --git a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/Simple.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/Simple.java
index 9287b0b..55a7d4a 100644
--- a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/Simple.java
+++ b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/Simple.java
@@ -34,4 +34,4 @@ import org.apache.camel.support.language.LanguageAnnotation;
 @LanguageAnnotation(language = "simple")
 public @interface Simple {
     String value();
-}
\ No newline at end of file
+}
diff --git a/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/impl/Activator.java b/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/impl/Activator.java
index 4b9db98..6443411 100644
--- a/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/impl/Activator.java
+++ b/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/impl/Activator.java
@@ -53,7 +53,6 @@ import org.apache.camel.spi.Injector;
 import org.apache.camel.spi.Language;
 import org.apache.camel.spi.LanguageResolver;
 import org.apache.camel.spi.PackageScanFilter;
-import org.apache.camel.spi.PropertyConfigurer;
 import org.apache.camel.spi.TypeConverterLoader;
 import org.apache.camel.spi.TypeConverterRegistry;
 import org.apache.camel.util.IOHelper;
@@ -73,7 +72,6 @@ import org.osgi.util.tracker.BundleTrackerCustomizer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 import static org.osgi.framework.wiring.BundleRevision.PACKAGE_NAMESPACE;
 
 public class Activator implements BundleActivator, BundleTrackerCustomizer<Object> {
diff --git a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelConsumerTemplateFactoryBean.java b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelConsumerTemplateFactoryBean.java
index a7e3bb9..c7cb476 100644
--- a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelConsumerTemplateFactoryBean.java
+++ b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelConsumerTemplateFactoryBean.java
@@ -72,4 +72,4 @@ public abstract class AbstractCamelConsumerTemplateFactoryBean extends AbstractC
     public void setMaximumCacheSize(Integer maximumCacheSize) {
         this.maximumCacheSize = maximumCacheSize;
     }
-}
\ No newline at end of file
+}
diff --git a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelRedeliveryPolicyFactoryBean.java b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelRedeliveryPolicyFactoryBean.java
index 84402bb..39f9396 100644
--- a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelRedeliveryPolicyFactoryBean.java
+++ b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelRedeliveryPolicyFactoryBean.java
@@ -392,4 +392,4 @@ public abstract class AbstractCamelRedeliveryPolicyFactoryBean extends AbstractC
     public void setExchangeFormatterRef(String exchangeFormatterRef) {
         this.exchangeFormatterRef = exchangeFormatterRef;
     }
-}
\ No newline at end of file
+}
diff --git a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelJMXAgentDefinition.java b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelJMXAgentDefinition.java
index d09cb46..d96a589 100644
--- a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelJMXAgentDefinition.java
+++ b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelJMXAgentDefinition.java
@@ -318,4 +318,4 @@ public class CamelJMXAgentDefinition extends IdentifiedType {
         return sb.toString();
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelStreamCachingStrategyDefinition.java b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelStreamCachingStrategyDefinition.java
index 5ca4588..ac47974 100644
--- a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelStreamCachingStrategyDefinition.java
+++ b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelStreamCachingStrategyDefinition.java
@@ -197,4 +197,4 @@ public class CamelStreamCachingStrategyDefinition extends IdentifiedType {
         this.anySpoolRules = anySpoolRules;
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XsltUriResolverTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XsltUriResolverTest.java
index bae547e..1b74e3b 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XsltUriResolverTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XsltUriResolverTest.java
@@ -1,37 +1,37 @@
-/*
- * 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.builder.xml;
-
-import javax.xml.transform.Source;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.component.xslt.XsltUriResolver;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Assert;
-import org.junit.Test;
-
-public class XsltUriResolverTest extends Assert {
-
-    @Test
-    public void testResolveUri() throws Exception {
-        CamelContext context = new DefaultCamelContext();
-        XsltUriResolver xsltUriResolver = new XsltUriResolver(context, "classpath:xslt/staff/staff.xsl");
-        Source source = xsltUriResolver.resolve("../../xslt/common/staff_template.xsl", "classpath:xslt/staff/staff.xsl");
-        assertNotNull(source);
-        assertEquals("classpath:xslt/common/staff_template.xsl", source.getSystemId());
-    }
-}
+/*
+ * 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.builder.xml;
+
+import javax.xml.transform.Source;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.component.xslt.XsltUriResolver;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class XsltUriResolverTest extends Assert {
+
+    @Test
+    public void testResolveUri() throws Exception {
+        CamelContext context = new DefaultCamelContext();
+        XsltUriResolver xsltUriResolver = new XsltUriResolver(context, "classpath:xslt/staff/staff.xsl");
+        Source source = xsltUriResolver.resolve("../../xslt/common/staff_template.xsl", "classpath:xslt/staff/staff.xsl");
+        assertNotNull(source);
+        assertEquals("classpath:xslt/common/staff_template.xsl", source.getSystemId());
+    }
+}
diff --git a/core/camel-core/src/test/java/org/apache/camel/catalog/RuntimeCamelCatalogTest.java b/core/camel-core/src/test/java/org/apache/camel/catalog/RuntimeCamelCatalogTest.java
index 89db9a2..e3224b8 100644
--- a/core/camel-core/src/test/java/org/apache/camel/catalog/RuntimeCamelCatalogTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/catalog/RuntimeCamelCatalogTest.java
@@ -144,4 +144,4 @@ public class RuntimeCamelCatalogTest {
         assertEquals("true", map.get("blockWhenFull"));
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/properties/OptionalPropertiesDslInvalidSyntaxTest.java b/core/camel-core/src/test/java/org/apache/camel/component/properties/OptionalPropertiesDslInvalidSyntaxTest.java
index 4fe9556..50ad98c 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/properties/OptionalPropertiesDslInvalidSyntaxTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/properties/OptionalPropertiesDslInvalidSyntaxTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.properties;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
-import org.apache.camel.PropertyBindingException;
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.Test;
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultMessageHeaderTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultMessageHeaderTest.java
index 2e90431..d548b91 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultMessageHeaderTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultMessageHeaderTest.java
@@ -22,7 +22,6 @@ import org.apache.camel.CamelContext;
 import org.apache.camel.Message;
 import org.apache.camel.support.DefaultExchange;
 import org.apache.camel.support.DefaultMessage;
-import org.junit.Assert;
 import org.junit.Test;
 
 public class DefaultMessageHeaderTest extends TestCase {
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerCacheTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerCacheTest.java
index c473110..8ffd2bf 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerCacheTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerCacheTest.java
@@ -26,7 +26,6 @@ import org.apache.camel.CamelContext;
 import org.apache.camel.Consumer;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Endpoint;
-import org.apache.camel.EndpointAware;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -36,11 +35,9 @@ import org.apache.camel.spi.EndpointUtilizationStatistics;
 import org.apache.camel.support.DefaultComponent;
 import org.apache.camel.support.DefaultEndpoint;
 import org.apache.camel.support.DefaultProducer;
-import org.apache.camel.support.service.ServiceSupport;
 import org.apache.camel.util.function.ThrowingFunction;
 import org.junit.Test;
 
-
 import static org.awaitility.Awaitility.await;
 
 public class DefaultProducerCacheTest extends ContextTestSupport {
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateTest.java
index b189ca9..7afafd6 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateTest.java
@@ -33,6 +33,7 @@ import org.apache.camel.impl.engine.DefaultProducerTemplate;
 import org.junit.Test;
 
 import static org.awaitility.Awaitility.await;
+
 /**
  * Unit test for DefaultProducerTemplate
  */
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateWithCustomCacheMaxSizeTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateWithCustomCacheMaxSizeTest.java
index 6187d5a..dfc5f24 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateWithCustomCacheMaxSizeTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateWithCustomCacheMaxSizeTest.java
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 package org.apache.camel.impl;
+
 import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.CamelContext;
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultPackageScanResourceResolverTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultPackageScanResourceResolverTest.java
index cda2b09..c3eea9f 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultPackageScanResourceResolverTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultPackageScanResourceResolverTest.java
@@ -31,7 +31,6 @@ import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-
 public class DefaultPackageScanResourceResolverTest {
     @Test
     public void testFileResourcesScan() {
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/health/RouteHealthCheckTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/health/RouteHealthCheckTest.java
index 355bd28..8cfa1ab 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/health/RouteHealthCheckTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/health/RouteHealthCheckTest.java
@@ -1,51 +1,51 @@
-/*
- * 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.impl.health;
-
-import java.util.Collections;
-
-import org.apache.camel.ContextTestSupport;
-import org.apache.camel.Route;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.health.HealthCheckResultBuilder;
-import org.junit.Test;
-
-public class RouteHealthCheckTest extends ContextTestSupport {
-
-    private static final String TEST_ROUTE_ID = "Test-Route";
-
-    @Test
-    public void testDoCallDoesNotHaveNPEWhenJmxDisabled() {
-        Route route = context.getRoute(TEST_ROUTE_ID);
-
-        RouteHealthCheck healthCheck = new RouteHealthCheck(route);
-        final HealthCheckResultBuilder builder = HealthCheckResultBuilder.on(healthCheck);
-
-        healthCheck.doCall(builder, Collections.emptyMap());
-    }
-
-    @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-            @Override
-            public void configure() throws Exception {
-                from("direct:input").id(TEST_ROUTE_ID).log("Message");
-            }
-        };
-    }
-
-}
+/*
+ * 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.impl.health;
+
+import java.util.Collections;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Route;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.health.HealthCheckResultBuilder;
+import org.junit.Test;
+
+public class RouteHealthCheckTest extends ContextTestSupport {
+
+    private static final String TEST_ROUTE_ID = "Test-Route";
+
+    @Test
+    public void testDoCallDoesNotHaveNPEWhenJmxDisabled() {
+        Route route = context.getRoute(TEST_ROUTE_ID);
+
+        RouteHealthCheck healthCheck = new RouteHealthCheck(route);
+        final HealthCheckResultBuilder builder = HealthCheckResultBuilder.on(healthCheck);
+
+        healthCheck.doCall(builder, Collections.emptyMap());
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("direct:input").id(TEST_ROUTE_ID).log("Message");
+            }
+        };
+    }
+
+}
diff --git a/core/camel-core/src/test/java/org/apache/camel/model/OnFallbackDefinitionTest.java b/core/camel-core/src/test/java/org/apache/camel/model/OnFallbackDefinitionTest.java
index ef53961..f8e22d2 100644
--- a/core/camel-core/src/test/java/org/apache/camel/model/OnFallbackDefinitionTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/model/OnFallbackDefinitionTest.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.model;
 
-import org.junit.Assert;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/CamelCaseInsentiveHeadersTrueTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/CamelCaseInsentiveHeadersTrueTest.java
index cdb4c87..793f411 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/CamelCaseInsentiveHeadersTrueTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/CamelCaseInsentiveHeadersTrueTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.processor;
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
 
 public class CamelCaseInsentiveHeadersTrueTest extends ContextTestSupport {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/ExchangeCreatedTimestampTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/ExchangeCreatedTimestampTest.java
index c85846c..92bd27e 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/ExchangeCreatedTimestampTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/ExchangeCreatedTimestampTest.java
@@ -16,10 +16,7 @@
  */
 package org.apache.camel.processor;
 
-import java.util.Date;
-
 import org.apache.camel.ContextTestSupport;
-import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/RecipientListNoCacheTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/RecipientListNoCacheTest.java
index a97b2d3..39e62bb 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/RecipientListNoCacheTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/RecipientListNoCacheTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.processor;
 
 import java.util.List;
-import java.util.concurrent.ExecutorService;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Processor;
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/RouteStopTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/RouteStopTest.java
index bcd1680..a803f26 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/RouteStopTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/RouteStopTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.processor;
 
 import org.apache.camel.ContextTestSupport;
-import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.Test;
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/RouteWithConstantFieldFromExchangeFailTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/RouteWithConstantFieldFromExchangeFailTest.java
index f7f3289..6a819cd 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/RouteWithConstantFieldFromExchangeFailTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/RouteWithConstantFieldFromExchangeFailTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.processor;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class RouteWithConstantFieldFromExchangeFailTest extends ContextTestSupport {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomListAggregationStrategyEmptySplitTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomListAggregationStrategyEmptySplitTest.java
index d1f630a..1c288d8 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomListAggregationStrategyEmptySplitTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomListAggregationStrategyEmptySplitTest.java
@@ -1,78 +1,78 @@
-/*
- * 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.processor.aggregator;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.camel.ContextTestSupport;
-import org.apache.camel.Exchange;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.processor.aggregate.AbstractListAggregationStrategy;
-import org.junit.Test;
-
-/**
- *
- */
-public class CustomListAggregationStrategyEmptySplitTest extends ContextTestSupport {
-
-    @SuppressWarnings("unchecked")
-    @Test
-    public void testCustomAggregationStrategy() throws Exception {
-        getMockEndpoint("mock:line").expectedBodiesReceived();
-
-        MockEndpoint result = getMockEndpoint("mock:result");
-        result.expectedMessageCount(1);
-        result.message(0).body().isInstanceOf(List.class);
-
-        List<String> body = new ArrayList<>();
-
-        template.sendBody("direct:start", body);
-
-        assertMockEndpointsSatisfied();
-
-        // the list will be stored as the message body by default
-        List<Integer> numbers = result.getExchanges().get(0).getIn().getBody(List.class);
-        assertNotNull(numbers);
-        assertEquals(0, numbers.size());
-    }
-
-    @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-            @Override
-            public void configure() throws Exception {
-                from("direct:start").split(body(), new MyListOfNumbersStrategy()).to("mock:line").end().to("mock:result");
-            }
-        };
-    }
-
-    /**
-     * Our strategy is irrelevant as getValue will not be called on an empty
-     * list, however this strategy will group a list of integers.
-     */
-    public final class MyListOfNumbersStrategy extends AbstractListAggregationStrategy<Integer> {
-
-        @Override
-        public Integer getValue(Exchange exchange) {
-            String s = exchange.getIn().getBody(String.class);
-            return Integer.valueOf(s);
-        }
-    }
-
-}
+/*
+ * 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.processor.aggregator;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.processor.aggregate.AbstractListAggregationStrategy;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class CustomListAggregationStrategyEmptySplitTest extends ContextTestSupport {
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void testCustomAggregationStrategy() throws Exception {
+        getMockEndpoint("mock:line").expectedBodiesReceived();
+
+        MockEndpoint result = getMockEndpoint("mock:result");
+        result.expectedMessageCount(1);
+        result.message(0).body().isInstanceOf(List.class);
+
+        List<String> body = new ArrayList<>();
+
+        template.sendBody("direct:start", body);
+
+        assertMockEndpointsSatisfied();
+
+        // the list will be stored as the message body by default
+        List<Integer> numbers = result.getExchanges().get(0).getIn().getBody(List.class);
+        assertNotNull(numbers);
+        assertEquals(0, numbers.size());
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("direct:start").split(body(), new MyListOfNumbersStrategy()).to("mock:line").end().to("mock:result");
+            }
+        };
+    }
+
+    /**
+     * Our strategy is irrelevant as getValue will not be called on an empty
+     * list, however this strategy will group a list of integers.
+     */
+    public final class MyListOfNumbersStrategy extends AbstractListAggregationStrategy<Integer> {
+
+        @Override
+        public Integer getValue(Exchange exchange) {
+            String s = exchange.getIn().getBody(String.class);
+            return Integer.valueOf(s);
+        }
+    }
+
+}
diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LogToDAdvancedTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LogToDAdvancedTest.java
index 862ea62..48c25c7 100644
--- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LogToDAdvancedTest.java
+++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LogToDAdvancedTest.java
@@ -22,7 +22,6 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.spi.ExceptionHandler;
 import org.apache.camel.spi.ExchangeFormatter;
 import org.apache.camel.support.processor.DefaultExchangeFormatter;
 import org.junit.Test;
diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/TimerAdvancedTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/TimerAdvancedTest.java
index a6dadcc..5b0250a 100644
--- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/TimerAdvancedTest.java
+++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/TimerAdvancedTest.java
@@ -23,7 +23,6 @@ import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spi.ExceptionHandler;
-import org.apache.camel.support.LoggingExceptionHandler;
 import org.junit.Test;
 
 public class TimerAdvancedTest extends ContextTestSupport {
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/Main.java b/core/camel-main/src/main/java/org/apache/camel/main/Main.java
index 576be75..ac51b86 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/Main.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/Main.java
@@ -21,7 +21,6 @@ import java.util.Map;
 import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.reifier.ProcessorReifier;
 import org.apache.camel.spi.Registry;
 
 /**
diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainBeansTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainBeansTest.java
index a0aa9a1..a61b930 100644
--- a/core/camel-main/src/test/java/org/apache/camel/main/MainBeansTest.java
+++ b/core/camel-main/src/test/java/org/apache/camel/main/MainBeansTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.main;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.seda.SedaComponent;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ComponentVerifierExtension.java b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ComponentVerifierExtension.java
index a5de932..ba97943 100644
--- a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ComponentVerifierExtension.java
+++ b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ComponentVerifierExtension.java
@@ -476,4 +476,4 @@ public final class ComponentVerifierExtension {
             super(name);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelHealthMBean.java b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelHealthMBean.java
index 6b82e05..1577ff5 100644
--- a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelHealthMBean.java
+++ b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelHealthMBean.java
@@ -36,4 +36,4 @@ public interface ManagedCamelHealthMBean {
 
     @ManagedOperation(description = "Invoke an Health Check by ID")
     String invoke(String id);
-}
\ No newline at end of file
+}
diff --git a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedChoiceMBean.java b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedChoiceMBean.java
index b22583f..1cd3577 100644
--- a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedChoiceMBean.java
+++ b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedChoiceMBean.java
@@ -25,4 +25,4 @@ public interface ManagedChoiceMBean extends ManagedProcessorMBean {
     @ManagedOperation(description = "Statistics of the content based router for each predicate")
     TabularData choiceStatistics();
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedClusterServiceMBean.java b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedClusterServiceMBean.java
index eccd2cf..9abf09d 100644
--- a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedClusterServiceMBean.java
+++ b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedClusterServiceMBean.java
@@ -45,4 +45,4 @@ public interface ManagedClusterServiceMBean {
 
     @ManagedOperation(description = "If the local view is leader")
     boolean isLeader(String namespace);
-}
\ No newline at end of file
+}
diff --git a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedCounterMBean.java b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedCounterMBean.java
index a4bf01f..01c85f9 100644
--- a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedCounterMBean.java
+++ b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedCounterMBean.java
@@ -35,4 +35,4 @@ public interface ManagedCounterMBean {
     @ManagedAttribute(description = "Total number of exchanges")
     long getExchangesTotal() throws Exception;
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedDynamicRouterMBean.java b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedDynamicRouterMBean.java
index 00654e3..5845545 100644
--- a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedDynamicRouterMBean.java
+++ b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedDynamicRouterMBean.java
@@ -42,4 +42,4 @@ public interface ManagedDynamicRouterMBean extends ManagedProcessorMBean, Manage
     @ManagedOperation(description = "Statistics of the endpoints which has been sent to")
     TabularData extendedInformation();
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedEndpointRegistryMBean.java b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedEndpointRegistryMBean.java
index 3c801f6..82e1dcb 100644
--- a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedEndpointRegistryMBean.java
+++ b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedEndpointRegistryMBean.java
@@ -44,4 +44,4 @@ public interface ManagedEndpointRegistryMBean extends ManagedServiceMBean {
     @ManagedOperation(description = "Lists all the endpoints in the registry (url)")
     TabularData listEndpoints();
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedEnricherMBean.java b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedEnricherMBean.java
index 60b7f43..f2b1321 100644
--- a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedEnricherMBean.java
+++ b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedEnricherMBean.java
@@ -45,4 +45,4 @@ public interface ManagedEnricherMBean extends ManagedProcessorMBean, ManagedExte
     @ManagedOperation(description = "Statistics of the endpoints that has been enriched from")
     TabularData extendedInformation();
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedFailoverLoadBalancerMBean.java b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedFailoverLoadBalancerMBean.java
index 14e30f0..3af0c1d 100644
--- a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedFailoverLoadBalancerMBean.java
+++ b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedFailoverLoadBalancerMBean.java
@@ -44,4 +44,4 @@ public interface ManagedFailoverLoadBalancerMBean extends ManagedProcessorMBean
     @ManagedOperation(description = "Statistics of the content based router for each exception")
     TabularData exceptionStatistics();
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedPerformanceCounterMBean.java b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedPerformanceCounterMBean.java
index 0b89b96..745e790 100644
--- a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedPerformanceCounterMBean.java
+++ b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedPerformanceCounterMBean.java
@@ -92,4 +92,4 @@ public interface ManagedPerformanceCounterMBean extends ManagedCounterMBean {
     @ManagedOperation(description = "Dumps the statistics as XML")
     String dumpStatsAsXml(boolean fullStats);
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedPollEnricherMBean.java b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedPollEnricherMBean.java
index 1cb4c4d..8f59a77 100644
--- a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedPollEnricherMBean.java
+++ b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedPollEnricherMBean.java
@@ -45,4 +45,4 @@ public interface ManagedPollEnricherMBean extends ManagedProcessorMBean, Managed
     @ManagedOperation(description = "Statistics of the endpoints that has been poll enriched from")
     TabularData extendedInformation();
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedRecipientListMBean.java b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedRecipientListMBean.java
index 2931911..8e3f97f 100644
--- a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedRecipientListMBean.java
+++ b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedRecipientListMBean.java
@@ -57,4 +57,4 @@ public interface ManagedRecipientListMBean extends ManagedProcessorMBean, Manage
     @ManagedOperation(description = "Statistics of the endpoints which has been sent to")
     TabularData extendedInformation();
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedRouteControllerMBean.java b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedRouteControllerMBean.java
index 07dc475..6b4282a 100644
--- a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedRouteControllerMBean.java
+++ b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedRouteControllerMBean.java
@@ -24,4 +24,4 @@ public interface ManagedRouteControllerMBean {
 
     @ManagedAttribute(description = "Controlled Routes")
     Collection<String> getControlledRoutes();
-}
\ No newline at end of file
+}
diff --git a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedRouteMBean.java b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedRouteMBean.java
index 1da0e0b..f5e0896 100644
--- a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedRouteMBean.java
+++ b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedRouteMBean.java
@@ -130,4 +130,4 @@ public interface ManagedRouteMBean extends ManagedPerformanceCounterMBean {
 
     @ManagedAttribute(description = "Last error")
     RouteError getLastError();
-}
\ No newline at end of file
+}
diff --git a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedRoutingSlipMBean.java b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedRoutingSlipMBean.java
index 61369e6..ca767f5 100644
--- a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedRoutingSlipMBean.java
+++ b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedRoutingSlipMBean.java
@@ -42,4 +42,4 @@ public interface ManagedRoutingSlipMBean extends ManagedProcessorMBean, ManagedE
     @ManagedOperation(description = "Statistics of the endpoints which has been sent to")
     TabularData extendedInformation();
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedSendDynamicProcessorMBean.java b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedSendDynamicProcessorMBean.java
index 12da2a8..cbffa5b 100644
--- a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedSendDynamicProcessorMBean.java
+++ b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedSendDynamicProcessorMBean.java
@@ -45,4 +45,4 @@ public interface ManagedSendDynamicProcessorMBean extends ManagedProcessorMBean,
     @ManagedOperation(description = "Statistics of the endpoints which has been sent to")
     TabularData extendedInformation();
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedSendProcessorMBean.java b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedSendProcessorMBean.java
index b7dda12..580841f 100644
--- a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedSendProcessorMBean.java
+++ b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedSendProcessorMBean.java
@@ -33,4 +33,4 @@ public interface ManagedSendProcessorMBean extends ManagedProcessorMBean, Manage
     @ManagedOperation(description = "Statistics of the endpoint which has been sent to")
     TabularData extendedInformation();
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedTransformerRegistryMBean.java b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedTransformerRegistryMBean.java
index 9b18ca4..51b7c1d 100644
--- a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedTransformerRegistryMBean.java
+++ b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedTransformerRegistryMBean.java
@@ -44,4 +44,4 @@ public interface ManagedTransformerRegistryMBean extends ManagedServiceMBean {
     @ManagedOperation(description = "Lists all the transformers in the registry")
     TabularData listTransformers();
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedValidatorRegistryMBean.java b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedValidatorRegistryMBean.java
index e5cdd4d..ed1957a 100644
--- a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedValidatorRegistryMBean.java
+++ b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedValidatorRegistryMBean.java
@@ -44,4 +44,4 @@ public interface ManagedValidatorRegistryMBean extends ManagedServiceMBean {
     @ManagedOperation(description = "Lists all the validators in the registry")
     TabularData listValidators();
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedWireTapMBean.java b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedWireTapMBean.java
index 9b5b9cd..5103dcb 100644
--- a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedWireTapMBean.java
+++ b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedWireTapMBean.java
@@ -45,4 +45,4 @@ public interface ManagedWireTapMBean extends ManagedProcessorMBean, ManagedExten
     @ManagedOperation(description = "Statistics of the endpoints which has been sent to")
     TabularData extendedInformation();
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedChoice.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedChoice.java
index db40fc7..2b91c8e 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedChoice.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedChoice.java
@@ -99,4 +99,4 @@ public class ManagedChoice extends ManagedProcessor implements ManagedChoiceMBea
             throw RuntimeCamelException.wrapRuntimeCamelException(e);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/DualManagedThreadPoolProfileTest.java b/core/camel-management/src/test/java/org/apache/camel/management/DualManagedThreadPoolProfileTest.java
index 65bd7b9..38f5bd9 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/DualManagedThreadPoolProfileTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/DualManagedThreadPoolProfileTest.java
@@ -97,4 +97,4 @@ public class DualManagedThreadPoolProfileTest extends ManagementTestSupport {
         };
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/DualManagedThreadPoolWithIdTest.java b/core/camel-management/src/test/java/org/apache/camel/management/DualManagedThreadPoolWithIdTest.java
index aa61f42..9656de7 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/DualManagedThreadPoolWithIdTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/DualManagedThreadPoolWithIdTest.java
@@ -80,4 +80,4 @@ public class DualManagedThreadPoolWithIdTest extends ManagementTestSupport {
         };
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/JmxInstrumentationDisableOnCamelContextTest.java b/core/camel-management/src/test/java/org/apache/camel/management/JmxInstrumentationDisableOnCamelContextTest.java
index 383acc2..d7c0afd 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/JmxInstrumentationDisableOnCamelContextTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/JmxInstrumentationDisableOnCamelContextTest.java
@@ -71,4 +71,4 @@ public class JmxInstrumentationDisableOnCamelContextTest extends JmxInstrumentat
         assertEquals("Found mbeans: " + s, 0, s.size());
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/JmxNotificationEventNotifierTest.java b/core/camel-management/src/test/java/org/apache/camel/management/JmxNotificationEventNotifierTest.java
index b460e7d..b0f1fb1 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/JmxNotificationEventNotifierTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/JmxNotificationEventNotifierTest.java
@@ -136,4 +136,4 @@ public class JmxNotificationEventNotifierTest extends ContextTestSupport {
         
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedAggregateControllerTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedAggregateControllerTest.java
index f711761..0fcddb9 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedAggregateControllerTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedAggregateControllerTest.java
@@ -193,4 +193,4 @@ public class ManagedAggregateControllerTest extends ManagementTestSupport {
             return oldExchange;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedBrowsableEndpointEmptyTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedBrowsableEndpointEmptyTest.java
index 64cd0ca..d3216b1 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedBrowsableEndpointEmptyTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedBrowsableEndpointEmptyTest.java
@@ -48,4 +48,4 @@ public class ManagedBrowsableEndpointEmptyTest extends ManagementTestSupport {
         };
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedConsumerCacheTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedConsumerCacheTest.java
index fe98110..bdc7ee6 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedConsumerCacheTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedConsumerCacheTest.java
@@ -99,4 +99,4 @@ public class ManagedConsumerCacheTest extends ManagementTestSupport {
         };
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedDataFormatTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedDataFormatTest.java
index 43a3669..3f3cd07 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedDataFormatTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedDataFormatTest.java
@@ -56,4 +56,4 @@ public class ManagedDataFormatTest extends ManagementTestSupport {
         };
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedDualCamelContextTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedDualCamelContextTest.java
index 68ce0f9..8df6ebd 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedDualCamelContextTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedDualCamelContextTest.java
@@ -87,4 +87,4 @@ public class ManagedDualCamelContextTest extends TestSupport {
         };
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedEndpointBaseUriTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedEndpointBaseUriTest.java
index 4b55720..a630c6a 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedEndpointBaseUriTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedEndpointBaseUriTest.java
@@ -52,4 +52,4 @@ public class ManagedEndpointBaseUriTest extends ManagementTestSupport {
         };
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedEndpointExplainTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedEndpointExplainTest.java
index 675ecea..44a0fcc 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedEndpointExplainTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedEndpointExplainTest.java
@@ -55,4 +55,4 @@ public class ManagedEndpointExplainTest extends ManagementTestSupport {
         };
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedEndpointRegistryTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedEndpointRegistryTest.java
index 4bb7090..5b71cf0 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedEndpointRegistryTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedEndpointRegistryTest.java
@@ -104,4 +104,4 @@ public class ManagedEndpointRegistryTest extends ManagementTestSupport {
         };
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedEndpointTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedEndpointTest.java
index 7ae0791..9e2086c 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedEndpointTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedEndpointTest.java
@@ -54,4 +54,4 @@ public class ManagedEndpointTest extends ManagementTestSupport {
         };
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedEndpointUtilizationStatisticsTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedEndpointUtilizationStatisticsTest.java
index 2f448a2..1ce7489 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedEndpointUtilizationStatisticsTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedEndpointUtilizationStatisticsTest.java
@@ -68,4 +68,4 @@ public class ManagedEndpointUtilizationStatisticsTest extends ManagementTestSupp
         };
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedInflightRepositoryTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedInflightRepositoryTest.java
index a6c132b..905d436 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedInflightRepositoryTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedInflightRepositoryTest.java
@@ -18,9 +18,7 @@ package org.apache.camel.management;
 
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
-import javax.management.openmbean.TabularData;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.Test;
 
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedProducerRecipientListRegisterAlwaysTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedProducerRecipientListRegisterAlwaysTest.java
index d539f0b..168530e 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedProducerRecipientListRegisterAlwaysTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedProducerRecipientListRegisterAlwaysTest.java
@@ -76,4 +76,4 @@ public class ManagedProducerRecipientListRegisterAlwaysTest extends ManagementTe
         };
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedProducerRecipientListTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedProducerRecipientListTest.java
index 609b74a..173ab2f 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedProducerRecipientListTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedProducerRecipientListTest.java
@@ -54,4 +54,4 @@ public class ManagedProducerRecipientListTest extends ManagementTestSupport {
         };
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedProducerRouteAddRemoveRegisterAlwaysTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedProducerRouteAddRemoveRegisterAlwaysTest.java
index f4b5ddd..dc68cdb 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedProducerRouteAddRemoveRegisterAlwaysTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedProducerRouteAddRemoveRegisterAlwaysTest.java
@@ -109,4 +109,4 @@ public class ManagedProducerRouteAddRemoveRegisterAlwaysTest extends ManagementT
         };
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedProducerTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedProducerTest.java
index 188b2a6..a8f37fb 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedProducerTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedProducerTest.java
@@ -67,4 +67,4 @@ public class ManagedProducerTest extends ManagementTestSupport {
         };
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRefProducerTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRefProducerTest.java
index 93ed3c3..04d90a6 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRefProducerTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRefProducerTest.java
@@ -90,4 +90,4 @@ public class ManagedRefProducerTest extends ManagementTestSupport {
         };
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedResetIncludeProcessorsTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedResetIncludeProcessorsTest.java
index 397ec33..742e37d 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedResetIncludeProcessorsTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedResetIncludeProcessorsTest.java
@@ -118,4 +118,4 @@ public class ManagedResetIncludeProcessorsTest extends ManagementTestSupport {
         };
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedResetIncludeRoutesTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedResetIncludeRoutesTest.java
index 86c7357..2ea2159 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedResetIncludeRoutesTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedResetIncludeRoutesTest.java
@@ -119,4 +119,4 @@ public class ManagedResetIncludeRoutesTest extends ManagementTestSupport {
         };
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteAddSecondRouteNotRegisterNewRoutesTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteAddSecondRouteNotRegisterNewRoutesTest.java
index 5708a37..54768f8 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteAddSecondRouteNotRegisterNewRoutesTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteAddSecondRouteNotRegisterNewRoutesTest.java
@@ -73,4 +73,4 @@ public class ManagedRouteAddSecondRouteNotRegisterNewRoutesTest extends Manageme
         assertFalse("2nd route should not be registered", mbeanServer.isRegistered(route2));
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteAddSecondRouteTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteAddSecondRouteTest.java
index 8eb1ebf..d3dab2a 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteAddSecondRouteTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteAddSecondRouteTest.java
@@ -70,4 +70,4 @@ public class ManagedRouteAddSecondRouteTest extends ManagementTestSupport {
         assertEquals("Should be started", ServiceStatus.Started.name(), state);
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteDumpStatsAsXmlAndResetWithCustomDomainTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteDumpStatsAsXmlAndResetWithCustomDomainTest.java
index 4962e8b..9d75231 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteDumpStatsAsXmlAndResetWithCustomDomainTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteDumpStatsAsXmlAndResetWithCustomDomainTest.java
@@ -1,90 +1,90 @@
-/*
- * 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.management;
-
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-
-import org.w3c.dom.Document;
-
-import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
-
-public class ManagedRouteDumpStatsAsXmlAndResetWithCustomDomainTest extends ManagementTestSupport {
-
-    private static final String CUSTOM_DOMAIN_NAME = "custom";
-
-    @Test
-    public void testPerformanceCounterStats() throws Exception {
-        // JMX tests dont work well on AIX CI servers (hangs them)
-        if (isPlatform("aix")) {
-            return;
-        }
-
-        // get the stats for the route
-        MBeanServer mbeanServer = getMBeanServer();
-        ObjectName on = ObjectName.getInstance(CUSTOM_DOMAIN_NAME + ":context=camel-1,type=routes,name=\"foo\"");
-
-        getMockEndpoint("mock:result").expectedMessageCount(1);
-
-        template.asyncSendBody("direct:start", "Hello World");
-
-        assertMockEndpointsSatisfied();
-
-        String xml = (String) mbeanServer.invoke(on, "dumpRouteStatsAsXml", new Object[]{false, true}, new String[]{"boolean", "boolean"});
-        log.info(xml);
-
-        // should be valid XML
-        Document doc = context.getTypeConverter().convertTo(Document.class, xml);
-        assertNotNull(doc);
-
-        int processors = doc.getDocumentElement().getElementsByTagName("processorStat").getLength();
-        assertEquals(3, processors);
-
-        int exchangeCompleted = Integer.parseInt(doc.getDocumentElement().getElementsByTagName("processorStat").item(0).getAttributes().getNamedItem("exchangesCompleted").getNodeValue());
-        assertEquals(1, exchangeCompleted);
-
-        //ResetValues
-        mbeanServer.invoke(on, "reset", new Object[]{true}, new String[]{"boolean"});
-
-        xml = (String) mbeanServer.invoke(on, "dumpRouteStatsAsXml", new Object[]{false, true}, new String[]{"boolean", "boolean"});
-        log.info(xml);
-
-        // should be valid XML
-        doc = context.getTypeConverter().convertTo(Document.class, xml);
-        assertNotNull(doc);
-        exchangeCompleted = Integer.parseInt(doc.getDocumentElement().getElementsByTagName("processorStat").item(0).getAttributes().getNamedItem("exchangesCompleted").getNodeValue());
-        assertEquals(0, exchangeCompleted);
-    }
-
-    @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-            @Override
-            public void configure() throws Exception {
-//              System.setProperty("org.apache.camel.jmx.mbeanObjectDomainName", CUSTOM_DOMAIN_NAME);
-//              Or
-                getContext().getManagementStrategy().getManagementAgent().setMBeanObjectDomainName(CUSTOM_DOMAIN_NAME);
-                from("direct:start").routeId("foo")
-                        .to("log:foo").id("to-log")
-                        .delay(100)
-                        .to("mock:result").id("to-mock");
-            }
-        };
-    }
-
-}
+/*
+ * 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.management;
+
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+
+import org.w3c.dom.Document;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.junit.Test;
+
+public class ManagedRouteDumpStatsAsXmlAndResetWithCustomDomainTest extends ManagementTestSupport {
+
+    private static final String CUSTOM_DOMAIN_NAME = "custom";
+
+    @Test
+    public void testPerformanceCounterStats() throws Exception {
+        // JMX tests dont work well on AIX CI servers (hangs them)
+        if (isPlatform("aix")) {
+            return;
+        }
+
+        // get the stats for the route
+        MBeanServer mbeanServer = getMBeanServer();
+        ObjectName on = ObjectName.getInstance(CUSTOM_DOMAIN_NAME + ":context=camel-1,type=routes,name=\"foo\"");
+
+        getMockEndpoint("mock:result").expectedMessageCount(1);
+
+        template.asyncSendBody("direct:start", "Hello World");
+
+        assertMockEndpointsSatisfied();
+
+        String xml = (String) mbeanServer.invoke(on, "dumpRouteStatsAsXml", new Object[]{false, true}, new String[]{"boolean", "boolean"});
+        log.info(xml);
+
+        // should be valid XML
+        Document doc = context.getTypeConverter().convertTo(Document.class, xml);
+        assertNotNull(doc);
+
+        int processors = doc.getDocumentElement().getElementsByTagName("processorStat").getLength();
+        assertEquals(3, processors);
+
+        int exchangeCompleted = Integer.parseInt(doc.getDocumentElement().getElementsByTagName("processorStat").item(0).getAttributes().getNamedItem("exchangesCompleted").getNodeValue());
+        assertEquals(1, exchangeCompleted);
+
+        //ResetValues
+        mbeanServer.invoke(on, "reset", new Object[]{true}, new String[]{"boolean"});
+
+        xml = (String) mbeanServer.invoke(on, "dumpRouteStatsAsXml", new Object[]{false, true}, new String[]{"boolean", "boolean"});
+        log.info(xml);
+
+        // should be valid XML
+        doc = context.getTypeConverter().convertTo(Document.class, xml);
+        assertNotNull(doc);
+        exchangeCompleted = Integer.parseInt(doc.getDocumentElement().getElementsByTagName("processorStat").item(0).getAttributes().getNamedItem("exchangesCompleted").getNodeValue());
+        assertEquals(0, exchangeCompleted);
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+//              System.setProperty("org.apache.camel.jmx.mbeanObjectDomainName", CUSTOM_DOMAIN_NAME);
+//              Or
+                getContext().getManagementStrategy().getManagementAgent().setMBeanObjectDomainName(CUSTOM_DOMAIN_NAME);
+                from("direct:start").routeId("foo")
+                        .to("log:foo").id("to-log")
+                        .delay(100)
+                        .to("mock:result").id("to-mock");
+            }
+        };
+    }
+
+}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteDumpStatsAsXmlCustomDomainTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteDumpStatsAsXmlCustomDomainTest.java
index f3ae680..1f69b00 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteDumpStatsAsXmlCustomDomainTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteDumpStatsAsXmlCustomDomainTest.java
@@ -1,75 +1,75 @@
-/*
- * 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.management;
-
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-
-import org.w3c.dom.Document;
-
-import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
-
-public class ManagedRouteDumpStatsAsXmlCustomDomainTest extends ManagementTestSupport {
-
-    private static final String CUSTOM_DOMAIN_NAME = "custom";
-
-    @Test
-    public void testPerformanceCounterStats() throws Exception {
-        // JMX tests dont work well on AIX CI servers (hangs them)
-        if (isPlatform("aix")) {
-            return;
-        }
-
-        // get the stats for the route
-        MBeanServer mbeanServer = getMBeanServer();
-        ObjectName on = ObjectName.getInstance(CUSTOM_DOMAIN_NAME + ":context=camel-1,type=routes,name=\"foo\"");
-
-        getMockEndpoint("mock:result").expectedMessageCount(1);
-
-        template.asyncSendBody("direct:start", "Hello World");
-
-        assertMockEndpointsSatisfied();
-
-        String xml = (String) mbeanServer.invoke(on, "dumpRouteStatsAsXml", new Object[]{false, true}, new String[]{"boolean", "boolean"});
-        log.info(xml);
-
-        // should be valid XML
-        Document doc = context.getTypeConverter().convertTo(Document.class, xml);
-        assertNotNull(doc);
-
-        int processors = doc.getDocumentElement().getElementsByTagName("processorStat").getLength();
-        assertEquals(3, processors);
-    }
-
-    @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-            @Override
-            public void configure() throws Exception {
-//              System.setProperty("org.apache.camel.jmx.mbeanObjectDomainName", CUSTOM_DOMAIN_NAME);
-//              Or
-                getContext().getManagementStrategy().getManagementAgent().setMBeanObjectDomainName(CUSTOM_DOMAIN_NAME);
-                from("direct:start").routeId("foo")
-                        .to("log:foo").id("to-log")
-                        .delay(100)
-                        .to("mock:result").id("to-mock");
-            }
-        };
-    }
-
-}
+/*
+ * 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.management;
+
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+
+import org.w3c.dom.Document;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.junit.Test;
+
+public class ManagedRouteDumpStatsAsXmlCustomDomainTest extends ManagementTestSupport {
+
+    private static final String CUSTOM_DOMAIN_NAME = "custom";
+
+    @Test
+    public void testPerformanceCounterStats() throws Exception {
+        // JMX tests dont work well on AIX CI servers (hangs them)
+        if (isPlatform("aix")) {
+            return;
+        }
+
+        // get the stats for the route
+        MBeanServer mbeanServer = getMBeanServer();
+        ObjectName on = ObjectName.getInstance(CUSTOM_DOMAIN_NAME + ":context=camel-1,type=routes,name=\"foo\"");
+
+        getMockEndpoint("mock:result").expectedMessageCount(1);
+
+        template.asyncSendBody("direct:start", "Hello World");
+
+        assertMockEndpointsSatisfied();
+
+        String xml = (String) mbeanServer.invoke(on, "dumpRouteStatsAsXml", new Object[]{false, true}, new String[]{"boolean", "boolean"});
+        log.info(xml);
+
+        // should be valid XML
+        Document doc = context.getTypeConverter().convertTo(Document.class, xml);
+        assertNotNull(doc);
+
+        int processors = doc.getDocumentElement().getElementsByTagName("processorStat").getLength();
+        assertEquals(3, processors);
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+//              System.setProperty("org.apache.camel.jmx.mbeanObjectDomainName", CUSTOM_DOMAIN_NAME);
+//              Or
+                getContext().getManagementStrategy().getManagementAgent().setMBeanObjectDomainName(CUSTOM_DOMAIN_NAME);
+                from("direct:start").routeId("foo")
+                        .to("log:foo").id("to-log")
+                        .delay(100)
+                        .to("mock:result").id("to-mock");
+            }
+        };
+    }
+
+}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteRestartTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteRestartTest.java
index 49fd26f..e78997b 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteRestartTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteRestartTest.java
@@ -119,4 +119,4 @@ public class ManagedRouteRestartTest extends ManagementTestSupport {
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteStopTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteStopTest.java
index a25b13d..8d6495e 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteStopTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteStopTest.java
@@ -90,4 +90,4 @@ public class ManagedRouteStopTest extends ManagementTestSupport {
         };
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteStopUsingMBeanAPITest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteStopUsingMBeanAPITest.java
index 4a2f375..7b58646 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteStopUsingMBeanAPITest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteStopUsingMBeanAPITest.java
@@ -71,4 +71,4 @@ public class ManagedRouteStopUsingMBeanAPITest extends ManagementTestSupport {
         };
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedScheduledPollConsumerTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedScheduledPollConsumerTest.java
index 913f9d4..b957ab3 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedScheduledPollConsumerTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedScheduledPollConsumerTest.java
@@ -118,4 +118,4 @@ public class ManagedScheduledPollConsumerTest extends ManagementTestSupport {
         };
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedSetAndRemoveHeaderAndPropertiesTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedSetAndRemoveHeaderAndPropertiesTest.java
index 819467d..7d21ae9 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedSetAndRemoveHeaderAndPropertiesTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedSetAndRemoveHeaderAndPropertiesTest.java
@@ -92,4 +92,4 @@ public class ManagedSetAndRemoveHeaderAndPropertiesTest extends ManagementTestSu
         };
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedShutdownStrategyTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedShutdownStrategyTest.java
index 3e1f39d..50f26a8 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedShutdownStrategyTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedShutdownStrategyTest.java
@@ -57,4 +57,4 @@ public class ManagedShutdownStrategyTest extends ManagementTestSupport {
             }
         };
     }
-}
\ No newline at end of file
+}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedStatisticsDisabledTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedStatisticsDisabledTest.java
index d748547..f75a410 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedStatisticsDisabledTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedStatisticsDisabledTest.java
@@ -90,4 +90,4 @@ public class ManagedStatisticsDisabledTest extends ManagementTestSupport {
         };
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedStatisticsLevelOffTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedStatisticsLevelOffTest.java
index 4dd1131..78136d5 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedStatisticsLevelOffTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedStatisticsLevelOffTest.java
@@ -81,4 +81,4 @@ public class ManagedStatisticsLevelOffTest extends ManagementTestSupport {
         };
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedStatisticsLevelRoutesOnlyTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedStatisticsLevelRoutesOnlyTest.java
index d0a0047..6dd018e 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedStatisticsLevelRoutesOnlyTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedStatisticsLevelRoutesOnlyTest.java
@@ -89,4 +89,4 @@ public class ManagedStatisticsLevelRoutesOnlyTest extends ManagementTestSupport
         };
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedStatisticsTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedStatisticsTest.java
index b0b41ad..a201ab5 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedStatisticsTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedStatisticsTest.java
@@ -97,4 +97,4 @@ public class ManagedStatisticsTest extends ManagementTestSupport {
         };
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedStatisticsWithSplitterTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedStatisticsWithSplitterTest.java
index 65121c4..00d3923 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedStatisticsWithSplitterTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedStatisticsWithSplitterTest.java
@@ -87,4 +87,4 @@ public class ManagedStatisticsWithSplitterTest extends ManagementTestSupport {
         };
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedThreadPoolProfileTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedThreadPoolProfileTest.java
index 078f951..e261bf8 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedThreadPoolProfileTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedThreadPoolProfileTest.java
@@ -93,4 +93,4 @@ public class ManagedThreadPoolProfileTest extends ManagementTestSupport {
         };
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedThreadPoolTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedThreadPoolTest.java
index ee633d8..40dd36d 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedThreadPoolTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedThreadPoolTest.java
@@ -89,4 +89,4 @@ public class ManagedThreadPoolTest extends ManagementTestSupport {
         };
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedThreadPoolWithIdTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedThreadPoolWithIdTest.java
index 6d9d96c..843e796 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedThreadPoolWithIdTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedThreadPoolWithIdTest.java
@@ -74,4 +74,4 @@ public class ManagedThreadPoolWithIdTest extends ManagementTestSupport {
         };
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedUnregisterProcessorTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedUnregisterProcessorTest.java
index f1292dd..a56a379 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedUnregisterProcessorTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedUnregisterProcessorTest.java
@@ -58,4 +58,4 @@ public class ManagedUnregisterProcessorTest extends ManagementTestSupport {
         };
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedUnregisterProducerTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedUnregisterProducerTest.java
index df372e2..7d95085 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedUnregisterProducerTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedUnregisterProducerTest.java
@@ -70,4 +70,4 @@ public class ManagedUnregisterProducerTest extends ManagementTestSupport {
         };
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/RemoveRouteDefinitionTest.java b/core/camel-management/src/test/java/org/apache/camel/management/RemoveRouteDefinitionTest.java
index 3667f23..e626253 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/RemoveRouteDefinitionTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/RemoveRouteDefinitionTest.java
@@ -120,4 +120,4 @@ public class RemoveRouteDefinitionTest extends ManagementTestSupport {
         };
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/util/AvailablePortFinder.java b/core/camel-management/src/test/java/org/apache/camel/management/util/AvailablePortFinder.java
index 9cf2a26..fcbf891 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/util/AvailablePortFinder.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/util/AvailablePortFinder.java
@@ -55,4 +55,4 @@ public final class AvailablePortFinder {
             throw new IllegalStateException("Cannot find free port", e);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/camel-support/src/main/java/org/apache/camel/component/extension/verifier/DefaultComponentVerifierExtension.java b/core/camel-support/src/main/java/org/apache/camel/component/extension/verifier/DefaultComponentVerifierExtension.java
index 28d539f..bb1e046 100644
--- a/core/camel-support/src/main/java/org/apache/camel/component/extension/verifier/DefaultComponentVerifierExtension.java
+++ b/core/camel-support/src/main/java/org/apache/camel/component/extension/verifier/DefaultComponentVerifierExtension.java
@@ -33,7 +33,6 @@ import org.apache.camel.support.CamelContextHelper;
 import org.apache.camel.support.PropertyBindingSupport;
 import org.apache.camel.util.PropertiesHelper;
 
-
 import static org.apache.camel.util.StreamUtils.stream;
 
 public class DefaultComponentVerifierExtension implements ComponentVerifierExtension, CamelContextAware, ComponentAware {
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/CamelObjectInputStream.java b/core/camel-support/src/main/java/org/apache/camel/support/CamelObjectInputStream.java
index e93f029..ba3f49d 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/CamelObjectInputStream.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/CamelObjectInputStream.java
@@ -44,4 +44,4 @@ public class CamelObjectInputStream extends ObjectInputStream {
             return super.resolveClass(desc);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/EndpointHelper.java b/core/camel-support/src/main/java/org/apache/camel/support/EndpointHelper.java
index c41edd7..11df373 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/EndpointHelper.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/EndpointHelper.java
@@ -40,7 +40,6 @@ import org.apache.camel.util.URISupport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 import static org.apache.camel.util.StringHelper.after;
 
 /**
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/EventHelper.java b/core/camel-support/src/main/java/org/apache/camel/support/EventHelper.java
index 9fb35ef..c27a7a2 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/EventHelper.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/EventHelper.java
@@ -1399,4 +1399,4 @@ public final class EventHelper {
         return true;
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/ExpressionListComparator.java b/core/camel-support/src/main/java/org/apache/camel/support/ExpressionListComparator.java
index 31ecfef..ffafb82 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/ExpressionListComparator.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/ExpressionListComparator.java
@@ -46,4 +46,4 @@ public class ExpressionListComparator implements Comparator<Exchange> {
         }
         return 0;
     }
-}
\ No newline at end of file
+}
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/RestComponentHelper.java b/core/camel-support/src/main/java/org/apache/camel/support/RestComponentHelper.java
index 8262b8c..49a94c9 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/RestComponentHelper.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/RestComponentHelper.java
@@ -1,154 +1,154 @@
-/*
- * 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.support;
-
-import java.net.URISyntaxException;
-import java.net.UnknownHostException;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
-import org.apache.camel.spi.RestConfiguration;
-import org.apache.camel.util.HostUtils;
-import org.apache.camel.util.URISupport;
-
-/**
- * Helper class for rest-dsl components.
- */
-public final class RestComponentHelper {
-    
-    private RestComponentHelper() {
-    }
-    
-    /**
-     * 
-     * @param queryMap the map of Endpoint options to apply the HTTP restrict settings to
-     * @param verb the HTTP verb for the route
-     * @param addOptions should OPTIONS verb be added.
-     * @return the map of Endpoint Properties with HTTP Restrict Options set
-     */
-    public static Map<String, Object> addHttpRestrictParam(Map<String, Object> queryMap, String verb, boolean addOptions) {
-        String restrict = verb.toUpperCase(Locale.US);
-        if (addOptions) {
-            restrict += ",OPTIONS";
-        }
-        queryMap.put("httpMethodRestrict", restrict);
-        return queryMap;
-    }
-    
-    /**
-     * 
-     * Creates an Endpoint Property Map based on properies set in the component's RestConfiguration.
-     * 
-     * @param componentName the Rest Component name
-     * @param config the RestConfiguration
-     * @return the map of Endpoint Properties set in the RestConfiguration
-     */
-    public static Map<String, Object> initRestEndpointProperties(String componentName, RestConfiguration config) {
-        Map<String, Object> map = new HashMap<>();
-        // build query string, and append any endpoint configuration properties
-        if (config.getComponent() == null || config.getComponent().equals(componentName)) {
-            // setup endpoint options
-            if (config.getEndpointProperties() != null && !config.getEndpointProperties().isEmpty()) {
-                map.putAll(config.getEndpointProperties());
-            }
-        }
-        return map;
-    }
-    
-    /**
-     * 
-     * Sets the Rest consumer host based on RestConfiguration
-     * 
-     * @param host the existing host configuration
-     * @param config the RestConfiguration
-     * @return the host based on RestConfiguration
-     * @throws UnknownHostException thrown when local host or local ip can't be resolved via network interfaces.
-     */
-    public static String resolveRestHostName(String host, RestConfiguration config) throws UnknownHostException {
-        if (config.getHostNameResolver() == RestConfiguration.RestHostNameResolver.allLocalIp) {
-            host = "0.0.0.0";
-        } else if (config.getHostNameResolver() == RestConfiguration.RestHostNameResolver.localHostName) {
-            host = HostUtils.getLocalHostName();
-        } else if (config.getHostNameResolver() == RestConfiguration.RestHostNameResolver.localIp) {
-            host = HostUtils.getLocalIp();
-        }
-        return host;
-    }
-    
-    /**
-     * 
-     * Creates the Rest consumers url based on component and url options.
-     * 
-     * @param componentName the name of the rest component
-     * @param verb the HTTP verb
-     * @param path the HTTP path of the route
-     * @param queryMap the endpoint query options
-     * @return a string of the component route url
-     * @throws URISyntaxException - is thrown if uri has invalid syntax.
-     */
-    public static String createRestConsumerUrl(String componentName, String verb, String path, Map<String, Object> queryMap) throws URISyntaxException {
-        String query = URISupport.createQueryString(queryMap);
-        return applyFormatAndQuery("%s:%s:%s", query, componentName, verb, path);
-    }
-    
-    /**
-     * 
-     * Creates the Rest consumers url based on component and url options.
-     * 
-     * @param componentName the name of the rest component
-     * @param path the HTTP path of the route
-     * @param queryMap the endpoint query options
-     * @return a string of the component route url
-     * @throws URISyntaxException - is thrown if uri has invalid syntax.
-     */
-    public static String createRestConsumerUrl(String componentName, String path, Map<String, Object> queryMap) throws URISyntaxException {
-        String query = URISupport.createQueryString(queryMap);
-        return applyFormatAndQuery("%s:/%s", query, componentName, path);
-    }
-    
-    /**
-     * 
-     * Creates the Rest consumers url based on component and url options.
-     * 
-     * @param componentName the name of the rest component
-     * @param scheme the scheme of the HTTP route http/https
-     * @param host the host of the HTTP route
-     * @param port the port the route will be exposed through
-     * @param path the HTTP path of the route
-     * @param queryMap the endpoint query options
-     * @return a string of the component route url
-     * @throws URISyntaxException - is thrown if uri has invalid syntax.
-     */
-    public static String createRestConsumerUrl(String componentName, String scheme, String host, int port, String path, Map<String, Object> queryMap) throws URISyntaxException {
-        
-        String query = URISupport.createQueryString(queryMap);
-        
-        return applyFormatAndQuery("%s:%s://%s:%s/%s", query, componentName, scheme, host, port, path);
-    }
-    
-    private static String applyFormatAndQuery(String format, String query, Object... formatOptions) {
-        // get the endpoint
-        StringBuilder urlBuilder = new StringBuilder(String.format(format, formatOptions));
-
-        if (!query.isEmpty()) {
-            urlBuilder.append("?");
-            urlBuilder.append(query);
-        }
-        return urlBuilder.toString();
-    }
-}
+/*
+ * 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.support;
+
+import java.net.URISyntaxException;
+import java.net.UnknownHostException;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+import org.apache.camel.spi.RestConfiguration;
+import org.apache.camel.util.HostUtils;
+import org.apache.camel.util.URISupport;
+
+/**
+ * Helper class for rest-dsl components.
+ */
+public final class RestComponentHelper {
+    
+    private RestComponentHelper() {
+    }
+    
+    /**
+     * 
+     * @param queryMap the map of Endpoint options to apply the HTTP restrict settings to
+     * @param verb the HTTP verb for the route
+     * @param addOptions should OPTIONS verb be added.
+     * @return the map of Endpoint Properties with HTTP Restrict Options set
+     */
+    public static Map<String, Object> addHttpRestrictParam(Map<String, Object> queryMap, String verb, boolean addOptions) {
+        String restrict = verb.toUpperCase(Locale.US);
+        if (addOptions) {
+            restrict += ",OPTIONS";
+        }
+        queryMap.put("httpMethodRestrict", restrict);
+        return queryMap;
+    }
+    
+    /**
+     * 
+     * Creates an Endpoint Property Map based on properies set in the component's RestConfiguration.
+     * 
+     * @param componentName the Rest Component name
+     * @param config the RestConfiguration
+     * @return the map of Endpoint Properties set in the RestConfiguration
+     */
+    public static Map<String, Object> initRestEndpointProperties(String componentName, RestConfiguration config) {
+        Map<String, Object> map = new HashMap<>();
+        // build query string, and append any endpoint configuration properties
+        if (config.getComponent() == null || config.getComponent().equals(componentName)) {
+            // setup endpoint options
+            if (config.getEndpointProperties() != null && !config.getEndpointProperties().isEmpty()) {
+                map.putAll(config.getEndpointProperties());
+            }
+        }
+        return map;
+    }
+    
+    /**
+     * 
+     * Sets the Rest consumer host based on RestConfiguration
+     * 
+     * @param host the existing host configuration
+     * @param config the RestConfiguration
+     * @return the host based on RestConfiguration
+     * @throws UnknownHostException thrown when local host or local ip can't be resolved via network interfaces.
+     */
+    public static String resolveRestHostName(String host, RestConfiguration config) throws UnknownHostException {
+        if (config.getHostNameResolver() == RestConfiguration.RestHostNameResolver.allLocalIp) {
+            host = "0.0.0.0";
+        } else if (config.getHostNameResolver() == RestConfiguration.RestHostNameResolver.localHostName) {
+            host = HostUtils.getLocalHostName();
+        } else if (config.getHostNameResolver() == RestConfiguration.RestHostNameResolver.localIp) {
+            host = HostUtils.getLocalIp();
+        }
+        return host;
+    }
+    
+    /**
+     * 
+     * Creates the Rest consumers url based on component and url options.
+     * 
+     * @param componentName the name of the rest component
+     * @param verb the HTTP verb
+     * @param path the HTTP path of the route
+     * @param queryMap the endpoint query options
+     * @return a string of the component route url
+     * @throws URISyntaxException - is thrown if uri has invalid syntax.
+     */
+    public static String createRestConsumerUrl(String componentName, String verb, String path, Map<String, Object> queryMap) throws URISyntaxException {
+        String query = URISupport.createQueryString(queryMap);
+        return applyFormatAndQuery("%s:%s:%s", query, componentName, verb, path);
+    }
+    
+    /**
+     * 
+     * Creates the Rest consumers url based on component and url options.
+     * 
+     * @param componentName the name of the rest component
+     * @param path the HTTP path of the route
+     * @param queryMap the endpoint query options
+     * @return a string of the component route url
+     * @throws URISyntaxException - is thrown if uri has invalid syntax.
+     */
+    public static String createRestConsumerUrl(String componentName, String path, Map<String, Object> queryMap) throws URISyntaxException {
+        String query = URISupport.createQueryString(queryMap);
+        return applyFormatAndQuery("%s:/%s", query, componentName, path);
+    }
+    
+    /**
+     * 
+     * Creates the Rest consumers url based on component and url options.
+     * 
+     * @param componentName the name of the rest component
+     * @param scheme the scheme of the HTTP route http/https
+     * @param host the host of the HTTP route
+     * @param port the port the route will be exposed through
+     * @param path the HTTP path of the route
+     * @param queryMap the endpoint query options
+     * @return a string of the component route url
+     * @throws URISyntaxException - is thrown if uri has invalid syntax.
+     */
+    public static String createRestConsumerUrl(String componentName, String scheme, String host, int port, String path, Map<String, Object> queryMap) throws URISyntaxException {
+        
+        String query = URISupport.createQueryString(queryMap);
+        
+        return applyFormatAndQuery("%s:%s://%s:%s/%s", query, componentName, scheme, host, port, path);
+    }
+    
+    private static String applyFormatAndQuery(String format, String query, Object... formatOptions) {
+        // get the endpoint
+        StringBuilder urlBuilder = new StringBuilder(String.format(format, formatOptions));
+
+        if (!query.isEmpty()) {
+            urlBuilder.append("?");
+            urlBuilder.append(query);
+        }
+        return urlBuilder.toString();
+    }
+}
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/SimpleUuidGenerator.java b/core/camel-support/src/main/java/org/apache/camel/support/SimpleUuidGenerator.java
index ac6a040..0b98f56 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/SimpleUuidGenerator.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/SimpleUuidGenerator.java
@@ -32,4 +32,4 @@ public class SimpleUuidGenerator implements UuidGenerator {
     public String generateUuid() {
         return String.valueOf(id.getAndIncrement());
     }
-}
\ No newline at end of file
+}
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/TimeoutMapEntry.java b/core/camel-support/src/main/java/org/apache/camel/support/TimeoutMapEntry.java
index c784870..dfa4a72 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/TimeoutMapEntry.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/TimeoutMapEntry.java
@@ -94,4 +94,4 @@ public class TimeoutMapEntry<K, V> implements Comparable<Object>, Map.Entry<K, V
     public String toString() {
         return key + " (times out after " + timeout + " millis)";
     }
-}
\ No newline at end of file
+}
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/builder/OutputStreamBuilder.java b/core/camel-support/src/main/java/org/apache/camel/support/builder/OutputStreamBuilder.java
index f2bdca4..f5c5bd3 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/builder/OutputStreamBuilder.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/builder/OutputStreamBuilder.java
@@ -92,4 +92,4 @@ public final class OutputStreamBuilder extends OutputStream {
         }
         return ((ByteArrayOutputStream)outputStream).toByteArray();
     }
-}
\ No newline at end of file
+}
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/management/NotificationSenderAdapter.java b/core/camel-support/src/main/java/org/apache/camel/support/management/NotificationSenderAdapter.java
index c56c25e..5b0a543 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/management/NotificationSenderAdapter.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/management/NotificationSenderAdapter.java
@@ -39,4 +39,4 @@ public final class NotificationSenderAdapter implements NotificationSender {
             throw new RuntimeException(e);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/processor/UnmarshalProcessor.java b/core/camel-support/src/main/java/org/apache/camel/support/processor/UnmarshalProcessor.java
index 2691450..1030753 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/processor/UnmarshalProcessor.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/processor/UnmarshalProcessor.java
@@ -144,4 +144,4 @@ public class UnmarshalProcessor extends AsyncProcessorSupport implements Traceab
         getCamelContext().removeService(dataFormat);
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/camel-util/src/main/java/org/apache/camel/util/concurrent/CamelThreadFactory.java b/core/camel-util/src/main/java/org/apache/camel/util/concurrent/CamelThreadFactory.java
index 95126fd..570e027 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/concurrent/CamelThreadFactory.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/concurrent/CamelThreadFactory.java
@@ -55,4 +55,4 @@ public final class CamelThreadFactory implements ThreadFactory {
     public String toString() {
         return "CamelThreadFactory[" + name + "]";
     }
-}
\ No newline at end of file
+}
diff --git a/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/MXParser.java b/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/MXParser.java
index c2f2b5a..c71ceab 100644
--- a/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/MXParser.java
+++ b/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/MXParser.java
@@ -24,15 +24,14 @@
  * $Id: MXParser.java,v 1.52 2006/11/09 18:29:37 aslom Exp $
  */
 
-package org.apache.camel.xml.io;
 // CHECKSTYLE:OFF
+package org.apache.camel.xml.io;
 
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
-import java.io.UnsupportedEncodingException;
 
 //TODO best handling of interning issues
 //   have isAllNewStringInterned ???
@@ -537,7 +536,7 @@ public class MXParser implements XmlPullParser {
         reader = in;
     }
 
-    public void setInput(java.io.InputStream inputStream, String inputEncoding) throws XmlPullParserException {
+    public void setInput(InputStream inputStream, String inputEncoding) throws XmlPullParserException {
         if (inputStream == null) {
             throw new IllegalArgumentException("input stream can not be null");
         }
diff --git a/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/XmlPullParser.java b/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/XmlPullParser.java
index 51ea68e..3a86919 100644
--- a/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/XmlPullParser.java
+++ b/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/XmlPullParser.java
@@ -18,11 +18,11 @@
 /* -*-             c-basic-offset: 4; indent-tabs-mode: nil; -*-  //------100-columns-wide------>|*/
 // for license please see accompanying LICENSE.txt file (available also at http://www.xmlpull.org/)
 
-package org.apache.camel.xml.io;
 // CHECKSTYLE:OFF
+package org.apache.camel.xml.io;
 
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.Reader;
 
 /**
diff --git a/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/XmlStreamReader.java b/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/XmlStreamReader.java
index 89eca22..2102b20 100644
--- a/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/XmlStreamReader.java
+++ b/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/XmlStreamReader.java
@@ -31,8 +31,9 @@
  * limitations under the License.
  *
  */
-package org.apache.camel.xml.io;
+
 // CHECKSTYLE:OFF
+package org.apache.camel.xml.io;
 
 import java.io.BufferedInputStream;
 import java.io.File;
diff --git a/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/XmlStreamReaderException.java b/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/XmlStreamReaderException.java
index 9233076..a74e6ab 100644
--- a/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/XmlStreamReaderException.java
+++ b/core/camel-xml-io/src/main/java/org/apache/camel/xml/io/XmlStreamReaderException.java
@@ -31,11 +31,12 @@
  * limitations under the License.
  *
  */
-package org.apache.camel.xml.io;
+
 // CHECKSTYLE:OFF
+package org.apache.camel.xml.io;
 
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 
 /**
  * The XmlReaderException is thrown by the XmlReader constructors if the charset
diff --git a/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbModelToXMLDumper.java b/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbModelToXMLDumper.java
index 95fafa0..005050c 100644
--- a/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbModelToXMLDumper.java
+++ b/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbModelToXMLDumper.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.xml.jaxb;
 
-
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.StringWriter;
diff --git a/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/StreamSourceConverter.java b/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/StreamSourceConverter.java
index 0a570c9..6dc52fd 100644
--- a/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/StreamSourceConverter.java
+++ b/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/StreamSourceConverter.java
@@ -44,4 +44,4 @@ public final class StreamSourceConverter {
     public static Reader toReader(StreamSource source) {
         return source.getReader();
     }
-}
\ No newline at end of file
+}
diff --git a/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/XmlErrorListener.java b/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/XmlErrorListener.java
index e41e5d4..16a9e9a 100644
--- a/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/XmlErrorListener.java
+++ b/core/camel-xml-jaxp/src/main/java/org/apache/camel/converter/jaxp/XmlErrorListener.java
@@ -43,4 +43,4 @@ public class XmlErrorListener implements ErrorListener {
     public void fatalError(TransformerException e) throws TransformerException {
         LOG.error(e.getMessage(), e);
     }
-}
\ No newline at end of file
+}
diff --git a/core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/SourceCache.java b/core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/SourceCache.java
index ab8de28..4dc9b0f 100644
--- a/core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/SourceCache.java
+++ b/core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/SourceCache.java
@@ -60,4 +60,4 @@ public final class SourceCache extends StringSource implements StreamCache {
     public long length() {
         return length;
     }
-}
\ No newline at end of file
+}
diff --git a/core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/StreamSourceCache.java b/core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/StreamSourceCache.java
index 83d1656..69c9eee 100644
--- a/core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/StreamSourceCache.java
+++ b/core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/StreamSourceCache.java
@@ -124,4 +124,4 @@ public final class StreamSourceCache extends StreamSource implements StreamCache
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jaxb/SpringLoadRouteFromXmlTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jaxb/SpringLoadRouteFromXmlTest.java
index e6a2f73..3d873f6 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jaxb/SpringLoadRouteFromXmlTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jaxb/SpringLoadRouteFromXmlTest.java
@@ -20,9 +20,9 @@ import javax.xml.bind.JAXBContext;
 import javax.xml.bind.Unmarshaller;
 
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.xml.jaxb.DefaultModelJAXBContextFactory;
 import org.apache.camel.model.RoutesDefinition;
 import org.apache.camel.test.spring.CamelSpringTestSupport;
+import org.apache.camel.xml.jaxb.DefaultModelJAXBContextFactory;
 import org.junit.Test;
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
diff --git a/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/srcgen/JavaClass.java b/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/srcgen/JavaClass.java
index 2442bac..563f99e 100644
--- a/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/srcgen/JavaClass.java
+++ b/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/srcgen/JavaClass.java
@@ -26,7 +26,6 @@ import java.util.Set;
 import java.util.TreeSet;
 import java.util.stream.Collectors;
 
-
 public class JavaClass {
 
     ClassLoader classLoader;
diff --git a/tooling/camel-tooling-util/src/test/java/org/apache/camel/tooling/util/PackageHelperTest.java b/tooling/camel-tooling-util/src/test/java/org/apache/camel/tooling/util/PackageHelperTest.java
index f4dd40f..8bcedf5 100644
--- a/tooling/camel-tooling-util/src/test/java/org/apache/camel/tooling/util/PackageHelperTest.java
+++ b/tooling/camel-tooling-util/src/test/java/org/apache/camel/tooling/util/PackageHelperTest.java
@@ -18,18 +18,14 @@ package org.apache.camel.tooling.util;
 
 import java.io.File;
 import java.nio.file.Path;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 import org.junit.jupiter.api.Test;
 
-import static org.apache.camel.tooling.util.PackageHelper.JSON_SUFIX;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class PackageHelperTest {
 
diff --git a/tooling/camel-tooling-util/src/test/java/org/apache/camel/tooling/util/StringsTest.java b/tooling/camel-tooling-util/src/test/java/org/apache/camel/tooling/util/StringsTest.java
index 67413b2..5f5630b 100644
--- a/tooling/camel-tooling-util/src/test/java/org/apache/camel/tooling/util/StringsTest.java
+++ b/tooling/camel-tooling-util/src/test/java/org/apache/camel/tooling/util/StringsTest.java
@@ -16,17 +16,11 @@
  */
 package org.apache.camel.tooling.util;
 
-import java.util.stream.Stream;
-
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
 
 import static org.apache.camel.tooling.util.Strings.asTitle;
 import static org.apache.camel.tooling.util.Strings.between;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.params.provider.Arguments.arguments;
 
 public class StringsTest {
 
diff --git a/tooling/maven/camel-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java b/tooling/maven/camel-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
index 93f490b..029b413 100644
--- a/tooling/maven/camel-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
+++ b/tooling/maven/camel-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
@@ -131,10 +131,10 @@ import org.codehaus.plexus.util.cli.CommandLineUtils;
 import org.codehaus.plexus.util.cli.Commandline;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 
-import static org.apache.maven.plugins.javadoc.JavadocUtil.toRelative;
-import static org.apache.maven.plugins.javadoc.JavadocUtil.toList;
 import static org.apache.maven.plugins.javadoc.JavadocUtil.isEmpty;
 import static org.apache.maven.plugins.javadoc.JavadocUtil.isNotEmpty;
+import static org.apache.maven.plugins.javadoc.JavadocUtil.toList;
+import static org.apache.maven.plugins.javadoc.JavadocUtil.toRelative;
 
 /**
  * Base class with majority of Javadoc functionalities.
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ComponentDslMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ComponentDslMojo.java
index 6b0270f..6a8a65a 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ComponentDslMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ComponentDslMojo.java
@@ -37,7 +37,6 @@ import org.apache.camel.maven.packaging.dsl.component.ComponentsDslMetadataRegis
 import org.apache.camel.tooling.model.ComponentModel;
 import org.apache.camel.tooling.model.JsonMapper;
 import org.apache.camel.tooling.util.PackageHelper;
-import org.apache.camel.tooling.util.srcgen.JavaClass;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java
index 0c61d33..aae9992 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java
@@ -17,13 +17,10 @@
 package org.apache.camel.maven.packaging;
 
 import java.io.File;
-import java.io.IOException;
-import java.nio.file.Path;
 import java.util.Collections;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.apache.camel.tooling.util.PackageHelper;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugin.logging.Log;
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageJandexMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageJandexMojo.java
index 741a77b..d4f4b7d 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageJandexMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageJandexMojo.java
@@ -26,7 +26,6 @@ import java.nio.file.Path;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageJaxbMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageJaxbMojo.java
index c9464d3..2dbae09 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageJaxbMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageJaxbMojo.java
@@ -49,7 +49,6 @@ import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.AnnotationTarget;
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
-import org.jboss.jandex.Index;
 import org.jboss.jandex.IndexReader;
 import org.jboss.jandex.IndexView;
 import org.jboss.jandex.Indexer;
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageModelMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageModelMojo.java
index 0f81a03..0e1758c 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageModelMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageModelMojo.java
@@ -17,10 +17,7 @@
 package org.apache.camel.maven.packaging;
 
 import java.io.File;
-import java.nio.file.Path;
 import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 import org.apache.camel.tooling.util.PackageHelper;
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageOtherMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageOtherMojo.java
index 308df66..8eb2de0 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageOtherMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageOtherMojo.java
@@ -17,7 +17,6 @@
 package org.apache.camel.maven.packaging;
 
 import java.io.File;
-import java.nio.file.Path;
 import java.util.Collections;
 
 import org.apache.camel.tooling.model.JsonMapper;
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaGeneratorMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaGeneratorMojo.java
index 14ca0e4..e49137c 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaGeneratorMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaGeneratorMojo.java
@@ -19,8 +19,6 @@ package org.apache.camel.maven.packaging;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.StringWriter;
-import java.io.Writer;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.Type;
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
index 6ca5c64..6520d8b 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
@@ -39,10 +39,8 @@ import org.apache.camel.tooling.model.JsonMapper;
 import org.apache.camel.tooling.model.LanguageModel;
 import org.apache.camel.tooling.util.PackageHelper;
 import org.apache.camel.tooling.util.Strings;
-import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ValidateComponentMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ValidateComponentMojo.java
index acfd0b6..7a038aa 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ValidateComponentMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ValidateComponentMojo.java
@@ -23,15 +23,10 @@ import java.util.stream.Collectors;
 
 import org.apache.camel.tooling.util.PackageHelper;
 import org.apache.camel.tooling.util.Strings;
-import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.MavenProjectHelper;
-import org.sonatype.plexus.build.incremental.BuildContext;
 
 /**
  * Validate a Camel component analyzing if the meta-data files for
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerImplBuilderGenerator.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerImplBuilderGenerator.java
index de76f96..b2aa7f7 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerImplBuilderGenerator.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerImplBuilderGenerator.java
@@ -19,7 +19,6 @@ package org.apache.camel.maven.packaging.dsl.component;
 import java.util.Collection;
 import java.util.Optional;
 
-import org.apache.camel.tooling.model.BaseOptionModel;
 import org.apache.camel.tooling.model.ComponentModel;
 import org.apache.camel.tooling.util.srcgen.JavaClass;
 import org.apache.commons.lang3.StringUtils;
diff --git a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGeneratorTest.java b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGeneratorTest.java
index 3b9da9d..f59a252 100644
--- a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGeneratorTest.java
+++ b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGeneratorTest.java
@@ -25,8 +25,8 @@ import org.apache.camel.tooling.model.JsonMapper;
 import org.apache.camel.tooling.util.PackageHelper;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class ComponentDslBuilderFactoryGeneratorTest {
 
@@ -56,4 +56,4 @@ class ComponentDslBuilderFactoryGeneratorTest {
         assertTrue(classCode.contains("static KafkaComponentBuilder kafka()"));
     }
 
-}
\ No newline at end of file
+}
diff --git a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerBuilderGeneratorTest.java b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerBuilderGeneratorTest.java
index aadad3c..f27b184 100644
--- a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerBuilderGeneratorTest.java
+++ b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerBuilderGeneratorTest.java
@@ -53,4 +53,4 @@ class ComponentDslInnerBuilderGeneratorTest {
             assertTrue(classCode.contains(propertiesSettersMethods));
         });
     }
-}
\ No newline at end of file
+}
diff --git a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerImplBuilderGeneratorTest.java b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerImplBuilderGeneratorTest.java
index d7398da..f2119a2 100644
--- a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerImplBuilderGeneratorTest.java
+++ b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerImplBuilderGeneratorTest.java
@@ -27,8 +27,8 @@ import org.apache.camel.tooling.util.srcgen.JavaClass;
 import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class ComponentDslInnerImplBuilderGeneratorTest {
 
@@ -57,4 +57,4 @@ class ComponentDslInnerImplBuilderGeneratorTest {
             assertTrue(code.contains(setterAsString));
         });
     }
-}
\ No newline at end of file
+}
diff --git a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/dsl/component/ComponentsBuilderFactoryGeneratorTest.java b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/dsl/component/ComponentsBuilderFactoryGeneratorTest.java
index bb0445b..859d633 100644
--- a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/dsl/component/ComponentsBuilderFactoryGeneratorTest.java
+++ b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/dsl/component/ComponentsBuilderFactoryGeneratorTest.java
@@ -27,8 +27,8 @@ import org.apache.camel.tooling.model.JsonMapper;
 import org.apache.camel.tooling.util.PackageHelper;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class ComponentsBuilderFactoryGeneratorTest {
 
@@ -50,4 +50,4 @@ class ComponentsBuilderFactoryGeneratorTest {
         assertTrue(classCode.contains("static org.apache.camel.builder.component.dsl.KafkaComponentBuilderFactory.KafkaComponentBuilder kafka()"));
         assertTrue(classCode.contains("return org.apache.camel.builder.component.dsl.KafkaComponentBuilderFactory.kafka();"));
     }
-}
\ No newline at end of file
+}
diff --git a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/dsl/component/ComponentsDslMetadataRegistryTest.java b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/dsl/component/ComponentsDslMetadataRegistryTest.java
index 08f023b..da8b8c7 100644
--- a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/dsl/component/ComponentsDslMetadataRegistryTest.java
+++ b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/dsl/component/ComponentsDslMetadataRegistryTest.java
@@ -28,9 +28,9 @@ import org.apache.camel.tooling.model.JsonMapper;
 import org.apache.camel.tooling.util.PackageHelper;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class ComponentsDslMetadataRegistryTest {
 
@@ -75,4 +75,4 @@ class ComponentsDslMetadataRegistryTest {
 
         assertNotNull(componentModelUpdated);
     }
-}
\ No newline at end of file
+}
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/GenerateMojo.java b/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/GenerateMojo.java
index 508f679..58c2c58 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/GenerateMojo.java
+++ b/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/GenerateMojo.java
@@ -32,7 +32,6 @@ import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.plugins.annotations.ResolutionScope;
 
-
 @Mojo(name = "generate", inheritByDefault = false, defaultPhase = LifecyclePhase.GENERATE_SOURCES,
     requiresDependencyResolution = ResolutionScope.COMPILE, threadSafe = true)
 public class GenerateMojo extends AbstractGenerateMojo {
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/GenerateXmlMojo.java b/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/GenerateXmlMojo.java
index 777a35f..7d9cca1 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/GenerateXmlMojo.java
+++ b/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/GenerateXmlMojo.java
@@ -32,8 +32,6 @@ import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.plugins.annotations.ResolutionScope;
 
-
-
 @Mojo(name = "generate-xml", inheritByDefault = false, defaultPhase = LifecyclePhase.GENERATE_SOURCES,
     requiresDependencyResolution = ResolutionScope.COMPILE, threadSafe = true)
 public class GenerateXmlMojo extends AbstractGenerateMojo {
diff --git a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/AppendableGenerator.java b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/AppendableGenerator.java
index 4aabcd8..3e51540 100644
--- a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/AppendableGenerator.java
+++ b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/AppendableGenerator.java
@@ -21,7 +21,6 @@ import java.io.IOException;
 import com.squareup.javapoet.JavaFile;
 import io.apicurio.datamodels.openapi.models.OasDocument;
 
-
 final class AppendableGenerator extends RestDslSourceCodeGenerator<Appendable> {
 
     AppendableGenerator(final OasDocument openapi) {
diff --git a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/DirectToOperationId.java b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/DirectToOperationId.java
index bab373b..3702b0c 100644
--- a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/DirectToOperationId.java
+++ b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/DirectToOperationId.java
@@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import io.apicurio.datamodels.openapi.models.OasOperation;
 
-
 public final class DirectToOperationId implements DestinationGenerator {
 
     private final AtomicInteger directRouteCount = new AtomicInteger(0);
diff --git a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/FilerGenerator.java b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/FilerGenerator.java
index ead7341..093b373 100644
--- a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/FilerGenerator.java
+++ b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/FilerGenerator.java
@@ -23,7 +23,6 @@ import javax.annotation.processing.Filer;
 import com.squareup.javapoet.JavaFile;
 import io.apicurio.datamodels.openapi.models.OasDocument;
 
-
 final class FilerGenerator extends RestDslSourceCodeGenerator<Filer> {
 
     FilerGenerator(final OasDocument openapi) {
diff --git a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/OperationVisitor.java b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/OperationVisitor.java
index 368f6f7..d905f78 100644
--- a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/OperationVisitor.java
+++ b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/OperationVisitor.java
@@ -236,4 +236,4 @@ class OperationVisitor<T> {
         return emitter;
         
     }
-}
\ No newline at end of file
+}
diff --git a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/PathGenerator.java b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/PathGenerator.java
index 1844295..f89aba8 100644
--- a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/PathGenerator.java
+++ b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/PathGenerator.java
@@ -22,7 +22,6 @@ import java.nio.file.Path;
 import com.squareup.javapoet.JavaFile;
 import io.apicurio.datamodels.openapi.models.OasDocument;
 
-
 final class PathGenerator extends RestDslSourceCodeGenerator<Path> {
 
     PathGenerator(final OasDocument openapi) {
diff --git a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/PathVisitor.java b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/PathVisitor.java
index 53d01c8..ca3c0bc 100644
--- a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/PathVisitor.java
+++ b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/PathVisitor.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.generator.openapi;
 
-
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -24,8 +23,6 @@ import io.apicurio.datamodels.openapi.models.OasOperation;
 import io.apicurio.datamodels.openapi.models.OasPathItem;
 import org.apache.camel.util.ObjectHelper;
 
-
-
 class PathVisitor<T> {
 
     private final DestinationGenerator destinationGenerator;
@@ -95,4 +92,4 @@ class PathVisitor<T> {
         OPTIONS
     }
 
-}
\ No newline at end of file
+}
diff --git a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslDefinitionGenerator.java b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslDefinitionGenerator.java
index 01210c8..27ae620 100644
--- a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslDefinitionGenerator.java
+++ b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslDefinitionGenerator.java
@@ -20,7 +20,6 @@ import io.apicurio.datamodels.openapi.models.OasDocument;
 import org.apache.camel.CamelContext;
 import org.apache.camel.model.rest.RestsDefinition;
 
-
 public final class RestDslDefinitionGenerator extends RestDslGenerator<RestDslDefinitionGenerator> {
 
     RestDslDefinitionGenerator(final OasDocument openapi) {
diff --git a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslGenerator.java b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslGenerator.java
index 52e0c01..90d243f 100644
--- a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslGenerator.java
+++ b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslGenerator.java
@@ -32,8 +32,6 @@ import org.apache.camel.model.rest.RestsDefinition;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
-
 import static org.apache.camel.util.ObjectHelper.notNull;
 
 /**
diff --git a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslXmlGenerator.java b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslXmlGenerator.java
index a2be5ca..a1ce847 100644
--- a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslXmlGenerator.java
+++ b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslXmlGenerator.java
@@ -39,9 +39,6 @@ import org.apache.camel.ExtendedCamelContext;
 import org.apache.camel.model.rest.RestsDefinition;
 import org.apache.camel.util.ObjectHelper;
 
-
-
-
 public class RestDslXmlGenerator extends RestDslGenerator<RestDslXmlGenerator> {
 
     private boolean blueprint;
diff --git a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDefinitionEmitterTest.java b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDefinitionEmitterTest.java
index 53d9f12..132c218 100644
--- a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDefinitionEmitterTest.java
+++ b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDefinitionEmitterTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.generator.openapi;
 
 import java.util.List;
 
-
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.model.rest.RestDefinition;
 import org.apache.camel.model.rest.RestOperationParamDefinition;
diff --git a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslGeneratorTest.java b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslGeneratorTest.java
index 6e8913d..9dcde26 100644
--- a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslGeneratorTest.java
+++ b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslGeneratorTest.java
@@ -26,7 +26,6 @@ import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.time.Instant;
 
-
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.apicurio.datamodels.Library;
@@ -37,7 +36,6 @@ import org.apache.camel.model.rest.RestsDefinition;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class RestDslGeneratorTest {
diff --git a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslGeneratorV3Test.java b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslGeneratorV3Test.java
index f31460e..645d0ad 100644
--- a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslGeneratorV3Test.java
+++ b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslGeneratorV3Test.java
@@ -36,8 +36,6 @@ import org.apache.camel.model.rest.RestsDefinition;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class RestDslGeneratorV3Test {
diff --git a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslSourceCodeGeneratorV3Test.java b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslSourceCodeGeneratorV3Test.java
index faf8b81..dee70d5 100644
--- a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslSourceCodeGeneratorV3Test.java
+++ b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslSourceCodeGeneratorV3Test.java
@@ -16,16 +16,13 @@
  */
 package org.apache.camel.generator.openapi;
 
-
 import io.apicurio.datamodels.openapi.models.OasInfo;
 import io.apicurio.datamodels.openapi.v3.models.Oas30Document;
 import io.apicurio.datamodels.openapi.v3.models.Oas30Info;
 import org.junit.Test;
 
-
 import static org.assertj.core.api.Assertions.assertThat;
 
-
 public class RestDslSourceCodeGeneratorV3Test {
 
     @Test
diff --git a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslXmlGeneratorTest.java b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslXmlGeneratorTest.java
index ad4ab36..397b849 100644
--- a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslXmlGeneratorTest.java
+++ b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslXmlGeneratorTest.java
@@ -40,7 +40,6 @@ import org.apache.camel.impl.DefaultCamelContext;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class RestDslXmlGeneratorTest {
diff --git a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslXmlGeneratorV3Test.java b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslXmlGeneratorV3Test.java
index 616d370..c3fa886 100644
--- a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslXmlGeneratorV3Test.java
+++ b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslXmlGeneratorV3Test.java
@@ -40,7 +40,6 @@ import org.apache.camel.impl.DefaultCamelContext;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class RestDslXmlGeneratorV3Test {


[camel] 02/02: Add a profile to run the impsort plugin (sort and remove unused imports)

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

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

commit 4eb044932fae344f49509a1ede2d3b58e59d0a93
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Wed Mar 4 17:54:02 2020 +0100

    Add a profile to run the impsort plugin (sort and remove unused imports)
---
 parent/pom.xml | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/parent/pom.xml b/parent/pom.xml
index ce17d6b..1bfc2a9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -299,6 +299,7 @@
         <ical4j-version>1.0.7</ical4j-version>
         <icu4j-version>65.1</icu4j-version>
         <ignite-version>2.7.6</ignite-version>
+        <impsort-maven-plugin-version>1.3.2</impsort-maven-plugin-version>
         <infinispan-version>10.1.3.Final</infinispan-version>
         <influx-java-driver-version>2.17</influx-java-driver-version>
         <influx-java-driver-bundle-version>2.17_1</influx-java-driver-bundle-version>
@@ -4500,6 +4501,34 @@
         </profile>
 
         <profile>
+            <id>impsort</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>net.revelc.code</groupId>
+                        <artifactId>impsort-maven-plugin</artifactId>
+                        <version>${impsort-maven-plugin-version}</version>
+                        <executions>
+                            <execution>
+                                <id>sort-imports</id>
+                                <goals>
+                                    <goal>sort</goal>
+                                </goals>
+                                <phase>process-sources</phase>
+                                <configuration>
+                                    <groups>java.,javax.,org.w3c.,org.xml.,junit.,*</groups>
+                                    <excludes>**/package-info.java</excludes>
+                                    <staticAfter>true</staticAfter>
+                                    <removeUnused>true</removeUnused>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
             <id>sourcecheck</id>
             <build>
                 <plugins>