This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1024317aa54a7605028b9a05623960760f82d144 Merge: bf4f3ee fbe6416 Author: Guillaume Nodet <[email protected]> AuthorDate: Fri Mar 13 15:36:59 2020 +0100 [CAMEL-14712] Provide an immutable lightweight camel context Merge remote-tracking branch 'origin/master' into immutable .../org/apache/camel/dataformat/any23/any23.json | 1 + .../src/main/docs/any23-dataformat.adoc | 3 +- .../any23/spring/SpringAny23DataFormatTest.xml | 4 +- .../camel/component/aws2/cw/Cw2Component.java | 23 +- .../camel/component/aws2/ddb/Ddb2Component.java | 23 +- .../aws2/ddbstream/Ddb2StreamComponent.java | 23 +- .../camel/component/aws2/ec2/AWS2EC2Component.java | 23 +- .../camel/component/aws2/ecs/ECS2Component.java | 23 +- .../camel/component/aws2/eks/EKS2Component.java | 23 +- .../camel/component/aws2/iam/IAM2Component.java | 23 +- components/camel-aws2-kms/pom.xml | 7 +- .../camel/component/aws2/kms/KMS2Component.java | 23 +- .../aws2/kms/KMSComponentClientRegistryTest.java | 13 +- .../aws2/kms/KMSComponentConfigurationTest.java | 6 +- .../kms/KMSComponentVerifierExtensionTest.java | 11 +- .../component/aws2/kms/KMSProducerSpringTest.java | 7 +- .../camel/component/aws2/kms/KMSProducerTest.java | 7 +- components/camel-aws2-lambda/pom.xml | 7 +- .../component/aws2/lambda/Lambda2Component.java | 23 +- .../lambda/LambdaComponentClientRegistryTest.java | 15 +- .../lambda/LambdaComponentConfigurationTest.java | 36 +- .../aws2/lambda/LambdaComponentSpringTest.java | 8 +- .../LambdaComponentVerifierExtensionTest.java | 11 +- .../aws2/lambda/LambdaOperationsTest.java | 4 +- .../lambda/LambdaProducerDefaultFunctionTest.java | 7 +- .../component/aws2/lambda/LambdaProducerTest.java | 8 +- .../LambdaComponentIntegrationTest.java | 84 +--- components/camel-aws2-mq/pom.xml | 7 +- .../camel/component/aws2/mq/MQ2Component.java | 23 +- .../aws2/mq/MQComponentClientRegistryTest.java | 13 +- .../aws2/mq/MQComponentConfigurationTest.java | 6 +- .../aws2/mq/MQComponentVerifierExtensionTest.java | 11 +- .../component/aws2/mq/MQProducerSpringTest.java | 6 +- .../camel/component/aws2/mq/MQProducerTest.java | 6 +- components/camel-aws2-msk/pom.xml | 7 +- .../camel/component/aws2/msk/MSK2Component.java | 23 +- .../aws2/msk/MSKComponentClientRegistryTest.java | 13 +- .../aws2/msk/MSKComponentConfigurationTest.java | 6 +- .../msk/MSKComponentVerifierExtensionTest.java | 11 +- .../component/aws2/msk/MSKProducerSpringTest.java | 6 +- .../camel/component/aws2/msk/MSKProducerTest.java | 6 +- .../camel/component/aws2/s3/AWS2S3Component.java | 23 +- .../S3CopyObjectOperationIntegrationTest.java | 2 +- .../S3DeleteBucketOperationIntegrationTest.java | 2 +- .../S3ListObjectsOperationIntegrationTest.java | 2 +- .../S3ObjectRangeOperationIntegrationTest.java | 2 +- components/camel-aws2-ses/pom.xml | 7 +- .../camel/component/aws2/ses/Ses2Component.java | 23 +- .../aws2/ses/SESComponentClientRegistryTest.java | 13 +- .../aws2/ses/SesComponentConfigurationTest.java | 35 +- .../component/aws2/ses/SesComponentSpringTest.java | 11 +- .../camel/component/aws2/ses/SesComponentTest.java | 7 +- .../ses/SesComponentVerifierExtensionTest.java | 11 +- .../integration/SesComponentIntegrationTest.java | 10 +- components/camel-aws2-sns/pom.xml | 24 +- .../camel/component/aws2/sns/Sns2Component.java | 23 +- .../component/aws2/sns/AmazonSNSClientMock.java | 9 +- .../aws2/sns/SNSComponentClientRegistryTest.java | 13 +- .../aws2/sns/SnsComponentConfigurationTest.java | 21 +- .../component/aws2/sns/SnsComponentSpringTest.java | 6 +- .../camel/component/aws2/sns/SnsComponentTest.java | 6 +- .../sns/SnsComponentVerifierExtensionTest.java | 11 +- .../camel/component/aws2/sns/SnsProducerTest.java | 14 +- .../integration/SnsComponentIntegrationTest.java | 10 +- .../SnsTopicWithKmsEncryptionIntegrationTest.java | 10 +- .../camel/component/aws2/sqs/Sqs2Component.java | 23 +- .../org/apache/camel/component/bean/BeanInfo.java | 16 - .../apache/camel/component/bean/MethodInfo.java | 4 +- .../org/apache/camel/component/elsql/elsql.json | 2 +- .../camel-elsql/src/main/docs/elsql-component.adoc | 2 +- components/camel-hazelcast/pom.xml | 7 +- .../component/hazelcast/HazelcastConstants.java | 1 + .../HazelcastAtomicnumberProducer.java | 4 +- .../instance/HazelcastInstanceConsumer.java | 10 +- .../hazelcast/list/HazelcastListConsumer.java | 2 +- .../hazelcast/list/HazelcastListProducer.java | 2 +- .../hazelcast/listener/CamelEntryListener.java | 7 +- .../hazelcast/listener/CamelItemListener.java | 4 +- .../hazelcast/listener/CamelMapListener.java | 2 +- .../hazelcast/listener/CamelMessageListener.java | 4 +- .../hazelcast/map/HazelcastMapConsumer.java | 2 +- .../hazelcast/map/HazelcastMapProducer.java | 4 +- .../multimap/HazelcastMultimapConsumer.java | 2 +- .../multimap/HazelcastMultimapProducer.java | 2 +- .../hazelcast/policy/HazelcastRoutePolicy.java | 2 +- .../hazelcast/queue/HazelcastQueueConsumer.java | 2 +- .../hazelcast/queue/HazelcastQueueProducer.java | 2 +- .../HazelcastReplicatedmapConsumer.java | 2 +- .../HazelcastReplicatedmapProducer.java | 2 +- .../hazelcast/seda/HazelcastSedaConsumer.java | 3 +- .../hazelcast/set/HazelcastSetConsumer.java | 2 +- .../hazelcast/set/HazelcastSetProducer.java | 2 +- .../hazelcast/topic/HazelcastTopicConsumer.java | 2 +- .../hazelcast/topic/HazelcastTopicProducer.java | 2 +- .../hazelcast/HazelcastAggregationRepository.java | 8 +- .../hazelcast/HazelcastIdempotentRepository.java | 2 +- ...HazelcastAtomicnumberProducerForSpringTest.java | 17 +- .../HazelcastAtomicnumberProducerTest.java | 12 +- .../hazelcast/HazelcastInstanceConsumerTest.java | 13 +- .../hazelcast/HazelcastListConsumerTest.java | 9 +- .../hazelcast/HazelcastListProducerTest.java | 2 +- .../hazelcast/HazelcastMapConsumerTest.java | 5 +- .../HazelcastMapProducerForSpringTest.java | 4 +- .../hazelcast/HazelcastMapProducerTest.java | 4 +- .../hazelcast/HazelcastMultimapConsumerTest.java | 5 +- .../HazelcastMultimapProducerForSpringTest.java | 2 +- .../hazelcast/HazelcastMultimapProducerTest.java | 2 +- .../hazelcast/HazelcastQueueConsumerPollTest.java | 2 +- .../hazelcast/HazelcastQueueConsumerTest.java | 9 +- .../hazelcast/HazelcastQueueProducerTest.java | 2 +- .../HazelcastReliableTopicConsumerTest.java | 9 +- .../HazelcastReliableTopicProducerTest.java | 2 +- .../HazelcastReplicatedmapConsumerTest.java | 5 +- ...azelcastReplicatedmapProducerForSpringTest.java | 2 +- .../HazelcastReplicatedmapProducerTest.java | 2 +- .../HazelcastSedaRecoverableConsumerTest.java | 4 +- .../hazelcast/HazelcastSetConsumerTest.java | 9 +- .../hazelcast/HazelcastSetProducerTest.java | 2 +- .../hazelcast/HazelcastTopicConsumerTest.java | 9 +- .../hazelcast/HazelcastTopicProducerTest.java | 2 +- .../HazelcastIdempotentRepositoryTest.java | 2 +- .../src/test/resources/hazelcast-custom.xml | 11 +- .../src/test/resources/hazelcast-default.xml | 24 +- .../src/test/resources/hazelcast-named.xml | 13 +- .../apache/camel/component/hbase/HBaseHelper.java | 35 -- components/camel-infinispan/pom.xml | 6 + .../InfinispanClusteredConsumerTest.java | 2 +- .../InfinispanComponentEmbeddedCacheTest.java | 92 ----- .../infinispan/InfinispanComponentTest.java | 4 +- .../infinispan/InfinispanConfigurationIT.java | 12 +- .../policy/InfinispanEmbeddedRoutePolicyTest.java | 2 +- .../InfinispanIdempotentRepositoryIT.java | 9 +- .../InfinispanIdempotentRepositoryTest.java | 2 +- .../src/test/resources/cache-configuration.xml | 32 -- .../policy/CacheManagerFromRegistryTest.java | 2 +- .../component/jcache/policy/hazelcast-spring.xml | 2 +- components/camel-mustache/pom.xml | 2 +- .../component/mustache/MustacheComponentTest.java | 6 +- .../component/mustache/MustacheLetterTest.java | 8 +- .../camel-mvel/src/main/docs/mvel-component.adoc | 2 +- .../http/PlatformHttpEndpointConfigurer.java | 2 + .../component/platform/http/platform-http.json | 1 + .../src/main/docs/platform-http-component.adoc | 3 +- .../platform/http/PlatformHttpEndpoint.java | 12 + .../pulsar/PulsarComponentConfigurer.java | 2 + .../component/pulsar/PulsarEndpointConfigurer.java | 2 + .../org/apache/camel/component/pulsar/pulsar.json | 12 +- .../src/main/docs/pulsar-component.adoc | 16 +- .../component/pulsar/PulsarConfiguration.java | 24 +- .../camel/component/pulsar/PulsarEndpoint.java | 22 ++ .../component/pulsar/PulsarMessageListener.java | 59 ++- .../camel/component/pulsar/PulsarProducer.java | 3 +- .../consumers/CommonCreationStrategyImpl.java | 2 +- .../consumers/ConsumerCreationStrategyFactory.java | 2 + .../utils/consumers/KeySharedConsumerStrategy.java | 63 +++ .../pulsar/utils/consumers/SubscriptionType.java | 2 +- .../pulsar/PulsarConsumerInAsynchronousTest.java | 194 +++++++++ .../pulsar/PulsarConsumerInSynchronousTest.java | 216 ++++++++++ .../ConsumerCreationStrategyFactoryTest.java | 9 + .../rabbitmq/RabbitMQComponentConfigurer.java | 2 + .../rabbitmq/RabbitMQEndpointConfigurer.java | 4 + .../apache/camel/component/rabbitmq/rabbitmq.json | 3 + .../src/main/docs/rabbitmq-component.adoc | 18 +- .../camel/component/rabbitmq/RabbitConsumer.java | 23 +- .../component/rabbitmq/RabbitMQComponent.java | 53 ++- .../rabbitmq/RabbitMQConnectionFactorySupport.java | 5 +- .../component/rabbitmq/RabbitMQConstants.java | 3 +- .../camel/component/rabbitmq/RabbitMQConsumer.java | 6 +- .../component/rabbitmq/RabbitMQDeclareSupport.java | 10 +- .../camel/component/rabbitmq/RabbitMQEndpoint.java | 29 ++ .../rabbitmq/RabbitMQHeaderFilterStrategy.java | 26 +- .../rabbitmq/RabbitMQMessageConverter.java | 40 +- .../rabbitmq/RabbitMQMessagePublisher.java | 25 +- .../camel/component/rabbitmq/RabbitMQProducer.java | 52 ++- .../rabbitmq/pool/PoolableChannelFactory.java | 4 +- .../rabbitmq/reply/CorrelationTimeoutMap.java | 10 +- .../rabbitmq/reply/MessageSentCallback.java | 4 +- .../rabbitmq/reply/QueueReplyHandler.java | 3 +- .../component/rabbitmq/reply/ReplyHandler.java | 6 +- .../component/rabbitmq/reply/ReplyHolder.java | 28 +- .../component/rabbitmq/reply/ReplyManager.java | 42 +- .../rabbitmq/reply/ReplyManagerSupport.java | 65 +-- .../rabbitmq/reply/TemporaryQueueReplyHandler.java | 9 +- .../rabbitmq/reply/TemporaryQueueReplyManager.java | 19 +- ...essageIdAsCorrelationIdMessageSentCallback.java | 8 +- .../component/rabbitmq/RabbitConsumerHangTest.java | 3 +- .../component/rabbitmq/RabbitMQComponentTest.java | 2 +- .../component/rabbitmq/RabbitMQConsumerTest.java | 2 +- .../component/rabbitmq/RabbitMQEndpointTest.java | 4 +- .../component/rabbitmq/RabbitMQProducerTest.java | 6 +- .../RabbitMQSpringExceptionHandlerTest.java | 63 +++ .../integration/AbstractRabbitMQIntTest.java | 8 +- .../rabbitmq/integration/DockerTestUtils.java | 18 +- .../rabbitmq/integration/RabbitMQBasicIntTest.java | 12 +- .../integration/RabbitMQConsumerIntTest.java | 14 +- .../RabbitMQConsumerIntTestReplyTo.java | 29 +- .../RabbitMQDeadLetterRoutingKeyIntTest.java | 44 +-- .../rabbitmq/integration/RabbitMQInOutIntTest.java | 33 +- .../rabbitmq/integration/RabbitMQLoadIntTest.java | 25 +- .../integration/RabbitMQProducerIntTest.java | 60 ++- .../integration/RabbitMQReConnectionIntTest.java | 40 +- .../RabbitMQRequeueHandledExceptionIntTest.java | 22 +- .../integration/RabbitMQRequeueIntTest.java | 44 +-- .../RabbitMQRequeueUnhandledExceptionIntTest.java | 22 +- .../integration/spring/RabbitMQSpringIntTest.java | 5 +- .../qpid/RabbitMQConsumerQpidTestReplyTo.java | 4 +- .../rabbitmq/qpid/RabbitMQProducerQpidTest.java | 4 +- .../rabbitmq/qpid/RabbitMQRequeueQpidTest.java | 4 +- .../testbeans/CustomRabbitExceptionHandler.java | 67 ++++ .../testbeans/TestNonSerializableObject.java | 2 +- .../testbeans/TestPartiallySerializableObject.java | 2 +- .../rabbitmq/testbeans/TestSerializableObject.java | 2 +- ...bitMQSpringExceptionHandlerIntTest-context.xml} | 7 +- .../resources/RabbitMQSpringIntTest-context.xml | 2 +- .../shiro/security/ShiroSecurityProcessor.java | 15 +- .../org/apache/camel/component/sql/sql.json | 2 +- .../camel-sql/src/main/docs/sql-component.adoc | 11 +- .../camel/component/sql/DefaultSqlEndpoint.java | 2 +- components/camel-test-junit5/pom.xml | 5 - .../xstream/XStreamDataFormatConfigurer.java | 2 +- .../apache/camel/dataformat/xstream/xstream.json | 8 +- .../src/main/docs/xstream-dataformat.adoc | 6 +- .../dataformat/xstream/AbstractXStreamWrapper.java | 41 +- .../xstream/XStreamConfigurationTest.java | 24 +- .../xstream/XStreamDataFormatOmitFieldsTest.java | 4 +- .../xstream/SpringMarshalOmitFieldsTest.xml | 6 +- .../xstream/SpringXStreamConfigurationTest.xml | 28 +- .../component/zookeepermaster/group/GroupTest.java | 6 +- .../dsl/PulsarComponentBuilderFactory.java | 29 +- .../dsl/RabbitmqComponentBuilderFactory.java | 14 + core/camel-core-engine/pom.xml | 19 +- .../org/apache/camel/model/dataformat/any23.json | 1 + .../org/apache/camel/model/dataformat/jaxb.index | 8 - .../org/apache/camel/model/dataformat/xstream.json | 8 +- .../camel/model/PropertyDescriptionsAdapter.java | 50 --- .../org/apache/camel/model/TimeUnitAdapter.java | 50 --- .../camel/model/dataformat/Any23DataFormat.java | 45 ++- .../camel/model/dataformat/XStreamDataFormat.java | 435 ++++----------------- .../reifier/dataformat/Any23DataFormatReifier.java | 2 +- .../dataformat/XStreamDataFormatReifier.java | 8 +- .../xml/AbstractCamelThreadPoolFactoryBean.java | 15 +- .../apache/camel/impl/JavaUuidGeneratorTest.java | 56 --- .../model/dataformat/Any23DataFormatTest.java | 8 +- .../endpoint/dsl/ElsqlEndpointBuilderFactory.java | 6 +- .../dsl/PlatformHttpEndpointBuilderFactory.java | 28 ++ .../endpoint/dsl/PulsarEndpointBuilderFactory.java | 71 +++- .../dsl/RabbitMQEndpointBuilderFactory.java | 104 +++++ .../endpoint/dsl/SqlEndpointBuilderFactory.java | 6 +- .../org/apache/camel/main/BaseMainSupport.java | 8 +- core/camel-management-api/pom.xml | 12 - core/camel-management/pom.xml | 12 - core/camel-xml-io/pom.xml | 7 - .../java/org/apache/camel/xml/in/ModelParser.java | 99 +---- .../java/org/apache/camel/xml/in/BaseParser.java | 10 - .../modules/ROOT/pages/any23-dataformat.adoc | 3 +- .../modules/ROOT/pages/elsql-component.adoc | 2 +- docs/components/modules/ROOT/pages/index.adoc | 10 +- .../modules/ROOT/pages/jclouds-component.adoc | 2 +- .../modules/ROOT/pages/mvel-component.adoc | 2 +- .../ROOT/pages/platform-http-component.adoc | 3 +- .../modules/ROOT/pages/pulsar-component.adoc | 16 +- .../modules/ROOT/pages/rabbitmq-component.adoc | 18 +- .../modules/ROOT/pages/sql-component.adoc | 11 +- .../modules/ROOT/pages/xstream-dataformat.adoc | 6 +- .../modules/ROOT/pages/camel-3x-upgrade-guide.adoc | 79 ++++ .../modules/ROOT/pages/contributing.adoc | 6 +- docs/user-manual/modules/ROOT/pages/index.adoc | 19 +- docs/user-manual/modules/ROOT/pages/java-dsl.adoc | 16 +- docs/user-manual/modules/ROOT/pages/team.adoc | 1 + .../modules/ROOT/pages/uuidgenerator.adoc | 46 +-- parent/pom.xml | 22 +- .../karaf/features/src/main/resources/features.xml | 1 - tooling/openapi-rest-dsl-generator/pom.xml | 2 - .../generator/openapi/AppendableGenerator.java | 4 +- .../camel/generator/openapi/FilerGenerator.java | 4 +- .../openapi/MethodBodySourceCodeEmitter.java | 64 +-- .../camel/generator/openapi/OperationFilter.java | 9 +- .../camel/generator/openapi/OperationVisitor.java | 101 ++--- .../camel/generator/openapi/PathGenerator.java | 4 +- .../camel/generator/openapi/PathVisitor.java | 41 +- .../generator/openapi/RestDefinitionEmitter.java | 10 +- .../openapi/RestDslDefinitionGenerator.java | 8 +- .../camel/generator/openapi/RestDslGenerator.java | 230 +++++------ .../openapi/RestDslSourceCodeGenerator.java | 33 +- .../generator/openapi/RestDslXmlGenerator.java | 10 +- .../SpringBootProjectSourceCodeGenerator.java | 48 +-- .../generator/openapi/OperationVisitorTest.java | 220 +++++++++++ .../PathSpringBootProjectSourceGeneratorTest.java | 5 +- .../openapi/RestDefinitionEmitterTest.java | 60 +-- .../generator/openapi/RestDslGeneratorTest.java | 163 ++++++-- .../generator/openapi/RestDslGeneratorV3Test.java | 85 ++-- .../openapi/RestDslSourceCodeGeneratorTest.java | 13 +- .../openapi/RestDslSourceCodeGeneratorV3Test.java | 19 +- .../generator/openapi/RestDslXmlGeneratorTest.java | 84 ++-- .../openapi/RestDslXmlGeneratorV3Test.java | 86 ++-- .../camel/generator/openapi}/openapi-spec.json | 0 .../camel/generator/openapi}/openapi-v2.json | 0 297 files changed, 3471 insertions(+), 2477 deletions(-)
