You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2019/10/26 10:02:41 UTC

[camel] 01/01: tiny cleanups: - remove unused import statements - make use of type inference for generic instance creation - remove obsolete 'public', 'static' and 'final' modifiers in interfaces - change field/method accesses to it's owning supertype - remove obsolete type castings - remove obsolete semicolons

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

bvahdat pushed a commit to branch tiny-cleanups
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 87791aa9ef8e3ec99dbd952035c3a73ab3841071
Author: Babak Vahdat <bv...@apache.org>
AuthorDate: Sat Oct 26 12:01:37 2019 +0200

    tiny cleanups:
    - remove unused import statements
    - make use of type inference for generic instance creation
    - remove obsolete 'public', 'static' and 'final' modifiers in interfaces
    - change field/method accesses to it's owning supertype
    - remove obsolete type castings
    - remove obsolete semicolons
---
 .../java/org/apache/camel/maven/GenerateMojo.java  |  1 -
 .../apache/camel/parser/RouteBuilderParser.java    |  2 -
 .../apache/camel/parser/xml/XmlRestDslTest.java    |  4 -
 .../component/activemq/ActiveMQComponent.java      |  4 +-
 .../ActiveMQReplyToHeaderUsingConverterTest.java   |  2 +-
 .../activemq/AutoExposeQueuesInCamelTest.java      |  2 +-
 ...nvokeRequestReplyUsingJmsReplyToHeaderTest.java |  4 +-
 .../any23/Any23DataFormatConfigurationsTest.java   |  2 +-
 .../any23/Any23DataFormatExtractorsTest.java       |  4 +-
 .../apache/camel/component/as2/api/AS2Charset.java |  4 +-
 .../camel/component/as2/api/AS2Constants.java      | 22 ++---
 .../apache/camel/component/as2/api/AS2Header.java  | 46 +++++------
 .../camel/component/as2/api/AS2MediaType.java      | 16 ++--
 .../camel/component/as2/api/AS2MicAlgorithm.java   |  8 +-
 .../camel/component/as2/api/AS2MimeType.java       | 18 ++---
 .../camel/component/as2/api/AS2ReportType.java     |  2 +-
 .../component/as2/api/AS2SignatureAlgorithm.java   | 36 ++++-----
 .../component/as2/api/AS2TransferEncoding.java     |  6 +-
 .../apache/camel/component/as2/api/MDNField.java   | 18 ++---
 .../as2/AS2ClientManagerIntegrationTest.java       |  2 +-
 .../as2/AS2ServerManagerIntegrationTest.java       |  1 -
 .../camel/component/atmos/AtmosEndpoint.java       |  1 -
 .../atomix/client/map/AtomixMapConsumer.java       |  2 -
 .../client/messaging/AtomixMessagingConsumer.java  |  2 -
 .../atomix/client/queue/AtomixQueueConsumer.java   |  2 -
 .../atomix/client/set/AtomixSetConsumer.java       |  2 -
 .../atomix/client/value/AtomixValueConsumer.java   |  2 -
 .../atomix/cluster/AtomixClusterService.java       |  1 -
 .../camel/avro/generated/KeyValueProtocol.java     |  4 +-
 .../camel/component/aws/ec2/EC2Configuration.java  |  1 -
 .../camel/component/aws/ec2/EC2Producer.java       |  1 -
 .../component/aws/ecs/AmazonECSClientMock.java     |  2 +-
 .../component/aws/eks/AmazonEKSClientMock.java     |  2 +-
 .../component/aws/iam/AmazonIAMClientMock.java     |  2 +-
 .../KinesisComponentIntegrationTest.java           |  2 -
 .../aws/lambda/AmazonLambdaClientMock.java         |  2 +-
 .../aws/lambda/LambdaComponentSpringTest.java      |  4 +-
 .../component/aws/lambda/LambdaProducerTest.java   |  4 +-
 .../component/aws/msk/AmazonMSKClientMock.java     |  2 +-
 .../aws/s3/S3ComponentConfigurationTest.java       |  1 -
 .../component/aws/sqs/AmazonSQSClientMock.java     |  8 +-
 .../camel/component/aws/swf/SWFConfiguration.java  |  1 -
 .../azure/queue/QueueServiceComponent.java         |  2 -
 .../BlueprintContainerBeanRepository.java          |  1 -
 .../camel/component/box/api/BoxSearchManager.java  |  3 -
 .../box/BoxEventsManagerIntegrationTest.java       |  1 -
 .../braintree/DisputeGatewayIntegrationTest.java   | 12 +--
 .../NamedCassandraIdempotentRepository.java        |  2 +-
 .../component/cbor/CBORObjectListSplitTest.java    |  2 +-
 .../camel/cdi/bean/FirstCamelContextBean.java      |  1 -
 ...CometdProducerConsumerInOutInteractiveMain.java |  1 -
 ...oducerConsumerInteractiveAuthenticatedMain.java |  1 -
 ...tdProducerConsumerInteractiveExtensionMain.java |  1 -
 .../CometdProducerConsumerInteractiveMain.java     |  1 -
 .../camel/component/corda/CordaProducer.java       | 10 +--
 .../corda/CordaConsumerNetworkMapFeedTest.java     |  1 -
 .../CordaConsumerStartTrackedFlowDynamicTest.java  |  1 -
 .../corda/CordaConsumerStateMachineFeedTest.java   |  1 -
 .../corda/CordaConsumerTransactionMapFeedTest.java |  1 -
 .../CordaConsumerVaultTrackByCriteriaTest.java     |  1 -
 .../corda/CordaConsumerVaultTrackByTest.java       |  1 -
 ...ordaConsumerVaultTrackByWithPagingSpecTest.java |  1 -
 .../CordaConsumerVaultTrackByWithSortingTest.java  |  1 -
 .../cms/common/DefaultCryptoCmsConfiguration.java  |  1 -
 .../crypto/DigitalSignatureConfiguration.java      |  5 --
 .../camel/component/cxf/DefaultCxfBinding.java     |  2 +-
 .../cxf/jaxrs/CxfRsBlueprintEndpoint.java          |  2 +-
 .../cxf/CxfConsumerClientDisconnectedTest.java     |  2 +-
 .../cxf/CxfConsumerContinuationTimeoutTest.java    |  2 -
 .../component/cxf/CxfProducerContextTest.java      |  1 -
 .../jaxrs/CxfRsConsumerClientDisconnectedTest.java |  2 +-
 .../cxf/jaxrs/CxfRsConsumerWithBeanTest.java       |  2 +-
 .../cxf/jaxrs/CxfRsConvertBodyToTest.java          |  2 +-
 .../component/cxf/jaxrs/CxfRsProducerTest.java     |  2 +-
 .../component/cxf/jaxrs/CxfRsStreamCacheTest.java  |  2 +-
 .../component/cxf/mtom/CxfMtomConsumerTest.java    |  1 -
 .../camel/component/cxf/wsdl/OrderEndpoint.java    |  2 +-
 .../component/dataformat/DataFormatComponent.java  |  1 -
 .../component/debezium/DebeziumEndpointTest.java   |  2 +-
 .../debezium/DebeziumTypeConverterTest.java        |  8 +-
 ...ConnectorEmbeddedDebeziumConfigurationTest.java |  3 +-
 .../camel/maven/config/ConnectorConfigField.java   |  2 -
 .../maven/config/ConnectorConfigGeneratorTest.java |  6 +-
 .../camel/component/directvm/DirectVmEndpoint.java |  1 -
 .../docker/consumer/DockerEventsConsumer.java      |  2 -
 .../component/docker/producer/DockerProducer.java  |  1 -
 .../component/dropbox/core/DropboxAPIFacade.java   |  1 -
 .../elsql/ElsqlSqlPrepareStatementStrategy.java    |  2 -
 .../FacebookComponentPageIdProducerTest.java       |  2 -
 .../data/FacebookMethodsTypeHelperTest.java        |  2 -
 .../camel/component/fhir/api/FhirHistory.java      |  1 -
 .../apache/camel/component/fhir/api/FhirMeta.java  |  2 -
 .../apache/camel/component/fhir/api/FhirPatch.java |  1 -
 .../camel/component/fhir/api/FhirSearch.java       |  1 -
 .../camel/component/fhir/FhirLoadPageIT.java       | 12 +--
 .../camel/component/fhir/FhirOperationIT.java      |  8 +-
 .../spring/FhirDataformatConfigSpringTest.java     |  4 -
 .../FhirXmlDataformatErrorHandlerSpringTest.java   |  2 -
 .../camel/component/file/GenericFileConverter.java |  6 --
 .../camel/component/file/remote/FtpsEndpoint.java  |  2 +-
 .../SftpChangedExclusiveReadLockStrategy.java      |  1 -
 .../remote/sftp/SftpKeyPairDSAConsumeTest.java     |  6 --
 .../component/geocoder/GeoCoderProxyTest.java      |  1 -
 .../CalendarCalendarListIntegrationTest.java       |  2 -
 .../calendar/CalendarCalendarsIntegrationTest.java |  2 -
 .../google/mail/GoogleMailConfiguration.java       |  4 -
 .../pubsub/GooglePubsubConnectionFactory.java      |  2 +-
 .../camel/component/grape/GrapeEndpoint.java       |  2 +-
 .../camel/component/grape/GrapeProducer.java       |  2 +-
 .../grpc/auth/jwt/JwtCallCredentials.java          |  2 -
 .../hazelcast/HazelcastDefaultEndpoint.java        |  3 -
 .../org/apache/camel/http/common/HttpHelper.java   |  1 -
 .../ignite/compute/IgniteComputeProducer.java      |  2 +-
 .../camel/component/ignite/IgniteEventsTest.java   |  1 -
 .../component/irc/it/IrcMultiChannelRouteTest.java |  1 -
 .../camel/component/irc/it/IrcOnReplyTest.java     |  1 -
 .../camel/component/irc/it/IrcPrivmsgTest.java     |  3 -
 .../camel/component/irc/it/IrcRouteTest.java       |  3 -
 .../camel/component/irc/it/IrcsListUsersTest.java  |  9 ---
 .../camel/converter/jaxb/JaxbDataFormat.java       |  2 -
 .../org/apache/camel/example/JAXBConvertTest.java  |  4 -
 .../CamelWorkItemHandlerIntegrationTests.java      |  2 +-
 .../jcache/policy/JCachePolicyTestBase.java        |  1 -
 .../jcache/policy/SpringJCachePolicyTest.java      |  2 -
 .../jcr/JcrRouteDifferentWorkspaceTestSupport.java |  1 -
 .../camel/component/jdbc/JdbcColumnTypeTest.java   |  4 -
 .../camel/component/jetty9/JettyHttpEndpoint9.java |  1 -
 .../apache/camel/component/jetty/HandlerTest.java  |  2 +-
 .../jetty/HttpBridgeMultipartRouteTest.java        |  1 -
 .../component/jetty/HttpStreamCacheFileTest.java   |  1 -
 .../component/jetty/JettyMuteExceptionTest.java    |  1 -
 .../jira/producer/WatcherProducerTest.java         |  2 +-
 .../component/jms/reply/QueueReplyManager.java     |  2 +-
 .../component/jms/reply/ReplyManagerSupport.java   |  1 -
 .../reply/SharedQueueMessageListenerContainer.java |  2 -
 .../component/jms/JmsRouteRequestReplyTest.java    | 13 ++-
 .../jpa/JpaWithNamedQueryAndParametersTest.java    |  1 -
 .../camel/component/kafka/KafkaProducer.java       |  1 -
 .../component/kafka/KafkaConsumerFullTest.java     |  1 -
 .../camel/component/kafka/embedded/TestUtils.java  |  2 -
 .../config_maps/KubernetesConfigMapsEndpoint.java  |  2 -
 .../deployments/KubernetesDeploymentsConsumer.java |  1 -
 .../deployments/KubernetesDeploymentsEndpoint.java |  2 -
 .../deployments/KubernetesDeploymentsProducer.java |  1 -
 .../kubernetes/hpa/KubernetesHPAEndpoint.java      |  2 -
 .../kubernetes/job/KubernetesJobEndpoint.java      |  2 -
 .../namespaces/KubernetesNamespacesEndpoint.java   |  2 -
 .../kubernetes/nodes/KubernetesNodesEndpoint.java  |  2 -
 .../kubernetes/nodes/KubernetesNodesProducer.java  |  3 -
 .../KubernetesPersistentVolumesEndpoint.java       |  2 -
 .../KubernetesPersistentVolumesClaimsEndpoint.java |  2 -
 .../kubernetes/pods/KubernetesPodsEndpoint.java    |  2 -
 .../KubernetesReplicationControllersEndpoint.java  |  2 -
 .../KubernetesResourcesQuotaEndpoint.java          |  2 -
 .../secrets/KubernetesSecretsEndpoint.java         |  2 -
 .../KubernetesServiceAccountsEndpoint.java         |  2 -
 .../services/KubernetesServicesEndpoint.java       |  2 -
 .../OpenshiftBuildConfigsEndpoint.java             |  2 -
 .../openshift/builds/OpenshiftBuildsEndpoint.java  |  2 -
 .../producer/KubernetesNodesProducerTest.java      |  2 -
 .../OpenshiftBuildConfigsProducerTest.java         |  6 --
 .../linkedin/api/LinkedInOAuthRequestFilter.java   |  2 +-
 .../camel/component/linkedin/LinkedInEndpoint.java |  2 -
 .../apache/camel/component/log/LogComponent.java   |  1 -
 .../mail/MailAttachmentDuplicateNamesTest.java     |  1 -
 .../mail/MailAttachmentRedeliveryTest.java         |  1 -
 .../camel/component/mail/MailAttachmentTest.java   |  1 -
 .../mail/MailAttachmentsUmlautIssueTest.java       |  1 -
 .../camel/component/mail/MailComponentTest.java    |  1 -
 .../mail/MailContentTypeResolverTest.java          |  1 -
 .../component/mail/MailHtmlAttachmentTest.java     |  1 -
 .../mail/MimeMultipartAlternativeTest.java         |  1 -
 ...MultipartAlternativeWithLongerFilenameTest.java |  1 -
 .../mail/SpringMailSplitAttachmentsTest.java       |  1 -
 .../component/metrics/MetricsComponentTest.java    |  1 -
 .../milo/client/MiloClientConfiguration.java       |  2 -
 .../apache/camel/component/mock/MockEndpoint.java  |  4 +-
 .../camel/component/mongodb/MongoDbEndpoint.java   |  1 -
 .../mongodb/MongoDbConnectionBeansTest.java        |  7 --
 .../netty/http/NettyHttpMuteExceptionTest.java     |  1 -
 .../ClientModeTCPNettyServerBootstrapFactory.java  |  2 +-
 .../apache/camel/component/nsq/NsqTestSupport.java |  2 +-
 .../olingo2/Olingo2ComponentConsumerTest.java      | 12 +--
 .../olingo4/Olingo4ComponentConsumerTest.java      | 18 ++---
 .../openstack/common/OpenstackException.java       |  2 -
 .../openstack/cinder/VolumeProducerTest.java       |  2 -
 .../cinder/VolumeSnapshotProducerTest.java         |  1 -
 .../openstack/keystone/DomainProducerTest.java     |  1 -
 .../openstack/keystone/GroupProducerTest.java      |  1 -
 .../openstack/keystone/ProjectProducerTest.java    |  1 -
 .../openstack/keystone/RegionProducerTest.java     |  1 -
 .../openstack/keystone/UserProducerTest.java       |  1 -
 .../openstack/neutron/NetworkProducerTest.java     |  1 -
 .../openstack/neutron/PortProducerTest.java        |  1 -
 .../openstack/neutron/RouterProducerTest.java      |  1 -
 .../openstack/neutron/SubnetProducerTest.java      |  1 -
 .../openstack/nova/FlavorProducerTest.java         |  1 -
 .../openstack/nova/ServerProducerTest.java         |  1 -
 .../openstack/swift/ContainerProducerTest.java     |  2 -
 .../openstack/swift/ObjectProducerTest.java        |  1 -
 .../CamelMessagingHeadersExtractAdapterTest.java   |  2 +-
 .../CamelMessagingHeadersInjectAdapterTest.java    |  2 +-
 .../camel/component/paho/PahoConfiguration.java    |  1 -
 .../ProtobufMarshalAndUnmarshalJsonTest.java       |  1 -
 .../camel/component/pubnub/PubNubProducer.java     |  4 +-
 .../component/pulsar/PulsarComponentTest.java      |  4 +-
 .../quartz/ScheduledRoutePolicyConstants.java      |  2 +-
 .../quickfixj/examples/trading/TradeExecutor.java  |  2 +-
 .../rabbitmq/RabbitMQMessageConverter.java         |  2 -
 .../rabbitmq/RabbitMQProducerIntTest.java          | 10 +--
 .../streams/util/UnwrapStreamProcessor.java        |  1 -
 .../camel/component/rest/RestApiEndpoint.java      |  1 -
 .../robotframework/RobotFrameworkArguments.java    |  4 +-
 .../RobotFrameworkCamelConstants.java              |  6 +-
 .../salesforce/api/dto/AbstractDTOBase.java        |  1 -
 .../salesforce/api/dto/approval/Approvals.java     |  2 +-
 .../salesforce/api/dto/composite/SObjectNode.java  |  1 -
 .../internal/processor/JsonRestProcessor.java      |  1 -
 .../ChangeEventsConsumerIntegrationTest.java       |  6 +-
 .../api/dto/composite/SObjectBatchTest.java        |  2 -
 .../salesforce/dto/generated/Contact.java          |  1 -
 .../salesforce/dto/generated/Document.java         |  2 -
 .../salesforce/dto/generated/Line_Item__c.java     |  2 -
 .../salesforce/dto/generated/Merchandise__c.java   |  2 -
 .../salesforce/dto/generated/StringMSPTest.java    |  7 --
 .../camel/maven/CamelSalesforceMojoOutputTest.java |  1 -
 .../camel/component/xquery/XQueryEndpoint.java     |  1 -
 .../component/xslt/SaxonXsltFeatureRouteTest.java  |  2 -
 .../processor/SchematronProcessorFactory.java      |  1 -
 .../component/servlet/HttpClientRouteTest.java     |  1 -
 .../servlet/ServletMuteExceptionTest.java          |  2 -
 .../ServletSetExchangePropertyBeanTest.java        |  1 -
 .../sjms/batch/SjmsBatchConsumerTest.java          |  1 -
 .../camel/component/sjms2/Sjms2Endpoint.java       |  1 -
 .../camel/component/sjms2/Sjms2EndpointTest.java   |  1 -
 .../slack/SlackComponentVerifierExtension.java     |  4 +-
 .../camel/component/slack/SlackConsumer.java       |  4 +-
 .../apache/camel/component/solr/SolrFixtures.java  |  1 -
 ...CamelSpringDelegatingTestContextLoaderTest.java |  1 -
 .../RedisStringIdempotentRepository.java           |  1 -
 .../RedisStringIdempotentRepositoryTest.java       |  1 -
 .../spring/ws/SpringWebserviceComponent.java       |  1 -
 .../spring/ws/SpringWebserviceMessage.java         |  1 -
 .../spring/ws/testfilters/LocalMessageFilter.java  |  1 -
 .../ErrorHandlerCamelContextRefNotFoundTest.java   |  1 -
 .../ErrorHandlerRouteContextRefNotFoundTest.java   |  1 -
 .../issues/SpringMainStartFailedIssueTest.java     |  1 -
 .../ManagedEndpointInjectRefEndpointTest.java      |  1 -
 .../spring/management/ManagedRefEndpointTest.java  |  1 -
 .../SpringCamelContextStartingFailedEventTest.java |  1 -
 ...gDeadLetterChannelInvalidDeadLetterUriTest.java |  1 -
 ...etterChannelInvalidOptionDeadLetterUriTest.java |  1 -
 ...ringDoubleLoadBalancerMisconfigurationTest.java |  1 -
 .../spring/processor/SpringFilterNoChildTest.java  |  1 -
 .../processor/SpringTryCatchMisconfiguredTest.java |  1 -
 ...ingTryCatchMustHaveExceptionConfiguredTest.java |  1 -
 .../sql/DefaultSqlProcessingStrategy.java          |  4 +-
 .../template/generated/SSPTParserTokenManager.java |  3 -
 .../sql/stored/ProducerBatchInvalidTest.java       |  1 -
 .../apache/camel/component/stub/StubEndpoint.java  |  1 -
 .../component/telegram/TelegramComponent.java      |  1 -
 .../telegram/TelegramConsumerMappingTest.java      |  1 -
 .../converter/FooConverterRegression.java          |  1 -
 .../management/ManagedRefEndpointTest.java         |  1 -
 .../junit5/CamelSpringTestContextLoader.java       |  1 -
 .../test/spring/CamelSpringTestContextLoader.java  |  1 -
 .../camel/test/spring/CamelSpringTestSupport.java  |  1 -
 .../test/spring/RouteCoverageEventNotifier.java    |  1 -
 .../org/apache/camel/test/junit4/TestSupport.java  |  3 -
 .../component/thrift/generated/Calculator.java     | 94 +++++++++++-----------
 .../thrift/generated/InvalidOperation.java         |  4 +-
 .../component/thrift/generated/Operation.java      |  5 --
 .../camel/component/thrift/generated/Work.java     |  4 +-
 .../dataformat/thrift/generated/Operation.java     |  5 --
 .../camel/dataformat/thrift/generated/Work.java    |  4 +-
 .../component/undertow/UndertowConstants.java      |  2 +-
 .../undertow/UndertowStreamingClientCallback.java  |  4 -
 .../component/undertow/MultiPartFormTest.java      |  1 -
 .../undertow/UndertowHttpStreamingTest.java        |  1 -
 .../integration/Web3jProducerGanacheTest.java      |  1 -
 .../camel/websocket/jsr356/JSR356Consumer.java     |  2 +-
 .../component/websocket/WebsocketConstants.java    |  2 +-
 .../camel/component/xj/JsonXmlStreamReader.java    | 59 +++++++-------
 .../camel/component/xj/XmlJsonStreamWriter.java    | 19 +++--
 .../xmlsecurity/XMLSecurityDataFormat.java         |  2 +-
 .../xmlsecurity/XMLSecurityDataFormatTest.java     |  2 -
 .../dataformat/zipfile/ZipFileDataFormat.java      |  4 -
 .../camel/zipkin/ZipkinMDCScopeDecoratorTest.java  |  1 -
 .../component/zookeepermaster/group/GroupTest.java |  1 -
 .../group/internal/ZooKeeperGroupTest.java         |  1 -
 .../component/zookeeper/NaturalSortComparator.java |  2 +-
 .../src/main/java/org/apache/camel/Channel.java    |  3 -
 .../camel/support/service/ServiceHelper.java       |  1 -
 .../apache/camel/converter/ObjectConverter.java    |  4 +-
 .../camel/impl/engine/AbstractCamelContext.java    |  2 -
 .../impl/engine/DefaultCamelBeanPostProcessor.java |  2 +-
 .../camel/impl/engine/DefaultProducerCache.java    |  1 -
 .../camel/processor/CamelInternalProcessor.java    |  2 +-
 .../camel/impl/AbstractModelCamelContext.java      |  1 -
 .../apache/camel/model/RouteDefinitionHelper.java  |  2 +-
 .../camel/model/dataformat/Any23DataFormat.java    |  2 +-
 .../apache/camel/reifier/InterceptFromReifier.java |  2 +-
 .../org/apache/camel/reifier/ProcessorReifier.java |  5 +-
 .../errorhandler/DeadLetterChannelReifier.java     |  2 +-
 .../camel/core/osgi/OsgiFactoryFinderTest.java     |  1 -
 .../test/java/org/apache/camel/TestSupport.java    |  3 +-
 .../camel/builder/xml/XPathFunctionsTest.java      |  1 -
 .../bean/BeanCreateBodyExceptionTest.java          |  1 -
 .../file/FilerProducerDoneFileNameTest.java        |  1 -
 .../issues/PropertiesAvailableEverywhereTest.java  |  1 -
 .../TransactedPropertyPlaceholderIssueTest.java    |  1 -
 .../camel/processor/RouteAutoStartupTest.java      |  1 -
 .../camel/processor/ThrottlingGroupingTest.java    |  8 +-
 .../InterceptFromPropertyPlaceholderTest.java      |  1 -
 ...mlChoiceFilterRoutePropertyPlaceholderTest.java |  1 -
 .../camel/util/DumpModelAsXmlPlaceholdersTest.java |  1 -
 .../DefaultManagementObjectStrategy.java           |  6 +-
 .../management/JmxManagementStrategyFactory.java   |  2 -
 .../camel/management/mbean/ManagedTracer.java      |  5 --
 .../camel/management/ManagedComponentTest.java     |  3 -
 .../camel/management/ManagementTestSupport.java    |  1 -
 .../camel/support/ScheduledPollConsumer.java       |  1 -
 .../apache/camel/support/SimpleTypeConverter.java  |  2 +-
 .../builder/TokenXMLExpressionIterator.java        |  1 -
 .../org/apache/camel/util/OrderedProperties.java   |  2 +-
 ...CamelSpringDelegatingTestContextLoaderTest.java |  1 -
 .../camel/example/billboard/BillboardAggrTest.java |  2 +-
 .../debezium/DebeziumMySqlConsumerToKinesis.java   |  1 -
 .../debezium/KinesisProducerToCassandra.java       |  1 -
 .../org/apache/camel/example/MyConfiguration.java  |  7 --
 .../example/spring/boot/metrics/Application.java   |  1 -
 .../apache/camel/example/client/CamelClient.java   |  1 -
 .../example/telegram/usage/GetUpdatesUsage.java    |  3 -
 .../example/telegram/usage/SendVenueUsage.java     |  3 -
 .../commands/AbstractLocalCamelController.java     |  4 +-
 .../apache/camel/commands/RouteStepCommand.java    |  1 -
 .../itest/springboot/CamelWebsocketJsr356Test.java |  1 -
 .../camel/itest/issues/JettyHttpFileCacheTest.java |  1 -
 .../apache/camel/itest/jms/JmsIntegrationTest.java |  2 -
 .../apt/ComponentPropertyConfigurerGenerator.java  |  1 -
 .../apt/CoreEipAnnotationProcessorHelper.java      |  1 -
 .../maven/AbstractApiMethodGeneratorMojo.java      |  1 -
 .../camel/maven/FileApiMethodGeneratorMojo.java    |  1 -
 .../camel/maven/JavadocApiMethodGeneratorMojo.java |  1 -
 .../camel/maven/packaging/generics/ClassUtil.java  |  2 +-
 .../maven/packaging/generics/GenericsUtil.java     |  6 +-
 .../maven/packaging/model/StringHelperTest.java    |  2 +-
 347 files changed, 343 insertions(+), 744 deletions(-)

diff --git a/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/GenerateMojo.java b/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/GenerateMojo.java
index 47621f0..c76cf89 100644
--- a/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/GenerateMojo.java
+++ b/catalog/camel-main-maven-plugin/src/main/java/org/apache/camel/maven/GenerateMojo.java
@@ -38,7 +38,6 @@ import org.apache.camel.maven.model.AutowireData;
 import org.apache.camel.maven.model.SpringBootGroupData;
 import org.apache.camel.maven.model.SpringBootPropertyData;
 import org.apache.camel.support.IntrospectionSupport;
-import org.apache.camel.support.ObjectHelper;
 import org.apache.camel.support.PatternHelper;
 import org.apache.camel.util.IOHelper;
 import org.apache.camel.util.OrderedProperties;
diff --git a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/RouteBuilderParser.java b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/RouteBuilderParser.java
index ba53cf5..7716276 100644
--- a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/RouteBuilderParser.java
+++ b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/RouteBuilderParser.java
@@ -17,8 +17,6 @@
 package org.apache.camel.parser;
 
 import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
 import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/xml/XmlRestDslTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/xml/XmlRestDslTest.java
index 3c1cff6..926056e 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/xml/XmlRestDslTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/xml/XmlRestDslTest.java
@@ -16,17 +16,13 @@
  */
 package org.apache.camel.parser.xml;
 
-import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.util.List;
 
-import org.apache.camel.parser.RestDslParser;
 import org.apache.camel.parser.XmlRestDslParser;
 import org.apache.camel.parser.model.RestConfigurationDetails;
 import org.apache.camel.parser.model.RestServiceDetails;
