You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by al...@apache.org on 2019/08/21 16:00:41 UTC

[camel] branch CAMEL-13826 updated (318d0f7 -> 9d40a37)

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

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


    omit 318d0f7  Merging CAMEL-13826 branch with master
    omit cdf8fac  CAMEL-13826: Migrated camel-hbase tests to camel-test-junit5
    omit ebf74e5  CAMEL-13826: Migrated camel-jmx tests to camel-test-junit5
    omit 4115a6d  CAMEL-13826: Removed unneeded throws Exception for tests in camel-test-junit5
    omit 0315224  CAMEL-13826: Migrated camel-ahc-ws tests to camel-test-junit5
    omit 1b1822f  CAMEL-13826: Migrated camel-ahc tests to camel-test-junit5
    omit 7b1bdbd  CAMEL-13826: Moved route coverage to a dedicated class
    omit 22ea2e5  CAMEL-13826: Removed deprecated methods and class
    omit 5998ed2  CAMEL-13826: Turned TestSupport into a utility class
     add e90f0a6  [CAMEL-13876]enable camel-undertow component to set custom HttpHandler
     add e1bd909  CAMEL-13879 : Fix Corda's component's documentation
     add c404047  Merge pull request #3113 from amolpednekar/patch-1
     add 092f8bf  Fixed CS for Camel-Salesforce
     add 8d972b2  Adding comments on verification and improved integration tests
     add a8c49b1  Merge pull request #3110 from Delawen/improve_dynamodb
     add 1ba73ed  Upgrade Atmosphere to version 2.5.4
     add 6208cdb  CAMEL-13826: Turned TestSupport into a utility class
     add 4d882b5  CAMEL-13826: Removed deprecated methods and class
     add ef77eae  CAMEL-13826: Moved route coverage to a dedicated class
     add 23c0862  CAMEL-13826: Migrated camel-ahc tests to camel-test-junit5
     add 711f29d  CAMEL-13826: Migrated camel-ahc-ws tests to camel-test-junit5
     add e066cb4  CAMEL-13826: Removed unneeded throws Exception for tests in camel-test-junit5
     add 5f1fa19  CAMEL-13826: Migrated camel-jmx tests to camel-test-junit5
     add 72c7328  CAMEL-13826: Migrated camel-hbase tests to camel-test-junit5
     add 6c1f1f3  Merging CAMEL-13826 branch with master
     add 9602df5  Upgrade Reactor to version 3.2.11.RELEASE
     add 05d46d7  Upgrade RxJava to version 2.2.11
     add 1f6dde3  Fixed CS for Camel-Undertow
     add 8df5e97  Upgrade Spring Boot to version 2.1.7.RELEASE
     add 688fc09  Upgrade Spring to version 5.1.9.RELEASE
     add 931772d  Regen
     add f5ceb8a  Upgrade Snakeyaml to version 1.25
     add ef34fd6  Removed Camel-snakeyaml Karaf integration test: there is already CamelYamlTest
     add b5fd8d9  CAMEL-13882: fixes broken images
     add ef36bac  Fixed Camel AWS MSK docs
     add c7c2a5e  Regen
     add dd3d7ea  add myself to the list of contributors
     add 601bdf8  Merge pull request #3114 from alaz/pr-contrib
     add 8aea95e  Switching to commons lang3 in a few places
     add 4a77c1e  Adding contributor name
     add ea38310  Merge pull request #3116 from dimitrisli/master
     add 2fbea3e  Fix docs
     add 4b9b619  CAMEL-13886: camel-servlet + camel-http4 with null body causes "Stream closed" IOException
     add 4fba2be  CAMEL-13877 fix NPE in RouteHealthCheck
     add 83854ec  CAMEL-13877 correct formatting
     add 199715f  CAMEL-13877 - Fixed CS
     add 940d3a5  Fix broken links in summary page
     add f604341  update: Component reference index.adoc
     add 0b7fad1  base structure camel-any23 dataformat
     add 623949c  add missing files to any23 dataformat basic structure
     add d2ff724  basic structure any23
     add 2ea75a6  some clean-up
     add d48be9d  basic marshal implementation any23
     add 786f650  Add configuration parameters. Add data format build clauses.
     add 7222a04  Marshal RDF-XML from microformats. Default configuration of Any 23.
     add 7f954bd  Fix marshal test
     add 22ae8ce  merge last camel version with any23 component
     add 17ebeaa  Improve configurability
     add 1e147a3  Improve configurability re build project
     add f5d494f  Restructure marshal/unmarshal Implement unmarshal Add karaf feature and test
     add e0cbc31  Improve documentation
     add 64f3273  Improve HTTP test. Add Spring XML test.
     add f9abcdd  Improve documentation
     add f158bd5  fix karaf support
     add 0158178  Rebuild project.
     add 03391af  suspend karaf support
     add 3176416  missing file to suspend karaf support
     add 8c6bd3b  Camel-Any23: Added a SB Integration test for the component
     add 695ca8f  Adding Dmitry Volodin to team.md also in main repo
     add 3971923  Fixed CS for Camel-Any23
     add 69e6aa3  Fixed CS for Camel-Core
     add 07868c7  Upgrade Mongodb Java driver to version 3.11.0
     add e833d4d  Upgrade Californium to version 2.0.0-M16
     add a2f4e2d  Upgrade Jgroups to version 4.1.2.Final
     add 3355234  Camel-Any23: polished code a bit
     add 549933d  Upgrade Commons DBCP to version 2.7.0
     add 993817b  Camel-AWS-SQS: Moving the logic of doStart for endpoint in doInit
     add 7f8e3a9  Camel-AWS-SQS: Fixed CS
     new a1727ab  CAMEL-13826: Merged CamelTestSupport.isCreateCamelContextPerClass() into JUnit 5 Lifecycle.PER_CLASS
     new 9d40a37  CAMEL-13826: Migrated half of the camel-xstream tests to JUnit 5 (testing coexistence of JUnit 4 and JUnit 5)

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

 * -- * -- B -- O -- O -- O   (318d0f7)
            \
             N -- N -- N   refs/heads/CAMEL-13826 (9d40a37)

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

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

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


