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/12/13 17:51:58 UTC
[camel] branch CAMEL-11807 updated (c599845 -> 7067d59)
This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a change to branch CAMEL-11807
in repository https://gitbox.apache.org/repos/asf/camel.git.
discard c599845 CAMEL-11807: Migrated camel-ftp tests to JUnit 5
add cf76f69 CAMEL-11807: Migrated camel-ftp tests to JUnit 5
add a6deea3 [CAMEL-13575] Use strings instead of boolean/integer/long in definition fields (#3365)
add d573141 CAMEL-13535: Polished
add e0353ee CAMEL-14235: Regen
add 9020bf4 CAMEL-14229: STOMP headers are missing in the Exchange (#3369)
add 19acced CAMEL-14229: Fixed CS and polished
add c83db4d Fixed test after XML DSL model change to use strings for attributes
add d6cd9bc Camel-Core-Engine: Fixed CS
add ae20a8e Camel-Core: Fixed CS
add aa59017 Camel-Spring: Fixed CS
add acaf398 Upgrade resilience4j
add ed6c524 Regen
add f8e2f8f Camel-Jbpm: Fixed Spring Boot Integration test
add 909b137 Upgrade Testcontainers to version 1.12.4
add 8f766d9 Upgrade Aspectj to version 1.9.5
add 266eec4 Upgrade Grpc to version 1.25.0
add a070d0d Camel-Grpc: Upgrade guava for grpc to version 28.1-jre
add 27555fa Camel-Grpc: Upgrade error prone to version 2.3.3
add 431ba09 Camel-Protobuf: Upgrade Protobuf to version 3.10.0
add f9bbc32 Camel-Protobuf: Aligned Karaf feature
add 4846c95 Upgrade Hibernate Validator to version 6.1.0.Final
add d5020be Add an option to set the default application.properties location as weel as disabling it
add 6bfc792 Deprecate SpringRouteBuilder in favour of just default route builder.
add a03ea75 CAMEL-14240: Add backlogTracing into the spring/blueprint XML
add d8292a9 CAMEL-14232: Updated some ftp options with better documentation.
add c71e3a3 Upgrade AWS Xray to version 2.4.0
add b5a0b1d CAMEL-14215: Adding camel-main-osgi.
add 8de58e2 CAMEL-14125 - Regen
add 126603c Upgrade Atmosphere to version 2.5.11
add 359e385 [CAMEL-14241] InfluxDb does not define its dependency on okio
add 1752a34 CAMEL-14246 - Camel-SQL: Relax the modifier for datasource setter by removing final
add f1757ad CAMEL-14240: Polished
add a26d147 CAMEL-14240: Add debug=true|false into spring/blueprint XML
add a547c3a CAMEL-14240: Polished
add 0c2aa42 [CAMEL-13213] Cannot use rest-swagger component with swagger.json provided over HTTPS protocol (#3374)
add 357c625 Regen
add dca5840 Fix regression caused by d5020bea388
add ae86153 CAMEL-14220: camel-activemq - Setting brokerURL via camel-main issue
add 89d05cb Polished
add 42f912a [CAMEL-14245] camel-main - allow to enable/disable auto confioguiration per component/language/data-format
add ae20689 CAMEL-14215: Rename to camel-core-osgi-activator. Add docs. (#3381)
add 9d76523 CAMEL-14244: camel-opentracing - Associate decorators with component FQN also
add 46a4be8 Add nsq span decorator for opentracing
add 15bacd5 CAMEL-14251: camel-nats - Store message payload in body/headers
add 4284d03 Add nats to opentracing
add 835c7c9 CAMEL-14252: camel-nats - Add support for reply-to in consumer
add 199b167 camel-nats - Let producer use byte[] if possible instead of string as first choice
add 6f2ad84 CAMEL-14253: camel-nats - Configure brokers on component level
add ec71087 Regen
add 725fed6 CAMEL-14253: camel-nats - Configure brokers on component level
add 1755297 CAMEL-14253: camel-nats - Configure brokers on component level
add 46e1e4e Regen
add 2f79624 Upgrade Jgroups Raft to version 0.5.1.Final
add 6ccce21 Remove dead link to javadoc of ExchangePattern
add 1986883 Merge pull request #3382 from apupier/patch-3
add 03dffbf Camel-AWS Translate: Fixed endpoint description
add 9bdd116 Regen docs
add b46a003 Fix wording in camel-jdbc prepareStatementStrategy docs
add 6b089f8 Allow to add custom decorator to open tracing via java api
add a00af79 Updating Olingo4
add c14976f CAMEL-14224: Fix camel-websocket sendToAll to be faster. Thanks to Michael Elbaz for reporting.
add ed419c9 CAMEL-14247: camel-netty thread pool for consumer should not be fixed at 16 by default but take into account netty thread pool size and be bigger
add 1e237f2 [CAMEL-14227]add a new camel-rest-openapi component and use apicurio-data-module which can support OpenApi 2 & 3 at the same time
add eb37001 [CAMEL-14227]make checkstyle happy
add 1913b85 Add FAQ entry how to create runnable JAR
add badf907 Regen
add 9ef1c8e Add FAQ entry how to create runnable JAR
add 0ec60e6 Regen
add 5c87c10 CAMEL-14233: Fix Overriden topics when using aggregation on Exchanges or Messages
add b214d81 Merge pull request #3383 from omarsmak/CAMEL-14233
add 5a5e6f8 CAMEL-14215: Remove osgi-activator from camel-core feature as it does not belong there.
add bad347a CAMEL-14259: camel-spring-boot - When using main-run-controller then CamelContext is initialized twice
add 56fe769 Upgrade Reactor Core to version 3.2.13.RELEASE
add 9aeb92a CAMEL-14242: Fix binding parameters with arg.- is not possible when using endpointdsl and RabbitMQ. Thaks to Michael Elbaz for reporting and with a PR with a try fix.
add 2929f73 Fix a small typo on the Elasticsearch documentation
add b6cceb1 Merge pull request #3386 from orpiske/minor-typo-fix
add 3e0dabf Upgrade RxJava to version 2.2.15
add 6c5c88b Regen docs
add d44c400 Move camel-core-osgi-activator tests to Karaf i... (#3387)
add bc9042b Merge branch 'master' of github.com:apache/camel into CAMEL-14227
add 306773e Update components/camel-rest-openapi/src/main/docs/rest-openapi-component.adoc
add 0243c9f Update components/camel-rest-openapi/src/main/docs/rest-openapi-component.adoc
add 42a0030 Update components/camel-rest-openapi/src/main/docs/rest-openapi-component.adoc
add da6db19 Update components/camel-rest-openapi/src/main/docs/rest-openapi-component.adoc
add 64e589d Update components/camel-rest-openapi/src/main/docs/rest-openapi-component.adoc
add ad455be Update components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiComponent.java
add 5c20947 Update components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiComponent.java
add 99570ba Update components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiComponent.java
add fe72005 Merge branch 'CAMEL-14227' of github.com:ffang/camel into CAMEL-14227
add b4bd116 [CAMEL-14227]more polish up
add 4ed8253 Merge pull request #3384 from ffang/CAMEL-14227
add 8cff6a1 Camel-Hazelcast: Fixed Hazelcast-set description
add 92d7a9d Camel-Hazelcast: Regen
add b71c03f Camel-Kubernetes: Fixed description for Kubernetes-services component
add 181145f Camel-Kubernetes: Regen
add 439ee88 Fixed build and regen
add 003666d CAMEL-14263: Make property configurer for component and endpoints into only class.
add 934698b Fixed build
add bee7c98 CAMEL-14263: Fixed CS
add c98a203 CAMEL-14240: Add backlogTracing into the spring/blueprint XML
add 9d22378 CAMEL-14263: camel-dozer should use source code generated configurer to avoid reflection configuration.
add b0e9543 CAMEL-14265: camel-cdi - Standalone CDI with Camel Main discovers routes twice
add bb47804 CAMEL-14266: Add getStartDate to CamelContext api
add e1e9684 Upgrade Narayana to version 5.10.1.Final
add 0ce80dd CAMEL-14263: camel-avro should use source code generated configurer to avoid reflection configuration.
add 1d1d26e Regen
add 923f13c Removing unused dom4j bundle from xstream
add c7cecef CAMEL-14263: camel-thrift should use source code generated configurer to avoid reflection configuration.
add 10dfcf5 CAMEL-14263: camel-stomp should use source code generated configurer to avoid reflection configuration.
add 66ba03a5 CAMEL-14263: camel-thrift should use source code generated configurer to avoid reflection configuration.
add c4f6b6f CAMEL-14263: camel-stomp should use source code generated configurer to avoid reflection configuration.
add 85c484b Upgrade Spring Boot to version 2.2.2.RELEASE
add ac8024b Upgrade Spring to version 5.2.2.RELEASE
add c94b885 Upgrade Spring Boot to version 2.2.2.RELEASE in spring-boot-dm too
add 05010d0 CAMEL-14263: camel-smpp should use source code generated configurer to avoid reflection configuration.
add dd98819 CAMEL-14263: camel-netty-http should use source code generated configurer to avoid reflection configuration.
add 9599748 CAMEL-14263 - Added a TODO note about setProperties for configuration copy
add 72f24cf CAMEL-14263: camel-netty-http should use source code generated configurer to avoid reflection configuration.
add 754ee4d [camel-core tests] fix producer, consumer cache tests on slow VM by adding timeout
add 83efe24 CAMEL-14263: camel-nats should use source code generated configurer to avoid reflection configuration.
add d4869c8 pg-replication-slot fix: if PG connection got lost while trying to send (#3389)
add ce91776 CAMEL-14263: camel-cm-sms should use source code generated configurer to avoid reflection configuration.
add c6c31cf CAMEL-14263: camel-elasticsearch-rest should use source code generated configurer to avoid reflection configuration.
add 8dbab21 CAMEL-14263: camel-ganglia should use source code generated configurer to avoid reflection configuration.
add aa0ce52 CAMEL-14263: camel-gora should use source code generated configurer to avoid reflection configuration.
add f96ddbc CAMEL-14263: camel-grpc should use source code generated configurer to avoid reflection configuration.
add 34762f1 CAMEL-14263: camel-kubernetes should use source code generated configurer to avoid reflection configuration.
add 5f3f0eb CAMEL-14272: Configuring endpoint with bean reference should fail if no such bean found when using source code generated configurer.
add ac43bbe Polished
add ecbcfa9 CAMEL-14263: camel-mina should use source code generated configurer to avoid reflection configuration.
add b86fd0d CAMEL-14263: camel-nagios should use source code generated configurer to avoid reflection configuration.
add 5775701 CAMEL-14263: camel-crypto should use source code generated configurer to avoid reflection configuration.
add 4220221 CAMEL-14263: camel-smpp should use source code generated configurer to avoid reflection configuration.
add c4f93f2 CAMEL-14263: camel-spark-rest should use source code generated configurer to avoid reflection configuration.
add ce7e7fb CAMEL-14263: camel-zookeeper should use source code generated configurer to avoid reflection configuration.
add 8b3d4f7 Remove unused import statements.
add f847f69 Camel 3 made Jackson the default JSON library. Update the Javadoc of DataFormatClause#json to reflect this.
add b8fe47c Regen
add 6d1e975 camel-jacksonxml: Make pretty-print test platform independent.
add 807aa89 CAMEL-14263: Fixed compile issue with ganglia and rebuild
add 33805aa Regen
add 660b902 CAMEL-14263: camel-hazelcast should use source code generated configurer to avoid reflection configuration - Hazelcast-queue
add 973e705 CAMEL-14263: camel-hazelcast should use source code generated configurer to avoid reflection configuration - Hazelcast-seda
add 863d659 CAMEL-14263: camel-hazelcast should use source code generated configurer to avoid reflection configuration - Hazelcast-topic
add d6ac2b3 Camel-Hazelcast: Fixed Hazelcast-seda configuration test
add 306fcbd CAMEL-14263: camel-hazelcast should use source code generated configurer to avoid reflection configuration.
add 6a8b8f8 CAMEL-14273: Binding properties using source code generated configurer classes should deal with if the setter method threw exception.
add da9e4bd Add ignite to git ignore folder
add caafa43 User Manual - JSON section: Replace usage of Context#getProperties (was removed in Camel 3) with Context#getGlobalOptions.
add a0fa6c7 Fixed flaky tests on slow CI servers
add b3f1e7a Camel-base: Remove dead code (#3390)
add 11bf04c Camel-Hazelcast: Fixed Hazelcast-seda config test
add bf49fa6 Upgrade Univocity Parsers to version 2.8.4
add 1704ad0 Upgrade Tika to version 1.23
add 832c6d3 Upgrade Qpid Broker to version 7.1.6
add ae967d8 "CAMEL-14019:Upgrade to log4j v2 in remainder components"
add f835ea1 CAMEL-14274: camel-crypto-cms - Deprecate this component as its hard to maintain
add 4d09509 CAMEL-14270: camel-quartz - Allow to configure quartz properties via spring boot autoconfiguraiton
add 309cb51 CAMEL-14275: Camel component option with Properties should be configurable in SB
add 04dfa37 CAMEL-14268: Upgrade to smallrye-config 1.5
add f01a61f CAMEL-14268: Upgrade to smallrye-config 1.5. Use the new groupId name
add 0198dd6 [CAMEL-14277] NPE when NATS server not configured
add f712653 Merge pull request #3394 from tdiesler/CAMEL-14277
add 1879c5e CAMEL-14276: Move camel-core-osgi-activator to components
add d08e3af CAMEL-14274: camel-crypto-cms - Deprecate this component as its hard to maintain
add f198e90 Revert "CAMEL-14268: Upgrade to smallrye-config 1.5. Use the new groupId name"
add 4d288b9 Revert "CAMEL-14268: Upgrade to smallrye-config 1.5"
add 8b019f6 CAMEL-14276: Move camel-core-osgi-activator to components
add 0c1f770 CAMEL-14276: Move camel-core-osgi-activator to components
add 3ddbd75 CAMEL-14276: Move camel-core-osgi-activator to components
add 6d0908b CAMEL-14276: Move camel-core-osgi-activator to components
add c427564 [CAMEL-14267] Fix a nullPointerException in convertIfRequired (#3393)
add a2fa539 CAMEL-14273: Fixed test
add dcc36a2 Fixed CS
add 10683c6 CAMEL-14268: Component auto configuration fails in Java 11
add 34c8665 Merge branch 'master' of github.com:apache/camel
add ccb8ae1 Put the example of skipHeaderRecord csv unmarshal
add eaabad1 Merge pull request #3395 from laertida/patch-1
add 436dc90 Regen
add 205f75f Revert "CAMEL-14268: Component auto configuration fails in Java 11"
add 5bfa152 CAMEL-14268: Component auto configuration fails in Java 11
add 8482457 CAMEL-14282: came-nsq - Configure servers on component level
add b9ec19a CAMEL-14254: Add Camel 3.x migration guide
add b4551d9 Polished migration guides
add f1ac2da CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object
add 3a8c094 CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object
add 9fc44e3 CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object
add 6011425 CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object
add 71969b5 Fix grammar
add e651223 Merge pull request #3398 from pepavesely/patch-1
add 18859ec CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object
add f13ad88 CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - Weather component
add 29af694 CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - Splunk Component
add bcdea7b CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - Paho component
add 85555a7 CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - Optaplanner Component
add d4b69ca CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - Consul component
add ea03a72 CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - Digitalocean component
add c8e25fb Upgrade JackRabbit to version 2.19.6
add 523e461 Upgrade Hazelcast to version 3.12.5
add 274e1df CAMEL-14254: Rename 'Camel 3.x Migration Guide' -> 'Camel 3.x Upgrade Guide'
add 1c3254b CAMEL-14287: getComponent on CamelContext should initialize component
add a1d7238 Regen
add 6464034 CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - JCache component
add c293252 CAMEL-14288: Endpoint configurer should deal better with list types
add bac299e Removed cruft which is no longer in use as properties component is not a regular Camel component anymore
add 342e16e CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - JCache component
add 9cb6fc2 CAMEL-14288: Endpoint configurer should deal better with list types
add 0a4514d CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - Docker component
add 184079a CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - Dropbox component
add 684fe1e CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - EHCache component
add 22240d4 CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - EHCache component
add 4416169 CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - Etcd component
add 8e4f1b5 CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - Debezium component
add 0653f9c CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - JBPM component
add 99214b2 CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - jclouds component
add c0ee244 CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - jira component
add eba5ee8 CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - milo component
add 97ce74f CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - pulsar component
add ce8513f Upgrade Qpid JMS client to version 0.48.0
add 5ac25d5 Upgrade Proton J to version 0.33.3
add 9c09d3ba CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - aws-cw
add fc9ef81 CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - xchange
add 6fb0ebf CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - aws-ddb
add 7b86d97 CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - aws-ddbstreams
add 9d16fee CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - webhook
add fc30420 CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - aws-ec2
add 926b206 CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - aws-ecs
add a3aa6c4 CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - aws-eks
add fb8c059 CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - aws-iam
add ef7fddd CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - aws-kinesis
add 97f0a64 CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - aws-kinesis-firehose
add a4ab5e5 CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - aws-kms
add b862e01 CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - aws-lambda
add 54a694e CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - aws-mq
add b8bf160 CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - aws-msk
add ab61fc7 CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - aws-s3
add d87e98e CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - aws-sdb
add 863e058 CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - aws-ses
add bdb6ad2 CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - aws-sns
add e6eee6f Regen
add b87d015 CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - corda
add 2105900 CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - infinispan
add 571a9bb CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - aws-sqs
add dd18048 CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - aws-swf
add 6977770 CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - aws-translate
add bd2b17d CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - google-sheets-stream
add 974f9ee CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - google-mail-stream
add 97eef36 CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - google-calendar-stream
add 6ba537c CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - google-bigquery
add 87a70f9 CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - google-bigquery-sql
add dddea30 CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - robotframework
add 52bb90b CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - ipfs. Also fixed so the endpoint is singleton and other cleanups.
add 7b25b69 CAMEL-14292 - Remove unwanted dependency to Guava strings class repackaged in google-http-client library
add f615dfb CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - web3j
add 950321f CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - web3j
add 5f554d4 Upgrade JGit to version 5.6.0.201912101111-r
add dcbca01 CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - telegram
add c36f04e CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - spring-ws
add 08f28a5 CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - jooq
add dc9b027 jooq upgrade issue
add 73891fd CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - spring-redis
add 564e4db Fix typos in documentation navigation (#3400)
add 13b9efa CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - servicenow
add 6243894 Polished
add 85b79e7 Fixing failing xml security tests with latest Azul JDK
add 757fd2c Add again the correct link in nav
add cef08ba Regen docs
add 1f74ae4 CAMEL-14285: Create bundle based karaf tests for camel-osgi-activator.
add 2259bda CAMEL-14285 - Removed tests from camel-itest-karaf
add c3080df Rename again: 'Camel 3.x Migration Guide' -> 'Camel 3.x Upgrade Guide'
add 7b1d682 Regen
add c244a6c Camel-AWS-EC2: Fixed CS
add 5e32eea Camel-Optaplanner: Fixed CS
add 1ad160a Camel-Pulsar: Fixed CS
add 4c07898 Camel-Consul: Fixed CS
add 8664391 Upgrade RabbitMq to version 5.8.0
add 47586fd CAMEL-14295 - Camel-cm-sms: Karaf and Spring Boot integration tests are broken
add 28dd0dc Re-introduce correct cql for camel-cassandra-cdi-example
add d1a8d5c Correct "not equals" symbol
add 7687556 Merge pull request #3406 from kodePhile/patch-1
add 67139e0 Regen
new 7067d59 CAMEL-11807: Migrated camel-telegram tests to 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 (c599845)
\
N -- N -- N refs/heads/CAMEL-11807 (7067d59)
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 1 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 | 15 +
apache-camel/src/main/descriptors/common-bin.xml | 3 +
bom/camel-bom/pom.xml | 15 +
components/camel-as2/camel-as2-api/pom.xml | 4 +
.../as2/api/io/AS2SessionInputBuffer.java | 4 +-
.../camel/component/atmos/AtmosComponent.java | 6 +-
.../camel/component/atmos/AtmosEndpoint.java | 1 +
.../src/main/docs/atomix-multimap-component.adoc | 32 +-
.../client/AbstractAtomixClientComponent.java | 2 -
.../atomix/client/map/AtomixMapComponent.java | 2 -
.../atomix/client/map/AtomixMapEndpoint.java | 4 +-
.../client/messaging/AtomixMessagingEndpoint.java | 4 +-
.../client/multimap/AtomixMultiMapEndpoint.java | 2 +-
.../atomix/client/queue/AtomixQueueEndpoint.java | 4 +-
.../atomix/client/set/AtomixSetEndpoint.java | 4 +-
.../atomix/client/value/AtomixValueEndpoint.java | 4 +-
.../apache/camel/component/avro/AvroComponent.java | 63 +-
.../camel/component/avro/AvroConfiguration.java | 3 +-
.../apache/camel/component/avro/AvroEndpoint.java | 79 +-
.../apache/camel/component/aws/cw/CwComponent.java | 47 +-
.../aws/cw/CwComponentConfigurationTest.java | 14 +-
.../aws/cw/CwComponentRegistryClientTest.java | 5 +-
.../camel/component/aws/ddb/DdbComponent.java | 33 +-
.../aws/ddbstream/DdbStreamComponent.java | 35 +-
.../aws/ddb/DdbComponentConfigurationTest.java | 6 +-
.../aws/ddb/DdbComponentRegistryClientTest.java | 4 +-
.../camel/component/aws/ddb/DdbComponentTest.java | 6 +-
.../DdbStreamComponentConfigurationTest.java | 11 +-
.../camel/component/aws/ec2/EC2Component.java | 32 +-
.../aws/ec2/EC2ComponentClientRegistryTest.java | 4 +-
.../aws/ec2/EC2ComponentConfigurationTest.java | 20 +-
.../camel/component/aws/ecs/ECSComponent.java | 35 +-
.../aws/ecs/ECSComponentClientRegistryTest.java | 4 +-
.../aws/ecs/ECSComponentConfigurationTest.java | 6 +-
.../camel/component/aws/eks/EKSComponent.java | 33 +-
.../aws/eks/EKSComponentClientRegistryTest.java | 4 +-
.../aws/eks/EKSComponentConfigurationTest.java | 6 +-
.../camel/component/aws/iam/IAMComponent.java | 33 +-
.../aws/iam/IAMComponentClientRegistryTest.java | 4 +-
.../aws/iam/IAMComponentConfigurationTest.java | 6 +-
.../aws/firehose/KinesisFirehoseComponent.java | 32 +-
.../component/aws/kinesis/KinesisComponent.java | 34 +-
.../KinesisFirehoseComponentConfigurationTest.java | 8 +-
.../kinesis/KinesisComponentConfigurationTest.java | 8 +-
.../camel/component/aws/kms/KMSComponent.java | 34 +-
.../aws/kms/KMSComponentClientRegistryTest.java | 4 +-
.../aws/kms/KMSComponentConfigurationTest.java | 6 +-
.../component/aws/lambda/LambdaComponent.java | 35 +-
.../lambda/LambdaComponentClientRegistryTest.java | 4 +-
.../lambda/LambdaComponentConfigurationTest.java | 18 +-
.../apache/camel/component/aws/mq/MQComponent.java | 33 +-
.../aws/mq/MQComponentClientRegistryTest.java | 4 +-
.../aws/mq/MQComponentConfigurationTest.java | 6 +-
.../camel/component/aws/msk/MSKComponent.java | 34 +-
.../aws/msk/MSKComponentClientRegistryTest.java | 4 +-
.../aws/msk/MSKComponentConfigurationTest.java | 6 +-
.../apache/camel/component/aws/s3/S3Component.java | 34 +-
.../aws/s3/S3ComponentClientRegistryTest.java | 4 +-
.../aws/s3/S3ComponentConfigurationTest.java | 34 +-
.../camel/component/aws/sdb/SdbComponent.java | 8 +-
.../aws/sdb/SdbComponentConfigurationTest.java | 20 +-
.../camel/component/aws/ses/SesComponent.java | 34 +-
.../aws/ses/SesComponentConfigurationTest.java | 40 +-
.../component/aws/ses/SesComponentSpringTest.java | 8 -
.../camel/component/aws/ses/SesComponentTest.java | 10 +-
.../aws/ses/SESComponentSpringTest-context.xml | 2 +-
.../camel/component/aws/sns/SnsComponent.java | 32 +-
.../aws/sns/SNSComponentClientRegistryTest.java | 4 +-
.../aws/sns/SnsComponentConfigurationTest.java | 26 +-
.../camel/component/aws/sqs/SqsComponent.java | 36 +-
.../aws/sqs/SqsComponentClientRegistryTest.java | 4 +-
.../aws/sqs/SqsComponentConfigurationTest.java | 40 +-
.../camel/component/aws/swf/SWFComponent.java | 30 +-
.../aws/swf/SWFComponentClientRegistryTest.java | 4 +-
.../aws/swf/SWFComponentConfigurationTest.java | 4 +-
.../aws/translate/TranslateComponent.java | 32 +-
.../component/aws/translate/TranslateEndpoint.java | 2 +-
components/camel-azure/pom.xml | 14 +-
.../component/azure/blob/BlobServiceComponent.java | 9 +-
.../azure/queue/QueueServiceComponent.java | 33 +-
...lobServiceComponentConfigurationClientTest.java | 66 +-
.../BlobServiceComponentConfigurationTest.java | 68 +-
.../component/azure/blob/BlobServiceUtilTest.java | 20 +-
...eueServiceComponentClientConfigurationTest.java | 36 +-
.../QueueServiceComponentConfigurationTest.java | 36 +-
.../azure/queue/QueueServiceUtilTest.java | 9 +-
.../camel/blueprint/CamelContextFactoryBean.java | 28 +
.../src/main/docs/bonita-component.adoc | 14 +-
.../camel/component/bonita/BonitaComponent.java | 5 +-
.../camel/component/bonita/BonitaEndpoint.java | 2 +-
.../src/main/docs/caffeine-cache-component.adoc | 9 +-
.../main/docs/caffeine-loadcache-component.adoc | 9 +-
.../caffeine/cache/CaffeineCacheComponent.java | 5 +-
.../caffeine/cache/CaffeineCacheEndpoint.java | 3 +-
.../caffeine/load/CaffeineLoadCacheComponent.java | 5 +-
.../caffeine/load/CaffeineLoadCacheEndpoint.java | 3 +-
.../src/main/java/org/apache/camel/cdi/Main.java | 5 +
.../camel/cdi/XmlErrorHandlerFactoryBean.java | 7 +-
.../camel/cdi/xml/CamelContextFactoryBean.java | 30 +
.../camel/cdi/xml/ErrorHandlerDefinition.java | 24 +-
components/camel-chatscript/pom.xml | 15 +-
.../org/apache/camel/component/cm/CMComponent.java | 20 +-
.../org/apache/camel/component/cm/CMEndpoint.java | 2 +-
.../java/org/apache/camel/coap/CoAPComponent.java | 4 +-
.../src/main/docs/consul-component.adoc | 31 +-
.../consul/ConsulClientConfiguration.java | 9 +-
.../camel/component/consul/ConsulComponent.java | 79 +-
.../camel/component/consul/ConsulEndpoint.java | 8 +-
.../camel/component/consul/ConsulRegistry.java | 24 +-
.../consul/cloud/ConsulServiceDiscovery.java | 38 +-
.../cloud/ConsulServiceDiscoveryFactory.java | 1 +
.../consul/cloud/ConsulServiceRegistry.java | 136 +--
.../cloud/ConsulServiceRegistryConfiguration.java | 3 +-
.../consul/cluster/ConsulClusterView.java | 34 +-
.../consul/endpoint/AbstractConsulProducer.java | 28 +-
.../consul/endpoint/ConsulCatalogProducer.java | 32 +-
.../consul/endpoint/ConsulCoordinatesProducer.java | 12 +-
.../consul/endpoint/ConsulEventConsumer.java | 11 +-
.../consul/endpoint/ConsulEventProducer.java | 19 +-
.../consul/endpoint/ConsulHealthProducer.java | 45 +-
.../consul/endpoint/ConsulKeyValueProducer.java | 72 +-
.../endpoint/ConsulPreparedQueryProducer.java | 31 +-
.../consul/endpoint/ConsulSessionProducer.java | 58 +-
.../consul/health/ConsulHealthCheckRepository.java | 24 +-
.../camel/component/consul/ConsulCatalogTest.java | 13 +-
.../component/consul/ConsulClientKeyValueTest.java | 11 +-
.../component/consul/ConsulCoordinatesTest.java | 13 +-
.../camel/component/consul/ConsulEventTest.java | 11 +-
.../component/consul/ConsulEventWatchTest.java | 4 +-
.../camel/component/consul/ConsulHealthTest.java | 37 +-
.../camel/component/consul/ConsulKeyValueTest.java | 11 +-
.../component/consul/ConsulKeyValueWatchTest.java | 4 +-
.../camel/component/consul/ConsulRegistryTest.java | 13 +-
.../component/consul/ConsulRegistryUtilsTest.java | 16 +-
.../camel/component/consul/ConsulSessionTest.java | 30 +-
.../camel/component/consul/ConsulTestSupport.java | 22 +-
.../cloud/ConsulDefaultServiceCallRouteTest.java | 26 +-
.../cloud/ConsulRibbonServiceCallRouteTest.java | 27 +-
.../ConsulServiceCallWithRegistrationTest.java | 36 +-
.../consul/cloud/ConsulServiceDiscoveryTest.java | 21 +-
.../cloud/ConsulServiceRegistrationTestBase.java | 8 +-
...RegistrationWithRoutePolicyAndMetadataTest.java | 8 +-
...viceRegistrationWithRoutePolicyFactoryTest.java | 6 +-
...nsulServiceRegistrationWithRoutePolicyTest.java | 8 +-
...erviceRegistrationWithServiceComponentTest.java | 7 +-
.../consul/cloud/ConsulServiceRegistryTest.java | 12 +-
.../cloud/SpringConsulServiceCallRouteTest.java | 59 +-
.../ConsulClusteredRoutePolicyFactoryMain.java | 4 +-
.../ConsulClusteredRoutePolicyFactoryTest.java | 5 +-
.../cluster/ConsulClusteredRoutePolicyTest.java | 5 +-
.../component/consul/cluster/ConsulMasterTest.java | 5 +-
components/camel-corda/README.md | 3 -
components/camel-corda/pom.xml | 4 -
.../camel-corda/src/main/docs/corda-component.adoc | 42 +-
.../camel/component/corda/CordaComponent.java | 23 +-
.../camel/component/corda/CordaConfiguration.java | 78 +-
.../camel/component/corda/CordaEndpoint.java | 37 +-
components/camel-crypto-cms/pom.xml | 2 +-
.../src/main/docs/crypto-cms-component.adoc | 7 +-
.../crypto/DigitalSignatureComponent.java | 10 +-
.../camel-csv/src/main/docs/csv-dataformat.adoc | 17 +-
.../component/debezium/DebeziumComponent.java | 7 +-
.../camel/component/debezium/DebeziumEndpoint.java | 5 +-
.../debezium/DebeziumMongodbComponentTest.java | 4 +
.../debezium/DebeziumMySqlComponentTest.java | 4 +
.../debezium/DebeziumPostgresComponentTest.java | 4 +
.../debezium/DebeziumSqlserverComponentTest.java | 4 +
.../digitalocean/DigitalOceanComponent.java | 11 +-
.../camel/component/docker/DockerComponent.java | 3 +-
.../camel/component/docker/DockerEndpoint.java | 16 +-
.../camel/component/dozer/DozerComponent.java | 12 +-
.../camel/component/dozer/DozerEndpoint.java | 5 +
.../camel/component/dozer/DozerComponentTest.java | 16 +-
.../camel/component/dropbox/DropboxComponent.java | 7 +-
.../camel/component/dropbox/DropboxEndpoint.java | 2 +
.../src/main/docs/ehcache-component.adoc | 4 +-
.../camel/component/ehcache/EhcacheComponent.java | 7 +-
.../component/ehcache/EhcacheConfiguration.java | 38 +-
.../camel/component/ehcache/EhcacheConsumer.java | 2 +-
.../camel/component/ehcache/EhcacheEndpoint.java | 28 +-
.../component/ehcache/EhcacheManagerTest.java | 8 +-
.../main/docs/elasticsearch-rest-component.adoc | 7 +-
.../elasticsearch/ElasticsearchComponent.java | 4 +-
.../elasticsearch/ElasticsearchConfiguration.java | 11 +-
.../apache/camel/component/etcd/EtcdComponent.java | 25 +-
components/camel-ftp/pom.xml | 1 -
.../camel-ftp/src/main/docs/sftp-component.adoc | 4 +-
.../component/file/remote/SftpConfiguration.java | 8 +-
.../remote/FtpProducerFileWithCharsetTest.java | 2 +-
.../camel/component/ganglia/GangliaComponent.java | 1 -
.../component/ganglia/GangliaConfiguration.java | 6 +-
components/camel-google-bigquery/pom.xml | 13 +-
.../google/bigquery/GoogleBigQueryComponent.java | 5 +-
.../bigquery/GoogleBigQueryConnectionFactory.java | 6 +-
.../bigquery/sql/GoogleBigQuerySQLComponent.java | 5 +-
.../src/test/resources/log4j2.properties | 12 +-
.../stream/GoogleCalendarStreamComponent.java | 1 -
.../mail/stream/GoogleMailStreamComponent.java | 1 -
components/camel-google-pubsub/pom.xml | 13 +-
.../pubsub/GooglePubsubConnectionFactory.java | 7 +-
.../google/pubsub/GooglePubsubConsumer.java | 7 +-
.../google/pubsub/GooglePubsubEndpoint.java | 13 +-
.../google/pubsub/GooglePubsubProducer.java | 7 +-
.../pubsub/consumer/PubsubAcknowledgement.java | 7 +-
.../src/test/resources/log4j2.properties | 12 +-
.../sheets/stream/GoogleSheetsStreamComponent.java | 1 -
.../apache/camel/component/gora/GoraComponent.java | 9 +-
.../apache/camel/component/grpc/GrpcComponent.java | 9 +-
.../camel/component/grpc/GrpcConfiguration.java | 2 +-
.../apache/camel/component/grpc/GrpcEndpoint.java | 29 +-
.../hazelcast/HazelcastDefaultComponent.java | 2 +
.../hazelcast/queue/HazelcastQueueComponent.java | 2 +-
.../hazelcast/seda/HazelcastSedaComponent.java | 2 +-
.../hazelcast/set/HazelcastSetEndpoint.java | 2 +-
.../hazelcast/topic/HazelcastTopicComponent.java | 2 +-
.../hystrix/processor/HystrixReifier.java | 58 +-
.../processor/HystrixHierarchicalConfigTest.java | 20 +-
.../HystrixRouteConfigMaximumSizeTest.java | 2 +-
.../hystrix/processor/HystrixRouteConfigTest.java | 2 +-
.../SpringHystrixRouteHierarchicalConfigTest.java | 2 +-
components/camel-ignite/.gitignore | 1 +
.../component/infinispan/InfinispanComponent.java | 8 +-
.../component/infinispan/InfinispanEndpoint.java | 4 +-
components/camel-influxdb/pom.xml | 10 +
.../camel-ipfs/src/main/docs/ipfs-component.adoc | 8 +-
.../apache/camel/component/ipfs/IPFSComponent.java | 10 +-
.../camel/component/ipfs/IPFSConfiguration.java | 41 +-
.../apache/camel/component/ipfs/IPFSEndpoint.java | 94 +-
.../apache/camel/component/ipfs/IPFSProducer.java | 103 +-
.../camel/component/ipfs/SimpleIPFSTest.java | 57 +-
.../src/test/resources/log4j2.properties | 4 +-
.../component/jacksonxml/JacksonMarshalTest.java | 2 +-
.../SpringJacksonJsonDataFormatTest.java | 2 +-
.../apache/camel/component/jbpm/JBPMComponent.java | 6 +-
.../apache/camel/component/jbpm/JBPMEndpoint.java | 4 +-
.../src/main/docs/jcache-component.adoc | 12 +-
.../camel/component/jcache/JCacheComponent.java | 46 +-
.../component/jcache/JCacheConfiguration.java | 21 +-
.../camel/component/jcache/JCacheEndpoint.java | 4 +-
.../camel/component/jcache/JCacheManager.java | 16 +-
.../camel/component/jcache/JCacheConsumerTest.java | 12 +-
.../camel/component/jclouds/JcloudsComponent.java | 1 -
.../camel-jdbc/src/main/docs/jdbc-component.adoc | 2 +-
.../apache/camel/component/jdbc/JdbcEndpoint.java | 2 +-
.../camel-jira/src/main/docs/jira-component.adoc | 2 +-
.../apache/camel/component/jira/JiraComponent.java | 12 +-
.../camel/component/jira/JiraConfiguration.java | 11 +-
.../apache/camel/component/jira/JiraEndpoint.java | 22 +-
.../jira/JiraComponentConfigurationTest.java | 18 +-
.../camel-jms/src/main/docs/jms-component.adoc | 2 +-
.../apache/camel/component/jms/JmsComponent.java | 2 +-
.../camel/component/jms/JmsConfiguration.java | 20 +-
.../jms/JmsEndpointConfigurationTest.java | 6 +-
.../apache/camel/component/jooq/JooqComponent.java | 40 +-
.../apache/camel/component/jooq/JooqEndpoint.java | 29 -
.../camel/component/kafka/KafkaProducer.java | 17 +-
.../camel/component/kafka/KafkaProducerTest.java | 100 ++
.../kubernetes/AbstractKubernetesComponent.java | 5 +-
.../config_maps/KubernetesConfigMapsEndpoint.java | 5 +-
.../deployments/KubernetesDeploymentsEndpoint.java | 4 +-
.../kubernetes/hpa/KubernetesHPAEndpoint.java | 5 +-
.../namespaces/KubernetesNamespacesEndpoint.java | 5 +-
.../kubernetes/nodes/KubernetesNodesEndpoint.java | 5 +-
.../kubernetes/pods/KubernetesPodsEndpoint.java | 5 +-
.../KubernetesReplicationControllersEndpoint.java | 4 +-
.../services/KubernetesServicesEndpoint.java | 7 +-
.../component/milo/client/MiloClientComponent.java | 20 +-
.../component/milo/client/MiloClientEndpoint.java | 20 +-
.../component/milo/server/MiloServerEndpoint.java | 4 +-
.../apache/camel/component/mina/MinaComponent.java | 6 +-
.../verifier/MongoDbVerifierExtensionTest.java | 2 +-
.../src/main/docs/nagios-component.adoc | 6 +-
.../camel/component/nagios/NagiosComponent.java | 1 -
.../component/nagios/NagiosConfiguration.java | 22 -
.../component/nagios/NagiosEncryptionMethod.java | 28 -
.../camel/component/nagios/NagiosEndpoint.java | 18 +-
.../component/nagios/NagiosAsyncSendTest.java | 51 -
.../apache/camel/component/nagios/NagiosTest.java | 14 +-
.../component/nagios/NagiosXorEncryptionTest.java | 13 +-
.../camel-nats/src/main/docs/nats-component.adoc | 107 +-
.../apache/camel/component/nats/NatsComponent.java | 24 +-
.../camel/component/nats/NatsConfiguration.java | 39 +-
.../apache/camel/component/nats/NatsConstants.java | 4 +
.../apache/camel/component/nats/NatsConsumer.java | 19 +-
.../apache/camel/component/nats/NatsEndpoint.java | 6 +-
.../apache/camel/component/nats/NatsProducer.java | 11 +-
.../component/nats/NatsAuthConsumerLoadTest.java | 4 +-
.../camel/component/nats/NatsAuthProducerTest.java | 3 +-
.../camel/component/nats/NatsAuthTestSupport.java | 13 +-
.../nats/NatsAuthTokenConsumerLoadTest.java | 4 +-
.../component/nats/NatsAuthTokenProducerTest.java | 3 +-
.../component/nats/NatsAuthTokenTestSupport.java | 14 +-
.../camel/component/nats/NatsConsumerLoadTest.java | 9 +-
.../nats/NatsConsumerMaxMessagesQueueTest.java | 8 +-
.../nats/NatsConsumerMaxMessagesTest.java | 5 +-
...rLoadTest.java => NatsConsumerReplyToTest.java} | 34 +-
.../camel/component/nats/NatsConsumerTest.java | 15 +-
.../nats/NatsConsumerWithConnectionLoadTest.java | 15 +-
.../nats/NatsConsumerWithRedeliveryTest.java | 19 +-
.../camel/component/nats/NatsProducerTLSTest.java | 3 +-
.../camel/component/nats/NatsProducerTest.java | 3 +-
.../camel/component/nats/NatsTestSupport.java | 13 +-
.../src/main/docs/netty-http-component.adoc | 6 +-
.../component/netty/http/NettyHttpComponent.java | 2 +-
.../camel-netty/src/main/docs/netty-component.adoc | 6 +-
.../netty/DefaultServerInitializerFactory.java | 2 -
.../camel/component/netty/NettyComponent.java | 39 +-
.../apache/camel/component/netty/NettyHelper.java | 17 +
.../camel-nsq/src/main/docs/nsq-component.adoc | 50 +-
.../apache/camel/component/nsq/NsqComponent.java | 26 +-
.../camel/component/nsq/NsqConfiguration.java | 23 +-
.../apache/camel/component/nsq/NsqEndpoint.java | 10 +-
.../apache/camel/component/nsq/NsqProducer.java | 2 -
.../camel/component/nsq/NsqConsumerTest.java | 2 +-
.../camel/component/nsq/NsqProducerTest.java | 5 +-
.../apache/camel/component/nsq/NsqTestSupport.java | 4 +-
.../camel/opentracing/OpenTracingTracer.java | 35 +-
.../apache/camel/opentracing/SpanDecorator.java | 14 +-
.../opentracing/decorators/AhcSpanDecorator.java | 5 +
.../opentracing/decorators/AmqpSpanDecorator.java | 5 +
.../decorators/AwsSnsSpanDecorator.java | 5 +
.../decorators/AwsSqsSpanDecorator.java | 5 +
.../decorators/CometdSpanDecorator.java | 5 +
.../opentracing/decorators/CqlSpanDecorator.java | 5 +
.../decorators/DirectSpanDecorator.java | 5 +
.../decorators/DirectvmSpanDecorator.java | 5 +
.../decorators/DisruptorSpanDecorator.java | 5 +
.../decorators/DisruptorvmSpanDecorator.java | 5 +
.../decorators/ElasticsearchSpanDecorator.java | 7 +-
.../opentracing/decorators/HttpSpanDecorator.java | 5 +
...cSpanDecorator.java => HttpsSpanDecorator.java} | 4 +-
.../decorators/IronmqSpanDecorator.java | 5 +
.../opentracing/decorators/JdbcSpanDecorator.java | 5 +
.../opentracing/decorators/JettySpanDecorator.java | 5 +
.../opentracing/decorators/JmsSpanDecorator.java | 5 +
.../opentracing/decorators/KafkaSpanDecorator.java | 5 +
.../opentracing/decorators/LogSpanDecorator.java | 5 +
.../decorators/MongoDBSpanDecorator.java | 5 +
...msSpanDecorator.java => NatsSpanDecorator.java} | 13 +-
.../decorators/NettyHttpSpanDecorator.java | 5 +
...ompSpanDecorator.java => NsqSpanDecorator.java} | 29 +-
.../opentracing/decorators/PahoSpanDecorator.java | 5 +
.../decorators/RabbitmqSpanDecorator.java | 5 +
.../opentracing/decorators/RestSpanDecorator.java | 5 +
.../opentracing/decorators/SedaSpanDecorator.java | 5 +
.../decorators/ServletSpanDecorator.java | 5 +
...gSpanDecorator.java => Sjms2SpanDecorator.java} | 8 +-
.../opentracing/decorators/SjmsSpanDecorator.java | 5 +
.../opentracing/decorators/SqlSpanDecorator.java | 5 +
.../opentracing/decorators/StompSpanDecorator.java | 5 +
.../opentracing/decorators/TimerSpanDecorator.java | 5 +
.../decorators/UndertowSpanDecorator.java | 5 +
.../opentracing/decorators/VmSpanDecorator.java | 5 +
.../org.apache.camel.opentracing.SpanDecorator | 4 +
.../opentracing/CustomComponentNameRouteTest.java | 82 ++
.../decorators/AbstractHttpSpanDecoratorTest.java | 35 +
.../AbstractMessagingSpanDecoratorTest.java | 16 +
.../decorators/AbstractSpanDecoratorTest.java | 15 +
.../optaplanner/OptaPlannerComponent.java | 5 +-
.../component/optaplanner/OptaPlannerEndpoint.java | 4 +-
components/camel-osgi-activator/pom.xml | 191 ++++
.../src/assembly/test-bundles.xml | 50 +
.../src/main/docs/osgi-activator.adoc | 56 +
.../camel/osgi/activator/CamelRoutesActivator.java | 115 ++
.../osgi/activator/CamelOsgiActivatorIT.java | 114 ++
.../component/osgi/activator/PaxExamOptions.java | 97 ++
.../apache/camel/component/paho/PahoComponent.java | 1 -
.../slot/PgReplicationSlotConsumer.java | 6 +-
.../camel/component/pulsar/PulsarComponent.java | 9 +-
.../component/pulsar/PulsarComponentTest.java | 8 +-
.../src/main/docs/quartz-component.adoc | 10 +-
.../camel/component/quartz/QuartzComponent.java | 31 +-
components/camel-rabbitmq/pom.xml | 5 +
.../component/rabbitmq/RabbitMQComponent.java | 7 +-
.../rabbitmq/RabbitMQEndpointDSLTest.java | 54 +
.../component/resilience4j/ResilienceReifier.java | 2 +-
.../pom.xml | 38 +-
.../src/main/docs/rest-openapi-component.adoc} | 99 +-
.../rest/openapi/RestOpenApiComponent.java | 218 ++++
.../rest/openapi/RestOpenApiEndpoint.java} | 386 ++++---
.../component/rest/openapi/RestOpenApiHelper.java | 50 +
.../rest/openapi/RestOpenApiProducer.java | 65 ++
.../camel/component/rest/openapi}/HttpsTest.java | 8 +-
.../camel/component/rest/openapi/HttpsV3Test.java} | 16 +-
.../rest/openapi/Jetty94ServerFactory.java | 74 ++
.../apache/camel/component/rest/openapi/Pet.java} | 14 +-
.../apache/camel/component/rest/openapi/Pets.java} | 22 +-
.../rest/openapi/RestOpenApiComponentTest.java | 234 ++++
.../rest/openapi/RestOpenApiComponentV3Test.java | 235 ++++
.../rest/openapi/RestOpenApiDelegateHttpsTest.java | 44 +
.../openapi/RestOpenApiDelegateHttpsV3Test.java | 44 +
.../rest/openapi/RestOpenApiEndpointTest.java} | 293 ++---
.../openapi/RestOpenApiEndpointUriParsingTest.java | 68 ++
.../rest/openapi/RestOpenApiEndpointV3Test.java} | 314 +++---
.../rest/openapi/RestOpenApiGlobalHttpsTest.java} | 27 +-
.../openapi/RestOpenApiGlobalHttpsV3Test.java} | 26 +-
.../rest/openapi/RestOpenApiHelperTest.java} | 37 +-
.../src/test/resources/alt-openapi.json | 1 +
.../src/test/resources/alt-petstore.json | 1039 +++++++++++++++++
.../src/test/resources/localhost.p12 | Bin 0 -> 2534 bytes
.../src/test/resources/log4j2.properties | 16 +-
.../src/test/resources/openapi-v3.json | 1 +
.../src/test/resources/openapi.json | 1 +
components/camel-rest-swagger/pom.xml | 11 +-
.../src/main/docs/rest-swagger-component.adoc | 3 +-
.../rest/swagger/RestSwaggerEndpoint.java | 76 +-
.../camel/component/rest/swagger/HttpsTest.java | 19 +-
.../rest/swagger/RestSwaggerEndpointTest.java | 4 +-
.../robotframework/RobotFrameworkComponent.java | 2 +-
.../RobotFrameworkCamelConfigurationTest.java | 2 +-
.../camel-seda/src/main/docs/seda-component.adoc | 3 +-
.../component/servicenow/ServiceNowComponent.java | 16 +-
.../sjms/batch/SjmsBatchEndpointTest.java | 2 +-
.../apache/camel/component/smpp/SmppComponent.java | 7 +-
.../camel/component/smpp/SmppComponentTest.java | 25 +-
.../camel/component/sparkrest/SparkComponent.java | 1 -
.../camel/component/splunk/SplunkComponent.java | 5 +-
.../boot/CamelSpringBootApplicationController.java | 5 +
.../camel/component/redis/RedisComponent.java | 5 +-
.../camel/component/redis/RedisEndpoint.java | 9 +-
.../spring/ws/SpringWebserviceComponent.java | 19 +-
.../camel/spring/CamelContextFactoryBean.java | 34 +
.../apache/camel/spring/SpringRouteBuilder.java | 3 +
.../properties/route/SpringSimpleRoute.java | 4 +-
.../properties/route2/SpringBeanInjectRoute.java | 4 +-
.../route2/SpringPropertyInjectRoute.java | 4 +-
.../ConsumerTemplateMaximumCacheSizeTest.java | 12 +-
.../spring/config/MyDependsOnRouteBuilder.java | 6 +-
.../ProducerTemplateMaximumCacheSizeTest.java | 10 +-
.../spring/contextscan/normalorder/BarRoute.java | 4 +-
.../spring/contextscan/normalorder/FooRoute.java | 4 +-
.../spring/contextscan/reverseorder/AFooRoute.java | 4 +-
.../spring/contextscan/reverseorder/ZBarRoute.java | 4 +-
.../camel/spring/interceptor/AnnotatedRoute.java | 4 +-
.../MixedPropagationTransactedTest.java | 3 +-
.../MixedTransactionPropagationTest.java | 3 +-
.../TransactedInterceptSendToEndpointTest.java | 3 +-
...InterceptUsingAdviceWithSendToEndpointTest.java | 3 +-
.../TransactionalClientDataSourceAsyncTest.java | 10 +-
.../camel/spring/issues/contextscan/MyRoute.java | 4 +-
.../MyRouteBuilderWithAutowiredPojo.java | 4 +-
.../camel/spring/routebuilder/MyOtherRoute.java | 4 +-
.../apache/camel/spring/routebuilder/MyRoute.java | 4 +-
.../src/test/resources/custom.properties} | 15 +-
.../apache/camel/spring/processor/aggregator.xml | 6 +-
.../aggregate/jdbc/JdbcAggregationRepository.java | 2 +-
.../sql/stored/ProducerBatchInvalidTest.java | 5 +-
.../camel-stomp/src/main/docs/stomp-component.adoc | 4 +-
.../camel/component/stomp/StompComponent.java | 2 -
.../camel/component/stomp/StompConfiguration.java | 4 +-
.../camel/component/stomp/StompConsumer.java | 2 +
.../camel/component/stomp/StompEndpoint.java | 13 +-
.../camel-stub/src/main/docs/stub-component.adoc | 3 +-
.../apache/camel/swagger/RestSwaggerReader.java | 10 +-
components/camel-telegram/pom.xml | 12 +-
.../component/telegram/TelegramComponent.java | 18 +-
.../component/telegram/TelegramChatBotTest.java | 8 +-
.../telegram/TelegramComponentParametersTest.java | 41 +-
.../telegram/TelegramConfigurationTest.java | 4 +-
.../telegram/TelegramConsumerChannelPostTest.java | 8 +-
.../TelegramConsumerEmptyResponseTest.java | 19 +-
.../TelegramConsumerFallbackConversionTest.java | 8 +-
.../telegram/TelegramConsumerMappingTest.java | 9 +-
.../TelegramConsumerMediaDocumentTest.java | 8 +-
.../telegram/TelegramConsumerMediaPhotoTest.java | 9 +-
.../telegram/TelegramConsumerMediaVideoTest.java | 8 +-
.../telegram/TelegramConsumerMultipleTest.java | 6 +-
.../telegram/TelegramConsumerServiceErrorTest.java | 6 +-
.../telegram/TelegramConsumerSingleTest.java | 6 +-
.../TelegramProducerChatIdResolutionTest.java | 4 +-
.../telegram/TelegramProducerLocationTest.java | 13 +-
.../telegram/TelegramProducerMediaTest.java | 4 +-
.../telegram/TelegramWebhookCallTest.java | 2 +-
.../telegram/TelegramWebhookRegistrationTest.java | 2 +-
.../telegram/integration/TelegramServiceTest.java | 14 +-
.../telegram/util/TelegramTestSupport.java | 2 +-
.../camel/test/blueprint/ignoreDatatypes.xml | 2 +-
.../src/main/docs/test-junit5.adoc | 2 -
.../camel/component/thrift/ThriftComponent.java | 5 +-
.../camel/component/thrift/ThriftEndpoint.java | 4 +-
.../undertow/DefaultUndertowHttpBinding.java | 4 +-
.../UndertowComponentVerifierExtensionTest.java | 2 +-
.../undertow/UndertowComponentVerifierTest.java | 2 +-
.../camel-vm/src/main/docs/vm-component.adoc | 3 +-
.../camel/component/weather/WeatherComponent.java | 4 +-
.../camel-web3j/src/main/docs/web3j-component.adoc | 12 +-
.../camel/component/web3j/Web3jComponent.java | 16 +-
.../camel/component/web3j/Web3jConfiguration.java | 62 +-
.../camel/component/web3j/Web3jConsumer.java | 19 +-
.../camel/component/web3j/Web3jEndpoint.java | 9 +-
.../apache/camel/component/web3j/Web3jHelper.java | 46 +
.../camel/component/web3j/Web3jProducer.java | 48 +-
.../src/test/resources/log4j2.properties | 2 +-
.../camel/component/webhook/WebhookComponent.java | 26 +-
.../camel/component/webhook/WebhookEndpoint.java | 19 +-
.../component/websocket/WebsocketProducer.java | 23 +-
.../src/main/docs/xchange-component.adoc | 2 +-
.../camel/component/xchange/XChangeComponent.java | 22 +-
.../component/xchange/XChangeConfiguration.java | 17 +-
.../camel/component/xchange/XChangeEndpoint.java | 36 +-
.../xchange/XChangeMarketDataProducer.java | 2 +-
.../component/xchange/XChangeMetaDataProducer.java | 2 +-
.../xmlsecurity/processor/SantuarioUtil.java | 5 +-
.../component/zookeeper/ZooKeeperComponent.java | 10 +-
components/pom.xml | 2 +
.../main/java/org/apache/camel/CamelContext.java | 10 +-
.../org/apache/camel/RuntimeConfiguration.java | 15 +-
.../java/org/apache/camel/spi/RoutePolicy.java | 3 +-
core/camel-base/src/main/docs/simple-language.adoc | 2 +-
.../component/properties/PropertiesComponent.java | 12 -
.../converter/InstanceMethodTypeConverter.java | 2 -
.../camel/impl/engine/AbstractCamelContext.java | 38 +-
.../camel/impl/engine/AbstractDynamicRegistry.java | 1 -
.../camel/impl/engine/DefaultEndpointRegistry.java | 2 -
.../camel/impl/engine/DefaultUnitOfWork.java | 3 -
.../impl/engine/SupervisingRouteController.java | 75 +-
.../engine/SupervisingRouteControllerFilters.java | 4 +
.../org/apache/camel/processor/ContractAdvice.java | 2 +-
.../java/org/apache/camel/processor/Throttler.java | 4 -
.../runtimecatalog/impl/AbstractCamelCatalog.java | 37 -
.../impl/cloud/CachingServiceDiscoveryTest.java | 2 +-
.../org/apache/camel/builder/DataFormatClause.java | 26 +-
.../camel/builder/ExpressionClauseSupport.java | 48 +-
.../apache/camel/model/AggregateDefinition.java | 162 +--
.../org/apache/camel/model/BeanDefinition.java | 8 +-
.../org/apache/camel/model/ChoiceDefinition.java | 11 +-
.../camel/model/CircuitBreakerDefinition.java | 2 +-
.../apache/camel/model/ClaimCheckDefinition.java | 23 +-
.../apache/camel/model/ContextScanDefinition.java | 6 +-
.../apache/camel/model/DataFormatDefinition.java | 7 +-
.../org/apache/camel/model/DelayDefinition.java | 18 +-
.../camel/model/DynamicRouterDefinition.java | 16 +-
.../org/apache/camel/model/EnrichDefinition.java | 40 +-
.../camel/model/HystrixConfigurationCommon.java | 168 +--
.../model/HystrixConfigurationDefinition.java | 110 +-
.../camel/model/IdempotentConsumerDefinition.java | 32 +-
.../org/apache/camel/model/InOnlyDefinition.java | 4 +-
.../org/apache/camel/model/InOutDefinition.java | 4 +-
.../apache/camel/model/InputTypeDefinition.java | 21 +-
.../model/InterceptSendToEndpointDefinition.java | 8 +-
.../apache/camel/model/LoadBalanceDefinition.java | 19 +-
.../java/org/apache/camel/model/LogDefinition.java | 7 +-
.../org/apache/camel/model/LoopDefinition.java | 16 +-
.../apache/camel/model/MulticastDefinition.java | 66 +-
.../apache/camel/model/OnCompletionDefinition.java | 46 +-
.../apache/camel/model/OnExceptionDefinition.java | 29 +-
.../apache/camel/model/OnFallbackDefinition.java | 37 +-
.../model/OptimisticLockRetryPolicyDefinition.java | 57 +-
.../apache/camel/model/OtherwiseDefinition.java | 12 +-
.../apache/camel/model/OutputTypeDefinition.java | 21 +-
.../apache/camel/model/PollEnrichDefinition.java | 42 +-
.../apache/camel/model/ProcessorDefinition.java | 62 +-
.../camel/model/RecipientListDefinition.java | 82 +-
.../camel/model/RedeliveryPolicyDefinition.java | 32 +-
.../apache/camel/model/ResequenceDefinition.java | 20 +-
.../org/apache/camel/model/RollbackDefinition.java | 12 +-
.../org/apache/camel/model/RouteDefinition.java | 32 +-
.../apache/camel/model/RoutingSlipDefinition.java | 16 +-
.../org/apache/camel/model/SendDefinition.java | 3 +-
.../camel/model/ThreadPoolProfileDefinition.java | 33 +-
.../org/apache/camel/model/ThreadsDefinition.java | 58 +-
.../java/org/apache/camel/model/ToDefinition.java | 12 +-
.../apache/camel/model/ToDynamicDefinition.java | 32 +-
.../org/apache/camel/model/WireTapDefinition.java | 31 +-
...ngServiceCallServiceDiscoveryConfiguration.java | 12 +-
...erServiceCallServiceDiscoveryConfiguration.java | 8 +-
.../camel/model/config/BatchResequencerConfig.java | 44 +-
.../model/config/StreamResequencerConfig.java | 44 +-
.../camel/model/dataformat/ASN1DataFormat.java | 11 +-
.../camel/model/dataformat/Any23DataFormat.java | 15 +-
.../camel/model/dataformat/BarcodeDataFormat.java | 14 +-
.../camel/model/dataformat/Base64DataFormat.java | 15 +-
.../camel/model/dataformat/BeanioDataFormat.java | 29 +-
.../camel/model/dataformat/CBORDataFormat.java | 36 +-
.../camel/model/dataformat/CryptoDataFormat.java | 21 +-
.../model/dataformat/JacksonXMLDataFormat.java | 35 +-
.../camel/model/dataformat/PGPDataFormat.java | 36 +-
.../camel/model/dataformat/UniVocityHeader.java | 6 +-
.../camel/model/language/ExpressionDefinition.java | 12 +-
.../camel/model/language/JsonPathExpression.java | 32 +-
.../camel/model/language/SimpleExpression.java | 2 +-
.../camel/model/language/TokenizerExpression.java | 36 +-
.../model/language/XMLTokenizerExpression.java | 7 +-
.../camel/model/language/XPathExpression.java | 30 +-
.../FailoverLoadBalancerDefinition.java | 18 +-
.../WeightedLoadBalancerDefinition.java | 13 +-
.../camel/model/rest/RestBindingDefinition.java | 24 +-
.../apache/camel/model/rest/RestDefinition.java | 52 +-
.../apache/camel/model/rest/VerbDefinition.java | 30 +-
.../org/apache/camel/reifier/AbstractReifier.java | 45 +
.../org/apache/camel/reifier/AggregateReifier.java | 52 +-
.../java/org/apache/camel/reifier/BeanReifier.java | 2 +-
.../apache/camel/reifier/ClaimCheckReifier.java | 3 +-
.../org/apache/camel/reifier/DelayReifier.java | 14 +-
.../apache/camel/reifier/DynamicRouterReifier.java | 4 +-
.../org/apache/camel/reifier/EnrichReifier.java | 10 +-
.../camel/reifier/IdempotentConsumerReifier.java | 8 +-
.../reifier/InterceptSendToEndpointReifier.java | 6 +-
.../java/org/apache/camel/reifier/LogReifier.java | 2 +-
.../java/org/apache/camel/reifier/LoopReifier.java | 4 +-
.../org/apache/camel/reifier/MulticastReifier.java | 20 +-
.../apache/camel/reifier/OnCompletionReifier.java | 8 +-
.../apache/camel/reifier/OnExceptionReifier.java | 4 +-
.../apache/camel/reifier/PollEnrichReifier.java | 12 +-
.../org/apache/camel/reifier/ProcessorReifier.java | 5 +-
.../apache/camel/reifier/RecipientListReifier.java | 26 +-
.../apache/camel/reifier/ResequenceReifier.java | 20 +-
.../org/apache/camel/reifier/RollbackReifier.java | 4 +-
.../org/apache/camel/reifier/RouteReifier.java | 8 +-
.../apache/camel/reifier/RoutingSlipReifier.java | 4 +-
.../java/org/apache/camel/reifier/SendReifier.java | 3 +-
.../org/apache/camel/reifier/ThreadsReifier.java | 15 +-
.../org/apache/camel/reifier/ToDynamicReifier.java | 7 +-
.../org/apache/camel/reifier/WireTapReifier.java | 11 +-
.../reifier/dataformat/DataFormatReifier.java | 5 +-
.../UniVocityFixedWidthDataFormatReifier.java | 5 +-
.../reifier/errorhandler/ErrorHandlerReifier.java | 17 +-
.../loadbalancer/FailoverLoadBalancerReifier.java | 6 +-
.../reifier/loadbalancer/LoadBalancerReifier.java | 3 +-
.../loadbalancer/WeightedLoadBalancerReifier.java | 4 +-
.../camel/reifier/rest/RestBindingReifier.java | 11 +-
.../core/xml/AbstractCamelContextFactoryBean.java | 15 +-
.../AbstractCamelRedeliveryPolicyFactoryBean.java | 16 +-
.../xml/AbstractCamelContextFactoryBeanTest.java | 2 +-
.../file/FileProducerChmodOptionTest.java | 5 +-
.../validator/ValidatorDtdAccessAbstractTest.java | 4 +-
.../validator/ValidatorDtdAccessOnTest.java | 2 +-
.../camel/impl/DefaultConsumerCacheTest.java | 6 +-
.../camel/impl/DefaultConsumerTemplateTest.java | 5 +-
...ConsumerTemplateWithCustomCacheMaxSizeTest.java | 7 +-
.../camel/impl/DefaultProducerCacheTest.java | 2 -
.../camel/impl/DefaultProducerTemplateTest.java | 7 +-
...ProducerTemplateWithCustomCacheMaxSizeTest.java | 6 +-
.../camel/impl/engine/DefaultCamelContextTest.java | 8 +
.../apache/camel/model/ChoiceDefinitionTest.java | 1 +
.../camel/model/OnFallbackDefinitionTest.java | 24 +-
.../java/org/apache/camel/model/XmlParseTest.java | 8 +-
.../AggregateClosedCorrelationKeyTest.java | 2 +-
.../aggregator/AlbertoAggregatorTest.java | 4 +-
.../apache/camel/util/CamelContextHelperTest.java | 35 +
.../builder/endpoint/EndpointBuilderFactory.java | 1 +
.../dsl/AtomixMultiMapEndpointBuilderFactory.java | 165 +--
.../endpoint/dsl/BonitaEndpointBuilderFactory.java | 128 +--
.../dsl/CaffeineCacheEndpointBuilderFactory.java | 464 +-------
.../CaffeineLoadCacheEndpointBuilderFactory.java | 461 +-------
.../endpoint/dsl/ConsulEndpointBuilderFactory.java | 1186 ++++++++++++++++++--
.../endpoint/dsl/CordaEndpointBuilderFactory.java | 87 +-
.../dsl/CryptoCmsEndpointBuilderFactory.java | 1 +
.../dsl/EhcacheEndpointBuilderFactory.java | 32 +-
.../dsl/ElasticsearchEndpointBuilderFactory.java | 77 ++
.../dsl/HazelcastSetEndpointBuilderFactory.java | 4 +-
.../endpoint/dsl/IPFSEndpointBuilderFactory.java | 21 +-
.../endpoint/dsl/JCacheEndpointBuilderFactory.java | 55 +-
.../endpoint/dsl/JdbcEndpointBuilderFactory.java | 4 +-
.../KubernetesServicesEndpointBuilderFactory.java | 8 +-
.../endpoint/dsl/NagiosEndpointBuilderFactory.java | 40 -
.../endpoint/dsl/NatsEndpointBuilderFactory.java | 209 ++--
.../endpoint/dsl/NsqEndpointBuilderFactory.java | 31 +-
...java => RestOpenApiEndpointBuilderFactory.java} | 84 +-
.../dsl/RestSwaggerEndpointBuilderFactory.java | 26 +
.../endpoint/dsl/SftpEndpointBuilderFactory.java | 54 +-
.../endpoint/dsl/StompEndpointBuilderFactory.java | 6 +-
.../dsl/TranslateEndpointBuilderFactory.java | 4 +-
.../endpoint/dsl/Web3jEndpointBuilderFactory.java | 112 +-
.../dsl/XChangeEndpointBuilderFactory.java | 15 +-
.../org/apache/camel/main/BaseMainSupport.java | 309 ++---
.../camel/main/MainComponentConfigurationTest.java | 54 +
.../main/MainPropertyPlaceholderLocationsTest.java | 57 +
.../camel/main/ServicesAutoConfigurationTest.java | 143 +++
.../camel/main/support/MyDummyComponent.java | 60 +-
.../main/support/MyDummyComponentConfigurer.java | 52 +
.../camel/main/support/MyDummyConfiguration.java | 43 +-
.../src/test/resources/default.properties | 15 +-
.../mbean/ManagedWeightedBalancerMBean.java | 2 +-
core/camel-management/pom.xml | 4 +-
.../mbean/ManagedWeightedLoadBalancer.java | 2 +-
.../ManagedWeightedLoadBalancerTest.java | 4 +-
.../apache/camel/support/CamelContextHelper.java | 87 +-
.../org/apache/camel/support/EndpointHelper.java | 3 +-
.../camel/support/PropertyBindingSupport.java | 86 +-
.../component/PropertyConfigurerSupport.java | 27 +-
docs/components/modules/ROOT/nav.adoc | 4 +-
.../ROOT/pages/atomix-multimap-component.adoc | 32 +-
.../modules/ROOT/pages/bonita-component.adoc | 14 +-
.../ROOT/pages/caffeine-cache-component.adoc | 9 +-
.../ROOT/pages/caffeine-loadcache-component.adoc | 9 +-
.../modules/ROOT/pages/consul-component.adoc | 31 +-
.../modules/ROOT/pages/corda-component.adoc | 42 +-
.../modules/ROOT/pages/crypto-cms-component.adoc | 7 +-
.../modules/ROOT/pages/csv-dataformat.adoc | 17 +-
.../modules/ROOT/pages/ehcache-component.adoc | 4 +-
.../ROOT/pages/elasticsearch-rest-component.adoc | 7 +-
docs/components/modules/ROOT/pages/index.adoc | 18 +-
.../modules/ROOT/pages/ipfs-component.adoc | 8 +-
.../modules/ROOT/pages/jcache-component.adoc | 12 +-
.../modules/ROOT/pages/jdbc-component.adoc | 2 +-
.../modules/ROOT/pages/jira-component.adoc | 2 +-
.../modules/ROOT/pages/jms-component.adoc | 2 +-
.../modules/ROOT/pages/nagios-component.adoc | 6 +-
.../modules/ROOT/pages/nats-component.adoc | 107 +-
.../modules/ROOT/pages/netty-component.adoc | 6 +-
.../modules/ROOT/pages/netty-http-component.adoc | 6 +-
.../modules/ROOT/pages/nsq-component.adoc | 50 +-
.../modules/ROOT/pages/osgi-activator.adoc | 57 +
.../modules/ROOT/pages/quartz-component.adoc | 10 +-
...-component.adoc => rest-openapi-component.adoc} | 101 +-
.../modules/ROOT/pages/rest-swagger-component.adoc | 3 +-
.../modules/ROOT/pages/seda-component.adoc | 3 +-
.../modules/ROOT/pages/sftp-component.adoc | 4 +-
.../modules/ROOT/pages/simple-language.adoc | 2 +-
.../modules/ROOT/pages/stomp-component.adoc | 4 +-
.../modules/ROOT/pages/stub-component.adoc | 3 +-
.../modules/ROOT/pages/vm-component.adoc | 3 +-
.../modules/ROOT/pages/web3j-component.adoc | 12 +-
.../modules/ROOT/pages/xchange-component.adoc | 2 +-
docs/user-manual-nav.adoc.template | 5 +-
docs/user-manual/modules/ROOT/nav.adoc | 5 +-
.../ROOT/pages/camel-3-migration-guide.adoc | 5 +-
.../modules/ROOT/pages/camel-3x-upgrade-guide.adoc | 48 +
.../modules/ROOT/pages/exchange-pattern.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/faq.adoc | 1 +
.../how-to-create-executable-jar-camel-main.adoc | 36 +
docs/user-manual/modules/ROOT/pages/json.adoc | 4 +-
.../modules/ROOT/pages/simple-language.adoc | 2 +-
examples/camel-example-main-artemis/pom.xml | 4 -
parent/pom.xml | 83 +-
.../karaf/features/src/main/resources/features.xml | 4 +-
.../TranslateComponentConfiguration.java | 2 +-
.../springboot/ConsulComponentConfiguration.java | 10 +-
.../springboot/CordaComponentConfiguration.java | 52 +-
.../HystrixConfigurationDefinitionCommon.java | 168 +--
.../springboot/EhcacheComponentConfiguration.java | 9 +-
.../camel-google-bigquery-starter/pom.xml | 8 +
.../camel-google-pubsub-starter/pom.xml | 8 +
.../HazelcastSetComponentConfiguration.java | 2 +-
.../HystrixHierarchicalConfigurationTest.java | 2 +-
.../springboot/JCacheComponentConfiguration.java | 25 +-
.../springboot/JiraComponentConfiguration.java | 2 +-
.../KubernetesServicesComponentConfiguration.java | 4 +-
.../springboot/NagiosComponentConfiguration.java | 18 -
.../springboot/NatsComponentConfiguration.java | 13 +
.../NettyHttpComponentConfiguration.java | 12 +-
.../springboot/NettyComponentConfiguration.java | 12 +-
.../nsq/springboot/NsqComponentConfiguration.java | 13 +
.../springboot/QuartzComponentConfiguration.java | 23 +-
.../pom.xml | 8 +-
.../RestOpenApiComponentAutoConfiguration.java | 128 +++
.../RestOpenApiComponentConfiguration.java} | 218 ++--
.../src/main/resources/META-INF/LICENSE.txt | 0
.../src/main/resources/META-INF/NOTICE.txt | 0
.../src/main/resources/META-INF/spring.factories | 15 +-
.../src/main/resources/META-INF/spring.provides | 15 +-
.../camel-rest-swagger-starter/pom.xml | 8 +
.../springboot/StompComponentConfiguration.java | 2 +-
.../springboot/Web3jComponentConfiguration.java | 19 +-
platforms/spring-boot/components-starter/pom.xml | 1 +
.../camel-spring-boot-dependencies/pom.xml | 15 +
platforms/spring-boot/spring-boot-dm/pom.xml | 2 +-
tests/camel-itest-karaf/pom.xml | 99 ++
.../camel/itest/springboot/CamelJbpmTest.java | 12 +-
.../apt/ComponentPropertyConfigurerGenerator.java | 169 ---
.../apt/CoreEipAnnotationProcessorHelper.java | 3 +
.../tools/apt/EndpointAnnotationProcessor.java | 21 +-
...rator.java => PropertyConfigurerGenerator.java} | 27 +-
.../camel/tools/apt/model/ComponentOption.java | 2 +-
.../camel/tools/apt/model/EndpointOption.java | 2 +-
.../camel/tools/apt/model/PropertyOption.java | 11 +-
.../maven/packaging/SpringBootStarterMojo.java | 2 +-
768 files changed, 12056 insertions(+), 7677 deletions(-)
delete mode 100644 components/camel-corda/README.md
copy components/{camel-ipfs => camel-google-bigquery}/src/test/resources/log4j2.properties (93%)
copy components/{camel-ipfs => camel-google-pubsub}/src/test/resources/log4j2.properties (93%)
create mode 100644 components/camel-ignite/.gitignore
delete mode 100644 components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEncryptionMethod.java
delete mode 100644 components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosAsyncSendTest.java
copy components/camel-nats/src/test/java/org/apache/camel/component/nats/{NatsConsumerLoadTest.java => NatsConsumerReplyToTest.java} (62%)
copy components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/{AhcSpanDecorator.java => HttpsSpanDecorator.java} (91%)
copy components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/{JmsSpanDecorator.java => NatsSpanDecorator.java} (74%)
copy components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/{StompSpanDecorator.java => NsqSpanDecorator.java} (55%)
copy components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/{LogSpanDecorator.java => Sjms2SpanDecorator.java} (81%)
create mode 100644 components/camel-opentracing/src/test/java/org/apache/camel/opentracing/CustomComponentNameRouteTest.java
create mode 100644 components/camel-osgi-activator/pom.xml
create mode 100644 components/camel-osgi-activator/src/assembly/test-bundles.xml
create mode 100644 components/camel-osgi-activator/src/main/docs/osgi-activator.adoc
create mode 100644 components/camel-osgi-activator/src/main/java/org/apache/camel/osgi/activator/CamelRoutesActivator.java
create mode 100644 components/camel-osgi-activator/src/test/java/org/apache/camel/component/osgi/activator/CamelOsgiActivatorIT.java
create mode 100644 components/camel-osgi-activator/src/test/java/org/apache/camel/component/osgi/activator/PaxExamOptions.java
create mode 100644 components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointDSLTest.java
copy components/{camel-rest-swagger => camel-rest-openapi}/pom.xml (74%)
copy components/{camel-rest-swagger/src/main/docs/rest-swagger-component.adoc => camel-rest-openapi/src/main/docs/rest-openapi-component.adoc} (79%)
create mode 100644 components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiComponent.java
copy components/{camel-rest-swagger/src/main/java/org/apache/camel/component/rest/swagger/RestSwaggerEndpoint.java => camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpoint.java} (57%)
create mode 100644 components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiHelper.java
create mode 100644 components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiProducer.java
copy components/{camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger => camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi}/HttpsTest.java (96%)
copy components/{camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger/HttpsTest.java => camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/HttpsV3Test.java} (91%)
create mode 100644 components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/Jetty94ServerFactory.java
copy components/{camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/HttpSpanDecorator.java => camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/Pet.java} (80%)
copy components/{camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/LogSpanDecorator.java => camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/Pets.java} (66%)
create mode 100644 components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiComponentTest.java
create mode 100644 components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiComponentV3Test.java
create mode 100644 components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiDelegateHttpsTest.java
create mode 100644 components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiDelegateHttpsV3Test.java
copy components/{camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger/RestSwaggerEndpointTest.java => camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpointTest.java} (53%)
create mode 100644 components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpointUriParsingTest.java
copy components/{camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger/RestSwaggerEndpointTest.java => camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpointV3Test.java} (50%)
copy components/{camel-spring/src/test/java/org/apache/camel/spring/routebuilder/MyRoute.java => camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiGlobalHttpsTest.java} (61%)
copy components/{camel-spring/src/test/java/org/apache/camel/spring/routebuilder/MyRoute.java => camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiGlobalHttpsV3Test.java} (61%)
copy components/{camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentClientRegistryTest.java => camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/RestOpenApiHelperTest.java} (50%)
create mode 100644 components/camel-rest-openapi/src/test/resources/alt-openapi.json
create mode 100644 components/camel-rest-openapi/src/test/resources/alt-petstore.json
create mode 100644 components/camel-rest-openapi/src/test/resources/localhost.p12
copy components/{camel-ipfs => camel-rest-openapi}/src/test/resources/log4j2.properties (78%)
create mode 100644 components/camel-rest-openapi/src/test/resources/openapi-v3.json
create mode 100644 components/camel-rest-openapi/src/test/resources/openapi.json
copy components/{camel-ipfs/src/test/resources/log4j2.properties => camel-spring/src/test/resources/custom.properties} (68%)
create mode 100644 components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jHelper.java
create mode 100644 core/camel-core-engine/src/main/java/org/apache/camel/reifier/AbstractReifier.java
copy components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/JmsSpanDecorator.java => core/camel-core/src/test/java/org/apache/camel/model/OnFallbackDefinitionTest.java (64%)
copy core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/{RestSwaggerEndpointBuilderFactory.java => RestOpenApiEndpointBuilderFactory.java} (77%)
create mode 100644 core/camel-main/src/test/java/org/apache/camel/main/MainComponentConfigurationTest.java
create mode 100644 core/camel-main/src/test/java/org/apache/camel/main/MainPropertyPlaceholderLocationsTest.java
create mode 100644 core/camel-main/src/test/java/org/apache/camel/main/ServicesAutoConfigurationTest.java
copy components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaComponent.java => core/camel-main/src/test/java/org/apache/camel/main/support/MyDummyComponent.java (52%)
create mode 100644 core/camel-main/src/test/java/org/apache/camel/main/support/MyDummyComponentConfigurer.java
copy components/camel-spring/src/test/java/org/apache/camel/spring/routebuilder/MyRoute.java => core/camel-main/src/test/java/org/apache/camel/main/support/MyDummyConfiguration.java (54%)
copy components/camel-ipfs/src/test/resources/log4j2.properties => core/camel-main/src/test/resources/default.properties (68%)
create mode 100644 docs/components/modules/ROOT/pages/osgi-activator.adoc
copy docs/components/modules/ROOT/pages/{rest-swagger-component.adoc => rest-openapi-component.adoc} (79%)
create mode 100644 docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc
create mode 100644 docs/user-manual/modules/ROOT/pages/faq/how-to-create-executable-jar-camel-main.adoc
copy platforms/spring-boot/components-starter/{camel-rest-swagger-starter => camel-rest-openapi-starter}/pom.xml (91%)
create mode 100644 platforms/spring-boot/components-starter/camel-rest-openapi-starter/src/main/java/org/apache/camel/component/rest/openapi/springboot/RestOpenApiComponentAutoConfiguration.java
copy platforms/spring-boot/components-starter/{camel-stomp-starter/src/main/java/org/apache/camel/component/stomp/springboot/StompComponentConfiguration.java => camel-rest-openapi-starter/src/main/java/org/apache/camel/component/rest/openapi/springboot/RestOpenApiComponentConfiguration.java} (50%)
copy {tooling/maven/camel-package-maven-plugin => platforms/spring-boot/components-starter/camel-rest-openapi-starter}/src/main/resources/META-INF/LICENSE.txt (100%)
copy {tooling/maven/camel-package-maven-plugin => platforms/spring-boot/components-starter/camel-rest-openapi-starter}/src/main/resources/META-INF/NOTICE.txt (100%)
copy components/camel-ipfs/src/test/resources/log4j2.properties => platforms/spring-boot/components-starter/camel-rest-openapi-starter/src/main/resources/META-INF/spring.factories (68%)
copy components/camel-ipfs/src/test/resources/log4j2.properties => platforms/spring-boot/components-starter/camel-rest-openapi-starter/src/main/resources/META-INF/spring.provides (68%)
delete mode 100644 tooling/apt/src/main/java/org/apache/camel/tools/apt/ComponentPropertyConfigurerGenerator.java
rename tooling/apt/src/main/java/org/apache/camel/tools/apt/{EndpointPropertyConfigurerGenerator.java => PropertyConfigurerGenerator.java} (89%)
copy components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConstants.java => tooling/apt/src/main/java/org/apache/camel/tools/apt/model/PropertyOption.java (83%)
[camel] 01/01: CAMEL-11807: Migrated camel-telegram tests to 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-11807
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7067d5950f4bbb71da9093b33e8c4102148962bd
Author: aldettinger <al...@gmail.com>
AuthorDate: Fri Dec 13 18:44:30 2019 +0100
CAMEL-11807: Migrated camel-telegram tests to JUnit 5
---
components/camel-ftp/pom.xml | 1 -
components/camel-telegram/pom.xml | 12 +++----
.../component/telegram/TelegramChatBotTest.java | 8 +++--
.../telegram/TelegramComponentParametersTest.java | 41 +++++++++++++---------
.../telegram/TelegramConfigurationTest.java | 4 ++-
.../telegram/TelegramConsumerChannelPostTest.java | 8 +++--
.../TelegramConsumerEmptyResponseTest.java | 19 +++++-----
.../TelegramConsumerFallbackConversionTest.java | 8 +++--
.../telegram/TelegramConsumerMappingTest.java | 9 +++--
.../TelegramConsumerMediaDocumentTest.java | 8 +++--
.../telegram/TelegramConsumerMediaPhotoTest.java | 9 +++--
.../telegram/TelegramConsumerMediaVideoTest.java | 8 +++--
.../telegram/TelegramConsumerMultipleTest.java | 6 ++--
.../telegram/TelegramConsumerServiceErrorTest.java | 6 ++--
.../telegram/TelegramConsumerSingleTest.java | 6 ++--
.../TelegramProducerChatIdResolutionTest.java | 4 ++-
.../telegram/TelegramProducerLocationTest.java | 13 +++----
.../telegram/TelegramProducerMediaTest.java | 4 ++-
.../telegram/TelegramWebhookCallTest.java | 2 +-
.../telegram/TelegramWebhookRegistrationTest.java | 2 +-
.../telegram/integration/TelegramServiceTest.java | 14 ++++----
.../telegram/util/TelegramTestSupport.java | 2 +-
parent/pom.xml | 5 +++
23 files changed, 120 insertions(+), 79 deletions(-)
diff --git a/components/camel-ftp/pom.xml b/components/camel-ftp/pom.xml
index 89855e4..a6f82fa 100644
--- a/components/camel-ftp/pom.xml
+++ b/components/camel-ftp/pom.xml
@@ -163,7 +163,6 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
- <version>${mockito-version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-telegram/pom.xml b/components/camel-telegram/pom.xml
index e5b7e1b..f897b26 100644
--- a/components/camel-telegram/pom.xml
+++ b/components/camel-telegram/pom.xml
@@ -74,12 +74,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -93,6 +88,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<scope>test</scope>
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramChatBotTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramChatBotTest.java
index 8f87935..c371ec6 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramChatBotTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramChatBotTest.java
@@ -24,11 +24,13 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.telegram.model.OutgoingTextMessage;
import org.apache.camel.component.telegram.model.UpdateResult;
import org.apache.camel.component.telegram.util.TelegramTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.verification.Timeout;
+import static org.apache.camel.test.junit5.TestSupport.assertCollectionSize;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.times;
@@ -40,7 +42,7 @@ import static org.mockito.Mockito.when;
*/
public class TelegramChatBotTest extends TelegramTestSupport {
- @Before
+ @BeforeEach
public void mockAPIs() {
TelegramService service = mockTelegramService();
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramComponentParametersTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramComponentParametersTest.java
index a26e071..05defa8 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramComponentParametersTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramComponentParametersTest.java
@@ -17,7 +17,10 @@
package org.apache.camel.component.telegram;
import org.apache.camel.component.telegram.util.TelegramTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* Tests the usage of defaults in the component configuration
@@ -38,25 +41,31 @@ public class TelegramComponentParametersTest extends TelegramTestSupport {
assertEquals("ANOTHER", ep3.getConfiguration().getAuthorizationToken());
}
- @Test(expected = IllegalArgumentException.class)
- public void testNonDefaultConfig() throws Exception {
- TelegramComponent component = (TelegramComponent) context().getComponent("telegram");
- component.setAuthorizationToken(null);
- component.createEndpoint("telegram:bots");
+ @Test
+ public void testNonDefaultConfig() {
+ assertThrows(IllegalArgumentException.class, () -> {
+ TelegramComponent component = (TelegramComponent)context().getComponent("telegram");
+ component.setAuthorizationToken(null);
+ component.createEndpoint("telegram:bots");
+ });
}
- @Test(expected = IllegalArgumentException.class)
- public void testWrongURI1() throws Exception {
- TelegramComponent component = (TelegramComponent) context().getComponent("telegram");
- component.setAuthorizationToken("ANY");
- component.createEndpoint("telegram:bots/ ");
+ @Test
+ public void testWrongURI1() {
+ assertThrows(IllegalArgumentException.class, () -> {
+ TelegramComponent component = (TelegramComponent)context().getComponent("telegram");
+ component.setAuthorizationToken("ANY");
+ component.createEndpoint("telegram:bots/ ");
+ });
}
- @Test(expected = IllegalArgumentException.class)
- public void testWrongURI2() throws Exception {
- TelegramComponent component = (TelegramComponent) context().getComponent("telegram");
- component.setAuthorizationToken("ANY");
- component.createEndpoint("telegram:bots/token/s");
+ @Test
+ public void testWrongURI2() {
+ assertThrows(IllegalArgumentException.class, () -> {
+ TelegramComponent component = (TelegramComponent)context().getComponent("telegram");
+ component.setAuthorizationToken("ANY");
+ component.createEndpoint("telegram:bots/token/s");
+ });
}
}
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConfigurationTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConfigurationTest.java
index 8051eda..1abb14c 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConfigurationTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConfigurationTest.java
@@ -19,7 +19,9 @@ package org.apache.camel.component.telegram;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.telegram.util.TelegramTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Tests that the configuration is loaded properly.
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerChannelPostTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerChannelPostTest.java
index 983a064..7c34000 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerChannelPostTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerChannelPostTest.java
@@ -27,9 +27,11 @@ import org.apache.camel.component.telegram.model.Chat;
import org.apache.camel.component.telegram.model.IncomingMessage;
import org.apache.camel.component.telegram.model.UpdateResult;
import org.apache.camel.component.telegram.util.TelegramTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
@@ -43,7 +45,7 @@ public class TelegramConsumerChannelPostTest extends TelegramTestSupport {
@EndpointInject("mock:telegram")
private MockEndpoint endpoint;
- @Before
+ @BeforeEach
public void mockAPIs() {
TelegramService api = mockTelegramService();
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerEmptyResponseTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerEmptyResponseTest.java
index 97ed018..bdaa461 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerEmptyResponseTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerEmptyResponseTest.java
@@ -22,9 +22,10 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.telegram.model.UpdateResult;
import org.apache.camel.component.telegram.util.TelegramTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
@@ -36,7 +37,7 @@ public class TelegramConsumerEmptyResponseTest extends TelegramTestSupport {
@EndpointInject("mock:telegram")
private MockEndpoint endpoint;
- @Before
+ @BeforeEach
public void mockAPIs() {
TelegramService api = mockTelegramService();
@@ -45,12 +46,14 @@ public class TelegramConsumerEmptyResponseTest extends TelegramTestSupport {
when(api.getUpdates(any(), any(), any(), any())).thenAnswer(i -> defaultRes);
}
- @Test(expected = AssertionError.class)
- public void testBehaviourWithEmptyUpdates() throws Exception {
- endpoint.setResultWaitTime(500L);
- endpoint.expectedMinimumMessageCount(1);
+ @Test
+ public void testBehaviourWithEmptyUpdates() {
+ assertThrows(AssertionError.class, () -> {
+ endpoint.setResultWaitTime(500L);
+ endpoint.expectedMinimumMessageCount(1);
- endpoint.assertIsSatisfied();
+ endpoint.assertIsSatisfied();
+ });
}
@Override
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerFallbackConversionTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerFallbackConversionTest.java
index 1efe3bf..186235e 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerFallbackConversionTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerFallbackConversionTest.java
@@ -24,10 +24,12 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.telegram.model.OutgoingTextMessage;
import org.apache.camel.component.telegram.util.TelegramTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
+import static org.apache.camel.test.junit5.TestSupport.assertCollectionSize;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
@@ -39,7 +41,7 @@ public class TelegramConsumerFallbackConversionTest extends TelegramTestSupport
@EndpointInject("direct:message")
protected ProducerTemplate template;
- @Before
+ @BeforeEach
public void mockAPIs() {
mockTelegramService();
}
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMappingTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMappingTest.java
index 61a6b0b..a1ce073 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMappingTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMappingTest.java
@@ -30,9 +30,12 @@ import org.apache.camel.component.telegram.model.MessageResult;
import org.apache.camel.component.telegram.model.UpdateResult;
import org.apache.camel.component.telegram.model.User;
import org.apache.camel.component.telegram.util.TelegramTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.when;
@@ -44,7 +47,7 @@ public class TelegramConsumerMappingTest extends TelegramTestSupport {
@EndpointInject("mock:telegram")
private MockEndpoint endpoint;
- @Before
+ @BeforeEach
public void mockAPIs() {
TelegramService api = mockTelegramService();
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMediaDocumentTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMediaDocumentTest.java
index 175efe1..c366593 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMediaDocumentTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMediaDocumentTest.java
@@ -25,9 +25,11 @@ import org.apache.camel.component.telegram.model.IncomingDocument;
import org.apache.camel.component.telegram.model.IncomingMessage;
import org.apache.camel.component.telegram.model.UpdateResult;
import org.apache.camel.component.telegram.util.TelegramTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
@@ -39,7 +41,7 @@ public class TelegramConsumerMediaDocumentTest extends TelegramTestSupport {
@EndpointInject("mock:telegram")
private MockEndpoint endpoint;
- @Before
+ @BeforeEach
public void mockAPIs() {
TelegramService api = mockTelegramService();
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMediaPhotoTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMediaPhotoTest.java
index 7ee7f60..75d8f75 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMediaPhotoTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMediaPhotoTest.java
@@ -24,9 +24,12 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.telegram.model.IncomingMessage;
import org.apache.camel.component.telegram.model.UpdateResult;
import org.apache.camel.component.telegram.util.TelegramTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.apache.camel.test.junit5.TestSupport.assertCollectionSize;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.when;
@@ -38,7 +41,7 @@ public class TelegramConsumerMediaPhotoTest extends TelegramTestSupport {
@EndpointInject("mock:telegram")
private MockEndpoint endpoint;
- @Before
+ @BeforeEach
public void mockAPIs() {
TelegramService api = mockTelegramService();
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMediaVideoTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMediaVideoTest.java
index 7f59fb7..9e96111 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMediaVideoTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMediaVideoTest.java
@@ -26,9 +26,11 @@ import org.apache.camel.component.telegram.model.IncomingPhotoSize;
import org.apache.camel.component.telegram.model.IncomingVideo;
import org.apache.camel.component.telegram.model.UpdateResult;
import org.apache.camel.component.telegram.util.TelegramTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.when;
@@ -40,7 +42,7 @@ public class TelegramConsumerMediaVideoTest extends TelegramTestSupport {
@EndpointInject("mock:telegram")
private MockEndpoint endpoint;
- @Before
+ @BeforeEach
public void mockAPIs() {
TelegramService api = mockTelegramService();
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMultipleTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMultipleTest.java
index ec3e6c5..15f0594 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMultipleTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerMultipleTest.java
@@ -22,8 +22,8 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.telegram.model.UpdateResult;
import org.apache.camel.component.telegram.util.TelegramTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.when;
@@ -36,7 +36,7 @@ public class TelegramConsumerMultipleTest extends TelegramTestSupport {
@EndpointInject("mock:telegram")
private MockEndpoint endpoint;
- @Before
+ @BeforeEach
public void mockAPIs() {
TelegramService api = mockTelegramService();
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerServiceErrorTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerServiceErrorTest.java
index b04e1f8..29d3c7e 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerServiceErrorTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerServiceErrorTest.java
@@ -22,8 +22,8 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.telegram.model.UpdateResult;
import org.apache.camel.component.telegram.util.TelegramTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
@@ -36,7 +36,7 @@ public class TelegramConsumerServiceErrorTest extends TelegramTestSupport {
@EndpointInject("mock:telegram")
private MockEndpoint endpoint;
- @Before
+ @BeforeEach
public void mockAPIs() {
TelegramService api = mockTelegramService();
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerSingleTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerSingleTest.java
index 42ccafe..842d8d9 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerSingleTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramConsumerSingleTest.java
@@ -22,8 +22,8 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.telegram.model.UpdateResult;
import org.apache.camel.component.telegram.util.TelegramTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.when;
@@ -36,7 +36,7 @@ public class TelegramConsumerSingleTest extends TelegramTestSupport {
@EndpointInject("mock:telegram")
private MockEndpoint endpoint;
- @Before
+ @BeforeEach
public void mockAPIs() {
TelegramService api = mockTelegramService();
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramProducerChatIdResolutionTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramProducerChatIdResolutionTest.java
index cec6081..096d417 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramProducerChatIdResolutionTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramProducerChatIdResolutionTest.java
@@ -23,10 +23,12 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.telegram.model.OutgoingTextMessage;
import org.apache.camel.component.telegram.util.TelegramTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Mockito;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.mockito.ArgumentMatchers.eq;
/**
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramProducerLocationTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramProducerLocationTest.java
index 7ae0fb4..8140c17 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramProducerLocationTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramProducerLocationTest.java
@@ -26,12 +26,13 @@ import org.apache.camel.component.telegram.model.StopMessageLiveLocationMessage;
import org.apache.camel.component.telegram.service.RestBotAPI;
import org.apache.camel.component.telegram.service.TelegramServiceRestBotAPIAdapter;
import org.apache.camel.component.telegram.util.TelegramTestSupport;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.when;
@@ -39,7 +40,7 @@ import static org.mockito.Mockito.when;
/**
* Tests a producer that sends location information.
*/
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class TelegramProducerLocationTest extends TelegramTestSupport {
private final double latitude = 59.9386292;
@@ -51,7 +52,7 @@ public class TelegramProducerLocationTest extends TelegramTestSupport {
private RestBotAPI restBotAPI;
@Override
- @Before
+ @BeforeEach
public void setUp() {
service = new TelegramServiceRestBotAPIAdapter(restBotAPI);
TelegramServiceProvider.get().setAlternativeService(service);
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramProducerMediaTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramProducerMediaTest.java
index 873b56b..3d9ec56 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramProducerMediaTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramProducerMediaTest.java
@@ -28,10 +28,12 @@ import org.apache.camel.component.telegram.model.OutgoingTextMessage;
import org.apache.camel.component.telegram.model.OutgoingVideoMessage;
import org.apache.camel.component.telegram.util.TelegramTestSupport;
import org.apache.camel.component.telegram.util.TelegramTestUtil;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Mockito;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.mockito.ArgumentMatchers.eq;
/**
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramWebhookCallTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramWebhookCallTest.java
index 6c77784..65fd3ef 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramWebhookCallTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramWebhookCallTest.java
@@ -26,7 +26,7 @@ import org.apache.camel.component.telegram.util.TelegramTestSupport;
import org.apache.camel.component.webhook.WebhookConfiguration;
import org.apache.camel.component.webhook.WebhookEndpoint;
import org.apache.camel.test.AvailablePortFinder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests a producer that sends media information.
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramWebhookRegistrationTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramWebhookRegistrationTest.java
index 168d252..6c945c2 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramWebhookRegistrationTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramWebhookRegistrationTest.java
@@ -21,7 +21,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.ServiceStatus;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.telegram.util.TelegramTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.awaitility.Awaitility.waitAtMost;
import static org.mockito.ArgumentMatchers.anyString;
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/integration/TelegramServiceTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/integration/TelegramServiceTest.java
index b639ee4..16f585c 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/integration/TelegramServiceTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/integration/TelegramServiceTest.java
@@ -31,9 +31,11 @@ import org.apache.camel.component.telegram.model.OutgoingVideoMessage;
import org.apache.camel.component.telegram.model.ReplyKeyboardMarkup;
import org.apache.camel.component.telegram.model.UpdateResult;
import org.apache.camel.component.telegram.util.TelegramTestUtil;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests if the BotAPI are working correctly.
@@ -44,7 +46,7 @@ public class TelegramServiceTest {
private static String chatId;
- @BeforeClass
+ @BeforeAll
public static void init() {
authorizationToken = System.getenv("TELEGRAM_AUTHORIZATION_TOKEN");
chatId = System.getenv("TELEGRAM_CHAT_ID");
@@ -56,8 +58,8 @@ public class TelegramServiceTest {
UpdateResult res = service.getUpdates(authorizationToken, null, null, null);
- Assert.assertNotNull(res);
- Assert.assertTrue(res.isOk());
+ assertNotNull(res);
+ assertTrue(res.isOk());
}
@Test
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/util/TelegramTestSupport.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/util/TelegramTestSupport.java
index 1246a0b..0de4aff 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/util/TelegramTestSupport.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/util/TelegramTestSupport.java
@@ -26,7 +26,7 @@ import org.apache.camel.component.telegram.TelegramServiceProvider;
import org.apache.camel.component.telegram.model.InlineKeyboardButton;
import org.apache.camel.component.telegram.model.OutgoingTextMessage;
import org.apache.camel.component.telegram.model.ReplyKeyboardMarkup;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.mockito.Mockito;
/**
diff --git a/parent/pom.xml b/parent/pom.xml
index d31abc2..4c9058a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -4954,6 +4954,11 @@
<version>${mockito-version}</version>
</dependency>
<dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <version>${mockito-version}</version>
+ </dependency>
+ <dependency>
<groupId>httpunit</groupId>
<artifactId>httpunit</artifactId>
<version>${httpunit-version}</version>