-import org.jboss.forge.roaster.Roaster;
-import org.jboss.forge.roaster.model.source.JavaClassSource;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
diff --git a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQComponent.java b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQComponent.java
index 7f6df6e..e8ecb14 100644
--- a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQComponent.java
+++ b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQComponent.java
@@ -49,8 +49,8 @@ public class ActiveMQComponent extends JmsComponent {
     private boolean exposeAllQueues;
     private CamelEndpointLoader endpointLoader;
     private EnhancedConnection connection;
-    private final CopyOnWriteArrayList<SingleConnectionFactory> singleConnectionFactoryList = new CopyOnWriteArrayList<SingleConnectionFactory>();
-    private final CopyOnWriteArrayList<Service> pooledConnectionFactoryServiceList = new CopyOnWriteArrayList<Service>();
+    private final CopyOnWriteArrayList<SingleConnectionFactory> singleConnectionFactoryList = new CopyOnWriteArrayList<>();
+    private final CopyOnWriteArrayList<Service> pooledConnectionFactoryServiceList = new CopyOnWriteArrayList<>();
     
     public ActiveMQComponent() {
     }
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQReplyToHeaderUsingConverterTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQReplyToHeaderUsingConverterTest.java
index 5d8ba0b..7f41688 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQReplyToHeaderUsingConverterTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQReplyToHeaderUsingConverterTest.java
@@ -63,7 +63,7 @@ public class ActiveMQReplyToHeaderUsingConverterTest extends CamelTestSupport {
         firstMessage.header("JMSType").isEqualTo(messageType);
         firstMessage.header("JMSXGroupID").isEqualTo(groupID);
 
-        Map<String, Object> headers = new HashMap<String, Object>();
+        Map<String, Object> headers = new HashMap<>();
         headers.put("cheese", 123);
         if (useReplyToHeader) {
             headers.put("JMSReplyTo", replyQueueName);
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AutoExposeQueuesInCamelTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AutoExposeQueuesInCamelTest.java
index 9b5ecc9..671502d 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AutoExposeQueuesInCamelTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AutoExposeQueuesInCamelTest.java
@@ -62,7 +62,7 @@ public class AutoExposeQueuesInCamelTest extends EmbeddedBrokerTestSupport {
     }
 
     public <T> List<T> getEndpoints(CamelContext camelContext, Class<T> type) {
-        List<T> answer = new ArrayList<T>();
+        List<T> answer = new ArrayList<>();
         Collection<Endpoint> endpoints = camelContext.getEndpoints();
         for (Endpoint endpoint : endpoints) {
             if (type.isInstance(endpoint)) {
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/InvokeRequestReplyUsingJmsReplyToHeaderTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/InvokeRequestReplyUsingJmsReplyToHeaderTest.java
index 8808c02..3b290d3 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/InvokeRequestReplyUsingJmsReplyToHeaderTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/InvokeRequestReplyUsingJmsReplyToHeaderTest.java
@@ -48,7 +48,7 @@ public class InvokeRequestReplyUsingJmsReplyToHeaderTest extends CamelTestSuppor
 
     @Test
     public void testPerformRequestReplyOverJms() throws Exception {
-        Map<String, Object> headers = new HashMap<String, Object>();
+        Map<String, Object> headers = new HashMap<>();
         headers.put("cheese", 123);
         headers.put("JMSReplyTo", replyQueueName);
         headers.put("JMSCorrelationID", correlationID);
@@ -57,7 +57,7 @@ public class InvokeRequestReplyUsingJmsReplyToHeaderTest extends CamelTestSuppor
         Exchange reply = template.request("activemq:test.server?replyTo=queue:test.reply", new Processor() {
             public void process(Exchange exchange) {
                 exchange.getIn().setBody("James");
-                Map<String, Object> headers = new HashMap<String, Object>();
+                Map<String, Object> headers = new HashMap<>();
                 headers.put("cheese", 123);
                 headers.put("JMSReplyTo", replyQueueName);
                 headers.put("JMSCorrelationID", correlationID);
diff --git a/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatConfigurationsTest.java b/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatConfigurationsTest.java
index aa4914c..ebf85a2 100644
--- a/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatConfigurationsTest.java
+++ b/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatConfigurationsTest.java
@@ -57,7 +57,7 @@ public class Any23DataFormatConfigurationsTest extends CamelTestSupport {
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             public void configure() {
-                Map<String, String> conf = new HashMap<String, String>();
+                Map<String, String> conf = new HashMap<>();
                 conf.put("any23.extraction.metadata.nesting", "off");
                 from("direct:start").unmarshal().any23(baseURI, Any23Type.TURTLE, conf).to("mock:result");
             }
diff --git a/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatExtractorsTest.java b/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatExtractorsTest.java
index 453e4e8..d1b8c60 100644
--- a/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatExtractorsTest.java
+++ b/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatExtractorsTest.java
@@ -58,9 +58,9 @@ public class Any23DataFormatExtractorsTest extends CamelTestSupport {
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             public void configure() {
-                Map<String, String> conf = new HashMap<String, String>();
+                Map<String, String> conf = new HashMap<>();
                 conf.put("any23.extraction.metadata.nesting", "off");
-                List<String> extc = new ArrayList<String>();
+                List<String> extc = new ArrayList<>();
                 extc.add("html-head-title");
                 from("direct:start").unmarshal().any23(baseURI, Any23Type.TURTLE, conf, extc).to("mock:result");
             }
diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2Charset.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2Charset.java
index 24d2eaf..77c698f 100644
--- a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2Charset.java
+++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2Charset.java
@@ -21,10 +21,10 @@ public interface AS2Charset {
     /**
      * Name of charset parameter in Content-Type header values.
      */
-    public static final String PARAM = "charset";
+    String PARAM = "charset";
 
     /**
      * Character Set Name for US ASCII
      */
-    public static final String US_ASCII = "US-ASCII";
+    String US_ASCII = "US-ASCII";
 }
diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2Constants.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2Constants.java
index 27e4b00..3ef0d85 100644
--- a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2Constants.java
+++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2Constants.java
@@ -26,22 +26,22 @@ public interface AS2Constants {
     /**
      * The Value of User Agent Header used by AS2 Camel Component.
      */
-    public static final String HTTP_USER_AGENT = "Camel AS2 Component";
+    String HTTP_USER_AGENT = "Camel AS2 Component";
 
     /**
      * The Value of Origin Server Header used by AS2 Camel Component.
      */
-    public static final String HTTP_ORIGIN_SERVER = "Camel AS2 Component";
+    String HTTP_ORIGIN_SERVER = "Camel AS2 Component";
 
     /**
      * Fully Qualified Domain Name used by AS2 Camel Component in Message ID Header.
      */
-    public static final String HTTP_MESSAGE_ID_FQDN = "camel.apache.org";
+    String HTTP_MESSAGE_ID_FQDN = "camel.apache.org";
 
     /**
      * The Value of User Agent Header used by AS2 Camel Component.
      */
-    public static final String MIME_VERSION = "1.0";
+    String MIME_VERSION = "1.0";
 
     //
     // HTTP Context Attribute Names
@@ -50,32 +50,32 @@ public interface AS2Constants {
     /**
      * HTTP Context Attribute Name for HTTP Client Connection object stored in context.
      */
-    public static final String HTTP_CLIENT_CONNECTION = HttpCoreContext.HTTP_CONNECTION;
+    String HTTP_CLIENT_CONNECTION = HttpCoreContext.HTTP_CONNECTION;
 
     /**
      * HTTP Context Attribute Name for HTTP Client Processor object stored in context.
      */
-    public static final String HTTP_CLIENT_PROCESSOR = "http.processor";
+    String HTTP_CLIENT_PROCESSOR = "http.processor";
 
     /**
      * HTTP Context Attribute Name for HTTP Client Fully Qualified Domain Name (FQDN) stored in context.
      */
-    public static final String HTTP_CLIENT_FQDN = "client.fqdn";
+    String HTTP_CLIENT_FQDN = "client.fqdn";
 
     /**
      * HTTP Context Attribute Name for HTTP Server Connection object stored in context.
      */
-    public static final String HTTP_SERVER_CONNECTION = "http.server.connection";
+    String HTTP_SERVER_CONNECTION = "http.server.connection";
 
     /**
      * HTTP Context Attribute Name for HTTP Server Processor object stored in context.
      */
-    public static final String HTTP_SERVER_PROCESSOR = "http.server.processor";
+    String HTTP_SERVER_PROCESSOR = "http.server.processor";
 
     /**
      * HTTP Context Attribute Name for HTTP Server Service object stored in context.
      */
-    public static final String HTTP_SERVER_SERVICE = "http.server.service";
+    String HTTP_SERVER_SERVICE = "http.server.service";
 
 
     //
@@ -85,6 +85,6 @@ public interface AS2Constants {
     /**
      * Application EDIFACT content type
      */
-    public static final String APPLICATION_EDIFACT_MIME_TYPE  = "Application/EDIFACT";
+    String APPLICATION_EDIFACT_MIME_TYPE  = "Application/EDIFACT";
 
 }
diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2Header.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2Header.java
index a193f29..059b739 100644
--- a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2Header.java
+++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2Header.java
@@ -23,94 +23,94 @@ public interface AS2Header {
     /**
      * Message Header Name for MIME Version
      */
-    public static final String MIME_VERSION = "MIME-Version";
+    String MIME_VERSION = "MIME-Version";
     /**
      * Message Header Name for AS2 From
      */
-    public static final String AS2_FROM = "AS2-From";
+    String AS2_FROM = "AS2-From";
     /**
      * Message Header Name for AS2 Version
      */
-    public static final String AS2_VERSION = "AS2-Version";
+    String AS2_VERSION = "AS2-Version";
     /**
      * Message Header Name for Content Type
      */
-    public static final String CONTENT_TYPE = "Content-Type";
+    String CONTENT_TYPE = "Content-Type";
     /**
      * Message Header Name for AS2 To
      */
-    public static final String AS2_TO = "AS2-To";
+    String AS2_TO = "AS2-To";
     /**
      * Message Header Name for From
      */
-    public static final String FROM = "From";
+    String FROM = "From";
     /**
      * Message Header Name for Subject
      */
-    public static final String SUBJECT = "Subject";
+    String SUBJECT = "Subject";
     /**
      * Message Header Name for Message ID
      */
-    public static final String MESSAGE_ID = "Message-Id";
+    String MESSAGE_ID = "Message-Id";
     /**
      * Message Header Name for Target Host
      */
-    public static final String TARGET_HOST = HTTP.TARGET_HOST;
+    String TARGET_HOST = HTTP.TARGET_HOST;
     /**
      * Message Header Name for User Agent
      */
-    public static final String USER_AGENT = HTTP.USER_AGENT;
+    String USER_AGENT = HTTP.USER_AGENT;
     /**
      * Message Header Name for Server Name
      */
-    public static final String SERVER = HTTP.SERVER_HEADER;
+    String SERVER = HTTP.SERVER_HEADER;
     /**
      * Message Header Name for Date
      */
-    public static final String DATE = HTTP.DATE_HEADER;
+    String DATE = HTTP.DATE_HEADER;
     /**
      * Message Header Name for Content Length
      */
-    public static final String CONTENT_LENGTH = HTTP.CONTENT_LEN;
+    String CONTENT_LENGTH = HTTP.CONTENT_LEN;
     /**
      * Message Header Name for Connection
      */
-    public static final String CONNECTION = HTTP.CONN_DIRECTIVE;
+    String CONNECTION = HTTP.CONN_DIRECTIVE;
     /**
      * Message Header Name for Expect
      */
-    public static final String EXPECT = HTTP.EXPECT_DIRECTIVE;
+    String EXPECT = HTTP.EXPECT_DIRECTIVE;
     /**
      * Message Header name for Content Transfer Encoding
      */
-    public static final String CONTENT_TRANSFER_ENCODING = "Content-Transfer-Encoding";
+    String CONTENT_TRANSFER_ENCODING = "Content-Transfer-Encoding";
     /**
      * Message Header name for Content Disposition
      */
-    public static final String CONTENT_DISPOSITION = "Content-Disposition";
+    String CONTENT_DISPOSITION = "Content-Disposition";
     /**
      * Message Header name for Content Description
      */
-    public static final String CONTENT_DESCRIPTION = "Content-Description";
+    String CONTENT_DESCRIPTION = "Content-Description";
     /**
      * Message Header name for Disposition Type
      */
-    public static final String DISPOSITION_TYPE = "Disposition-Type";
+    String DISPOSITION_TYPE = "Disposition-Type";
     /**
      * Message Header name for Disposition Notification To
      */
-    public static final String DISPOSITION_NOTIFICATION_TO = "Disposition-Notification-To";
+    String DISPOSITION_NOTIFICATION_TO = "Disposition-Notification-To";
     /**
      * Message Header name for Receipt Delivery Option
      */
-    public static final String RECEIPT_DELIVERY_OPTION = "Receipt-Delivery-Option";
+    String RECEIPT_DELIVERY_OPTION = "Receipt-Delivery-Option";
     /**
      * Message Header name for Receipt Address
      */
-    public static final String RECIPIENT_ADDRESS = "Recipient-Address";
+    String RECIPIENT_ADDRESS = "Recipient-Address";
     /**
      * Message Header name for Disposition Notification Options
      */
-    public static final String DISPOSITION_NOTIFICATION_OPTIONS = "Disposition-Notification-Options";
+    String DISPOSITION_NOTIFICATION_OPTIONS = "Disposition-Notification-Options";
 
 }
diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2MediaType.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2MediaType.java
index ee67fa8..289485c 100644
--- a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2MediaType.java
+++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2MediaType.java
@@ -21,33 +21,33 @@ public interface AS2MediaType {
     /**
      * Media Type for Multipart Signed Data
      */
-    public static final String MULTIPART_SIGNED = "multipart/signed; protocol=\"application/pkcs7-signature\"";
+    String MULTIPART_SIGNED = "multipart/signed; protocol=\"application/pkcs7-signature\"";
     /**
      * Media Type for Application PKCS7 Signature
      */
-    public static final String APPLICATION_PKCS7_SIGNATURE = "application/pkcs7-signature; name=smime.p7s; smime-type=signed-data";
+    String APPLICATION_PKCS7_SIGNATURE = "application/pkcs7-signature; name=smime.p7s; smime-type=signed-data";
     /**
      * Media Type for Application PKCS7 Enveloped Data
      */
-    public static final String APPLICATION_PKCS7_MIME_ENVELOPED = "application/pkcs7-mime; smime-type=enveloped-data; name=smime.p7m";
+    String APPLICATION_PKCS7_MIME_ENVELOPED = "application/pkcs7-mime; smime-type=enveloped-data; name=smime.p7m";
     /**
      * Media Type for Application PKCS7 Compressed Data
      */
-    public static final String APPLICATION_PKCS7_MIME_COMPRESSED = "application/pkcs7-mime; smime-type=compressed-data; name=smime.p7z";
+    String APPLICATION_PKCS7_MIME_COMPRESSED = "application/pkcs7-mime; smime-type=compressed-data; name=smime.p7z";
     /**
      * Media Type for Text/Plain Data
      */
-    public static final String TEXT_PLAIN = "text/plain";
+    String TEXT_PLAIN = "text/plain";
     /**
      * Media Type for Application/EDIFACT
      */
-    public static final String APPLICATION_EDIFACT = "application/edifact";
+    String APPLICATION_EDIFACT = "application/edifact";
     /**
      * Media Type for Application/EDI-X12
      */
-    public static final String APPLICATION_EDI_X12 = "application/edi-x12";
+    String APPLICATION_EDI_X12 = "application/edi-x12";
     /**
      * Media Type for Application/EDI-consent
      */
-    public static final String APPLICATION_EDI_CONSENT = "application/edi-consent";
+    String APPLICATION_EDI_CONSENT = "application/edi-consent";
 }
diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2MicAlgorithm.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2MicAlgorithm.java
index efa3979..09d32cf 100644
--- a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2MicAlgorithm.java
+++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2MicAlgorithm.java
@@ -17,11 +17,11 @@
 package org.apache.camel.component.as2.api;
 
 interface Constants {
-    static final String SHA_1_AS2_ALGORITHM_NAME = "sha1";
-    static final String SHA_1_JDK_ALGORITHM_NAME = "SHA-1";
+    String SHA_1_AS2_ALGORITHM_NAME = "sha1";
+    String SHA_1_JDK_ALGORITHM_NAME = "SHA-1";
 
-    static final String MD5_AS2_ALGORITHM_NAME = "md5";
-    static final String MD5_JDK_ALGORITHM_NAME = "MD5";
+    String MD5_AS2_ALGORITHM_NAME = "md5";
+    String MD5_JDK_ALGORITHM_NAME = "MD5";
 }
 
 public enum AS2MicAlgorithm {
diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2MimeType.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2MimeType.java
index bf76d32..1eff9d9 100644
--- a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2MimeType.java
+++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2MimeType.java
@@ -20,38 +20,38 @@ public interface AS2MimeType {
     /**
      * Mime Type for Multipart Signed Data
      */
-    public static final String MULTIPART_SIGNED = "multipart/signed";
+    String MULTIPART_SIGNED = "multipart/signed";
     /**
      * Mime Type for Application PKCS7 Signature
      */
-    public static final String APPLICATION_PKCS7_SIGNATURE = "application/pkcs7-signature";
+    String APPLICATION_PKCS7_SIGNATURE = "application/pkcs7-signature";
     /**
      * Mime Type for Application PKCS7 Signature
      */
-    public static final String APPLICATION_PKCS7_MIME = "application/pkcs7-mime";
+    String APPLICATION_PKCS7_MIME = "application/pkcs7-mime";
     /**
      * Mime Type for Text/Plain Data
      */
-    public static final String TEXT_PLAIN = "text/plain";
+    String TEXT_PLAIN = "text/plain";
     /**
      * Mime Type for Application/EDIFACT
      */
-    public static final String APPLICATION_EDIFACT = "application/edifact";
+    String APPLICATION_EDIFACT = "application/edifact";
     /**
      * Mime Type for Application/EDI-X12
      */
-    public static final String APPLICATION_EDI_X12 = "application/edi-x12";
+    String APPLICATION_EDI_X12 = "application/edi-x12";
     /**
      * Mime Type for Application/EDI-consent
      */
-    public static final String APPLICATION_EDI_CONSENT = "application/edi-consent";
+    String APPLICATION_EDI_CONSENT = "application/edi-consent";
     /**
      * Mime Type for Multipart/Report
      */
-    public static final String MULTIPART_REPORT = "multipart/report";
+    String MULTIPART_REPORT = "multipart/report";
     /**
      * Mime Type for Message/Disposition-Notification
      */
-    public static final String MESSAGE_DISPOSITION_NOTIFICATION = "message/disposition-notification";
+    String MESSAGE_DISPOSITION_NOTIFICATION = "message/disposition-notification";
 
 }
diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2ReportType.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2ReportType.java
index b7aaeec..561d404 100644
--- a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2ReportType.java
+++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2ReportType.java
@@ -21,6 +21,6 @@ public interface AS2ReportType {
     /**
      * Disposition Notification Report Type
      */
-    public static final String DISPOSITION_NOTIFICATION = "disposition-notification";
+    String DISPOSITION_NOTIFICATION = "disposition-notification";
 
 }
diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2SignatureAlgorithm.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2SignatureAlgorithm.java
index 8583cff..c595561 100644
--- a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2SignatureAlgorithm.java
+++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2SignatureAlgorithm.java
@@ -29,40 +29,40 @@ import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
 
 interface AS2SignatureAlgorithmParams {
     
-    static AlgorithmIdentifier SHA1ALGID = new AlgorithmIdentifier(OIWObjectIdentifiers.idSHA1, DERNull.INSTANCE);
-    static RSASSAPSSparams SHA1ALGPARAMS = new RSASSAPSSparams(SHA1ALGID,
+    AlgorithmIdentifier SHA1ALGID = new AlgorithmIdentifier(OIWObjectIdentifiers.idSHA1, DERNull.INSTANCE);
+    RSASSAPSSparams SHA1ALGPARAMS = new RSASSAPSSparams(SHA1ALGID,
             new AlgorithmIdentifier(PKCSObjectIdentifiers.id_mgf1, SHA1ALGID), new ASN1Integer(20), new ASN1Integer(1));
     
-    static AlgorithmIdentifier SHA224ALGID = new AlgorithmIdentifier(NISTObjectIdentifiers.id_sha224, DERNull.INSTANCE);
-    static RSASSAPSSparams SHA224ALGPARAMS = new RSASSAPSSparams(SHA224ALGID,
+    AlgorithmIdentifier SHA224ALGID = new AlgorithmIdentifier(NISTObjectIdentifiers.id_sha224, DERNull.INSTANCE);
+    RSASSAPSSparams SHA224ALGPARAMS = new RSASSAPSSparams(SHA224ALGID,
             new AlgorithmIdentifier(PKCSObjectIdentifiers.id_mgf1, SHA224ALGID), new ASN1Integer(28), new ASN1Integer(1));
     
-    static AlgorithmIdentifier SHA256ALGID = new AlgorithmIdentifier(NISTObjectIdentifiers.id_sha256, DERNull.INSTANCE);
-    static RSASSAPSSparams SHA256ALGPARAMS = new RSASSAPSSparams(SHA256ALGID,
+    AlgorithmIdentifier SHA256ALGID = new AlgorithmIdentifier(NISTObjectIdentifiers.id_sha256, DERNull.INSTANCE);
+    RSASSAPSSparams SHA256ALGPARAMS = new RSASSAPSSparams(SHA256ALGID,
             new AlgorithmIdentifier(PKCSObjectIdentifiers.id_mgf1, SHA256ALGID), new ASN1Integer(32), new ASN1Integer(1));
     
-    static AlgorithmIdentifier SHA384ALGID = new AlgorithmIdentifier(NISTObjectIdentifiers.id_sha384, DERNull.INSTANCE);
-    static RSASSAPSSparams SHA384ALGPARAMS = new RSASSAPSSparams(SHA384ALGID,
+    AlgorithmIdentifier SHA384ALGID = new AlgorithmIdentifier(NISTObjectIdentifiers.id_sha384, DERNull.INSTANCE);
+    RSASSAPSSparams SHA384ALGPARAMS = new RSASSAPSSparams(SHA384ALGID,
             new AlgorithmIdentifier(PKCSObjectIdentifiers.id_mgf1, SHA384ALGID), new ASN1Integer(48), new ASN1Integer(1));
     
-    static AlgorithmIdentifier SHA512ALGID = new AlgorithmIdentifier(NISTObjectIdentifiers.id_sha512, DERNull.INSTANCE);
-    static RSASSAPSSparams SHA512ALGPARAMS = new RSASSAPSSparams(SHA512ALGID,
+    AlgorithmIdentifier SHA512ALGID = new AlgorithmIdentifier(NISTObjectIdentifiers.id_sha512, DERNull.INSTANCE);
+    RSASSAPSSparams SHA512ALGPARAMS = new RSASSAPSSparams(SHA512ALGID,
             new AlgorithmIdentifier(PKCSObjectIdentifiers.id_mgf1, SHA512ALGID), new ASN1Integer(64), new ASN1Integer(1));
 
-    static AlgorithmIdentifier SHA3_224ALGID = new AlgorithmIdentifier(NISTObjectIdentifiers.id_sha3_224, DERNull.INSTANCE);
-    static RSASSAPSSparams SHA3_224ALGPARAMS = new RSASSAPSSparams(SHA3_224ALGID,
+    AlgorithmIdentifier SHA3_224ALGID = new AlgorithmIdentifier(NISTObjectIdentifiers.id_sha3_224, DERNull.INSTANCE);
+    RSASSAPSSparams SHA3_224ALGPARAMS = new RSASSAPSSparams(SHA3_224ALGID,
             new AlgorithmIdentifier(PKCSObjectIdentifiers.id_mgf1, SHA3_224ALGID), new ASN1Integer(28), new ASN1Integer(1));
     
-    static AlgorithmIdentifier SHA3_256ALGID = new AlgorithmIdentifier(NISTObjectIdentifiers.id_sha3_256, DERNull.INSTANCE);
-    static RSASSAPSSparams SHA3_256ALGPARAMS = new RSASSAPSSparams(SHA3_256ALGID,
+    AlgorithmIdentifier SHA3_256ALGID = new AlgorithmIdentifier(NISTObjectIdentifiers.id_sha3_256, DERNull.INSTANCE);
+    RSASSAPSSparams SHA3_256ALGPARAMS = new RSASSAPSSparams(SHA3_256ALGID,
             new AlgorithmIdentifier(PKCSObjectIdentifiers.id_mgf1, SHA3_256ALGID), new ASN1Integer(32), new ASN1Integer(1));
     
-    static AlgorithmIdentifier SHA3_384ALGID = new AlgorithmIdentifier(NISTObjectIdentifiers.id_sha3_384, DERNull.INSTANCE);
-    static RSASSAPSSparams SHA3_384ALGPARAMS = new RSASSAPSSparams(SHA3_384ALGID,
+    AlgorithmIdentifier SHA3_384ALGID = new AlgorithmIdentifier(NISTObjectIdentifiers.id_sha3_384, DERNull.INSTANCE);
+    RSASSAPSSparams SHA3_384ALGPARAMS = new RSASSAPSSparams(SHA3_384ALGID,
             new AlgorithmIdentifier(PKCSObjectIdentifiers.id_mgf1, SHA3_384ALGID), new ASN1Integer(48), new ASN1Integer(1));
     
-    static AlgorithmIdentifier SHA3_512ALGID = new AlgorithmIdentifier(NISTObjectIdentifiers.id_sha3_512, DERNull.INSTANCE);
-    static RSASSAPSSparams SHA3_512ALGPARAMS = new RSASSAPSSparams(SHA3_512ALGID,
+    AlgorithmIdentifier SHA3_512ALGID = new AlgorithmIdentifier(NISTObjectIdentifiers.id_sha3_512, DERNull.INSTANCE);
+    RSASSAPSSparams SHA3_512ALGPARAMS = new RSASSAPSSparams(SHA3_512ALGID,
             new AlgorithmIdentifier(PKCSObjectIdentifiers.id_mgf1, SHA3_512ALGID), new ASN1Integer(64), new ASN1Integer(1));
     
 }
diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2TransferEncoding.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2TransferEncoding.java
index 0b03b64..6684158 100644
--- a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2TransferEncoding.java
+++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2TransferEncoding.java
@@ -17,7 +17,7 @@
 package org.apache.camel.component.as2.api;
 
 public interface AS2TransferEncoding {
-    public static final String NONE = null;
-    public static final String BASE64 = "base64";
-    public static final String SEVENBIT = "7bit";
+    String NONE = null;
+    String BASE64 = "base64";
+    String SEVENBIT = "7bit";
 }
diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/MDNField.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/MDNField.java
index 0fe49ba..2f414cb 100644
--- a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/MDNField.java
+++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/MDNField.java
@@ -21,46 +21,46 @@ public interface MDNField {
     /**
      * Field Name for Reporting UA
      */
-    public static final String REPORTING_UA = "Reporting-UA";
+    String REPORTING_UA = "Reporting-UA";
 
     /**
      * Field Name for MDN Gateway
      */
-    public static final String MDN_GATEWAY = "MDN-Gateway";
+    String MDN_GATEWAY = "MDN-Gateway";
 
     /**
      * Field Name for Final Recipient
      */
-    public static final String FINAL_RECIPIENT = "Final-Recipient";
+    String FINAL_RECIPIENT = "Final-Recipient";
 
     /**
      * Field Name for Original Message IDX
      */
-    public static final String ORIGINAL_MESSAGE_ID = "Original-Message-ID";
+    String ORIGINAL_MESSAGE_ID = "Original-Message-ID";
 
     /**
      * Field Name for Disposition
      */
-    public static final String DISPOSITION = "Disposition";
+    String DISPOSITION = "Disposition";
 
     /**
      * Field Name for Failure
      */
-    public static final String FAILURE = "Failure";
+    String FAILURE = "Failure";
 
     /**
      * Field Name for Error
      */
-    public static final String ERROR = "Error";
+    String ERROR = "Error";
 
     /**
      * Field Name for Warning
      */
-    public static final String WARNING = "Warning";
+    String WARNING = "Warning";
 
     /**
      * Field Name for Received Content MIC
      */
-    public static final String RECEIVED_CONTENT_MIC = "Received-content-MIC";
+    String RECEIVED_CONTENT_MIC = "Received-content-MIC";
 
 }
diff --git a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIntegrationTest.java b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIntegrationTest.java
index 0d63055..c3f2292 100644
--- a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIntegrationTest.java
+++ b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIntegrationTest.java
@@ -560,7 +560,7 @@ public class AS2ClientManagerIntegrationTest extends AbstractAS2TestSupport {
         response.setHeader(AS2Header.SERVER, REPORTING_UA);
 
         // Create a receipt for edi message
-        Map<String, String> extensionFields = new HashMap<String, String>();
+        Map<String, String> extensionFields = new HashMap<>();
         extensionFields.put("Original-Recipient", "rfc822;" + AS2_NAME);
         AS2DispositionModifier dispositionModifier = AS2DispositionModifier.createWarning("AS2 is cool!");
         String[] failureFields = new String[] {"failure-field-1"};
diff --git a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerManagerIntegrationTest.java b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerManagerIntegrationTest.java
index a27ae47..dd224b1 100644
--- a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerManagerIntegrationTest.java
+++ b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerManagerIntegrationTest.java
@@ -58,7 +58,6 @@ import org.apache.http.HttpStatus;
 import org.apache.http.HttpVersion;
 import org.apache.http.entity.ContentType;
 import org.apache.http.message.BasicHttpEntityEnclosingRequest;
-import org.apache.http.protocol.BasicHttpContext;
 import org.apache.http.protocol.HttpCoreContext;
 import org.bouncycastle.asn1.ASN1EncodableVector;
 import org.bouncycastle.asn1.cms.IssuerAndSerialNumber;
diff --git a/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/AtmosEndpoint.java b/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/AtmosEndpoint.java
index c5b12c1..c0b7a32 100644
--- a/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/AtmosEndpoint.java
+++ b/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/AtmosEndpoint.java
@@ -27,7 +27,6 @@ import org.apache.camel.component.atmos.integration.producer.AtmosMoveProducer;
 import org.apache.camel.component.atmos.integration.producer.AtmosPutProducer;
 import org.apache.camel.component.atmos.util.AtmosException;
 import org.apache.camel.component.atmos.util.AtmosOperation;
-import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriEndpoint;
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.support.DefaultEndpoint;
diff --git a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/map/AtomixMapConsumer.java b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/map/AtomixMapConsumer.java
index 2627bd1..429699e 100644
--- a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/map/AtomixMapConsumer.java
+++ b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/map/AtomixMapConsumer.java
@@ -25,8 +25,6 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.component.atomix.client.AbstractAtomixClientConsumer;
 import org.apache.camel.component.atomix.client.AtomixClientConstants;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public final class AtomixMapConsumer extends AbstractAtomixClientConsumer<AtomixMapEndpoint> {
 
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 3c101bb..34590ab 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
@@ -29,8 +29,6 @@ import org.apache.camel.Processor;
 import org.apache.camel.component.atomix.client.AbstractAtomixClientConsumer;
 import org.apache.camel.component.atomix.client.AtomixClientConstants;
 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;
diff --git a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/queue/AtomixQueueConsumer.java b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/queue/AtomixQueueConsumer.java
index 34afa61..aa19c44 100644
--- a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/queue/AtomixQueueConsumer.java
+++ b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/queue/AtomixQueueConsumer.java
@@ -25,8 +25,6 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.component.atomix.client.AbstractAtomixClientConsumer;
 import org.apache.camel.component.atomix.client.AtomixClientConstants;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public final class AtomixQueueConsumer extends AbstractAtomixClientConsumer<AtomixQueueEndpoint> {
 
diff --git a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/set/AtomixSetConsumer.java b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/set/AtomixSetConsumer.java
index faef03a..9687258 100644
--- a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/set/AtomixSetConsumer.java
+++ b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/set/AtomixSetConsumer.java
@@ -25,8 +25,6 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.component.atomix.client.AbstractAtomixClientConsumer;
 import org.apache.camel.component.atomix.client.AtomixClientConstants;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public final class AtomixSetConsumer extends AbstractAtomixClientConsumer<AtomixSetEndpoint> {
 
diff --git a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/value/AtomixValueConsumer.java b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/value/AtomixValueConsumer.java
index 520137b..d39d691 100644
--- a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/value/AtomixValueConsumer.java
+++ b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/value/AtomixValueConsumer.java
@@ -25,8 +25,6 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.component.atomix.client.AbstractAtomixClientConsumer;
 import org.apache.camel.component.atomix.client.AtomixClientConstants;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public final class AtomixValueConsumer extends AbstractAtomixClientConsumer<AtomixValueEndpoint> {
 
diff --git a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/cluster/AtomixClusterService.java b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/cluster/AtomixClusterService.java
index cfb78f3..a959d9f 100644
--- a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/cluster/AtomixClusterService.java
+++ b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/cluster/AtomixClusterService.java
@@ -20,7 +20,6 @@ import java.util.List;
 
 import io.atomix.AtomixReplica;
 import io.atomix.catalyst.transport.Address;
-import io.atomix.catalyst.transport.Transport;
 import io.atomix.copycat.server.storage.StorageLevel;
 import org.apache.camel.CamelContext;
 import org.apache.camel.support.cluster.AbstractCamelClusterService;
diff --git a/components/camel-avro/src/test/java/org/apache/camel/avro/generated/KeyValueProtocol.java b/components/camel-avro/src/test/java/org/apache/camel/avro/generated/KeyValueProtocol.java
index 8da153b..340b972 100644
--- a/components/camel-avro/src/test/java/org/apache/camel/avro/generated/KeyValueProtocol.java
+++ b/components/camel-avro/src/test/java/org/apache/camel/avro/generated/KeyValueProtocol.java
@@ -24,13 +24,13 @@ package org.apache.camel.avro.generated;
 
 @SuppressWarnings("all")
 public interface KeyValueProtocol {
-  public static final org.apache.avro.Protocol PROTOCOL = org.apache.avro.Protocol.parse("{\"protocol\":\"KeyValueProtocol\",\"namespace\":\"org.apache.camel.avro.generated\",\"types\":[{\"type\":\"record\",\"name\":\"Key\",\"fields\":[{\"name\":\"key\",\"type\":\"string\"}]},{\"type\":\"record\",\"name\":\"Value\",\"fields\":[{\"name\":\"value\",\"type\":\"string\"}]}],\"messages\":{\"put\":{\"request\":[{\"name\":\"key\",\"type\":\"Key\"},{\"name\":\"value\",\"type\":\"Value\"}],\"resp [...]
+  org.apache.avro.Protocol PROTOCOL = org.apache.avro.Protocol.parse("{\"protocol\":\"KeyValueProtocol\",\"namespace\":\"org.apache.camel.avro.generated\",\"types\":[{\"type\":\"record\",\"name\":\"Key\",\"fields\":[{\"name\":\"key\",\"type\":\"string\"}]},{\"type\":\"record\",\"name\":\"Value\",\"fields\":[{\"name\":\"value\",\"type\":\"string\"}]}],\"messages\":{\"put\":{\"request\":[{\"name\":\"key\",\"type\":\"Key\"},{\"name\":\"value\",\"type\":\"Value\"}],\"response\":\"null\"},\"g [...]
   java.lang.Void put(org.apache.camel.avro.generated.Key key, org.apache.camel.avro.generated.Value value) throws org.apache.avro.AvroRemoteException;
   org.apache.camel.avro.generated.Value get(org.apache.camel.avro.generated.Key key) throws org.apache.avro.AvroRemoteException;
 
   @SuppressWarnings("all")
   public interface Callback extends KeyValueProtocol {
-    public static final org.apache.avro.Protocol PROTOCOL = org.apache.camel.avro.generated.KeyValueProtocol.PROTOCOL;
+    org.apache.avro.Protocol PROTOCOL = org.apache.camel.avro.generated.KeyValueProtocol.PROTOCOL;
     void put(org.apache.camel.avro.generated.Key key, org.apache.camel.avro.generated.Value value, org.apache.avro.ipc.Callback<java.lang.Void> callback) throws java.io.IOException;
     void get(org.apache.camel.avro.generated.Key key, org.apache.avro.ipc.Callback<org.apache.camel.avro.generated.Value> callback) throws java.io.IOException;
   }
diff --git a/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2Configuration.java b/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2Configuration.java
index a95d1bd..849d7f2 100644
--- a/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2Configuration.java
+++ b/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2Configuration.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.aws.ec2;
 
 import com.amazonaws.services.ec2.AmazonEC2;
-import com.amazonaws.services.ec2.AmazonEC2Client;
 
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spi.Metadata;
diff --git a/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2Producer.java b/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2Producer.java
index faea1d0..9a21522 100644
--- a/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2Producer.java
+++ b/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2Producer.java
@@ -21,7 +21,6 @@ import java.util.Collection;
 
 import com.amazonaws.AmazonServiceException;
 import com.amazonaws.services.ec2.AmazonEC2;
-import com.amazonaws.services.ec2.AmazonEC2Client;
 import com.amazonaws.services.ec2.model.CreateTagsRequest;
 import com.amazonaws.services.ec2.model.CreateTagsResult;
 import com.amazonaws.services.ec2.model.DeleteTagsRequest;
diff --git a/components/camel-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/AmazonECSClientMock.java b/components/camel-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/AmazonECSClientMock.java
index ba7ab31..8bb6af6 100644
--- a/components/camel-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/AmazonECSClientMock.java
+++ b/components/camel-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/AmazonECSClientMock.java
@@ -69,7 +69,7 @@ public class AmazonECSClientMock extends AbstractAmazonECS {
     @Override
     public ListClustersResult listClusters(ListClustersRequest request) {
         ListClustersResult res = new ListClustersResult();
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         list.add("Test");
         res.setClusterArns(list);
         return res;
diff --git a/components/camel-aws-eks/src/test/java/org/apache/camel/component/aws/eks/AmazonEKSClientMock.java b/components/camel-aws-eks/src/test/java/org/apache/camel/component/aws/eks/AmazonEKSClientMock.java
index bac5f61..de45c8b 100644
--- a/components/camel-aws-eks/src/test/java/org/apache/camel/component/aws/eks/AmazonEKSClientMock.java
+++ b/components/camel-aws-eks/src/test/java/org/apache/camel/component/aws/eks/AmazonEKSClientMock.java
@@ -70,7 +70,7 @@ public class AmazonEKSClientMock extends AbstractAmazonEKS {
     @Override
     public ListClustersResult listClusters(ListClustersRequest request) {
         ListClustersResult res = new ListClustersResult();
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         list.add("Test");
         res.setClusters(list);
         return res;
diff --git a/components/camel-aws-iam/src/test/java/org/apache/camel/component/aws/iam/AmazonIAMClientMock.java b/components/camel-aws-iam/src/test/java/org/apache/camel/component/aws/iam/AmazonIAMClientMock.java
index 7b5d874..e2d88a2 100644
--- a/components/camel-aws-iam/src/test/java/org/apache/camel/component/aws/iam/AmazonIAMClientMock.java
+++ b/components/camel-aws-iam/src/test/java/org/apache/camel/component/aws/iam/AmazonIAMClientMock.java
@@ -709,7 +709,7 @@ public class AmazonIAMClientMock extends AmazonIdentityManagementClient {
     @Override
     public ListAccessKeysResult listAccessKeys() {
         ListAccessKeysResult result = new ListAccessKeysResult();
-        Collection<AccessKeyMetadata> accessKeyMetadata = new ArrayList<AccessKeyMetadata>();
+        Collection<AccessKeyMetadata> accessKeyMetadata = new ArrayList<>();
         AccessKeyMetadata meta = new AccessKeyMetadata();
         meta.setAccessKeyId("1");
         meta.setCreateDate(new Date());
diff --git a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java
index c72056e..b437455 100644
--- a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java
+++ b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.component.aws.kinesis.integration;
 
-import com.amazonaws.auth.AWSStaticCredentialsProvider;
-import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.kinesis.AmazonKinesis;
 import com.amazonaws.services.kinesis.AmazonKinesisClientBuilder;
diff --git a/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/AmazonLambdaClientMock.java b/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/AmazonLambdaClientMock.java
index 5049af4..3923d1f 100644
--- a/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/AmazonLambdaClientMock.java
+++ b/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/AmazonLambdaClientMock.java
@@ -240,7 +240,7 @@ public class AmazonLambdaClientMock extends AbstractAWSLambda {
     @Override
     public ListEventSourceMappingsResult listEventSourceMappings(ListEventSourceMappingsRequest listEventSourceMappingsRequest) {
         ListEventSourceMappingsResult result = new ListEventSourceMappingsResult();
-        List<EventSourceMappingConfiguration> confList = new ArrayList<EventSourceMappingConfiguration>();
+        List<EventSourceMappingConfiguration> confList = new ArrayList<>();
         EventSourceMappingConfiguration conf = new EventSourceMappingConfiguration();
         conf.setBatchSize(100);
         conf.setFunctionArn("arn:aws:lambda:eu-central-1:643534317684:function:" + listEventSourceMappingsRequest.getFunctionName());
diff --git a/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentSpringTest.java b/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentSpringTest.java
index 8311fac..e7dcb06 100644
--- a/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentSpringTest.java
+++ b/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentSpringTest.java
@@ -188,7 +188,7 @@ public class LambdaComponentSpringTest extends CamelSpringTestSupport {
         Exchange exchange = template.send("direct:tagResource", ExchangePattern.InOut, new Processor() {
             @Override
             public void process(Exchange exchange) throws Exception {
-                Map<String, String> tags = new HashMap<String, String>();
+                Map<String, String> tags = new HashMap<>();
                 tags.put("test", "added-tag");
                 exchange.getIn().setHeader(LambdaConstants.RESOURCE_ARN, "arn:aws:lambda:eu-central-1:643534317684:function:GetHelloWithName");
                 exchange.getIn().setHeader(LambdaConstants.RESOURCE_TAGS, tags);
@@ -206,7 +206,7 @@ public class LambdaComponentSpringTest extends CamelSpringTestSupport {
         Exchange exchange = template.send("direct:untagResource", ExchangePattern.InOut, new Processor() {
             @Override
             public void process(Exchange exchange) throws Exception {
-                List<String> tagKeys = new ArrayList<String>();
+                List<String> tagKeys = new ArrayList<>();
                 tagKeys.add("test");
                 exchange.getIn().setHeader(LambdaConstants.RESOURCE_ARN, "arn:aws:lambda:eu-central-1:643534317684:function:GetHelloWithName");
                 exchange.getIn().setHeader(LambdaConstants.RESOURCE_TAG_KEYS, tagKeys);
diff --git a/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaProducerTest.java b/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaProducerTest.java
index 13b2e14..09264f7 100644
--- a/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaProducerTest.java
+++ b/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaProducerTest.java
@@ -231,7 +231,7 @@ public class LambdaProducerTest extends CamelTestSupport {
         Exchange exchange = template.send("direct:tagResource", ExchangePattern.InOut, new Processor() {
             @Override
             public void process(Exchange exchange) throws Exception {
-                Map<String, String> tags = new HashMap<String, String>();
+                Map<String, String> tags = new HashMap<>();
                 tags.put("test", "added-tag");
                 exchange.getIn().setHeader(LambdaConstants.RESOURCE_ARN, "arn:aws:lambda:eu-central-1:643534317684:function:GetHelloWithName");
                 exchange.getIn().setHeader(LambdaConstants.RESOURCE_TAGS, tags);
@@ -249,7 +249,7 @@ public class LambdaProducerTest extends CamelTestSupport {
         Exchange exchange = template.send("direct:untagResource", ExchangePattern.InOut, new Processor() {
             @Override
             public void process(Exchange exchange) throws Exception {
-                List<String> tagKeys = new ArrayList<String>();
+                List<String> tagKeys = new ArrayList<>();
                 tagKeys.add("test");
                 exchange.getIn().setHeader(LambdaConstants.RESOURCE_ARN, "arn:aws:lambda:eu-central-1:643534317684:function:GetHelloWithName");
                 exchange.getIn().setHeader(LambdaConstants.RESOURCE_TAG_KEYS, tagKeys);
diff --git a/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/AmazonMSKClientMock.java b/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/AmazonMSKClientMock.java
index 69d5021..bfbcf9b 100644
--- a/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/AmazonMSKClientMock.java
+++ b/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/AmazonMSKClientMock.java
@@ -40,7 +40,7 @@ public class AmazonMSKClientMock extends AbstractAWSKafka {
     @Override
     public ListClustersResult listClusters(ListClustersRequest request) {
         ListClustersResult result = new ListClustersResult();
-        List<ClusterInfo> info = new ArrayList<ClusterInfo>();
+        List<ClusterInfo> info = new ArrayList<>();
         ClusterInfo info1 = new ClusterInfo();
         info1.setClusterName("test-kafka");
         info.add(info1);
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentConfigurationTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentConfigurationTest.java
index bde0a75..6d462f2 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentConfigurationTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentConfigurationTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.aws.s3;
 
 import com.amazonaws.regions.Regions;
 
-import org.apache.camel.BindToRegistry;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java
index 356ed5a..3e021e8 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java
@@ -30,7 +30,6 @@ import java.util.concurrent.TimeUnit;
 
 import com.amazonaws.AmazonClientException;
 import com.amazonaws.AmazonServiceException;
-import com.amazonaws.http.SdkHttpMetadata;
 import com.amazonaws.services.sqs.AbstractAmazonSQS;
 import com.amazonaws.services.sqs.model.BatchResultErrorEntry;
 import com.amazonaws.services.sqs.model.ChangeMessageVisibilityRequest;
@@ -45,7 +44,6 @@ import com.amazonaws.services.sqs.model.Message;
 import com.amazonaws.services.sqs.model.ReceiveMessageRequest;
 import com.amazonaws.services.sqs.model.ReceiveMessageResult;
 import com.amazonaws.services.sqs.model.SendMessageBatchRequest;
-import com.amazonaws.services.sqs.model.SendMessageBatchRequestEntry;
 import com.amazonaws.services.sqs.model.SendMessageBatchResult;
 import com.amazonaws.services.sqs.model.SendMessageBatchResultEntry;
 import com.amazonaws.services.sqs.model.SendMessageRequest;
@@ -75,7 +73,7 @@ public class AmazonSQSClientMock extends AbstractAmazonSQS {
     @Override
     public ListQueuesResult listQueues(ListQueuesRequest request) {
         ListQueuesResult result = new ListQueuesResult();
-        List<String> queues = new ArrayList<String>();
+        List<String> queues = new ArrayList<>();
         queues.add("queue1");
         queues.add("queue2");
         result.setQueueUrls(queues);
@@ -202,14 +200,14 @@ public class AmazonSQSClientMock extends AbstractAmazonSQS {
     @Override
     public SendMessageBatchResult sendMessageBatch(SendMessageBatchRequest request) {
         SendMessageBatchResult result = new SendMessageBatchResult();
-        Collection<SendMessageBatchResultEntry> entriesSuccess = new ArrayList<SendMessageBatchResultEntry>();
+        Collection<SendMessageBatchResultEntry> entriesSuccess = new ArrayList<>();
         SendMessageBatchResultEntry entry1 = new SendMessageBatchResultEntry();
         SendMessageBatchResultEntry entry2 = new SendMessageBatchResultEntry();
         entry1.setId("team1");
         entry2.setId("team2");
         entriesSuccess.add(entry1);
         entriesSuccess.add(entry2);
-        Collection<BatchResultErrorEntry> entriesFail = new ArrayList<BatchResultErrorEntry>();
+        Collection<BatchResultErrorEntry> entriesFail = new ArrayList<>();
         BatchResultErrorEntry entry3 = new BatchResultErrorEntry();
         BatchResultErrorEntry entry4 = new BatchResultErrorEntry();
         entry3.setId("team1");
diff --git a/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFConfiguration.java b/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFConfiguration.java
index 043b3de..65e68d3 100644
--- a/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFConfiguration.java
+++ b/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFConfiguration.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.aws.swf;
 import java.util.Map;
 
 import com.amazonaws.services.simpleworkflow.AmazonSimpleWorkflow;
-import com.amazonaws.services.simpleworkflow.AmazonSimpleWorkflowClient;
 import com.amazonaws.services.simpleworkflow.flow.ActivitySchedulingOptions;
 import com.amazonaws.services.simpleworkflow.flow.DataConverter;
 import com.amazonaws.services.simpleworkflow.flow.WorkflowTypeRegistrationOptions;
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 3c5291a..e47528c 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
@@ -20,12 +20,10 @@ import java.util.Map;
 import java.util.Set;
 
 import com.microsoft.azure.storage.StorageCredentials;
-import com.microsoft.azure.storage.blob.CloudBlob;
 import com.microsoft.azure.storage.queue.CloudQueue;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
-import org.apache.camel.component.azure.blob.BlobServiceConfiguration;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.annotations.Component;
 import org.apache.camel.support.DefaultComponent;
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerBeanRepository.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerBeanRepository.java
index 104518c..8c32a62 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerBeanRepository.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerBeanRepository.java
@@ -23,7 +23,6 @@ import java.util.Set;
 
 import org.apache.camel.NoSuchBeanException;
 import org.apache.camel.spi.BeanRepository;
-import org.apache.camel.spi.Registry;
 import org.osgi.framework.Bundle;
 import org.osgi.service.blueprint.container.BlueprintContainer;
 import org.osgi.service.blueprint.container.NoSuchComponentException;
diff --git a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxSearchManager.java b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxSearchManager.java
index 3517158..944f2e3 100644
--- a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxSearchManager.java
+++ b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxSearchManager.java
@@ -16,15 +16,12 @@
  */
 package org.apache.camel.component.box.api;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedList;
-import java.util.stream.Collectors;
 
 import com.box.sdk.BoxAPIConnection;
 import com.box.sdk.BoxAPIException;
-import com.box.sdk.BoxFolder;
 import com.box.sdk.BoxItem;
 
 import com.box.sdk.BoxSearch;
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxEventsManagerIntegrationTest.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxEventsManagerIntegrationTest.java
index 5620e87..ca88aef 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxEventsManagerIntegrationTest.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxEventsManagerIntegrationTest.java
@@ -29,7 +29,6 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.box.api.BoxEventsManager;
 import org.apache.camel.component.box.internal.BoxApiCollection;
 import org.apache.camel.component.box.internal.BoxEventsManagerApiMethod;
-import org.apache.camel.component.box.internal.BoxFilesManagerApiMethod;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
 import org.slf4j.Logger;
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/DisputeGatewayIntegrationTest.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/DisputeGatewayIntegrationTest.java
index eeb99d1..f957e19 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/DisputeGatewayIntegrationTest.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/DisputeGatewayIntegrationTest.java
@@ -83,7 +83,7 @@ public class DisputeGatewayIntegrationTest extends AbstractBraintreeTestSupport
         assertEquals(Dispute.Status.OPEN, createdDispute.getStatus());
         DocumentUpload uploadedDocument = uploadDocument();
 
-        final Map<String, Object> headers = new HashMap<String, Object>();
+        final Map<String, Object> headers = new HashMap<>();
         headers.put("CamelBraintree.disputeId", createdDispute.getId());
         headers.put("CamelBraintree.documentId", uploadedDocument.getId());
 
@@ -103,7 +103,7 @@ public class DisputeGatewayIntegrationTest extends AbstractBraintreeTestSupport
         assertEquals(Dispute.Status.OPEN, createdDispute.getStatus());
         DocumentUpload uploadedDocument = uploadDocument();
 
-        final Map<String, Object> headers = new HashMap<String, Object>();
+        final Map<String, Object> headers = new HashMap<>();
         headers.put("CamelBraintree.disputeId", createdDispute.getId());
         FileEvidenceRequest fileEvidenceRequest = new FileEvidenceRequest().documentId(uploadedDocument.getId());
         headers.put("CamelBraintree.fileEvidenceRequest", fileEvidenceRequest);
@@ -125,7 +125,7 @@ public class DisputeGatewayIntegrationTest extends AbstractBraintreeTestSupport
         Dispute createdDispute = createDispute();
         assertEquals(Dispute.Status.OPEN, createdDispute.getStatus());
 
-        final Map<String, Object> headers = new HashMap<String, Object>();
+        final Map<String, Object> headers = new HashMap<>();
         headers.put("CamelBraintree.id", createdDispute.getId());
         headers.put("CamelBraintree.content", textEvidence);
         final Result<DisputeEvidence> result = requestBodyAndHeaders(
@@ -148,7 +148,7 @@ public class DisputeGatewayIntegrationTest extends AbstractBraintreeTestSupport
         Dispute createdDispute = createDispute();
         assertEquals(Dispute.Status.OPEN, createdDispute.getStatus());
 
-        final Map<String, Object> headers = new HashMap<String, Object>();
+        final Map<String, Object> headers = new HashMap<>();
         headers.put("CamelBraintree.id", createdDispute.getId());
         TextEvidenceRequest textEvidenceRequest = new TextEvidenceRequest().content(textEvidence);
         headers.put("CamelBraintree.textEvidenceRequest", textEvidenceRequest);
@@ -206,7 +206,7 @@ public class DisputeGatewayIntegrationTest extends AbstractBraintreeTestSupport
         Dispute createdDispute = createDispute();
         assertEquals(Dispute.Status.OPEN, createdDispute.getStatus());
 
-        final Map<String, Object> addTextEvidenceHeaders = new HashMap<String, Object>();
+        final Map<String, Object> addTextEvidenceHeaders = new HashMap<>();
         addTextEvidenceHeaders.put("CamelBraintree.id", createdDispute.getId());
         addTextEvidenceHeaders.put("CamelBraintree.content", textEvidence);
 
@@ -222,7 +222,7 @@ public class DisputeGatewayIntegrationTest extends AbstractBraintreeTestSupport
         DisputeEvidence disputeEvidence = addTextEvidenceResult.getTarget();
         assertEquals(textEvidence, disputeEvidence.getComment());
 
-        final Map<String, Object> removeTextEvidenceHeaders = new HashMap<String, Object>();
+        final Map<String, Object> removeTextEvidenceHeaders = new HashMap<>();
         removeTextEvidenceHeaders.put("CamelBraintree.disputeId", createdDispute.getId());
         removeTextEvidenceHeaders.put("CamelBraintree.evidenceId", disputeEvidence.getId());
 
diff --git a/components/camel-cassandraql/src/main/java/org/apache/camel/processor/idempotent/cassandra/NamedCassandraIdempotentRepository.java b/components/camel-cassandraql/src/main/java/org/apache/camel/processor/idempotent/cassandra/NamedCassandraIdempotentRepository.java
index aab1948..62ab2ef 100644
--- a/components/camel-cassandraql/src/main/java/org/apache/camel/processor/idempotent/cassandra/NamedCassandraIdempotentRepository.java
+++ b/components/camel-cassandraql/src/main/java/org/apache/camel/processor/idempotent/cassandra/NamedCassandraIdempotentRepository.java
@@ -42,7 +42,7 @@ public class NamedCassandraIdempotentRepository extends CassandraIdempotentRepos
     }
 
     public String getName() {
-        return (String) getPrefixPKValues()[0];
+        return getPrefixPKValues()[0];
     }
 
     public final void setName(String name) {
diff --git a/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORObjectListSplitTest.java b/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORObjectListSplitTest.java
index 8ef4e58..8bf7e30 100644
--- a/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORObjectListSplitTest.java
+++ b/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORObjectListSplitTest.java
@@ -38,7 +38,7 @@ public class CBORObjectListSplitTest extends CamelTestSupport {
         DummyObject d2 = new DummyObject();
         d2.setDummy("value2");
         
-        List<DummyObject> list = new ArrayList<DummyObject>();
+        List<DummyObject> list = new ArrayList<>();
         list.add(d1);
         list.add(d2);
 
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextBean.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextBean.java
index 1bf34ca..7c6ddf5 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextBean.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextBean.java
@@ -17,7 +17,6 @@
 package org.apache.camel.cdi.bean;
 
 import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
 
 import org.apache.camel.impl.DefaultCamelContext;
 
diff --git a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInOutInteractiveMain.java b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInOutInteractiveMain.java
index 0db1d9f..736d7a7 100644
--- a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInOutInteractiveMain.java
+++ b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInOutInteractiveMain.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.cometd;
 
-import java.io.File;
 import java.net.URI;
 import java.net.URISyntaxException;
 
diff --git a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveAuthenticatedMain.java b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveAuthenticatedMain.java
index 82e72b5..40dc8d2 100644
--- a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveAuthenticatedMain.java
+++ b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveAuthenticatedMain.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.cometd;
 
-import java.io.File;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.HashMap;
diff --git a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveExtensionMain.java b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveExtensionMain.java
index ab357be..0fa7fab 100644
--- a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveExtensionMain.java
+++ b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveExtensionMain.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.cometd;
 
-import java.io.File;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Arrays;
diff --git a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveMain.java b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveMain.java
index 7540c04..afb4af8 100644
--- a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveMain.java
+++ b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveMain.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.cometd;
 
-import java.io.File;
 import java.net.URI;
 import java.net.URISyntaxException;
 
diff --git a/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaProducer.java b/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaProducer.java
index 6aaf900..f057e67 100644
--- a/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaProducer.java
+++ b/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaProducer.java
@@ -204,13 +204,13 @@ public class CordaProducer extends HeaderSelectorProducer {
 
     @InvokeOnHeader(CordaConstants.VAULT_QUERY)
     void vaultQuery(Message message) throws Exception {
-        Class<ContractState> contractStateClass = (Class<ContractState>) message.getBody(Class.class);
+        Class<ContractState> contractStateClass = message.getBody(Class.class);
         message.setBody(cordaRPCOps.vaultQuery(contractStateClass));
     }
 
     @InvokeOnHeader(CordaConstants.VAULT_QUERY_BY)
     void vaultQueryBy(Message message) throws Exception {
-        Class<ContractState> contractStateClass = (Class<ContractState>) message.getBody(Class.class);
+        Class<ContractState> contractStateClass = message.getBody(Class.class);
         QueryCriteria criteria = message.getHeader(QUERY_CRITERIA, QueryCriteria.class);
         PageSpecification pageSpec = message.getHeader(PAGE_SPECIFICATION, PageSpecification.class);
         Sort sorting = message.getHeader(SORT, Sort.class);
@@ -219,14 +219,14 @@ public class CordaProducer extends HeaderSelectorProducer {
 
     @InvokeOnHeader(CordaConstants.VAULT_QUERY_BY_CRITERIA)
     void vaultQueryByCriteria(Message message) throws Exception {
-        Class<ContractState> contractStateClass = (Class<ContractState>) message.getBody(Class.class);
+        Class<ContractState> contractStateClass = message.getBody(Class.class);
         QueryCriteria criteria = message.getHeader(QUERY_CRITERIA, QueryCriteria.class);
         message.setBody(cordaRPCOps.vaultQueryByCriteria(criteria, contractStateClass));
     }
 
     @InvokeOnHeader(CordaConstants.VAULT_QUERY_BY_WITH_PAGING_SPEC)
     void vaultQueryByWithPagingSpec(Message message) throws Exception {
-        Class<ContractState> contractStateClass = (Class<ContractState>) message.getBody(Class.class);
+        Class<ContractState> contractStateClass = message.getBody(Class.class);
         QueryCriteria criteria = message.getHeader(QUERY_CRITERIA, QueryCriteria.class);
         PageSpecification pageSpec = message.getHeader(PAGE_SPECIFICATION, PageSpecification.class);
         message.setBody(cordaRPCOps.vaultQueryByWithPagingSpec(contractStateClass, criteria, pageSpec));
@@ -234,7 +234,7 @@ public class CordaProducer extends HeaderSelectorProducer {
 
     @InvokeOnHeader(CordaConstants.VAULT_QUERY_BY_WITH_SORTING)
     void vaultQueryByWithSorting(Message message) throws Exception {
-        Class<ContractState> contractStateClass = (Class<ContractState>) message.getBody(Class.class);
+        Class<ContractState> contractStateClass = message.getBody(Class.class);
         QueryCriteria criteria = message.getHeader(QUERY_CRITERIA, QueryCriteria.class);
         Sort sorting = message.getHeader(SORT, Sort.class);
         message.setBody(cordaRPCOps.vaultQueryByWithSorting(contractStateClass, criteria, sorting));
diff --git a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerNetworkMapFeedTest.java b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerNetworkMapFeedTest.java
index f49edf5..a622501 100644
--- a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerNetworkMapFeedTest.java
+++ b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerNetworkMapFeedTest.java
@@ -23,7 +23,6 @@ import org.junit.Test;
 
 import static org.apache.camel.component.corda.CordaConstants.NETWORK_MAP_FEED;
 import static org.apache.camel.component.corda.CordaConstants.OPERATION;
-import static org.apache.camel.component.corda.CordaConstants.STATE_MACHINE_FEED;
 
 @Ignore("This integration test requires a locally running corda node such cordapp-template-java")
 public class CordaConsumerNetworkMapFeedTest extends CordaConsumerTestSupport {
diff --git a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerStartTrackedFlowDynamicTest.java b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerStartTrackedFlowDynamicTest.java
index dbce113..bcc9eff 100644
--- a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerStartTrackedFlowDynamicTest.java
+++ b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerStartTrackedFlowDynamicTest.java
@@ -23,7 +23,6 @@ import org.junit.Test;
 
 import static org.apache.camel.component.corda.CordaConstants.OPERATION;
 import static org.apache.camel.component.corda.CordaConstants.START_TRACKED_FLOW_DYNAMIC;
-import static org.apache.camel.component.corda.CordaConstants.VAULT_TRACK_BY;
 
 @Ignore("This integration test requires a locally running corda node such cordapp-template-java")
 public class CordaConsumerStartTrackedFlowDynamicTest extends CordaConsumerTestSupport {
diff --git a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerStateMachineFeedTest.java b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerStateMachineFeedTest.java
index f787645..da2b631 100644
--- a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerStateMachineFeedTest.java
+++ b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerStateMachineFeedTest.java
@@ -23,7 +23,6 @@ import org.junit.Test;
 
 import static org.apache.camel.component.corda.CordaConstants.OPERATION;
 import static org.apache.camel.component.corda.CordaConstants.STATE_MACHINE_FEED;
-import static org.apache.camel.component.corda.CordaConstants.VAULT_TRACK_BY;
 
 @Ignore("This integration test requires a locally running corda node such cordapp-template-java")
 public class CordaConsumerStateMachineFeedTest extends CordaConsumerTestSupport {
diff --git a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerTransactionMapFeedTest.java b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerTransactionMapFeedTest.java
index 8e92490..2c5a7c5 100644
--- a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerTransactionMapFeedTest.java
+++ b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerTransactionMapFeedTest.java
@@ -21,7 +21,6 @@ import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import static org.apache.camel.component.corda.CordaConstants.NETWORK_MAP_FEED;
 import static org.apache.camel.component.corda.CordaConstants.OPERATION;
 import static org.apache.camel.component.corda.CordaConstants.STATE_MACHINE_RECORDED_TRANSACTION_MAPPING_FEED;
 
diff --git a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByCriteriaTest.java b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByCriteriaTest.java
index b62673c..497ad80 100644
--- a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByCriteriaTest.java
+++ b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByCriteriaTest.java
@@ -22,7 +22,6 @@ import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.apache.camel.component.corda.CordaConstants.OPERATION;
-import static org.apache.camel.component.corda.CordaConstants.VAULT_TRACK_BY;
 import static org.apache.camel.component.corda.CordaConstants.VAULT_TRACK_BY_CRITERIA;
 
 @Ignore("This integration test requires a locally running corda node such cordapp-template-java")
diff --git a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByTest.java b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByTest.java
index 2f88b3f..d8fee89 100644
--- a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByTest.java
+++ b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByTest.java
@@ -22,7 +22,6 @@ import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.apache.camel.component.corda.CordaConstants.OPERATION;
-import static org.apache.camel.component.corda.CordaConstants.VAULT_TRACK;
 import static org.apache.camel.component.corda.CordaConstants.VAULT_TRACK_BY;
 
 @Ignore("This integration test requires a locally running corda node such cordapp-template-java")
diff --git a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByWithPagingSpecTest.java b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByWithPagingSpecTest.java
index f6d2d02..f4930b0 100644
--- a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByWithPagingSpecTest.java
+++ b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByWithPagingSpecTest.java
@@ -22,7 +22,6 @@ import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.apache.camel.component.corda.CordaConstants.OPERATION;
-import static org.apache.camel.component.corda.CordaConstants.VAULT_TRACK_BY;
 import static org.apache.camel.component.corda.CordaConstants.VAULT_TRACK_BY_WITH_PAGING_SPEC;
 
 @Ignore("This integration test requires a locally running corda node such cordapp-template-java")
diff --git a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByWithSortingTest.java b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByWithSortingTest.java
index ba16cde..e04ef40 100644
--- a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByWithSortingTest.java
+++ b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByWithSortingTest.java
@@ -22,7 +22,6 @@ import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.apache.camel.component.corda.CordaConstants.OPERATION;
-import static org.apache.camel.component.corda.CordaConstants.VAULT_TRACK_BY;
 import static org.apache.camel.component.corda.CordaConstants.VAULT_TRACK_BY_WITH_SORTING;
 
 @Ignore("This integration test requires a locally running corda node such cordapp-template-java")
diff --git a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/common/DefaultCryptoCmsConfiguration.java b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/common/DefaultCryptoCmsConfiguration.java
index cbfe495..cdad279 100644
--- a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/common/DefaultCryptoCmsConfiguration.java
+++ b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/common/DefaultCryptoCmsConfiguration.java
@@ -20,7 +20,6 @@ import java.io.IOException;
 import java.security.GeneralSecurityException;
 import java.security.KeyStore;
 
-import org.apache.camel.component.crypto.cms.exception.CryptoCmsException;
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.spi.UriParams;
 import org.apache.camel.support.jsse.KeyStoreParameters;
diff --git a/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/DigitalSignatureConfiguration.java b/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/DigitalSignatureConfiguration.java
index a0151dc..908abfb 100644
--- a/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/DigitalSignatureConfiguration.java
+++ b/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/DigitalSignatureConfiguration.java
@@ -16,16 +16,11 @@
  */
 package org.apache.camel.component.crypto;
 
-import java.io.IOException;
-import java.security.GeneralSecurityException;
 import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
 import java.security.PrivateKey;
 import java.security.PublicKey;
 import java.security.SecureRandom;
 import java.security.Signature;
-import java.security.UnrecoverableKeyException;
 import java.security.cert.Certificate;
 
 import org.apache.camel.CamelContext;
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
index 6e18f5e..1c7983d 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
@@ -332,7 +332,7 @@ public class DefaultCxfBinding implements CxfBinding, HeaderFilterStrategyAware
         }
         
         // create response context
-        Map<String, Object> responseContext = new HashMap<String, Object>();
+        Map<String, Object> responseContext = new HashMap<>();
         
         org.apache.camel.Message response;
         if (camelExchange.getPattern().isOutCapable()) {
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsBlueprintEndpoint.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsBlueprintEndpoint.java
index 4ab6a68..ddf6c35 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsBlueprintEndpoint.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsBlueprintEndpoint.java
@@ -78,7 +78,7 @@ public class CxfRsBlueprintEndpoint extends CxfRsEndpoint {
     @Override
     protected JAXRSClientFactoryBean newJAXRSClientFactoryBean() {
         checkBeanType(bean, JAXRSClientFactoryBean.class);
-        return (RsClientBlueprintBean)newInstanceWithCommonProperties();
+        return newInstanceWithCommonProperties();
     }
 
     private RsClientBlueprintBean newInstanceWithCommonProperties() {
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerClientDisconnectedTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerClientDisconnectedTest.java
index b2ad865..5364a97 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerClientDisconnectedTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerClientDisconnectedTest.java
@@ -67,7 +67,7 @@ public class CxfConsumerClientDisconnectedTest extends CamelTestSupport {
                         });
                     });
 
-            };
+            }
         };
     }
 
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerContinuationTimeoutTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerContinuationTimeoutTest.java
index fa963a4..872b774 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerContinuationTimeoutTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerContinuationTimeoutTest.java
@@ -19,11 +19,9 @@ package org.apache.camel.component.cxf;
 import java.util.concurrent.ExecutorService;
 
 import org.apache.camel.AsyncCallback;
-import org.apache.camel.AsyncProcessor;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.support.AsyncProcessorHelper;
 import org.apache.camel.support.AsyncProcessorSupport;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerContextTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerContextTest.java
index d44ace8..f11b807 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerContextTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerContextTest.java
@@ -27,7 +27,6 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.component.cxf.common.message.CxfConstants;
 import org.apache.cxf.endpoint.Client;
-import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.message.Message;
 import org.junit.Test;
 
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerClientDisconnectedTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerClientDisconnectedTest.java
index bd4f252..c9d16a1 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerClientDisconnectedTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerClientDisconnectedTest.java
@@ -68,7 +68,7 @@ public class CxfRsConsumerClientDisconnectedTest extends CamelTestSupport {
                         });
                     });
 
-            };
+            }
         };
     }
 
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerWithBeanTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerWithBeanTest.java
index 4c1d0d7..f11bec6 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerWithBeanTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerWithBeanTest.java
@@ -45,7 +45,7 @@ public class CxfRsConsumerWithBeanTest extends CamelTestSupport {
             public void configure() {
                 from(CXF_RS_ENDPOINT_URI).to("bean://service?method=invoke(${body[0]}, ${body[1]})");
                 from(CXF_RS_ENDPOINT_URI_2).bean(ServiceUtil.class, "invoke(${body[0]}, ${body[1]})");
-            };
+            }
         };
     }
 
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConvertBodyToTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConvertBodyToTest.java
index 0ed0e16..25ed60d9 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConvertBodyToTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConvertBodyToTest.java
@@ -48,7 +48,7 @@ public class CxfRsConvertBodyToTest extends CamelTestSupport {
                     .to("mock:result")
                     // respond with OK
                     .transform(constant(ok));
-            };
+            }
         };
     }
 
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java
index 9481d56..6518667 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java
@@ -452,7 +452,7 @@ public class CxfRsProducerTest extends CamelSpringTestSupport {
         public void initialize(Bus bus) {
             //Do nothing
         }
-    };
+    }
 
     @Test
     public void testProducerWithFeature() {
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsStreamCacheTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsStreamCacheTest.java
index faaef92..567e655 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsStreamCacheTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsStreamCacheTest.java
@@ -76,7 +76,7 @@ public class CxfRsStreamCacheTest extends CamelTestSupport {
                         });
                     });
 
-            };
+            }
         };
     }
 
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java
index a32e44f..dc72a58 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java
@@ -27,7 +27,6 @@ import javax.xml.ws.Holder;
 import javax.xml.ws.soap.SOAPBinding;
 
 import org.apache.camel.Exchange;
-import org.apache.camel.Message;
 import org.apache.camel.Processor;
 import org.apache.camel.attachment.AttachmentMessage;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsdl/OrderEndpoint.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsdl/OrderEndpoint.java
index 7afe384..1db7e00 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsdl/OrderEndpoint.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsdl/OrderEndpoint.java
@@ -31,5 +31,5 @@ public class OrderEndpoint {
     public String doOrder(Order order) {
         LOG.info("Processing order");
         return "Order processed " + order;
-    };
+    }
 }
diff --git a/components/camel-dataformat/src/main/java/org/apache/camel/component/dataformat/DataFormatComponent.java b/components/camel-dataformat/src/main/java/org/apache/camel/component/dataformat/DataFormatComponent.java
index 9fdfd40..43f9ff1 100644
--- a/components/camel-dataformat/src/main/java/org/apache/camel/component/dataformat/DataFormatComponent.java
+++ b/components/camel-dataformat/src/main/java/org/apache/camel/component/dataformat/DataFormatComponent.java
@@ -22,7 +22,6 @@ import org.apache.camel.Endpoint;
 import org.apache.camel.spi.DataFormat;
 import org.apache.camel.spi.annotations.Component;
 import org.apache.camel.support.DefaultComponent;
-import org.apache.camel.support.EndpointHelper;
 import org.apache.camel.support.PropertyBindingSupport;
 import org.apache.camel.util.StringHelper;
 
diff --git a/components/camel-debezium/camel-debezium-component/src/test/java/org/apache/camel/component/debezium/DebeziumEndpointTest.java b/components/camel-debezium/camel-debezium-component/src/test/java/org/apache/camel/component/debezium/DebeziumEndpointTest.java
index 1a47497..4662552 100644
--- a/components/camel-debezium/camel-debezium-component/src/test/java/org/apache/camel/component/debezium/DebeziumEndpointTest.java
+++ b/components/camel-debezium/camel-debezium-component/src/test/java/org/apache/camel/component/debezium/DebeziumEndpointTest.java
@@ -257,7 +257,7 @@ public class DebeziumEndpointTest {
     }
 
     private SourceRecord createStringRecord() {
-        final Schema recordSchema = SchemaBuilder.STRING_SCHEMA;
+        final Schema recordSchema = Schema.STRING_SCHEMA;
         return new SourceRecord(new HashMap<>(), createSourceOffset(), "dummy", recordSchema, "test_record");
     }
 
diff --git a/components/camel-debezium/camel-debezium-component/src/test/java/org/apache/camel/component/debezium/DebeziumTypeConverterTest.java b/components/camel-debezium/camel-debezium-component/src/test/java/org/apache/camel/component/debezium/DebeziumTypeConverterTest.java
index d30ebed..e5ea86a 100644
--- a/components/camel-debezium/camel-debezium-component/src/test/java/org/apache/camel/component/debezium/DebeziumTypeConverterTest.java
+++ b/components/camel-debezium/camel-debezium-component/src/test/java/org/apache/camel/component/debezium/DebeziumTypeConverterTest.java
@@ -47,10 +47,10 @@ public class DebeziumTypeConverterTest {
 
     private Struct createTestStruct(final int id, final String name, final boolean valid) {
         final Schema schema = SchemaBuilder.struct()
-                                .field("id", SchemaBuilder.INT32_SCHEMA)
-                                .field("name", SchemaBuilder.STRING_SCHEMA)
-                                .field("valid", SchemaBuilder.BOOLEAN_SCHEMA)
-                                .field("extra", SchemaBuilder.STRING_SCHEMA)
+                                .field("id", Schema.INT32_SCHEMA)
+                                .field("name", Schema.STRING_SCHEMA)
+                                .field("valid", Schema.BOOLEAN_SCHEMA)
+                                .field("extra", Schema.STRING_SCHEMA)
                                 .build();
 
         final Struct value = new Struct(schema);
diff --git a/components/camel-debezium/camel-debezium-component/src/test/java/org/apache/camel/component/debezium/configuration/MySqlConnectorEmbeddedDebeziumConfigurationTest.java b/components/camel-debezium/camel-debezium-component/src/test/java/org/apache/camel/component/debezium/configuration/MySqlConnectorEmbeddedDebeziumConfigurationTest.java
index cb0090f..9b86e18 100644
--- a/components/camel-debezium/camel-debezium-component/src/test/java/org/apache/camel/component/debezium/configuration/MySqlConnectorEmbeddedDebeziumConfigurationTest.java
+++ b/components/camel-debezium/camel-debezium-component/src/test/java/org/apache/camel/component/debezium/configuration/MySqlConnectorEmbeddedDebeziumConfigurationTest.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.debezium.configuration;
 
+import io.debezium.config.CommonConnectorConfig;
 import io.debezium.config.Configuration;
 import io.debezium.connector.mysql.MySqlConnector;
 import io.debezium.connector.mysql.MySqlConnectorConfig;
@@ -40,7 +41,7 @@ public class MySqlConnectorEmbeddedDebeziumConfigurationTest {
         assertEquals("test_config", dbzMysqlConfigurations.getString(EmbeddedEngine.ENGINE_NAME));
         assertEquals("test_user", dbzMysqlConfigurations.getString(MySqlConnectorConfig.USER));
         assertTrue(dbzMysqlConfigurations.getBoolean(MySqlConnectorConfig.INCLUDE_SQL_QUERY));
-        assertEquals(1212, dbzMysqlConfigurations.getInteger(MySqlConnectorConfig.MAX_QUEUE_SIZE));
+        assertEquals(1212, dbzMysqlConfigurations.getInteger(CommonConnectorConfig.MAX_QUEUE_SIZE));
         assertEquals(30000,
                 dbzMysqlConfigurations.getLong(MySqlConnectorConfig.CONNECTION_TIMEOUT_MS));
         assertEquals(MySqlConnector.class.getName(), dbzMysqlConfigurations.getString(EmbeddedEngine.CONNECTOR_CLASS));
diff --git a/components/camel-debezium/camel-debezium-maven-plugin/src/main/java/org/apache/camel/maven/config/ConnectorConfigField.java b/components/camel-debezium/camel-debezium-maven-plugin/src/main/java/org/apache/camel/maven/config/ConnectorConfigField.java
index 4f5574f..ce89442 100644
--- a/components/camel-debezium/camel-debezium-maven-plugin/src/main/java/org/apache/camel/maven/config/ConnectorConfigField.java
+++ b/components/camel-debezium/camel-debezium-maven-plugin/src/main/java/org/apache/camel/maven/config/ConnectorConfigField.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.maven.config;
 
-import java.util.List;
-
 import io.debezium.config.Field;
 import org.apache.camel.util.ObjectHelper;
 import org.apache.commons.text.CaseUtils;
diff --git a/components/camel-debezium/camel-debezium-maven-plugin/src/test/java/org/apache/camel/maven/config/ConnectorConfigGeneratorTest.java b/components/camel-debezium/camel-debezium-maven-plugin/src/test/java/org/apache/camel/maven/config/ConnectorConfigGeneratorTest.java
index a3502fc..858e8c3 100644
--- a/components/camel-debezium/camel-debezium-maven-plugin/src/test/java/org/apache/camel/maven/config/ConnectorConfigGeneratorTest.java
+++ b/components/camel-debezium/camel-debezium-maven-plugin/src/test/java/org/apache/camel/maven/config/ConnectorConfigGeneratorTest.java
@@ -23,8 +23,10 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
+import io.debezium.config.CommonConnectorConfig;
 import io.debezium.connector.mysql.MySqlConnector;
 import io.debezium.connector.mysql.MySqlConnectorConfig;
+import io.debezium.relational.RelationalDatabaseConnectorConfig;
 import io.debezium.relational.history.FileDatabaseHistory;
 import org.apache.kafka.connect.source.SourceConnector;
 import org.junit.Test;
@@ -36,10 +38,10 @@ public class ConnectorConfigGeneratorTest {
 
     @Test
     public void testIfCorrectlyGeneratedMySQLFile() {
-        final Set<String> requiredFields = new HashSet<>(Arrays.asList(MySqlConnectorConfig.PASSWORD.name(), MySqlConnectorConfig.SERVER_NAME.name()));
+        final Set<String> requiredFields = new HashSet<>(Arrays.asList(MySqlConnectorConfig.PASSWORD.name(), RelationalDatabaseConnectorConfig.SERVER_NAME.name()));
         final Map<String, Object> overrideFields = new HashMap<>();
         overrideFields.put(MySqlConnectorConfig.DATABASE_HISTORY.name(), FileDatabaseHistory.class);
-        overrideFields.put(MySqlConnectorConfig.TOMBSTONES_ON_DELETE.name(), false);
+        overrideFields.put(CommonConnectorConfig.TOMBSTONES_ON_DELETE.name(), false);
         overrideFields.put(MySqlConnectorConfig.SERVER_ID.name(), 1111);
 
         testIfCorrectlyGeneratedFile(new MySqlConnector(), MySqlConnectorConfig.class, requiredFields, overrideFields);
diff --git a/components/camel-directvm/src/main/java/org/apache/camel/component/directvm/DirectVmEndpoint.java b/components/camel-directvm/src/main/java/org/apache/camel/component/directvm/DirectVmEndpoint.java
index dbea73f..99f40da 100644
--- a/components/camel-directvm/src/main/java/org/apache/camel/component/directvm/DirectVmEndpoint.java
+++ b/components/camel-directvm/src/main/java/org/apache/camel/component/directvm/DirectVmEndpoint.java
@@ -20,7 +20,6 @@ import org.apache.camel.AsyncEndpoint;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
-import org.apache.camel.component.direct.DirectConsumer;
 import org.apache.camel.spi.HeaderFilterStrategy;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriEndpoint;
diff --git a/components/camel-docker/src/main/java/org/apache/camel/component/docker/consumer/DockerEventsConsumer.java b/components/camel-docker/src/main/java/org/apache/camel/component/docker/consumer/DockerEventsConsumer.java
index 32ab67a..9fed31a 100644
--- a/components/camel-docker/src/main/java/org/apache/camel/component/docker/consumer/DockerEventsConsumer.java
+++ b/components/camel-docker/src/main/java/org/apache/camel/component/docker/consumer/DockerEventsConsumer.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.component.docker.consumer;
 
-import java.util.Date;
-
 import com.github.dockerjava.api.command.EventsCmd;
 import com.github.dockerjava.api.model.Event;
 import com.github.dockerjava.core.command.EventsResultCallback;
diff --git a/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/DockerProducer.java b/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/DockerProducer.java
index 5c69521..36c7d62 100644
--- a/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/DockerProducer.java
+++ b/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/DockerProducer.java
@@ -52,7 +52,6 @@ import com.github.dockerjava.api.model.Capability;
 import com.github.dockerjava.api.model.ExposedPort;
 import com.github.dockerjava.api.model.ExposedPorts;
 import com.github.dockerjava.api.model.HostConfig;
-import com.github.dockerjava.api.model.Mount;
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.Volumes;
 import com.github.dockerjava.api.model.VolumesFrom;
diff --git a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/core/DropboxAPIFacade.java b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/core/DropboxAPIFacade.java
index 2d1d12f..1cfb6bf 100644
--- a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/core/DropboxAPIFacade.java
+++ b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/core/DropboxAPIFacade.java
@@ -38,7 +38,6 @@ import com.dropbox.core.v2.files.ListFolderResult;
 import com.dropbox.core.v2.files.Metadata;
 import com.dropbox.core.v2.files.SearchMatch;
 import com.dropbox.core.v2.files.SearchResult;
-import com.dropbox.core.v2.files.UploadUploader;
 import com.dropbox.core.v2.files.WriteMode;
 import org.apache.camel.Exchange;
 import org.apache.camel.component.dropbox.dto.DropboxDelResult;
diff --git a/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlSqlPrepareStatementStrategy.java b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlSqlPrepareStatementStrategy.java
index 5a3cb25..e062476 100644
--- a/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlSqlPrepareStatementStrategy.java
+++ b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlSqlPrepareStatementStrategy.java
@@ -20,10 +20,8 @@ import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.util.Iterator;
 
-import com.opengamma.elsql.SpringSqlParams;
 import org.apache.camel.Exchange;
 import org.apache.camel.component.sql.SqlPrepareStatementStrategy;
-import org.springframework.jdbc.core.namedparam.SqlParameterSource;
 
 public class ElsqlSqlPrepareStatementStrategy implements SqlPrepareStatementStrategy {
 
diff --git a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentPageIdProducerTest.java b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentPageIdProducerTest.java
index e9ad554..1fef049 100644
--- a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentPageIdProducerTest.java
+++ b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentPageIdProducerTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.component.facebook;
 
 import facebook4j.Post;
 import facebook4j.ResponseList;
-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-facebook/src/test/java/org/apache/camel/component/facebook/data/FacebookMethodsTypeHelperTest.java b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/data/FacebookMethodsTypeHelperTest.java
index cb3af23..fb48769 100644
--- a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/data/FacebookMethodsTypeHelperTest.java
+++ b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/data/FacebookMethodsTypeHelperTest.java
@@ -20,9 +20,7 @@ import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 import facebook4j.Facebook;
 
diff --git a/components/camel-fhir/camel-fhir-api/src/main/java/org/apache/camel/component/fhir/api/FhirHistory.java b/components/camel-fhir/camel-fhir-api/src/main/java/org/apache/camel/component/fhir/api/FhirHistory.java
index a5ad763..2da1613 100644
--- a/components/camel-fhir/camel-fhir-api/src/main/java/org/apache/camel/component/fhir/api/FhirHistory.java
+++ b/components/camel-fhir/camel-fhir-api/src/main/java/org/apache/camel/component/fhir/api/FhirHistory.java
@@ -21,7 +21,6 @@ import java.util.Map;
 import ca.uhn.fhir.rest.client.api.IGenericClient;
 import ca.uhn.fhir.rest.gclient.IHistoryTyped;
 import org.hl7.fhir.instance.model.api.IBaseBundle;
-import org.hl7.fhir.instance.model.api.IBaseConformance;
 import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.hl7.fhir.instance.model.api.IIdType;
 import org.hl7.fhir.instance.model.api.IPrimitiveType;
diff --git a/components/camel-fhir/camel-fhir-api/src/main/java/org/apache/camel/component/fhir/api/FhirMeta.java b/components/camel-fhir/camel-fhir-api/src/main/java/org/apache/camel/component/fhir/api/FhirMeta.java
index dcf03c1..788b892 100644
--- a/components/camel-fhir/camel-fhir-api/src/main/java/org/apache/camel/component/fhir/api/FhirMeta.java
+++ b/components/camel-fhir/camel-fhir-api/src/main/java/org/apache/camel/component/fhir/api/FhirMeta.java
@@ -19,8 +19,6 @@ package org.apache.camel.component.fhir.api;
 import java.util.Map;
 import ca.uhn.fhir.rest.client.api.IGenericClient;
 import ca.uhn.fhir.rest.gclient.IClientExecutable;
-import ca.uhn.fhir.rest.gclient.IMeta;
-import org.hl7.fhir.instance.model.api.IBaseBundle;
 import org.hl7.fhir.instance.model.api.IBaseMetaType;
 import org.hl7.fhir.instance.model.api.IIdType;
 
diff --git a/components/camel-fhir/camel-fhir-api/src/main/java/org/apache/camel/component/fhir/api/FhirPatch.java b/components/camel-fhir/camel-fhir-api/src/main/java/org/apache/camel/component/fhir/api/FhirPatch.java
index 866a4d3..7fc5084 100644
--- a/components/camel-fhir/camel-fhir-api/src/main/java/org/apache/camel/component/fhir/api/FhirPatch.java
+++ b/components/camel-fhir/camel-fhir-api/src/main/java/org/apache/camel/component/fhir/api/FhirPatch.java
@@ -21,7 +21,6 @@ import ca.uhn.fhir.rest.api.MethodOutcome;
 import ca.uhn.fhir.rest.api.PreferReturnEnum;
 import ca.uhn.fhir.rest.client.api.IGenericClient;
 import ca.uhn.fhir.rest.gclient.IPatchExecutable;
-import org.hl7.fhir.instance.model.api.IBaseMetaType;
 import org.hl7.fhir.instance.model.api.IIdType;
 
 /**
diff --git a/components/camel-fhir/camel-fhir-api/src/main/java/org/apache/camel/component/fhir/api/FhirSearch.java b/components/camel-fhir/camel-fhir-api/src/main/java/org/apache/camel/component/fhir/api/FhirSearch.java
index 80cea34..1b69a6c 100644
--- a/components/camel-fhir/camel-fhir-api/src/main/java/org/apache/camel/component/fhir/api/FhirSearch.java
+++ b/components/camel-fhir/camel-fhir-api/src/main/java/org/apache/camel/component/fhir/api/FhirSearch.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.fhir.api;
 
 import java.util.Map;
-import ca.uhn.fhir.rest.api.MethodOutcome;
 import ca.uhn.fhir.rest.client.api.IGenericClient;
 import ca.uhn.fhir.rest.gclient.IQuery;
 import org.hl7.fhir.instance.model.api.IBaseBundle;
diff --git a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirLoadPageIT.java b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirLoadPageIT.java
index 8c80946..5e1c77d 100644
--- a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirLoadPageIT.java
+++ b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirLoadPageIT.java
@@ -50,7 +50,7 @@ public class FhirLoadPageIT extends AbstractFhirTestSupport {
         Bundle bundle = this.fhirClient.search()
                 .byUrl(url)
                 .returnBundle(Bundle.class).execute();
-        assertNotNull(bundle.getLink(Bundle.LINK_NEXT));
+        assertNotNull(bundle.getLink(IBaseBundle.LINK_NEXT));
 
         String nextPageLink = bundle.getLink("next").getUrl();
 
@@ -72,7 +72,7 @@ public class FhirLoadPageIT extends AbstractFhirTestSupport {
         Bundle bundle = this.fhirClient.search()
                                        .byUrl(url)
                                        .returnBundle(Bundle.class).execute();
-        assertNotNull(bundle.getLink(Bundle.LINK_NEXT));
+        assertNotNull(bundle.getLink(IBaseBundle.LINK_NEXT));
 
         // using org.hl7.fhir.instance.model.api.IBaseBundle message body for single parameter "bundle"
         Bundle result = requestBody("direct://NEXT", bundle);
@@ -87,11 +87,11 @@ public class FhirLoadPageIT extends AbstractFhirTestSupport {
         Bundle bundle = this.fhirClient.search()
                 .byUrl(url)
                 .returnBundle(Bundle.class).execute();
-        assertNotNull(bundle.getLink(Bundle.LINK_NEXT));
+        assertNotNull(bundle.getLink(IBaseBundle.LINK_NEXT));
 
         String nextPageLink = bundle.getLink("next").getUrl();
         bundle = this.fhirClient.loadPage().byUrl(nextPageLink).andReturnBundle(Bundle.class).execute();
-        assertNotNull(bundle.getLink(Bundle.LINK_PREV));
+        assertNotNull(bundle.getLink(IBaseBundle.LINK_PREV));
 
         // using org.hl7.fhir.instance.model.api.IBaseBundle message body for single parameter "bundle"
         Bundle result = requestBody("direct://PREVIOUS", bundle);
@@ -106,11 +106,11 @@ public class FhirLoadPageIT extends AbstractFhirTestSupport {
         Bundle bundle = this.fhirClient.search()
                 .byUrl(url)
                 .returnBundle(Bundle.class).execute();
-        assertNotNull(bundle.getLink(Bundle.LINK_NEXT));
+        assertNotNull(bundle.getLink(IBaseBundle.LINK_NEXT));
 
         String nextPageLink = bundle.getLink("next").getUrl();
         bundle = this.fhirClient.loadPage().byUrl(nextPageLink).andReturnBundle(Bundle.class).execute();
-        assertNotNull(bundle.getLink(Bundle.LINK_PREV));
+        assertNotNull(bundle.getLink(IBaseBundle.LINK_PREV));
         Map<String, Object> headers = new HashMap<>();
         headers.put(ExtraParameters.ENCODING_ENUM.getHeaderName(), EncodingEnum.XML);
 
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 55a51f3..f043b5c 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
@@ -43,7 +43,7 @@ public class FhirOperationIT extends AbstractFhirTestSupport {
 
     @Test
     public void testOnInstance() throws Exception {
-        final Map<String, Object> headers = new HashMap<String, Object>();
+        final Map<String, Object> headers = new HashMap<>();
         // parameter type is org.hl7.fhir.instance.model.api.IIdType
         headers.put("CamelFhir.id", this.patient.getIdElement());
         // parameter type is String
@@ -70,7 +70,7 @@ public class FhirOperationIT extends AbstractFhirTestSupport {
 
     @Test
     public void testOnInstanceVersion() throws Exception {
-        final Map<String, Object> headers = new HashMap<String, Object>();
+        final Map<String, Object> headers = new HashMap<>();
         // parameter type is org.hl7.fhir.instance.model.api.IIdType
         headers.put("CamelFhir.id", this.patient.getIdElement());
         // parameter type is String
@@ -120,7 +120,7 @@ public class FhirOperationIT extends AbstractFhirTestSupport {
 
     @Test
     public void testOnType() throws Exception {
-        final Map<String, Object> headers = new HashMap<String, Object>();
+        final Map<String, Object> headers = new HashMap<>();
         // parameter type is Class
         headers.put("CamelFhir.resourceType", Patient.class);
         // parameter type is String
@@ -145,7 +145,7 @@ public class FhirOperationIT extends AbstractFhirTestSupport {
     + " https://github.com/jamesagnew/hapi-fhir/blob/master/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoMessageHeaderDstu3.java#L33")
     @Test
     public void testProcessMessage() throws Exception {
-        final Map<String, Object> headers = new HashMap<String, Object>();
+        final Map<String, Object> headers = new HashMap<>();
         // parameter type is String
         headers.put("CamelFhir.respondToUri", null);
         // parameter type is org.hl7.fhir.instance.model.api.IBaseBundle
diff --git a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirDataformatConfigSpringTest.java b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirDataformatConfigSpringTest.java
index 394576c..6f00052 100644
--- a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirDataformatConfigSpringTest.java
+++ b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirDataformatConfigSpringTest.java
@@ -32,10 +32,6 @@ import org.junit.Test;
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
 public class FhirDataformatConfigSpringTest extends CamelSpringTestSupport {
 
     @Override
diff --git a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirXmlDataformatErrorHandlerSpringTest.java b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirXmlDataformatErrorHandlerSpringTest.java
index c098ace..aa593ca 100644
--- a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirXmlDataformatErrorHandlerSpringTest.java
+++ b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/dataformat/spring/FhirXmlDataformatErrorHandlerSpringTest.java
@@ -27,8 +27,6 @@ import org.junit.Test;
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-import static org.junit.Assert.assertEquals;
-
 public class FhirXmlDataformatErrorHandlerSpringTest extends CamelSpringTestSupport {
 
     private static final String INPUT = "<Patient><active value=\"true\"/><active value=\"false\"/></Patient>";
diff --git a/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileConverter.java b/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileConverter.java
index 0c3d9d8..61e7ace 100644
--- a/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileConverter.java
+++ b/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileConverter.java
@@ -18,16 +18,10 @@ package org.apache.camel.component.file;
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.Reader;
 import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
 import java.nio.charset.Charset;
 import java.util.function.Supplier;
 
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 38d0eb4..58ffbd9 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
@@ -229,7 +229,7 @@ public class FtpsEndpoint extends FtpEndpoint<FTPFile> {
      * Returns the FtpsConfiguration. This method exists only for convenient.
      */
     public FtpsConfiguration getFtpsConfiguration() {
-        return (FtpsConfiguration) getConfiguration();
+        return getConfiguration();
     }
 
     public Map<String, Object> getFtpClientKeyStoreParameters() {
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/SftpChangedExclusiveReadLockStrategy.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/SftpChangedExclusiveReadLockStrategy.java
index 0c7d07c..df439f1 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/SftpChangedExclusiveReadLockStrategy.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/SftpChangedExclusiveReadLockStrategy.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.file.remote.strategy;
 
-import java.util.Date;
 import java.util.List;
 
 import com.jcraft.jsch.ChannelSftp;
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyPairDSAConsumeTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyPairDSAConsumeTest.java
index ebb6439..819f39e 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyPairDSAConsumeTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyPairDSAConsumeTest.java
@@ -16,18 +16,12 @@
  */
 package org.apache.camel.component.file.remote.sftp;
 
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.util.IOHelper;
 import org.apache.sshd.server.auth.pubkey.PublickeyAuthenticator;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderProxyTest.java b/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderProxyTest.java
index 335b02f..dcbaf09 100644
--- a/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderProxyTest.java
+++ b/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderProxyTest.java
@@ -22,7 +22,6 @@ import com.google.maps.GeocodingApi;
 import com.google.maps.GeocodingApiRequest;
 import com.google.maps.model.GeocodingResult;
 import com.google.maps.model.LatLng;
-import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Ignore;
 import org.junit.Test;
 
diff --git a/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarCalendarListIntegrationTest.java b/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarCalendarListIntegrationTest.java
index 1e5e8ba..9f67f47 100644
--- a/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarCalendarListIntegrationTest.java
+++ b/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarCalendarListIntegrationTest.java
@@ -25,8 +25,6 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.google.calendar.internal.CalendarCalendarListApiMethod;
 import org.apache.camel.component.google.calendar.internal.GoogleCalendarApiCollection;
 import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Test class for {@link com.google.api.services.calendar.Calendar$CalendarList} APIs.
diff --git a/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarCalendarsIntegrationTest.java b/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarCalendarsIntegrationTest.java
index 05d3c86..90eb7b6 100644
--- a/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarCalendarsIntegrationTest.java
+++ b/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarCalendarsIntegrationTest.java
@@ -25,8 +25,6 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.google.calendar.internal.CalendarCalendarsApiMethod;
 import org.apache.camel.component.google.calendar.internal.GoogleCalendarApiCollection;
 import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Test class for {@link com.google.api.services.calendar.Calendar$Calendars} APIs.
diff --git a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailConfiguration.java b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailConfiguration.java
index 90ce3e7..2e26a88 100644
--- a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailConfiguration.java
+++ b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailConfiguration.java
@@ -16,10 +16,6 @@
  */
 package org.apache.camel.component.google.mail;
 
-import java.util.Arrays;
-import java.util.List;
-
-import com.google.api.services.gmail.GmailScopes;
 import org.apache.camel.component.google.mail.internal.GoogleMailApiName;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriParam;
diff --git a/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubConnectionFactory.java b/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubConnectionFactory.java
index 6d4e55f..b46c5a9 100644
--- a/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubConnectionFactory.java
+++ b/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubConnectionFactory.java
@@ -74,7 +74,7 @@ public class GooglePubsubConnectionFactory {
 
     private Pubsub buildClient() throws Exception {
         return buildClient(GoogleNetHttpTransport.newTrustedTransport());
-    };
+    }
 
     private Pubsub buildClient(HttpTransport httpTransport) throws Exception {
 
diff --git a/components/camel-grape/src/main/java/org/apache/camel/component/grape/GrapeEndpoint.java b/components/camel-grape/src/main/java/org/apache/camel/component/grape/GrapeEndpoint.java
index 59dda3f..7a7dfe8 100644
--- a/components/camel-grape/src/main/java/org/apache/camel/component/grape/GrapeEndpoint.java
+++ b/components/camel-grape/src/main/java/org/apache/camel/component/grape/GrapeEndpoint.java
@@ -54,7 +54,7 @@ public class GrapeEndpoint extends DefaultEndpoint {
         return DefaultGroovyMethods.each(patchesRepository.listPatches(), new Closure<Object>(null, null) {
             public void doCall(String it) {
                 MavenCoordinates coordinates = MavenCoordinates.parseMavenCoordinates(it);
-                LinkedHashMap<String, Object> map = new LinkedHashMap<String, Object>(5);
+                LinkedHashMap<String, Object> map = new LinkedHashMap<>(5);
                 map.put("classLoader", classLoader);
                 map.put("group", coordinates.getGroupId());
                 map.put("module", coordinates.getArtifactId());
diff --git a/components/camel-grape/src/main/java/org/apache/camel/component/grape/GrapeProducer.java b/components/camel-grape/src/main/java/org/apache/camel/component/grape/GrapeProducer.java
index ef3f936..ff52e9e 100644
--- a/components/camel-grape/src/main/java/org/apache/camel/component/grape/GrapeProducer.java
+++ b/components/camel-grape/src/main/java/org/apache/camel/component/grape/GrapeProducer.java
@@ -37,7 +37,7 @@ public class GrapeProducer extends DefaultProducer {
         case grab:
             ClassLoader classLoader = exchange.getContext().getApplicationContextClassLoader();
             String rawCoordinates = exchange.getIn().getBody(String.class);
-            LinkedHashMap<String, Object> map = new LinkedHashMap<String, Object>(5);
+            LinkedHashMap<String, Object> map = new LinkedHashMap<>(5);
             try {
                 MavenCoordinates coordinates = MavenCoordinates.parseMavenCoordinates(rawCoordinates);
                 map.put("classLoader", classLoader);
diff --git a/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/auth/jwt/JwtCallCredentials.java b/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/auth/jwt/JwtCallCredentials.java
index f1b1060..4b84e38 100644
--- a/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/auth/jwt/JwtCallCredentials.java
+++ b/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/auth/jwt/JwtCallCredentials.java
@@ -18,10 +18,8 @@ package org.apache.camel.component.grpc.auth.jwt;
 
 import java.util.concurrent.Executor;
 
-import io.grpc.Attributes;
 import io.grpc.CallCredentials;
 import io.grpc.Metadata;
-import io.grpc.MethodDescriptor;
 import io.grpc.Status;
 import org.apache.camel.component.grpc.GrpcConstants;
 import org.slf4j.Logger;
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastDefaultEndpoint.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastDefaultEndpoint.java
index 1560e66..611ca5b 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastDefaultEndpoint.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastDefaultEndpoint.java
@@ -21,9 +21,6 @@ import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
-import org.apache.camel.component.hazelcast.queue.HazelcastQueueConfiguration;
-import org.apache.camel.component.hazelcast.seda.HazelcastSedaConfiguration;
-import org.apache.camel.component.hazelcast.topic.HazelcastTopicConfiguration;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.spi.UriPath;
diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
index c688efd..8e6846f 100644
--- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
+++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
@@ -32,7 +32,6 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
-import org.apache.camel.Producer;
 import org.apache.camel.RuntimeExchangeException;
 import org.apache.camel.converter.stream.CachedOutputStream;
 import org.apache.camel.support.CamelObjectInputStream;
diff --git a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/compute/IgniteComputeProducer.java b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/compute/IgniteComputeProducer.java
index c3ab9ac..0cf4265 100644
--- a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/compute/IgniteComputeProducer.java
+++ b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/compute/IgniteComputeProducer.java
@@ -271,6 +271,6 @@ public class IgniteComputeProducer extends DefaultAsyncProducer {
             exchange.getOut().setBody(result);
             callback.done(false);
         }
-    };
+    }
 
 }
diff --git a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteEventsTest.java b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteEventsTest.java
index d2239f7..327d43f 100644
--- a/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteEventsTest.java
+++ b/components/camel-ignite/src/test/java/org/apache/camel/component/ignite/IgniteEventsTest.java
@@ -24,7 +24,6 @@ import javax.cache.expiry.Duration;
 
 import com.google.common.base.Function;
 import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Route;
diff --git a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcMultiChannelRouteTest.java b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcMultiChannelRouteTest.java
index fa22835..7c47221 100644
--- a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcMultiChannelRouteTest.java
+++ b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcMultiChannelRouteTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.irc.it;
 
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcOnReplyTest.java b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcOnReplyTest.java
index 0a54d82..4da62b5 100644
--- a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcOnReplyTest.java
+++ b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcOnReplyTest.java
@@ -21,7 +21,6 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.irc.IrcConstants;
-import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
 
 public class IrcOnReplyTest extends IrcIntegrationTestSupport {
diff --git a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcPrivmsgTest.java b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcPrivmsgTest.java
index 1290624..3101e8b 100644
--- a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcPrivmsgTest.java
+++ b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcPrivmsgTest.java
@@ -22,9 +22,6 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.irc.IrcConstants;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class IrcPrivmsgTest extends IrcIntegrationTestSupport {
diff --git a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcRouteTest.java b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcRouteTest.java
index d741cc1..abc1329 100644
--- a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcRouteTest.java
+++ b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcRouteTest.java
@@ -22,9 +22,6 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.irc.IrcConstants;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class IrcRouteTest extends IrcIntegrationTestSupport {
diff --git a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcsListUsersTest.java b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcsListUsersTest.java
index 43f364e..b3dbe32 100644
--- a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcsListUsersTest.java
+++ b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcsListUsersTest.java
@@ -16,18 +16,9 @@
  */
 package org.apache.camel.component.irc.it;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.camel.EndpointInject;
 import org.apache.camel.RoutesBuilder;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.irc.IrcConfiguration;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
index 45289e1..1a0a0ea 100644
--- a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
+++ b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
@@ -64,8 +64,6 @@ import org.apache.camel.support.ResourceHelper;
 import org.apache.camel.support.service.ServiceSupport;
 import org.apache.camel.util.IOHelper;
 import org.apache.camel.util.ObjectHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * A <a href="http://camel.apache.org/data-format.html">data format</a> ({@link DataFormat})
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/example/JAXBConvertTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/example/JAXBConvertTest.java
index b0abd39..a94124c 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/example/JAXBConvertTest.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/example/JAXBConvertTest.java
@@ -19,14 +19,10 @@ package org.apache.camel.example;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.NoTypeConversionAvailableException;
 import org.apache.camel.StreamCache;
 import org.apache.camel.TypeConversionException;
-import org.apache.camel.TypeConverter;
-import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.test.junit4.ExchangeTestSupport;
-import org.junit.Assert;
 import org.junit.Test;
 
 public class JAXBConvertTest extends ExchangeTestSupport {
diff --git a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandlerIntegrationTests.java b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandlerIntegrationTests.java
index d646060..6f37d5e 100644
--- a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandlerIntegrationTests.java
+++ b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandlerIntegrationTests.java
@@ -264,7 +264,7 @@ public class CamelWorkItemHandlerIntegrationTests extends CamelTestSupport {
                             
                                 @Override
                                 public void process(Exchange exchange) throws Exception {
-                                    RuntimeCamelException exceptionWrapper = new RuntimeCamelException(exchange.EXCEPTION_CAUGHT);        
+                                    RuntimeCamelException exceptionWrapper = new RuntimeCamelException(Exchange.EXCEPTION_CAUGHT);        
                                     throw exceptionWrapper;
                                 }
                             })
diff --git a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/JCachePolicyTestBase.java b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/JCachePolicyTestBase.java
index 271cd5e..ccfdaf5 100644
--- a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/JCachePolicyTestBase.java
+++ b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/JCachePolicyTestBase.java
@@ -21,7 +21,6 @@ import javax.cache.Cache;
 import javax.cache.CacheManager;
 import javax.cache.Caching;
 
-import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.After;
 import org.junit.Before;
diff --git a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/SpringJCachePolicyTest.java b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/SpringJCachePolicyTest.java
index cc983fc..1862ebb 100644
--- a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/SpringJCachePolicyTest.java
+++ b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/SpringJCachePolicyTest.java
@@ -18,9 +18,7 @@ package org.apache.camel.component.jcache.policy;
 
 import javax.cache.Cache;
 
-import com.hazelcast.cache.HazelcastCachingProvider;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.model.language.SimpleExpression;
 import org.apache.camel.test.spring.CamelSpringTestSupport;
 import org.junit.AfterClass;
 import org.junit.Before;
diff --git a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrRouteDifferentWorkspaceTestSupport.java b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrRouteDifferentWorkspaceTestSupport.java
index 794987b..78f94d4 100644
--- a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrRouteDifferentWorkspaceTestSupport.java
+++ b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrRouteDifferentWorkspaceTestSupport.java
@@ -24,7 +24,6 @@ import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.SimpleCredentials;
 import javax.jcr.Workspace;
-import javax.naming.Context;
 
 import org.apache.camel.spi.Registry;
 import org.apache.camel.test.junit4.CamelTestSupport;
diff --git a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcColumnTypeTest.java b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcColumnTypeTest.java
index 3232cee..8f766f5 100644
--- a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcColumnTypeTest.java
+++ b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcColumnTypeTest.java
@@ -16,9 +16,6 @@
  */
 package org.apache.camel.component.jdbc;
 
-import java.io.InputStream;
-import java.io.StringWriter;
-import java.sql.Clob;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.Map;
@@ -26,7 +23,6 @@ import java.util.Set;
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.logging.log4j.core.util.IOUtils;
 import org.junit.Test;
 
 public class JdbcColumnTypeTest extends AbstractJdbcTestSupport {
diff --git a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9.java b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9.java
index 311b322..68808f1 100644
--- a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9.java
+++ b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9.java
@@ -24,7 +24,6 @@ import org.apache.camel.component.jetty.JettyContentExchange;
 import org.apache.camel.component.jetty.JettyHttpComponent;
 import org.apache.camel.component.jetty.JettyHttpEndpoint;
 import org.apache.camel.http.common.HttpBinding;
-import org.apache.camel.http.common.HttpConsumer;
 import org.apache.camel.spi.UriEndpoint;
 
 /**
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HandlerTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HandlerTest.java
index 817690c..c1179c8 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HandlerTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HandlerTest.java
@@ -115,7 +115,7 @@ public class HandlerTest extends BaseJettyTest {
                         exchange.getOut().setBody(htmlResponse);
                     }
                 });
-            };
+            }
         };
     }
 }
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBridgeMultipartRouteTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBridgeMultipartRouteTest.java
index ac28666..ffb7da9 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBridgeMultipartRouteTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBridgeMultipartRouteTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.jetty;
 import java.io.File;
 
 import org.apache.camel.Exchange;
-import org.apache.camel.Message;
 import org.apache.camel.Processor;
 import org.apache.camel.attachment.AttachmentMessage;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpStreamCacheFileTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpStreamCacheFileTest.java
index a7b83cf..e487f32 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpStreamCacheFileTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpStreamCacheFileTest.java
@@ -22,7 +22,6 @@ import org.apache.camel.CamelExecutionException;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.converter.stream.CachedOutputStream;
 import org.apache.camel.http.common.HttpOperationFailedException;
 import org.apache.camel.util.ObjectHelper;
 import org.junit.Before;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyMuteExceptionTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyMuteExceptionTest.java
index a7bebc9..8352709 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyMuteExceptionTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyMuteExceptionTest.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.jetty;
 
-import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.methods.GetMethod;
diff --git a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/WatcherProducerTest.java b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/WatcherProducerTest.java
index 4606f19..7acb5a8 100644
--- a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/WatcherProducerTest.java
+++ b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/WatcherProducerTest.java
@@ -73,7 +73,7 @@ public class WatcherProducerTest extends CamelTestSupport {
     private MockEndpoint mockResult;
 
     private Issue backendIssue;
-    private List<String> backendwatchers = new ArrayList<>();;
+    private List<String> backendwatchers = new ArrayList<>();
 
     @Override
     protected void bindToRegistry(Registry registry) {
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyManager.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyManager.java
index c4605a6..7e1b96b 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyManager.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyManager.java
@@ -113,7 +113,7 @@ public class QueueReplyManager extends ReplyManagerSupport {
             }
             return destination;
         }
-    };
+    }
 
     @Override
     protected AbstractMessageListenerContainer createListenerContainer() throws Exception {
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java
index 57cfb8c..a4fc5d5 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java
@@ -30,7 +30,6 @@ import org.apache.camel.AsyncCallback;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangeTimedOutException;
-import org.apache.camel.component.jms.JmsConstants;
 import org.apache.camel.component.jms.JmsEndpoint;
 import org.apache.camel.component.jms.JmsMessage;
 import org.apache.camel.component.jms.JmsMessageHelper;
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/SharedQueueMessageListenerContainer.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/SharedQueueMessageListenerContainer.java
index a94e94c..6c4a5ed 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/SharedQueueMessageListenerContainer.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/SharedQueueMessageListenerContainer.java
@@ -18,8 +18,6 @@ package org.apache.camel.component.jms.reply;
 
 import org.apache.camel.component.jms.DefaultJmsMessageListenerContainer;
 import org.apache.camel.component.jms.JmsEndpoint;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.jms.listener.DefaultMessageListenerContainer;
 
 /**
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java
index 8e73eb4..e6f3583 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java
@@ -41,7 +41,6 @@ import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.springframework.jms.core.JmsTemplate;
 
 import static org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
 
@@ -82,7 +81,7 @@ public class JmsRouteRequestReplyTest extends CamelTestSupport {
                     }
                 });
         }
-    };
+    }
 
     public static class SingleNodeRouteBuilder extends RouteBuilder {
         @Override
@@ -94,7 +93,7 @@ public class JmsRouteRequestReplyTest extends CamelTestSupport {
                 }
             });
         }
-    };
+    }
 
     public static class MultiNodeRouteBuilder extends RouteBuilder {
         @Override
@@ -107,7 +106,7 @@ public class JmsRouteRequestReplyTest extends CamelTestSupport {
                 }
             });
         }
-    };
+    }
 
     public static class MultiNodeReplyToRouteBuilder extends RouteBuilder {
         @Override
@@ -124,7 +123,7 @@ public class JmsRouteRequestReplyTest extends CamelTestSupport {
                 }
             });
         }
-    };
+    }
 
     public static class MultiNodeDiffCompRouteBuilder extends RouteBuilder {
         @Override
@@ -137,7 +136,7 @@ public class JmsRouteRequestReplyTest extends CamelTestSupport {
                 }
             });
         }
-    };
+    }
 
     public static class ContextBuilderMessageID implements ContextBuilder {
         @Override
@@ -150,7 +149,7 @@ public class JmsRouteRequestReplyTest extends CamelTestSupport {
             context.addComponent(componentName, jmsComponent);
             return context;
         }
-    };
+    }
 
     protected static void init() {
         if (inited.compareAndSet(false, true)) {
diff --git a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryAndParametersTest.java b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryAndParametersTest.java
index 4f92795..f8eff9e 100644
--- a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryAndParametersTest.java
+++ b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryAndParametersTest.java
@@ -29,7 +29,6 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.examples.Customer;
-import org.apache.camel.examples.MultiSteps;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.support.SimpleRegistry;
 import org.apache.camel.support.service.ServiceHelper;
diff --git a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
index 04bbb32..47ba7b0 100644
--- a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
+++ b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
@@ -32,7 +32,6 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 import org.apache.camel.AsyncCallback;
-import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.component.kafka.serde.KafkaHeaderSerializer;
 import org.apache.camel.spi.HeaderFilterStrategy;
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerFullTest.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerFullTest.java
index 26351ba..bb78a61 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerFullTest.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerFullTest.java
@@ -27,7 +27,6 @@ import org.apache.camel.EndpointInject;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.kafka.serde.DefaultKafkaHeaderDeserializer;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.spi.Registry;
 import org.apache.kafka.clients.producer.ProducerRecord;
 import org.apache.kafka.common.header.internals.RecordHeader;
 import org.junit.After;
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/embedded/TestUtils.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/embedded/TestUtils.java
index 61dd910..5c9b74a 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/embedded/TestUtils.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/embedded/TestUtils.java
@@ -18,8 +18,6 @@ package org.apache.camel.component.kafka.embedded;
 
 import java.io.File;
 import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.net.ServerSocket;
 
 import org.apache.commons.lang3.RandomStringUtils;
 
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsEndpoint.java
index 26dc3c9..27e8533 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsEndpoint.java
@@ -22,8 +22,6 @@ import org.apache.camel.Producer;
 import org.apache.camel.component.kubernetes.AbstractKubernetesEndpoint;
 import org.apache.camel.component.kubernetes.KubernetesConfiguration;
 import org.apache.camel.spi.UriEndpoint;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * The Kubernetes Configmaps component provides a producer to execute kubernetes
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsConsumer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsConsumer.java
index f453631..d8adacd 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsConsumer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsConsumer.java
@@ -26,7 +26,6 @@ import io.fabric8.kubernetes.client.Watch;
 import io.fabric8.kubernetes.client.Watcher;
 import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
 import io.fabric8.kubernetes.client.dsl.RollableScalableResource;
-import io.fabric8.kubernetes.client.dsl.ScalableResource;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsEndpoint.java
index dc6b73f..f2c8b20 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsEndpoint.java
@@ -22,8 +22,6 @@ import org.apache.camel.Producer;
 import org.apache.camel.component.kubernetes.AbstractKubernetesEndpoint;
 import org.apache.camel.component.kubernetes.KubernetesConfiguration;
 import org.apache.camel.spi.UriEndpoint;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * The Kubernetes Nodes component provides a producer to execute kubernetes node
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsProducer.java
index 1114b08..9ab17f7 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsProducer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsProducer.java
@@ -25,7 +25,6 @@ import io.fabric8.kubernetes.api.model.apps.DeploymentSpec;
 import io.fabric8.kubernetes.api.model.apps.DoneableDeployment;
 import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
 import io.fabric8.kubernetes.client.dsl.RollableScalableResource;
-import io.fabric8.kubernetes.client.dsl.ScalableResource;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.component.kubernetes.AbstractKubernetesEndpoint;
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAEndpoint.java
index 0ab76f5..334dd82 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAEndpoint.java
@@ -22,8 +22,6 @@ import org.apache.camel.Producer;
 import org.apache.camel.component.kubernetes.AbstractKubernetesEndpoint;
 import org.apache.camel.component.kubernetes.KubernetesConfiguration;
 import org.apache.camel.spi.UriEndpoint;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * The Kubernetes HPA component provides a producer to execute kubernetes hpa
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/job/KubernetesJobEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/job/KubernetesJobEndpoint.java
index a5c09c5..0cc3e5f 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/job/KubernetesJobEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/job/KubernetesJobEndpoint.java
@@ -22,8 +22,6 @@ import org.apache.camel.Producer;
 import org.apache.camel.component.kubernetes.AbstractKubernetesEndpoint;
 import org.apache.camel.component.kubernetes.KubernetesConfiguration;
 import org.apache.camel.spi.UriEndpoint;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * The Kubernetes Jobs component provides a producer to execute kubernetes job
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/namespaces/KubernetesNamespacesEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/namespaces/KubernetesNamespacesEndpoint.java
index 6398141..2d996338 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/namespaces/KubernetesNamespacesEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/namespaces/KubernetesNamespacesEndpoint.java
@@ -22,8 +22,6 @@ import org.apache.camel.Producer;
 import org.apache.camel.component.kubernetes.AbstractKubernetesEndpoint;
 import org.apache.camel.component.kubernetes.KubernetesConfiguration;
 import org.apache.camel.spi.UriEndpoint;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * The Kubernetes Namespaces component provides a producer to execute kubernetes
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesEndpoint.java
index ab332e3..4d04c12 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesEndpoint.java
@@ -22,8 +22,6 @@ import org.apache.camel.Producer;
 import org.apache.camel.component.kubernetes.AbstractKubernetesEndpoint;
 import org.apache.camel.component.kubernetes.KubernetesConfiguration;
 import org.apache.camel.spi.UriEndpoint;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * The Kubernetes Nodes component provides a producer to execute kubernetes node
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesProducer.java
index 793529c..79224cd 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesProducer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesProducer.java
@@ -19,9 +19,6 @@ package org.apache.camel.component.kubernetes.nodes;
 import java.util.Map;
 
 import io.fabric8.kubernetes.api.model.DoneableNode;
-import io.fabric8.kubernetes.api.model.HorizontalPodAutoscaler;
-import io.fabric8.kubernetes.api.model.HorizontalPodAutoscalerBuilder;
-import io.fabric8.kubernetes.api.model.HorizontalPodAutoscalerSpec;
 import io.fabric8.kubernetes.api.model.Node;
 import io.fabric8.kubernetes.api.model.NodeBuilder;
 import io.fabric8.kubernetes.api.model.NodeList;
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes/KubernetesPersistentVolumesEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes/KubernetesPersistentVolumesEndpoint.java
index e41a30a..62ad11e 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes/KubernetesPersistentVolumesEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes/KubernetesPersistentVolumesEndpoint.java
@@ -22,8 +22,6 @@ import org.apache.camel.Producer;
 import org.apache.camel.component.kubernetes.AbstractKubernetesEndpoint;
 import org.apache.camel.component.kubernetes.KubernetesConfiguration;
 import org.apache.camel.spi.UriEndpoint;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * The Kubernetes Persistent Volumes component provides a producer to execute
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsEndpoint.java
index 35d6a02..8688583 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsEndpoint.java
@@ -22,8 +22,6 @@ import org.apache.camel.Producer;
 import org.apache.camel.component.kubernetes.AbstractKubernetesEndpoint;
 import org.apache.camel.component.kubernetes.KubernetesConfiguration;
 import org.apache.camel.spi.UriEndpoint;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * The Kubernetes Persistent Volumes Claims component provides a producer to
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsEndpoint.java
index c796f9e..e6850b4 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsEndpoint.java
@@ -22,8 +22,6 @@ import org.apache.camel.Producer;
 import org.apache.camel.component.kubernetes.AbstractKubernetesEndpoint;
 import org.apache.camel.component.kubernetes.KubernetesConfiguration;
 import org.apache.camel.spi.UriEndpoint;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * The Kubernetes Pods component provides a producer to execute kubernetes pod
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersEndpoint.java
index a993879..f394214 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersEndpoint.java
@@ -22,8 +22,6 @@ import org.apache.camel.Producer;
 import org.apache.camel.component.kubernetes.AbstractKubernetesEndpoint;
 import org.apache.camel.component.kubernetes.KubernetesConfiguration;
 import org.apache.camel.spi.UriEndpoint;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * The Kubernetes Replication Controllers component provides a producer to
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/resources_quota/KubernetesResourcesQuotaEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/resources_quota/KubernetesResourcesQuotaEndpoint.java
index 6cfdfd6..ef29ac7 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/resources_quota/KubernetesResourcesQuotaEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/resources_quota/KubernetesResourcesQuotaEndpoint.java
@@ -22,8 +22,6 @@ import org.apache.camel.Producer;
 import org.apache.camel.component.kubernetes.AbstractKubernetesEndpoint;
 import org.apache.camel.component.kubernetes.KubernetesConfiguration;
 import org.apache.camel.spi.UriEndpoint;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * The Kubernetes Resources Quota component provides a producer to execute
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsEndpoint.java
index 1264cd5..c0afea3 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsEndpoint.java
@@ -22,8 +22,6 @@ import org.apache.camel.Producer;
 import org.apache.camel.component.kubernetes.AbstractKubernetesEndpoint;
 import org.apache.camel.component.kubernetes.KubernetesConfiguration;
 import org.apache.camel.spi.UriEndpoint;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * The Kubernetes Secrets component provides a producer to execute kubernetes
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/service_accounts/KubernetesServiceAccountsEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/service_accounts/KubernetesServiceAccountsEndpoint.java
index 25f69c1..eb8813b 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/service_accounts/KubernetesServiceAccountsEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/service_accounts/KubernetesServiceAccountsEndpoint.java
@@ -22,8 +22,6 @@ import org.apache.camel.Producer;
 import org.apache.camel.component.kubernetes.AbstractKubernetesEndpoint;
 import org.apache.camel.component.kubernetes.KubernetesConfiguration;
 import org.apache.camel.spi.UriEndpoint;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * The Kubernetes Service Accounts component provides a producer to execute
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/services/KubernetesServicesEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/services/KubernetesServicesEndpoint.java
index c6c3fc2..5fb64dc 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/services/KubernetesServicesEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/services/KubernetesServicesEndpoint.java
@@ -22,8 +22,6 @@ import org.apache.camel.Producer;
 import org.apache.camel.component.kubernetes.AbstractKubernetesEndpoint;
 import org.apache.camel.component.kubernetes.KubernetesConfiguration;
 import org.apache.camel.spi.UriEndpoint;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * The Kubernetes Service Accounts component provides a producer to execute
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsEndpoint.java
index 4765d1c..c2132a4 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsEndpoint.java
@@ -22,8 +22,6 @@ import org.apache.camel.Producer;
 import org.apache.camel.component.kubernetes.AbstractKubernetesEndpoint;
 import org.apache.camel.component.kubernetes.KubernetesConfiguration;
 import org.apache.camel.spi.UriEndpoint;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * The Kubernetes Build Config component provides a producer to execute
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsEndpoint.java
index 0efef79..3b9b6b5 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsEndpoint.java
@@ -22,8 +22,6 @@ import org.apache.camel.Producer;
 import org.apache.camel.component.kubernetes.AbstractKubernetesEndpoint;
 import org.apache.camel.component.kubernetes.KubernetesConfiguration;
 import org.apache.camel.spi.UriEndpoint;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * The Openshift Builds component provides a producer to execute openshift build
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNodesProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNodesProducerTest.java
index 9ca5087..1c8119a 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNodesProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNodesProducerTest.java
@@ -26,8 +26,6 @@ import io.fabric8.kubernetes.api.model.NodeListBuilder;
 import io.fabric8.kubernetes.api.model.NodeSpec;
 import io.fabric8.kubernetes.api.model.NodeSpecBuilder;
 import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.Pod;
-import io.fabric8.kubernetes.api.model.PodBuilder;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
 
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftBuildConfigsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftBuildConfigsProducerTest.java
index 83c97a4..d01e80d 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftBuildConfigsProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftBuildConfigsProducerTest.java
@@ -16,22 +16,16 @@
  */
 package org.apache.camel.component.openshift.producer;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import io.fabric8.kubernetes.api.model.APIGroupListBuilder;
 import io.fabric8.openshift.api.model.BuildConfig;
 import io.fabric8.openshift.api.model.BuildConfigListBuilder;
 import io.fabric8.openshift.client.NamespacedOpenShiftClient;
-import io.fabric8.openshift.client.OpenShiftClient;
 import io.fabric8.openshift.client.server.mock.OpenShiftServer;
 
 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.kubernetes.KubernetesConstants;
 import org.apache.camel.component.kubernetes.KubernetesTestSupport;
 import org.junit.Rule;
 import org.junit.Test;
diff --git a/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/LinkedInOAuthRequestFilter.java b/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/LinkedInOAuthRequestFilter.java
index f22f5fa..65a65fd 100644
--- a/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/LinkedInOAuthRequestFilter.java
+++ b/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/LinkedInOAuthRequestFilter.java
@@ -179,7 +179,7 @@ public final class LinkedInOAuthRequestFilter implements ClientRequestFilter {
                 throw new IllegalArgumentException("Redirect response query is null, check username, password and permissions");
             }
 
-            final Map<String, String> params = new HashMap<String, String>();
+            final Map<String, String> params = new HashMap<>();
             final Matcher matcher = QUERY_PARAM_PATTERN.matcher(redirectQuery);
             while (matcher.find()) {
                 params.put(matcher.group(1), matcher.group(2));
diff --git a/components/camel-linkedin/camel-linkedin-component/src/main/java/org/apache/camel/component/linkedin/LinkedInEndpoint.java b/components/camel-linkedin/camel-linkedin-component/src/main/java/org/apache/camel/component/linkedin/LinkedInEndpoint.java
index ef28c58..10fd7d3 100644
--- a/components/camel-linkedin/camel-linkedin-component/src/main/java/org/apache/camel/component/linkedin/LinkedInEndpoint.java
+++ b/components/camel-linkedin/camel-linkedin-component/src/main/java/org/apache/camel/component/linkedin/LinkedInEndpoint.java
@@ -42,9 +42,7 @@ import org.apache.camel.support.component.ApiMethod;
 import org.apache.camel.support.component.ApiMethodPropertiesHelper;
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
-import org.apache.cxf.jaxrs.client.AbstractClient;
 import org.apache.cxf.jaxrs.client.JAXRSClientFactory;
-import org.apache.cxf.jaxrs.client.JAXRSClientFactoryBean;
 import org.apache.cxf.jaxrs.client.WebClient;
 
 
diff --git a/components/camel-log/src/main/java/org/apache/camel/component/log/LogComponent.java b/components/camel-log/src/main/java/org/apache/camel/component/log/LogComponent.java
index c23ea28..403fc89 100644
--- a/components/camel-log/src/main/java/org/apache/camel/component/log/LogComponent.java
+++ b/components/camel-log/src/main/java/org/apache/camel/component/log/LogComponent.java
@@ -24,7 +24,6 @@ import org.apache.camel.LoggingLevel;
 import org.apache.camel.spi.CamelLogger;
 import org.apache.camel.spi.ExchangeFormatter;
 import org.apache.camel.spi.Metadata;
-import org.apache.camel.spi.PropertyConfigurer;
 import org.apache.camel.support.DefaultComponent;
 import org.apache.camel.support.processor.DefaultExchangeFormatter;
 import org.slf4j.Logger;
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentDuplicateNamesTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentDuplicateNamesTest.java
index dc86fe5..0a9b406 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentDuplicateNamesTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentDuplicateNamesTest.java
@@ -23,7 +23,6 @@ import javax.activation.FileDataSource;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
-import org.apache.camel.Message;
 import org.apache.camel.Producer;
 import org.apache.camel.attachment.AttachmentMessage;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java
index 300a6b7..4fa17c8 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java
@@ -25,7 +25,6 @@ import javax.activation.FileDataSource;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
-import org.apache.camel.Message;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
 import org.apache.camel.attachment.AttachmentMessage;
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java
index 242cd85..9096885 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java
@@ -23,7 +23,6 @@ import javax.activation.FileDataSource;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
-import org.apache.camel.Message;
 import org.apache.camel.Producer;
 import org.apache.camel.attachment.Attachment;
 import org.apache.camel.attachment.AttachmentMessage;
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentsUmlautIssueTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentsUmlautIssueTest.java
index 08a26dc..afb61b4 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentsUmlautIssueTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentsUmlautIssueTest.java
@@ -25,7 +25,6 @@ import javax.activation.FileDataSource;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
-import org.apache.camel.Message;
 import org.apache.camel.Producer;
 import org.apache.camel.attachment.AttachmentMessage;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentTest.java
index 2b10763..9b93421 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.mail;
 import javax.mail.Message;
 
 import org.apache.camel.Endpoint;
-import org.apache.camel.pollconsumer.quartz.QuartzScheduledPollConsumerScheduler;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeResolverTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeResolverTest.java
index d2506b8..bb5742b 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeResolverTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeResolverTest.java
@@ -23,7 +23,6 @@ import javax.activation.FileDataSource;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
-import org.apache.camel.Message;
 import org.apache.camel.Producer;
 import org.apache.camel.attachment.AttachmentMessage;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java
index 17c7290..51fa0cd 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java
@@ -23,7 +23,6 @@ import javax.activation.FileDataSource;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
-import org.apache.camel.Message;
 import org.apache.camel.Producer;
 import org.apache.camel.attachment.AttachmentMessage;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java
index 34def5a..d0964fe 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java
@@ -24,7 +24,6 @@ import javax.activation.FileDataSource;
 import javax.mail.internet.MimeMultipart;
 
 import org.apache.camel.Exchange;
-import org.apache.camel.Message;
 import org.apache.camel.attachment.AttachmentMessage;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithLongerFilenameTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithLongerFilenameTest.java
index 9ffdbc3..dead234 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithLongerFilenameTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithLongerFilenameTest.java
@@ -24,7 +24,6 @@ import javax.activation.FileDataSource;
 import javax.mail.internet.MimeMultipart;
 
 import org.apache.camel.Exchange;
-import org.apache.camel.Message;
 import org.apache.camel.attachment.AttachmentMessage;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/SpringMailSplitAttachmentsTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/SpringMailSplitAttachmentsTest.java
index 18bb761..b9c72a2 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/SpringMailSplitAttachmentsTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/SpringMailSplitAttachmentsTest.java
@@ -21,7 +21,6 @@ import javax.activation.FileDataSource;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
-import org.apache.camel.Message;
 import org.apache.camel.Producer;
 import org.apache.camel.attachment.AttachmentMessage;
 import org.apache.camel.component.mock.MockEndpoint;
diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentTest.java
index 7eaa38b..0489536 100644
--- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentTest.java
+++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentTest.java
@@ -22,7 +22,6 @@ import java.util.HashMap;
 import java.util.Map;
 
 import com.codahale.metrics.MetricRegistry;
-import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.ExtendedCamelContext;
 import org.apache.camel.RuntimeCamelException;
diff --git a/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientConfiguration.java b/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientConfiguration.java
index 871bca9..a532657 100644
--- a/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientConfiguration.java
+++ b/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientConfiguration.java
@@ -17,8 +17,6 @@
 package org.apache.camel.component.milo.client;
 
 import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.security.GeneralSecurityException;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockEndpoint.java b/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
index 485b431..7efce6a 100644
--- a/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
+++ b/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
@@ -43,7 +43,7 @@ import org.apache.camel.Message;
 import org.apache.camel.Predicate;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
-import org.apache.camel.RuntimeExchangeException;
+import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spi.BrowsableEndpoint;
 import org.apache.camel.spi.InterceptSendToEndpoint;
 import org.apache.camel.spi.Metadata;
@@ -1236,7 +1236,7 @@ public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint,
             try {
                 return latch.await(0, TimeUnit.SECONDS);
             } catch (InterruptedException e) {
-                throw RuntimeExchangeException.wrapRuntimeException(e);
+                throw RuntimeCamelException.wrapRuntimeException(e);
             }
         } else {
             return true;
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 a4f6f55..9c28a81 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
@@ -42,7 +42,6 @@ import org.apache.camel.spi.UriPath;
 import org.apache.camel.support.CamelContextHelper;
 import org.apache.camel.support.DefaultEndpoint;
 import org.apache.camel.util.ObjectHelper;
-import org.apache.camel.util.StringHelper;
 import org.bson.Document;
 import org.bson.conversions.Bson;
 
diff --git a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbConnectionBeansTest.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbConnectionBeansTest.java
index 14189da..a37d8f3 100644
--- a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbConnectionBeansTest.java
+++ b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbConnectionBeansTest.java
@@ -16,17 +16,10 @@
  */
 package org.apache.camel.component.mongodb;
 
-import java.util.Properties;
-
 import com.mongodb.MongoClient;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
-import org.apache.camel.NoSuchBeanException;
-import org.apache.camel.component.properties.PropertiesComponent;
-import org.apache.camel.spring.SpringCamelContext;
 import org.junit.Test;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
 public class MongoDbConnectionBeansTest extends AbstractMongoDbTest {
 
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpMuteExceptionTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpMuteExceptionTest.java
index 58b68cb..3473a4b 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpMuteExceptionTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpMuteExceptionTest.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.netty.http;
 
-import org.apache.camel.CamelExecutionException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.methods.GetMethod;
diff --git a/components/camel-netty/src/main/java/org/apache/camel/component/netty/ClientModeTCPNettyServerBootstrapFactory.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty/ClientModeTCPNettyServerBootstrapFactory.java
index 0acc31a..e661e38 100644
--- a/components/camel-netty/src/main/java/org/apache/camel/component/netty/ClientModeTCPNettyServerBootstrapFactory.java
+++ b/components/camel-netty/src/main/java/org/apache/camel/component/netty/ClientModeTCPNettyServerBootstrapFactory.java
@@ -192,7 +192,7 @@ public class ClientModeTCPNettyServerBootstrapFactory extends ServiceSupport imp
                 @Override
                 public void operationComplete(ChannelFuture future) throws Exception {
                     scheduleReconnect(channelFuture);
-                };
+                }
             });
         }
 
diff --git a/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqTestSupport.java b/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqTestSupport.java
index d2e980d..099f6e4 100644
--- a/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqTestSupport.java
+++ b/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqTestSupport.java
@@ -39,7 +39,7 @@ public class NsqTestSupport extends ContainerAwareTestSupport {
     @Override
     protected List<GenericContainer<?>> createContainers() {
         network = Network.newNetwork();
-        return new ArrayList<GenericContainer<?>>(Arrays.asList(nsqlookupdContainer(network), nsqdContainer(network)));
+        return new ArrayList<>(Arrays.asList(nsqlookupdContainer(network), nsqdContainer(network)));
     }
 
     public static GenericContainer<?> nsqlookupdContainer(Network network) {
diff --git a/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2ComponentConsumerTest.java b/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2ComponentConsumerTest.java
index 851091a..64e8726 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2ComponentConsumerTest.java
+++ b/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2ComponentConsumerTest.java
@@ -90,7 +90,7 @@ public class Olingo2ComponentConsumerTest extends AbstractOlingo2TestSupport {
             public void configure() {
                 from("olingo2://read/Manufacturers?filterAlreadySeen=true&" + "delay=2&sendEmptyMessageWhenIdle=true&" + "splitResult=false")
                     .to("mock:consumer-alreadyseen");
-            };
+            }
         };
         addRouteAndStartContext(builder);
 
@@ -140,7 +140,7 @@ public class Olingo2ComponentConsumerTest extends AbstractOlingo2TestSupport {
             public void configure() {
                 from("olingo2://read/Manufacturers?filterAlreadySeen=true&" + "delay=2&sendEmptyMessageWhenIdle=false&" + "splitResult=false")
                     .to("mock:consumer-alreadyseen");
-            };
+            }
         };
         addRouteAndStartContext(builder);
 
@@ -178,7 +178,7 @@ public class Olingo2ComponentConsumerTest extends AbstractOlingo2TestSupport {
             public void configure() {
                 from("olingo2://read/Manufacturers('1')?filterAlreadySeen=true&" + "delay=2&sendEmptyMessageWhenIdle=true&" + "splitResult=true")
                     .to("mock:consumer-splitresult-kp-manufacturer");
-            };
+            }
         };
         addRouteAndStartContext(builder);
 
@@ -228,7 +228,7 @@ public class Olingo2ComponentConsumerTest extends AbstractOlingo2TestSupport {
             public void configure() {
                 from("olingo2://read/Manufacturers('1')?filterAlreadySeen=true&" + "delay=2&sendEmptyMessageWhenIdle=false&" + "splitResult=true")
                     .to("mock:consumer-splitresult-kp-manufacturer");
-            };
+            }
         };
         addRouteAndStartContext(builder);
 
@@ -266,7 +266,7 @@ public class Olingo2ComponentConsumerTest extends AbstractOlingo2TestSupport {
         RouteBuilder builder = new RouteBuilder() {
             public void configure() {
                 from("olingo2://read/Manufacturers('1')/Address?splitResult=true").to("mock:consumer-value");
-            };
+            }
         };
         addRouteAndStartContext(builder);
 
@@ -299,7 +299,7 @@ public class Olingo2ComponentConsumerTest extends AbstractOlingo2TestSupport {
         RouteBuilder builder = new RouteBuilder() {
             public void configure() {
                 from("olingo2://read/Manufacturers?splitResult=true").to("mock:consumer-splitresult");
-            };
+            }
         };
 
         addRouteAndStartContext(builder);
diff --git a/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/Olingo4ComponentConsumerTest.java b/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/Olingo4ComponentConsumerTest.java
index c0ae176..e53e2f8 100644
--- a/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/Olingo4ComponentConsumerTest.java
+++ b/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/Olingo4ComponentConsumerTest.java
@@ -56,7 +56,7 @@ public class Olingo4ComponentConsumerTest extends AbstractOlingo4TestSupport {
         RouteBuilder builder = new RouteBuilder() {
             public void configure() {
                 from("olingo4://read/" + PEOPLE + "?" + "$filter=LastName eq 'Whyte'&$expand=Trips").to("mock:consumer-query");
-            };
+            }
         };
         addRouteAndStartContext(builder);
 
@@ -99,7 +99,7 @@ public class Olingo4ComponentConsumerTest extends AbstractOlingo4TestSupport {
             public void configure() {
                 from("olingo4://read/" + PEOPLE + "?delay=2&sendEmptyMessageWhenIdle=true&splitResult=false&filterAlreadySeen=true")
                     .to("mock:consumer-alreadyseen");
-            };
+            }
         };
         addRouteAndStartContext(builder);
 
@@ -150,7 +150,7 @@ public class Olingo4ComponentConsumerTest extends AbstractOlingo4TestSupport {
             public void configure() {
                 from("olingo4://read/" + PEOPLE + "?delay=2&sendEmptyMessageWhenIdle=false&splitResult=false&filterAlreadySeen=true")
                     .to("mock:consumer-alreadyseen");
-            };
+            }
         };
         addRouteAndStartContext(builder);
 
@@ -188,7 +188,7 @@ public class Olingo4ComponentConsumerTest extends AbstractOlingo4TestSupport {
             public void configure() {
                 from("olingo4://read/" + AIRPORTS + "('KSFO')" + "?filterAlreadySeen=true&" + "delay=2&sendEmptyMessageWhenIdle=true&"
                      + "splitResult=true").to("mock:consumer-splitresult-kp-airport");
-            };
+            }
         };
         addRouteAndStartContext(builder);
 
@@ -238,7 +238,7 @@ public class Olingo4ComponentConsumerTest extends AbstractOlingo4TestSupport {
             public void configure() {
                 from("olingo4://read/" + AIRPORTS + "('KSFO')" + "?filterAlreadySeen=true&" + "delay=2&sendEmptyMessageWhenIdle=false&"
                      + "splitResult=true").to("mock:consumer-splitresult-kp-airport");
-            };
+            }
         };
         addRouteAndStartContext(builder);
 
@@ -275,7 +275,7 @@ public class Olingo4ComponentConsumerTest extends AbstractOlingo4TestSupport {
         RouteBuilder builder = new RouteBuilder() {
             public void configure() {
                 from("olingo4://read/" + PEOPLE + "?splitResult=true").to("mock:consumer-splitresult");
-            };
+            }
         };
         addRouteAndStartContext(builder);
 
@@ -318,7 +318,7 @@ public class Olingo4ComponentConsumerTest extends AbstractOlingo4TestSupport {
         RouteBuilder builder = new RouteBuilder() {
             public void configure() {
                 from("olingo4://read/" + TEST_PEOPLE + "/FavoriteFeature?splitResult=true").to("mock:consumer-splitresult-value");
-            };
+            }
         };
         addRouteAndStartContext(builder);
 
@@ -344,7 +344,7 @@ public class Olingo4ComponentConsumerTest extends AbstractOlingo4TestSupport {
         RouteBuilder builder = new RouteBuilder() {
             public void configure() {
                 from("olingo4://read/" + TEST_PEOPLE + "/AddressInfo?splitResult=true").to("mock:consumer-splitresult-collection-value");
-            };
+            }
         };
         addRouteAndStartContext(builder);
 
@@ -370,7 +370,7 @@ public class Olingo4ComponentConsumerTest extends AbstractOlingo4TestSupport {
         RouteBuilder builder = new RouteBuilder() {
             public void configure() {
                 from("olingo4://read/" + TEST_PEOPLE + "/AddressInfo?splitResult=false").to("mock:consumer-nosplitresult-colleciton-value");
-            };
+            }
         };
         addRouteAndStartContext(builder);
 
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/common/OpenstackException.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/common/OpenstackException.java
index 6466dff..4aa9954 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/common/OpenstackException.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/common/OpenstackException.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.component.openstack.common;
 
-import org.apache.camel.Exchange;
-
 public class OpenstackException extends Exception {
 
     public OpenstackException(String message) {
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeProducerTest.java
index 69bfbb2..6b26652 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeProducerTest.java
@@ -34,10 +34,8 @@ import org.openstack4j.model.storage.block.Volume;
 import org.openstack4j.model.storage.block.builder.VolumeBuilder;
 
 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.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.verify;
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeSnapshotProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeSnapshotProducerTest.java
index e88e2dc..d099400 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeSnapshotProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeSnapshotProducerTest.java
@@ -33,7 +33,6 @@ import org.openstack4j.model.common.ActionResponse;
 import org.openstack4j.model.storage.block.VolumeSnapshot;
 
 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.mockito.ArgumentMatchers.any;
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/DomainProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/DomainProducerTest.java
index fa02d1e..a1ab71b 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/DomainProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/DomainProducerTest.java
@@ -35,7 +35,6 @@ import org.openstack4j.model.identity.v3.Domain;
 import org.openstack4j.model.network.Network;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/GroupProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/GroupProducerTest.java
index 605c206..89bc885 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/GroupProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/GroupProducerTest.java
@@ -35,7 +35,6 @@ import org.openstack4j.model.identity.v3.Group;
 import org.openstack4j.model.network.Network;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/ProjectProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/ProjectProducerTest.java
index e1be336..9577915 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/ProjectProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/ProjectProducerTest.java
@@ -35,7 +35,6 @@ import org.openstack4j.model.identity.v3.Project;
 import org.openstack4j.model.network.Network;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/RegionProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/RegionProducerTest.java
index 9e8b10a..2874d2a 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/RegionProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/RegionProducerTest.java
@@ -35,7 +35,6 @@ import org.openstack4j.model.identity.v3.Region;
 import org.openstack4j.model.network.Network;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/UserProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/UserProducerTest.java
index 7d9722d..73299c7 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/UserProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/UserProducerTest.java
@@ -35,7 +35,6 @@ import org.openstack4j.model.identity.v3.User;
 import org.openstack4j.model.network.Network;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/NetworkProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/NetworkProducerTest.java
index c7f15ed..6501467 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/NetworkProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/NetworkProducerTest.java
@@ -36,7 +36,6 @@ import org.openstack4j.model.network.Network;
 import org.openstack4j.model.network.NetworkType;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/PortProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/PortProducerTest.java
index 8af3d62..0075acc 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/PortProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/PortProducerTest.java
@@ -35,7 +35,6 @@ import org.openstack4j.model.common.ActionResponse;
 import org.openstack4j.model.network.Port;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/RouterProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/RouterProducerTest.java
index 8b9aea8..0767267 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/RouterProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/RouterProducerTest.java
@@ -38,7 +38,6 @@ import org.openstack4j.model.network.RouterInterface;
 import org.openstack4j.openstack.networking.domain.NeutronRouterInterface;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/SubnetProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/SubnetProducerTest.java
index 692fd78..3e9601b 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/SubnetProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/SubnetProducerTest.java
@@ -36,7 +36,6 @@ import org.openstack4j.model.network.IPVersionType;
 import org.openstack4j.model.network.Subnet;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/FlavorProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/FlavorProducerTest.java
index d4b7723..f261b1b 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/FlavorProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/FlavorProducerTest.java
@@ -38,7 +38,6 @@ import org.openstack4j.model.compute.Flavor;
 import org.openstack4j.model.compute.builder.FlavorBuilder;
 
 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;
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/ServerProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/ServerProducerTest.java
index cde240d..c0c26df 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/ServerProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/ServerProducerTest.java
@@ -35,7 +35,6 @@ import org.openstack4j.model.compute.Server;
 import org.openstack4j.model.compute.ServerCreate;
 
 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;
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/ContainerProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/ContainerProducerTest.java
index 6478b04..6717c09 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/ContainerProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/ContainerProducerTest.java
@@ -37,9 +37,7 @@ import org.openstack4j.model.storage.object.options.ContainerListOptions;
 import org.openstack4j.model.storage.object.options.CreateUpdateContainerOptions;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.isNull;
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/ObjectProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/ObjectProducerTest.java
index 312d22c..cf6929a 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/ObjectProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/ObjectProducerTest.java
@@ -41,7 +41,6 @@ import org.openstack4j.model.storage.object.SwiftObject;
 import org.openstack4j.model.storage.object.options.ObjectLocation;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doReturn;
diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/propagation/CamelMessagingHeadersExtractAdapterTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/propagation/CamelMessagingHeadersExtractAdapterTest.java
index 3d13788..53dfff1 100644
--- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/propagation/CamelMessagingHeadersExtractAdapterTest.java
+++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/propagation/CamelMessagingHeadersExtractAdapterTest.java
@@ -33,7 +33,7 @@ public class CamelMessagingHeadersExtractAdapterTest {
 
     @Before
     public void before() {
-        map = new HashMap<String, Object>();
+        map = new HashMap<>();
     }
 
     @Test
diff --git a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/propagation/CamelMessagingHeadersInjectAdapterTest.java b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/propagation/CamelMessagingHeadersInjectAdapterTest.java
index e98dc02..fa1fb2d 100644
--- a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/propagation/CamelMessagingHeadersInjectAdapterTest.java
+++ b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/propagation/CamelMessagingHeadersInjectAdapterTest.java
@@ -36,7 +36,7 @@ public class CamelMessagingHeadersInjectAdapterTest {
 
     @Before
     public void before() {
-        map = new HashMap<String, Object>();
+        map = new HashMap<>();
     }
 
     @Test
diff --git a/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoConfiguration.java b/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoConfiguration.java
index 6e93625..0d5239c 100644
--- a/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoConfiguration.java
+++ b/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoConfiguration.java
@@ -24,7 +24,6 @@ import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.spi.UriParams;
-import org.eclipse.paho.client.mqttv3.MqttMessage;
 
 @UriParams
 public class PahoConfiguration implements Cloneable {
diff --git a/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalAndUnmarshalJsonTest.java b/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalAndUnmarshalJsonTest.java
index 535aa4a..5268918 100644
--- a/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalAndUnmarshalJsonTest.java
+++ b/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalAndUnmarshalJsonTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.dataformat.protobuf;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.dataformat.protobuf.generated.AddressBookProtos;
 import org.apache.camel.dataformat.protobuf.generated.AddressBookProtos.Person;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
diff --git a/components/camel-pubnub/src/main/java/org/apache/camel/component/pubnub/PubNubProducer.java b/components/camel-pubnub/src/main/java/org/apache/camel/component/pubnub/PubNubProducer.java
index 2eec337..73c71bc 100644
--- a/components/camel-pubnub/src/main/java/org/apache/camel/component/pubnub/PubNubProducer.java
+++ b/components/camel-pubnub/src/main/java/org/apache/camel/component/pubnub/PubNubProducer.java
@@ -170,7 +170,7 @@ public class PubNubProducer extends DefaultAsyncProducer {
                 public void onResponse(PNSetStateResult result, PNStatus status) {
                     log.debug("Got setState responsee [{}]", result);
                     processMessage(exchange, callback, status, result);
-                };
+                }
             });
     }
 
@@ -212,7 +212,7 @@ public class PubNubProducer extends DefaultAsyncProducer {
                 public void onResponse(PNWhereNowResult result, PNStatus status) {
                     log.debug("Got whereNow message [{}]", result.getChannels());
                     processMessage(exchange, callback, status, result.getChannels());
-                };
+                }
             });
     }
 
diff --git a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarComponentTest.java b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarComponentTest.java
index 6ef8983..a3f2487 100644
--- a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarComponentTest.java
+++ b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarComponentTest.java
@@ -21,8 +21,8 @@ import org.apache.camel.component.pulsar.utils.consumers.SubscriptionType;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Before;
 import org.junit.Test;
-import org.mockito.Matchers;
 
+import org.mockito.ArgumentMatchers;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -74,7 +74,7 @@ public class PulsarComponentTest extends CamelTestSupport {
 
         component.createEndpoint("pulsar://persistent/test/foobar/BatchCreated?numberOfConsumers=10&subscriptionName=batch-created-subscription&subscriptionType=Shared");
 
-        verify(autoConfiguration).ensureNameSpaceAndTenant(Matchers.anyString());
+        verify(autoConfiguration).ensureNameSpaceAndTenant(ArgumentMatchers.anyString());
     }
 
     @Test
diff --git a/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledRoutePolicyConstants.java b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledRoutePolicyConstants.java
index 9da96ca..1a77638 100644
--- a/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledRoutePolicyConstants.java
+++ b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledRoutePolicyConstants.java
@@ -22,7 +22,7 @@ package org.apache.camel.routepolicy.quartz;
 public interface ScheduledRoutePolicyConstants {
     enum Action {
         START, STOP, SUSPEND, RESUME
-    };
+    }
 
     String SCHEDULED_ROUTE = "ScheduledRoute";
     String SCHEDULED_TRIGGER = "ScheduledTrigger";
diff --git a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutor.java b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutor.java
index e03d028..669f928 100644
--- a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutor.java
+++ b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutor.java
@@ -432,5 +432,5 @@ public class TradeExecutor {
         public double getBid(String symbol) {
             return defaultMarketPrice;
         }
-    };
+    }
 }
\ No newline at end of file
diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQMessageConverter.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQMessageConverter.java
index 91172ad..a5ceb41 100644
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQMessageConverter.java
+++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQMessageConverter.java
@@ -20,8 +20,6 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.ObjectInputStream;
-import java.math.BigDecimal;
-import java.sql.Timestamp;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQProducerIntTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQProducerIntTest.java
index 617cbd9..fe5ffdd 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQProducerIntTest.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQProducerIntTest.java
@@ -122,8 +122,8 @@ public class RabbitMQProducerIntTest extends AbstractRabbitMQIntTest {
     @Test
     public void producedMessageWithNotNullHeaders() throws InterruptedException, IOException, TimeoutException {
         final List<String> received = new ArrayList<>();
-        final Map<String, Object> receivedHeaders = new HashMap<String, Object>();
-        Map<String, Object> headers = new HashMap<String, Object>();
+        final Map<String, Object> receivedHeaders = new HashMap<>();
+        Map<String, Object> headers = new HashMap<>();
         
         headers.put(RabbitMQConstants.EXCHANGE_NAME, EXCHANGE);
         headers.put(CUSTOM_HEADER, CUSTOM_HEADER.toLowerCase());
@@ -138,8 +138,8 @@ public class RabbitMQProducerIntTest extends AbstractRabbitMQIntTest {
     @Test
     public void producedMessageAllowNullHeaders() throws InterruptedException, IOException, TimeoutException {
         final List<String> received = new ArrayList<>();
-        final Map<String, Object> receivedHeaders = new HashMap<String, Object>();
-        Map<String, Object> headers = new HashMap<String, Object>();
+        final Map<String, Object> receivedHeaders = new HashMap<>();
+        Map<String, Object> headers = new HashMap<>();
         
         headers.put(RabbitMQConstants.EXCHANGE_NAME, null);
         headers.put(CUSTOM_HEADER, null);
@@ -231,7 +231,7 @@ public class RabbitMQProducerIntTest extends AbstractRabbitMQIntTest {
         ArrayPopulatingConsumer(final List<String> received) {
             super(RabbitMQProducerIntTest.this.channel);
             this.received = received;
-            receivedHeaders = new HashMap<String, Object>();
+            receivedHeaders = new HashMap<>();
         }
         
         ArrayPopulatingConsumer(final List<String> received, Map<String, Object> receivedHeaders) {
diff --git a/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/util/UnwrapStreamProcessor.java b/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/util/UnwrapStreamProcessor.java
index f6aaad5..839c527 100644
--- a/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/util/UnwrapStreamProcessor.java
+++ b/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/util/UnwrapStreamProcessor.java
@@ -21,7 +21,6 @@ import java.util.List;
 
 import org.apache.camel.AsyncCallback;
 import org.apache.camel.Exchange;
-import org.apache.camel.support.AsyncProcessorHelper;
 import org.apache.camel.support.AsyncProcessorSupport;
 import org.reactivestreams.Publisher;
 import org.reactivestreams.Subscriber;
diff --git a/components/camel-rest/src/main/java/org/apache/camel/component/rest/RestApiEndpoint.java b/components/camel-rest/src/main/java/org/apache/camel/component/rest/RestApiEndpoint.java
index 69bc559..5dc0bee 100644
--- a/components/camel-rest/src/main/java/org/apache/camel/component/rest/RestApiEndpoint.java
+++ b/components/camel-rest/src/main/java/org/apache/camel/component/rest/RestApiEndpoint.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.rest;
 
 import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
 
 import org.apache.camel.Component;
diff --git a/components/camel-robotframework/src/main/java/org/apache/camel/component/robotframework/RobotFrameworkArguments.java b/components/camel-robotframework/src/main/java/org/apache/camel/component/robotframework/RobotFrameworkArguments.java
index 22eaf7f..e27335f 100644
--- a/components/camel-robotframework/src/main/java/org/apache/camel/component/robotframework/RobotFrameworkArguments.java
+++ b/components/camel-robotframework/src/main/java/org/apache/camel/component/robotframework/RobotFrameworkArguments.java
@@ -25,7 +25,7 @@ import org.apache.camel.util.ObjectHelper;
 
 public class RobotFrameworkArguments {
 
-    private final List<String> arguments = new ArrayList<String>();
+    private final List<String> arguments = new ArrayList<>();
 
     public void addFileToArguments(File file, String flag) {
         if (isFileValid(file)) {
@@ -59,7 +59,7 @@ public class RobotFrameworkArguments {
             return;
         }
         String[] splittedVariablesToAdd = variablesToAdd.split(",");
-        addListToArguments(new ArrayList<String>(Arrays.asList(splittedVariablesToAdd)), flag);
+        addListToArguments(new ArrayList<>(Arrays.asList(splittedVariablesToAdd)), flag);
     }
 
     public void addListToArguments(List<String> variablesToAdd, String flag) {
diff --git a/components/camel-robotframework/src/main/java/org/apache/camel/component/robotframework/RobotFrameworkCamelConstants.java b/components/camel-robotframework/src/main/java/org/apache/camel/component/robotframework/RobotFrameworkCamelConstants.java
index b7b47a3..8fa3985 100644
--- a/components/camel-robotframework/src/main/java/org/apache/camel/component/robotframework/RobotFrameworkCamelConstants.java
+++ b/components/camel-robotframework/src/main/java/org/apache/camel/component/robotframework/RobotFrameworkCamelConstants.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.robotframework;
 
 public interface RobotFrameworkCamelConstants {
 
-    public final String CAMEL_ROBOT_VARIABLES = "CamelRobotVariables";
-    public final String CAMEL_ROBOT_RETURN_CODE = "CamelRobotReturnCode";
-    public final String CAMEL_ROBOT_RESOURCE_URI = "CamelRobotResourceUri";
+    String CAMEL_ROBOT_VARIABLES = "CamelRobotVariables";
+    String CAMEL_ROBOT_RETURN_CODE = "CamelRobotReturnCode";
+    String CAMEL_ROBOT_RESOURCE_URI = "CamelRobotResourceUri";
 
 }
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/AbstractDTOBase.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/AbstractDTOBase.java
index 4558b6c..c7f29a7 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/AbstractDTOBase.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/AbstractDTOBase.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.salesforce.api.dto;
 import java.io.IOException;
 import java.io.StringWriter;
 
-import com.fasterxml.jackson.annotation.JsonFilter;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/approval/Approvals.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/approval/Approvals.java
index 951bce4..833344f 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/approval/Approvals.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/approval/Approvals.java
@@ -121,7 +121,7 @@ public final class Approvals implements Serializable {
      */
     public List<Info> approvalsFor(final String object) {
         return approvals.getOrDefault(object, Collections.emptyList());
-    };
+    }
 
     /**
      * Returns approvals by Salesforce object type. You might have approvals for
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/composite/SObjectNode.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/composite/SObjectNode.java
index d19ed05..52c1be4 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/composite/SObjectNode.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/composite/SObjectNode.java
@@ -31,7 +31,6 @@ import static java.util.Objects.requireNonNull;
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamConverter;
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/JsonRestProcessor.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/JsonRestProcessor.java
index d09d1d3..76104d5 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/JsonRestProcessor.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/JsonRestProcessor.java
@@ -30,7 +30,6 @@ import org.apache.camel.AsyncCallback;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.component.salesforce.SalesforceEndpoint;
-import org.apache.camel.component.salesforce.SalesforceEndpointConfig;
 import org.apache.camel.component.salesforce.api.SalesforceException;
 import org.apache.camel.component.salesforce.api.TypeReferences;
 import org.apache.camel.component.salesforce.api.dto.AbstractDTOBase;
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/ChangeEventsConsumerIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/ChangeEventsConsumerIntegrationTest.java
index 17d1d1f..1f12ca9 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/ChangeEventsConsumerIntegrationTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/ChangeEventsConsumerIntegrationTest.java
@@ -69,7 +69,7 @@ public class ChangeEventsConsumerIntegrationTest extends AbstractSalesforceTestB
         final Message createEvent = capturedChangeEvents.getExchanges().get(0).getIn();
         Assert.assertNotNull(createEvent);
         Assert.assertEquals("CREATE", createEvent.getHeader("CamelSalesforceChangeType"));
-        final Map<String, Object> createEventBody = (Map<String, Object>)createEvent.getBody(Map.class);
+        final Map<String, Object> createEventBody = createEvent.getBody(Map.class);
         Assert.assertNotNull(createEventBody);
         Assert.assertEquals(ACCOUNT_NAME, createEventBody.get("Name"));
         Assert.assertFalse(createEventBody.containsKey("Description"));
@@ -77,7 +77,7 @@ public class ChangeEventsConsumerIntegrationTest extends AbstractSalesforceTestB
         final Message updateEvent = capturedChangeEvents.getExchanges().get(1).getIn();
         Assert.assertNotNull(updateEvent);
         Assert.assertEquals("UPDATE", updateEvent.getHeader("CamelSalesforceChangeType"));
-        final Map<String, Object> updateEventBody = (Map<String, Object>)updateEvent.getBody(Map.class);
+        final Map<String, Object> updateEventBody = updateEvent.getBody(Map.class);
         Assert.assertNotNull(updateEventBody);
         Assert.assertFalse(updateEventBody.containsKey("Name"));
         Assert.assertEquals(ACCOUNT_DESCRIPTION, updateEventBody.get("Description"));
@@ -85,7 +85,7 @@ public class ChangeEventsConsumerIntegrationTest extends AbstractSalesforceTestB
         final Message deleteEvent = capturedChangeEvents.getExchanges().get(2).getIn();
         Assert.assertNotNull(deleteEvent);
         Assert.assertEquals("DELETE", deleteEvent.getHeader("CamelSalesforceChangeType"));
-        final Map<String, Object> deleteEventBody = (Map<String, Object>)deleteEvent.getBody(Map.class);
+        final Map<String, Object> deleteEventBody = deleteEvent.getBody(Map.class);
         Assert.assertFalse(deleteEventBody.containsKey("Name"));
         Assert.assertFalse(deleteEventBody.containsKey("Description"));
     }
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/composite/SObjectBatchTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/composite/SObjectBatchTest.java
index a92d73c..1438d0e 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/composite/SObjectBatchTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/composite/SObjectBatchTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.component.salesforce.api.dto.composite;
 
-import java.util.regex.Pattern;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.thoughtworks.xstream.XStream;
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Contact.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Contact.java
index d3afdce..4aaf257 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Contact.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Contact.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.salesforce.dto.generated;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import org.apache.camel.component.salesforce.api.dto.AbstractDescribedSObjectBase;
-import org.apache.camel.component.salesforce.api.dto.Attributes;
 import org.apache.camel.component.salesforce.api.dto.SObjectDescription;
 import org.apache.camel.component.salesforce.api.dto.SObjectDescriptionUrls;
 import org.apache.camel.component.salesforce.api.dto.SObjectField;
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Document.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Document.java
index 7395bbd..2b07493 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Document.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Document.java
@@ -20,8 +20,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 
 import org.apache.camel.component.salesforce.api.dto.AbstractDescribedSObjectBase;
-import org.apache.camel.component.salesforce.api.dto.AbstractSObjectBase;
-import org.apache.camel.component.salesforce.api.dto.Attributes;
 import org.apache.camel.component.salesforce.api.dto.SObjectDescription;
 import org.apache.camel.component.salesforce.api.dto.SObjectDescriptionUrls;
 import org.apache.camel.component.salesforce.api.dto.SObjectField;
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Line_Item__c.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Line_Item__c.java
index 5f9b121..7fec19c 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Line_Item__c.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Line_Item__c.java
@@ -20,8 +20,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 
 import org.apache.camel.component.salesforce.api.dto.AbstractDescribedSObjectBase;
-import org.apache.camel.component.salesforce.api.dto.AbstractSObjectBase;
-import org.apache.camel.component.salesforce.api.dto.Attributes;
 import org.apache.camel.component.salesforce.api.dto.SObjectDescription;
 import org.apache.camel.component.salesforce.api.dto.SObjectDescriptionUrls;
 import org.apache.camel.component.salesforce.api.dto.SObjectField;
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Merchandise__c.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Merchandise__c.java
index 377386a..9798951 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Merchandise__c.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/Merchandise__c.java
@@ -20,8 +20,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 
 import org.apache.camel.component.salesforce.api.dto.AbstractDescribedSObjectBase;
-import org.apache.camel.component.salesforce.api.dto.AbstractSObjectBase;
-import org.apache.camel.component.salesforce.api.dto.Attributes;
 import org.apache.camel.component.salesforce.api.dto.SObjectDescription;
 import org.apache.camel.component.salesforce.api.dto.SObjectDescriptionUrls;
 import org.apache.camel.component.salesforce.api.dto.SObjectField;
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/StringMSPTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/StringMSPTest.java
index 3c92c8f..06bec5c 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/StringMSPTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/StringMSPTest.java
@@ -16,19 +16,12 @@
  */
 package org.apache.camel.component.salesforce.dto.generated;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonValue;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamConverter;
 
-import org.apache.camel.component.salesforce.api.MultiSelectPicklistConverter;
-import org.apache.camel.component.salesforce.api.MultiSelectPicklistDeserializer;
-import org.apache.camel.component.salesforce.api.MultiSelectPicklistSerializer;
 import org.apache.camel.component.salesforce.api.StringMultiSelectPicklistConverter;
 import org.apache.camel.component.salesforce.api.StringMultiSelectPicklistDeserializer;
 import org.apache.camel.component.salesforce.api.StringMultiSelectPicklistSerializer;
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoOutputTest.java b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoOutputTest.java
index 21c9aa9..9889838 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoOutputTest.java
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoOutputTest.java
@@ -20,7 +20,6 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryEndpoint.java b/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryEndpoint.java
index ecafdbd..e2b06cd 100644
--- a/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryEndpoint.java
+++ b/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryEndpoint.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.xquery;
 
 import java.io.InputStream;
-import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltFeatureRouteTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltFeatureRouteTest.java
index a8567da..9315a76 100644
--- a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltFeatureRouteTest.java
+++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltFeatureRouteTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.component.xslt;
 
-import javax.xml.transform.TransformerException;
-
 import net.sf.saxon.trans.UncheckedXPathException;
 
 import org.apache.camel.CamelExecutionException;
diff --git a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/SchematronProcessorFactory.java b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/SchematronProcessorFactory.java
index 14ee954..655f835 100644
--- a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/SchematronProcessorFactory.java
+++ b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/SchematronProcessorFactory.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.schematron.processor;
 
-import javax.xml.XMLConstants;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
diff --git a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/HttpClientRouteTest.java b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/HttpClientRouteTest.java
index 5f59dca..e85cbf7 100644
--- a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/HttpClientRouteTest.java
+++ b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/HttpClientRouteTest.java
@@ -28,7 +28,6 @@ import com.meterware.httpunit.WebResponse;
 import com.meterware.servletunit.ServletUnitClient;
 import org.apache.camel.Exchange;
 import org.apache.camel.FailedToCreateProducerException;
-import org.apache.camel.FailedToCreateRouteException;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.Test;
diff --git a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletMuteExceptionTest.java b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletMuteExceptionTest.java
index 2e7d057..6a48a2b 100644
--- a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletMuteExceptionTest.java
+++ b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletMuteExceptionTest.java
@@ -23,8 +23,6 @@ import com.meterware.httpunit.WebRequest;
 import com.meterware.httpunit.WebResponse;
 import com.meterware.servletunit.ServletUnitClient;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.http.common.HttpConstants;
-import org.apache.camel.http.common.HttpHelper;
 import org.junit.Test;
 
 public class ServletMuteExceptionTest extends ServletCamelRouterTestSupport {
diff --git a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletSetExchangePropertyBeanTest.java b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletSetExchangePropertyBeanTest.java
index 61d972b..49e1f4f 100644
--- a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletSetExchangePropertyBeanTest.java
+++ b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletSetExchangePropertyBeanTest.java
@@ -20,7 +20,6 @@ import com.meterware.httpunit.GetMethodWebRequest;
 import com.meterware.httpunit.WebRequest;
 import com.meterware.httpunit.WebResponse;
 import com.meterware.servletunit.ServletUnitClient;
-import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.junit.Test;
 
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumerTest.java
index ecf7d10..a2df865 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumerTest.java
@@ -33,7 +33,6 @@ import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.component.sjms.SjmsComponent;
 import org.apache.camel.component.sjms.support.MockConnectionFactory;
 import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.processor.aggregate.GroupedBodyAggregationStrategy;
 import org.apache.camel.support.SimpleRegistry;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.apache.camel.util.StopWatch;
diff --git a/components/camel-sjms2/src/main/java/org/apache/camel/component/sjms2/Sjms2Endpoint.java b/components/camel-sjms2/src/main/java/org/apache/camel/component/sjms2/Sjms2Endpoint.java
index e1eda55..8c62cc1 100644
--- a/components/camel-sjms2/src/main/java/org/apache/camel/component/sjms2/Sjms2Endpoint.java
+++ b/components/camel-sjms2/src/main/java/org/apache/camel/component/sjms2/Sjms2Endpoint.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.sjms2;
 
 import org.apache.camel.AsyncEndpoint;
 import org.apache.camel.Component;
-import org.apache.camel.component.sjms.SjmsConsumer;
 import org.apache.camel.component.sjms.SjmsEndpoint;
 import org.apache.camel.component.sjms2.jms.Jms2ObjectFactory;
 import org.apache.camel.spi.UriEndpoint;
diff --git a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointTest.java b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointTest.java
index 5421694..4edc559 100644
--- a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointTest.java
+++ b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointTest.java
@@ -20,7 +20,6 @@ import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.ExchangePattern;
-import org.apache.camel.ResolveEndpointFailedException;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
diff --git a/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackComponentVerifierExtension.java b/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackComponentVerifierExtension.java
index e7e0793..869f7ae 100644
--- a/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackComponentVerifierExtension.java
+++ b/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackComponentVerifierExtension.java
@@ -107,14 +107,14 @@ public class SlackComponentVerifierExtension extends DefaultComponentVerifierExt
                 builder.error(ResultErrorBuilder.withCodeAndDescription(VerificationError.StandardCode.AUTHENTICATION, "Invalid webhookUrl").parameterKey("webhookUrl").build());
             }
         } 
-        if (ObjectHelper.isNotEmpty((String)parameters.get("token"))) {
+        if (ObjectHelper.isNotEmpty(parameters.get("token"))) {
             String token = (String)parameters.get("token");
 
             try {
                 HttpClient client = HttpClientBuilder.create().useSystemProperties().build();
                 HttpPost httpPost = new HttpPost(parameters.get("serverUrl") + "/api/channels.list");
 
-                List<BasicNameValuePair> params = new ArrayList<BasicNameValuePair>();
+                List<BasicNameValuePair> params = new ArrayList<>();
                 params.add(new BasicNameValuePair("token", token));
                 httpPost.setEntity(new UrlEncodedFormEntity(params));
 
diff --git a/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackConsumer.java b/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackConsumer.java
index a1539e9..54725e9 100644
--- a/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackConsumer.java
+++ b/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackConsumer.java
@@ -60,7 +60,7 @@ public class SlackConsumer extends ScheduledBatchPollingConsumer {
 
         HttpClient client = HttpClientBuilder.create().useSystemProperties().build();
         HttpPost httpPost = new HttpPost(slackEndpoint.getServerUrl() + "/api/channels.history");
-        List<BasicNameValuePair> params = new ArrayList<BasicNameValuePair>();
+        List<BasicNameValuePair> params = new ArrayList<>();
         params.add(new BasicNameValuePair("channel", channelId));
         if (ObjectHelper.isNotEmpty(timestamp)) {
             params.add(new BasicNameValuePair("oldest", timestamp));
@@ -128,7 +128,7 @@ public class SlackConsumer extends ScheduledBatchPollingConsumer {
         HttpClient client = HttpClientBuilder.create().useSystemProperties().build();
         HttpPost httpPost = new HttpPost(slackEndpoint.getServerUrl() + "/api/channels.list");
 
-        List<BasicNameValuePair> params = new ArrayList<BasicNameValuePair>();
+        List<BasicNameValuePair> params = new ArrayList<>();
         params.add(new BasicNameValuePair("token", slackEndpoint.getToken()));
         httpPost.setEntity(new UrlEncodedFormEntity(params));
 
diff --git a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrFixtures.java b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrFixtures.java
index 9c671fa..0ec2fcf 100644
--- a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrFixtures.java
+++ b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrFixtures.java
@@ -23,7 +23,6 @@ import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.client.solrj.embedded.JettySolrRunner;
 import org.apache.solr.client.solrj.impl.HttpSolrClient;
-import org.apache.solr.client.solrj.request.AbstractUpdateRequest;
 import org.apache.solr.client.solrj.request.AbstractUpdateRequest.ACTION;
 import org.apache.solr.client.solrj.request.UpdateRequest;
 
diff --git a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/CamelSpringDelegatingTestContextLoaderTest.java b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/CamelSpringDelegatingTestContextLoaderTest.java
index 7e41757..9fe6e40 100644
--- a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/CamelSpringDelegatingTestContextLoaderTest.java
+++ b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/CamelSpringDelegatingTestContextLoaderTest.java
@@ -23,7 +23,6 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.javaconfig.SingleRouteCamelConfiguration;
 import org.apache.camel.test.spring.CamelSpringDelegatingTestContextLoader;
-import org.apache.camel.test.spring.CamelSpringJUnit4ClassRunner;
 import org.apache.camel.test.spring.CamelSpringRunner;
 import org.apache.camel.test.spring.MockEndpoints;
 import org.junit.Test;
diff --git a/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/processor/idempotent/RedisStringIdempotentRepository.java b/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/processor/idempotent/RedisStringIdempotentRepository.java
index 583bfcb..310c81b 100644
--- a/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/processor/idempotent/RedisStringIdempotentRepository.java
+++ b/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/processor/idempotent/RedisStringIdempotentRepository.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.redis.processor.idempotent;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.api.management.ManagedOperation;
 import org.apache.camel.api.management.ManagedResource;
diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisStringIdempotentRepositoryTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisStringIdempotentRepositoryTest.java
index 5e20e84..fd208bc 100644
--- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisStringIdempotentRepositoryTest.java
+++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisStringIdempotentRepositoryTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.redis.processor.idempotent;
 
 import java.time.Duration;
-import java.util.concurrent.TimeUnit;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceComponent.java b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceComponent.java
index b41a5ae..5c04f6c 100644
--- a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceComponent.java
+++ b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceComponent.java
@@ -28,7 +28,6 @@ import org.apache.camel.component.spring.ws.bean.CamelEndpointDispatcher;
 import org.apache.camel.component.spring.ws.bean.CamelSpringWSEndpointMapping;
 import org.apache.camel.component.spring.ws.filter.MessageFilter;
 import org.apache.camel.component.spring.ws.filter.impl.BasicMessageFilter;
-import org.apache.camel.component.spring.ws.type.EndpointMappingKey;
 import org.apache.camel.component.spring.ws.type.EndpointMappingType;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.annotations.Component;
diff --git a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceMessage.java b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceMessage.java
index 143e8d8..6101345 100644
--- a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceMessage.java
+++ b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceMessage.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.spring.ws;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.Exchange;
 import org.apache.camel.support.DefaultMessage;
 import org.springframework.ws.WebServiceMessage;
 
diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/testfilters/LocalMessageFilter.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/testfilters/LocalMessageFilter.java
index 60503a5..fc6fd54 100644
--- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/testfilters/LocalMessageFilter.java
+++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/testfilters/LocalMessageFilter.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.spring.ws.testfilters;
 
 import javax.xml.namespace.QName;
 
-import org.apache.camel.Message;
 import org.apache.camel.attachment.AttachmentMessage;
 import org.apache.camel.component.spring.ws.filter.impl.BasicMessageFilter;
 import org.springframework.ws.soap.SoapMessage;
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerCamelContextRefNotFoundTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerCamelContextRefNotFoundTest.java
index 06741a7..4cca79f 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerCamelContextRefNotFoundTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerCamelContextRefNotFoundTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.spring.config;
 
 import org.apache.camel.FailedToCreateRouteException;
 import org.apache.camel.NoSuchBeanException;
-import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spring.SpringTestSupport;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerRouteContextRefNotFoundTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerRouteContextRefNotFoundTest.java
index 5f9483d..b2d72cf 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerRouteContextRefNotFoundTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerRouteContextRefNotFoundTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.spring.config;
 import org.apache.camel.FailedToCreateRouteException;
 import org.apache.camel.NoSuchBeanException;
-import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spring.SpringTestSupport;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringMainStartFailedIssueTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringMainStartFailedIssueTest.java
index b94b651..be081ea 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringMainStartFailedIssueTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringMainStartFailedIssueTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.spring.issues;
 
 import org.apache.camel.FailedToCreateRouteException;
-import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.TestSupport;
 import org.apache.camel.spring.Main;
 import org.junit.Test;
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/ManagedEndpointInjectRefEndpointTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/ManagedEndpointInjectRefEndpointTest.java
index 56a619e..2211777 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/ManagedEndpointInjectRefEndpointTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/ManagedEndpointInjectRefEndpointTest.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.spring.management;
 
-import java.util.Iterator;
 import java.util.Set;
 
 import javax.management.MBeanServer;
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/ManagedRefEndpointTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/ManagedRefEndpointTest.java
index d33de1c..5f95923 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/ManagedRefEndpointTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/ManagedRefEndpointTest.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.spring.management;
 
-import java.util.Iterator;
 import java.util.Set;
 
 import javax.management.MBeanServer;
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.java
index c322102..30a3f72 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.spring.management;
 
 import org.apache.camel.FailedToCreateRouteException;
 import org.apache.camel.ResolveEndpointFailedException;
-import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spring.SpringTestSupport;
 import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidDeadLetterUriTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidDeadLetterUriTest.java
index af771a2..db90d5c 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidDeadLetterUriTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidDeadLetterUriTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.FailedToCreateRouteException;
 import org.apache.camel.NoSuchEndpointException;
-import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spring.SpringTestSupport;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidOptionDeadLetterUriTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidOptionDeadLetterUriTest.java
index 2d23645..8560be8 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidOptionDeadLetterUriTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidOptionDeadLetterUriTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.spring.processor;
 
 import org.apache.camel.FailedToCreateRouteException;
 import org.apache.camel.ResolveEndpointFailedException;
-import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spring.SpringTestSupport;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDoubleLoadBalancerMisconfigurationTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDoubleLoadBalancerMisconfigurationTest.java
index 4930b79..466a7a5 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDoubleLoadBalancerMisconfigurationTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringDoubleLoadBalancerMisconfigurationTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.spring.processor;
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.FailedToCreateRouteException;
-import org.apache.camel.RuntimeCamelException;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFilterNoChildTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFilterNoChildTest.java
index 56bf920..aa8e67c 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFilterNoChildTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringFilterNoChildTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.spring.processor;
 
 import org.apache.camel.FailedToCreateRouteException;
-import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spring.SpringTestSupport;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryCatchMisconfiguredTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryCatchMisconfiguredTest.java
index 85bf262..69e7efd 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryCatchMisconfiguredTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryCatchMisconfiguredTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.spring.processor;
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.FailedToCreateRouteException;
-import org.apache.camel.RuntimeCamelException;
 import org.junit.Test;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryCatchMustHaveExceptionConfiguredTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryCatchMustHaveExceptionConfiguredTest.java
index 99a63d4..7c7fa8e 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryCatchMustHaveExceptionConfiguredTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTryCatchMustHaveExceptionConfiguredTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.spring.processor;
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.FailedToCreateRouteException;
-import org.apache.camel.RuntimeCamelException;
 import org.junit.Test;
 
 import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlProcessingStrategy.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlProcessingStrategy.java
index 92b7a69..0ada8a3d 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlProcessingStrategy.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlProcessingStrategy.java
@@ -61,7 +61,7 @@ public class DefaultSqlProcessingStrategy implements SqlProcessingStrategy {
                 }
 
                 return 0;
-            };
+            }
         });
     }
 
@@ -84,7 +84,7 @@ public class DefaultSqlProcessingStrategy implements SqlProcessingStrategy {
                     LOG.trace("Update count {}", updateCount);
                 }
                 return updateCount;
-            };
+            }
         });
     }
 }
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java
index 670034b..68fc700 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java
@@ -16,9 +16,6 @@
  */
 /* Generated By:JavaCC: Do not edit this line. SSPTParserTokenManager.java */
 package org.apache.camel.component.sql.stored.template.generated;
-import java.io.Reader;
-import org.apache.camel.spi.ClassResolver;
-import org.apache.camel.component.sql.stored.template.ast.*;
 
 /** Token Manager. */
 public class SSPTParserTokenManager implements SSPTParserConstants
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBatchInvalidTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBatchInvalidTest.java
index 824baf4..bf7fc6c 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBatchInvalidTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBatchInvalidTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.sql.stored;
 
 import org.apache.camel.FailedToCreateRouteException;
-import org.apache.camel.PropertyBindingException;
 import org.apache.camel.ResolveEndpointFailedException;
 import org.apache.camel.TypeConversionException;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-stub/src/main/java/org/apache/camel/component/stub/StubEndpoint.java b/components/camel-stub/src/main/java/org/apache/camel/component/stub/StubEndpoint.java
index a6921c6..71129c4 100644
--- a/components/camel-stub/src/main/java/org/apache/camel/component/stub/StubEndpoint.java
+++ b/components/camel-stub/src/main/java/org/apache/camel/component/stub/StubEndpoint.java
@@ -23,7 +23,6 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
 import org.apache.camel.component.seda.BlockingQueueFactory;
-import org.apache.camel.component.vm.VmConsumer;
 import org.apache.camel.component.vm.VmEndpoint;
 import org.apache.camel.spi.UriEndpoint;
 
diff --git a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/TelegramComponent.java b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/TelegramComponent.java
index 1242b69..533b80b 100644
--- a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/TelegramComponent.java
+++ b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/TelegramComponent.java
@@ -22,7 +22,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;
 
 @Component("telegram")
 public class TelegramComponent extends DefaultComponent {
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMappingTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMappingTest.java
index 611bcac..7986e30 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMappingTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMappingTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.telegram;
 
 import java.time.Instant;
-import java.util.Date;
 
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
diff --git a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/converter/FooConverterRegression.java b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/converter/FooConverterRegression.java
index d3fe8bc..64dcc44 100644
--- a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/converter/FooConverterRegression.java
+++ b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/converter/FooConverterRegression.java
@@ -17,7 +17,6 @@
 package org.apache.camel.test.blueprint.converter;
 
 import org.apache.camel.Converter;
-import org.apache.camel.TypeConverters;
 import org.apache.camel.test.blueprint.Foo;
 
 public class FooConverterRegression {
diff --git a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/management/ManagedRefEndpointTest.java b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/management/ManagedRefEndpointTest.java
index 8f583ac..3552670 100644
--- a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/management/ManagedRefEndpointTest.java
+++ b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/management/ManagedRefEndpointTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.test.blueprint.management;
 
 import java.util.Arrays;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Set;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
diff --git a/components/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/CamelSpringTestContextLoader.java b/components/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/CamelSpringTestContextLoader.java
index 727d23c..ff7e5c8 100644
--- a/components/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/CamelSpringTestContextLoader.java
+++ b/components/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/CamelSpringTestContextLoader.java
@@ -26,7 +26,6 @@ import java.util.List;
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.ExtendedCamelContext;
 import org.apache.camel.api.management.JmxSystemPropertyKeys;
 import org.apache.camel.impl.engine.InterceptSendToMockEndpointStrategy;
diff --git a/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java b/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java
index 841d182..f408fd0 100644
--- a/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java
+++ b/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java
@@ -26,7 +26,6 @@ import java.util.List;
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.ExtendedCamelContext;
 import org.apache.camel.api.management.JmxSystemPropertyKeys;
 import org.apache.camel.impl.engine.InterceptSendToMockEndpointStrategy;
diff --git a/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestSupport.java b/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestSupport.java
index 4e8ff41..df9500f 100644
--- a/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestSupport.java
+++ b/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestSupport.java
@@ -21,7 +21,6 @@ import java.util.HashSet;
 import java.util.List;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.ExtendedCamelContext;
 import org.apache.camel.spring.SpringCamelContext;
 import org.apache.camel.test.ExcludingPackageScanClassResolver;
 import org.apache.camel.test.junit4.CamelTestSupport;
diff --git a/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/RouteCoverageEventNotifier.java b/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/RouteCoverageEventNotifier.java
index 55474fa..4b10502 100644
--- a/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/RouteCoverageEventNotifier.java
+++ b/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/RouteCoverageEventNotifier.java
@@ -20,7 +20,6 @@ import java.util.function.Function;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.spi.CamelEvent;
-import org.apache.camel.spi.CamelEvent.CamelContextEvent;
 import org.apache.camel.spi.CamelEvent.CamelContextStoppingEvent;
 import org.apache.camel.support.EventNotifierSupport;
 
diff --git a/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java b/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
index 3f47d96..19de853 100644
--- a/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
+++ b/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
@@ -20,7 +20,6 @@ import java.io.File;
 import java.util.Collection;
 import java.util.List;
 import java.util.Locale;
-import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
@@ -39,8 +38,6 @@ import org.apache.camel.support.PredicateAssertHelper;
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.rules.TestName;
-import org.junit.rules.TestWatcher;
-import org.junit.runner.Description;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/Calculator.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/Calculator.java
index ed72db3..3c141a2 100644
--- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/Calculator.java
+++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/Calculator.java
@@ -38,25 +38,25 @@ public class Calculator {
      * lists and exception lists are specified using the exact same syntax as
      * field lists in struct or exception definitions.
      */
-    public void ping() throws org.apache.thrift.TException;
+    void ping() throws org.apache.thrift.TException;
 
-    public int add(int num1, int num2) throws org.apache.thrift.TException;
+    int add(int num1, int num2) throws org.apache.thrift.TException;
 
-    public int calculate(int logid, Work w) throws InvalidOperation, org.apache.thrift.TException;
+    int calculate(int logid, Work w) throws InvalidOperation, org.apache.thrift.TException;
 
     /**
      * This method has a oneway modifier. That means the client only makes
      * a request and does not listen for any response at all. Oneway methods
      * must be void.
      */
-    public void zip() throws org.apache.thrift.TException;
+    void zip() throws org.apache.thrift.TException;
 
     /**
      * This method echoed input object as return value.
      * 
      * @param w
      */
-    public Work echo(Work w) throws org.apache.thrift.TException;
+    Work echo(Work w) throws org.apache.thrift.TException;
 
     /**
      * This method contains all possible simple, special, struct and container types as input parameters
@@ -74,23 +74,23 @@ public class Calculator {
      * @param v11
      * @param v12
      */
-    public int alltypes(boolean v1, byte v2, short v3, int v4, long v5, double v6, java.lang.String v7, java.nio.ByteBuffer v8, Work v9, java.util.List<java.lang.Integer> v10, java.util.Set<java.lang.String> v11, java.util.Map<java.lang.String,java.lang.Long> v12) throws org.apache.thrift.TException;
+    int alltypes(boolean v1, byte v2, short v3, int v4, long v5, double v6, java.lang.String v7, java.nio.ByteBuffer v8, Work v9, java.util.List<java.lang.Integer> v10, java.util.Set<java.lang.String> v11, java.util.Map<java.lang.String,java.lang.Long> v12) throws org.apache.thrift.TException;
 
   }
 
   public interface AsyncIface {
 
-    public void ping(org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
+    void ping(org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
 
-    public void add(int num1, int num2, org.apache.thrift.async.AsyncMethodCallback<java.lang.Integer> resultHandler) throws org.apache.thrift.TException;
+    void add(int num1, int num2, org.apache.thrift.async.AsyncMethodCallback<java.lang.Integer> resultHandler) throws org.apache.thrift.TException;
 
-    public void calculate(int logid, Work w, org.apache.thrift.async.AsyncMethodCallback<java.lang.Integer> resultHandler) throws org.apache.thrift.TException;
+    void calculate(int logid, Work w, org.apache.thrift.async.AsyncMethodCallback<java.lang.Integer> resultHandler) throws org.apache.thrift.TException;
 
-    public void zip(org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
+    void zip(org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
 
-    public void echo(Work w, org.apache.thrift.async.AsyncMethodCallback<Work> resultHandler) throws org.apache.thrift.TException;
+    void echo(Work w, org.apache.thrift.async.AsyncMethodCallback<Work> resultHandler) throws org.apache.thrift.TException;
 
-    public void alltypes(boolean v1, byte v2, short v3, int v4, long v5, double v6, java.lang.String v7, java.nio.ByteBuffer v8, Work v9, java.util.List<java.lang.Integer> v10, java.util.Set<java.lang.String> v11, java.util.Map<java.lang.String,java.lang.Long> v12, org.apache.thrift.async.AsyncMethodCallback<java.lang.Integer> resultHandler) throws org.apache.thrift.TException;
+    void alltypes(boolean v1, byte v2, short v3, int v4, long v5, double v6, java.lang.String v7, java.nio.ByteBuffer v8, Work v9, java.util.List<java.lang.Integer> v10, java.util.Set<java.lang.String> v11, java.util.Map<java.lang.String,java.lang.Long> v12, org.apache.thrift.async.AsyncMethodCallback<java.lang.Integer> resultHandler) throws org.apache.thrift.TException;
 
   }
 
@@ -1024,7 +1024,7 @@ public class Calculator {
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
 ;
 
-      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<>();
 
       static {
         for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
@@ -1077,7 +1077,7 @@ public class Calculator {
     }
     public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<>(_Fields.class);
       metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ping_args.class, metaDataMap);
     }
@@ -1274,7 +1274,7 @@ public class Calculator {
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
 ;
 
-      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<>();
 
       static {
         for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
@@ -1327,7 +1327,7 @@ public class Calculator {
     }
     public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<>(_Fields.class);
       metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ping_result.class, metaDataMap);
     }
@@ -1529,7 +1529,7 @@ public class Calculator {
       NUM1((short)1, "num1"),
       NUM2((short)2, "num2");
 
-      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<>();
 
       static {
         for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
@@ -1591,7 +1591,7 @@ public class Calculator {
     private byte __isset_bitfield = 0;
     public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<>(_Fields.class);
       tmpMap.put(_Fields.NUM1, new org.apache.thrift.meta_data.FieldMetaData("num1", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
       tmpMap.put(_Fields.NUM2, new org.apache.thrift.meta_data.FieldMetaData("num2", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -1980,7 +1980,7 @@ public class Calculator {
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success");
 
-      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<>();
 
       static {
         for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
@@ -2039,7 +2039,7 @@ public class Calculator {
     private byte __isset_bitfield = 0;
     public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
       metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
@@ -2343,7 +2343,7 @@ public class Calculator {
       LOGID((short)1, "logid"),
       W((short)2, "w");
 
-      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<>();
 
       static {
         for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
@@ -2404,7 +2404,7 @@ public class Calculator {
     private byte __isset_bitfield = 0;
     public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<>(_Fields.class);
       tmpMap.put(_Fields.LOGID, new org.apache.thrift.meta_data.FieldMetaData("logid", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
       tmpMap.put(_Fields.W, new org.apache.thrift.meta_data.FieldMetaData("w", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -2810,7 +2810,7 @@ public class Calculator {
       SUCCESS((short)0, "success"),
       OUCH((short)1, "ouch");
 
-      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<>();
 
       static {
         for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
@@ -2871,7 +2871,7 @@ public class Calculator {
     private byte __isset_bitfield = 0;
     public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
       tmpMap.put(_Fields.OUCH, new org.apache.thrift.meta_data.FieldMetaData("ouch", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -3271,7 +3271,7 @@ public class Calculator {
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
 ;
 
-      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<>();
 
       static {
         for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
@@ -3324,7 +3324,7 @@ public class Calculator {
     }
     public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<>(_Fields.class);
       metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(zip_args.class, metaDataMap);
     }
@@ -3523,7 +3523,7 @@ public class Calculator {
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       W((short)1, "w");
 
-      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<>();
 
       static {
         for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
@@ -3580,7 +3580,7 @@ public class Calculator {
     // isset id assignments
     public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<>(_Fields.class);
       tmpMap.put(_Fields.W, new org.apache.thrift.meta_data.FieldMetaData("w", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Work.class)));
       metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
@@ -3890,7 +3890,7 @@ public class Calculator {
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success");
 
-      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<>();
 
       static {
         for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
@@ -3947,7 +3947,7 @@ public class Calculator {
     // isset id assignments
     public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Work.class)));
       metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
@@ -4290,7 +4290,7 @@ public class Calculator {
       V11((short)11, "v11"),
       V12((short)12, "v12");
 
-      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<>();
 
       static {
         for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
@@ -4376,7 +4376,7 @@ public class Calculator {
     private byte __isset_bitfield = 0;
     public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<>(_Fields.class);
       tmpMap.put(_Fields.V1, new org.apache.thrift.meta_data.FieldMetaData("v1", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
       tmpMap.put(_Fields.V2, new org.apache.thrift.meta_data.FieldMetaData("v2", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -4468,15 +4468,15 @@ public class Calculator {
         this.v9 = new Work(other.v9);
       }
       if (other.isSetV10()) {
-        java.util.List<java.lang.Integer> __this__v10 = new java.util.ArrayList<java.lang.Integer>(other.v10);
+        java.util.List<java.lang.Integer> __this__v10 = new java.util.ArrayList<>(other.v10);
         this.v10 = __this__v10;
       }
       if (other.isSetV11()) {
-        java.util.Set<java.lang.String> __this__v11 = new java.util.HashSet<java.lang.String>(other.v11);
+        java.util.Set<java.lang.String> __this__v11 = new java.util.HashSet<>(other.v11);
         this.v11 = __this__v11;
       }
       if (other.isSetV12()) {
-        java.util.Map<java.lang.String,java.lang.Long> __this__v12 = new java.util.HashMap<java.lang.String,java.lang.Long>(other.v12);
+        java.util.Map<java.lang.String,java.lang.Long> __this__v12 = new java.util.HashMap<>(other.v12);
         this.v12 = __this__v12;
       }
     }
@@ -4737,7 +4737,7 @@ public class Calculator {
 
     public void addToV10(int elem) {
       if (this.v10 == null) {
-        this.v10 = new java.util.ArrayList<java.lang.Integer>();
+        this.v10 = new java.util.ArrayList<>();
       }
       this.v10.add(elem);
     }
@@ -4776,7 +4776,7 @@ public class Calculator {
 
     public void addToV11(java.lang.String elem) {
       if (this.v11 == null) {
-        this.v11 = new java.util.HashSet<java.lang.String>();
+        this.v11 = new java.util.HashSet<>();
       }
       this.v11.add(elem);
     }
@@ -4811,7 +4811,7 @@ public class Calculator {
 
     public void putToV12(java.lang.String key, long val) {
       if (this.v12 == null) {
-        this.v12 = new java.util.HashMap<java.lang.String,java.lang.Long>();
+        this.v12 = new java.util.HashMap<>();
       }
       this.v12.put(key, val);
     }
@@ -5154,7 +5154,7 @@ public class Calculator {
 
       hashCode = hashCode * 8191 + ((v1) ? 131071 : 524287);
 
-      hashCode = hashCode * 8191 + (int) (v2);
+      hashCode = hashCode * 8191 + (v2);
 
       hashCode = hashCode * 8191 + v3;
 
@@ -5535,7 +5535,7 @@ public class Calculator {
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
                   org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
-                  struct.v10 = new java.util.ArrayList<java.lang.Integer>(_list0.size);
+                  struct.v10 = new java.util.ArrayList<>(_list0.size);
                   int _elem1;
                   for (int _i2 = 0; _i2 < _list0.size; ++_i2)
                   {
@@ -5553,7 +5553,7 @@ public class Calculator {
               if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
                 {
                   org.apache.thrift.protocol.TSet _set3 = iprot.readSetBegin();
-                  struct.v11 = new java.util.HashSet<java.lang.String>(2*_set3.size);
+                  struct.v11 = new java.util.HashSet<>(2*_set3.size);
                   java.lang.String _elem4;
                   for (int _i5 = 0; _i5 < _set3.size; ++_i5)
                   {
@@ -5571,7 +5571,7 @@ public class Calculator {
               if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
                   org.apache.thrift.protocol.TMap _map6 = iprot.readMapBegin();
-                  struct.v12 = new java.util.HashMap<java.lang.String,java.lang.Long>(2*_map6.size);
+                  struct.v12 = new java.util.HashMap<>(2*_map6.size);
                   java.lang.String _key7;
                   long _val8;
                   for (int _i9 = 0; _i9 < _map6.size; ++_i9)
@@ -5828,7 +5828,7 @@ public class Calculator {
         if (incoming.get(9)) {
           {
             org.apache.thrift.protocol.TList _list16 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32());
-            struct.v10 = new java.util.ArrayList<java.lang.Integer>(_list16.size);
+            struct.v10 = new java.util.ArrayList<>(_list16.size);
             int _elem17;
             for (int _i18 = 0; _i18 < _list16.size; ++_i18)
             {
@@ -5841,7 +5841,7 @@ public class Calculator {
         if (incoming.get(10)) {
           {
             org.apache.thrift.protocol.TSet _set19 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-            struct.v11 = new java.util.HashSet<java.lang.String>(2*_set19.size);
+            struct.v11 = new java.util.HashSet<>(2*_set19.size);
             java.lang.String _elem20;
             for (int _i21 = 0; _i21 < _set19.size; ++_i21)
             {
@@ -5854,7 +5854,7 @@ public class Calculator {
         if (incoming.get(11)) {
           {
             org.apache.thrift.protocol.TMap _map22 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32());
-            struct.v12 = new java.util.HashMap<java.lang.String,java.lang.Long>(2*_map22.size);
+            struct.v12 = new java.util.HashMap<>(2*_map22.size);
             java.lang.String _key23;
             long _val24;
             for (int _i25 = 0; _i25 < _map22.size; ++_i25)
@@ -5888,7 +5888,7 @@ public class Calculator {
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success");
 
-      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<>();
 
       static {
         for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
@@ -5947,7 +5947,7 @@ public class Calculator {
     private byte __isset_bitfield = 0;
     public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
       metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/InvalidOperation.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/InvalidOperation.java
index 6d9f0d4..8d004c3 100644
--- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/InvalidOperation.java
+++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/InvalidOperation.java
@@ -44,7 +44,7 @@ public class InvalidOperation extends org.apache.thrift.TException implements or
     WHAT_OP((short)1, "whatOp"),
     WHY((short)2, "why");
 
-    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<>();
 
     static {
       for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
@@ -105,7 +105,7 @@ public class InvalidOperation extends org.apache.thrift.TException implements or
   private byte __isset_bitfield = 0;
   public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<>(_Fields.class);
     tmpMap.put(_Fields.WHAT_OP, new org.apache.thrift.meta_data.FieldMetaData("whatOp", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
     tmpMap.put(_Fields.WHY, new org.apache.thrift.meta_data.FieldMetaData("why", org.apache.thrift.TFieldRequirementType.DEFAULT, 
diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/Operation.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/Operation.java
index c4700bb..b8886a9 100644
--- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/Operation.java
+++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/Operation.java
@@ -22,11 +22,6 @@
  */
 package org.apache.camel.component.thrift.generated;
 
-
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
-
 /**
  * You can define enums, which are just 32 bit integers. Values are optional
  * and start at 1 if not supplied, C style again.
diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/Work.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/Work.java
index 8c622e9..9db1e52 100644
--- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/Work.java
+++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/Work.java
@@ -64,7 +64,7 @@ public class Work implements org.apache.thrift.TBase<Work, Work._Fields>, java.i
     OP((short)3, "op"),
     COMMENT((short)4, "comment");
 
-    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<>();
 
     static {
       for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
@@ -131,7 +131,7 @@ public class Work implements org.apache.thrift.TBase<Work, Work._Fields>, java.i
   private static final _Fields optionals[] = {_Fields.COMMENT};
   public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<>(_Fields.class);
     tmpMap.put(_Fields.NUM1, new org.apache.thrift.meta_data.FieldMetaData("num1", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
     tmpMap.put(_Fields.NUM2, new org.apache.thrift.meta_data.FieldMetaData("num2", org.apache.thrift.TFieldRequirementType.DEFAULT, 
diff --git a/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/generated/Operation.java b/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/generated/Operation.java
index 63ed05f..5fe2a65 100644
--- a/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/generated/Operation.java
+++ b/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/generated/Operation.java
@@ -22,11 +22,6 @@
  */
 package org.apache.camel.dataformat.thrift.generated;
 
-
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
-
 /**
  * You can define enums, which are just 32 bit integers. Values are optional
  * and start at 1 if not supplied, C style again.
diff --git a/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/generated/Work.java b/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/generated/Work.java
index 115ea3c..f6c8f8f 100644
--- a/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/generated/Work.java
+++ b/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/generated/Work.java
@@ -64,7 +64,7 @@ public class Work implements org.apache.thrift.TBase<Work, Work._Fields>, java.i
     OP((short)3, "op"),
     COMMENT((short)4, "comment");
 
-    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<>();
 
     static {
       for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
@@ -131,7 +131,7 @@ public class Work implements org.apache.thrift.TBase<Work, Work._Fields>, java.i
   private static final _Fields optionals[] = {_Fields.COMMENT};
   public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<>(_Fields.class);
     tmpMap.put(_Fields.NUM1, new org.apache.thrift.meta_data.FieldMetaData("num1", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
     tmpMap.put(_Fields.NUM2, new org.apache.thrift.meta_data.FieldMetaData("num2", org.apache.thrift.TFieldRequirementType.DEFAULT, 
diff --git a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowConstants.java b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowConstants.java
index c53a039..2a504d0 100644
--- a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowConstants.java
+++ b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowConstants.java
@@ -76,6 +76,6 @@ public final class UndertowConstants {
     public static final String WSS_PROTOCOL = "wss";
 
     private UndertowConstants() {
-    };
+    }
 
 }
diff --git a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowStreamingClientCallback.java b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowStreamingClientCallback.java
index 068af08..c71c6cb 100644
--- a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowStreamingClientCallback.java
+++ b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowStreamingClientCallback.java
@@ -21,17 +21,13 @@ import java.io.InputStream;
 import java.nio.ByteBuffer;
 import java.nio.channels.Channels;
 import java.nio.channels.ReadableByteChannel;
-import java.nio.channels.WritableByteChannel;
 
-import io.undertow.client.ClientConnection;
 import io.undertow.client.ClientExchange;
 import io.undertow.client.ClientRequest;
 import org.apache.camel.AsyncCallback;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
-import org.apache.camel.support.ExchangeHelper;
 import org.apache.camel.util.IOHelper;
-import org.xnio.IoUtils;
 import org.xnio.channels.StreamSinkChannel;
 
 class UndertowStreamingClientCallback extends UndertowClientCallback {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/MultiPartFormTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/MultiPartFormTest.java
index c9d2132..3766774 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/MultiPartFormTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/MultiPartFormTest.java
@@ -22,7 +22,6 @@ import java.util.Map;
 import javax.activation.DataHandler;
 
 import org.apache.camel.Exchange;
-import org.apache.camel.Message;
 import org.apache.camel.Processor;
 import org.apache.camel.attachment.AttachmentMessage;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpStreamingTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpStreamingTest.java
index c35668f..685b4b0 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpStreamingTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpStreamingTest.java
@@ -31,7 +31,6 @@ import java.util.stream.LongStream;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.support.DefaultExchange;
 import org.junit.Test;
 
 public class UndertowHttpStreamingTest extends BaseUndertowTest {
diff --git a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jProducerGanacheTest.java b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jProducerGanacheTest.java
index 00d819f..3268709 100644
--- a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jProducerGanacheTest.java
+++ b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/integration/Web3jProducerGanacheTest.java
@@ -24,7 +24,6 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Produce;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.web3j.Web3jConstants;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.web3j.protocol.core.methods.response.EthBlock;
diff --git a/components/camel-websocket-jsr356/src/main/java/org/apache/camel/websocket/jsr356/JSR356Consumer.java b/components/camel-websocket-jsr356/src/main/java/org/apache/camel/websocket/jsr356/JSR356Consumer.java
index 701b254..a7c4b3b 100644
--- a/components/camel-websocket-jsr356/src/main/java/org/apache/camel/websocket/jsr356/JSR356Consumer.java
+++ b/components/camel-websocket-jsr356/src/main/java/org/apache/camel/websocket/jsr356/JSR356Consumer.java
@@ -43,7 +43,7 @@ public class JSR356Consumer extends DefaultConsumer {
                 getExceptionHandler().handleException("Error processing exchange", exchange, exchange.getException());
             }
         });
-    };;
+    };
 
     JSR356Consumer(final JSR356Endpoint jsr356Endpoint, final Processor processor, final int sessionCount) {
         super(jsr356Endpoint, processor);
diff --git a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketConstants.java b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketConstants.java
index 131a900..9ff13f2 100644
--- a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketConstants.java
+++ b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketConstants.java
@@ -29,5 +29,5 @@ public final class WebsocketConstants {
     public static final String WSS_PROTOCOL = "wss";
 
     private WebsocketConstants() {
-    };
+    }
 }
diff --git a/components/camel-xj/src/main/java/org/apache/camel/component/xj/JsonXmlStreamReader.java b/components/camel-xj/src/main/java/org/apache/camel/component/xj/JsonXmlStreamReader.java
index ffd99d0..8f2be71 100644
--- a/components/camel-xj/src/main/java/org/apache/camel/component/xj/JsonXmlStreamReader.java
+++ b/components/camel-xj/src/main/java/org/apache/camel/component/xj/JsonXmlStreamReader.java
@@ -29,10 +29,9 @@ import java.util.stream.Collectors;
 import javax.xml.namespace.NamespaceContext;
 import javax.xml.namespace.QName;
 import javax.xml.stream.Location;
+import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.events.XMLEvent;
-
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
 
@@ -102,16 +101,16 @@ public class JsonXmlStreamReader implements XMLStreamReader {
                 case VALUE_TRUE:
                 case VALUE_FALSE: {
                     switch (previousElement.xmlEvent) {
-                    case XMLEvent.START_ELEMENT:
-                        previousElement.xmlEvent = XMLEvent.CHARACTERS;
-                        return XMLEvent.CHARACTERS;
-                    case XMLEvent.CHARACTERS:
+                    case XMLStreamConstants.START_ELEMENT:
+                        previousElement.xmlEvent = XMLStreamConstants.CHARACTERS;
+                        return XMLStreamConstants.CHARACTERS;
+                    case XMLStreamConstants.CHARACTERS:
                         removeStackElement(previousElement.jsonToken);
                         removeStackElement(JsonToken.FIELD_NAME);
 
                         assert tokenStack.peek() != null;
-                        tokenStack.peek().xmlEvent = XMLEvent.END_ELEMENT;
-                        return XMLEvent.END_ELEMENT;
+                        tokenStack.peek().xmlEvent = XMLStreamConstants.END_ELEMENT;
+                        return XMLStreamConstants.END_ELEMENT;
                     default:
                         throw new IllegalStateException("illegal state");
                     }
@@ -149,23 +148,23 @@ public class JsonXmlStreamReader implements XMLStreamReader {
             case VALUE_NULL:
             case VALUE_TRUE:
             case VALUE_FALSE:
-                stackElement.xmlEvent = XMLEvent.START_ELEMENT;
+                stackElement.xmlEvent = XMLStreamConstants.START_ELEMENT;
 
-                return XMLEvent.START_ELEMENT;
+                return XMLStreamConstants.START_ELEMENT;
             case END_OBJECT:
                 removeStackElement(JsonToken.END_OBJECT);
                 removeStackElement(JsonToken.START_OBJECT);
                 removeStackElement(JsonToken.FIELD_NAME);
                 eof = tokenStack.size() == 0;
 
-                return XMLEvent.END_ELEMENT;
+                return XMLStreamConstants.END_ELEMENT;
             case END_ARRAY:
                 removeStackElement(JsonToken.END_ARRAY);
                 removeStackElement(JsonToken.START_ARRAY);
                 removeStackElement(JsonToken.FIELD_NAME);
                 eof = tokenStack.size() == 0;
 
-                return XMLEvent.END_ELEMENT;
+                return XMLStreamConstants.END_ELEMENT;
             default:
                 throw new IllegalStateException("JsonToken: " + currentToken);
             }
@@ -210,7 +209,7 @@ public class JsonXmlStreamReader implements XMLStreamReader {
         int evt;
         do {
             evt = next();
-        } while (evt != XMLEvent.START_ELEMENT && evt != XMLEvent.END_ELEMENT);
+        } while (evt != XMLStreamConstants.START_ELEMENT && evt != XMLStreamConstants.END_ELEMENT);
 
         return evt;
     }
@@ -241,7 +240,7 @@ public class JsonXmlStreamReader implements XMLStreamReader {
             return false;
         }
 
-        return stackElement.xmlEvent == XMLEvent.START_ELEMENT;
+        return stackElement.xmlEvent == XMLStreamConstants.START_ELEMENT;
     }
 
     @Override
@@ -251,7 +250,7 @@ public class JsonXmlStreamReader implements XMLStreamReader {
             return false;
         }
 
-        return stackElement.xmlEvent == XMLEvent.END_ELEMENT;
+        return stackElement.xmlEvent == XMLStreamConstants.END_ELEMENT;
     }
 
     @Override
@@ -261,7 +260,7 @@ public class JsonXmlStreamReader implements XMLStreamReader {
             return false;
         }
 
-        return stackElement.xmlEvent == XMLEvent.CHARACTERS;
+        return stackElement.xmlEvent == XMLStreamConstants.CHARACTERS;
     }
 
     @Override
@@ -277,7 +276,7 @@ public class JsonXmlStreamReader implements XMLStreamReader {
     @Override
     public int getAttributeCount() {
         final StackElement stackElement = tokenStack.peek();
-        if (stackElement == null || (stackElement.xmlEvent != XMLEvent.START_ELEMENT)) {
+        if (stackElement == null || (stackElement.xmlEvent != XMLStreamConstants.START_ELEMENT)) {
             throw new IllegalStateException(ERROR_MSG_NOT_IN_START_ELEMENT);
         }
 
@@ -287,7 +286,7 @@ public class JsonXmlStreamReader implements XMLStreamReader {
     @Override
     public QName getAttributeName(int index) {
         final StackElement stackElement = tokenStack.peek();
-        if (stackElement == null || (stackElement.xmlEvent != XMLEvent.START_ELEMENT)) {
+        if (stackElement == null || (stackElement.xmlEvent != XMLStreamConstants.START_ELEMENT)) {
             throw new IllegalStateException(ERROR_MSG_NOT_IN_START_ELEMENT);
         }
 
@@ -297,7 +296,7 @@ public class JsonXmlStreamReader implements XMLStreamReader {
     @Override
     public String getAttributeNamespace(int index) {
         final StackElement stackElement = tokenStack.peek();
-        if (stackElement == null || (stackElement.xmlEvent != XMLEvent.START_ELEMENT)) {
+        if (stackElement == null || (stackElement.xmlEvent != XMLStreamConstants.START_ELEMENT)) {
             throw new IllegalStateException(ERROR_MSG_NOT_IN_START_ELEMENT);
         }
 
@@ -307,7 +306,7 @@ public class JsonXmlStreamReader implements XMLStreamReader {
     @Override
     public String getAttributeLocalName(int index) {
         final StackElement stackElement = tokenStack.peek();
-        if (stackElement == null || (stackElement.xmlEvent != XMLEvent.START_ELEMENT)) {
+        if (stackElement == null || (stackElement.xmlEvent != XMLStreamConstants.START_ELEMENT)) {
             throw new IllegalStateException(ERROR_MSG_NOT_IN_START_ELEMENT);
         }
 
@@ -317,7 +316,7 @@ public class JsonXmlStreamReader implements XMLStreamReader {
     @Override
     public String getAttributePrefix(int index) {
         final StackElement stackElement = tokenStack.peek();
-        if (stackElement == null || (stackElement.xmlEvent != XMLEvent.START_ELEMENT)) {
+        if (stackElement == null || (stackElement.xmlEvent != XMLStreamConstants.START_ELEMENT)) {
             throw new IllegalStateException(ERROR_MSG_NOT_IN_START_ELEMENT);
         }
 
@@ -327,7 +326,7 @@ public class JsonXmlStreamReader implements XMLStreamReader {
     @Override
     public String getAttributeType(int index) {
         final StackElement stackElement = tokenStack.peek();
-        if (stackElement == null || (stackElement.xmlEvent != XMLEvent.START_ELEMENT)) {
+        if (stackElement == null || (stackElement.xmlEvent != XMLStreamConstants.START_ELEMENT)) {
             throw new IllegalStateException(ERROR_MSG_NOT_IN_START_ELEMENT);
         }
 
@@ -337,7 +336,7 @@ public class JsonXmlStreamReader implements XMLStreamReader {
     @Override
     public String getAttributeValue(int index) {
         final StackElement stackElement = tokenStack.peek();
-        if (stackElement == null || (stackElement.xmlEvent != XMLEvent.START_ELEMENT)) {
+        if (stackElement == null || (stackElement.xmlEvent != XMLStreamConstants.START_ELEMENT)) {
             throw new IllegalStateException(ERROR_MSG_NOT_IN_START_ELEMENT);
         }
 
@@ -362,7 +361,7 @@ public class JsonXmlStreamReader implements XMLStreamReader {
     @Override
     public String getNamespacePrefix(int index) {
         final StackElement stackElement = tokenStack.peek();
-        if (stackElement == null || (stackElement.xmlEvent != XMLEvent.START_ELEMENT && stackElement.xmlEvent != XMLEvent.END_ELEMENT)) {
+        if (stackElement == null || (stackElement.xmlEvent != XMLStreamConstants.START_ELEMENT && stackElement.xmlEvent != XMLStreamConstants.END_ELEMENT)) {
             throw new IllegalStateException(ERROR_MSG_NOT_IN_START_END_ELEMENT);
         }
 
@@ -372,7 +371,7 @@ public class JsonXmlStreamReader implements XMLStreamReader {
     @Override
     public String getNamespaceURI(int index) {
         final StackElement stackElement = tokenStack.peek();
-        if (stackElement == null || (stackElement.xmlEvent != XMLEvent.START_ELEMENT && stackElement.xmlEvent != XMLEvent.END_ELEMENT)) {
+        if (stackElement == null || (stackElement.xmlEvent != XMLStreamConstants.START_ELEMENT && stackElement.xmlEvent != XMLStreamConstants.END_ELEMENT)) {
             throw new IllegalStateException(ERROR_MSG_NOT_IN_START_END_ELEMENT);
         }
 
@@ -387,11 +386,11 @@ public class JsonXmlStreamReader implements XMLStreamReader {
     @Override
     public int getEventType() {
         if (eof) {
-            return XMLEvent.END_DOCUMENT;
+            return XMLStreamConstants.END_DOCUMENT;
         }
 
         if (tokenStack.size() == 0) {
-            return XMLEvent.START_DOCUMENT;
+            return XMLStreamConstants.START_DOCUMENT;
         }
 
         return tokenStack.peek().xmlEvent;
@@ -405,7 +404,7 @@ public class JsonXmlStreamReader implements XMLStreamReader {
     @Override
     public char[] getTextCharacters() {
         final StackElement stackElement = tokenStack.peek();
-        if (stackElement == null || stackElement.xmlEvent != XMLEvent.CHARACTERS) {
+        if (stackElement == null || stackElement.xmlEvent != XMLStreamConstants.CHARACTERS) {
             throw new IllegalStateException(ERROR_MSG_NOT_IN_CHARACTERS);
         }
 
@@ -462,7 +461,7 @@ public class JsonXmlStreamReader implements XMLStreamReader {
             return false;
         }
 
-        return stackElement.xmlEvent == XMLEvent.CHARACTERS;
+        return stackElement.xmlEvent == XMLStreamConstants.CHARACTERS;
     }
 
     @Override
@@ -487,7 +486,7 @@ public class JsonXmlStreamReader implements XMLStreamReader {
             return false;
         }
 
-        return stackElement.xmlEvent == XMLEvent.START_ELEMENT || stackElement.xmlEvent == XMLEvent.END_ELEMENT;
+        return stackElement.xmlEvent == XMLStreamConstants.START_ELEMENT || stackElement.xmlEvent == XMLStreamConstants.END_ELEMENT;
     }
 
     @Override
diff --git a/components/camel-xj/src/main/java/org/apache/camel/component/xj/XmlJsonStreamWriter.java b/components/camel-xj/src/main/java/org/apache/camel/component/xj/XmlJsonStreamWriter.java
index 31ceb29..9449240 100644
--- a/components/camel-xj/src/main/java/org/apache/camel/component/xj/XmlJsonStreamWriter.java
+++ b/components/camel-xj/src/main/java/org/apache/camel/component/xj/XmlJsonStreamWriter.java
@@ -29,10 +29,9 @@ import java.util.Set;
 import java.util.stream.Collectors;
 
 import javax.xml.namespace.NamespaceContext;
+import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
-import javax.xml.stream.events.XMLEvent;
-
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonToken;
 
@@ -73,7 +72,7 @@ public class XmlJsonStreamWriter implements XMLStreamWriter {
 
     @Override
     public void writeStartElement(String prefix, String localName, String namespaceURI) {
-        final TreeElement treeElement = new TreeElement(currentTreeElement, XMLEvent.START_ELEMENT, localName);
+        final TreeElement treeElement = new TreeElement(currentTreeElement, XMLStreamConstants.START_ELEMENT, localName);
 
         currentTreeElement.addChild(treeElement);
         currentTreeElement = treeElement;
@@ -150,7 +149,7 @@ public class XmlJsonStreamWriter implements XMLStreamWriter {
             }
         }
 
-        final TreeElement treeElement = new TreeElement(currentTreeElement, XMLEvent.ATTRIBUTE, JsonToken.VALUE_STRING, localName);
+        final TreeElement treeElement = new TreeElement(currentTreeElement, XMLStreamConstants.ATTRIBUTE, JsonToken.VALUE_STRING, localName);
         treeElement.setValue(value);
 
         currentTreeElement.addChild(treeElement);
@@ -213,7 +212,7 @@ public class XmlJsonStreamWriter implements XMLStreamWriter {
 
     @Override
     public void writeStartDocument(String encoding, String version) {
-        final TreeElement treeElement = new TreeElement(null, XMLEvent.START_DOCUMENT, JsonToken.NOT_AVAILABLE);
+        final TreeElement treeElement = new TreeElement(null, XMLStreamConstants.START_DOCUMENT, JsonToken.NOT_AVAILABLE);
         this.treeRoot = treeElement;
         this.currentTreeElement = treeElement;
     }
@@ -224,14 +223,14 @@ public class XmlJsonStreamWriter implements XMLStreamWriter {
         final List<TreeElement> childs = currentTreeElement.childs;
         if (childs.size() > 0) {
             final TreeElement child = childs.get(childs.size() - 1);
-            if (child.getXmlEvent() == XMLEvent.CHARACTERS) {
+            if (child.getXmlEvent() == XMLStreamConstants.CHARACTERS) {
                 child.appendValue(text);
 
                 return;
             }
         }
 
-        final TreeElement treeElement = new TreeElement(currentTreeElement, XMLEvent.CHARACTERS, JsonToken.VALUE_STRING);
+        final TreeElement treeElement = new TreeElement(currentTreeElement, XMLStreamConstants.CHARACTERS, JsonToken.VALUE_STRING);
         treeElement.setValue(text);
 
         currentTreeElement.addChild(treeElement);
@@ -345,7 +344,7 @@ public class XmlJsonStreamWriter implements XMLStreamWriter {
         }
 
         private void writeEndNoTypeHints() {
-            if (xmlEvent == XMLEvent.START_ELEMENT) {
+            if (xmlEvent == XMLStreamConstants.START_ELEMENT) {
                 if (childs.isEmpty()) {
                     // empty root element
                     if (this.parent.jsonToken == JsonToken.NOT_AVAILABLE) {
@@ -357,7 +356,7 @@ public class XmlJsonStreamWriter implements XMLStreamWriter {
                         treeElement.setValue("");
                         this.addChild(treeElement);
                     }
-                } else if (childs.size() == 1 && childs.get(0).xmlEvent == XMLEvent.CHARACTERS) {
+                } else if (childs.size() == 1 && childs.get(0).xmlEvent == XMLStreamConstants.CHARACTERS) {
                     // just character childs.
 
                     // empty root element
@@ -440,7 +439,7 @@ public class XmlJsonStreamWriter implements XMLStreamWriter {
                                 treeElement.addChild(element);
                                 childs.set(childs.indexOf(element), treeElement);
                                 element.parent = treeElement;
-                                if (element.xmlEvent == XMLEvent.CHARACTERS) {
+                                if (element.xmlEvent == XMLStreamConstants.CHARACTERS) {
                                     element.jsonToken = jsonToken;
                                 }
                             }
diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java b/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java
index 6ecf9b7..81754e8 100644
--- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java
+++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java
@@ -828,7 +828,7 @@ public class XMLSecurityDataFormat extends ServiceSupport implements DataFormat,
      
     private DefaultNamespaceContext getNamespaceContext() {
         return this.nsContext;
-    };
+    }
 
     public String getXmlCipherAlgorithm() {
         return xmlCipherAlgorithm;
diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormatTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormatTest.java
index a813028..a0178ee 100644
--- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormatTest.java
+++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormatTest.java
@@ -25,8 +25,6 @@ import javax.xml.transform.OutputKeys;
 import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
 
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.converter.jaxp.XmlConverter;
diff --git a/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java b/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java
index 8831baa..fe889f5 100644
--- a/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java
+++ b/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.dataformat.zipfile;
 
-import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -28,12 +27,9 @@ import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;
 
 import org.apache.camel.Exchange;
-import org.apache.camel.InvalidPayloadException;
-import org.apache.camel.TypeConverter;
 import org.apache.camel.spi.DataFormat;
 import org.apache.camel.spi.DataFormatName;
 import org.apache.camel.spi.annotations.Dataformat;
-import org.apache.camel.support.InputStreamIterator;
 import org.apache.camel.support.builder.OutputStreamBuilder;
 import org.apache.camel.support.service.ServiceSupport;
 import org.apache.camel.util.IOHelper;
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinMDCScopeDecoratorTest.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinMDCScopeDecoratorTest.java
index 0e0068a..0fe6395 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinMDCScopeDecoratorTest.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinMDCScopeDecoratorTest.java
@@ -22,7 +22,6 @@ import org.apache.camel.Processor;
 import org.apache.camel.RoutesBuilder;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.MDC;
 
diff --git a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/GroupTest.java b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/GroupTest.java
index f73a8aa..6f10a1d 100644
--- a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/GroupTest.java
+++ b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/GroupTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.zookeepermaster.group;
 
 import java.io.File;
-import java.net.ServerSocket;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
diff --git a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/internal/ZooKeeperGroupTest.java b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/internal/ZooKeeperGroupTest.java
index 0ebcf8f..e1723f8 100644
--- a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/internal/ZooKeeperGroupTest.java
+++ b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/internal/ZooKeeperGroupTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.zookeepermaster.group.internal;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.net.ServerSocket;
 import java.util.List;
 import java.util.Map;
 
diff --git a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/NaturalSortComparator.java b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/NaturalSortComparator.java
index ab6bfdc..76e41b6 100644
--- a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/NaturalSortComparator.java
+++ b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/NaturalSortComparator.java
@@ -42,7 +42,7 @@ public class NaturalSortComparator implements Comparator<CharSequence> {
         }
     }
 
-    private Order order;;
+    private Order order;
 
     public NaturalSortComparator() {
         this(Order.Ascending);
diff --git a/core/camel-api/src/main/java/org/apache/camel/Channel.java b/core/camel-api/src/main/java/org/apache/camel/Channel.java
index 8fcdbbe..bdfcbfb 100644
--- a/core/camel-api/src/main/java/org/apache/camel/Channel.java
+++ b/core/camel-api/src/main/java/org/apache/camel/Channel.java
@@ -16,9 +16,6 @@
  */
 package org.apache.camel;
 
-import java.util.List;
-
-import org.apache.camel.spi.InterceptStrategy;
 import org.apache.camel.spi.RouteContext;
 
 /**
diff --git a/core/camel-api/src/main/java/org/apache/camel/support/service/ServiceHelper.java b/core/camel-api/src/main/java/org/apache/camel/support/service/ServiceHelper.java
index 05393ea..6ecfdc7 100644
--- a/core/camel-api/src/main/java/org/apache/camel/support/service/ServiceHelper.java
+++ b/core/camel-api/src/main/java/org/apache/camel/support/service/ServiceHelper.java
@@ -25,7 +25,6 @@ import java.util.Set;
 import org.apache.camel.Channel;
 import org.apache.camel.Navigate;
 import org.apache.camel.Processor;
-import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.Service;
 import org.apache.camel.ShutdownableService;
 import org.apache.camel.StatefulService;
diff --git a/core/camel-base/src/main/java/org/apache/camel/converter/ObjectConverter.java b/core/camel-base/src/main/java/org/apache/camel/converter/ObjectConverter.java
index 20bacc9..202f272 100644
--- a/core/camel-base/src/main/java/org/apache/camel/converter/ObjectConverter.java
+++ b/core/camel-base/src/main/java/org/apache/camel/converter/ObjectConverter.java
@@ -123,9 +123,9 @@ public final class ObjectConverter {
     public static Class<?> toClass(String value, Exchange exchange) {
         // prefer to use class resolver API
         if (exchange != null) {
-            return exchange.getContext().getClassResolver().resolveClass((String) value);
+            return exchange.getContext().getClassResolver().resolveClass(value);
         } else {
-            return org.apache.camel.util.ObjectHelper.loadClass((String) value);
+            return org.apache.camel.util.ObjectHelper.loadClass(value);
         }
     }
 
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 f9813e4..d4e024e 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
@@ -143,13 +143,11 @@ import org.apache.camel.support.EndpointHelper;
 import org.apache.camel.support.EventHelper;
 import org.apache.camel.support.OrderedComparator;
 import org.apache.camel.support.ProcessorEndpoint;
-import org.apache.camel.support.ResolverHelper;
 import org.apache.camel.support.jsse.SSLContextParameters;
 import org.apache.camel.support.service.ServiceHelper;
 import org.apache.camel.support.service.ServiceSupport;
 import org.apache.camel.util.IOHelper;
 import org.apache.camel.util.ObjectHelper;
-import org.apache.camel.util.PropertiesHelper;
 import org.apache.camel.util.StopWatch;
 import org.apache.camel.util.StringHelper;
 import org.apache.camel.util.TimeUtils;
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java
index 919edc9..5fb4c0e 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java
@@ -234,7 +234,7 @@ public class DefaultCamelBeanPostProcessor implements CamelBeanPostProcessor {
     protected void injectBindToRegistryMethods(final Object bean, final String beanName) {
         // sort the methods so the simplest are used first
 
-        final List<Method> methods = new ArrayList<Method>();
+        final List<Method> methods = new ArrayList<>();
         ReflectionHelper.doWithMethods(bean.getClass(), method -> {
             BindToRegistry bind = method.getAnnotation(BindToRegistry.class);
             if (bind != null) {
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultProducerCache.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultProducerCache.java
index 7d8fa18..f5bc298 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultProducerCache.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultProducerCache.java
@@ -27,7 +27,6 @@ import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
 import org.apache.camel.FailedToCreateProducerException;
-import org.apache.camel.FailedToStartRouteException;
 import org.apache.camel.Processor;
 import org.apache.camel.StatefulService;
 import org.apache.camel.processor.CamelInternalProcessor;
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
index 766e0c6..5d5af65 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
@@ -838,7 +838,7 @@ public class CamelInternalProcessor extends DelegateAsyncProcessor {
         if (instrumentationProcessor instanceof CamelInternalProcessor) {
             return (CamelInternalProcessorAdvice<T>) instrumentationProcessor;
         } else {
-            return new CamelInternalProcessorAdviceWrapper<T>(instrumentationProcessor);
+            return new CamelInternalProcessorAdviceWrapper<>(instrumentationProcessor);
         }
     }
 
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/impl/AbstractModelCamelContext.java b/core/camel-core-engine/src/main/java/org/apache/camel/impl/AbstractModelCamelContext.java
index 29cd731..148f9f0 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/impl/AbstractModelCamelContext.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/impl/AbstractModelCamelContext.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.impl;
 
-import java.io.InputStream;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java
index 93e6dea..02b07ca 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java
@@ -214,7 +214,7 @@ public final class RouteDefinitionHelper {
                     FromDefinition fromDefinition = route.getInput();
                     String endpointUri = fromDefinition.getEndpointUri();
                     if (ObjectHelper.isNotEmpty(endpointUri) && (endpointUri.startsWith("rest:") || endpointUri.startsWith("rest-api:"))) {
-                        Map<String, Object> options = new HashMap<String, Object>(1);
+                        Map<String, Object> options = new HashMap<>(1);
                         options.put("routeId", route.getId());
                         endpointUri = URISupport.appendParametersToURI(endpointUri, options);
 
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/Any23DataFormat.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/Any23DataFormat.java
index 5678816..c65afac 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/Any23DataFormat.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/dataformat/Any23DataFormat.java
@@ -43,7 +43,7 @@ public class Any23DataFormat extends DataFormatDefinition {
     @Metadata(defaultValue = "RDF4JMODEL")
     private Any23Type outputFormat;
     @XmlJavaTypeAdapter(PropertyDescriptionsAdapter.class)
-    private Map<String, String> configuration = new HashMap<String, String>();
+    private Map<String, String> configuration = new HashMap<>();
     @XmlElement
     private List<String> extractors;
     @XmlAttribute
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/InterceptFromReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/InterceptFromReifier.java
index ea3c10d..dd2d052 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/InterceptFromReifier.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/InterceptFromReifier.java
@@ -27,7 +27,7 @@ import org.apache.camel.support.ExpressionAdapter;
 public class InterceptFromReifier extends InterceptReifier<InterceptFromDefinition> {
 
     public InterceptFromReifier(ProcessorDefinition<?> definition) {
-        super((InterceptFromDefinition)definition);
+        super(definition);
     }
 
     @Override
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ProcessorReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
index 4cc69b2..8fc7382 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
@@ -472,9 +472,8 @@ public abstract class ProcessorReifier<T extends ProcessorDefinition<?>> {
             // resolve properties before we create the processor
             ProcessorDefinitionHelper.resolvePropertyPlaceholders(routeContext.getCamelContext(), output);
 
-            // also resolve properties and constant fields on embedded
-            // expressions
-            ProcessorDefinition<?> me = (ProcessorDefinition<?>)output;
+            // also resolve properties and constant fields on embedded expressions
+            ProcessorDefinition<?> me = output;
             if (me instanceof ExpressionNode) {
                 ExpressionNode exp = (ExpressionNode)me;
                 ExpressionDefinition expressionDefinition = exp.getExpression();
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java
index 2b70462..02da389 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java
@@ -28,7 +28,7 @@ import org.apache.camel.util.StringHelper;
 public class DeadLetterChannelReifier extends DefaultErrorHandlerReifier<DeadLetterChannelBuilder> {
 
     public DeadLetterChannelReifier(ErrorHandlerFactory definition) {
-        super((DeadLetterChannelBuilder)definition);
+        super(definition);
     }
 
     @Override
diff --git a/core/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/OsgiFactoryFinderTest.java b/core/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/OsgiFactoryFinderTest.java
index b8c82f0..383a717 100644
--- a/core/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/OsgiFactoryFinderTest.java
+++ b/core/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/OsgiFactoryFinderTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.core.osgi;
 
 import java.io.IOException;
 
-import org.apache.camel.NoFactoryAvailableException;
 import org.apache.camel.impl.engine.DefaultClassResolver;
 import org.junit.Test;
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/TestSupport.java b/core/camel-core/src/test/java/org/apache/camel/TestSupport.java
index e3f9d3a..786fd44 100644
--- a/core/camel-core/src/test/java/org/apache/camel/TestSupport.java
+++ b/core/camel-core/src/test/java/org/apache/camel/TestSupport.java
@@ -25,6 +25,7 @@ import org.apache.camel.builder.Builder;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.builder.ValueBuilder;
 import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.impl.engine.AbstractCamelContext;
 import org.apache.camel.processor.Pipeline;
 import org.apache.camel.processor.errorhandler.ErrorHandlerSupport;
 import org.apache.camel.support.DefaultExchange;
@@ -63,7 +64,7 @@ public abstract class TestSupport extends Assert {
     @Before
     public void setUp() throws Exception {
         // start with a clean slate
-        DefaultCamelContext.setContextCounter(0);
+        AbstractCamelContext.setContextCounter(0);
         TestSupportNodeIdFactory.resetCounters();
         Assume.assumeTrue(canRunOnThisPlatform());
     }
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathFunctionsTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathFunctionsTest.java
index 6335b3a..9f10ee6 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathFunctionsTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathFunctionsTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.builder.xml;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.component.properties.PropertiesComponent;
 import org.junit.Test;
 
 /**
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanCreateBodyExceptionTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanCreateBodyExceptionTest.java
index ecd8bcf..0b37fe6 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanCreateBodyExceptionTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanCreateBodyExceptionTest.java
@@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.support.DefaultMessage;
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class BeanCreateBodyExceptionTest extends ContextTestSupport {
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FilerProducerDoneFileNameTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FilerProducerDoneFileNameTest.java
index d2985dd..c750f9c 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FilerProducerDoneFileNameTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FilerProducerDoneFileNameTest.java
@@ -24,7 +24,6 @@ import org.apache.camel.CamelExecutionException;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExpressionIllegalSyntaxException;
-import org.apache.camel.component.properties.PropertiesComponent;
 import org.apache.camel.impl.JndiRegistry;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/PropertiesAvailableEverywhereTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/PropertiesAvailableEverywhereTest.java
index 1877a55..1f8c908 100644
--- a/core/camel-core/src/test/java/org/apache/camel/issues/PropertiesAvailableEverywhereTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/issues/PropertiesAvailableEverywhereTest.java
@@ -21,7 +21,6 @@ import java.util.Properties;
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.properties.PropertiesComponent;
 import org.junit.Test;
 
 public class PropertiesAvailableEverywhereTest extends ContextTestSupport {
diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/TransactedPropertyPlaceholderIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/TransactedPropertyPlaceholderIssueTest.java
index 67eee94..4ce6d43 100644
--- a/core/camel-core/src/test/java/org/apache/camel/issues/TransactedPropertyPlaceholderIssueTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/issues/TransactedPropertyPlaceholderIssueTest.java
@@ -21,7 +21,6 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.NamedNode;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.properties.PropertiesComponent;
 import org.apache.camel.spi.Policy;
 import org.apache.camel.spi.RouteContext;
 import org.junit.Test;
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/RouteAutoStartupTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/RouteAutoStartupTest.java
index b9a9790..0ba1286 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/RouteAutoStartupTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/RouteAutoStartupTest.java
@@ -20,7 +20,6 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.direct.DirectComponent;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.component.properties.PropertiesComponent;
 import org.junit.Test;
 
 public class RouteAutoStartupTest extends ContextTestSupport {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/ThrottlingGroupingTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/ThrottlingGroupingTest.java
index a14d8de..7679504 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/ThrottlingGroupingTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/ThrottlingGroupingTest.java
@@ -51,7 +51,7 @@ public class ThrottlingGroupingTest extends ContextTestSupport {
         getMockEndpoint("mock:dead").expectedBodiesReceived("Kaboom", "Saloon");
         getMockEndpoint("mock:resultdynamic").expectedBodiesReceived("Hello Dynamic World", "Bye Dynamic World");
 
-        Map<String, Object> headers = new HashMap<String, Object>();
+        Map<String, Object> headers = new HashMap<>();
 
         template.sendBodyAndHeaders("seda:a", "Kaboom", headers);
         template.sendBodyAndHeaders("seda:a", "Saloon", headers);
@@ -75,7 +75,7 @@ public class ThrottlingGroupingTest extends ContextTestSupport {
         resultEndpoint.expectedMessageCount(3);
         resultEndpoint.setResultWaitTime(2000);
 
-        Map<String, Object> headers = new HashMap<String, Object>();
+        Map<String, Object> headers = new HashMap<>();
         for (int i = 0; i < 9; i++) {
             if (i % 2 == 0) {
                 headers.put("key", "1");
@@ -116,7 +116,7 @@ public class ThrottlingGroupingTest extends ContextTestSupport {
             for (int i = 0; i < messageCount; i++) {
                 executor.execute(new Runnable() {
                     public void run() {
-                        Map<String, Object> headers = new HashMap<String, Object>();
+                        Map<String, Object> headers = new HashMap<>();
                         if (messageCount % 2 == 0) {
                             headers.put("key", "1");
                         } else {
@@ -178,7 +178,7 @@ public class ThrottlingGroupingTest extends ContextTestSupport {
         for (int i = 0; i < messageCount; i++) {
             executor.execute(new Runnable() {
                 public void run() {
-                    Map<String, Object> headers = new HashMap<String, Object>();
+                    Map<String, Object> headers = new HashMap<>();
                     headers.put("throttleValue", throttle);
                     if (messageCount % 2 == 0) {
                         headers.put("key", "1");
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptFromPropertyPlaceholderTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptFromPropertyPlaceholderTest.java
index a1be5f2..df0136f 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptFromPropertyPlaceholderTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptFromPropertyPlaceholderTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.processor.intercept;
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.properties.PropertiesComponent;
 import org.junit.Test;
 
 /**
diff --git a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlChoiceFilterRoutePropertyPlaceholderTest.java b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlChoiceFilterRoutePropertyPlaceholderTest.java
index bc9dd0f..cfac414 100644
--- a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlChoiceFilterRoutePropertyPlaceholderTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlChoiceFilterRoutePropertyPlaceholderTest.java
@@ -21,7 +21,6 @@ import java.util.Properties;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.model.ModelHelper;
-import org.apache.camel.spi.PropertiesComponent;
 import org.junit.Test;
 
 /**
diff --git a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlPlaceholdersTest.java b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlPlaceholdersTest.java
index fe61ca1..967823e 100644
--- a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlPlaceholdersTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlPlaceholdersTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.util;
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.properties.PropertiesComponent;
 import org.apache.camel.model.ModelHelper;
 import org.junit.Test;
 
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java b/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java
index 1b8a99f..101dd80 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java
@@ -230,7 +230,7 @@ public class DefaultManagementObjectStrategy implements ManagementObjectStrategy
 
     @Override
     public Object getManagedObjectForRouteController(CamelContext context) {
-        ManagedRouteController mrc = new ManagedRouteController((ModelCamelContext) context);
+        ManagedRouteController mrc = new ManagedRouteController(context);
         mrc.init(context.getManagementStrategy());
         return mrc;
     }
@@ -239,9 +239,9 @@ public class DefaultManagementObjectStrategy implements ManagementObjectStrategy
     public Object getManagedObjectForRoute(CamelContext context, Route route) {
         ManagedRoute mr;
         if (route.supportsSuspension()) {
-            mr = new ManagedSuspendableRoute((ModelCamelContext)context, route);
+            mr = new ManagedSuspendableRoute(context, route);
         } else {
-            mr = new ManagedRoute((ModelCamelContext)context, route);
+            mr = new ManagedRoute(context, route);
         }
         mr.init(context.getManagementStrategy());
         return mr;
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementStrategyFactory.java b/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementStrategyFactory.java
index dee2c0e..ef4f9e7 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementStrategyFactory.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementStrategyFactory.java
@@ -18,10 +18,8 @@ package org.apache.camel.management;
 
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.Service;
 import org.apache.camel.spi.LifecycleStrategy;
 import org.apache.camel.spi.ManagementStrategy;
 import org.apache.camel.spi.ManagementStrategyFactory;
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedTracer.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedTracer.java
index f3b81e6..8aa90db 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedTracer.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedTracer.java
@@ -16,14 +16,9 @@
  */
 package org.apache.camel.management.mbean;
 
-import java.util.List;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.api.management.ManagedResource;
-import org.apache.camel.api.management.mbean.BacklogTracerEventMessage;
-import org.apache.camel.api.management.mbean.ManagedBacklogTracerMBean;
 import org.apache.camel.api.management.mbean.ManagedTracerMBean;
-import org.apache.camel.processor.interceptor.BacklogTracer;
 import org.apache.camel.spi.ManagementStrategy;
 import org.apache.camel.spi.Tracer;
 
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedComponentTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedComponentTest.java
index b78f6c4..244e656 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedComponentTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedComponentTest.java
@@ -22,9 +22,6 @@ import java.util.Map;
 import javax.management.MBeanServer;
 import javax.management.MBeanServerConnection;
 import javax.management.ObjectName;
-import javax.management.remote.JMXConnector;
-import javax.management.remote.JMXConnectorFactory;
-import javax.management.remote.JMXServiceURL;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagementTestSupport.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagementTestSupport.java
index a4057bd..fb9dbc5 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagementTestSupport.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagementTestSupport.java
@@ -17,7 +17,6 @@
 package org.apache.camel.management;
 
 import java.io.IOException;
-import java.util.Random;
 
 import javax.management.InstanceNotFoundException;
 import javax.management.MBeanException;
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java b/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java
index 68cd54e..77e53ee 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java
@@ -24,7 +24,6 @@ import java.util.concurrent.atomic.AtomicLong;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
-import org.apache.camel.ExtendedCamelContext;
 import org.apache.camel.FailedToCreateConsumerException;
 import org.apache.camel.LoggingLevel;
 import org.apache.camel.PollingConsumerPollingStrategy;
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/SimpleTypeConverter.java b/core/camel-support/src/main/java/org/apache/camel/support/SimpleTypeConverter.java
index 4d60c86..8b4a72c 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/SimpleTypeConverter.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/SimpleTypeConverter.java
@@ -104,4 +104,4 @@ public class SimpleTypeConverter implements TypeConverter {
         }
     }
 
-};
+}
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/builder/TokenXMLExpressionIterator.java b/core/camel-support/src/main/java/org/apache/camel/support/builder/TokenXMLExpressionIterator.java
index a6aa884..81265b6 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/builder/TokenXMLExpressionIterator.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/builder/TokenXMLExpressionIterator.java
@@ -35,7 +35,6 @@ import org.apache.camel.InvalidPayloadException;
 import org.apache.camel.support.ExchangeHelper;
 import org.apache.camel.support.ExpressionAdapter;
 import org.apache.camel.support.LanguageSupport;
-import org.apache.camel.util.CollectionStringBuffer;
 import org.apache.camel.util.IOHelper;
 import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.StringHelper;
diff --git a/core/camel-util/src/main/java/org/apache/camel/util/OrderedProperties.java b/core/camel-util/src/main/java/org/apache/camel/util/OrderedProperties.java
index 5fd017a..84f78d6 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/OrderedProperties.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/OrderedProperties.java
@@ -96,7 +96,7 @@ public final class OrderedProperties extends Properties {
     @SuppressWarnings("unchecked")
     public Set<Map.Entry<Object, Object>> entrySet() {
         Set entrySet = map.entrySet();
-        return (Set<Map.Entry<Object, Object>>) entrySet;
+        return entrySet;
     }
 
     @Override
diff --git a/docs/user-manual/modules/ROOT/examples/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/CamelSpringDelegatingTestContextLoaderTest.java b/docs/user-manual/modules/ROOT/examples/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/CamelSpringDelegatingTestContextLoaderTest.java
index 7e41757..9fe6e40 100644
--- a/docs/user-manual/modules/ROOT/examples/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/CamelSpringDelegatingTestContextLoaderTest.java
+++ b/docs/user-manual/modules/ROOT/examples/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/CamelSpringDelegatingTestContextLoaderTest.java
@@ -23,7 +23,6 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.javaconfig.SingleRouteCamelConfiguration;
 import org.apache.camel.test.spring.CamelSpringDelegatingTestContextLoader;
-import org.apache.camel.test.spring.CamelSpringJUnit4ClassRunner;
 import org.apache.camel.test.spring.CamelSpringRunner;
 import org.apache.camel.test.spring.MockEndpoints;
 import org.junit.Test;
diff --git a/examples/camel-example-billboard-aggr/src/test/java/org/apache/camel/example/billboard/BillboardAggrTest.java b/examples/camel-example-billboard-aggr/src/test/java/org/apache/camel/example/billboard/BillboardAggrTest.java
index 9f956e6..7786512 100644
--- a/examples/camel-example-billboard-aggr/src/test/java/org/apache/camel/example/billboard/BillboardAggrTest.java
+++ b/examples/camel-example-billboard-aggr/src/test/java/org/apache/camel/example/billboard/BillboardAggrTest.java
@@ -94,7 +94,7 @@ public class BillboardAggrTest extends CamelTestSupport {
     }
 
     public static class MyAggregationStrategy implements AggregationStrategy {
-        private static Map<String, Integer> map = new ConcurrentHashMap<String, Integer>();
+        private static Map<String, Integer> map = new ConcurrentHashMap<>();
 
         @Override
         public Exchange aggregate(Exchange oldExchange, Exchange newExchange) {
diff --git a/examples/camel-example-debezium/src/main/java/org/apache/camel/example/debezium/DebeziumMySqlConsumerToKinesis.java b/examples/camel-example-debezium/src/main/java/org/apache/camel/example/debezium/DebeziumMySqlConsumerToKinesis.java
index 73fb065..891d7ff 100644
--- a/examples/camel-example-debezium/src/main/java/org/apache/camel/example/debezium/DebeziumMySqlConsumerToKinesis.java
+++ b/examples/camel-example-debezium/src/main/java/org/apache/camel/example/debezium/DebeziumMySqlConsumerToKinesis.java
@@ -22,7 +22,6 @@ import java.util.Map;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.aws.kinesis.KinesisConstants;
 import org.apache.camel.component.debezium.DebeziumConstants;
-import org.apache.camel.component.properties.PropertiesComponent;
 import org.apache.camel.main.Main;
 import org.apache.camel.model.dataformat.JsonLibrary;
 import org.apache.kafka.connect.data.Struct;
diff --git a/examples/camel-example-debezium/src/main/java/org/apache/camel/example/debezium/KinesisProducerToCassandra.java b/examples/camel-example-debezium/src/main/java/org/apache/camel/example/debezium/KinesisProducerToCassandra.java
index a31b093..fef2c86 100644
--- a/examples/camel-example-debezium/src/main/java/org/apache/camel/example/debezium/KinesisProducerToCassandra.java
+++ b/examples/camel-example-debezium/src/main/java/org/apache/camel/example/debezium/KinesisProducerToCassandra.java
@@ -21,7 +21,6 @@ import java.util.Collections;
 import java.util.Map;
 
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.properties.PropertiesComponent;
 import org.apache.camel.main.Main;
 import org.apache.camel.model.dataformat.JsonLibrary;
 import org.slf4j.Logger;
diff --git a/examples/camel-example-main-artemis/src/main/java/org/apache/camel/example/MyConfiguration.java b/examples/camel-example-main-artemis/src/main/java/org/apache/camel/example/MyConfiguration.java
index 38c1e89..215c9e2 100644
--- a/examples/camel-example-main-artemis/src/main/java/org/apache/camel/example/MyConfiguration.java
+++ b/examples/camel-example-main-artemis/src/main/java/org/apache/camel/example/MyConfiguration.java
@@ -16,13 +16,6 @@
  */
 package org.apache.camel.example;
 
-import javax.jms.ConnectionFactory;
-
-import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.artemis.jms.client.ActiveMQJMSConnectionFactory;
-import org.apache.camel.BindToRegistry;
-import org.apache.camel.PropertyInject;
-
 /**
  * Class to configure the Camel application.
  */
diff --git a/examples/camel-example-spring-boot-metrics/src/main/java/org/apache/camel/example/spring/boot/metrics/Application.java b/examples/camel-example-spring-boot-metrics/src/main/java/org/apache/camel/example/spring/boot/metrics/Application.java
index 7b47a4b..8507f25 100644
--- a/examples/camel-example-spring-boot-metrics/src/main/java/org/apache/camel/example/spring/boot/metrics/Application.java
+++ b/examples/camel-example-spring-boot-metrics/src/main/java/org/apache/camel/example/spring/boot/metrics/Application.java
@@ -30,7 +30,6 @@ import org.apache.camel.component.metrics.routepolicy.MetricsRoutePolicyFactory;
 import org.apache.camel.spring.boot.CamelContextConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
diff --git a/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClient.java b/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClient.java
index ccc057a..33958e7 100644
--- a/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClient.java
+++ b/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClient.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.example.client;
 
-import org.apache.camel.ExchangePattern;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.util.IOHelper;
 import org.slf4j.Logger;
diff --git a/examples/camel-example-telegram/src/main/java/org/apache/camel/example/telegram/usage/GetUpdatesUsage.java b/examples/camel-example-telegram/src/main/java/org/apache/camel/example/telegram/usage/GetUpdatesUsage.java
index ad3dbb5..8fec138 100644
--- a/examples/camel-example-telegram/src/main/java/org/apache/camel/example/telegram/usage/GetUpdatesUsage.java
+++ b/examples/camel-example-telegram/src/main/java/org/apache/camel/example/telegram/usage/GetUpdatesUsage.java
@@ -17,11 +17,8 @@
 package org.apache.camel.example.telegram.usage;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.ProducerTemplate;
 import org.apache.camel.component.telegram.TelegramService;
 import org.apache.camel.component.telegram.TelegramServiceProvider;
-import org.apache.camel.component.telegram.model.MessageResult;
-import org.apache.camel.component.telegram.model.OutgoingTextMessage;
 import org.apache.camel.component.telegram.model.UpdateResult;
 import org.apache.camel.example.telegram.Application;
 
diff --git a/examples/camel-example-telegram/src/main/java/org/apache/camel/example/telegram/usage/SendVenueUsage.java b/examples/camel-example-telegram/src/main/java/org/apache/camel/example/telegram/usage/SendVenueUsage.java
index c07011b..de2d0be 100644
--- a/examples/camel-example-telegram/src/main/java/org/apache/camel/example/telegram/usage/SendVenueUsage.java
+++ b/examples/camel-example-telegram/src/main/java/org/apache/camel/example/telegram/usage/SendVenueUsage.java
@@ -18,11 +18,8 @@ package org.apache.camel.example.telegram.usage;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
-import org.apache.camel.component.telegram.model.EditMessageLiveLocationMessage;
 import org.apache.camel.component.telegram.model.MessageResult;
-import org.apache.camel.component.telegram.model.SendLocationMessage;
 import org.apache.camel.component.telegram.model.SendVenueMessage;
-import org.apache.camel.component.telegram.model.StopMessageLiveLocationMessage;
 
 public class SendVenueUsage implements TelegramMethodUsage {
 
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java
index 8f7d16d..1be88bd 100644
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java
+++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java
@@ -591,7 +591,7 @@ public abstract class AbstractLocalCamelController extends AbstractCamelControll
         if (camelContextName != null) {
             CamelContext context = this.getLocalCamelContext(camelContextName);
             if (context != null) {
-                List<Transformer> transformers = new ArrayList<Transformer>(context.getTransformerRegistry().values());
+                List<Transformer> transformers = new ArrayList<>(context.getTransformerRegistry().values());
                 for (Transformer transformer : transformers) {
                     Map<String, String> row = new LinkedHashMap<>();
                     row.put("camelContextName", context.getName());
@@ -614,7 +614,7 @@ public abstract class AbstractLocalCamelController extends AbstractCamelControll
         if (camelContextName != null) {
             CamelContext context = this.getLocalCamelContext(camelContextName);
             if (context != null) {
-                List<Validator> validators = new ArrayList<Validator>(context.getValidatorRegistry().values());
+                List<Validator> validators = new ArrayList<>(context.getValidatorRegistry().values());
                 for (Validator validator : validators) {
                     Map<String, String> row = new LinkedHashMap<>();
                     row.put("camelContextName", context.getName());
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteStepCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteStepCommand.java
index 4880beb..1c9a1dc 100644
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteStepCommand.java
+++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteStepCommand.java
@@ -21,7 +21,6 @@ import java.io.StringReader;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.Unmarshaller;
 
-import org.apache.camel.support.dump.ProcessorStatDump;
 import org.apache.camel.support.dump.RouteStatDump;
 import org.apache.camel.support.dump.StepStatDump;
 
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelWebsocketJsr356Test.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelWebsocketJsr356Test.java
index fbda38e..10122e0 100644
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelWebsocketJsr356Test.java
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelWebsocketJsr356Test.java
@@ -17,7 +17,6 @@
 package org.apache.camel.itest.springboot;
 
 import org.apache.camel.itest.springboot.util.ArquillianPackager;
-import org.apache.camel.itest.springboot.util.DependencyResolver;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.Archive;
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/JettyHttpFileCacheTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/JettyHttpFileCacheTest.java
index 92865ba..4577934 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/JettyHttpFileCacheTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/JettyHttpFileCacheTest.java
@@ -21,7 +21,6 @@ import java.io.File;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.converter.stream.CachedOutputStream;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsIntegrationTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsIntegrationTest.java
index f206fae..78924d7 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsIntegrationTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsIntegrationTest.java
@@ -20,13 +20,11 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
 import javax.jms.ConnectionFactory;
-import javax.naming.Context;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.jms.JmsComponent;
 import org.apache.camel.itest.CamelJmsTestHelper;
 import org.apache.camel.spi.Registry;
-import org.apache.camel.support.jndi.JndiContext;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/ComponentPropertyConfigurerGenerator.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/ComponentPropertyConfigurerGenerator.java
index dcd1d13..000a610 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/ComponentPropertyConfigurerGenerator.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/ComponentPropertyConfigurerGenerator.java
@@ -28,7 +28,6 @@ import javax.tools.StandardLocation;
 
 import org.apache.camel.tools.apt.helper.IOHelper;
 import org.apache.camel.tools.apt.model.ComponentOption;
-import org.apache.camel.tools.apt.model.EndpointOption;
 
 import static org.apache.camel.tools.apt.AnnotationProcessorHelper.dumpExceptionToErrorFile;
 
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessorHelper.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessorHelper.java
index b53d63b..b839be6 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessorHelper.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/CoreEipAnnotationProcessorHelper.java
@@ -34,7 +34,6 @@ import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.ElementFilter;
 import javax.lang.model.util.Elements;
-import javax.tools.Diagnostic.Kind;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementRef;
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractApiMethodGeneratorMojo.java b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractApiMethodGeneratorMojo.java
index 4f3c1cc..fa5eed3 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractApiMethodGeneratorMojo.java
+++ b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractApiMethodGeneratorMojo.java
@@ -29,7 +29,6 @@ import org.apache.camel.support.component.ApiMethodParser;
 import org.apache.camel.support.component.ArgumentSubstitutionParser;
 import org.apache.commons.lang.ClassUtils;
 import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.velocity.VelocityContext;
 
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/FileApiMethodGeneratorMojo.java b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/FileApiMethodGeneratorMojo.java
index 9354840..02895d6 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/FileApiMethodGeneratorMojo.java
+++ b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/FileApiMethodGeneratorMojo.java
@@ -18,7 +18,6 @@ package org.apache.camel.maven;
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocApiMethodGeneratorMojo.java b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocApiMethodGeneratorMojo.java
index 71d8981..03b3f5b 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocApiMethodGeneratorMojo.java
+++ b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocApiMethodGeneratorMojo.java
@@ -35,7 +35,6 @@ import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.plugins.annotations.ResolutionScope;
-import org.codehaus.plexus.util.IOUtil;
 
 /**
  * Parses ApiMethod signatures from Javadoc.
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/ClassUtil.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/ClassUtil.java
index 341c4e1..59e8821a 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/ClassUtil.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/ClassUtil.java
@@ -36,7 +36,7 @@ public final class ClassUtil {
     public static final Map<Class<?>, Class<?>> PRIMITIVE_TO_WRAPPERS_MAP;
 
     static {
-        Map<Class<?>, Class<?>> primitiveToWrappersMap = new HashMap<Class<?>, Class<?>>();
+        Map<Class<?>, Class<?>> primitiveToWrappersMap = new HashMap<>();
         primitiveToWrappersMap.put(Integer.TYPE, Integer.class);
         primitiveToWrappersMap.put(Float.TYPE, Float.class);
         primitiveToWrappersMap.put(Double.TYPE, Double.class);
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/GenericsUtil.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/GenericsUtil.java
index 38e4828..c89cf9b 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/GenericsUtil.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/GenericsUtil.java
@@ -589,7 +589,7 @@ public final class GenericsUtil {
     }
 
     public static Set<Type> getDirectTypeClosure(final Type type, final Type actualType) {
-        Set<Type> typeClosure = new HashSet<Type>();
+        Set<Type> typeClosure = new HashSet<>();
         typeClosure.add(Object.class);
         fillTypeHierarchy(typeClosure, type, actualType);
         return typeClosure;
@@ -611,7 +611,7 @@ public final class GenericsUtil {
     }
 
     private static Collection<TypeVariable<?>> newSeenList() {
-        return new ArrayList<TypeVariable<?>>();
+        return new ArrayList<>();
     }
 
     public static boolean hasTypeParameters(Type type) {
@@ -684,7 +684,7 @@ public final class GenericsUtil {
     }
 
     private static Class<?>[] getClassTypes(Class<?>[] rawTypes) {
-        List<Class<?>> classTypes = new ArrayList<Class<?>>();
+        List<Class<?>> classTypes = new ArrayList<>();
         for (Class<?> rawType : rawTypes) {
             if (!rawType.isInterface()) {
                 classTypes.add(rawType);
diff --git a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/model/StringHelperTest.java b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/model/StringHelperTest.java
index 811006a..e13144a 100644
--- a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/model/StringHelperTest.java
+++ b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/model/StringHelperTest.java
@@ -41,7 +41,7 @@ public class StringHelperTest {
                          arguments("List", "java.util.List<Map<String,java.lang.Integer>>"),
                          arguments("List", "java.util.List<Map<java.lang.String,java.lang.Integer>>"),
                          arguments("List", "java.util.List<java.util.Map<java.lang.String,java.lang.Integer>>"));
-    };
+    }
 
     @ParameterizedTest
     @MethodSource("getClassShortNameTypeVarations")