Summary of changes:
 apache-camel/pom.xml                               |   10 +
 apache-camel/src/main/descriptors/common-bin.xml   |    2 +
 bom/camel-bom/pom.xml                              |   10 +
 components/camel-any23/pom.xml                     |   96 +
 .../src/main/docs/any23-dataformat.adoc            |  119 ++
 .../camel/dataformat/any23/Any23DataFormat.java    |  202 ++
 .../camel/dataformat/any23/Any23OutputFormat.java} |    7 +-
 .../camel/dataformat/any23/utils/Any23Utils.java   |   66 +
 .../dataformat/any23/writer/RDF4JModelWriter.java  |   68 +
 .../any23/Any23DataFormatConfigurationsTest.java   |   67 +
 .../any23/Any23DataFormatDefaultTest.java          |   43 +-
 .../any23/Any23DataFormatExtractorsTest.java       |   70 +
 .../dataformat/any23/Any23DataFormatHTTPTest.java  |   41 +-
 .../any23/Any23DataFormatMarshalTest.java          |   46 +-
 .../dataformat/any23/Any23DataFormatModelTest.java |   44 +-
 .../any23/Any23DataFormatOutputFormatTest.java     |   63 +
 .../any23/Any23DataFormatSpringTest.java           |   57 +
 .../camel/dataformat/any23/Any23TestSupport.java   |   41 +-
 .../src/test/resources/log4j2.properties           |   28 +
 .../camel/dataformat/any23/microformat/vcard.html  |   79 +
 .../any23/spring/SpringAny23DataFormatTest.xml     |   54 +
 .../aws/ddb/DdbComponentVerifierExtension.java     |   20 +-
 .../integration/DdbComponentIntegrationTest.java   |   98 +-
 .../src/main/docs/aws-msk-component.adoc           |    8 +-
 .../aws/sqs/MessageDeduplicationIdStrategy.java    |    2 +-
 .../camel/component/aws/sqs/SqsComponent.java      |   24 +-
 .../camel/component/aws/sqs/SqsConfiguration.java  |    3 +-
 .../camel/component/aws/sqs/SqsConstants.java      |    3 +-
 .../camel/component/aws/sqs/SqsConsumer.java       |    4 +-
 .../camel/component/aws/sqs/SqsEndpoint.java       |   36 +-
 .../component/aws/sqs/SqsHeaderFilterStrategy.java |    4 +-
 .../camel/component/aws/sqs/SqsOperations.java     |    4 +-
 .../camel/component/aws/sqs/SqsProducer.java       |    6 +-
 .../component/aws/sqs/AmazonSQSClientMock.java     |   23 +-
 .../component/aws/sqs/SqsBatchConsumerTest.java    |   19 +-
 .../aws/sqs/SqsComponentClientRegistryTest.java    |    6 +-
 .../aws/sqs/SqsComponentConfigurationTest.java     |  113 +-
 .../component/aws/sqs/SqsComponentSpringTest.java  |   30 +-
 .../camel/component/aws/sqs/SqsComponentTest.java  |   41 +-
 .../aws/sqs/SqsConcurrentConsumerTest.java         |   22 +-
 .../component/aws/sqs/SqsConfigurationTest.java    |    1 -
 .../aws/sqs/SqsConsumerIdleMessageTest.java        |    8 +-
 .../sqs/SqsDoesNotExtendMessageVisibilityTest.java |    3 +-
 .../aws/sqs/SqsEndpointExplicitQueueUrlTest.java   |    7 +-
 .../camel/component/aws/sqs/SqsEndpointTest.java   |   77 +-
 .../aws/sqs/SqsEndpointUseExistingQueueTest.java   |   17 +-
 .../aws/sqs/SqsExtendMessageVisibilityTest.java    |    9 +-
 .../aws/sqs/SqsFilterMessagesWithNoDeleteTest.java |   36 +-
 .../component/aws/sqs/SqsProducerBatchTest.java    |    7 +-
 .../component/aws/sqs/SqsProducerDeleteTest.java   |    7 +-
 .../aws/sqs/SqsProducerListQueuesTest.java         |    7 +-
 .../integration/SqsComponentIntegrationTest.java   |   50 +-
 .../SqsConsumerMessageIntegrationTest.java         |   11 +-
 .../SqsProducerBatchSendFifoIntegrationTest.java   |    5 +-
 .../SqsProducerDeleteMessageIntegrationTest.java   |    5 +-
 components/camel-aws-xray/pom.xml                  |    6 +-
 .../camel/component/aws/xray/FakeAWSDaemon.java    |    4 +-
 .../camel/component/aws/xray/json/JsonParser.java  |    2 +-
 .../src/main/docs/barcode-dataformat.adoc          |    2 +-
 .../camel-controlbus/src/main/docs/control_bus.png |  Bin 0 -> 2438 bytes
 .../src/main/docs/controlbus-component.adoc        |    2 +-
 .../camel-corda/src/main/docs/corda-component.adoc |    4 +-
 components/camel-cxf/pom.xml                       |    6 +-
 .../CxfConsumerPayloadXPathClientServerTest.java   |    2 +-
 .../component/cxf/CxfConsumerPayloadXPathTest.java |    4 +-
 .../src/main/docs/direct-vm-component.adoc         |    2 +-
 .../src/main/docs/google-bigquery-component.adoc   |    8 +-
 components/camel-http-common/pom.xml               |    5 +
 .../org/apache/camel/http/common/HttpHelper.java   |    4 +-
 .../apache/camel/http/common/HttpHelperTest.java   |  103 +-
 components/camel-ignite/src/main/docs/ignite.adoc  |    2 +-
 .../camel-jmx/src/main/docs/jconsole_doubles.PNG   |  Bin 47415 -> 0 bytes
 components/camel-kafka/pom.xml                     |    6 +-
 .../camel/component/kafka/embedded/TestUtils.java  |    2 +-
 .../camel-olingo2/camel-olingo2-component/pom.xml  |    6 +-
 .../component/olingo2/Olingo2Configuration.java    |    2 +-
 .../camel-olingo4/camel-olingo4-component/pom.xml  |    6 +-
 .../component/olingo4/Olingo4Configuration.java    |    2 +-
 .../salesforce/SalesforceClientTemplate.java       |   13 +-
 .../component/salesforce/SalesforceComponent.java  |  163 +-
 .../SalesforceComponentVerifierExtension.java      |   27 +-
 .../component/salesforce/SalesforceConsumer.java   |    9 +-
 .../component/salesforce/SalesforceEndpoint.java   |   35 +-
 .../salesforce/SalesforceEndpointConfig.java       |   63 +-
 .../component/salesforce/SalesforceHttpClient.java |    3 +-
 .../salesforce/SalesforceLoginConfig.java          |   44 +-
 .../salesforce/SalesforceMetaDataExtension.java    |    5 +-
 .../component/salesforce/SalesforceProducer.java   |    5 +-
 .../api/MultiSelectPicklistConverter.java          |   16 +-
 .../api/MultiSelectPicklistDeserializer.java       |    8 +-
 .../api/MultiSelectPicklistSerializer.java         |    9 +-
 .../salesforce/api/PicklistEnumConverter.java      |   10 +-
 .../SalesforceReportResultsToListConverter.java    |  110 +-
 .../api/StringMultiSelectPicklistConverter.java    |   13 +-
 .../api/StringMultiSelectPicklistDeserializer.java |    6 +-
 .../api/StringMultiSelectPicklistSerializer.java   |    9 +-
 .../component/salesforce/api/TypeReferences.java   |    3 +-
 .../api/dto/AbstractDescribedSObjectBase.java      |   21 +-
 .../api/dto/AbstractQueryRecordsBase.java          |   24 +-
 .../salesforce/api/dto/AbstractSObjectBase.java    |    9 +-
 .../api/dto/AnnotationFieldKeySorter.java          |    3 +-
 .../component/salesforce/api/dto/Attributes.java   |    8 +-
 .../camel/component/salesforce/api/dto/Limits.java |   59 +-
 .../salesforce/api/dto/PlatformEvent.java          |    6 +-
 .../component/salesforce/api/dto/RestError.java    |    3 +-
 .../salesforce/api/dto/SObjectDescription.java     |    4 +-
 .../api/dto/analytics/reports/AsyncAttributes.java |    1 -
 .../api/dto/analytics/reports/SummaryValue.java    |    1 +
 .../api/dto/approval/ApprovalRequest.java          |   29 +-
 .../api/dto/approval/ApprovalRequests.java         |    2 +-
 .../api/dto/approval/ApprovalResult.java           |   17 +-
 .../salesforce/api/dto/approval/Approvals.java     |   23 +-
 .../salesforce/api/dto/bulk/BatchInfo.java         |   76 +-
 .../salesforce/api/dto/bulk/BatchInfoList.java     |   28 +-
 .../salesforce/api/dto/bulk/BatchResult.java       |   27 +-
 .../salesforce/api/dto/bulk/BatchStateEnum.java    |   21 +-
 .../api/dto/bulk/ConcurrencyModeEnum.java          |   12 +-
 .../salesforce/api/dto/bulk/ContentType.java       |   16 +-
 .../component/salesforce/api/dto/bulk/Error.java   |   25 +-
 .../component/salesforce/api/dto/bulk/JobInfo.java |  168 +-
 .../salesforce/api/dto/bulk/JobStateEnum.java      |   18 +-
 .../salesforce/api/dto/bulk/ObjectFactory.java     |   50 +-
 .../salesforce/api/dto/bulk/OperationEnum.java     |   24 +-
 .../salesforce/api/dto/bulk/QueryResult.java       |   27 +-
 .../salesforce/api/dto/bulk/QueryResultList.java   |   27 +-
 .../component/salesforce/api/dto/bulk/Result.java  |   33 +-
 .../salesforce/api/dto/bulk/ResultError.java       |   40 +-
 .../component/salesforce/api/dto/bulk/SObject.java |   41 +-
 .../salesforce/api/dto/bulk/StatusCode.java        |  223 +--
 .../salesforce/api/dto/bulk/package-info.java      |    3 +-
 .../salesforce/api/dto/composite/Counter.java      |    3 +-
 .../api/dto/composite/ReferenceGenerator.java      |   20 +-
 .../salesforce/api/dto/composite/ReferenceId.java  |   11 +-
 .../api/dto/composite/RichInputConverter.java      |    2 +-
 .../salesforce/api/dto/composite/SObjectBatch.java |  221 +--
 .../api/dto/composite/SObjectBatchResponse.java    |   11 +-
 .../api/dto/composite/SObjectBatchResult.java      |   57 +-
 .../api/dto/composite/SObjectComposite.java        |   68 +-
 .../dto/composite/SObjectCompositeResponse.java    |    3 +-
 .../api/dto/composite/SObjectCompositeResult.java  |   12 +-
 .../salesforce/api/dto/composite/SObjectNode.java  |   95 +-
 .../dto/composite/SObjectNodeXStreamConverter.java |    2 +-
 .../salesforce/api/dto/composite/SObjectTree.java  |   64 +-
 .../api/dto/composite/SObjectTreeResponse.java     |   11 +-
 .../salesforce/api/utils/InstantConverter.java     |    5 +-
 .../salesforce/api/utils/InstantSerializer.java    |    3 +-
 .../component/salesforce/api/utils/JsonUtils.java  |   89 +-
 .../api/utils/LocalDateTimeConverter.java          |    5 +-
 .../api/utils/LocalDateTimeDeserializer.java       |    3 +-
 .../api/utils/LocalDateTimeSerializer.java         |    3 +-
 .../api/utils/OffsetDateTimeConverter.java         |    5 +-
 .../api/utils/OffsetDateTimeDeserializer.java      |    3 +-
 .../api/utils/OffsetDateTimeSerializer.java        |    3 +-
 .../salesforce/api/utils/OffsetTimeConverter.java  |    5 +-
 .../salesforce/api/utils/OffsetTimeSerializer.java |    3 +-
 .../salesforce/api/utils/QueryHelper.java          |   12 +-
 .../component/salesforce/api/utils/TimeModule.java |    9 +-
 .../component/salesforce/api/utils/Version.java    |    9 +-
 .../salesforce/api/utils/XStreamUtils.java         |    3 +-
 .../api/utils/ZonedDateTimeConverter.java          |    5 +-
 .../salesforce/internal/OperationName.java         |   55 +-
 .../salesforce/internal/PayloadFormat.java         |    3 +-
 .../salesforce/internal/SalesforceSession.java     |   40 +-
 .../internal/client/AbstractClientBase.java        |   47 +-
 .../internal/client/AnalyticsApiClient.java        |   15 +-
 .../salesforce/internal/client/BulkApiClient.java  |   41 +-
 .../internal/client/CompositeApiClient.java        |    9 +-
 .../internal/client/DefaultAnalyticsApiClient.java |   67 +-
 .../internal/client/DefaultBulkApiClient.java      |   47 +-
 .../internal/client/DefaultCompositeApiClient.java |   54 +-
 .../internal/client/DefaultRestClient.java         |   57 +-
 .../salesforce/internal/client/RestClient.java     |  159 +-
 .../internal/client/SalesforceSecurityHandler.java |   58 +-
 .../internal/client/SyncResponseCallback.java      |    3 +-
 .../internal/dto/NotifyForFieldsEnum.java          |    2 +-
 .../internal/dto/NotifyForOperationsEnum.java      |    2 +-
 .../internal/processor/AbstractRestProcessor.java  |  196 +-
 .../processor/AbstractSalesforceProcessor.java     |   50 +-
 .../internal/processor/AnalyticsApiProcessor.java  |   70 +-
 .../internal/processor/BulkApiProcessor.java       |  203 +-
 .../internal/processor/CompositeApiProcessor.java  |   40 +-
 .../internal/processor/JsonRestProcessor.java      |    6 +-
 .../internal/processor/SalesforceProcessor.java    |    6 +-
 .../internal/processor/XmlRestProcessor.java       |   62 +-
 .../internal/streaming/PushTopicHelper.java        |  100 +-
 .../internal/streaming/SubscriptionHelper.java     |   55 +-
 .../AbstractApprovalIntegrationTest.java           |   12 +-
 .../salesforce/AbstractBulkApiTestBase.java        |   37 +-
 .../salesforce/AbstractSalesforceTestBase.java     |    4 +-
 .../salesforce/AnalyticsApiIntegrationTest.java    |   82 +-
 .../ApprovalExamplesIntegrationTest.java           |   18 +-
 .../salesforce/ApprovalIntegrationTest.java        |   42 +-
 .../salesforce/BulkApiBatchIntegrationTest.java    |    9 +-
 .../salesforce/BulkApiIntegrationTest.java         |    2 +-
 .../salesforce/BulkApiJobIntegrationTest.java      |    5 +-
 .../salesforce/BulkApiQueryIntegrationTest.java    |   10 +-
 .../CompositeApiBatchIntegrationTest.java          |   96 +-
 .../salesforce/CompositeApiIntegrationTest.java    |    8 +-
 .../CompositeApiTreeIntegrationTest.java           |    3 +-
 .../salesforce/CompoundTypesIntegrationTest.java   |   36 +-
 .../salesforce/HttpProxyIntegrationTest.java       |   20 +-
 .../salesforce/LimitsIntegrationTest.java          |    3 +-
 .../component/salesforce/LoginConfigHelper.java    |    6 +-
 .../salesforce/NotFoundIntegrationTest.java        |   11 +-
 .../camel/component/salesforce/RawPayloadTest.java |   55 +-
 .../salesforce/RecentIntegrationTest.java          |   29 +-
 .../salesforce/RestApiIntegrationTest.java         |  170 +-
 ...eComponentVerifierExtensionIntegrationTest.java |   38 +-
 .../salesforce/SalesforceConsumerTest.java         |    6 +-
 .../salesforce/SalesforceEndpointTest.java         |   14 +-
 .../SalesforceHeadersIntegrationTest.java          |    2 +-
 .../SalesforceMetaDataExtensionTest.java           |   27 +-
 .../camel/component/salesforce/Standalone.java     |    3 +-
 .../salesforce/StreamingApiIntegrationTest.java    |   42 +-
 .../api/MultiSelectPicklistJsonTest.java           |    2 +-
 .../salesforce/api/MultiSelectPicklistXmlTest.java |    6 +-
 .../component/salesforce/api/dto/LimitsTest.java   |   17 +-
 .../salesforce/api/dto/PlatformEventTest.java      |   13 +-
 .../salesforce/api/dto/RecentItemTest.java         |   27 +-
 .../salesforce/api/dto/RestErrorTest.java          |   14 +-
 .../api/dto/approval/ApprovalRequestTest.java      |   35 +-
 .../api/dto/approval/ApprovalRequestsTest.java     |   74 +-
 .../api/dto/approval/ApprovalResultTest.java       |   40 +-
 .../salesforce/api/dto/approval/ApprovalsTest.java |   28 +-
 .../api/dto/composite/MapOfMapsConverterTest.java  |   30 +-
 .../dto/composite/SObjectBatchResponseTest.java    |  110 +-
 .../api/dto/composite/SObjectBatchTest.java        |  254 +--
 .../composite/SObjectCompositeResponseTest.java    |   71 +-
 .../api/dto/composite/SObjectCompositeTest.java    |    9 +-
 .../api/dto/composite/SObjectTreeResponseTest.java |  136 +-
 .../api/dto/composite/SObjectTreeTest.java         |  122 +-
 .../salesforce/api/utils/JsonUtilsTest.java        |    2 +-
 .../salesforce/api/utils/QueryHelperTest.java      |   31 +-
 .../api/utils/SalesforceTimeFormatsTest.java       |   45 +-
 .../salesforce/dto/generated/Account.java          |   23 +-
 .../dto/generated/Account_IndustryEnum.java        |    2 +-
 .../salesforce/dto/generated/Contact.java          |   20 +-
 .../salesforce/dto/generated/Document.java         |   12 +-
 .../salesforce/dto/generated/Line_Item__c.java     |    4 -
 .../salesforce/dto/generated/Merchandise__c.java   |    7 +-
 .../dto/generated/QueryRecordsLine_Item__c.java    |    1 +
 .../salesforce/internal/LoginTokenTest.java        |   22 +-
 .../salesforce/internal/SalesforceSessionTest.java |   15 +-
 .../internal/SessionIntegrationTest.java           |    3 +-
 .../internal/client/AbstractClientBaseTest.java    |   15 +-
 .../AbstractRestProcessorApprovalTest.java         |   27 +-
 .../internal/processor/JsonRestProcessorTest.java  |   23 +-
 .../internal/streaming/SubscriptionHelperTest.java |   34 +-
 .../apache/camel/maven/AbstractSalesforceMojo.java |   16 +-
 .../java/org/apache/camel/maven/GenerateMojo.java  |  121 +-
 .../org/apache/camel/maven/ObjectDescriptions.java |   25 +-
 .../java/org/apache/camel/maven/SchemaMojo.java    |   15 +-
 .../AbstractSalesforceMojoIntegrationTest.java     |    6 +-
 .../camel/maven/CamelSalesforceMojoOutputTest.java |   86 +-
 .../org/apache/camel/maven/GenerateMojoTest.java   |   24 +-
 .../camel/maven/HttpProxyMojoIntegrationTest.java  |   23 +-
 .../camel/maven/SchemaMojoIntegrationTest.java     |    3 +-
 .../camel-spark/src/main/docs/spark-component.adoc |    4 +-
 .../src/main/docs/test-junit5.adoc                 |    3 +
 .../apache/camel/test/junit5/CamelTestSupport.java |   25 +-
 .../CreateCamelContextPerTestFalseTest.java        |    7 +-
 .../CreateCamelContextPerTestTrueTest.java         |    5 -
 .../FilterCreateCamelContextPerClassTest.java      |   10 +-
 components/camel-test/pom.xml                      |    4 +
 .../src/main/docs/undertow-component.adoc          |    3 +-
 .../undertow/CamelUndertowHttpHandler.java}        |   10 +-
 .../camel/component/undertow/UndertowConsumer.java |   14 +
 .../camel/component/undertow/UndertowEndpoint.java |   22 +
 .../component/undertow/MapIdentityManager.java     |  122 ++
 .../undertow/UndertowBasicAuthHandler.java         |   76 +
 .../undertow/UndertowHandlersSpringTest.java       |  104 +
 .../src/test/resources/HandlersSpringTest.xml      |   67 +
 components/camel-xstream/pom.xml                   |    5 +
 .../xstream/MarshalDomainObjectJSONTest.java       |    4 +-
 .../xstream/MarshalDomainObjectTest.java           |    8 +-
 .../xstream/XStreamDataFormatOmitFieldsTest.java   |   15 +-
 ...eamDataFormatPermissionsSystemPropertyTest.java |   13 +-
 .../xstream/XStreamDataFormatPermissionsTest.java  |    7 +-
 components/pom.xml                                 |    1 +
 components/readme.adoc                             |    4 +-
 .../apache/camel/impl/health/RouteHealthCheck.java |   16 +-
 .../apache/camel/builder/AdviceWithBuilder.java    |    9 +-
 .../camel/builder/AdviceWithRouteBuilder.java      |   97 +-
 .../org/apache/camel/builder/AdviceWithTask.java   |    3 +-
 .../org/apache/camel/builder/AdviceWithTasks.java  |  145 +-
 .../camel/builder/AggregationStrategies.java       |   49 +-
 .../camel/builder/AggregationStrategyClause.java   |   37 +-
 .../java/org/apache/camel/builder/Builder.java     |   65 +-
 .../org/apache/camel/builder/BuilderSupport.java   |   83 +-
 .../org/apache/camel/builder/DataFormatClause.java |  236 +--
 .../camel/builder/DeadLetterChannelBuilder.java    |   20 +-
 .../camel/builder/DefaultErrorHandlerBuilder.java  |  183 +-
 .../camel/builder/EndpointConsumerBuilder.java     |   10 +-
 .../camel/builder/EndpointProducerBuilder.java     |   14 +-
 .../org/apache/camel/builder/EnrichClause.java     |    1 -
 .../apache/camel/builder/ErrorHandlerBuilder.java  |    5 +-
 .../camel/builder/ErrorHandlerBuilderRef.java      |    5 +-
 .../camel/builder/ErrorHandlerBuilderSupport.java  |   18 +-
 .../org/apache/camel/builder/ExchangeBuilder.java  |    9 +-
 .../apache/camel/builder/ExpressionBuilder.java    |    6 +-
 .../org/apache/camel/builder/ExpressionClause.java |  164 +-
 .../camel/builder/ExpressionClauseSupport.java     |  167 +-
 .../camel/builder/FlexibleAggregationStrategy.java |  156 +-
 .../camel/builder/NoErrorHandlerBuilder.java       |   11 +-
 .../org/apache/camel/builder/NotifyBuilder.java    |  301 +--
 .../org/apache/camel/builder/PredicateBuilder.java |    5 +-
 .../org/apache/camel/builder/PredicateClause.java  |   79 +-
 .../org/apache/camel/builder/ProcessClause.java    |   76 +-
 .../org/apache/camel/builder/ProxyBuilder.java     |   10 +-
 .../org/apache/camel/builder/RouteBuilder.java     |   92 +-
 .../org/apache/camel/builder/SimpleBuilder.java    |   15 +-
 .../apache/camel/builder/ThreadPoolBuilder.java    |   16 +-
 .../camel/builder/ThreadPoolProfileBuilder.java    |    5 +-
 .../apache/camel/builder/TransformerBuilder.java   |   48 +-
 .../org/apache/camel/builder/ValidatorBuilder.java |   42 +-
 .../camel/impl/AbstractModelCamelContext.java      |    6 +-
 .../org/apache/camel/impl/DefaultCamelContext.java |   29 +-
 .../camel/impl/DefaultExecutorServiceManager.java  |    3 +-
 .../camel/impl/DefaultModelJAXBContextFactory.java |    5 +-
 .../java/org/apache/camel/impl/RouteIdFactory.java |   15 +-
 .../java/org/apache/camel/impl/RouteService.java   |   23 +-
 .../impl/cluster/ClusteredRouteConfiguration.java  |    2 +-
 .../impl/cluster/ClusteredRouteController.java     |   11 +-
 .../camel/impl/cluster/ClusteredRouteFilter.java   |    2 +-
 .../camel/impl/cluster/ClusteredRoutePolicy.java   |   23 +-
 .../impl/cluster/ClusteredRoutePolicyFactory.java  |    3 +-
 .../apache/camel/model/AdviceWithDefinition.java   |    2 +-
 .../apache/camel/model/AggregateDefinition.java    |  375 ++--
 .../org/apache/camel/model/BeanDefinition.java     |    9 +-
 .../org/apache/camel/model/CatchDefinition.java    |   24 +-
 .../org/apache/camel/model/ChoiceDefinition.java   |   44 +-
 .../apache/camel/model/ClaimCheckDefinition.java   |   87 +-
 .../java/org/apache/camel/model/Constants.java     |   14 +-
 .../apache/camel/model/ContextScanDefinition.java  |    5 +-
 .../apache/camel/model/ConvertBodyDefinition.java  |    4 +-
 .../apache/camel/model/DataFormatDefinition.java   |    9 +-
 .../DefinitionPropertyPlaceholderConfigurer.java   |    9 +-
 .../org/apache/camel/model/DelayDefinition.java    |   17 +-
 .../camel/model/DynamicRouterDefinition.java       |   30 +-
 .../camel/model/EndpointRequiredDefinition.java    |    5 +-
 .../org/apache/camel/model/EnrichDefinition.java   |   59 +-
 .../model/ExecutorServiceAwareDefinition.java      |    8 +-
 .../org/apache/camel/model/ExpressionNode.java     |   28 +-
 .../apache/camel/model/ExpressionNodeHelper.java   |   48 +-
 .../model/ExpressionSubElementDefinition.java      |   15 +-
 .../org/apache/camel/model/FilterDefinition.java   |   12 +-
 .../org/apache/camel/model/FinallyDefinition.java  |    2 +-
 .../org/apache/camel/model/FromDefinition.java     |    3 +-
 .../camel/model/HystrixConfigurationCommon.java    |  152 +-
 .../model/HystrixConfigurationDefinition.java      |  137 +-
 .../org/apache/camel/model/HystrixDefinition.java  |   27 +-
 .../camel/model/IdempotentConsumerDefinition.java  |   61 +-
 .../org/apache/camel/model/IdentifiedType.java     |    7 +-
 .../org/apache/camel/model/InOnlyDefinition.java   |    4 +-
 .../org/apache/camel/model/InOutDefinition.java    |    4 +-
 .../apache/camel/model/InputTypeDefinition.java    |   28 +-
 .../apache/camel/model/InterceptDefinition.java    |   15 +-
 .../camel/model/InterceptFromDefinition.java       |    4 +-
 .../model/InterceptSendToEndpointDefinition.java   |   37 +-
 .../apache/camel/model/LoadBalanceDefinition.java  |   83 +-
 .../apache/camel/model/LoadBalancerDefinition.java |    3 +-
 .../java/org/apache/camel/model/LogDefinition.java |    5 +-
 .../org/apache/camel/model/LoopDefinition.java     |   28 +-
 .../org/apache/camel/model/MarshalDefinition.java  |   69 +-
 .../main/java/org/apache/camel/model/Model.java    |  125 +-
 .../java/org/apache/camel/model/ModelHelper.java   |  110 +-
 .../apache/camel/model/MulticastDefinition.java    |  188 +-
 .../apache/camel/model/OnCompletionDefinition.java |   75 +-
 .../apache/camel/model/OnExceptionDefinition.java  |  230 ++-
 .../apache/camel/model/OnFallbackDefinition.java   |   10 +-
 .../model/OptimisticLockRetryPolicyDefinition.java |   14 +-
 .../camel/model/OptionalIdentifiedDefinition.java  |   24 +-
 .../apache/camel/model/OtherAttributesAware.java   |    8 +-
 .../apache/camel/model/OutputTypeDefinition.java   |   28 +-
 .../apache/camel/model/PackageScanDefinition.java  |    3 +-
 .../org/apache/camel/model/PipelineDefinition.java |    2 +-
 .../org/apache/camel/model/PolicyDefinition.java   |    9 +-
 .../apache/camel/model/PollEnrichDefinition.java   |   73 +-
 .../org/apache/camel/model/ProcessDefinition.java  |    6 +-
 .../apache/camel/model/ProcessorDefinition.java    | 1986 ++++++++++++--------
 .../camel/model/ProcessorDefinitionHelper.java     |  310 +--
 .../org/apache/camel/model/PropertyDefinition.java |    6 +-
 .../camel/model/RecipientListDefinition.java       |  190 +-
 .../camel/model/RedeliveryPolicyDefinition.java    |  207 +-
 .../apache/camel/model/RemoveHeaderDefinition.java |    8 +-
 .../camel/model/RemoveHeadersDefinition.java       |   40 +-
 .../camel/model/RemovePropertiesDefinition.java    |   40 +-
 .../camel/model/RemovePropertyDefinition.java      |    8 +-
 .../apache/camel/model/ResequenceDefinition.java   |   55 +-
 .../camel/model/RestContextRefDefinition.java      |    2 +-
 .../model/RestContextRefDefinitionHelper.java      |   40 +-
 .../org/apache/camel/model/RollbackDefinition.java |    2 +-
 .../apache/camel/model/RouteBuilderDefinition.java |    9 +-
 .../camel/model/RouteContextRefDefinition.java     |    2 +-
 .../model/RouteContextRefDefinitionHelper.java     |   30 +-
 .../org/apache/camel/model/RouteDefinition.java    |  162 +-
 .../apache/camel/model/RouteDefinitionHelper.java  |  237 +--
 .../java/org/apache/camel/model/RouteFilters.java  |   32 +-
 .../org/apache/camel/model/RoutesDefinition.java   |   36 +-
 .../apache/camel/model/RoutingSlipDefinition.java  |   32 +-
 .../camel/model/SagaActionUriDefinition.java       |    1 -
 .../org/apache/camel/model/SagaDefinition.java     |   45 +-
 .../apache/camel/model/SagaOptionDefinition.java   |    7 +-
 .../org/apache/camel/model/SagaPropagation.java    |    6 +-
 .../org/apache/camel/model/SamplingDefinition.java |   28 +-
 .../org/apache/camel/model/ScriptDefinition.java   |    3 +-
 .../org/apache/camel/model/SendDefinition.java     |    3 +-
 .../camel/model/SetExchangePatternDefinition.java  |    5 +-
 .../apache/camel/model/SetHeaderDefinition.java    |    4 +-
 .../apache/camel/model/SetPropertyDefinition.java  |   15 +-
 .../org/apache/camel/model/SortDefinition.java     |    4 +-
 .../org/apache/camel/model/SplitDefinition.java    |  191 +-
 .../org/apache/camel/model/StepDefinition.java     |    5 +-
 .../org/apache/camel/model/StopDefinition.java     |    2 +-
 .../camel/model/ThreadPoolProfileDefinition.java   |    6 +-
 .../org/apache/camel/model/ThreadsDefinition.java  |   27 +-
 .../org/apache/camel/model/ThrottleDefinition.java |   44 +-
 .../camel/model/ThrowExceptionDefinition.java      |    7 +-
 .../java/org/apache/camel/model/ToDefinition.java  |    1 -
 .../apache/camel/model/ToDynamicDefinition.java    |   33 +-
 .../apache/camel/model/TransactedDefinition.java   |   12 +-
 .../apache/camel/model/TransformDefinition.java    |    3 +-
 .../java/org/apache/camel/model/TryDefinition.java |   21 +-
 .../apache/camel/model/UnmarshalDefinition.java    |   70 +-
 .../org/apache/camel/model/ValidateDefinition.java |   13 +-
 .../org/apache/camel/model/WhenDefinition.java     |    9 +-
 .../model/WhenSkipSendToEndpointDefinition.java    |    9 +-
 .../org/apache/camel/model/WireTapDefinition.java  |  122 +-
 ...klistServiceCallServiceFilterConfiguration.java |   23 +-
 ...ngServiceCallServiceDiscoveryConfiguration.java |   27 +-
 ...edServiceCallServiceDiscoveryConfiguration.java |   24 +-
 ...binedServiceCallServiceFilterConfiguration.java |   17 +-
 ...ulServiceCallServiceDiscoveryConfiguration.java |   14 +-
 ...ustomServiceCallServiceFilterConfiguration.java |    3 +-
 ...nsServiceCallServiceDiscoveryConfiguration.java |    5 +-
 ...cdServiceCallServiceDiscoveryConfiguration.java |   15 +-
 ...althyServiceCallServiceFilterConfiguration.java |    2 +-
 ...esServiceCallServiceDiscoveryConfiguration.java |   97 +-
 ...roughServiceCallServiceFilterConfiguration.java |    2 +-
 .../cloud/ServiceCallConfigurationDefinition.java  |   61 +-
 .../camel/model/cloud/ServiceCallDefinition.java   |   53 +-
 .../cloud/ServiceCallExpressionConfiguration.java  |   55 +-
 .../ServiceCallServiceChooserConfiguration.java    |   36 +-
 .../ServiceCallServiceDiscoveryConfiguration.java  |   46 +-
 .../ServiceCallServiceFilterConfiguration.java     |   36 +-
 ...erviceCallServiceLoadBalancerConfiguration.java |   36 +-
 ...icServiceCallServiceDiscoveryConfiguration.java |   21 +-
 ...erServiceCallServiceDiscoveryConfiguration.java |    9 +-
 .../camel/model/config/BatchResequencerConfig.java |   11 +-
 .../model/config/StreamResequencerConfig.java      |   69 +-
 .../apache/camel/model/config/package-info.java    |    4 +-
 .../camel/model/dataformat/ASN1DataFormat.java     |   20 +-
 .../camel/model/dataformat/Any23DataFormat.java    |  127 ++
 .../{YAMLTypeFilterType.java => Any23Type.java}    |   11 +-
 .../camel/model/dataformat/AvroDataFormat.java     |    3 +-
 .../camel/model/dataformat/BarcodeDataFormat.java  |    7 +-
 .../camel/model/dataformat/Base64DataFormat.java   |    9 +-
 .../camel/model/dataformat/BeanioDataFormat.java   |   29 +-
 .../camel/model/dataformat/BindyDataFormat.java    |   14 +-
 .../camel/model/dataformat/CBORDataFormat.java     |   17 +-
 .../camel/model/dataformat/CryptoDataFormat.java   |   24 +-
 .../camel/model/dataformat/CsvDataFormat.java      |   48 +-
 .../camel/model/dataformat/CustomDataFormat.java   |    9 +-
 .../model/dataformat/DataFormatsDefinition.java    |   66 +-
 .../camel/model/dataformat/FhirDataformat.java     |  149 +-
 .../camel/model/dataformat/FhirJsonDataFormat.java |    3 +-
 .../camel/model/dataformat/FhirXmlDataFormat.java  |    3 +-
 .../camel/model/dataformat/FlatpackDataFormat.java |   29 +-
 .../camel/model/dataformat/GrokDataFormat.java     |   14 +-
 .../camel/model/dataformat/GzipDataFormat.java     |    3 +-
 .../camel/model/dataformat/HL7DataFormat.java      |    8 +-
 .../camel/model/dataformat/IcalDataFormat.java     |    2 +-
 .../model/dataformat/JacksonXMLDataFormat.java     |    8 +-
 .../camel/model/dataformat/JaxbDataFormat.java     |   66 +-
 .../camel/model/dataformat/LZFDataFormat.java      |    5 +-
 .../model/dataformat/MimeMultipartDataFormat.java  |   10 +-
 .../camel/model/dataformat/PGPDataFormat.java      |   83 +-
 .../camel/model/dataformat/ProtobufDataFormat.java |   20 +-
 .../camel/model/dataformat/RssDataFormat.java      |    5 +-
 .../camel/model/dataformat/SoapJaxbDataFormat.java |   81 +-
 .../camel/model/dataformat/SyslogDataFormat.java   |    3 +-
 .../camel/model/dataformat/TarFileDataFormat.java  |   20 +-
 .../camel/model/dataformat/ThriftDataFormat.java   |   22 +-
 .../model/dataformat/TidyMarkupDataFormat.java     |   14 +-
 .../dataformat/UniVocityAbstractDataFormat.java    |   35 +-
 .../model/dataformat/UniVocityCsvDataFormat.java   |   12 +-
 .../dataformat/UniVocityFixedWidthDataFormat.java  |    3 +-
 .../model/dataformat/UniVocityTsvDataFormat.java   |    6 +-
 .../model/dataformat/XMLSecurityDataFormat.java    |  122 +-
 .../camel/model/dataformat/XStreamDataFormat.java  |   76 +-
 .../camel/model/dataformat/XmlRpcDataFormat.java   |    4 +-
 .../camel/model/dataformat/YAMLDataFormat.java     |   12 +-
 .../camel/model/dataformat/YAMLTypeFilterType.java |    3 +-
 .../model/dataformat/ZipDeflaterDataFormat.java    |   12 +-
 .../camel/model/dataformat/ZipFileDataFormat.java  |   22 +-
 .../camel/model/dataformat/package-info.java       |    5 +-
 .../camel/model/language/ConstantExpression.java   |    7 +-
 .../model/language/ExchangePropertyExpression.java |    2 +-
 .../camel/model/language/ExpressionDefinition.java |   32 +-
 .../camel/model/language/HeaderExpression.java     |    2 +-
 .../camel/model/language/JsonPathExpression.java   |   17 +-
 .../camel/model/language/MethodCallExpression.java |   11 +-
 .../camel/model/language/MvelExpression.java       |    2 +-
 .../model/language/NamespaceAwareExpression.java   |   10 +-
 .../apache/camel/model/language/RefExpression.java |    3 +-
 .../camel/model/language/SimpleExpression.java     |    2 +-
 .../camel/model/language/TokenizerExpression.java  |   33 +-
 .../model/language/XMLTokenizerExpression.java     |   14 +-
 .../camel/model/language/XPathExpression.java      |   42 +-
 .../camel/model/language/XQueryExpression.java     |    2 +-
 .../apache/camel/model/language/package-info.java  |    5 +-
 .../FailoverLoadBalancerDefinition.java            |   60 +-
 .../loadbalancer/RandomLoadBalancerDefinition.java |    5 +-
 .../RoundRobinLoadBalancerDefinition.java          |    7 +-
 .../loadbalancer/StickyLoadBalancerDefinition.java |    7 +-
 .../loadbalancer/TopicLoadBalancerDefinition.java  |    5 +-
 .../WeightedLoadBalancerDefinition.java            |   21 +-
 .../camel/model/loadbalancer/package-info.java     |    5 +-
 .../java/org/apache/camel/model/package-info.java  |    5 +-
 .../camel/model/rest/RestBindingDefinition.java    |   41 +-
 .../model/rest/RestConfigurationDefinition.java    |  286 +--
 .../apache/camel/model/rest/RestDefinition.java    |   77 +-
 .../model/rest/RestOperationParamDefinition.java   |   14 +-
 .../RestOperationResponseHeaderDefinition.java     |   15 +-
 .../rest/RestOperationResponseMsgDefinition.java   |    5 +-
 .../org/apache/camel/model/rest/RestParamType.java |    2 +-
 .../camel/model/rest/RestPropertyDefinition.java   |    4 +-
 .../camel/model/rest/RestSecuritiesDefinition.java |    7 +-
 .../camel/model/rest/RestSecurityApiKey.java       |    3 +-
 .../camel/model/rest/RestSecurityDefinition.java   |    3 +-
 .../camel/model/rest/RestSecurityOAuth2.java       |   15 +-
 .../apache/camel/model/rest/RestsDefinition.java   |    6 +-
 .../camel/model/rest/SecurityDefinition.java       |    3 +-
 .../apache/camel/model/rest/VerbDefinition.java    |   70 +-
 .../transformer/CustomTransformerDefinition.java   |    9 +-
 .../DataFormatTransformerDefinition.java           |   75 +-
 .../transformer/EndpointTransformerDefinition.java |   13 +-
 .../model/transformer/TransformerDefinition.java   |   53 +-
 .../model/transformer/TransformersDefinition.java  |    8 +-
 .../camel/model/transformer/package-info.java      |    5 +-
 .../model/validator/CustomValidatorDefinition.java |    9 +-
 .../validator/EndpointValidatorDefinition.java     |   15 +-
 .../validator/PredicateValidatorDefinition.java    |   20 +-
 .../camel/model/validator/ValidatorDefinition.java |   28 +-
 .../model/validator/ValidatorsDefinition.java      |    8 +-
 .../apache/camel/model/validator/package-info.java |    5 +-
 .../org/apache/camel/reifier/AggregateReifier.java |   31 +-
 .../org/apache/camel/reifier/CatchReifier.java     |    6 +-
 .../org/apache/camel/reifier/ChoiceReifier.java    |   21 +-
 .../apache/camel/reifier/ClaimCheckReifier.java    |    4 +-
 .../apache/camel/reifier/DynamicRouterReifier.java |    6 +-
 .../org/apache/camel/reifier/EnrichReifier.java    |    4 +-
 .../apache/camel/reifier/ExpressionReifier.java    |    4 +-
 .../org/apache/camel/reifier/FilterReifier.java    |    1 -
 .../camel/reifier/IdempotentConsumerReifier.java   |    3 +-
 .../apache/camel/reifier/InterceptFromReifier.java |    9 +-
 .../org/apache/camel/reifier/InterceptReifier.java |   10 +-
 .../reifier/InterceptSendToEndpointReifier.java    |   25 +-
 .../apache/camel/reifier/LoadBalanceReifier.java   |   15 +-
 .../java/org/apache/camel/reifier/LogReifier.java  |    5 +-
 .../java/org/apache/camel/reifier/LoopReifier.java |    2 +-
 .../org/apache/camel/reifier/MarshalReifier.java   |    2 +-
 .../org/apache/camel/reifier/MulticastReifier.java |   14 +-
 .../apache/camel/reifier/OnCompletionReifier.java  |   19 +-
 .../apache/camel/reifier/OnExceptionReifier.java   |   17 +-
 .../apache/camel/reifier/OnFallbackReifier.java    |    2 +-
 .../org/apache/camel/reifier/PolicyReifier.java    |    5 +-
 .../apache/camel/reifier/PollEnrichReifier.java    |    6 +-
 .../org/apache/camel/reifier/ProcessReifier.java   |    2 +-
 .../org/apache/camel/reifier/ProcessorReifier.java |  152 +-
 .../apache/camel/reifier/RecipientListReifier.java |   12 +-
 .../apache/camel/reifier/RemoveHeaderReifier.java  |    2 +-
 .../apache/camel/reifier/RemoveHeadersReifier.java |    4 +-
 .../camel/reifier/RemovePropertiesReifier.java     |    4 +-
 .../camel/reifier/RemovePropertyReifier.java       |    2 +-
 .../apache/camel/reifier/ResequenceReifier.java    |   21 +-
 .../org/apache/camel/reifier/RollbackReifier.java  |    2 +-
 .../org/apache/camel/reifier/RouteReifier.java     |  113 +-
 .../apache/camel/reifier/RoutingSlipReifier.java   |    7 +-
 .../java/org/apache/camel/reifier/SagaReifier.java |   20 +-
 .../org/apache/camel/reifier/SamplingReifier.java  |    2 +-
 .../org/apache/camel/reifier/ScriptReifier.java    |    2 +-
 .../java/org/apache/camel/reifier/SendReifier.java |    4 +-
 .../org/apache/camel/reifier/SetBodyReifier.java   |    2 +-
 .../camel/reifier/SetExchangePatternReifier.java   |    2 +-
 .../org/apache/camel/reifier/SetHeaderReifier.java |    2 +-
 .../apache/camel/reifier/SetPropertyReifier.java   |    2 +-
 .../java/org/apache/camel/reifier/SortReifier.java |    2 +-
 .../org/apache/camel/reifier/SplitReifier.java     |   12 +-
 .../java/org/apache/camel/reifier/StopReifier.java |    2 +-
 .../org/apache/camel/reifier/ThreadsReifier.java   |   13 +-
 .../org/apache/camel/reifier/ThrottleReifier.java  |    2 +-
 .../camel/reifier/ThrowExceptionReifier.java       |    2 +-
 .../org/apache/camel/reifier/ToDynamicReifier.java |    8 +-
 .../apache/camel/reifier/TransactedReifier.java    |   34 +-
 .../org/apache/camel/reifier/TransformReifier.java |    2 +-
 .../java/org/apache/camel/reifier/TryReifier.java  |    2 +-
 .../org/apache/camel/reifier/UnmarshalReifier.java |    2 +-
 .../org/apache/camel/reifier/ValidateReifier.java  |    2 +-
 .../java/org/apache/camel/reifier/WhenReifier.java |    2 +-
 .../reifier/WhenSkipSendToEndpointReifier.java     |    5 +-
 .../org/apache/camel/reifier/WireTapReifier.java   |    2 +-
 .../reifier/dataformat/ASN1DataFormatReifier.java  |    2 +-
 ...matReifier.java => Any23DataFormatReifier.java} |   22 +-
 .../reifier/dataformat/AvroDataFormatReifier.java  |    2 +-
 .../dataformat/BarcodeDataFormatReifier.java       |    2 +-
 .../dataformat/Base64DataFormatReifier.java        |    2 +-
 .../dataformat/BeanioDataFormatReifier.java        |    2 +-
 .../reifier/dataformat/BindyDataFormatReifier.java |    2 +-
 .../reifier/dataformat/CBORDataFormatReifier.java  |    2 +-
 .../dataformat/CryptoDataFormatReifier.java        |    6 +-
 .../reifier/dataformat/CsvDataFormatReifier.java   |    3 +-
 .../dataformat/CustomDataFormatReifier.java        |    2 +-
 .../reifier/dataformat/DataFormatReifier.java      |   25 +-
 .../reifier/dataformat/FhirDataFormatReifier.java  |    2 +-
 .../dataformat/FlatpackDataFormatReifier.java      |    2 +-
 .../reifier/dataformat/GrokDataFormatReifier.java  |    2 +-
 .../reifier/dataformat/GzipDataFormatReifier.java  |    2 +-
 .../reifier/dataformat/HL7DataFormatReifier.java   |    2 +-
 .../reifier/dataformat/IcalDataFormatReifier.java  |    2 +-
 .../dataformat/JacksonXMLDataFormatReifier.java    |    2 +-
 .../reifier/dataformat/JaxbDataFormatReifier.java  |    2 +-
 .../dataformat/JsonApiDataFormatReifier.java       |    2 +-
 .../reifier/dataformat/JsonDataFormatReifier.java  |    2 +-
 .../reifier/dataformat/LZFDataFormatReifier.java   |    2 +-
 .../dataformat/MimeMultipartDataFormatReifier.java |    2 +-
 .../reifier/dataformat/PGPDataFormatReifier.java   |    2 +-
 .../dataformat/ProtobufDataFormatReifier.java      |    2 +-
 .../reifier/dataformat/RssDataFormatReifier.java   |    2 +-
 .../dataformat/SoapJaxbDataFormatReifier.java      |    2 +-
 .../dataformat/SyslogDataFormatReifier.java        |    2 +-
 .../dataformat/TarFileDataFormatReifier.java       |    2 +-
 .../dataformat/ThriftDataFormatReifier.java        |    2 +-
 .../dataformat/TidyMarkupDataFormatReifier.java    |    2 +-
 .../UniVocityAbstractDataFormatReifier.java        |    5 +-
 .../dataformat/XMLSecurityDataFormatReifier.java   |    2 +-
 .../dataformat/XStreamDataFormatReifier.java       |    2 +-
 .../dataformat/XmlRpcDataFormatReifier.java        |    2 +-
 .../reifier/dataformat/YAMLDataFormatReifier.java  |    4 +-
 .../reifier/dataformat/ZipDataFormatReifier.java   |    2 +-
 .../dataformat/ZipFileDataFormatReifier.java       |    2 +-
 .../errorhandler/DeadLetterChannelReifier.java     |   15 +-
 .../errorhandler/DefaultErrorHandlerReifier.java   |   26 +-
 .../errorhandler/ErrorHandlerRefReifier.java       |    2 +-
 .../reifier/errorhandler/ErrorHandlerReifier.java  |   85 +-
 .../errorhandler/NoErrorHandlerReifier.java        |    2 +-
 .../loadbalancer/CustomLoadBalancerReifier.java    |    2 +-
 .../loadbalancer/FailoverLoadBalancerReifier.java  |    2 +-
 .../reifier/loadbalancer/LoadBalancerReifier.java  |    7 +-
 .../loadbalancer/RandomLoadBalancerReifier.java    |    2 +-
 .../RoundRobinLoadBalancerReifier.java             |    2 +-
 .../loadbalancer/StickyLoadBalancerReifier.java    |    2 +-
 .../loadbalancer/TopicLoadBalancerReifier.java     |    2 +-
 .../loadbalancer/WeightedLoadBalancerReifier.java  |    2 +-
 .../camel/reifier/rest/RestBindingReifier.java     |   24 +-
 .../transformer/CustomTransformeReifier.java       |    6 +-
 .../transformer/DataFormatTransformeReifier.java   |    8 +-
 .../transformer/EndpointTransformeReifier.java     |   11 +-
 .../reifier/transformer/TransformerReifier.java    |    2 +-
 .../reifier/validator/CustomValidatorReifier.java  |    2 +-
 .../validator/EndpointValidatorReifier.java        |    9 +-
 .../validator/PredicateValidatorReifier.java       |    6 +-
 .../camel/reifier/validator/ValidatorReifier.java  |    2 +-
 core/camel-core/src/main/schema/constant.json      |    2 +-
 .../java/org/apache/camel/CamelExceptionsTest.java |    6 +-
 .../java/org/apache/camel/ContextTestSupport.java  |   53 +-
 .../java/org/apache/camel/ExchangeTestSupport.java |   10 +-
 .../org/apache/camel/InjectorDefaultsTest.java     |    1 -
 .../java/org/apache/camel/LanguageTestSupport.java |   22 +-
 .../test/java/org/apache/camel/TestSupport.java    |   91 +-
 .../org/apache/camel/TestSupportJmxCleanup.java    |    7 +-
 .../camel/builder/BuilderWithScopesTest.java       |   50 +-
 .../org/apache/camel/builder/ErrorHandlerTest.java |    8 +-
 .../apache/camel/builder/ExceptionBuilderTest.java |   44 +-
 .../ExceptionBuilderWithHandledExceptionTest.java  |   12 +-
 .../apache/camel/builder/ExchangeBuilderTest.java  |   11 +-
 .../camel/builder/ExpressionBuilderTest.java       |   32 +-
 .../builder/ExpressionClauseSupplierTest.java      |    4 +-
 .../camel/builder/ExpressionFunctionTest.java      |   12 +-
 .../camel/builder/FluentProducerTemplateTest.java  |  191 +-
 .../java/org/apache/camel/builder/MyProcessor.java |    2 +-
 .../camel/builder/NotifyBuilderFromRouteTest.java  |   20 +-
 .../apache/camel/builder/NotifyBuilderTest.java    |  216 +--
 .../builder/NotifyBuilderWhenDoneByIndexTest.java  |   11 +-
 .../builder/PredicateBinaryCoerceRouteTest.java    |   18 +-
 .../builder/PredicateBinaryCoerceTypeTest.java     |    1 +
 .../apache/camel/builder/PredicateBuilderTest.java |    1 +
 .../ProxyBuilderSkipJavaLangObjectMethodsTest.java |    4 +-
 .../org/apache/camel/builder/ProxyBuilderTest.java |    4 +-
 .../RouteBuilderAddRoutesOnlyInterceptTest.java    |    2 +-
 .../org/apache/camel/builder/RouteBuilderTest.java |   61 +-
 .../apache/camel/builder/SimpleBuilderTest.java    |    8 +-
 .../camel/builder/ThreadPoolBuilderTest.java       |   17 +-
 .../builder/xml/DefaultNamespaceContextTest.java   |    2 +-
 .../builder/xml/ExtractXPathWithNamespaceTest.java |    6 +-
 .../builder/xml/XPathContentBasedRouterTest.java   |    6 +-
 .../apache/camel/builder/xml/XPathFeatureTest.java |   36 +-
 .../camel/builder/xml/XPathFunctionsTest.java      |   17 +-
 .../XPathHeaderNameResultTypeAndNamespaceTest.java |    7 +-
 .../camel/builder/xml/XPathHeaderNameTest.java     |   25 +-
 .../apache/camel/builder/xml/XPathHeaderTest.java  |   12 +-
 .../builder/xml/XPathNamespaceResultTypeTest.java  |    9 +-
 .../camel/builder/xml/XPathNamespaceTest.java      |    9 +-
 .../builder/xml/XPathNestedNamespaceTest.java      |   10 +-
 .../org/apache/camel/builder/xml/XPathTest.java    |   34 +-
 .../camel/builder/xml/XPathTransformRouteTest.java |    1 -
 .../camel/builder/xml/XPathTransformTest.java      |    8 +-
 .../xml/XPathWithNamespacesFromDomTest.java        |    3 +-
 .../apache/camel/builder/xml/XsltBuilderTest.java  |    3 +-
 .../camel/builder/xml/XsltOutputFileTest.java      |    2 +-
 .../apache/camel/component/bar/BarProducer.java    |    4 +-
 .../camel/component/bar/BarSendDynamicAware.java   |    3 +-
 .../component/bean/BeanByteArrayBodyTest.java      |    7 +-
 ...seMethodWithMatchingTypeAndSkipSettersTest.java |   15 +-
 .../bean/BeanComponentMissingParenthesisTest.java  |   12 +-
 .../camel/component/bean/BeanConcurrentTest.java   |    5 +-
 .../BeanExchangeAsReturnTypeNotAllowedTest.java    |    4 +-
 .../bean/BeanExplicitMethodAmbiguousTest.java      |    6 +-
 .../component/bean/BeanExplicitMethodTest.java     |    4 +-
 .../bean/BeanExpressionConcurrentTest.java         |    5 +-
 .../bean/BeanHandlerMethodPredicateTest.java       |    6 +-
 .../component/bean/BeanHandlerMethodTest.java      |    2 +-
 .../component/bean/BeanImplicitMethodTest.java     |    2 +-
 .../camel/component/bean/BeanInPipelineTest.java   |    5 +-
 .../bean/BeanInfoAMoreComplexOverloadedTest.java   |    2 +-
 .../component/bean/BeanInfoInheritanceTest.java    |    2 -
 .../component/bean/BeanInfoSelectMethodTest.java   |    2 -
 .../camel/component/bean/BeanInvokeAsyncTest.java  |   13 +-
 .../BeanInvokeSimpleOgnlToStringMethodTest.java    |    4 +-
 .../bean/BeanInvokeSingleMethodNoBodyTest.java     |    6 +-
 .../camel/component/bean/BeanInvokeStaticTest.java |    2 +-
 .../camel/component/bean/BeanInvokeTest.java       |    2 +-
 .../bean/BeanInvokeToStringMethodTest.java         |    4 +-
 .../camel/component/bean/BeanLifecycleTest.java    |   14 +-
 .../camel/component/bean/BeanMapPutTest.java       |    3 +-
 .../bean/BeanMethodNameHeaderIssueTest.java        |   11 +-
 .../bean/BeanMethodValueWithCommaTest.java         |   16 +-
 .../bean/BeanMethodValueWithExchangeTest.java      |    8 +-
 ...rameterAndNoMethodWithNoParameterIssueTest.java |    8 +-
 .../bean/BeanMethodWithStringParameterTest.java    |   10 +-
 .../camel/component/bean/BeanNoCacheTest.java      |    4 +-
 .../bean/BeanNoTypeConvertionPossibleTest.java     |    3 +-
 ...BeanNoTypeConvertionPossibleWhenHeaderTest.java |    7 +-
 .../BeanOgnlBodyMethodReturnNullValueTest.java     |    3 +-
 .../component/bean/BeanOgnlPerformanceTest.java    |   17 +-
 .../component/bean/BeanOnglStaticMethodTest.java   |    4 +-
 .../bean/BeanOverloadedCovariantMethodTest.java    |   46 +-
 .../bean/BeanOverloadedMethodFQNTest.java          |   24 +-
 .../BeanOverloadedMethodParameterValueTest.java    |   34 +-
 .../component/bean/BeanOverloadedMethodTest.java   |   45 +-
 .../bean/BeanPackageScopeOutsideTest.java          |    4 +-
 .../camel/component/bean/BeanPackageScopeTest.java |    4 +-
 .../BeanParameterBindingStreamCachingTest.java     |    7 +-
 .../bean/BeanParameterInvalidSyntaxTest.java       |    3 +-
 .../bean/BeanParameterInvalidValueTest.java        |   16 +-
 .../BeanParameterMethodCallThreeBodyOgnlTest.java  |    6 +-
 .../bean/BeanParameterNoBeanBindingTest.java       |    4 +-
 .../bean/BeanParameterThreeBodyOgnlTest.java       |    4 +-
 .../component/bean/BeanParameterValueOgnlTest.java |   13 +-
 .../bean/BeanParameterValueOverloadedTest.java     |    8 +-
 .../component/bean/BeanParameterValueTest.java     |   32 +-
 .../camel/component/bean/BeanPerformanceTest.java  |    3 +-
 .../camel/component/bean/BeanPipelineTest.java     |    4 +-
 .../BeanPrivateClassWithInterfaceMethodTest.java   |   11 +-
 .../component/bean/BeanPropagateHeaderTest.java    |    6 +-
 .../component/bean/BeanProxyNoBindingTest.java     |   13 +-
 .../apache/camel/component/bean/BeanProxyTest.java |   14 +-
 .../component/bean/BeanRefMethodNotFoundTest.java  |    2 +-
 .../camel/component/bean/BeanRefNoCacheTest.java   |    4 +-
 .../camel/component/bean/BeanRegistryBeanTest.java |    1 -
 .../bean/BeanReturnCallableReturnNullTest.java     |    5 +-
 .../component/bean/BeanReturnCallableTest.java     |    5 +-
 .../camel/component/bean/BeanReturnNullTest.java   |    3 +-
 .../bean/BeanWithAnnotationAndExchangeTest.java    |    5 +-
 .../bean/BeanWithAnnotationInheritedTest.java      |   51 +-
 .../BeanWithExchangeExceptionAnnotationTest.java   |   22 +-
 ...ngeExceptionAnnotationWrappedExceptionTest.java |    5 +-
 .../camel/component/bean/BeanWithHeaderTest.java   |    9 +-
 .../bean/BeanWithInputStreamBodyTest.java          |   20 +-
 .../component/bean/BeanWithMethodHeaderTest.java   |   19 +-
 ...thPropertiesAndHeadersAndBodyInjectionTest.java |    6 +-
 ...BeanWithXPathInjectionUsingHeaderValueTest.java |   12 +-
 .../BeanWithXPathInjectionUsingResultTypeTest.java |    3 +-
 .../apache/camel/component/bean/CamelCustomer.java |    1 +
 .../bean/CamelSimpleExpressionPerfTestRunner.java  |    4 +-
 .../ClassComponentInvalidConfigurationTest.java    |   10 +-
 ...entWithPropertiesLookupSetFromEndpointTest.java |    6 +-
 ...ComponentWithPropertiesSetFromEndpointTest.java |    6 +-
 .../bean/CustomParameterMappingStrategyTest.java   |    2 +-
 .../bean/FileBeanParameterBindingTest.java         |   14 +-
 .../bean/MethodCallBeanRefMethodNotFoundTest.java  |    2 +-
 .../bean/MethodCallBeanRefNotFoundTest.java        |    2 +-
 .../bean/MethodCallMissingParenthesisTest.java     |   12 +-
 .../bean/MethodCallRefOrBeanPrefixTest.java        |    8 +-
 .../component/bean/MethodCallStaticMethodTest.java |    6 +-
 .../component/bean/MyAuditServiceProxyTest.java    |    3 +-
 .../camel/component/bean/MyCurrencyBeanTest.java   |    8 +-
 .../apache/camel/component/bean/MyDummyBean.java   |    6 +-
 .../apache/camel/component/bean/MyPrefixBean.java  |    2 +-
 .../org/apache/camel/component/bean/MyService.java |    2 +-
 .../camel/component/bean/MyServiceProxyTest.java   |   15 +-
 .../bean/ProxyReturnFutureExceptionTest.java       |    4 +-
 .../component/bean/ProxyReturnFutureListTest.java  |   18 +-
 .../component/bean/ProxyReturnFutureTest.java      |    4 +-
 .../component/bean/RouteMethodCallStaticTest.java  |    7 +-
 .../SimpleLanguageBeanBodyParenthesisTest.java     |    7 +-
 ...nguageBeanFunctionMethodValueWithCommaTest.java |   34 +-
 ...BeanFunctionMethodValueWithParenthesisTest.java |   34 +-
 .../camel/component/bean/issues/BaseClass.java     |    3 +-
 .../bean/issues/BeanAbstractMethodIssueTest.java   |    3 +-
 .../issues/BeanInfoSingleMethodServiceTest.java    |    4 +-
 .../bean/issues/BeanRouteToDerivedClassTest.java   |   19 +-
 .../bean/issues/BeanThisAdviceWithIssueTest.java   |   18 +-
 .../issues/BeanVsProcessorPerformanceTest.java     |    6 +-
 .../issues/FilterBeanLanguageNonRegistryTest.java  |    4 +-
 .../bean/issues/FilterBeanNonRegistryTest.java     |   10 +-
 .../bean/issues/FilterBeanRegistryTest.java        |   10 +-
 .../component/bean/issues/FilterPojoIssueTest.java |    7 +-
 .../bean/issues/MyMessageToProcessorConverter.java |    2 +-
 .../component/bean/issues/PrivateClasses.java      |    2 +-
 .../bean/issues/TransformerIssueTest.java          |    4 +-
 .../camel/component/bean/pojomessage/Person.java   |    2 +-
 .../pojomessage/PojoProxyHelperOneWayTest.java     |   12 +-
 .../PojoProxyHelperRequestReplyTest.java           |    8 +-
 .../camel/component/browse/BrowseEndpointTest.java |    2 +-
 .../component/browse/BrowseRouteConsumeTest.java   |    2 +-
 .../camel/component/browse/BrowseRouteTest.java    |    2 +-
 .../apache/camel/component/browse/BrowseTest.java  |    2 +-
 .../ControlBusLanguageSimpleStartRouteTest.java    |    3 +-
 .../controlbus/ControlBusRestartRouteTest.java     |    3 +-
 .../controlbus/ControlBusStartRouteAsyncTest.java  |    3 +-
 .../controlbus/ControlBusStartRouteTest.java       |    7 +-
 .../camel/component/dataset/BigDataSetTest.java    |    3 +-
 .../component/dataset/DataSetConsumerTest.java     |   43 +-
 .../component/dataset/DataSetPreloadTest.java      |    2 +-
 .../component/dataset/DataSetProducerTest.java     |   95 +-
 .../camel/component/dataset/DataSetSedaTest.java   |    2 +-
 .../camel/component/dataset/DataSetTest.java       |    3 +-
 .../component/dataset/DataSetTestAnyOrderTest.java |    3 +-
 .../component/dataset/DataSetTestEndpointTest.java |    3 +-
 .../dataset/DataSetTestFileSplitTest.java          |    3 +-
 .../component/dataset/DataSetTestFileTest.java     |    3 +-
 .../component/dataset/DataSetTestSedaTest.java     |    3 +-
 .../component/dataset/FileDataSetConsumerTest.java |    7 +-
 .../dataset/FileDataSetConsumerWithSplitTest.java  |    7 +-
 .../component/dataset/FileDataSetProducerTest.java |    3 +-
 .../dataset/FileDataSetProducerWithSplitTest.java  |    3 +-
 .../component/dataset/ListDataSetConsumerTest.java |    7 +-
 .../component/dataset/ListDataSetProducerTest.java |    3 +-
 .../component/dataset/RoutePerformanceTest.java    |   11 +-
 .../component/direct/DirectNoConsumerTest.java     |    2 +-
 .../direct/DirectNoMultipleConsumersTest.java      |    2 +-
 .../direct/DirectProducerBlockingTest.java         |    3 +-
 .../camel/component/direct/DirectQueueTest.java    |    2 +-
 .../direct/DirectShouldUseSameThreadTest.java      |    2 +-
 .../SendToNonExistingDirectEndpointTest.java       |    6 +-
 ...SendingToAlotOfDifferentDirectEndpointTest.java |    3 +-
 .../direct/TwoCamelContextDirectEndpointTest.java  |    1 +
 .../directvm/DirectVmConsumerExpressionTest.java   |   16 +-
 .../directvm/DirectVmHeaderFilterStrategyTest.java |   34 +-
 ...DirectVmNoPropertyPropagationComponentTest.java |   21 +-
 .../DirectVmNoPropertyPropagationTest.java         |   30 +-
 .../directvm/DirectVmProducerBlockingTest.java     |    3 +-
 .../directvm/DirectVmShouldUseSameThreadTest.java  |    2 +-
 .../DirectVmTwoCamelContextAdviceWithTest.java     |   10 +-
 ...rectVmTwoCamelContextDuplicateConsumerTest.java |   14 +-
 .../directvm/DirectVmTwoCamelContextTest.java      |   12 +-
 .../extension/verifier/ComponentVerifierTest.java  |    5 +-
 .../file/AntPathMatcherGenericFileFilterTest.java  |   29 +-
 .../camel/component/file/BeanToFileTest.java       |    5 +-
 .../file/ConsumerTemplateFileShutdownTest.java     |    8 +-
 .../component/file/DirectoryCreateIssueTest.java   |   12 +-
 .../file/FileAbsoluteAndRelativeConsumerTest.java  |    1 +
 .../component/file/FileAbsolutePathIssueTest.java  |    1 +
 .../file/FileBatchConsumerMemoryLeakTest.java      |   36 +-
 .../file/FileBeginFailureOneTimeTest.java          |   25 +-
 .../component/file/FileBrowsableEndpointTest.java  |    6 +-
 .../FileConcurrentWriteAppendSameFileTest.java     |   12 +-
 .../camel/component/file/FileConfigureTest.java    |   28 +-
 .../FileConsumeAlterFileNameHeaderIssueTest.java   |   25 +-
 .../file/FileConsumeBackoffMultiplierTest.java     |    4 +-
 .../component/file/FileConsumeCharsetTest.java     |    5 +-
 .../file/FileConsumeDoneFileIssueTest.java         |   24 +-
 ...eConsumeDynamicDoneFileNameWithTwoDotsTest.java |    4 +-
 .../file/FileConsumeFilesAndDeleteTest.java        |    4 +-
 .../file/FileConsumeMaxMessagesPerPollTest.java    |    7 +-
 .../file/FileConsumeMoveRelativeNameTest.java      |    7 +-
 .../file/FileConsumeMultipleDirectoriesTest.java   |   15 +-
 .../file/FileConsumeNoopIdempotentAutoTest.java    |    2 +-
 .../FileConsumeNoopIdempotentDisabledTest.java     |    1 +
 .../file/FileConsumeNoopIdempotentEnabledTest.java |    3 +-
 .../FileConsumeNotEagerMaxMessagesPerPollTest.java |    9 +-
 .../file/FileConsumePollEnrichFileTest.java        |    9 +-
 ...ileConsumePollEnrichFileUsingProcessorTest.java |   51 +-
 .../file/FileConsumeRootDirManualTest.java         |    4 +-
 .../file/FileConsumeRunLoggingLevelTest.java       |    4 +-
 ...ileConsumeSimpleAbsoluteMoveToAbsoluteTest.java |    6 +-
 ...ileConsumeSimpleAbsoluteMoveToRelativeTest.java |    6 +-
 ...ileConsumeSimpleRelativeMoveToAbsoluteTest.java |    6 +-
 ...ileConsumeSimpleRelativeMoveToRelativeTest.java |    4 +-
 .../file/FileConsumeSingleDirectoryOnlyTest.java   |    4 +-
 .../component/file/FileConsumeTemplateTest.java    |    1 +
 .../file/FileConsumeWithDollarInPathTest.java      |    1 +
 .../FileConsumerAbsolutePathDefaultMoveTest.java   |    3 +-
 .../file/FileConsumerAbsolutePathTest.java         |    3 +-
 ...leConsumerAbsolutePathWithAbsoluteMoveTest.java |    3 +-
 ...leConsumerAbsolutePathWithRelativeMoveTest.java |    3 +-
 ...ileConsumerAbsoluteRootPathDefaultMoveTest.java |    5 +-
 .../file/FileConsumerAutoCreateDirectoryTest.java  |    1 -
 .../component/file/FileConsumerBatchTest.java      |    6 +-
 ...BeginAndCommitExpressionRenameStrategyTest.java |   24 +-
 ...leConsumerBeginAndCommitRenameStrategyTest.java |   21 +-
 ...eConsumerBeginExpressionRenameStrategyTest.java |   21 +-
 .../file/FileConsumerBeginRenameStrategyTest.java  |   21 +-
 ...ileConsumerBridgeRouteExceptionHandlerTest.java |   17 +-
 ...nsumerCommitRenameAbsolutePathStrategyTest.java |    6 +-
 .../file/FileConsumerCommitRenameStrategyTest.java |    4 +-
 .../file/FileConsumerConsumedFileNameTest.java     |    1 +
 .../FileConsumerCustomExceptionHandlerTest.java    |   36 +-
 .../file/FileConsumerCustomSchedulerTest.java      |    4 +-
 .../file/FileConsumerDeleteAndFailureTest.java     |   19 +-
 .../file/FileConsumerDeleteAndMoveFailedTest.java  |   16 +-
 .../file/FileConsumerDirectoryFilterTest.java      |   20 +-
 ...erDirectoryMustExistBridgeErrorHandlerTest.java |    4 +-
 .../file/FileConsumerDirectoryNotMatchedTest.java  |   13 +-
 .../file/FileConsumerExcludeNameTest.java          |    3 +-
 .../file/FileConsumerExtendedAttributesTest.java   |   18 +-
 .../file/FileConsumerFailureHandledTest.java       |   16 +-
 .../file/FileConsumerFileExpressionTest.java       |   15 +-
 ...leConsumerFileExpressionThrowExceptionTest.java |    9 +-
 .../component/file/FileConsumerFileFilterTest.java |   12 +-
 .../file/FileConsumerFilterDirectoryTest.java      |   12 +-
 .../component/file/FileConsumerFilterFileTest.java |    5 +-
 ...FileConsumerIdempotentKeyChangedIssue2Test.java |   11 +-
 .../FileConsumerIdempotentKeyChangedIssueTest.java |    7 +-
 .../FileConsumerIdempotentKeyNameAndSizeTest.java  |    5 +-
 .../file/FileConsumerIdempotentKeyTest.java        |    6 +-
 ...leConsumerIdempotentOnExceptionHandledTest.java |    8 +-
 .../file/FileConsumerIdempotentRefTest.java        |   13 +-
 .../component/file/FileConsumerIdempotentTest.java |   11 +-
 .../file/FileConsumerIdleMessageTest.java          |    8 +-
 .../FileConsumerIncludeAndExcludeNameTest.java     |    6 +-
 .../file/FileConsumerIncludeNameTest.java          |    6 +-
 .../file/FileConsumerInterceptEmptyFileTest.java   |    6 +-
 .../file/FileConsumerMoveAndMoveFailureTest.java   |   18 +-
 .../file/FileConsumerMoveExpressionTest.java       |   18 +-
 .../FileConsumerMoveFailureOnCompletionTest.java   |    4 +-
 .../file/FileConsumerMoveFailureTest.java          |   16 +-
 .../camel/component/file/FileConsumerNoopTest.java |    4 +-
 .../file/FileConsumerPathWithAmpersandTest.java    |    1 +
 .../file/FileConsumerPollStrategyNotBeginTest.java |    3 +-
 ...FileConsumerPollStrategyPolledMessagesTest.java |    6 +-
 ...umerPollStrategyRollbackThrowExceptionTest.java |    3 +-
 ...FileConsumerPollStrategyStopOnRollbackTest.java |    4 +-
 .../file/FileConsumerPollStrategyTest.java         |    3 +-
 ...rPreMoveCopyAndDeleteOnRenameFailFalseTest.java |    3 +-
 .../file/FileConsumerPreMoveDeleteTest.java        |    5 +-
 .../file/FileConsumerPreMoveIssueTest.java         |    6 +-
 .../file/FileConsumerPreMoveLastModifiedTest.java  |    7 +-
 .../file/FileConsumerPreMoveNoopTest.java          |    5 +-
 .../component/file/FileConsumerPreMoveTest.java    |    5 +-
 ...ileConsumerPreMoveWithProbeContentTypeTest.java |    4 +-
 .../file/FileConsumerProducerRouteTest.java        |    3 +-
 .../file/FileConsumerRelativeFileNameTest.java     |   11 +-
 .../file/FileConsumerRestartNotLeakThreadTest.java |    4 +-
 .../file/FileConsumerSharedThreadPollTest.java     |   22 +-
 .../file/FileConsumerSkipDotFilesTest.java         |   10 +-
 .../file/FileConsumerSpringSchedulerTest.java      |    4 +-
 .../file/FileConsumerSuspendAndResumeTest.java     |    8 +-
 .../component/file/FileConsumerSuspendTest.java    |    6 +-
 .../component/file/FileConsumerTemplateTest.java   |    3 +-
 .../FileConsumerThreadsInProgressIssueTest.java    |    7 +-
 .../component/file/FileContentBasedRouterTest.java |   17 +-
 .../component/file/FileConvertBodyToUTF8Test.java  |    5 +-
 .../file/FileEagerDeleteTargetFileTest.java        |   10 +-
 .../file/FileExclusiveReadLockCopyTest.java        |    2 +-
 .../file/FileExclusiveReadManuelTest.java          |    8 +-
 .../file/FileExclusiveReadNoneStrategyTest.java    |    4 +-
 .../file/FileHeaderFileNameProducedTest.java       |   16 +-
 .../file/FileIdempotentReadSameFileAgainTest.java  |    5 +-
 .../component/file/FileKeepLastModifiedTest.java   |   13 +-
 .../camel/component/file/FileLanguageCBRTest.java  |    9 +-
 .../camel/component/file/FileMEPInOutTest.java     |    7 +-
 .../file/FileMarkerFileDeleteOldLockFilesTest.java |    4 +-
 ...eMarkerFileRecursiveDeleteOldLockFilesTest.java |    7 +-
 ...erFileRecursiveDoNotDeleteOldLockFilesTest.java |    5 +-
 ...cursiveFilterDeleteOldLockFilesIncludeTest.java |    5 +-
 ...rFileRecursiveFilterDeleteOldLockFilesTest.java |    7 +-
 .../file/FileMoveAndMoveFailedIssueTest.java       |    7 +-
 .../FileMoveErrorOnExceptionNotHandledTest.java    |   10 +-
 .../component/file/FileMulticastDeleteTest.java    |   19 +-
 .../camel/component/file/FileNoOpLockFileTest.java |   13 +-
 .../component/file/FilePollEnrichNoWaitTest.java   |   13 +-
 .../camel/component/file/FilePollEnrichTest.java   |   13 +-
 .../component/file/FilePollingConsumerTest.java    |   12 +-
 .../component/file/FileProduceAppendCharsTest.java |    6 +-
 .../component/file/FileProduceAppendTest.java      |    7 +-
 .../file/FileProduceOverruleExpressionTest.java    |    6 +-
 .../file/FileProduceOverruleOnlyOnceTest.java      |    7 +-
 .../component/file/FileProduceOverruleTest.java    |    6 +-
 .../file/FileProduceTempFileNameTest.java          |    9 +-
 .../component/file/FileProduceTempPrefixTest.java  |    9 +-
 ...ProducerAllowNullBodyFileAlreadyExistsTest.java |   23 +-
 .../file/FileProducerAllowNullBodyTest.java        |   12 +-
 .../file/FileProducerCharsetUTFOptimizedTest.java  |    1 +
 .../FileProducerCharsetUTFtoISOConfiguredTest.java |    4 +-
 ...leProducerCharsetUTFtoISOConvertBodyToTest.java |    5 +-
 .../file/FileProducerCharsetUTFtoISOTest.java      |    4 +-
 .../file/FileProducerCharsetUTFtoUTFTest.java      |    4 +-
 .../file/FileProducerChmodOptionTest.java          |   21 +-
 .../file/FileProducerDirectoryChmodOptionTest.java |   13 +-
 .../component/file/FileProducerExpressionTest.java |   10 +-
 .../file/FileProducerFileBodyGetsMovedTest.java    |    5 +-
 ...ileProducerFileExistAppendNoFileBeforeTest.java |    6 +-
 .../file/FileProducerFileExistAppendTest.java      |    6 +-
 .../file/FileProducerFileExistFailTest.java        |    3 +-
 .../file/FileProducerFileExistIgnoreTest.java      |    3 +-
 ...eProducerFileExistOverrideNoFileBeforeTest.java |    3 +-
 .../file/FileProducerFileExistOverrideTest.java    |    4 +-
 .../file/FileProducerFileExistTryRenameTest.java   |    6 +-
 .../file/FileProducerFilenameConstantTest.java     |    1 +
 .../FileProducerJailStartingDirectoryTest.java     |    5 +-
 .../file/FileProducerMoveExistingStrategyTest.java |   40 +-
 .../file/FileProducerMoveExistingTest.java         |   37 +-
 .../file/FileProducerNoForcedWritesTest.java       |    7 +-
 .../file/FileProducerRenameUsingCopyTest.java      |    3 +-
 .../component/file/FileProducerStreamTest.java     |    4 +-
 .../file/FileProducerTempFileExistsIssueTest.java  |    1 +
 .../file/FileProducerToDMoveExistingTest.java      |    4 +-
 .../component/file/FileRecursiveDepthTest.java     |   13 +-
 .../component/file/FileRecursiveNoopTest.java      |    5 +-
 .../file/FileRenameFileOnCommitIssueTest.java      |   11 +-
 .../FileRenameReadLockMustUseMarkerFileTest.java   |   24 +-
 .../file/FileRouteOnDosWithNoVolTest.java          |   11 +-
 .../component/file/FileSortByExpressionTest.java   |   15 +-
 .../file/FileSortByIgnoreCaseExpressionTest.java   |   21 +-
 .../file/FileSortByNestedExpressionTest.java       |   21 +-
 .../camel/component/file/FileSorterRefTest.java    |   14 +-
 .../camel/component/file/FileSplitInSplitTest.java |   32 +-
 .../component/file/FileSplitXPathCharsetTest.java  |   12 +-
 .../component/file/FileToFileNioLowBufferTest.java |    4 +-
 .../component/file/FileToFileWithFlattenTest.java  |    7 +-
 .../camel/component/file/FileURLDecodingTest.java  |   31 +-
 .../file/FilerConsumerDoneFileNameDeleteTest.java  |    4 +-
 .../file/FilerConsumerDoneFileNamePrefixTest.java  |    4 +-
 .../FilerConsumerDoneFileNameSimplePrefixTest.java |    7 +-
 .../file/FilerConsumerDoneFileNameSuffixTest.java  |    4 +-
 .../file/FilerConsumerDoneFileNameTest.java        |    4 +-
 .../file/FilerConsumerDoneFileNoopTest.java        |    4 +-
 .../file/FilerConsumerDualDoneFileNameTest.java    |    1 +
 .../FilerConsumerMoveFailedDoneFileNameTest.java   |    5 +-
 .../file/FilerConsumerPreMoveDoneFileNameTest.java |    4 +-
 .../file/FilerConsumerRetryDoneFileNameTest.java   |   28 +-
 .../FilerConsumerShouldSkipDoneFilePrefixTest.java |    8 +-
 .../FilerConsumerShouldSkipDoneFileSuffixTest.java |    8 +-
 .../file/FilerConsumerShouldSkipDoneFileTest.java  |    8 +-
 .../component/file/FilerProducerAbsoluteTest.java  |    3 +-
 .../file/FilerProducerDoneFileNameRouteTest.java   |    5 +-
 .../component/file/FilerProducerFileNamesTest.java |    4 +-
 .../FromFileDoNotDeleteFileIfProcessFailsTest.java |    8 +-
 .../FromFileDoNotMoveFileIfProcessFailsTest.java   |   10 +-
 .../file/FromFileMoveDoneCustomHeaderTest.java     |    5 +-
 .../file/FromFileMoveFileIfProcessFailsTest.java   |   16 +-
 .../file/FromFileMulticastToFilesTest.java         |   35 +-
 .../file/FromFilePollThirdTimeOkTest.java          |   26 +-
 .../component/file/GenericFileConverterTest.java   |   38 +-
 .../component/file/GenericFileMessageTest.java     |    4 +-
 ...kerFileExclusiveReadLockStrategyUnlockTest.java |    4 +-
 .../camel/component/file/NewFileConsumeTest.java   |    3 +-
 .../camel/component/file/NewFileConsumerTest.java  |    1 +
 .../camel/component/file/ToFileRouteTest.java      |    6 +-
 .../camel/component/file/XPathToFileTest.java      |   11 +-
 .../FileLockClusteredRoutePolicyFactoryTest.java   |    5 +-
 .../cluster/FileLockClusteredRoutePolicyTest.java  |    5 +-
 .../FileChangedReadLockLoggingLevelTest.java       |    6 +-
 .../FileChangedReadLockMarkerFileFalseTest.java    |    4 +-
 .../FileChangedReadLockMinAgeShortCircuitTest.java |    3 +-
 .../strategy/FileChangedReadLockMinAgeTest.java    |    3 +-
 .../file/strategy/FileChangedReadLockTest.java     |    4 +-
 .../strategy/FileChangedReadLockTimeoutTest.java   |    6 +-
 .../FileChangedReadLockZeroTimeoutTest.java        |   17 +-
 .../FileChangedZeroLengthReadLockTest.java         |    5 +-
 .../FileIdempotentChangedReadLockTest.java         |    3 +-
 .../FileIdempotentReadLockDelayedAsyncTest.java    |    7 +-
 .../FileIdempotentReadLockDelayedTest.java         |    7 +-
 .../file/strategy/FileIdempotentReadLockTest.java  |   22 +-
 .../strategy/FileIdempotentRenameReadLockTest.java |    3 +-
 .../GenericFileDeleteProcessStrategyTest.java      |    5 +-
 .../MarkerFileExclusiveReadLockStrategyTest.java   |   16 +-
 .../file/stress/FileAsyncStressFileDropper.java    |    9 +-
 .../file/stress/FileAsyncStressManually.java       |   21 +-
 .../FileAsyncStressReadLockLockFileTest.java       |   23 +-
 .../stress/FileAsyncStressReadLockNoneTest.java    |   23 +-
 .../stress/FileAsyncStressReadLockRenameTest.java  |   23 +-
 .../component/file/stress/FileAsyncStressTest.java |   24 +-
 .../file/stress/FileConsumerPollManyFilesTest.java |    5 +-
 .../FileProducerAppendManyMessagesFastTest.java    |   54 +-
 .../stress/FileProducerAppendManyMessagesTest.java |    9 +-
 .../language/LanguageCacheScriptTest.java          |    4 +-
 .../LanguageLoadScriptFromClasspathHeaderTest.java |    7 +-
 .../LanguageLoadScriptFromClasspathTest.java       |    3 +-
 .../LanguageLoadScriptFromFileUpdateTest.java      |    7 +-
 .../language/LanguageNoCacheScriptTest.java        |    4 +-
 ...guageResourceLoadConstantFromClasspathTest.java |    4 +-
 ...anguageResourceLoadScriptFromClasspathTest.java |    3 +-
 .../language/LanguageRouteNoTransformTest.java     |    4 +-
 .../camel/component/log/ConsumingAppender.java     |   19 +-
 .../log/DefaultExchangeFormatterTest.java          |    9 +-
 .../component/log/LogBodyWithNewLineTest.java      |   18 +-
 .../component/log/LogCustomFormatterTest.java      |   39 +-
 .../camel/component/log/LogCustomLoggerTest.java   |   33 +-
 .../component/log/LogEndpointOptionsTest.java      |    3 +-
 .../camel/component/log/LogEndpointTest.java       |    7 +-
 .../camel/component/log/LogInputStreamTest.java    |   16 +-
 .../apache/camel/component/log/LogMaskTest.java    |    1 +
 .../camel/component/log/ThroughputLoggerTest.java  |    6 +-
 .../camel/component/mock/MockAsBeanTest.java       |   12 +-
 .../camel/component/mock/MockEndpointTest.java     |   62 +-
 .../component/mock/MockEndpointTimeClauseTest.java |    2 +-
 .../mock/MockEndpointWithParametersTest.java       |    3 +-
 .../component/mock/MockStreamCachingTest.java      |    4 +-
 .../apache/camel/component/mock/MockXpathTest.java |    6 +-
 .../ComponentResolvePropertyPlaceholdersTest.java  |    5 +-
 .../OptionalPropertiesDslInvalidSyntaxTest.java    |    8 +-
 .../properties/OptionalPropertiesDslTest.java      |    9 +-
 ...opertiesComponentConcatenatePropertiesTest.java |    1 +
 .../PropertiesComponentDefaultFunctionsTest.java   |    9 +-
 .../PropertiesComponentDisableDefaultsTest.java    |    6 +-
 ...pertiesComponentEIPChoiceConvertBodyToTest.java |   10 +-
 .../PropertiesComponentEIPChoiceSimpleTest.java    |    9 +-
 .../PropertiesComponentEIPConvertBodyToTest.java   |    6 +-
 .../PropertiesComponentEIPRoutingSlipTest.java     |    5 +-
 .../PropertiesComponentEncodingTest.java           |    4 +-
 .../PropertiesComponentEndpointMandatoryTest.java  |    6 +-
 .../PropertiesComponentEndpointTest.java           |    6 +-
 .../PropertiesComponentFunctionTest.java           |    5 +-
 .../PropertiesComponentGetOrElseTest.java          |    7 +-
 .../PropertiesComponentInitialPropertiesTest.java  |    7 +-
 .../PropertiesComponentInterceptFromTest.java      |   11 +-
 ...ponentLoadPropertiesFromFileTrimValuesTest.java |    3 +-
 .../PropertiesComponentNestPropertiesTest.java     |   17 +-
 ...ertiesComponentOnExceptionDelayPatternTest.java |   13 +-
 .../PropertiesComponentOnExceptionTest.java        |   12 +-
 ...ropertiesComponentOnlyUseDefaultValuesTest.java |   12 +-
 .../PropertiesComponentOverridePropertiesTest.java |    6 +-
 .../PropertiesComponentPropertiesSourceTest.java   |   10 +-
 .../properties/PropertiesComponentRefTest.java     |    4 +-
 .../PropertiesComponentRegistryTest.java           |    4 +-
 .../PropertiesComponentServiceHostPortTest.java    |   10 +-
 .../PropertiesComponentServiceHostTest.java        |   10 +-
 .../PropertiesComponentServicePortTest.java        |   10 +-
 .../properties/PropertiesComponentServiceTest.java |   10 +-
 .../PropertiesComponentSetHeaderSimpleTest.java    |    8 +-
 .../PropertiesComponentSimpleLanguageTest.java     |    8 +-
 ...rtiesComponentSomethingElseBoundToJndiTest.java |    3 +-
 .../properties/PropertiesComponentTest.java        |   13 +-
 .../PropertiesEnvironmentVariableOverrideTest.java |    6 +-
 .../properties/PropertiesRouteFromTest.java        |    5 +-
 .../properties/PropertiesRouteIdTest.java          |    3 +-
 .../properties/XPathPropertyPlaceholderTest.java   |   21 +-
 .../camel/component/ref/RefFileEndpointTest.java   |    2 +-
 .../component/rest/DummyRestConsumerFactory.java   |   12 +-
 .../component/rest/DummyRestProcessorFactory.java  |    5 +-
 .../component/rest/FromRestAdviceWithTest.java     |    9 +-
 .../camel/component/rest/FromRestApiTest.java      |    3 +-
 .../component/rest/FromRestConfigurationTest.java  |   13 +-
 .../component/rest/FromRestDefaultValueTest.java   |   10 +-
 .../component/rest/FromRestDuplicateTest.java      |   13 +-
 .../rest/FromRestExplicitComponentTest.java        |   35 +-
 .../component/rest/FromRestGetContentTypeTest.java |    3 +-
 .../rest/FromRestGetCorsAllowCredentialsTest.java  |   19 +-
 .../component/rest/FromRestGetCorsCustomTest.java  |   16 +-
 .../camel/component/rest/FromRestGetCorsTest.java  |   16 +-
 .../rest/FromRestGetEmbeddedRouteTest.java         |   18 +-
 .../component/rest/FromRestGetEndPathTest.java     |   16 +-
 .../rest/FromRestGetHttpErrorCodeTest.java         |   11 +-
 .../component/rest/FromRestGetInterceptTest.java   |    6 +-
 .../component/rest/FromRestGetOnExceptionTest.java |    5 +-
 .../component/rest/FromRestGetPolicyTest.java      |    3 +-
 .../rest/FromRestGetRouteOnExceptionTest.java      |    7 +-
 .../camel/component/rest/FromRestGetTest.java      |   38 +-
 .../rest/FromRestIdAndDescriptionTest.java         |   29 +-
 .../component/rest/FromRestUriPrefixTest.java      |   17 +-
 .../camel/component/rest/RestComponentTest.java    |    6 +-
 .../rest/RestComponentVerifierExtensionTest.java   |   45 +-
 .../component/rest/RestComponentVerifierTest.java  |   45 +-
 .../camel/component/rest/RestEndpointTest.java     |   19 +-
 .../rest/RestProducerBindingProcessorTest.java     |   12 +-
 .../camel/component/rest/RestProducerTest.java     |   12 +-
 .../camel/component/saga/SagaComponentTest.java    |   32 +-
 .../scheduler/SchedulerNoPolledMessagesTest.java   |   18 +-
 .../component/scheduler/SchedulerRouteTest.java    |    4 +-
 .../TwoSchedulerConcurrentTasksOneRouteTest.java   |   24 +-
 .../scheduler/TwoSchedulerConcurrentTasksTest.java |    8 +-
 .../component/scheduler/TwoSchedulerTest.java      |    6 +-
 .../seda/DirectRequestReplyAndSedaInOnlyTest.java  |    5 +-
 .../seda/FileSedaShutdownCompleteAllTasksTest.java |   35 +-
 ...meSedaQueueMultipleConsumersDifferenceTest.java |    3 +-
 .../seda/SameSedaQueueSizeAndNoSizeTest.java       |    7 +-
 .../component/seda/SedaAsyncProducerTest.java      |   25 +-
 .../SedaBlockWhenFullInvalidConfigurationTest.java |    3 +-
 .../component/seda/SedaBlockWhenFullTest.java      |   11 +-
 .../seda/SedaComponentReferenceEndpointTest.java   |    4 +-
 .../seda/SedaConcurrentConsumersNPEIssueTest.java  |    8 +-
 .../camel/component/seda/SedaConcurrentTest.java   |   11 +-
 .../camel/component/seda/SedaConfigureTest.java    |    1 -
 .../seda/SedaConsumerSuspendResumeTest.java        |   16 +-
 .../seda/SedaDefaultBlockWhenFullTest.java         |    6 +-
 .../camel/component/seda/SedaEndpointTest.java     |   22 +-
 .../apache/camel/component/seda/SedaErrorTest.java |    4 +-
 .../camel/component/seda/SedaFromRouteIdTest.java  |   10 +-
 .../component/seda/SedaInOnlyChainedTest.java      |    2 +-
 .../component/seda/SedaInOutBigChainedTest.java    |    2 +-
 .../seda/SedaInOutChainedTimeoutTest.java          |   13 +-
 .../seda/SedaInOutChainedWithOnCompletionTest.java |    5 +-
 .../apache/camel/component/seda/SedaInOutTest.java |    2 +-
 .../SedaInOutWithErrorDeadLetterChannelTest.java   |    6 +-
 .../component/seda/SedaInOutWithErrorTest.java     |    6 +-
 .../component/seda/SedaMultipleConsumersTest.java  |   21 +-
 .../camel/component/seda/SedaNoConsumerTest.java   |    4 -
 .../component/seda/SedaPurgeWhenStoppingTest.java  |   16 +-
 .../apache/camel/component/seda/SedaQueueTest.java |    4 +-
 .../seda/SedaRemoveRouteThenAddAgainTest.java      |    2 +-
 .../apache/camel/component/seda/SedaRouteTest.java |    3 +-
 .../seda/SedaShouldNotUseSameThreadTest.java       |    2 +-
 .../camel/component/seda/SedaSimpleSizeTest.java   |    4 +-
 .../seda/SedaSuspendConsumerStopRouteTest.java     |    3 +-
 .../component/seda/SedaTimeoutDisabledTest.java    |    2 +-
 .../camel/component/seda/SedaTimeoutTest.java      |    6 +-
 .../camel/component/seda/SedaUnitOfWorkTest.java   |   46 +-
 .../seda/SedaWaitForTaskAsPropertyTest.java        |    5 +-
 .../SedaWaitForTaskCompleteOnCompletionTest.java   |   55 +-
 .../seda/SedaWaitForTaskCompleteTest.java          |    5 +-
 .../seda/SedaWaitForTaskIfReplyExpectedTest.java   |    5 +-
 .../seda/SedaWaitForTaskNewerOnCompletionTest.java |   56 +-
 .../component/seda/SedaWaitForTaskNewerTest.java   |    2 +-
 .../camel/component/seda/TracingWithDelayTest.java |   14 +-
 .../camel/component/stub/StubConsumerTest.java     |   15 +-
 .../camel/component/stub/StubInOnlyTest.java       |    4 +-
 .../apache/camel/component/stub/StubInOutTest.java |    4 +-
 .../org/apache/camel/component/stub/StubTest.java  |   12 +-
 .../camel/component/timer/TimerAsyncTest.java      |   17 +-
 .../camel/component/timer/TimerDelayTest.java      |    2 +-
 .../component/timer/TimerGracefulShutdownTest.java |    6 +-
 .../timer/TimerMultipleConsumerStopRouteTest.java  |    2 +-
 .../component/timer/TimerMultipleConsumerTest.java |    2 +-
 .../camel/component/timer/TimerNameTest.java       |    3 +-
 .../component/timer/TimerNegativeDelayTest.java    |    4 +-
 .../timer/TimerNegativeNoRepeatCountDelayTest.java |    2 +-
 .../timer/TimerReferenceConfigurationTest.java     |   26 +-
 .../component/timer/TimerRepeatCountTest.java      |    3 +-
 .../camel/component/timer/TimerRestartTest.java    |    2 +-
 .../camel/component/timer/TimerRouteTest.java      |    4 +-
 .../timer/TimerSuspendCamelContextTest.java        |    2 +-
 .../validator/CustomSchemaFactoryFeatureTest.java  |    5 +-
 .../validator/FileValidatorRouteTest.java          |   21 +-
 .../component/validator/ValidatorBeanCallTest.java |   15 +-
 .../validator/ValidatorDtdAccessAbstractTest.java  |   27 +-
 .../validator/ValidatorDtdAccessOffTest.java       |   10 +-
 .../validator/ValidatorDtdAccessOnTest.java        |   23 +-
 .../validator/ValidatorIllegalImportTest.java      |   40 +-
 .../ValidatorIncludeEncodingRouteTest.java         |   23 +-
 .../ValidatorIncludeRelativeRouteTest.java         |   32 +-
 .../validator/ValidatorIncludeRouteTest.java       |   62 +-
 .../validator/ValidatorLazyStartProducerTest.java  |    8 +-
 .../ValidatorResourceResolverFactoryTest.java      |    1 -
 .../component/validator/ValidatorRootPathTest.java |   13 +-
 .../component/validator/ValidatorRouteTest.java    |   71 +-
 .../ValidatorWithResourceResolverRouteTest.java    |   25 +-
 .../camel/component/vm/AbstractVmTestSupport.java  |   12 +-
 .../component/vm/SameVmQueueSizeAndNoSizeTest.java |    7 +-
 .../apache/camel/component/vm/VMSplitterTest.java  |    8 +-
 .../vm/VmComponentReferenceEndpointTest.java       |    4 +-
 .../component/vm/VmConcurrentConsumersTest.java    |    4 +-
 ...mDifferentOptionsOnConsumerAndProducerTest.java |   13 +-
 .../camel/component/vm/VmInOnlyChainedTest.java    |    4 +-
 .../apache/camel/component/vm/VmInOnlyTest.java    |    4 +-
 .../camel/component/vm/VmInOutChainedTest.java     |    4 +-
 .../component/vm/VmInOutChainedTimeoutTest.java    |   21 +-
 .../org/apache/camel/component/vm/VmInOutTest.java |    4 +-
 .../camel/component/vm/VmInOutWithErrorTest.java   |    8 +-
 .../component/vm/VmMultipleConsumersIssueTest.java |   12 +-
 .../vm/VmMultipleConsumersKeepRouteTest.java       |    4 +-
 .../vm/VmMultipleConsumersMultipleContextTest.java |   13 +-
 .../vm/VmMultipleConsumersRemoteRouteTest.java     |    7 +-
 .../vm/VmMultipleContextsStartStopTest.java        |   14 +-
 .../component/vm/VmShouldNotUseSameThreadTest.java |    2 +-
 .../component/vm/VmShouldUseConsumerContext.java   |    8 +-
 .../camel/component/vm/VmTimeoutIssueTest.java     |   25 +-
 .../camel/component/vm/VmUseSameQueueTest.java     |    4 +-
 .../component/vm/VmWaitForTaskCompleteTest.java    |    7 +-
 .../vm/VmWaitForTaskIfReplyExpectedTest.java       |    7 +-
 .../camel/component/vm/VmWaitForTaskNewerTest.java |    4 +-
 .../org/apache/camel/component/xslt/MyEcho.java    |    2 +-
 .../org/apache/camel/component/xslt/MyXPath.java   |    4 +-
 .../camel/component/xslt/SAXSourceLogBodyTest.java |   28 +-
 .../xslt/XsltCustomizeEntityResolverTest.java      |    5 +-
 .../xslt/XsltCustomizeURIResolverTest.java         |    3 +-
 .../apache/camel/component/xslt/XsltDTDTest.java   |   32 +-
 .../camel/component/xslt/XsltFeatureRouteTest.java |   15 +-
 .../component/xslt/XsltFromFileExceptionTest.java  |   11 +-
 .../XsltIncludeClasspathDotInDirectoryTest.java    |   12 +-
 .../component/xslt/XsltIncludeClasspathTest.java   |    8 +-
 .../xslt/XsltIncludeRelativeFileSchemeTest.java    |    6 +-
 .../xslt/XsltIncludeRelativeNestedTest.java        |    6 +-
 .../xslt/XsltIncludeRelativeOtherTest.java         |    8 +-
 .../component/xslt/XsltIncludeRelativeTest.java    |    6 +-
 .../camel/component/xslt/XsltIncludeTest.java      |    4 +-
 .../component/xslt/XsltMessageTerminateTest.java   |    7 +-
 .../camel/component/xslt/XsltOutputBytesTest.java  |    4 +-
 .../camel/component/xslt/XsltOutputDOMTest.java    |    4 +-
 .../component/xslt/XsltOutputFileDeleteTest.java   |    6 +-
 .../camel/component/xslt/XsltOutputFileTest.java   |    4 +-
 .../camel/component/xslt/XsltOutputStringTest.java |    4 +-
 .../component/xslt/XsltRouteAllowStAXTest.java     |    6 +-
 .../camel/component/xslt/XsltRouteFileTest.java    |    6 +-
 .../apache/camel/component/xslt/XsltRouteTest.java |   22 +-
 .../component/xslt/XsltRouteXsltWithErrorTest.java |    6 +-
 .../xslt/XsltTransformingExceptionTest.java        |    4 +-
 .../camel/converter/CollectionConverterTest.java   |    6 +-
 .../camel/converter/ConverterBenchmarkTest.java    |   31 +-
 .../org/apache/camel/converter/ConverterTest.java  |   15 +-
 .../camel/converter/DateTimeConverterTest.java     |    4 +-
 .../apache/camel/converter/IOConverterTest.java    |   12 +-
 .../java/org/apache/camel/converter/JaxpTest.java  |    7 +-
 .../apache/camel/converter/NIOConverterTest.java   |   11 +-
 .../camel/converter/ObjectConverterNaNTest.java    |    4 +-
 .../camel/converter/ObjectConverterTest.java       |   18 +-
 .../PropertyEditorTypeConverterIssueTest.java      |    6 +-
 .../converter/StaticFallbackConverterTest.java     |    2 +-
 .../apache/camel/converter/StringSourceTest.java   |    7 +-
 .../camel/converter/TimePatternConverterTest.java  |   20 +-
 .../converter/TimePatternTypeConversionTest.java   |    6 +-
 .../TimerDrivenTimePatternConverterTest.java       |   12 +-
 .../camel/converter/jaxp/DomConverterTest.java     |   10 +-
 .../camel/converter/jaxp/StAX2SAXSourceTest.java   |    3 +-
 .../camel/converter/jaxp/StaxConverterTest.java    |   28 +-
 .../camel/converter/jaxp/XmlConverterTest.java     |   28 +-
 .../InstanceMethodWithExchangeTestConverter.java   |    3 +-
 .../myconverter/StaticDummyFallbackConverter.java  |    2 +-
 .../stream/ByteArrayInputStreamCacheTest.java      |    2 +-
 .../converter/stream/CachedOutputStreamTest.java   |   49 +-
 .../converter/stream/FileInputStreamCacheTest.java |    2 +-
 .../converter/stream/InputStreamCacheTest.java     |    2 +-
 .../camel/converter/stream/ReaderCacheTest.java    |    2 +-
 .../camel/converter/stream/SourceCacheTest.java    |    2 +-
 .../converter/stream/StreamCacheConverterTest.java |   15 +-
 .../converter/stream/StreamSourceCacheTest.java    |    2 +-
 .../camel/impl/BeanInjectRouteBuilderTest.java     |   18 +-
 .../impl/BindToRegistryBeanPostProcessorTest.java  |    2 +-
 .../CamelContextAddRestDefinitionsFromXmlTest.java |    3 +-
 ...CamelContextAddRouteDefinitionsFromXmlTest.java |    1 +
 .../camel/impl/CamelContextDeadlockTest.java       |   17 +-
 .../CamelCustomDefaultThreadPoolProfileTest.java   |    4 +-
 .../camel/impl/CamelProduceInterfaceTest.java      |    6 +-
 .../camel/impl/ConsumerCacheZeroCapacityTest.java  |    7 +-
 .../impl/CustomHeadersMapFactoryRouteTest.java     |    3 +-
 .../org/apache/camel/impl/CustomIdFactoryTest.java |   30 +-
 .../camel/impl/CustomUnitOfWorkFactoryTest.java    |    4 +-
 .../DefaultAsyncProcessorAwaitManagerTest.java     |   11 +-
 ...melContextAllowUseOriginalMessageFalseTest.java |    5 +-
 ...amelContextAllowUseOriginalMessageTrueTest.java |    5 +-
 .../impl/DefaultCamelContextAutoStartupTest.java   |   13 +-
 .../impl/DefaultCamelContextResolverTest.java      |   19 +-
 .../camel/impl/DefaultCamelContextRestartTest.java |    3 +-
 ...lContextSuspendResumeRouteStartupOrderTest.java |    2 +-
 .../DefaultCamelContextSuspendResumeRouteTest.java |    2 +-
 ...melContextWithLifecycleStrategyRestartTest.java |    3 +-
 .../camel/impl/DefaultClassResolverTest.java       |    6 +-
 .../DefaultComponentReferencePropertiesTest.java   |   12 +-
 .../apache/camel/impl/DefaultComponentTest.java    |   10 +-
 .../impl/DefaultComponentValidateURITest.java      |    5 +-
 .../camel/impl/DefaultConsumerCacheTest.java       |    5 +-
 .../camel/impl/DefaultConsumerTemplateTest.java    |    7 +-
 ...ConsumerTemplateWithCustomCacheMaxSizeTest.java |    5 +-
 .../camel/impl/DefaultEndpointRegistryTest.java    |    2 +-
 .../camel/impl/DefaultExchangeHolderTest.java      |    9 +-
 .../org/apache/camel/impl/DefaultExchangeTest.java |   18 +-
 .../impl/DefaultExecutorServiceManagerTest.java    |   13 +-
 .../camel/impl/DefaultHeadersMapFactoryTest.java   |    2 +-
 .../camel/impl/DefaultMessageHeaderTest.java       |    2 +-
 .../camel/impl/DefaultProducerCacheTest.java       |    4 +-
 .../impl/DefaultProducerTemplateAsyncTest.java     |   27 +-
 ...efaultProducerTemplateNonBlockingAsyncTest.java |    1 +
 .../camel/impl/DefaultProducerTemplateTest.java    |    6 +-
 ...ProducerTemplateWithCustomCacheMaxSizeTest.java |    3 +-
 .../apache/camel/impl/DefaultUnitOfWorkTest.java   |    6 +-
 .../camel/impl/DefaultUuidGeneratorTest.java       |    2 +-
 .../apache/camel/impl/DummyLifecycleStrategy.java  |    3 +-
 .../camel/impl/DurationRoutePolicyFactoryTest.java |    6 +-
 .../impl/DurationRoutePolicyMaxMessagesTest.java   |    3 +-
 .../impl/DurationRoutePolicyMaxSecondsTest.java    |    6 +-
 .../EndpointRegistryKeepRouteEndpointsTest.java    |    2 +-
 .../EventDrivenPollingConsumerQueueSizeTest.java   |    5 +-
 .../apache/camel/impl/ExpressionAdapterTest.java   |    4 +-
 .../apache/camel/impl/ExpressionSupportTest.java   |    2 +-
 .../impl/ExtendedStartupListenerComponentTest.java |    3 +-
 .../apache/camel/impl/FileStateRepositoryTest.java |    2 +-
 .../camel/impl/FromMultipleEndpointTest.java       |    2 +-
 .../GracefulShutdownNoAutoStartOrderClashTest.java |    2 +-
 .../impl/HashMapHeadersMapFactoryRouteTest.java    |    3 +-
 .../InflightRepositoryBrowseFromRouteTest.java     |   33 +-
 .../camel/impl/InflightRepositoryBrowseTest.java   |   33 +-
 .../apache/camel/impl/JavaUuidGeneratorTest.java   |    2 +-
 .../camel/impl/LogDebugBodyMaxCharsOffTest.java    |    4 +-
 .../camel/impl/LogDebugBodyMaxCharsTest.java       |    1 +
 .../apache/camel/impl/LogDebugBodyStreamsTest.java |    4 +-
 .../org/apache/camel/impl/MessageSupportTest.java  |    8 +-
 .../camel/impl/MockScheduledPollConsumer.java      |    5 +-
 .../camel/impl/MultipleConsumersSupportTest.java   |    3 +-
 .../camel/impl/MultipleLifecycleStrategyTest.java  |    9 +-
 ...ingExchangesAsyncDelayShutdownGracefulTest.java |    7 +-
 .../impl/PendingExchangesShutdownGracefulTest.java |    5 +-
 ...ndingExchangesTwoRouteShutdownGracefulTest.java |    5 +-
 .../impl/PojoProduceInterceptEndpointTest.java     |   12 +-
 .../PojoProduceProxyInterceptEndpointTest.java     |   12 +-
 .../camel/impl/ProducerCacheNonSingletonTest.java  |    2 +-
 .../org/apache/camel/impl/RefDataFormatTest.java   |   10 +-
 .../camel/impl/RemoveRouteStopEndpointTest.java    |   33 +-
 .../camel/impl/RouteDirectSuspendResumeTest.java   |    4 +-
 .../camel/impl/RouteIdRestDefinitionTest.java      |    7 +-
 .../impl/RouteMustHaveOutputOnExceptionTest.java   |   30 +-
 .../org/apache/camel/impl/RouteNoOutputTest.java   |    1 +
 .../apache/camel/impl/RoutePolicyCallbackTest.java |    3 +-
 .../apache/camel/impl/RoutePolicyFactoryTest.java  |    7 +-
 .../camel/impl/RoutePolicyRefCallbackTest.java     |    3 +-
 .../apache/camel/impl/RoutePolicySupportTest.java  |   30 +-
 .../org/apache/camel/impl/RoutePolicyTest.java     |    6 +-
 .../org/apache/camel/impl/RouteRemoveTest.java     |   11 +-
 .../apache/camel/impl/RouteSedaStopStartTest.java  |    6 +-
 .../camel/impl/RouteSedaSuspendResumeTest.java     |    6 +-
 .../camel/impl/RouteSetRouteIdTwoTimesTest.java    |    4 +-
 .../impl/RouteWithMistypedComponentNameTest.java   |    1 -
 .../camel/impl/RuntimeEndpointRegistryTest.java    |   11 +-
 .../camel/impl/ScheduledPollConsumerTest.java      |    7 +-
 .../ShutdownGracefulNoAutoStartedRoutesTest.java   |    2 +-
 .../impl/ShutdownGracefulTimeoutTriggerTest.java   |    2 +-
 ...ownStrategyNotSuppressLoggingOnTimeoutTest.java |    4 +-
 ...utdownStrategySuppressLoggingOnTimeoutTest.java |    4 +-
 .../org/apache/camel/impl/SimpleRegistryTest.java  |    7 +-
 .../apache/camel/impl/SimpleRegistryWrapTest.java  |    5 +-
 .../SimpleShutdownGracefulNoAtuoStartedTest.java   |    2 +-
 .../apache/camel/impl/SimpleUuidGeneratorTest.java |    2 +-
 .../apache/camel/impl/StartAndStopRoutesTest.java  |    5 +-
 .../camel/impl/StartStopAndShutdownRouteTest.java  |    1 -
 .../StartupListenerComponentFromRegistryTest.java  |    2 +-
 .../org/apache/camel/impl/StartupListenerTest.java |    8 +-
 .../camel/impl/StopRouteAbortAfterTimeoutTest.java |   22 +-
 .../camel/impl/TwoRouteSuspendResumeTest.java      |    2 +-
 .../camel/impl/TypeConverterAllowNullTest.java     |    2 +-
 .../TypeConverterRegistryMissesThenAddTest.java    |    2 +-
 ...TypeConverterRegistryStatisticsEnabledTest.java |    4 +-
 .../camel/impl/TypeConverterRegistryTest.java      |    8 +-
 .../camel/impl/VetoCamelContextStartTest.java      |    3 +-
 .../impl/cluster/ClusterServiceSelectorTest.java   |    2 -
 .../camel/impl/cluster/ClusterServiceViewTest.java |   42 +-
 .../impl/engine/CustomThreadPoolFactoryTest.java   |    5 +-
 .../camel/impl/engine/DefaultCamelContextTest.java |   10 +-
 .../impl/engine/DefaultFactoryFinderTest.java      |    6 +-
 .../apache/camel/impl/engine/RouteRemove2Test.java |    2 +-
 .../camel/impl/event/EventNotifierEventsTest.java  |    1 +
 .../event/EventNotifierExchangeCompletedTest.java  |    4 +-
 .../EventNotifierExchangeSentParallelTest.java     |    2 +-
 .../impl/event/EventNotifierExchangeSentTest.java  |   10 +-
 .../EventNotifierFailureHandledEventsTest.java     |   16 +-
 .../event/EventNotifierRedeliveryEventsTest.java   |    5 +-
 ...ventNotifierServiceStoppingFailedEventTest.java |    3 +-
 .../event/MultipleEventNotifierEventsTest.java     |    3 +-
 .../health/DefaultHealthCheckRegistryTest.java     |   12 +-
 .../impl/health/DefaultHealthCheckServiceTest.java |    1 -
 .../apache/camel/impl/health/HealthCheckTest.java  |    1 -
 .../health/RouteHealthCheckTest.java}              |   98 +-
 .../impl/transformer/TransformerContractTest.java  |   41 +-
 .../impl/transformer/TransformerRouteTest.java     |  122 +-
 .../validator/BeanValidatorInputValidateTest.java  |   18 +-
 .../validator/BeanValidatorOutputValidateTest.java |   18 +-
 ...InflightRepositoryWithFailedValidationTest.java |   10 +-
 .../impl/validator/ValidatorContractTest.java      |   29 +-
 .../camel/impl/validator/ValidatorRouteTest.java   |   53 +-
 .../impl/validator/ValidatorXmlSchemaTest.java     |    3 +-
 .../verifier/DefaultComponentVerifierTest.java     |    1 +
 .../camel/impl/verifier/ResultErrorHelperTest.java |    7 +-
 .../org/apache/camel/issues/AdviceWithCBRTest.java |    7 +-
 ...viceWithContextScopedErrorHandlerIssueTest.java |    4 +-
 .../issues/AdviceWithErrorHandlerRemoveTest.java   |   11 +-
 .../issues/AdviceWithInterceptFromRemoveTest.java  |    6 +-
 .../issues/AdviceWithInterceptRemoveTest.java      |    6 +-
 ...dviceWithInterceptSendToEndpointRemoveTest.java |   10 +-
 ...nterceptSendToEndpointWithLoadbalancerTest.java |    8 +-
 .../issues/AdviceWithInvalidConfiguredTest.java    |    4 +-
 .../apache/camel/issues/AdviceWithIssueTest.java   |    8 +-
 .../issues/AdviceWithOnCompletionRemoveTest.java   |   10 +-
 .../camel/issues/AdviceWithOnCompletionTest.java   |    4 +-
 .../AdviceWithOnExceptionAndInterceptTest.java     |   27 +-
 .../issues/AdviceWithOnExceptionRemoveTest.java    |   15 +-
 .../camel/issues/AdviceWithOnExceptionTest.java    |    4 +-
 .../apache/camel/issues/AdviceWithPolicyTest.java  |    5 +-
 .../camel/issues/AdviceWithRoutePolicyTest.java    |    4 +-
 ...AdviceWithRouteScopedErrorHandlerIssueTest.java |    8 +-
 .../issues/AdviceWithStartTargetIssueTest.java     |   18 +-
 .../camel/issues/AdviceWithTransactedTest.java     |    4 +-
 .../AdviceWithTwoRoutesOnExceptionIssueTest.java   |   11 +-
 .../camel/issues/AdviceWithUrlIssueTest.java       |    4 +-
 .../issues/AdviceWithWeaveByToUriCBRTest.java      |    6 +-
 .../camel/issues/AdviceWithWeaveByTypeCBRTest.java |   11 +-
 .../AggregatorWithBatchConsumingIssueTest.java     |    7 +-
 .../apache/camel/issues/AmahDeadLetterTest.java    |    2 +-
 .../camel/issues/CBRConcurrencyIssueTest.java      |    9 +-
 .../apache/camel/issues/CBRContainsIssueTest.java  |    7 +-
 .../issues/CBRCustomPredicateAsFilterTest.java     |    5 +-
 .../CacheInputStreamInDeadLetterIssue520Test.java  |    8 +-
 .../apache/camel/issues/Camel4857UriIssueTest.java |   17 +-
 .../CharlesSplitAndTryCatchRollbackIssueTest.java  |   13 +-
 ...CharlesSplitUseBeanAsErrorHandlerIssueTest.java |   15 +-
 .../issues/ChoiceEndOrEndChoiceIssueTest.java      |   29 +-
 .../issues/ChoicePredicateSimpleHeaderTest.java    |    7 +-
 .../camel/issues/ComponentUseRawUriTest.java       |    4 +-
 ...tScopedOnExceptionErrorHandlerRefIssueTest.java |   11 +-
 ...ExceptionErrorHandlerRefIssueTwoRoutesTest.java |   17 +-
 ...nExceptionMultipleRouteBuildersReverseTest.java |   35 +-
 ...ScopedOnExceptionMultipleRouteBuildersTest.java |   35 +-
 ...xceptionNotHandledErrorHandlerRefIssueTest.java |   11 +-
 ...otHandledErrorHandlerRefIssueTwoRoutesTest.java |   15 +-
 ...HandledRouteScopedErrorHandlerRefIssueTest.java |   12 +-
 ...uteScopedErrorHandlerRefIssueTwoRoutesTest.java |   17 +-
 ...ceptionRouteScopedErrorHandlerRefIssueTest.java |   12 +-
 ...uteScopedErrorHandlerRefIssueTwoRoutesTest.java |   17 +-
 .../camel/issues/CustomFailveOverProcessor.java    |    5 +-
 .../issues/DoCatchCaughExceptionIssueTest.java     |   19 +-
 .../issues/DynamicRouterWithInterceptorTest.java   |   15 +-
 .../issues/EndpointWithRawUriParameterTest.java    |   28 +-
 .../camel/issues/ErrorHandlerAdviceIssueTest.java  |   29 +-
 .../camel/issues/ExceptionCamel4022Test.java       |   17 +-
 .../camel/issues/ExceptionPolicyIssueTest.java     |    5 +-
 .../org/apache/camel/issues/ExceptionTest.java     |   13 +-
 ...tionThrownFromOnExceptionNoEndlessLoopTest.java |   71 +-
 .../issues/ExceptionThrownFromOnExceptionTest.java |  253 +--
 .../camel/issues/FilePollingConsumerIssueTest.java |    1 +
 .../issues/FileSplitStreamingWithChoiceTest.java   |   10 +-
 .../issues/FilterCustomPredicateAsFilterTest.java  |   10 +-
 .../org/apache/camel/issues/GertJBIIssueTest.java  |   10 +-
 .../InterceptCustomPredicateAsFilterTest.java      |    2 +-
 .../InterceptFromPredicateProceedAndStopTest.java  |    2 +-
 .../java/org/apache/camel/issues/Issue170Test.java |    2 +-
 .../camel/issues/MethodClassByTypeIssueTest.java   |   12 +-
 .../camel/issues/MockExpectedHeadersIssueTest.java |    7 +-
 .../camel/issues/MockValueBuilderIssueTest.java    |    4 +-
 ...ticastAggregationStrategyInputExchangeTest.java |   16 +-
 ...icastAggregationStrategyThrowExceptionTest.java |    8 +-
 ...essageBodyAndEnrichedHeadersClaimCheckTest.java |   38 +-
 ...xOriginalMessageBodyAndEnrichedHeadersTest.java |   29 +-
 ...eBodyAndEnrichedHeadersUseOriginalBodyTest.java |   23 +-
 ...lelStopOnExceptionWithOnExceptionIssueTest.java |   19 +-
 ...thAggregationStrategyThrowingExceptionTest.java |    6 +-
 .../MulticastParallelWithOnExceptionIssueTest.java |   13 +-
 .../MulticastPipelineAggregateIssueTest.java       |   25 +-
 ...UnitOfWorkOnExceptionHandledFalseIssueTest.java |   18 +-
 .../issues/MulticastSingleAggregateIssueTest.java  |    8 +-
 ...astStopOnExceptionWithOnExceptionIssueTest.java |   15 +-
 .../issues/MulticastWithOnExceptionIssueTest.java  |   15 +-
 .../MultipleErrorHandlerOnExceptionIssueTest.java  |   17 +-
 .../org/apache/camel/issues/MultipleFromTest.java  |    4 +-
 .../java/org/apache/camel/issues/MyCamelBean.java  |    2 +-
 .../org/apache/camel/issues/MyTransformBean.java   |    2 +-
 .../org/apache/camel/issues/NeilSplitterTest.java  |   12 +-
 ...derExactlyDoneSplitterWhereSentToIssueTest.java |   10 +-
 ...tifyBuilderOnFailureShutdownCamelIssueTest.java |    3 +-
 .../apache/camel/issues/OnCompletionIssueTest.java |   35 +-
 .../OnExceptionBeforeErrorHandlerIssueTest.java    |   30 +-
 .../issues/OnExceptionContinuedIssueTest.java      |   60 +-
 ...OnExceptionContinuedNoFailureProcessorTest.java |   19 +-
 .../OnExceptionErrorHandlerRefIssueTest.java       |    9 +-
 ...ExceptionErrorHandlerRefIssueTwoRoutesTest.java |   13 +-
 .../OnExceptionHandledNoFailureProcessorTest.java  |   22 +-
 ...xceptionNotHandledErrorHandlerRefIssueTest.java |    9 +-
 ...otHandledErrorHandlerRefIssueTwoRoutesTest.java |   13 +-
 ...nExceptionNotHandledNoFailureProcessorTest.java |   22 +-
 ...HandledRouteScopedErrorHandlerRefIssueTest.java |   12 +-
 ...uteScopedErrorHandlerRefIssueTwoRoutesTest.java |   17 +-
 .../camel/issues/OnExceptionProcessIssueTest.java  |   22 +-
 ...ceptionRouteScopedErrorHandlerRefIssueTest.java |   12 +-
 ...uteScopedErrorHandlerRefIssueTwoRoutesTest.java |   17 +-
 .../camel/issues/OnExceptionWithTwoBeansTest.java  |   28 +-
 .../issues/PropertiesAvailableEverywhereTest.java  |   15 +-
 .../camel/issues/ProxyReturnNullIssueTest.java     |    1 -
 ...ntListAggregationStrategyInputExchangeTest.java |   14 +-
 .../RecipientListDirectNoConsumerIssueTest.java    |    8 +-
 ...thAggregationStrategyThrowingExceptionTest.java |   10 +-
 ...UnitOfWorkOnExceptionHandledFalseIssueTest.java |   15 +-
 ...eOriginalMessageEndpointExceptionIssueTest.java |   10 +-
 .../RecipientListUseOriginalMessageIssueTest.java  |    7 +-
 .../issues/RecipientListWithInterceptorTest.java   |   15 +-
 ...andlerAsyncDelayedTwoCamelContextIssueTest.java |   11 +-
 ...olicyOnExceptionWhileRedeliveringIssueTest.java |   20 +-
 .../camel/issues/RegExPredicateIssueTest.java      |    6 +-
 ...ryContextScopedUntilRecipientListIssueTest.java |    6 +-
 ...tScopedUntilRecipientListParallelIssueTest.java |    6 +-
 ...etryRouteScopedUntilRecipientListIssueTest.java |   12 +-
 ...eScopedUntilRecipientListParallelIssueTest.java |    8 +-
 .../RetryWhilePredicateExpressionIssueTest.java    |   22 +-
 .../RetryWhileSimpleExpressionIssueTest.java       |    9 +-
 .../apache/camel/issues/RomeksExceptionTest.java   |   18 +-
 .../issues/RouteIdAnonymousAndFixedClashTest.java  |    8 +-
 .../camel/issues/RouteIdAutoAssignClashIssue.java  |    9 +-
 .../RouteScopedErrorHandlerAndOnExceptionTest.java |   22 +-
 ...ScopedOnExceptionMultipleRouteBuildersTest.java |   43 +-
 ...eptionWithInterceptSendToEndpointIssueTest.java |   17 +-
 ...erceptSendToEndpointIssueWithPredicateTest.java |   35 +-
 .../RouteStartupFailShouldStopAlsoIssueTest.java   |    9 +-
 .../apache/camel/issues/RouteWithCustomIdTest.java |    7 +-
 .../camel/issues/RoutingSlipMemoryLeakTest.java    |    6 +-
 .../issues/RoutingSlipNotStopErrorHandlerTest.java |   10 +-
 .../issues/RoutingSlipWithInterceptorTest.java     |   15 +-
 ...RouteAndContextScopedErrorHandlerIssueTest.java |   23 +-
 .../camel/issues/SedaFileIdempotentIssueTest.java  |    8 +-
 .../SedaFileIdempotentNoTimeoutIssueTest.java      |    7 +-
 .../issues/SedaFileIdempotentTimeoutIssueTest.java |    7 +-
 .../issues/SentExchangeEventNotifierIssueTest.java |   13 +-
 .../SentExchangeEventNotifierTwoIssueTest.java     |   13 +-
 .../camel/issues/SetBodyTryCatchIssueTest.java     |   19 +-
 .../camel/issues/SetHeaderInDoCatchIssueTest.java  |   16 +-
 .../camel/issues/SplitContinuedLogIssueTest.java   |   16 +-
 .../camel/issues/SplitListListIssueTest.java       |   12 +-
 .../camel/issues/SplitPropertiesFileIssueTest.java |   16 +-
 ...UnitOfWorkOnExceptionHandledFalseIssueTest.java |   15 +-
 .../issues/SplitStopOnExceptionIssueTest.java      |   15 +-
 .../SplitWithCustomAggregationStrategyTest.java    |   36 +-
 .../camel/issues/SplitWithInterceptorTest.java     |   10 +-
 ...litterAggregationStrategyInputExchangeTest.java |   21 +-
 .../issues/SplitterCorrelationIdIssueTest.java     |    4 +-
 .../camel/issues/SplitterParallelIssueTest.java    |   24 +-
 ...thAggregationStrategyThrowingExceptionTest.java |    8 +-
 ...rParallelWithIteratorThrowingExceptionTest.java |    9 +-
 .../SplitterThrowExceptionInExpressionTest.java    |   14 +-
 .../SplitterThrowExceptionInExpressionTwoTest.java |   15 +-
 ...terUsingBeanReturningCloseableIteratorTest.java |    5 +-
 .../SplitterUsingBeanReturningMessageTest.java     |    3 +-
 .../camel/issues/StopCamelFromRouteTest.java       |   18 +-
 .../camel/issues/StopRouteFromRouteTest.java       |   57 +-
 .../issues/StopRouteImpactsErrorHandlerTest.java   |   28 +-
 ...dNotStopContextScopedErrorHandlerIssueTest.java |   12 +-
 ...uldNotStopRouteScopedErrorHandlerIssueTest.java |   12 +-
 ...ryCatchInterceptSendToAllEndpointIssueTest.java |   16 +-
 ...ThreadsRejectedExecutionWithDeadLetterTest.java |   66 +-
 .../issues/TimerAndErrorHandlerIssueTest.java      |    6 +-
 .../TransactedPropertyPlaceholderIssueTest.java    |    5 +-
 .../TryCatchFinallyOnExceptionIssueTest.java       |   18 +-
 .../camel/issues/TryCatchSetHeaderIssueTest.java   |   22 +-
 .../camel/issues/TryCatchWithSplitIssueTest.java   |   14 +-
 ...erceptSendToEndpointIssueWithPredicateTest.java |   46 +-
 .../apache/camel/issues/TwoTimerWithJMXIssue.java  |    3 +-
 .../issues/TypeConverterConcurrencyIssueTest.java  |    9 +-
 .../apache/camel/issues/XPathSplitStreamTest.java  |    6 +-
 .../language/BeanAnnotationParameterTest.java      |   25 +-
 .../language/BeanAnnotationParameterTwoTest.java   |   29 +-
 .../language/BeanLanguageInvalidOGNLTest.java      |    5 +-
 .../BeanLanguageMethodMissingParenthesisTest.java  |   16 +-
 .../camel/language/BeanLanguageOGNLTest.java       |    3 +-
 ...LWithDotInParameterPropertyPlaceholderTest.java |    4 +-
 .../BeanLanguageOGNLWithDotInParameterTest.java    |    4 +-
 .../ConstantLanguageBinaryResourceTest.java        |    3 +-
 .../org/apache/camel/language/ConstantTest.java    |    4 +-
 .../java/org/apache/camel/language/HeaderTest.java |    2 +-
 .../apache/camel/language/LanguageServiceTest.java |    4 +-
 .../apache/camel/language/NoSuchLanguageTest.java  |    2 +-
 .../PropertyInjectAnnotationParameterTest.java     |   12 +-
 .../apache/camel/language/RefPredicateTest.java    |    2 +-
 .../java/org/apache/camel/language/RefTest.java    |    2 +-
 .../camel/language/SimpleLanguageRouteTest.java    |    3 +-
 .../SimpleLanguageTransformRandomTest.java         |    6 +-
 .../camel/language/SimpleOgnlMapIssueTest.java     |    7 +-
 ...okenPairIteratorSplitChoicePerformanceTest.java |  111 +-
 .../camel/language/TokenPairPredicateTest.java     |   14 +-
 .../TokenXMLPairMultiNamespaceSplitTest.java       |    2 +-
 .../TokenXMLPairNamespaceMultilineSplitTest.java   |    2 +-
 ...kenXMLPairNamespaceSplitChildNamespaceTest.java |   15 +-
 .../language/TokenXMLPairNamespaceSplitTest.java   |   15 +-
 .../org/apache/camel/language/TokenizerTest.java   |   32 +-
 .../apache/camel/language/XMLTokenSplitTest.java   |   15 +-
 .../language/XPathAnotherRouteConcurrentTest.java  |   13 +-
 .../camel/language/XPathFromFileExceptionTest.java |   14 +-
 .../apache/camel/language/XPathFunctionTest.java   |   33 +-
 .../language/XPathLanguageSingleNodeListTest.java  |   32 +-
 .../apache/camel/language/XPathResourceTest.java   |    4 +-
 .../language/XPathRouteConcurrentBigTest.java      |   67 +-
 .../camel/language/XPathRouteConcurrentTest.java   |    8 +-
 .../language/XPathSplitChoicePerformanceTest.java  |  111 +-
 .../camel/language/simple/SimpleDecHeaderTest.java |    4 +-
 .../camel/language/simple/SimpleIncHeaderTest.java |    4 +-
 .../SimpleMessageHistoryNotDetailedTest.java       |    7 +-
 .../language/simple/SimpleMessageHistoryTest.java  |    8 +-
 .../camel/language/simple/SimpleOperatorTest.java  |   18 +-
 .../simple/SimpleParserExpressionInvalidTest.java  |    5 +-
 .../simple/SimpleParserExpressionTest.java         |    3 +-
 .../simple/SimpleParserRegexpPredicateTest.java    |    2 +-
 .../simple/SimplePropertiesNestedTest.java         |    6 +-
 .../language/simple/SimpleResourceDynamicTest.java |    4 +-
 .../camel/language/simple/SimpleResourceTest.java  |    4 +-
 .../SimpleRouteExpressionAsPredicateTest.java      |    6 +-
 .../simple/SimpleSetHeaderPredicateTest.java       |   12 +-
 .../apache/camel/language/simple/SimpleTest.java   |   40 +-
 .../language/simple/SimpleWithPropertiesTest.java  |   12 +-
 .../language/tokenizer/TokenizeLanguageTest.java   |   71 +-
 .../tokenizer/TokenizeWrapLanguageTest.java        |   90 +-
 .../tokenizer/XMLTokenizeLanguageGroupingTest.java |   93 +-
 .../XMLTokenizeLanguageStreamingFileTest.java      |   24 +-
 .../XMLTokenizeLanguageStreamingTest.java          |    6 +-
 .../tokenizer/XMLTokenizeLanguageTest.java         |   91 +-
 .../XMLTokenizeWrapLanguageGroupingTest.java       |  118 +-
 .../tokenizer/XMLTokenizeWrapLanguageTest.java     |  129 +-
 .../model/GatherAllStaticEndpointUrisTest.java     |   13 +-
 .../apache/camel/model/LoadRestFromXmlTest.java    |    5 +-
 .../apache/camel/model/LoadRouteFromXmlTest.java   |    3 +-
 .../model/LoadRouteFromXmlWithNamespaceTest.java   |    3 +-
 .../model/LoadRouteFromXmlWithPolicyTest.java      |    3 +-
 .../model/ModelRouteFilterPatternExcludeTest.java  |    6 +-
 .../ModelRouteFilterPatternIncludeExcludeTest.java |    9 +-
 .../model/ModelRouteFilterPatternIncludeTest.java  |    6 +-
 .../apache/camel/model/ModelSanityCheckerTest.java |    9 +-
 .../camel/model/ProcessDefinitionSetBodyTest.java  |    7 +-
 .../camel/model/ProcessorDefinitionHelperTest.java |    8 +-
 .../org/apache/camel/model/RouteGroupTest.java     |    7 +-
 .../apache/camel/model/RoutePropertiesTest.java    |   11 +-
 .../model/StartingRoutesErrorReportedTest.java     |   10 +-
 .../org/apache/camel/model/XmlRestParseTest.java   |    3 +-
 .../apache/camel/model/XmlRestParseToDTest.java    |    2 +-
 .../apache/camel/model/XmlRoutePropertiesTest.java |    8 +-
 .../apache/camel/processor/AsyncLoopCopyTest.java  |   31 +-
 .../org/apache/camel/processor/AsyncLoopTest.java  |   43 +-
 .../BatchResequencerAllowDuplicatesTest.java       |    8 +-
 .../processor/BatchResequencerJMSPriorityTest.java |   11 +-
 .../BatchResequencerWithDuplicateTest.java         |    2 +-
 .../processor/BeanCachedProcessorGlobalTest.java   |    6 +-
 .../camel/processor/BeanCachedProcessorTest.java   |    7 +-
 .../org/apache/camel/processor/BeanCachedTest.java |    7 +-
 .../BeanInvocationThrowsExceptionTest.java         |    5 +-
 .../BeanOgnMethodWithXPathInjectionTest.java       |   12 +-
 .../BeanProcessorSpecializedMessageTest.java       |    7 +-
 .../BeanRecipientListInterfaceAnnotationTest.java  |    7 +-
 .../camel/processor/BeanRecipientListTest.java     |    3 +-
 .../processor/BeanRecipientListTimeoutTest.java    |   14 +-
 .../org/apache/camel/processor/BeanRouteTest.java  |    1 +
 .../camel/processor/BeanWithExceptionTest.java     |    6 +-
 .../processor/BeanWithXPathInjectionTest.java      |    9 +-
 .../camel/processor/BreadcrumbDisabledTest.java    |   24 +-
 .../org/apache/camel/processor/BreadcrumbTest.java |   24 +-
 .../camel/processor/CBRHeaderPredicateTest.java    |   11 +-
 .../CBRPredicateBeanThrowExceptionTest.java        |   16 +-
 .../processor/CBRSimplePredicateEmptyBodyTest.java |    9 +-
 .../apache/camel/processor/CBRSimpleTypeTest.java  |   10 +-
 .../camel/processor/CBRWithLoadBalancerTest.java   |   11 +-
 .../camel/processor/CBRWithMulticastTest.java      |   11 +-
 .../camel/processor/CBRWithRecipientListTest.java  |   12 +-
 .../apache/camel/processor/CBRWithWireTapTest.java |   10 +-
 .../processor/Camel715ThreadProcessorTest.java     |   17 +-
 .../CamelContextLogExhaustedMessageBodyTest.java   |    4 +-
 .../org/apache/camel/processor/ChannelTest.java    |   14 +-
 .../apache/camel/processor/ChoiceAsyncTest.java    |   11 +-
 .../processor/ChoiceCompoundPredicateTest.java     |   27 +-
 .../apache/camel/processor/ChoiceNoActionTest.java |    8 +-
 .../camel/processor/ChoiceNoErrorHandlerTest.java  |   18 +-
 .../org/apache/camel/processor/ChoiceTest.java     |    9 +-
 .../processor/ChoiceWhenBeanExpressionTest.java    |   42 +-
 .../ChoiceWhenBeanExpressionWithExceptionTest.java |   48 +-
 .../processor/ChoiceWhenNotPredicateTest.java      |    8 +-
 .../apache/camel/processor/ChoiceWithEndTest.java  |   35 +-
 .../processor/ChoiceWithSimpleExpressionTest.java  |    8 +-
 .../camel/processor/ChoiceWithTranfromTest.java    |   30 +-
 .../ClaimCheckEipDynamicKeyGetSetTest.java         |   14 +-
 .../ClaimCheckEipGetAndRemoveSetTest.java          |   14 +-
 .../camel/processor/ClaimCheckEipGetSetTest.java   |   13 +-
 .../processor/ClaimCheckEipPushPopBodyTest.java    |   10 +-
 .../ClaimCheckEipPushPopExcludeBodyTest.java       |   13 +-
 .../ClaimCheckEipPushPopHeadersPatternTest.java    |   10 +-
 .../processor/ClaimCheckEipPushPopHeadersTest.java |   10 +-
 .../ClaimCheckEipPushPopRemoveHeaderTest.java      |   13 +-
 .../camel/processor/ClaimCheckEipPushPopTest.java  |    7 +-
 .../org/apache/camel/processor/ClaimCheckTest.java |   40 +-
 .../processor/ComposedMessageProcessorTest.java    |   91 +-
 .../apache/camel/processor/ConvertBodyTest.java    |    8 +-
 .../apache/camel/processor/CorrectRouteIdTest.java |   19 +-
 .../CreateRouteWithNonExistingEndpointTest.java    |    1 +
 .../CustomConsumerExceptionHandlerTest.java        |    9 +-
 .../camel/processor/CustomLoadBalanceTest.java     |    6 +-
 .../processor/CustomProcessorFactoryTest.java      |   20 +-
 .../camel/processor/CustomRefLoadBalanceTest.java  |    6 +-
 .../camel/processor/CustomRoutePolicyTest.java     |    1 -
 .../processor/CustomScheduledRoutePolicyTest.java  |    2 +-
 .../processor/DataFormatServiceCustomRefTest.java  |   10 +-
 .../camel/processor/DataFormatServiceTest.java     |    3 +-
 .../DeadLetterChannelAlwaysHandledTest.java        |   11 +-
 .../DeadLetterChannelCatchThrowableTest.java       |   13 +-
 ...dLetterChannelExceptionCausePropagatedTest.java |    8 +-
 ...CausePropagatedWithDefaultErrorHandlerTest.java |   10 +-
 .../DeadLetterChannelFailureRouteIdTest.java       |   18 +-
 .../DeadLetterChannelHandleNewExceptionTest.java   |   16 +-
 .../DeadLetterChannelHandledExampleTest.java       |   36 +-
 ...lHandledExampleWithDefaultErrorHandlerTest.java |   17 +-
 ...etterChannelLogExhaustedMessageHistoryTest.java |    9 +-
 ...nnelLogExhaustedMessageHistoryWithBodyTest.java |    7 +-
 .../DeadLetterChannelNewExceptionTest.java         |    6 +-
 .../DeadLetterChannelNoRedeliveryTest.java         |    9 +-
 ...DeadLetterChannelNotHandleNewExceptionTest.java |    9 +-
 ...adLetterChannelOnExceptionOnRedeliveryTest.java |   35 +-
 .../processor/DeadLetterChannelOnPrepareTest.java  |    6 +-
 .../DeadLetterChannelOnRedeliveryTest.java         |   15 +-
 ...dLetterChannelPropagateCausedExceptionTest.java |   57 +-
 ...etterChannelRedeliverWithDelayBlockingTest.java |   25 +-
 ...LetterChannelRedeliveringWhileShutdownTest.java |    2 +-
 ...eadLetterChannelRedeliveryDelayPatternTest.java |   13 +-
 .../processor/DeadLetterChannelRedeliveryTest.java |   42 +-
 .../DeadLetterChannelRestartFromBeginningTest.java |   29 +-
 .../processor/DeadLetterChannelSetHeaderTest.java  |    9 +-
 .../camel/processor/DeadLetterChannelTest.java     |   15 +-
 .../DeadLetterChannelUnmarshalSetHeaderTest.java   |    9 +-
 .../DeadLetterChannelUseOriginalInBodyTest.java    |   16 +-
 ...LetterChannelUseOriginalInBodyWithFileTest.java |    5 +-
 ...tConsumerBridgeErrorHandlerOnExceptionTest.java |   20 +-
 ...ltConsumerBridgeErrorHandlerRedeliveryTest.java |   30 +-
 .../DefaultConsumerBridgeErrorHandlerTest.java     |   10 +-
 .../DefaultErrorHandlerCatchThrowableTest.java     |   13 +-
 .../DefaultErrorHandlerExplicitConfiguredTest.java |    2 +-
 .../DefaultErrorHandlerFailureRouteIdTest.java     |   14 +-
 ...ErrorHandlerLogExhaustedMessageHistoryTest.java |    4 +-
 .../DefaultErrorHandlerOnExceptionTest.java        |    2 +-
 .../DefaultErrorHandlerOnPrepareTest.java          |    6 +-
 .../DefaultErrorHandlerRedeliveryTest.java         |   43 +-
 .../camel/processor/DefaultErrorHandlerTest.java   |    5 +-
 ...cheduledPollConsumerBridgeErrorHandlerTest.java |    7 +-
 .../DefinitionPolicyPerProcessorTest.java          |    7 +-
 .../camel/processor/DelayInterceptorTest.java      |   14 +-
 .../camel/processor/DelayerAsyncDelayedTest.java   |    5 +-
 .../camel/processor/DelayerPerRouteTest.java       |    2 +-
 .../org/apache/camel/processor/DelayerTest.java    |    3 +-
 .../camel/processor/DelayerWhileShutdownTest.java  |    2 +-
 .../org/apache/camel/processor/DetourTest.java     |   40 +-
 .../processor/DoTryCatchWithSplitterTest.java      |   16 +-
 .../DoubleLoadBalancerMisconfigurationTest.java    |   12 +-
 .../apache/camel/processor/DualPipelineTest.java   |   17 +-
 .../apache/camel/processor/DynamicRouter4Test.java |    4 +-
 .../processor/DynamicRouterAnnotationTest.java     |    3 +-
 .../DynamicRouterExchangeHeaders2Test.java         |    3 +-
 .../DynamicRouterExchangeHeadersTest.java          |    3 +-
 .../DynamicRouterExchangePropertiesTest.java       |    6 +-
 .../processor/DynamicRouterOnExceptionTest.java    |    7 +-
 ...amicRouterThrowExceptionFromExpressionTest.java |   10 +-
 ...point2MustBeStartedBeforeSendProcessorTest.java |   17 +-
 ...dpointMustBeStartedBeforeSendProcessorTest.java |   14 +-
 .../camel/processor/EnrichSubUnitOfWorkTest.java   |   20 +-
 ...HandlerOnExceptionRedeliveryAndHandledTest.java |   44 +-
 .../apache/camel/processor/ErrorHandlerTest.java   |   19 +-
 .../processor/ErrorHandlerWrappedEachNodeTest.java |    7 +-
 .../processor/EvaluateExpressionProcessorTest.java |   18 +-
 .../EventNotifierExchangeSentExampleTest.java      |    4 +-
 .../processor/EventNotifierExchangeSentTest.java   |    8 +-
 .../processor/ExceptionHandlerStreamCacheTest.java |    4 +-
 .../processor/ExchangeAwareDelayCalcBean.java      |    2 +-
 .../processor/ExchangeIdempotentConsumerTest.java  |    8 +-
 .../processor/FailOverAllFailedExceptionTest.java  |    7 +-
 .../FailOverLoadBalanceAutoStartupFalseTest.java   |    8 +-
 .../FailOverLoadBalanceMultipleExceptionTest.java  |    7 +-
 ...verLoadBalanceNotInheritedErrorHandlerTest.java |   11 +-
 .../camel/processor/FailOverLoadBalanceTest.java   |   32 +-
 .../FailOverLoadBalanceWithRedeliveryTest.java     |   29 +-
 ...lOverLoadBalanceWrappedExceptionNoLuckTest.java |    6 +-
 .../FailOverLoadBalanceWrappedExceptionTest.java   |    6 +-
 .../FailOverLoadBalancerSetFaultTest.java          |   35 +-
 .../processor/FailOverNotCatchedExceptionTest.java |   15 +-
 ...overLoadBalancerBreakoutDuringShutdownTest.java |   34 +-
 .../FailoverMaximumFailoverAttemptsTest.java       |   33 +-
 .../processor/FailoverRoundRobinGoodBadTest.java   |   13 +-
 .../processor/FailoverRoundRobinStickyTest.java    |   29 +-
 .../camel/processor/FailoverRoundRobinTest.java    |   23 +-
 .../apache/camel/processor/FailoverStickyTest.java |   23 +-
 .../camel/processor/FileIdempotentClearTest.java   |    7 +-
 .../FileIdempotentConsumerCreateRepoTest.java      |    3 +-
 .../FileIdempotentConsumerLoadStoreTest.java       |    5 +-
 .../processor/FileIdempotentConsumerTest.java      |    5 +-
 .../camel/processor/FileIdempotentRemoveTest.java  |    5 +-
 .../processor/FileIdempotentTrunkStoreTest.java    |   14 +-
 .../processor/FileRollbackOnCompletionTest.java    |   26 +-
 .../camel/processor/FilterBeforeSplitTest.java     |   15 +-
 .../camel/processor/FilterNotMatchedTest.java      |    6 +-
 .../org/apache/camel/processor/FilterNotTest.java  |    4 +-
 .../apache/camel/processor/FlipRoutePolicy.java    |    3 +-
 .../camel/processor/FlipRoutePolicyTest.java       |   12 +-
 .../apache/camel/processor/FromToInOutTest.java    |   17 +-
 .../processor/IdempotentConsumerAsyncTest.java     |   15 +-
 .../IdempotentConsumerCompletionEagerTest.java     |   29 +-
 .../IdempotentConsumerConcurrentTest.java          |   44 +-
 .../camel/processor/IdempotentConsumerDslTest.java |    6 +-
 .../processor/IdempotentConsumerEagerTest.java     |   43 +-
 .../IdempotentConsumerNoMessageIdTest.java         |    5 +-
 .../IdempotentConsumerRemoveOnFailureTest.java     |   21 +-
 .../IdempotentConsumerRepoExceptionTest.java       |    4 +-
 .../camel/processor/IdempotentConsumerTest.java    |   34 +-
 ...dempotentConsumerUsingCustomRepositoryTest.java |   14 +-
 .../processor/InheritErrorHandlerDefaultTest.java  |    6 +-
 .../processor/InheritErrorHandlerFalseTest.java    |    4 +-
 .../processor/InheritErrorHandlerTrueTest.java     |    6 +-
 .../camel/processor/InlinedProcessorIdTest.java    |   15 +-
 .../org/apache/camel/processor/JoinRoutesTest.java |    6 +-
 .../camel/processor/LanguageBuilderTest.java       |    3 +-
 .../org/apache/camel/processor/LogEipMaskTest.java |    1 +
 .../processor/LogEipPropagateExceptionTest.java    |   23 +-
 .../apache/camel/processor/LogProcessorTest.java   |    4 +-
 .../LogProcessorWithProvidedLoggerTest.java        |    8 +-
 .../apache/camel/processor/LoopAsyncCopyTest.java  |   14 +-
 .../camel/processor/LoopAsyncNoCopyTest.java       |   14 +-
 .../apache/camel/processor/LoopCopyErrorTest.java  |   24 +-
 .../org/apache/camel/processor/LoopCopyTest.java   |   12 +-
 .../apache/camel/processor/LoopDoWhileTest.java    |   15 +-
 .../apache/camel/processor/LoopExceptionTest.java  |    7 +-
 .../org/apache/camel/processor/LoopNoCopyTest.java |   12 +-
 .../java/org/apache/camel/processor/LoopTest.java  |    1 +
 .../apache/camel/processor/LoopTestProcessor.java  |    6 +-
 .../camel/processor/LoopWithAggregatorTest.java    |   22 +-
 .../org/apache/camel/processor/MDCAsyncTest.java   |   50 +-
 .../processor/MDCOnCompletionOnCompletionTest.java |   39 +-
 .../camel/processor/MDCOnCompletionTest.java       |   44 +-
 .../org/apache/camel/processor/MDCResetTest.java   |   62 +-
 .../java/org/apache/camel/processor/MDCTest.java   |   59 +-
 .../org/apache/camel/processor/MDCWireTapTest.java |   51 +-
 .../camel/processor/MDCWithBreadcrumbTest.java     |   32 +-
 .../camel/processor/MarkRollbackOnlyTest.java      |    2 +-
 .../processor/MessageHistoryCopyExchangeTest.java  |   14 +-
 .../processor/MessageHistoryCopyMessageTest.java   |   17 +-
 .../processor/MessageHistoryDumpRoutingTest.java   |   25 +-
 .../processor/MessageHistoryStepOnlyTest.java      |   16 +-
 .../apache/camel/processor/MethodFilterTest.java   |    8 +-
 .../MultiCastParallelAndStreamCachingTest.java     |   50 +-
 .../MultiCastStreamCachingInSubRouteTest.java      |   15 +-
 .../MultiErrorHandlerInRouteNotHandledTest.java    |   12 +-
 .../processor/MultiErrorHandlerInRouteTest.java    |   12 +-
 .../processor/MulticastCompletedPropertyTest.java  |    5 +-
 .../MulticastCopyOfSplitSubUnitOfWorkTest.java     |   25 +-
 .../apache/camel/processor/MulticastDslTest.java   |   19 +-
 .../MulticastFineGrainedErrorHandlingTest.java     |   10 +-
 .../MulticastGroupedExchangeExceptionTest.java     |    6 +-
 .../MulticastKeepOriginalMessageUnchangedTest.java |   14 +-
 .../camel/processor/MulticastNoOnPrepareTest.java  |    6 +-
 .../processor/MulticastNoStopOnExceptionTest.java  |    8 +-
 .../camel/processor/MulticastOnPrepareTest.java    |    3 +-
 .../MulticastParallelAllTimeoutAwareTest.java      |   24 +-
 .../MulticastParallelFailureEndpointTest.java      |   18 +-
 ...ticastParallelFineGrainedErrorHandlingTest.java |   16 +-
 .../MulticastParallelLastTimeoutTest.java          |   25 +-
 .../MulticastParallelMiddleTimeoutTest.java        |   25 +-
 .../MulticastParallelNoStopOnExceptionTest.java    |   40 +-
 .../MulticastParallelStopOnExceptionTest.java      |   38 +-
 .../processor/MulticastParallelStreamingTest.java  |   27 +-
 .../MulticastParallelStreamingTimeoutTest.java     |   25 +-
 .../MulticastParallelStreamingTwoTimeoutTest.java  |   25 +-
 .../processor/MulticastParallelStressTest.java     |   28 +-
 .../camel/processor/MulticastParallelTest.java     |   25 +-
 .../processor/MulticastParallelTimeout2Test.java   |   25 +-
 .../processor/MulticastParallelTimeout3Test.java   |   25 +-
 .../MulticastParallelTimeoutAwareTest.java         |   21 +-
 .../processor/MulticastParallelTimeoutTest.java    |   25 +-
 .../MulticastParallelTwoTimeoutMiddleTest.java     |   31 +-
 .../processor/MulticastParallelTwoTimeoutTest.java |   25 +-
 .../camel/processor/MulticastPipelineTest.java     |   24 +-
 .../camel/processor/MulticastRedeliverTest.java    |   76 +-
 ...castStopOnExceptionLastWithOnExceptionTest.java |   11 +-
 .../processor/MulticastStopOnExceptionTest.java    |    9 +-
 ...ulticastStopOnExceptionWithOnExceptionTest.java |   14 +-
 .../processor/MulticastStreamCachingTest.java      |    5 +-
 .../processor/MulticastSubUnitOfWorkTest.java      |   35 +-
 .../org/apache/camel/processor/MulticastTest.java  |    1 +
 .../processor/MulticastThreadPoolProfileTest.java  |   28 +-
 .../camel/processor/MulticastUnitOfWorkTest.java   |   30 +-
 .../MulticastWithOnExceptionFirstTest.java         |   13 +-
 .../MulticastWithOnExceptionLastTest.java          |   13 +-
 .../processor/MulticastWithOnExceptionTest.java    |   11 +-
 .../apache/camel/processor/MyDelayCalcBean.java    |    2 +-
 .../camel/processor/MyLoggingSentEventNotifer.java |    2 +-
 .../org/apache/camel/processor/MyNormalizer.java   |    6 +-
 .../apache/camel/processor/NavigateRouteTest.java  |   13 +-
 .../camel/processor/NestedChoiceIssueTest.java     |   14 +-
 .../org/apache/camel/processor/NormalizerTest.java |   31 +-
 ...deliveryWhileStoppingDeadLetterChannelTest.java |    7 +-
 .../NotAllowRedeliveryWhileStoppingTest.java       |    7 +-
 ...letionAndInterceptAndOnExceptionGlobalTest.java |   11 +-
 ...nCompletionAndInterceptGlobalSSEnabledTest.java |    2 +-
 .../OnCompletionAndInterceptGlobalTest.java        |    9 +-
 .../processor/OnCompletionAndInterceptTest.java    |   11 +-
 .../camel/processor/OnCompletionAsyncTest.java     |   70 +-
 .../camel/processor/OnCompletionContainsTest.java  |    9 +-
 .../OnCompletionGlobalCustomPoolTest.java          |   13 +-
 .../camel/processor/OnCompletionGlobalTest.java    |    9 +-
 .../camel/processor/OnCompletionModeTest.java      |   20 +-
 .../OnCompletionMoreGlobalRouteCompletionTest.java |   12 +-
 .../processor/OnCompletionMoreGlobalTest.java      |   12 +-
 .../processor/OnCompletionOnCompleteOnlyTest.java  |   15 +-
 .../processor/OnCompletionOnFailureOnlyTest.java   |   12 +-
 .../OnCompletionParallelProcessingTest.java        |    7 +-
 ...ompletionRouteScopeOverrideGlobalScopeTest.java |   18 +-
 .../processor/OnCompletionShouldBeLastTest.java    |   72 +-
 .../OnCompletionShutdownProcessorTest.java         |    5 +-
 .../apache/camel/processor/OnCompletionTest.java   |   14 +-
 .../processor/OnCompletionUseOriginalBodyTest.java |   12 +-
 .../camel/processor/OnCompletionWhenTest.java      |   17 +-
 .../processor/OnExceptionContinueToRouteTest.java  |   14 +-
 .../processor/OnExceptionFailureRouteIdTest.java   |   18 +-
 .../camel/processor/PipelineConcurrentTest.java    |   19 +-
 .../apache/camel/processor/PipelineMEPTest.java    |   24 +-
 .../camel/processor/PipelineStepWithEventTest.java |   41 +-
 .../org/apache/camel/processor/PipelineTest.java   |   18 +-
 .../camel/processor/PolicyPerProcessorTest.java    |   11 +-
 .../apache/camel/processor/PolicyPerRouteTest.java |   18 +-
 .../ProcessorMutateExchangeRedeliverTest.java      |   64 +-
 .../ProducerTemplateDisableEventNotifierTest.java  |    4 +-
 .../RandomLoadBalanceJavaDSLBuilderTest.java       |   20 +-
 .../camel/processor/RandomLoadBalanceTest.java     |    9 +-
 .../RecipientListAggregationStrategyTest.java      |    6 +-
 .../processor/RecipientListBeanOnPrepareTest.java  |    3 +-
 .../RecipientListBeanSubUnitOfWorkTest.java        |   17 +-
 .../camel/processor/RecipientListBeanTest.java     |    2 +-
 ...pientListContextScopedOnExceptionIssueTest.java |   64 +-
 .../RecipientListDoNotStopOnExceptionTest.java     |    6 +-
 .../RecipientListExchangePatternOptionTest.java    |    7 +-
 ...istExchangePropertyAggregationStrategyTest.java |    6 +-
 .../RecipientListExchangePropertyTest.java         |    4 +-
 .../RecipientListFineGrainedErrorHandlingTest.java |   23 +-
 .../processor/RecipientListFunctionalTest.java     |    6 +-
 .../RecipientListIgnoreInvalidEndpointsTest.java   |   19 +-
 ...cipientListInvalidEndpointErrorHandlerTest.java |   10 +-
 ...tInvalidEndpointIgnoreInvalidEndpointsTest.java |   10 +-
 .../camel/processor/RecipientListLeakTest.java     |    2 +-
 .../camel/processor/RecipientListMEPTest.java      |    8 +-
 .../processor/RecipientListMEPWithRawTest.java     |    8 +-
 .../camel/processor/RecipientListNoCacheTest.java  |    6 +-
 .../processor/RecipientListNoErrorHandlerTest.java |   21 +-
 .../processor/RecipientListOnPrepareTest.java      |    3 +-
 ...ntListParallelAggregateThreadPoolIssueTest.java |    6 +-
 ...ntListParallelFineGrainedErrorHandlingTest.java |   20 +-
 ...ParallelStopOnExceptionWithOnExceptionTest.java |   14 +-
 .../RecipientListParallelStreamingTest.java        |   10 +-
 .../camel/processor/RecipientListParallelTest.java |    3 +-
 .../RecipientListParallelTimeoutTest.java          |   24 +-
 .../processor/RecipientListRedeliverTest.java      |   63 +-
 .../processor/RecipientListReturnValueTest.java    |    8 +-
 .../RecipientListStopOnExceptionTest.java          |    6 +-
 ...ientListStopOnExceptionWithOnExceptionTest.java |   11 +-
 .../processor/RecipientListSubUnitOfWorkTest.java  |   17 +-
 .../apache/camel/processor/RecipientListTest.java  |    6 +-
 ...ipientListThrowExceptionFromExpressionTest.java |   10 +-
 .../RecipientListThrowExceptionSubRouteTest.java   |   16 +-
 .../RecipientListWithArrayHeaderTest.java          |    3 +-
 .../processor/RecipientListWithDelimiterTest.java  |    2 +-
 .../RecipientListWithSimpleExpressionTest.java     |    5 +-
 ...RecipientListWithStringDelimitedHeaderTest.java |    2 +-
 ...cipientListWithStringDelimitedPropertyTest.java |    6 +-
 .../camel/processor/RedeliverToSubRouteTest.java   |   16 +-
 ...tterErrorHandlerNoRedeliveryOnShutdownTest.java |   10 +-
 .../RedeliveryErrorHandlerBlockedDelayTest.java    |   37 +-
 ...veryErrorHandlerBreakoutDuringShutdownTest.java |   16 +-
 .../RedeliveryErrorHandlerLogHandledTest.java      |   73 +-
 ...veryErrorHandlerNoRedeliveryOnShutdownTest.java |   14 +-
 .../RedeliveryErrorHandlerNonBlockedDelayTest.java |   34 +-
 ...ErrorHandlerNonBlockedRedeliveryHeaderTest.java |   37 +-
 .../RedeliveryOnExceptionBlockedDelayTest.java     |   37 +-
 .../RedeliveryPolicyPerExceptionTest.java          |    3 +-
 .../org/apache/camel/processor/RegExRouteTest.java |    8 +-
 .../apache/camel/processor/RemoveHeaderTest.java   |   13 +-
 .../camel/processor/RemoveHeadersExcludeTest.java  |   12 +-
 .../apache/camel/processor/RemoveHeadersTest.java  |    8 +-
 .../RemovePropertiesWithExclusionTest.java         |   17 +-
 .../RemovePropertiesWithoutExclusionTest.java      |   14 +-
 .../apache/camel/processor/RemovePropertyTest.java |   11 +-
 .../ResequenceBatchIgnoreInvalidExchangesTest.java |    8 +-
 ...sequenceBatchNotIgnoreInvalidExchangesTest.java |    4 +-
 ...ResequenceStreamIgnoreInvalidExchangesTest.java |    8 +-
 ...equenceStreamNotIgnoreInvalidExchangesTest.java |    4 +-
 .../ResequenceStreamRejectOldExchangesTest.java    |   10 +-
 .../apache/camel/processor/ResequencerTest.java    |    9 +-
 .../camel/processor/RollbackCustomMessageTest.java |    2 +-
 .../processor/RollbackDefaultErrorHandlerTest.java |   20 +-
 .../org/apache/camel/processor/RollbackTest.java   |    9 +-
 .../camel/processor/RoundRobinLoadBalanceTest.java |   10 +-
 .../camel/processor/RouteAutoStartupTest.java      |    2 +-
 .../camel/processor/RouteAwareRouteTest.java       |    4 +-
 .../processor/RouteAwareSynchronizationTest.java   |    8 +-
 .../camel/processor/RouteContextProcessorTest.java |   22 +-
 .../camel/processor/RouteFormattedUriTest.java     |    1 +
 .../org/apache/camel/processor/RouteIdTest.java    |   10 +-
 .../camel/processor/RoutePerformanceCountTest.java |    6 +-
 .../camel/processor/RoutePoliciesRefTest.java      |    5 +-
 .../apache/camel/processor/RoutePoliciesTest.java  |    5 +-
 .../processor/RouteServicesStartupOrderTest.java   |    4 +-
 .../RouteShutdownNotReverseOrderTest.java          |    4 +-
 .../processor/RouteShutdownReverseOrderTest.java   |    4 +-
 .../processor/RouteStartupOrderClashTest.java      |    2 +-
 .../RouteStartupOrderDirectReverseTest.java        |    4 +-
 .../processor/RouteStartupOrderDirectTest.java     |    4 +-
 .../camel/processor/RouteStartupOrderLastTest.java |    2 +-
 .../processor/RouteStartupOrderSimpleTest.java     |    4 +-
 ...StartupOrderSuspendResumeNoAutoStartupTest.java |    6 +-
 .../RouteStartupOrderSuspendResumeTest.java        |    4 +-
 .../camel/processor/RouteStartupOrderTest.java     |    4 +-
 .../RouteStartupOrderWithDefaultTest.java          |    4 +-
 .../org/apache/camel/processor/RouteStopTest.java  |   12 +-
 .../processor/RouteTopLevelMisconfiguredTest.java  |   22 +-
 ...RouteWithConstantFieldFromExchangeFailTest.java |    4 +-
 .../RouteWithConstantFieldFromExchangeTest.java    |    4 +-
 ...utingSlipContextScopedOnExceptionIssueTest.java |   54 +-
 .../apache/camel/processor/RoutingSlipDslTest.java |    4 +-
 .../processor/RoutingSlipInOutAndInOnlyTest.java   |   13 +-
 .../camel/processor/RoutingSlipNoCacheTest.java    |    6 +-
 .../processor/RoutingSlipNoErrorHandlerTest.java   |   21 +-
 .../RoutingSlipNoSuchEndpointExceptionTest.java    |   16 +-
 .../processor/RoutingSlipOnExceptionTest.java      |    8 +-
 .../camel/processor/RoutingSlipRedeliverTest.java  |   65 +-
 ...outingSlipThrowExceptionFromExpressionTest.java |   10 +-
 .../apache/camel/processor/SagaFailuresTest.java   |   49 +-
 .../apache/camel/processor/SagaOptionsTest.java    |   26 +-
 .../camel/processor/SagaPropagationTest.java       |   68 +-
 .../java/org/apache/camel/processor/SagaTest.java  |   59 +-
 .../apache/camel/processor/SagaTimeoutTest.java    |   21 +-
 .../camel/processor/SamplingThrottlerTest.java     |   36 +-
 .../apache/camel/processor/ScriptExternalTest.java |    4 +-
 .../org/apache/camel/processor/ScriptTest.java     |    4 +-
 .../processor/SendExchangePatternOptionTest.java   |    7 +-
 .../camel/processor/SendToNoErrorHandlerTest.java  |   21 +-
 .../camel/processor/SetBodyProcessorTest.java      |   14 +-
 .../camel/processor/SetExchangePatternTest.java    |   20 +-
 .../SetHeaderUsingDslExpressionsTest.java          |   44 +-
 .../apache/camel/processor/SetPropertyTest.java    |    5 +-
 .../processor/ShutdownCompleteAllTasksTest.java    |    7 +-
 .../ShutdownCompleteCurrentTaskOnlyTest.java       |    6 +-
 .../apache/camel/processor/ShutdownDeferTest.java  |   17 +-
 .../camel/processor/ShutdownNotDeferTest.java      |   10 +-
 .../ShutdownSedaAndDirectEndpointTest.java         |   10 +-
 .../processor/SimpleProcessorIdAwareTest.java      |   13 +-
 .../camel/processor/SimpleResultTypeRouteTest.java |    8 +-
 .../processor/SimpleSingleOutputMockTest.java      |    1 -
 .../camel/processor/SimpleTryCatchFinallyTest.java |   14 +-
 .../camel/processor/SimpleTryFinallyTest.java      |    8 +-
 .../SimpleTryThrowExceptionFinallyTest.java        |   11 +-
 .../org/apache/camel/processor/SimulatorTest.java  |    8 +-
 .../org/apache/camel/processor/SortBodyTest.java   |    4 +-
 .../apache/camel/processor/SortExpressionTest.java |    2 +-
 .../camel/processor/SplitAggregateInOutTest.java   |   48 +-
 .../camel/processor/SplitCustomExpressionTest.java |    6 +-
 .../camel/processor/SplitGroupMultiLinesTest.java  |    3 +-
 .../camel/processor/SplitGroupMultiXmlTest.java    |    8 +-
 .../processor/SplitGroupMultiXmlTokenTest.java     |   14 +-
 .../camel/processor/SplitGroupSkipFirstTest.java   |    8 +-
 .../SplitGroupWrappedMultiXmlTokenTest.java        |   19 +-
 .../camel/processor/SplitIteratorNullTest.java     |    4 +-
 .../camel/processor/SplitParallelTimeoutTest.java  |   23 +-
 .../processor/SplitRefCustomExpressionTest.java    |    6 +-
 ...ubUnitOfWorkStopOnExceptionAndParallelTest.java |   21 +-
 ...SplitSubUnitOfWorkStopOnExceptionIssueTest.java |   23 +-
 .../SplitSubUnitOfWorkStopOnExceptionTest.java     |   21 +-
 .../camel/processor/SplitSubUnitOfWorkTest.java    |   25 +-
 .../processor/SplitTokenizerGroupDynamicTest.java  |   12 +-
 .../camel/processor/SplitTokenizerGroupTest.java   |   12 +-
 .../processor/SplitTokenizerNamespaceTest.java     |   46 +-
 .../processor/SplitTokenizerRegexpGroupTest.java   |    4 +-
 .../apache/camel/processor/SplitTokenizerTest.java |   48 +-
 .../processor/SplitTokenizerXmlMultilineTest.java  |   13 +-
 .../camel/processor/SplitTwoSubUnitOfWorkTest.java |   41 +-
 .../apache/camel/processor/SplitWithEndTest.java   |   32 +-
 .../camel/processor/SplitterCollateTest.java       |    4 +-
 .../processor/SplitterCompletedPropertyTest.java   |   10 +-
 .../camel/processor/SplitterMethodCallTest.java    |    8 +-
 .../SplitterNoAggregationStrategyTest.java         |    7 +-
 .../processor/SplitterNoStopOnExceptionTest.java   |   10 +-
 .../processor/SplitterNullBodyParallelTest.java    |   12 +-
 .../camel/processor/SplitterNullBodyTest.java      |   14 +-
 .../camel/processor/SplitterOnCompletionTest.java  |    5 +-
 .../SplitterOnPrepareExceptionStreamingTest.java   |    4 +-
 .../processor/SplitterOnPrepareExceptionTest.java  |    4 +-
 .../camel/processor/SplitterOnPrepareTest.java     |    4 +-
 .../processor/SplitterParallelAggregateTest.java   |   14 +-
 .../processor/SplitterParallelBigFileTest.java     |    8 +-
 .../SplitterParallelNoStopOnExceptionTest.java     |   30 +-
 .../SplitterParallelStopOnExceptionTest.java       |   27 +-
 ...ParallelStopOnExceptionWithOnExceptionTest.java |   21 +-
 .../apache/camel/processor/SplitterPojoTest.java   |   35 +-
 .../processor/SplitterPropertyContinuedTest.java   |   29 +-
 ...SplitterShareUnitOfWorkCompletionAwareTest.java |    8 +-
 .../apache/camel/processor/SplitterSkipTest.java   |    4 +-
 .../processor/SplitterStopOnExceptionTest.java     |    8 +-
 ...SplitterStopOnExceptionWithOnExceptionTest.java |   21 +-
 .../camel/processor/SplitterStreamCacheTest.java   |   12 +-
 .../SplitterStreamCachingInSubRouteTest.java       |   16 +-
 .../SplitterStreamingErrorHandlingTest.java        |   28 +-
 ...rStreamingStopOnExceptionErrorHandlingTest.java |   22 +-
 .../processor/SplitterStreamingUoWIssueTest.java   |   13 +-
 .../org/apache/camel/processor/SplitterTest.java   |   36 +-
 .../SplitterThrowExceptionFromExpressionTest.java  |   11 +-
 .../camel/processor/SplitterUoWIssueTest.java      |   13 +-
 .../processor/SplitterUseOriginalLoopTest.java     |   12 +-
 ...litterUseOriginalNotPropagateExceptionTest.java |   13 +-
 .../processor/SplitterWireTapStreamCacheTest.java  |   22 +-
 .../SplitterWithCustomThreadPoolExecutorTest.java  |   21 +-
 .../processor/SplitterWithDualMulticastTest.java   |   26 +-
 .../camel/processor/SplitterWithMulticastTest.java |   17 +-
 .../SplitterWithScannerIoExceptionTest.java        |   10 +-
 .../camel/processor/SplitterWithXqureyTest.java    |   26 +-
 .../camel/processor/StepEventNotifierTest.java     |   19 +-
 .../java/org/apache/camel/processor/StepTest.java  |   11 +-
 .../camel/processor/StickyLoadBalanceTest.java     |    6 +-
 .../StreamCachingCustomShouldSpoolRuleTest.java    |   12 +-
 .../camel/processor/StreamCachingInOutTest.java    |    2 +-
 .../processor/StreamCachingOnlyRouteTest.java      |    2 +-
 .../camel/processor/StreamCachingPerRouteTest.java |    2 +-
 .../processor/StreamCachingRecipientListTest.java  |    4 +-
 .../processor/StreamCachingRoutingSlipTest.java    |    4 +-
 .../StreamCachingSpoolDirectoryQuarkusTest.java    |   11 +-
 .../processor/StreamCachingXPathRouteTest.java     |    7 +-
 ...SourceContentBasedRouterNoErrorHandlerTest.java |   10 +-
 ...tentBasedRouterSSEnabledOnCamelContextTest.java |   11 +-
 .../StreamSourceContentBasedRouterTest.java        |   15 +-
 .../ThreadsCoreAndMaxPoolInvalidTest.java          |    6 +-
 .../ThreadsCoreAndMaxPoolKeepAliveTimeTest.java    |    8 +-
 .../camel/processor/ThreadsCoreAndMaxPoolTest.java |   11 +-
 .../camel/processor/ThreadsCorePoolTest.java       |   41 +-
 .../apache/camel/processor/ThreadsDefaultTest.java |    4 +-
 .../camel/processor/ThreadsInvalidConfigTest.java  |   34 +-
 .../camel/processor/ThreadsMaxQueueSizeTest.java   |   11 +-
 .../processor/ThreadsRejectedExecutionTest.java    |   77 +-
 .../camel/processor/ThreadsRejectedPolicyTest.java |    9 +-
 .../camel/processor/ThreadsRequestReplyTest.java   |   27 +-
 .../processor/ThreadsZeroInCoreAndMaxPoolTest.java |   16 +-
 .../ThrottlerAsyncDelayedCallerRunsTest.java       |    9 +-
 .../camel/processor/ThrottlerAsyncDelayedTest.java |    4 +-
 .../apache/camel/processor/ThrottlerDslTest.java   |    8 +-
 .../processor/ThrottlerInvalidConfiguredTest.java  |    2 +-
 .../camel/processor/ThrottlerMethodCallTest.java   |    6 +-
 .../camel/processor/ThrottlerNullEvalTest.java     |    2 +-
 .../org/apache/camel/processor/ThrottlerTest.java  |   40 +-
 .../processor/ThrottlerThreadPoolProfileTest.java  |    6 +-
 ...xceptionRoutePolicyHalfOpenHandlerSedaTest.java |   36 +-
 ...ingExceptionRoutePolicyHalfOpenHandlerTest.java |   38 +-
 ...ThrottlingExceptionRoutePolicyHalfOpenTest.java |   31 +-
 ...lingExceptionRoutePolicyKeepOpenOnInitTest.java |    6 +-
 ...tlingExceptionRoutePolicyOpenViaConfigTest.java |    8 +-
 .../ThrottlingExceptionRoutePolicyTest.java        |   30 +-
 .../camel/processor/ThrottlingGroupingTest.java    |   44 +-
 .../ThrottlingInflightRoutePolicyTest.java         |    5 +-
 .../camel/processor/ThrowExceptionMessageTest.java |    5 +-
 .../processor/ThrowExceptionNullMessageTest.java   |    5 +-
 .../apache/camel/processor/ThrowExceptionTest.java |    5 +-
 .../apache/camel/processor/ToDynamicEmptyTest.java |    3 +-
 .../camel/processor/ToDynamicIgnoreTest.java       |    3 +-
 ...DynamicLanguageSimpleAndXPathAndHeaderTest.java |    3 +-
 .../ToDynamicLanguageSimpleAndXPathTest.java       |    3 +-
 .../processor/ToDynamicLanguageXPathTest.java      |    3 +-
 .../camel/processor/ToDynamicRawAndXPathTest.java  |    3 +-
 .../apache/camel/processor/ToDynamicRawTest.java   |    3 +-
 .../processor/ToDynamicSendDynamicAwareTest.java   |    4 +-
 .../org/apache/camel/processor/ToDynamicTest.java  |    3 +-
 .../camel/processor/ToEndpointPropertyTest.java    |    2 -
 .../camel/processor/TopicLoadBalanceTest.java      |    6 +-
 .../apache/camel/processor/TraceDelayerTest.java   |    2 +-
 .../camel/processor/TraceInterceptorTest.java      |   23 +-
 .../camel/processor/TracePerRouteManualTest.java   |    2 +-
 .../camel/processor/TracerConfigurationTest.java   |    2 +-
 .../processor/TransformBeanExceptionTest.java      |   15 +-
 .../processor/TransformExternalScriptTest.java     |    4 +-
 .../TransformProcessorWithHeaderTest.java          |    9 +-
 .../org/apache/camel/processor/TransformTest.java  |    1 +
 .../camel/processor/TransformViaDSLTest.java       |    1 +
 .../apache/camel/processor/TransformXpathTest.java |    6 +-
 .../processor/TripleNestedChoiceIssueTest.java     |   19 +-
 .../TryCatchCaughtExceptionFinallyTest.java        |   35 +-
 .../processor/TryCatchCaughtExceptionTest.java     |   21 +-
 .../TryCatchCaughtExceptionTwoTimesTest.java       |   40 +-
 .../processor/TryCatchContinueToRouteTest.java     |   20 +-
 .../TryCatchMustHaveExceptionConfiguredTest.java   |   10 +-
 .../camel/processor/TryCatchNestedChoiceTest.java  |   31 +-
 .../camel/processor/TryCatchRecipientListTest.java |  135 +-
 .../processor/TryFinallyCaughtExceptionTest.java   |    9 +-
 .../TryProcessorHandleWrappedExceptionTest.java    |   16 +-
 .../TryProcessorMultipleExceptionTest.java         |   13 +-
 .../camel/processor/TryProcessorOnWhenTest.java    |   28 +-
 .../apache/camel/processor/TryProcessorTest.java   |   49 +-
 .../TypeConverterRegistryStatsPerformanceTest.java |    6 +-
 .../camel/processor/UnitOfWorkProducerTest.java    |    3 +-
 .../UnitOfWorkSynchronizationAdapterTest.java      |    2 +-
 .../org/apache/camel/processor/UnitOfWorkTest.java |    5 +-
 .../processor/UnitOfWorkWithAsyncFlowTest.java     |    1 +
 .../org/apache/camel/processor/ValidateIdTest.java |    7 +-
 .../apache/camel/processor/ValidateRegExpTest.java |   19 +-
 .../camel/processor/ValidateSimpleRegExpTest.java  |    8 +-
 .../apache/camel/processor/ValidateSimpleTest.java |    8 +-
 .../processor/ValidatingDomProcessorTest.java      |    8 +-
 .../ValidatingProcessorFromSourceTest.java         |    2 +-
 .../processor/ValidatingProcessorFromUrlTest.java  |    3 +-
 .../ValidatingProcessorNotUseSharedSchemaTest.java |   24 +-
 .../camel/processor/ValidatingProcessorTest.java   |   34 +-
 .../ValidationFinallyBlockNoCatchTest.java         |   13 +-
 .../processor/ValidationFinallyBlockTest.java      |    5 +-
 .../org/apache/camel/processor/ValidationTest.java |   24 +-
 ...dationWithErrorInHandleAndFinallyBlockTest.java |   16 +-
 .../processor/ValidationWithExceptionTest.java     |    6 +-
 .../ValidationWithFinallyBlockPipelineTest.java    |   15 +-
 ...lidationWithHandlePipelineAndExceptionTest.java |    8 +-
 .../ValidationWithHandlePipelineTest.java          |   10 +-
 .../ValidationWithInFlowExceptionTest.java         |    6 +-
 .../ValidationWithMultipleHandlesTest.java         |   12 +-
 ...lidationWithNestedFinallyBlockPipelineTest.java |   15 +-
 .../camel/processor/VerySimpleDirectTest.java      |    2 +-
 .../processor/WeightedRandomLoadBalanceTest.java   |   38 +-
 .../WeightedRoundRobinLoadBalanceTest.java         |   39 +-
 .../processor/WireTapBeanAsProcessorTest.java      |    9 +-
 .../apache/camel/processor/WireTapBeanTest.java    |   12 +-
 .../camel/processor/WireTapCustomPool2Test.java    |   15 +-
 .../camel/processor/WireTapCustomPoolTest.java     |   15 +-
 .../camel/processor/WireTapExpressionTest.java     |    5 +-
 .../camel/processor/WireTapLogEndpointTest.java    |    8 +-
 .../org/apache/camel/processor/WireTapLogTest.java |    8 +-
 .../camel/processor/WireTapNewExchangeTest.java    |   10 +-
 .../camel/processor/WireTapOnExceptionTest.java    |    4 +-
 .../camel/processor/WireTapOnPrepareRefTest.java   |    4 +-
 .../camel/processor/WireTapOnPrepareTest.java      |    4 +-
 .../camel/processor/WireTapShutdownBeanTest.java   |   11 +-
 .../camel/processor/WireTapShutdownRouteTest.java  |   14 +-
 .../camel/processor/WireTapStreamCachingTest.java  |   15 +-
 .../org/apache/camel/processor/WireTapTest.java    |   18 +-
 ...WireTapUsingFireAndForgetCopyAsDefaultTest.java |   32 +-
 .../WireTapUsingFireAndForgetCopyTest.java         |   34 +-
 .../processor/WireTapUsingFireAndForgetTest.java   |   14 +-
 .../camel/processor/WireTapUsingMulticastTest.java |    1 +
 .../camel/processor/WireTapVoidBeanTest.java       |    8 +-
 .../apache/camel/processor/XPathChoiceTest.java    |    9 +-
 .../apache/camel/processor/XPathFilterTest.java    |    4 +-
 ...ithNamespaceBuilderFilterAndResultTypeTest.java |    9 +-
 .../XPathWithNamespaceBuilderFilterTest.java       |   13 +-
 .../processor/XPathWithNamespacesFilterTest.java   |   10 +-
 ...ggregateAggregationStrategyIsPredicateTest.java |    4 +-
 .../AggregateClosedCorrelationKeyTest.java         |   13 +-
 .../aggregator/AggregateCompleteAllOnStopTest.java |    6 +-
 ...yBatchConsumerSendEmptyMessageWhenIdleTest.java |    5 +-
 ...gateCompletionAwareAggregationStrategyTest.java |    7 +-
 .../AggregateCompletionIntervalTest.java           |   15 +-
 ...gregateCompletionOnNewCorrelationGroupTest.java |    9 +-
 .../aggregator/AggregateCompletionOnlyOneTest.java |    5 +-
 .../aggregator/AggregateCompletionOnlyTwoTest.java |    5 +-
 .../AggregateCompletionPredicateTest.java          |    6 +-
 ...ggregateCompletionSizeAndBatchConsumerTest.java |    6 +-
 ...gateCompletionSizeExpressionAndTimeoutTest.java |    9 +-
 .../AggregateConcurrentPerCorrelationKeyTest.java  |    4 +-
 .../aggregator/AggregateControllerTest.java        |    8 +-
 .../aggregator/AggregateDiscardOnFailureTest.java  |   10 +-
 .../aggregator/AggregateDiscardOnTimeoutTest.java  |   18 +-
 .../processor/aggregator/AggregateDslTest.java     |   26 +-
 .../AggregateEagerCheckCompletionTest.java         |   14 +-
 .../AggregateExpressionSizeFallbackTest.java       |   12 +-
 .../AggregateExpressionSizeOverrideFixedTest.java  |    7 +-
 ...gateExpressionSizeOverrideFixedTimeoutTest.java |    9 +-
 .../aggregator/AggregateExpressionSizeTest.java    |   11 +-
 .../aggregator/AggregateExpressionTest.java        |    6 +-
 .../AggregateExpressionTimeoutFallbackTest.java    |   10 +-
 .../AggregateExpressionTimeoutPerGroupTest.java    |   13 +-
 .../aggregator/AggregateExpressionTimeoutTest.java |   11 +-
 ...eCompletionHeaderInAggregationStrategyTest.java |   13 +-
 .../AggregateForceCompletionHeaderTest.java        |   16 +-
 ...AggregateForceCompletionOnStopParallelTest.java |   10 +-
 .../AggregateForceCompletionOnStopTest.java        |    8 +-
 .../aggregator/AggregateFromWireTapTest.java       |   23 +-
 .../aggregator/AggregateGroupMessageTest.java      |    7 +-
 .../AggregateGroupedExchangeBatchSizeTest.java     |   18 +-
 ...roupedExchangeCompletionExpressionSizeTest.java |    8 +-
 ...AggregateGroupedExchangeCompletionSizeTest.java |    6 +-
 ...gateGroupedExchangeMultipleCorrelationTest.java |   12 +-
 .../AggregateGroupedExchangeSizePredicateTest.java |    9 +-
 .../AggregateGroupedExchangeSizeTest.java          |    7 +-
 .../aggregator/AggregateGroupedExchangeTest.java   |   13 +-
 .../AggregateIgnoreInvalidCorrelationKeysTest.java |   12 +-
 .../aggregator/AggregateLostGroupIssueTest.java    |   17 +-
 .../aggregator/AggregateMultipleSourceTest.java    |    6 +-
 .../AggregateNewExchangeAndConfirmTest.java        |    8 +-
 .../AggregateParallelProcessingTest.java           |   12 +-
 .../AggregatePreCompleteAwareStrategyTest.java     |    6 +-
 ...gregatePreCompleteAwareStrategyTimeoutTest.java |    7 +-
 .../aggregator/AggregateProcessorTest.java         |    5 +-
 ...egateProcessorTimeoutCompletionRestartTest.java |   21 +-
 .../AggregateRepositoryReturnNullTest.java         |    4 +-
 .../AggregateShouldSkipFilteredExchangesTest.java  |   12 +-
 .../AggregateShutdownThreadPoolTest.java           |   10 +-
 .../AggregateSimpleExpressionIssueTest.java        |   11 +-
 .../AggregateSimplePredicateEagerTest.java         |   15 +-
 .../aggregator/AggregateSimplePredicateTest.java   |   11 +-
 .../aggregator/AggregateSimpleSizeTest.java        |   11 +-
 .../aggregator/AggregateSimpleTimeoutTest.java     |    9 +-
 .../aggregator/AggregateStrategyServiceTest.java   |    5 +-
 .../aggregator/AggregateThreadPoolProfileTest.java |   11 +-
 .../aggregator/AggregateTimeoutManualTest.java     |    5 +-
 .../aggregator/AggregateTimeoutOnlyTest.java       |    6 +-
 .../processor/aggregator/AggregateTimeoutTest.java |   25 +-
 .../AggregateTimeoutWithExecutorServiceTest.java   |   13 +-
 .../AggregateTimeoutWithNoExecutorServiceTest.java |   18 +-
 .../AggregateUnknownExecutorServiceRefTest.java    |   11 +-
 .../AggregationStrategyAsPredicateTest.java        |    7 +-
 ...trategyBeanAdapterAllowNullOldExchangeTest.java |    5 +-
 ...ggregationStrategyBeanAdapterAllowNullTest.java |    5 +-
 ...tionStrategyBeanAdapterNonStaticMethodTest.java |    5 +-
 ...ggregationStrategyBeanAdapterOneMethodTest.java |    5 +-
 ...nAdapterPollEnrichAllowNullNewExchangeTest.java |    4 +-
 ...gregationStrategyBeanAdapterPollEnrichTest.java |    4 +-
 ...gationStrategyBeanAdapterRefMethodNameTest.java |    5 +-
 .../AggregationStrategyBeanAdapterRefTest.java     |    5 +-
 ...egationStrategyBeanAdapterStaticMethodTest.java |    5 +-
 .../AggregationStrategyBeanAdapterTest.java        |    5 +-
 ...egyBeanAdapterWithHeadersAndPropertiesTest.java |   11 +-
 ...regationStrategyBeanAdapterWithHeadersTest.java |    5 +-
 .../AggregationStrategyCompleteByPropertyTest.java |    7 +-
 .../AggregationStrategyLifecycleTest.java          |    7 +-
 .../aggregator/AggregatorAndOnExceptionTest.java   |   13 +-
 .../aggregator/AggregatorConcurrencyTest.java      |   24 +-
 .../aggregator/AggregatorExceptionHandleTest.java  |    6 +-
 .../AggregatorExceptionInPredicateTest.java        |   47 +-
 .../aggregator/AggregatorExceptionTest.java        |   13 +-
 .../aggregator/AggregatorLockingTest.java          |   23 +-
 .../camel/processor/aggregator/AggregatorTest.java |   20 +-
 .../aggregator/AlbertoAggregatorTest.java          |   61 +-
 .../aggregator/BeanBeforeAggregateIssueTest.java   |    8 +-
 .../CustomAggregationStrategyServiceTest.java      |    5 +-
 .../aggregator/CustomAggregationStrategyTest.java  |   14 +-
 ...ionStrategyCompletionFromBatchConsumerTest.java |    6 +-
 ...ustomListAggregationStrategyEmptySplitTest.java |   13 +-
 .../CustomListAggregationStrategySplitTest.java    |    6 +-
 .../CustomListAggregationStrategyTest.java         |    5 +-
 .../DefaultAggregatorCollectionTest.java           |   11 +-
 .../DistributedCompletionIntervalTest.java         |   20 +-
 ...DistributedConcurrentPerCorrelationKeyTest.java |    8 +-
 .../DistributedOptimisticLockFailingTest.java      |   26 +-
 .../aggregator/DistributedTimeoutTest.java         |   23 +-
 .../EnricherRouteNumberOfProcessorTest.java        |   82 +-
 .../aggregator/OptimisticLockRetryPolicyTest.java  |    2 +-
 .../PredicateAggregatorCollectionTest.java         |   13 +-
 .../SplitRouteNumberOfProcessorTest.java           |   77 +-
 .../aggregator/StringAggregationStrategyTest.java  |   29 +-
 ...yncDeadLetterChannelExecutorServiceRefTest.java |   19 +-
 .../async/AsyncDeadLetterChannelTest.java          |   16 +-
 .../async/AsyncDefaultErrorHandlerTest.java        |   15 +-
 .../processor/async/AsyncEndpointCBRTest.java      |   31 +-
 .../AsyncEndpointCustomAsyncInterceptorTest.java   |   35 +-
 .../async/AsyncEndpointCustomInterceptorTest.java  |   36 +-
 .../async/AsyncEndpointCustomRoutePolicyTest.java  |   26 +-
 .../processor/async/AsyncEndpointDelayUoWTest.java |   31 +-
 .../async/AsyncEndpointDoWhileLoopTest.java        |   15 +-
 .../async/AsyncEndpointDualMulticastTest.java      |   21 +-
 .../AsyncEndpointDualTopicLoadBalanceTest.java     |   12 +-
 .../async/AsyncEndpointDynamicRouterTest.java      |   17 +-
 .../processor/async/AsyncEndpointEnricherTest.java |   28 +-
 .../AsyncEndpointEventNotifierSendingTest.java     |    7 +-
 .../async/AsyncEndpointEventNotifierTest.java      |   11 +-
 ...AsyncEndpointFailOverLoadBalanceMixed2Test.java |   36 +-
 ...AsyncEndpointFailOverLoadBalanceMixed3Test.java |   42 +-
 .../AsyncEndpointFailOverLoadBalanceMixedTest.java |   36 +-
 ...ncEndpointFailOverLoadBalanceOnlyAsyncTest.java |   28 +-
 ...ncEndpointFailedAfterDeadLetterChannelTest.java |   29 +-
 ...EndpointFailedAfterOnExceptionContinueTest.java |   32 +-
 ...cEndpointFailedAfterOnExceptionHandledTest.java |   29 +-
 .../async/AsyncEndpointFailedAfterTest.java        |   29 +-
 .../AsyncEndpointFailureProcessorContinueTest.java |   35 +-
 .../async/AsyncEndpointFailureProcessorTest.java   |   35 +-
 .../processor/async/AsyncEndpointFilterTest.java   |   30 +-
 .../async/AsyncEndpointIdempotentConsumerTest.java |   29 +-
 .../processor/async/AsyncEndpointLoopTest.java     |   31 +-
 ...pointMulticastFineGrainedErrorHandlingTest.java |   13 +-
 .../async/AsyncEndpointMulticastTest.java          |   30 +-
 .../processor/async/AsyncEndpointPipelineTest.java |    5 +-
 .../processor/async/AsyncEndpointPolicyTest.java   |   38 +-
 .../async/AsyncEndpointRecipientList2Test.java     |   31 +-
 .../async/AsyncEndpointRecipientList3Test.java     |   32 +-
 .../async/AsyncEndpointRecipientList4Test.java     |   32 +-
 .../async/AsyncEndpointRecipientListBean3Test.java |   32 +-
 .../async/AsyncEndpointRecipientListBean4Test.java |   32 +-
 .../async/AsyncEndpointRecipientListBeanTest.java  |   28 +-
 ...tRecipientListFineGrainedErrorHandlingTest.java |   10 +-
 .../AsyncEndpointRecipientListParallel2Test.java   |   31 +-
 .../AsyncEndpointRecipientListParallel3Test.java   |   32 +-
 .../AsyncEndpointRecipientListParallel4Test.java   |   32 +-
 .../AsyncEndpointRecipientListParallel5Test.java   |   33 +-
 .../AsyncEndpointRecipientListParallelTest.java    |   28 +-
 .../async/AsyncEndpointRecipientListTest.java      |   28 +-
 ...RedeliveryErrorHandlerNonBlockedDelay2Test.java |   50 +-
 ...RedeliveryErrorHandlerNonBlockedDelay3Test.java |   27 +-
 ...tRedeliveryErrorHandlerNonBlockedDelayTest.java |   50 +-
 .../AsyncEndpointRoundRobinLoadBalanceTest.java    |   31 +-
 .../async/AsyncEndpointRoutingSlip2Test.java       |    5 +-
 .../async/AsyncEndpointRoutingSlip3Test.java       |   36 +-
 .../async/AsyncEndpointRoutingSlipBean2Test.java   |    5 +-
 .../async/AsyncEndpointRoutingSlipBean3Test.java   |   36 +-
 ...syncEndpointRoutingSlipBeanNonBlockingTest.java |    8 +-
 .../async/AsyncEndpointRoutingSlipBeanTest.java    |    6 +-
 .../async/AsyncEndpointRoutingSlipTest.java        |    5 +-
 .../processor/async/AsyncEndpointSamplingTest.java |   30 +-
 .../async/AsyncEndpointSedaInOnlyTest.java         |   43 +-
 .../processor/async/AsyncEndpointSedaTest.java     |   29 +-
 .../AsyncEndpointSingleTopicLoadBalanceTest.java   |   12 +-
 ...cEndpointSplitFineGrainedErrorHandlingTest.java |   23 +-
 .../processor/async/AsyncEndpointSplitTest.java    |   30 +-
 ...pointSplitUseLatestAggregationStrategyTest.java |   30 +-
 .../processor/async/AsyncEndpointStopTest.java     |   29 +-
 .../async/AsyncEndpointSynchronousFalseTest.java   |   26 +-
 .../async/AsyncEndpointSynchronousTest.java        |   26 +-
 .../camel/processor/async/AsyncEndpointTest.java   |   26 +-
 .../async/AsyncEndpointTransformTest.java          |   30 +-
 .../async/AsyncEndpointTryCatchFinally2Test.java   |   45 +-
 .../async/AsyncEndpointTryCatchFinally3Test.java   |   55 +-
 .../async/AsyncEndpointTryCatchFinally4Test.java   |   15 +-
 .../async/AsyncEndpointTryCatchFinally5Test.java   |   21 +-
 .../async/AsyncEndpointTryCatchFinallyTest.java    |   33 +-
 .../async/AsyncEndpointUoWFailedTest.java          |   31 +-
 .../processor/async/AsyncEndpointUoWTest.java      |   30 +-
 .../async/AsyncEndpointWithDelayerTest.java        |   28 +-
 .../async/AsyncEndpointWithStreamCachingTest.java  |   28 +-
 .../async/AsyncEndpointWithTracingTest.java        |   28 +-
 ...FailureProcessorWithRedeliveryAndDelayTest.java |   33 +-
 .../AsyncFailureProcessorWithRedeliveryTest.java   |   33 +-
 .../processor/async/AsyncInOnlyEndpointTest.java   |   28 +-
 .../apache/camel/processor/async/AsyncMDCTest.java |   41 +-
 .../async/AsyncNestedTripleChoiceIssueTest.java    |   22 +-
 ...xceptionFailureProcessorWithRedeliveryTest.java |   21 +-
 .../AsyncProcessorAwaitManagerInterruptTest.java   |   34 +-
 ...sorAwaitManagerInterruptWithRedeliveryTest.java |   13 +-
 .../async/AsyncProcessorAwaitManagerTest.java      |   37 +-
 .../camel/processor/async/AsyncProducerTest.java   |   24 +-
 .../processor/async/AsyncRouteWithErrorTest.java   |   38 +-
 .../async/AsyncSedaInOnlyEndpointTest.java         |   28 +-
 .../processor/async/AsyncTwoEndpointTest.java      |   40 +-
 .../camel/processor/async/MyAsyncComponent.java    |    2 +-
 .../camel/processor/async/MyAsyncProducer.java     |    2 +-
 .../EnrichExpressionIgnoreInvalidEndpointTest.java |    4 +-
 .../enricher/EnrichExpressionNoCacheTest.java      |    4 +-
 .../processor/enricher/EnrichExpressionTest.java   |    4 +-
 .../enricher/EnricherAggregateOnExceptionTest.java |   11 +-
 .../EnricherAsyncUnhandledExceptionTest.java       |   21 +-
 .../EnricherDefaultAggregationStrategyTest.java    |    4 +-
 .../camel/processor/enricher/EnricherDslTest.java  |    9 +-
 .../processor/enricher/EnricherNoResourceTest.java |    9 +-
 .../processor/enricher/EnricherSendEventTest.java  |   39 +-
 .../camel/processor/enricher/EnricherTest.java     |   33 +-
 .../camel/processor/enricher/FailureProcessor.java |    1 -
 .../enricher/PollEnrichBridgeErrorHandlerTest.java |    5 +-
 ...lEnrichExpressionIgnoreInvalidEndpointTest.java |    4 +-
 .../enricher/PollEnrichExpressionNoCacheTest.java  |    4 +-
 .../enricher/PollEnrichExpressionTest.java         |    4 +-
 ...ollEnrichFileCustomAggregationStrategyTest.java |   15 +-
 ...llEnrichFileDefaultAggregationStrategyTest.java |   13 +-
 .../processor/enricher/PollEnrichNullBodyTest.java |    4 +-
 .../PollEnricherAggregateOnExceptionTest.java      |    8 +-
 .../enricher/PollEnricherNoResourceTest.java       |   10 +-
 .../processor/enricher/PollEnricherRefTest.java    |    2 +-
 .../camel/processor/enricher/PollEnricherTest.java |   31 +-
 .../camel/processor/enricher/SampleAggregator.java |    4 +-
 .../errorhandler/ErrorHandlerSupportTest.java      |    3 +-
 .../CustomExceptionPolicyStrategyTest.java         |   22 +-
 .../DefaultExceptionPolicyStrategyTest.java        |    4 +-
 ...ltExceptionPolicyStrategyUsingOnlyWhenTest.java |    6 +-
 ...efaultExceptionPolicyStrategyUsingWhenTest.java |   14 +-
 .../intercept/FromFileInterceptSendToIssue.java    |    6 +-
 .../intercept/IntercepFromWithPredicateTest.java   |    6 +-
 .../InterceptFromEndpointInstanceTest.java         |    4 +-
 .../InterceptFromEndpointRefFixedTest.java         |    2 +-
 .../intercept/InterceptFromEndpointRefTest.java    |    2 +-
 .../InterceptFromEndpointRefUriFixedTest.java      |    4 +-
 .../intercept/InterceptFromEndpointRefUriTest.java |    4 +-
 .../intercept/InterceptFromRouteTest.java          |    5 +-
 .../intercept/InterceptFromSimpleLogTest.java      |    4 +-
 .../InterceptFromSimplePredicateTest.java          |    7 +-
 .../InterceptFromSimplePredicateWithStopTest.java  |    8 +-
 .../intercept/InterceptFromSimpleRouteTest.java    |    3 +-
 .../intercept/InterceptFromUriRegexTest.java       |    5 +-
 .../intercept/InterceptFromUriSimpleLogTest.java   |    2 +-
 .../InterceptFromUriWildcardHeaderUriTest.java     |    2 +-
 .../intercept/InterceptFromUriWildcardTest.java    |    5 +-
 .../intercept/InterceptFromWhenNoStopTest.java     |    2 +-
 .../processor/intercept/InterceptFromWhenTest.java |    2 +-
 .../intercept/InterceptFromWhenWithChoiceTest.java |    9 +-
 ...erceptFromWithPredicateAndProceedRouteTest.java |    2 +-
 .../InterceptFromWithPredicateRouteTest.java       |    2 +-
 .../intercept/InterceptFromWithStopRouteTest.java  |    4 +-
 .../InterceptFromWithoutProceedRouteTest.java      |    2 +-
 .../InterceptSendToEndpointAfterTest.java          |   27 +-
 ...nterceptSendToEndpointConditionalSkip2Test.java |   19 +-
 ...nterceptSendToEndpointConditionalSkip3Test.java |   14 +-
 ...InterceptSendToEndpointConditionalSkipTest.java |   61 +-
 .../InterceptSendToEndpointDynamicTest.java        |   62 +-
 .../InterceptSendToEndpointInOnException.java      |   12 +-
 .../InterceptSendToEndpointMultipleRoutesTest.java |   16 +-
 ...nterceptSendToEndpointNormalizePatternTest.java |    4 +-
 .../intercept/InterceptSendToEndpointTest.java     |   66 +-
 .../InterceptSendToEndpointWithStopTest.java       |   10 +-
 .../intercept/InterceptSendToExceptionTest.java    |    1 -
 .../processor/intercept/InterceptSendToIssue.java  |    4 +-
 .../intercept/InterceptSimpleRouteStopTest.java    |    5 +-
 .../intercept/InterceptSimpleRouteTest.java        |    3 +-
 .../InterceptSimpleRouteWhenStopTest.java          |    5 +-
 .../intercept/InterceptSimpleRouteWhenTest.java    |    5 +-
 .../ParentChildInterceptStrategyTest.java          |   20 +-
 ...ipientListInterceptSendToEndpointException.java |    8 +-
 .../interceptor/AdviceWithAutoStartupTest.java     |    2 +-
 .../interceptor/AdviceWithLambdaTest.java          |   14 +-
 ...AdviceWithMockEndpointsHavingParameterTest.java |   11 +-
 .../interceptor/AdviceWithMockEndpointsTest.java   |    1 -
 .../AdviceWithMockEndpointsWithSkipTest.java       |    3 +-
 ...dviceWithMockMultipleEndpointsWithSkipTest.java |    3 +-
 .../AdviceWithRecipientListMockEndpointsTest.java  |    3 +-
 .../interceptor/AdviceWithReplaceFromTest.java     |    2 +-
 .../interceptor/AdviceWithRouteIdTest.java         |    7 +-
 .../interceptor/AdviceWithTasksMatchTest.java      |    8 +-
 .../AdviceWithTasksOnExceptionTest.java            |    8 +-
 .../interceptor/AdviceWithTasksSelectTest.java     |   11 +-
 .../processor/interceptor/AdviceWithTasksTest.java |    7 +-
 .../AdviceWithTasksToStringPatternTest.java        |   10 +-
 .../processor/interceptor/AdviceWithTest.java      |   14 +-
 .../interceptor/AdviceWithTryCatchTest.java        |   11 +-
 ...eWithTwoRoutesContextScopedOnExceptionTest.java |   12 +-
 .../AdviceWithTwoRoutesOnExceptionTest.java        |   34 +-
 .../interceptor/AdviceWithTwoRoutesTest.java       |   27 +-
 .../processor/interceptor/AdviceWithTypeTest.java  |    7 +-
 .../AdviceWithWeaveAfterLastSplitTest.java         |    2 +-
 .../AdviceWithWeaveByTypeOnExceptionTest.java      |   10 +-
 .../interceptor/AdviceWithWeaveFirstLastTest.java  |   13 +-
 .../interceptor/AdviceWithWeaveLastCBRTest.java    |   13 +-
 .../AdviceWithWeaveToUriAndAddLastTest.java        |    8 +-
 .../AuditInterceptorAsyncDelegateIssueTest.java    |    5 +-
 .../AuditInterceptorDelegateIssueTest.java         |    5 +-
 .../processor/interceptor/ConditionSupport.java    |    3 +-
 .../CustomInterceptorRouteWithChildOutputTest.java |   12 +-
 .../interceptor/DebugExceptionBreakpointTest.java  |   10 +-
 .../DebugExceptionEventBreakpointTest.java         |   10 +-
 .../interceptor/DebugSingleStepConditionTest.java  |    3 +-
 .../processor/interceptor/DebugSingleStepTest.java |    3 +-
 .../camel/processor/interceptor/DebugTest.java     |    3 +-
 .../InterceptorStrategyNotOrderedTest.java         |    3 +-
 .../InterceptorStrategyOrderedTest.java            |    3 +-
 .../processor/interceptor/NoStreamCachingTest.java |    1 +
 ...xtScopedOnExceptionCorrectRouteContextTest.java |   65 +-
 ...ScopedOnExceptionLoadBalancerStopRouteTest.java |   26 +-
 .../ContextScopedOnExceptionLogRouteTest.java      |   29 +-
 ...efaultErrorHandlerExchangeFormatterRefTest.java |    4 +-
 .../DefaultErrorHandlerRetryWhileTest.java         |    2 +-
 .../onexception/DoCatchDirectDynamicRouteTest.java |   18 +-
 .../DoCatchDirectRecipientListStreamingTest.java   |   18 +-
 .../DoCatchDirectRecipientListTest.java            |   24 +-
 .../onexception/DoCatchDirectRouteTest.java        |   18 +-
 .../onexception/MyFunctionalException.java         |    2 +-
 .../processor/onexception/OnCatchHandledTest.java  |    8 +-
 .../onexception/OnExceptionAfterRouteTest.java     |    7 +-
 ...xceptionAndDLCErrorHandlerIssueReverseTest.java |   11 +-
 .../OnExceptionAndDLCErrorHandlerIssueTest.java    |   11 +-
 .../OnExceptionCallSubRouteNoErrorHandlerTest.java |   17 +-
 .../onexception/OnExceptionComplexRouteTest.java   |   24 +-
 ...tionComplexWithNestedErrorHandlerRouteTest.java |   44 +-
 ...rorHandlerRouteWithDefaultErrorHandlerTest.java |   35 +-
 .../OnExceptionContinuePredicateTest.java          |   25 +-
 .../OnExceptionContinueSubRouteTest.java           |   15 +-
 .../OnExceptionContinueSubSubRouteTest.java        |   19 +-
 .../onexception/OnExceptionContinueTest.java       |   10 +-
 .../OnExceptionContinueTwoPredicateTest.java       |   31 +-
 .../onexception/OnExceptionContinueTwoTest.java    |   16 +-
 .../onexception/OnExceptionFromChoiceTest.java     |   10 +-
 .../OnExceptionFromChoiceUseOriginalBodyTest.java  |   19 +-
 ...ptionFromChoiceWithDefaultErrorHandlerTest.java |    9 +-
 ...onGlobalAndDLCErrorHandlerIssueReverseTest.java |   15 +-
 ...ExceptionGlobalAndDLCErrorHandlerIssueTest.java |   15 +-
 .../OnExceptionGlobalScopedRecursionTest.java      |  121 +-
 .../OnExceptionHandleAndThrowNewExceptionTest.java |   22 +-
 .../OnExceptionHandleAndTransformTest.java         |   33 +-
 ...dleAndTransformWithDefaultErrorHandlerTest.java |   35 +-
 .../OnExceptionHandledAndContinueTest.java         |    7 +-
 .../onexception/OnExceptionHandledTest.java        |    3 +-
 .../OnExceptionLoadBalancerDoubleIssueTest.java    |   10 +-
 .../onexception/OnExceptionMisconfiguredTest.java  |   11 +-
 ...nExceptionOccurredProcessorOnExceptionTest.java |    3 +-
 .../OnExceptionOccurredProcessorTest.java          |    3 +-
 ...ceptionProcessorInspectCausedExceptionTest.java |   14 +-
 ...CausedExceptionWithDefaultErrorHandlerTest.java |   14 +-
 .../onexception/OnExceptionRecursionTest.java      |   42 +-
 .../onexception/OnExceptionRetryUntilTest.java     |   25 +-
 ...ptionRetryUntilWithDefaultErrorHandlerTest.java |   17 +-
 .../onexception/OnExceptionRouteIdTest.java        |   13 +-
 .../OnExceptionRouteScopedRecursionTest.java       |   99 +-
 .../onexception/OnExceptionRouteTest.java          |   25 +-
 ...nExceptionRouteWithDefaultErrorHandlerTest.java |   10 +-
 .../onexception/OnExceptionSubRouteTest.java       |   26 +-
 ...ceptionSubRouteWithDefaultErrorHandlerTest.java |   13 +-
 .../OnExceptionUseOriginalBodyTest.java            |   14 +-
 .../OnExceptionUseOriginalMessageTest.java         |   34 +-
 .../onexception/OnExceptionWhenSimpleOgnlTest.java |    7 +-
 .../OnExceptionWireTapNewExchangeBodyTest.java     |    8 +-
 .../OnExceptionWithRouteAndContinueTest.java       |    7 +-
 .../OnExceptionWrappedExceptionTest.java           |    5 +-
 .../onexception/OnExceptionsPerRouteTest.java      |   11 +-
 .../onexception/RedeliverEntireRouteTest.java      |   20 +-
 ...ScopedOnExceptionLoadBalancerStopRouteTest.java |   18 +-
 .../RouteScopedOnExceptionSameTypeTest.java        |  163 +-
 .../resequencer/MyFileNameExpression.java          |    5 +-
 .../resequencer/ResequencerBatchOrderTest.java     |    9 +-
 .../resequencer/ResequencerEngineSync.java         |   22 +-
 .../resequencer/ResequencerEngineTest.java         |   25 +-
 .../resequencer/ResequencerFileNameTest.java       |    3 +-
 .../processor/resequencer/SequenceBuffer.java      |   10 +-
 .../camel/processor/resequencer/SequenceTest.java  |    3 +-
 .../processor/resequencer/TestComparatorTest.java  |    9 +-
 .../camel/processor/resequencer/TestObject.java    |    6 +-
 .../RoutingSlipCreateProducerFailedTest.java       |    3 +-
 .../RoutingSlipDataModificationTest.java           |    7 +-
 .../RoutingSlipIgnoreInvalidEndpointsTest.java     |   26 +-
 .../processor/routingslip/RoutingSlipPOJOTest.java |   14 +-
 .../processor/routingslip/RoutingSlipTest.java     |   16 +-
 .../RoutingSlipWithErrorHandlerTest.java           |    2 +-
 .../routingslip/RoutingSlipWithExceptionTest.java  |   27 +-
 .../validation/CatalogLSResourceResolver.java      |    8 +-
 .../impl/AbstractCamelCatalogTest.java             |   48 +-
 .../impl/RuntimeCamelCatalogTest.java              |    3 +-
 .../DefaultCamelContextEndpointCacheLimitTest.java |    5 +-
 .../DefaultCamelContextEndpointCacheTest.java      |    5 +-
 .../apache/camel/support/DefaultEndpointTest.java  |    6 +-
 .../camel/support/DefaultTimeoutMapTest.java       |    4 +-
 .../camel/support/GroupTokenIteratorTest.java      |    4 +-
 .../camel/support/IntrospectionSupportTest.java    |   36 +-
 ...opertyBindingSupportAutowireNestedDeepTest.java |    1 -
 .../PropertyBindingSupportAutowireNestedTest.java  |    1 -
 .../PropertyBindingSupportAutowireTest.java        |    1 -
 .../support/PropertyBindingSupportListTest.java    |    1 -
 .../support/PropertyBindingSupportMapTest.java     |    4 +-
 .../camel/support/PropertyBindingSupportTest.java  |   18 +-
 .../support/builder/RecordableInputStreamTest.java |   18 +-
 .../support/builder/RecordableReaderTest.java      |   18 +-
 .../support/component/ApiMethodHelperTest.java     |   33 +-
 .../component/ApiMethodPropertiesHelperTest.java   |    5 +-
 .../org/apache/camel/support/jndi/ExampleBean.java |    4 +-
 ...ndiCamelSingletonInitialContextFactoryTest.java |   19 +-
 .../support/jsse/AbstractJsseParametersTest.java   |    9 +-
 .../camel/support/jsse/FilterParametersTest.java   |   56 +-
 .../support/jsse/KeyManagersParametersTest.java    |   61 +-
 .../camel/support/jsse/KeyStoreParametersTest.java |   58 +-
 .../support/jsse/SSLContextParametersTest.java     |  231 ++-
 .../support/jsse/SecureRandomParametersTest.java   |   28 +-
 .../support/jsse/TrustManagersParametersTest.java  |   45 +-
 .../processor/DefaultExchangeFormatterTest.java    |    8 +-
 .../FileIdempotentStoreOrderingTest.java           |   62 +-
 .../org/apache/camel/urlhandler/pd/Handler.java    |   46 +-
 .../org/apache/camel/util/AnotherExampleBean.java  |    2 +-
 .../apache/camel/util/CaseInsensitiveMapTest.java  |   11 +-
 .../apache/camel/util/CreateModelFromXmlTest.java  |    4 +-
 .../util/DumpModelAsXmlAggregateRouteTest.java     |    8 +-
 ...mlChoiceFilterRoutePropertyPlaceholderTest.java |   25 +-
 .../util/DumpModelAsXmlChoiceFilterRouteTest.java  |   24 +-
 .../util/DumpModelAsXmlDanishCharactersTest.java   |    5 +-
 .../camel/util/DumpModelAsXmlNamespaceTest.java    |    5 +-
 .../camel/util/DumpModelAsXmlPlaceholdersTest.java |    3 +-
 .../util/DumpModelAsXmlRouteExpressionTest.java    |   16 +-
 .../util/DumpModelAsXmlRoutePredicateTest.java     |   16 +-
 .../util/DumpModelAsXmlSplitBodyRouteTest.java     |    5 +-
 ...elAsXmlSplitNestedChoiceEndChoiceRouteTest.java |   29 +-
 ...umpModelAsXmlSplitNestedChoiceEndRouteTest.java |   17 +-
 .../DumpModelAsXmlTransformRouteConstantTest.java  |    4 +-
 .../DumpModelAsXmlTransformRouteLanguageTest.java  |    4 +-
 .../util/DumpModelAsXmlTransformRouteTest.java     |    4 +-
 .../org/apache/camel/util/EndpointHelperTest.java  |    2 +-
 .../org/apache/camel/util/EventHelperTest.java     |   39 +-
 .../org/apache/camel/util/ExchangeHelperTest.java  |    1 +
 .../camel/util/ExpressionListComparatorTest.java   |    4 +-
 .../java/org/apache/camel/util/FileUtilTest.java   |   10 +-
 .../java/org/apache/camel/util/GZIPHelperTest.java |   12 +-
 .../org/apache/camel/util/IOHelperCharsetTest.java |   19 +-
 .../java/org/apache/camel/util/IOHelperTest.java   |   14 +-
 .../org/apache/camel/util/MessageHelperTest.java   |   26 +-
 .../java/org/apache/camel/util/MyDummyObject.java  |    2 +-
 .../NoClassDefFoundErrorWrapExceptionTest.java     |    5 +-
 .../org/apache/camel/util/ObjectHelperTest.java    |   16 +-
 .../java/org/apache/camel/util/OgnlHelperTest.java |    2 +-
 .../org/apache/camel/util/PlatformHelperTest.java  |    8 +-
 .../org/apache/camel/util/ReflectionInjector.java  |    2 +-
 .../apache/camel/util/StingQuoteHelperTest.java    |    2 +-
 .../org/apache/camel/util/StringHelperTest.java    |   20 +-
 .../camel/util/UnsafeCharactersEncoderTest.java    |    4 +-
 .../toolbox/FlexibleAggregationStrategiesTest.java |  202 +-
 .../dsl/UndertowEndpointBuilderFactory.java        |   38 +
 .../modules/ROOT/assets/images}/apache-ignite.png  |  Bin
 .../ROOT/assets/images}/camel-direct-vm.png        |  Bin
 .../ROOT/assets/images}/camel_spark_cluster.png    |  Bin
 .../ROOT/assets/images}/camel_spark_driver.png     |  Bin
 .../modules/ROOT/assets/images/control_bus.png     |  Bin 0 -> 2438 bytes
 .../controlbus-component.data/ControlBus.gif       |  Bin 3705 -> 0 bytes
 .../modules/ROOT/assets/images}/qr-code.png        |  Bin
 docs/components/modules/ROOT/nav.adoc              |    1 +
 .../modules/ROOT/pages/any23-dataformat.adoc       |  119 ++
 .../modules/ROOT/pages/aws-msk-component.adoc      |    8 +-
 .../modules/ROOT/pages/barcode-dataformat.adoc     |    2 +-
 .../modules/ROOT/pages/controlbus-component.adoc   |    2 +-
 .../modules/ROOT/pages/corda-component.adoc        |    4 +-
 .../modules/ROOT/pages/direct-vm-component.adoc    |    2 +-
 .../ROOT/pages/google-bigquery-component.adoc      |    8 +-
 docs/components/modules/ROOT/pages/ignite.adoc     |    2 +-
 docs/components/modules/ROOT/pages/index.adoc      |  386 ++++
 .../modules/ROOT/pages/spark-component.adoc        |    4 +-
 .../components/modules/ROOT/pages/test-junit5.adoc |   37 +-
 .../modules/ROOT/pages/undertow-component.adoc     |    3 +-
 docs/gulpfile.js                                   |   30 +-
 .../{images/camel-core.data => }/architecture.png  |  Bin
 .../architecture_incl_violations.png               |  Bin
 .../architecture.data => }/camel-components.png    |  Bin
 .../camel-eclipse-m2e-import-completed.png         |  Bin
 .../camel-eclipse-m2e-import.png                   |  Bin
 .../modules/ROOT/assets/images}/camel-jmx.png      |  Bin
 .../async.data => }/camel_async_request_only.png   |  Bin
 .../async.data => }/camel_async_request_reply.png  |  Bin
 .../async.data => }/camel_sync_request_only.png    |  Bin
 .../async.data => }/camel_sync_request_reply.png   |  Bin
 .../images/{images/debugger.data => }/debug.png    |  Bin
 .../images}/jconsole_trace_notifications.png       |  Bin
 .../images/message_flow_in_route.png}              |  Bin
 .../lifecycle.data => }/service_lifecycle.png      |  Bin
 .../modules/ROOT/pages/architecture.adoc           |    2 +-
 docs/user-manual/modules/ROOT/pages/async.adoc     |    8 +-
 docs/user-manual/modules/ROOT/pages/building.adoc  |    4 +-
 .../user-manual/modules/ROOT/pages/camel-core.adoc |    6 +-
 docs/user-manual/modules/ROOT/pages/debugger.adoc  |    2 +-
 docs/user-manual/modules/ROOT/pages/faq.adoc       |   22 -
 .../using-getin-or-getout-methods-on-exchange.adoc |    2 +-
 docs/user-manual/modules/ROOT/pages/index.adoc     |    2 +-
 docs/user-manual/modules/ROOT/pages/jmx.adoc       |    4 +-
 docs/user-manual/modules/ROOT/pages/lifecycle.adoc |    2 +-
 .../modules/ROOT/pages/polling-consumer.adoc       |    2 +-
 docs/user-manual/modules/ROOT/pages/team.adoc      |    3 +
 parent/pom.xml                                     |   58 +-
 .../karaf/features/src/main/resources/features.xml |    3 +-
 .../components-starter/camel-any23-starter/pom.xml |   53 +
 .../Any23DataFormatAutoConfiguration.java          |  128 ++
 .../springboot/Any23DataFormatConfiguration.java   |   98 +
 .../src/main/resources/META-INF/LICENSE.txt        |    0
 .../src/main/resources/META-INF/NOTICE.txt         |    0
 .../src/main/resources/META-INF/spring.factories   |   19 +
 .../src/main/resources/META-INF/spring.provides    |   17 +
 platforms/spring-boot/components-starter/pom.xml   |    1 +
 .../camel-spring-boot-dependencies/pom.xml         |   27 +-
 platforms/spring-boot/spring-boot-dm/pom.xml       |    2 +-
 .../camel/itest/springboot/CamelAny23Test.java}    |   30 +-
 .../pom.xml                                        |    6 +-
 .../apache/camel/maven/DocumentationEnricher.java  |    4 +-
 .../camel/maven/EipDocumentationEnricherMojo.java  |    2 +-
 2843 files changed, 24624 insertions(+), 28440 deletions(-)
 create mode 100644 components/camel-any23/pom.xml
 create mode 100644 components/camel-any23/src/main/docs/any23-dataformat.adoc
 create mode 100644 components/camel-any23/src/main/java/org/apache/camel/dataformat/any23/Any23DataFormat.java
 copy components/{camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/PayloadFormat.java => camel-any23/src/main/java/org/apache/camel/dataformat/any23/Any23OutputFormat.java} (85%)
 create mode 100644 components/camel-any23/src/main/java/org/apache/camel/dataformat/any23/utils/Any23Utils.java
 create mode 100644 components/camel-any23/src/main/java/org/apache/camel/dataformat/any23/writer/RDF4JModelWriter.java
 create mode 100644 components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatConfigurationsTest.java
 copy core/camel-core/src/test/java/org/apache/camel/processor/FilterNotTest.java => components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatDefaultTest.java (55%)
 create mode 100644 components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatExtractorsTest.java
 copy core/camel-core/src/test/java/org/apache/camel/processor/FilterNotTest.java => components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatHTTPTest.java (55%)
 copy core/camel-core/src/test/java/org/apache/camel/processor/FilterNotTest.java => components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatMarshalTest.java (51%)
 copy core/camel-core/src/test/java/org/apache/camel/processor/FilterNotTest.java => components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatModelTest.java (55%)
 create mode 100644 components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatOutputFormatTest.java
 create mode 100644 components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23DataFormatSpringTest.java
 copy core/camel-core/src/test/java/org/apache/camel/converter/stream/ReaderCacheTest.java => components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/Any23TestSupport.java (53%)
 create mode 100644 components/camel-any23/src/test/resources/log4j2.properties
 create mode 100644 components/camel-any23/src/test/resources/org/apache/camel/dataformat/any23/microformat/vcard.html
 create mode 100644 components/camel-any23/src/test/resources/org/apache/camel/dataformat/any23/spring/SpringAny23DataFormatTest.xml
 create mode 100644 components/camel-controlbus/src/main/docs/control_bus.png
 copy core/camel-core/src/test/java/org/apache/camel/language/simple/SimpleWithPropertiesTest.java => components/camel-http-common/src/test/java/org/apache/camel/http/common/HttpHelperTest.java (52%)
 delete mode 100644 components/camel-jmx/src/main/docs/jconsole_doubles.PNG
 copy components/{camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/MessageDeduplicationIdStrategy.java => camel-undertow/src/main/java/org/apache/camel/component/undertow/CamelUndertowHttpHandler.java} (80%)
 create mode 100644 components/camel-undertow/src/test/java/org/apache/camel/component/undertow/MapIdentityManager.java
 create mode 100644 components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowBasicAuthHandler.java
 create mode 100644 components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHandlersSpringTest.java
 create mode 100644 components/camel-undertow/src/test/resources/HandlersSpringTest.xml
 create mode 100644 core/camel-core/src/main/java/org/apache/camel/model/dataformat/Any23DataFormat.java
 copy core/camel-core/src/main/java/org/apache/camel/model/dataformat/{YAMLTypeFilterType.java => Any23Type.java} (81%)
 copy core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/{CustomDataFormatReifier.java => Any23DataFormatReifier.java} (56%)
 copy core/camel-core/src/test/java/org/apache/camel/{model/RouteGroupTest.java => impl/health/RouteHealthCheckTest.java} (62%)
 copy {components/camel-ignite/src/main/docs => docs/components/modules/ROOT/assets/images}/apache-ignite.png (100%)
 copy docs/{user-manual/modules/ROOT/assets/images/images/direct-vm.data => components/modules/ROOT/assets/images}/camel-direct-vm.png (100%)
 copy docs/{user-manual/modules/ROOT/assets/images/images/apache-spark.data => components/modules/ROOT/assets/images}/camel_spark_cluster.png (100%)
 copy docs/{user-manual/modules/ROOT/assets/images/images/apache-spark.data => components/modules/ROOT/assets/images}/camel_spark_driver.png (100%)
 create mode 100644 docs/components/modules/ROOT/assets/images/control_bus.png
 delete mode 100644 docs/components/modules/ROOT/assets/images/images/controlbus-component.data/ControlBus.gif
 copy docs/{user-manual/modules/ROOT/assets/images/images/barcode-data-format.data => components/modules/ROOT/assets/images}/qr-code.png (100%)
 create mode 100644 docs/components/modules/ROOT/pages/any23-dataformat.adoc
 rename docs/user-manual/modules/ROOT/assets/images/{images/camel-core.data => }/architecture.png (100%)
 rename docs/user-manual/modules/ROOT/assets/images/{images/camel-core.data => }/architecture_incl_violations.png (100%)
 rename docs/user-manual/modules/ROOT/assets/images/{images/architecture.data => }/camel-components.png (100%)
 rename docs/user-manual/modules/ROOT/assets/images/{images/building.data => }/camel-eclipse-m2e-import-completed.png (100%)
 rename docs/user-manual/modules/ROOT/assets/images/{images/building.data => }/camel-eclipse-m2e-import.png (100%)
 rename {components/camel-jmx/src/main/docs => docs/user-manual/modules/ROOT/assets/images}/camel-jmx.png (100%)
 rename docs/user-manual/modules/ROOT/assets/images/{images/async.data => }/camel_async_request_only.png (100%)
 rename docs/user-manual/modules/ROOT/assets/images/{images/async.data => }/camel_async_request_reply.png (100%)
 rename docs/user-manual/modules/ROOT/assets/images/{images/async.data => }/camel_sync_request_only.png (100%)
 rename docs/user-manual/modules/ROOT/assets/images/{images/async.data => }/camel_sync_request_reply.png (100%)
 rename docs/user-manual/modules/ROOT/assets/images/{images/debugger.data => }/debug.png (100%)
 rename {components/camel-jmx/src/main/docs => docs/user-manual/modules/ROOT/assets/images}/jconsole_trace_notifications.png (100%)
 copy docs/user-manual/modules/ROOT/{pages/faq/images/using-getin-or-getout-methods-on-exchange.data/Message-flow-in-Route.png => assets/images/message_flow_in_route.png} (100%)
 rename docs/user-manual/modules/ROOT/assets/images/{images/lifecycle.data => }/service_lifecycle.png (100%)
 create mode 100644 platforms/spring-boot/components-starter/camel-any23-starter/pom.xml
 create mode 100644 platforms/spring-boot/components-starter/camel-any23-starter/src/main/java/org/apache/camel/dataformat/any23/springboot/Any23DataFormatAutoConfiguration.java
 create mode 100644 platforms/spring-boot/components-starter/camel-any23-starter/src/main/java/org/apache/camel/dataformat/any23/springboot/Any23DataFormatConfiguration.java
 copy {tooling/maven/camel-package-maven-plugin => platforms/spring-boot/components-starter/camel-any23-starter}/src/main/resources/META-INF/LICENSE.txt (100%)
 copy {tooling/maven/camel-package-maven-plugin => platforms/spring-boot/components-starter/camel-any23-starter}/src/main/resources/META-INF/NOTICE.txt (100%)
 create mode 100644 platforms/spring-boot/components-starter/camel-any23-starter/src/main/resources/META-INF/spring.factories
 create mode 100644 platforms/spring-boot/components-starter/camel-any23-starter/src/main/resources/META-INF/spring.provides
 rename tests/{camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSnakeyamlTest.java => camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelAny23Test.java} (50%)


