You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2019/08/03 15:56:28 UTC

[camel] branch master updated: CAMEL-13822: Add Override annotations

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 3312243  CAMEL-13822: Add Override annotations
3312243 is described below

commit 3312243b32af03ac39c3af170e318f03e01d64f0
Author: Jan Bednář <ma...@janbednar.eu>
AuthorDate: Sat Aug 3 17:39:47 2019 +0200

    CAMEL-13822: Add Override annotations
---
 .../java/org/apache/camel/parser/ParserResult.java |   1 +
 .../camel/parser/model/CamelNodeDetails.java       |   1 +
 .../camel/component/activemq/CamelConnection.java  |   2 +
 .../component/activemq/CamelConnectionFactory.java |   3 +
 .../camel/component/activemq/CamelDestination.java |  11 ++
 .../component/activemq/CamelMessageConsumer.java   |   7 +
 .../component/activemq/CamelMessageProducer.java   |   4 +
 .../camel/component/activemq/CamelQueue.java       |   3 +
 .../component/activemq/CamelQueueReceiver.java     |   1 +
 .../camel/component/activemq/CamelQueueSender.java |   3 +
 .../camel/component/activemq/CamelTopic.java       |   3 +
 .../component/activemq/CamelTopicPublisher.java    |   5 +
 .../component/activemq/CamelTopicSubscriber.java   |   2 +
 .../activemq/ActiveMQJmsHeaderRouteForceTest.java  |   1 +
 .../activemq/ActiveMQJmsHeaderRouteTest.java       |   2 +
 .../activemq/ActiveMQOriginalDestinationTest.java  |   1 +
 .../ActiveMQReplyToHeaderUsingConverterTest.java   |   2 +
 .../component/activemq/ActiveMQRouteTest.java      |   3 +
 .../activemq/AdvisoryConsumerExample.java          |   1 +
 .../camel/component/activemq/CamelJmsTest.java     |   1 +
 ...nvokeRequestReplyUsingJmsReplyToHeaderTest.java |   2 +
 .../activemq/JmsSimpleRequestReplyTest.java        |   2 +
 .../component/activemq/SetGroupIdProcessor.java    |   1 +
 .../converter/InvokeJmsMessageListenerTest.java    |   1 +
 .../converter/InvokeMessageListenerTest.java       |   2 +
 .../apache/camel/component/ahc/ws/WsEndpoint.java  |   1 +
 .../apache/camel/component/ahc/AhcEndpoint.java    |   2 +
 .../camel/component/ahc/DefaultAhcBinding.java     |   1 +
 ...ponentClientConfigSslContextParametersTest.java |   3 +
 ...entConfigWithClientConfigUriParametersTest.java |   1 +
 ...entConfigWithClientConfigUriParametersTest.java |   1 +
 .../ahc/AhcProduceSSLContextParametersGetTest.java |   2 +
 .../ahc/HttpHeaderFilterStrategyTest.java          |   1 +
 .../apache/camel/component/amqp/AMQPRouteTest.java |   2 +
 .../component/amqp/AMQPRouteTraceFrameTest.java    |   2 +
 .../amqp/artemis/AMQPEmbeddedBrokerTest.java       |   2 +
 .../apache/camel/component/apns/ApnsComponent.java |   1 +
 .../apache/camel/component/apns/ApnsConsumer.java  |   1 +
 .../apache/camel/component/apns/ApnsEndpoint.java  |   2 +
 .../apache/camel/component/apns/ApnsProducer.java  |   1 +
 .../component/apns/factory/ApnsServiceFactory.java |   2 +
 .../camel/component/apns/ApnsConsumerTest.java     |   2 +
 .../camel/component/apns/ApnsProducerTest.java     |   2 +
 .../apns/ApnsProducerWithoutTokensHeaderTest.java  |   2 +
 .../component/as2/api/CanonicalOutputStream.java   |   3 +
 .../camel/component/as2/api/entity/MimeEntity.java |   1 +
 .../apache/camel/component/as2/AS2Endpoint.java    |   3 +
 .../as2/AS2ClientManagerIntegrationTest.java       |   1 +
 .../component/asterisk/AsteriskConsumerTest.java   |   1 +
 .../camel/component/atmos/AtmosComponent.java      |   1 +
 .../camel/component/atmos/AtmosEndpoint.java       |   2 +
 .../websocket/WebsocketCamelRouterTestSupport.java |   2 +
 ...bsocketCamelRouterWithInitParamTestSupport.java |   2 +
 .../atmosphere/websocket/WebsocketRouteTest.java   |   1 +
 .../websocket/WebsocketRouteWithInitParamTest.java |   1 +
 .../apache/camel/component/atom/AtomProducer.java  |   1 +
 .../camel/component/atom/UpdatedDateFilter.java    |   3 +-
 .../apache/camel/component/feed/FeedComponent.java |   1 +
 .../apache/camel/component/feed/FeedEndpoint.java  |   3 +
 .../component/feed/FeedEntryPollingConsumer.java   |   1 +
 .../camel/component/feed/FeedPollingConsumer.java  |   1 +
 .../camel/component/atom/AtomEndpointTest.java     |   1 +
 .../atom/AtomEntryPollingConsumerTest.java         |   1 +
 .../camel/component/atom/AtomEntrySortTest.java    |   1 +
 .../camel/component/atom/AtomHttpConsumerTest.java |   1 +
 .../atom/AtomPollingConsumerIdleMessageTest.java   |   1 +
 .../component/atom/AtomPollingConsumerTest.java    |   1 +
 .../component/atom/AtomPollingLowDelayTest.java    |   1 +
 .../component/atom/AtomPollingUnthrottledTest.java |   1 +
 .../atomix/client/map/AtomixMapConfiguration.java  |   1 +
 .../messaging/AtomixMessagingConfiguration.java    |   1 +
 .../multimap/AtomixMultiMapConfiguration.java      |   1 +
 .../client/queue/AtomixQueueConfiguration.java     |   1 +
 .../atomix/client/set/AtomixSetConfiguration.java  |   1 +
 .../client/value/AtomixValueConfiguration.java     |   1 +
 .../atomix/client/map/AtomixMapConsumerTest.java   |   1 +
 .../apache/camel/attachment/DefaultAttachment.java |   2 +
 .../attachment/BeanMethodWithExchangeTest.java     |   1 +
 .../camel/dataformat/avro/AvroDataFormat.java      |   4 +
 .../camel/dataformat/avro/SpecificDataNoCache.java |   1 +
 .../camel/component/avro/AvroHttpConsumerTest.java |   1 +
 .../camel/component/avro/AvroHttpProducerTest.java |   1 +
 .../component/avro/AvroNettyConsumerTest.java      |   1 +
 .../component/avro/AvroNettyProducerTest.java      |   1 +
 .../avro/AvroMarshalAndUnmarshalSpringTest.java    |   2 +
 .../apache/camel/component/aws/cw/CwComponent.java |   1 +
 .../apache/camel/component/aws/cw/CwEndpoint.java  |   2 +
 .../apache/camel/component/aws/cw/CwProducer.java  |   1 +
 .../cw/integration/CwComponentIntegrationTest.java |   1 +
 .../camel/component/aws/ddb/DdbComponent.java      |   1 +
 .../camel/component/aws/ddb/DdbEndpoint.java       |   2 +
 .../camel/component/aws/ddb/DdbProducer.java       |   1 +
 .../integration/DdbComponentIntegrationTest.java   |   1 +
 .../camel/component/aws/ec2/EC2Endpoint.java       |   2 +
 .../camel/component/aws/ec2/EC2Producer.java       |   1 +
 .../camel/component/aws/ecs/ECSEndpoint.java       |   2 +
 .../camel/component/aws/ecs/ECSProducer.java       |   1 +
 .../camel/component/aws/eks/EKSEndpoint.java       |   2 +
 .../camel/component/aws/eks/EKSProducer.java       |   1 +
 .../camel/component/aws/iam/IAMEndpoint.java       |   2 +
 .../camel/component/aws/iam/IAMProducer.java       |   1 +
 .../KinesisFirehoseComponentIntegrationTest.java   |   1 +
 .../KinesisComponentIntegrationTest.java           |   1 +
 .../camel/component/aws/kms/KMSEndpoint.java       |   2 +
 .../camel/component/aws/kms/KMSProducer.java       |   1 +
 .../camel/component/aws/lambda/LambdaEndpoint.java |   2 +
 .../apache/camel/component/aws/mq/MQEndpoint.java  |   2 +
 .../apache/camel/component/aws/mq/MQProducer.java  |   1 +
 .../camel/component/aws/msk/MSKEndpoint.java       |   2 +
 .../camel/component/aws/msk/MSKProducer.java       |   1 +
 .../apache/camel/component/aws/s3/S3Component.java |   1 +
 .../apache/camel/component/aws/s3/S3Consumer.java  |   1 +
 .../apache/camel/component/aws/s3/S3Endpoint.java  |   2 +
 .../s3/client/impl/S3ClientIAMOptimizedImpl.java   |   1 +
 .../aws/s3/client/impl/S3ClientStandardImpl.java   |   1 +
 .../aws/s3/S3ComponentContentLengthFileTest.java   |   1 +
 .../component/aws/s3/S3ComponentFileTest.java      |   1 +
 .../aws/s3/S3ComponentKeyNameFileTest.java         |   1 +
 .../s3/integration/S3ComponentIntegrationTest.java |   1 +
 .../aws/sdb/BatchDeleteAttributesCommand.java      |   1 +
 .../aws/sdb/BatchPutAttributesCommand.java         |   1 +
 .../component/aws/sdb/DeleteAttributesCommand.java |   1 +
 .../component/aws/sdb/DeleteDomainCommand.java     |   1 +
 .../component/aws/sdb/DomainMetadataCommand.java   |   1 +
 .../component/aws/sdb/GetAttributesCommand.java    |   1 +
 .../component/aws/sdb/ListDomainsCommand.java      |   1 +
 .../component/aws/sdb/PutAttributesCommand.java    |   1 +
 .../camel/component/aws/sdb/SdbComponent.java      |   1 +
 .../camel/component/aws/sdb/SdbEndpoint.java       |   2 +
 .../camel/component/aws/sdb/SdbProducer.java       |   1 +
 .../camel/component/aws/sdb/SelectCommand.java     |   1 +
 .../camel/component/aws/ses/SesComponent.java      |   1 +
 .../camel/component/aws/ses/SesEndpoint.java       |   2 +
 .../camel/component/aws/ses/SesProducer.java       |   1 +
 .../integration/SesComponentIntegrationTest.java   |   1 +
 .../camel/component/aws/sns/SnsComponent.java      |   1 +
 .../camel/component/aws/sns/SnsEndpoint.java       |   4 +
 .../camel/component/aws/sns/SnsProducer.java       |   1 +
 .../integration/SnsComponentIntegrationTest.java   |   1 +
 .../SnsTopicWithKmsEncryptionIntegrationTest.java  |   1 +
 .../camel/component/aws/sqs/SqsConsumer.java       |   1 +
 .../camel/component/aws/sqs/SqsEndpoint.java       |   4 +
 .../camel/component/aws/sqs/SqsProducer.java       |   1 +
 .../integration/SqsComponentIntegrationTest.java   |   1 +
 .../SqsConsumerMessageIntegrationTest.java         |   1 +
 .../SqsProducerBatchSendFifoIntegrationTest.java   |   1 +
 .../SqsProducerBatchSendIntegrationTest.java       |   1 +
 .../SqsProducerDeleteMessageIntegrationTest.java   |   1 +
 .../component/aws/swf/SWFActivityProducer.java     |   1 +
 .../camel/component/aws/swf/SWFComponent.java      |   1 +
 .../camel/component/aws/swf/SWFEndpoint.java       |   2 +
 .../component/aws/swf/SWFWorkflowProducer.java     |   1 +
 .../component/azure/blob/BlobServiceComponent.java |   1 +
 .../component/azure/blob/BlobServiceEndpoint.java  |   2 +
 .../azure/queue/QueueServiceComponent.java         |   1 +
 .../azure/queue/QueueServiceEndpoint.java          |   2 +
 .../barcode/BarcodeDataFormatSpringTest.java       |   2 +
 .../bean/validator/BeanValidatorProducer.java      |   1 +
 .../validator/BeanValidatorConfigurationTest.java  |   5 +
 .../BeanValidatorXMLConfigurationRouteTest.java    |   1 +
 .../bean/validator/CarWithAnnotations.java         |   4 +
 .../validator/CarWithRedefinedDefaultGroup.java    |   4 +
 .../bean/validator/CarWithoutAnnotations.java      |   4 +
 .../component/bean/AbstractBeanProcessor.java      |   3 +
 .../apache/camel/component/bean/BeanComponent.java |   1 +
 .../apache/camel/component/bean/BeanProcessor.java |   1 +
 .../camel/component/bean/ConstantBeanHolder.java   |   5 +
 .../component/bean/ConstantTypeBeanHolder.java     |   6 +
 .../bean/DefaultParameterMappingStrategy.java      |   1 +
 .../apache/camel/component/bean/MethodInfo.java    |   2 +
 .../apache/camel/component/bean/RegistryBean.java  |   5 +
 .../camel/component/beanclass/ClassComponent.java  |   1 +
 .../apache/camel/language/bean/BeanExpression.java |   2 +
 .../apache/camel/language/bean/BeanLanguage.java   |   3 +
 .../camel/dataformat/beanio/BeanIODataFormat.java  |   4 +
 .../dataformat/bindy/BindyAbstractFactory.java     |   3 +
 .../dataformat/bindy/csv/BindyCsvDataFormat.java   |   2 +
 .../bindy/fixed/BindyFixedLengthDataFormat.java    |   2 +
 .../bindy/format/NumberPatternFormat.java          |   3 +
 .../format/factories/BigDecimalFormatFactory.java  |   2 +
 .../format/factories/BigIntegerFormatFactory.java  |   2 +
 .../format/factories/BooleanFormatFactory.java     |   2 +
 .../bindy/format/factories/ByteFormatFactory.java  |   2 +
 .../format/factories/CharacterFormatFactory.java   |   2 +
 .../bindy/format/factories/DateFormatFactory.java  |   3 +
 .../format/factories/DoubleFormatFactory.java      |   2 +
 .../bindy/format/factories/EnumFormatFactory.java  |   2 +
 .../bindy/format/factories/FloatFormatFactory.java |   2 +
 .../format/factories/IntegerFormatFactory.java     |   2 +
 .../format/factories/LocalDateFormatFactory.java   |   3 +
 .../factories/LocalDateTimeFormatFactory.java      |   3 +
 .../format/factories/LocalTimeFormatFactory.java   |   3 +
 .../bindy/format/factories/LongFormatFactory.java  |   2 +
 .../bindy/format/factories/ShortFormatFactory.java |   2 +
 .../format/factories/StringFormatFactory.java      |   2 +
 .../bindy/kvp/BindyKeyValuePairDataFormat.java     |   3 +
 .../BindyComplexCsvGenerateHeaderMarshallTest.java |   1 +
 .../bindy/csv/BindyComplexCsvUnmarshallTest.java   |   1 +
 ...mplexCsvUnmarshallUnwrapSingleInstanceTest.java |   1 +
 .../bindy/csv/BindyCsvBigFileUnmarshallTest.java   |   1 +
 .../bindy/csv/BindyCsvSkipFieldTest.java           |   1 +
 .../BindyDoNotRemoveQuotesCsvUnmarshallTest.java   |   1 +
 .../csv/BindyDoubleQuotesCsvUnmarshallTest.java    |   1 +
 .../BindyDoubleQuotesInFieldCsvUnmarshallTest.java |   1 +
 .../csv/BindyInlinedQuotesCsvUnmarshallTest.java   |   1 +
 .../csv/BindyMarshalOneToManyWithHeadersTest.java  |   1 +
 .../bindy/csv/BindyPojoSimpleCsvMarshallTest.java  |   1 +
 .../BindySimpleCsvBooleanFalseMarshallTest.java    |   1 +
 .../csv/BindySimpleCsvBooleanTrueMarshallTest.java |   1 +
 .../csv/BindySimpleCsvBooleanUnmarshallTest.java   |   1 +
 .../BindySimpleCsvGenerateHeaderMarshallTest.java  |   1 +
 .../csv/BindySimpleCsvIntegerMarshallTest.java     |   1 +
 ...indySimpleCsvMandatoryFieldsUnmarshallTest.java |   1 +
 .../bindy/csv/BindySimpleCsvMarshallDslTest.java   |   1 +
 ...BindySimpleCsvMarshallPositionModifiedTest.java |   1 +
 .../bindy/csv/BindySimpleCsvMarshallTest.java      |   1 +
 .../csv/BindySimpleCsvMarshallTrimClipTest.java    |   1 +
 .../bindy/csv/BindySimpleCsvNullMarshallTest.java  |   1 +
 .../csv/BindySimpleCsvOneToManyMarshallTest.java   |   1 +
 ...ndySimpleCsvRemoveWhitespaceUnmarshallTest.java |   1 +
 .../BindySimpleCsvSkipFirstLineUnmarshallTest.java |   1 +
 .../BindySimpleCsvUnmarshallBadIntegerTest.java    |   1 +
 ...ndySimpleCsvUnmarshallPositionModifiedTest.java |   1 +
 .../bindy/csv/BindySimpleCsvUnmarshallTest.java    |   1 +
 ...indySimpleCsvUnmarshallUnicodeNextLineTest.java |   1 +
 ...BindySingleQuoteStartWordCsvUnmarshallTest.java |   1 +
 .../csv/BindySingleQuotesCsvUnmarshallTest.java    |   1 +
 ...esWithDoubleQuotesInFieldCsvUnmarshallTest.java |   1 +
 ...ComplexOneToManyKeyValuePairUnMarshallTest.java |   1 +
 .../BindySimpleKeyValuePairMarshallDslTest.java    |   1 +
 .../fix/BindySimpleKeyValuePairMarshallTest.java   |   1 +
 .../BindySimpleKeyValuePairNullMarshallTest.java   |   1 +
 .../BindySimpleKeyValuePairSortedMarshallTest.java |   1 +
 ...indySimpleKeyValuePairSortedUnmarshallTest.java |   1 +
 .../BindySimpleKeyValuePairTabMarshallTest.java    |   1 +
 .../BindySimpleKeyValuePairTabUnmarshallTest.java  |   1 +
 ...BindySimpleKeyValuePairUnicodeNextLineTest.java |   1 +
 .../BindySimpleKeyValuePairUnmarshallDslTest.java  |   1 +
 .../fix/BindySimpleKeyValuePairUnmarshallTest.java |   1 +
 ...eKeyValuePairWithoutSectionMarshallDslTest.java |   1 +
 .../bindy/fixed/implied/BindyImpliedTest.java      |   1 +
 .../simple/BindySimpleFixedLengthMarshallTest.java |   1 +
 .../bindy/fixed/number/BindyNumberTest.java        |   1 +
 ...SimpleFixedLengthUnmarshallClassMethodTest.java |   1 +
 ...pleFixedLengthUnmarshallExternalMethodTest.java |   1 +
 .../trim/BindySimpleFixedLengthUnmarshallTest.java |   1 +
 ...FixedLengthUnmarshallTrimAlignedBFieldTest.java |   1 +
 ...dySimpleFixedLengthUnmarshallTrimFieldTest.java |   1 +
 .../date/BindyDatePatternCsvUnmarshallTest.java    |   1 +
 .../camel/blueprint/BlueprintCamelContext.java     |   1 +
 .../BlueprintModelJAXBContextFactory.java          |   1 +
 .../camel/blueprint/CamelContextFactoryBean.java   |  50 ++++++
 .../blueprint/CamelErrorHandlerFactoryBean.java    |   1 +
 .../camel/blueprint/CamelProxyFactoryBean.java     |   5 +
 .../blueprint/handler/CamelNamespaceHandler.java   |  10 ++
 .../camel/component/bonita/BonitaComponent.java    |   1 +
 .../camel/component/bonita/BonitaEndpoint.java     |   2 +
 .../bonita/producer/BonitaStartProducer.java       |   1 +
 .../apache/camel/component/box/BoxEndpoint.java    |   3 +
 .../camel/component/browse/BrowseComponent.java    |   1 +
 .../camel/component/browse/BrowseEndpoint.java     |   3 +
 .../camel/component/caffeine/EvictionType.java     |   1 +
 .../CaffeineIdempotentRepositoryTest.java          |   1 +
 .../component/cassandra/CassandraEndpoint.java     |   2 +
 .../component/cassandra/CassandraProducer.java     |   1 +
 .../CassandraAggregationRepositoryTest.java        |   2 +
 .../NamedCassandraAggregationRepositoryTest.java   |   2 +
 .../CassandraIdempotentRepositoryTest.java         |   2 +
 .../NamedCassandraIdempotentRepositoryTest.java    |   2 +
 .../org/apache/camel/cdi/AnnotatedDelegate.java    |   9 ++
 .../org/apache/camel/cdi/SyntheticAnnotated.java   |   6 +
 .../JtaTransactionErrorHandlerBuilder.java         |   2 +
 .../cdi/transaction/TransactionErrorHandler.java   |   4 +
 .../camel/cdi/xml/CamelContextFactoryBean.java     |  50 ++++++
 .../component/chatscript/ChatScriptComponent.java  |   1 +
 .../component/chatscript/ChatScriptEndpoint.java   |   2 +
 .../component/chatscript/ChatScriptProducer.java   |   1 +
 .../camel/component/chunk/ChunkLetterTest.java     |   1 +
 .../apache/camel/component/cmis/CMISComponent.java |   1 +
 .../apache/camel/component/cmis/CMISProducer.java  |   1 +
 .../camel/component/cmis/CMISQueryProducer.java    |   1 +
 .../java/org/apache/camel/coap/CoAPComponent.java  |   1 +
 .../java/org/apache/camel/coap/CoAPProducer.java   |   1 +
 .../org/apache/camel/coap/CoAPTestSupport.java     |   1 +
 .../camel/component/cometd/CometdConsumer.java     |   2 +
 .../camel/component/cometd/CometdEndpoint.java     |   3 +
 .../camel/component/cometd/CometdProducer.java     |   3 +
 ...oducerConsumerInteractiveAuthenticatedMain.java |   5 +
 ...tdProducerConsumerInteractiveExtensionMain.java |   5 +
 ...erviceRegistrationWithServiceComponentTest.java |   1 +
 .../camel/component/corda/CordaComponent.java      |   1 +
 .../component/couchbase/CouchbaseConsumer.java     |   1 +
 .../component/couchdb/CouchDbChangesetTracker.java |   1 +
 ...DefaultEnvelopedDataDecryptorConfiguration.java |   1 +
 .../cms/crypt/DefaultKeyTransRecipientInfo.java    |   1 +
 .../DefaultSignedDataVerifierConfiguration.java    |   1 +
 .../crypto/cms/sig/DefaultSignerInfo.java          |   1 +
 .../camel/component/crypto/cms/ComponentTest.java  |   1 +
 .../camel/component/crypto/cms/ProcessorsTest.java |   1 +
 .../component/crypto/cms/SpringComponentTest.java  |   2 +
 .../crypto/DigitalSignatureComponent.java          |   1 +
 .../crypto/DigitalSignatureConfiguration.java      |   2 +
 .../component/crypto/DigitalSignatureEndpoint.java |   2 +
 .../component/crypto/DigitalSignatureProducer.java |   1 +
 .../crypto/processor/SigningProcessor.java         |   1 +
 .../crypto/processor/VerifyingProcessor.java       |   1 +
 .../camel/converter/crypto/CryptoDataFormat.java   |   2 +
 .../converter/crypto/PGPKeyAccessDataFormat.java   |   2 +
 .../camel/component/crypto/ECDSASignatureTest.java |   1 +
 .../camel/component/crypto/SignatureTest.java      |   1 +
 .../component/crypto/SpringSignatureTest.java      |   1 +
 .../converter/crypto/CryptoDataFormatTest.java     |   1 +
 .../converter/crypto/PGPDataFormatDynamicTest.java |   1 +
 .../converter/crypto/PGPDataFormatElGamalTest.java |   2 +
 .../camel/converter/crypto/PGPDataFormatTest.java  |   1 +
 .../crypto/PGPDataFormatWithProvider.java          |   1 +
 .../crypto/PGPKeyAccessDataFormatTest.java         |   1 +
 .../crypto/SpringCryptoDataFormatTest.java         |   1 +
 .../SpringPGPDataFormatNoPassPhraseTest.java       |   1 +
 .../converter/crypto/SpringPGPDataFormatTest.java  |   1 +
 .../apache/camel/dataformat/csv/CsvDataFormat.java |   2 +
 .../camel/dataformat/csv/CsvUnmarshaller.java      |   1 +
 .../dataformat/csv/CsvMarshalCharsetTest.java      |   1 +
 ...MarshalHeaderWithCustomMarshallFactoryTest.java |   1 +
 .../camel/dataformat/csv/CsvRouteCharsetTest.java  |   1 +
 .../apache/camel/dataformat/csv/CsvRouteTest.java  |   1 +
 .../dataformat/csv/CsvUnmarshalStreamTest.java     |   1 +
 .../cxf/common/header/SoapMessageHeaderFilter.java |   2 +
 .../common/message/DefaultCxfMessageMapper.java    |   6 +-
 .../component/cxf/transport/CamelConduit.java      |   4 +
 .../component/cxf/transport/CamelDestination.java  |  10 ++
 .../component/cxf/transport/CamelOutputStream.java |   3 +
 .../cxf/transport/CamelTransportFactory.java       |   6 +
 .../blueprint/CamelTransportNameSpaceHandler.java  |   3 +
 .../AbstractCamelContextBeanDefinitionParser.java  |   1 +
 .../cxf/transport/spring/NamespaceHandler.java     |   1 +
 .../component/cxf/transport/CamelConduitTest.java  |   2 +
 .../cxf/transport/CamelDestinationTest.java        |   2 +
 .../cxf/transport/CamelTransportTestSupport.java   |   2 +
 .../cxf/transport/JaxWSCamelConduitTest.java       |   1 +
 .../cxf/transport/JaxWSCamelDestinationTest.java   |   1 +
 .../camel/component/cxf/CxfBlueprintEndpoint.java  |   2 +
 .../camel/component/cxf/CxfClientCallback.java     |   2 +
 .../apache/camel/component/cxf/CxfConsumer.java    |   1 +
 .../apache/camel/component/cxf/CxfEndpoint.java    |   5 +
 .../org/apache/camel/component/cxf/CxfPayload.java |   1 +
 .../apache/camel/component/cxf/CxfProducer.java    |   2 +
 .../camel/component/cxf/CxfSpringEndpoint.java     |   5 +-
 .../camel/component/cxf/DefaultCxfBinding.java     |  18 ++-
 .../component/cxf/DefaultPayloadProviderSEI.java   |   1 +
 .../component/cxf/WSDLServiceFactoryBean.java      |   3 +
 .../cxf/blueprint/CxfNamespaceHandler.java         |   4 +
 .../cxf/blueprint/RsClientBlueprintBean.java       |   4 +
 .../cxf/blueprint/RsServerBlueprintBean.java       |   4 +
 .../cxf/converter/DelegatingXMLStreamReader.java   |  34 ++++
 .../component/cxf/converter/NodeListWrapper.java   |   2 +
 .../ConfigureDocLitWrapperInterceptor.java         |   1 +
 .../CxfMessageSoapHeaderOutInterceptor.java        |   1 +
 .../OneWayOutgoingChainInterceptor.java            |   1 +
 .../RawMessageContentRedirectInterceptor.java      |   1 +
 .../interceptors/RawMessageWSDLGetInterceptor.java |   1 +
 .../RawMessageWSDLGetOutInterceptor.java           |   1 +
 .../interceptors/SetSoapVersionInterceptor.java    |   1 +
 .../camel/component/cxf/jaxrs/CxfRsEndpoint.java   |   4 +
 .../camel/component/cxf/jaxrs/CxfRsInvoker.java    |   1 +
 .../camel/component/cxf/jaxrs/CxfRsProducer.java   |   4 +
 .../component/cxf/jaxrs/CxfRsSpringEndpoint.java   |   2 +
 .../component/cxf/jaxrs/DefaultCxfRsBinding.java   |  11 +-
 .../component/cxf/spring/NamespaceHandler.java     |   1 +
 .../component/cxf/spring/SpringBusFactoryBean.java |   5 +
 .../cxf/spring/SpringJAXRSClientFactoryBean.java   |   7 +-
 .../cxf/spring/SpringJAXRSServerFactoryBean.java   |   3 +
 .../component/cxf/util/DataInInterceptor.java      |   1 +
 .../component/cxf/util/DataOutInterceptor.java     |   1 +
 .../cxf/AbstractCXFGreeterRouterTest.java          |   2 +
 .../camel/component/cxf/CXFGreeterEnrichTest.java  |   1 +
 .../camel/component/cxf/CXFGreeterRouterTest.java  |   1 +
 .../CXFWsdlOnlyPayloadModeNoSpringSoap12Test.java  |   1 +
 .../camel/component/cxf/CXFWsdlOnlyTest.java       |   3 +
 ...fConsumerClientDisconnectedSynchronousTest.java |   1 +
 .../cxf/CxfConsumerClientDisconnectedTest.java     |   1 +
 .../cxf/CxfConsumerContinuationTimeoutTest.java    |   1 +
 .../component/cxf/CxfConsumerMessageTest.java      |   1 +
 .../cxf/CxfConsumerPayLoadConvertorTest.java       |   1 +
 .../CxfConsumerPayloadFaultCauseEnabledTest.java   |   1 +
 .../component/cxf/CxfConsumerPayloadTest.java      |   1 +
 .../component/cxf/CxfConsumerProviderTest.java     |   1 +
 .../component/cxf/CxfConsumerResponseTest.java     |   1 +
 .../component/cxf/CxfConsumerStreamCacheTest.java  |   1 +
 .../camel/component/cxf/CxfConsumerTest.java       |   1 +
 .../component/cxf/CxfConsumerWithTryCatchTest.java |   2 +
 .../cxf/CxfConusmerNamespacePayLoadTest.java       |   2 +
 .../component/cxf/CxfCustomizedExceptionTest.java  |   2 +
 .../cxf/CxfGreeterConverterRouterTest.java         |   1 +
 .../cxf/CxfMessageStreamExceptionTest.java         |   1 +
 .../component/cxf/CxfMixedModeRouterTest.java      |   1 +
 .../camel/component/cxf/CxfNonWrapperTest.java     |   2 +
 .../camel/component/cxf/CxfOneWayRouteTest.java    |   1 +
 .../component/cxf/CxfPayLoadBareSoapTest.java      |   1 +
 .../component/cxf/CxfPayLoadMessageRouterTest.java |   1 +
 .../cxf/CxfPayLoadMessageXmlBindingRouterTest.java |   3 +
 .../cxf/CxfPayLoadSoapHeaderSpringTest.java        |   4 +
 .../CxfPayLoadSoapHeaderViaCamelHeaderTest.java    |   1 +
 ...dConsumerDuplicateNamespaceStreamCacheTest.java |   1 +
 .../CxfPayloadConsumerNamespaceOnEnvelopeTest.java |   2 +
 .../CxfPayloadProducerNamespaceOnEnvelopeTest.java |   2 +
 .../cxf/CxfPayloadProviderRouterTest.java          |   1 +
 .../cxf/CxfPayloadRouterContentLengthTest.java     |   2 +
 .../component/cxf/CxfProducerOperationTest.java    |   4 +
 .../cxf/CxfProducerProtocalHeaderTest.java         |   1 +
 .../camel/component/cxf/CxfProducerRouterTest.java |   1 +
 .../component/cxf/CxfProducerSessionTest.java      |   1 +
 .../component/cxf/CxfProducerSoapActionTest.java   |   1 +
 .../cxf/CxfProducerSynchronousFalseTest.java       |   1 +
 .../component/cxf/CxfProducerSynchronousTest.java  |   1 +
 .../component/cxf/CxfRawMessageRouterTest.java     |   1 +
 .../camel/component/cxf/CxfSimpleRouterTest.java   |   2 +
 .../cxf/CxfSimpleRouterWithUnwrappedStyleTest.java |   5 +
 .../cxf/CxfSpringCustomizedExceptionTest.java      |   2 +
 .../camel/component/cxf/CxfSpringRouterTest.java   |   2 +
 .../component/cxf/CxfWsdlFirstPayloadModeTest.java |   2 +
 .../component/cxf/CxfWsdlFirstProcessorTest.java   |   1 +
 .../camel/component/cxf/CxfWsdlFirstTest.java      |   1 +
 .../component/cxf/EchoServiceSessionImpl.java      |   1 +
 .../camel/component/cxf/HelloServiceImpl.java      |   6 +
 .../cxf/JaxWsWebFaultAnnotationToFaultTest.java    |   1 +
 .../camel/component/cxf/ParameterProcessor.java    |   1 +
 .../camel/component/cxf/RouteBuilderCxfTracer.java |   4 +
 .../camel/component/cxf/ServiceProvider.java       |   1 +
 .../camel/component/cxf/SoapMessageProvider.java   |   1 +
 .../apache/camel/component/cxf/TestCxfFeature.java |   1 +
 .../cxf/WriteXmlDeclarationInterceptor.java        |   1 +
 .../converter/CxfPayLoadStreamCacheRouterTest.java |   1 +
 .../cxf/converter/PayLoadConvertToPOJOTest.java    |   2 +
 .../component/cxf/holder/CXFHolderRouteTest.java   |   1 +
 .../cxf/holder/CxfHolderConsumerTest.java          |   1 +
 .../camel/component/cxf/holder/MyProcessor.java    |   1 +
 .../cxf/jaxrs/CxfRsAsyncProducerTest.java          |   1 +
 .../CxfRsBindingConfigurationSelectionTest.java    |   1 +
 ...sConsumerClientDisconnectedSynchronousTest.java |   1 +
 .../jaxrs/CxfRsConsumerClientDisconnectedTest.java |   1 +
 .../component/cxf/jaxrs/CxfRsConsumerTest.java     |   4 +
 .../cxf/jaxrs/CxfRsConsumerWithBeanTest.java       |   1 +
 .../cxf/jaxrs/CxfRsConvertBodyToTest.java          |   1 +
 .../jaxrs/CxfRsProducerAddressOverrideTest.java    |   1 +
 .../jaxrs/CxfRsProducerEndpointConfigurerTest.java |   1 +
 .../cxf/jaxrs/CxfRsProducerHeaderTest.java         |   1 +
 .../component/cxf/jaxrs/CxfRsProducerTest.java     |   1 +
 .../cxf/jaxrs/CxfRsSpringConsumerTest.java         |   1 +
 .../component/cxf/jaxrs/CxfRsStreamCacheTest.java  |   1 +
 .../component/cxf/jaxrs/JettyCxfRsRouterTest.java  |   3 +-
 .../CxfRsConsumerSimpleBindingTest.java            |   3 +
 .../cxf/jms/CxfEndpointJMSConsumerTest.java        |   3 +
 .../cxf/mtom/CxfJavaMtomProducerPayloadTest.java   |   1 +
 .../cxf/mtom/CxfMtomConsumerPayloadModeTest.java   |   1 +
 .../component/cxf/mtom/CxfMtomConsumerTest.java    |   3 +-
 .../CxfMtomDisabledConsumerPayloadModeTest.java    |   1 +
 .../component/cxf/multipart/CXFMultiPartTest.java  |   3 +
 .../cxf/soap/headers/CustomHeaderFilter.java       |   4 +-
 .../soap/headers/CxfMessageHeadersRelayTest.java   |   2 +
 .../component/cxf/spring/CxfEndpointBeanTest.java  |   1 +
 .../cxf/spring/CxfEndpointBeanWithBusTest.java     |   1 +
 .../cxf/spring/CxfEndpointBeansRouterTest.java     |   1 +
 .../camel/component/cxf/spring/MyProcessor.java    |   1 +
 .../cxf/transport/CxfRsCamelTransportTest.java     |   1 +
 .../cxf/util/CxfEndpointUtilsWithSpringTest.java   |   4 +
 .../component/cxf/util/SplitterWithXqureyTest.java |   1 +
 .../camel/component/cxf/wsa/WSAddressingTest.java  |   1 +
 .../camel/component/cxf/wsrm/HelloWorldImpl.java   |   1 +
 .../component/cxf/wsrm/MessageLossSimulator.java   |   1 +
 .../camel/component/cxf/wsrm/MyProcessor.java      |   1 +
 .../cxf/wssecurity/client/UTPasswordCallback.java  |   1 +
 .../cxf/wssecurity/server/UTPasswordCallback.java  |   1 +
 .../apache/camel/non_wrapper/PersonProcessor.java  |   1 +
 .../apache/camel/wsdl_first/JaxwsTestHandler.java  |   7 +-
 .../apache/camel/wsdl_first/PersonProcessor.java   |   1 +
 .../camel/component/dataset/DataSetSupport.java    |   4 +
 .../camel/component/dataset/ListDataSet.java       |   1 +
 .../camel/component/dataset/SimpleDataSet.java     |   1 +
 .../digitalocean/DigitalOceanComponent.java        |   1 +
 .../digitalocean/DigitalOceanEndpoint.java         |   2 +
 .../producer/DigitalOceanAccountProducer.java      |   1 +
 .../producer/DigitalOceanActionsProducer.java      |   1 +
 .../DigitalOceanBlockStoragesProducer.java         |   1 +
 .../producer/DigitalOceanDropletsProducer.java     |   1 +
 .../producer/DigitalOceanFloatingIPsProducer.java  |   1 +
 .../producer/DigitalOceanImagesProducer.java       |   1 +
 .../producer/DigitalOceanKeysProducer.java         |   1 +
 .../producer/DigitalOceanRegionsProducer.java      |   1 +
 .../producer/DigitalOceanSizesProducer.java        |   1 +
 .../producer/DigitalOceanSnapshotsProducer.java    |   1 +
 .../producer/DigitalOceanTagsProducer.java         |   1 +
 .../camel/component/direct/DirectComponent.java    |   1 +
 .../camel/component/direct/DirectConsumer.java     |   3 +
 .../camel/component/direct/DirectEndpoint.java     |   2 +
 .../camel/component/direct/DirectProducer.java     |   2 +
 .../directvm/DirectVmBlockingProducer.java         |   2 +
 .../MultipleConsumerSynchronizedExchange.java      |   1 +
 .../disruptor/SedaDisruptorCompareTest.java        |   1 +
 .../vm/DisruptorVmShouldNotUseSameThreadTest.java  |   1 +
 .../apache/camel/component/dns/DnsComponent.java   |   1 +
 .../component/dns/policy/DnsActivationPolicy.java  |   7 +
 .../camel/component/dns/DnsDigEndpointTest.java    |   1 +
 .../camel/component/dns/DnsIpEndpointTest.java     |   1 +
 .../component/dns/DnsIpHeaderTransferTest.java     |   1 +
 .../camel/component/dns/DnsLookupEndpointTest.java |   1 +
 .../camel/component/dns/WikipediaEndpointTest.java |   1 +
 .../docker/consumer/DockerEventsConsumer.java      |   1 +
 .../docker/consumer/DockerStatsConsumer.java       |   1 +
 .../component/docker/producer/DockerProducer.java  |   1 +
 .../camel/component/dozer/DozerComponent.java      |   1 +
 .../converter/dozer/DozerTypeConverterLoader.java  |   2 +
 .../camel/component/drill/DrillEndpoint.java       |   2 +
 .../camel/component/dropbox/DropboxComponent.java  |   1 +
 .../camel/component/dropbox/DropboxEndpoint.java   |   2 +
 .../EhcacheIdempotentRepositoryTest.java           |   1 +
 .../elasticsearch/ElasticsearchComponent.java      |   1 +
 .../elasticsearch/ElasticsearchEndpoint.java       |   2 +
 .../elasticsearch/ElasticsearchProducer.java       |   1 +
 .../ElasticsearchScrollRequestIterator.java        |   1 +
 .../camel/component/elsql/ElsqlEndpoint.java       |   2 +
 .../elsql/ElsqlSqlPrepareStatementStrategy.java    |   3 +
 .../camel/component/elsql/ElSqlComponentTest.java  |   1 +
 .../component/elsql/ElSqlConsumerDeleteTest.java   |   2 +
 .../elsql/ElSqlConsumerDynamicParameterTest.java   |   1 +
 .../camel/component/elsql/ElSqlConsumerTest.java   |   1 +
 .../camel/component/elsql/ElSqlDataSourceTest.java |   1 +
 .../component/elsql/ElSqlProducerBatchTest.java    |   1 +
 .../elsql/ElSqlProducerBodySimpleTest.java         |   1 +
 .../elsql/ElSqlProducerStreamListTest.java         |   1 +
 .../camel/component/etcd/EtcdTestSupport.java      |   1 +
 .../component/eventadmin/EventAdminConsumer.java   |   1 +
 .../component/eventadmin/EventAdminEndpoint.java   |   3 +
 .../component/eventadmin/EventAdminProducer.java   |   1 +
 .../apache/camel/component/exec/ExecEndpoint.java  |   2 +
 .../apache/camel/component/exec/ExecProducer.java  |   1 +
 .../component/exec/impl/DefaultExecBinding.java    |   2 +
 .../component/exec/ExecutableJavaProgram.java      |   2 +
 .../exec/impl/ExecCommandExecutorMock.java         |   1 +
 .../component/facebook/FacebookComponent.java      |   1 +
 .../camel/component/facebook/FacebookEndpoint.java |   2 +
 .../apache/camel/component/fhir/FhirEndpoint.java  |   3 +
 .../Hl7v2PatientToFhirPatientIntegrationTest.java  |   1 +
 .../fhir/dataformat/FhirJsonDataFormatTest.java    |   1 +
 .../FhirJsonDataformatErrorHandlerTest.java        |   1 +
 .../fhir/dataformat/FhirXmlDataFormatTest.java     |   1 +
 .../FhirXmlDataformatErrorHandlerTest.java         |   1 +
 .../component/file/watch/FileWatchComponent.java   |   1 +
 .../component/file/watch/FileWatchEndpoint.java    |   1 +
 .../component/file/AntPathMatcherFileFilter.java   |   1 +
 .../file/AntPathMatcherGenericFileFilter.java      |   1 +
 .../apache/camel/component/file/FileBinding.java   |   3 +
 .../apache/camel/component/file/FileComponent.java |   2 +
 .../apache/camel/component/file/FileEndpoint.java  |   3 +
 .../camel/component/file/FileOperations.java       |  12 ++
 .../apache/camel/component/file/GenericFile.java   |   1 +
 .../camel/component/file/GenericFileComponent.java |   1 +
 .../component/file/GenericFileConfiguration.java   |   1 +
 .../camel/component/file/GenericFileConsumer.java  |   2 +
 .../component/file/GenericFileDefaultBinding.java  |   3 +
 .../camel/component/file/GenericFileEndpoint.java  |   2 +
 .../component/file/GenericFileOnCompletion.java    |   2 +
 .../camel/component/file/GenericFileProducer.java  |   1 +
 ...dempotentChangedRepositoryReadLockStrategy.java |   7 +
 ...IdempotentRenameRepositoryReadLockStrategy.java |   7 +
 .../FileIdempotentRepositoryReadLockStrategy.java  |   7 +
 .../strategy/GenericFileExpressionRenamer.java     |   1 +
 .../GenericFileProcessStrategySupport.java         |   5 +
 .../camel/component/flatpack/DataSetList.java      |   2 +
 .../component/flatpack/FlatpackComponent.java      |   1 +
 .../camel/component/flatpack/FlatpackEndpoint.java |   2 +
 .../camel/component/flatpack/FlatpackProducer.java |   1 +
 .../dataformat/flatpack/FlatpackDataFormat.java    |   2 +
 .../apache/camel/component/fop/FopComponent.java   |   1 +
 .../apache/camel/component/fop/FopEndpoint.java    |   2 +
 .../apache/camel/component/fop/FopProducer.java    |   1 +
 .../component/freemarker/FreemarkerComponent.java  |   1 +
 .../FreemarkerBodyAsDomainObjectTest.java          |   2 +
 .../freemarker/FreemarkerConcurrentTest.java       |   1 +
 .../freemarker/FreemarkerContentCacheTest.java     |   2 +
 .../freemarker/FreemarkerEncodingTest.java         |   1 +
 .../freemarker/FreemarkerEndpointTest.java         |   1 +
 .../freemarker/FreemarkerFileLetterTest.java       |   1 +
 .../component/freemarker/FreemarkerLetterTest.java |   1 +
 .../FreemarkerLetterWithoutHeaderTest.java         |   1 +
 .../freemarker/FreemarkerTemplateInHeaderTest.java |   1 +
 .../camel/component/freemarker/FreemarkerTest.java |   1 +
 .../FreemarkerValuesInPropertiesTest.java          |   1 +
 .../camel/component/file/remote/FtpComponent.java  |   1 +
 .../camel/component/file/remote/FtpConsumer.java   |   1 +
 .../camel/component/file/remote/FtpEndpoint.java   |   2 +
 .../camel/component/file/remote/FtpOperations.java |  17 ++
 .../camel/component/file/remote/FtpsEndpoint.java  |   1 +
 .../component/file/remote/RemoteFileConsumer.java  |   1 +
 .../component/file/remote/RemoteFileProducer.java  |   2 +
 .../camel/component/file/remote/SftpComponent.java |   1 +
 .../camel/component/file/remote/SftpConsumer.java  |   1 +
 .../camel/component/file/remote/SftpEndpoint.java  |   2 +
 .../component/file/remote/SftpOperations.java      |  21 +++
 .../FtpChangedExclusiveReadLockStrategy.java       |   1 +
 .../SftpChangedExclusiveReadLockStrategy.java      |   1 +
 ...LWithClientAuthAndSSLContextParametersTest.java |   1 +
 .../FileToFtpsExplicitSSLWithClientAuthTest.java   |   1 +
 ...lientAuthAndGlobalSSLContextParametersTest.java |   1 +
 ...thoutClientAuthAndSSLContextParametersTest.java |   1 +
 ...FileToFtpsExplicitSSLWithoutClientAuthTest.java |   1 +
 ...SWithClientAuthAndSSLContextParametersTest.java |   1 +
 .../FileToFtpsExplicitTLSWithClientAuthTest.java   |   1 +
 ...thoutClientAuthAndSSLContextParametersTest.java |   1 +
 ...FileToFtpsExplicitTLSWithoutClientAuthTest.java |   1 +
 ...LWithClientAuthAndSSLContextParametersTest.java |   1 +
 .../FileToFtpsImplicitSSLWithClientAuthTest.java   |   1 +
 ...thoutClientAuthAndSSLContextParametersTest.java |   1 +
 ...FileToFtpsImplicitSSLWithoutClientAuthTest.java |   1 +
 ...SWithClientAuthAndSSLContextParametersTest.java |   1 +
 .../FileToFtpsImplicitTLSWithClientAuthTest.java   |   1 +
 ...thoutClientAuthAndSSLContextParametersTest.java |   1 +
 ...FileToFtpsImplicitTLSWithoutClientAuthTest.java |   1 +
 ...psWithCustomKeyAndTrustStorePropertiesTest.java |   1 +
 ...leToFtpsWithCustomTrustStorePropertiesTest.java |   1 +
 .../FileToFtpsWithDefaultSettingsIPV6Test.java     |   1 +
 .../remote/FileToFtpsWithDefaultSettingsTest.java  |   1 +
 .../FileToFtpsWithFtpClientConfigRefTest.java      |   1 +
 .../remote/FromFilePercentSignInPasswordTest.java  |   1 +
 ...lePercentSignInPasswordUserInfoEncodedTest.java |   1 +
 .../FromFilePercentSignInPasswordUserInfoTest.java |   1 +
 ...FromFileToFtpDefaultRootRenameStrategyTest.java |   2 +
 .../file/remote/FromFileToFtpDeleteTest.java       |   1 +
 .../file/remote/FromFileToFtpNotStepwiseTest.java  |   1 +
 .../component/file/remote/FromFileToFtpTest.java   |   1 +
 .../file/remote/FromFileToFtpWithChmodTest.java    |   1 +
 .../remote/FromFileTransferLoggingLevelTest.java   |   1 +
 .../FromFileTransferLoggingLevelVerboseTest.java   |   1 +
 .../file/remote/FromFtpActivePortRangeTest.java    |   1 +
 .../file/remote/FromFtpAsyncProcessTest.java       |   1 +
 .../file/remote/FromFtpClientConfigRefTest.java    |   1 +
 .../file/remote/FromFtpClientDataTimeoutTest.java  |   1 +
 .../file/remote/FromFtpClientSoTimeout2Test.java   |   1 +
 .../file/remote/FromFtpClientSoTimeoutTest.java    |   1 +
 .../remote/FromFtpDeleteFileNotStepwiseTest.java   |   1 +
 .../file/remote/FromFtpDeleteFileTest.java         |   1 +
 .../remote/FromFtpDirectoryToBinaryFilesTest.java  |   1 +
 .../FromFtpDoNotDeleteFileIfProcessFailsTest.java  |   1 +
 .../FromFtpExclusiveReadNoneStrategyTest.java      |   1 +
 .../file/remote/FromFtpFilterNotStepwiseTest.java  |   1 +
 .../component/file/remote/FromFtpFilterTest.java   |   2 +
 .../FromFtpKeepLastModifiedNotStepwiseTest.java    |   1 +
 ...FileAbsoluteFolderRecursiveNotStepwiseTest.java |   1 +
 ...FromFtpMoveFileAbsoluteFolderRecursiveTest.java |   1 +
 .../remote/FromFtpMoveFileNotStepwiseTest.java     |   1 +
 .../FromFtpMoveFilePostfixNotStepwiseTest.java     |   1 +
 .../file/remote/FromFtpMoveFilePostfixTest.java    |   1 +
 .../FromFtpMoveFilePrefixNotStepwiseTest.java      |   1 +
 .../file/remote/FromFtpMoveFilePrefixTest.java     |   1 +
 .../FromFtpMoveFileRecursiveNotStepwiseTest.java   |   1 +
 .../file/remote/FromFtpMoveFileRecursiveTest.java  |   1 +
 .../component/file/remote/FromFtpMoveFileTest.java |   1 +
 ...FileToHiddenFolderRecursiveNotStepwiseTest.java |   1 +
 ...FromFtpMoveFileToHiddenFolderRecursiveTest.java |   1 +
 ...tPathRelativeMoveToAbsoluteNotStepwiseTest.java |   1 +
 ...tpNoEndpointPathRelativeMoveToAbsoluteTest.java |   1 +
 .../component/file/remote/FromFtpNoFilesTest.java  |   1 +
 .../remote/FromFtpNoopIdempotentFalseTest.java     |   1 +
 .../component/file/remote/FromFtpNoopTest.java     |   1 +
 .../file/remote/FromFtpNotDownloadTest.java        |   1 +
 .../file/remote/FromFtpPassiveModeTest.java        |   1 +
 .../file/remote/FromFtpPollFileOnlyTest.java       |   1 +
 .../FromFtpPreMoveDeleteNotStepwiseTest.java       |   1 +
 .../file/remote/FromFtpPreMoveDeleteTest.java      |   1 +
 .../remote/FromFtpPreMoveFileExpressionTest.java   |   1 +
 .../FromFtpPreMoveFilePostfixNotStepwiseTest.java  |   1 +
 .../file/remote/FromFtpPreMoveFilePostfixTest.java |   1 +
 .../FromFtpPreMoveFilePrefixNotStepwiseTest.java   |   1 +
 .../file/remote/FromFtpPreMoveFilePrefixTest.java  |   1 +
 .../remote/FromFtpPreMoveNoopNotStepwiseTest.java  |   1 +
 .../file/remote/FromFtpPreMoveNoopTest.java        |   1 +
 .../FromFtpRecursiveNoopNotStepwiseTest.java       |   1 +
 .../file/remote/FromFtpRegexPatternTest.java       |   1 +
 .../FromFtpRemoteFileFilterDirectoryTest.java      |   2 +
 .../file/remote/FromFtpRemoteFileFilterTest.java   |   2 +
 .../file/remote/FromFtpRemoteFileSorterTest.java   |   2 +
 .../file/remote/FromFtpSedaDeleteFileTest.java     |   1 +
 .../FromFtpServerLanguageCodeAndTimeoutTest.java   |   1 +
 .../file/remote/FromFtpServerLanguageCodeTest.java |   1 +
 .../FromFtpSetNamesWithMultiDirectoriesTest.java   |   1 +
 ...tPathRelativeMoveToAbsoluteNotStepwiseTest.java |   1 +
 ...leNoEndpointPathRelativeMoveToAbsoluteTest.java |   1 +
 ...tPathRelativeMoveToRelativeNotStepwiseTest.java |   1 +
 ...leNoEndpointPathRelativeMoveToRelativeTest.java |   1 +
 ...impleRelativeMoveToAbsoluteNotStepwiseTest.java |   1 +
 .../FromFtpSimpleRelativeMoveToAbsoluteTest.java   |   1 +
 ...impleRelativeMoveToRelativeNotStepwiseTest.java |   1 +
 .../FromFtpSimpleRelativeMoveToRelativeTest.java   |   1 +
 .../FromFtpSimulateNetworkIssueRecoverTest.java    |   1 +
 .../FromFtpStartingDirAndFileNameClashTest.java    |   1 +
 .../file/remote/FromFtpThirdPoolOkTest.java        |   1 +
 .../FromFtpToAsciiFileNoBodyConversionTest.java    |   1 +
 .../file/remote/FromFtpToAsciiFileTest.java        |   1 +
 .../file/remote/FromFtpToBinaryFileTest.java       |   1 +
 .../file/remote/FromFtpToBinaryFilesTest.java      |   1 +
 .../file/remote/FromFtpToBinarySampleTest.java     |   1 +
 .../remote/FromFtpToFileNoFileNameHeaderTest.java  |   1 +
 .../component/file/remote/FromFtpToMockTest.java   |   1 +
 .../file/remote/FromFtpTwoSlashesIssueTest.java    |   1 +
 .../file/remote/FromFtpUseListFalseTest.java       |   1 +
 .../remote/FromQueueThenConsumeFtpToMockTest.java  |   1 +
 .../component/file/remote/FtpAnonymousTest.java    |   1 +
 .../FtpChangedReadLockFastExistCheckTest.java      |   1 +
 .../remote/FtpChangedReadLockLoggingLevelTest.java |   1 +
 .../file/remote/FtpChangedReadLockTimeoutTest.java |   1 +
 ...tpChangedRootDirReadLockFastExistCheckTest.java |   1 +
 .../file/remote/FtpConnectTimeoutTest.java         |   1 +
 .../file/remote/FtpConsumerAbsolutePathTest.java   |   1 +
 .../file/remote/FtpConsumerBodyAsStringTest.java   |   1 +
 .../FtpConsumerDirectoriesNotMatchedTest.java      |   1 +
 .../FtpConsumerDoneFileNameFixedStepwiseTest.java  |   1 +
 .../FtpConsumerDoneFileNameStepwiseTest.java       |   1 +
 .../file/remote/FtpConsumerExcludeNameTest.java    |   1 +
 .../file/remote/FtpConsumerFileSplitTest.java      |   1 +
 .../remote/FtpConsumerIPV6BodyAsStringTest.java    |   1 +
 .../file/remote/FtpConsumerIdempotentRefTest.java  |   7 +
 .../file/remote/FtpConsumerIncludeNameTest.java    |   1 +
 ...nsumerLocalWorkDirectoryAsAbsolutePathTest.java |   1 +
 .../FtpConsumerLocalWorkDirectoryDirectTest.java   |   1 +
 .../remote/FtpConsumerLocalWorkDirectoryTest.java  |   1 +
 ...onsumerLocalWorkDirectoryWorkOnPayloadTest.java |   1 +
 .../remote/FtpConsumerMaxMessagesPerPollTest.java  |   1 +
 .../remote/FtpConsumerMultipleDirectoriesTest.java |   1 +
 .../FtpConsumerNotEagerMaxMessagesPerPollTest.java |   1 +
 .../file/remote/FtpConsumerResumeDownloadTest.java |   1 +
 .../file/remote/FtpConsumerSkipDotFilesTest.java   |   1 +
 ...FtpConsumerThrowExceptionOnLoginFailedTest.java |   3 +
 .../FtpConsumerUsingFTPClientConfigTest.java       |   1 +
 .../file/remote/FtpConsumerWithCharsetTest.java    |   1 +
 .../remote/FtpConsumerWithNoFileOptionTest.java    |   1 +
 .../FtpNoReconnectAttemptUnknownHostTest.java      |   1 +
 .../remote/FtpProducerConnectErrorsHeaderTest.java |   1 +
 ...rrideNotEagerDeleteTargetFileTwoUploadTest.java |   1 +
 .../remote/FtpProducerFileFastExistFailTest.java   |   1 +
 .../FtpReconnectAttemptServerStoppedTest.java      |   1 +
 .../remote/FtpReconnectAttemptUnknownHostTest.java |   1 +
 ...ServerExplicitSSLWithClientAuthTestSupport.java |   3 +
 ...verExplicitSSLWithoutClientAuthTestSupport.java |   3 +
 ...ServerExplicitTLSWithClientAuthTestSupport.java |   3 +
 ...verExplicitTLSWithoutClientAuthTestSupport.java |   3 +
 ...ServerImplicitSSLWithClientAuthTestSupport.java |   3 +
 ...verImplicitSSLWithoutClientAuthTestSupport.java |   3 +
 ...ServerImplicitTLSWithClientAuthTestSupport.java |   3 +
 ...verImplicitTLSWithoutClientAuthTestSupport.java |   3 +
 .../remote/ToFtpTempFileTargetFileExistTest.java   |   1 +
 .../remote/sftp/SftpFromSedaDeleteFileTest.java    |   1 +
 .../camel/component/ganglia/GangliaEndpoint.java   |   2 +
 .../camel/component/ganglia/GangliaProducer.java   |   1 +
 .../component/geocoder/GeoCoderComponent.java      |   1 +
 .../camel/component/geocoder/GeoCoderEndpoint.java |   2 +
 .../camel/component/geocoder/GeoCoderProducer.java |   1 +
 .../apache/camel/component/git/GitComponent.java   |   1 +
 .../git/consumer/AbstractGitConsumer.java          |   1 +
 .../camel/component/github/GitHubComponent.java    |   1 +
 .../camel/component/github/GitHubEndpoint.java     |   2 +
 .../github/consumer/AbstractGitHubConsumer.java    |   1 +
 .../github/producer/AbstractGitHubProducer.java    |   1 +
 .../github/producer/ClosePullRequestProducer.java  |   1 +
 .../github/producer/CreateIssueProducer.java       |   1 +
 .../github/producer/GetCommitFileProducer.java     |   1 +
 .../producer/PullRequestCommentProducer.java       |   1 +
 .../github/producer/PullRequestFilesProducer.java  |   1 +
 .../github/producer/PullRequestStateProducer.java  |   1 +
 .../github/services/MockPullRequestService.java    |   1 +
 .../google/bigquery/GoogleBigQueryEndpoint.java    |   1 +
 .../bigquery/sql/GoogleBigQuerySQLEndpoint.java    |   1 +
 .../google/drive/GoogleDriveEndpoint.java          |   3 +
 .../drive/GoogleDriveFilesConverterTest.java       |   1 +
 .../google/pubsub/GooglePubsubEndpoint.java        |   3 +
 .../apache/camel/component/gora/GoraEndpoint.java  |   1 +
 .../camel/component/gora/GoraProducerTest.java     |   1 +
 .../camel/language/groovy/GroovyExpression.java    |   2 +
 .../camel/language/groovy/GroovyLanguage.java      |   2 +
 .../camel/language/groovy/GroovyLanguageTest.java  |   1 +
 .../camel/language/groovy/GroovyListMapTest.java   |   1 +
 .../apache/camel/component/grpc/GrpcComponent.java |   1 +
 .../apache/camel/component/grpc/GrpcEndpoint.java  |   2 +
 .../component/grpc/GrpcConsumerConcurrentTest.java |   1 +
 .../camel/component/gson/GsonConcurrentTest.java   |   1 +
 .../hazelcast/HazelcastDefaultEndpoint.java        |   2 +
 .../component/hazelcast/HazelcastOperation.java    |   1 +
 .../HazelcastAtomicnumberEndpoint.java             |   2 +
 .../HazelcastAtomicnumberProducer.java             |   1 +
 .../instance/HazelcastInstanceConsumer.java        |   3 +
 .../instance/HazelcastInstanceEndpoint.java        |   2 +
 .../hazelcast/list/HazelcastListProducer.java      |   1 +
 .../hazelcast/listener/CamelEntryListener.java     |   6 +
 .../hazelcast/listener/CamelItemListener.java      |   2 +
 .../hazelcast/listener/CamelMessageListener.java   |   1 +
 .../hazelcast/map/HazelcastMapEndpoint.java        |   2 +
 .../hazelcast/map/HazelcastMapProducer.java        |   1 +
 .../multimap/HazelcastMultimapEndpoint.java        |   2 +
 .../multimap/HazelcastMultimapProducer.java        |   1 +
 .../queue/HazelcastQueueConsumerMode.java          |   1 +
 .../hazelcast/queue/HazelcastQueueProducer.java    |   1 +
 .../HazelcastReplicatedmapEndpoint.java            |   2 +
 .../HazelcastReplicatedmapProducer.java            |   1 +
 .../ringbuffer/HazelcastRingbufferEndpoint.java    |   2 +
 .../ringbuffer/HazelcastRingbufferProducer.java    |   1 +
 .../hazelcast/seda/HazelcastSedaConsumer.java      |   1 +
 .../hazelcast/seda/HazelcastSedaEndpoint.java      |   2 +
 .../hazelcast/seda/HazelcastSedaProducer.java      |   1 +
 .../hazelcast/set/HazelcastSetProducer.java        |   1 +
 .../hazelcast/topic/HazelcastTopicProducer.java    |   1 +
 ...tSedaRecoverableConsumerNewTransactionTest.java |   2 +
 ...zelcastSedaRecoverableConsumerRollbackTest.java |   2 +
 .../HazelcastIdempotentRepositoryTest.java         |   3 +
 .../camel/component/hbase/HBaseComponent.java      |   1 +
 .../camel/component/hbase/HBaseEndpoint.java       |   2 +
 .../camel/component/hbase/HBaseProducer.java       |   1 +
 .../filters/ModelAwareColumnMatchingFilter.java    |   1 +
 .../hbase/mapping/BodyMappingStrategy.java         |   2 +
 .../hbase/mapping/HeaderMappingStrategy.java       |   2 +
 .../camel/component/hbase/model/HBaseCell.java     |   1 +
 .../component/hbase/CamelHBaseTestSupport.java     |   2 +
 .../idempotent/HBaseIdempotentRepositoryTest.java  |   2 +
 .../camel/component/hdfs2/HdfsComponent.java       |   1 +
 .../apache/camel/component/hdfs2/HdfsConsumer.java |   1 +
 .../camel/component/hdfs2/FromFileToHdfsTest.java  |   1 +
 .../camel/component/hdfs2/HdfsConsumerTest.java    |   1 +
 .../component/hdfs2/HdfsProducerConsumerTest.java  |   1 +
 .../component/hdfs2/HdfsProducerSplitTest.java     |   1 +
 .../camel/component/hdfs2/HdfsProducerTest.java    |   1 +
 .../camel/component/hipchat/HipchatComponent.java  |   1 +
 .../camel/component/hipchat/HipchatEndpoint.java   |   2 +
 .../camel/component/hipchat/HipchatProducer.java   |   1 +
 .../hipchat/HipchatEPSuccessTestSupport.java       |   1 +
 .../HipchatConsumerIntegrationTest.java            |   1 +
 .../HipchatProducerIntegrationTest.java            |   1 +
 .../apache/camel/component/hl7/HL7DataFormat.java  |   2 +
 .../apache/camel/component/hl7/HL7MLLPCodec.java   |   2 +
 .../apache/camel/component/hl7/HL7MLLPEncoder.java |   1 +
 .../camel/component/hl7/HL7DataFormatTest.java     |   1 +
 .../component/hl7/HL7MLLPCodecBoundaryTest.java    |   1 +
 .../camel/component/hl7/HL7MLLPCodecLongTest.java  |   1 +
 .../hl7/HL7MLLPCodecMessageFloodingTest.java       |   1 +
 .../component/hl7/HL7MLLPCodecPlainStringTest.java |   1 +
 .../hl7/HL7MLLPCodecStandAndEndBytesTest.java      |   1 +
 .../camel/component/hl7/HL7MLLPCodecTest.java      |   1 +
 .../hl7/HL7MLLPNettyCodecBoundaryTest.java         |   1 +
 .../component/hl7/HL7MLLPNettyCodecLongTest.java   |   1 +
 .../hl7/HL7MLLPNettyCodecStandAndEndBytesTest.java |   1 +
 .../camel/component/hl7/HL7MLLPNettyCodecTest.java |   1 +
 .../hl7/HL7MLLPNettyDecoderResourceLeakTest.java   |   1 +
 .../component/hl7/HL7MLLPNettyRouteToTest.java     |   1 +
 .../camel/component/hl7/HL7ValidateTest.java       |   1 +
 .../camel/component/hl7/HL7XmlDataFormatTest.java  |   1 +
 .../camel/http/common/CamelFileDataSource.java     |   3 +
 .../org/apache/camel/http/common/CamelServlet.java |   1 +
 .../camel/http/common/DefaultHttpBinding.java      |  24 +++
 .../camel/http/common/HttpCommonEndpoint.java      |   3 +
 .../org/apache/camel/http/common/HttpConsumer.java |   1 +
 .../UrlRewriteHttpServletRequestAdapter.java       |   1 +
 .../http/common/HttpHeaderFilterStrategyTest.java  |   1 +
 .../http/common/cookie/CookieHandlerTest.java      |   1 +
 .../BasicAuthenticationHttpClientConfigurer.java   |   1 +
 .../component/http4/CompositeHttpConfigurer.java   |   1 +
 .../component/http4/HttpDeleteWithBodyMethod.java  |   1 +
 .../apache/camel/component/http4/HttpEndpoint.java |   3 +
 .../apache/camel/component/http4/HttpMethods.java  |   1 +
 .../camel/component/http4/HttpPollingConsumer.java |   5 +
 .../apache/camel/component/http4/HttpProducer.java |   1 +
 .../component/http4/PreemptiveAuthInterceptor.java |   1 +
 .../component/http4/ProxyHttpClientConfigurer.java |   1 +
 .../http4/HttpBodyWithOtherProtocalNameTest.java   |   1 +
 .../component/http4/HttpCamelHeadersTest.java      |   1 +
 .../camel/component/http4/HttpCompressionTest.java |   2 +
 .../camel/component/http4/HttpProxyServerTest.java |   2 +
 .../camel/component/http4/HttpRedirectTest.java    |   1 +
 .../http4/HttpReferenceParameterTest.java          |   1 +
 .../http4/HttpsSslContextParametersGetTest.java    |   1 +
 .../handler/AuthenticationValidationHandler.java   |   1 +
 .../handler/BasicRawQueryValidationHandler.java    |   1 +
 .../http4/handler/BasicValidationHandler.java      |   1 +
 .../http4/handler/DelayValidationHandler.java      |   1 +
 .../http4/handler/HeaderValidationHandler.java     |   1 +
 .../ProxyAuthenticationValidationHandler.java      |   1 +
 .../infinispan/InfinispanCustomListener.java       |   1 +
 .../infinispan/MyEmbeddedCustomListener.java       |   1 +
 .../apache/camel/component/iota/IOTAComponent.java |   1 +
 .../apache/camel/component/iota/IOTAEndpoint.java  |   2 +
 .../apache/camel/component/iota/IOTAProducer.java  |   1 +
 .../apache/camel/component/irc/IrcComponent.java   |   2 +
 .../camel/component/irc/IrcConfiguration.java      |   1 +
 .../apache/camel/component/irc/IrcEndpoint.java    |   4 +
 .../apache/camel/component/irc/IrcProducer.java    |   1 +
 .../component/irc/it/IrcMultiChannelRouteTest.java |   1 +
 .../camel/component/irc/it/IrcOnReplyTest.java     |   2 +
 .../camel/component/irc/it/IrcPrivmsgTest.java     |   1 +
 .../camel/component/irc/it/IrcRouteTest.java       |   3 +
 .../camel/component/ironmq/IronMQEndpoint.java     |   2 +
 .../camel/component/ironmq/IronMQProducer.java     |   1 +
 .../camel/component/jackson/JacksonDataFormat.java |   4 +
 .../component/jackson/JacksonConcurrentTest.java   |   1 +
 .../component/jacksonxml/JacksonXMLDataFormat.java |   4 +
 .../jacksonxml/JacksonConcurrentTest.java          |   1 +
 .../org/apache/camel/component/jasypt/Main.java    |   2 +
 .../converter/jaxb/FilteringXmlStreamWriter.java   |  32 ++++
 .../camel/converter/jaxb/JaxbDataFormat.java       |   4 +
 .../camel/converter/jaxb/NonXmlFilterReader.java   |   1 +
 .../camel/example/DataFormatComponentTest.java     |   1 +
 .../camel/example/DataFormatDataSetTest.java       |   1 +
 .../org/apache/camel/example/DataFormatTest.java   |   1 +
 .../example/JaxbConcurrentDataFormatTest.java      |   1 +
 .../camel/example/SpringDataFormatPartialTest.java |   1 +
 .../apache/camel/example/SpringDataFormatTest.java |   1 +
 .../example/SpringDataFormatWithEncodingTest.java  |   1 +
 ...aFormatWithMarshalAndUnmarshalUsingRefTest.java |   1 +
 ...WithMarshalAndUnmarshalUsingSpringBeanTest.java |   1 +
 .../org/apache/camel/example/UnmarshalTest.java    |   1 +
 ...melJaxbNoNamespaceSchemaLocationSpringTest.java |   1 +
 .../org/apache/camel/jaxb/CamelJaxbSpringTest.java |   1 +
 .../policy/CacheManagerFromRegistryTest.java       |   1 +
 .../idempotent/JCacheIdempotentRepositoryTest.java |   2 +
 .../jclouds/JcloudsBlobStoreConsumer.java          |   1 +
 .../camel/component/jclouds/JcloudsComponent.java  |   1 +
 .../component/jclouds/JcloudsComputeEndpoint.java  |  16 ++
 .../jclouds/JcloudsSpringComputeTest.java          |   1 +
 .../camel/component/jcr/EndpointEventListener.java |   1 +
 .../apache/camel/component/jcr/JcrConsumer.java    |   1 +
 .../apache/camel/component/jcr/JcrEndpoint.java    |   2 +
 .../apache/camel/component/jcr/JcrProducer.java    |   1 +
 .../apache/camel/component/jdbc/JdbcEndpoint.java  |   2 +
 .../apache/camel/component/jdbc/JdbcProducer.java  |   1 +
 .../jdbc/JdbcRouteUsingSqlSelectAliasTest.java     |   1 +
 .../camel/component/jetty/CamelFilterWrapper.java  |   3 +
 .../component/jetty9/AttachmentHttpBinding.java    |   1 +
 .../camel/component/jetty9/CamelHttpClient9.java   |   3 +
 .../component/jetty9/JettyContentExchange9.java    |  17 ++
 .../component/jetty9/JettyHttpComponent9.java      |   7 +-
 .../camel/component/jetty/CustomFiltersTest.java   |   1 +
 .../camel/component/jetty/EnableCORSTest.java      |   1 +
 .../jetty/ExplicitJettyAsyncRouteTest.java         |   1 +
 .../component/jetty/ExplicitJettyRouteTest.java    |   1 +
 .../component/jetty/HttpBridgeAsyncRouteTest.java  |   1 +
 .../component/jetty/HttpBridgeEncodedPathTest.java |   1 +
 .../jetty/HttpBridgeMultipartRouteTest.java        |   1 +
 .../camel/component/jetty/HttpBridgeRouteTest.java |   1 +
 .../component/jetty/HttpCharacterEncodingTest.java |   1 +
 .../jetty/HttpClientRouteEnableChunkedTest.java    |   1 +
 .../camel/component/jetty/HttpClientRouteTest.java |   1 +
 .../component/jetty/HttpGZipEncodingTest.java      |   1 +
 .../component/jetty/HttpMethodRestrictTest.java    |   1 +
 .../jetty/HttpProducerConcurrentTest.java          |   1 +
 .../jetty/HttpProxyRouteContentTypeTest.java       |   1 +
 .../camel/component/jetty/HttpProxyRouteTest.java  |   1 +
 .../component/jetty/HttpRequestResponseTest.java   |   1 +
 .../camel/component/jetty/HttpToFileTest.java      |   1 +
 .../camel/component/jetty/HttpUrlRewriteTest.java  |   1 +
 .../camel/component/jetty/HttpsAsyncRouteTest.java |   7 +
 .../jetty/JettyContentBasedRouteTest.java          |   1 +
 .../component/jetty/JettyContentTypeTest.java      |   1 +
 .../jetty/JettyHttpBridgeEncodedPathTest.java      |   1 +
 .../jetty/JettyHttpEndpointDisconnectTest.java     |   1 +
 .../JettyHttpGetWithParamAsExchangeHeaderTest.java |   1 +
 .../component/jetty/JettyHttpGetWithParamTest.java |   2 +
 .../jetty/JettyHttpMapHttpMessageHeadersTest.java  |   1 +
 .../camel/component/jetty/JettyImageFileTest.java  |   3 +-
 .../jetty/JettyResponseBodyWhenErrorTest.java      |   1 +
 .../camel/component/jetty/JettyRouteTest.java      |   1 +
 .../jetty/JettyRouteWithSocketPropertiesTest.java  |   1 +
 .../camel/component/jetty/JettySteveIssueTest.java |   1 +
 .../component/jetty/JettyWithXPathChoiceTest.java  |   1 +
 .../component/jetty/MultiPartFormOkHttpTest.java   |   1 +
 .../camel/component/jetty/MultiPartFormTest.java   |   1 +
 .../jetty/MultiPartFormWithCustomFilterTest.java   |   1 +
 .../camel/component/jetty/MyErrorHandler.java      |   1 +
 .../component/jetty/async/MyAsyncEndpoint.java     |   3 +
 .../component/jetty/async/MyAsyncProducer.java     |   2 +
 .../component/jetty/proxy/MyCoolServiceBean.java   |   1 +
 .../component/jetty/rest/RestApiJettyYamlTest.java |   1 +
 .../component/validator/jing/JingComponent.java    |   1 +
 .../component/validator/jing/JingValidator.java    |   1 +
 .../component/validator/jing/RNCRouteTest.java     |   1 +
 .../component/validator/jing/RNGRouteTest.java     |   1 +
 .../apache/camel/component/jira/JiraComponent.java |   1 +
 .../apache/camel/component/jira/JiraEndpoint.java  |   2 +
 .../jira/consumer/AbstractJiraConsumer.java        |   1 +
 .../jira/oauth/OAuthHttpClientDecorator.java       |   6 +
 .../component/jms/DefaultJmsKeyFormatStrategy.java |   2 +
 .../component/jms/DefaultQueueBrowseStrategy.java  |   1 +
 .../apache/camel/component/jms/JmsComponent.java   |   1 +
 .../camel/component/jms/JmsConfiguration.java      |   2 +
 .../apache/camel/component/jms/JmsConsumer.java    |   1 +
 .../apache/camel/component/jms/JmsEndpoint.java    |   5 +
 .../org/apache/camel/component/jms/JmsMessage.java |   1 +
 .../camel/component/jms/JmsPollingConsumer.java    |   5 +
 .../apache/camel/component/jms/JmsProducer.java    |   3 +
 .../camel/component/jms/JmsQueueEndpoint.java      |   1 +
 .../component/jms/JmsTemporaryQueueEndpoint.java   |   2 +
 .../component/jms/JmsTemporaryTopicEndpoint.java   |   2 +
 .../jms/PassThroughJmsKeyFormatStrategy.java       |   2 +
 .../component/jms/reply/QueueReplyManager.java     |   6 +
 .../component/jms/reply/ReplyManagerSupport.java   |   8 +
 .../jms/reply/TemporaryQueueReplyHandler.java      |   2 +
 .../jms/reply/TemporaryQueueReplyManager.java      |   4 +
 ...essageIdAsCorrelationIdMessageSentCallback.java |   1 +
 .../jms/ActiveMQOriginalDestinationTest.java       |   1 +
 .../component/jms/AggregratedJmsRouteTest.java     |   3 +
 .../camel/component/jms/BrowsableQueueTest.java    |   2 +
 .../component/jms/ConsumeJmsBytesMessageTest.java  |   2 +
 .../component/jms/ConsumeJmsMapMessageTest.java    |   2 +
 .../component/jms/ConsumeJmsObjectMessageTest.java |   2 +
 .../component/jms/ConsumeMessageConverterTest.java |   4 +
 .../jms/ConsumerTemplateJmsSelectorTest.java       |   1 +
 .../jms/FileRouteJmsKeepLastModifiedTest.java      |   2 +
 .../component/jms/FileRouteJmsPreMoveTest.java     |   2 +
 .../camel/component/jms/FileRouteToJmsTest.java    |   2 +
 .../component/jms/FileRouteToJmsToFileTest.java    |   2 +
 .../component/jms/FromTextToBytesMessageTest.java  |   1 +
 .../jms/JmsAddAndRemoveRouteManagementTest.java    |   1 +
 .../jms/JmsAllowAdditionalHeadersTest.java         |   1 +
 .../camel/component/jms/JmsAllowNullBodyTest.java  |   1 +
 .../component/jms/JmsAsyncStartListenerTest.java   |   2 +
 .../jms/JmsAsyncStartStopListenerTest.java         |   2 +
 .../component/jms/JmsAsyncStopListenerTest.java    |   2 +
 .../camel/component/jms/JmsAutoStartupTest.java    |   1 +
 .../jms/JmsBatchResequencerJMSPriorityTest.java    |   1 +
 .../camel/component/jms/JmsClientAckTest.java      |   1 +
 .../camel/component/jms/JmsComponentTest.java      |   2 +
 .../component/jms/JmsConsumeTemplateTest.java      |   1 +
 ...sumerRestartPickupConfigurationChangesTest.java |   1 +
 .../jms/JmsCustomHeaderFilterStrategyTest.java     |   3 +
 .../jms/JmsDeadLetterChannelInOutTest.java         |   1 +
 .../component/jms/JmsDeadLetterQueueTest.java      |   1 +
 ...msDeadLetterQueueUsingTransferExchangeTest.java |   1 +
 .../jms/JmsDefaultTaskExecutorTypeTest.java        |   1 +
 .../component/jms/JmsDestinationResolverTest.java  |   2 +
 .../camel/component/jms/JmsDurableTopicTest.java   |   1 +
 .../jms/JmsEagerLoadingPropertiesTest.java         |   1 +
 .../jms/JmsEndpointConfigurationTest.java          |   1 +
 .../jms/JmsErrorHandlerLogStackTraceTest.java      |   1 +
 .../apache/camel/component/jms/JmsFilterTest.java  |   1 +
 .../component/jms/JmsHeaderFilteringTest.java      |   2 +
 .../jms/JmsInOnlyDisableTimeToLiveTest.java        |   2 +
 .../jms/JmsInOnlyIncludeSentJMSMessageIDTest.java  |   1 +
 .../jms/JmsInOnlyInvalidDestinationTest.java       |   1 +
 .../jms/JmsInOnlyWithReplyToAsHeaderTest.java      |   1 +
 ...ToDisabledButJMSReplyToHeaderPreservedTest.java |   1 +
 .../jms/JmsInOnlyWithReplyToDisabledTest.java      |   1 +
 .../jms/JmsInOnlyWithReplyToHeaderTest.java        |   1 +
 .../jms/JmsInOnlyWithReplyToHeaderTopicTest.java   |   1 +
 .../jms/JmsInOnlyWithReplyToNotPreservedTest.java  |   1 +
 .../component/jms/JmsInOnlyWithReplyToTest.java    |   1 +
 .../component/jms/JmsInOutBeanReturnNullTest.java  |   1 +
 .../jms/JmsInOutDisableTimeToLiveTest.java         |   2 +
 .../jms/JmsInOutFixedReplyQueueTimeoutTest.java    |   2 +
 ...ueueTimeoutUseMessageIDAsCorrelationIDTest.java |   1 +
 .../jms/JmsInOutIndividualRequestTimeoutTest.java  |   2 +
 .../component/jms/JmsInOutNonPersistentTest.java   |   1 +
 .../jms/JmsInOutSynchronousFalseTest.java          |   2 +
 .../component/jms/JmsInOutSynchronousTest.java     |   2 +
 .../component/jms/JmsInOutWithNoOutBodyTest.java   |   2 +
 .../jms/JmsIncludeAllJMSXPropertiesTest.java       |   2 +
 .../component/jms/JmsLoadBalanceFailoverTest.java  |   1 +
 ...ailoverWithForceSendOriginalJmsMessageTest.java |   1 +
 ...geAsOriginalMessageInDefaultUnitOfWorkTest.java |   1 +
 .../component/jms/JmsMessageBodySetNullTest.java   |   1 +
 .../JmsMessageCreatedStrategyComponentTest.java    |   1 +
 .../jms/JmsMessageCreatedStrategyEndpointTest.java |   1 +
 .../jms/JmsMessageIDNotOverridenAMQTest.java       |   1 +
 .../camel/component/jms/JmsMessageTypeTest.java    |   1 +
 .../component/jms/JmsMultipleConsumersTest.java    |   1 +
 .../component/jms/JmsNoRequestTimeoutTest.java     |   2 +
 .../JmsNotInOnlyIncludeSentJMSMessageIDTest.java   |   1 +
 .../jms/JmsNotIncludeAllJMSXPropertiesTest.java    |   2 +
 ...OnCompletionAndInterceptAndOnExceptionTest.java |   2 +
 .../camel/component/jms/JmsOnCompletionTest.java   |   2 +
 .../component/jms/JmsPollingConsumerTest.java      |   1 +
 .../jms/JmsProducerDisableReplyToTest.java         |   1 +
 .../jms/JmsProducerWithJMSHeaderTest.java          |   1 +
 .../component/jms/JmsProduerConcurrentTest.java    |   1 +
 .../jms/JmsProduerConcurrentWithReplyTest.java     |   1 +
 .../camel/component/jms/JmsQosRouteTest.java       |   2 +
 .../camel/component/jms/JmsRemoveHeaderTest.java   |   1 +
 ...sRequestReplyExclusiveReplyToComponentTest.java |   1 +
 ...RequestReplyExclusiveReplyToConcurrentTest.java |   1 +
 ...estReplyExclusiveReplyToRemoveAddRouteTest.java |   1 +
 .../jms/JmsRequestReplyExclusiveReplyToTest.java   |   1 +
 .../JmsRequestReplyFixedReplyToInEndpointTest.java |   1 +
 .../jms/JmsRequestReplyManualReplyTest.java        |   1 +
 .../JmsRequestReplyManualWithJMSReplyToTest.java   |   1 +
 ...lyProcessRepliesConcurrentUsingThreadsTest.java |   1 +
 .../jms/JmsRequestReplyReplyToOverrideTest.java    |   1 +
 .../jms/JmsRequestReplySharedReplyToTest.java      |   1 +
 ...RequestReplyTempQueueMultipleConsumersTest.java |   1 +
 .../jms/JmsRequestReplyTemporaryCacheNoneTest.java |   1 +
 .../jms/JmsRouteDeliveryModePreserveQoSTest.java   |   1 +
 .../component/jms/JmsRouteRequestReplyTest.java    |  10 ++
 .../apache/camel/component/jms/JmsRouteTest.java   |   2 +
 .../jms/JmsRouteTimeoutCheckerIntervalTest.java    |   2 +
 .../camel/component/jms/JmsRouteTimeoutTest.java   |   2 +
 .../camel/component/jms/JmsRouteToFileTest.java    |   2 +
 .../jms/JmsRouteUsingDifferentHeadersTest.java     |   1 +
 .../component/jms/JmsRouteUsingJMSXGroupTest.java  |   1 +
 .../jms/JmsRouteUsingSpringAndJmsNameTest.java     |   1 +
 .../jms/JmsRouteUsingSpringJMSTemplateTest.java    |   1 +
 .../jms/JmsRouteUsingSpringWithAutoWireTest.java   |   1 +
 .../JmsRouteWithCustomKeyFormatStrategyTest.java   |   3 +
 .../JmsRouteWithCustomListenerContainerTest.java   |   1 +
 .../JmsRouteWithDefaultKeyFormatStrategyTest.java  |   1 +
 .../jms/JmsRouteWithInOnlyAndMultipleAcksTest.java |   1 +
 .../component/jms/JmsRouteWithInOnlyTest.java      |   1 +
 .../component/jms/JmsRoutingSlipInOutTest.java     |   1 +
 .../camel/component/jms/JmsRoutingSlipTest.java    |   2 +
 .../camel/component/jms/JmsSelectorInTest.java     |   2 +
 .../camel/component/jms/JmsSelectorOptionTest.java |   2 +
 .../camel/component/jms/JmsSelectorTest.java       |   2 +
 .../apache/camel/component/jms/JmsSessionTest.java |   1 +
 ...BodyNullErrorHandlerUseOriginalMessageTest.java |   1 +
 .../camel/component/jms/JmsSimpleHeaderTest.java   |   1 +
 .../component/jms/JmsSimpleInOnlyNoMutateTest.java |   2 +
 .../jms/JmsSimpleRequestCustomReplyToTest.java     |   3 +
 .../jms/JmsSimpleRequestLateReplyTest.java         |   3 +
 .../component/jms/JmsSimpleRequestReply2Test.java  |   2 +
 .../JmsSimpleRequestReplyFixedReplyQueueTest.java  |   2 +
 .../component/jms/JmsSimpleRequestReplyTest.java   |   2 +
 .../jms/JmsSplitterParallelChainedTest.java        |   1 +
 .../component/jms/JmsSplitterParallelTest.java     |   1 +
 .../jms/JmsSpringLoadBalanceFailoverTest.java      |   1 +
 .../camel/component/jms/JmsSuspendResumeTest.java  |   2 +
 .../jms/JmsTestConnectionOnStartupTest.java        |   1 +
 .../jms/JmsThrottlingInflightRoutePolicyTest.java  |   1 +
 .../org/apache/camel/component/jms/JmsToDTest.java |   1 +
 .../org/apache/camel/component/jms/JmsToTest.java  |   1 +
 .../component/jms/JmsTransactedRouteTest.java      |   2 +
 .../component/jms/JmsTransferExceptionTest.java    |   1 +
 .../jms/JmsTransferExchangeFromSplitterTest.java   |   1 +
 .../component/jms/JmsTransferExchangeTest.java     |   1 +
 .../component/jms/JmsUseOriginalBodyTest.java      |   2 +
 .../camel/component/jms/JmsXMLRouteTest.java       |   1 +
 .../camel/component/jms/JmsXPathHeaderTest.java    |   1 +
 .../component/jms/ManagedJmsEndpointTest.java      |   1 +
 .../component/jms/ManagedJmsEndpointTopicTest.java |   1 +
 .../component/jms/ManagedJmsSelectorTest.java      |   1 +
 .../camel/component/jms/MapJmsMessageTest.java     |   2 +
 .../camel/component/jms/MyDestinationResolver.java |   1 +
 .../component/jms/PayloadByteArrayJmsTest.java     |   2 +
 .../component/jms/ProduceMessageConverterTest.java |   4 +
 .../jms/ReplyToDestinationSelectorNameTest.java    |   1 +
 .../component/jms/TwoConsumerOnSameQueueTest.java  |   1 +
 .../component/jms/TwoConsumerOnSameTopicTest.java  |   1 +
 .../ActiveMQConsumeWildcardQueuesTest.java         |   2 +
 .../activemq/TwoEmbeddedActiveMQBrokersTest.java   |   1 +
 .../jms/async/AsyncConsumerFalseTest.java          |   1 +
 .../jms/async/AsyncConsumerInOutTest.java          |   1 +
 .../jms/async/AsyncConsumerInOutTwoTest.java       |   1 +
 .../component/jms/async/AsyncConsumerTest.java     |   1 +
 .../component/jms/async/AsyncJmsInOutTest.java     |   1 +
 .../component/jms/async/AsyncJmsProducerTest.java  |   1 +
 .../camel/component/jms/async/MyAsyncEndpoint.java |   3 +
 .../camel/component/jms/async/MyAsyncProducer.java |   2 +
 .../component/jms/bind/JmsMessageBindTest.java     |   1 +
 .../component/jms/discovery/JmsDiscoveryTest.java  |   2 +
 .../jms/issues/ActiveMQPropagateHeadersTest.java   |   2 +
 .../component/jms/issues/AdviceWithIssueTest.java  |   1 +
 .../jms/issues/BruceHandlingBeanExceptionTest.java |   1 +
 .../camel/component/jms/issues/DummyOrder.java     |   3 +
 .../jms/issues/JmsAnotherCustomJMSReplyToTest.java |   2 +
 .../jms/issues/JmsBeanMethodHeaderTest.java        |   2 +
 .../issues/JmsBlockedAsyncRoutingEngineTest.java   |   2 +
 .../issues/JmsChainedEndpointDelayTimeoutTest.java |   1 +
 .../issues/JmsConcurrentConsumerInOnlyTest.java    |   2 +
 .../jms/issues/JmsConcurrentConsumersTest.java     |   2 +
 .../jms/issues/JmsCustomJMSReplyToIssueTest.java   |   2 +
 .../jms/issues/JmsDirectStartupOrderIssueTest.java |   2 +
 .../jms/issues/JmsFilenameHeaderTest.java          |   2 +
 .../jms/issues/JmsGetHeaderKeyFormatIssueTest.java |   1 +
 ...derKeyFormatIssueWithContentTypeHeaderTest.java |   1 +
 .../jms/issues/JmsHeaderAsObjectTest.java          |   2 +
 .../component/jms/issues/JmsInOnlyIssueTest.java   |   2 +
 .../jms/issues/JmsInOnlyParameterTest.java         |   2 +
 .../JmsInOutExclusiveTopicRecipientListTest.java   |   2 +
 .../jms/issues/JmsInOutExclusiveTopicTest.java     |   2 +
 .../component/jms/issues/JmsInOutIssueTest.java    |   2 +
 .../component/jms/issues/JmsInOutParallelTest.java |   2 +
 .../issues/JmsInOutPersistentReplyQueueTest.java   |   2 +
 .../jms/issues/JmsInOutPipelineWithBeanTest.java   |   1 +
 .../issues/JmsInOutRepeatedInvocationsTest.java    |   2 +
 .../jms/issues/JmsInOutRoutingSlipTest.java        |   1 +
 .../JmsInOutUseMessageIDasCorrelationIDTest.java   |   2 +
 ...msJMSReplyToConsumerEndpointUsingInOutTest.java |   2 +
 .../JmsJMSReplyToEndpointUsingInOutTest.java       |   2 +
 .../jms/issues/JmsLifecycleIssueTest.java          |   1 +
 .../jms/issues/JmsMQSpecialHeaderTest.java         |   1 +
 .../JmsMessageHeaderContentBasedRouterTest.java    |   1 +
 .../component/jms/issues/JmsMutateMessageTest.java |   1 +
 .../issues/JmsMutateRemoveHeaderMessageTest.java   |   1 +
 ...roughtJmsKeyFormatStrategyEndUserIssueTest.java |   1 +
 ...ssThroughtJmsKeyFormatStrategyEndpointTest.java |   1 +
 .../JmsPassThroughtJmsKeyFormatStrategyTest.java   |   1 +
 ...KeyFormatStrategyUsingJmsConfigurationTest.java |   1 +
 .../jms/issues/JmsReplyToLoopIssueTest.java        |   1 +
 .../jms/issues/JmsRoutingSlipIssueTest.java        |   1 +
 ...endToAlotOfDestinationWithSameEndpointTest.java |   1 +
 ...etterChannelHandlerRollbackOnExceptionTest.java |   1 +
 ...erChannelNotHandlerRollbackOnExceptionTest.java |   1 +
 ...ansactedOnExceptionRollbackOnExceptionTest.java |   1 +
 .../jms/issues/JmsTypeConverterIssueTest.java      |   4 +
 .../camel/component/jms/issues/LarsIssueTest.java  |   2 +
 .../component/jms/issues/MQSeriesHeaderTest.java   |   2 +
 .../component/jms/issues/MyFailureProcessor.java   |   1 +
 .../NoClassDefFoundErrorWrapExceptionTest.java     |   1 +
 .../issues/RequestReplyWithProducerIssueTest.java  |   1 +
 .../component/jms/issues/TempReplyToIssueTest.java |   1 +
 ...TransactionErrorHandlerRedeliveryDelayTest.java |   1 +
 .../component/jms/remoting/JmsRemotingTest.java    |   1 +
 .../camel/component/jms/remoting/SayService.java   |   1 +
 .../camel/component/jms/temp/JmsReconnectTest.java |   1 +
 .../jms/temp/TemporaryQueueRouteTest.java          |   2 +
 .../jms/tuning/PerformanceRoutePojoTest.java       |   1 +
 .../component/jms/tuning/PerformanceRouteTest.java |   1 +
 .../component/jms/tx/AbstractTransactionTest.java  |   2 +
 .../jms/tx/ConditionalExceptionProcessor.java      |   1 +
 .../jms/tx/JMSTransactionErrorHandlerTest.java     |   2 +
 .../JMSTransactionIsTransactedRedeliveredTest.java |   2 +
 .../jms/tx/JMSTransactionRollbackTest.java         |   2 +
 .../JMSTransactionThrottlingRoutePolicyTest.java   |   1 +
 .../jms/tx/JMSTransactionalClientTest.java         |   2 +
 .../tx/JMSTransactionalClientWithRollbackTest.java |   2 +
 ...MXTXUseOriginalBodyWithDLCErrorHandlerTest.java |   2 +
 ...JMXTXUseOriginalBodyWithTXErrorHandlerTest.java |   2 +
 .../jms/tx/JmsToJmsTransactedSecurityTest.java     |   1 +
 .../component/jms/tx/JmsToJmsTransactedTest.java   |   1 +
 ...sactionWithoutDefineTransactionManagerTest.java |   1 +
 .../component/jms/tx/RouteIdTransactedTest.java    |   1 +
 .../jms/tx/TransactedAsyncUsingThreadsTest.java    |   1 +
 ...sactionErrorHandlerBuilderAsSpringBeanTest.java |   2 +
 ...actionErrorHandlerCustomerSpringParserTest.java |   2 +
 .../tx/TransactionInterceptSendToEndpointTest.java |   1 +
 .../tx/TransactionMinimalConfigurationTest.java    |   2 +
 .../jms/tx/XMLQueueToProcessorTransactionTest.java |   1 +
 .../jms/tx/XMLQueueToQueueTransactionTest.java     |   1 +
 .../apache/camel/component/jmx/JMXConsumer.java    |   1 +
 .../apache/camel/component/jmx/JMXEndpoint.java    |   3 +
 .../apache/camel/component/jmx/JMXUriBuilder.java  |   1 +
 .../camel/component/jmx/JMXConsumerTest.java       |   1 +
 .../camel/component/jmx/JMXHandbackTest.java       |   1 +
 .../apache/camel/component/jmx/JMXRemoteTest.java  |   1 +
 .../jmx/JMXRobustRemoteConnectionTest.java         |   1 +
 .../camel/component/jmx/beans/SimpleBean.java      |  12 ++
 .../apache/camel/component/jolt/JoltComponent.java |   1 +
 .../apache/camel/component/jpa/JpaConsumer.java    |   1 +
 .../apache/camel/component/jpa/JpaEndpoint.java    |   2 +
 .../apache/camel/component/jpa/JpaProducer.java    |   1 +
 .../apache/camel/component/jpa/QueryBuilder.java   |   1 +
 .../idempotent/jpa/JpaMessageIdRepository.java     |   4 +
 .../camel/component/jpa/AbstractJpaMethodTest.java |   1 +
 .../camel/component/jpa/JpaUseMergeTest.java       |   1 +
 .../camel/component/jpa/JpaUsePersistTest.java     |   1 +
 .../jpa/JpaUsingCustomPersistenceUnitTest.java     |   1 +
 .../camel/processor/jpa/AbstractJpaTest.java       |   2 +
 .../jpa/FileConsumerJpaIdempotentTest.java         |   1 +
 .../apache/camel/component/scp/ScpComponent.java   |   1 +
 .../jsonvalidator/JsonValidatorComponent.java      |   1 +
 .../jsonvalidator/FileValidatorRouteTest.java      |   1 +
 .../component/jt400/Jt400DataQueueProducer.java    |   1 +
 .../camel/component/jt400/Jt400Endpoint.java       |   1 +
 .../camel/component/jt400/Jt400PgmProducer.java    |   1 +
 .../Jt400ComponentDefaultConnectionPoolTest.java   |   2 +
 ...00ComponentDefaultSecureConnectionPoolTest.java |   2 +
 .../jt400/Jt400ConfigurationConnectionTest.java    |   2 +
 .../Jt400ConfigurationSecureConnectionTest.java    |   2 +
 .../component/jt400/Jt400ConfigurationTest.java    |   1 +
 .../component/jt400/Jt400SecureTestSupport.java    |   2 +
 .../camel/component/jt400/Jt400TestSupport.java    |   2 +
 .../camel/component/kafka/KafkaConfiguration.java  |   2 +
 .../kafka/embedded/EmbeddedKafkaBroker.java        |   2 +
 .../camel/component/kafka/embedded/SystemTime.java |   3 +
 .../kubernetes/AbstractKubernetesComponent.java    |   3 +-
 .../config_maps/KubernetesConfigMapsComponent.java |   1 +
 .../KubernetesDeploymentsComponent.java            |   1 +
 .../kubernetes/hpa/KubernetesHPAComponent.java     |   1 +
 .../kubernetes/job/KubernetesJobComponent.java     |   1 +
 .../namespaces/KubernetesNamespacesComponent.java  |   1 +
 .../kubernetes/nodes/KubernetesNodesComponent.java |   1 +
 .../KubernetesPersistentVolumesComponent.java      |   1 +
 ...KubernetesPersistentVolumesClaimsComponent.java |   1 +
 .../kubernetes/pods/KubernetesPodsComponent.java   |   1 +
 .../KubernetesReplicationControllersComponent.java |   1 +
 .../KubernetesResourcesQuotaComponent.java         |   1 +
 .../secrets/KubernetesSecretsComponent.java        |   1 +
 .../KubernetesServiceAccountsComponent.java        |   1 +
 .../services/KubernetesServicesComponent.java      |   1 +
 .../OpenshiftBuildConfigsComponent.java            |   1 +
 .../openshift/builds/OpenshiftBuildsComponent.java |   1 +
 .../component/language/LanguageComponent.java      |   1 +
 .../camel/component/language/LanguageEndpoint.java |   3 +
 .../camel/component/language/LanguageProducer.java |   1 +
 .../apache/camel/component/ldap/LdapComponent.java |   1 +
 .../apache/camel/component/ldap/LdapEndpoint.java  |   2 +
 .../apache/camel/component/ldap/LdapProducer.java  |   1 +
 .../apache/camel/component/ldif/LdifProducer.java  |   1 +
 .../leveldb/LevelDBAggregationRepository.java      |  16 ++
 .../camel/component/leveldb/LevelDBFile.java       |   2 +
 ...elDBAggregateConcurrentDifferentGroupsTest.java |   1 +
 .../LevelDBAggregateConcurrentSameGroupTest.java   |   1 +
 .../LevelDBAggregateDiscardOnTimeoutTest.java      |   1 +
 .../LevelDBAggregateForceCompletionHeaderTest.java |   1 +
 .../LevelDBAggregateLoadAndRecoverTest.java        |   1 +
 .../LevelDBAggregateLoadConcurrentTest.java        |   1 +
 .../leveldb/LevelDBAggregateLoadTest.java          |   1 +
 ...DBAggregateNotLostRemovedWhenConfirmedTest.java |   1 +
 .../leveldb/LevelDBAggregateNotLostTest.java       |   1 +
 ...ggregateRecoverDeadLetterChannelFailedTest.java |   1 +
 ...velDBAggregateRecoverDeadLetterChannelTest.java |   1 +
 .../leveldb/LevelDBAggregateRecoverTest.java       |   1 +
 ...DBAggregateRecoverWithRedeliveryPolicyTest.java |   1 +
 .../LevelDBAggregateRecoverWithSedaTest.java       |   1 +
 .../LevelDBAggregateSerializedHeadersTest.java     |   1 +
 .../component/leveldb/LevelDBAggregateTest.java    |   1 +
 ...velDBAggregateTimeoutCompletionRestartTest.java |   1 +
 ...ngAggregateRecoverWithRedeliveryPolicyTest.java |   2 +
 .../leveldb/LevelDBSpringAggregateTest.java        |   1 +
 .../component/linkedin/api/DoubleAdapter.java      |   2 +
 .../component/linkedin/api/LinkedInException.java  |   1 +
 .../camel/component/linkedin/api/LongAdapter.java  |   2 +
 .../camel/component/linkedin/LinkedInEndpoint.java |   3 +
 .../apache/camel/component/log/LogComponent.java   |   1 +
 .../apache/camel/component/log/LogProducer.java    |   1 +
 .../camel/component/lucene/LuceneEndpoint.java     |   2 +
 .../component/lucene/LuceneIndexProducer.java      |   1 +
 .../component/lucene/LuceneQueryProducer.java      |   1 +
 .../processor/lucene/LuceneQueryProcessor.java     |   1 +
 .../camel/dataformat/lzf/LZFDataFormatTest.java    |   1 +
 .../camel/component/mail/DefaultAuthenticator.java |   1 +
 .../component/mail/DefaultJavaMailSender.java      |  14 ++
 .../apache/camel/component/mail/MailConsumer.java  |   2 +
 .../apache/camel/component/mail/MailEndpoint.java  |   5 +
 .../apache/camel/component/mail/MailMessage.java   |   2 +
 .../apache/camel/component/mail/MailProducer.java  |   1 +
 .../apache/camel/component/mail/NowSearchTerm.java |   1 +
 .../mail/MailAttachmentDuplicateNamesTest.java     |   1 +
 .../mail/MailAttachmentRedeliveryTest.java         |   1 +
 .../camel/component/mail/MailAttachmentTest.java   |   1 +
 .../mail/MailAttachmentsUmlautIssueTest.java       |   1 +
 .../component/mail/MailBatchConsumerTest.java      |   1 +
 .../component/mail/MailCollectionHeaderTest.java   |   1 +
 .../component/mail/MailCommitOnCompletionTest.java |   1 +
 .../mail/MailConsumerUnsupportedCharsetTest.java   |   1 +
 .../mail/MailContentTypeResolverTest.java          |   1 +
 .../camel/component/mail/MailContentTypeTest.java  |   1 +
 .../camel/component/mail/MailCopyToTest.java       |   1 +
 .../component/mail/MailCustomContentTypeTest.java  |   1 +
 .../mail/MailDefaultDelayForMailConsumeTest.java   |   1 +
 .../camel/component/mail/MailDisconnectTest.java   |   1 +
 .../mail/MailDoNotDeleteIfProcessFailsTest.java    |   1 +
 .../camel/component/mail/MailFetchSizeTest.java    |   1 +
 .../component/mail/MailFetchSizeZeroTest.java      |   1 +
 ...aderOverrulePreConfigurationRecipientsTest.java |   1 +
 .../component/mail/MailHtmlAttachmentTest.java     |   1 +
 ...IdempotentRepositoryDuplicateNotRemoveTest.java |   2 +
 .../MailIdempotentRepositoryDuplicateTest.java     |   1 +
 .../mail/MailIdempotentRepositoryTest.java         |   1 +
 .../component/mail/MailMaxMessagesPerPollTest.java |   1 +
 .../component/mail/MailMimeDecodeHeadersTest.java  |   1 +
 .../component/mail/MailMultipleRecipientsTest.java |   1 +
 .../MailMultipleRecipientsUsingHeadersTest.java    |   1 +
 .../mail/MailNameAndEmailInRecipientTest.java      |   1 +
 .../camel/component/mail/MailNoRecipientsTest.java |   1 +
 .../component/mail/MailPollEnrichNoMailTest.java   |   1 +
 .../camel/component/mail/MailPollEnrichTest.java   |   1 +
 .../component/mail/MailPostProcessActionTest.java  |   1 +
 .../mail/MailProcessOnlyUnseenMessagesTest.java    |   1 +
 .../mail/MailRecipientsPipeIssueTest.java          |   1 +
 .../camel/component/mail/MailRecipientsTest.java   |   1 +
 .../camel/component/mail/MailReplyToTest.java      |   1 +
 .../component/mail/MailSearchTermNotSpamTest.java  |   1 +
 .../camel/component/mail/MailSearchTermTest.java   |   1 +
 .../mail/MailSearchTermUriConfigBeanTest.java      |   1 +
 .../MailSearchTermUriConfigLast24HoursTest.java    |   1 +
 .../mail/MailSearchTermUriConfigTest.java          |   1 +
 .../MailShutdownCompleteCurrentTaskOnlyTest.java   |   1 +
 .../camel/component/mail/MailSortTermTest.java     |   1 +
 .../component/mail/MailSortTermThreeTest.java      |   1 +
 .../camel/component/mail/MailSortTermTwoTest.java  |   1 +
 .../camel/component/mail/MailSubjectTest.java      |   1 +
 .../component/mail/MailUsernameWithAtSignTest.java |   1 +
 .../component/mail/MailUsingCustomSessionTest.java |   1 +
 .../camel/component/mail/MailUsingHeadersTest.java |   1 +
 .../component/mail/MapMailMessagesBugRoute.java    |   1 +
 .../mail/MimeMultipartAlternativeTest.java         |   1 +
 ...imeMultipartAlternativeWithContentTypeTest.java |   1 +
 ...MultipartAlternativeWithLongerFilenameTest.java |   1 +
 .../camel/component/mail/mock/MyMockFolder.java    |   2 +
 .../multipart/MimeMultipartDataFormatTest.java     |   1 +
 .../messagehistory/MetricsMessageHistory.java      |   1 +
 .../MetricsMessageHistoryService.java              |   4 +
 .../routepolicy/MetricsRegistryService.java        |   3 +
 .../messagehistory/MicrometerMessageHistory.java   |   1 +
 .../component/mina2/Mina2TextLineCodecFactory.java |   2 +
 .../mina2/Mina2UdpProtocolCodecFactory.java        |   2 +
 .../Mina2ClientModeTcpTextlineDelimiterTest.java   |   2 +
 .../component/mina2/Mina2ClientServerTest.java     |   1 +
 .../camel/component/mina2/Mina2ConsumerTest.java   |   1 +
 .../mina2/Mina2ExchangeDefaultTimeOutTest.java     |   1 +
 .../component/mina2/Mina2ExchangeTimeOutTest.java  |   1 +
 .../camel/component/mina2/Mina2FileTcpTest.java    |   1 +
 .../camel/component/mina2/Mina2FileUdpTest.java    |   1 +
 .../component/mina2/Mina2MaxLineLengthTest.java    |   1 +
 .../mina2/Mina2NoResponseFromServerTest.java       |   3 +
 .../mina2/Mina2ProducerShutdownMockTest.java       |   1 +
 .../component/mina2/Mina2ProducerShutdownTest.java |   1 +
 .../mina2/Mina2ReverseProtocolHandler.java         |   2 +
 .../mina2/Mina2SslContextParametersTcpTest.java    |   1 +
 .../mina2/Mina2SslContextParametersUdpTest.java    |   1 +
 .../mina2/Mina2SslContextParametersVmTest.java     |   1 +
 .../Mina2SslGlobalContextParametersTcpTest.java    |   1 +
 .../Mina2TcpLineDelimiterUsingPlainSocketTest.java |   1 +
 .../apache/camel/component/mina2/Mina2TcpTest.java |   1 +
 .../mina2/Mina2TcpTextlineDelimiterTest.java       |   1 +
 .../mina2/Mina2TcpTextlineProtocolTest.java        |   1 +
 .../Mina2TcpWithInOutUsingPlainSocketTest.java     |   1 +
 .../Mina2TcpWithIoOutProcessorExceptionTest.java   |   1 +
 .../mina2/Mina2TransferExchangeOptionTest.java     |   1 +
 .../component/mina2/Mina2UdpConcurrentTest.java    |   1 +
 .../apache/camel/component/mina2/Mina2UdpTest.java |   1 +
 .../component/mina2/Mina2UdpUsingTemplateTest.java |   1 +
 .../Mina2UdpWithInOutUsingPlainSocketTest.java     |   1 +
 .../component/mina2/Mina2VMCustomCodecTest.java    |   1 +
 .../camel/component/mina2/Mina2VMFileTcpTest.java  |   1 +
 .../mina2/Mina2VMTextlineProtocolTest.java         |   1 +
 .../mina2/Mina2VMTransferExchangeOptionTest.java   |   1 +
 .../apache/camel/component/mina2/Mina2VmTest.java  |   1 +
 .../apache/camel/component/mllp/MllpEndpoint.java  |   2 +
 .../component/mllp/MllpTcpClientProducer.java      |   1 +
 .../mllp/internal/TcpServerAcceptThread.java       |   1 +
 ...umerOptionalEndOfDataWithoutValidationTest.java |   2 +
 .../internal/MllpSocketBufferReadFromTest.java     |   1 +
 .../test/junit/rule/mllp/MllpServerResource.java   |   2 +
 .../camel/component/mock/AssertionClause.java      |   4 +
 .../apache/camel/component/mock/MockEndpoint.java  |   5 +
 .../component/mongodb/gridfs/GridFsComponent.java  |   1 +
 .../component/mongodb/gridfs/GridFsProducer.java   |   1 +
 .../camel/component/mongodb3/MongoDbComponent.java |   1 +
 .../camel/component/mongodb3/MongoDbEndpoint.java  |   2 +
 .../camel/component/mongodb3/MongoDbProducer.java  |   1 +
 .../apache/camel/component/mqtt/MQTTComponent.java |   1 +
 .../apache/camel/component/mqtt/MQTTConsumer.java  |   2 +
 .../apache/camel/component/mqtt/MQTTProducer.java  |   1 +
 .../apache/camel/component/mqtt/MQTTBaseTest.java  |   2 +
 .../mqtt/MQTTConsumerMultipleTopicsTest.java       |   1 +
 .../camel/component/mqtt/MQTTConsumerTest.java     |   1 +
 .../mqtt/MQTTConsumerWildcardTopicsTest.java       |   1 +
 .../camel/component/mqtt/MQTTLoopProducerTest.java |   1 +
 .../component/mqtt/MQTTProducerReconnectTest.java  |   1 +
 .../camel/component/mqtt/MQTTProducerTest.java     |   1 +
 .../component/validator/msv/RelaxNGRouteTest.java  |   1 +
 .../component/mustache/MustacheLetterTest.java     |   1 +
 .../apache/camel/component/mvel/MvelComponent.java |   1 +
 .../apache/camel/language/mvel/MvelExpression.java |   3 +
 .../apache/camel/language/mvel/MvelLanguage.java   |   2 +
 .../camel/language/mvel/MvelComponentTest.java     |   1 +
 .../org/apache/camel/language/mvel/MvelTest.java   |   1 +
 .../mybatis/DefaultMyBatisProcessingStrategy.java  |   2 +
 .../component/mybatis/MyBatisBeanEndpoint.java     |   1 +
 .../component/mybatis/MyBatisBeanProducer.java     |   1 +
 .../camel/component/mybatis/MyBatisConsumer.java   |   2 +
 .../camel/component/mybatis/MyBatisEndpoint.java   |   2 +
 .../camel/component/mybatis/MyBatisProducer.java   |   1 +
 .../camel/component/mybatis/MyBatisQueueTest.java  |   2 +
 .../camel/component/nagios/NagiosEndpoint.java     |   2 +
 .../component/nagios/NagiosEventNotifier.java      |   2 +
 .../camel/component/nagios/NagiosProducer.java     |   1 +
 .../netty4/http/DefaultNettySharedHttpServer.java  |   9 ++
 .../netty4/http/HttpServerBootstrapFactory.java    |   1 +
 .../component/netty4/http/NettyHttpComponent.java  |   2 +
 .../netty4/http/NettyHttpConfiguration.java        |   2 +
 .../component/netty4/http/NettyHttpEndpoint.java   |   2 +
 .../netty4/http/RestNettyHttpBinding.java          |   1 +
 .../netty4/http/SecurityAuthenticatorSupport.java  |   3 +
 .../HttpServerMultiplexChannelHandler.java         |   6 +
 .../netty4/http/ManagedNettyEndpointTest.java      |   1 +
 ...tpBasicAuthCustomSecurityAuthenticatorTest.java |   2 +
 .../http/NettyHttpBridgeEncodedPathTest.java       |   1 +
 .../NettyHttpBridgeRouteUsingHttpClientTest.java   |   1 +
 .../http/NettyHttpCharacterEncodingTest.java       |   1 +
 .../NettyHttpGetWithParamAsExchangeHeaderTest.java |   1 +
 .../netty4/http/NettyHttpGetWithParamTest.java     |   2 +
 .../netty4/http/NettyHttpMethodRestrictTest.java   |   1 +
 .../http/NettyHttpProducerConcurrentTest.java      |   1 +
 .../ClientModeTCPNettyServerBootstrapFactory.java  |   6 +
 .../netty4/DefaultClientInitializerFactory.java    |   1 +
 .../camel/component/netty4/NettyEndpoint.java      |   2 +
 .../camel/component/netty4/NettyProducer.java      |   1 +
 .../netty4/ShareableChannelHandlerFactory.java     |   1 +
 .../SingleTCPNettyServerBootstrapFactory.java      |   6 +
 .../SingleUDPNettyServerBootstrapFactory.java      |   6 +
 .../component/netty4/codec/ObjectDecoder.java      |   1 +
 .../camel/component/netty4/MultipleCodecsTest.java |   1 +
 .../NettyConsumerClientModeReconnectTest.java      |   2 +
 .../NettyConsumerClientModeReuseChannelTest.java   |   2 +
 .../netty4/NettyConsumerClientModeTest.java        |   2 +
 .../camel/component/netty4/NettyConverterTest.java |   1 +
 .../NettyCustomPipelineFactoryAsynchTest.java      |   1 +
 .../camel/component/netty4/NettyFileTcpTest.java   |   1 +
 .../netty4/NettySSLConsumerClientModeTest.java     |   2 +
 .../component/netty4/NettySingleCodecTest.java     |   1 +
 .../NettyTcpWithInOutUsingPlainSocketTest.java     |   1 +
 .../netty4/NettyTransferExchangeOptionTest.java    |   1 +
 .../NettyUdpWithInOutUsingPlainSocketTest.java     |   1 +
 .../netty4/UnsharableCodecsConflicts2Test.java     |   1 +
 .../netty4/UnsharableCodecsConflictsTest.java      |   1 +
 .../apache/camel/component/nsq/NsqComponent.java   |   1 +
 .../apache/camel/component/nsq/NsqEndpoint.java    |   2 +
 .../apache/camel/language/ognl/OgnlExpression.java |   2 +
 .../apache/camel/language/ognl/OgnlLanguage.java   |   2 +
 .../camel/language/ognl/MyClassResolver.java       |   1 +
 .../org/apache/camel/language/ognl/OgnlTest.java   |   1 +
 .../camel/language/ognl/patterns/FilterTest.java   |   1 +
 .../olingo2/api/batch/Olingo2BatchRequest.java     |   1 +
 .../camel/component/olingo2/Olingo2Endpoint.java   |   3 +
 .../olingo4/api/batch/Olingo4BatchRequest.java     |   1 +
 .../camel/component/olingo4/Olingo4Endpoint.java   |   3 +
 .../component/openstack/cinder/CinderEndpoint.java |   2 +
 .../component/openstack/glance/GlanceEndpoint.java |   2 +
 .../openstack/keystone/KeystoneEndpoint.java       |   2 +
 .../openstack/neutron/NeutronEndpoint.java         |   2 +
 .../component/openstack/nova/NovaEndpoint.java     |   2 +
 .../component/openstack/swift/SwiftEndpoint.java   |   2 +
 .../optaplanner/OptaPlannerComponent.java          |   1 +
 .../optaplanner/OptaPlannerAsyncSolverTest.java    |   1 +
 .../optaplanner/OptaPlannerConsumerTest.java       |   1 +
 .../optaplanner/OptaPlannerDaemonSolverTest.java   |   1 +
 .../optaplanner/OptaPlannerSyncSolverTest.java     |   1 +
 .../component/paxlogging/PaxLoggingConsumer.java   |   1 +
 .../component/paxlogging/PaxLoggingEndpoint.java   |   3 +
 .../pdf/text/DefaultLineBuilderStrategy.java       |   1 +
 .../camel/component/pgevent/PgEventConsumer.java   |   1 +
 .../camel/component/printer/PrintDocument.java     |   7 +-
 .../camel/component/printer/PrinterEndpoint.java   |   3 +
 .../camel/component/printer/PrinterOperations.java |   1 +
 .../camel/component/printer/PrinterProducer.java   |   1 +
 .../AbstractLocationPropertiesSource.java          |   1 +
 .../properties/DefaultPropertiesParser.java        |   1 +
 .../component/properties/FilePropertiesSource.java |   1 +
 .../component/properties/PropertiesComponent.java  |  10 ++
 .../component/properties/RefPropertiesSource.java  |   1 +
 .../dataformat/protobuf/ProtobufDataFormat.java    |   4 +
 .../component/pulsar/PulsarComponentTest.java      |   1 +
 .../quartz2/CronScheduledRoutePolicy.java          |   1 +
 .../camel/routepolicy/quartz2/ScheduledJob.java    |   1 +
 .../quartz2/SimpleScheduledRoutePolicy.java        |   1 +
 .../camel/component/rabbitmq/RabbitConsumer.java   |   5 +
 .../camel/component/rabbitmq/RabbitMQProducer.java |   1 +
 .../rabbitmq/reply/ReplyManagerSupport.java        |   7 +
 .../rabbitmq/reply/TemporaryQueueReplyHandler.java |   2 +
 .../rabbitmq/reply/TemporaryQueueReplyManager.java |   2 +
 ...essageIdAsCorrelationIdMessageSentCallback.java |   1 +
 .../engine/DefaultCamelReactiveStreamsService.java |   3 +
 .../reactor/engine/ReactorStreamsService.java      |   1 +
 .../apache/camel/component/ref/RefComponent.java   |   1 +
 .../camel/component/rest/DefaultRestRegistry.java  |  17 ++
 .../component/restlet/DefaultRestletBinding.java   |   6 +
 .../camel/component/restlet/RestletComponent.java  |   2 +
 .../camel/component/restlet/RestletEndpoint.java   |   4 +
 .../RecipientListInflightExchangesTest.java        |   1 +
 .../restlet/RestletMultiMethodsEndpointTest.java   |   1 +
 .../restlet/RestletMultiRoutesEndpointTest.java    |   1 +
 .../component/restlet/RestletPostContentTest.java  |   3 +-
 .../component/restlet/RestletPostFormTest.java     |   3 +-
 .../camel/component/restlet/RestletQueryTest.java  |   3 +-
 .../restlet/RestletValidUriQueryTest.java          |   3 +-
 .../component/rss/AggregateRssFeedStrategy.java    |   1 +
 .../apache/camel/component/rss/RssComponent.java   |   1 +
 .../camel/component/rss/RssDateComparator.java     |   1 +
 .../component/rss/RssEntryPollingConsumer.java     |   1 +
 .../camel/component/rss/UpdatedDateFilter.java     |   1 +
 .../apache/camel/dataformat/rss/RssDataFormat.java |   2 +
 .../camel/component/rss/RssEndpointTest.java       |   1 +
 .../component/rss/RssEntryPollingConsumerTest.java |   1 +
 .../rss/RssEntryPollingConsumerWithFilterTest.java |   1 +
 .../component/rss/RssEntrySortDefaultsTest.java    |   1 +
 .../camel/component/rss/RssEntrySortTest.java      |   1 +
 .../apache/camel/component/rss/RssFilterTest.java  |   1 +
 .../component/rss/RssPollingConsumerTest.java      |   1 +
 ...sPollingConsumerWithFeedHeaderDisabledTest.java |   1 +
 .../camel/dataformat/rss/RssConverterTest.java     |   1 +
 .../camel/dataformat/rss/RssDataFormatTest.java    |   1 +
 .../dataformat/rss/RssFilterWithXPathTest.java     |   1 +
 .../rxjava2/engine/RxJavaStreamsService.java       |   1 +
 .../component/salesforce/SalesforceComponent.java  |   1 +
 .../component/salesforce/SalesforceEndpoint.java   |   3 +
 .../salesforce/api/dto/SObjectDescription.java     |   1 +
 .../internal/client/AbstractClientBase.java        |   1 +
 .../internal/client/DefaultRestClient.java         |   1 +
 .../internal/client/SalesforceSecurityHandler.java |   1 +
 .../internal/processor/XmlRestProcessor.java       |   1 +
 .../camel/component/xquery/XQueryBuilder.java      |   5 +
 .../camel/component/xquery/XQueryComponent.java    |   1 +
 .../component/xquery/XQueryModuleURIResolver.java  |   1 +
 .../camel/language/xquery/XQueryLanguage.java      |   2 +
 .../camel/builder/XsltAggregationStrategyTest.java |   1 +
 .../builder/saxon/BeanWithXQueryInjectionTest.java |   1 +
 .../saxon/XPathAnnotationResultTypeTest.java       |   1 +
 .../camel/builder/saxon/XQueryFilterTest.java      |   1 +
 ...XQueryHeaderNameResultTypeAndNamespaceTest.java |   1 +
 .../camel/builder/saxon/XQueryHeaderNameTest.java  |   1 +
 .../builder/saxon/XQueryRecipientListTest.java     |   1 +
 .../camel/builder/saxon/XQueryTransformTest.java   |   1 +
 .../builder/saxon/XQueryTransformTextTest.java     |   1 +
 .../saxon/XQueryWithNamespacesFilterTest.java      |   1 +
 .../component/xquery/XQueryConcurrencyTest.java    |   1 +
 .../camel/component/xquery/XQueryEndpointTest.java |   1 +
 .../camel/component/xquery/XQueryExampleTest.java  |   1 +
 .../camel/component/xquery/XQueryFromFileTest.java |   1 +
 .../xquery/XQueryLanguageFromFileTest.java         |   1 +
 .../component/xquery/XQueryNullHeaderTest.java     |   1 +
 .../xquery/XQueryPropogateHeadersTest.java         |   1 +
 .../xquery/XQueryURLBasedConcurrencyTest.java      |   1 +
 .../xquery/XQueryWithExplicitTypeTest.java         |   1 +
 .../camel/converter/saxon/SaxonConverterTest.java  |   1 +
 .../camel/language/xpath/XPathLanguageTest.java    |   1 +
 .../component/schematron/SchematronComponent.java  |   1 +
 .../component/schematron/SchematronEndpoint.java   |   2 +
 .../component/schematron/SchematronProducer.java   |   1 +
 .../apache/camel/component/seda/SedaConsumer.java  |   7 +
 .../apache/camel/component/seda/SedaEndpoint.java  |   4 +
 .../component/servicenow/ServiceNowParams.java     |   6 +
 .../ExposedServletEndpointURIToJMXTest.java        |   1 +
 .../servlet/HttpClientRouteExampleSpringTest.java  |   2 +
 .../servlet/HttpClientRouteSpringTest.java         |   2 +
 .../component/servlet/HttpClientRouteTest.java     |   1 +
 .../servlet/MultiServletConsumerTest.java          |   2 +
 .../servlet/ServletCamelRouterTestSupport.java     |   2 +
 .../servlet/ServletNoSlashNeededTest.java          |   1 +
 .../component/servlet/ServletRootPathTest.java     |   1 +
 .../component/servlet/ServletSetBodyTest.java      |   1 +
 .../shiro/security/ShiroSecurityPolicy.java        |   2 +
 .../shiro/security/ShiroSecurityTokenInjector.java |   1 +
 .../security/ShiroAuthenticationBase64Test.java    |   2 +
 ...nticationReauthenticateFalseAndNewUserTest.java |   2 +
 .../shiro/security/ShiroAuthenticationTest.java    |   2 +
 .../shiro/security/ShiroAuthorizationTest.java     |   1 +
 .../security/ShiroRolesAuthorizationTest.java      |   1 +
 .../apache/camel/component/sip/SipEndpoint.java    |   2 +
 .../apache/camel/component/sip/SipPublisher.java   |   1 +
 .../sip/listener/SipPresenceAgentListener.java     |   6 +
 .../component/sip/listener/SipPublishListener.java |   8 +-
 .../sip/listener/SipSubscriptionListener.java      |   6 +
 .../apache/camel/component/sjms/SjmsEndpoint.java  |   4 +
 .../apache/camel/component/sjms/SjmsMessage.java   |   1 +
 .../apache/camel/component/sjms/SjmsProducer.java  |   2 +
 .../component/sjms/batch/SjmsBatchConsumer.java    |   1 +
 .../component/sjms/batch/SjmsBatchEndpoint.java    |   2 +
 .../sjms/jms/DefaultJmsKeyFormatStrategy.java      |   2 +
 .../component/sjms/jms/Jms11ObjectFactory.java     |   2 +
 .../tx/SessionBatchTransactionSynchronization.java |   1 +
 .../component/sjms/AsyncStartStopListenerTest.java |   1 +
 .../component/sjms/JmsSelectorOptionTest.java      |   1 +
 .../camel/component/sjms/JmsSelectorTest.java      |   1 +
 .../sjms/SjmsEndpointNameOverrideTest.java         |   1 +
 .../camel/component/sjms/SjmsEndpointTest.java     |   1 +
 .../component/sjms/bugfixes/CAMEL6820Test.java     |   1 +
 .../sjms/consumer/AsyncConsumerFalseTest.java      |   1 +
 .../sjms/consumer/AsyncConsumerInOutTest.java      |   1 +
 .../sjms/consumer/EmptyMessageBodyTest.java        |   1 +
 .../InOnlyConsumerQueueSynchronousTest.java        |   1 +
 .../sjms/consumer/InOnlyConsumerQueueTest.java     |   1 +
 .../sjms/consumer/InOnlyConsumerTempQueueTest.java |   1 +
 .../sjms/consumer/InOnlyConsumerTopicTest.java     |   1 +
 .../sjms/consumer/InOutConcurrentConsumerTest.java |   2 +
 .../sjms/consumer/InOutConsumerQueueAsyncTest.java |   1 +
 .../sjms/consumer/InOutConsumerQueueTest.java      |   1 +
 .../consumer/InOutConsumerTempQueueAsyncTest.java  |   1 +
 .../sjms/consumer/InOutConsumerTempQueueTest.java  |   1 +
 .../sjms/consumer/InOutConsumerTopicTest.java      |   1 +
 .../consumer/InOutSynchronousConsumerTest.java     |   1 +
 .../sjms/producer/AsyncQueueProducerTest.java      |   1 +
 .../sjms/producer/AsyncTopicProducerTest.java      |   1 +
 .../component/sjms/producer/PrefillPoolTest.java   |   1 +
 .../component/sjms/support/MockConnection.java     |   1 +
 .../sjms/support/MockConnectionFactory.java        |   2 +
 .../sjms/support/MockMessageConsumer.java          |   1 +
 .../camel/component/sjms/support/MockSession.java  |   2 +
 .../component/sjms/support/MyAsyncEndpoint.java    |   3 +
 .../component/sjms/support/MyAsyncProducer.java    |   2 +
 .../sjms/support/MyInOutTestConsumer.java          |   1 +
 .../sjms2/Sjms2EndpointNameOverrideTest.java       |   1 +
 .../camel/component/sjms2/Sjms2EndpointTest.java   |   1 +
 .../camel/component/slack/SlackConsumerTest.java   |   1 +
 .../smpp/MessageReceiverListenerImpl.java          |   3 +
 .../component/smpp/SmppConnectionFactory.java      |   1 +
 .../apache/camel/component/smpp/SmppEndpoint.java  |   2 +
 .../camel/component/smpp/SmppNLSTSplitter.java     |   1 +
 .../apache/camel/component/smpp/SmppProducer.java  |   1 +
 .../integration/SmppComponentIntegrationTest.java  |   1 +
 .../SmppConsumerReconnectIntegrationTest.java      |   1 +
 .../SmppProducerReconnectIntegrationTest.java      |   1 +
 .../apache/camel/component/snmp/SnmpEndpoint.java  |   3 +
 .../apache/camel/component/snmp/SnmpOIDPoller.java |   1 +
 .../camel/component/snmp/SnmpTrapConsumer.java     |   1 +
 .../apache/camel/component/snmp/PollOIDTest.java   |   1 +
 .../org/apache/camel/component/snmp/TrapTest.java  |   1 +
 .../dataformat/soap/Soap11DataFormatAdapter.java   |   1 +
 .../dataformat/soap/Soap12DataFormatAdapter.java   |   1 +
 .../camel/dataformat/soap/SoapJaxbDataFormat.java  |   2 +
 .../camel/dataformat/soap/name/QNameStrategy.java  |   2 +
 .../soap/name/ServiceInterfaceStrategy.java        |   2 +
 .../dataformat/soap/name/TypeNameStrategy.java     |   2 +
 .../camel/dataformat/soap/FileReplyProcessor.java  |   1 +
 .../camel/dataformat/soap/SoapCxfClientTest.java   |   1 +
 .../camel/dataformat/soap/SoapCxfServerTest.java   |   1 +
 .../soroushbot/support/SoroushMockServer.java      |   1 +
 .../splunk/DefaultSplunkConfigurationFactory.java  |   1 +
 .../camel/component/splunk/SplunkComponent.java    |   1 +
 .../camel/component/splunk/SplunkEndpoint.java     |   2 +
 .../camel/component/splunk/SplunkProducer.java     |   1 +
 .../component/splunk/support/SplunkDataWriter.java |   3 +
 .../spring/batch/SpringBatchIntegrationTest.java   |   1 +
 .../spring/batch/SpringBatchJobLauncherTest.java   |   1 +
 .../integration/SpringIntegrationComponent.java    |   1 +
 .../integration/SpringIntegrationConsumer.java     |   3 +
 .../integration/SpringIntegrationEndpoint.java     |   3 +
 .../integration/SpringIntegrationMessage.java      |   1 +
 .../integration/SpringIntegrationProducer.java     |   1 +
 .../integration/adapter/CamelSourceAdapter.java    |   3 +
 .../integration/adapter/CamelTargetAdapter.java    |   1 +
 .../AbstractCamelContextBeanDefinitionParaser.java |   1 +
 .../adapter/config/NamespaceHandler.java           |   1 +
 .../component/spring/integration/MyProcessor.java  |   1 +
 .../SpringIntegrationChannelConverterTest.java     |   1 +
 .../SpringIntegrationOneWayConsumerTest.java       |   1 +
 .../integration/SpringIntegrationProducerTest.java |   1 +
 .../SpringIntegrationTwoWayConsumerTest.java       |   1 +
 .../spring/javaconfig/CamelConfiguration.java      |   2 +
 .../org/apache/camel/spring/javaconfig/Main.java   |   1 +
 .../spring/javaconfig/config/ContextConfig.java    |   1 +
 .../spring/javaconfig/patterns/FilterTest.java     |   1 +
 .../test/JavaConfigWithNestedConfigClassTest.java  |   1 +
 .../test/JavaConfigWithPostProcessorTest.java      |   1 +
 .../spring/javaconfig/test/MyPostProcessor.java    |   2 +
 .../springldap/SpringLdapProducerTest.java         |   1 +
 .../component/redis/AllRedisProcessorsCreator.java |   1 +
 .../camel/component/redis/RedisComponent.java      |   1 +
 .../camel/component/redis/RedisEndpoint.java       |   3 +
 .../idempotent/RedisIdempotentRepository.java      |   8 +
 .../camel/component/redis/RedisConsumerTest.java   |   1 +
 .../security/DefaultAuthenticationAdapter.java     |   1 +
 .../SpringSecurityAuthorizationPolicy.java         |   5 +
 .../security/config/BeanDefinitionParser.java      |   2 +
 .../spring/security/config/NamespaceHandler.java   |   1 +
 .../SpringSecurityAuthorizationPolicyParser.java   |   2 +
 .../spring/ws/SpringWebserviceComponent.java       |   1 +
 .../spring/ws/SpringWebserviceConsumer.java        |   1 +
 .../spring/ws/SpringWebserviceEndpoint.java        |   2 +
 .../spring/ws/SpringWebserviceProducer.java        |   2 +
 .../spring/ws/bean/CamelEndpointDispatcher.java    |   1 +
 .../spring/ws/bean/CamelEndpointMapping.java       |   6 +
 .../spring/ws/bean/WSACamelEndpointMapping.java    |   2 +
 ...ConsumerEndpointMappingByBeanNameRouteTest.java |   1 +
 ...erEndpointMappingResponseHandlingRouteTest.java |   1 +
 .../ws/ConsumerEndpointMappingRouteTest.java       |   1 +
 .../ws/MessageFilterResolvingDefaultsTest.java     |   1 +
 .../spring/ws/MessageFilterResolvingTest.java      |   1 +
 .../spring/ws/SoapAttachmentResponseProcessor.java |   1 +
 .../spring/ws/SoapHeaderResponseProcessor.java     |   1 +
 .../spring/ws/StockQuoteResponseProcessor.java     |   1 +
 .../spring/ws/addressing/AbstractWSATests.java     |   1 +
 .../ws/addressing/CamelDirectSenderTest.java       |   1 +
 .../ConsumerWSAEndpointMappingRouteTest.java       |   1 +
 .../ConsumerWSANewChannelParamsActionTests.java    |   1 +
 .../ConsumerWSANewChannelParamsToTests.java        |   1 +
 .../ConsumerWSASameChannelParamsActionTests.java   |   1 +
 .../ConsumerWSASameChannelParamsToTests.java       |   1 +
 .../ws/addressing/ProducerParamsBasicTest.java     |   1 +
 .../addressing/ProducerParamsPrecedenceTest.java   |   1 +
 .../spring/ws/addressing/StaticIdStrategy.java     |   1 +
 .../ws/processor/FaultResponseProcessor.java       |   1 +
 .../spring/ws/processor/OkResponseProcessor.java   |   1 +
 .../spring/ws/processor/PrecedenceProcessor.java   |   1 +
 ...ProducerWss4JSecurityHeaderTestInterceptor.java |   1 +
 .../camel/component/event/EventComponent.java      |   2 +
 .../camel/component/event/EventEndpoint.java       |   3 +
 .../apache/camel/language/spel/SpelExpression.java |   2 +
 .../apache/camel/language/spel/SpelLanguage.java   |   2 +
 .../spring/CamelConsumerTemplateFactoryBean.java   |   1 +
 .../camel/spring/CamelContextFactoryBean.java      |  54 +++++++
 .../camel/spring/CamelEndpointFactoryBean.java     |   1 +
 .../CamelFluentProducerTemplateFactoryBean.java    |   1 +
 .../spring/CamelProducerTemplateFactoryBean.java   |   1 +
 .../spring/CamelRedeliveryPolicyFactoryBean.java   |   1 +
 .../camel/spring/CamelRestContextFactoryBean.java  |   3 +
 .../camel/spring/CamelRouteContextFactoryBean.java |   3 +
 .../camel/spring/CamelThreadPoolFactoryBean.java   |   1 +
 .../main/java/org/apache/camel/spring/Main.java    |   2 +
 .../spring/SpringModelJAXBContextFactory.java      |   1 +
 .../apache/camel/spring/SpringRouteBuilder.java    |   3 +-
 .../camel/spring/handler/BeanDefinitionParser.java |   2 +
 .../spring/handler/CamelNamespaceHandler.java      |   1 +
 .../handler/ErrorHandlerDefinitionParser.java      |   3 +
 .../spring/remoting/CamelProxyFactoryBean.java     |   9 ++
 .../spring/remoting/CamelServiceExporter.java      |   5 +
 .../spi/BridgePropertyPlaceholderConfigurer.java   |   1 +
 .../apache/camel/spring/spi/SpringInjector.java    |   1 +
 .../spring/spi/SpringManagementMBeanAssembler.java |   1 +
 .../camel/spring/spi/SpringTransactionPolicy.java  |   2 +
 .../camel/spring/spi/TransactionErrorHandler.java  |   1 +
 .../spring/spi/TransactionErrorHandlerBuilder.java |   3 +
 .../spring/spi/TransactionErrorHandlerReifier.java |   1 +
 .../org/apache/camel/spring/util/MainRunner.java   |   3 +
 .../spring/KeyManagersParametersFactoryBean.java   |   1 +
 .../util/spring/KeyStoreParametersFactoryBean.java |   1 +
 .../SSLContextClientParametersFactoryBean.java     |   1 +
 .../spring/SSLContextParametersFactoryBean.java    |   1 +
 .../SSLContextServerParametersFactoryBean.java     |   1 +
 .../spring/SecureRandomParametersFactoryBean.java  |   1 +
 .../spring/TrustManagersParametersFactoryBean.java |   1 +
 .../bean/AutowireConstructorRouteTest.java         |   1 +
 .../bean/AutowireConstructorRouteTwoTest.java      |   1 +
 .../camel/component/bean/BeanBindingTest.java      |   1 +
 .../apache/camel/component/bean/BeanRouteTest.java |   1 +
 .../bean/SpringRouteMethodCallStaticTest.java      |   1 +
 .../camel/component/event/EventRouteTest.java      |   1 +
 .../camel/component/event/MistypedPackageTest.java |   1 +
 .../component/log/CustomExchangeFormatterTest.java |   1 +
 .../camel/component/log/SpringLogMarkerTest.java   |   1 +
 .../apache/camel/component/log/SpringLogTest.java  |   1 +
 .../SpringOptionalPropertiesDslTest.java           |   1 +
 ...pertiesComponentEIPChoiceConvertBodyToTest.java |   1 +
 ...ingPropertiesComponentEIPConvertBodyToTest.java |   1 +
 ...SpringPropertiesComponentInterceptFromTest.java |   1 +
 ...pringPropertiesComponentOnExceptionRefTest.java |   1 +
 .../SpringPropertiesComponentOnExceptionTest.java  |   1 +
 .../properties/SpringPropertiesRouteFromTest.java  |   1 +
 .../properties/SpringPropertiesRouteIdTest.java    |   1 +
 ...pringPropertyPlaceholderOnExceptionRefTest.java |   1 +
 .../rest/SpringFromRestConfigurationTest.java      |   1 +
 .../rest/SpringFromRestGetEmbeddedRouteTest.java   |   1 +
 .../rest/SpringFromRestGetInterceptTest.java       |   1 +
 .../rest/SpringFromRestGetOnExceptionTest.java     |   1 +
 .../SpringFromRestGetRouteOnExceptionTest.java     |   1 +
 .../component/rest/SpringFromRestGetTest.java      |   1 +
 .../rest/SpringFromRestIdAndDescriptionTest.java   |   1 +
 .../rest/SpringFromRestUriPrefixTest.java          |   1 +
 .../validator/SpringValidatorRouteTest.java        |   1 +
 .../component/xslt/SpringXsltRouteFileTest.java    |   1 +
 .../camel/component/xslt/SpringXsltRouteTest.java  |   1 +
 .../SpringTokenXMLPairNamespaceSplitTest.java      |   1 +
 .../camel/language/SpringXMLTokenSplitTest.java    |   1 +
 .../apache/camel/language/spel/SpelSpringTest.java |   1 +
 .../org/apache/camel/language/spel/SpelTest.java   |   1 +
 .../camel/processor/RemoveHeadersExcludeTest.java  |   1 +
 .../apache/camel/spring/CamelContextAwareBean.java |   2 +
 .../apache/camel/spring/CamelContextAwareTest.java |   1 +
 .../camel/spring/CamelLoadRoutesFromXMLTest.java   |   1 +
 .../apache/camel/spring/EndpointReferenceTest.java |   2 +
 .../apache/camel/spring/EndpointToIdRefTest.java   |   1 +
 .../org/apache/camel/spring/InjectedBeanTest.java  |   1 +
 .../RouteRefCamelContextFactoryBeanTest.java       |   2 +
 .../spring/SpringLogDebugBodyMaxCharsTest.java     |   1 +
 .../org/apache/camel/spring/SpringMDCTest.java     |   2 +
 .../SpringMDCWithBreadcrumbDisabledTest.java       |   2 +
 .../camel/spring/SpringMDCWithBreadcrumbTest.java  |   2 +
 .../camel/spring/StartAndStopEventNotifier.java    |   4 +
 .../aop/SpringAopClassLevelCamelBeanTest.java      |   1 +
 .../camel/spring/bind/BeanAsEndpointTest.java      |   1 +
 .../camel/spring/bind/ProcessorAsEndpointTest.java |   1 +
 .../apache/camel/spring/bind/ProcessorStub.java    |   1 +
 .../DefaultPackageResolverConfigureTest.java       |   1 +
 .../DualCamelContextEndpointOutsideTest.java       |   1 +
 .../spring/config/DummyErrorHandlerBuilder.java    |   3 +
 .../camel/spring/config/ErrorHandlerTest.java      |   1 +
 .../camel/spring/config/MyFailureProcessor.java    |   1 +
 ...lContextCustomDefaultThreadPoolProfileTest.java |   1 +
 ...ingCamelContextCustomThreadPoolProfileTest.java |   1 +
 ...xtSimpleCustomDefaultThreadPoolProfileTest.java |   1 +
 .../SpringCamelContextThreadPoolProfilesTest.java  |   1 +
 ...ntextThreadPoolProfilesWithPlaceholderTest.java |   1 +
 .../spring/config/scan/component/MyProcessor.java  |   1 +
 .../spring/example/ContentBasedRouteTest.java      |   1 +
 .../camel/spring/example/FooEventRouteTest.java    |   1 +
 .../apache/camel/spring/example/MyProcessor.java   |   1 +
 .../camel/spring/example/PojoConsumerTest.java     |   1 +
 .../camel/spring/example/PojoSenderTest.java       |   1 +
 .../camel/spring/example/PojoVmConsumerTest.java   |   1 +
 .../camel/spring/example/SimpleRouteTest.java      |   1 +
 .../camel/spring/example/test1/MyRouteBuilder.java |   1 +
 .../SpringFileAntPathMatcherFileFilterTest.java    |   1 +
 .../file/SpringFileConsumerPreMoveIssueTest.java   |   1 +
 .../spring/file/SpringFileConsumerPreMoveTest.java |   1 +
 .../camel/spring/file/SpringFileRouteTest.java     |   1 +
 .../file/SpringSimpleFileNameWithQuoteTest.java    |   1 +
 .../camel/spring/handler/MyErrorProcessor.java     |   2 +
 ...melContextAllowUseOriginalMessageFalseTest.java |   1 +
 ...amelContextAllowUseOriginalMessageTrueTest.java |   1 +
 .../camel/spring/impl/SpringRefDataFormatTest.java |   1 +
 .../spring/impl/SpringRoutePolicyFactoryTest.java  |   1 +
 .../impl/SpringRoutePolicyRefCallbackTest.java     |   1 +
 ...TypeConverterRegistryStatisticsEnabledTest.java |   1 +
 .../transformer/SpringTransformerRouteTest.java    |   2 +
 .../impl/validator/SpringValidatorRouteTest.java   |   1 +
 .../interceptor/AnnotatedBookServiceImpl.java      |   1 +
 .../spring/interceptor/AnnotatedConsumeImpl.java   |   1 +
 .../camel/spring/interceptor/AnnotatedRoute.java   |   1 +
 .../interceptor/ContainerWideInterceptor.java      |   1 +
 .../spring/interceptor/DelayerInterceptorTest.java |   1 +
 .../MixedPropagationTransactedTest.java            |   2 +
 .../MixedStreamCachingInterceptorTest.java         |   1 +
 .../MixedTransactionPropagationTest.java           |   2 +
 .../NoStreamCachingInterceptorTest.java            |   1 +
 ...eWithTwoRoutesContextScopedOnExceptionTest.java |   1 +
 .../SpringAdviceWithTwoRoutesOnExceptionTest.java  |   1 +
 .../interceptor/SpringAdviceWithTwoRoutesTest.java |   1 +
 .../SpringInterceptorStrategyOrderedTest.java      |   1 +
 ...ransactionalClientDataSourceTransactedTest.java |   1 +
 ...ctionalClientDataSourceUsingTransactedTest.java |   1 +
 ...hOnExceptionAndRollbackUsingTransactedTest.java |   2 +
 ...dOnExceptionAndRollbackUsingTransactedTest.java |   1 +
 .../interceptor/StreamCachingInterceptorTest.java  |   1 +
 .../TransactedInterceptSendToEndpointTest.java     |   3 +
 ...InterceptUsingAdviceWithSendToEndpointTest.java |   3 +
 .../TransactionClientDataSourceSupport.java        |   1 +
 .../TransactionalClientDataSourceAsyncTest.java    |   2 +
 .../TransactionalClientDataSourceHandledTest.java  |   2 +
 ...ransactionalClientDataSourceLookupTypeTest.java |   1 +
 .../TransactionalClientDataSourceMDCTest.java      |   1 +
 ...alClientDataSourceMinimalConfigurationTest.java |   1 +
 ...entDataSourceMixedTransactedRedeliveryTest.java |   1 +
 ...ctionalClientDataSourceMixedTransactedTest.java |   2 +
 ...sactionalClientDataSourceNotTransactedTest.java |   2 +
 ...lClientDataSourceOnExceptionRedeliveryTest.java |   1 +
 ...ransactionalClientDataSourceRedeliveryTest.java |   1 +
 .../TransactionalClientDataSourceTest.java         |   1 +
 ...ransactionalClientDataSourceTransactedTest.java |   1 +
 ...taSourceTransactedWithChoiceRedeliveryTest.java |   1 +
 ...alClientDataSourceTransactedWithChoiceTest.java |   1 +
 ...urceTransactedWithFileLocalOnExceptionTest.java |   1 +
 ...ataSourceTransactedWithFileOnExceptionTest.java |   1 +
 ...onalClientDataSourceTransactedWithFileTest.java |   1 +
 ...taSourceTransactedWithLocalOnExceptionTest.java |   1 +
 ...lientDataSourceTransactionErrorHandlerTest.java |   1 +
 ...tDataSourceWithNoErrorHandlerConfigureTest.java |   1 +
 ...ourceWithOnExceptionHandledAndRollbackTest.java |   2 +
 ...ptionHandledAndRollbackUsingTransactedTest.java |   2 +
 ...rceWithOnExceptionMinimalConfigurationTest.java |   1 +
 ...lientDataSourceWithOnExceptionRollbackTest.java |   2 +
 ...ctionalClientDataSourceWithOnExceptionTest.java |   2 +
 ...actedErrorHandlerOnExceptionRedeliveryTest.java |   1 +
 .../TransactionalClientWithAnnotatedBeanTest.java  |   1 +
 .../TransactionalClientWithRollbackTest.java       |   2 +
 .../route/DataSourceSpringRouteBuilder.java        |   1 +
 ...dSpringOnExceptionErrorHandlerRefIssueTest.java |   1 +
 ...xceptionNotHandledErrorHandlerRefIssueTest.java |   1 +
 ...otHandledErrorHandlerRefIssueTwoRoutesTest.java |   1 +
 ...HandledRouteScopedErrorHandlerRefIssueTest.java |   1 +
 ...uteScopedErrorHandlerRefIssueTwoRoutesTest.java |   1 +
 ...ceptionRouteScopedErrorHandlerRefIssueTest.java |   1 +
 ...uteScopedErrorHandlerRefIssueTwoRoutesTest.java |   1 +
 .../spring/issues/MyInjectionRouteBuilder.java     |   1 +
 .../apache/camel/spring/issues/MyProcessor.java    |   1 +
 .../apache/camel/spring/issues/MyRouteBuilder.java |   1 +
 .../spring/issues/SampleInitializingBean.java      |   1 +
 .../issues/SampleInitializingRouteBuilder.java     |   1 +
 .../spring/issues/SampleRouteBuilderContainer.java |   1 +
 ...ingAdviceWithTwoRoutesOnExceptionIssueTest.java |   1 +
 .../spring/issues/SpringCatchNestedFailTest.java   |   1 +
 ...ngCharlesSplitAndTryCatchRollbackIssueTest.java |   1 +
 .../issues/SpringExceptionCamel4022Test.java       |   1 +
 .../spring/issues/SpringFinallyNestedFailTest.java |   1 +
 ...ngMultipleErrorHandlerOnExceptionIssueTest.java |   1 +
 .../SpringOnExceptionErrorHandlerRefIssueTest.java |   1 +
 ...ExceptionErrorHandlerRefIssueTwoRoutesTest.java |   1 +
 ...xceptionNotHandledErrorHandlerRefIssueTest.java |   1 +
 ...otHandledErrorHandlerRefIssueTwoRoutesTest.java |   1 +
 ...HandledRouteScopedErrorHandlerRefIssueTest.java |   1 +
 ...uteScopedErrorHandlerRefIssueTwoRoutesTest.java |   1 +
 ...ceptionRouteScopedErrorHandlerRefIssueTest.java |   1 +
 ...uteScopedErrorHandlerRefIssueTwoRoutesTest.java |   1 +
 .../camel/spring/issues/SpringPackageTest.java     |   1 +
 .../SpringPropertiesAvailableEverywhereTest.java   |   1 +
 ...uteScopedErrorHandlerRefIssueTwoRoutesTest.java |   1 +
 .../issues/SpringRouteIdAutoAssignClashIssue.java  |   1 +
 ...andlerAndContextScopedOnExceptionIssueTest.java |   1 +
 .../SpringTryCatchFinallyAndErrorHandlerTest.java  |   1 +
 .../issues/SpringTryCatchWithSplitIssueTest.java   |   1 +
 .../spring/issues/SpringTryNestedFailTest.java     |   1 +
 .../org/apache/camel/spring/main/MyHelloBean.java  |   1 +
 ...ualCamelContextManagedAutoAssignedNameTest.java |   2 +
 .../management/DualCamelContextManagedTest.java    |   1 +
 .../JmxInstrumentationWithConnectorTest.java       |   1 +
 .../camel/spring/management/MyEventNotifier.java   |   1 +
 .../SpringCamelContextStartingFailedEventTest.java |   1 +
 .../SpringDualLoggingEventNotifierTest.java        |   1 +
 .../management/SpringLoggingEventNotifierTest.java |   1 +
 .../management/SpringManagedCamelContextTest.java  |   1 +
 .../SpringManagedCustomProcessorTest.java          |   1 +
 .../management/SpringManagedErrorHandlerTest.java  |   1 +
 .../SpringManagedNamePatternFixedTest.java         |   1 +
 .../management/SpringManagedNamePatternTest.java   |   1 +
 .../management/SpringManagedResourceTest.java      |   1 +
 ...edRouteRemoveContextScopedErrorHandlerTest.java |   1 +
 ...emoveRouteAndContextScopedErrorHandlerTest.java |   1 +
 ...agedRouteRemoveRouteScopedErrorHandlerTest.java |   1 +
 .../management/SpringManagedSanitizeTest.java      |   1 +
 .../SpringManagedStatisticsLevelOffTest.java       |   1 +
 ...SpringManagedStatisticsLevelRoutesOnlyTest.java |   1 +
 .../management/SpringPublishEventNotifierTest.java |   1 +
 .../org/apache/camel/spring/mock/BeanMockTest.java |   1 +
 .../org/apache/camel/spring/mock/MyAssertions.java |   1 +
 ...LanguageWithSpringPropertyPlaceholderRoute.java |   1 +
 ...uageWithSpringPropertyPlaceholderRouteTest.java |   1 +
 ...CamelCustomPostProcessorOnRouteBuilderTest.java |   1 +
 .../MyRouteBuilderWithAutowiredPojo.java           |   1 +
 .../camel/spring/processor/MyAggregator.java       |   1 +
 .../apache/camel/spring/processor/MyProcessor.java |   1 +
 .../camel/spring/processor/SetHeaderProcessor.java |   1 +
 .../processor/SpringAggregateFromWireTapTest.java  |   1 +
 .../SpringAggregatorWithCustomStrategyTest.java    |   1 +
 .../SpringBatchResequencerAllowDuplicatesTest.java |   1 +
 .../SpringBatchResequencerJMSPriorityTest.java     |   1 +
 .../processor/SpringCBRHeaderPredicateTest.java    |   1 +
 ...ingCamelContextLogExhaustedMessageBodyTest.java |   1 +
 .../camel/spring/processor/SpringChoiceTest.java   |   1 +
 .../SpringClaimCheckEipGetAndRemoveSetTest.java    |   1 +
 .../processor/SpringClaimCheckEipGetSetTest.java   |   1 +
 .../SpringClaimCheckEipPushPopBodyTest.java        |   1 +
 ...ringClaimCheckEipPushPopHeadersPatternTest.java |   1 +
 .../SpringClaimCheckEipPushPopHeadersTest.java     |   1 +
 ...SpringClaimCheckEipPushPopRemoveHeaderTest.java |   1 +
 .../processor/SpringClaimCheckEipPushPopTest.java  |   1 +
 .../processor/SpringComplexBlockWithEndTest.java   |   2 +
 .../spring/processor/SpringConvertBodyTest.java    |   1 +
 .../processor/SpringCustomPredicateTest.java       |   1 +
 .../SpringCustomProcessorFactoryTest.java          |   1 +
 .../processor/SpringCustomRefLoadBalanceTest.java  |   1 +
 ...etterChannelLogExhaustedMessageHistoryTest.java |   1 +
 .../SpringDeadLetterChannelNewExceptionTest.java   |   1 +
 .../SpringDeadLetterChannelNoRedeliveryTest.java   |   1 +
 ...DeadLetterChannelNotHandleNewExceptionTest.java |   1 +
 .../SpringDeadLetterChannelOnPrepareTestTest.java  |   1 +
 ...ingDeadLetterChannelUseOriginalBodyNewTest.java |   1 +
 ...SpringDeadLetterChannelUseOriginalBodyTest.java |   1 +
 ...adLetterChannelUseOriginalBodyWithFileTest.java |   1 +
 ...efaultErrorHandlerExchangeFormatterRefTest.java |   1 +
 ...ErrorHandlerLogExhaustedMessageHistoryTest.java |   1 +
 ...SpringDefaultErrorHandlerOnPrepareTestTest.java |   1 +
 .../SpringDefaultErrorHandlerRetryWhileTest.java   |   1 +
 .../processor/SpringDelayerPerRouteTest.java       |   1 +
 .../camel/spring/processor/SpringDelayerTest.java  |   1 +
 .../spring/processor/SpringDynamicRouterTest.java  |   1 +
 .../processor/SpringEnrichExpressionTest.java      |   1 +
 .../SpringEnricherAggregateOnExceptionTest.java    |   1 +
 .../spring/processor/SpringEnricherRefTest.java    |   1 +
 .../camel/spring/processor/SpringEnricherTest.java |   1 +
 ...SpringEventNotifierExchangeSentExampleTest.java |   1 +
 ...ingFailOverLoadBalanceAutoStartupFalseTest.java |   1 +
 .../processor/SpringFailOverLoadBalanceTest.java   |   1 +
 .../SpringFailoverMaximumFailoverAttemptsTest.java |   1 +
 .../SpringFailoverRoundRobinStickyTest.java        |   1 +
 .../processor/SpringFailoverRoundRobinTest.java    |   1 +
 ...pringIdempotentConsumerRemoveOnFailureTest.java |   1 +
 .../SpringInheritErrorHandlerDefaultTest.java      |   1 +
 .../SpringInheritErrorHandlerFalseTest.java        |   1 +
 .../SpringInheritErrorHandlerTrueTest.java         |   1 +
 .../SpringInterceptFromEndpointRefTest.java        |   1 +
 .../spring/processor/SpringInterceptFromTest.java  |   1 +
 .../processor/SpringInterceptFromUriRegexTest.java |   1 +
 .../SpringInterceptFromUriSimpleLogTest.java       |   1 +
 .../SpringInterceptFromUriWildcardTest.java        |   1 +
 .../SpringInterceptFromWhenNoStopTest.java         |   1 +
 .../processor/SpringInterceptFromWhenTest.java     |   1 +
 .../SpringInterceptFromWhenWithChoiceTest.java     |   1 +
 .../processor/SpringInterceptFromWithStopTest.java |   1 +
 .../SpringInterceptSendToEndpointDynamicTest.java  |   1 +
 ...ngInterceptSendToEndpointInOnExceptionTest.java |   1 +
 .../SpringInterceptSendToEndpointSkipTest.java     |   1 +
 .../SpringInterceptSendToEndpointTest.java         |   1 +
 .../SpringInterceptSendToEndpointWhenTest.java     |   1 +
 .../SpringInterceptSimpleRouteStopTest.java        |   1 +
 .../processor/SpringInterceptSimpleRouteTest.java  |   1 +
 .../SpringInterceptSimpleRouteWhenStopTest.java    |   1 +
 .../SpringInterceptSimpleRouteWhenTest.java        |   1 +
 .../spring/processor/SpringLogProcessorTest.java   |   1 +
 .../SpringLogProcessorWithProvidedLoggerTest.java  |   1 +
 .../processor/SpringMarkRollbackOnlyTest.java      |   1 +
 .../SpringMessageHistoryDumpRoutingTest.java       |   1 +
 .../spring/processor/SpringMethodCallTest.java     |   1 +
 .../SpringMulticastNoStopOnExceptionTest.java      |   1 +
 .../processor/SpringMulticastOnPrepareTest.java    |   1 +
 .../SpringMulticastStopOnExceptionTest.java        |   1 +
 .../SpringMulticastSubUnitOfWorkTest.java          |   1 +
 .../spring/processor/SpringMulticastTest.java      |   1 +
 .../processor/SpringNestedChoiceIssueTest.java     |   1 +
 .../spring/processor/SpringNormalizerTest.java     |   1 +
 ...letionAndInterceptAndOnExceptionGlobalTest.java |   1 +
 .../SpringOnCompletionAndInterceptGlobalTest.java  |   1 +
 .../SpringOnCompletionAndInterceptTest.java        |   1 +
 .../processor/SpringOnCompletionGlobalTest.java    |   1 +
 .../processor/SpringOnCompletionModeTest.java      |   1 +
 .../SpringOnCompletionOnCompleteOnlyTest.java      |   1 +
 .../SpringOnCompletionOnFailureOnlyTest.java       |   1 +
 ...ompletionRouteScopeOverrideGlobalScopeTest.java |   1 +
 .../spring/processor/SpringOnCompletionTest.java   |   1 +
 .../SpringOnCompletionUseOriginalBodyTest.java     |   1 +
 .../processor/SpringOnCompletionWhenTest.java      |   1 +
 .../SpringOnExceptionContinueToRouteTest.java      |   1 +
 .../processor/SpringPolicyPerProcessorTest.java    |   1 +
 .../spring/processor/SpringPolicyPerRouteTest.java |   1 +
 .../processor/SpringPollEnrichExpressionTest.java  |   1 +
 .../processor/SpringPollEnricherRefTest.java       |   1 +
 .../spring/processor/SpringPollEnricherTest.java   |   1 +
 .../processor/SpringRandomLoadBalanceTest.java     |   1 +
 ...SpringRecipientListAggregationStrategyTest.java |   1 +
 ...pringRecipientListDoNotStopOnExceptionTest.java |   1 +
 ...ingRecipientListIgnoreInvalidEndpointsTest.java |   1 +
 .../SpringRecipientListOnPrepareTest.java          |   1 +
 ...ecipientListParallelOptionalPropertiesTest.java |   1 +
 .../SpringRecipientListParallelStreamingTest.java  |   1 +
 .../processor/SpringRecipientListParallelTest.java |   1 +
 .../SpringRecipientListStopOnExceptionTest.java    |   1 +
 .../SpringRecipientListSubUnitOfWorkTest.java      |   1 +
 .../SpringRecipientListWithArrayHeaderTest.java    |   1 +
 ...RecipientListWithStringDelimitedHeaderTest.java |   1 +
 ...cipientListWithStringDelimitedPropertyTest.java |   1 +
 .../processor/SpringRedeliverToSubRouteTest.java   |   1 +
 ...veryErrorHandlerNoRedeliveryOnShutdownTest.java |   1 +
 .../spring/processor/SpringRemoveHeaderTest.java   |   1 +
 .../processor/SpringRemoveHeadersExcludeTest.java  |   1 +
 .../spring/processor/SpringRemoveHeadersTest.java  |   1 +
 .../SpringRemovePropertiesWithExclusionTest.java   |   1 +
 ...SpringRemovePropertiesWithoutExclusionTest.java |   1 +
 .../spring/processor/SpringRemovePropertyTest.java |   1 +
 ...ringResequenceStreamRejectOldExchangesTest.java |   1 +
 .../spring/processor/SpringResequencerTest.java    |   1 +
 .../camel/spring/processor/SpringRollbackTest.java |   1 +
 .../processor/SpringRoundRobinLoadBalanceTest.java |   1 +
 .../processor/SpringRouteNoAutoStartupTest.java    |   1 +
 .../SpringRouteStartupOrderSimpleTest.java         |   1 +
 .../processor/SpringRouteStartupOrderTest.java     |   1 +
 .../SpringRouteStartupOrderWithDefaultTest.java    |   1 +
 .../spring/processor/SpringRouteStopTest.java      |   1 +
 ...RouteWithConstantFieldFromExchangeFailTest.java |   1 +
 ...ringRouteWithConstantFieldFromExchangeTest.java |   1 +
 ...pringRoutingSlipIgnoreInvalidEndpointsTest.java |   1 +
 .../spring/processor/SpringRoutingSlipTest.java    |   1 +
 .../camel/spring/processor/SpringSagaTest.java     |   1 +
 .../processor/SpringSamplingThrottlerTest.java     |   1 +
 .../spring/processor/SpringScriptExternalTest.java |   1 +
 .../camel/spring/processor/SpringScriptTest.java   |   1 +
 .../camel/spring/processor/SpringSetBodyTest.java  |   1 +
 .../processor/SpringSetExchangePatternTest.java    |   1 +
 .../SpringSetExchangePatternWithCustomIdTest.java  |   1 +
 .../processor/SpringSetHeaderNameDynamicTest.java  |   1 +
 .../spring/processor/SpringSetHeaderTest.java      |   1 +
 .../processor/SpringSetHeaderWithConstantTest.java |   1 +
 .../SpringSetPropertyNameDynamicTest.java          |   1 +
 .../spring/processor/SpringSetPropertyTest.java    |   1 +
 .../SpringShutdownCompleteAllTasksTest.java        |   1 +
 .../SpringShutdownCompleteCurrentTaskOnlyTest.java |   1 +
 .../SpringSimpleProcessorIdAwareTest.java          |   1 +
 .../processor/SpringSimpleResultTypeRouteTest.java |   1 +
 .../camel/spring/processor/SpringSortBodyTest.java |   1 +
 .../spring/processor/SpringSortExpressionTest.java |   1 +
 .../processor/SpringSplitCustomExpressionTest.java |   1 +
 .../processor/SpringSplitGroupMultiLinesTest.java  |   1 +
 .../processor/SpringSplitGroupSkipFirstTest.java   |   1 +
 .../processor/SpringSplitSubUnitOfWorkTest.java    |   1 +
 .../SpringSplitTokenizerGroupDynamicTest.java      |   1 +
 .../processor/SpringSplitterMethodCallTest.java    |   1 +
 .../SpringSplitterNoStopOnExceptionTest.java       |   1 +
 .../processor/SpringSplitterOnPrepareTest.java     |   1 +
 .../SpringSplitterStopOnExceptionTest.java         |   1 +
 ...ngSplitterWithCustomThreadPoolExecutorTest.java |   1 +
 .../processor/SpringStaticRecipientListTest.java   |   1 +
 .../camel/spring/processor/SpringStepTest.java     |   1 +
 .../processor/SpringStickyLoadBalanceTest.java     |   1 +
 .../processor/SpringStreamCachingPerRouteTest.java |   1 +
 ...ringThreadsCoreAndMaxPoolKeepAliveTimeTest.java |   1 +
 .../processor/SpringThreadsCoreAndMaxPoolTest.java |   1 +
 .../processor/SpringThreadsCorePoolTest.java       |   1 +
 .../spring/processor/SpringThreadsDefaultTest.java |   1 +
 ...ngThreadsExternalThreadPoolFactoryBeanTest.java |   1 +
 .../SpringThreadsThreadPoolFactoryBeanTest.java    |   1 +
 .../processor/SpringThrottlerGroupingTest.java     |   1 +
 .../processor/SpringThrottlerMethodCallTest.java   |   1 +
 .../spring/processor/SpringThrottlerTest.java      |   1 +
 .../SpringThrottlerThreadPoolProfileTest.java      |   1 +
 .../SpringThrottlingInflightRoutePolicyTest.java   |   1 +
 .../processor/SpringThrowExceptionMessageTest.java |   1 +
 .../spring/processor/SpringThrowExceptionTest.java |   1 +
 .../processor/SpringToDynamicIgnoreTest.java       |   1 +
 ...DynamicLanguageSimpleAndXPathAndHeaderTest.java |   1 +
 .../SpringToDynamicLanguageSimpleAndXPathTest.java |   1 +
 .../SpringToDynamicLanguageXPathTest.java          |   1 +
 .../spring/processor/SpringToDynamicTest.java      |   1 +
 .../spring/processor/SpringTokenizerTest.java      |   1 +
 .../processor/SpringTopicLoadBalanceTest.java      |   1 +
 .../spring/processor/SpringTransformTest.java      |   1 +
 ...ingTryCatchMustHaveExceptionConfiguredTest.java |   1 +
 .../SpringTryProcessorMultipleExceptionTest.java   |   1 +
 .../processor/SpringTryProcessorOnWhenTest.java    |   1 +
 .../spring/processor/SpringValidateRegExpTest.java |   1 +
 .../spring/processor/SpringValidateSimpleTest.java |   1 +
 .../SpringWeightedRandomLoadBalanceTest.java       |   1 +
 .../SpringWeightedRoundRobinLoadBalanceTest.java   |   1 +
 .../processor/SpringWireTapExpressionTest.java     |   1 +
 .../processor/SpringWireTapNewExchangeTest.java    |   1 +
 .../processor/SpringWireTapOnPrepareTest.java      |   1 +
 .../camel/spring/processor/SpringWireTapTest.java  |   1 +
 .../SpringWireTapUsingFireAndForgetCopyTest.java   |   2 +
 .../SpringWireTapUsingFireAndForgetTest.java       |   2 +
 .../processor/SpringWireTapVoidBeanTest.java       |   1 +
 .../spring/processor/SpringXPathFilterTest.java    |   1 +
 ...ilterWithNamespaceOnImportRouteContextTest.java |   1 +
 ...XPathFilterWithNamespaceOnRouteContextTest.java |   1 +
 .../SpringXPathFilterWithNamespaceTest.java        |   1 +
 ...gXPathHeaderNameResultTypeAndNamespaceTest.java |   1 +
 .../processor/SpringXPathHeaderNameTest.java       |   1 +
 .../spring/processor/SpringXPathHeaderTest.java    |   1 +
 .../processor/TransformWithExpressionTest.java     |   1 +
 .../SpringAggregateCompleteAllOnStopTest.java      |   1 +
 .../SpringAggregateCompletionIntervalTest.java     |   1 +
 .../aggregator/SpringAggregateControllerTest.java  |   1 +
 .../SpringAggregateDiscardOnTimeoutTest.java       |   1 +
 .../SpringAggregateExpressionSizeFallbackTest.java |   1 +
 .../SpringAggregateExpressionSizeTest.java         |   1 +
 ...ringAggregateExpressionTimeoutFallbackTest.java |   1 +
 ...ringAggregateExpressionTimeoutPerGroupTest.java |   1 +
 .../SpringAggregateExpressionTimeoutTest.java      |   1 +
 .../SpringAggregateForceCompletionOnStopTest.java  |   1 +
 ...roupedExchangeCompletionExpressionSizeTest.java |   1 +
 .../SpringAggregateSimplePredicateEagerTest.java   |   1 +
 .../SpringAggregateSimplePredicateTest.java        |   1 +
 .../aggregator/SpringAggregateSimpleSizeTest.java  |   1 +
 .../SpringAggregateSimpleTimeoutTest.java          |   1 +
 .../SpringAggregateThreadPoolProfileTest.java      |   1 +
 ...ggregationStrategyBeanAdapterAllowNullTest.java |   1 +
 ...gationStrategyBeanAdapterRefMethodNameTest.java |   1 +
 ...pringAggregationStrategyBeanAdapterRefTest.java |   1 +
 .../processor/aggregator/SpringAggregatorTest.java |   1 +
 .../FileConsumerIdempotentLoadStoreTest.java       |   1 +
 .../idempotent/FileConsumerIdempotentTest.java     |   1 +
 .../idempotent/SpringCacheIdempotentTest.java      |   1 +
 .../SpringParentChildInterceptStrategyTest.java    |   1 +
 .../DeadLetterChannelHandledExampleTest.java       |   1 +
 .../onexception/RedeliveryPolicyReTest.java        |   1 +
 .../SpringContextScopeOnExceptionTest.java         |   1 +
 ...adLetterChannelOnExceptionOnRedeliveryTest.java |   1 +
 .../SpringOnExceptionContinueSubRouteTest.java     |   1 +
 .../SpringOnExceptionContinueSubSubRouteTest.java  |   1 +
 .../onexception/SpringOnExceptionContinueTest.java |   1 +
 ...ngOnExceptionFromChoiceUseOriginalBodyTest.java |   1 +
 ...ringOnExceptionLoadBalancerDoubleIssueTest.java |   1 +
 ...pringOnExceptionNotNormalizedClassNameTest.java |   1 +
 ...nExceptionOccurredProcessorOnExceptionTest.java |   1 +
 .../SpringOnExceptionOccurredProcessorTest.java    |   1 +
 .../onexception/SpringOnExceptionSubRouteTest.java |   1 +
 ...ceptionSubRouteWithDefaultErrorHandlerTest.java |   1 +
 .../SpringOnExceptionUseOriginalBodyTest.java      |   1 +
 .../SpringOnExceptionUseOriginalMessageTest.java   |   1 +
 .../SpringOnExceptionWithRouteAndContinueTest.java |   1 +
 .../LowestQuoteAggregationStrategy.java            |   1 +
 .../processor/scattergather/ScatterGatherTest.java |   1 +
 .../camel/spring/produce/MyListenerService.java    |   1 +
 .../org/apache/camel/spring/remoting/Bean.java     |   1 +
 .../apache/camel/spring/remoting/EchoService.java  |   1 +
 .../remoting/EchoSpringRemotingPojoDirectTest.java |   1 +
 ...choSpringRemotingPojoOutOfCamelContextTest.java |   1 +
 .../remoting/EchoSpringRemotingPojoTest.java       |   1 +
 ...SpringRemotingThrowingRuntimeExceptionTest.java |   1 +
 .../apache/camel/spring/remoting/SayService.java   |   1 +
 .../SpringRemotingWithExportAndProxyTest.java      |   1 +
 ...ingWithServiceExportAndNamespacesRouteTest.java |   1 +
 .../SpringRemotingWithServiceExportRouteTest.java  |   1 +
 .../spring/routebuilder/CamelRouteBuilderTest.java |   1 +
 .../camel/spring/routebuilder/MyOtherRoute.java    |   3 +
 .../apache/camel/spring/routebuilder/MyRoute.java  |   1 +
 .../scan/DefaultPackageScanClassResolverTest.java  |   1 +
 .../scan/PatternBasedPackageScanFilterTest.java    |   1 +
 .../apache/camel/spring/scan/ScanTestSupport.java  |   1 +
 .../camel/spring/xml/ConfiguredRouteBuilder.java   |   1 +
 .../camel/spring/xml/ConfiguredRouteBuilder2.java  |   1 +
 .../apache/camel/component/sql/SqlEndpoint.java    |   2 +
 .../apache/camel/component/sql/SqlProducer.java    |   1 +
 .../component/sql/stored/SqlStoredEndpoint.java    |   1 +
 .../component/sql/stored/SqlStoredProducer.java    |   1 +
 .../sql/stored/template/generated/Token.java       |   1 +
 .../stored/template/generated/TokenMgrError.java   |   1 +
 .../jdbc/ClassLoadingAwareObjectInputStream.java   |   2 +
 .../aggregate/jdbc/JdbcAggregationRepository.java  |   9 ++
 .../sql/SqlConsumerDeleteBatchCompleteTest.java    |   2 +
 .../component/sql/SqlConsumerDeleteFailedTest.java |   2 +
 .../camel/component/sql/SqlConsumerDeleteTest.java |   2 +
 .../sql/SqlConsumerDeleteTransformTest.java        |   2 +
 .../sql/SqlConsumerDynamicParameterTest.java       |   2 +
 .../sql/SqlConsumerMaxMessagesPerPollTest.java     |   2 +
 .../sql/SqlConsumerOutputTypeSelectListTest.java   |   2 +
 ...lConsumerOutputTypeSelectListWithClassTest.java |   2 +
 .../sql/SqlConsumerOutputTypeStreamListTest.java   |   2 +
 .../camel/component/sql/SqlConsumerTest.java       |   2 +
 .../camel/component/sql/SqlDataSourceRefTest.java  |   1 +
 .../camel/component/sql/SqlDataSourceTest.java     |   1 +
 .../camel/component/sql/SqlEndpointLikeTest.java   |   1 +
 .../camel/component/sql/SqlEndpointTest.java       |   2 +
 .../camel/component/sql/SqlGeneratedKeysTest.java  |   2 +
 .../camel/component/sql/SqlPreserveHeaderTest.java |   2 +
 ...qlProducerAlwaysPopulateStatementFalseTest.java |   2 +
 .../SqlProducerAlwaysPopulateStatementTest.java    |   2 +
 .../camel/component/sql/SqlProducerAndInTest.java  |   2 +
 .../component/sql/SqlProducerConcurrentTest.java   |   2 +
 .../sql/SqlProducerExpressionParameterTest.java    |   2 +
 .../component/sql/SqlProducerInMultiTest.java      |   2 +
 .../camel/component/sql/SqlProducerInTest.java     |   2 +
 .../component/sql/SqlProducerInsertNullTest.java   |   2 +
 .../camel/component/sql/SqlProducerJSONTest.java   |   2 +
 .../sql/SqlProducerNamedParameterNotExistTest.java |   2 +
 .../sql/SqlProducerNamedParameterTest.java         |   2 +
 .../sql/SqlProducerNamedParametersTest.java        |   2 +
 .../camel/component/sql/SqlProducerNoopTest.java   |   2 +
 .../sql/SqlProducerNullBodyHeaderTest.java         |   2 +
 .../component/sql/SqlProducerNullBodyTest.java     |   2 +
 .../component/sql/SqlProducerOutputHeaderTest.java |   2 +
 .../sql/SqlProducerOutputHeaderWithQueryTest.java  |   2 +
 .../sql/SqlProducerOutputTypeSelectListTest.java   |   2 +
 ...lProducerOutputTypeSelectListWithClassTest.java |   2 +
 ...SqlProducerOutputTypeSelectOneNoResultTest.java |   2 +
 .../sql/SqlProducerOutputTypeStreamListTest.java   |   2 +
 .../sql/SqlProducerParametersCountTest.java        |   2 +
 .../sql/SqlProducerReuseParameterTest.java         |   2 +
 .../component/sql/SqlProducerSeparatorTest.java    |   2 +
 .../sql/SqlProducerUseMessageBodyForSqlTest.java   |   2 +
 .../component/sql/SqlProducerWhereIssueTest.java   |   2 +
 .../apache/camel/component/sql/SqlRouteTest.java   |   2 +
 .../component/sql/SqlTransactedRouteTest.java      |   2 +
 .../sql/stored/CallableStatementWrapperTest.java   |   2 +
 .../sql/stored/ProducerBatchInvalidTest.java       |   2 +
 .../component/sql/stored/ProducerBatchTest.java    |   2 +
 .../sql/stored/ProducerBodyArrayTest.java          |   2 +
 .../component/sql/stored/ProducerInOutTest.java    |   2 +
 .../camel/component/sql/stored/ProducerTest.java   |   2 +
 .../ProducerUseMessageBodyForTemplateTest.java     |   2 +
 .../sql/stored/SqlFunctionDataSourceTest.java      |   2 +
 .../sql/stored/SqlStoredDataSourceTest.java        |   1 +
 .../component/sql/stored/TemplateCacheTest.java    |   2 +
 .../jdbc/AbstractJdbcAggregationTestSupport.java   |   1 +
 ...ggregateRecoverDeadLetterChannelFailedTest.java |   1 +
 .../JdbcAggregateRecoverDeadLetterChannelTest.java |   1 +
 .../aggregate/jdbc/JdbcAggregateRecoverTest.java   |   1 +
 ...bcAggregateRecoverWithRedeliveryPolicyTest.java |   1 +
 .../jdbc/JdbcAggregateRecoverWithSedaTest.java     |   1 +
 .../jdbc/JdbcAggregationRepositoryTest.java        |   1 +
 ...ngAggregateRecoverWithRedeliveryPolicyTest.java |   1 +
 .../camel/component/stax/StaxStreamXMLReader.java  |  46 ++++--
 .../camel/component/stomp/StompConsumer.java       |   2 +
 .../camel/component/stomp/StompEndpoint.java       |   4 +
 .../camel/component/stomp/StompProducer.java       |   1 +
 .../camel/component/stomp/StompConsumerTest.java   |   1 +
 .../component/stomp/StompConsumerUriTest.java      |   1 +
 .../camel/component/stomp/StompProducerTest.java   |   1 +
 .../component/stream/FileWatcherStrategy.java      |   1 +
 .../camel/component/stream/StreamConsumer.java     |   1 +
 .../camel/component/stream/StreamEndpoint.java     |   3 +
 .../camel/component/stream/StreamProducer.java     |   1 +
 .../component/stream/ScanStreamDelayTest.java      |   1 +
 .../component/stream/ScanStreamFileManualTest.java |   1 +
 .../camel/component/stream/ScanStreamFileTest.java |   1 +
 .../stream/ScanStreamFileWithFilterTest.java       |   1 +
 .../component/stream/SplitStreamFileTest.java      |   1 +
 .../camel/component/stream/StreamDelayTest.java    |   1 +
 .../camel/component/stream/StreamEncodingTest.java |   1 +
 .../stream/StreamGroupLinesLastStrategyTest.java   |   1 +
 .../stream/StreamGroupLinesStrategyTest.java       |   1 +
 .../camel/component/stream/StreamHeaderTest.java   |   2 +
 .../component/stream/StreamRouteBuilderTest.java   |   1 +
 .../component/stream/StreamSystemErrTest.java      |   1 +
 .../component/stream/StreamSystemOutTest.java      |   1 +
 .../camel/component/stream/StreamToUrlTest.java    |   1 +
 .../stringtemplate/StringTemplateComponent.java    |   1 +
 .../StringTemplateConcurrentTest.java              |   1 +
 .../StringTemplateContentCacheTest.java            |   2 +
 .../stringtemplate/StringTemplateLetterTest.java   |   1 +
 .../stringtemplate/StringTemplateTest.java         |   1 +
 .../RestSwaggerReaderOverrideHostApiDocsTest.java  |   1 +
 .../dataformat/tagsoup/TidyMarkupDataFormat.java   |   2 +
 .../tarfile/TarFileMultipleFilesSplitterTest.java  |   1 +
 .../telegram/TelegramProducerLocationTest.java     |   1 +
 .../test/blueprint/SimpleWeaveAddMockLastTest.java |   1 +
 .../component/rest/FromRestConfigurationTest.java  |   1 +
 .../rest/FromRestIdAndDescriptionTest.java         |   1 +
 ...lSpringRouteProcessorDumpRouteCoverageTest.java |   1 +
 ...pringRunnerDisableJmxInheritedOverrideTest.java |   1 +
 .../spring/CamelSpringRunnerUseAdviceWithTest.java |   1 +
 .../test/patterns/SimpleWeaveAddMockLastTest.java  |   1 +
 .../camel/component/thrift/ThriftComponent.java    |   1 +
 .../camel/component/thrift/ThriftEndpoint.java     |   2 +
 .../camel/dataformat/thrift/ThriftDataFormat.java  |   4 +
 .../component/thrift/generated/Operation.java      |   1 +
 .../dataformat/thrift/generated/Operation.java     |   1 +
 .../camel/component/timer/TimerEndpoint.java       |   3 +
 .../camel/component/twilio/TwilioComponent.java    |   2 +
 .../component/twitter/AbstractTwitterEndpoint.java |   2 +
 .../directmessage/DirectMessageProducer.java       |   1 +
 .../twitter/search/SearchConsumerHandler.java      |   2 +
 .../twitter/DirectMessageProducerTest.java         |   1 +
 .../twitter/SearchByExchangeDirectTest.java        |   1 +
 .../camel/component/twitter/SearchEventTest.java   |   2 +
 .../component/twitter/UserProducerInOnlyTest.java  |   1 +
 .../component/twitter/UserProducerInOutTest.java   |   1 +
 .../deprecated/SearchByExchangeDirectTest.java     |   1 +
 .../twitter/deprecated/SearchEventTest.java        |   2 +
 .../twitter/deprecated/UserProducerInOnlyTest.java |   1 +
 .../twitter/deprecated/UserProducerInOutTest.java  |   1 +
 .../component/undertow/DefaultUndertowHost.java    |   1 +
 .../undertow/DefaultUndertowHttpBinding.java       |   2 +
 .../camel/component/undertow/UndertowEndpoint.java |   2 +
 .../undertow/handlers/CamelMethodHandler.java      |   1 +
 .../undertow/handlers/CamelPathHandler.java        |   1 +
 .../handlers/CamelPathTemplateHandler.java         |   1 +
 .../undertow/handlers/CamelRootHandler.java        |   2 +
 .../undertow/handlers/CamelWebSocketHandler.java   |   1 +
 .../component/undertow/MultiPartFormTest.java      |   1 +
 .../component/validator/ValidatorComponent.java    |   1 +
 .../velocity/CamelVelocityDelegateClassLoader.java |   1 +
 .../component/velocity/VelocityComponent.java      |   1 +
 .../velocity/VelocityBodyAsDomainObjectTest.java   |   2 +
 .../component/velocity/VelocityConcurrentTest.java |   1 +
 .../velocity/VelocityContentCacheTest.java         |   2 +
 .../velocity/VelocityDynamicTemplateTest.java      |   1 +
 .../component/velocity/VelocityEncodingTest.java   |   1 +
 .../component/velocity/VelocityEndpointTest.java   |   1 +
 .../component/velocity/VelocityFileLetterTest.java |   1 +
 .../VelocityFileLetterWithPropertyTest.java        |   1 +
 .../component/velocity/VelocityLetterTest.java     |   1 +
 .../velocity/VelocityLetterWithParserTest.java     |   1 +
 .../velocity/VelocityLetterWithoutHeaderTest.java  |   1 +
 .../velocity/VelocityMethodInvokationTest.java     |   1 +
 .../velocity/VelocityOverridesPropertiesTest.java  |   1 +
 .../velocity/VelocitySetTemplateViaHeaderTest.java |   1 +
 .../VelocitySomeValuesNotInExchangeTest.java       |   1 +
 .../velocity/VelocityTemplateInHeaderTest.java     |   1 +
 .../camel/component/velocity/VelocityTest.java     |   1 +
 .../velocity/VelocityValuesInPropertiesTest.java   |   1 +
 .../camel/component/vertx/VertxComponent.java      |   1 +
 .../camel/component/vertx/VertxConsumer.java       |   2 +
 .../camel/component/vertx/VertxEndpoint.java       |   2 +
 .../component/vertx/VertxMultipleConsumerTest.java |   1 +
 .../component/vertx/VertxRequestReplyTest.java     |   1 +
 .../component/vertx/VertxRoutePubSubTest.java      |   1 +
 .../camel/component/vertx/VertxRouteTest.java      |   1 +
 .../org/apache/camel/component/vm/VmConsumer.java  |   1 +
 .../weather/http/CompositeHttpConfigurer.java      |   1 +
 .../weather/CurrentWeatherMadridProducerTest.java  |   1 +
 .../camel/component/web3j/Web3jComponent.java      |   1 +
 .../component/web3j/Web3jQuorumProducerTest.java   |   1 +
 .../integration/Web3jConsumerMainnetTest.java      |   1 +
 .../integration/Web3jProducerMainnetTest.java      |   1 +
 .../component/websocket/WebsocketConsumer.java     |   1 +
 .../component/websocket/WebsocketProducer.java     |   1 +
 .../websocket/AllowAllHostnameVerifier.java        |   1 +
 .../component/wordpress/WordpressComponent.java    |   1 +
 .../component/wordpress/WordpressEndpoint.java     |   2 +
 .../impl/AbstractWordpressCrudServiceAdapter.java  |   4 +
 .../wordpress/producer/WordpressPostProducer.java  |   3 +
 .../wordpress/producer/WordpressUserProducer.java  |   3 +
 .../apache/camel/component/xchange/XChange.java    |  10 ++
 .../component/xmlsecurity/XmlSignerEndpoint.java   |   1 +
 .../component/xmlsecurity/XmlVerifierEndpoint.java |   1 +
 .../xmlsecurity/api/DefaultKeySelector.java        |   1 +
 .../xmlsecurity/api/XmlSignatureHelper.java        |   3 +
 .../processor/XmlSignatureConfiguration.java       |   2 +
 .../processor/XmlVerifierConfiguration.java        |   1 +
 .../xmlsecurity/XMLSecurityDataFormat.java         |   1 +
 .../component/xmlsecurity/ECDSASignatureTest.java  |   1 +
 .../xmlsecurity/SignatureAlgorithmTest.java        |   3 +
 .../xmlsecurity/SignatureDigestMethodTest.java     |   3 +
 .../xmlsecurity/SpringXmlSignatureTest.java        |   1 +
 .../xmlsecurity/XAdESSignaturePropertiesTest.java  |   1 +
 .../component/xmlsecurity/XmlSignatureTest.java    |   3 +
 .../util/SameDocumentUriDereferencer.java          |   1 +
 ...ature2Message2MessageWithTimestampProperty.java |   1 +
 .../xmlsecurity/XMLSecurityConcurrencyTest.java    |   1 +
 .../apache/camel/component/xmpp/XmppEndpoint.java  |   4 +
 .../component/xmpp/XmppGroupChatProducer.java      |   1 +
 .../apache/camel/component/xmpp/XmppLogger.java    |   1 +
 .../component/xmpp/XmppPrivateChatProducer.java    |   1 +
 .../camel/component/xmpp/XmppPubSubProducer.java   |   1 +
 .../component/xmpp/GoogleTalkEndpointTest.java     |   1 +
 .../camel/component/xmpp/GoogleTalkTest.java       |   1 +
 .../component/xmpp/XmppMultiUserChatTest.java      |   1 +
 .../camel/component/xmpp/XmppRouteChatTest.java    |   1 +
 ...ppRouteMultipleProducersSingleConsumerTest.java |   1 +
 .../language/xpath/DefaultNamespaceContext.java    |   5 +
 .../language/xpath/MessageVariableResolver.java    |   1 +
 .../apache/camel/language/xpath/XPathBuilder.java  |   4 +
 .../apache/camel/language/xpath/XPathLanguage.java |   3 +
 .../xslt/DefaultTransformErrorHandler.java         |   6 +
 .../camel/component/xslt/DomResultHandler.java     |   2 +
 .../component/xslt/DomResultHandlerFactory.java    |   1 +
 .../camel/component/xslt/FileResultHandler.java    |   2 +
 .../component/xslt/FileResultHandlerFactory.java   |   1 +
 .../camel/component/xslt/StreamResultHandler.java  |   2 +
 .../component/xslt/StreamResultHandlerFactory.java |   1 +
 .../camel/component/xslt/StringResultHandler.java  |   2 +
 .../component/xslt/StringResultHandlerFactory.java |   1 +
 .../apache/camel/component/xslt/XsltBuilder.java   |   1 +
 .../dataformat/xstream/AbstractXStreamWrapper.java |   2 +
 .../camel/dataformat/xstream/JsonDataFormat.java   |   2 +
 .../dataformat/xstream/XStreamDataFormat.java      |   2 +
 .../xstream/MarshalDomainObjectJSONTest.java       |   1 +
 .../xstream/MarshalDomainObjectTest.java           |   1 +
 .../camel/dataformat/xstream/MarshalListTest.java  |   1 +
 .../camel/dataformat/xstream/PurchaseOrder.java    |   1 +
 .../xstream/SpringMarshalDomainObjectJSONTest.java |   1 +
 .../dataformat/xstream/SpringMarshalListTest.java  |   1 +
 .../xstream/SpringMarshalOmitFieldsTest.java       |   1 +
 .../xstream/SpringXStreamConfigurationTest.java    |   1 +
 .../xstream/UnmarshalThenMarshalJSONTest.java      |   1 +
 .../xstream/UnmarshalThenMarshalTest.java          |   1 +
 .../dataformat/xstream/XStreamConcurrencyTest.java |   1 +
 .../xstream/XStreamConfigurationTest.java          |   9 ++
 .../xstream/XStreamDataFormatOmitFieldsTest.java   |   1 +
 .../camel/component/yammer/YammerComponent.java    |   1 +
 .../camel/component/yammer/YammerEndpoint.java     |   2 +
 .../yammer/scribe/JsonTokenExtractor.java          |   1 +
 .../yammer/YammerMessageAndUserRouteTest.java      |   1 +
 .../camel/component/zendesk/ZendeskEndpoint.java   |   3 +
 .../deflater/GzipDeflaterDataFormat.java           |   2 +
 .../dataformat/deflater/ZipDeflaterDataFormat.java |   2 +
 .../deflater/ZipDeflaterDataFormatTest.java        |   1 +
 .../zipfile/ZipFileMultipleFilesSplitterTest.java  |   1 +
 .../java/org/apache/camel/zipkin/ZipkinTracer.java |   2 +
 .../component/zookeepermaster/MasterEndpoint.java  |   3 +
 .../zookeepermaster/ZookeeperGroupSupport.java     |   1 +
 .../component/zookeepermaster/group/Group.java     |   1 +
 .../internal/DelegateZooKeeperMultiGroup.java      |   1 +
 .../group/internal/ZooKeeperGroup.java             |   1 +
 .../zookeepermaster/CuratorFactoryBean.java        |   4 +
 .../zookeepermaster/ZKServerFactoryBean.java       |   5 +
 .../component/zookeeper/ConnectionHolder.java      |   1 +
 .../component/zookeeper/NaturalSortComparator.java |   1 +
 .../component/zookeeper/ZooKeeperComponent.java    |   1 +
 .../zookeeper/ZooKeeperConnectionManager.java      |   2 +
 .../component/zookeeper/ZooKeeperConsumer.java     |   1 +
 .../component/zookeeper/ZooKeeperEndpoint.java     |   2 +
 .../component/zookeeper/ZooKeeperProducer.java     |   2 +
 .../zookeeper/operations/DataChangedOperation.java |   1 +
 .../zookeeper/operations/DeleteOperation.java      |   1 +
 .../operations/FutureEventDrivenOperation.java     |   3 +
 .../zookeeper/operations/GetChildrenOperation.java |   1 +
 .../zookeeper/operations/GetDataOperation.java     |   1 +
 .../zookeeper/operations/SetDataOperation.java     |   1 +
 .../component/zookeeper/ZooKeeperTestSupport.java  |   1 +
 ...erviceRegistrationWithServiceComponentTest.java |   1 +
 .../main/java/org/apache/camel/CamelContext.java   |   3 +
 .../org/apache/camel/spi/CamelContextTracker.java  |   1 +
 .../main/java/org/apache/camel/spi/CamelEvent.java |  32 ++++
 .../OptimisticLockingAggregationRepository.java    |   1 +
 .../java/org/apache/camel/spi/RouteContext.java    |   2 +
 .../jsse/AliasedX509ExtendedKeyManager.java        |   6 +
 .../apache/camel/support/jsse/JsseParameters.java  |   2 +
 .../camel/support/service/ServiceSupport.java      |   3 +
 .../camel/impl/converter/ArrayTypeConverter.java   |   1 +
 .../impl/converter/BaseTypeConverterRegistry.java  |   5 +
 .../camel/impl/converter/DefaultTypeConverter.java |   1 +
 .../camel/impl/converter/EnumTypeConverter.java    |   1 +
 .../InstanceMethodFallbackTypeConverter.java       |   1 +
 .../converter/InstanceMethodTypeConverter.java     |   1 +
 .../StaticMethodFallbackTypeConverter.java         |   1 +
 .../impl/converter/StaticMethodTypeConverter.java  |   1 +
 .../camel/impl/engine/AbstractCamelContext.java    | 173 +++++++++++++++++++++
 .../apache/camel/impl/engine/BaseRouteService.java |   2 +
 .../impl/engine/CamelPostProcessorHelper.java      |   2 +
 .../engine/DefaultAsyncProcessorAwaitManager.java  |   4 +
 .../impl/engine/DefaultCamelBeanPostProcessor.java |   2 +
 .../camel/impl/engine/DefaultClassResolver.java    |  14 ++
 .../impl/engine/DefaultComponentResolver.java      |   1 +
 .../camel/impl/engine/DefaultConsumerCache.java    |  17 ++
 .../camel/impl/engine/DefaultConsumerTemplate.java |  26 ++++
 .../impl/engine/DefaultFactoryFinderResolver.java  |   2 +
 .../impl/engine/DefaultInflightRepository.java     |   5 +
 .../camel/impl/engine/DefaultLanguageResolver.java |   1 +
 .../impl/engine/DefaultManagementNameStrategy.java |   1 +
 .../impl/engine/DefaultManagementStrategy.java     |  21 +++
 .../impl/engine/DefaultMessageHistoryFactory.java  |   4 +
 .../camel/impl/engine/DefaultNodeIdFactory.java    |   1 +
 .../engine/DefaultPackageScanClassResolver.java    |  10 ++
 .../camel/impl/engine/DefaultProducerCache.java    |  19 +++
 .../camel/impl/engine/DefaultProducerTemplate.java |  96 +++++++++++-
 .../org/apache/camel/impl/engine/DefaultRoute.java |  14 ++
 .../camel/impl/engine/DefaultRouteContext.java     |  46 ++++++
 .../impl/engine/DefaultRouteStartupOrder.java      |   4 +
 .../engine/DefaultRuntimeEndpointRegistry.java     |   8 +
 .../camel/impl/engine/DefaultShutdownStrategy.java |  20 +++
 .../impl/engine/DefaultStreamCachingStrategy.java  |  39 +++++
 .../apache/camel/impl/engine/DefaultTracer.java    |   1 +
 .../camel/impl/engine/DefaultUnitOfWork.java       |  19 +++
 .../camel/impl/engine/DefaultUuidGenerator.java    |   1 +
 .../impl/engine/DefaultValidatorRegistry.java      |   1 +
 .../impl/engine/DeferServiceStartupListener.java   |   1 +
 .../impl/engine/EventDrivenConsumerRoute.java      |   5 +
 .../engine/InterceptSendToEndpointProcessor.java   |   4 +
 .../InterceptSendToMockEndpointStrategy.java       |   1 +
 .../camel/impl/engine/JavaUuidGenerator.java       |   1 +
 .../engine/LimitedPollingConsumerPollStrategy.java |   3 +
 .../apache/camel/impl/engine/MDCUnitOfWork.java    |   1 +
 .../camel/impl/event/AbstractContextEvent.java     |   1 +
 .../camel/impl/event/AbstractExchangeEvent.java    |   1 +
 .../camel/impl/event/AbstractRouteEvent.java       |   1 +
 .../camel/impl/event/DefaultEventFactory.java      |  30 +++-
 .../impl/event/ExchangeFailureHandledEvent.java    |   3 +
 .../impl/event/ExchangeFailureHandlingEvent.java   |   3 +
 .../camel/impl/event/ExchangeRedeliveryEvent.java  |   1 +
 .../camel/impl/event/ExchangeSendingEvent.java     |   1 +
 .../apache/camel/impl/event/ExchangeSentEvent.java |   2 +
 .../impl/event/ServiceStartupFailureEvent.java     |   1 +
 .../camel/impl/event/ServiceStopFailureEvent.java  |   1 +
 .../scan/AnnotatedWithAnyPackageScanFilter.java    |   1 +
 .../impl/scan/AnnotatedWithPackageScanFilter.java  |   1 +
 .../impl/scan/AssignableToPackageScanFilter.java   |   1 +
 .../impl/scan/CompositePackageScanFilter.java      |   1 +
 .../impl/scan/InvertingPackageScanFilter.java      |   1 +
 .../camel/language/constant/ConstantLanguage.java  |   3 +
 .../camel/language/header/HeaderLanguage.java      |   3 +
 .../property/ExchangePropertyLanguage.java         |   3 +
 .../org/apache/camel/language/ref/RefLanguage.java |   3 +
 .../language/simple/SimpleExpressionBuilder.java   |   1 +
 .../camel/language/simple/SimpleLanguage.java      |   2 +
 .../camel/language/simple/ast/BaseSimpleNode.java  |   1 +
 .../camel/language/tokenizer/TokenizeLanguage.java |   3 +
 .../org/apache/camel/processor/CatchProcessor.java |   3 +
 .../apache/camel/processor/ChoiceProcessor.java    |   8 +
 .../camel/processor/ConvertBodyProcessor.java      |   3 +
 .../camel/processor/DelayProcessorSupport.java     |   1 +
 .../java/org/apache/camel/processor/Delayer.java   |   4 +
 .../org/apache/camel/processor/DynamicRouter.java  |   2 +
 .../java/org/apache/camel/processor/Enricher.java  |   8 +
 .../processor/EvaluateExpressionProcessor.java     |   1 +
 .../camel/processor/ExchangePatternProcessor.java  |   3 +
 .../apache/camel/processor/FilterProcessor.java    |   3 +
 .../apache/camel/processor/FinallyProcessor.java   |   3 +
 .../InterceptorToAsyncProcessorBridge.java         |   2 +
 .../org/apache/camel/processor/LogProcessor.java   |   3 +
 .../org/apache/camel/processor/LoopProcessor.java  |   4 +
 .../camel/processor/MethodCallProcessor.java       |   4 +
 .../apache/camel/processor/MulticastProcessor.java |  15 ++
 .../camel/processor/OnCompletionProcessor.java     |   7 +
 .../java/org/apache/camel/processor/Pipeline.java  |   2 +
 .../org/apache/camel/processor/PollEnricher.java   |   8 +
 .../org/apache/camel/processor/RecipientList.java  |   6 +
 .../camel/processor/RecipientListProcessor.java    |   9 ++
 .../camel/processor/RemoveHeaderProcessor.java     |   3 +
 .../camel/processor/RemoveHeadersProcessor.java    |   3 +
 .../camel/processor/RemovePropertiesProcessor.java |   3 +
 .../camel/processor/RemovePropertyProcessor.java   |   3 +
 .../org/apache/camel/processor/Resequencer.java    |   8 +
 .../apache/camel/processor/RollbackProcessor.java  |   4 +
 .../org/apache/camel/processor/RoutingSlip.java    |   7 +
 .../apache/camel/processor/SamplingThrottler.java  |   3 +
 .../apache/camel/processor/ScriptProcessor.java    |   4 +
 .../camel/processor/SendDynamicProcessor.java      |   7 +
 .../org/apache/camel/processor/SendProcessor.java  |   7 +
 .../apache/camel/processor/SetBodyProcessor.java   |   3 +
 .../apache/camel/processor/SetHeaderProcessor.java |   3 +
 .../camel/processor/SetPropertyProcessor.java      |   3 +
 .../org/apache/camel/processor/SortProcessor.java  |   3 +
 .../org/apache/camel/processor/StopProcessor.java  |   3 +
 .../apache/camel/processor/StreamResequencer.java  |   7 +
 .../apache/camel/processor/ThreadsProcessor.java   |   7 +
 .../java/org/apache/camel/processor/Throttler.java |   3 +
 .../camel/processor/ThrowExceptionProcessor.java   |   7 +
 .../apache/camel/processor/TransformProcessor.java |   4 +
 .../org/apache/camel/processor/TryProcessor.java   |  10 ++
 .../apache/camel/processor/UnitOfWorkProducer.java |   2 +
 .../apache/camel/processor/WireTapProcessor.java   |   5 +
 .../aggregate/AbstractListAggregationStrategy.java |   2 +
 .../processor/aggregate/AggregateProcessor.java    |  22 +++
 .../aggregate/AggregationStrategyBeanAdapter.java  |   2 +
 .../aggregate/DefaultAggregateController.java      |   4 +
 .../aggregate/GroupedBodyAggregationStrategy.java  |   1 +
 .../aggregate/MemoryAggregationRepository.java     |   6 +
 .../ShareUnitOfWorkAggregationStrategy.java        |   1 +
 .../aggregate/UseLatestAggregationStrategy.java    |   1 +
 .../aggregate/UseOriginalAggregationStrategy.java  |   1 +
 .../camel/processor/channel/DefaultChannel.java    |   5 +
 .../errorhandler/RedeliveryErrorHandler.java       |   7 +
 .../processor/idempotent/IdempotentConsumer.java   |   7 +
 .../idempotent/IdempotentOnCompletion.java         |   2 +
 .../processor/interceptor/BacklogDebugger.java     |   2 +
 .../processor/interceptor/BreakpointSupport.java   |   6 +
 .../DefaultBacklogTracerEventMessage.java          |   7 +
 .../processor/interceptor/DefaultDebugger.java     |   1 +
 .../loadbalancer/FailOverLoadBalancer.java         |   2 +
 .../loadbalancer/LoadBalancerSupport.java          |  10 ++
 .../processor/loadbalancer/QueueLoadBalancer.java  |   1 +
 .../processor/loadbalancer/RandomLoadBalancer.java |   1 +
 .../loadbalancer/RoundRobinLoadBalancer.java       |   1 +
 .../processor/loadbalancer/StickyLoadBalancer.java |   1 +
 .../processor/loadbalancer/TopicLoadBalancer.java  |   1 +
 .../WeightedRoundRobinLoadBalancer.java            |   1 +
 .../camel/processor/resequencer/Element.java       |   1 +
 .../camel/processor/resequencer/Sequence.java      |   3 +
 .../throttling/ThrottlingInflightRoutePolicy.java  |   2 +
 .../caffeine/lrucache/CaffeineLRUCache.java        |   7 +
 .../caffeine/lrucache/CaffeineLRUCacheFactory.java |  10 ++
 .../caffeine/lrucache/CaffeineLRUCacheTest.java    |   2 +
 .../apache/camel/core/osgi/OsgiBeanRepository.java |   4 +
 .../camel/core/osgi/OsgiCamelContextPublisher.java |   2 +
 .../camel/core/osgi/OsgiComponentResolver.java     |   1 +
 .../camel/core/osgi/OsgiDataFormatResolver.java    |   2 +
 .../camel/core/osgi/OsgiEventAdminNotifier.java    |   2 +
 .../camel/core/osgi/OsgiFactoryFinderResolver.java |   2 +
 .../camel/core/osgi/OsgiLanguageResolver.java      |   1 +
 .../core/osgi/OsgiPackageScanClassResolver.java    |   1 +
 .../apache/camel/core/osgi/OsgiTypeConverter.java  |  24 +++
 .../org/apache/camel/core/osgi/impl/Activator.java |  14 ++
 .../osgi/utils/BundleDelegatingClassLoader.java    |   4 +
 .../apache/camel/core/osgi/CamelMockBundle.java    |   5 +
 .../camel/core/osgi/CamelMockBundleContext.java    |   4 +
 .../camel/core/osgi/CamelMockLanguageResolver.java |   1 +
 .../core/osgi/test/MockTypeConverterRegistry.java  |  20 ++-
 .../AbstractCamelConsumerTemplateFactoryBean.java  |   3 +
 .../core/xml/AbstractCamelContextFactoryBean.java  |   2 +
 .../core/xml/AbstractCamelEndpointFactoryBean.java |   2 +
 .../camel/core/xml/AbstractCamelFactoryBean.java   |   2 +
 ...ractCamelFluentProducerTemplateFactoryBean.java |   3 +
 .../AbstractCamelProducerTemplateFactoryBean.java  |   3 +
 .../AbstractCamelRedeliveryPolicyFactoryBean.java  |   2 +
 .../xml/AbstractCamelThreadPoolFactoryBean.java    |   2 +
 .../core/xml/PatternBasedPackageScanFilter.java    |   1 +
 .../xml/util/jsse/AbstractJsseUtilFactoryBean.java |   3 +
 .../org/apache/camel/builder/AdviceWithTasks.java  |   8 +
 .../camel/builder/DeadLetterChannelBuilder.java    |   4 +
 .../camel/builder/DefaultErrorHandlerBuilder.java  |   2 +
 .../camel/builder/ErrorHandlerBuilderRef.java      |   2 +
 .../camel/builder/NoErrorHandlerBuilder.java       |   2 +
 .../org/apache/camel/builder/NotifyBuilder.java    |  14 ++
 .../org/apache/camel/builder/RouteBuilder.java     |   1 +
 .../org/apache/camel/builder/SimpleBuilder.java    |   3 +
 .../org/apache/camel/builder/ValueBuilder.java     |   1 +
 .../camel/impl/AbstractModelCamelContext.java      |   5 +
 .../org/apache/camel/impl/DefaultCamelContext.java |  36 +++++
 .../camel/impl/DefaultModelJAXBContextFactory.java |   1 +
 .../java/org/apache/camel/impl/RouteService.java   |   4 +
 .../apache/camel/model/AggregateDefinition.java    |   6 +
 .../org/apache/camel/model/DelayDefinition.java    |   6 +
 .../org/apache/camel/model/HystrixDefinition.java  |   2 +
 .../apache/camel/model/LoadBalanceDefinition.java  |   1 +
 .../apache/camel/model/MulticastDefinition.java    |   6 +
 .../org/apache/camel/model/NoOutputDefinition.java |   1 +
 .../apache/camel/model/OnCompletionDefinition.java |   7 +
 .../org/apache/camel/model/OutputDefinition.java   |   1 +
 .../apache/camel/model/ProcessorDefinition.java    |   3 +
 .../camel/model/RecipientListDefinition.java       |   6 +
 .../apache/camel/model/ResequenceDefinition.java   |   1 +
 .../org/apache/camel/model/RouteDefinition.java    |   5 +
 .../org/apache/camel/model/RoutesDefinition.java   |   3 +
 .../org/apache/camel/model/SplitDefinition.java    |   6 +
 .../org/apache/camel/model/ThreadsDefinition.java  |   6 +
 .../org/apache/camel/model/ThrottleDefinition.java |   6 +
 .../java/org/apache/camel/model/TryDefinition.java |   1 +
 .../org/apache/camel/model/WireTapDefinition.java  |   7 +
 ...klistServiceCallServiceFilterConfiguration.java |   1 +
 ...icServiceCallServiceDiscoveryConfiguration.java |   1 +
 .../camel/model/language/ConstantExpression.java   |   1 +
 .../model/language/ExchangePropertyExpression.java |   1 +
 .../camel/model/language/ExpressionDefinition.java |   3 +
 .../camel/model/language/GroovyExpression.java     |   1 +
 .../camel/model/language/HeaderExpression.java     |   1 +
 .../camel/model/language/Hl7TerserExpression.java  |   1 +
 .../camel/model/language/JsonPathExpression.java   |   1 +
 .../camel/model/language/LanguageExpression.java   |   1 +
 .../camel/model/language/MethodCallExpression.java |   1 +
 .../camel/model/language/MvelExpression.java       |   1 +
 .../model/language/NamespaceAwareExpression.java   |   2 +
 .../camel/model/language/OgnlExpression.java       |   1 +
 .../apache/camel/model/language/RefExpression.java |   1 +
 .../camel/model/language/SimpleExpression.java     |   1 +
 .../camel/model/language/SpELExpression.java       |   1 +
 .../camel/model/language/XPathExpression.java      |   1 +
 .../camel/model/language/XQueryExpression.java     |   1 +
 .../apache/camel/model/rest/RestsDefinition.java   |   3 +
 .../org/apache/camel/reifier/MulticastReifier.java |   1 +
 .../reifier/dataformat/BindyDataFormatReifier.java |   1 +
 .../errorhandler/DeadLetterChannelReifier.java     |   1 +
 .../errorhandler/DefaultErrorHandlerReifier.java   |   1 +
 .../java/org/apache/camel/ContextTestSupport.java  |   2 +
 .../test/java/org/apache/camel/MyBarSingleton.java |   1 +
 .../org/apache/camel/SuspendableServiceTest.java   |   5 +
 .../camel/builder/ContextErrorHandlerTest.java     |   3 +
 .../org/apache/camel/builder/ErrorHandlerTest.java |   2 +
 .../apache/camel/builder/ExceptionBuilderTest.java |   1 +
 .../ExceptionBuilderWithHandledExceptionTest.java  |   1 +
 .../camel/builder/ExpressionBuilderTest.java       |   1 +
 .../camel/builder/MyInterceptorProcessor.java      |   1 +
 .../java/org/apache/camel/builder/MyProcessor.java |   1 +
 .../builder/xml/ExtractXPathWithNamespaceTest.java |   1 +
 .../camel/builder/xml/XPathFunctionsTest.java      |   1 +
 .../XPathHeaderNameResultTypeAndNamespaceTest.java |   1 +
 .../camel/builder/xml/XPathHeaderNameTest.java     |   1 +
 .../apache/camel/builder/xml/XPathHeaderTest.java  |   1 +
 .../builder/xml/XPathNamespaceResultTypeTest.java  |   1 +
 .../camel/builder/xml/XPathNamespaceTest.java      |   1 +
 ...AmbiguousMethodCallExceptionSimplifiedTest.java |   1 +
 .../BeanExchangeAsReturnTypeNotAllowedTest.java    |   2 +
 .../component/bean/BeanHandlerMethodTest.java      |   1 +
 .../component/bean/BeanImplicitMethodTest.java     |   1 +
 .../camel/component/bean/BeanInPipelineTest.java   |   2 +
 .../component/bean/BeanInfoInheritanceTest.java    |   1 +
 .../apache/camel/component/bean/BeanInfoTest.java  |   3 +
 .../bean/BeanInfoWithBridgedMethodTest.java        |   2 +
 .../bean/BeanOverloadedCovariantMethodTest.java    |   1 +
 .../bean/BeanPackageScopeOutsideTest.java          |   1 +
 .../camel/component/bean/BeanPackageScopeTest.java |   1 +
 .../camel/component/bean/BeanPipelineTest.java     |   2 +
 .../bean/BeanReturnCallableReturnNullTest.java     |   2 +
 .../component/bean/BeanReturnCallableTest.java     |   2 +
 .../bean/BeanWithAnnotationAndExchangeTest.java    |   2 +
 .../bean/BeanWithAnnotationInheritedTest.java      |   6 +
 .../BeanWithExchangeExceptionAnnotationTest.java   |   2 +
 .../BeanWithExpressionInjectionPredicateTest.java  |   1 +
 .../bean/BeanWithExpressionInjectionTest.java      |   1 +
 .../camel/component/bean/BeanWithHeaderTest.java   |   2 +
 .../bean/BeanWithHeadersAndBodyInject2Test.java    |   1 +
 .../bean/BeanWithHeadersAndBodyInject3Test.java    |   1 +
 .../bean/BeanWithHeadersAndBodyInjectionTest.java  |   1 +
 .../component/bean/BeanWithMethodHeaderTest.java   |   1 +
 ...thPropertiesAndHeadersAndBodyInjectionTest.java |   1 +
 .../BeanWithPropertiesAndHeadersInjectionTest.java |   1 +
 .../BodyAnnotationToDisambiguateMethodsTest.java   |   1 +
 .../bean/CustomParameterMappingStrategyTest.java   |   1 +
 ...ressionAnnotationToDisambiguateMethodsTest.java |   1 +
 .../camel/component/bean/MyOtherFooBean.java       |   1 +
 .../camel/component/bean/NewInstanceTest.java      |   1 +
 .../camel/component/bean/PredicateAsBeanTest.java  |   2 +
 .../camel/component/bean/issues/BaseClass.java     |   1 +
 .../camel/component/bean/issues/BaseSomething.java |   1 +
 .../bean/issues/MyMessageToProcessorConverter.java |   1 +
 .../camel/component/direct/DirectNoToTypeTest.java |   1 +
 .../direct/DirectProducerBlockingTest.java         |   1 +
 .../direct/DirectShouldUseSameThreadTest.java      |   1 +
 .../directvm/DirectVmHeaderFilterStrategyTest.java |   1 +
 ...DirectVmNoPropertyPropagationComponentTest.java |   1 +
 .../DirectVmNoPropertyPropagationTest.java         |   1 +
 .../directvm/DirectVmProducerBlockingTest.java     |   1 +
 .../directvm/DirectVmShouldUseSameThreadTest.java  |   1 +
 .../camel/component/file/BeanToFileTest.java       |   2 +
 .../file/FileBeginFailureOneTimeTest.java          |   9 +-
 .../file/FileConsumeMaxMessagesPerPollTest.java    |   1 +
 .../file/FileConsumeMoveRelativeNameTest.java      |   1 +
 .../file/FileConsumeMultipleDirectoriesTest.java   |   1 +
 .../FileConsumeNotEagerMaxMessagesPerPollTest.java |   1 +
 .../FileConsumerAbsolutePathDefaultMoveTest.java   |   1 +
 .../file/FileConsumerAbsolutePathTest.java         |   1 +
 ...leConsumerAbsolutePathWithAbsoluteMoveTest.java |   1 +
 ...leConsumerAbsolutePathWithRelativeMoveTest.java |   1 +
 ...ileConsumerAbsoluteRootPathDefaultMoveTest.java |   1 +
 ...BeginAndCommitExpressionRenameStrategyTest.java |   1 +
 ...leConsumerBeginAndCommitRenameStrategyTest.java |   1 +
 ...eConsumerBeginExpressionRenameStrategyTest.java |   1 +
 .../file/FileConsumerBeginRenameStrategyTest.java  |   1 +
 ...nsumerCommitRenameAbsolutePathStrategyTest.java |   1 +
 .../file/FileConsumerCommitRenameStrategyTest.java |   1 +
 .../file/FileConsumerDirectoryFilterTest.java      |   2 +
 .../file/FileConsumerDirectoryNotMatchedTest.java  |   1 +
 .../file/FileConsumerExcludeNameTest.java          |   1 +
 .../file/FileConsumerFailureHandledTest.java       |   2 +
 ...leConsumerFileExpressionThrowExceptionTest.java |   3 +
 .../component/file/FileConsumerFileFilterTest.java |   2 +
 .../file/FileConsumerFilterDirectoryTest.java      |   1 +
 .../component/file/FileConsumerFilterFileTest.java |   1 +
 ...leConsumerIdempotentOnExceptionHandledTest.java |   1 +
 .../file/FileConsumerIdempotentRefTest.java        |   6 +
 .../FileConsumerIncludeAndExcludeNameTest.java     |   1 +
 .../file/FileConsumerIncludeNameTest.java          |   1 +
 .../file/FileConsumerInterceptEmptyFileTest.java   |   1 +
 .../file/FileConsumerPollStrategyNotBeginTest.java |   4 +
 ...FileConsumerPollStrategyPolledMessagesTest.java |   4 +
 ...umerPollStrategyRollbackThrowExceptionTest.java |   4 +
 ...FileConsumerPollStrategyStopOnRollbackTest.java |   4 +
 .../file/FileConsumerPollStrategyTest.java         |   4 +
 .../file/FileConsumerPreMoveDeleteTest.java        |   1 +
 .../file/FileConsumerPreMoveIssueTest.java         |   1 +
 .../file/FileConsumerPreMoveLastModifiedTest.java  |   1 +
 .../file/FileConsumerPreMoveNoopTest.java          |   1 +
 .../component/file/FileConsumerPreMoveTest.java    |   1 +
 .../FileConsumerSharedThreadPollStopRouteTest.java |   1 +
 .../file/FileConsumerSkipDotFilesTest.java         |   1 +
 .../file/FileConsumerSuspendAndResumeTest.java     |   1 +
 .../component/file/FileConsumerSuspendTest.java    |   1 +
 .../FileConsumerThreadsInProgressIssueTest.java    |   1 +
 .../file/FileExclusiveReadLockCopyTest.java        |   1 +
 .../file/FileExclusiveReadManuelTest.java          |   1 +
 .../file/FileExclusiveReadNoneStrategyTest.java    |   1 +
 .../file/FileHeaderFileNameProducedTest.java       |   1 +
 .../camel/component/file/FileMEPInOutTest.java     |   1 +
 .../camel/component/file/FileNoOpLockFileTest.java |   2 +
 .../file/FileProduceGeneratedFileNameTest.java     |   1 +
 .../file/FileProduceTempFileNameTest.java          |   1 +
 .../component/file/FileProduceTempPrefixTest.java  |   1 +
 .../file/FileProducerFileBodyGetsMovedTest.java    |   1 +
 .../file/FileRouteOnDosWithNoVolTest.java          |   1 +
 .../camel/component/file/FileSorterRefTest.java    |   1 +
 .../component/file/FilerProducerAbsoluteTest.java  |   1 +
 .../component/file/FilerProducerFileNamesTest.java |   1 +
 .../FromFileDoNotDeleteFileIfProcessFailsTest.java |   1 +
 .../FromFileDoNotMoveFileIfProcessFailsTest.java   |   1 +
 .../file/FromFileMoveFileIfProcessFailsTest.java   |   1 +
 .../file/FromFilePollThirdTimeOkTest.java          |   1 +
 .../camel/component/file/NewFileConsumerTest.java  |   1 +
 .../camel/component/file/ToFileRouteTest.java      |   3 +
 .../GenericFileDeleteProcessStrategyTest.java      |  13 ++
 .../component/log/LogBodyWithNewLineTest.java      |   1 +
 .../camel/component/mock/MockEndpointTest.java     |   1 +
 .../component/mock/MockEndpointTimeClauseTest.java |   1 +
 .../apache/camel/component/pojo/SayService.java    |   1 +
 .../component/rest/FromRestGetEndPathTest.java     |   1 +
 .../rest/FromRestIdAndDescriptionTest.java         |   1 +
 .../component/rest/FromRestUriPrefixTest.java      |   1 +
 .../seda/SedaShouldNotUseSameThreadTest.java       |   1 +
 .../camel/component/seda/SedaUnitOfWorkTest.java   |   1 +
 .../validator/CustomSchemaFactoryFeatureTest.java  |   1 +
 .../ValidatorIncludeRelativeRouteTest.java         |   1 +
 .../apache/camel/component/vm/VMSplitterTest.java  |   1 +
 .../component/vm/VmShouldNotUseSameThreadTest.java |   1 +
 .../component/xslt/XsltUriResolverFactoryTest.java |   1 +
 .../org/apache/camel/converter/ConverterTest.java  |   2 +
 .../org/apache/camel/converter/PurchaseOrder.java  |   1 +
 .../converter/stream/CachedOutputStreamTest.java   |   1 +
 .../org/apache/camel/impl/CustomIdFactoryTest.java |   1 +
 .../camel/impl/DataFormatContextAwareTest.java     |   2 +
 .../impl/DefaultCamelContextStopFailureTest.java   |   2 +
 .../DefaultComponentReferencePropertiesTest.java   |   4 +
 .../apache/camel/impl/DefaultComponentTest.java    |   2 +
 .../apache/camel/impl/DummyLifecycleStrategy.java  |  15 ++
 .../camel/impl/EndpointShutdownOnceTest.java       |   4 +
 .../apache/camel/impl/ExpressionAdapterTest.java   |   2 +
 .../apache/camel/impl/ExpressionSupportTest.java   |   2 +
 .../impl/ExtendedStartupListenerComponentTest.java |   1 +
 .../impl/HeaderFilterStrategyComponentTest.java    |   6 +
 .../camel/impl/LanguageCamelContextAwareTest.java  |   4 +
 .../camel/impl/MultipleConsumersSupportTest.java   |   8 +
 .../org/apache/camel/impl/RefDataFormatTest.java   |   2 +
 .../camel/impl/RouteSuspendResumeWarmUpTest.java   |   3 +
 .../StartupListenerComponentFromRegistryTest.java  |   1 +
 .../camel/impl/StartupListenerComponentTest.java   |   1 +
 .../org/apache/camel/impl/StartupListenerTest.java |   1 +
 .../camel/impl/TypeConverterAllowNullTest.java     |   1 +
 .../TypeConverterRegistryMissesThenAddTest.java    |   1 +
 .../camel/impl/TypeConverterRegistryTest.java      |   1 +
 .../camel/impl/engine/DefaultCamelContextTest.java |   2 +
 .../EventNotifierExchangeSentParallelTest.java     |   1 +
 ...ventNotifierServiceStoppingFailedEventTest.java |   2 +
 .../issues/AdviceWithStartTargetIssueTest.java     |   1 +
 .../issues/CBRCustomPredicateAsFilterTest.java     |   1 +
 .../apache/camel/issues/Camel4857UriIssueTest.java |   3 +
 .../CharlesSplitAndTryCatchRollbackIssueTest.java  |   1 +
 ...CharlesSplitUseBeanAsErrorHandlerIssueTest.java |   1 +
 .../camel/issues/ComponentUseRawUriTest.java       |   3 +
 .../camel/issues/CustomFailveOverProcessor.java    |   1 +
 .../org/apache/camel/issues/DavidSiefertTest.java  |   1 +
 .../issues/DynamicRouterWithInterceptorTest.java   |   1 +
 .../issues/FilterCustomPredicateAsFilterTest.java  |   1 +
 .../InterceptCustomPredicateAsFilterTest.java      |   1 +
 .../apache/camel/issues/InterceptFromLogTest.java  |   1 +
 .../java/org/apache/camel/issues/Issue170Test.java |   1 +
 ...icastAggregationStrategyThrowExceptionTest.java |   1 +
 ...lelStopOnExceptionWithOnExceptionIssueTest.java |   2 +
 ...thAggregationStrategyThrowingExceptionTest.java |   1 +
 .../MulticastPipelineAggregateIssueTest.java       |   1 +
 .../issues/MulticastSingleAggregateIssueTest.java  |   1 +
 .../org/apache/camel/issues/NeilSplitterTest.java  |   1 +
 .../camel/issues/OnExceptionWithTwoBeansTest.java  |   1 +
 .../camel/issues/ProxyReturnNullIssueTest.java     |   1 +
 ...thAggregationStrategyThrowingExceptionTest.java |   1 +
 .../issues/RecipientListWithInterceptorTest.java   |   1 +
 .../issues/RoutingSlipWithInterceptorTest.java     |   1 +
 .../camel/issues/SetHeaderInDoCatchIssueTest.java  |   1 +
 .../camel/issues/SplitPropertiesFileIssueTest.java |   1 +
 .../camel/issues/SplitWithInterceptorTest.java     |   1 +
 ...thAggregationStrategyThrowingExceptionTest.java |   1 +
 .../SplitterThrowExceptionInExpressionTest.java    |   1 +
 .../SplitterThrowExceptionInExpressionTwoTest.java |   1 +
 .../camel/issues/TryCatchWithSplitIssueTest.java   |   2 +
 .../apache/camel/issues/TwoTimerWithJMXIssue.java  |   1 +
 .../java/org/apache/camel/language/BeanTest.java   |   1 +
 .../org/apache/camel/language/ConstantTest.java    |   1 +
 .../camel/language/FileLanguageExtSingleTest.java  |   2 +
 .../apache/camel/language/FileLanguageTest.java    |   2 +
 .../java/org/apache/camel/language/HeaderTest.java |   1 +
 .../apache/camel/language/NoSuchLanguageTest.java  |   1 +
 .../org/apache/camel/language/PropertyTest.java    |   1 +
 .../apache/camel/language/RefPredicateTest.java    |   1 +
 .../java/org/apache/camel/language/RefTest.java    |   1 +
 .../TokenXMLPairMultiNamespaceSplitTest.java       |   2 +
 .../TokenXMLPairNamespaceMultilineSplitTest.java   |   2 +
 .../apache/camel/language/XPathFunctionTest.java   |   1 +
 .../camel/language/XPathOutFunctionTest.java       |   1 +
 .../java/org/apache/camel/language/XPathTest.java  |   1 +
 .../camel/language/simple/SimpleOperatorTest.java  |   1 +
 .../language/simple/SimpleParserPredicateTest.java |   1 +
 .../apache/camel/language/simple/SimpleTest.java   |   1 +
 .../model/LoadRouteFromXmlWithOnExceptionTest.java |   1 +
 .../model/LoadRouteFromXmlWithPolicyTest.java      |   2 +
 .../camel/processor/AnimalDeepClonePrepare.java    |   1 +
 .../apache/camel/processor/AppendingProcessor.java |   1 +
 .../org/apache/camel/processor/AsyncLoopTest.java  |   1 +
 .../camel/processor/BeanCachedProcessorTest.java   |   1 +
 .../BeanInvocationThrowsExceptionTest.java         |   1 +
 .../BeanOgnMethodWithXPathInjectionTest.java       |   1 +
 .../BeanRecipientListInterfaceAnnotationTest.java  |   1 +
 .../BeanRecipientListNoMethodNameTest.java         |   1 +
 .../camel/processor/BeanRecipientListTest.java     |   1 +
 .../processor/BeanRecipientListTimeoutTest.java    |   3 +
 .../org/apache/camel/processor/BeanRouteTest.java  |   1 +
 .../camel/processor/BeanWithExceptionTest.java     |   1 +
 .../processor/BeanWithXPathInjectionTest.java      |   1 +
 .../camel/processor/BodyInAggregatingStrategy.java |   1 +
 .../BodyInPreCompleteAggregatingStrategy.java      |   1 +
 .../processor/BodyOutAggregatingStrategy.java      |   1 +
 .../processor/Camel715ThreadProcessorTest.java     |   1 +
 .../apache/camel/processor/ChoiceAsyncTest.java    |   1 +
 .../processor/ChoiceCompoundPredicateTest.java     |   1 +
 .../apache/camel/processor/ChoiceNoActionTest.java |   1 +
 .../org/apache/camel/processor/ChoiceTest.java     |   1 +
 .../processor/ChoiceWhenBeanExpressionTest.java    |   1 +
 .../ChoiceWhenBeanExpressionWithExceptionTest.java |   1 +
 .../processor/ChoiceWhenNotPredicateTest.java      |   1 +
 .../processor/ChoiceWithSimpleExpressionTest.java  |   1 +
 .../camel/processor/ChoiceWithTranfromTest.java    |   1 +
 .../org/apache/camel/processor/ClaimCheckTest.java |   2 +
 .../processor/ComposedMessageProcessorTest.java    |   3 +
 .../apache/camel/processor/ConvertBodyTest.java    |   1 +
 .../CreateRouteWithNonExistingEndpointTest.java    |   1 +
 .../camel/processor/CustomLoadBalanceTest.java     |   2 +
 .../camel/processor/CustomRefLoadBalanceTest.java  |   1 +
 .../camel/processor/CustomRoutePolicyTest.java     |   1 +
 .../camel/processor/DataFormatServiceTest.java     |   4 +
 ...dLetterChannelExceptionCausePropagatedTest.java |   1 +
 ...CausePropagatedWithDefaultErrorHandlerTest.java |   1 +
 .../DeadLetterChannelHandledExampleTest.java       |   1 +
 ...lHandledExampleWithDefaultErrorHandlerTest.java |   1 +
 ...adLetterChannelOnExceptionOnRedeliveryTest.java |   4 +
 .../DeadLetterChannelOnRedeliveryTest.java         |   1 +
 .../camel/processor/DeadLetterChannelTest.java     |   1 +
 .../DeadLetterChannelUseOriginalInBodyTest.java    |   1 +
 ...LetterChannelUseOriginalInBodyWithFileTest.java |   1 +
 ...ltConsumerBridgeErrorHandlerRedeliveryTest.java |   1 +
 .../DefinitionPolicyPerProcessorTest.java          |   2 +
 .../camel/processor/DelayInterceptorTest.java      |   1 +
 .../camel/processor/DelayerAsyncDelayedTest.java   |   1 +
 .../org/apache/camel/processor/DelayerTest.java    |   1 +
 .../camel/processor/DelayerWhileShutdownTest.java  |   1 +
 .../org/apache/camel/processor/DetourTest.java     |   2 +
 ...point2MustBeStartedBeforeSendProcessorTest.java |   4 +
 ...dpointMustBeStartedBeforeSendProcessorTest.java |   4 +
 .../processor/ExceptionHandlerStreamCacheTest.java |   1 +
 .../processor/FailOverAllFailedExceptionTest.java  |   1 +
 .../FailOverLoadBalanceAutoStartupFalseTest.java   |   1 +
 .../FailOverLoadBalanceMultipleExceptionTest.java  |   1 +
 ...verLoadBalanceNotInheritedErrorHandlerTest.java |   1 +
 .../camel/processor/FailOverLoadBalanceTest.java   |   3 +
 ...lOverLoadBalanceWrappedExceptionNoLuckTest.java |   1 +
 .../FailOverLoadBalanceWrappedExceptionTest.java   |   1 +
 .../processor/FailOverNotCatchedExceptionTest.java |   1 +
 .../camel/processor/FileIdempotentClearTest.java   |   1 +
 .../FileIdempotentConsumerLoadStoreTest.java       |   1 +
 .../processor/FileIdempotentConsumerTest.java      |   1 +
 .../camel/processor/FileIdempotentRemoveTest.java  |   1 +
 .../processor/FileIdempotentTrunkStoreTest.java    |   1 +
 .../processor/FileRollbackOnCompletionTest.java    |   2 +
 .../camel/processor/FilterBeforeSplitTest.java     |   1 +
 .../camel/processor/FilterNotMatchedTest.java      |   1 +
 .../org/apache/camel/processor/FilterNotTest.java  |   1 +
 .../apache/camel/processor/FilterSimpleTest.java   |   1 +
 .../org/apache/camel/processor/FilterTest.java     |   1 +
 ...dempotentConsumerUsingCustomRepositoryTest.java |   6 +
 .../processor/InheritErrorHandlerDefaultTest.java  |   1 +
 .../processor/InheritErrorHandlerFalseTest.java    |   1 +
 .../processor/InheritErrorHandlerTrueTest.java     |   1 +
 .../org/apache/camel/processor/JoinRoutesTest.java |   1 +
 .../java/org/apache/camel/processor/LoopTest.java  |   1 +
 .../apache/camel/processor/LoopTestProcessor.java  |   1 +
 .../camel/processor/LoopWithAggregatorTest.java    |   1 +
 .../apache/camel/processor/MethodFilterTest.java   |   1 +
 .../MultiErrorHandlerInRouteNotHandledTest.java    |   1 +
 .../processor/MultiErrorHandlerInRouteTest.java    |   1 +
 .../MulticastKeepOriginalMessageUnchangedTest.java |   1 +
 .../processor/MulticastNoStopOnExceptionTest.java  |   1 +
 .../MulticastParallelAllTimeoutAwareTest.java      |   2 +
 .../MulticastParallelNoStopOnExceptionTest.java    |   2 +
 .../MulticastParallelStopOnExceptionTest.java      |   2 +
 .../MulticastParallelTimeoutAwareTest.java         |   2 +
 ...castStopOnExceptionLastWithOnExceptionTest.java |   1 +
 .../processor/MulticastStopOnExceptionTest.java    |   1 +
 ...ulticastStopOnExceptionWithOnExceptionTest.java |   1 +
 .../processor/MulticastStreamCachingTest.java      |   1 +
 .../org/apache/camel/processor/MulticastTest.java  |   1 +
 .../camel/processor/MulticastUnitOfWorkTest.java   |   1 +
 .../processor/MulticastWithOnExceptionTest.java    |   1 +
 .../camel/processor/MyLoggingSentEventNotifer.java |   1 +
 .../camel/processor/MySentEventNotifier.java       |   1 +
 .../org/apache/camel/processor/MyValidator.java    |   1 +
 .../processor/NewProcessorAndServiceTest.java      |   3 +
 .../org/apache/camel/processor/NormalizerTest.java |   1 +
 ...letionAndInterceptAndOnExceptionGlobalTest.java |   1 +
 .../OnCompletionAndInterceptGlobalTest.java        |   1 +
 .../processor/OnCompletionAndInterceptTest.java    |   1 +
 .../camel/processor/OnCompletionAsyncTest.java     |   1 +
 .../OnCompletionGlobalCustomPoolTest.java          |   2 +
 .../camel/processor/OnCompletionGlobalTest.java    |   1 +
 .../OnCompletionMoreGlobalRouteCompletionTest.java |   1 +
 .../processor/OnCompletionMoreGlobalTest.java      |   1 +
 .../processor/OnCompletionOnCompleteOnlyTest.java  |   1 +
 .../processor/OnCompletionOnFailureOnlyTest.java   |   1 +
 ...ompletionRouteScopeOverrideGlobalScopeTest.java |   1 +
 .../OnCompletionShutdownProcessorTest.java         |   3 +
 .../apache/camel/processor/OnCompletionTest.java   |   1 +
 .../processor/OnCompletionUseOriginalBodyTest.java |   1 +
 .../camel/processor/PipelineConcurrentTest.java    |   1 +
 .../apache/camel/processor/PipelineMEPTest.java    |   1 +
 .../org/apache/camel/processor/PipelineTest.java   |   4 +-
 .../camel/processor/PolicyPerProcessorTest.java    |   2 +
 .../apache/camel/processor/PolicyPerRouteTest.java |   2 +
 .../camel/processor/RandomLoadBalanceTest.java     |   1 +
 .../camel/processor/RecipientListBeanTest.java     |   1 +
 ...istExchangePropertyAggregationStrategyTest.java |   1 +
 .../RecipientListExchangePropertyTest.java         |   1 +
 .../RecipientListFineGrainedErrorHandlingTest.java |   1 +
 .../processor/RecipientListFunctionalTest.java     |   1 +
 .../RecipientListIgnoreInvalidEndpointsTest.java   |   1 +
 ...cipientListInvalidEndpointErrorHandlerTest.java |   1 +
 ...tInvalidEndpointIgnoreInvalidEndpointsTest.java |   1 +
 .../camel/processor/RecipientListLeakTest.java     |   1 +
 .../camel/processor/RecipientListNoCacheTest.java  |   1 +
 .../processor/RecipientListReturnValueTest.java    |   1 +
 .../apache/camel/processor/RecipientListTest.java  |   1 +
 .../RecipientListWithArrayHeaderTest.java          |   1 +
 ...RecipientListWithStringDelimitedHeaderTest.java |   1 +
 ...cipientListWithStringDelimitedPropertyTest.java |   1 +
 .../RedeliveryPolicyPerExceptionTest.java          |   1 +
 .../org/apache/camel/processor/RegExRouteTest.java |   1 +
 .../apache/camel/processor/RemoveHeaderTest.java   |   1 +
 .../camel/processor/RemoveHeadersExcludeTest.java  |   1 +
 .../apache/camel/processor/RemoveHeadersTest.java  |   1 +
 .../RemovePropertiesWithExclusionTest.java         |   1 +
 .../RemovePropertiesWithoutExclusionTest.java      |   1 +
 .../apache/camel/processor/RemovePropertyTest.java |   1 +
 .../apache/camel/processor/ResequencerTest.java    |   2 +
 .../camel/processor/RoundRobinLoadBalanceTest.java |   1 +
 .../camel/processor/RoutePerformanceCountTest.java |   1 +
 .../processor/RouteServicesStartupOrderTest.java   |   4 +
 .../apache/camel/processor/RoutingSlipDslTest.java |   1 +
 .../camel/processor/RoutingSlipNoCacheTest.java    |   1 +
 .../camel/processor/SamplingThrottlerTest.java     |   1 +
 .../apache/camel/processor/ScriptExternalTest.java |   1 +
 .../org/apache/camel/processor/ScriptTest.java     |   1 +
 .../camel/processor/SetExchangePatternTest.java    |   1 +
 .../SetHeaderUsingDslExpressionsTest.java          |   2 +
 .../apache/camel/processor/SetPropertyTest.java    |   1 +
 .../processor/ShutdownCompleteAllTasksTest.java    |   1 +
 .../org/apache/camel/processor/SimulatorTest.java  |   2 +
 .../org/apache/camel/processor/SortBodyTest.java   |   1 +
 .../apache/camel/processor/SortExpressionTest.java |   2 +
 .../camel/processor/SplitAggregateInOutTest.java   |   1 +
 .../camel/processor/SplitParallelTimeoutTest.java  |   2 +
 .../camel/processor/SplitterMethodCallTest.java    |   2 +
 .../SplitterNoAggregationStrategyTest.java         |   1 +
 .../processor/SplitterNoStopOnExceptionTest.java   |   1 +
 .../camel/processor/SplitterOnCompletionTest.java  |   1 +
 .../processor/SplitterOnPrepareExceptionTest.java  |   1 +
 .../camel/processor/SplitterOnPrepareTest.java     |   1 +
 .../SplitterParallelNoStopOnExceptionTest.java     |   2 +
 .../SplitterParallelStopOnExceptionTest.java       |   2 +
 ...ParallelStopOnExceptionWithOnExceptionTest.java |   1 +
 .../apache/camel/processor/SplitterPojoTest.java   |   1 +
 ...SplitterShareUnitOfWorkCompletionAwareTest.java |   1 +
 .../processor/SplitterStopOnExceptionTest.java     |   1 +
 ...SplitterStopOnExceptionWithOnExceptionTest.java |   1 +
 .../camel/processor/SplitterStreamCacheTest.java   |   1 +
 .../org/apache/camel/processor/SplitterTest.java   |   1 +
 .../SplitterWithCustomThreadPoolExecutorTest.java  |   1 +
 .../camel/processor/SplitterWithXqureyTest.java    |   1 +
 .../camel/processor/StickyLoadBalanceTest.java     |   1 +
 .../camel/processor/StreamResequencerTest.java     |   1 +
 ...SourceContentBasedRouterNoErrorHandlerTest.java |   1 +
 ...tentBasedRouterSSEnabledOnCamelContextTest.java |   1 +
 .../StreamSourceContentBasedRouterTest.java        |   1 +
 .../camel/processor/ThrottlerAsyncDelayedTest.java |   1 +
 .../apache/camel/processor/ThrottlerDslTest.java   |   1 +
 .../camel/processor/ThrottlerMethodCallTest.java   |   1 +
 .../org/apache/camel/processor/ThrottlerTest.java  |   1 +
 .../processor/ThrottlerThreadPoolProfileTest.java  |   1 +
 ...xceptionRoutePolicyHalfOpenHandlerSedaTest.java |   1 +
 ...ingExceptionRoutePolicyHalfOpenHandlerTest.java |   1 +
 ...ThrottlingExceptionRoutePolicyHalfOpenTest.java |   1 +
 .../ThrottlingExceptionRoutePolicyTest.java        |   1 +
 .../camel/processor/TopicLoadBalanceTest.java      |   1 +
 .../apache/camel/processor/TraceDelayerTest.java   |   1 +
 .../camel/processor/TraceInterceptorTest.java      |   1 +
 .../camel/processor/TracerConfigurationTest.java   |   1 +
 .../processor/TransformExternalScriptTest.java     |   1 +
 .../camel/processor/TransformProcessorTest.java    |   1 +
 .../TransformProcessorWithHeaderTest.java          |   1 +
 .../org/apache/camel/processor/TransformTest.java  |   1 +
 .../camel/processor/TransformViaDSLTest.java       |   1 +
 .../apache/camel/processor/TransformXpathTest.java |   1 +
 .../TryProcessorHandleWrappedExceptionTest.java    |   3 +
 .../TryProcessorMultipleExceptionTest.java         |   1 +
 .../camel/processor/TryProcessorOnWhenTest.java    |   1 +
 .../apache/camel/processor/TryProcessorTest.java   |   5 +
 .../TypeConverterRegistryStatsPerformanceTest.java |   1 +
 .../UnitOfWorkSynchronizationAdapterTest.java      |   1 +
 .../org/apache/camel/processor/UnitOfWorkTest.java |   1 +
 .../apache/camel/processor/ValidateRegExpTest.java |   1 +
 .../camel/processor/ValidateSimpleRegExpTest.java  |   1 +
 .../apache/camel/processor/ValidateSimpleTest.java |   1 +
 .../processor/ValidatingDomProcessorTest.java      |   1 +
 .../ValidatingProcessorNotUseSharedSchemaTest.java |   1 +
 .../camel/processor/ValidatingProcessorTest.java   |   1 +
 .../ValidationFinallyBlockNoCatchTest.java         |   1 +
 .../processor/ValidationFinallyBlockTest.java      |   1 +
 .../org/apache/camel/processor/ValidationTest.java |   1 +
 ...dationWithErrorInHandleAndFinallyBlockTest.java |   1 +
 .../processor/ValidationWithExceptionTest.java     |   1 +
 .../ValidationWithFinallyBlockPipelineTest.java    |   1 +
 ...lidationWithHandlePipelineAndExceptionTest.java |   1 +
 .../ValidationWithHandlePipelineTest.java          |   1 +
 .../ValidationWithInFlowExceptionTest.java         |   1 +
 .../ValidationWithMultipleHandlesTest.java         |   1 +
 ...lidationWithNestedFinallyBlockPipelineTest.java |   1 +
 .../processor/ValidationWithTryCatchTest.java      |   1 +
 .../processor/WireTapBeanAsProcessorTest.java      |   1 +
 .../apache/camel/processor/WireTapBeanTest.java    |   1 +
 .../camel/processor/WireTapCustomPool2Test.java    |   2 +
 .../camel/processor/WireTapCustomPoolTest.java     |   2 +
 .../camel/processor/WireTapExpressionTest.java     |   1 +
 .../camel/processor/WireTapLogEndpointTest.java    |   1 +
 .../org/apache/camel/processor/WireTapLogTest.java |   1 +
 .../camel/processor/WireTapShutdownBeanTest.java   |   1 +
 .../camel/processor/WireTapShutdownRouteTest.java  |   1 +
 .../camel/processor/WireTapStreamCachingTest.java  |   1 +
 .../org/apache/camel/processor/WireTapTest.java    |   1 +
 .../camel/processor/WireTapUsingMulticastTest.java |   1 +
 .../camel/processor/WireTapVoidBeanTest.java       |   1 +
 .../apache/camel/processor/XPathChoiceTest.java    |   1 +
 .../apache/camel/processor/XPathFilterTest.java    |   1 +
 ...ithNamespaceBuilderFilterAndResultTypeTest.java |   1 +
 .../XPathWithNamespaceBuilderFilterTest.java       |   1 +
 .../processor/XPathWithNamespacesFilterTest.java   |   1 +
 .../aggregator/AbstractDistributedTest.java        |   2 +
 ...gregateCompletionOnNewCorrelationGroupTest.java |   1 +
 .../aggregator/AggregateControllerTest.java        |   1 +
 ...eCompletionHeaderInAggregationStrategyTest.java |   1 +
 .../AggregateForceCompletionHeaderTest.java        |   1 +
 .../aggregator/AggregateFromWireTapTest.java       |   1 +
 .../aggregator/AggregateMultipleSourceTest.java    |   1 +
 .../AggregateNewExchangeAndConfirmTest.java        |   1 +
 .../AggregateRepositoryReturnNullTest.java         |   1 +
 .../AggregateShouldSkipFilteredExchangesTest.java  |   1 +
 .../AggregateSimpleExpressionIssueTest.java        |   1 +
 .../processor/aggregator/AggregateTimeoutTest.java |   2 +
 .../camel/processor/aggregator/AggregatorTest.java |   1 +
 .../aggregator/CustomAggregationStrategyTest.java  |   1 +
 .../aggregator/DistributedTimeoutTest.java         |   2 +
 .../AsyncEndpointCustomAsyncInterceptorTest.java   |   1 +
 .../async/AsyncEndpointCustomInterceptorTest.java  |   1 +
 .../async/AsyncEndpointCustomRoutePolicyTest.java  |   1 +
 .../processor/async/AsyncEndpointDelayUoWTest.java |   1 +
 .../processor/async/AsyncEndpointPolicyTest.java   |   2 +
 .../async/AsyncEndpointUoWFailedTest.java          |   1 +
 .../processor/async/AsyncEndpointUoWTest.java      |   1 +
 .../processor/async/AsyncRouteWithErrorTest.java   |   1 +
 .../camel/processor/async/MyAsyncEndpoint.java     |   3 +
 .../camel/processor/async/MyAsyncProducer.java     |   2 +
 .../DynamicRouterConcurrentPOJOTest.java           |   1 +
 .../EnricherAsyncUnhandledExceptionTest.java       |   1 +
 .../processor/enricher/EnricherNoResourceTest.java |   1 +
 .../processor/enricher/EnricherSendEventTest.java  |   1 +
 .../camel/processor/enricher/EnricherTest.java     |   1 +
 .../camel/processor/enricher/FailureProcessor.java |   1 +
 ...ollEnrichFileCustomAggregationStrategyTest.java |   1 +
 .../enricher/PollEnricherNoResourceTest.java       |   1 +
 .../camel/processor/enricher/PollEnricherTest.java |   1 +
 .../camel/processor/enricher/SampleAggregator.java |   1 +
 .../errorhandler/ErrorHandlerSupportTest.java      |   5 +
 .../CustomExceptionPolicyStrategyTest.java         |   2 +
 ...ltExceptionPolicyStrategyUsingOnlyWhenTest.java |   1 +
 ...efaultExceptionPolicyStrategyUsingWhenTest.java |   1 +
 .../InterceptFromEndpointInstanceTest.java         |   1 +
 .../InterceptFromEndpointRefFixedTest.java         |   1 +
 .../intercept/InterceptFromEndpointRefTest.java    |   1 +
 .../InterceptFromEndpointRefUriFixedTest.java      |   1 +
 .../intercept/InterceptFromEndpointRefUriTest.java |   1 +
 .../intercept/InterceptFromSimpleLogTest.java      |   1 +
 .../InterceptFromSimplePredicateTest.java          |   2 +
 .../InterceptFromSimplePredicateWithStopTest.java  |   1 +
 .../intercept/InterceptFromSimpleRouteTest.java    |   1 +
 .../intercept/InterceptFromUriRegexTest.java       |   1 +
 .../intercept/InterceptFromUriSimpleLogTest.java   |   1 +
 .../InterceptFromUriWildcardHeaderUriTest.java     |   1 +
 .../intercept/InterceptFromUriWildcardTest.java    |   1 +
 .../interceptor/AdviceWithRouteIdTest.java         |   1 +
 .../AuditInterceptorAsyncDelegateIssueTest.java    |   1 +
 .../AuditInterceptorDelegateIssueTest.java         |   1 +
 .../processor/interceptor/ConditionSupport.java    |   2 +
 .../InterceptorStrategyNotOrderedTest.java         |   2 +
 .../InterceptorStrategyOrderedTest.java            |   4 +
 ...efaultErrorHandlerExchangeFormatterRefTest.java |   1 +
 .../DefaultErrorHandlerRetryWhileTest.java         |   1 +
 ...rorHandlerRouteWithDefaultErrorHandlerTest.java |   1 +
 ...ceptionProcessorInspectCausedExceptionTest.java |   1 +
 ...CausedExceptionWithDefaultErrorHandlerTest.java |   1 +
 .../OnExceptionUseOriginalBodyTest.java            |   1 +
 .../OnExceptionWrappedExceptionTest.java           |   1 +
 .../resequencer/MyFileNameExpression.java          |   1 +
 .../resequencer/ResequencerBatchOrderTest.java     |   1 +
 .../resequencer/ResequencerEngineTest.java         |   2 +
 .../resequencer/ResequencerFileNameTest.java       |   1 +
 .../processor/resequencer/SequenceBuffer.java      |   1 +
 .../DynamicRouterEventNotifierTest.java            |   1 +
 .../RecipientListEventNotifierTest.java            |   1 +
 .../RoutingSlipDataModificationTest.java           |   1 +
 .../routingslip/RoutingSlipEventNotifierTest.java  |   1 +
 .../RoutingSlipIgnoreInvalidEndpointsTest.java     |   1 +
 .../processor/routingslip/RoutingSlipPOJOTest.java |   1 +
 .../processor/routingslip/RoutingSlipTest.java     |   1 +
 .../RoutingSlipWithErrorHandlerTest.java           |   1 +
 .../routingslip/RoutingSlipWithExceptionTest.java  |   1 +
 .../validation/CatalogLSResourceResolver.java      |  16 ++
 .../camel/support/IntrospectionSupportTest.java    |   1 +
 .../apache/camel/support/ServiceSupportTest.java   |   3 +
 .../org/apache/camel/support/jndi/ExampleBean.java |   1 +
 .../org/apache/camel/support/jndi/JndiTest.java    |   1 +
 .../org/apache/camel/util/AnotherExampleBean.java  |   1 +
 .../camel/util/ExpressionListComparatorTest.java   |   2 +
 .../apache/camel/util/OrderedComparatorTest.java   |   1 +
 .../builder/endpoint/AbstractEndpointBuilder.java  |   1 +
 .../AtmosphereWebsocketEndpointBuilderFactory.java |  48 +++---
 .../endpoint/ProcessorDefinitionDslTest.java       |   1 +
 .../language/xtokenizer/XMLTokenizeLanguage.java   |   3 +
 .../camel/support/builder/xml/StAX2SAXSource.java  |  15 ++
 .../validation/DefaultValidationErrorHandler.java  |   5 +
 .../validation/PredicateValidatingProcessor.java   |   2 +
 .../processor/validation/ValidatingProcessor.java  |   1 +
 .../org/apache/camel/util/xml/BytesSource.java     |   3 +
 .../org/apache/camel/util/xml/SourceCache.java     |   5 +
 .../apache/camel/util/xml/StreamSourceCache.java   |   5 +
 .../org/apache/camel/util/xml/StringSource.java    |   5 +
 .../src/main/java/org/apache/camel/main/Main.java  |   3 +
 .../org/apache/camel/main/MainListenerSupport.java |   5 +
 .../java/org/apache/camel/main/MainSupport.java    |   4 +
 .../mbean/ManagedAggregateProcessorMBean.java      |   2 +
 .../mbean/ManagedDynamicRouterMBean.java           |   1 +
 .../api/management/mbean/ManagedEnricherMBean.java |   1 +
 .../management/mbean/ManagedPollEnricherMBean.java |   1 +
 .../mbean/ManagedRecipientListMBean.java           |   1 +
 .../management/mbean/ManagedRoutingSlipMBean.java  |   1 +
 .../mbean/ManagedSendDynamicProcessorMBean.java    |   1 +
 .../mbean/ManagedSendProcessorMBean.java           |   1 +
 .../api/management/mbean/ManagedWireTapMBean.java  |   1 +
 .../DefaultInstrumentationProcessor.java           |   1 +
 .../camel/management/DefaultManagementAgent.java   |  45 ++++++
 .../DefaultManagementObjectNameStrategy.java       |  19 +++
 .../DefaultManagementObjectStrategy.java           |  15 ++
 .../management/DelegatePerformanceCounter.java     |   5 +
 .../management/JmxManagementLifecycleStrategy.java |  17 ++
 .../camel/management/JmxManagementStrategy.java    |   6 +
 .../management/JmxManagementStrategyFactory.java   |   1 +
 .../management/JmxNotificationEventNotifier.java   |   4 +
 .../camel/management/LoggingEventNotifier.java     |   3 +
 .../camel/management/ManagedCamelContextImpl.java  |   4 +
 .../camel/management/PublishEventNotifier.java     |   4 +
 .../mbean/ManagedAggregateProcessor.java           |  39 +++++
 .../management/mbean/ManagedBacklogDebugger.java   |  38 +++++
 .../management/mbean/ManagedBacklogTracer.java     |  25 +++
 .../management/mbean/ManagedCamelContext.java      |  57 +++++++
 .../camel/management/mbean/ManagedComponent.java   |   5 +
 .../camel/management/mbean/ManagedConsumer.java    |   2 +
 .../management/mbean/ManagedConsumerCache.java     |   8 +
 .../camel/management/mbean/ManagedCounter.java     |   4 +
 .../camel/management/mbean/ManagedDelayer.java     |   4 +
 .../management/mbean/ManagedEndpointRegistry.java  |   8 +
 .../camel/management/mbean/ManagedEnricher.java    |   1 +
 .../management/mbean/ManagedErrorHandler.java      |  50 ++++++
 .../management/mbean/ManagedEventNotifier.java     |  23 +++
 .../mbean/ManagedPerformanceCounter.java           |  27 ++++
 .../management/mbean/ManagedPollEnricher.java      |   1 +
 .../camel/management/mbean/ManagedProcessor.java   |  11 ++
 .../camel/management/mbean/ManagedProducer.java    |   2 +
 .../management/mbean/ManagedProducerCache.java     |   9 ++
 .../camel/management/mbean/ManagedRoute.java       |  29 ++++
 .../mbean/ManagedRuntimeCamelCatalog.java          |   1 +
 .../mbean/ManagedRuntimeEndpointRegistry.java      |   1 +
 .../mbean/ManagedScheduledPollConsumer.java        |  16 ++
 .../mbean/ManagedSendDynamicProcessor.java         |   8 +
 .../management/mbean/ManagedSendProcessor.java     |   4 +
 .../camel/management/mbean/ManagedService.java     |  13 ++
 .../mbean/ManagedStreamCachingStrategy.java        |  24 +++
 .../management/mbean/ManagedSuspendableRoute.java  |   3 +
 .../camel/management/mbean/ManagedThreadPool.java  |  24 +++
 .../camel/management/mbean/ManagedThrottler.java   |   7 +
 .../ManagedThrottlingInflightRoutePolicy.java      |   8 +
 .../management/mbean/ManagedThroughputLogger.java  |   5 +
 .../camel/management/mbean/ManagedTracer.java      |   8 +
 .../mbean/ManagedTransformerRegistry.java          |   8 +
 .../mbean/ManagedTypeConverterRegistry.java        |  13 ++
 .../management/mbean/ManagedValidatorRegistry.java |   8 +
 .../management/mbean/ManagedWireTapProcessor.java  |   8 +
 .../camel/management/mbean/StatisticCounter.java   |   3 +
 .../camel/management/mbean/StatisticDelta.java     |   3 +
 .../camel/management/mbean/StatisticMaximum.java   |   3 +
 .../camel/management/mbean/StatisticMinimum.java   |   3 +
 .../camel/management/mbean/StatisticValue.java     |   3 +
 .../component/controlbus/ControlBusStatsTest.java  |   1 +
 .../management/CamelChoiceWithManagementTest.java  |   1 +
 .../apache/camel/management/CustomEndpoint.java    |   3 +
 .../JmxInstrumentationCustomMBeanTest.java         |   4 +
 .../JmxInstrumentationUsingDefaultsTest.java       |   1 +
 .../JmxNotificationEventNotifierTest.java          |   1 +
 .../camel/management/JmxRecipientListTest.java     |   1 +
 .../management/ManagedAggregateControllerTest.java |   1 +
 .../management/ManagedCustomLoadBalancerTest.java  |   1 +
 .../management/ManagedCustomProcessorTest.java     |   1 +
 .../management/ManagedFileIdempotentClearTest.java |   1 +
 .../ManagedFileIdempotentConsumerTest.java         |   1 +
 .../ManagedMemoryIdempotentClearTest.java          |   1 +
 .../ManagedMemoryIdempotentConsumerTest.java       |   1 +
 .../ManagedRouteStopAndStartCleanupTest.java       |   1 +
 .../management/ManagedSuspendedServiceTest.java    |   1 +
 .../apache/camel/component/ResourceEndpoint.java   |   6 +
 .../stream/ByteArrayInputStreamCache.java          |   3 +
 .../camel/converter/stream/CachedOutputStream.java |   8 +
 .../converter/stream/FileInputStreamCache.java     |   4 +
 .../camel/converter/stream/InputStreamCache.java   |   4 +
 .../apache/camel/converter/stream/ReaderCache.java |   5 +
 .../support/AsyncProcessorConverterHelper.java     |   6 +
 .../camel/support/CamelObjectInputStream.java      |   1 +
 .../apache/camel/support/ChildServiceSupport.java  |   2 +
 .../apache/camel/support/DefaultAsyncProducer.java |   2 +
 .../org/apache/camel/support/DefaultComponent.java |   5 +
 .../org/apache/camel/support/DefaultConsumer.java  |   6 +
 .../org/apache/camel/support/DefaultEndpoint.java  |  10 ++
 .../org/apache/camel/support/DefaultExchange.java  |  43 +++++
 .../camel/support/DefaultExchangeHolder.java       |   1 +
 .../camel/support/DefaultHeaderFilterStrategy.java |   2 +
 .../camel/support/DefaultLRUCacheFactory.java      |   6 +
 .../org/apache/camel/support/DefaultMessage.java   |  14 ++
 .../DefaultPollingConsumerPollStrategy.java        |   3 +
 .../camel/support/DefaultPollingEndpoint.java      |   1 +
 .../org/apache/camel/support/DefaultProducer.java  |   1 +
 .../support/DefaultScheduledPollConsumer.java      |   1 +
 .../DefaultScheduledPollConsumerScheduler.java     |   2 +
 .../camel/support/DefaultThreadPoolFactory.java    |   1 +
 .../apache/camel/support/DefaultTimeoutMap.java    |   5 +
 .../camel/support/EventDrivenPollingConsumer.java  |   7 +
 .../apache/camel/support/EventNotifierSupport.java |  24 +++
 .../apache/camel/support/ExpressionAdapter.java    |   2 +
 .../apache/camel/support/ExpressionComparator.java |   1 +
 .../camel/support/ExpressionListComparator.java    |   1 +
 .../apache/camel/support/ExpressionSupport.java    |   1 +
 .../support/ExpressionToPredicateAdapter.java      |   1 +
 .../support/HeaderFilterStrategyComponent.java     |   2 +
 .../camel/support/HeaderSelectorProducer.java      |   1 +
 .../org/apache/camel/support/LanguageSupport.java  |   2 +
 .../camel/support/LoggingExceptionHandler.java     |   3 +
 .../apache/camel/support/OrderedComparator.java    |   1 +
 .../camel/support/PollingConsumerSupport.java      |   1 +
 .../apache/camel/support/ProcessorEndpoint.java    |   2 +
 .../camel/support/ProcessorPollingConsumer.java    |   5 +
 .../apache/camel/support/RoutePolicySupport.java   |   4 +
 .../camel/support/ScheduledPollConsumer.java       |   1 +
 .../camel/support/ScheduledPollEndpoint.java       |   1 +
 .../apache/camel/support/SimpleUuidGenerator.java  |   1 +
 .../camel/support/SynchronizationAdapter.java      |   6 +
 .../camel/support/SynchronousDelegateProducer.java |   6 +
 .../org/apache/camel/support/TimeoutMapEntry.java  |   5 +
 .../support/builder/BinaryPredicateSupport.java    |   5 +
 .../support/component/AbstractApiComponent.java    |   1 +
 .../support/component/AbstractApiEndpoint.java     |   1 +
 .../support/jndi/CamelInitialContextFactory.java   |   1 +
 .../jndi/CamelSingletonInitialContextFactory.java  |   1 +
 .../camel/support/jndi/JndiBeanRepository.java     |   4 +
 .../org/apache/camel/support/jndi/JndiContext.java |  36 +++++
 .../DefaultAnnotationExpressionFactory.java        |   1 +
 .../DefaultManagementMBeanAssembler.java           |   1 +
 .../camel/support/processor/CamelLogProcessor.java |   4 +
 .../processor/DefaultExchangeFormatter.java        |   1 +
 .../support/processor/DefaultMaskingFormatter.java |   1 +
 .../support/processor/DelegateAsyncProcessor.java  |   7 +
 .../camel/support/processor/DelegateProcessor.java |   6 +
 .../support/processor/DelegateSyncProcessor.java   |   1 +
 .../camel/support/processor/MarshalProcessor.java  |   6 +
 .../camel/support/processor/ThroughputLogger.java  |   5 +
 .../support/processor/UnmarshalProcessor.java      |   7 +
 .../idempotent/FileIdempotentRepository.java       |   5 +
 .../idempotent/MemoryIdempotentRepository.java     |   5 +
 .../org/apache/camel/util/CamelVersionHelper.java  |  16 ++
 .../java/org/apache/camel/util/FilterIterator.java |   3 +
 .../main/java/org/apache/camel/util/Scanner.java   |   3 +
 .../util/concurrent/AsyncCompletionService.java    |   2 +
 .../camel/util/concurrent/CamelThreadFactory.java  |   2 +
 .../concurrent/SubmitOrderedCompletionService.java |   7 +
 .../concurrent/SynchronousExecutorService.java     |   6 +
 .../spring/javaconfig/patterns/FilterTest.java     |   1 +
 .../org/apache/camel/processor/FilterTest.java     |   1 +
 .../org/apache/camel/processor/TransformTest.java  |   1 +
 .../camel/processor/TransformViaDSLTest.java       |   1 +
 .../management/ManagedCustomProcessorTest.java     |   1 +
 .../camel/example/NumberAggregationStrategy.java   |   1 +
 .../camel/example/cafe/CafeRouteBuilder.java       |   1 +
 .../org/apache/camel/example/cafe/OrderItem.java   |   1 +
 .../cafe/stuff/CafeAggregationStrategy.java        |   1 +
 .../camel/example/cafe/CafeRouteBuilderTest.java   |   1 +
 .../camel/example/cafe/test/TestDrinkRouter.java   |   1 +
 .../apache/camel/example/cafe/test/TestWaiter.java |   1 +
 .../camel/example/cafe/CafeRouteBuilder.java       |   1 +
 .../org/apache/camel/example/cafe/Customer.java    |   3 +
 .../org/apache/camel/example/cafe/OrderItem.java   |   1 +
 .../cafe/stuff/CafeAggregationStrategy.java        |   1 +
 .../camel/example/cafe/CafeRouteBuilderTest.java   |   1 +
 .../camel/example/cafe/CafeRouteSpringTest.java    |   3 +
 .../camel/example/cafe/test/TestDrinkRouter.java   |   1 +
 .../apache/camel/example/cafe/test/TestWaiter.java |   1 +
 .../reportincident/ReportIncidentRoutes.java       |   1 +
 .../camel/example/cxf/ws/HelloWorldImpl.java       |   1 +
 .../camel/example/cxf/ws/UserPasswordCallback.java |   1 +
 .../camel/example/cxf/httptojms/JmsBroker.java     |   1 +
 .../example/cxf/jaxrs/CamelRouterBuilder.java      |   2 +
 .../camel/example/cxf/jaxrs/JAXRSClient.java       |   1 +
 .../camel/example/cxf/jaxrs/resources/Book.java    |   1 +
 .../example/cxf/jaxrs/resources/BookStoreImpl.java |   4 +-
 .../example/cxf/provider/GreeterProvider.java      |   1 +
 .../example/cxf/jaxrs/JAXRSClientServerTest.java   |   1 +
 .../apache/camel/example/jdbc/RecordProcessor.java |   1 +
 .../apache/camel/example/jmx/MyRouteBuilder.java   |   1 +
 .../org/apache/camel/example/jmx/SimpleBean.java   |   1 +
 .../org/apache/camel/example/model/Report.java     |   1 +
 .../camel/loanbroker/CreditScoreProcessor.java     |   1 +
 .../org/apache/camel/loanbroker/bank/Bank.java     |   2 +
 .../apache/camel/loanbroker/bank/BankQuote.java    |   1 +
 .../camel/loanbroker/credit/CreditAgency.java      |   2 +
 .../camel/loanbroker/CreditAgencyProcessor.java    |   1 +
 .../apache/camel/loanbroker/LoanBrokerRoute.java   |   1 +
 .../apache/camel/loanbroker/ReplyProcessor.java    |   1 +
 .../camel/loanbroker/bank/BankProcessor.java       |   1 +
 .../example/management/ManagementExampleTest.java  |   1 +
 .../camel/example/pojo/CamelContextTest.java       |   1 +
 .../apache/camel/example/ServiceApplication.java   |   2 +
 .../apache/camel/example/ServiceApplication.java   |   2 +
 .../apache/camel/example/ServiceApplication.java   |   1 +
 .../org/apache/camel/example/server/Treble.java    |   1 +
 .../apache/camel/example/pulsar/server/Treble.java |   1 +
 .../camel/example/server/IncrementRoute.java       |   1 +
 .../camel/example/spring/MyRouteBuilder.java       |   1 +
 .../example/telegram/usage/GetUpdatesUsage.java    |   1 +
 .../example/telegram/usage/LiveLocationUsage.java  |   1 +
 .../example/telegram/usage/SendMessageUsage.java   |   1 +
 .../example/telegram/usage/SendVenueUsage.java     |   1 +
 .../example/transformer/demo/OrderProcessor.java   |   1 +
 .../commands/AbstractLocalCamelController.java     |  20 +++
 .../camel/commands/AbstractRouteCommand.java       |   1 +
 .../camel/karaf/commands/ContextInflight.java      |   1 +
 .../apache/camel/karaf/commands/EndpointList.java  |   1 +
 .../apache/camel/karaf/commands/EndpointStats.java |   1 +
 .../apache/camel/karaf/commands/RestApiDoc.java    |   1 +
 .../camel/karaf/commands/RestRegistryList.java     |   1 +
 .../org/apache/camel/karaf/commands/RestShow.java  |   1 +
 .../org/apache/camel/karaf/commands/RouteInfo.java |   1 +
 .../org/apache/camel/karaf/commands/RouteList.java |   1 +
 .../org/apache/camel/karaf/commands/RouteShow.java |   1 +
 .../commands/completers/CamelContextCompleter.java |   1 +
 .../karaf/commands/completers/RouteCompleter.java  |   1 +
 .../test/cxf/blueprint/CxfConsumerSoap12Test.java  |   1 +
 .../test/cxf/blueprint/CxfConsumerWSRMTest.java    |   1 +
 .../camel/test/cxf/blueprint/MyProcessor.java      |   1 +
 .../apache/camel/itest/async/MyAsyncEndpoint.java  |   3 +
 .../apache/camel/itest/async/MyAsyncProducer.java  |   2 +
 .../customerrelations/CustomerServicesTest.java    |   1 +
 ...ipientListInterceptSendToEndpointIssueTest.java |   2 +
 .../org/apache/camel/itest/ftp/FtpXQueryTest.java  |   2 +
 .../camel/itest/greeter/FilePrepareRequest.java    |   1 +
 .../camel/itest/greeter/JmsPrepareRequest.java     |   1 +
 .../camel/itest/greeter/JmsPrepareResponse.java    |   1 +
 .../apache/camel/itest/greeter/PrepareRequest.java |   1 +
 .../camel/itest/greeter/PrepareResponse.java       |   1 +
 .../itest/idempotent/JdbcIdempotentRepository.java |   7 +
 .../org/apache/camel/itest/issues/BaseClass.java   |   1 +
 .../itest/issues/BeanCallDerivedClassTest.java     |   1 +
 .../camel/itest/issues/DummyInterceptor.java       |   1 +
 .../camel/itest/issues/JettyHttpFileCacheTest.java |   1 +
 .../jetty/JettySimulateFailoverRoundRobinTest.java |   1 +
 .../itest/jetty/SetExchangePatternProcessor.java   |   1 +
 .../camel/itest/jetty/SetResponseProcessor.java    |   1 +
 .../JMSTransactionIsTransactedRedeliveredTest.java |   3 +
 .../apache/camel/itest/jms/JmsResequencerTest.java |   1 +
 .../quartz/FtpCronScheduledRoutePolicyTest.java    |   2 +
 .../camel/itest/security/CXFMessageProcessor.java  |   1 +
 .../itest/security/KeystorePasswordCallback.java   |   1 +
 .../itest/security/MyAuthenticationAdapter.java    |   1 +
 .../apache/camel/itest/security/MyProcessor.java   |   1 +
 .../org/apache/camel/itest/tx/JmsToHttpRoute.java  |   1 +
 ...ndNoTransactionErrorHandlerConfiguredRoute.java |   1 +
 .../itest/tx/JmsToHttpWithOnExceptionRoute.java    |   1 +
 .../camel/itest/tx/JmsToHttpWithRollbackRoute.java |   1 +
 .../camel/tests/partialclasspath/RouteTest.java    |   1 +
 .../camel/tests/typeconverterscan/RouteTest.java   |   1 +
 .../tools/apt/EndpointAnnotationProcessor.java     |   1 +
 .../camel/maven/ApiComponentGeneratorMojoTest.java |   1 +
 .../maven/FileApiMethodGeneratorMojoTest.java      |   1 +
 .../java/org/apache/camel/maven/EmbeddedMojo.java  |   1 +
 .../main/java/org/apache/camel/maven/RunMojo.java  |   3 +
 .../packaging/PackageArchetypeCatalogMojo.java     |   1 +
 .../maven/packaging/PackageComponentMojo.java      |   1 +
 .../maven/packaging/PackageDataFormatMojo.java     |   1 +
 .../camel/maven/packaging/PackageJaxbMojo.java     |   1 +
 .../camel/maven/packaging/PackageLanguageMojo.java |   1 +
 .../camel/maven/packaging/PackageLegalMojo.java    |   1 +
 .../camel/maven/packaging/PackageModelMojo.java    |   1 +
 .../camel/maven/packaging/PackageOtherMojo.java    |   1 +
 .../maven/packaging/PrepareCatalogKarafMojo.java   |   1 +
 .../camel/maven/packaging/PrepareCatalogMojo.java  |   1 +
 .../packaging/PrepareCatalogSpringBootMojo.java    |   1 +
 .../maven/packaging/PrepareComponentMojo.java      |   1 +
 .../camel/maven/packaging/PrepareExampleMojo.java  |   1 +
 .../maven/packaging/PrepareParentPomMojo.java      |   1 +
 .../camel/maven/packaging/PrepareReadmeMojo.java   |   1 +
 .../maven/packaging/PrepareReleasePomMojo.java     |   1 +
 .../maven/packaging/PrepareUserGuideMojo.java      |   1 +
 .../maven/packaging/ValidateComponentMojo.java     |   1 +
 .../generics/OwbGenericArrayTypeImpl.java          |   1 +
 .../generics/OwbParametrizedTypeImpl.java          |   1 +
 .../packaging/generics/OwbWildcardTypeImpl.java    |   1 +
 .../camel/maven/packaging/srcgen/GenericType.java  |   1 +
 .../camel/maven/packaging/srcgen/JavaClass.java    |   1 +
 3630 files changed, 7545 insertions(+), 76 deletions(-)

diff --git a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/ParserResult.java b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/ParserResult.java
index 23a80b9..7ed9973 100644
--- a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/ParserResult.java
+++ b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/ParserResult.java
@@ -87,6 +87,7 @@ public class ParserResult {
         this.predicate = predicate;
     }
 
+    @Override
     public String toString() {
         return element;
     }
diff --git a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/model/CamelNodeDetails.java b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/model/CamelNodeDetails.java
index 58d3480..ad98a57 100644
--- a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/model/CamelNodeDetails.java
+++ b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/model/CamelNodeDetails.java
@@ -143,6 +143,7 @@ public class CamelNodeDetails {
         this.methodName = methodName;
     }
 
+    @Override
     public String toString() {
         return name;
     }
diff --git a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelConnection.java b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelConnection.java
index df2d6da..e150783 100644
--- a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelConnection.java
+++ b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelConnection.java
@@ -34,10 +34,12 @@ public class CamelConnection extends ActiveMQConnection implements CamelContextA
         super(transport, clientIdGenerator, connectionIdGenerator, factoryStats);
     }
 
+    @Override
     public CamelContext getCamelContext() {
         return camelContext;
     }
 
+    @Override
     public void setCamelContext(CamelContext camelContext) {
         this.camelContext = camelContext;
     }
diff --git a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelConnectionFactory.java b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelConnectionFactory.java
index f08026d..9b5f98d 100644
--- a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelConnectionFactory.java
+++ b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelConnectionFactory.java
@@ -33,16 +33,19 @@ public class CamelConnectionFactory extends ActiveMQConnectionFactory implements
     public CamelConnectionFactory() {
     }
 
+    @Override
     public CamelContext getCamelContext() {
         return camelContext;
     }
 
+    @Override
     public void setCamelContext(CamelContext camelContext) {
         this.camelContext = camelContext;
     }
 
     // Implementation methods
     // -----------------------------------------------------------------------
+    @Override
     protected CamelConnection createActiveMQConnection(Transport transport, JMSStatsImpl stats) throws Exception {
         CamelConnection connection = new CamelConnection(transport, getClientIdGenerator(), getConnectionIdGenerator(), stats);
         CamelContext context = getCamelContext();
diff --git a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelDestination.java b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelDestination.java
index 330c491..50b938b 100644
--- a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelDestination.java
+++ b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelDestination.java
@@ -51,42 +51,51 @@ public class CamelDestination implements CustomDestination, CamelContextAware {
         this.uri = uri;
     }
 
+    @Override
     public String toString() {
         return uri.toString();
     }
 
     // CustomDestination interface
     // -----------------------------------------------------------------------
+    @Override
     public MessageConsumer createConsumer(ActiveMQSession session, String messageSelector) {
         return createConsumer(session, messageSelector, false);
     }
 
+    @Override
     public MessageConsumer createConsumer(ActiveMQSession session, String messageSelector, boolean noLocal) {
         return new CamelMessageConsumer(this, resolveEndpoint(session), session, messageSelector, noLocal);
     }
 
+    @Override
     public TopicSubscriber createSubscriber(ActiveMQSession session, String messageSelector, boolean noLocal) {
         return createDurableSubscriber(session, null, messageSelector, noLocal);
     }
 
+    @Override
     public TopicSubscriber createDurableSubscriber(ActiveMQSession session, String name, String messageSelector, boolean noLocal) {
         throw new UnsupportedOperationException("This destination is not a Topic: " + this);
     }
 
+    @Override
     public QueueReceiver createReceiver(ActiveMQSession session, String messageSelector) {
         throw new UnsupportedOperationException("This destination is not a Queue: " + this);
     }
 
     // Producers
     // -----------------------------------------------------------------------
+    @Override
     public MessageProducer createProducer(ActiveMQSession session) throws JMSException {
         return new CamelMessageProducer(this, resolveEndpoint(session), session);
     }
 
+    @Override
     public TopicPublisher createPublisher(ActiveMQSession session) throws JMSException {
         throw new UnsupportedOperationException("This destination is not a Topic: " + this);
     }
 
+    @Override
     public QueueSender createSender(ActiveMQSession session) throws JMSException {
         throw new UnsupportedOperationException("This destination is not a Queue: " + this);
     }
@@ -110,10 +119,12 @@ public class CamelDestination implements CustomDestination, CamelContextAware {
         this.endpoint = endpoint;
     }
 
+    @Override
     public CamelContext getCamelContext() {
         return camelContext;
     }
 
+    @Override
     public void setCamelContext(CamelContext camelContext) {
         this.camelContext = camelContext;
     }
diff --git a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelMessageConsumer.java b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelMessageConsumer.java
index 7cb0ebc..c254316 100644
--- a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelMessageConsumer.java
+++ b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelMessageConsumer.java
@@ -53,6 +53,7 @@ public class CamelMessageConsumer implements MessageConsumer {
         this.noLocal = noLocal;
     }
 
+    @Override
     public void close() throws JMSException {
         if (!closed) {
             closed = true;
@@ -69,10 +70,12 @@ public class CamelMessageConsumer implements MessageConsumer {
         }
     }
 
+    @Override
     public MessageListener getMessageListener() throws JMSException {
         return messageListener;
     }
 
+    @Override
     public void setMessageListener(MessageListener messageListener) throws JMSException {
         this.messageListener = messageListener;
         if (messageListener != null && consumer == null) {
@@ -80,16 +83,19 @@ public class CamelMessageConsumer implements MessageConsumer {
         }
     }
 
+    @Override
     public Message receive() throws JMSException {
         Exchange exchange = getPollingConsumer().receive();
         return createMessage(exchange);
     }
 
+    @Override
     public Message receive(long timeoutMillis) throws JMSException {
         Exchange exchange = getPollingConsumer().receive(timeoutMillis);
         return createMessage(exchange);
     }
 
+    @Override
     public Message receiveNoWait() throws JMSException {
         Exchange exchange = getPollingConsumer().receiveNoWait();
         return createMessage(exchange);
@@ -106,6 +112,7 @@ public class CamelMessageConsumer implements MessageConsumer {
         return endpoint;
     }
 
+    @Override
     public String getMessageSelector() {
         return messageSelector;
     }
diff --git a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelMessageProducer.java b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelMessageProducer.java
index a9ed0e8..e7065ef 100644
--- a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelMessageProducer.java
+++ b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelMessageProducer.java
@@ -56,6 +56,7 @@ public class CamelMessageProducer extends ActiveMQMessageProducerSupport {
         }
     }
 
+    @Override
     public CamelDestination getDestination() throws JMSException {
         return destination;
     }
@@ -64,6 +65,7 @@ public class CamelMessageProducer extends ActiveMQMessageProducerSupport {
         return endpoint;
     }
 
+    @Override
     public void close() throws JMSException {
         if (!closed) {
             closed = true;
@@ -75,6 +77,7 @@ public class CamelMessageProducer extends ActiveMQMessageProducerSupport {
         }
     }
 
+    @Override
     public void send(Destination destination, Message message, int deliveryMode, int priority, long timeToLive) throws JMSException {
         CamelDestination camelDestination = null;
         if (ObjectHelper.equal(destination, this.destination)) {
@@ -94,6 +97,7 @@ public class CamelMessageProducer extends ActiveMQMessageProducerSupport {
         }
     }
 
+    @Override
     protected void checkClosed() throws IllegalStateException {
         if (closed) {
             throw new IllegalStateException("The producer is closed");
diff --git a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelQueue.java b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelQueue.java
index f6abc2e..7effa06 100644
--- a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelQueue.java
+++ b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelQueue.java
@@ -32,14 +32,17 @@ public class CamelQueue extends CamelDestination implements Queue {
         super(uri);
     }
 
+    @Override
     public String getQueueName() throws JMSException {
         return getUri();
     }
 
+    @Override
     public QueueSender createSender(ActiveMQSession session) throws JMSException {
         return new CamelQueueSender(this, resolveEndpoint(session), session);
     }
 
+    @Override
     public QueueReceiver createReceiver(ActiveMQSession session, String messageSelector) {
         return new CamelQueueReceiver(this, resolveEndpoint(session), session, messageSelector);
     }
diff --git a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelQueueReceiver.java b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelQueueReceiver.java
index 0ef26df..0ab08cf 100644
--- a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelQueueReceiver.java
+++ b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelQueueReceiver.java
@@ -41,6 +41,7 @@ public class CamelQueueReceiver extends CamelMessageConsumer implements QueueRec
      *             queue receiver due to some internal error.
      */
 
+    @Override
     public Queue getQueue() throws JMSException {
         checkClosed();
         return (Queue)super.getDestination();
diff --git a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelQueueSender.java b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelQueueSender.java
index 9ae81a9..fd0d075 100644
--- a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelQueueSender.java
+++ b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelQueueSender.java
@@ -42,6 +42,7 @@ public class CamelQueueSender extends CamelMessageProducer implements QueueSende
      *             <CODE>QueueSender</CODE> due to some internal error.
      */
 
+    @Override
     public Queue getQueue() throws JMSException {
         return (Queue)super.getDestination();
     }
@@ -65,6 +66,7 @@ public class CamelQueueSender extends CamelMessageProducer implements QueueSende
      * @see javax.jms.MessageProducer#getPriority()
      */
 
+    @Override
     public void send(Queue queue, Message message) throws JMSException {
         super.send(queue, message);
     }
@@ -87,6 +89,7 @@ public class CamelQueueSender extends CamelMessageProducer implements QueueSende
      *             some internal error.
      */
 
+    @Override
     public void send(Queue queue, Message message, int deliveryMode, int priority, long timeToLive) throws JMSException {
         super.send(queue, message, deliveryMode, priority, timeToLive);
     }
diff --git a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelTopic.java b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelTopic.java
index aa84990..31daca1 100644
--- a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelTopic.java
+++ b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelTopic.java
@@ -32,14 +32,17 @@ public class CamelTopic extends CamelDestination implements Topic {
         super(uri);
     }
 
+    @Override
     public String getTopicName() throws JMSException {
         return getUri();
     }
 
+    @Override
     public TopicPublisher createPublisher(ActiveMQSession session) throws JMSException {
         return new CamelTopicPublisher(this, resolveEndpoint(session), session);
     }
 
+    @Override
     public TopicSubscriber createDurableSubscriber(ActiveMQSession session, String name, String messageSelector, boolean noLocal) {
         return new CamelTopicSubscriber(this, resolveEndpoint(session), session, name, messageSelector, noLocal);
     }
diff --git a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelTopicPublisher.java b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelTopicPublisher.java
index eceaa16..2ff0c67 100644
--- a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelTopicPublisher.java
+++ b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelTopicPublisher.java
@@ -42,6 +42,7 @@ public class CamelTopicPublisher extends CamelMessageProducer implements TopicPu
      *             <CODE>TopicPublisher</CODE> due to some internal error.
      */
 
+    @Override
     public Topic getTopic() throws JMSException {
         return (Topic)super.getDestination();
     }
@@ -67,6 +68,7 @@ public class CamelTopicPublisher extends CamelMessageProducer implements TopicPu
      * @see javax.jms.MessageProducer#getPriority()
      */
 
+    @Override
     public void publish(Message message) throws JMSException {
         super.send(message);
     }
@@ -92,6 +94,7 @@ public class CamelTopicPublisher extends CamelMessageProducer implements TopicPu
      *             at creation time.
      */
 
+    @Override
     public void publish(Message message, int deliveryMode, int priority, long timeToLive) throws JMSException {
         super.send(message, deliveryMode, priority, timeToLive);
     }
@@ -119,6 +122,7 @@ public class CamelTopicPublisher extends CamelMessageProducer implements TopicPu
      * @see javax.jms.MessageProducer#getPriority()
      */
 
+    @Override
     public void publish(Topic topic, Message message) throws JMSException {
         super.send(topic, message);
     }
@@ -145,6 +149,7 @@ public class CamelTopicPublisher extends CamelMessageProducer implements TopicPu
      *             method with an invalid topic.
      */
 
+    @Override
     public void publish(Topic topic, Message message, int deliveryMode, int priority, long timeToLive) throws JMSException {
         super.send(topic, message, deliveryMode, priority, timeToLive);
     }
diff --git a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelTopicSubscriber.java b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelTopicSubscriber.java
index ce49154..9e1f846 100644
--- a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelTopicSubscriber.java
+++ b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelTopicSubscriber.java
@@ -41,6 +41,7 @@ public class CamelTopicSubscriber extends CamelMessageConsumer implements TopicS
      *             for this topic subscriber due to some internal error.
      */
 
+    @Override
     public Topic getTopic() throws JMSException {
         checkClosed();
         return (Topic)super.getDestination();
@@ -56,6 +57,7 @@ public class CamelTopicSubscriber extends CamelMessageConsumer implements TopicS
      *             some internal error.
      */
 
+    @Override
     public boolean getNoLocal() throws JMSException {
         checkClosed();
         return super.isNoLocal();
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteForceTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteForceTest.java
index 20a7706..e2df2e2 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteForceTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteForceTest.java
@@ -26,6 +26,7 @@ import org.apache.camel.component.jms.JmsMessage;
  */
 public class ActiveMQJmsHeaderRouteForceTest extends ActiveMQJmsHeaderRouteTest {
 
+    @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteTest.java
index ee333cc..1c66828 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteTest.java
@@ -69,6 +69,7 @@ public class ActiveMQJmsHeaderRouteTest extends CamelTestSupport {
         assertEquals("ReplyTo", replyQueue.toString(), destination.toString());
     }
 
+    @Override
     protected CamelContext createCamelContext() throws Exception {
         CamelContext camelContext = super.createCamelContext();
         camelContext.setTracing(true);
@@ -80,6 +81,7 @@ public class ActiveMQJmsHeaderRouteTest extends CamelTestSupport {
         return camelContext;
     }
 
+    @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQOriginalDestinationTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQOriginalDestinationTest.java
index 623160d..29ceea5 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQOriginalDestinationTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQOriginalDestinationTest.java
@@ -56,6 +56,7 @@ public class ActiveMQOriginalDestinationTest extends CamelTestSupport {
         assertEquals("Queue", original.getDestinationTypeAsString());
     }
 
+    @Override
     protected CamelContext createCamelContext() throws Exception {
         CamelContext camelContext = super.createCamelContext();
         camelContext.addComponent("activemq", activeMQComponent("vm://localhost?broker.persistent=false"));
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 42eb0bc..5d8ba0b 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
@@ -91,6 +91,7 @@ public class ActiveMQReplyToHeaderUsingConverterTest extends CamelTestSupport {
         assertMessageHeader(in, "JMSXGroupID", groupID);
     }
 
+    @Override
     protected CamelContext createCamelContext() throws Exception {
         CamelContext camelContext = super.createCamelContext();
 
@@ -101,6 +102,7 @@ public class ActiveMQReplyToHeaderUsingConverterTest extends CamelTestSupport {
         return camelContext;
     }
 
+    @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQRouteTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQRouteTest.java
index f6a22f5..4e4b37a 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQRouteTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQRouteTest.java
@@ -49,6 +49,7 @@ public class ActiveMQRouteTest extends CamelTestSupport {
         template.sendBodyAndHeader(startEndpointUri, expectedBody, "cheese", 123);
     }
 
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();
@@ -56,6 +57,7 @@ public class ActiveMQRouteTest extends CamelTestSupport {
         resultEndpoint = (MockEndpoint)context.getEndpoint("mock:result");
     }
 
+    @Override
     protected CamelContext createCamelContext() throws Exception {
         CamelContext camelContext = super.createCamelContext();
 
@@ -66,6 +68,7 @@ public class ActiveMQRouteTest extends CamelTestSupport {
         return camelContext;
     }
 
+    @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AdvisoryConsumerExample.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AdvisoryConsumerExample.java
index cccc39a..bba0a26 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AdvisoryConsumerExample.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AdvisoryConsumerExample.java
@@ -40,6 +40,7 @@ public class AdvisoryConsumerExample extends CamelTestSupport {
         Thread.sleep(10000);
     }
 
+    @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/CamelJmsTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/CamelJmsTest.java
index 98c0db6..a48e312 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/CamelJmsTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/CamelJmsTest.java
@@ -99,6 +99,7 @@ public class CamelJmsTest extends CamelSpringTestSupport {
         return 0;
     }
 
+    @Override
     protected ClassPathXmlApplicationContext createApplicationContext() {
         return new ClassPathXmlApplicationContext("org/apache/camel/component/activemq/spring.xml");
     }
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 abf5985..8808c02 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
@@ -85,6 +85,7 @@ public class InvokeRequestReplyUsingJmsReplyToHeaderTest extends CamelTestSuppor
         assertEquals("ReplyTo", replyQueueName, destination.toString());
     }
 
+    @Override
     protected CamelContext createCamelContext() throws Exception {
         CamelContext camelContext = super.createCamelContext();
 
@@ -95,6 +96,7 @@ public class InvokeRequestReplyUsingJmsReplyToHeaderTest extends CamelTestSuppor
         return camelContext;
     }
 
+    @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsSimpleRequestReplyTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsSimpleRequestReplyTest.java
index f01ec3c..3e58395 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsSimpleRequestReplyTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsSimpleRequestReplyTest.java
@@ -47,6 +47,7 @@ public class JmsSimpleRequestReplyTest extends CamelTestSupport {
         result.assertIsSatisfied();
     }
 
+    @Override
     protected CamelContext createCamelContext() throws Exception {
         CamelContext camelContext = super.createCamelContext();
 
@@ -68,6 +69,7 @@ public class JmsSimpleRequestReplyTest extends CamelTestSupport {
         return pooled;
     }
 
+    @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/SetGroupIdProcessor.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/SetGroupIdProcessor.java
index 3e31565..b976f26 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/SetGroupIdProcessor.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/SetGroupIdProcessor.java
@@ -24,6 +24,7 @@ import org.apache.camel.Processor;
  * 
  */
 public class SetGroupIdProcessor implements Processor {
+    @Override
     public void process(Exchange exchange) throws Exception {
         // lets copy the IN to the OUT message
         Message out = exchange.getOut();
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeJmsMessageListenerTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeJmsMessageListenerTest.java
index 57b3f87..3c32760 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeJmsMessageListenerTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeJmsMessageListenerTest.java
@@ -53,6 +53,7 @@ public class InvokeJmsMessageListenerTest extends CamelTestSupport {
     protected static class MyMessageListener implements MessageListener {
         public Message message;
 
+        @Override
         public void onMessage(Message message) {
             this.message = message;
         }
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeMessageListenerTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeMessageListenerTest.java
index 892a4c5..c4b2de3 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeMessageListenerTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeMessageListenerTest.java
@@ -54,12 +54,14 @@ public class InvokeMessageListenerTest extends CamelTestSupport {
         assertEquals("Text mesage body: " + textMessage, expectedBody, textMessage.getText());
     }
 
+    @Override
     protected CamelContext createCamelContext() throws Exception {
         CamelContext camelContext = super.createCamelContext();
         camelContext.addComponent("activemq", activeMQComponent("vm://localhost?broker.persistent=false"));
         return camelContext;
     }
 
+    @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
diff --git a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
index 764ef50..27f66d8 100644
--- a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
+++ b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
@@ -203,6 +203,7 @@ public class WsEndpoint extends AhcEndpoint {
             }
         }
 
+        @Override
         public void onPingFrame(byte[] payload) {
             log.debug("Received ping --> {}", payload);
             websocket.sendPongFrame(payload);
diff --git a/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcEndpoint.java b/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcEndpoint.java
index 38566e1..1ed5750 100644
--- a/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcEndpoint.java
+++ b/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcEndpoint.java
@@ -149,6 +149,7 @@ public class AhcEndpoint extends DefaultEndpoint implements AsyncEndpoint, Heade
         this.binding = binding;
     }
 
+    @Override
     public HeaderFilterStrategy getHeaderFilterStrategy() {
         return headerFilterStrategy;
     }
@@ -156,6 +157,7 @@ public class AhcEndpoint extends DefaultEndpoint implements AsyncEndpoint, Heade
     /**
      * To use a custom HeaderFilterStrategy to filter header to and from Camel message.
      */
+    @Override
     public void setHeaderFilterStrategy(HeaderFilterStrategy headerFilterStrategy) {
         this.headerFilterStrategy = headerFilterStrategy;
     }
diff --git a/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/DefaultAhcBinding.java b/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/DefaultAhcBinding.java
index 9a77570..e496f4b 100644
--- a/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/DefaultAhcBinding.java
+++ b/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/DefaultAhcBinding.java
@@ -58,6 +58,7 @@ public class DefaultAhcBinding implements AhcBinding {
     protected final Logger log = LoggerFactory.getLogger(this.getClass());
     protected HeaderFilterStrategy httpProtocolHeaderFilterStrategy = new HttpProtocolHeaderFilterStrategy();
 
+    @Override
     public Request prepareRequest(AhcEndpoint endpoint, Exchange exchange) throws CamelExchangeException {
         if (endpoint.isBridgeEndpoint()) {
             exchange.setProperty(Exchange.SKIP_GZIP_ENCODING, Boolean.TRUE);
diff --git a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java
index a6fddde..f92761f 100644
--- a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java
+++ b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java
@@ -20,6 +20,7 @@ import org.apache.camel.support.jsse.SSLContextParameters;
 
 public class AhcComponentClientConfigSslContextParametersTest extends AhcComponentClientConfigTest {
 
+    @Override
     public void configureComponent() {
         super.configureComponent();
         
@@ -27,10 +28,12 @@ public class AhcComponentClientConfigSslContextParametersTest extends AhcCompone
         component.setSslContextParameters(context.getRegistry().lookupByNameAndType("sslContextParameters", SSLContextParameters.class));
     }
 
+    @Override
     protected String getTestServerEndpointUri() {
         return super.getTestServerEndpointUri() + "?sslContextParameters=#sslContextParameters";
     }
     
+    @Override
     protected String getTestServerEndpointTwoUri() {
         return super.getTestServerEndpointTwoUri() + "?sslContextParameters=#sslContextParameters";
     }
diff --git a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigWithClientConfigUriParametersTest.java b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigWithClientConfigUriParametersTest.java
index c8737bb..2e827b7 100644
--- a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigWithClientConfigUriParametersTest.java
+++ b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigWithClientConfigUriParametersTest.java
@@ -21,6 +21,7 @@ import org.junit.Test;
 
 public class AhcComponentClientConfigWithClientConfigUriParametersTest extends AhcComponentClientConfigTest {
 
+    @Override
     @Test
     public void testAhcComponentClientConfig() throws Exception {
         super.testAhcComponentClientConfig();
diff --git a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceClientConfigWithClientConfigUriParametersTest.java b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceClientConfigWithClientConfigUriParametersTest.java
index ce20aaa..0b023d7 100644
--- a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceClientConfigWithClientConfigUriParametersTest.java
+++ b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceClientConfigWithClientConfigUriParametersTest.java
@@ -21,6 +21,7 @@ import org.junit.Test;
 
 public class AhcProduceClientConfigWithClientConfigUriParametersTest extends AhcProduceClientConfigTest {
 
+    @Override
     @Test
     public void testAhcProduceClientConfig() throws Exception {
         super.testAhcProduceClientConfig();
diff --git a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceSSLContextParametersGetTest.java b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceSSLContextParametersGetTest.java
index aa358cb..eeeba54 100644
--- a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceSSLContextParametersGetTest.java
+++ b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceSSLContextParametersGetTest.java
@@ -18,10 +18,12 @@ package org.apache.camel.component.ahc;
 
 public class AhcProduceSSLContextParametersGetTest extends AhcProduceGetTest {
 
+    @Override
     protected String getTestServerEndpointUri() {
         return super.getTestServerEndpointUri() + "?sslContextParameters=#sslContextParameters";
     }
     
+    @Override
     protected String getAhcEndpointUri() {
         return super.getAhcEndpointUri() + "?sslContextParameters=#sslContextParameters";
     }
diff --git a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/HttpHeaderFilterStrategyTest.java b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/HttpHeaderFilterStrategyTest.java
index 32c4682..6b198c3 100644
--- a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/HttpHeaderFilterStrategyTest.java
+++ b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/HttpHeaderFilterStrategyTest.java
@@ -28,6 +28,7 @@ public class HttpHeaderFilterStrategyTest extends CamelTestSupport {
     private HttpHeaderFilterStrategy filter;
     private Exchange exchange;
 
+    @Override
     @Before
     public void setUp() {
         filter = new HttpHeaderFilterStrategy();
diff --git a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
index 1033fef..9ada047 100644
--- a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
+++ b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
@@ -96,6 +96,7 @@ public class AMQPRouteTest extends CamelTestSupport {
 
     // Routes fixtures
 
+    @Override
     protected CamelContext createCamelContext() throws Exception {
         CamelContext camelContext = super.createCamelContext();
         camelContext.getRegistry().bind("amqpConnection", discoverAMQP(camelContext));
@@ -103,6 +104,7 @@ public class AMQPRouteTest extends CamelTestSupport {
         return camelContext;
     }
 
+    @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
diff --git a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTraceFrameTest.java b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTraceFrameTest.java
index 3a1870c..3f35ede 100644
--- a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTraceFrameTest.java
+++ b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTraceFrameTest.java
@@ -64,6 +64,7 @@ public class AMQPRouteTraceFrameTest extends CamelTestSupport {
         resultEndpoint.assertIsSatisfied();
     }
 
+    @Override
     protected CamelContext createCamelContext() throws Exception {
         CamelContext camelContext = super.createCamelContext();
 
@@ -76,6 +77,7 @@ public class AMQPRouteTraceFrameTest extends CamelTestSupport {
         return camelContext;
     }
 
+    @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
diff --git a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/artemis/AMQPEmbeddedBrokerTest.java b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/artemis/AMQPEmbeddedBrokerTest.java
index 5535742..31e1c1a 100644
--- a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/artemis/AMQPEmbeddedBrokerTest.java
+++ b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/artemis/AMQPEmbeddedBrokerTest.java
@@ -85,6 +85,7 @@ public class AMQPEmbeddedBrokerTest extends CamelTestSupport {
         resultEndpoint.assertIsSatisfied();
     }
     
+    @Override
     protected CamelContext createCamelContext() throws Exception {
         CamelContext camelContext = super.createCamelContext();
         camelContext.getRegistry().bind("amqpConnection", discoverAMQP(camelContext));
@@ -92,6 +93,7 @@ public class AMQPEmbeddedBrokerTest extends CamelTestSupport {
         return camelContext;
     }
     
+    @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
diff --git a/components/camel-apns/src/main/java/org/apache/camel/component/apns/ApnsComponent.java b/components/camel-apns/src/main/java/org/apache/camel/component/apns/ApnsComponent.java
index eeec69a..611dac3 100644
--- a/components/camel-apns/src/main/java/org/apache/camel/component/apns/ApnsComponent.java
+++ b/components/camel-apns/src/main/java/org/apache/camel/component/apns/ApnsComponent.java
@@ -41,6 +41,7 @@ public class ApnsComponent extends DefaultComponent {
         this.apnsService = apnsService;
     }
 
+    @Override
     protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
         ApnsEndpoint endpoint = new ApnsEndpoint(uri, this);
         endpoint.setName(remaining);
diff --git a/components/camel-apns/src/main/java/org/apache/camel/component/apns/ApnsConsumer.java b/components/camel-apns/src/main/java/org/apache/camel/component/apns/ApnsConsumer.java
index ada1d80..a44b992 100644
--- a/components/camel-apns/src/main/java/org/apache/camel/component/apns/ApnsConsumer.java
+++ b/components/camel-apns/src/main/java/org/apache/camel/component/apns/ApnsConsumer.java
@@ -42,6 +42,7 @@ public class ApnsConsumer extends ScheduledPollConsumer {
         setUseFixedDelay(DEFAULT_APNS_FIXED_DELAY);
     }
 
+    @Override
     protected int poll() throws Exception {
         List<InactiveDevice> inactiveDeviceList = getInactiveDevices();
 
diff --git a/components/camel-apns/src/main/java/org/apache/camel/component/apns/ApnsEndpoint.java b/components/camel-apns/src/main/java/org/apache/camel/component/apns/ApnsEndpoint.java
index 3057356..d65e96f 100644
--- a/components/camel-apns/src/main/java/org/apache/camel/component/apns/ApnsEndpoint.java
+++ b/components/camel-apns/src/main/java/org/apache/camel/component/apns/ApnsEndpoint.java
@@ -77,12 +77,14 @@ public class ApnsEndpoint extends ScheduledPollEndpoint {
         return consumers;
     }
 
+    @Override
     public Consumer createConsumer(Processor processor) throws Exception {
         ApnsConsumer apnsConsumer = new ApnsConsumer(this, processor);
         configureConsumer(apnsConsumer);
         return apnsConsumer;
     }
 
+    @Override
     public Producer createProducer() throws Exception {
         return new ApnsProducer(this);
     }
diff --git a/components/camel-apns/src/main/java/org/apache/camel/component/apns/ApnsProducer.java b/components/camel-apns/src/main/java/org/apache/camel/component/apns/ApnsProducer.java
index a74cef0..1bf6724 100644
--- a/components/camel-apns/src/main/java/org/apache/camel/component/apns/ApnsProducer.java
+++ b/components/camel-apns/src/main/java/org/apache/camel/component/apns/ApnsProducer.java
@@ -60,6 +60,7 @@ public class ApnsProducer extends DefaultProducer {
         return tokenList != null;
     }
 
+    @Override
     public void process(Exchange exchange) throws Exception {
         notify(exchange);
     }
diff --git a/components/camel-apns/src/main/java/org/apache/camel/component/apns/factory/ApnsServiceFactory.java b/components/camel-apns/src/main/java/org/apache/camel/component/apns/factory/ApnsServiceFactory.java
index 72728fc..3404d7f 100644
--- a/components/camel-apns/src/main/java/org/apache/camel/component/apns/factory/ApnsServiceFactory.java
+++ b/components/camel-apns/src/main/java/org/apache/camel/component/apns/factory/ApnsServiceFactory.java
@@ -72,10 +72,12 @@ public class ApnsServiceFactory implements CamelContextAware {
         this.camelContext = camelContext;
     }
 
+    @Override
     public CamelContext getCamelContext() {
         return camelContext;
     }
 
+    @Override
     public void setCamelContext(CamelContext camelContext) {
         this.camelContext = camelContext;
     }
diff --git a/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsConsumerTest.java b/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsConsumerTest.java
index 172ed41..a3f973a 100644
--- a/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsConsumerTest.java
+++ b/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsConsumerTest.java
@@ -73,6 +73,7 @@ public class ApnsConsumerTest extends CamelTestSupport {
         assertEquals(deviceToken, inactiveDevice.getDeviceToken());
     }
 
+    @Override
     protected CamelContext createCamelContext() throws Exception {
         CamelContext camelContext = super.createCamelContext();
 
@@ -86,6 +87,7 @@ public class ApnsConsumerTest extends CamelTestSupport {
         return camelContext;
     }
 
+    @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
diff --git a/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsProducerTest.java b/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsProducerTest.java
index fe3d72b..6a722ec 100644
--- a/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsProducerTest.java
+++ b/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsProducerTest.java
@@ -83,6 +83,7 @@ public class ApnsProducerTest extends CamelTestSupport {
 
     }
 
+    @Override
     protected CamelContext createCamelContext() throws Exception {
         CamelContext camelContext = super.createCamelContext();
 
@@ -95,6 +96,7 @@ public class ApnsProducerTest extends CamelTestSupport {
         return camelContext;
     }
 
+    @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
diff --git a/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsProducerWithoutTokensHeaderTest.java b/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsProducerWithoutTokensHeaderTest.java
index 0043873..082d893 100644
--- a/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsProducerWithoutTokensHeaderTest.java
+++ b/components/camel-apns/src/test/java/org/apache/camel/component/apns/ApnsProducerWithoutTokensHeaderTest.java
@@ -64,6 +64,7 @@ public class ApnsProducerWithoutTokensHeaderTest extends CamelTestSupport {
         assertArrayEquals(apnsNotification.marshall(), server.getReceived().toByteArray());
     }
 
+    @Override
     protected CamelContext createCamelContext() throws Exception {
         CamelContext camelContext = super.createCamelContext();
 
@@ -76,6 +77,7 @@ public class ApnsProducerWithoutTokensHeaderTest extends CamelTestSupport {
         return camelContext;
     }
 
+    @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/CanonicalOutputStream.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/CanonicalOutputStream.java
index 710a626..7b7f22e 100644
--- a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/CanonicalOutputStream.java
+++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/CanonicalOutputStream.java
@@ -39,6 +39,7 @@ public class CanonicalOutputStream extends FilterOutputStream {
         lastByte = -1;
     }
 
+    @Override
     public void write(int i) throws IOException {
         if (i == '\r') {
             // convert all carriage-return characters into line-break sequence
@@ -57,10 +58,12 @@ public class CanonicalOutputStream extends FilterOutputStream {
         lastByte = i;
     }
 
+    @Override
     public void write(byte[] buf) throws IOException {
         this.write(buf, 0, buf.length);
     }
 
+    @Override
     public void write(byte buf[], int off, int len) throws IOException {
         for (int i = off; i != off + len; i++) {
             this.write(buf[i]);
diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/MimeEntity.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/MimeEntity.java
index 557e559..e6a28cb 100644
--- a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/MimeEntity.java
+++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/MimeEntity.java
@@ -50,6 +50,7 @@ public abstract class MimeEntity extends AbstractHttpEntity {
             super(os);
         }
 
+        @Override
         public void close() {
             // do nothing
         }
diff --git a/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Endpoint.java b/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Endpoint.java
index 25f4f1a..5a9a8a7 100644
--- a/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Endpoint.java
+++ b/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Endpoint.java
@@ -79,10 +79,12 @@ public class AS2Endpoint extends AbstractApiEndpoint<AS2ApiName, AS2Configuratio
         return as2ServerConnection;
     }
 
+    @Override
     public Producer createProducer() throws Exception {
         return new AS2Producer(this);
     }
 
+    @Override
     public Consumer createConsumer(Processor processor) throws Exception {
         // make sure inBody is not set for consumers
         if (inBody != null) {
@@ -228,6 +230,7 @@ public class AS2Endpoint extends AbstractApiEndpoint<AS2ApiName, AS2Configuratio
         return AS2PropertiesHelper.getHelper();
     }
 
+    @Override
     protected String getThreadProfileName() {
         return AS2Constants.THREAD_PROFILE_NAME;
     }
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 ede4224..4142012 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
@@ -166,6 +166,7 @@ public class AS2ClientManagerIntegrationTest extends AbstractAS2TestSupport {
     private List<X509Certificate> certList;
     private AS2SignedDataGenerator gen;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();
diff --git a/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskConsumerTest.java b/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskConsumerTest.java
index ef7e939..2741c81 100644
--- a/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskConsumerTest.java
+++ b/components/camel-asterisk/src/test/java/org/apache/camel/component/asterisk/AsteriskConsumerTest.java
@@ -54,6 +54,7 @@ public class AsteriskConsumerTest extends CamelTestSupport {
         // do nothing here , just make sure the camel route can started.
     }
 
+    @Override
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             public void configure() {
diff --git a/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/AtmosComponent.java b/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/AtmosComponent.java
index bc99014..b1254d1 100644
--- a/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/AtmosComponent.java
+++ b/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/AtmosComponent.java
@@ -44,6 +44,7 @@ public class AtmosComponent extends DefaultComponent {
         super(context);
     }
 
+    @Override
     protected AtmosEndpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
         AtmosConfiguration configuration = new AtmosConfiguration();
 
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 c1db1f7..7f1371e 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
@@ -64,6 +64,7 @@ public class AtmosEndpoint extends DefaultEndpoint {
      * @return the camel producer
      * @throws Exception
      */
+    @Override
     public Producer createProducer() throws Exception {
         log.debug("resolve producer atmos endpoint {{}}", configuration.getOperation());
         log.debug("resolve producer atmos attached client: {}", configuration.getClient());
@@ -87,6 +88,7 @@ public class AtmosEndpoint extends DefaultEndpoint {
      * @return the camel consumer
      * @throws Exception
      */
+    @Override
     public Consumer createConsumer(Processor processor) throws Exception {
         log.debug("resolve consumer atmos endpoint {{}}", configuration.getOperation());
         log.debug("resolve consumer atmos attached client:{}", configuration.getClient());
diff --git a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterTestSupport.java b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterTestSupport.java
index 0d5051d..95dedef 100644
--- a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterTestSupport.java
+++ b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterTestSupport.java
@@ -34,6 +34,7 @@ public class WebsocketCamelRouterTestSupport extends CamelTestSupport {
 
     protected ServletHolder servletHolder;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         server = new Server(PORT);
@@ -53,6 +54,7 @@ public class WebsocketCamelRouterTestSupport extends CamelTestSupport {
         server.start();
     }
     
+    @Override
     @After
     public void tearDown() throws Exception {
         if (startCamelContext) {
diff --git a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterWithInitParamTestSupport.java b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterWithInitParamTestSupport.java
index 402b0a3..ff59fb7 100644
--- a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterWithInitParamTestSupport.java
+++ b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterWithInitParamTestSupport.java
@@ -34,6 +34,7 @@ public class WebsocketCamelRouterWithInitParamTestSupport extends CamelTestSuppo
 
     protected ServletHolder servletHolder;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         server = new Server(PORT);
@@ -54,6 +55,7 @@ public class WebsocketCamelRouterWithInitParamTestSupport extends CamelTestSuppo
         server.start();
     }
     
+    @Override
     @After
     public void tearDown() throws Exception {
         if (startCamelContext) {
diff --git a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRouteTest.java b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRouteTest.java
index 585a728..136fcea 100644
--- a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRouteTest.java
+++ b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRouteTest.java
@@ -125,6 +125,7 @@ public class WebsocketRouteTest extends WebsocketCamelRouterTestSupport {
     }
 
     // START SNIPPET: payload
+    @Override
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             public void configure() {
diff --git a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRouteWithInitParamTest.java b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRouteWithInitParamTest.java
index e932fe0..538cf11 100644
--- a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRouteWithInitParamTest.java
+++ b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketRouteWithInitParamTest.java
@@ -141,6 +141,7 @@ public class WebsocketRouteWithInitParamTest extends WebsocketCamelRouterWithIni
     }
 
     // START SNIPPET: payload
+    @Override
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             public void configure() {
diff --git a/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomProducer.java b/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomProducer.java
index 0f13840..cf91770 100644
--- a/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomProducer.java
+++ b/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomProducer.java
@@ -28,6 +28,7 @@ public class AtomProducer extends DefaultProducer {
         super(endpoint);
     }
 
+    @Override
     public void process(Exchange exchange) throws Exception {
         throw new UnsupportedOperationException("AtomProducer is not implemented");
     }
diff --git a/components/camel-atom/src/main/java/org/apache/camel/component/atom/UpdatedDateFilter.java b/components/camel-atom/src/main/java/org/apache/camel/component/atom/UpdatedDateFilter.java
index 36fd7a6..2425b2f 100644
--- a/components/camel-atom/src/main/java/org/apache/camel/component/atom/UpdatedDateFilter.java
+++ b/components/camel-atom/src/main/java/org/apache/camel/component/atom/UpdatedDateFilter.java
@@ -37,7 +37,8 @@ public class UpdatedDateFilter implements EntryFilter {
         this.lastUpdate = lastUpdate;
     }
 
-    public boolean isValidEntry(FeedEndpoint endpoint, Object feed, Object entry) {        
+    @Override
+    public boolean isValidEntry(FeedEndpoint endpoint, Object feed, Object entry) {
         Date updated = ((Entry)entry).getUpdated();
         if (updated == null) {
             // never been updated so get published date
diff --git a/components/camel-atom/src/main/java/org/apache/camel/component/feed/FeedComponent.java b/components/camel-atom/src/main/java/org/apache/camel/component/feed/FeedComponent.java
index 5a0a145..59c498c 100644
--- a/components/camel-atom/src/main/java/org/apache/camel/component/feed/FeedComponent.java
+++ b/components/camel-atom/src/main/java/org/apache/camel/component/feed/FeedComponent.java
@@ -28,6 +28,7 @@ public abstract class FeedComponent extends DefaultComponent {
     public FeedComponent() {
     }
 
+    @Override
     protected abstract FeedEndpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception;
 
 }
diff --git a/components/camel-atom/src/main/java/org/apache/camel/component/feed/FeedEndpoint.java b/components/camel-atom/src/main/java/org/apache/camel/component/feed/FeedEndpoint.java
index 3abe565..15ed9c3 100644
--- a/components/camel-atom/src/main/java/org/apache/camel/component/feed/FeedEndpoint.java
+++ b/components/camel-atom/src/main/java/org/apache/camel/component/feed/FeedEndpoint.java
@@ -60,10 +60,12 @@ public abstract class FeedEndpoint extends DefaultPollingEndpoint {
         this.feedUri = feedUri;
     }
 
+    @Override
     public Producer createProducer() throws Exception {
         throw new UnsupportedOperationException("FeedProducer is not implemented");
     }
 
+    @Override
     public Consumer createConsumer(Processor processor) throws Exception {
         ObjectHelper.notNull(feedUri, "feedUri");
 
@@ -192,6 +194,7 @@ public abstract class FeedEndpoint extends DefaultPollingEndpoint {
         return sortEntries;
     }      
 
+    @Override
     public boolean isLenientProperties() {
         // true to allow dynamic URI options to be configured and passed to external system for eg. the HttpProducer
         return true;
diff --git a/components/camel-atom/src/main/java/org/apache/camel/component/feed/FeedEntryPollingConsumer.java b/components/camel-atom/src/main/java/org/apache/camel/component/feed/FeedEntryPollingConsumer.java
index 3e87975..0b88050 100644
--- a/components/camel-atom/src/main/java/org/apache/camel/component/feed/FeedEntryPollingConsumer.java
+++ b/components/camel-atom/src/main/java/org/apache/camel/component/feed/FeedEntryPollingConsumer.java
@@ -41,6 +41,7 @@ public abstract class FeedEntryPollingConsumer extends FeedPollingConsumer {
         this.throttleEntries = throttleEntries;
     }
 
+    @Override
     public int poll() throws Exception {
         if (feed == null) {
             // populate new feed
diff --git a/components/camel-atom/src/main/java/org/apache/camel/component/feed/FeedPollingConsumer.java b/components/camel-atom/src/main/java/org/apache/camel/component/feed/FeedPollingConsumer.java
index d081817..9c4ccf2 100644
--- a/components/camel-atom/src/main/java/org/apache/camel/component/feed/FeedPollingConsumer.java
+++ b/components/camel-atom/src/main/java/org/apache/camel/component/feed/FeedPollingConsumer.java
@@ -32,6 +32,7 @@ public abstract class FeedPollingConsumer extends ScheduledPollConsumer {
         this.endpoint = endpoint;
     }
 
+    @Override
     protected int poll() throws Exception {
         Object feed = createFeed();
         if (feed != null) {
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEndpointTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEndpointTest.java
index 4a08dcf..cf96c44 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEndpointTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEndpointTest.java
@@ -23,6 +23,7 @@ import org.apache.camel.builder.RouteBuilder;
  */
 public class AtomEndpointTest extends AtomPollingConsumerTest {
 
+    @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerTest.java
index f0e7273..026f6d9 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerTest.java
@@ -56,6 +56,7 @@ public class AtomEntryPollingConsumerTest extends CamelTestSupport {
         registry.bind("myDate", df.parse("2007-11-13 14:35:00 +0100"));
     }
 
+    @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntrySortTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntrySortTest.java
index 2b2dbf5..cfd024e 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntrySortTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntrySortTest.java
@@ -52,6 +52,7 @@ public class AtomEntrySortTest extends CamelTestSupport {
         registry.bind("myBean", new MyBean());
     }
 
+    @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomHttpConsumerTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomHttpConsumerTest.java
index 5344976..29313a2 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomHttpConsumerTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomHttpConsumerTest.java
@@ -35,6 +35,7 @@ public class AtomHttpConsumerTest extends CamelTestSupport {
         mock.assertIsSatisfied();
     }
 
+    @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerIdleMessageTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerIdleMessageTest.java
index 6afd28c..413c454 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerIdleMessageTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerIdleMessageTest.java
@@ -37,6 +37,7 @@ public class AtomPollingConsumerIdleMessageTest extends CamelTestSupport {
         assertTrue(mock.getExchanges().get(1).getIn().getBody() == null);
     }
 
+    @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerTest.java
index cfc7dcf..93376fb 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerTest.java
@@ -63,6 +63,7 @@ public class AtomPollingConsumerTest extends CamelTestSupport {
         assertEquals("file:src/test/data/feed.atom", endpoint.getFeedUri());
     }
 
+    @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingLowDelayTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingLowDelayTest.java
index 6bfc856..cb01a43 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingLowDelayTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingLowDelayTest.java
@@ -34,6 +34,7 @@ public class AtomPollingLowDelayTest extends CamelTestSupport {
         mock.assertIsSatisfied();
     }
 
+    @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingUnthrottledTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingUnthrottledTest.java
index 1ad6217..2f86e1b 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingUnthrottledTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingUnthrottledTest.java
@@ -32,6 +32,7 @@ public class AtomPollingUnthrottledTest extends CamelTestSupport {
         assertMockEndpointsSatisfied();
     }
 
+    @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
diff --git a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/map/AtomixMapConfiguration.java b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/map/AtomixMapConfiguration.java
index d1bd6b9..d161bf5 100644
--- a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/map/AtomixMapConfiguration.java
+++ b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/map/AtomixMapConfiguration.java
@@ -72,6 +72,7 @@ public final class AtomixMapConfiguration extends AtomixClientConfiguration {
     // Copy
     // ****************************************
 
+    @Override
     public AtomixMapConfiguration copy() {
         try {
             return (AtomixMapConfiguration) super.clone();
diff --git a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingConfiguration.java b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingConfiguration.java
index 439d0fc..de6aa0c 100644
--- a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingConfiguration.java
+++ b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingConfiguration.java
@@ -84,6 +84,7 @@ public class AtomixMessagingConfiguration extends AtomixClientConfiguration {
     // Copy
     // ****************************************
 
+    @Override
     public AtomixMessagingConfiguration copy() {
         try {
             return (AtomixMessagingConfiguration) super.clone();
diff --git a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapConfiguration.java b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapConfiguration.java
index 6cabdf1..4c59ba5 100644
--- a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapConfiguration.java
+++ b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapConfiguration.java
@@ -72,6 +72,7 @@ public class AtomixMultiMapConfiguration extends AtomixClientConfiguration {
     // Copy
     // ****************************************
 
+    @Override
     public AtomixMultiMapConfiguration copy() {
         try {
             return (AtomixMultiMapConfiguration) super.clone();
diff --git a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/queue/AtomixQueueConfiguration.java b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/queue/AtomixQueueConfiguration.java
index 5f270a1..360bb2e 100644
--- a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/queue/AtomixQueueConfiguration.java
+++ b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/queue/AtomixQueueConfiguration.java
@@ -45,6 +45,7 @@ public class AtomixQueueConfiguration extends AtomixClientConfiguration {
     // Copy
     // ****************************************
 
+    @Override
     public AtomixQueueConfiguration copy() {
         try {
             return (AtomixQueueConfiguration) super.clone();
diff --git a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/set/AtomixSetConfiguration.java b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/set/AtomixSetConfiguration.java
index c88875c..c4dfce4 100644
--- a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/set/AtomixSetConfiguration.java
+++ b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/set/AtomixSetConfiguration.java
@@ -58,6 +58,7 @@ public class AtomixSetConfiguration extends AtomixClientConfiguration {
     // Copy
     // ****************************************
 
+    @Override
     public AtomixSetConfiguration copy() {
         try {
             return (AtomixSetConfiguration) super.clone();
diff --git a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/value/AtomixValueConfiguration.java b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/value/AtomixValueConfiguration.java
index c2d3919..c6fe1df 100644
--- a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/value/AtomixValueConfiguration.java
+++ b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/value/AtomixValueConfiguration.java
@@ -58,6 +58,7 @@ public class AtomixValueConfiguration extends AtomixClientConfiguration {
     // Copy
     // ****************************************
 
+    @Override
     public AtomixValueConfiguration copy() {
         try {
             return (AtomixValueConfiguration) super.clone();
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapConsumerTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapConsumerTest.java
index 8c965df..8c2fa20 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapConsumerTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/client/map/AtomixMapConsumerTest.java
@@ -40,6 +40,7 @@ public class AtomixMapConsumerTest extends AtomixClientTestSupport {
     // Setup
     // ************************************
 
+    @Override
     @BindToRegistry("atomix-map")
     public Map<String, Component> createComponents() {
         AtomixMapComponent component = new AtomixMapComponent();
diff --git a/components/camel-attachments/src/main/java/org/apache/camel/attachment/DefaultAttachment.java b/components/camel-attachments/src/main/java/org/apache/camel/attachment/DefaultAttachment.java
index 466e317..0cf360b 100644
--- a/components/camel-attachments/src/main/java/org/apache/camel/attachment/DefaultAttachment.java
+++ b/components/camel-attachments/src/main/java/org/apache/camel/attachment/DefaultAttachment.java
@@ -110,6 +110,7 @@ public class DefaultAttachment implements Attachment {
         return new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
     }
 
+    @Override
     public boolean equals(Object other) {
         if (other instanceof Attachment) {
             DataHandler otherDh = ((Attachment)other).getDataHandler();
@@ -118,6 +119,7 @@ public class DefaultAttachment implements Attachment {
         return false;
     }
 
+    @Override
     public int hashCode() {
         return dataHandler.hashCode();
     }
diff --git a/components/camel-attachments/src/test/java/org/apache/camel/attachment/BeanMethodWithExchangeTest.java b/components/camel-attachments/src/test/java/org/apache/camel/attachment/BeanMethodWithExchangeTest.java
index 24ea353..9f29328 100644
--- a/components/camel-attachments/src/test/java/org/apache/camel/attachment/BeanMethodWithExchangeTest.java
+++ b/components/camel-attachments/src/test/java/org/apache/camel/attachment/BeanMethodWithExchangeTest.java
@@ -45,6 +45,7 @@ public class BeanMethodWithExchangeTest extends CamelTestSupport {
         Assert.assertFalse(result.getMessage(AttachmentMessage.class).getAttachments().containsKey("attachment"));
     }
 
+    @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
diff --git a/components/camel-avro/src/main/java/org/apache/camel/dataformat/avro/AvroDataFormat.java b/components/camel-avro/src/main/java/org/apache/camel/dataformat/avro/AvroDataFormat.java
index 5241896..05d83b5 100644
--- a/components/camel-avro/src/main/java/org/apache/camel/dataformat/avro/AvroDataFormat.java
+++ b/components/camel-avro/src/main/java/org/apache/camel/dataformat/avro/AvroDataFormat.java
@@ -63,10 +63,12 @@ public class AvroDataFormat extends ServiceSupport implements DataFormat, DataFo
         return "avro";
     }
 
+    @Override
     public CamelContext getCamelContext() {
         return camelContext;
     }
 
+    @Override
     public void setCamelContext(CamelContext camelContext) {
         this.camelContext = camelContext;
     }
@@ -124,6 +126,7 @@ public class AvroDataFormat extends ServiceSupport implements DataFormat, DataFo
         }
     }
 
+    @Override
     public void marshal(Exchange exchange, Object graph, OutputStream outputStream) throws Exception {
         // the schema should be from the graph class name
         Schema useSchema = actualSchema != null ? actualSchema : loadSchema(graph.getClass().getName());
@@ -134,6 +137,7 @@ public class AvroDataFormat extends ServiceSupport implements DataFormat, DataFo
         encoder.flush();
     }
 
+    @Override
     public Object unmarshal(Exchange exchange, InputStream inputStream) throws Exception {
         ObjectHelper.notNull(actualSchema, "schema", this);
 
diff --git a/components/camel-avro/src/main/java/org/apache/camel/dataformat/avro/SpecificDataNoCache.java b/components/camel-avro/src/main/java/org/apache/camel/dataformat/avro/SpecificDataNoCache.java
index 5460e5e..b1534ee 100644
--- a/components/camel-avro/src/main/java/org/apache/camel/dataformat/avro/SpecificDataNoCache.java
+++ b/components/camel-avro/src/main/java/org/apache/camel/dataformat/avro/SpecificDataNoCache.java
@@ -29,6 +29,7 @@ public class SpecificDataNoCache extends SpecificData {
         super(classLoader);
     }
 
+    @Override
     public Object newRecord(Object old, Schema schema) {
         Class c = new SpecificDataNoCache().getClass(schema);
         return c == null ? super.newRecord(old, schema) : (c.isInstance(old) ? old : newInstance(c, schema));
diff --git a/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroHttpConsumerTest.java b/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroHttpConsumerTest.java
index 6e05a44..c9efe19 100644
--- a/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroHttpConsumerTest.java
+++ b/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroHttpConsumerTest.java
@@ -47,6 +47,7 @@ public class AvroHttpConsumerTest extends AvroConsumerTestSupport {
         reflectRequestor = new ReflectRequestor(TestReflection.class, reflectTransceiver);
     }
 
+    @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             @Override
diff --git a/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroHttpProducerTest.java b/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroHttpProducerTest.java
index d92f11c..0ec9d11 100644
--- a/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroHttpProducerTest.java
+++ b/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroHttpProducerTest.java
@@ -41,6 +41,7 @@ public class AvroHttpProducerTest extends AvroProducerTestSupport {
         }
     }
 
+    @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             @Override
diff --git a/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettyConsumerTest.java b/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettyConsumerTest.java
index 96c4af4..6e078cf 100644
--- a/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettyConsumerTest.java
+++ b/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettyConsumerTest.java
@@ -47,6 +47,7 @@ public class AvroNettyConsumerTest extends AvroConsumerTestSupport {
         reflectRequestor = new ReflectRequestor(TestReflection.class, reflectTransceiver);
     }
 
+    @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             @Override
diff --git a/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettyProducerTest.java b/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettyProducerTest.java
index 30e8176..d4dfc83 100644
--- a/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettyProducerTest.java
+++ b/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroNettyProducerTest.java
@@ -40,6 +40,7 @@ public class AvroNettyProducerTest extends AvroProducerTestSupport {
         }
     }
 
+    @Override
     public RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             @Override
diff --git a/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroMarshalAndUnmarshalSpringTest.java b/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroMarshalAndUnmarshalSpringTest.java
index 6ef8339..26582c0 100644
--- a/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroMarshalAndUnmarshalSpringTest.java
+++ b/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroMarshalAndUnmarshalSpringTest.java
@@ -25,11 +25,13 @@ public class AvroMarshalAndUnmarshalSpringTest extends AvroMarshalAndUnmarshallT
 
     private AbstractXmlApplicationContext applicationContext;
 
+    @Override
     protected CamelContext createCamelContext() throws Exception {
         applicationContext =  new ClassPathXmlApplicationContext("org/apache/camel/dataformat/avro/springDataFormat.xml");
         return SpringCamelContext.springCamelContext(applicationContext, true);
     }
 
+    @Override
     public boolean isUseRouteBuilder() {
         return false;
     }
diff --git a/components/camel-aws-cw/src/main/java/org/apache/camel/component/aws/cw/CwComponent.java b/components/camel-aws-cw/src/main/java/org/apache/camel/component/aws/cw/CwComponent.java
index 575c456..c391918 100644
--- a/components/camel-aws-cw/src/main/java/org/apache/camel/component/aws/cw/CwComponent.java
+++ b/components/camel-aws-cw/src/main/java/org/apache/camel/component/aws/cw/CwComponent.java
@@ -51,6 +51,7 @@ public class CwComponent extends DefaultComponent {
         registerExtension(new CwComponentVerifierExtension());
     }
 
+    @Override
     protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
         CwConfiguration configuration = this.configuration.copy();
         setProperties(configuration, parameters);
diff --git a/components/camel-aws-cw/src/main/java/org/apache/camel/component/aws/cw/CwEndpoint.java b/components/camel-aws-cw/src/main/java/org/apache/camel/component/aws/cw/CwEndpoint.java
index 5920261..a28287a 100644
--- a/components/camel-aws-cw/src/main/java/org/apache/camel/component/aws/cw/CwEndpoint.java
+++ b/components/camel-aws-cw/src/main/java/org/apache/camel/component/aws/cw/CwEndpoint.java
@@ -49,10 +49,12 @@ public class CwEndpoint extends DefaultEndpoint {
         this.configuration = configuration;
     }
 
+    @Override
     public Consumer createConsumer(Processor processor) throws Exception {
         throw new UnsupportedOperationException("You cannot receive messages from this endpoint");
     }
 
+    @Override
     public Producer createProducer() throws Exception {
         return new CwProducer(this);
     }
diff --git a/components/camel-aws-cw/src/main/java/org/apache/camel/component/aws/cw/CwProducer.java b/components/camel-aws-cw/src/main/java/org/apache/camel/component/aws/cw/CwProducer.java
index 1264bee..5079a52 100644
--- a/components/camel-aws-cw/src/main/java/org/apache/camel/component/aws/cw/CwProducer.java
+++ b/components/camel-aws-cw/src/main/java/org/apache/camel/component/aws/cw/CwProducer.java
@@ -45,6 +45,7 @@ public class CwProducer extends DefaultProducer {
         super(endpoint);
     }
 
+    @Override
     public void process(Exchange exchange) throws Exception {
         List<MetricDatum> metricData = getMetricData(exchange);
 
diff --git a/components/camel-aws-cw/src/test/java/org/apache/camel/component/aws/cw/integration/CwComponentIntegrationTest.java b/components/camel-aws-cw/src/test/java/org/apache/camel/component/aws/cw/integration/CwComponentIntegrationTest.java
index c0e1155..6b9d3c3 100644
--- a/components/camel-aws-cw/src/test/java/org/apache/camel/component/aws/cw/integration/CwComponentIntegrationTest.java
+++ b/components/camel-aws-cw/src/test/java/org/apache/camel/component/aws/cw/integration/CwComponentIntegrationTest.java
@@ -50,6 +50,7 @@ public class CwComponentIntegrationTest extends CamelTestSupport {
         assertMockEndpointsSatisfied();
     }
 
+    @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             @Override
diff --git a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DdbComponent.java b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DdbComponent.java
index a1d2589..c2a8c79 100644
--- a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DdbComponent.java
+++ b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DdbComponent.java
@@ -51,6 +51,7 @@ public class DdbComponent extends DefaultComponent {
         registerExtension(new DdbComponentVerifierExtension());
     }
 
+    @Override
     protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
         DdbConfiguration configuration = this.configuration.copy();
         setProperties(configuration, parameters);
diff --git a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DdbEndpoint.java b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DdbEndpoint.java
index 39b481a..bc84cca 100644
--- a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DdbEndpoint.java
+++ b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DdbEndpoint.java
@@ -58,10 +58,12 @@ public class DdbEndpoint extends ScheduledPollEndpoint {
         this.configuration = configuration;
     }
 
+    @Override
     public Consumer createConsumer(Processor processor) throws Exception {
         throw new UnsupportedOperationException("You cannot receive messages from this endpoint");
     }
 
+    @Override
     public Producer createProducer() throws Exception {
         return new DdbProducer(this);
     }
diff --git a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DdbProducer.java b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DdbProducer.java
index eeb564c..5f7544e 100644
--- a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DdbProducer.java
+++ b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DdbProducer.java
@@ -33,6 +33,7 @@ public class DdbProducer extends DefaultProducer {
         super(endpoint);
     }
 
+    @Override
     public void process(Exchange exchange) throws Exception {
         switch (determineOperation(exchange)) {
         case BatchGetItems:
diff --git a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/integration/DdbComponentIntegrationTest.java b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/integration/DdbComponentIntegrationTest.java
index 5287b3e..d49a2dc 100644
--- a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/integration/DdbComponentIntegrationTest.java
+++ b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/integration/DdbComponentIntegrationTest.java
@@ -56,6 +56,7 @@ public class DdbComponentIntegrationTest extends CamelTestSupport {
         assertNotNull(exchange.getIn().getHeader(DdbConstants.ITEMS, List.class));
     }
 
+    @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             @Override
diff --git a/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2Endpoint.java b/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2Endpoint.java
index 8e80345..c1a4782 100644
--- a/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2Endpoint.java
+++ b/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2Endpoint.java
@@ -51,10 +51,12 @@ public class EC2Endpoint extends ScheduledPollEndpoint {
         this.configuration = configuration;
     }
 
+    @Override
     public Consumer createConsumer(Processor processor) throws Exception {
         throw new UnsupportedOperationException("You cannot receive messages from this endpoint");
     }
 
+    @Override
     public Producer createProducer() throws Exception {
         return new EC2Producer(this);
     }
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 7309c95..faea1d0 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
@@ -65,6 +65,7 @@ public class EC2Producer extends DefaultProducer {
         super(endpoint);
     }
 
+    @Override
     public void process(Exchange exchange) throws Exception {
         switch (determineOperation(exchange)) {
         case createAndRunInstances:
diff --git a/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSEndpoint.java b/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSEndpoint.java
index c853fa7..b51c517 100644
--- a/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSEndpoint.java
+++ b/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSEndpoint.java
@@ -50,10 +50,12 @@ public class ECSEndpoint extends ScheduledPollEndpoint {
         this.configuration = configuration;
     }
 
+    @Override
     public Consumer createConsumer(Processor processor) throws Exception {
         throw new UnsupportedOperationException("You cannot receive messages from this endpoint");
     }
 
+    @Override
     public Producer createProducer() throws Exception {
         return new ECSProducer(this);
     }
diff --git a/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSProducer.java b/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSProducer.java
index c0a8032..0118e78 100644
--- a/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSProducer.java
+++ b/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSProducer.java
@@ -46,6 +46,7 @@ public class ECSProducer extends DefaultProducer {
         super(endpoint);
     }
 
+    @Override
     public void process(Exchange exchange) throws Exception {
         switch (determineOperation(exchange)) {
         case listClusters:
diff --git a/components/camel-aws-eks/src/main/java/org/apache/camel/component/aws/eks/EKSEndpoint.java b/components/camel-aws-eks/src/main/java/org/apache/camel/component/aws/eks/EKSEndpoint.java
index 8b20733..47371f6 100644
--- a/components/camel-aws-eks/src/main/java/org/apache/camel/component/aws/eks/EKSEndpoint.java
+++ b/components/camel-aws-eks/src/main/java/org/apache/camel/component/aws/eks/EKSEndpoint.java
@@ -50,10 +50,12 @@ public class EKSEndpoint extends ScheduledPollEndpoint {
         this.configuration = configuration;
     }
 
+    @Override
     public Consumer createConsumer(Processor processor) throws Exception {
         throw new UnsupportedOperationException("You cannot receive messages from this endpoint");
     }
 
+    @Override
     public Producer createProducer() throws Exception {
         return new EKSProducer(this);
     }
diff --git a/components/camel-aws-eks/src/main/java/org/apache/camel/component/aws/eks/EKSProducer.java b/components/camel-aws-eks/src/main/java/org/apache/camel/component/aws/eks/EKSProducer.java
index 56de803..1929115 100644
--- a/components/camel-aws-eks/src/main/java/org/apache/camel/component/aws/eks/EKSProducer.java
+++ b/components/camel-aws-eks/src/main/java/org/apache/camel/component/aws/eks/EKSProducer.java
@@ -47,6 +47,7 @@ public class EKSProducer extends DefaultProducer {
         super(endpoint);
     }
 
+    @Override
     public void process(Exchange exchange) throws Exception {
         switch (determineOperation(exchange)) {
         case listClusters:
diff --git a/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMEndpoint.java b/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMEndpoint.java
index b9d94b5..fac2634 100644
--- a/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMEndpoint.java
+++ b/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMEndpoint.java
@@ -50,10 +50,12 @@ public class IAMEndpoint extends ScheduledPollEndpoint {
         this.configuration = configuration;
     }
 
+    @Override
     public Consumer createConsumer(Processor processor) throws Exception {
         throw new UnsupportedOperationException("You cannot receive messages from this endpoint");
     }
 
+    @Override
     public Producer createProducer() throws Exception {
         return new IAMProducer(this);
     }
diff --git a/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMProducer.java b/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMProducer.java
index f3ef931..2a036e7 100644
--- a/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMProducer.java
+++ b/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMProducer.java
@@ -62,6 +62,7 @@ public class IAMProducer extends DefaultProducer {
         super(endpoint);
     }
 
+    @Override
     public void process(Exchange exchange) throws Exception {
         switch (determineOperation(exchange)) {
         case listAccessKeys:
diff --git a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/firehose/integration/KinesisFirehoseComponentIntegrationTest.java b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/firehose/integration/KinesisFirehoseComponentIntegrationTest.java
index f4bde13..a5977a2 100644
--- a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/firehose/integration/KinesisFirehoseComponentIntegrationTest.java
+++ b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/firehose/integration/KinesisFirehoseComponentIntegrationTest.java
@@ -43,6 +43,7 @@ public class KinesisFirehoseComponentIntegrationTest extends CamelTestSupport {
         assertNotNull(exchange.getIn().getHeader(KinesisFirehoseConstants.RECORD_ID));
     }
 
+    @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             @Override
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 4d5539b..c72056e 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
@@ -81,6 +81,7 @@ public class KinesisComponentIntegrationTest extends CamelTestSupport {
         assertNotNull(resultExchange.getIn().getHeader(KinesisConstants.SEQUENCE_NUMBER));
     }
 
+    @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             @Override
diff --git a/components/camel-aws-kms/src/main/java/org/apache/camel/component/aws/kms/KMSEndpoint.java b/components/camel-aws-kms/src/main/java/org/apache/camel/component/aws/kms/KMSEndpoint.java
index db20c8a..e22c8b5 100644
--- a/components/camel-aws-kms/src/main/java/org/apache/camel/component/aws/kms/KMSEndpoint.java
+++ b/components/camel-aws-kms/src/main/java/org/apache/camel/component/aws/kms/KMSEndpoint.java
@@ -50,10 +50,12 @@ public class KMSEndpoint extends ScheduledPollEndpoint {
         this.configuration = configuration;
     }
 
+    @Override
     public Consumer createConsumer(Processor processor) throws Exception {
         throw new UnsupportedOperationException("You cannot receive messages from this endpoint");
     }
 
+    @Override
     public Producer createProducer() throws Exception {
         return new KMSProducer(this);
     }
diff --git a/components/camel-aws-kms/src/main/java/org/apache/camel/component/aws/kms/KMSProducer.java b/components/camel-aws-kms/src/main/java/org/apache/camel/component/aws/kms/KMSProducer.java
index c12a5eb..4cdcbdc 100644
--- a/components/camel-aws-kms/src/main/java/org/apache/camel/component/aws/kms/KMSProducer.java
+++ b/components/camel-aws-kms/src/main/java/org/apache/camel/component/aws/kms/KMSProducer.java
@@ -50,6 +50,7 @@ public class KMSProducer extends DefaultProducer {
         super(endpoint);
     }
 
+    @Override
     public void process(Exchange exchange) throws Exception {
         switch (determineOperation(exchange)) {
         case listKeys:
diff --git a/components/camel-aws-lambda/src/main/java/org/apache/camel/component/aws/lambda/LambdaEndpoint.java b/components/camel-aws-lambda/src/main/java/org/apache/camel/component/aws/lambda/LambdaEndpoint.java
index 9b8a70b..9c24d4d 100644
--- a/components/camel-aws-lambda/src/main/java/org/apache/camel/component/aws/lambda/LambdaEndpoint.java
+++ b/components/camel-aws-lambda/src/main/java/org/apache/camel/component/aws/lambda/LambdaEndpoint.java
@@ -49,10 +49,12 @@ public class LambdaEndpoint extends DefaultEndpoint {
         this.configuration = configuration;
     }
 
+    @Override
     public Consumer createConsumer(Processor processor) throws Exception {
         throw new UnsupportedOperationException("You cannot receive messages from this endpoint");
     }
 
+    @Override
     public Producer createProducer() throws Exception {
         return new LambdaProducer(this);
     }
diff --git a/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQEndpoint.java b/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQEndpoint.java
index 85fd129..e426a535 100644
--- a/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQEndpoint.java
+++ b/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQEndpoint.java
@@ -51,10 +51,12 @@ public class MQEndpoint extends ScheduledPollEndpoint {
         this.configuration = configuration;
     }
 
+    @Override
     public Consumer createConsumer(Processor processor) throws Exception {
         throw new UnsupportedOperationException("You cannot receive messages from this endpoint");
     }
 
+    @Override
     public Producer createProducer() throws Exception {
         return new MQProducer(this);
     }
diff --git a/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQProducer.java b/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQProducer.java
index 4b3d317..8757feb 100644
--- a/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQProducer.java
+++ b/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQProducer.java
@@ -56,6 +56,7 @@ public class MQProducer extends DefaultProducer {
         super(endpoint);
     }
 
+    @Override
     public void process(Exchange exchange) throws Exception {
         switch (determineOperation(exchange)) {
         case listBrokers:
diff --git a/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKEndpoint.java b/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKEndpoint.java
index 9a16390..446866a 100644
--- a/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKEndpoint.java
+++ b/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKEndpoint.java
@@ -50,10 +50,12 @@ public class MSKEndpoint extends ScheduledPollEndpoint {
         this.configuration = configuration;
     }
 
+    @Override
     public Consumer createConsumer(Processor processor) throws Exception {
         throw new UnsupportedOperationException("You cannot receive messages from this endpoint");
     }
 
+    @Override
     public Producer createProducer() throws Exception {
         return new MSKProducer(this);
     }
diff --git a/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKProducer.java b/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKProducer.java
index ffc267a..81aa769 100644
--- a/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKProducer.java
+++ b/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKProducer.java
@@ -47,6 +47,7 @@ public class MSKProducer extends DefaultProducer {
         super(endpoint);
     }
 
+    @Override
     public void process(Exchange exchange) throws Exception {
         switch (determineOperation(exchange)) {
         case listClusters:
diff --git a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Component.java b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Component.java
index 44b1140..17f6e68 100644
--- a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Component.java
+++ b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Component.java
@@ -52,6 +52,7 @@ public class S3Component extends DefaultComponent {
         registerExtension(new S3ComponentVerifierExtension());
     }
 
+    @Override
     protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
         final S3Configuration configuration = this.configuration.copy();
         setProperties(configuration, parameters);
diff --git a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Consumer.java b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Consumer.java
index c01f50e..d67158e 100644
--- a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Consumer.java
+++ b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Consumer.java
@@ -136,6 +136,7 @@ public class S3Consumer extends ScheduledBatchPollingConsumer {
         return answer;
     }
     
+    @Override
     public int processBatch(Queue<Object> exchanges) throws Exception {
         int total = exchanges.size();
 
diff --git a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java
index d1c5a7b..7bb869f 100644
--- a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java
+++ b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java
@@ -67,6 +67,7 @@ public class S3Endpoint extends ScheduledPollEndpoint {
         this.configuration = configuration;
     }
 
+    @Override
     public Consumer createConsumer(Processor processor) throws Exception {
         S3Consumer s3Consumer = new S3Consumer(this, processor);
         configureConsumer(s3Consumer);
@@ -74,6 +75,7 @@ public class S3Endpoint extends ScheduledPollEndpoint {
         return s3Consumer;
     }
 
+    @Override
     public Producer createProducer() throws Exception {
         return new S3Producer(this);
     }
diff --git a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/client/impl/S3ClientIAMOptimizedImpl.java b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/client/impl/S3ClientIAMOptimizedImpl.java
index 04f1200..6cf6f50 100644
--- a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/client/impl/S3ClientIAMOptimizedImpl.java
+++ b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/client/impl/S3ClientIAMOptimizedImpl.java
@@ -51,6 +51,7 @@ public class S3ClientIAMOptimizedImpl implements S3Client {
      * Getting the s3 aws client that is used.
      * @return Amazon S3 Client.
      */
+    @Override
     public AmazonS3 getS3Client() {
         AmazonS3 client = null;
         AmazonS3ClientBuilder clientBuilder = null;
diff --git a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/client/impl/S3ClientStandardImpl.java b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/client/impl/S3ClientStandardImpl.java
index 4285049..eca2c84 100644
--- a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/client/impl/S3ClientStandardImpl.java
+++ b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/client/impl/S3ClientStandardImpl.java
@@ -54,6 +54,7 @@ public class S3ClientStandardImpl implements S3Client {
      * Getting the s3 aws client that is used.
      * @return Amazon S3 Client.
      */
+    @Override
     public AmazonS3 getS3Client() {
         AmazonS3 client = null;
         AmazonS3ClientBuilder clientBuilder = null;
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentContentLengthFileTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentContentLengthFileTest.java
index d56fe77..bd57cb1 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentContentLengthFileTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentContentLengthFileTest.java
@@ -70,6 +70,7 @@ public class S3ComponentContentLengthFileTest extends CamelTestSupport {
         writer.close();
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         super.tearDown();
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentFileTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentFileTest.java
index 7191619..9fe3e8f 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentFileTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentFileTest.java
@@ -69,6 +69,7 @@ public class S3ComponentFileTest extends CamelTestSupport {
         writer.close();
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         super.tearDown();
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentKeyNameFileTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentKeyNameFileTest.java
index d873514..ddf4242 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentKeyNameFileTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentKeyNameFileTest.java
@@ -70,6 +70,7 @@ public class S3ComponentKeyNameFileTest extends CamelTestSupport {
         writer.close();
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         super.tearDown();
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/integration/S3ComponentIntegrationTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/integration/S3ComponentIntegrationTest.java
index 6123875..4fa357f 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/integration/S3ComponentIntegrationTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/integration/S3ComponentIntegrationTest.java
@@ -106,6 +106,7 @@ public class S3ComponentIntegrationTest extends CamelTestSupport {
         assertNull(message.getHeader(S3Constants.VERSION_ID));
     }
     
+    @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             @Override
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/BatchDeleteAttributesCommand.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/BatchDeleteAttributesCommand.java
index fcab53f..76d1cec 100644
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/BatchDeleteAttributesCommand.java
+++ b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/BatchDeleteAttributesCommand.java
@@ -30,6 +30,7 @@ public class BatchDeleteAttributesCommand extends AbstractSdbCommand {
         super(sdbClient, configuration, exchange);
     }
 
+    @Override
     public void execute() {
         BatchDeleteAttributesRequest request = new BatchDeleteAttributesRequest()
             .withDomainName(determineDomainName())
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/BatchPutAttributesCommand.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/BatchPutAttributesCommand.java
index 5b9a164..52db2db 100644
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/BatchPutAttributesCommand.java
+++ b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/BatchPutAttributesCommand.java
@@ -30,6 +30,7 @@ public class BatchPutAttributesCommand extends AbstractSdbCommand {
         super(sdbClient, configuration, exchange);
     }
 
+    @Override
     public void execute() {
         BatchPutAttributesRequest request = new BatchPutAttributesRequest()
             .withDomainName(determineDomainName())
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/DeleteAttributesCommand.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/DeleteAttributesCommand.java
index 3ccc09e..128d554 100644
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/DeleteAttributesCommand.java
+++ b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/DeleteAttributesCommand.java
@@ -30,6 +30,7 @@ public class DeleteAttributesCommand extends AbstractSdbCommand {
         super(sdbClient, configuration, exchange);
     }
 
+    @Override
     public void execute() {
         DeleteAttributesRequest request = new DeleteAttributesRequest()
             .withDomainName(determineDomainName())
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/DeleteDomainCommand.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/DeleteDomainCommand.java
index 6423f37..d07b15a 100644
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/DeleteDomainCommand.java
+++ b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/DeleteDomainCommand.java
@@ -27,6 +27,7 @@ public class DeleteDomainCommand extends AbstractSdbCommand {
         super(sdbClient, configuration, exchange);
     }
 
+    @Override
     public void execute() {
         DeleteDomainRequest request = new DeleteDomainRequest()
             .withDomainName(determineDomainName());
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/DomainMetadataCommand.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/DomainMetadataCommand.java
index 66a564e..703fab0 100644
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/DomainMetadataCommand.java
+++ b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/DomainMetadataCommand.java
@@ -29,6 +29,7 @@ public class DomainMetadataCommand extends AbstractSdbCommand {
         super(sdbClient, configuration, exchange);
     }
 
+    @Override
     public void execute() {
         DomainMetadataRequest request = new DomainMetadataRequest()
             .withDomainName(determineDomainName());
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/GetAttributesCommand.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/GetAttributesCommand.java
index fbf39c9..f867845 100644
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/GetAttributesCommand.java
+++ b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/GetAttributesCommand.java
@@ -31,6 +31,7 @@ public class GetAttributesCommand extends AbstractSdbCommand {
         super(sdbClient, configuration, exchange);
     }
 
+    @Override
     public void execute() {
         GetAttributesRequest request = new GetAttributesRequest()
             .withDomainName(determineDomainName())
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/ListDomainsCommand.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/ListDomainsCommand.java
index 4a80103..ead7983 100644
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/ListDomainsCommand.java
+++ b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/ListDomainsCommand.java
@@ -29,6 +29,7 @@ public class ListDomainsCommand extends AbstractSdbCommand {
         super(sdbClient, configuration, exchange);
     }
 
+    @Override
     public void execute() {
         ListDomainsRequest request = new ListDomainsRequest()
             .withMaxNumberOfDomains(determineMaxNumberOfDomains())
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/PutAttributesCommand.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/PutAttributesCommand.java
index 0ae870c..f4f6ad1 100644
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/PutAttributesCommand.java
+++ b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/PutAttributesCommand.java
@@ -30,6 +30,7 @@ public class PutAttributesCommand extends AbstractSdbCommand {
         super(sdbClient, configuration, exchange);
     }
 
+    @Override
     public void execute() {
         PutAttributesRequest request = new PutAttributesRequest()
             .withDomainName(determineDomainName())
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbComponent.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbComponent.java
index 3530eee..27ae28f 100644
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbComponent.java
+++ b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbComponent.java
@@ -36,6 +36,7 @@ public class SdbComponent extends DefaultComponent {
         registerExtension(new SdbComponentVerifierExtension());
     }
 
+    @Override
     protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
         SdbConfiguration configuration = new SdbConfiguration();
         setProperties(configuration, parameters);
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java
index 7006838..ecb9e5b 100644
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java
+++ b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java
@@ -59,10 +59,12 @@ public class SdbEndpoint extends ScheduledPollEndpoint {
         this.configuration = configuration;
     }
 
+    @Override
     public Consumer createConsumer(Processor processor) throws Exception {
         throw new UnsupportedOperationException("You cannot receive messages from this endpoint");
     }
 
+    @Override
     public Producer createProducer() throws Exception {
         return new SdbProducer(this);
     }
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbProducer.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbProducer.java
index 1dade23..b58548d 100644
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbProducer.java
+++ b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SdbProducer.java
@@ -33,6 +33,7 @@ public class SdbProducer extends DefaultProducer {
         super(endpoint);
     }
 
+    @Override
     public void process(Exchange exchange) throws Exception {
         switch (determineOperation(exchange)) {
         case BatchDeleteAttributes:
diff --git a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SelectCommand.java b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SelectCommand.java
index a310bbd..0e0dcf5 100644
--- a/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SelectCommand.java
+++ b/components/camel-aws-sdb/src/main/java/org/apache/camel/component/aws/sdb/SelectCommand.java
@@ -29,6 +29,7 @@ public class SelectCommand extends AbstractSdbCommand {
         super(sdbClient, configuration, exchange);
     }
 
+    @Override
     public void execute() {
         SelectRequest request = new SelectRequest()
             .withSelectExpression(determineSelectExpression())
diff --git a/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesComponent.java b/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesComponent.java
index d065720..64af4c4 100644
--- a/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesComponent.java
+++ b/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesComponent.java
@@ -51,6 +51,7 @@ public class SesComponent extends DefaultComponent {
         registerExtension(new SesComponentVerifierExtension());
     }
 
+    @Override
     protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
         SesConfiguration configuration = this.configuration.copy();
         setProperties(configuration, parameters);
diff --git a/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesEndpoint.java b/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesEndpoint.java
index 9593f88..46118d1 100644
--- a/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesEndpoint.java
+++ b/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesEndpoint.java
@@ -68,10 +68,12 @@ public class SesEndpoint extends DefaultEndpoint {
         super.doStop();
     }
 
+    @Override
     public Consumer createConsumer(Processor processor) throws Exception {
         throw new UnsupportedOperationException("You cannot receive messages from this endpoint");
     }
 
+    @Override
     public Producer createProducer() throws Exception {
         return new SesProducer(this);
     }
diff --git a/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesProducer.java b/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesProducer.java
index 2de16ed..eff6e7f 100644
--- a/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesProducer.java
+++ b/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesProducer.java
@@ -48,6 +48,7 @@ public class SesProducer extends DefaultProducer {
         super(endpoint);
     }
 
+    @Override
     public void process(Exchange exchange) throws Exception {
         if (!(exchange.getIn().getBody() instanceof javax.mail.Message)) {
             SendEmailRequest request = createMailRequest(exchange);
diff --git a/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/integration/SesComponentIntegrationTest.java b/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/integration/SesComponentIntegrationTest.java
index 81fec9d..d7b4681 100644
--- a/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/integration/SesComponentIntegrationTest.java
+++ b/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/integration/SesComponentIntegrationTest.java
@@ -43,6 +43,7 @@ public class SesComponentIntegrationTest extends CamelTestSupport {
         assertNotNull(exchange.getIn().getHeader(SesConstants.MESSAGE_ID));
     }
 
+    @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             @Override
diff --git a/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsComponent.java b/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsComponent.java
index aaa1bcd..65e8ec6 100644
--- a/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsComponent.java
+++ b/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsComponent.java
@@ -52,6 +52,7 @@ public class SnsComponent extends DefaultComponent {
         registerExtension(new SnsComponentVerifierExtension());
     }
 
+    @Override
     protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
         SnsConfiguration configuration = this.configuration.copy();
         setProperties(configuration, parameters);
diff --git a/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java b/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java
index 64636b4..c969f6f 100644
--- a/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java
+++ b/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java
@@ -70,6 +70,7 @@ public class SnsEndpoint extends DefaultEndpoint implements HeaderFilterStrategy
         this.configuration = configuration;
     }
 
+    @Override
     public HeaderFilterStrategy getHeaderFilterStrategy() {
         return headerFilterStrategy;
     }
@@ -77,14 +78,17 @@ public class SnsEndpoint extends DefaultEndpoint implements HeaderFilterStrategy
     /**
      * To use a custom HeaderFilterStrategy to map headers to/from Camel.
      */
+    @Override
     public void setHeaderFilterStrategy(HeaderFilterStrategy strategy) {
         this.headerFilterStrategy = strategy;
     }
 
+    @Override
     public Consumer createConsumer(Processor processor) throws Exception {
         throw new UnsupportedOperationException("You cannot receive messages from this endpoint");
     }
 
+    @Override
     public Producer createProducer() throws Exception {
         return new SnsProducer(this);
     }
diff --git a/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsProducer.java b/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsProducer.java
index 7cab7ae..a89b468 100644
--- a/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsProducer.java
+++ b/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsProducer.java
@@ -48,6 +48,7 @@ public class SnsProducer extends DefaultProducer {
         super(endpoint);
     }
 
+    @Override
     public void process(Exchange exchange) throws Exception {
         PublishRequest request = new PublishRequest();
 
diff --git a/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/integration/SnsComponentIntegrationTest.java b/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/integration/SnsComponentIntegrationTest.java
index 1c1f9e4..ea514f1 100644
--- a/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/integration/SnsComponentIntegrationTest.java
+++ b/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/integration/SnsComponentIntegrationTest.java
@@ -52,6 +52,7 @@ public class SnsComponentIntegrationTest extends CamelTestSupport {
         assertNotNull(exchange.getOut().getHeader(SnsConstants.MESSAGE_ID));
     }
     
+    @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             @Override
diff --git a/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/integration/SnsTopicWithKmsEncryptionIntegrationTest.java b/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/integration/SnsTopicWithKmsEncryptionIntegrationTest.java
index 5be4d38..dcc4abd 100644
--- a/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/integration/SnsTopicWithKmsEncryptionIntegrationTest.java
+++ b/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/integration/SnsTopicWithKmsEncryptionIntegrationTest.java
@@ -52,6 +52,7 @@ public class SnsTopicWithKmsEncryptionIntegrationTest extends CamelTestSupport {
         assertNotNull(exchange.getOut().getHeader(SnsConstants.MESSAGE_ID));
     }
     
+    @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             @Override
diff --git a/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java b/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java
index 0958a28..5c764d8 100644
--- a/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java
+++ b/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java
@@ -139,6 +139,7 @@ public class SqsConsumer extends ScheduledBatchPollingConsumer {
         return answer;
     }
 
+    @Override
     public int processBatch(Queue<Object> exchanges) throws Exception {
         int total = exchanges.size();
 
diff --git a/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java b/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
index 16354e8..0007c32 100644
--- a/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
+++ b/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
@@ -78,6 +78,7 @@ public class SqsEndpoint extends ScheduledPollEndpoint implements HeaderFilterSt
         this.configuration = configuration;
     }
 
+    @Override
     public HeaderFilterStrategy getHeaderFilterStrategy() {
         return headerFilterStrategy;
     }
@@ -85,14 +86,17 @@ public class SqsEndpoint extends ScheduledPollEndpoint implements HeaderFilterSt
     /**
      * To use a custom HeaderFilterStrategy to map headers to/from Camel.
      */
+    @Override
     public void setHeaderFilterStrategy(HeaderFilterStrategy strategy) {
         this.headerFilterStrategy = strategy;
     }
 
+    @Override
     public Producer createProducer() throws Exception {
         return new SqsProducer(this);
     }
 
+    @Override
     public Consumer createConsumer(Processor processor) throws Exception {
         SqsConsumer sqsConsumer = new SqsConsumer(this, processor);
         configureConsumer(sqsConsumer);
diff --git a/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java b/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
index 12120f6..edd929f 100644
--- a/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
+++ b/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
@@ -59,6 +59,7 @@ public class SqsProducer extends DefaultProducer {
         }
     }
 
+    @Override
     public void process(Exchange exchange) throws Exception {
         SqsOperations operation = determineOperation(exchange);
         if (ObjectHelper.isEmpty(operation)) {
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsComponentIntegrationTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsComponentIntegrationTest.java
index c77453a..57c840a 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsComponentIntegrationTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsComponentIntegrationTest.java
@@ -88,6 +88,7 @@ public class SqsComponentIntegrationTest extends CamelTestSupport {
         assertEquals("6a1559560f67c5e7a7d5d838bf0272ee", exchange.getOut().getHeader(SqsConstants.MD5_OF_BODY));
     }
     
+    @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         final String sqsEndpointUri = String.format("aws-sqs://MyNewCamelQueue?accessKey=%s&secretKey=%s&messageRetentionPeriod=%s&maximumMessageSize=%s&visibilityTimeout=%s&policy=%s",
                 accessKey, secretKey, "1209600", "65536", "60", "%7B%22Version%22%3A%222008-10-17%22%2C%22Id%22%3A%22%2F195004372649%2FMyNewCamelQueue%2FSQSDefaultPolicy%22%2C%22"
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsConsumerMessageIntegrationTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsConsumerMessageIntegrationTest.java
index 68bfc53..f680b49 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsConsumerMessageIntegrationTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsConsumerMessageIntegrationTest.java
@@ -55,6 +55,7 @@ public class SqsConsumerMessageIntegrationTest extends CamelTestSupport {
         assertMockEndpointsSatisfied();
     }
 
+    @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         final String sqsEndpointUri = String.format("aws-sqs://camel-1?accessKey=RAW(xxxx)&secretKey=RAW(xxxx)&region=EU_WEST_1");
 
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsProducerBatchSendFifoIntegrationTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsProducerBatchSendFifoIntegrationTest.java
index 9f244fa..0c92df0 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsProducerBatchSendFifoIntegrationTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsProducerBatchSendFifoIntegrationTest.java
@@ -59,6 +59,7 @@ public class SqsProducerBatchSendFifoIntegrationTest extends CamelTestSupport {
         assertMockEndpointsSatisfied();
     }
 
+    @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         final String sqsEndpointUri = 
               String.format("aws-sqs://camel-1.fifo?accessKey=RAW(xxx)&secretKey=RAW(xxx)&region=EU_WEST_1&messageGroupIdStrategy=useExchangeId" 
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsProducerBatchSendIntegrationTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsProducerBatchSendIntegrationTest.java
index 4f5bf82..30f7def 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsProducerBatchSendIntegrationTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsProducerBatchSendIntegrationTest.java
@@ -59,6 +59,7 @@ public class SqsProducerBatchSendIntegrationTest extends CamelTestSupport {
         assertMockEndpointsSatisfied();
     }
 
+    @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         final String sqsEndpointUri = String.format("aws-sqs://camel-1?accessKey=RAW(xxx)&secretKey=RAW(xxx)&region=EU_WEST_1");
 
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsProducerDeleteMessageIntegrationTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsProducerDeleteMessageIntegrationTest.java
index 116b3e7..91f810c 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsProducerDeleteMessageIntegrationTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsProducerDeleteMessageIntegrationTest.java
@@ -49,6 +49,7 @@ public class SqsProducerDeleteMessageIntegrationTest extends CamelTestSupport {
         assertMockEndpointsSatisfied();
     }
 
+    @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         final String sqsEndpointUri = String.format("aws-sqs://camel-1?accessKey=RAW(xxx)&secretKey=RAW(xxx)&region=EU_WEST_1");
 
diff --git a/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFActivityProducer.java b/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFActivityProducer.java
index d9e8e23..e9c34d8 100644
--- a/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFActivityProducer.java
+++ b/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFActivityProducer.java
@@ -37,6 +37,7 @@ public class SWFActivityProducer extends DefaultProducer {
         this.camelSWFClient = camelSWFActivityClient;
     }
 
+    @Override
     public void process(Exchange exchange) throws Exception {
         String eventName = getEventName(exchange);
         String version = getVersion(exchange);
diff --git a/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFComponent.java b/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFComponent.java
index e99c318..3e5bd11 100644
--- a/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFComponent.java
+++ b/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFComponent.java
@@ -52,6 +52,7 @@ public class SWFComponent extends DefaultComponent {
         registerExtension(new SwfComponentVerifierExtension());
     }
 
+    @Override
     protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
         Map<String, Object> clientConfigurationParameters = IntrospectionSupport.extractProperties(parameters, "clientConfiguration.");
         Map<String, Object> sWClientParameters = IntrospectionSupport.extractProperties(parameters, "sWClient.");
diff --git a/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFEndpoint.java b/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFEndpoint.java
index 1f6b42b..c53cdd1 100644
--- a/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFEndpoint.java
+++ b/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFEndpoint.java
@@ -58,11 +58,13 @@ public class SWFEndpoint extends DefaultEndpoint {
         this.configuration = configuration;
     }
 
+    @Override
     public Producer createProducer() throws Exception {
         return isWorkflow()
                 ? new SWFWorkflowProducer(this, new CamelSWFWorkflowClient(this, configuration)) : new SWFActivityProducer(this, new CamelSWFActivityClient(configuration));
     }
 
+    @Override
     public Consumer createConsumer(Processor processor) throws Exception {
         Consumer consumer = isWorkflow()
                 ? new SWFWorkflowConsumer(this, processor, configuration) : new SWFActivityConsumer(this, processor, configuration);
diff --git a/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFWorkflowProducer.java b/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFWorkflowProducer.java
index 7b85b5f..5c845a9 100644
--- a/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFWorkflowProducer.java
+++ b/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFWorkflowProducer.java
@@ -42,6 +42,7 @@ public class SWFWorkflowProducer extends DefaultProducer {
         this.camelSWFClient = camelSWFClient;
     }
 
+    @Override
     public void process(Exchange exchange) throws Exception {
         LOGGER.debug("processing workflow task " + exchange);
 
diff --git a/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceComponent.java b/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceComponent.java
index 3843f94..4facebb 100644
--- a/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceComponent.java
+++ b/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceComponent.java
@@ -42,6 +42,7 @@ public class BlobServiceComponent extends DefaultComponent {
         this.configuration = new BlobServiceConfiguration();
     }
 
+    @Override
     protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
         final BlobServiceConfiguration configuration = this.configuration.copy();
         setProperties(configuration, parameters);
diff --git a/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceEndpoint.java b/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceEndpoint.java
index 009d485..ca92a93 100644
--- a/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceEndpoint.java
+++ b/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceEndpoint.java
@@ -47,6 +47,7 @@ public class BlobServiceEndpoint extends DefaultEndpoint {
         this.configuration = configuration;
     }
 
+    @Override
     public Consumer createConsumer(Processor processor) throws Exception {
         log.trace("Creating a consumer");
         if (getConfiguration().getBlobName() == null) {
@@ -57,6 +58,7 @@ public class BlobServiceEndpoint extends DefaultEndpoint {
         return consumer;
     }
 
+    @Override
     public Producer createProducer() throws Exception {
         log.trace("Creating a producer");
         if (getConfiguration().getBlobName() == null
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 e153b9f..3c5291a 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
@@ -44,6 +44,7 @@ public class QueueServiceComponent extends DefaultComponent {
         this.configuration = new QueueServiceConfiguration();
     }
 
+    @Override
     protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
         final QueueServiceConfiguration configuration = this.configuration.copy();
         setProperties(configuration, parameters);
diff --git a/components/camel-azure/src/main/java/org/apache/camel/component/azure/queue/QueueServiceEndpoint.java b/components/camel-azure/src/main/java/org/apache/camel/component/azure/queue/QueueServiceEndpoint.java
index e0640f9..d527547 100644
--- a/components/camel-azure/src/main/java/org/apache/camel/component/azure/queue/QueueServiceEndpoint.java
+++ b/components/camel-azure/src/main/java/org/apache/camel/component/azure/queue/QueueServiceEndpoint.java
@@ -47,6 +47,7 @@ public class QueueServiceEndpoint extends DefaultEndpoint {
         this.configuration = configuration;
     }
 
+    @Override
     public Consumer createConsumer(Processor processor) throws Exception {
         log.trace("Creating a consumer");
         QueueServiceConsumer consumer = new QueueServiceConsumer(this, processor);
@@ -54,6 +55,7 @@ public class QueueServiceEndpoint extends DefaultEndpoint {
         return consumer;
     }
 
+    @Override
     public Producer createProducer() throws Exception {
         log.trace("Creating a producer");
         return new QueueServiceProducer(this);
diff --git a/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatSpringTest.java b/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatSpringTest.java
index b12ee03..64f3557 100644
--- a/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatSpringTest.java
+++ b/components/camel-barcode/src/test/java/org/apache/camel/dataformat/barcode/BarcodeDataFormatSpringTest.java
@@ -23,10 +23,12 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 public class BarcodeDataFormatSpringTest extends BarcodeDataFormatCamelTest {
     
+    @Override
     public boolean isCreateCamelContextPerClass() {
         return true;
     }
     
+    @Override
     public boolean isUseRouteBuilder() {
         return false;
     }
diff --git a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorProducer.java b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorProducer.java
index cb960db..454826e 100644
--- a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorProducer.java
+++ b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorProducer.java
@@ -37,6 +37,7 @@ public class BeanValidatorProducer extends DefaultProducer {
         super(endpoint);
     }
 
+    @Override
     public void process(Exchange exchange) throws Exception {
         Object bean = exchange.getIn().getBody();
         Set<ConstraintViolation<Object>> constraintViolations;
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java
index 6b27ecc..72120ff 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java
@@ -80,10 +80,12 @@ public class BeanValidatorConfigurationTest extends CamelTestSupport {
 
     class MyMessageInterpolator implements MessageInterpolator {
 
+        @Override
         public String interpolate(String messageTemplate, Context context) {
             return null;
         }
 
+        @Override
         public String interpolate(String messageTemplate, Context context, Locale locale) {
             return null;
         }
@@ -91,10 +93,12 @@ public class BeanValidatorConfigurationTest extends CamelTestSupport {
 
     class MyTraversableResolver implements TraversableResolver {
 
+        @Override
         public boolean isCascadable(Object traversableObject, Node traversableProperty, Class<?> rootBeanType, Path pathToTraversableObject, ElementType elementType) {
             return false;
         }
 
+        @Override
         public boolean isReachable(Object traversableObject, Node traversableProperty, Class<?> rootBeanType, Path pathToTraversableObject, ElementType elementType) {
             return false;
         }
@@ -102,6 +106,7 @@ public class BeanValidatorConfigurationTest extends CamelTestSupport {
 
     class MyConstraintValidatorFactory implements ConstraintValidatorFactory {
 
+        @Override
         public <T extends ConstraintValidator<?, ?>> T getInstance(Class<T> key) {
             return null;
         }
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorXMLConfigurationRouteTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorXMLConfigurationRouteTest.java
index 10ab0be..6a826be 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorXMLConfigurationRouteTest.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorXMLConfigurationRouteTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.bean.validator;
 
 public class BeanValidatorXMLConfigurationRouteTest extends BeanValidatorRouteTest {
     
+    @Override
     Car createCar(String manufacturer, String licencePlate) {
         return new CarWithoutAnnotations(manufacturer, licencePlate);
     }
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CarWithAnnotations.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CarWithAnnotations.java
index 456ee33..fec405a 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CarWithAnnotations.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CarWithAnnotations.java
@@ -33,18 +33,22 @@ public class CarWithAnnotations implements Car {
         this.licensePlate = licencePlate;
     }
 
+    @Override
     public String getManufacturer() {
         return manufacturer;
     }
 
+    @Override
     public void setManufacturer(String manufacturer) {
         this.manufacturer = manufacturer;
     }
 
+    @Override
     public String getLicensePlate() {
         return licensePlate;
     }
 
+    @Override
     public void setLicensePlate(String licensePlate) {
         this.licensePlate = licensePlate;
     }
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CarWithRedefinedDefaultGroup.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CarWithRedefinedDefaultGroup.java
index b25cb39..00d411e 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CarWithRedefinedDefaultGroup.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CarWithRedefinedDefaultGroup.java
@@ -35,18 +35,22 @@ public class CarWithRedefinedDefaultGroup implements Car {
         this.licensePlate = licencePlate;
     }
 
+    @Override
     public String getManufacturer() {
         return manufacturer;
     }
 
+    @Override
     public void setManufacturer(String manufacturer) {
         this.manufacturer = manufacturer;
     }
 
+    @Override
     public String getLicensePlate() {
         return licensePlate;
     }
 
+    @Override
     public void setLicensePlate(String licensePlate) {
         this.licensePlate = licensePlate;
     }
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CarWithoutAnnotations.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CarWithoutAnnotations.java
index c1a550d..7455d03 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CarWithoutAnnotations.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CarWithoutAnnotations.java
@@ -28,18 +28,22 @@ public class CarWithoutAnnotations implements Car {
         this.licensePlate = licencePlate;
     }
 
+    @Override
     public String getManufacturer() {
         return manufacturer;
     }
 
+    @Override
     public void setManufacturer(String manufacturer) {
         this.manufacturer = manufacturer;
     }
 
+    @Override
     public String getLicensePlate() {
         return licensePlate;
     }
 
+    @Override
     public void setLicensePlate(String licensePlate) {
         this.licensePlate = licensePlate;
     }
diff --git a/components/camel-bean/src/main/java/org/apache/camel/component/bean/AbstractBeanProcessor.java b/components/camel-bean/src/main/java/org/apache/camel/component/bean/AbstractBeanProcessor.java
index f4b9547..7ac80a8 100644
--- a/components/camel-bean/src/main/java/org/apache/camel/component/bean/AbstractBeanProcessor.java
+++ b/components/camel-bean/src/main/java/org/apache/camel/component/bean/AbstractBeanProcessor.java
@@ -60,6 +60,7 @@ public abstract class AbstractBeanProcessor extends AsyncProcessorSupport {
         return "BeanProcessor[" + beanHolder + (method != null ? "#" + method : "") + "]";
     }
 
+    @Override
     public boolean process(Exchange exchange, AsyncCallback callback) {
         // do we have an explicit method name we always should invoke (either configured on endpoint or as a header)
         String explicitMethodName = exchange.getIn().getHeader(Exchange.BEAN_METHOD_NAME, method, String.class);
@@ -197,6 +198,7 @@ public abstract class AbstractBeanProcessor extends AsyncProcessorSupport {
 
     // Implementation methods
     //-------------------------------------------------------------------------
+    @Override
     protected void doStart() throws Exception {
         // optimize to only get (create) a processor if really needed
         if (beanHolder.supportProcessor() && allowProcessor(method, beanHolder.getBeanInfo())) {
@@ -213,6 +215,7 @@ public abstract class AbstractBeanProcessor extends AsyncProcessorSupport {
         }
     }
 
+    @Override
     protected void doStop() throws Exception {
         if (processor != null) {
             ServiceHelper.stopService(processor);
diff --git a/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanComponent.java b/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanComponent.java
index cbf7dc1..19a111d 100644
--- a/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanComponent.java
+++ b/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanComponent.java
@@ -45,6 +45,7 @@ public class BeanComponent extends DefaultComponent {
     
     // Implementation methods
     //-----------------------------------------------------------------------
+    @Override
     protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
         BeanEndpoint endpoint = new BeanEndpoint(uri, this);
         endpoint.setBeanName(remaining);
diff --git a/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanProcessor.java b/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
index 602d287..b545deb 100644
--- a/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
+++ b/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
@@ -106,6 +106,7 @@ public class BeanProcessor extends ServiceSupport implements AsyncProcessor {
         delegate.doStop();
     }
 
+    @Override
     public String toString() {
         return delegate.toString();
     }
diff --git a/components/camel-bean/src/main/java/org/apache/camel/component/bean/ConstantBeanHolder.java b/components/camel-bean/src/main/java/org/apache/camel/component/bean/ConstantBeanHolder.java
index 9b12a60..8fecf1d 100644
--- a/components/camel-bean/src/main/java/org/apache/camel/component/bean/ConstantBeanHolder.java
+++ b/components/camel-bean/src/main/java/org/apache/camel/component/bean/ConstantBeanHolder.java
@@ -57,10 +57,12 @@ public class ConstantBeanHolder implements BeanHolder {
         return ObjectHelper.className(bean) + "(" + ObjectHelper.getIdentityHashCode(bean) + ")";
     }
 
+    @Override
     public Object getBean()  {
         return bean;
     }
 
+    @Override
     public Processor getProcessor() {
         if (this.processor == null) {
             this.processor = CamelContextHelper.convertTo(beanInfo.getCamelContext(), Processor.class, bean);
@@ -68,14 +70,17 @@ public class ConstantBeanHolder implements BeanHolder {
         return this.processor;
     }
 
+    @Override
     public boolean supportProcessor() {
         return true;
     }
 
+    @Override
     public BeanInfo getBeanInfo() {
         return beanInfo;
     }
 
+    @Override
     public BeanInfo getBeanInfo(Object bean) {
         return null;
     }
diff --git a/components/camel-bean/src/main/java/org/apache/camel/component/bean/ConstantTypeBeanHolder.java b/components/camel-bean/src/main/java/org/apache/camel/component/bean/ConstantTypeBeanHolder.java
index 8efd676..f1e42bf 100644
--- a/components/camel-bean/src/main/java/org/apache/camel/component/bean/ConstantTypeBeanHolder.java
+++ b/components/camel-bean/src/main/java/org/apache/camel/component/bean/ConstantTypeBeanHolder.java
@@ -58,6 +58,7 @@ public class ConstantTypeBeanHolder implements BeanTypeHolder {
         return type.toString();
     }
 
+    @Override
     public Object getBean()  {
         // only create a bean if we have constructors
         if (beanInfo.hasPublicConstructors()) {
@@ -67,22 +68,27 @@ public class ConstantTypeBeanHolder implements BeanTypeHolder {
         }
     }
 
+    @Override
     public Processor getProcessor() {
         return null;
     }
 
+    @Override
     public boolean supportProcessor() {
         return false;
     }
 
+    @Override
     public BeanInfo getBeanInfo() {
         return beanInfo;
     }
 
+    @Override
     public BeanInfo getBeanInfo(Object bean) {
         return null;
     }
 
+    @Override
     public Class<?> getType() {
         return type;
     }
diff --git a/components/camel-bean/src/main/java/org/apache/camel/component/bean/DefaultParameterMappingStrategy.java b/components/camel-bean/src/main/java/org/apache/camel/component/bean/DefaultParameterMappingStrategy.java
index 5c4e6d2..a57949b 100644
--- a/components/camel-bean/src/main/java/org/apache/camel/component/bean/DefaultParameterMappingStrategy.java
+++ b/components/camel-bean/src/main/java/org/apache/camel/component/bean/DefaultParameterMappingStrategy.java
@@ -37,6 +37,7 @@ public class DefaultParameterMappingStrategy implements ParameterMappingStrategy
         loadDefaultRegistry();
     }
 
+    @Override
     public Expression getDefaultParameterTypeExpression(Class<?> parameterType) {
         return parameterTypeToExpressionMap.get(parameterType);
     }
diff --git a/components/camel-bean/src/main/java/org/apache/camel/component/bean/MethodInfo.java b/components/camel-bean/src/main/java/org/apache/camel/component/bean/MethodInfo.java
index 2bd512f..9ee2162 100644
--- a/components/camel-bean/src/main/java/org/apache/camel/component/bean/MethodInfo.java
+++ b/components/camel-bean/src/main/java/org/apache/camel/component/bean/MethodInfo.java
@@ -183,6 +183,7 @@ public class MethodInfo {
         }
     }
 
+    @Override
     public String toString() {
         return method.toString();
     }
@@ -579,6 +580,7 @@ public class MethodInfo {
             this.expressions = expressions;
         }
 
+        @Override
         @SuppressWarnings("unchecked")
         public <T> T evaluate(Exchange exchange, Class<T> type) {
             Object body = exchange.getIn().getBody();
diff --git a/components/camel-bean/src/main/java/org/apache/camel/component/bean/RegistryBean.java b/components/camel-bean/src/main/java/org/apache/camel/component/bean/RegistryBean.java
index 3c2a838..b871c8f 100644
--- a/components/camel-bean/src/main/java/org/apache/camel/component/bean/RegistryBean.java
+++ b/components/camel-bean/src/main/java/org/apache/camel/component/bean/RegistryBean.java
@@ -69,6 +69,7 @@ public class RegistryBean implements BeanHolder {
         return new ConstantBeanHolder(bean, info);
     }
 
+    @Override
     public Object getBean() throws NoSuchBeanException {
         // must always lookup bean first
         Object value = lookupBean();
@@ -96,14 +97,17 @@ public class RegistryBean implements BeanHolder {
         return context.getInjector().newInstance(clazz);
     }
 
+    @Override
     public Processor getProcessor() {
         return null;
     }
 
+    @Override
     public boolean supportProcessor() {
         return false;
     }
 
+    @Override
     public BeanInfo getBeanInfo() {
         if (beanInfo == null) {
             Object bean = getBean();
@@ -112,6 +116,7 @@ public class RegistryBean implements BeanHolder {
         return beanInfo;
     }
 
+    @Override
     public BeanInfo getBeanInfo(Object bean) {
         return createBeanInfo(bean);
     }
diff --git a/components/camel-bean/src/main/java/org/apache/camel/component/beanclass/ClassComponent.java b/components/camel-bean/src/main/java/org/apache/camel/component/beanclass/ClassComponent.java
index de2dd01..2c59d6b 100644
--- a/components/camel-bean/src/main/java/org/apache/camel/component/beanclass/ClassComponent.java
+++ b/components/camel-bean/src/main/java/org/apache/camel/component/beanclass/ClassComponent.java
@@ -36,6 +36,7 @@ public class ClassComponent extends BeanComponent {
     public ClassComponent() {
     }
 
+    @Override
     protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
         ClassEndpoint endpoint = new ClassEndpoint(uri, this);
         endpoint.setBeanName(remaining);
diff --git a/components/camel-bean/src/main/java/org/apache/camel/language/bean/BeanExpression.java b/components/camel-bean/src/main/java/org/apache/camel/language/bean/BeanExpression.java
index b39ca6f..b2dea7a 100644
--- a/components/camel-bean/src/main/java/org/apache/camel/language/bean/BeanExpression.java
+++ b/components/camel-bean/src/main/java/org/apache/camel/language/bean/BeanExpression.java
@@ -166,6 +166,7 @@ public class BeanExpression implements Expression, Predicate, AfterPropertiesCon
         }
     }
 
+    @Override
     public <T> T evaluate(Exchange exchange, Class<T> type) {
         Object result = evaluate(exchange);
         if (Object.class == type) {
@@ -176,6 +177,7 @@ public class BeanExpression implements Expression, Predicate, AfterPropertiesCon
         }
     }
 
+    @Override
     public boolean matches(Exchange exchange) {
         Object value = evaluate(exchange);
         return ObjectHelper.evaluateValuePredicate(value);
diff --git a/components/camel-bean/src/main/java/org/apache/camel/language/bean/BeanLanguage.java b/components/camel-bean/src/main/java/org/apache/camel/language/bean/BeanLanguage.java
index 10f7cc0..18b3f18 100644
--- a/components/camel-bean/src/main/java/org/apache/camel/language/bean/BeanLanguage.java
+++ b/components/camel-bean/src/main/java/org/apache/camel/language/bean/BeanLanguage.java
@@ -78,10 +78,12 @@ public class BeanLanguage extends LanguageSupport {
         this.method = method;
     }
 
+    @Override
     public Predicate createPredicate(String expression) {
         return ExpressionToPredicateAdapter.toPredicate(createExpression(expression));
     }
 
+    @Override
     public Expression createExpression(String expression) {
         // favour using the configured options
         if (bean != null) {
@@ -130,6 +132,7 @@ public class BeanLanguage extends LanguageSupport {
         }
     }
 
+    @Override
     public boolean isSingleton() {
         return false;
     }
diff --git a/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/BeanIODataFormat.java b/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/BeanIODataFormat.java
index d40ef74..93dcf8d 100644
--- a/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/BeanIODataFormat.java
+++ b/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/BeanIODataFormat.java
@@ -96,10 +96,12 @@ public class BeanIODataFormat extends ServiceSupport implements DataFormat, Data
         factory = null;
     }
 
+    @Override
     public CamelContext getCamelContext() {
         return camelContext;
     }
 
+    @Override
     public void setCamelContext(CamelContext camelContext) {
         this.camelContext = camelContext;
     }
@@ -108,11 +110,13 @@ public class BeanIODataFormat extends ServiceSupport implements DataFormat, Data
         return factory;
     }
 
+    @Override
     public void marshal(Exchange exchange, Object body, OutputStream stream) throws Exception {
         List<Object> models = getModels(exchange, body);
         writeModels(stream, models);
     }
 
+    @Override
     public Object unmarshal(Exchange exchange, InputStream stream) throws Exception {
         if (isUnmarshalSingleObject()) {
             return readSingleModel(exchange, stream);
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java
index 2e423b8..ca4330b 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java
@@ -67,6 +67,7 @@ public abstract class BindyAbstractFactory implements BindyFactory {
      *
      * @throws Exception
      */
+    @Override
     public void initModel() throws Exception {
         models = new HashSet<>();
         modelClassNames = new HashSet<>();
@@ -123,8 +124,10 @@ public abstract class BindyAbstractFactory implements BindyFactory {
      */
     public abstract void initAnnotatedFields() throws Exception;
 
+    @Override
     public abstract void bind(CamelContext camelContext, List<String> data, Map<String, Object> model, int line) throws Exception;
     
+    @Override
     public abstract String unbind(CamelContext camelContext, Map<String, Object> model) throws Exception;
 
     /**
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java
index 52ebcdf..d676253 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java
@@ -69,6 +69,7 @@ public class BindyCsvDataFormat extends BindyAbstractDataFormat {
         return "bindy-csv";
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public void marshal(Exchange exchange, Object body, OutputStream outputStream) throws Exception {
 
@@ -138,6 +139,7 @@ public class BindyCsvDataFormat extends BindyAbstractDataFormat {
         return canReturnEmptyListOfModels;
     }
 
+    @Override
     public Object unmarshal(Exchange exchange, InputStream inputStream) throws Exception {
         BindyCsvFactory factory = (BindyCsvFactory)getFactory();
         org.apache.camel.util.ObjectHelper.notNull(factory, "not instantiated");
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
index d7290c6..024c3bc 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
@@ -68,6 +68,7 @@ public class BindyFixedLengthDataFormat extends BindyAbstractDataFormat {
         return "bindy-fixed";
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public void marshal(Exchange exchange, Object body, OutputStream outputStream) throws Exception {
         BindyFixedLengthFactory factory = (BindyFixedLengthFactory) getFactory();
@@ -175,6 +176,7 @@ public class BindyFixedLengthDataFormat extends BindyAbstractDataFormat {
         return false;
     }
 
+    @Override
     public Object unmarshal(Exchange exchange, InputStream inputStream) throws Exception {
         BindyFixedLengthFactory factory = (BindyFixedLengthFactory) getFactory();
         org.apache.camel.util.ObjectHelper.notNull(factory, "not instantiated");
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/NumberPatternFormat.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/NumberPatternFormat.java
index 44995fd..5ba66a7 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/NumberPatternFormat.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/NumberPatternFormat.java
@@ -49,6 +49,7 @@ public abstract class NumberPatternFormat<T> implements PatternFormat<T> {
         this.rounding = rounding;
     }
 
+    @Override
     public String format(T object) throws Exception {
         if (getNumberFormat() != null) {
             return this.getNumberFormat().format(object);
@@ -57,6 +58,7 @@ public abstract class NumberPatternFormat<T> implements PatternFormat<T> {
         }
     }
 
+    @Override
     public abstract T parse(String string) throws Exception;
 
     /**
@@ -87,6 +89,7 @@ public abstract class NumberPatternFormat<T> implements PatternFormat<T> {
         return format;
     }
 
+    @Override
     public String getPattern() {
         return pattern;
     }
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/BigDecimalFormatFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/BigDecimalFormatFactory.java
index f5d64ef..3884d6a 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/BigDecimalFormatFactory.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/BigDecimalFormatFactory.java
@@ -49,12 +49,14 @@ public class BigDecimalFormatFactory extends AbstractFormatFactory {
             super(impliedDecimalPosition, precision, locale);
         }
 
+        @Override
         public String format(BigDecimal object) throws Exception {
             return !super.hasImpliedDecimalPosition()
                     ? super.getFormat().format(object)
                     : super.getFormat().format(object.multiply(new BigDecimal(super.getMultiplier())));
         }
 
+        @Override
         public BigDecimal parse(String string) throws Exception {
             BigDecimal result = new BigDecimal(string.trim());
             if (super.hasImpliedDecimalPosition()) {
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/BigIntegerFormatFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/BigIntegerFormatFactory.java
index 88c93c1..9bec0f0 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/BigIntegerFormatFactory.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/BigIntegerFormatFactory.java
@@ -42,10 +42,12 @@ public class BigIntegerFormatFactory extends AbstractFormatFactory {
 
     private static class BigIntegerFormat extends AbstractNumberFormat<BigInteger> {
 
+        @Override
         public String format(BigInteger object) throws Exception {
             return object.toString();
         }
 
+        @Override
         public BigInteger parse(String string) throws Exception {
             return new BigInteger(string);
         }
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/BooleanFormatFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/BooleanFormatFactory.java
index c14f1f3..44e8d72 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/BooleanFormatFactory.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/BooleanFormatFactory.java
@@ -35,10 +35,12 @@ public class BooleanFormatFactory extends AbstractFormatFactory {
 
     private static class BooleanFormat implements Format<Boolean> {
 
+        @Override
         public String format(Boolean object) throws Exception {
             return object.toString();
         }
 
+        @Override
         public Boolean parse(String string) throws Exception {
             return Boolean.valueOf(string);
         }
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/ByteFormatFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/ByteFormatFactory.java
index 5345caf..75d6943 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/ByteFormatFactory.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/ByteFormatFactory.java
@@ -41,10 +41,12 @@ public class ByteFormatFactory extends AbstractFormatFactory {
 
     private static class ByteFormat implements Format<Byte> {
 
+        @Override
         public String format(Byte object) throws Exception {
             return object.toString();
         }
 
+        @Override
         public Byte parse(String string) throws Exception {
             return new Byte(string);
         }
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/CharacterFormatFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/CharacterFormatFactory.java
index 5064ec1..951adc6 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/CharacterFormatFactory.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/CharacterFormatFactory.java
@@ -37,10 +37,12 @@ public class CharacterFormatFactory extends AbstractFormatFactory {
 
     private static class CharacterFormat implements Format<Character> {
 
+        @Override
         public String format(Character object) throws Exception {
             return object.toString();
         }
 
+        @Override
         public Character parse(String string) throws Exception {
             if (string.length() > 1) {
                 throw new ParseException("The string \"" + string + "\" cannot be parsed to a character (size > 1).", 1);
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/DateFormatFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/DateFormatFactory.java
index ae2fdbf..474c8fc 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/DateFormatFactory.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/DateFormatFactory.java
@@ -55,11 +55,13 @@ public class DateFormatFactory extends AbstractFormatFactory {
             }
         }
 
+        @Override
         public String format(Date object) throws Exception {
             ObjectHelper.notNull(this.pattern, "pattern");
             return this.getDateFormat().format(object);
         }
 
+        @Override
         public Date parse(String string) throws Exception {
 
             Date date;
@@ -99,6 +101,7 @@ public class DateFormatFactory extends AbstractFormatFactory {
             return result;
         }
 
+        @Override
         public String getPattern() {
             return pattern;
         }
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/DoubleFormatFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/DoubleFormatFactory.java
index 7e6c935..059ef07 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/DoubleFormatFactory.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/DoubleFormatFactory.java
@@ -50,12 +50,14 @@ public class DoubleFormatFactory extends AbstractFormatFactory {
             super(impliedDecimalPosition, precision, locale);
         }
 
+        @Override
         public String format(Double object) throws Exception {
             return !super.hasImpliedDecimalPosition()
                     ? super.getFormat().format(object)
                     : super.getFormat().format(object * super.getMultiplier());
         }
 
+        @Override
         public Double parse(String string) throws Exception {
             Double value = null;
             if (!super.hasImpliedDecimalPosition()) {
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/EnumFormatFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/EnumFormatFactory.java
index 167034a..861ca05 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/EnumFormatFactory.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/EnumFormatFactory.java
@@ -41,10 +41,12 @@ public class EnumFormatFactory extends AbstractFormatFactory {
             this.clazz = clazz;
         }
 
+        @Override
         public String format(final T object) throws Exception {
             return object.name();
         }
 
+        @Override
         public T parse(final String string) throws Exception {
             return Enum.valueOf(clazz, string);
         }
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/FloatFormatFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/FloatFormatFactory.java
index a22d890..cde750c 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/FloatFormatFactory.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/FloatFormatFactory.java
@@ -50,12 +50,14 @@ public class FloatFormatFactory extends AbstractFormatFactory {
             super(impliedDecimalPosition, precision, locale);
         }
 
+        @Override
         public String format(Float object) throws Exception {
             return !super.hasImpliedDecimalPosition()
                     ? super.getFormat().format(object)
                     : super.getFormat().format(object * super.getMultiplier());
         }
 
+        @Override
         public Float parse(String string) throws Exception {
             Float value;
             if (!super.hasImpliedDecimalPosition()) {
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/IntegerFormatFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/IntegerFormatFactory.java
index 18efa03..2c02d2c 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/IntegerFormatFactory.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/IntegerFormatFactory.java
@@ -43,10 +43,12 @@ public class IntegerFormatFactory extends AbstractFormatFactory {
 
     private static class IntegerFormat extends AbstractNumberFormat<Integer> {
 
+        @Override
         public String format(Integer object) throws Exception {
             return object.toString();
         }
 
+        @Override
         public Integer parse(String string) throws Exception {
             return new Integer(string);
         }
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/LocalDateFormatFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/LocalDateFormatFactory.java
index c0ef2fb..cf1a867 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/LocalDateFormatFactory.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/LocalDateFormatFactory.java
@@ -46,11 +46,13 @@ public class LocalDateFormatFactory extends AbstractFormatFactory {
             this.locale = locale;
         }
 
+        @Override
         public String format(LocalDate object) throws Exception {
             ObjectHelper.notNull(this.pattern, "pattern");
             return this.getDateFormat().format(object);
         }
 
+        @Override
         public LocalDate parse(String string) throws Exception {
 
             LocalDate date;
@@ -72,6 +74,7 @@ public class LocalDateFormatFactory extends AbstractFormatFactory {
             return result;
         }
 
+        @Override
         public String getPattern() {
             return pattern;
         }
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/LocalDateTimeFormatFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/LocalDateTimeFormatFactory.java
index fb0430d..763eca0 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/LocalDateTimeFormatFactory.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/LocalDateTimeFormatFactory.java
@@ -55,11 +55,13 @@ public class LocalDateTimeFormatFactory extends AbstractFormatFactory {
             }
         }
 
+        @Override
         public String format(LocalDateTime object) throws Exception {
             ObjectHelper.notNull(this.pattern, "pattern");
             return this.getDateFormat().format(object);
         }
 
+        @Override
         public LocalDateTime parse(String string) throws Exception {
 
             LocalDateTime date;
@@ -82,6 +84,7 @@ public class LocalDateTimeFormatFactory extends AbstractFormatFactory {
             return result;
         }
 
+        @Override
         public String getPattern() {
             return pattern;
         }
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/LocalTimeFormatFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/LocalTimeFormatFactory.java
index f23a025..22bf405 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/LocalTimeFormatFactory.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/LocalTimeFormatFactory.java
@@ -55,11 +55,13 @@ public class LocalTimeFormatFactory extends AbstractFormatFactory {
             }
         }
 
+        @Override
         public String format(LocalTime object) throws Exception {
             ObjectHelper.notNull(this.pattern, "pattern");
             return this.getDateFormat().format(object);
         }
 
+        @Override
         public LocalTime parse(String string) throws Exception {
 
             LocalTime date;
@@ -82,6 +84,7 @@ public class LocalTimeFormatFactory extends AbstractFormatFactory {
             return result;
         }
 
+        @Override
         public String getPattern() {
             return pattern;
         }
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/LongFormatFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/LongFormatFactory.java
index a6c8d8d..eb3de4b 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/LongFormatFactory.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/LongFormatFactory.java
@@ -42,10 +42,12 @@ public class LongFormatFactory extends AbstractFormatFactory {
 
     private static class LongFormat extends AbstractNumberFormat<Long> {
 
+        @Override
         public String format(Long object) throws Exception {
             return object.toString();
         }
 
+        @Override
         public Long parse(String string) throws Exception {
             return new Long(string);
         }
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/ShortFormatFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/ShortFormatFactory.java
index 4c7c0cf..c91908f 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/ShortFormatFactory.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/ShortFormatFactory.java
@@ -43,10 +43,12 @@ public class ShortFormatFactory extends AbstractFormatFactory {
 
     private static class ShortFormat extends AbstractNumberFormat<Short> {
 
+        @Override
         public String format(Short object) throws Exception {
             return object.toString();
         }
 
+        @Override
         public Short parse(String string) throws Exception {
             return new Short(string);
         }
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/StringFormatFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/StringFormatFactory.java
index c4ffcf0..2cee38a 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/StringFormatFactory.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/StringFormatFactory.java
@@ -34,10 +34,12 @@ public class StringFormatFactory extends AbstractFormatFactory {
 
     private static class StringFormat implements Format<String> {
 
+        @Override
         public String format(String object) throws Exception {
             return object;
         }
 
+        @Override
         public String parse(String string) throws Exception {
             return string;
         }
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java
index c16509a..5a6dd42 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java
@@ -67,6 +67,7 @@ public class BindyKeyValuePairDataFormat extends BindyAbstractDataFormat {
         return "bindy-kvp";
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public void marshal(Exchange exchange, Object body, OutputStream outputStream) throws Exception {
         final BindyAbstractFactory factory = getFactory();
@@ -91,6 +92,7 @@ public class BindyKeyValuePairDataFormat extends BindyAbstractDataFormat {
         }
     }
 
+    @Override
     public Object unmarshal(Exchange exchange, InputStream inputStream) throws Exception {
         BindyKeyValuePairFactory factory = (BindyKeyValuePairFactory) getFactory();
 
@@ -177,6 +179,7 @@ public class BindyKeyValuePairDataFormat extends BindyAbstractDataFormat {
         }
     }
 
+    @Override
     protected BindyAbstractFactory createModelFactory(FormatFactory formatFactory) throws Exception {
         BindyKeyValuePairFactory bindyKeyValuePairFactory = new BindyKeyValuePairFactory(getClassType());
         bindyKeyValuePairFactory.setFormatFactory(formatFactory);
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvGenerateHeaderMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvGenerateHeaderMarshallTest.java
index 02df499..062d6e8 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvGenerateHeaderMarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvGenerateHeaderMarshallTest.java
@@ -96,6 +96,7 @@ public class BindyComplexCsvGenerateHeaderMarshallTest extends AbstractJUnit4Spr
 
     public static class ContextConfig extends RouteBuilder {
 
+        @Override
         public void configure() {
             BindyCsvDataFormat camelDataFormat = 
                 new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.model.complex.generateheader.Order.class);
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallTest.java
index 5ec04c4..ad3ec14 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallTest.java
@@ -73,6 +73,7 @@ public class BindyComplexCsvUnmarshallTest extends AbstractJUnit4SpringContextTe
     }
 
     public static class ContextConfig extends RouteBuilder {
+        @Override
         public void configure() {
             from("direct:start")
                 .unmarshal(new BindyCsvDataFormat(TYPE))
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallUnwrapSingleInstanceTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallUnwrapSingleInstanceTest.java
index fda9f8d..e2a6279 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallUnwrapSingleInstanceTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallUnwrapSingleInstanceTest.java
@@ -58,6 +58,7 @@ public class BindyComplexCsvUnmarshallUnwrapSingleInstanceTest extends AbstractJ
     }
 
     public static class ContextConfig extends RouteBuilder {
+        @Override
         public void configure() {
             from("direct:start")
                 .unmarshal().bindy(BindyType.Csv, TYPE, false)
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvBigFileUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvBigFileUnmarshallTest.java
index 34a03d2..4a0d20f 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvBigFileUnmarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvBigFileUnmarshallTest.java
@@ -51,6 +51,7 @@ public class BindyCsvBigFileUnmarshallTest extends AbstractJUnit4SpringContextTe
     }
 
     public static class ContextConfig extends RouteBuilder {
+        @Override
         public void configure() {
             BindyCsvDataFormat camelDataFormat = 
                 new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.model.simple.oneclass.Order.class);
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvSkipFieldTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvSkipFieldTest.java
index d54daca..e1e0dd5 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvSkipFieldTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCsvSkipFieldTest.java
@@ -57,6 +57,7 @@ public class BindyCsvSkipFieldTest  extends AbstractJUnit4SpringContextTests {
     public static class ContextConfig extends RouteBuilder {
         BindyCsvDataFormat camelDataFormat = new BindyCsvDataFormat(CsvSkipField.class);
 
+        @Override
         public void configure() {
             from(URI_DIRECT_START).unmarshal(camelDataFormat)
                     .process(new Processor() {
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoNotRemoveQuotesCsvUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoNotRemoveQuotesCsvUnmarshallTest.java
index 56b0a91..9470636 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoNotRemoveQuotesCsvUnmarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoNotRemoveQuotesCsvUnmarshallTest.java
@@ -64,6 +64,7 @@ public class BindyDoNotRemoveQuotesCsvUnmarshallTest extends AbstractJUnit4Sprin
     public static class ContextConfig extends RouteBuilder {
         BindyCsvDataFormat camelDataFormat = new BindyCsvDataFormat(BindyDoNotRemoveQuotesCsvUnmarshallTest.Product.class);
 
+        @Override
         public void configure() {
             from(URI_DIRECT_START).unmarshal(camelDataFormat).to(URI_MOCK_RESULT);
         }
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoubleQuotesCsvUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoubleQuotesCsvUnmarshallTest.java
index 1105b9b..01700e4 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoubleQuotesCsvUnmarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoubleQuotesCsvUnmarshallTest.java
@@ -60,6 +60,7 @@ public class BindyDoubleQuotesCsvUnmarshallTest extends AbstractJUnit4SpringCont
     public static class ContextConfig extends RouteBuilder {
         BindyCsvDataFormat camelDataFormat = new BindyCsvDataFormat(Order.class);
 
+        @Override
         public void configure() {
             from(URI_DIRECT_START).unmarshal(camelDataFormat).to(URI_MOCK_RESULT);
         }
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoubleQuotesInFieldCsvUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoubleQuotesInFieldCsvUnmarshallTest.java
index f1c06c4..ddc6067 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoubleQuotesInFieldCsvUnmarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyDoubleQuotesInFieldCsvUnmarshallTest.java
@@ -64,6 +64,7 @@ public class BindyDoubleQuotesInFieldCsvUnmarshallTest extends AbstractJUnit4Spr
     public static class ContextConfig extends RouteBuilder {
         BindyCsvDataFormat camelDataFormat = new BindyCsvDataFormat(Order.class);
 
+        @Override
         public void configure() {
             from(URI_DIRECT_START).unmarshal(camelDataFormat).to(URI_MOCK_RESULT);
         }
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyInlinedQuotesCsvUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyInlinedQuotesCsvUnmarshallTest.java
index 55cb468..14a206f 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyInlinedQuotesCsvUnmarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyInlinedQuotesCsvUnmarshallTest.java
@@ -62,6 +62,7 @@ public class BindyInlinedQuotesCsvUnmarshallTest extends AbstractJUnit4SpringCon
     public static class ContextConfig extends RouteBuilder {
         BindyCsvDataFormat camelDataFormat = new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.model.simple.oneclasssinglequote.Order.class);
 
+        @Override
         public void configure() {
             from(URI_DIRECT_START).unmarshal(camelDataFormat).to(URI_MOCK_RESULT);
         }
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyMarshalOneToManyWithHeadersTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyMarshalOneToManyWithHeadersTest.java
index 32b0354..d977045 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyMarshalOneToManyWithHeadersTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyMarshalOneToManyWithHeadersTest.java
@@ -85,6 +85,7 @@ public class BindyMarshalOneToManyWithHeadersTest extends AbstractJUnit4SpringCo
 
     public static class ContextConfig extends RouteBuilder {
 
+        @Override
         public void configure() {
 
             BindyCsvDataFormat camelDataFormat = new BindyCsvDataFormat(Order.class);
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPojoSimpleCsvMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPojoSimpleCsvMarshallTest.java
index ef0aa98..052ec4b 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPojoSimpleCsvMarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPojoSimpleCsvMarshallTest.java
@@ -91,6 +91,7 @@ public class BindyPojoSimpleCsvMarshallTest extends AbstractJUnit4SpringContextT
 
     public static class ContextConfig extends RouteBuilder {
 
+        @Override
         public void configure() {
             BindyCsvDataFormat camelDataFormat = 
                 new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.model.simple.oneclass.Order.class);
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanFalseMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanFalseMarshallTest.java
index 719900d..282c9dd 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanFalseMarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanFalseMarshallTest.java
@@ -70,6 +70,7 @@ public class BindySimpleCsvBooleanFalseMarshallTest extends AbstractJUnit4Spring
 
     public static class ContextConfig extends RouteBuilder {
 
+        @Override
         public void configure() {
             BindyCsvDataFormat camelDataFormat = new BindyCsvDataFormat(
                 org.apache.camel.dataformat.bindy.model.simple.bool.BooleanExample.class);
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanTrueMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanTrueMarshallTest.java
index 96a9025..1a1c584 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanTrueMarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanTrueMarshallTest.java
@@ -70,6 +70,7 @@ public class BindySimpleCsvBooleanTrueMarshallTest extends AbstractJUnit4SpringC
 
     public static class ContextConfig extends RouteBuilder {
 
+        @Override
         public void configure() {
             BindyCsvDataFormat camelDataFormat = new BindyCsvDataFormat(
                 org.apache.camel.dataformat.bindy.model.simple.bool.BooleanExample.class);
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanUnmarshallTest.java
index 3e12545..de48209 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanUnmarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanUnmarshallTest.java
@@ -108,6 +108,7 @@ public class BindySimpleCsvBooleanUnmarshallTest extends AbstractJUnit4SpringCon
         BindyCsvDataFormat camelDataFormat = new BindyCsvDataFormat(
             org.apache.camel.dataformat.bindy.model.simple.bool.BooleanExample.class);
 
+        @Override
         public void configure() {
             // from("file://src/test/data?move=./target/done").unmarshal(camelDataFormat).to("mock:result");
 
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvGenerateHeaderMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvGenerateHeaderMarshallTest.java
index 036595c..07fc290 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvGenerateHeaderMarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvGenerateHeaderMarshallTest.java
@@ -84,6 +84,7 @@ public class BindySimpleCsvGenerateHeaderMarshallTest extends AbstractJUnit4Spri
 
     public static class ContextConfig extends RouteBuilder {
 
+        @Override
         public void configure() {
             BindyCsvDataFormat camelDataFormat =
                 new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.model.simple.oneclassgenerateheader.Order.class);
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvIntegerMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvIntegerMarshallTest.java
index 8527447..ad02953 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvIntegerMarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvIntegerMarshallTest.java
@@ -56,6 +56,7 @@ public class BindySimpleCsvIntegerMarshallTest extends AbstractJUnit4SpringConte
     }
 
     public static class ContextConfig extends RouteBuilder {
+        @Override
         public void configure() {
             BindyCsvDataFormat camelDataFormat = new BindyCsvDataFormat(MyOrder.class);
             camelDataFormat.setLocale("en_US");
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMandatoryFieldsUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMandatoryFieldsUnmarshallTest.java
index 334ac44..d297de8 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMandatoryFieldsUnmarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMandatoryFieldsUnmarshallTest.java
@@ -192,6 +192,7 @@ public class BindySimpleCsvMandatoryFieldsUnmarshallTest extends AbstractJUnit4S
         BindyCsvDataFormat formatMandatory = new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.model.simple.oneclassmandatory.Order.class);
         BindyCsvDataFormat formatEmptyStream = new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.model.simple.oneclassemptystream.Order.class);
 
+        @Override
         public void configure() {
             from("direct:start1").unmarshal(formatOptional).to("mock:result1");
             from("direct:start2").unmarshal(formatMandatory).to("mock:result2");
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallDslTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallDslTest.java
index 72dde24..7caf02f 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallDslTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallDslTest.java
@@ -92,6 +92,7 @@ public class BindySimpleCsvMarshallDslTest extends AbstractJUnit4SpringContextTe
 
     public static class ContextConfig extends RouteBuilder {
 
+        @Override
         public void configure() {
             BindyDataFormat bindy = new BindyDataFormat();
             bindy.setLocale("en");
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallPositionModifiedTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallPositionModifiedTest.java
index 80bee73..fca2d3d 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallPositionModifiedTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallPositionModifiedTest.java
@@ -77,6 +77,7 @@ public class BindySimpleCsvMarshallPositionModifiedTest extends CommonBindyTest
 
     public static class ContextConfig extends RouteBuilder {
 
+        @Override
         public void configure() {
 
             BindyCsvDataFormat csvBindyDataFormat = new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.model.simple.oneclassdifferentposition.Order.class);
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTest.java
index 0a00c41..0f50bdc 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTest.java
@@ -100,6 +100,7 @@ public class BindySimpleCsvMarshallTest extends AbstractJUnit4SpringContextTests
 
     public static class ContextConfig extends RouteBuilder {
 
+        @Override
         public void configure() {
 
             BindyCsvDataFormat camelDataFormat = new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.model.simple.oneclass.Order.class);
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTrimClipTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTrimClipTest.java
index c2ff835..2df53a2 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTrimClipTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTrimClipTest.java
@@ -62,6 +62,7 @@ public class BindySimpleCsvMarshallTrimClipTest extends AbstractJUnit4SpringCont
     }
 
     public static class ContextConfig extends RouteBuilder {
+        @Override
         public void configure() {
             BindyCsvDataFormat camelDataFormat = new BindyCsvDataFormat(
                 org.apache.camel.dataformat.bindy.model.simple.oneclassandtrimandclip.Customer.class);
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvNullMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvNullMarshallTest.java
index 840ae31..ab72a95 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvNullMarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvNullMarshallTest.java
@@ -83,6 +83,7 @@ public class BindySimpleCsvNullMarshallTest extends AbstractJUnit4SpringContextT
 
     public static class ContextConfig extends RouteBuilder {
 
+        @Override
         public void configure() {
             BindyCsvDataFormat camelDataFormat = new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.model.simple.oneclass.Order.class);
             camelDataFormat.setLocale("en");
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvOneToManyMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvOneToManyMarshallTest.java
index c124f1d..b1823cf 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvOneToManyMarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvOneToManyMarshallTest.java
@@ -107,6 +107,7 @@ public class BindySimpleCsvOneToManyMarshallTest extends AbstractJUnit4SpringCon
     public static class ContextConfig extends RouteBuilder {
         BindyCsvDataFormat camelDataFormat = new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.model.simple.onetomany.Author.class);
 
+        @Override
         public void configure() {
             from("direct:start").marshal(camelDataFormat).to("mock:result");
         }
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvRemoveWhitespaceUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvRemoveWhitespaceUnmarshallTest.java
index f20fdc1..deedf6b 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvRemoveWhitespaceUnmarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvRemoveWhitespaceUnmarshallTest.java
@@ -57,6 +57,7 @@ public class BindySimpleCsvRemoveWhitespaceUnmarshallTest extends AbstractJUnit4
     public static class ContextConfig extends RouteBuilder {
         BindyCsvDataFormat camelDataFormat = new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.model.simple.oneclassandremovewhitespace.Order.class);
 
+        @Override
         public void configure() {
             // from("file://src/test/data2")
             from("direct:start").unmarshal(camelDataFormat).to("mock:result");
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvSkipFirstLineUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvSkipFirstLineUnmarshallTest.java
index cb94294..f3c4d31 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvSkipFirstLineUnmarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvSkipFirstLineUnmarshallTest.java
@@ -52,6 +52,7 @@ public class BindySimpleCsvSkipFirstLineUnmarshallTest extends AbstractJUnit4Spr
     public static class ContextConfig extends RouteBuilder {
         BindyCsvDataFormat camelDataFormat = new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.model.simple.oneclassandskipfirstline.Order.class);
 
+        @Override
         public void configure() {
             // from("file://src/test/data2")
             from("direct:start").unmarshal(camelDataFormat).to("mock:result");
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallBadIntegerTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallBadIntegerTest.java
index 7a31b23..fa0b44e 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallBadIntegerTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallBadIntegerTest.java
@@ -96,6 +96,7 @@ public class BindySimpleCsvUnmarshallBadIntegerTest extends AbstractJUnit4Spring
 
         BindyCsvDataFormat orderBindyDataFormat = new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.model.simple.oneclassmath.Math.class);
 
+        @Override
         public void configure() {
 
             // default should errors go to mock:error
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallPositionModifiedTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallPositionModifiedTest.java
index ac9d7a9..dfa9b6d 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallPositionModifiedTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallPositionModifiedTest.java
@@ -89,6 +89,7 @@ public class BindySimpleCsvUnmarshallPositionModifiedTest extends AbstractJUnit4
 
         BindyCsvDataFormat orderBindyDataFormat = new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.model.simple.oneclassdifferentposition.Order.class);
 
+        @Override
         public void configure() {
 
             // default should errors go to mock:error
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallTest.java
index 5b3ac9b..9dd8155 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallTest.java
@@ -137,6 +137,7 @@ public class BindySimpleCsvUnmarshallTest extends AbstractJUnit4SpringContextTes
     public static class ContextConfig extends RouteBuilder {
         BindyCsvDataFormat camelDataFormat = new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.model.simple.oneclass.Order.class);
 
+        @Override
         public void configure() {
             // from("file://src/test/data?move=./target/done").unmarshal(camelDataFormat).to("mock:result");
 
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallUnicodeNextLineTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallUnicodeNextLineTest.java
index 5d421b0..9fa8513 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallUnicodeNextLineTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallUnicodeNextLineTest.java
@@ -61,6 +61,7 @@ public class BindySimpleCsvUnmarshallUnicodeNextLineTest extends AbstractJUnit4S
     public static class ContextConfig extends RouteBuilder {
         BindyCsvDataFormat locationRecordBindyDataFormat = new BindyCsvDataFormat(LocationRecord.class);
 
+        @Override
         public void configure() {
             from(URI_DIRECT_START)
                     .unmarshal(locationRecordBindyDataFormat)
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySingleQuoteStartWordCsvUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySingleQuoteStartWordCsvUnmarshallTest.java
index 5f02074..3e73c14 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySingleQuoteStartWordCsvUnmarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySingleQuoteStartWordCsvUnmarshallTest.java
@@ -62,6 +62,7 @@ public class BindySingleQuoteStartWordCsvUnmarshallTest extends AbstractJUnit4Sp
     public static class ContextConfig extends RouteBuilder {
         BindyCsvDataFormat camelDataFormat = new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.model.simple.oneclass.Order.class);
 
+        @Override
         public void configure() {
             from(URI_DIRECT_START).unmarshal(camelDataFormat).to(URI_MOCK_RESULT);
         }
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySingleQuotesCsvUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySingleQuotesCsvUnmarshallTest.java
index 8a291ee..50b409a 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySingleQuotesCsvUnmarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySingleQuotesCsvUnmarshallTest.java
@@ -55,6 +55,7 @@ public class BindySingleQuotesCsvUnmarshallTest extends AbstractJUnit4SpringCont
     public static class ContextConfig extends RouteBuilder {
         BindyCsvDataFormat camelDataFormat = new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.model.simple.oneclasssinglequote.Order.class);
 
+        @Override
         public void configure() {
             from(URI_DIRECT_START).unmarshal(camelDataFormat).to(URI_MOCK_RESULT);
         }
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySingleQuotesWithDoubleQuotesInFieldCsvUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySingleQuotesWithDoubleQuotesInFieldCsvUnmarshallTest.java
index aaca356..72e824c 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySingleQuotesWithDoubleQuotesInFieldCsvUnmarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySingleQuotesWithDoubleQuotesInFieldCsvUnmarshallTest.java
@@ -62,6 +62,7 @@ public class BindySingleQuotesWithDoubleQuotesInFieldCsvUnmarshallTest extends A
     public static class ContextConfig extends RouteBuilder {
         BindyCsvDataFormat camelDataFormat = new BindyCsvDataFormat(org.apache.camel.dataformat.bindy.model.simple.oneclasssinglequote.Order.class);
 
+        @Override
         public void configure() {
             from(URI_DIRECT_START).unmarshal(camelDataFormat).to(URI_MOCK_RESULT);
         }
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexOneToManyKeyValuePairUnMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexOneToManyKeyValuePairUnMarshallTest.java
index cbae0fd..7895cd0 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexOneToManyKeyValuePairUnMarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexOneToManyKeyValuePairUnMarshallTest.java
@@ -56,6 +56,7 @@ public class BindyComplexOneToManyKeyValuePairUnMarshallTest extends CommonBindy
     public static class ContextConfig extends RouteBuilder {
         BindyKeyValuePairDataFormat kvpBindyDataFormat = new BindyKeyValuePairDataFormat(org.apache.camel.dataformat.bindy.model.fix.complex.onetomany.Order.class);
 
+        @Override
         public void configure() {
             from(URI_DIRECT_START).unmarshal(kvpBindyDataFormat).to(URI_MOCK_RESULT);
         }
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairMarshallDslTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairMarshallDslTest.java
index 3e6968c..af7b369 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairMarshallDslTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairMarshallDslTest.java
@@ -80,6 +80,7 @@ public class BindySimpleKeyValuePairMarshallDslTest extends AbstractJUnit4Spring
 
     public static class ContextConfig extends RouteBuilder {
         
+        @Override
         public void configure() {
             from("direct:start").marshal()
                 .bindy(BindyType.KeyValue, org.apache.camel.dataformat.bindy.model.fix.simple.Order.class)
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairMarshallTest.java
index c9e02a5..dae1baa 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairMarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairMarshallTest.java
@@ -90,6 +90,7 @@ public class BindySimpleKeyValuePairMarshallTest extends AbstractJUnit4SpringCon
     public static class ContextConfig extends RouteBuilder {
         BindyKeyValuePairDataFormat camelDataFormat = new BindyKeyValuePairDataFormat(org.apache.camel.dataformat.bindy.model.fix.simple.Order.class);
 
+        @Override
         public void configure() {
             from("direct:start").marshal(camelDataFormat).to("mock:result");
         }
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairNullMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairNullMarshallTest.java
index 8e15d3c..742b04b 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairNullMarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairNullMarshallTest.java
@@ -93,6 +93,7 @@ public class BindySimpleKeyValuePairNullMarshallTest extends AbstractJUnit4Sprin
     public static class ContextConfig extends RouteBuilder {
         BindyKeyValuePairDataFormat kvpBindyDataFormat = new BindyKeyValuePairDataFormat(org.apache.camel.dataformat.bindy.model.fix.simple.Order.class);
 
+        @Override
         public void configure() {
             from("direct:start").marshal(kvpBindyDataFormat).to("mock:result");
         }
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairSortedMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairSortedMarshallTest.java
index 5c0dbc8..dc20d70 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairSortedMarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairSortedMarshallTest.java
@@ -93,6 +93,7 @@ public class BindySimpleKeyValuePairSortedMarshallTest extends CommonBindyTest {
 
         BindyKeyValuePairDataFormat kvpBindyDataFormat = new BindyKeyValuePairDataFormat(org.apache.camel.dataformat.bindy.model.fix.sorted.body.Order.class);
        
+        @Override
         public void configure() {
             from(URI_DIRECT_START).marshal(kvpBindyDataFormat).to(URI_MOCK_RESULT);
         }
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairSortedUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairSortedUnmarshallTest.java
index 9e60a0b..499eb38 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairSortedUnmarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairSortedUnmarshallTest.java
@@ -45,6 +45,7 @@ public class BindySimpleKeyValuePairSortedUnmarshallTest extends CommonBindyTest
     public static class ContextConfig extends RouteBuilder {
         BindyKeyValuePairDataFormat kvpBindyDataFormat = new BindyKeyValuePairDataFormat(Order.class);
 
+        @Override
         public void configure() {
             from(URI_FILE_FIX).unmarshal(kvpBindyDataFormat).to(URI_MOCK_RESULT);
         }
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairTabMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairTabMarshallTest.java
index 68b5d93..d478d66 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairTabMarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairTabMarshallTest.java
@@ -85,6 +85,7 @@ public class BindySimpleKeyValuePairTabMarshallTest extends CommonBindyTest {
     public static class ContextConfig extends RouteBuilder {
         BindyKeyValuePairDataFormat kvpBindyDataFormat = new BindyKeyValuePairDataFormat(org.apache.camel.dataformat.bindy.model.fix.tab.Order.class);
 
+        @Override
         public void configure() {
             from(URI_DIRECT_START).marshal(kvpBindyDataFormat).to(URI_MOCK_RESULT);
         }
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairTabUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairTabUnmarshallTest.java
index d9d6b14..0da2991 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairTabUnmarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairTabUnmarshallTest.java
@@ -44,6 +44,7 @@ public class BindySimpleKeyValuePairTabUnmarshallTest extends CommonBindyTest {
     public static class ContextConfig extends RouteBuilder {
         BindyKeyValuePairDataFormat kvpBindyDataFormat = new BindyKeyValuePairDataFormat(Order.class);
 
+        @Override
         public void configure() {
             from(URI_FILE_FIX_TAB).unmarshal(kvpBindyDataFormat).to(URI_MOCK_RESULT);
         }
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairUnicodeNextLineTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairUnicodeNextLineTest.java
index 8336c0c..8355f03 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairUnicodeNextLineTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairUnicodeNextLineTest.java
@@ -66,6 +66,7 @@ public class BindySimpleKeyValuePairUnicodeNextLineTest extends AbstractJUnit4Sp
 
         BindyKeyValuePairDataFormat kvpBindyDataFormat = new BindyKeyValuePairDataFormat(UnicodeFixOrder.class);
 
+        @Override
         public void configure() {
             from(URI_DIRECT_START).unmarshal(kvpBindyDataFormat).to(URI_MOCK_RESULT);
         }
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairUnmarshallDslTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairUnmarshallDslTest.java
index 8868d68..d0ca6c6 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairUnmarshallDslTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairUnmarshallDslTest.java
@@ -43,6 +43,7 @@ public class BindySimpleKeyValuePairUnmarshallDslTest extends CommonBindyTest {
 
     public static class ContextConfig extends RouteBuilder {
 
+        @Override
         public void configure() {
             from(URI_FILE_FIX).unmarshal()
                 .bindy(BindyType.KeyValue, Order.class)
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairUnmarshallTest.java
index d456f72..9c80047 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairUnmarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairUnmarshallTest.java
@@ -43,6 +43,7 @@ public class BindySimpleKeyValuePairUnmarshallTest extends CommonBindyTest {
     public static class ContextConfig extends RouteBuilder {
         BindyKeyValuePairDataFormat kvpBindyDataFormat = new BindyKeyValuePairDataFormat(Order.class);
 
+        @Override
         public void configure() {
             from(URI_FILE_FIX).unmarshal(kvpBindyDataFormat).to(URI_MOCK_RESULT);
         }
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairWithoutSectionMarshallDslTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairWithoutSectionMarshallDslTest.java
index db788ff..609a5fc 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairWithoutSectionMarshallDslTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairWithoutSectionMarshallDslTest.java
@@ -97,6 +97,7 @@ public class BindySimpleKeyValuePairWithoutSectionMarshallDslTest extends Abstra
 
         BindyKeyValuePairDataFormat orderBindyDataFormat = new BindyKeyValuePairDataFormat(org.apache.camel.dataformat.bindy.model.fix.withoutsection.Order.class);
 
+        @Override
         public void configure() {
 
             // default should errors go to mock:error
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/implied/BindyImpliedTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/implied/BindyImpliedTest.java
index 871886c..c1ec726 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/implied/BindyImpliedTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/implied/BindyImpliedTest.java
@@ -108,6 +108,7 @@ public class BindyImpliedTest extends AbstractJUnit4SpringContextTests {
     // *************************************************************************
 
     public static class ContextConfig extends RouteBuilder {
+        @Override
         public void configure() {
             BindyDataFormat bindy = new BindyDataFormat();
             bindy.setClassType(Record.class);
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallTest.java
index be9c2b3..8ae44c6 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallTest.java
@@ -94,6 +94,7 @@ public class BindySimpleFixedLengthMarshallTest extends AbstractJUnit4SpringCont
     }
 
     public static class ContextConfig extends RouteBuilder {
+        @Override
         public void configure() {
 
             // default should errors go to mock:error
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/number/BindyNumberTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/number/BindyNumberTest.java
index 612ef3c..0f702dd 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/number/BindyNumberTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/number/BindyNumberTest.java
@@ -103,6 +103,7 @@ public class BindyNumberTest extends AbstractJUnit4SpringContextTests {
     // *************************************************************************
 
     public static class ContextConfig extends RouteBuilder {
+        @Override
         public void configure() {
             BindyDataFormat bindy = new BindyDataFormat();
             bindy.setClassType(DataModel.class);
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/method/BindySimpleFixedLengthUnmarshallClassMethodTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/method/BindySimpleFixedLengthUnmarshallClassMethodTest.java
index dba090d..a2f4486 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/method/BindySimpleFixedLengthUnmarshallClassMethodTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/method/BindySimpleFixedLengthUnmarshallClassMethodTest.java
@@ -70,6 +70,7 @@ public class BindySimpleFixedLengthUnmarshallClassMethodTest extends AbstractJUn
     public static class ContextConfig extends RouteBuilder {
         BindyFixedLengthDataFormat camelDataFormat = new BindyFixedLengthDataFormat(Order.class);
 
+        @Override
         public void configure() {
             from(URI_DIRECT_START).unmarshal(camelDataFormat).to(URI_MOCK_RESULT);
         }
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/method/BindySimpleFixedLengthUnmarshallExternalMethodTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/method/BindySimpleFixedLengthUnmarshallExternalMethodTest.java
index 36a9f5f..8d99bae 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/method/BindySimpleFixedLengthUnmarshallExternalMethodTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/method/BindySimpleFixedLengthUnmarshallExternalMethodTest.java
@@ -74,6 +74,7 @@ public class BindySimpleFixedLengthUnmarshallExternalMethodTest extends Abstract
     public static class ContextConfig extends RouteBuilder {
         BindyFixedLengthDataFormat camelDataFormat = new BindyFixedLengthDataFormat(Order.class);
 
+        @Override
         public void configure() {
             from(URI_DIRECT_START).unmarshal(camelDataFormat).to(URI_MOCK_RESULT);
         }
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trim/BindySimpleFixedLengthUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trim/BindySimpleFixedLengthUnmarshallTest.java
index f555432..5ea1eca 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trim/BindySimpleFixedLengthUnmarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trim/BindySimpleFixedLengthUnmarshallTest.java
@@ -70,6 +70,7 @@ public class BindySimpleFixedLengthUnmarshallTest extends AbstractJUnit4SpringCo
     public static class ContextConfig extends RouteBuilder {
         BindyFixedLengthDataFormat camelDataFormat = new BindyFixedLengthDataFormat(Order.class);
 
+        @Override
         public void configure() {
             from(URI_DIRECT_START).unmarshal(camelDataFormat).to(URI_MOCK_RESULT);
         }
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trimfield/BindySimpleFixedLengthUnmarshallTrimAlignedBFieldTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trimfield/BindySimpleFixedLengthUnmarshallTrimAlignedBFieldTest.java
index ca805d1..44e5f9a 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trimfield/BindySimpleFixedLengthUnmarshallTrimAlignedBFieldTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trimfield/BindySimpleFixedLengthUnmarshallTrimAlignedBFieldTest.java
@@ -72,6 +72,7 @@ public class BindySimpleFixedLengthUnmarshallTrimAlignedBFieldTest extends Abstr
     public static class ContextConfig extends RouteBuilder {
         BindyFixedLengthDataFormat camelDataFormat = new BindyFixedLengthDataFormat(Order.class);
 
+        @Override
         public void configure() {
             from(URI_DIRECT_START).unmarshal(camelDataFormat).to(URI_MOCK_RESULT);
         }
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trimfield/BindySimpleFixedLengthUnmarshallTrimFieldTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trimfield/BindySimpleFixedLengthUnmarshallTrimFieldTest.java
index 7d84231..f306849 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trimfield/BindySimpleFixedLengthUnmarshallTrimFieldTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trimfield/BindySimpleFixedLengthUnmarshallTrimFieldTest.java
@@ -71,6 +71,7 @@ public class BindySimpleFixedLengthUnmarshallTrimFieldTest extends AbstractJUnit
     public static class ContextConfig extends RouteBuilder {
         BindyFixedLengthDataFormat camelDataFormat = new BindyFixedLengthDataFormat(Order.class);
 
+        @Override
         public void configure() {
             from(URI_DIRECT_START).unmarshal(camelDataFormat).to(URI_MOCK_RESULT);
         }
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/date/BindyDatePatternCsvUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/date/BindyDatePatternCsvUnmarshallTest.java
index 0847a7a..829e71f 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/date/BindyDatePatternCsvUnmarshallTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/date/BindyDatePatternCsvUnmarshallTest.java
@@ -67,6 +67,7 @@ public class BindyDatePatternCsvUnmarshallTest extends AbstractJUnit4SpringConte
     public static class ContextConfig extends RouteBuilder {
         BindyCsvDataFormat camelDataFormat = new BindyCsvDataFormat(Order.class);
 
+        @Override
         public void configure() {
             from(URI_DIRECT_START)
                 .unmarshal(camelDataFormat)
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java
index f5827f2..f14bffb 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java
@@ -105,6 +105,7 @@ public class BlueprintCamelContext extends DefaultCamelContext implements Servic
         this.bundleStateService = bundleStateService;
     }
    
+    @Override
     public void doInit() throws Exception {
         log.trace("init {}", this);
         // add service listener so we can be notified when blueprint container is done
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintModelJAXBContextFactory.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintModelJAXBContextFactory.java
index 20e52b8..07259b5 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintModelJAXBContextFactory.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintModelJAXBContextFactory.java
@@ -36,6 +36,7 @@ public class BlueprintModelJAXBContextFactory extends DefaultModelJAXBContextFac
         return classLoader;
     }
 
+    @Override
     protected String getPackages() {
         // we nedd to have a class from each different package with jaxb models
         // and we must use the .class for the classloader to work in OSGi
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
index 1c3270c..f63f212 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
@@ -214,6 +214,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
     @XmlTransient
     private OsgiCamelContextPublisher osgiCamelContextPublisher;
 
+    @Override
     public Class<BlueprintCamelContext> getObjectType() {
         return BlueprintCamelContext.class;
     }
@@ -372,6 +373,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
         }
     }
 
+    @Override
     public String getDependsOn() {
         return dependsOn;
     }
@@ -380,6 +382,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
         this.dependsOn = dependsOn;
     }
 
+    @Override
     public String getAutoStartup() {
         return autoStartup;
     }
@@ -388,6 +391,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
         this.autoStartup = autoStartup;
     }
 
+    @Override
     public String getUseMDCLogging() {
         return useMDCLogging;
     }
@@ -396,6 +400,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
         this.useMDCLogging = useMDCLogging;
     }
 
+    @Override
     public String getUseDataType() {
         return useDataType;
     }
@@ -404,6 +409,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
         this.useDataType = useDataType;
     }
 
+    @Override
     public String getUseBreadcrumb() {
         return useBreadcrumb;
     }
@@ -412,6 +418,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
         this.useBreadcrumb = useBreadcrumb;
     }
 
+    @Override
     public String getAllowUseOriginalMessage() {
         return allowUseOriginalMessage;
     }
@@ -420,6 +427,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
         this.allowUseOriginalMessage = allowUseOriginalMessage;
     }
 
+    @Override
     public String getRuntimeEndpointRegistryEnabled() {
         return runtimeEndpointRegistryEnabled;
     }
@@ -428,6 +436,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
         this.runtimeEndpointRegistryEnabled = runtimeEndpointRegistryEnabled;
     }
 
+    @Override
     public String getManagementNamePattern() {
         return managementNamePattern;
     }
@@ -436,6 +445,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
         this.managementNamePattern = managementNamePattern;
     }
 
+    @Override
     public String getThreadNamePattern() {
         return threadNamePattern;
     }
@@ -453,6 +463,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
         this.loadTypeConverters = loadTypeConverters;
     }
 
+    @Override
     public Boolean getTypeConverterStatisticsEnabled() {
         return typeConverterStatisticsEnabled;
     }
@@ -461,6 +472,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
         this.typeConverterStatisticsEnabled = typeConverterStatisticsEnabled;
     }
 
+    @Override
     public TypeConverterExists getTypeConverterExists() {
         return typeConverterExists;
     }
@@ -469,6 +481,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
         this.typeConverterExists = typeConverterExists;
     }
 
+    @Override
     public LoggingLevel getTypeConverterExistsLoggingLevel() {
         return typeConverterExistsLoggingLevel;
     }
@@ -477,6 +490,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
         this.typeConverterExistsLoggingLevel = typeConverterExistsLoggingLevel;
     }
 
+    @Override
     public ShutdownRoute getShutdownRoute() {
         return shutdownRoute;
     }
@@ -485,6 +499,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
         this.shutdownRoute = shutdownRoute;
     }
 
+    @Override
     public ShutdownRunningTask getShutdownRunningTask() {
         return shutdownRunningTask;
     }
@@ -493,6 +508,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
         this.shutdownRunningTask = shutdownRunningTask;
     }
 
+    @Override
     public CamelPropertyPlaceholderDefinition getCamelPropertyPlaceholder() {
         return camelPropertyPlaceholder;
     }
@@ -501,6 +517,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
         this.camelPropertyPlaceholder = camelPropertyPlaceholder;
     }
 
+    @Override
     public List<RouteContextRefDefinition> getRouteRefs() {
         return routeRefs;
     }
@@ -509,6 +526,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
         this.routeRefs = routeRefs;
     }
 
+    @Override
     public List<RestContextRefDefinition> getRestRefs() {
         return restRefs;
     }
@@ -517,6 +535,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
         this.restRefs = restRefs;
     }
 
+    @Override
     public List<CamelRedeliveryPolicyFactoryBean> getRedeliveryPolicies() {
         return redeliveryPolicies;
     }
@@ -525,6 +544,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
         this.redeliveryPolicies = redeliveryPolicies;
     }
 
+    @Override
     public List<ThreadPoolProfileDefinition> getThreadPoolProfiles() {
         return threadPoolProfiles;
     }
@@ -541,6 +561,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
         this.threadPools = threadPools;
     }
 
+    @Override
     public String getTrace() {
         return trace;
     }
@@ -549,6 +570,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
         this.trace = trace;
     }
 
+    @Override
     public String getTracePattern() {
         return tracePattern;
     }
@@ -557,6 +579,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
         this.tracePattern = tracePattern;
     }
 
+    @Override
     public String getMessageHistory() {
         return messageHistory;
     }
@@ -565,6 +588,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
         this.messageHistory = messageHistory;
     }
 
+    @Override
     public String getLogMask() {
         return logMask;
     }
@@ -573,6 +597,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
         this.logMask = logMask;
     }
 
+    @Override
     public String getLogExhaustedMessageBody() {
         return logExhaustedMessageBody;
     }
@@ -581,6 +606,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
         this.logExhaustedMessageBody = logExhaustedMessageBody;
     }
 
+    @Override
     public String getStreamCache() {
         return streamCache;
     }
@@ -589,6 +615,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
         this.streamCache = streamCache;
     }
 
+    @Override
     public String getDelayer() {
         return delayer;
     }
@@ -597,6 +624,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
         this.delayer = delayer;
     }
 
+    @Override
     public String getErrorHandlerRef() {
         return errorHandlerRef;
     }
@@ -614,6 +642,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
         this.globalOptions = globalOptions;
     }
 
+    @Override
     public String[] getPackages() {
         return packages;
     }
@@ -622,22 +651,27 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
         this.packages = packages;
     }
 
+    @Override
     public PackageScanDefinition getPackageScan() {
         return packageScan;
     }
 
+    @Override
     public void setPackageScan(PackageScanDefinition packageScan) {
         this.packageScan = packageScan;
     }
 
+    @Override
     public ContextScanDefinition getContextScan() {
         return contextScan;
     }
 
+    @Override
     public void setContextScan(ContextScanDefinition contextScan) {
         this.contextScan = contextScan;
     }
 
+    @Override
     public CamelJMXAgentDefinition getCamelJMXAgent() {
         return camelJMXAgent;
     }
@@ -646,6 +680,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
         this.camelJMXAgent = camelJMXAgent;
     }
 
+    @Override
     public CamelStreamCachingStrategyDefinition getCamelStreamCachingStrategy() {
         return camelStreamCachingStrategy;
     }
@@ -708,6 +743,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
         this.hystrixConfigurations = hystrixConfigurations;
     }
 
+    @Override
     public List<RouteBuilderDefinition> getBuilderRefs() {
         return builderRefs;
     }
@@ -716,6 +752,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
         this.builderRefs = builderRefs;
     }
 
+    @Override
     public List<CamelEndpointFactoryBean> getEndpoints() {
         return endpoints;
     }
@@ -724,6 +761,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
         this.endpoints = endpoints;
     }
 
+    @Override
     public DataFormatsDefinition getDataFormats() {
         return dataFormats;
     }
@@ -736,6 +774,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
         this.transformers = transformers;
     }
 
+    @Override
     public TransformersDefinition getTransformers() {
         return transformers;
     }
@@ -744,10 +783,12 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
         this.validators = validators;
     }
 
+    @Override
     public ValidatorsDefinition getValidators() {
         return validators;
     }
 
+    @Override
     public List<OnExceptionDefinition> getOnExceptions() {
         return onExceptions;
     }
@@ -756,6 +797,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
         this.onExceptions = onExceptions;
     }
 
+    @Override
     public List<OnCompletionDefinition> getOnCompletions() {
         return onCompletions;
     }
@@ -764,6 +806,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
         this.onCompletions = onCompletions;
     }
 
+    @Override
     public List<InterceptDefinition> getIntercepts() {
         return intercepts;
     }
@@ -772,6 +815,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
         this.intercepts = intercepts;
     }
 
+    @Override
     public List<InterceptFromDefinition> getInterceptFroms() {
         return interceptFroms;
     }
@@ -780,6 +824,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
         this.interceptFroms = interceptFroms;
     }
 
+    @Override
     public List<InterceptSendToEndpointDefinition> getInterceptSendToEndpoints() {
         return interceptSendToEndpoints;
     }
@@ -788,22 +833,27 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Blu
         this.interceptSendToEndpoints = interceptSendToEndpoints;
     }
 
+    @Override
     public List<RouteDefinition> getRoutes() {
         return routes;
     }
 
+    @Override
     public void setRoutes(List<RouteDefinition> routes) {
         this.routes = routes;
     }
 
+    @Override
     public List<RestDefinition> getRests() {
         return rests;
     }
 
+    @Override
     public void setRests(List<RestDefinition> rests) {
         this.rests = rests;
     }
 
+    @Override
     public RestConfigurationDefinition getRestConfiguration() {
         return restConfiguration;
     }
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelErrorHandlerFactoryBean.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelErrorHandlerFactoryBean.java
index 6db7ce5..3a9cd7a 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelErrorHandlerFactoryBean.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelErrorHandlerFactoryBean.java
@@ -116,6 +116,7 @@ public class CamelErrorHandlerFactoryBean extends AbstractCamelFactoryBean<Error
         this.blueprintContainer = blueprintContainer;
     }
 
+    @Override
     protected CamelContext getCamelContextWithId(String camelContextId) {
         if (blueprintContainer != null) {
             return (CamelContext) blueprintContainer.getComponentInstance(camelContextId);
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelProxyFactoryBean.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelProxyFactoryBean.java
index b003f9c..7d59e73 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelProxyFactoryBean.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelProxyFactoryBean.java
@@ -56,14 +56,17 @@ public class CamelProxyFactoryBean extends AbstractCamelFactoryBean<Object> {
     @XmlTransient
     private ExtendedBlueprintContainer blueprintContainer;
 
+    @Override
     public Object getObject() {
         return serviceProxy;
     }
 
+    @Override
     public Class<Object> getObjectType() {
         return Object.class;
     }
 
+    @Override
     protected CamelContext getCamelContextWithId(String camelContextId) {
         if (blueprintContainer != null) {
             return (CamelContext) blueprintContainer.getComponentInstance(camelContextId);
@@ -83,6 +86,7 @@ public class CamelProxyFactoryBean extends AbstractCamelFactoryBean<Object> {
         return null;
     }
 
+    @Override
     public void afterPropertiesSet() throws Exception {
         if (endpoint == null) {
             getCamelContext();
@@ -121,6 +125,7 @@ public class CamelProxyFactoryBean extends AbstractCamelFactoryBean<Object> {
         }
     }
 
+    @Override
     public void destroy() throws Exception {
         // we let CamelContext manage the lifecycle of the producer and shut it down when Camel stops
     }
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
index bd21202..b0e6469 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
@@ -177,6 +177,7 @@ public class CamelNamespaceHandler implements NamespaceHandler {
         }
     }
 
+    @Override
     public URL getSchemaLocation(String namespace) {
         if (BLUEPRINT_NS.equals(namespace)) {
             return getClass().getClassLoader().getResource("camel-blueprint.xsd");
@@ -184,11 +185,13 @@ public class CamelNamespaceHandler implements NamespaceHandler {
         return null;
     }
 
+    @Override
     @SuppressWarnings({"rawtypes"})
     public Set<Class> getManagedClasses() {
         return new HashSet<>(Arrays.asList(BlueprintCamelContext.class));
     }
 
+    @Override
     public Metadata parse(Element element, ParserContext context) {
         LOG.trace("Parsing element {}", element);
 
@@ -661,6 +664,7 @@ public class CamelNamespaceHandler implements NamespaceHandler {
         return (BlueprintContainer) ptm.getObject();
     }
 
+    @Override
     public ComponentMetadata decorate(Node node, ComponentMetadata component, ParserContext context) {
         return null;
     }
@@ -796,6 +800,7 @@ public class CamelNamespaceHandler implements NamespaceHandler {
             this.value = value;
         }
 
+        @Override
         public T call() throws Exception {
             return value;
         }
@@ -823,6 +828,7 @@ public class CamelNamespaceHandler implements NamespaceHandler {
             return null;
         }
 
+        @Override
         public Object beforeInit(Object bean, String beanName, BeanCreator beanCreator, BeanMetadata beanMetadata) {
             LOG.trace("Before init of bean: {} -> {}", beanName, bean);
             // prefer to inject later in afterInit
@@ -964,6 +970,7 @@ public class CamelNamespaceHandler implements NamespaceHandler {
             }
         }
 
+        @Override
         public Object afterInit(Object bean, String beanName, BeanCreator beanCreator, BeanMetadata beanMetadata) {
             LOG.trace("After init of bean: {} -> {}", beanName, bean);
             // we cannot inject CamelContextAware beans as the CamelContext may not be ready
@@ -973,9 +980,11 @@ public class CamelNamespaceHandler implements NamespaceHandler {
             return bean;
         }
 
+        @Override
         public void beforeDestroy(Object bean, String beanName) {
         }
 
+        @Override
         public void afterDestroy(Object bean, String beanName) {
         }
 
@@ -1011,6 +1020,7 @@ public class CamelNamespaceHandler implements NamespaceHandler {
             this.blueprintContainer = blueprintContainer;
         }
 
+        @Override
         public void process(ComponentDefinitionRegistry componentDefinitionRegistry) {
             CamelContextFactoryBean ccfb = (CamelContextFactoryBean) blueprintContainer.getComponentInstance(".camelBlueprint.factory." + camelContextName);
             CamelContext camelContext = ccfb.getContext();
diff --git a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/BonitaComponent.java b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/BonitaComponent.java
index 0d29a0f..ed67f58 100644
--- a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/BonitaComponent.java
+++ b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/BonitaComponent.java
@@ -34,6 +34,7 @@ public class BonitaComponent extends DefaultComponent {
         super(context);
     }
 
+    @Override
     protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
         BonitaConfiguration configuration = new BonitaConfiguration();
         setProperties(configuration, parameters);
diff --git a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/BonitaEndpoint.java b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/BonitaEndpoint.java
index 2cf36f4..eb103e5 100644
--- a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/BonitaEndpoint.java
+++ b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/BonitaEndpoint.java
@@ -44,6 +44,7 @@ public class BonitaEndpoint extends DefaultEndpoint {
         this.configuration = configuration;
     }
 
+    @Override
     public Producer createProducer() throws Exception {
         if (configuration.getOperation() == BonitaOperation.startCase) {
             return new BonitaStartProducer(this, configuration);
@@ -52,6 +53,7 @@ public class BonitaEndpoint extends DefaultEndpoint {
         }
     }
 
+    @Override
     public Consumer createConsumer(Processor processor) throws Exception {
         throw new UnsupportedOperationException("Consumer not supported");
     }
diff --git a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/producer/BonitaStartProducer.java b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/producer/BonitaStartProducer.java
index 2d9f1ec..ed10b5b 100644
--- a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/producer/BonitaStartProducer.java
+++ b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/producer/BonitaStartProducer.java
@@ -32,6 +32,7 @@ public class BonitaStartProducer extends BonitaProducer {
         super(endpoint, configuration);
     }
 
+    @Override
     public void process(Exchange exchange) throws Exception {
         // Setup access type (HTTP on local host)
         String hostname = this.configuration.getHostname();
diff --git a/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxEndpoint.java b/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxEndpoint.java
index 4778cde..8a198e8 100644
--- a/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxEndpoint.java
+++ b/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxEndpoint.java
@@ -79,10 +79,12 @@ public class BoxEndpoint extends AbstractApiEndpoint<BoxApiName, BoxConfiguratio
         return boxConnection;
     }
 
+    @Override
     public Producer createProducer() throws Exception {
         return new BoxProducer(this);
     }
 
+    @Override
     public Consumer createConsumer(Processor processor) throws Exception {
         // make sure inBody is not set for consumers
         if (inBody != null) {
@@ -99,6 +101,7 @@ public class BoxEndpoint extends AbstractApiEndpoint<BoxApiName, BoxConfiguratio
         return BoxPropertiesHelper.getHelper();
     }
 
+    @Override
     protected String getThreadProfileName() {
         return BoxConstants.THREAD_PROFILE_NAME;
     }
diff --git a/components/camel-browse/src/main/java/org/apache/camel/component/browse/BrowseComponent.java b/components/camel-browse/src/main/java/org/apache/camel/component/browse/BrowseComponent.java
index 5f0a194..1fe1661 100644
--- a/components/camel-browse/src/main/java/org/apache/camel/component/browse/BrowseComponent.java
+++ b/components/camel-browse/src/main/java/org/apache/camel/component/browse/BrowseComponent.java
@@ -31,6 +31,7 @@ public class BrowseComponent extends DefaultComponent {
     public BrowseComponent() {
     }
 
+    @Override
     protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
         BrowseEndpoint endpoint = new BrowseEndpoint(uri, this);
         endpoint.setName(remaining);
diff --git a/components/camel-browse/src/main/java/org/apache/camel/component/browse/BrowseEndpoint.java b/components/camel-browse/src/main/java/org/apache/camel/component/browse/BrowseEndpoint.java
index 03ff7b4..4511deb 100644
--- a/components/camel-browse/src/main/java/org/apache/camel/component/browse/BrowseEndpoint.java
+++ b/components/camel-browse/src/main/java/org/apache/camel/component/browse/BrowseEndpoint.java
@@ -53,6 +53,7 @@ public class BrowseEndpoint extends DefaultEndpoint implements BrowsableEndpoint
         super(uri, component);
     }
 
+    @Override
     public List<Exchange> getExchanges() {
         if (exchanges == null) {
             exchanges = createExchangeList();
@@ -60,6 +61,7 @@ public class BrowseEndpoint extends DefaultEndpoint implements BrowsableEndpoint
         return exchanges;
     }
 
+    @Override
     public Producer createProducer() throws Exception {
         return new DefaultProducer(this) {
             public void process(Exchange exchange) throws Exception {
@@ -68,6 +70,7 @@ public class BrowseEndpoint extends DefaultEndpoint implements BrowsableEndpoint
         };
     }
 
+    @Override
     public Consumer createConsumer(Processor processor) throws Exception {
         this.onExchangeProcessor = processor;
 
diff --git a/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/EvictionType.java b/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/EvictionType.java
index 04d8f63..c8ccb6a 100644
--- a/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/EvictionType.java
+++ b/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/EvictionType.java
@@ -42,6 +42,7 @@ public enum EvictionType {
         throw new IllegalArgumentException(String.format("Eviction type '%s' is not supported by this component.", name));
     }
 
+    @Override
     public String toString() {
         return type;
     }
diff --git a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/processor/idempotent/CaffeineIdempotentRepositoryTest.java b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/processor/idempotent/CaffeineIdempotentRepositoryTest.java
index 1e2a154..4d370a1 100644
--- a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/processor/idempotent/CaffeineIdempotentRepositoryTest.java
+++ b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/processor/idempotent/CaffeineIdempotentRepositoryTest.java
@@ -120,6 +120,7 @@ public class CaffeineIdempotentRepositoryTest extends CamelTestSupport {
         assertMockEndpointsSatisfied();
     }
 
+    @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             @Override
diff --git a/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraEndpoint.java b/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraEndpoint.java
index 56da476..e045e9f 100644
--- a/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraEndpoint.java
+++ b/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraEndpoint.java
@@ -84,10 +84,12 @@ public class CassandraEndpoint extends ScheduledPollEndpoint {
         this.keyspace = keyspace;
     }
 
+    @Override
     public Producer createProducer() throws Exception {
         return new CassandraProducer(this);
     }
 
+    @Override
     public Consumer createConsumer(Processor processor) throws Exception {
         CassandraConsumer consumer = new CassandraConsumer(this, processor);
         configureConsumer(consumer);
diff --git a/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraProducer.java b/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraProducer.java
index c6d058f..3c20d5b 100644
--- a/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraProducer.java
+++ b/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraProducer.java
@@ -161,6 +161,7 @@ public class CassandraProducer extends DefaultProducer {
         return resultSet;
     }
 
+    @Override
     public void process(Exchange exchange) throws Exception {
         // copy the header of in message to the out message
         exchange.getOut().copyFrom(exchange.getIn());
diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationRepositoryTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationRepositoryTest.java
index a5440cf..a86754a 100644
--- a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationRepositoryTest.java
+++ b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationRepositoryTest.java
@@ -45,6 +45,7 @@ public class CassandraAggregationRepositoryTest extends BaseCassandraTest {
     private CassandraAggregationRepository aggregationRepository;
     private CamelContext camelContext;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         camelContext = new DefaultCamelContext();
@@ -57,6 +58,7 @@ public class CassandraAggregationRepositoryTest extends BaseCassandraTest {
         }
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         if (canTest()) {
diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/NamedCassandraAggregationRepositoryTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/NamedCassandraAggregationRepositoryTest.java
index 0f74b3d..0d79508 100644
--- a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/NamedCassandraAggregationRepositoryTest.java
+++ b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/NamedCassandraAggregationRepositoryTest.java
@@ -45,6 +45,7 @@ public class NamedCassandraAggregationRepositoryTest extends BaseCassandraTest {
     private CassandraAggregationRepository aggregationRepository;
     private CamelContext camelContext;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         camelContext = new DefaultCamelContext();
@@ -57,6 +58,7 @@ public class NamedCassandraAggregationRepositoryTest extends BaseCassandraTest {
         }
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         if (canTest()) {
diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentRepositoryTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentRepositoryTest.java
index 663a44e..b7e37a4 100644
--- a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentRepositoryTest.java
+++ b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentRepositoryTest.java
@@ -38,6 +38,7 @@ public class CassandraIdempotentRepositoryTest extends BaseCassandraTest {
     private Session session;
     private CassandraIdempotentRepository idempotentRepository;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         if (canTest()) {
@@ -48,6 +49,7 @@ public class CassandraIdempotentRepositoryTest extends BaseCassandraTest {
         }
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         if (canTest()) {
diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/NamedCassandraIdempotentRepositoryTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/NamedCassandraIdempotentRepositoryTest.java
index 66b0ac0..06d01a1 100644
--- a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/NamedCassandraIdempotentRepositoryTest.java
+++ b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/NamedCassandraIdempotentRepositoryTest.java
@@ -38,6 +38,7 @@ public class NamedCassandraIdempotentRepositoryTest extends BaseCassandraTest {
     private Session session;
     private CassandraIdempotentRepository idempotentRepository;
 
+    @Override
     @Before
     public void setUp() throws Exception {
         if (canTest()) {
@@ -49,6 +50,7 @@ public class NamedCassandraIdempotentRepositoryTest extends BaseCassandraTest {
         }
     }
 
+    @Override
     @After
     public void tearDown() throws Exception {
         if (canTest()) {
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedDelegate.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedDelegate.java
index 7736570..7be5cbe 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedDelegate.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedDelegate.java
@@ -42,6 +42,7 @@ class AnnotatedDelegate implements Annotated {
         this.annotations = delegate.getAnnotations();
     }
 
+    @Override
     public <T extends Annotation> T getAnnotation(Class<T> type) {
         return annotations.stream()
             .filter(isAnnotationType(type))
@@ -50,6 +51,7 @@ class AnnotatedDelegate implements Annotated {
             .orElse(null);
     }
 
+    @Override
     public <T extends Annotation> Set<T> getAnnotations(Class<T> type) {
         return annotations.stream()
             .filter(isAnnotationType(type))
@@ -57,30 +59,37 @@ class AnnotatedDelegate implements Annotated {
             .collect(toSet());
     }
 
+    @Override
     public Set<Annotation> getAnnotations() {
         return annotations;
     }
 
+    @Override
     public Type getBaseType() {
         return delegate.getBaseType();
     }
 
+    @Override
     public Set<Type> getTypeClosure() {
         return delegate.getTypeClosure();
     }
 
+    @Override
     public boolean isAnnotationPresent(Class<? extends Annotation> type) {
         return annotations.stream().anyMatch(isAnnotationType(type));
     }
 
+    @Override
     public String toString() {
         return delegate.toString();
     }
     
+    @Override
     public int hashCode() {
         return delegate.hashCode();
     }
     
+    @Override
     public boolean equals(Object object) {
         return delegate.equals(object);
     }
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticAnnotated.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticAnnotated.java
index d885cca..3c1e1a6 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticAnnotated.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticAnnotated.java
@@ -64,18 +64,22 @@ final class SyntheticAnnotated implements Annotated {
         annotations.add(annotation);
     }
 
+    @Override
     public Type getBaseType() {
         return type;
     }
 
+    @Override
     public Set<Type> getTypeClosure() {
         return unmodifiableSet(types);
     }
 
+    @Override
     public Set<Annotation> getAnnotations() {
         return unmodifiableSet(annotations);
     }
 
+    @Override
     public <T extends Annotation> T getAnnotation(Class<T> type) {
         return annotations.stream()
             .filter(isAnnotationType(type))
@@ -84,6 +88,7 @@ final class SyntheticAnnotated implements Annotated {
             .orElse(null);
     }
 
+    @Override
     public <T extends Annotation> Set<T> getAnnotations(Class<T> type) {
         return annotations.stream()
             .filter(isAnnotationType(type))
@@ -91,6 +96,7 @@ final class SyntheticAnnotated implements Annotated {
             .collect(toSet());
     }
 
+    @Override
     public boolean isAnnotationPresent(Class<? extends Annotation> type) {
         return annotations.stream().anyMatch(isAnnotationType(type));
     }
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionErrorHandlerBuilder.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionErrorHandlerBuilder.java
index 61cbd1d..f47928f 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionErrorHandlerBuilder.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/JtaTransactionErrorHandlerBuilder.java
@@ -75,6 +75,7 @@ public class JtaTransactionErrorHandlerBuilder extends DefaultErrorHandlerBuilde
         }
     }
 
+    @Override
     public Processor createErrorHandler(final RouteContext routeContext, final Processor processor) throws Exception {
         // resolve policy reference, if given
         if (transactionPolicy == null) {
@@ -158,6 +159,7 @@ public class JtaTransactionErrorHandlerBuilder extends DefaultErrorHandlerBuilde
         return this;
     }
 
+    @Override
     protected CamelLogger createLogger() {
         return new CamelLogger(LoggerFactory.getLogger(TransactionErrorHandler.class), LoggingLevel.ERROR);
     }
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactionErrorHandler.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactionErrorHandler.java
index deb42af..af9e0ce 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactionErrorHandler.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactionErrorHandler.java
@@ -89,6 +89,7 @@ public class TransactionErrorHandler extends ErrorHandlerSupport
         setExceptionPolicy(exceptionPolicyStrategy);
     }
 
+    @Override
     public void process(Exchange exchange) throws Exception {
         // we have to run this synchronously as a JTA Transaction does *not*
         // support using multiple threads to span a transaction
@@ -104,6 +105,7 @@ public class TransactionErrorHandler extends ErrorHandlerSupport
         }
     }
 
+    @Override
     public boolean process(Exchange exchange, AsyncCallback callback) {
         // invoke this synchronous method as JTA Transaction does *not*
         // support using multiple threads to span a transaction
@@ -321,6 +323,7 @@ public class TransactionErrorHandler extends ErrorHandlerSupport
         }
     }
 
+    @Override
     public void setExceptionPolicy(ExceptionPolicyStrategy exceptionPolicy) {
         this.exceptionPolicy = exceptionPolicy;
     }
@@ -357,6 +360,7 @@ public class TransactionErrorHandler extends ErrorHandlerSupport
         return true;
     }
 
+    @Override
     public boolean hasNext() {
         return output != null;
     }
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/CamelContextFactoryBean.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/CamelContextFactoryBean.java
index 5381608..c502954 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/CamelContextFactoryBean.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/CamelContextFactoryBean.java
@@ -383,22 +383,27 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
         this.hystrixConfigurations = hystrixConfigurations;
     }
 
+    @Override
     public List<RouteDefinition> getRoutes() {
         return routes;
     }
 
+    @Override
     public void setRoutes(List<RouteDefinition> routes) {
         this.routes = routes;
     }
 
+    @Override
     public List<RestDefinition> getRests() {
         return rests;
     }
 
+    @Override
     public void setRests(List<RestDefinition> rests) {
         this.rests = rests;
     }
 
+    @Override
     public RestConfigurationDefinition getRestConfiguration() {
         return restConfiguration;
     }
@@ -407,6 +412,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
         this.restConfiguration = restConfiguration;
     }
 
+    @Override
     public List<EndpointFactoryBean> getEndpoints() {
         return endpoints;
     }
@@ -415,6 +421,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
         this.endpoints = endpoints;
     }
 
+    @Override
     public List<RedeliveryPolicyFactoryBean> getRedeliveryPolicies() {
         return redeliveryPolicies;
     }
@@ -423,6 +430,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
         this.redeliveryPolicies = redeliveryPolicies;
     }
 
+    @Override
     public List<InterceptDefinition> getIntercepts() {
         return intercepts;
     }
@@ -431,6 +439,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
         this.intercepts = intercepts;
     }
 
+    @Override
     public List<InterceptFromDefinition> getInterceptFroms() {
         return interceptFroms;
     }
@@ -439,6 +448,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
         this.interceptFroms = interceptFroms;
     }
 
+    @Override
     public List<InterceptSendToEndpointDefinition> getInterceptSendToEndpoints() {
         return interceptSendToEndpoints;
     }
@@ -447,6 +457,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
         this.interceptSendToEndpoints = interceptSendToEndpoints;
     }
 
+    @Override
     public GlobalOptionsDefinition getGlobalOptions() {
         return globalOptions;
     }
@@ -455,6 +466,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
         this.globalOptions = globalOptions;
     }
 
+    @Override
     public String[] getPackages() {
         return packages;
     }
@@ -474,6 +486,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
         this.packages = packages;
     }
 
+    @Override
     public PackageScanDefinition getPackageScan() {
         return packageScan;
     }
@@ -485,10 +498,12 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
      *
      * @param packageScan the package scan
      */
+    @Override
     public void setPackageScan(PackageScanDefinition packageScan) {
         this.packageScan = packageScan;
     }
 
+    @Override
     public ContextScanDefinition getContextScan() {
         return contextScan;
     }
@@ -500,10 +515,12 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
      *
      * @param contextScan the context scan
      */
+    @Override
     public void setContextScan(ContextScanDefinition contextScan) {
         this.contextScan = contextScan;
     }
 
+    @Override
     public CamelPropertyPlaceholderDefinition getCamelPropertyPlaceholder() {
         return camelPropertyPlaceholder;
     }
@@ -512,6 +529,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
         this.camelPropertyPlaceholder = camelPropertyPlaceholder;
     }
 
+    @Override
     public CamelStreamCachingStrategyDefinition getCamelStreamCachingStrategy() {
         return camelStreamCachingStrategy;
     }
@@ -520,6 +538,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
         this.camelStreamCachingStrategy = camelStreamCachingStrategy;
     }
 
+    @Override
     public String getTrace() {
         return trace;
     }
@@ -528,6 +547,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
         this.trace = trace;
     }
 
+    @Override
     public String getTracePattern() {
         return tracePattern;
     }
@@ -536,6 +556,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
         this.tracePattern = tracePattern;
     }
 
+    @Override
     public String getMessageHistory() {
         return messageHistory;
     }
@@ -544,6 +565,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
         this.messageHistory = messageHistory;
     }
 
+    @Override
     public String getLogMask() {
         return logMask;
     }
@@ -561,6 +583,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
         this.logExhaustedMessageBody = logExhaustedMessageBody;
     }
 
+    @Override
     public String getStreamCache() {
         return streamCache;
     }
@@ -569,6 +592,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
         this.streamCache = streamCache;
     }
 
+    @Override
     public String getDelayer() {
         return delayer;
     }
@@ -577,6 +601,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
         this.delayer = delayer;
     }
 
+    @Override
     public String getAutoStartup() {
         return autoStartup;
     }
@@ -593,6 +618,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
         this.shutdownEager = shutdownEager;
     }
 
+    @Override
     public String getUseMDCLogging() {
         return useMDCLogging;
     }
@@ -601,6 +627,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
         this.useMDCLogging = useMDCLogging;
     }
 
+    @Override
     public String getUseDataType() {
         return useDataType;
     }
@@ -609,6 +636,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
         this.useDataType = useDataType;
     }
 
+    @Override
     public String getUseBreadcrumb() {
         return useBreadcrumb;
     }
@@ -617,6 +645,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
         this.useBreadcrumb = useBreadcrumb;
     }
 
+    @Override
     public String getAllowUseOriginalMessage() {
         return allowUseOriginalMessage;
     }
@@ -625,6 +654,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
         this.allowUseOriginalMessage = allowUseOriginalMessage;
     }
 
+    @Override
     public String getRuntimeEndpointRegistryEnabled() {
         return runtimeEndpointRegistryEnabled;
     }
@@ -633,6 +663,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
         this.runtimeEndpointRegistryEnabled = runtimeEndpointRegistryEnabled;
     }
 
+    @Override
     public String getManagementNamePattern() {
         return managementNamePattern;
     }
@@ -641,6 +672,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
         this.managementNamePattern = managementNamePattern;
     }
 
+    @Override
     public String getThreadNamePattern() {
         return threadNamePattern;
     }
@@ -649,6 +681,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
         this.threadNamePattern = threadNamePattern;
     }
 
+    @Override
     public Boolean getLoadTypeConverters() {
         return loadTypeConverters;
     }
@@ -657,6 +690,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
         this.loadTypeConverters = loadTypeConverters;
     }
 
+    @Override
     public Boolean getTypeConverterStatisticsEnabled() {
         return typeConverterStatisticsEnabled;
     }
@@ -665,6 +699,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
         this.typeConverterStatisticsEnabled = typeConverterStatisticsEnabled;
     }
 
+    @Override
     public TypeConverterExists getTypeConverterExists() {
         return typeConverterExists;
     }
@@ -673,6 +708,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
         this.typeConverterExists = typeConverterExists;
     }
 
+    @Override
     public LoggingLevel getTypeConverterExistsLoggingLevel() {
         return typeConverterExistsLoggingLevel;
     }
@@ -681,6 +717,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
         this.typeConverterExistsLoggingLevel = typeConverterExistsLoggingLevel;
     }
 
+    @Override
     public CamelJMXAgentDefinition getCamelJMXAgent() {
         return camelJMXAgent;
     }
@@ -689,6 +726,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
         camelJMXAgent = agent;
     }
 
+    @Override
     public List<RouteBuilderDefinition> getBuilderRefs() {
         return builderRefs;
     }
@@ -697,6 +735,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
         this.builderRefs = builderRefs;
     }
 
+    @Override
     public List<RouteContextRefDefinition> getRouteRefs() {
         return routeRefs;
     }
@@ -705,6 +744,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
         this.routeRefs = routeRefs;
     }
 
+    @Override
     public List<RestContextRefDefinition> getRestRefs() {
         return restRefs;
     }
@@ -713,6 +753,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
         this.restRefs = restRefs;
     }
 
+    @Override
     public String getErrorHandlerRef() {
         return errorHandlerRef;
     }
@@ -721,6 +762,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
         this.errorHandlerRef = errorHandlerRef;
     }
 
+    @Override
     public DataFormatsDefinition getDataFormats() {
         return dataFormats;
     }
@@ -729,6 +771,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
         this.dataFormats = dataFormats;
     }
 
+    @Override
     public TransformersDefinition getTransformers() {
         return transformers;
     }
@@ -737,6 +780,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
         this.transformers = transformers;
     }
 
+    @Override
     public ValidatorsDefinition getValidators() {
         return validators;
     }
@@ -745,6 +789,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
         this.validators = validators;
     }
 
+    @Override
     public List<OnExceptionDefinition> getOnExceptions() {
         return onExceptions;
     }
@@ -753,6 +798,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
         this.onExceptions = onExceptions;
     }
 
+    @Override
     public List<OnCompletionDefinition> getOnCompletions() {
         return onCompletions;
     }
@@ -761,6 +807,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
         this.onCompletions = onCompletions;
     }
 
+    @Override
     public ShutdownRoute getShutdownRoute() {
         return shutdownRoute;
     }
@@ -769,6 +816,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
         this.shutdownRoute = shutdownRoute;
     }
 
+    @Override
     public ShutdownRunningTask getShutdownRunningTask() {
         return shutdownRunningTask;
     }
@@ -777,6 +825,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
         this.shutdownRunningTask = shutdownRunningTask;
     }
 
+    @Override
     public List<ThreadPoolProfileDefinition> getThreadPoolProfiles() {
         return threadPoolProfiles;
     }
@@ -785,6 +834,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
         this.threadPoolProfiles = threadPoolProfiles;
     }
 
+    @Override
     public String getDependsOn() {
         return dependsOn;
     }
diff --git a/components/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptComponent.java b/components/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptComponent.java
index 4670433..bb1569a 100644
--- a/components/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptComponent.java
+++ b/components/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptComponent.java
@@ -28,6 +28,7 @@ import org.apache.camel.support.DefaultComponent;
 @Component("chatscript")
 public class ChatScriptComponent extends DefaultComponent {
 
+    @Override
     protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
         Endpoint endpoint = new ChatScriptEndpoint(uri, remaining, this);
         setProperties(endpoint, parameters);
diff --git a/components/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptEndpoint.java b/components/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptEndpoint.java
index 5dfcbca..15823fa 100644
--- a/components/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptEndpoint.java
+++ b/components/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptEndpoint.java
@@ -91,10 +91,12 @@ public class ChatScriptEndpoint extends DefaultEndpoint {
         this.chatUserName = chatusername;
     }
 
+    @Override
     public Producer createProducer() throws Exception {
         return new ChatScriptProducer(this);
     }
 
+    @Override
     public Consumer createConsumer(Processor processor) throws Exception {
         throw new UnsupportedOperationException("Chatscript consumer not supported");
     }
diff --git a/components/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptProducer.java b/components/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptProducer.java
index eba932c..f54f9ed 100644
--- a/components/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptProducer.java
+++ b/components/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptProducer.java
@@ -35,6 +35,7 @@ public class ChatScriptProducer extends DefaultProducer {
         }
     }
 
+    @Override
     public void process(Exchange exchange) throws Exception {
 
         Object body = exchange.getIn().getBody();
diff --git a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkLetterTest.java b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkLetterTest.java
index 02e142b..6f16270 100644
--- a/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkLetterTest.java
+++ b/components/camel-chunk/src/test/java/org/apache/camel/component/chunk/ChunkLetterTest.java
@@ -52,6 +52,7 @@ public class ChunkLetterTest extends CamelTestSupport {
         mock.assertIsSatisfied();
     }
 
+    @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
diff --git a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISComponent.java b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISComponent.java
index ef464d4..78e2d0f 100644
--- a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISComponent.java
+++ b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISComponent.java
@@ -34,6 +34,7 @@ public class CMISComponent extends DefaultComponent {
     public CMISComponent() {
     }
 
+    @Override
     protected Endpoint createEndpoint(String uri, final String remaining, final Map<String, Object> parameters) throws Exception {
         CMISEndpoint endpoint = new CMISEndpoint(uri, this, remaining);
 
diff --git a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISProducer.java b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISProducer.java
index 2fc1f15..73f33e9 100644
--- a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISProducer.java
+++ b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISProducer.java
@@ -65,6 +65,7 @@ public class CMISProducer extends DefaultProducer {
         return (CMISEndpoint) super.getEndpoint();
     }
 
+    @Override
     public void process(Exchange exchange) throws Exception {
 
         CamelCMISActions action = exchange.getIn().getHeader(CamelCMISConstants.CMIS_ACTION, CamelCMISActions.class);
diff --git a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISQueryProducer.java b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISQueryProducer.java
index f9ca6b0..e338c07 100644
--- a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISQueryProducer.java
+++ b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISQueryProducer.java
@@ -43,6 +43,7 @@ public class CMISQueryProducer extends DefaultProducer {
         return (CMISEndpoint) super.getEndpoint();
     }
 
+    @Override
     public void process(Exchange exchange) throws Exception {
         List<Map<String, Object>> nodes = executeQuery(exchange);
         exchange.getOut().setBody(nodes);
diff --git a/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPComponent.java b/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPComponent.java
index 4863e5e..cc389dd 100644
--- a/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPComponent.java
+++ b/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPComponent.java
@@ -112,6 +112,7 @@ public class CoAPComponent extends DefaultComponent implements RestConsumerFacto
         return server;
     }
 
+    @Override
     protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
         Endpoint endpoint = new CoAPEndpoint(uri, this);
         setProperties(endpoint, parameters);
diff --git a/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPProducer.java b/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPProducer.java
index aefa7f6..2401de3 100644
--- a/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPProducer.java
+++ b/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPProducer.java
@@ -46,6 +46,7 @@ public class CoAPProducer extends DefaultProducer {
         this.endpoint = endpoint;
     }
 
+    @Override
     public void process(Exchange exchange) throws Exception {
         CoapClient client = getClient(exchange);
         String ct = exchange.getIn().getHeader(Exchange.CONTENT_TYPE, String.class);
diff --git a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPTestSupport.java b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPTestSupport.java
index bf0d291..de3c770 100644
--- a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPTestSupport.java
+++ b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPTestSupport.java
@@ -27,6 +27,7 @@ public class CoAPTestSupport extends CamelTestSupport {
 
     protected static final int PORT = AvailablePortFinder.getNextAvailable();
 
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();
diff --git a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdConsumer.java b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdConsumer.java
index 335f679..e6441a0 100644
--- a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdConsumer.java
+++ b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdConsumer.java
@@ -58,10 +58,12 @@ public class CometdConsumer extends DefaultConsumer implements CometdProducerCon
         super.doStop();
     }
 
+    @Override
     public void setBayeux(BayeuxServerImpl bayeux) {
         this.bayeux = bayeux;
     }
 
+    @Override
     public CometdEndpoint getEndpoint() {
         return endpoint;
     }
diff --git a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdEndpoint.java b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdEndpoint.java
index 24e096b..d97910e 100644
--- a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdEndpoint.java
+++ b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdEndpoint.java
@@ -86,12 +86,14 @@ public class CometdEndpoint extends DefaultEndpoint {
         }
     }
 
+    @Override
     public Producer createProducer() throws Exception {
         ObjectHelper.notNull(component, "component");
         CometdProducer producer = new CometdProducer(this);
         return producer;
     }
 
+    @Override
     public Consumer createConsumer(Processor processor) throws Exception {
         ObjectHelper.notNull(component, "component");
         CometdConsumer consumer = new CometdConsumer(this, processor);
@@ -107,6 +109,7 @@ public class CometdEndpoint extends DefaultEndpoint {
         component.disconnect(prodcons);
     }
 
+    @Override
     public CometdComponent getComponent() {
         return component;
     }
diff --git a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdProducer.java b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdProducer.java
index 6807df7..bae63a3 100644
--- a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdProducer.java
+++ b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdProducer.java
@@ -59,10 +59,12 @@ public class CometdProducer extends DefaultProducer implements CometdProducerCon
         endpoint.disconnect(this);
     }
 
+    @Override
     public void process(final Exchange exchange) {
         service.process(exchange);
     }
 
+    @Override
     public CometdEndpoint getEndpoint() {
         return endpoint;
     }
@@ -75,6 +77,7 @@ public class CometdProducer extends DefaultProducer implements CometdProducerCon
         return service;
     }
 
+    @Override
     public void setBayeux(BayeuxServerImpl bayeux) {
         this.bayeux = bayeux;
     }
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 6a5a567..14b7f91 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
@@ -122,6 +122,7 @@ public class CometdProducerConsumerInteractiveAuthenticatedMain {
             return "OK";
         }
 
+        @Override
         public boolean sendMeta(ServerSession to, ServerMessage.Mutable message) {
             if (Channel.META_HANDSHAKE.equals(message.getChannel())) {
                 if (!message.isSuccessful()) {
@@ -138,18 +139,22 @@ public class CometdProducerConsumerInteractiveAuthenticatedMain {
             return true;
         }
 
+        @Override
         public void removed(ServerSession session, boolean timeout) {
             // Remove authentication data
         }
 
+        @Override
         public boolean rcv(ServerSession from, ServerMessage.Mutable message) {
             return true;
         }
 
+        @Override
         public boolean rcvMeta(ServerSession from, ServerMessage.Mutable message) {
             return true;
         }
 
+        @Override
         public boolean send(ServerSession from, ServerSession to, ServerMessage.Mutable message) {
             return true;
         }
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 88f136a..f1f8b83 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
@@ -77,18 +77,22 @@ public class CometdProducerConsumerInteractiveExtensionMain {
 
         private HashSet<String> forbidden = new HashSet<>(Arrays.asList("one", "two"));
 
+        @Override
         public void removed(ServerSession session, boolean timeout) {
             // called on remove of client
         }
 
+        @Override
         public boolean rcv(ServerSession from, ServerMessage.Mutable message) {
             return true;
         }
 
+        @Override
         public boolean rcvMeta(ServerSession from, ServerMessage.Mutable message) {
             return true;
         }
 
+        @Override
         public boolean send(ServerSession from, ServerSession to, ServerMessage.Mutable message) {
             Object data = message.getData();
             if (forbidden.contains(data)) {
@@ -97,6 +101,7 @@ public class CometdProducerConsumerInteractiveExtensionMain {
             return true;
         }
 
+        @Override
         public boolean sendMeta(ServerSession from, ServerMessage.Mutable message) {
             return true;
         }
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistrationWithServiceComponentTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistrationWithServiceComponentTest.java
index 93a119b..5a7102b 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistrationWithServiceComponentTest.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistrationWithServiceComponentTest.java
@@ -29,6 +29,7 @@ public class ConsulServiceRegistrationWithServiceComponentTest extends ConsulSer
     @BindToRegistry("service")
     ServiceComponent comp = new ServiceComponent();
 
+    @Override
     protected Map<String, String> getMetadata() {
         return new HashMap<String, String>() {
             {
diff --git a/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaComponent.java b/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaComponent.java
index dcb4553..13d5767 100644
--- a/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaComponent.java
+++ b/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaComponent.java
@@ -48,6 +48,7 @@ public class CordaComponent extends DefaultComponent {
         this.configuration = configuration;
     }
 
+    @Override
     protected Endpoint createEndpoint(String uri, final String remaining, final Map<String, Object> parameters) throws Exception {
         CordaConfiguration conf =  configuration != null ? configuration.copy() : new CordaConfiguration();
         setProperties(conf, parameters);
diff --git a/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseConsumer.java b/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseConsumer.java
index 70b7ac9..85f8eda 100644
--- a/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseConsumer.java
+++ b/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseConsumer.java
@@ -48,6 +48,7 @@ public class CouchbaseConsumer extends DefaultScheduledPollConsumer {
         init();
     }
 
+    @Override
     protected void doInit() {
 
         query.setIncludeDocs(true);
diff --git a/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/CouchDbChangesetTracker.java b/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/CouchDbChangesetTracker.java
index 2e71699..2959e87 100644
--- a/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/CouchDbChangesetTracker.java
+++ b/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/CouchDbChangesetTracker.java
@@ -54,6 +54,7 @@ public class CouchDbChangesetTracker implements Runnable {
                 .since(since).heartBeat(endpoint.getHeartbeat()).continuousChanges();
     }
 
+    @Override
     public void run() {
 
         String lastSequence = null;
diff --git a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/crypt/DefaultEnvelopedDataDecryptorConfiguration.java b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/crypt/DefaultEnvelopedDataDecryptorConfiguration.java
index a6ddbf6..fe1805f 100644
--- a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/crypt/DefaultEnvelopedDataDecryptorConfiguration.java
+++ b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/crypt/DefaultEnvelopedDataDecryptorConfiguration.java
@@ -110,6 +110,7 @@ public class DefaultEnvelopedDataDecryptorConfiguration extends DefaultCryptoCms
         }
     }
 
+    @Override
     public DefaultEnvelopedDataDecryptorConfiguration copy() {
         try {
             return (DefaultEnvelopedDataDecryptorConfiguration)clone();
diff --git a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/crypt/DefaultKeyTransRecipientInfo.java b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/crypt/DefaultKeyTransRecipientInfo.java
index b33810c..0095f9a 100644
--- a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/crypt/DefaultKeyTransRecipientInfo.java
+++ b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/crypt/DefaultKeyTransRecipientInfo.java
@@ -66,6 +66,7 @@ public class DefaultKeyTransRecipientInfo extends DefaultCryptoCmsConfiguration
     // this.keyEncryptionAlgorithm = keyEncryptionAlgorithm;
     // }
 
+    @Override
     public String toString() {
         return "certificate alias=" + certificateAlias + ", key encryption algorithm=" + keyEncryptionAlgorithm;
     }
diff --git a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/DefaultSignedDataVerifierConfiguration.java b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/DefaultSignedDataVerifierConfiguration.java
index 54efaa5..bd1ab60 100644
--- a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/DefaultSignedDataVerifierConfiguration.java
+++ b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/DefaultSignedDataVerifierConfiguration.java
@@ -94,6 +94,7 @@ public class DefaultSignedDataVerifierConfiguration extends DefaultCryptoCmsUnMa
         }
     }
 
+    @Override
     public DefaultSignedDataVerifierConfiguration copy() {
         try {
             return (DefaultSignedDataVerifierConfiguration)clone();
diff --git a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/DefaultSignerInfo.java b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/DefaultSignerInfo.java
index dee030f..0144074 100644
--- a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/DefaultSignerInfo.java
+++ b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/DefaultSignerInfo.java
@@ -192,6 +192,7 @@ public class DefaultSignerInfo extends DefaultCryptoCmsConfiguration implements
         return unsignedAttributeGenerator;
     }
 
+    @Override
     public String toString() {
         return "private key alias=" + privateKeyAlias + ", signature algorithm=" + signatureAlgorithm + ", isIncludeCertificates=" + includeCertificates;
     }
diff --git a/components/camel-crypto-cms/src/test/java/org/apache/camel/component/crypto/cms/ComponentTest.java b/components/camel-crypto-cms/src/test/java/org/apache/camel/component/crypto/cms/ComponentTest.java
index 622a305..3158d2f 100644
--- a/components/camel-crypto-cms/src/test/java/org/apache/camel/component/crypto/cms/ComponentTest.java
+++ b/components/camel-crypto-cms/src/test/java/org/apache/camel/component/crypto/cms/ComponentTest.java
@@ -89,6 +89,7 @@ public class ComponentTest extends CamelTestSupport {
         assertMockEndpointsSatisfied();
     }
 
+    @Override
     protected CamelContext createCamelContext() throws Exception {
         simpleReg = new SimpleRegistry();
         CamelContext context = new DefaultCamelContext(simpleReg);
diff --git a/components/camel-crypto-cms/src/test/java/org/apache/camel/component/crypto/cms/ProcessorsTest.java b/components/camel-crypto-cms/src/test/java/org/apache/camel/component/crypto/cms/ProcessorsTest.java
index 445781f..c50e13b 100644
--- a/components/camel-crypto-cms/src/test/java/org/apache/camel/component/crypto/cms/ProcessorsTest.java
+++ b/components/camel-crypto-cms/src/test/java/org/apache/camel/component/crypto/cms/ProcessorsTest.java
@@ -59,6 +59,7 @@ public class ProcessorsTest extends CamelTestSupport {
         assertMockEndpointsSatisfied();
     }
 
+    @Override
     protected CamelContext createCamelContext() throws Exception {
         simpleReg = new SimpleRegistry();
         CamelContext context = new DefaultCamelContext(simpleReg);
diff --git a/components/camel-crypto-cms/src/test/java/org/apache/camel/component/crypto/cms/SpringComponentTest.java b/components/camel-crypto-cms/src/test/java/org/apache/camel/component/crypto/cms/SpringComponentTest.java
index 5576dcd5..88861af 100644
--- a/components/camel-crypto-cms/src/test/java/org/apache/camel/component/crypto/cms/SpringComponentTest.java
+++ b/components/camel-crypto-cms/src/test/java/org/apache/camel/component/crypto/cms/SpringComponentTest.java
@@ -23,12 +23,14 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 public class SpringComponentTest extends ComponentTest {
 
+    @Override
     protected CamelContext createCamelContext() throws Exception {
 
         return SpringCamelContext.springCamelContext(
                 new ClassPathXmlApplicationContext("SpringCryptoCmsTests.xml"), true);
     }
 
+    @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             @Override
diff --git a/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/DigitalSignatureComponent.java b/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/DigitalSignatureComponent.java
index f0a0e27..d7d3f71 100644
--- a/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/DigitalSignatureComponent.java
+++ b/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/DigitalSignatureComponent.java
@@ -40,6 +40,7 @@ public class DigitalSignatureComponent extends DefaultComponent {
         super(context);
     }
 
+    @Override
     protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
         ObjectHelper.notNull(getCamelContext(), "CamelContext");
 
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 4c6be5e..c81eb20 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
@@ -88,10 +88,12 @@ public class DigitalSignatureConfiguration implements Cloneable, CamelContextAwa
         }
     }
 
+    @Override
     public CamelContext getCamelContext() {
         return context;
     }
 
+    @Override
     public void setCamelContext(CamelContext camelContext) {
         // TODO: this is wrong a configuration should not have CamelContext
         this.context = camelContext;
diff --git a/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/DigitalSignatureEndpoint.java b/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/DigitalSignatureEndpoint.java
index ba1a3bb..9d6c26f 100644
--- a/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/DigitalSignatureEndpoint.java
+++ b/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/DigitalSignatureEndpoint.java
@@ -44,6 +44,7 @@ public class DigitalSignatureEndpoint extends DefaultEndpoint {
         this.configuration = configuration;
     }
 
+    @Override
     public Producer createProducer() throws Exception {
         if (CryptoOperation.sign == configuration.getCryptoOperation()) {
             return new DigitalSignatureProducer(this, new SigningProcessor(configuration));
@@ -52,6 +53,7 @@ public class DigitalSignatureEndpoint extends DefaultEndpoint {
         }
     }
 
+    @Override
     public Consumer createConsumer(Processor processor) throws Exception {
         throw new UnsupportedOperationException("Digital Signatures endpoints are not meant to be consumed from. They are meant be used as an intermediate endpoints");
     }
diff --git a/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/DigitalSignatureProducer.java b/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/DigitalSignatureProducer.java
index fa274c5..0a429ed 100644
--- a/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/DigitalSignatureProducer.java
+++ b/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/DigitalSignatureProducer.java
@@ -31,6 +31,7 @@ public class DigitalSignatureProducer extends DefaultProducer {
         this.processor = processor;
     }
 
+    @Override
     public void process(Exchange exchange) throws Exception {
         processor.process(exchange);
     }
diff --git a/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/processor/SigningProcessor.java b/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/processor/SigningProcessor.java
index 46d2157..142ee3c 100644
--- a/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/processor/SigningProcessor.java
+++ b/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/processor/SigningProcessor.java
@@ -35,6 +35,7 @@ public class SigningProcessor extends DigitalSignatureProcessor {
         super(configuration);
     }
 
+    @Override
     public void process(Exchange exchange) throws Exception {
         Signature service = initSignatureService(exchange);
         calculateSignature(exchange, service);
diff --git a/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/processor/VerifyingProcessor.java b/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/processor/VerifyingProcessor.java
index 4b51dbb..daec8f4 100644
--- a/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/processor/VerifyingProcessor.java
+++ b/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/processor/VerifyingProcessor.java
@@ -37,6 +37,7 @@ public class VerifyingProcessor extends DigitalSignatureProcessor {
         super(configuration);
     }
 
+    @Override
     public void process(Exchange exchange) throws Exception {
         Signature signer = createSignatureService();
         Certificate cert = getCertificate(exchange);
diff --git a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/CryptoDataFormat.java b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/CryptoDataFormat.java
index 6d0b3a9..695276c4 100644
--- a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/CryptoDataFormat.java
+++ b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/CryptoDataFormat.java
@@ -124,6 +124,7 @@ public class CryptoDataFormat extends ServiceSupport implements DataFormat, Data
         return cipher;
     }
 
+    @Override
     public void marshal(Exchange exchange, Object graph, OutputStream outputStream) throws Exception {
         byte[] iv = getInitializationVector(exchange);
         Key key = getKey(exchange);
@@ -154,6 +155,7 @@ public class CryptoDataFormat extends ServiceSupport implements DataFormat, Data
         }
     }
 
+    @Override
     public Object unmarshal(final Exchange exchange, final InputStream encryptedStream) throws Exception {
         if (encryptedStream != null) {
             byte[] iv = getInlinedInitializationVector(exchange, encryptedStream);
diff --git a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormat.java b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormat.java
index 309fd01..faba116 100644
--- a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormat.java
+++ b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormat.java
@@ -216,6 +216,7 @@ public class PGPKeyAccessDataFormat extends ServiceSupport implements DataFormat
         return exchange.getIn().getHeader(Exchange.FILE_NAME, getFileName(), String.class);
     }
 
+    @Override
     public void marshal(Exchange exchange, Object graph, OutputStream outputStream) throws Exception { //NOPMD
         List<String> userids = determineEncryptionUserIds(exchange);
         List<PGPPublicKey> keys = publicKeyAccessor.getEncryptionKeys(exchange, userids);
@@ -356,6 +357,7 @@ public class PGPKeyAccessDataFormat extends ServiceSupport implements DataFormat
         return sigGens;
     }
 
+    @Override
     public Object unmarshal(Exchange exchange, InputStream encryptedStream) throws Exception { //NOPMD
         if (encryptedStream == null) {
             return null;
diff --git a/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java b/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java
index 9f85fc7..3856d33 100644
--- a/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java
+++ b/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java
@@ -142,6 +142,7 @@ public class ECDSASignatureTest extends CamelTestSupport {
         }
     }
 
+    @Override
     @Before
     public void setUp() throws Exception {
         disableJMX();
diff --git a/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/SignatureTest.java b/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/SignatureTest.java
index e3743e9..47fb83f 100644
--- a/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/SignatureTest.java
+++ b/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/SignatureTest.java
@@ -372,6 +372,7 @@ public class SignatureTest extends CamelTestSupport {
         }
     }
 
+    @Override
     @Before
     public void setUp() throws Exception {
         setUpKeys("DSA");
diff --git a/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/SpringSignatureTest.java b/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/SpringSignatureTest.java
index 4522074..ec26064 100644
--- a/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/SpringSignatureTest.java
+++ b/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/SpringSignatureTest.java
@@ -32,6 +32,7 @@ public class SpringSignatureTest extends SignatureTest {
 
     private static KeyPair rsaPair;
 
+    @Override
     protected CamelContext createCamelContext() throws Exception {
         rsaPair = getKeyPair("RSA");
         return SpringCamelContext.springCamelContext(new ClassPathXmlApplicationContext("org/apache/camel/component/crypto/SpringSignatureTest.xml"), true);
diff --git a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/CryptoDataFormatTest.java b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/CryptoDataFormatTest.java
index ef4e816..2688964 100644
--- a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/CryptoDataFormatTest.java
+++ b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/CryptoDataFormatTest.java
@@ -140,6 +140,7 @@ public class CryptoDataFormatTest extends CamelTestSupport {
         }
     }
 
+    @Override
     protected RouteBuilder[] createRouteBuilders() throws Exception {
         return new RouteBuilder[] {new RouteBuilder() {
             public void configure() throws Exception {
diff --git a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatDynamicTest.java b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatDynamicTest.java
index 6d9ac63..df573f4 100644
--- a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatDynamicTest.java
+++ b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatDynamicTest.java
@@ -76,6 +76,7 @@ public class PGPDataFormatDynamicTest extends PGPDataFormatTest {
     }
 
     // override wrong userid and password with correct userid and password in the headers
+    @Override
     protected Map<String, Object> getHeaders() {
         Map<String, Object> headers = new HashMap<>();
         headers.put(PGPKeyAccessDataFormat.KEY_USERID, "sdude@nowhere.net");
diff --git a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatElGamalTest.java b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatElGamalTest.java
index f7c4347..82faf11 100644
--- a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatElGamalTest.java
+++ b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatElGamalTest.java
@@ -20,10 +20,12 @@ import org.junit.Ignore;
 
 @Ignore("Requires JCE unlimited strength jurisdiction policy files on CI server")
 public class PGPDataFormatElGamalTest extends PGPDataFormatTest {
+    @Override
     protected String getKeyFileName() {
         return "org/apache/camel/component/crypto/pubring-ElGamal.gpg";
     }
     
+    @Override
     protected String getKeyFileNameSec() {
         return "org/apache/camel/component/crypto/secring-ElGamal.gpg";
     }
diff --git a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatTest.java b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatTest.java
index 4c2851e..33907bd 100644
--- a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatTest.java
+++ b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatTest.java
@@ -490,6 +490,7 @@ public class PGPDataFormatTest extends AbstractPGPDataFormatTest {
 
     }
 
+    @Override
     protected RouteBuilder[] createRouteBuilders() {
         return new RouteBuilder[] {new RouteBuilder() {
             public void configure() throws Exception {
diff --git a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatWithProvider.java b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatWithProvider.java
index f4d43ea..acf1e90 100644
--- a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatWithProvider.java
+++ b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatWithProvider.java
@@ -18,6 +18,7 @@ package org.apache.camel.converter.crypto;
 
 public class PGPDataFormatWithProvider extends PGPDataFormatTest {
     
+    @Override
     protected String getProvider() {
         return "BC"; //"IAIK"; 
     }
diff --git a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormatTest.java b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormatTest.java
index f03e5e8..196b536 100644
--- a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormatTest.java
+++ b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormatTest.java
@@ -21,6 +21,7 @@ import org.apache.camel.test.junit4.CamelTestSupport;
 
 public class PGPKeyAccessDataFormatTest extends CamelTestSupport {
 
+    @Override
     protected RouteBuilder createRouteBuilder() {
 
         return new RouteBuilder() {
diff --git a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/SpringCryptoDataFormatTest.java b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/SpringCryptoDataFormatTest.java
index 2c754d4..800e2b1 100644
--- a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/SpringCryptoDataFormatTest.java
+++ b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/SpringCryptoDataFormatTest.java
@@ -36,6 +36,7 @@ public class SpringCryptoDataFormatTest extends CryptoDataFormatTest {
         return new RouteBuilder[] {};
     }
 
+    @Override
     protected CamelContext createCamelContext() throws Exception {
         KeyGenerator generator = KeyGenerator.getInstance("DES");
         deskey = generator.generateKey();
diff --git a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/SpringPGPDataFormatNoPassPhraseTest.java b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/SpringPGPDataFormatNoPassPhraseTest.java
index 913d99a..13ee2e3 100644
--- a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/SpringPGPDataFormatNoPassPhraseTest.java
+++ b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/SpringPGPDataFormatNoPassPhraseTest.java
@@ -23,6 +23,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 public class SpringPGPDataFormatNoPassPhraseTest extends AbstractPGPDataFormatTest {
 
+    @Override
     protected CamelContext createCamelContext() throws Exception {
         return SpringCamelContext.springCamelContext(new ClassPathXmlApplicationContext("/org/apache/camel/component/crypto/SpringPGPDataFormatTest.xml"), true);
     }
diff --git a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/SpringPGPDataFormatTest.java b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/SpringPGPDataFormatTest.java
index 41eaea8..67d3823 100644
--- a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/SpringPGPDataFormatTest.java
+++ b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/SpringPGPDataFormatTest.java
@@ -23,6 +23,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 public class SpringPGPDataFormatTest extends AbstractPGPDataFormatTest {
 
+    @Override
     protected CamelContext createCamelContext() throws Exception {
         return SpringCamelContext.springCamelContext(
                 new ClassPathXmlApplicationContext("/org/apache/camel/component/crypto/SpringPGPDataFormatTest.xml"), true);
diff --git a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvDataFormat.java b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvDataFormat.java
index bdf267f..f66f528 100644
--- a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvDataFormat.java
+++ b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvDataFormat.java
@@ -86,10 +86,12 @@ public class CsvDataFormat extends ServiceSupport implements DataFormat, DataFor
         return "csv";
     }
 
+    @Override
     public void marshal(Exchange exchange, Object object, OutputStream outputStream) throws Exception {
         marshaller.marshal(exchange, object, outputStream);
     }
 
+    @Override
     public Object unmarshal(Exchange exchange, InputStream inputStream) throws Exception {
         return unmarshaller.unmarshal(exchange, inputStream);
     }
diff --git a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvUnmarshaller.java b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvUnmarshaller.java
index 851dbb5..19d197f 100644
--- a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvUnmarshaller.java
+++ b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvUnmarshaller.java
@@ -92,6 +92,7 @@ abstract class CsvUnmarshaller {
             super(format, dataFormat);
         }
 
+        @Override
         public Object unmarshal(Exchange exchange, InputStream inputStream) throws IOException {
             CSVParser parser = new CSVParser(new InputStreamReader(inputStream, ExchangeHelper.getCharsetName(exchange)), format);
             try {
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalCharsetTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalCharsetTest.java
index 1e4a87e..f305173 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalCharsetTest.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalCharsetTest.java
@@ -48,6 +48,7 @@ public class CsvMarshalCharsetTest extends CamelTestSupport {
         assertThat(body, startsWith("L\u00fccky Luke"));
     }
 
+    @Override
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             public void configure() {
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalHeaderWithCustomMarshallFactoryTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalHeaderWithCustomMarshallFactoryTest.java
index a632fce..dc30032 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalHeaderWithCustomMarshallFactoryTest.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalHeaderWithCustomMarshallFactoryTest.java
@@ -127,6 +127,7 @@ public class CsvMarshalHeaderWithCustomMarshallFactoryTest extends CamelTestSupp
             }
         }
 
+        @Override
         @SuppressWarnings("unchecked")
         public void marshal(Exchange exchange, Object object, OutputStream outputStream) throws IOException {
             Iterator<Map<String, String>> it = (Iterator<Map<String, String>>) ObjectHelper.createIterator(object);
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteCharsetTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteCharsetTest.java
index 9551b8a..488e0b0 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteCharsetTest.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteCharsetTest.java
@@ -40,6 +40,7 @@ public class CsvRouteCharsetTest extends CamelTestSupport {
         assertEquals("Lücky Luke", data.get(2).get(0));
     }
 
+    @Override
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             public void configure() {
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java
index dcbaa22..84f7316 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java
@@ -153,6 +153,7 @@ public class CsvRouteTest extends CamelTestSupport {
         // END SNIPPET : unmarshalResult
     }
 
+    @Override
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             public void configure() {
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalStreamTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalStreamTest.java
index e476b7c..a18c806 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalStreamTest.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalStreamTest.java
@@ -88,6 +88,7 @@ public class CsvUnmarshalStreamTest extends CamelTestSupport {
             super(file);
         }
 
+        @Override
         public void close() throws IOException {
             // Use this to find out how camel close the FileInputStream
             super.close();
diff --git a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/SoapMessageHeaderFilter.java b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/SoapMessageHeaderFilter.java
index cdc2327..bd417be 100644
--- a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/SoapMessageHeaderFilter.java
+++ b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/SoapMessageHeaderFilter.java
@@ -41,10 +41,12 @@ public class SoapMessageHeaderFilter implements MessageHeaderFilter {
                       SoapBindingFactory.SOAP_11_BINDING, 
                       SoapBindingFactory.SOAP_12_BINDING);
     
+    @Override
     public List<String> getActivationNamespaces() {
         return ACTIVATION_NS;
     }
 
+    @Override
     public void filter(Direction direction, List<Header> headers) {
         // Treat both in and out direction the same
         if (headers == null) {
diff --git a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/message/DefaultCxfMessageMapper.java b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/message/DefaultCxfMessageMapper.java
index df86b7f..116f80b 100644
--- a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/message/DefaultCxfMessageMapper.java
+++ b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/message/DefaultCxfMessageMapper.java
@@ -35,8 +35,9 @@ public class DefaultCxfMessageMapper implements CxfMessageMapper {
     private static final String CXF_HTTP_REQUEST = "HTTP.REQUEST";
     private static final String CXF_HTTP_RESPONSE = "HTTP.RESPONSE";
     
-    public Message createCxfMessageFromCamelExchange(Exchange camelExchange, 
-            HeaderFilterStrategy headerFilterStrategy) {
+    @Override
+    public Message createCxfMessageFromCamelExchange(Exchange camelExchange,
+                                                     HeaderFilterStrategy headerFilterStrategy) {
         
         org.apache.cxf.message.Message answer = 
             CxfMessageHelper.getCxfInMessage(headerFilterStrategy, camelExchange, false);
@@ -96,6 +97,7 @@ public class DefaultCxfMessageMapper implements CxfMessageMapper {
         });
     }
 
+    @Override
     public void propagateResponseHeadersToCamel(Message cxfMessage, Exchange exchange,
                                                 HeaderFilterStrategy strategy) {
 
diff --git a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java
index 6fb3368..e627efd 100644
--- a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java
+++ b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java
@@ -93,6 +93,7 @@ public class CamelConduit extends AbstractConduit implements Configurable {
     }
 
     // prepare the message for send out , not actually send out the message
+    @Override
     public void prepare(Message message) throws IOException {
         LOG.trace("CamelConduit send message");
         CamelOutputStream os = new CamelOutputStream(this.targetCamelEndpointUri, 
@@ -103,6 +104,7 @@ public class CamelConduit extends AbstractConduit implements Configurable {
         message.setContent(OutputStream.class, os);
     }
 
+    @Override
     public void close() {
         LOG.trace("CamelConduit closed ");
         // shutdown the producer
@@ -113,10 +115,12 @@ public class CamelConduit extends AbstractConduit implements Configurable {
         }
     }
 
+    @Override
     protected java.util.logging.Logger getLogger() {
         return JUL_LOG;
     }
 
+    @Override
     public String getBeanName() {
         if (endpointInfo == null || endpointInfo.getName() == null) {
             return "default" + BASE_BEAN_NAME_SUFFIX;
diff --git a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
index f282096..70110ae 100644
--- a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
+++ b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
@@ -83,6 +83,7 @@ public class CamelDestination extends AbstractDestination implements Configurabl
         this.checkException = checkException;
     }
 
+    @Override
     protected java.util.logging.Logger getLogger() {
         return JUL_LOG;
     }
@@ -99,11 +100,13 @@ public class CamelDestination extends AbstractDestination implements Configurabl
      * @param inMessage the incoming message
      * @return the inbuilt backchannel
      */
+    @Override
     protected Conduit getInbuiltBackChannel(Message inMessage) {
         //we can pass the message back by looking up the camelExchange from inMessage
         return new BackChannelConduit(inMessage);
     }
 
+    @Override
     public void activate() {
         LOG.debug("CamelDestination activate().... ");
         ObjectHelper.notNull(camelContext, "CamelContext", this);
@@ -125,6 +128,7 @@ public class CamelDestination extends AbstractDestination implements Configurabl
         }
     }
 
+    @Override
     public void deactivate() {
         try {
             ServiceHelper.stopService(consumer);
@@ -133,6 +137,7 @@ public class CamelDestination extends AbstractDestination implements Configurabl
         }
     }
 
+    @Override
     public void shutdown() {
         LOG.debug("CamelDestination shutdown()");
         this.deactivate();
@@ -160,6 +165,7 @@ public class CamelDestination extends AbstractDestination implements Configurabl
         incomingObserver.onMessage(inMessage);
     }
 
+    @Override
     public String getBeanName() {
         if (endpointInfo == null || endpointInfo.getName() == null) {
             return "default" + BASE_BEAN_NAME_SUFFIX;
@@ -182,6 +188,7 @@ public class CamelDestination extends AbstractDestination implements Configurabl
     }
 
     protected class ConsumerProcessor implements Processor {
+        @Override
         public void process(Exchange exchange) {
             try {
                 incoming(exchange);
@@ -208,6 +215,7 @@ public class CamelDestination extends AbstractDestination implements Configurabl
          *
          * @param observer the observer to notify on receipt of incoming
          */
+        @Override
         public void setMessageObserver(MessageObserver observer) {
             // shouldn't be called for a back channel conduit
         }
@@ -218,11 +226,13 @@ public class CamelDestination extends AbstractDestination implements Configurabl
          *
          * @param message the message to be sent.
          */
+        @Override
         public void prepare(Message message) throws IOException {
             message.put(CamelTransportConstants.CAMEL_EXCHANGE, inMessage.get(CamelTransportConstants.CAMEL_EXCHANGE));
             message.setContent(OutputStream.class, new CamelOutputStream(message));
         }
 
+        @Override
         protected java.util.logging.Logger getLogger() {
             return JUL_LOG;
         }
diff --git a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelOutputStream.java b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelOutputStream.java
index 9432fa7..b8ddd26 100644
--- a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelOutputStream.java
+++ b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelOutputStream.java
@@ -61,16 +61,19 @@ class CamelOutputStream extends CachedOutputStream {
         outMessage = m;
     }
 
+    @Override
     protected void doFlush() throws IOException {
         // do nothing here
     }
 
+    @Override
     protected void doClose() throws IOException {
         isOneWay = outMessage.getExchange().isOneWay();
         
         commitOutputMessage();
     }
 
+    @Override
     protected void onWrite() throws IOException {
         // do nothing here
     }
diff --git a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportFactory.java b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportFactory.java
index 8a96f5c..f0e3367 100644
--- a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportFactory.java
+++ b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportFactory.java
@@ -93,6 +93,7 @@ public class CamelTransportFactory extends AbstractTransportFactory implements C
         return getDestination(endpointInfo, bus);
     }
 
+    @Override
     public Set<String> getUriPrefixes() {
         return URI_PREFIXES;
     }
@@ -105,18 +106,23 @@ public class CamelTransportFactory extends AbstractTransportFactory implements C
         this.headerFilterStrategy = headerFilterStrategy;
     }
     
+    @Override
     public CamelContext getCamelContext() {
         return camelContext;
     }
+    @Override
     public void setCamelContext(CamelContext c) {
         camelContext = c;
     }
+    @Override
     public Destination getDestination(EndpointInfo ei, Bus b) throws IOException {
         return new CamelDestination(camelContext, b, this, ei, headerFilterStrategy, checkException);
     }
+    @Override
     public Conduit getConduit(EndpointInfo targetInfo, Bus b) throws IOException {
         return getConduit(targetInfo, null, b);
     }
+    @Override
     public Conduit getConduit(EndpointInfo localInfo, EndpointReferenceType target, Bus b)
         throws IOException {
         return new CamelConduit(camelContext, b, localInfo, target, headerFilterStrategy);
diff --git a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/blueprint/CamelTransportNameSpaceHandler.java b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/blueprint/CamelTransportNameSpaceHandler.java
index cc83f6e..06c57ed 100644
--- a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/blueprint/CamelTransportNameSpaceHandler.java
+++ b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/blueprint/CamelTransportNameSpaceHandler.java
@@ -36,15 +36,18 @@ import org.slf4j.LoggerFactory;
 public class CamelTransportNameSpaceHandler extends BaseNamespaceHandler {
     private static final Logger LOG = LoggerFactory.getLogger(CamelTransportNameSpaceHandler.class);
 
+    @Override
     public ComponentMetadata decorate(Node node, ComponentMetadata componentMetadata, ParserContext parserContext) {
         return null;
     }
 
+    @Override
     @SuppressWarnings("rawtypes")
     public Set<Class> getManagedClasses() {
         return new HashSet<>(Arrays.asList(CamelTransportNameSpaceHandler.class));
     }
 
+    @Override
     public URL getSchemaLocation(String s) {
         if ("http://cxf.apache.org/transports/camel/blueprint".equals(s)) {
             return getClass().getClassLoader().getResource("schema/blueprint/camel.xsd");
diff --git a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/spring/AbstractCamelContextBeanDefinitionParser.java b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/spring/AbstractCamelContextBeanDefinitionParser.java
index 6f5331c..7f57e27 100644
--- a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/spring/AbstractCamelContextBeanDefinitionParser.java
+++ b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/spring/AbstractCamelContextBeanDefinitionParser.java
@@ -42,6 +42,7 @@ public class AbstractCamelContextBeanDefinitionParser extends AbstractBeanDefini
         bean.addPropertyReference("camelContext", camelContextId);
     }
 
+    @Override
     protected void doParse(Element element, ParserContext ctx, BeanDefinitionBuilder bean) {
         // Parser the id attribute
         bean.setAbstract(true);
diff --git a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/spring/NamespaceHandler.java b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/spring/NamespaceHandler.java
index f86516b..becf9d8 100644
--- a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/spring/NamespaceHandler.java
+++ b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/spring/NamespaceHandler.java
@@ -20,6 +20,7 @@ import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 public class NamespaceHandler extends NamespaceHandlerSupport {
 
+    @Override
     public void init() {
         registerBeanDefinitionParser("conduit", new CamelConduitDefinitionParser());
         registerBeanDefinitionParser("destination", new CamelDestinationDefinitionParser());
diff --git a/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelConduitTest.java b/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelConduitTest.java
index b8c3dc7..a1690cc 100644
--- a/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelConduitTest.java
+++ b/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelConduitTest.java
@@ -37,6 +37,7 @@ import org.junit.Test;
 
 public class CamelConduitTest extends CamelTransportTestSupport {
 
+    @Override
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             public void configure() {
@@ -54,6 +55,7 @@ public class CamelConduitTest extends CamelTransportTestSupport {
         };
     }
 
+    @Override
     protected CamelContext createCamelContext() throws Exception {
         return new DefaultCamelContext();
     }
diff --git a/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java b/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java
index 711fc22..ff14974 100644
--- a/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java
+++ b/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java
@@ -56,6 +56,7 @@ import static org.mockito.Mockito.mock;
 public class CamelDestinationTest extends CamelTransportTestSupport {
     private Message destMessage;
 
+    @Override
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             public void configure() {
@@ -65,6 +66,7 @@ public class CamelDestinationTest extends CamelTransportTestSupport {
         };
     }
 
+    @Override
     protected CamelContext createCamelContext() throws Exception {
         return new DefaultCamelContext();
     }
diff --git a/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelTransportTestSupport.java b/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelTransportTestSupport.java
index f16b543..6429d90 100644
--- a/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelTransportTestSupport.java
+++ b/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelTransportTestSupport.java
@@ -43,6 +43,7 @@ public abstract class CamelTransportTestSupport extends CamelTestSupport {
     protected MessageObserver observer;
     protected Message inMessage;
 
+    @Override
... 62293 lines suppressed ...