[camel] 02/02: CAMEL-13826: Migrated half of the camel-xstream tests to JUnit 5 (testing coexistence of JUnit 4 and JUnit 5)

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

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

commit 9d40a373c0ea1c7cf2c3dac1aa5f8bed8c422c44
Author: aldettinger <al...@gmail.com>
AuthorDate: Wed Aug 21 17:31:13 2019 +0200

    CAMEL-13826: Migrated half of the camel-xstream tests to JUnit 5 (testing coexistence of JUnit 4 and JUnit 5)
---
 components/camel-test/pom.xml                             |  4 ++++
 components/camel-xstream/pom.xml                          |  5 +++++
 .../dataformat/xstream/MarshalDomainObjectJSONTest.java   |  4 +++-
 .../camel/dataformat/xstream/MarshalDomainObjectTest.java |  8 +++++---
 .../xstream/XStreamDataFormatOmitFieldsTest.java          | 15 +++++++++------
 .../XStreamDataFormatPermissionsSystemPropertyTest.java   | 13 ++++++++-----
 .../xstream/XStreamDataFormatPermissionsTest.java         |  7 +++++--
 parent/pom.xml                                            |  4 ++--
 8 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/components/camel-test/pom.xml b/components/camel-test/pom.xml
index 2e70437..aa6acfa 100644
--- a/components/camel-test/pom.xml
+++ b/components/camel-test/pom.xml
@@ -54,6 +54,10 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
diff --git a/components/camel-xstream/pom.xml b/components/camel-xstream/pom.xml
index d3fa5d7..99dad32 100644
--- a/components/camel-xstream/pom.xml
+++ b/components/camel-xstream/pom.xml
@@ -77,6 +77,11 @@
         </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
             <artifactId>camel-spring</artifactId>
             <scope>test</scope>
         </dependency>
diff --git a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONTest.java b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONTest.java
index 6f6ad86..2e6fe37 100644
--- a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONTest.java
+++ b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONTest.java
@@ -19,7 +19,9 @@ package org.apache.camel.dataformat.xstream;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.model.dataformat.JsonLibrary;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class MarshalDomainObjectJSONTest extends MarshalDomainObjectTest {
     
diff --git a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectTest.java b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectTest.java
index 8e429d5..2096c85 100644
--- a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectTest.java
+++ b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectTest.java
@@ -18,8 +18,10 @@ package org.apache.camel.dataformat.xstream;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Marshal tests with domain objects.
@@ -58,7 +60,7 @@ public class MarshalDomainObjectTest extends CamelTestSupport {
 
         String body1 = mock.getExchanges().get(0).getIn().getBody(String.class);
         String body2 = mock.getExchanges().get(1).getIn().getBody(String.class);
-        assertEquals("The body should marshalled to the same", body1, body2);
+        assertEquals(body1, body2, "The body should marshalled to the same");
     }
 
     @Test
diff --git a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamDataFormatOmitFieldsTest.java b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamDataFormatOmitFieldsTest.java
index b6d34e2..b9df598 100644
--- a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamDataFormatOmitFieldsTest.java
+++ b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamDataFormatOmitFieldsTest.java
@@ -21,8 +21,11 @@ import java.util.Map;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class XStreamDataFormatOmitFieldsTest extends CamelTestSupport {
 
@@ -40,10 +43,10 @@ public class XStreamDataFormatOmitFieldsTest extends CamelTestSupport {
 
         assertMockEndpointsSatisfied();
 
-        String body = mock.getReceivedExchanges().get(0).getIn().getBody(String.class);        
-        assertTrue("Should contain name field", body.contains("<name>"));
-        assertFalse("Should not contain price field", body.contains("price"));
-        assertTrue("Should contain amount field", body.contains("<amount>"));
+        String body = mock.getReceivedExchanges().get(0).getIn().getBody(String.class);
+        assertTrue(body.contains("<name>"), "Should contain name field");
+        assertFalse(body.contains("price"), "Should not contain price field");
+        assertTrue(body.contains("<amount>"), "Should contain amount field");
     }
     
 
diff --git a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamDataFormatPermissionsSystemPropertyTest.java b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamDataFormatPermissionsSystemPropertyTest.java
index 99f83d6..acf39a4 100644
--- a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamDataFormatPermissionsSystemPropertyTest.java
+++ b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamDataFormatPermissionsSystemPropertyTest.java
@@ -16,20 +16,23 @@
  */
 package org.apache.camel.dataformat.xstream;
 import com.thoughtworks.xstream.XStream;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class XStreamDataFormatPermissionsSystemPropertyTest extends XStreamDataFormatPermissionsTest {
 
-    @BeforeClass
+    @BeforeAll
     public static void setup() {
         // clear the default permissions system property
         // see AbstractXStreamWrapper.PERMISSIONS_PROPERTY_DEFAULT
         XStreamTestUtils.setPermissionSystemProperty("*");
     }
 
-    @AfterClass
+    @AfterAll
     public static void cleanup() {
         XStreamTestUtils.revertPermissionSystemProperty();
     }
diff --git a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamDataFormatPermissionsTest.java b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamDataFormatPermissionsTest.java
index 425be60..ee8a274 100644
--- a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamDataFormatPermissionsTest.java
+++ b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamDataFormatPermissionsTest.java
@@ -18,8 +18,11 @@ package org.apache.camel.dataformat.xstream;
 
 import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.security.ForbiddenClassException;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class XStreamDataFormatPermissionsTest extends CamelTestSupport {
     protected static final String XML_PURCHASE_ORDER = 
diff --git a/parent/pom.xml b/parent/pom.xml
index 159f418..1e44189 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -4785,8 +4785,8 @@
                 <version>${junit-jupiter-version}</version>
             </dependency>
             <dependency>
-                <groupId>org.junit.jupiter</groupId>
-                <artifactId>junit-jupiter-vintage</artifactId>
+                <groupId>org.junit.vintage</groupId>
+                <artifactId>junit-vintage-engine</artifactId>
                 <version>${junit-jupiter-version}</version>
             </dependency>
             <dependency>


[camel] 01/02: CAMEL-13826: Merged CamelTestSupport.isCreateCamelContextPerClass() into JUnit 5 Lifecycle.PER_CLASS

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

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

commit a1727ab3860c509a96f93e72673bd54624d92f3f
Author: aldettinger <al...@gmail.com>
AuthorDate: Tue Aug 20 17:33:30 2019 +0200

    CAMEL-13826: Merged CamelTestSupport.isCreateCamelContextPerClass() into JUnit 5 Lifecycle.PER_CLASS
---
 .../src/main/docs/test-junit5.adoc                 |  3 +++
 .../apache/camel/test/junit5/CamelTestSupport.java | 25 ++++++++++++++--------
 .../CreateCamelContextPerTestFalseTest.java        |  7 ++----
 .../CreateCamelContextPerTestTrueTest.java         |  5 -----
 .../FilterCreateCamelContextPerClassTest.java      | 10 ++-------
 5 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/components/camel-test-junit5/src/main/docs/test-junit5.adoc b/components/camel-test-junit5/src/main/docs/test-junit5.adoc
index 0ae295f..f31ff75 100644
--- a/components/camel-test-junit5/src/main/docs/test-junit5.adoc
+++ b/components/camel-test-junit5/src/main/docs/test-junit5.adoc
@@ -62,6 +62,9 @@ Projects using `camel-test` would need to use `camel-test-junit5`. For instance,
 * `TestSupport` static methods should be imported where needed, for instance `import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf`
 * Usage of the field `CamelTestSupport.log` should be replaced by another logger, for instance `org.slf4j.LoggerFactory.getLogger(MyCamelTest.class);`
 * Usage of the method `CamelTestSupport.createRegistry` should be replaced by `CamelTestSupport.createCamelRegistry()`
+* Overrides of `isCreateCamelContextPerClass()` returning `false` should be removed
+* Overrides of `isCreateCamelContextPerClass()` returning `true` should be replaced by `@TestInstance(Lifecycle.PER_CLASS)`
+
 
 === Typical migration steps linked to JUnit 5 itself
 Once Camel related steps have been performed, there are still typical JUnit 5 migration steps to remember:
diff --git a/components/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java b/components/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
index 1818a98..083f3fc 100644
--- a/components/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
+++ b/components/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
@@ -66,8 +66,10 @@ import org.apache.camel.util.TimeUtils;
 import org.apache.camel.util.URISupport;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInstance.Lifecycle;
 import org.junit.jupiter.api.extension.AfterAllCallback;
 import org.junit.jupiter.api.extension.AfterTestExecutionCallback;
+import org.junit.jupiter.api.extension.BeforeAllCallback;
 import org.junit.jupiter.api.extension.BeforeEachCallback;
 import org.junit.jupiter.api.extension.BeforeTestExecutionCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;
@@ -82,7 +84,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
  * with some routes along with a {@link org.apache.camel.ProducerTemplate} for
  * use in the test case Do <tt>not</tt> use this class for Spring Boot testing.
  */
-public abstract class CamelTestSupport implements BeforeEachCallback, AfterAllCallback, BeforeTestExecutionCallback, AfterTestExecutionCallback {
+public abstract class CamelTestSupport implements BeforeEachCallback, AfterAllCallback, BeforeAllCallback, BeforeTestExecutionCallback, AfterTestExecutionCallback {
 
     /**
      * JVM system property which can be set to true to turn on dumping route
@@ -112,6 +114,7 @@ public abstract class CamelTestSupport implements BeforeEachCallback, AfterAllCa
     private static final ThreadLocal<AtomicInteger> TESTS = new ThreadLocal<>();
     private static final ThreadLocal<CamelTestSupport> INSTANCE = new ThreadLocal<>();
     private String currentTestName;
+    private boolean isCreateCamelContextPerClass = false;
     private CamelRouteCoverageDumper routeCoverageDumper = new CamelRouteCoverageDumper();
     // CHECKSTYLE:ON
 
@@ -135,6 +138,11 @@ public abstract class CamelTestSupport implements BeforeEachCallback, AfterAllCa
     }
 
     @Override
+    public void beforeAll(ExtensionContext context) {
+        isCreateCamelContextPerClass = context.getTestInstanceLifecycle().filter(lc -> lc.equals(Lifecycle.PER_CLASS)).isPresent();
+    }
+
+    @Override
     public void afterAll(ExtensionContext context) {
         CamelTestSupport support = INSTANCE.get();
         if (support != null && support.isCreateCamelContextPerClass()) {
@@ -197,12 +205,11 @@ public abstract class CamelTestSupport implements BeforeEachCallback, AfterAllCa
     }
 
     /**
-     * Override to control whether {@link CamelContext} should be setup per test
-     * or per class.
+     * Tells whether {@link CamelContext} should be setup per test or per class.
      * <p/>
-     * By default it will be setup/teardown per test (per test method). If you
-     * want to re-use {@link CamelContext} between test methods you can override
-     * this method and return <tt>true</tt>
+     * By default it will be setup/teardown per test method. This method returns
+     * <code>true</code> when the camel test class is annotated
+     * with @TestInstance(TestInstance.Lifecycle.PER_CLASS).
      * <p/>
      * <b>Important:</b> Use this with care as the {@link CamelContext} will
      * carry over state from previous tests, such as endpoints, components etc.
@@ -214,8 +221,8 @@ public abstract class CamelTestSupport implements BeforeEachCallback, AfterAllCa
      *
      * @return <tt>true</tt> per class, <tt>false</tt> per test.
      */
-    public boolean isCreateCamelContextPerClass() {
-        return false;
+    public final boolean isCreateCamelContextPerClass() {
+        return isCreateCamelContextPerClass;
     }
 
     /**
@@ -539,7 +546,7 @@ public abstract class CamelTestSupport implements BeforeEachCallback, AfterAllCa
         LOG.info("********************************************************************************");
 
         if (isCreateCamelContextPerClass()) {
-            // will tear down test specially in CamelTearDownRule
+            // will tear down test specially in afterAll callback
         } else {
             LOG.debug("tearDown()");
             doStopTemplates(consumer, template, fluentTemplate);
diff --git a/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/CreateCamelContextPerTestFalseTest.java b/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/CreateCamelContextPerTestFalseTest.java
index 34c8591..149edb9 100644
--- a/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/CreateCamelContextPerTestFalseTest.java
+++ b/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/CreateCamelContextPerTestFalseTest.java
@@ -27,12 +27,14 @@ import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.junit5.CamelTestSupport;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+@TestInstance(TestInstance.Lifecycle.PER_METHOD)
 public class CreateCamelContextPerTestFalseTest extends CamelTestSupport {
 
     private static final Logger LOG = LoggerFactory.getLogger(CreateCamelContextPerTestFalseTest.class);
@@ -47,11 +49,6 @@ public class CreateCamelContextPerTestFalseTest extends CamelTestSupport {
     protected ProducerTemplate template;
 
     @Override
-    public boolean isCreateCamelContextPerClass() {
-        return false;
-    }
-
-    @Override
     protected CamelContext createCamelContext() throws Exception {
         LOG.info("createCamelContext()");
         CREATED_CONTEXTS.incrementAndGet();
diff --git a/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/CreateCamelContextPerTestTrueTest.java b/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/CreateCamelContextPerTestTrueTest.java
index a234455..222fe62 100644
--- a/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/CreateCamelContextPerTestTrueTest.java
+++ b/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/CreateCamelContextPerTestTrueTest.java
@@ -52,11 +52,6 @@ public class CreateCamelContextPerTestTrueTest extends CamelTestSupport {
     protected ProducerTemplate template;
 
     @Override
-    public boolean isCreateCamelContextPerClass() {
-        return true;
-    }
-
-    @Override
     protected CamelContext createCamelContext() throws Exception {
         LOG.info("createCamelContext()");
         CREATED_CONTEXTS.incrementAndGet();
diff --git a/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/FilterCreateCamelContextPerClassTest.java b/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/FilterCreateCamelContextPerClassTest.java
index 0f5be29..be38b86 100644
--- a/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/FilterCreateCamelContextPerClassTest.java
+++ b/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/FilterCreateCamelContextPerClassTest.java
@@ -19,21 +19,15 @@ package org.apache.camel.test.junit5.patterns;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit5.CamelTestSupport;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 /**
  * Tests filtering using Camel Test
  */
 // START SNIPPET: example
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class FilterCreateCamelContextPerClassTest extends CamelTestSupport {
 
-    @Override
-    public boolean isCreateCamelContextPerClass() {
-        // we override this method and return true, to tell Camel test-kit that
-        // it should only create CamelContext once (per class), so we will
-        // re-use the CamelContext between each test method in this class
-        return true;
-    }
-
     @Test
     public void testSendMatchingMessage() throws Exception {
         String expectedBody = "<matched/>";