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/11/30 15:36:52 UTC
[camel] branch CAMEL-11807 updated (488d4f8 -> c599845)
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 488d4f8 CAMEL-11807: Migrated camel-mongodb tests to JUnit 5
discard 4b09eda CAMEL-11807: Migrated camel-swagger-java tests to JUnit 5
discard 125f8ce CAMEL-11807: Bumped to maven-surefire-plugin 3.0.0-M4
add 416e4b0 Polished eip table a bit
add 80eda13 Update loadBalance-eip.adoc
add 6cbe7a3 Fix link to XQuery
add f7222d4 Merge pull request #3348 from shoukunhuai/patch-1
add 82ad138 Fixed Spring Boot integration tests
add fa62caf Regen
add e24e9d6 CAMEL-11807: Bumped to maven-surefire-plugin 3.0.0-M4
add b92e23c CAMEL-11807: Migrated camel-swagger-java tests to JUnit 5
add edc208d CAMEL-11807: Migrated camel-mongodb tests to JUnit 5
add 02d60fe Camel-Resilience4j: Fixed CS
add 7699c21 Fixed CS for camel-core-engine
add 2c4ab6e Camel-Resilience4j Example: Fixed CS
add 85ef457 Polished EIP docs to have more links
add 89f343b Polished EIP docs to have more links
add e4583bf CAMEL-14126: Fixed test
add e775c68 Skip test that fails on CI
add cbf420e Upgrade Corda to version 4.3
add 75c96e0 Upgrade Undertow to version 2.0.28.Final
add f83ceec CAMEL-14106 - Camel-AWS: S3 Range Get
add a96ba1b CAMEL-14106 - Fixed CS
add ac3e430 CAMEL-14106 - A bit of docs and example
add e90f6f6 CAMEL-14106 - Regen docs
add 6c2fceb CAMEL-14192: Add toMap in the protobuf data format
add 51a31aa CAMEL-14192: Fix checkstyle and avoid infinite loop in the type converter
add 942a163 Merge pull request #3349 from omarsmak/CAMEL-14192
add a261432 CAMEL-14192: regen docs
add 710873a Polished docs
add d59bd22 Fix box upload overwrite. The previous check used the box search api but it relied on a folder index, that was reindexed every couple of minutes, so the check just failed for recently uploaded files. The fix is to use the folder.canUpload() and folder list api. (#3350)
add 059ae48 CAMEL-14194: Message thread name removed from JID (#3351)
add b36e286 Regen
add 0d5aee3 CAMEL-14178: camel-amqp - Add support for reading AMQP anntations
add 89b452d CAMEL-14191: EIP docs - Add links to last EIP patterns and add new pages if missing content
add 1e793ef CAMEL-14191: EIP docs - Add links to last EIP patterns and add new pages if missing content
add 88d7258 CAMEL-14191: EIP docs - Add links to last EIP patterns and add new pages if missing content
add 50c67a6 CAMEL-14191: EIP docs - Add links to last EIP patterns and add new pages if missing content
add 9bfb28b CAMEL-14178: camel-amqp - Add tests for AMQP annotations
add 411fedb Upgrade Zipkin to version 2.19.2
add 06f56e9 Upgrade Zipkin Reporter to version 2.11.1
add a88ff15 Upgrade pgjdbc to version 0.8.3
add 7f860c9 CAMEL-13643: Fixed spring-boot itests after SB groupId change.
add 6ce732dd CAMEL-14191: EIP docs - Add links to last EIP patterns and add new pages if missing content
add 2d4f7f6 Regen
add 95b1625 Regen
add 3c36fcd Regen again
add 473000d CAMEL-14191: EIP docs - Add links to last EIP patterns and add new pages if missing content
add 092c868 Fixing owasp plugin
add 8c96f84 Updating Apache Directory
add ac8e2fa Updating iota version
add f3b5746 Updating dozer
add 2bf5f7f Removing unnecessary netty exclusion from zookeeper poms
add 7d641db Updating grpc
add 0512dd8 Updating google maps
add bf7c7a7 Updating Spring Cloud
add 9d55256 Fixing camel-ldif feature
add 83d6125 Updating Shiro
add 50d9bb0 CAMEL-14191: EIP docs - Add links to last EIP patterns and add new pages if missing content
add 90754f2 CAMEL-14191: EIP docs - Add links to last EIP patterns and add new pages if missing content
add fc94528 CAMEL-14196: Unable to bind properties...
add ed188ed CAMEL-14191: Fixed links
add a698688 CAMEL-14191: EIP docs - Add links to last EIP patterns and add new pages if missing content
add 6c839a3 When do I remember to have adoc in the links
add 56280e5 CAMEL-14187: Fix asciidoc warnings related to the inline reference
add aee5ec1 Merge pull request #3352 from omarsmak/CAMEL-14187
add 8b95991 regen docs
add 1735c51 Camel-AWS ECS: Fixed endpoint description.
add 2414542 Camel-AWS ECS: Regen and regen docs
add 7982118 Camel-AWS EKS: Fixed endpoint description.
add 4005279 Camel-AWS EKS: Regen and regen docs
add 3fff135 Camel-AWS MSK: Fixed endpoint description.
add 25571cb Camel-AWS MSK: Regen and regen docs
add f744542 Regen
add 76acda0 Revert "Updating grpc"
add 9e7cbbb CAMEL-14173: camel-paho - Do not unsubscribe for durable topics when stopping. Thanks to Roland Beisel for reporting. Removed support for suspend/resume as it wouldnt work properly either with durable topics.
add 9842986 camel-amqp - Fix typo in Javadoc
add 60807b6 [CAMEL-14197] Missing dependency in camel-optaplanner (#3355)
add 8245282 Introduce TransformerFactoryConfigurationStrategy to be able to configure a TransformerFactory per XsltEndpoint (#3353)
add 2aac4d7 CAMEL-14190: JMSComponent tries to use applicationContext before it is initialised. Change this kind of logic to be more Camel like.
add bfe8df0 Polished
add b86faa9 Regen
add 2153b7f CAMEL-14198: Fix camel-spring-boot to not restart routes on startup if using main-route-controller due to routes being discovered and configured twice.
add 255560c CAMEL-14198: Fix test
add e0e47df Fixed CS and polished
add 227c2b4 CAMEL-14199 : camel-hdfs - Add maxMessagesPerPoll for Consumer (#3356)
add 7f1dd91 CAMEL-14200: Clean up potentially stale metrics
add e3042c2 CAMEL-14201: Port the platform-http component from Camel Quarkus (#3357)
add ad84e0d CAMEL-14201: Added a little docs and polished a bit.
add 2efb84b CAMEL-14202: camel-activemq - Setting brokerURL should be used when using spring boot. Updated example to use camel-activemq-starter
add 702b06c CAMEL-14204: Remove old cruft from camel-activemq which we dont want to have anymore. And not in use really.
add b2e59d5 CAMEL-14203: camel-jms - Spring Boot documentation is duplicated
add ed13ef8 Remove dangling SB metadata file that was generated using old tooling.
add a3175b7 CAMEL-14207: camel-olingo2 - Basic auth with endpointHttpHeaders not working
add 1971adc Fix doc name
add dc0aa09 Upgrade SmallRye Metrics to 2.3.1
add 0d9cd49 Regen
add dfadaaf CAMEL-14195: Add logging to capture Decoder exceptions at error level (#3358)
add 08c193d CAMEL-14195: Fixed CS. If error decoding the request by netty server then return 400 status.
add 20238db Fixed CS
add 5b60c2e CAMEL-14146 : camel-hdfs - Consumer that splits with ChunkSize should add similar header info like the Splitter (#3354)
add 1080527 Revert "CAMEL-14146 : camel-hdfs - Consumer that splits with ChunkSize should add similar header info like the Splitter (#3354)" (#3359)
add 3c8594b Revert "Revert "CAMEL-14146 : camel-hdfs - Consumer that splits with ChunkSize should add similar header info like the Splitter (#3354)" (#3359)"
add c0e4970 CAMEL-14191: EIP docs - Add links to last EIP patterns and add new pages if missing content
add 866c3d1 Regen
add 1d123ec CAMEL-14191: EIP docs - Add links to last EIP patterns and add new pages if missing content
add 1b5131e Fixed CS
add 612222a CAMEL-14211: @Ignore tests that currently fail
add 872ff66 CAMEL-14146 - camel-hdfs - Consumer that splits with ChunkSize should add similar header info like the Splitter (#3360)
add 409529f Disable tracing fix (#3361)
add 0491209 Regen
add 5a2d960 Fix groupId of referenced Spring Boot Dependencies Generator
add be2ee4a Fix groupId of referenced Spring Boot Dependencies Generator
add 8fa8850 Fix groupId of referenced Camel Spring Boot dependencies
add 4fdcc61 spring boot groupId fix
add 4518605 Fixed flaky test on slow CI servers
add 4c558a8 Upgrade CXF plugins
add 20db898 CAMEL-14213: camel-jms - Should only lookup CF if a TX manager has not been configured either, as the TX manager woudld come with its own. Allow to configure these autowrire options on component level also.
add 125e1b0 Regen
add c22d5fe Fixed CS
add fb4272a Regen
add abbada0 CAMEL-14216: Add a note in the stomp component
add e99abeb Upgrade Kubernetes client to version 4.6.4
add 574012e Updating Pax url version
add 630f1b9 Upgrade Jandex to version 2.1.2.Final
add 72bc6b0 Upgrade Brave Zipkin to version 5.9.1
add e2d6c51 CAMEL-11807: Migrated camel-jsonpath tests to JUnit 5
add 179b7ec Upgrade Xchange to version 4.4.1
add d690251 CAMEL-14219: enforce type conversion on reactive-streams subscriber (#3362)
add 5018712 Regen
add d0956e7 Ignore Camel-Solr SB Integration test, it's failing only on CI
add 26ad5db camel-rabbitmq - Fix link to ConnectionFactory javadoc
add b85e956 CAMEL-13679: fixed Camel-FTP component does not set CamelFtpReplyCode in some case(ex 530). (#3363)
add d517275 Regen
add 52f9aa1 Upgrade kotlin
add 7140b64 Upgrade Vertx to version 3.8.4
add 5961397 Upgrade Jandex Maven Plugin to version 1.0.7
add cb7ffd6 Upgrade ActiveMQ to version 5.15.11
add ac11f88 [maven-release-plugin] prepare release camel-3.0.0
add 3eadf4a [maven-release-plugin] prepare for next development iteration
add a1e2052 Merge branch 'release/3.0.0'
add ca4d150 Add XML schema references for release 3.0.0
add c9b2a6f Update Maven to version 3.6.3
add 830ec32 Update Maven Wrapper to version 0.5.5
add 87e542f Upgrade Johnzon to version 1.2.2
add 32daaed Upgrade Drools to version 7.30.0.Final
add 41277ca Upgrade Optaplanner to version 7.30.0.Final
add 812079d Upgrade Kie to version 7.30.0.Final
add 2caa08f Upgrade Jbpm to version 7.30.0.Final
add 80fb1e0 CAMEL-14223: Fix EndpointBuilderFactory is not updated in endpointdsl
add 9fe725f CAMEL-14223: Fix CS
add d688565 CAMEL-14223: Fix CS and make sure to ignore updating in case content did not change
add 354caeb CAMEL-14223: Make the file check more tolerant towards the naming
add 5589745 Merge pull request #3366 from omarsmak/CAMEL-14223
add 0d656c5 Update poms to version 3.1.0-SNAPSHOT
add 7c87953 CAMEL-14228: camel-netty - Let netty calculate the default worker count
add b1b6505 Regen
add 60d9e79 Upgrade Jt400 and related bundle to version 10.1
add 917bf5a Regen
add 60c8bc0 Upgrade AWS Java SDK and related bundle to version 1.11.681
add aac7559 Upgrade Java-util and related bundle to version 1.38.0
add d7baffa Upgrade Libphonenumber and related bundle to version 8.10.23
add aa35e7a Upgrade Influxdb Java and related bundle to version 2.16
add f68f6d0 CAMEL-14221: Stomp Component has no option to set version
add 5d47725 Merge pull request #3367 from onlybytes/CAMEL-14221
add f54f96d Upgrade Batik to version 1.12
add 23ee159 Camel-platform-http: Added component and endpoint options through placeholders
add 4796b94 Regen docs
add 52710c1b Regen
add 7231b30 CAMEL-14230 - Disable RC4 and MD5 TLS ciphersuites by default
add 26fb0f9 Fixing up webpage
add c0e6e15 More fixup
add 8eaa198 CAMEL-14231: Fix broken links
add 5e49180 typo link
add 0443fd5 CAMEL-14234: Fix BOM group id for camel-archetype-spring-boot
add a53535f Remove irc-room page as we dont use that anymore as we use gitter chat
add 35cfb1a CAMEL-14235: Add option to discardWhenFull to seda component.
new c599845 CAMEL-11807: Migrated camel-ftp 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 (488d4f8)
\
N -- N -- N refs/heads/CAMEL-11807 (c599845)
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:
.mvn/wrapper/MavenWrapperDownloader.java | 51 +-
.mvn/wrapper/maven-wrapper.jar | Bin 48337 -> 50710 bytes
.mvn/wrapper/maven-wrapper.properties | 3 +-
apache-camel/pom.xml | 15 +-
apache-camel/src/main/descriptors/common-bin.xml | 2 +
archetypes/camel-archetype-api-component/pom.xml | 5 +-
archetypes/camel-archetype-blueprint/pom.xml | 5 +-
archetypes/camel-archetype-cdi/pom.xml | 5 +-
archetypes/camel-archetype-component/pom.xml | 5 +-
archetypes/camel-archetype-dataformat/pom.xml | 5 +-
archetypes/camel-archetype-java/pom.xml | 5 +-
archetypes/camel-archetype-java8/pom.xml | 5 +-
archetypes/camel-archetype-main/pom.xml | 5 +-
archetypes/camel-archetype-spring-boot/pom.xml | 5 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
archetypes/camel-archetype-spring/pom.xml | 5 +-
archetypes/camel-archetype-web/pom.xml | 5 +-
archetypes/pom.xml | 5 +-
bom/camel-bom/pom.xml | 12 +-
bom/pom.xml | 7 +-
buildingtools/pom.xml | 5 +-
catalog/camel-catalog-lucene/pom.xml | 5 +-
catalog/camel-catalog-maven/pom.xml | 5 +-
catalog/camel-catalog-provider-karaf/pom.xml | 5 +-
catalog/camel-catalog-provider-springboot/pom.xml | 5 +-
catalog/camel-catalog/pom.xml | 5 +-
catalog/camel-main-maven-plugin/pom.xml | 5 +-
catalog/camel-report-maven-plugin/pom.xml | 5 +-
catalog/camel-route-parser/pom.xml | 5 +-
catalog/dummy-component/pom.xml | 5 +-
catalog/pom.xml | 5 +-
components/camel-activemq/pom.xml | 5 +-
.../src/main/docs/activemq-component.adoc | 22 +-
.../component/activemq/ActiveMQComponent.java | 87 +-
.../component/activemq/ActiveMQConfiguration.java | 47 +-
.../camel/component/activemq/CamelConnection.java | 46 -
.../component/activemq/CamelConnectionFactory.java | 57 -
.../camel/component/activemq/CamelDestination.java | 173 ---
.../component/activemq/CamelEndpointLoader.java | 176 ---
.../component/activemq/CamelMessageConsumer.java | 176 ---
.../component/activemq/CamelMessageProducer.java | 106 --
.../camel/component/activemq/CamelQueue.java | 50 -
.../component/activemq/CamelQueueReceiver.java | 49 -
.../camel/component/activemq/CamelQueueSender.java | 96 --
.../component/activemq/CamelShutdownHook.java | 73 -
.../camel/component/activemq/CamelTopic.java | 50 -
.../component/activemq/CamelTopicPublisher.java | 156 --
.../component/activemq/CamelTopicSubscriber.java | 65 -
.../activemq/converter/ActiveMQConverter.java | 4 +-
.../converter/ActiveMQMessageConverter.java | 3 -
.../activemq/AutoExposeQueuesInCamelTest.java | 102 --
.../activemq/BrokerPreShutdownHookTest.java | 79 --
.../activemq/CamelJmsRequestReplyNobTest.java | 114 --
.../camel/component/activemq/CamelJmsTest.java | 106 --
.../camel/component/activemq/requestReply.xml | 78 -
.../org/apache/camel/component/activemq/spring.xml | 51 -
components/camel-ahc-ws/pom.xml | 5 +-
.../src/main/docs/ahc-ws-component.adoc | 2 +-
components/camel-ahc/pom.xml | 5 +-
.../camel-ahc/src/main/docs/ahc-component.adoc | 2 +-
components/camel-amqp/pom.xml | 5 +-
.../camel-amqp/src/main/docs/amqp-component.adoc | 12 +-
.../apache/camel/component/amqp/AMQPComponent.java | 54 +-
.../camel/component/amqp/AMQPConfiguration.java | 56 +
.../camel/component/amqp/AMQPConstants.java} | 22 +-
.../camel/component/amqp/AMQPJmsBinding.java | 83 ++
.../apache/camel/component/amqp/AMQPRouteTest.java | 82 +-
components/camel-any23/pom.xml | 5 +-
components/camel-apns/pom.xml | 5 +-
.../camel-apns/src/main/docs/apns-component.adoc | 2 +-
components/camel-as2/camel-as2-api/pom.xml | 5 +-
components/camel-as2/camel-as2-component/pom.xml | 19 +-
components/camel-as2/pom.xml | 97 +-
components/camel-asn1/pom.xml | 5 +-
components/camel-asterisk/pom.xml | 5 +-
.../src/main/docs/asterisk-component.adoc | 2 +-
components/camel-atmos/pom.xml | 5 +-
.../camel-atmos/src/main/docs/atmos-component.adoc | 2 +-
components/camel-atmosphere-websocket/pom.xml | 5 +-
.../main/docs/atmosphere-websocket-component.adoc | 2 +-
components/camel-atom/pom.xml | 5 +-
.../camel-atom/src/main/docs/atom-component.adoc | 2 +-
components/camel-atomix/pom.xml | 5 +-
components/camel-attachments/pom.xml | 5 +-
components/camel-avro/pom.xml | 5 +-
.../camel-avro/src/main/docs/avro-component.adoc | 4 +-
.../camel-avro/src/main/docs/avro-dataformat.adoc | 4 +-
components/camel-aws-cw/pom.xml | 5 +-
components/camel-aws-ddb/pom.xml | 5 +-
components/camel-aws-ec2/pom.xml | 5 +-
components/camel-aws-ecs/pom.xml | 5 +-
.../camel/component/aws/ecs/ECSEndpoint.java | 2 +-
components/camel-aws-eks/pom.xml | 5 +-
.../camel/component/aws/eks/EKSEndpoint.java | 2 +-
components/camel-aws-iam/pom.xml | 5 +-
components/camel-aws-kinesis/pom.xml | 5 +-
components/camel-aws-kms/pom.xml | 5 +-
components/camel-aws-lambda/pom.xml | 5 +-
components/camel-aws-mq/pom.xml | 5 +-
components/camel-aws-msk/pom.xml | 5 +-
.../camel/component/aws/msk/MSKEndpoint.java | 2 +-
components/camel-aws-s3/pom.xml | 5 +-
.../src/main/docs/aws-s3-component.adoc | 20 +
.../camel/component/aws/s3/S3Configuration.java | 5 +-
.../apache/camel/component/aws/s3/S3Constants.java | 52 +-
.../apache/camel/component/aws/s3/S3Consumer.java | 27 +-
.../apache/camel/component/aws/s3/S3Endpoint.java | 9 +-
.../camel/component/aws/s3/S3Operations.java | 8 +-
.../apache/camel/component/aws/s3/S3Producer.java | 20 +
.../camel/component/aws/s3/client/S3Client.java | 4 +-
.../component/aws/s3/client/S3ClientFactory.java | 7 +-
.../s3/client/impl/S3ClientIAMOptimizedImpl.java | 25 +-
.../aws/s3/client/impl/S3ClientStandardImpl.java | 35 +-
.../component/aws/s3/AWSS3ClientFactoryTest.java | 2 +-
.../camel/component/aws/s3/AmazonS3ClientMock.java | 46 +-
.../aws/s3/AmazonS3EncryptionClientMock.java | 46 +-
.../s3/S3BatchConsumerMaxMessagesPerPollTest.java | 2 +-
.../component/aws/s3/S3BatchConsumerTest.java | 2 +-
.../aws/s3/S3ComponentClientRegistryTest.java | 2 +-
.../aws/s3/S3ComponentConfigurationTest.java | 5 +-
.../aws/s3/S3ComponentContentLengthFileTest.java | 4 +-
.../s3/S3ComponentCopyObjectEncryptionTest.java | 2 +-
.../aws/s3/S3ComponentCopyObjectSpringTest.java | 2 +-
.../aws/s3/S3ComponentCopyObjectTest.java | 2 +-
.../aws/s3/S3ComponentDeleteObjectSpringTest.java | 2 +-
.../aws/s3/S3ComponentDeleteObjectTest.java | 2 +-
.../aws/s3/S3ComponentDownloadLinkSpringTest.java | 2 +-
.../aws/s3/S3ComponentDownloadLinkTest.java | 2 +-
.../aws/s3/S3ComponentExistingBucketTest.java | 2 +-
.../component/aws/s3/S3ComponentFileTest.java | 2 +-
...est.java => S3ComponentGetObjectRangeTest.java} | 20 +-
.../component/aws/s3/S3ComponentGetObjectTest.java | 2 +-
.../aws/s3/S3ComponentKeyNameFileTest.java | 2 +-
.../aws/s3/S3ComponentListBucketsSpringTest.java | 2 +-
.../aws/s3/S3ComponentListBucketsTest.java | 2 +-
.../aws/s3/S3ComponentListObjectTest.java | 4 +-
.../aws/s3/S3ComponentListObjectsSpringTest.java | 2 +-
.../aws/s3/S3ComponentNonExistingBucketTest.java | 2 +-
.../component/aws/s3/S3ComponentStringTest.java | 2 +-
.../impl/IAMOptimizedAWSS3ClientImplTest.java | 8 +-
.../client/impl/StandardAWSS3ClientImplTest.java | 9 +-
.../s3/integration/S3ComponentIntegrationTest.java | 52 +-
.../S3ObjectRangeOperationIntegrationTest.java | 105 ++
components/camel-aws-sdb/pom.xml | 5 +-
components/camel-aws-ses/pom.xml | 5 +-
components/camel-aws-sns/pom.xml | 5 +-
components/camel-aws-sqs/pom.xml | 5 +-
components/camel-aws-swf/pom.xml | 5 +-
components/camel-aws-translate/pom.xml | 5 +-
components/camel-aws-xray/pom.xml | 6 +-
components/camel-azure/pom.xml | 5 +-
.../src/main/docs/azure-blob-component.adoc | 2 +-
.../src/main/docs/azure-queue-component.adoc | 2 +-
components/camel-barcode/pom.xml | 5 +-
.../src/main/docs/barcode-dataformat.adoc | 2 +-
components/camel-base64/pom.xml | 5 +-
.../src/main/docs/base64-dataformat.adoc | 2 +-
components/camel-bean-validator/pom.xml | 5 +-
.../src/main/docs/bean-validator-component.adoc | 2 +-
components/camel-bean/pom.xml | 5 +-
components/camel-beanio/pom.xml | 5 +-
.../src/main/docs/beanio-dataformat.adoc | 2 +-
components/camel-beanstalk/pom.xml | 7 +-
.../src/main/docs/beanstalk-component.adoc | 2 +-
components/camel-bindy/pom.xml | 5 +-
.../src/main/docs/bindy-dataformat.adoc | 6 +-
components/camel-blueprint/pom.xml | 69 +-
components/camel-bonita/pom.xml | 5 +-
.../src/main/docs/bonita-component.adoc | 2 +-
components/camel-box/camel-box-api/pom.xml | 5 +-
.../camel/component/box/api/BoxFilesManager.java | 53 +-
components/camel-box/camel-box-component/pom.xml | 27 +-
.../src/main/docs/box-component.adoc | 2 +-
.../box/BoxFilesManagerIntegrationTest.java | 33 +-
components/camel-box/pom.xml | 5 +-
components/camel-braintree/pom.xml | 31 +-
.../src/main/docs/braintree-component.adoc | 2 +-
components/camel-browse/pom.xml | 5 +-
components/camel-caffeine/pom.xml | 5 +-
components/camel-cassandraql/pom.xml | 5 +-
.../src/main/docs/cql-component.adoc | 2 +-
components/camel-cbor/pom.xml | 5 +-
components/camel-cdi/pom.xml | 5 +-
components/camel-chatscript/pom.xml | 5 +-
components/camel-chunk/pom.xml | 5 +-
.../camel-chunk/src/main/docs/chunk-component.adoc | 2 +-
components/camel-cm-sms/pom.xml | 233 ++-
.../src/main/docs/cm-sms-component.adoc | 2 +-
components/camel-cmis/pom.xml | 7 +-
.../camel-cmis/src/main/docs/cmis-component.adoc | 2 +-
components/camel-coap/pom.xml | 5 +-
.../camel-coap/src/main/docs/coap-component.adoc | 2 +-
components/camel-cometd/pom.xml | 5 +-
.../src/main/docs/cometd-component.adoc | 2 +-
components/camel-consul/pom.xml | 5 +-
.../src/main/docs/consul-component.adoc | 2 +-
components/camel-controlbus/pom.xml | 5 +-
components/camel-corda/pom.xml | 5 +-
.../camel-corda/src/main/docs/corda-component.adoc | 2 +-
components/camel-couchbase/pom.xml | 5 +-
.../src/main/docs/couchbase-component.adoc | 2 +-
components/camel-couchdb/pom.xml | 5 +-
.../src/main/docs/couchdb-component.adoc | 2 +-
components/camel-crypto-cms/pom.xml | 5 +-
components/camel-crypto/pom.xml | 5 +-
.../src/main/docs/crypto-component.adoc | 4 +-
.../src/main/docs/crypto-dataformat.adoc | 4 +-
components/camel-csv/pom.xml | 5 +-
.../camel-csv/src/main/docs/csv-dataformat.adoc | 2 +-
components/camel-cxf-transport/pom.xml | 5 +-
components/camel-cxf/pom.xml | 19 +-
.../camel-cxf/src/main/docs/cxf-component.adoc | 2 +-
.../camel-cxf/src/main/docs/cxfrs-component.adoc | 2 +-
.../src/main/resources/META-INF/spring.schemas | 1 +
components/camel-dataformat/pom.xml | 5 +-
components/camel-dataset/pom.xml | 5 +-
.../camel-debezium-common-component/pom.xml | 5 +-
.../camel-debezium-maven-plugin/pom.xml | 7 +-
components/camel-debezium-common/pom.xml | 5 +-
components/camel-debezium-mongodb/pom.xml | 5 +-
components/camel-debezium-mysql/pom.xml | 5 +-
components/camel-debezium-postgres/pom.xml | 5 +-
components/camel-debezium-sqlserver/pom.xml | 5 +-
components/camel-digitalocean/pom.xml | 5 +-
.../src/main/docs/digitalocean-component.adoc | 2 +-
components/camel-direct/pom.xml | 5 +-
components/camel-directvm/pom.xml | 5 +-
components/camel-disruptor/pom.xml | 5 +-
.../src/main/docs/disruptor-component.adoc | 4 +-
components/camel-dns/pom.xml | 5 +-
.../camel-dns/src/main/docs/dns-component.adoc | 2 +-
components/camel-docker/pom.xml | 5 +-
.../src/main/docs/docker-component.adoc | 2 +-
components/camel-dozer/pom.xml | 5 +-
.../camel-dozer/src/main/docs/dozer-component.adoc | 2 +-
components/camel-drill/pom.xml | 5 +-
.../camel-drill/src/main/docs/drill-component.adoc | 2 +-
components/camel-dropbox/pom.xml | 5 +-
.../src/main/docs/dropbox-component.adoc | 2 +-
components/camel-ehcache/pom.xml | 5 +-
.../src/main/docs/ehcache-component.adoc | 2 +-
components/camel-elasticsearch-rest/pom.xml | 5 +-
components/camel-elsql/pom.xml | 5 +-
.../camel-elsql/src/main/docs/elsql-component.adoc | 2 +-
components/camel-etcd/pom.xml | 5 +-
.../camel-etcd/src/main/docs/etcd-component.adoc | 2 +-
components/camel-eventadmin/pom.xml | 5 +-
components/camel-exec/pom.xml | 5 +-
.../camel-exec/src/main/docs/exec-component.adoc | 2 +-
components/camel-facebook/pom.xml | 5 +-
.../src/main/docs/facebook-component.adoc | 2 +-
components/camel-fastjson/pom.xml | 5 +-
components/camel-fhir/camel-fhir-api/pom.xml | 5 +-
components/camel-fhir/camel-fhir-component/pom.xml | 21 +-
components/camel-fhir/pom.xml | 5 +-
components/camel-file-watch/pom.xml | 134 +-
components/camel-file/pom.xml | 5 +-
components/camel-flatpack/pom.xml | 5 +-
.../src/main/docs/flatpack-component.adoc | 4 +-
.../src/main/docs/flatpack-dataformat.adoc | 4 +-
components/camel-flink/pom.xml | 5 +-
.../camel-flink/src/main/docs/flink-component.adoc | 2 +-
components/camel-fop/pom.xml | 5 +-
.../camel-fop/src/main/docs/fop-component.adoc | 2 +-
components/camel-freemarker/pom.xml | 5 +-
.../src/main/docs/freemarker-component.adoc | 2 +-
components/camel-ftp/pom.xml | 18 +-
.../camel-ftp/src/main/docs/ftp-component.adoc | 2 +-
.../camel-ftp/src/main/docs/ftps-component.adoc | 2 +-
.../component/file/remote/FtpsOperations.java | 6 -
.../file/remote/BaseServerTestSupport.java | 9 +-
.../remote/ConsumerTemplateFtpShutdownTest.java | 4 +-
.../file/remote/FileToFtpTempFileNameTest.java | 6 +-
.../FileToFtpsExplicitSSLWithClientAuthTest.java | 2 +-
...FileToFtpsExplicitSSLWithoutClientAuthTest.java | 2 +-
.../FileToFtpsExplicitTLSWithClientAuthTest.java | 2 +-
...FileToFtpsExplicitTLSWithoutClientAuthTest.java | 2 +-
.../FileToFtpsImplicitSSLWithClientAuthTest.java | 2 +-
...FileToFtpsImplicitSSLWithoutClientAuthTest.java | 2 +-
.../FileToFtpsImplicitTLSWithClientAuthTest.java | 2 +-
...FileToFtpsImplicitTLSWithoutClientAuthTest.java | 2 +-
...psWithCustomKeyAndTrustStorePropertiesTest.java | 2 +-
...leToFtpsWithCustomTrustStorePropertiesTest.java | 2 +-
.../FileToFtpsWithDefaultSettingsIPV6Test.java | 6 +-
.../remote/FileToFtpsWithDefaultSettingsTest.java | 2 +-
.../FileToFtpsWithFtpClientConfigRefTest.java | 2 +-
.../remote/FromFilePercentSignInPasswordTest.java | 2 +-
...FromFileToFtpDefaultRootRenameStrategyTest.java | 8 +-
.../file/remote/FromFileToFtpDeleteTest.java | 9 +-
.../component/file/remote/FromFileToFtpTest.java | 2 +-
.../file/remote/FromFileToFtpWithChmodTest.java | 2 +-
.../remote/FromFileTransferLoggingLevelTest.java | 2 +-
.../FromFileTransferLoggingLevelVerboseTest.java | 2 +-
.../file/remote/FromFtpActivePortRangeTest.java | 6 +-
.../file/remote/FromFtpAsyncProcessTest.java | 8 +-
.../file/remote/FromFtpClientConfigRefTest.java | 6 +-
.../file/remote/FromFtpClientDataTimeoutTest.java | 6 +-
.../file/remote/FromFtpClientSoTimeout2Test.java | 6 +-
.../file/remote/FromFtpClientSoTimeout3Test.java | 6 +-
.../file/remote/FromFtpClientSoTimeoutTest.java | 6 +-
.../FromFtpConsumerTemplateRollbackTest.java | 13 +-
.../file/remote/FromFtpConsumerTemplateTest.java | 14 +-
.../file/remote/FromFtpDeleteFileTest.java | 13 +-
.../remote/FromFtpDirectoryToBinaryFilesTest.java | 18 +-
.../FromFtpDoNotDeleteFileIfProcessFailsTest.java | 12 +-
.../FromFtpExclusiveReadNoneStrategyTest.java | 16 +-
.../component/file/remote/FromFtpFilterTest.java | 2 +-
.../file/remote/FromFtpKeepLastModifiedTest.java | 15 +-
...FromFtpMoveFileAbsoluteFolderRecursiveTest.java | 6 +-
.../file/remote/FromFtpMoveFilePostfixTest.java | 10 +-
.../file/remote/FromFtpMoveFilePrefixTest.java | 10 +-
.../file/remote/FromFtpMoveFileRecursiveTest.java | 6 +-
.../component/file/remote/FromFtpMoveFileTest.java | 10 +-
...FromFtpMoveFileToHiddenFolderRecursiveTest.java | 6 +-
...tpNoEndpointPathRelativeMoveToAbsoluteTest.java | 6 +-
.../component/file/remote/FromFtpNoFilesTest.java | 5 +-
.../remote/FromFtpNoopIdempotentFalseTest.java | 10 +-
.../component/file/remote/FromFtpNoopTest.java | 10 +-
.../file/remote/FromFtpNotDownloadTest.java | 11 +-
.../file/remote/FromFtpPassiveModeTest.java | 6 +-
.../file/remote/FromFtpPollFileOnlyTest.java | 6 +-
.../file/remote/FromFtpPreMoveDeleteTest.java | 13 +-
.../remote/FromFtpPreMoveFileExpressionTest.java | 12 +-
.../file/remote/FromFtpPreMoveFilePostfixTest.java | 12 +-
.../file/remote/FromFtpPreMoveFilePrefixTest.java | 12 +-
.../file/remote/FromFtpPreMoveNoopTest.java | 12 +-
.../file/remote/FromFtpRecursiveNoopTest.java | 6 +-
.../FromFtpRecursiveNotStepwiseNoBasePathTest.java | 6 +-
.../file/remote/FromFtpRegexPatternTest.java | 6 +-
.../FromFtpRemoteFileFilterDirectoryTest.java | 15 +-
.../file/remote/FromFtpRemoteFileFilterTest.java | 15 +-
.../FromFtpRemoteFileSortByExpressionTest.java | 6 +-
...tpRemoteFileSortByIgnoreCaseExpressionTest.java | 6 +-
...romFtpRemoteFileSortByNestedExpressionTest.java | 6 +-
.../file/remote/FromFtpRemoteFileSorterTest.java | 6 +-
.../file/remote/FromFtpSedaDeleteFileTest.java | 13 +-
.../FromFtpServerLanguageCodeAndTimeoutTest.java | 6 +-
.../file/remote/FromFtpServerLanguageCodeTest.java | 6 +-
.../FromFtpSetNamesWithMultiDirectoriesTest.java | 19 +-
...leNoEndpointPathRelativeMoveToAbsoluteTest.java | 6 +-
...leNoEndpointPathRelativeMoveToRelativeTest.java | 6 +-
.../FromFtpSimpleRelativeMoveToAbsoluteTest.java | 6 +-
.../FromFtpSimpleRelativeMoveToRelativeTest.java | 6 +-
.../FromFtpSimulateNetworkIssueRecoverTest.java | 7 +-
.../FromFtpStartingDirAndFileNameClashTest.java | 6 +-
.../file/remote/FromFtpThirdPoolOkTest.java | 15 +-
.../FromFtpToAsciiFileNoBodyConversionTest.java | 6 +-
.../file/remote/FromFtpToAsciiFileTest.java | 12 +-
.../file/remote/FromFtpToBinaryFileTest.java | 14 +-
.../file/remote/FromFtpToBinaryFilesTest.java | 18 +-
.../file/remote/FromFtpToBinarySampleTest.java | 4 +-
.../remote/FromFtpToFileNoFileNameHeaderTest.java | 6 +-
.../component/file/remote/FromFtpToMockTest.java | 2 +-
.../file/remote/FromFtpTwoSlashesIssueTest.java | 10 +-
.../file/remote/FromFtpUseListFalseTest.java | 6 +-
.../remote/FromQueueThenConsumeFtpToMockTest.java | 6 +-
.../component/file/remote/FtpAnonymousTest.java | 6 +-
.../file/remote/FtpBadLoginConnectionLeakTest.java | 9 +-
.../FtpBadLoginInProducerConnectionLeakTest.java | 11 +-
.../FtpBadLoginMockNoopConnectionLeakTest.java | 22 +-
.../file/remote/FtpBrowsableEndpointTest.java | 19 +-
.../file/remote/FtpChangedReadLockTest.java | 7 +-
.../file/remote/FtpChangedRootDirReadLockTest.java | 7 +-
.../remote/FtpChangedZeroLengthReadLockTest.java | 4 +-
.../file/remote/FtpConnectTimeoutTest.java | 2 +-
.../file/remote/FtpConsumerAbsolutePathTest.java | 9 +-
.../file/remote/FtpConsumerAsyncStressTest.java | 6 +-
.../file/remote/FtpConsumerAutoCreateTest.java | 9 +-
.../file/remote/FtpConsumerBodyAsStringTest.java | 9 +-
.../FtpConsumerDeleteNoWritePermissionTest.java | 10 +-
.../FtpConsumerDirectoriesNotMatchedTest.java | 6 +-
.../file/remote/FtpConsumerDisconnectTest.java | 13 +-
.../remote/FtpConsumerDoneFileNameFixedTest.java | 6 +-
.../file/remote/FtpConsumerDoneFileNameTest.java | 6 +-
.../remote/FtpConsumerDualDoneFileNameTest.java | 2 +-
.../file/remote/FtpConsumerExcludeNameTest.java | 6 +-
.../file/remote/FtpConsumerFileSplitTest.java | 2 +-
.../remote/FtpConsumerIPV6BodyAsStringTest.java | 13 +-
.../FtpConsumerIdempotentKeyChangedIssueTest.java | 2 +-
.../remote/FtpConsumerIdempotentMemoryRefTest.java | 5 +-
.../file/remote/FtpConsumerIdempotentRefTest.java | 7 +-
.../file/remote/FtpConsumerIdempotentTest.java | 2 +-
.../file/remote/FtpConsumerIncludeNameTest.java | 6 +-
...nsumerLocalWorkDirectoryAsAbsolutePathTest.java | 20 +-
.../FtpConsumerLocalWorkDirectoryDirectTest.java | 17 +-
.../remote/FtpConsumerLocalWorkDirectoryTest.java | 18 +-
.../remote/FtpConsumerMaxMessagesPerPollTest.java | 6 +-
.../file/remote/FtpConsumerMoveExpressionTest.java | 11 +-
.../remote/FtpConsumerMultipleDirectoriesTest.java | 10 +-
.../FtpConsumerNotEagerMaxMessagesPerPollTest.java | 6 +-
.../remote/FtpConsumerProcessStrategyTest.java | 8 +-
.../remote/FtpConsumerRelativeFileNameTest.java | 8 +-
.../file/remote/FtpConsumerReplyStringTest.java | 2 +-
.../file/remote/FtpConsumerResumeDownloadTest.java | 18 +-
.../file/remote/FtpConsumerSkipDotFilesTest.java | 6 +-
.../file/remote/FtpConsumerTemplateTest.java | 17 +-
.../FtpConsumerTemplateUseListFalseTest.java | 13 +-
...FtpConsumerThrowExceptionOnLoginFailedTest.java | 8 +-
.../FtpConsumerUsingFTPClientConfigTest.java | 6 +-
.../file/remote/FtpConsumerWithCharsetTest.java | 26 +-
.../remote/FtpConsumerWithNoFileOptionTest.java | 9 +-
.../file/remote/FtpEndpointURISanitizedTest.java | 4 +-
.../file/remote/FtpIllegalOptionsTest.java | 6 +-
.../component/file/remote/FtpLoginNoRetryTest.java | 8 +-
.../camel/component/file/remote/FtpLoginTest.java | 11 +-
.../FtpNoReconnectAttemptUnknownHostTest.java | 2 +-
.../FtpPollEnrichBridgeErrorHandlerTest.java | 5 +-
...llEnrichConsumeWithDisconnectAndDeleteTest.java | 12 +-
.../remote/FtpPollingConsumerIdleMessageTest.java | 8 +-
.../file/remote/FtpPollingConsumerTest.java | 8 +-
...pProducerAllowNullBodyFileAlreadyExistTest.java | 6 +-
.../file/remote/FtpProducerAllowNullBodyTest.java | 10 +-
.../file/remote/FtpProducerBuildDirectoryTest.java | 7 +-
.../FtpProducerBuildPartOfDirectoryTest.java | 9 +-
.../file/remote/FtpProducerConcurrentTest.java | 6 +-
.../remote/FtpProducerConnectErrorsHeaderTest.java | 2 +-
.../FtpProducerDisconnectOnBatchCompleteTest.java | 12 +-
.../file/remote/FtpProducerDisconnectTest.java | 13 +-
.../file/remote/FtpProducerDoneFileNameTest.java | 27 +-
.../file/remote/FtpProducerExpressionTest.java | 9 +-
...FtpProducerFileExistAppendNoFileBeforeTest.java | 8 +-
.../remote/FtpProducerFileExistAppendTest.java | 8 +-
.../file/remote/FtpProducerFileExistFailTest.java | 13 +-
.../remote/FtpProducerFileExistIgnoreTest.java | 8 +-
...pProducerFileExistOverrideNoFileBeforeTest.java | 8 +-
.../remote/FtpProducerFileExistOverrideTest.java | 6 +-
.../FtpProducerFileExistOverrideTwoUploadTest.java | 5 +-
.../remote/FtpProducerFileWithCharsetTest.java | 26 +-
.../FtpProducerFileWithPathNoStepwiseTest.java | 7 +-
...ileWithPathPathSeparatorAutoNoStepwiseTest.java | 8 +-
...ileWithPathPathSeparatorUnixNoStepwiseTest.java | 8 +-
...WithPathPathSeparatorWindowsNoStepwiseTest.java | 8 +-
.../file/remote/FtpProducerFileWithPathTest.java | 7 +-
.../FtpProducerJailStartingDirectoryTest.java | 6 +-
.../file/remote/FtpProducerMoveExistingTest.java | 9 +-
.../remote/FtpProducerMultipleSiteCommandTest.java | 7 +-
.../file/remote/FtpProducerRawPasswordTest.java | 7 +-
...tpProducerRecipientListParallelTimeoutTest.java | 6 +-
.../file/remote/FtpProducerRecipientListTest.java | 10 +-
.../file/remote/FtpProducerReplyStringTest.java | 2 +-
.../remote/FtpProducerRootFileExistFailTest.java | 13 +-
.../file/remote/FtpProducerSendNoopFalseTest.java | 7 +-
.../file/remote/FtpProducerSiteCommandTest.java | 7 +-
.../remote/FtpProducerTempFileExistIssueTest.java | 7 +-
.../file/remote/FtpProducerTempPrefixTest.java | 7 +-
.../remote/FtpProducerToDMoveExistingTest.java | 4 +-
.../FtpReconnectAttemptServerStoppedTest.java | 2 +-
.../remote/FtpReconnectAttemptUnknownHostTest.java | 2 +-
.../file/remote/FtpRecursiveDepth2Test.java | 2 +-
.../file/remote/FtpRecursiveDepth3Test.java | 2 +-
.../file/remote/FtpRecursiveDepthTest.java | 2 +-
.../file/remote/FtpServerTestSupport.java | 18 +-
.../remote/FtpShutdownCompleteAllTasksTest.java | 10 +-
.../FtpShutdownCompleteCurrentTaskOnlyTest.java | 10 +-
.../file/remote/FtpSimpleConsumeAbsoluteTest.java | 2 +-
...ectoryParseWithAbsoluteDepthNoStepwiseTest.java | 2 +-
.../FtpSimpleConsumeStreamingPartialReadTest.java | 5 +-
.../file/remote/FtpSimpleConsumeStreamingTest.java | 4 +-
...impleConsumeStreamingWithMultipleFilesTest.java | 4 +-
.../component/file/remote/FtpSoTimeoutTest.java | 40 +-
.../file/remote/FtpStreamingMoveTest.java | 11 +-
.../FtpThrowExceptionOnConnectionFailedTest.java | 8 +-
...FtpUtilsExtractDirNameFromAbsolutePathTest.java | 4 +-
.../file/remote/FtpsServerTestSupport.java | 10 +-
.../file/remote/OsgiParserFactoryTest.java | 15 +-
.../component/file/remote/PaddyRouteTest.java | 5 +-
.../RecipientListErrorHandlingIssueTest.java | 2 +-
...tRemoteFilePollingConsumerPollStrategyTest.java | 6 +-
.../remote/RemoteFileIgnoreDoPollErrorTest.java | 20 +-
.../RemoteFileProduceOverruleOnlyOnceTest.java | 8 +-
...llEnrichConsumeWithDisconnectAndDeleteTest.java | 12 +-
.../remote/ToFtpTempFileTargetFileExistTest.java | 10 +-
.../file/remote/UriConfigurationTest.java | 15 +-
.../remote/manual/FtpConsumerCamelManualTest.java | 14 +-
.../FtpConsumerCamelRecursiveManualTest.java | 14 +-
...ConsumerCamelRecursiveToAbsoluteManualTest.java | 14 +-
.../FtpConsumerNotStepwiseCamelManualTest.java | 14 +-
...onsumerNotStepwiseCamelRecursiveManualTest.java | 14 +-
...StepwiseCamelRecursiveToAbsoluteManualTest.java | 14 +-
.../remote/manual/FtpConsumerScottManualTest.java | 14 +-
.../FtpConsumerScottRecursiveManualTest.java | 14 +-
...FromSftpRecursiveNotStepwiseNoBasePathTest.java | 6 +-
.../file/remote/sftp/SftpChangedReadLockTest.java | 12 +-
.../component/file/remote/sftp/SftpChmodTest.java | 13 +-
.../file/remote/sftp/SftpConsumeTemplateTest.java | 5 +-
.../remote/sftp/SftpConsumerAutoCreateTest.java | 9 +-
.../remote/sftp/SftpConsumerDisconnectTest.java | 10 +-
.../sftp/SftpConsumerProcessStrategyTest.java | 8 +-
.../remote/sftp/SftpConsumerWithCharsetTest.java | 5 +-
.../file/remote/sftp/SftpECKeyFileConsumeTest.java | 2 +-
.../remote/sftp/SftpFromSedaDeleteFileTest.java | 10 +-
.../file/remote/sftp/SftpKeyConsumeTest.java | 2 +-
.../file/remote/sftp/SftpKeyFileConsumeTest.java | 2 +-
.../remote/sftp/SftpKeyPairDSAConsumeTest.java | 6 +-
.../remote/sftp/SftpKeyPairRSAConsumeTest.java | 6 +-
.../sftp/SftpKeyUriConsumeFromClasspathTest.java | 2 +-
.../file/remote/sftp/SftpKeyUriConsumeTest.java | 2 +-
.../file/remote/sftp/SftpProduceTempFileTest.java | 9 +-
.../SftpProducerFileWithPathNoStepwiseTest.java | 7 +-
.../remote/sftp/SftpProducerFileWithPathTest.java | 7 +-
.../remote/sftp/SftpProducerMoveExistingTest.java | 9 +-
.../remote/sftp/SftpProducerWithCharsetTest.java | 7 +-
.../file/remote/sftp/SftpServerTestSupport.java | 16 +-
.../file/remote/sftp/SftpSetCipherTest.java | 7 +-
.../file/remote/sftp/SftpSetOperationsTest.java | 7 +-
.../sftp/SftpSimpleConsumeRecursiveTest.java | 2 +-
.../SftpSimpleConsumeStreamingPartialReadTest.java | 5 +-
.../sftp/SftpSimpleConsumeStreamingTest.java | 4 +-
...impleConsumeStreamingWithMultipleFilesTest.java | 4 +-
.../file/remote/sftp/SftpSimpleConsumeTest.java | 2 +-
.../sftp/SftpSimpleConsumeThroughProxyTest.java | 2 +-
.../remote/sftp/SftpSimpleIPV6ConsumeTest.java | 6 +-
.../sftp/SftpSimpleProduceDisconnectTest.java | 9 +-
.../sftp/SftpSimpleProduceNotStepwiseTest.java | 11 +-
.../file/remote/sftp/SftpSimpleProduceTest.java | 11 +-
.../sftp/SftpSimpleProduceThroughProxyTest.java | 11 +-
.../file/remote/sftp/SftpUseListFalseTest.java | 2 +-
components/camel-ganglia/pom.xml | 5 +-
.../src/main/docs/ganglia-component.adoc | 2 +-
components/camel-geocoder/pom.xml | 5 +-
.../src/main/docs/geocoder-component.adoc | 2 +-
components/camel-git/pom.xml | 5 +-
.../camel-git/src/main/docs/git-component.adoc | 2 +-
components/camel-github/pom.xml | 5 +-
.../src/main/docs/github-component.adoc | 2 +-
components/camel-google-bigquery/pom.xml | 5 +-
components/camel-google-calendar/pom.xml | 21 +-
.../src/main/docs/google-calendar-component.adoc | 2 +-
components/camel-google-drive/pom.xml | 31 +-
.../src/main/docs/google-drive-component.adoc | 2 +-
components/camel-google-mail/pom.xml | 17 +-
.../src/main/docs/google-mail-component.adoc | 2 +-
components/camel-google-pubsub/pom.xml | 5 +-
.../src/main/docs/google-pubsub-component.adoc | 2 +-
components/camel-google-sheets/pom.xml | 9 +-
components/camel-gora/pom.xml | 5 +-
.../camel-gora/src/main/docs/gora-component.adoc | 2 +-
components/camel-grape/pom.xml | 5 +-
components/camel-graphql/pom.xml | 4 +-
components/camel-grok/pom.xml | 147 +-
components/camel-groovy/pom.xml | 5 +-
.../src/main/docs/groovy-language.adoc | 2 +-
components/camel-grpc/pom.xml | 5 +-
.../camel-grpc/src/main/docs/grpc-component.adoc | 2 +-
components/camel-gson/pom.xml | 5 +-
.../src/main/docs/json-gson-dataformat.adoc | 2 +-
components/camel-guava-eventbus/pom.xml | 5 +-
.../src/main/docs/guava-eventbus-component.adoc | 2 +-
components/camel-hazelcast/pom.xml | 5 +-
.../main/docs/hazelcast-atomicvalue-component.adoc | 2 +-
.../main/docs/hazelcast-instance-component.adoc | 2 +-
.../src/main/docs/hazelcast-list-component.adoc | 2 +-
.../src/main/docs/hazelcast-map-component.adoc | 2 +-
.../main/docs/hazelcast-multimap-component.adoc | 2 +-
.../src/main/docs/hazelcast-queue-component.adoc | 2 +-
.../docs/hazelcast-replicatedmap-component.adoc | 2 +-
.../main/docs/hazelcast-ringbuffer-component.adoc | 2 +-
.../src/main/docs/hazelcast-seda-component.adoc | 2 +-
.../src/main/docs/hazelcast-set-component.adoc | 2 +-
.../src/main/docs/hazelcast-topic-component.adoc | 2 +-
components/camel-hbase/pom.xml | 5 +-
.../camel-hbase/src/main/docs/hbase-component.adoc | 2 +-
components/camel-hdfs/pom.xml | 5 +-
.../camel-hdfs/src/main/docs/hdfs-component.adoc | 3 +-
.../camel/component/hdfs/DefaultHdfsFile.java | 13 +-
.../component/hdfs/HdfsArrayFileTypeHandler.java | 16 +-
...leHandler.java => HdfsBloomMapFileHandler.java} | 19 +-
.../camel/component/hdfs/HdfsConfiguration.java | 17 +
.../apache/camel/component/hdfs/HdfsConstants.java | 2 +
.../apache/camel/component/hdfs/HdfsConsumer.java | 87 +-
.../apache/camel/component/hdfs/HdfsFileType.java | 4 +-
.../camel/component/hdfs/HdfsInputStream.java | 69 +-
.../camel/component/hdfs/HdfsMapFileHandler.java | 18 +-
.../component/hdfs/HdfsNormalFileHandler.java | 9 +-
.../component/hdfs/HdfsSequenceFileHandler.java | 24 +-
.../component/hdfs/HdfsWritableFactories.java | 44 +-
.../org/apache/camel/component/hdfs/Holder.java | 10 +-
.../camel/component/hdfs/HdfsConsumerTest.java | 8 +-
.../camel/component/hdfs/HdfsInputStreamTest.java | 7 +
components/camel-hipchat/pom.xml | 5 +-
.../src/main/docs/hipchat-component.adoc | 2 +-
components/camel-hl7/pom.xml | 5 +-
.../camel-hl7/src/main/docs/hl7-dataformat.adoc | 2 +-
.../src/main/docs/hl7terser-language.adoc | 2 +-
components/camel-http-common/pom.xml | 5 +-
components/camel-http/pom.xml | 5 +-
components/camel-hystrix/pom.xml | 5 +-
components/camel-ical/pom.xml | 5 +-
.../camel-ical/src/main/docs/ical-dataformat.adoc | 2 +-
components/camel-iec60870/pom.xml | 5 +-
components/camel-ignite/pom.xml | 5 +-
.../src/main/docs/ignite-cache-component.adoc | 2 +-
.../src/main/docs/ignite-compute-component.adoc | 2 +-
.../src/main/docs/ignite-events-component.adoc | 2 +-
.../src/main/docs/ignite-idgen-component.adoc | 2 +-
.../src/main/docs/ignite-messaging-component.adoc | 2 +-
.../src/main/docs/ignite-queue-component.adoc | 2 +-
.../src/main/docs/ignite-set-component.adoc | 2 +-
components/camel-infinispan/pom.xml | 5 +-
.../src/main/docs/infinispan-component.adoc | 2 +-
components/camel-influxdb/pom.xml | 5 +-
.../src/main/docs/influxdb-component.adoc | 2 +-
components/camel-iota/pom.xml | 5 +-
.../camel-iota/src/main/docs/iota-component.adoc | 47 +-
.../apache/camel/component/iota/IOTAConstants.java | 2 +-
.../apache/camel/component/iota/IOTAEndpoint.java | 32 +-
.../apache/camel/component/iota/IOTAProducer.java | 29 +-
.../camel/component/iota/IOTAProducerTest.java | 4 +-
.../src/test/resources/log4j2.properties | 2 +-
components/camel-ipfs/pom.xml | 5 +-
components/camel-irc/pom.xml | 5 +-
.../camel-irc/src/main/docs/irc-component.adoc | 2 +-
components/camel-ironmq/pom.xml | 5 +-
.../src/main/docs/ironmq-component.adoc | 2 +-
components/camel-jackson/pom.xml | 5 +-
.../src/main/docs/json-jackson-dataformat.adoc | 2 +-
components/camel-jacksonxml/pom.xml | 5 +-
.../src/main/docs/jacksonxml-dataformat.adoc | 2 +-
components/camel-jasypt/pom.xml | 7 +-
components/camel-jaxb/pom.xml | 5 +-
.../camel-jaxb/src/main/docs/jaxb-dataformat.adoc | 2 +-
components/camel-jbpm/pom.xml | 5 +-
.../camel-jbpm/src/main/docs/jbpm-component.adoc | 2 +-
components/camel-jcache/pom.xml | 5 +-
.../src/main/docs/jcache-component.adoc | 2 +-
components/camel-jclouds/pom.xml | 5 +-
components/camel-jcr/pom.xml | 5 +-
.../camel-jcr/src/main/docs/jcr-component.adoc | 2 +-
components/camel-jdbc/pom.xml | 5 +-
.../camel-jdbc/src/main/docs/jdbc-component.adoc | 2 +-
components/camel-jetty-common/pom.xml | 5 +-
components/camel-jetty/pom.xml | 5 +-
.../component/jetty/JettyThreadPoolSizeTest.java | 2 +
components/camel-jgroups-raft/pom.xml | 5 +-
.../src/main/docs/jgroups-raft-component.adoc | 2 +-
components/camel-jgroups/pom.xml | 5 +-
.../src/main/docs/jgroups-component.adoc | 2 +-
components/camel-jing/pom.xml | 5 +-
.../camel-jing/src/main/docs/jing-component.adoc | 2 +-
components/camel-jira/pom.xml | 5 +-
components/camel-jms/pom.xml | 5 +-
.../camel-jms/src/main/docs/jms-component.adoc | 102 +-
.../apache/camel/component/jms/JmsComponent.java | 98 +-
components/camel-jmx/pom.xml | 5 +-
.../camel-jmx/src/main/docs/jmx-component.adoc | 2 +-
components/camel-johnzon/pom.xml | 5 +-
.../src/main/docs/json-johnzon-dataformat.adoc | 2 +-
components/camel-jolt/pom.xml | 5 +-
.../camel-jolt/src/main/docs/jolt-component.adoc | 2 +-
components/camel-jooq/pom.xml | 5 +-
components/camel-jpa/pom.xml | 7 +-
.../camel-jpa/src/main/docs/jpa-component.adoc | 2 +-
components/camel-jsch/pom.xml | 5 +-
.../camel-jsch/src/main/docs/scp-component.adoc | 2 +-
components/camel-json-validator/pom.xml | 5 +-
components/camel-jsonapi/pom.xml | 5 +-
components/camel-jsonpath/pom.xml | 7 +-
.../src/main/docs/jsonpath-language.adoc | 2 +-
.../jsonpath/JsonPathBeanStreamCachingTest.java | 4 +-
.../JsonPathBeanSuppressExceptionsTest.java | 4 +-
.../apache/camel/jsonpath/JsonPathBeanTest.java | 4 +-
.../org/apache/camel/jsonpath/JsonPathCBRTest.java | 4 +-
.../apache/camel/jsonpath/JsonPathCharsetTest.java | 15 +-
.../camel/jsonpath/JsonPathHeaderNameTest.java | 4 +-
.../camel/jsonpath/JsonPathLanguageTest.java | 22 +-
.../camel/jsonpath/JsonPathMapTransformTest.java | 7 +-
.../camel/jsonpath/JsonPathMockMatchesTest.java | 4 +-
.../camel/jsonpath/JsonPathPojoTransformTest.java | 4 +-
.../apache/camel/jsonpath/JsonPathSourceTest.java | 8 +-
.../apache/camel/jsonpath/JsonPathSplitTest.java | 8 +-
.../JsonPathSplitWriteAsStringMapTest.java | 6 +-
.../jsonpath/JsonPathSplitWriteAsStringTest.java | 4 +-
.../camel/jsonpath/JsonPathSuppressTest.java | 4 +-
.../jsonpath/JsonPathTransformHeaderNameTest.java | 6 +-
.../jsonpath/JsonPathTransformResultTypeTest.java | 4 +-
.../camel/jsonpath/JsonPathTransformTest.java | 6 +-
.../camel/jsonpath/JsonPathWithSimpleCBRTest.java | 4 +-
.../org/apache/camel/jsonpath/JsonStreamTest.java | 14 +-
.../camel/jsonpath/SpringJsonPathCBRTest.java | 4 +-
.../SpringJsonPathSplitWriteAsStringTest.java | 4 +-
.../camel/jsonpath/SpringJsonPathSuppressTest.java | 4 +-
.../SpringJsonPathTransformHeaderNameTest.java | 6 +-
.../SpringJsonPathTransformResultTypeTest.java | 4 +-
.../jsonpath/SpringJsonPathTransformTest.java | 6 +-
.../EasyJsonPathWithRootSimpleCBRTest.java | 4 +-
.../EasyJsonPathWithSimpleCBRTest.java | 4 +-
components/camel-jt400/pom.xml | 5 +-
.../camel-jt400/src/main/docs/jt400-component.adoc | 2 +-
components/camel-kafka/pom.xml | 5 +-
.../camel-kafka/src/main/docs/kafka-component.adoc | 2 +-
components/camel-kubernetes/pom.xml | 5 +-
components/camel-kudu/pom.xml | 6 +-
components/camel-kura/pom.xml | 5 +-
components/camel-language/pom.xml | 5 +-
components/camel-ldap/pom.xml | 5 +-
.../camel-ldap/src/main/docs/ldap-component.adoc | 2 +-
components/camel-ldif/pom.xml | 5 +-
components/camel-leveldb/pom.xml | 5 +-
components/camel-log/pom.xml | 5 +-
components/camel-lra/pom.xml | 5 +-
components/camel-lucene/pom.xml | 5 +-
.../src/main/docs/lucene-component.adoc | 2 +-
components/camel-lumberjack/pom.xml | 6 +-
.../src/main/docs/lumberjack-component.adoc | 2 +-
components/camel-lzf/pom.xml | 5 +-
.../camel-lzf/src/main/docs/lzf-dataformat.adoc | 2 +-
components/camel-mail/pom.xml | 5 +-
.../camel-mail/src/main/docs/mail-component.adoc | 4 +-
components/camel-master/pom.xml | 5 +-
components/camel-metrics/pom.xml | 5 +-
.../src/main/docs/metrics-component.adoc | 30 +-
components/camel-micrometer/pom.xml | 5 +-
.../src/main/docs/micrometer-component.adoc | 12 +-
components/camel-microprofile-config/pom.xml | 5 +-
components/camel-microprofile-health/pom.xml | 4 +-
components/camel-microprofile-metrics/pom.xml | 4 +-
.../metrics/MicroProfileMetricsComponent.java | 13 +
.../metrics/MicroProfileMetricsHelper.java | 7 +
...croProfileMetricsCamelContextEventNotifier.java | 20 +
.../MicroProfileMetricsExchangeEventNotifier.java | 23 +
.../MicroProfileMetricsRouteEventNotifier.java | 37 +-
.../MicroProfileMetricsMessageHistoryFactory.java | 14 +
.../policy/MicroProfileMetricsRoutePolicy.java | 19 +
...rofileMetricsCamelContextEventNotifierTest.java | 14 +-
...croProfileMetricsExchangeEventNotifierTest.java | 14 +-
.../MicroProfileMetricsRouteEventNotifierTest.java | 13 +-
.../MicroProfileMetricsMessageHistoryTest.java | 14 +-
.../policy/MicroProfileMetricsRoutePolicyTest.java | 19 +
components/camel-milo/pom.xml | 5 +-
.../src/main/docs/milo-client-component.adoc | 2 +-
.../src/main/docs/milo-server-component.adoc | 2 +-
components/camel-mina/pom.xml | 5 +-
components/camel-mllp/pom.xml | 6 +-
.../camel-mllp/src/main/docs/mllp-component.adoc | 2 +-
components/camel-mock/pom.xml | 5 +-
components/camel-mongodb-gridfs/pom.xml | 5 +-
.../src/main/docs/mongodb-gridfs-component.adoc | 2 +-
components/camel-mongodb/pom.xml | 5 +-
components/camel-msv/pom.xml | 5 +-
.../camel-msv/src/main/docs/msv-component.adoc | 2 +-
components/camel-mustache/pom.xml | 5 +-
.../src/main/docs/mustache-component.adoc | 2 +-
components/camel-mvel/pom.xml | 5 +-
.../camel-mvel/src/main/docs/mvel-component.adoc | 4 +-
.../camel-mvel/src/main/docs/mvel-language.adoc | 4 +-
components/camel-mybatis/pom.xml | 5 +-
.../src/main/docs/mybatis-component.adoc | 2 +-
components/camel-nagios/pom.xml | 5 +-
.../src/main/docs/nagios-component.adoc | 2 +-
components/camel-nats/pom.xml | 5 +-
.../camel-nats/src/main/docs/nats-component.adoc | 2 +-
components/camel-netty-http/pom.xml | 5 +-
.../src/main/docs/netty-http-component.adoc | 10 +-
.../netty/http/NettyHttpConfiguration.java | 13 +
.../http/handlers/HttpServerChannelHandler.java | 17 +
components/camel-netty/pom.xml | 5 +-
.../camel-netty/src/main/docs/netty-component.adoc | 8 +-
.../apache/camel/component/netty/NettyHelper.java | 1 -
.../netty/NettyServerBootstrapConfiguration.java | 6 +-
.../component/netty/NettyWorkerPoolBuilder.java | 5 +-
components/camel-nitrite/pom.xml | 2 +-
components/camel-nsq/pom.xml | 6 +-
components/camel-ognl/pom.xml | 5 +-
.../camel-ognl/src/main/docs/ognl-language.adoc | 2 +-
components/camel-olingo2/camel-olingo2-api/pom.xml | 5 +-
.../camel-olingo2/camel-olingo2-component/pom.xml | 9 +-
.../src/main/docs/olingo2-component.adoc | 2 +-
.../camel/component/olingo2/Olingo2AppWrapper.java | 4 +-
.../camel/component/olingo2/Olingo2Endpoint.java | 3 +-
components/camel-olingo2/pom.xml | 5 +-
components/camel-olingo4/camel-olingo4-api/pom.xml | 5 +-
.../camel-olingo4/camel-olingo4-component/pom.xml | 10 +-
.../src/main/docs/olingo4-component.adoc | 2 +-
components/camel-olingo4/pom.xml | 5 +-
components/camel-openstack/pom.xml | 6 +-
.../src/main/docs/openstack-cinder-component.adoc | 2 +-
.../src/main/docs/openstack-glance-component.adoc | 2 +-
.../main/docs/openstack-keystone-component.adoc | 2 +-
.../src/main/docs/openstack-neutron-component.adoc | 2 +-
.../src/main/docs/openstack-nova-component.adoc | 2 +-
.../src/main/docs/openstack-swift-component.adoc | 2 +-
components/camel-opentracing/pom.xml | 5 +-
components/camel-optaplanner/pom.xml | 9 +-
.../src/main/docs/optaplanner-component.adoc | 2 +-
components/camel-paho/pom.xml | 5 +-
.../camel-paho/src/main/docs/paho-component.adoc | 2 +-
.../apache/camel/component/paho/PahoConsumer.java | 34 +-
components/camel-paxlogging/pom.xml | 5 +-
components/camel-pdf/pom.xml | 5 +-
.../camel-pdf/src/main/docs/pdf-component.adoc | 2 +-
components/camel-pg-replication-slot/pom.xml | 2 +-
.../main/docs/pg-replication-slot-component.adoc | 2 +-
components/camel-pgevent/pom.xml | 5 +-
.../src/main/docs/pgevent-component.adoc | 2 +-
.../pom.xml | 19 +-
.../src/main/docs/platform-http-component.adoc} | 66 +-
.../platform/http/PlatformHttpComponent.java | 162 +++
.../platform/http/PlatformHttpConstants.java} | 17 +-
.../platform/http/PlatformHttpEndpoint.java | 153 ++
.../http/PlatformHttpHeaderFilterStrategy.java | 55 +
.../camel/component/platform/http/spi/Method.java | 74 +
.../platform/http/spi/PlatformHttpEngine.java | 22 +-
components/camel-printer/pom.xml | 5 +-
.../camel-printer/src/main/docs/lpr-component.adoc | 2 +-
components/camel-protobuf/pom.xml | 5 +-
.../src/main/docs/protobuf-dataformat.adoc | 6 +-
.../dataformat/protobuf/ProtobufConverter.java | 72 +-
.../dataformat/protobuf/ProtobufDataFormat.java | 10 +-
.../protobuf/ProtobufTypeConverter.java} | 25 +-
.../dataformat/protobuf/ProtobufConverterTest.java | 41 +-
.../ProtobufMarshalAndUnmarshalMapTest.java | 5 +-
components/camel-pubnub/pom.xml | 5 +-
.../src/main/docs/pubnub-component.adoc | 2 +-
components/camel-pulsar/pom.xml | 6 +-
components/camel-quartz/pom.xml | 5 +-
components/camel-quickfix/pom.xml | 5 +-
.../src/main/docs/quickfix-component.adoc | 2 +-
components/camel-rabbitmq/pom.xml | 5 +-
.../src/main/docs/rabbitmq-component.adoc | 4 +-
components/camel-reactive-executor-vertx/pom.xml | 5 +-
components/camel-reactive-streams/pom.xml | 5 +-
.../src/main/docs/reactive-streams-component.adoc | 2 +-
.../engine/DefaultCamelReactiveStreamsService.java | 4 +-
.../streams/util/ConvertingSubscriber.java | 8 +-
components/camel-reactor/pom.xml | 5 +-
.../reactor/engine/ReactorStreamsService.java | 4 +-
components/camel-ref/pom.xml | 5 +-
components/camel-resilience4j/pom.xml | 5 +-
.../resilience4j/ResilienceProcessor.java | 26 +-
.../resilience4j/ResilienceProcessorFactory.java | 3 +-
.../component/resilience4j/ResilienceReifier.java | 13 +-
.../ResilienceExistingCircuitBreakerTest.java | 11 +-
.../ResilienceInheritErrorHandlerTest.java | 13 +-
.../resilience4j/ResilienceManagementTest.java | 30 +-
.../ResilienceRouteBulkheadFallbackTest.java | 11 +-
.../ResilienceRouteBulkheadOkTest.java | 16 +-
.../resilience4j/ResilienceRouteFallbackTest.java | 11 +-
.../ResilienceRouteFallbackViaNetworkTest.java | 11 +-
.../resilience4j/ResilienceRouteOkTest.java | 15 +-
.../resilience4j/ResilienceRouteRejectedTest.java | 13 +-
.../resilience4j/ResilienceTimeoutTest.java | 29 +-
.../ResilienceTimeoutThreadPoolTest.java | 30 +-
.../ResilienceTimeoutWithFallbackTest.java | 35 +-
components/camel-rest-swagger/pom.xml | 5 +-
.../src/main/docs/rest-swagger-component.adoc | 2 +-
components/camel-rest/pom.xml | 5 +-
components/camel-ribbon/pom.xml | 5 +-
components/camel-robotframework/pom.xml | 2 +-
components/camel-rss/pom.xml | 5 +-
.../camel-rss/src/main/docs/rss-component.adoc | 4 +-
.../camel-rss/src/main/docs/rss-dataformat.adoc | 4 +-
components/camel-rxjava/pom.xml | 5 +-
.../rxjava/engine/RxJavaStreamsService.java | 4 +-
components/camel-saga/pom.xml | 5 +-
.../camel-salesforce-component/pom.xml | 49 +-
.../src/main/docs/salesforce-component.adoc | 2 +-
.../camel-salesforce-maven-plugin/pom.xml | 9 +-
components/camel-salesforce/pom.xml | 5 +-
components/camel-sap-netweaver/pom.xml | 5 +-
.../src/main/docs/sap-netweaver-component.adoc | 2 +-
components/camel-saxon/pom.xml | 5 +-
.../src/main/docs/xquery-component.adoc | 4 +-
.../camel-saxon/src/main/docs/xquery-language.adoc | 4 +-
components/camel-scheduler/pom.xml | 5 +-
components/camel-schematron/pom.xml | 5 +-
.../src/main/docs/schematron-component.adoc | 2 +-
components/camel-seda/pom.xml | 5 +-
.../camel-seda/src/main/docs/seda-component.adoc | 6 +-
.../apache/camel/component/seda/SedaComponent.java | 19 +
.../apache/camel/component/seda/SedaEndpoint.java | 25 +-
.../apache/camel/component/seda/SedaProducer.java | 24 +-
components/camel-service/pom.xml | 5 +-
.../camel-servicenow-component/pom.xml | 5 +-
.../src/main/docs/servicenow-component.adoc | 2 +-
.../camel-servicenow-maven-plugin/pom.xml | 9 +-
components/camel-servicenow/pom.xml | 5 +-
components/camel-servlet/pom.xml | 5 +-
.../src/main/docs/servlet-component.adoc | 2 +-
components/camel-shiro/pom.xml | 5 +-
components/camel-sip/pom.xml | 5 +-
.../camel-sip/src/main/docs/sip-component.adoc | 2 +-
components/camel-sjms/pom.xml | 5 +-
.../src/main/docs/sjms-batch-component.adoc | 2 +-
.../camel-sjms/src/main/docs/sjms-component.adoc | 2 +-
components/camel-sjms2/pom.xml | 5 +-
.../camel-sjms2/src/main/docs/sjms2-component.adoc | 2 +-
components/camel-slack/pom.xml | 5 +-
.../camel-slack/src/main/docs/slack-component.adoc | 2 +-
components/camel-smpp/pom.xml | 5 +-
.../camel-smpp/src/main/docs/smpp-component.adoc | 2 +-
components/camel-snakeyaml/pom.xml | 5 +-
.../src/main/docs/yaml-snakeyaml-dataformat.adoc | 2 +-
components/camel-snmp/pom.xml | 5 +-
.../camel-snmp/src/main/docs/snmp-component.adoc | 2 +-
components/camel-soap/pom.xml | 5 +-
.../src/main/docs/soapjaxb-dataformat.adoc | 2 +-
components/camel-solr/pom.xml | 7 +-
.../camel-solr/src/main/docs/solr-component.adoc | 2 +-
components/camel-soroush/pom.xml | 5 +-
components/camel-spark-rest/pom.xml | 5 +-
components/camel-spark/pom.xml | 5 +-
.../camel-spark/src/main/docs/spark-component.adoc | 2 +-
components/camel-splunk/pom.xml | 5 +-
.../src/main/docs/splunk-component.adoc | 2 +-
components/camel-spring-batch/pom.xml | 5 +-
.../src/main/docs/spring-batch-component.adoc | 2 +-
components/camel-spring-boot/pom.xml | 7 +-
.../boot/CamelSpringBootApplicationController.java | 3 +
.../SupervisingRouteControllerRestartTest.java | 12 +-
.../boot/SupervisingRouteControllerTest.java | 17 +-
components/camel-spring-cloud-consul/pom.xml | 7 +-
components/camel-spring-cloud-netflix/pom.xml | 7 +-
components/camel-spring-cloud-zookeeper/pom.xml | 7 +-
components/camel-spring-cloud/pom.xml | 7 +-
components/camel-spring-integration/pom.xml | 5 +-
.../main/docs/spring-integration-component.adoc | 2 +-
.../src/main/resources/META-INF/spring.schemas | 1 +
components/camel-spring-javaconfig/pom.xml | 5 +-
components/camel-spring-ldap/pom.xml | 5 +-
.../src/main/docs/spring-ldap-component.adoc | 2 +-
components/camel-spring-redis/pom.xml | 5 +-
.../src/main/docs/spring-redis-component.adoc | 2 +-
components/camel-spring-security/pom.xml | 5 +-
.../src/main/resources/META-INF/spring.schemas | 1 +
components/camel-spring-ws/pom.xml | 5 +-
.../src/main/docs/spring-ws-component.adoc | 2 +-
components/camel-spring/pom.xml | 114 +-
.../src/main/docs/spring-event-component.adoc | 4 +-
.../src/main/resources/META-INF/spring.schemas | 1 +
.../ConsumerTemplateMaximumCacheSizeTest.java | 6 +-
components/camel-sql/pom.xml | 5 +-
.../camel-sql/src/main/docs/sql-component.adoc | 2 +-
.../src/main/docs/sql-stored-component.adoc | 2 +-
components/camel-ssh/pom.xml | 5 +-
.../camel-ssh/src/main/docs/ssh-component.adoc | 2 +-
components/camel-stax/pom.xml | 5 +-
.../camel-stax/src/main/docs/stax-component.adoc | 2 +-
.../component/stax/IssueWithWrongEncodingTest.java | 28 +-
.../src/test/resources/products_with_non_utf8.xml | 27 -
components/camel-stomp/pom.xml | 5 +-
.../camel-stomp/src/main/docs/stomp-component.adoc | 11 +-
.../camel/component/stomp/StompConfiguration.java | 13 +
.../camel/component/stomp/StompEndpoint.java | 3 +
components/camel-stream/pom.xml | 5 +-
.../src/main/docs/stream-component.adoc | 2 +-
components/camel-stringtemplate/pom.xml | 5 +-
.../src/main/docs/string-template-component.adoc | 2 +-
components/camel-stub/pom.xml | 5 +-
.../camel-stub/src/main/docs/stub-component.adoc | 6 +-
.../apache/camel/component/stub/StubEndpoint.java | 2 +-
.../apache/camel/component/stub/StubProducer.java | 5 +-
components/camel-swagger-java/pom.xml | 5 +-
components/camel-syslog/pom.xml | 5 +-
.../src/main/docs/syslog-dataformat.adoc | 2 +-
components/camel-tagsoup/pom.xml | 5 +-
.../src/main/docs/tidyMarkup-dataformat.adoc | 2 +-
components/camel-tarfile/pom.xml | 5 +-
.../src/main/docs/tarfile-dataformat.adoc | 2 +-
components/camel-telegram/pom.xml | 5 +-
.../src/main/docs/telegram-component.adoc | 2 +-
components/camel-test-blueprint/pom.xml | 5 +-
components/camel-test-cdi/pom.xml | 5 +-
components/camel-test-junit5/pom.xml | 6 +-
.../src/main/docs/test-junit5.adoc | 2 +
components/camel-test-karaf/pom.xml | 9 +-
components/camel-test-spring-junit5/pom.xml | 5 +-
components/camel-test-spring/pom.xml | 5 +-
components/camel-test/pom.xml | 5 +-
components/camel-testcontainers-junit5/pom.xml | 5 +-
.../camel-testcontainers-spring-junit5/pom.xml | 5 +-
components/camel-testcontainers-spring/pom.xml | 5 +-
components/camel-testcontainers/pom.xml | 5 +-
components/camel-thrift/pom.xml | 5 +-
components/camel-tika/pom.xml | 5 +-
.../camel-tika/src/main/docs/tika-component.adoc | 2 +-
components/camel-timer/pom.xml | 5 +-
components/camel-twilio/pom.xml | 5 +-
.../src/main/docs/twilio-component.adoc | 2 +-
components/camel-twitter/pom.xml | 5 +-
components/camel-undertow/pom.xml | 5 +-
.../src/main/docs/undertow-component.adoc | 2 +-
components/camel-univocity-parsers/pom.xml | 5 +-
.../src/main/docs/univocity-csv-dataformat.adoc | 2 +-
.../src/main/docs/univocity-fixed-dataformat.adoc | 2 +-
.../src/main/docs/univocity-tsv-dataformat.adoc | 2 +-
components/camel-validator/pom.xml | 5 +-
components/camel-velocity/pom.xml | 5 +-
.../src/main/docs/velocity-component.adoc | 2 +-
components/camel-vertx/pom.xml | 5 +-
.../camel-vertx/src/main/docs/vertx-component.adoc | 2 +-
components/camel-vm/pom.xml | 5 +-
.../camel-vm/src/main/docs/vm-component.adoc | 6 +-
components/camel-weather/pom.xml | 5 +-
.../src/main/docs/weather-component.adoc | 2 +-
components/camel-web3j/pom.xml | 5 +-
.../camel-web3j/src/main/docs/web3j-component.adoc | 2 +-
components/camel-webhook/pom.xml | 6 +-
components/camel-websocket-jsr356/pom.xml | 8 +-
components/camel-websocket/pom.xml | 5 +-
.../src/main/docs/websocket-component.adoc | 2 +-
components/camel-wordpress/pom.xml | 5 +-
components/camel-xchange/pom.xml | 5 +-
components/camel-xj/pom.xml | 6 +-
.../camel-xj/src/main/docs/xj-component.adoc | 11 +-
components/camel-xmlsecurity/pom.xml | 5 +-
.../src/main/docs/xmlsecurity-component.adoc | 4 +-
components/camel-xmpp/pom.xml | 5 +-
.../camel-xmpp/src/main/docs/xmpp-component.adoc | 2 +-
.../component/xmpp/XmppPrivateChatProducer.java | 6 +-
components/camel-xpath/pom.xml | 5 +-
components/camel-xslt-saxon/pom.xml | 5 +-
.../src/main/docs/xslt-saxon-component.adoc | 11 +-
components/camel-xslt/pom.xml | 5 +-
.../camel-xslt/src/main/docs/xslt-component.adoc | 11 +-
.../TransformerFactoryConfigurationStrategy.java} | 16 +-
.../apache/camel/component/xslt/XsltComponent.java | 27 +
.../apache/camel/component/xslt/XsltEndpoint.java | 36 +-
components/camel-xstream/pom.xml | 5 +-
.../src/main/docs/xstream-dataformat.adoc | 4 +-
components/camel-yammer/pom.xml | 5 +-
.../src/main/docs/yammer-component.adoc | 2 +-
components/camel-zendesk/pom.xml | 7 +-
.../src/main/docs/zendesk-component.adoc | 2 +-
components/camel-zip-deflater/pom.xml | 5 +-
components/camel-zipfile/pom.xml | 5 +-
.../src/main/docs/zipfile-dataformat.adoc | 2 +-
components/camel-zipkin/pom.xml | 5 +-
components/camel-zookeeper-master/pom.xml | 15 +-
.../src/main/docs/zookeeper-master-component.adoc | 2 +-
components/camel-zookeeper/pom.xml | 16 +-
.../src/main/docs/zookeeper-component.adoc | 2 +-
components/pom.xml | 6 +-
core/camel-api/pom.xml | 5 +-
.../support/jsse/BaseSSLContextParameters.java | 2 +-
core/camel-base/pom.xml | 5 +-
core/camel-caffeine-lrucache/pom.xml | 5 +-
core/camel-cloud/pom.xml | 5 +-
core/camel-core-engine/pom.xml | 7 +-
.../src/main/docs/eips/loadBalance-eip.adoc | 1 -
.../camel/builder/AdviceWithRouteBuilder.java | 14 +-
.../model/Resilience4jConfigurationCommon.java | 1 +
.../model/Resilience4jConfigurationDefinition.java | 1 +
core/camel-core-osgi/pom.xml | 5 +-
core/camel-core-xml/pom.xml | 5 +-
core/camel-core/pom.xml | 5 +-
.../seda/SedaDefaultDiscardWhenFullTest.java | 38 +-
.../component/seda/SedaDiscardWhenFullTest.java | 35 +-
core/camel-endpointdsl/pom.xml | 5 +-
.../builder/endpoint/EndpointBuilderFactory.java | 17 +
.../endpoint/dsl/ECSEndpointBuilderFactory.java | 4 +-
.../endpoint/dsl/EKSEndpointBuilderFactory.java | 4 +-
.../endpoint/dsl/HdfsEndpointBuilderFactory.java | 36 +
.../endpoint/dsl/IOTAEndpointBuilderFactory.java | 544 +------
.../endpoint/dsl/MSKEndpointBuilderFactory.java | 4 +-
.../endpoint/dsl/NettyEndpointBuilderFactory.java | 28 +-
.../dsl/NettyHttpEndpointBuilderFactory.java | 54 +-
.../dsl/PlatformHttpEndpointBuilderFactory.java | 331 +++++
.../endpoint/dsl/S3EndpointBuilderFactory.java | 3 +-
.../endpoint/dsl/SedaEndpointBuilderFactory.java | 32 +
.../endpoint/dsl/StompEndpointBuilderFactory.java | 33 +
.../endpoint/dsl/StubEndpointBuilderFactory.java | 32 +
.../endpoint/dsl/VmEndpointBuilderFactory.java | 31 +
.../endpoint/dsl/XJEndpointBuilderFactory.java | 28 +
.../endpoint/dsl/XsltEndpointBuilderFactory.java | 28 +
.../dsl/XsltSaxonEndpointBuilderFactory.java | 28 +
core/camel-headersmap/pom.xml | 5 +-
core/camel-jaxp/pom.xml | 5 +-
core/camel-main/pom.xml | 5 +-
.../org/apache/camel/main/BaseMainSupport.java | 5 +
.../test/java/org/apache/camel/main/MainTest.java | 12 +
.../src/test/resources/application.properties | 5 +-
core/camel-management-api/pom.xml | 5 +-
core/camel-management/pom.xml | 5 +-
core/camel-support/pom.xml | 5 +-
.../camel/support/PropertyBindingSupport.java | 2 +-
core/camel-util/pom.xml | 5 +-
core/pom.xml | 5 +-
docs/components/modules/ROOT/nav.adoc | 1 +
.../modules/ROOT/pages/activemq-component.adoc | 22 +-
.../modules/ROOT/pages/ahc-component.adoc | 2 +-
.../modules/ROOT/pages/ahc-ws-component.adoc | 2 +-
.../modules/ROOT/pages/amqp-component.adoc | 12 +-
.../modules/ROOT/pages/apns-component.adoc | 2 +-
.../modules/ROOT/pages/asterisk-component.adoc | 2 +-
.../modules/ROOT/pages/atmos-component.adoc | 2 +-
.../ROOT/pages/atmosphere-websocket-component.adoc | 2 +-
.../modules/ROOT/pages/atom-component.adoc | 2 +-
.../modules/ROOT/pages/avro-component.adoc | 4 +-
.../modules/ROOT/pages/avro-dataformat.adoc | 4 +-
.../modules/ROOT/pages/aws-s3-component.adoc | 20 +
.../modules/ROOT/pages/azure-blob-component.adoc | 2 +-
.../modules/ROOT/pages/azure-queue-component.adoc | 2 +-
.../modules/ROOT/pages/barcode-dataformat.adoc | 2 +-
.../modules/ROOT/pages/base64-dataformat.adoc | 2 +-
.../ROOT/pages/bean-validator-component.adoc | 2 +-
.../modules/ROOT/pages/beanio-dataformat.adoc | 2 +-
.../modules/ROOT/pages/beanstalk-component.adoc | 2 +-
.../modules/ROOT/pages/bindy-dataformat.adoc | 6 +-
.../modules/ROOT/pages/bonita-component.adoc | 2 +-
.../modules/ROOT/pages/box-component.adoc | 2 +-
.../modules/ROOT/pages/braintree-component.adoc | 2 +-
.../modules/ROOT/pages/chunk-component.adoc | 2 +-
.../modules/ROOT/pages/cm-sms-component.adoc | 2 +-
.../modules/ROOT/pages/cmis-component.adoc | 2 +-
.../modules/ROOT/pages/coap-component.adoc | 2 +-
.../modules/ROOT/pages/cometd-component.adoc | 2 +-
.../modules/ROOT/pages/consul-component.adoc | 2 +-
.../modules/ROOT/pages/corda-component.adoc | 2 +-
.../modules/ROOT/pages/couchbase-component.adoc | 2 +-
.../modules/ROOT/pages/couchdb-component.adoc | 2 +-
.../modules/ROOT/pages/cql-component.adoc | 2 +-
.../modules/ROOT/pages/crypto-component.adoc | 4 +-
.../modules/ROOT/pages/crypto-dataformat.adoc | 4 +-
.../modules/ROOT/pages/csv-dataformat.adoc | 2 +-
.../modules/ROOT/pages/cxf-component.adoc | 2 +-
.../modules/ROOT/pages/cxfrs-component.adoc | 2 +-
.../modules/ROOT/pages/digitalocean-component.adoc | 2 +-
.../modules/ROOT/pages/disruptor-component.adoc | 4 +-
.../modules/ROOT/pages/dns-component.adoc | 2 +-
.../modules/ROOT/pages/docker-component.adoc | 2 +-
.../modules/ROOT/pages/dozer-component.adoc | 2 +-
.../modules/ROOT/pages/drill-component.adoc | 2 +-
.../modules/ROOT/pages/dropbox-component.adoc | 2 +-
.../modules/ROOT/pages/ehcache-component.adoc | 2 +-
.../modules/ROOT/pages/elsql-component.adoc | 2 +-
.../modules/ROOT/pages/etcd-component.adoc | 2 +-
.../modules/ROOT/pages/exec-component.adoc | 2 +-
.../modules/ROOT/pages/facebook-component.adoc | 2 +-
.../modules/ROOT/pages/flatpack-component.adoc | 4 +-
.../modules/ROOT/pages/flatpack-dataformat.adoc | 4 +-
.../modules/ROOT/pages/flink-component.adoc | 2 +-
.../modules/ROOT/pages/fop-component.adoc | 2 +-
.../modules/ROOT/pages/freemarker-component.adoc | 2 +-
.../modules/ROOT/pages/ftp-component.adoc | 2 +-
.../modules/ROOT/pages/ftps-component.adoc | 2 +-
.../modules/ROOT/pages/ganglia-component.adoc | 2 +-
.../modules/ROOT/pages/geocoder-component.adoc | 2 +-
.../modules/ROOT/pages/git-component.adoc | 2 +-
.../modules/ROOT/pages/github-component.adoc | 2 +-
.../ROOT/pages/google-calendar-component.adoc | 2 +-
.../modules/ROOT/pages/google-drive-component.adoc | 2 +-
.../modules/ROOT/pages/google-mail-component.adoc | 2 +-
.../ROOT/pages/google-pubsub-component.adoc | 2 +-
.../modules/ROOT/pages/gora-component.adoc | 2 +-
.../modules/ROOT/pages/groovy-language.adoc | 2 +-
.../modules/ROOT/pages/grpc-component.adoc | 2 +-
.../ROOT/pages/guava-eventbus-component.adoc | 2 +-
.../pages/hazelcast-atomicvalue-component.adoc | 2 +-
.../ROOT/pages/hazelcast-instance-component.adoc | 2 +-
.../ROOT/pages/hazelcast-list-component.adoc | 2 +-
.../ROOT/pages/hazelcast-map-component.adoc | 2 +-
.../ROOT/pages/hazelcast-multimap-component.adoc | 2 +-
.../ROOT/pages/hazelcast-queue-component.adoc | 2 +-
.../pages/hazelcast-replicatedmap-component.adoc | 2 +-
.../ROOT/pages/hazelcast-ringbuffer-component.adoc | 2 +-
.../ROOT/pages/hazelcast-seda-component.adoc | 2 +-
.../ROOT/pages/hazelcast-set-component.adoc | 2 +-
.../ROOT/pages/hazelcast-topic-component.adoc | 2 +-
.../modules/ROOT/pages/hbase-component.adoc | 2 +-
.../modules/ROOT/pages/hdfs-component.adoc | 3 +-
.../modules/ROOT/pages/hipchat-component.adoc | 2 +-
.../modules/ROOT/pages/hl7-dataformat.adoc | 2 +-
.../modules/ROOT/pages/hl7terser-language.adoc | 2 +-
.../modules/ROOT/pages/ical-dataformat.adoc | 2 +-
.../modules/ROOT/pages/ignite-cache-component.adoc | 2 +-
.../ROOT/pages/ignite-compute-component.adoc | 2 +-
.../ROOT/pages/ignite-events-component.adoc | 2 +-
.../modules/ROOT/pages/ignite-idgen-component.adoc | 2 +-
.../ROOT/pages/ignite-messaging-component.adoc | 2 +-
.../modules/ROOT/pages/ignite-queue-component.adoc | 2 +-
.../modules/ROOT/pages/ignite-set-component.adoc | 2 +-
docs/components/modules/ROOT/pages/index.adoc | 10 +-
.../modules/ROOT/pages/infinispan-component.adoc | 2 +-
.../modules/ROOT/pages/influxdb-component.adoc | 2 +-
.../modules/ROOT/pages/iota-component.adoc | 47 +-
.../modules/ROOT/pages/irc-component.adoc | 2 +-
.../modules/ROOT/pages/ironmq-component.adoc | 2 +-
.../modules/ROOT/pages/jacksonxml-dataformat.adoc | 2 +-
.../modules/ROOT/pages/jaxb-dataformat.adoc | 2 +-
.../modules/ROOT/pages/jbpm-component.adoc | 2 +-
.../modules/ROOT/pages/jcache-component.adoc | 2 +-
.../modules/ROOT/pages/jcr-component.adoc | 2 +-
.../modules/ROOT/pages/jdbc-component.adoc | 2 +-
.../modules/ROOT/pages/jgroups-component.adoc | 2 +-
.../modules/ROOT/pages/jgroups-raft-component.adoc | 2 +-
.../modules/ROOT/pages/jing-component.adoc | 2 +-
.../modules/ROOT/pages/jms-component.adoc | 102 +-
.../modules/ROOT/pages/jmx-component.adoc | 2 +-
.../modules/ROOT/pages/jolt-component.adoc | 2 +-
.../modules/ROOT/pages/jpa-component.adoc | 2 +-
.../modules/ROOT/pages/json-gson-dataformat.adoc | 2 +-
.../ROOT/pages/json-jackson-dataformat.adoc | 2 +-
.../ROOT/pages/json-johnzon-dataformat.adoc | 2 +-
.../modules/ROOT/pages/jsonpath-language.adoc | 2 +-
.../modules/ROOT/pages/jt400-component.adoc | 2 +-
.../modules/ROOT/pages/kafka-component.adoc | 2 +-
.../modules/ROOT/pages/ldap-component.adoc | 2 +-
.../modules/ROOT/pages/lpr-component.adoc | 2 +-
.../modules/ROOT/pages/lucene-component.adoc | 2 +-
.../modules/ROOT/pages/lumberjack-component.adoc | 2 +-
.../modules/ROOT/pages/lzf-dataformat.adoc | 2 +-
.../modules/ROOT/pages/mail-component.adoc | 4 +-
.../modules/ROOT/pages/metrics-component.adoc | 30 +-
.../modules/ROOT/pages/micrometer-component.adoc | 12 +-
.../modules/ROOT/pages/milo-client-component.adoc | 2 +-
.../modules/ROOT/pages/milo-server-component.adoc | 2 +-
.../modules/ROOT/pages/mllp-component.adoc | 2 +-
.../ROOT/pages/mongodb-gridfs-component.adoc | 2 +-
.../modules/ROOT/pages/msv-component.adoc | 2 +-
.../modules/ROOT/pages/mustache-component.adoc | 2 +-
.../modules/ROOT/pages/mvel-component.adoc | 4 +-
.../modules/ROOT/pages/mvel-language.adoc | 4 +-
.../modules/ROOT/pages/mybatis-component.adoc | 2 +-
.../modules/ROOT/pages/nagios-component.adoc | 2 +-
.../modules/ROOT/pages/nats-component.adoc | 2 +-
.../modules/ROOT/pages/netty-component.adoc | 8 +-
.../modules/ROOT/pages/netty-http-component.adoc | 10 +-
.../modules/ROOT/pages/ognl-language.adoc | 2 +-
.../modules/ROOT/pages/olingo2-component.adoc | 2 +-
.../modules/ROOT/pages/olingo4-component.adoc | 2 +-
.../ROOT/pages/openstack-cinder-component.adoc | 2 +-
.../ROOT/pages/openstack-glance-component.adoc | 2 +-
.../ROOT/pages/openstack-keystone-component.adoc | 2 +-
.../ROOT/pages/openstack-neutron-component.adoc | 2 +-
.../ROOT/pages/openstack-nova-component.adoc | 2 +-
.../ROOT/pages/openstack-swift-component.adoc | 2 +-
.../modules/ROOT/pages/optaplanner-component.adoc | 2 +-
.../modules/ROOT/pages/paho-component.adoc | 2 +-
.../modules/ROOT/pages/pdf-component.adoc | 2 +-
.../ROOT/pages/pg-replication-slot-component.adoc | 2 +-
.../modules/ROOT/pages/pgevent-component.adoc | 2 +-
.../ROOT/pages/platform-http-component.adoc | 67 +-
.../modules/ROOT/pages/protobuf-dataformat.adoc | 6 +-
.../modules/ROOT/pages/pubnub-component.adoc | 2 +-
.../modules/ROOT/pages/quickfix-component.adoc | 2 +-
.../modules/ROOT/pages/rabbitmq-component.adoc | 4 +-
.../ROOT/pages/reactive-streams-component.adoc | 2 +-
.../modules/ROOT/pages/rest-swagger-component.adoc | 2 +-
.../modules/ROOT/pages/rss-component.adoc | 4 +-
.../modules/ROOT/pages/rss-dataformat.adoc | 4 +-
.../modules/ROOT/pages/salesforce-component.adoc | 2 +-
.../ROOT/pages/sap-netweaver-component.adoc | 2 +-
.../modules/ROOT/pages/schematron-component.adoc | 2 +-
.../modules/ROOT/pages/scp-component.adoc | 2 +-
.../modules/ROOT/pages/seda-component.adoc | 6 +-
.../modules/ROOT/pages/servicenow-component.adoc | 2 +-
.../modules/ROOT/pages/servlet-component.adoc | 2 +-
.../modules/ROOT/pages/sip-component.adoc | 2 +-
.../modules/ROOT/pages/sjms-batch-component.adoc | 2 +-
.../modules/ROOT/pages/sjms-component.adoc | 2 +-
.../modules/ROOT/pages/sjms2-component.adoc | 2 +-
.../modules/ROOT/pages/slack-component.adoc | 2 +-
.../modules/ROOT/pages/smpp-component.adoc | 2 +-
.../modules/ROOT/pages/snmp-component.adoc | 2 +-
.../modules/ROOT/pages/soapjaxb-dataformat.adoc | 2 +-
.../modules/ROOT/pages/solr-component.adoc | 2 +-
.../modules/ROOT/pages/spark-component.adoc | 2 +-
.../modules/ROOT/pages/splunk-component.adoc | 2 +-
.../modules/ROOT/pages/spring-batch-component.adoc | 2 +-
.../modules/ROOT/pages/spring-event-component.adoc | 4 +-
.../ROOT/pages/spring-integration-component.adoc | 2 +-
.../modules/ROOT/pages/spring-ldap-component.adoc | 2 +-
.../modules/ROOT/pages/spring-redis-component.adoc | 2 +-
.../modules/ROOT/pages/spring-ws-component.adoc | 2 +-
.../modules/ROOT/pages/sql-component.adoc | 2 +-
.../modules/ROOT/pages/sql-stored-component.adoc | 2 +-
.../modules/ROOT/pages/ssh-component.adoc | 2 +-
.../modules/ROOT/pages/stax-component.adoc | 2 +-
.../modules/ROOT/pages/stomp-component.adoc | 11 +-
.../modules/ROOT/pages/stream-component.adoc | 2 +-
.../ROOT/pages/string-template-component.adoc | 2 +-
.../modules/ROOT/pages/stub-component.adoc | 6 +-
.../modules/ROOT/pages/syslog-dataformat.adoc | 2 +-
.../modules/ROOT/pages/tarfile-dataformat.adoc | 2 +-
.../modules/ROOT/pages/telegram-component.adoc | 2 +-
.../modules/ROOT/pages/tidyMarkup-dataformat.adoc | 2 +-
.../modules/ROOT/pages/tika-component.adoc | 2 +-
.../modules/ROOT/pages/twilio-component.adoc | 2 +-
.../modules/ROOT/pages/undertow-component.adoc | 2 +-
.../ROOT/pages/univocity-csv-dataformat.adoc | 2 +-
.../ROOT/pages/univocity-fixed-dataformat.adoc | 2 +-
.../ROOT/pages/univocity-tsv-dataformat.adoc | 2 +-
.../modules/ROOT/pages/velocity-component.adoc | 2 +-
.../modules/ROOT/pages/vertx-component.adoc | 2 +-
.../modules/ROOT/pages/vm-component.adoc | 6 +-
.../modules/ROOT/pages/weather-component.adoc | 2 +-
.../modules/ROOT/pages/web3j-component.adoc | 2 +-
.../modules/ROOT/pages/websocket-component.adoc | 2 +-
.../modules/ROOT/pages/xj-component.adoc | 11 +-
.../modules/ROOT/pages/xmlsecurity-component.adoc | 4 +-
.../modules/ROOT/pages/xmpp-component.adoc | 2 +-
.../modules/ROOT/pages/xquery-component.adoc | 4 +-
.../modules/ROOT/pages/xquery-language.adoc | 4 +-
.../modules/ROOT/pages/xslt-component.adoc | 11 +-
.../modules/ROOT/pages/xslt-saxon-component.adoc | 11 +-
.../modules/ROOT/pages/xstream-dataformat.adoc | 4 +-
.../ROOT/pages/yaml-snakeyaml-dataformat.adoc | 2 +-
.../modules/ROOT/pages/yammer-component.adoc | 2 +-
.../modules/ROOT/pages/zendesk-component.adoc | 2 +-
.../modules/ROOT/pages/zipfile-dataformat.adoc | 2 +-
.../modules/ROOT/pages/zookeeper-component.adoc | 2 +-
.../ROOT/pages/zookeeper-master-component.adoc | 2 +-
docs/pom.xml | 6 +-
.../ROOT/assets/images/eip/BroadcastAggregate.gif | Bin 0 -> 4005 bytes
.../ROOT/assets/images/eip/CDC-Debezium.png | Bin 0 -> 67771 bytes
.../ROOT/assets/images/eip/ChannelAdapterIcon.gif | Bin 0 -> 941 bytes
.../assets/images/eip/ChannelAdapterSolution.gif | Bin 0 -> 2898 bytes
.../ROOT/assets/images/eip/CompetingConsumers.gif | Bin 0 -> 4759 bytes
.../assets/images/eip/DistributionAggregate.gif | Bin 0 -> 6302 bytes
.../images/eip/DurableSubscriptionSolution.gif | Bin 0 -> 3234 bytes
.../ROOT/assets/images/eip/MessageBroker.gif | Bin 0 -> 1686 bytes
.../ROOT/assets/images/eip/MessageBrokerIcon.gif | Bin 0 -> 547 bytes
.../ROOT/assets/images/eip/MessageDispatcher.gif | Bin 0 -> 5128 bytes
.../assets/images/eip/MessageExpirationIcon.gif | Bin 0 -> 276 bytes
.../images/eip/MessageExpirationSolution.gif | Bin 0 -> 4409 bytes
.../ROOT/assets/images/eip/MessageHistory.gif | Bin 0 -> 2351 bytes
.../assets/images/eip/MessageSelectorSolution.gif | Bin 0 -> 2987 bytes
.../assets/images/eip/MessagingAdapterSolution.gif | Bin 0 -> 3923 bytes
.../ROOT/assets/images/eip/MessagingBridge.gif | Bin 0 -> 1828 bytes
.../ROOT/assets/images/eip/MessagingBridgeIcon.gif | Bin 0 -> 437 bytes
.../assets/images/eip/MessagingGatewaySolution.gif | Bin 0 -> 3780 bytes
.../images/eip/MessagingMapperClassDiagram.gif | Bin 0 -> 2019 bytes
.../ROOT/assets/images/eip/NormalizerDetail.gif | Bin 0 -> 8388 bytes
.../ROOT/assets/images/eip/ProcessManager.gif | Bin 0 -> 3175 bytes
.../ROOT/assets/images/eip/ProcessManagerIcon.gif | Bin 0 -> 429 bytes
.../modules/ROOT/pages/bean-integration.adoc | 64 +-
.../ROOT/pages/camel-configuration-utilities.adoc | 4 +-
.../modules/ROOT/pages/change-data-capture.adoc | 17 +
.../modules/ROOT/pages/channel-adapter.adoc | 54 +
.../modules/ROOT/pages/competing-consumers.adoc | 105 ++
.../ROOT/pages/composed-message-processor.adoc | 51 +
.../modules/ROOT/pages/content-enricher.adoc | 2 +-
.../modules/ROOT/pages/contributing.adoc | 6 +-
.../modules/ROOT/pages/durable-subscriber.adoc | 50 +
.../pages/enterprise-integration-patterns.adoc | 133 +-
.../modules/ROOT/pages/event-message.adoc | 2 +-
.../using-getin-or-getout-methods-on-exchange.adoc | 2 +-
.../modules/ROOT/pages/getting-started.adoc | 35 +-
docs/user-manual/modules/ROOT/pages/irc-room.adoc | 24 -
.../modules/ROOT/pages/loadBalance-eip.adoc | 1 -
.../modules/ROOT/pages/message-broker.adoc | 20 +
.../modules/ROOT/pages/message-channel.adoc | 4 +-
.../modules/ROOT/pages/message-dispatcher.adoc | 15 +
.../modules/ROOT/pages/message-expiration.adoc | 31 +
.../modules/ROOT/pages/message-history.adoc | 99 ++
.../modules/ROOT/pages/message-translator.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/message.adoc | 4 +-
.../modules/ROOT/pages/messaging-bridge.adoc | 24 +
.../modules/ROOT/pages/messaging-gateway.adoc | 20 +
.../modules/ROOT/pages/messaging-mapper.adoc | 24 +
.../user-manual/modules/ROOT/pages/normalizer.adoc | 75 +
.../modules/ROOT/pages/pojo-consuming.adoc | 2 +-
.../modules/ROOT/pages/pojo-producing.adoc | 22 +-
.../modules/ROOT/pages/process-manager.adoc | 25 +
.../modules/ROOT/pages/request-reply.adoc | 44 +
.../modules/ROOT/pages/scatter-gather.adoc | 136 ++
.../modules/ROOT/pages/selective-consumer.adoc | 46 +
.../modules/ROOT/pages/service-activator.adoc | 45 +
.../modules/ROOT/pages/spring-remoting.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/support.adoc | 6 +-
.../pages/using-exchange-pattern-annotations.adoc | 2 +-
etc/pom.xml | 99 +-
examples/camel-example-activemq-tomcat/pom.xml | 5 +-
examples/camel-example-aggregate/pom.xml | 5 +-
examples/camel-example-any23/pom.xml | 2 +-
.../camel-example-artemis-amqp-blueprint/pom.xml | 5 +-
.../camel-example-artemis-large-messages/pom.xml | 5 +-
examples/camel-example-artemis/pom.xml | 5 +-
examples/camel-example-as2/pom.xml | 2 +-
examples/camel-example-bigxml-split/pom.xml | 6 +-
examples/camel-example-billboard-aggr/pom.xml | 6 +-
examples/camel-example-cafe-endpointdsl/pom.xml | 5 +-
examples/camel-example-cafe/pom.xml | 5 +-
.../camel-example-cassandra-kubernetes/pom.xml | 5 +-
examples/camel-example-cdi-aws-s3/pom.xml | 5 +-
examples/camel-example-cdi-cassandraql/pom.xml | 5 +-
examples/camel-example-cdi-kubernetes/pom.xml | 5 +-
examples/camel-example-cdi-metrics/pom.xml | 5 +-
examples/camel-example-cdi-properties/pom.xml | 5 +-
examples/camel-example-cdi-rest-servlet/pom.xml | 5 +-
examples/camel-example-cdi-test/pom.xml | 5 +-
examples/camel-example-cdi-xml/pom.xml | 5 +-
examples/camel-example-cdi/pom.xml | 5 +-
examples/camel-example-console/pom.xml | 5 +-
examples/camel-example-cxf-blueprint/pom.xml | 5 +-
examples/camel-example-cxf-proxy/pom.xml | 5 +-
examples/camel-example-cxf-tomcat/pom.xml | 5 +-
.../pom.xml | 5 +-
examples/camel-example-cxf/pom.xml | 5 +-
examples/camel-example-debezium/pom.xml | 5 +-
examples/camel-example-ehcache-blueprint/pom.xml | 5 +-
.../camel-example-fhir-auth-tx-spring-boot/pom.xml | 5 +-
examples/camel-example-fhir-osgi/pom.xml | 7 +-
examples/camel-example-fhir-spring-boot/pom.xml | 5 +-
examples/camel-example-fhir/pom.xml | 5 +-
examples/camel-example-ftp/pom.xml | 5 +-
examples/camel-example-google-pubsub/pom.xml | 5 +-
.../hello-camel-grpc-client-kubernetes/pom.xml | 6 +-
.../hello-camel-grpc-server-kubernetes/pom.xml | 8 +-
examples/camel-example-grpc-kubernetes/pom.xml | 5 +-
.../camel-example-hazelcast-kubernetes/pom.xml | 5 +-
examples/camel-example-hystrix/client/pom.xml | 5 +-
examples/camel-example-hystrix/pom.xml | 5 +-
examples/camel-example-hystrix/service1/pom.xml | 5 +-
examples/camel-example-hystrix/service2/pom.xml | 5 +-
examples/camel-example-java8/pom.xml | 5 +-
examples/camel-example-jdbc/pom.xml | 5 +-
examples/camel-example-jira/pom.xml | 6 +-
examples/camel-example-jms-file/pom.xml | 5 +-
examples/camel-example-jmx/pom.xml | 5 +-
examples/camel-example-jooq/pom.xml | 6 +-
examples/camel-example-kafka-avro/pom.xml | 5 +-
.../camel-example-kafka-offsetrepository/pom.xml | 5 +-
examples/camel-example-kafka/pom.xml | 5 +-
examples/camel-example-kotlin/pom.xml | 7 +-
examples/camel-example-loadbalancing/pom.xml | 5 +-
examples/camel-example-loan-broker-cxf/pom.xml | 5 +-
examples/camel-example-loan-broker-jms/pom.xml | 5 +-
examples/camel-example-main-artemis/pom.xml | 5 +-
examples/camel-example-main-tiny/pom.xml | 5 +-
examples/camel-example-main-xml/pom.xml | 5 +-
examples/camel-example-main/pom.xml | 5 +-
examples/camel-example-management/pom.xml | 5 +-
examples/camel-example-micrometer/pom.xml | 5 +-
examples/camel-example-mybatis/pom.xml | 5 +-
.../camel-example-netty-custom-correlation/pom.xml | 5 +-
.../camel-example-netty-http/myapp-cdi/pom.xml | 5 +-
.../camel-example-netty-http/myapp-one/pom.xml | 5 +-
.../camel-example-netty-http/myapp-two/pom.xml | 5 +-
examples/camel-example-netty-http/pom.xml | 5 +-
.../shared-netty-http-server/pom.xml | 5 +-
examples/camel-example-olingo4-blueprint/pom.xml | 5 +-
examples/camel-example-opentracing/client/pom.xml | 5 +-
.../loggingtracer/pom.xml | 5 +-
examples/camel-example-opentracing/pom.xml | 5 +-
.../camel-example-opentracing/service1/pom.xml | 5 +-
.../camel-example-opentracing/service2/pom.xml | 5 +-
examples/camel-example-pojo-messaging/pom.xml | 5 +-
examples/camel-example-rabbitmq/pom.xml | 5 +-
.../camel-example-reactive-executor-vertx/pom.xml | 5 +-
examples/camel-example-reactive-streams/pom.xml | 6 +-
examples/camel-example-resilience4j/client/pom.xml | 7 +-
.../main/java/sample/camel/ClientApplication.java | 5 +-
.../camel-example-resilience4j/client2/pom.xml | 5 +-
.../main/java/sample/camel/Client2Application.java | 5 +-
examples/camel-example-resilience4j/pom.xml | 5 +-
.../camel-example-resilience4j/service1/pom.xml | 7 +-
.../camel-example-resilience4j/service2/pom.xml | 5 +-
examples/camel-example-rest-producer/pom.xml | 5 +-
examples/camel-example-rest-swagger/pom.xml | 5 +-
examples/camel-example-route-throttling/pom.xml | 5 +-
.../camel-example-servlet-rest-blueprint/pom.xml | 5 +-
examples/camel-example-servlet-tomcat/pom.xml | 5 +-
examples/camel-example-spark-rest/pom.xml | 5 +-
examples/camel-example-splunk/pom.xml | 5 +-
.../camel-example-spring-boot-activemq/pom.xml | 24 +-
.../camel-example-spring-boot-activemq/readme.adoc | 5 -
.../java/sample/camel/SampleAmqApplication.java | 2 -
.../src/main/resources/application.properties | 10 +-
examples/camel-example-spring-boot-amqp/pom.xml | 5 +-
.../cluster-bootstrap/pom.xml | 6 +-
.../cluster-node/pom.xml | 6 +-
.../pom.xml | 5 +-
.../camel-example-spring-boot-geocoder/pom.xml | 5 +-
.../hello-camel-grpc-client/pom.xml | 6 +-
.../hello-camel-grpc-server/pom.xml | 8 +-
examples/camel-example-spring-boot-grpc/pom.xml | 5 +-
.../application/pom.xml | 5 +-
.../pom.xml | 5 +-
.../service/pom.xml | 5 +-
.../camel-example-spring-boot-infinispan/pom.xml | 5 +-
examples/camel-example-spring-boot-master/pom.xml | 5 +-
examples/camel-example-spring-boot-metrics/pom.xml | 5 +-
examples/camel-example-spring-boot-pojo/pom.xml | 5 +-
.../camel-example-spring-boot-rest-jpa/pom.xml | 5 +-
.../camel-example-spring-boot-rest-swagger/pom.xml | 5 +-
.../consumer/pom.xml | 6 +-
.../camel-example-spring-boot-servicecall/pom.xml | 6 +-
.../services/pom.xml | 6 +-
.../pom.xml | 5 +-
.../src/main/resources/application.properties | 4 -
examples/camel-example-spring-boot-xml/pom.xml | 5 +-
examples/camel-example-spring-boot/pom.xml | 5 +-
.../consumer/pom.xml | 6 +-
.../camel-example-spring-cloud-servicecall/pom.xml | 6 +-
.../service/pom.xml | 6 +-
.../consumer/pom.xml | 6 +-
.../pom.xml | 6 +-
.../service/pom.xml | 6 +-
examples/camel-example-spring-javaconfig/pom.xml | 5 +-
examples/camel-example-spring-jms/pom.xml | 5 +-
examples/camel-example-spring-pulsar/pom.xml | 5 +-
examples/camel-example-spring-security/pom.xml | 5 +-
examples/camel-example-spring-ws/pom.xml | 5 +-
examples/camel-example-spring-xquery/pom.xml | 7 +-
examples/camel-example-spring/pom.xml | 5 +-
examples/camel-example-sql-blueprint/pom.xml | 5 +-
examples/camel-example-ssh-security/pom.xml | 7 +-
examples/camel-example-ssh/pom.xml | 7 +-
examples/camel-example-swagger-cdi/pom.xml | 5 +-
examples/camel-example-swagger-osgi/pom.xml | 5 +-
examples/camel-example-telegram/pom.xml | 6 +-
.../camel-example-transformer-blueprint/pom.xml | 5 +-
examples/camel-example-transformer-cdi/pom.xml | 5 +-
examples/camel-example-transformer-demo/pom.xml | 5 +-
examples/camel-example-twitter-salesforce/pom.xml | 5 +-
.../pom.xml | 5 +-
examples/camel-example-twitter-websocket/pom.xml | 5 +-
.../camel-example-validator-spring-boot/pom.xml | 5 +-
examples/camel-example-webhook/pom.xml | 6 +-
examples/camel-example-widget-gadget-cdi/pom.xml | 5 +-
examples/camel-example-widget-gadget-java/pom.xml | 5 +-
examples/camel-example-widget-gadget-xml/pom.xml | 5 +-
examples/camel-example-zipkin/client/pom.xml | 5 +-
examples/camel-example-zipkin/pom.xml | 5 +-
examples/camel-example-zipkin/service1/pom.xml | 5 +-
examples/camel-example-zipkin/service2/pom.xml | 5 +-
examples/pom.xml | 9 +-
mvnw | 32 +-
mvnw.cmd | 39 +-
parent/pom.xml | 131 +-
platforms/commands/commands-core/pom.xml | 5 +-
platforms/commands/pom.xml | 5 +-
platforms/karaf/commands/pom.xml | 5 +-
platforms/karaf/features/pom.xml | 5 +-
.../karaf/features/src/main/resources/features.xml | 30 +-
platforms/karaf/pom.xml | 5 +-
platforms/pom.xml | 5 +-
.../camel-activemq-starter/pom.xml | 2 +-
.../springboot/ActiveMQComponentConfiguration.java | 56 +-
.../components-starter/camel-ahc-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-ahc-ws-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-amqp-starter/pom.xml | 2 +-
.../springboot/AMQPComponentConfiguration.java | 47 +
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-any23-starter/pom.xml | 2 +-
.../components-starter/camel-apns-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-as2-starter/pom.xml | 2 +-
.../components-starter/camel-asn1-starter/pom.xml | 2 +-
.../camel-asterisk-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-atmos-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-atmosphere-websocket-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-atom-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-atomix-starter/pom.xml | 2 +-
.../components-starter/camel-avro-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 16 -
.../camel-aws-cw-starter/pom.xml | 2 +-
.../camel-aws-ddb-starter/pom.xml | 2 +-
.../camel-aws-ec2-starter/pom.xml | 2 +-
.../camel-aws-ecs-starter/pom.xml | 2 +-
.../ecs/springboot/ECSComponentConfiguration.java | 2 +-
.../camel-aws-eks-starter/pom.xml | 2 +-
.../eks/springboot/EKSComponentConfiguration.java | 2 +-
.../camel-aws-iam-starter/pom.xml | 2 +-
.../camel-aws-kinesis-starter/pom.xml | 2 +-
.../camel-aws-kms-starter/pom.xml | 2 +-
.../camel-aws-lambda-starter/pom.xml | 2 +-
.../camel-aws-mq-starter/pom.xml | 2 +-
.../camel-aws-msk-starter/pom.xml | 2 +-
.../msk/springboot/MSKComponentConfiguration.java | 2 +-
.../camel-aws-s3-starter/pom.xml | 2 +-
.../camel-aws-sdb-starter/pom.xml | 2 +-
.../camel-aws-ses-starter/pom.xml | 2 +-
.../camel-aws-sns-starter/pom.xml | 2 +-
.../camel-aws-sqs-starter/pom.xml | 2 +-
.../camel-aws-swf-starter/pom.xml | 2 +-
.../camel-aws-translate-starter/pom.xml | 2 +-
.../camel-aws-xray-starter/pom.xml | 2 +-
.../components-starter/camel-azure-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 16 -
.../camel-barcode-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-base64-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-bean-starter/pom.xml | 2 +-
.../camel-bean-validator-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-beanio-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-beanstalk-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-bindy-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 22 -
.../camel-bonita-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-box-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-braintree-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-browse-starter/pom.xml | 2 +-
.../camel-caffeine-starter/pom.xml | 2 +-
.../camel-cassandraql-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-cbor-starter/pom.xml | 2 +-
.../camel-chatscript-starter/pom.xml | 2 +-
.../components-starter/camel-chunk-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-cm-sms-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-cmis-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-coap-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-cometd-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-consul-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-controlbus-starter/pom.xml | 2 +-
.../components-starter/camel-corda-starter/pom.xml | 10 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-core-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 52 -
.../camel-couchbase-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-couchdb-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-crypto-cms-starter/pom.xml | 2 +-
.../camel-crypto-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 22 -
.../components-starter/camel-csv-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-cxf-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 16 -
.../camel-cxf-transport-starter/pom.xml | 2 +-
.../camel-dataformat-starter/pom.xml | 2 +-
.../camel-dataset-starter/pom.xml | 2 +-
.../camel-debezium-common-starter/pom.xml | 2 +-
.../camel-debezium-mongodb-starter/pom.xml | 2 +-
.../camel-debezium-mysql-starter/pom.xml | 2 +-
.../camel-debezium-postgres-starter/pom.xml | 2 +-
.../camel-debezium-sqlserver-starter/pom.xml | 2 +-
.../camel-digitalocean-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-direct-starter/pom.xml | 2 +-
.../camel-directvm-starter/pom.xml | 2 +-
.../camel-disruptor-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 16 -
.../components-starter/camel-dns-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-docker-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-dozer-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-drill-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-dropbox-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-ehcache-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-elasticsearch-rest-starter/pom.xml | 2 +-
.../components-starter/camel-elsql-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-etcd-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-exec-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-facebook-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-fastjson-starter/pom.xml | 2 +-
.../components-starter/camel-fhir-starter/pom.xml | 2 +-
.../components-starter/camel-file-starter/pom.xml | 2 +-
.../camel-file-watch-starter/pom.xml | 2 +-
.../camel-flatpack-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 16 -
.../components-starter/camel-flink-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-fop-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-freemarker-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-ftp-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 22 -
.../camel-ganglia-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-geocoder-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-git-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-github-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-google-bigquery-starter/pom.xml | 2 +-
.../camel-google-calendar-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-google-drive-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-google-mail-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-google-pubsub-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-google-sheets-starter/pom.xml | 2 +-
.../components-starter/camel-gora-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-grape-starter/pom.xml | 2 +-
.../camel-graphql-starter/pom.xml | 2 +-
.../components-starter/camel-grok-starter/pom.xml | 2 +-
.../camel-groovy-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-grpc-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-gson-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-guava-eventbus-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-hazelcast-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 76 -
.../components-starter/camel-hbase-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-hdfs-starter/pom.xml | 2 +-
.../camel-hipchat-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-hl7-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 16 -
.../camel-http-common-starter/pom.xml | 2 +-
.../components-starter/camel-http-starter/pom.xml | 2 +-
.../camel-hystrix-starter/pom.xml | 2 +-
.../components-starter/camel-ical-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-iec60870-starter/pom.xml | 2 +-
.../camel-ignite-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 46 -
.../camel-infinispan-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-influxdb-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-iota-starter/pom.xml | 14 +-
.../components-starter/camel-ipfs-starter/pom.xml | 2 +-
.../components-starter/camel-irc-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-ironmq-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-jackson-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-jacksonxml-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-jasypt-starter/pom.xml | 2 +-
.../components-starter/camel-jaxb-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-jaxp-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-jbpm-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-jcache-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-jclouds-starter/pom.xml | 2 +-
.../components-starter/camel-jcr-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-jdbc-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-jetty-common-starter/pom.xml | 2 +-
.../components-starter/camel-jetty-starter/pom.xml | 2 +-
.../camel-jgroups-raft-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-jgroups-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-jing-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-jira-starter/pom.xml | 2 +-
.../components-starter/camel-jms-starter/pom.xml | 2 +-
.../jms/springboot/JmsComponentConfiguration.java | 1488 +-------------------
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-jmx-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-johnzon-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-jolt-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-jooq-starter/pom.xml | 2 +-
.../components-starter/camel-jpa-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-jsch-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-json-validator-starter/pom.xml | 2 +-
.../camel-jsonapi-starter/pom.xml | 2 +-
.../camel-jsonpath-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-jt400-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-kafka-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-kubernetes-starter/pom.xml | 2 +-
.../components-starter/camel-kudu-starter/pom.xml | 2 +-
.../components-starter/camel-kura-starter/pom.xml | 2 +-
.../camel-language-starter/pom.xml | 2 +-
.../components-starter/camel-ldap-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-ldif-starter/pom.xml | 2 +-
.../camel-leveldb-starter/pom.xml | 2 +-
.../components-starter/camel-log-starter/pom.xml | 2 +-
.../components-starter/camel-lra-starter/pom.xml | 2 +-
.../camel-lucene-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-lumberjack-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-lzf-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-mail-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 16 -
.../camel-master-starter/pom.xml | 2 +-
.../camel-metrics-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-micrometer-starter/pom.xml | 2 +-
.../components-starter/camel-milo-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 16 -
.../components-starter/camel-mina-starter/pom.xml | 2 +-
.../components-starter/camel-mllp-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-mock-starter/pom.xml | 2 +-
.../camel-mongodb-gridfs-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-mongodb-starter/pom.xml | 2 +-
.../components-starter/camel-msv-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-mustache-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-mvel-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 16 -
.../camel-mybatis-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-nagios-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-nats-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-netty-http-starter/pom.xml | 2 +-
.../NettyHttpComponentConfiguration.java | 13 +
.../components-starter/camel-netty-starter/pom.xml | 2 +-
.../springboot/NettyComponentConfiguration.java | 6 +-
.../camel-nitrite-starter/pom.xml | 2 +-
.../components-starter/camel-nsq-starter/pom.xml | 2 +-
.../components-starter/camel-ognl-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-olingo2-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-olingo4-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-openstack-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 40 -
.../camel-opentracing-starter/pom.xml | 2 +-
.../camel-optaplanner-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-paho-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-pdf-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-pg-replication-slot-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-pgevent-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../pom.xml | 10 +-
.../PlatformHttpComponentAutoConfiguration.java | 129 ++
.../PlatformHttpComponentConfiguration.java} | 56 +-
.../src/main/resources/META-INF/LICENSE.txt | 0
.../src/main/resources/META-INF/NOTICE.txt | 0
.../src/main/resources/META-INF/spring.factories | 6 +-
.../src/main/resources/META-INF/spring.provides | 6 +-
.../camel-printer-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-protobuf-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-pubnub-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-pulsar-starter/pom.xml | 2 +-
.../camel-quartz-starter/pom.xml | 2 +-
.../camel-quickfix-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-rabbitmq-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-reactive-executor-vertx-starter/pom.xml | 2 +-
.../camel-reactive-streams-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-reactor-starter/pom.xml | 2 +-
.../components-starter/camel-ref-starter/pom.xml | 2 +-
.../camel-resilience4j-starter/pom.xml | 2 +-
.../components-starter/camel-rest-starter/pom.xml | 2 +-
.../camel-rest-swagger-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-ribbon-starter/pom.xml | 2 +-
.../camel-robotframework-starter/pom.xml | 2 +-
.../components-starter/camel-rss-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 16 -
.../camel-rxjava-starter/pom.xml | 2 +-
.../components-starter/camel-saga-starter/pom.xml | 2 +-
.../camel-salesforce-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-sap-netweaver-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-saxon-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 16 -
.../camel-scheduler-starter/pom.xml | 2 +-
.../camel-schematron-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-seda-starter/pom.xml | 2 +-
.../springboot/SedaComponentConfiguration.java | 15 +
.../camel-service-starter/pom.xml | 2 +-
.../camel-servicenow-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-servlet-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-shiro-starter/pom.xml | 2 +-
.../components-starter/camel-sip-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-sjms-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 16 -
.../components-starter/camel-sjms2-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-slack-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-smpp-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-snakeyaml-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-snmp-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-soap-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-solr-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-soroush-starter/pom.xml | 2 +-
.../components-starter/camel-spark-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-splunk-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-spring-batch-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-spring-boot-starter/pom.xml | 2 +-
.../camel-spring-cloud-consul-starter/pom.xml | 2 +-
.../camel-spring-cloud-netflix-starter/pom.xml | 2 +-
.../camel-spring-cloud-starter/pom.xml | 2 +-
.../camel-spring-cloud-zookeeper-starter/pom.xml | 2 +-
.../camel-spring-integration-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-spring-javaconfig-starter/pom.xml | 2 +-
.../camel-spring-ldap-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-spring-redis-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-spring-security-starter/pom.xml | 2 +-
.../camel-spring-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 16 -
.../camel-spring-ws-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-sql-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 16 -
.../components-starter/camel-ssh-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-stax-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-stomp-starter/pom.xml | 2 +-
.../springboot/StompComponentConfiguration.java | 12 +
.../additional-spring-configuration-metadata.json | 10 -
.../camel-stream-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-stringtemplate-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-stub-starter/pom.xml | 2 +-
.../springboot/StubComponentConfiguration.java | 15 +
.../camel-swagger-java-starter/pom.xml | 2 +-
.../camel-syslog-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-tagsoup-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-tarfile-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-telegram-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-thrift-starter/pom.xml | 2 +-
.../components-starter/camel-tika-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-timer-starter/pom.xml | 2 +-
.../camel-twilio-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-twitter-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-undertow-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-univocity-parsers-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 22 -
.../camel-validator-starter/pom.xml | 2 +-
.../camel-velocity-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-vertx-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-vm-starter/pom.xml | 2 +-
.../vm/springboot/VmComponentConfiguration.java | 15 +
.../camel-weather-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-web3j-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-webhook-starter/pom.xml | 2 +-
.../camel-websocket-jsr356-starter/pom.xml | 2 +-
.../camel-websocket-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-wordpress-starter/pom.xml | 2 +-
.../camel-xchange-starter/pom.xml | 2 +-
.../components-starter/camel-xj-starter/pom.xml | 2 +-
.../xj/springboot/XJComponentConfiguration.java | 28 +
.../camel-xmlsecurity-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 16 -
.../components-starter/camel-xmpp-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../components-starter/camel-xpath-starter/pom.xml | 2 +-
.../camel-xslt-saxon-starter/pom.xml | 2 +-
.../XsltSaxonComponentConfiguration.java | 28 +
.../components-starter/camel-xslt-starter/pom.xml | 2 +-
.../springboot/XsltComponentConfiguration.java | 28 +
.../camel-xstream-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 16 -
.../camel-yammer-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-zendesk-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-zip-deflater-starter/pom.xml | 2 +-
.../camel-zipfile-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-zipkin-starter/pom.xml | 2 +-
.../camel-zookeeper-master-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
.../camel-zookeeper-starter/pom.xml | 2 +-
.../additional-spring-configuration-metadata.json | 10 -
platforms/spring-boot/components-starter/pom.xml | 3 +-
platforms/spring-boot/pom.xml | 6 +-
platforms/spring-boot/spring-boot-dm/README.adoc | 2 +-
.../pom.xml | 6 +-
.../target-template-pom.xml | 2 +-
.../camel-spring-boot-dependencies/pom.xml | 144 +-
.../spring-boot-dm/camel-starter-parent/pom.xml | 6 +-
platforms/spring-boot/spring-boot-dm/pom.xml | 12 +-
pom.xml | 108 +-
tests/camel-blueprint-cxf-test/pom.xml | 5 +-
tests/camel-blueprint-test/pom.xml | 5 +-
tests/camel-itest-cdi/pom.xml | 5 +-
tests/camel-itest-jms2/pom.xml | 5 +-
tests/camel-itest-karaf/pom.xml | 7 +-
tests/camel-itest-osgi/pom.xml | 5 +-
tests/camel-itest-performance/pom.xml | 5 +-
tests/camel-itest-spring-boot/pom.xml | 2 +-
.../camel/itest/springboot/CamelSolrTest.java | 2 +
.../itest/springboot/util/ArquillianPackager.java | 2 +-
.../camel/itest/springboot/util/BOMResolver.java | 8 +-
.../src/test/resources/application-pom-sb1.xml | 6 +-
.../src/test/resources/application-pom-sb2.xml | 6 +-
tests/camel-itest-standalone/pom.xml | 5 +-
tests/camel-itest/pom.xml | 5 +-
tests/camel-jmh/pom.xml | 5 +-
tests/camel-partial-classpath-test/pom.xml | 5 +-
tests/camel-performance/pom.xml | 5 +-
tests/camel-typeconverterscan-test/pom.xml | 5 +-
tests/pom.xml | 7 +-
.../camel-validator-test-resources/pom.xml | 5 +-
tests/test-bundles/mock-javamail_1.7/pom.xml | 5 +-
tests/test-bundles/pom.xml | 15 +-
tooling/apt/pom.xml | 5 +-
tooling/camel-bundle-plugin/pom.xml | 5 +-
tooling/camel-util-json/pom.xml | 5 +-
tooling/maven/bom-generator-maven-plugin/pom.xml | 5 +-
.../maven/bom/generator/BomGeneratorMojo.java | 9 +-
.../maven/camel-api-component-maven-plugin/pom.xml | 7 +-
.../pom.xml | 7 +-
tooling/maven/camel-javadoc-plugin/pom.xml | 5 +-
.../maven/camel-main-package-maven-plugin/pom.xml | 5 +-
tooling/maven/camel-main-parser/pom.xml | 5 +-
tooling/maven/camel-maven-plugin/pom.xml | 5 +-
tooling/maven/camel-package-maven-plugin/pom.xml | 5 +-
.../camel/maven/packaging/EndpointDslMojo.java | 64 +
.../packaging/SpringBootAutoConfigurationMojo.java | 21 +-
tooling/maven/camel-restdsl-swagger-plugin/pom.xml | 5 +-
tooling/maven/pom.xml | 7 +-
tooling/meta-annotations/pom.xml | 5 +-
tooling/parent/pom.xml | 5 +-
tooling/pom.xml | 7 +-
tooling/spi-annotations/pom.xml | 5 +-
tooling/swagger-rest-dsl-generator/pom.xml | 5 +-
2078 files changed, 9007 insertions(+), 11808 deletions(-)
mode change 100755 => 100644 .mvn/wrapper/MavenWrapperDownloader.java
mode change 100755 => 100644 .mvn/wrapper/maven-wrapper.jar
mode change 100755 => 100644 .mvn/wrapper/maven-wrapper.properties
delete mode 100644 components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelConnection.java
delete mode 100644 components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelConnectionFactory.java
delete mode 100644 components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelDestination.java
delete mode 100644 components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelEndpointLoader.java
delete mode 100644 components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelMessageConsumer.java
delete mode 100644 components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelMessageProducer.java
delete mode 100644 components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelQueue.java
delete mode 100644 components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelQueueReceiver.java
delete mode 100644 components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelQueueSender.java
delete mode 100644 components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelShutdownHook.java
delete mode 100644 components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelTopic.java
delete mode 100644 components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelTopicPublisher.java
delete mode 100644 components/camel-activemq/src/main/java/org/apache/camel/component/activemq/CamelTopicSubscriber.java
delete mode 100644 components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AutoExposeQueuesInCamelTest.java
delete mode 100644 components/camel-activemq/src/test/java/org/apache/camel/component/activemq/BrokerPreShutdownHookTest.java
delete mode 100644 components/camel-activemq/src/test/java/org/apache/camel/component/activemq/CamelJmsRequestReplyNobTest.java
delete mode 100644 components/camel-activemq/src/test/java/org/apache/camel/component/activemq/CamelJmsTest.java
delete mode 100644 components/camel-activemq/src/test/resources/org/apache/camel/component/activemq/requestReply.xml
delete mode 100644 components/camel-activemq/src/test/resources/org/apache/camel/component/activemq/spring.xml
create mode 100644 components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPConfiguration.java
copy components/{camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/client/S3Client.java => camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPConstants.java} (68%)
create mode 100644 components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPJmsBinding.java
copy components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/{S3ComponentGetObjectTest.java => S3ComponentGetObjectRangeTest.java} (76%)
create mode 100644 components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/integration/S3ObjectRangeOperationIntegrationTest.java
rename components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/{HdfsBloommapFileHandler.java => HdfsBloomMapFileHandler.java} (86%)
copy components/{camel-directvm => camel-platform-http}/pom.xml (73%)
copy components/{camel-ignite/src/main/docs/ignite-events-component.adoc => camel-platform-http/src/main/docs/platform-http-component.adoc} (64%)
create mode 100644 components/camel-platform-http/src/main/java/org/apache/camel/component/platform/http/PlatformHttpComponent.java
copy components/{camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Operations.java => camel-platform-http/src/main/java/org/apache/camel/component/platform/http/PlatformHttpConstants.java} (72%)
create mode 100644 components/camel-platform-http/src/main/java/org/apache/camel/component/platform/http/PlatformHttpEndpoint.java
create mode 100644 components/camel-platform-http/src/main/java/org/apache/camel/component/platform/http/PlatformHttpHeaderFilterStrategy.java
create mode 100644 components/camel-platform-http/src/main/java/org/apache/camel/component/platform/http/spi/Method.java
copy examples/camel-example-resilience4j/client/src/main/java/sample/camel/ClientApplication.java => components/camel-platform-http/src/main/java/org/apache/camel/component/platform/http/spi/PlatformHttpEngine.java (55%)
copy components/{camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/client/S3Client.java => camel-protobuf/src/main/java/org/apache/camel/dataformat/protobuf/ProtobufTypeConverter.java} (66%)
delete mode 100755 components/camel-stax/src/test/resources/products_with_non_utf8.xml
copy components/{camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/client/S3Client.java => camel-xslt/src/main/java/org/apache/camel/component/xslt/TransformerFactoryConfigurationStrategy.java} (59%)
copy components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeTest.java => core/camel-core/src/test/java/org/apache/camel/component/seda/SedaDefaultDiscardWhenFullTest.java (60%)
copy components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeTest.java => core/camel-core/src/test/java/org/apache/camel/component/seda/SedaDiscardWhenFullTest.java (61%)
create mode 100644 core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PlatformHttpEndpointBuilderFactory.java
copy components/camel-ignite/src/main/docs/ignite-events-component.adoc => docs/components/modules/ROOT/pages/platform-http-component.adoc (64%)
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/BroadcastAggregate.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/CDC-Debezium.png
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/ChannelAdapterIcon.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/ChannelAdapterSolution.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/CompetingConsumers.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/DistributionAggregate.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/DurableSubscriptionSolution.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/MessageBroker.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/MessageBrokerIcon.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/MessageDispatcher.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/MessageExpirationIcon.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/MessageExpirationSolution.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/MessageHistory.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/MessageSelectorSolution.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/MessagingAdapterSolution.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/MessagingBridge.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/MessagingBridgeIcon.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/MessagingGatewaySolution.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/MessagingMapperClassDiagram.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/NormalizerDetail.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/ProcessManager.gif
create mode 100644 docs/user-manual/modules/ROOT/assets/images/eip/ProcessManagerIcon.gif
create mode 100644 docs/user-manual/modules/ROOT/pages/change-data-capture.adoc
create mode 100644 docs/user-manual/modules/ROOT/pages/channel-adapter.adoc
create mode 100644 docs/user-manual/modules/ROOT/pages/competing-consumers.adoc
create mode 100644 docs/user-manual/modules/ROOT/pages/composed-message-processor.adoc
create mode 100644 docs/user-manual/modules/ROOT/pages/durable-subscriber.adoc
delete mode 100644 docs/user-manual/modules/ROOT/pages/irc-room.adoc
create mode 100644 docs/user-manual/modules/ROOT/pages/message-broker.adoc
create mode 100644 docs/user-manual/modules/ROOT/pages/message-dispatcher.adoc
create mode 100644 docs/user-manual/modules/ROOT/pages/message-expiration.adoc
create mode 100644 docs/user-manual/modules/ROOT/pages/message-history.adoc
create mode 100644 docs/user-manual/modules/ROOT/pages/messaging-bridge.adoc
create mode 100644 docs/user-manual/modules/ROOT/pages/messaging-gateway.adoc
create mode 100644 docs/user-manual/modules/ROOT/pages/messaging-mapper.adoc
create mode 100644 docs/user-manual/modules/ROOT/pages/normalizer.adoc
create mode 100644 docs/user-manual/modules/ROOT/pages/process-manager.adoc
create mode 100644 docs/user-manual/modules/ROOT/pages/request-reply.adoc
create mode 100644 docs/user-manual/modules/ROOT/pages/scatter-gather.adoc
create mode 100644 docs/user-manual/modules/ROOT/pages/selective-consumer.adoc
create mode 100644 docs/user-manual/modules/ROOT/pages/service-activator.adoc
mode change 100755 => 100644 mvnw.cmd
delete mode 100644 platforms/spring-boot/components-starter/camel-ahc-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-ahc-ws-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-amqp-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-apns-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-asterisk-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-atmos-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-atmosphere-websocket-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-atom-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-avro-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-azure-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-barcode-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-base64-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-bean-validator-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-beanio-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-beanstalk-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-bindy-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-bonita-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-box-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-braintree-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-cassandraql-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-chunk-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-cm-sms-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-cmis-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-coap-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-cometd-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-consul-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-corda-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-core-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-couchbase-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-couchdb-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-crypto-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-csv-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-cxf-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-digitalocean-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-disruptor-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-dns-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-docker-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-dozer-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-drill-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-dropbox-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-ehcache-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-elsql-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-etcd-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-exec-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-facebook-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-flatpack-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-flink-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-fop-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-freemarker-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-ftp-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-ganglia-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-geocoder-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-git-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-github-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-google-calendar-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-google-drive-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-google-mail-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-google-pubsub-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-gora-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-groovy-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-grpc-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-gson-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-guava-eventbus-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-hazelcast-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-hbase-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-hipchat-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-hl7-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-ical-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-ignite-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-infinispan-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-influxdb-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-irc-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-ironmq-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-jackson-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-jacksonxml-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-jaxb-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-jaxp-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-jbpm-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-jcache-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-jcr-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-jdbc-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-jgroups-raft-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-jgroups-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-jing-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-jms-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-jmx-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-johnzon-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-jolt-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-jpa-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-jsch-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-jsonpath-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-jt400-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-kafka-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-ldap-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-lucene-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-lumberjack-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-lzf-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-mail-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-metrics-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-milo-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-mllp-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-mongodb-gridfs-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-msv-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-mustache-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-mvel-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-mybatis-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-nagios-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-nats-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-ognl-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-olingo2-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-olingo4-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-openstack-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-optaplanner-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-paho-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-pdf-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-pg-replication-slot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-pgevent-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
copy platforms/spring-boot/components-starter/{camel-amqp-starter => camel-platform-http-starter}/pom.xml (84%)
create mode 100644 platforms/spring-boot/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/PlatformHttpComponentAutoConfiguration.java
copy platforms/spring-boot/components-starter/{camel-xslt-starter/src/main/java/org/apache/camel/component/xslt/springboot/XsltComponentConfiguration.java => camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/PlatformHttpComponentConfiguration.java} (65%)
copy {tooling/maven/camel-package-maven-plugin => platforms/spring-boot/components-starter/camel-platform-http-starter}/src/main/resources/META-INF/LICENSE.txt (100%)
copy {tooling/maven/camel-package-maven-plugin => platforms/spring-boot/components-starter/camel-platform-http-starter}/src/main/resources/META-INF/NOTICE.txt (100%)
copy core/camel-main/src/test/resources/application.properties => platforms/spring-boot/components-starter/camel-platform-http-starter/src/main/resources/META-INF/spring.factories (85%)
copy core/camel-main/src/test/resources/application.properties => platforms/spring-boot/components-starter/camel-platform-http-starter/src/main/resources/META-INF/spring.provides (88%)
delete mode 100644 platforms/spring-boot/components-starter/camel-printer-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-protobuf-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-pubnub-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-quickfix-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-rabbitmq-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-reactive-streams-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-rest-swagger-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-rss-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-salesforce-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-sap-netweaver-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-saxon-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-schematron-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-servicenow-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-servlet-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-sip-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-sjms-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-sjms2-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-slack-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-smpp-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-snakeyaml-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-snmp-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-soap-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-solr-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-spark-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-splunk-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-spring-batch-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-spring-integration-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-spring-ldap-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-spring-redis-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-spring-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-spring-ws-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-sql-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-ssh-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-stax-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-stomp-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-stream-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-stringtemplate-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-syslog-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-tagsoup-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-tarfile-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-telegram-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-tika-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-twilio-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-twitter-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-undertow-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-univocity-parsers-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-velocity-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-vertx-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-weather-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-web3j-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-websocket-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-xmlsecurity-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-xmpp-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-xstream-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-yammer-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-zendesk-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-zipfile-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-zookeeper-master-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-zookeeper-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
[camel] 01/01: CAMEL-11807: Migrated camel-ftp 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 c599845d81c8bd6bdfdc6b4a284d9531e794a243
Author: aldettinger <al...@gmail.com>
AuthorDate: Sat Nov 30 12:26:32 2019 +0100
CAMEL-11807: Migrated camel-ftp tests to JUnit 5
---
components/camel-ftp/pom.xml | 13 ++++++-
.../file/remote/BaseServerTestSupport.java | 9 +++--
.../remote/ConsumerTemplateFtpShutdownTest.java | 4 ++-
.../file/remote/FileToFtpTempFileNameTest.java | 6 ++--
.../FileToFtpsExplicitSSLWithClientAuthTest.java | 2 +-
...FileToFtpsExplicitSSLWithoutClientAuthTest.java | 2 +-
.../FileToFtpsExplicitTLSWithClientAuthTest.java | 2 +-
...FileToFtpsExplicitTLSWithoutClientAuthTest.java | 2 +-
.../FileToFtpsImplicitSSLWithClientAuthTest.java | 2 +-
...FileToFtpsImplicitSSLWithoutClientAuthTest.java | 2 +-
.../FileToFtpsImplicitTLSWithClientAuthTest.java | 2 +-
...FileToFtpsImplicitTLSWithoutClientAuthTest.java | 2 +-
...psWithCustomKeyAndTrustStorePropertiesTest.java | 2 +-
...leToFtpsWithCustomTrustStorePropertiesTest.java | 2 +-
.../FileToFtpsWithDefaultSettingsIPV6Test.java | 6 ++--
.../remote/FileToFtpsWithDefaultSettingsTest.java | 2 +-
.../FileToFtpsWithFtpClientConfigRefTest.java | 2 +-
.../remote/FromFilePercentSignInPasswordTest.java | 2 +-
...FromFileToFtpDefaultRootRenameStrategyTest.java | 8 +++--
.../file/remote/FromFileToFtpDeleteTest.java | 9 +++--
.../component/file/remote/FromFileToFtpTest.java | 2 +-
.../file/remote/FromFileToFtpWithChmodTest.java | 2 +-
.../remote/FromFileTransferLoggingLevelTest.java | 2 +-
.../FromFileTransferLoggingLevelVerboseTest.java | 2 +-
.../file/remote/FromFtpActivePortRangeTest.java | 6 ++--
.../file/remote/FromFtpAsyncProcessTest.java | 8 +++--
.../file/remote/FromFtpClientConfigRefTest.java | 6 ++--
.../file/remote/FromFtpClientDataTimeoutTest.java | 6 ++--
.../file/remote/FromFtpClientSoTimeout2Test.java | 6 ++--
.../file/remote/FromFtpClientSoTimeout3Test.java | 6 ++--
.../file/remote/FromFtpClientSoTimeoutTest.java | 6 ++--
.../FromFtpConsumerTemplateRollbackTest.java | 13 ++++---
.../file/remote/FromFtpConsumerTemplateTest.java | 14 +++++---
.../file/remote/FromFtpDeleteFileTest.java | 13 ++++---
.../remote/FromFtpDirectoryToBinaryFilesTest.java | 18 +++++-----
.../FromFtpDoNotDeleteFileIfProcessFailsTest.java | 12 ++++---
.../FromFtpExclusiveReadNoneStrategyTest.java | 16 +++++----
.../component/file/remote/FromFtpFilterTest.java | 2 +-
.../file/remote/FromFtpKeepLastModifiedTest.java | 15 ++++----
...FromFtpMoveFileAbsoluteFolderRecursiveTest.java | 6 ++--
.../file/remote/FromFtpMoveFilePostfixTest.java | 10 +++---
.../file/remote/FromFtpMoveFilePrefixTest.java | 10 +++---
.../file/remote/FromFtpMoveFileRecursiveTest.java | 6 ++--
.../component/file/remote/FromFtpMoveFileTest.java | 10 +++---
...FromFtpMoveFileToHiddenFolderRecursiveTest.java | 6 ++--
...tpNoEndpointPathRelativeMoveToAbsoluteTest.java | 6 ++--
.../component/file/remote/FromFtpNoFilesTest.java | 5 ++-
.../remote/FromFtpNoopIdempotentFalseTest.java | 10 +++---
.../component/file/remote/FromFtpNoopTest.java | 10 +++---
.../file/remote/FromFtpNotDownloadTest.java | 11 +++---
.../file/remote/FromFtpPassiveModeTest.java | 6 ++--
.../file/remote/FromFtpPollFileOnlyTest.java | 6 ++--
.../file/remote/FromFtpPreMoveDeleteTest.java | 13 ++++---
.../remote/FromFtpPreMoveFileExpressionTest.java | 12 ++++---
.../file/remote/FromFtpPreMoveFilePostfixTest.java | 12 ++++---
.../file/remote/FromFtpPreMoveFilePrefixTest.java | 12 ++++---
.../file/remote/FromFtpPreMoveNoopTest.java | 12 ++++---
.../file/remote/FromFtpRecursiveNoopTest.java | 6 ++--
.../FromFtpRecursiveNotStepwiseNoBasePathTest.java | 6 ++--
.../file/remote/FromFtpRegexPatternTest.java | 6 ++--
.../FromFtpRemoteFileFilterDirectoryTest.java | 15 ++++----
.../file/remote/FromFtpRemoteFileFilterTest.java | 15 ++++----
.../FromFtpRemoteFileSortByExpressionTest.java | 6 ++--
...tpRemoteFileSortByIgnoreCaseExpressionTest.java | 6 ++--
...romFtpRemoteFileSortByNestedExpressionTest.java | 6 ++--
.../file/remote/FromFtpRemoteFileSorterTest.java | 6 ++--
.../file/remote/FromFtpSedaDeleteFileTest.java | 13 ++++---
.../FromFtpServerLanguageCodeAndTimeoutTest.java | 6 ++--
.../file/remote/FromFtpServerLanguageCodeTest.java | 6 ++--
.../FromFtpSetNamesWithMultiDirectoriesTest.java | 19 +++++-----
...leNoEndpointPathRelativeMoveToAbsoluteTest.java | 6 ++--
...leNoEndpointPathRelativeMoveToRelativeTest.java | 6 ++--
.../FromFtpSimpleRelativeMoveToAbsoluteTest.java | 6 ++--
.../FromFtpSimpleRelativeMoveToRelativeTest.java | 6 ++--
.../FromFtpSimulateNetworkIssueRecoverTest.java | 7 ++--
.../FromFtpStartingDirAndFileNameClashTest.java | 6 ++--
.../file/remote/FromFtpThirdPoolOkTest.java | 15 +++++---
.../FromFtpToAsciiFileNoBodyConversionTest.java | 6 ++--
.../file/remote/FromFtpToAsciiFileTest.java | 12 ++++---
.../file/remote/FromFtpToBinaryFileTest.java | 14 ++++----
.../file/remote/FromFtpToBinaryFilesTest.java | 18 +++++-----
.../file/remote/FromFtpToBinarySampleTest.java | 4 +--
.../remote/FromFtpToFileNoFileNameHeaderTest.java | 6 ++--
.../component/file/remote/FromFtpToMockTest.java | 2 +-
.../file/remote/FromFtpTwoSlashesIssueTest.java | 10 +++---
.../file/remote/FromFtpUseListFalseTest.java | 6 ++--
.../remote/FromQueueThenConsumeFtpToMockTest.java | 6 ++--
.../component/file/remote/FtpAnonymousTest.java | 6 ++--
.../file/remote/FtpBadLoginConnectionLeakTest.java | 9 +++--
.../FtpBadLoginInProducerConnectionLeakTest.java | 11 +++---
.../FtpBadLoginMockNoopConnectionLeakTest.java | 22 ++++++++----
.../file/remote/FtpBrowsableEndpointTest.java | 19 ++++++----
.../file/remote/FtpChangedReadLockTest.java | 7 ++--
.../file/remote/FtpChangedRootDirReadLockTest.java | 7 ++--
.../remote/FtpChangedZeroLengthReadLockTest.java | 4 ++-
.../file/remote/FtpConnectTimeoutTest.java | 2 +-
.../file/remote/FtpConsumerAbsolutePathTest.java | 9 +++--
.../file/remote/FtpConsumerAsyncStressTest.java | 6 ++--
.../file/remote/FtpConsumerAutoCreateTest.java | 9 +++--
.../file/remote/FtpConsumerBodyAsStringTest.java | 9 +++--
.../FtpConsumerDeleteNoWritePermissionTest.java | 10 +++---
.../FtpConsumerDirectoriesNotMatchedTest.java | 6 ++--
.../file/remote/FtpConsumerDisconnectTest.java | 13 ++++---
.../remote/FtpConsumerDoneFileNameFixedTest.java | 6 ++--
.../file/remote/FtpConsumerDoneFileNameTest.java | 6 ++--
.../remote/FtpConsumerDualDoneFileNameTest.java | 2 +-
.../file/remote/FtpConsumerExcludeNameTest.java | 6 ++--
.../file/remote/FtpConsumerFileSplitTest.java | 2 +-
.../remote/FtpConsumerIPV6BodyAsStringTest.java | 13 ++++---
.../FtpConsumerIdempotentKeyChangedIssueTest.java | 2 +-
.../remote/FtpConsumerIdempotentMemoryRefTest.java | 5 ++-
.../file/remote/FtpConsumerIdempotentRefTest.java | 7 ++--
.../file/remote/FtpConsumerIdempotentTest.java | 2 +-
.../file/remote/FtpConsumerIncludeNameTest.java | 6 ++--
...nsumerLocalWorkDirectoryAsAbsolutePathTest.java | 20 +++++++----
.../FtpConsumerLocalWorkDirectoryDirectTest.java | 17 +++++----
.../remote/FtpConsumerLocalWorkDirectoryTest.java | 18 ++++++----
.../remote/FtpConsumerMaxMessagesPerPollTest.java | 6 ++--
.../file/remote/FtpConsumerMoveExpressionTest.java | 11 +++---
.../remote/FtpConsumerMultipleDirectoriesTest.java | 10 ++++--
.../FtpConsumerNotEagerMaxMessagesPerPollTest.java | 6 ++--
.../remote/FtpConsumerProcessStrategyTest.java | 8 +++--
.../remote/FtpConsumerRelativeFileNameTest.java | 8 +++--
.../file/remote/FtpConsumerReplyStringTest.java | 2 +-
.../file/remote/FtpConsumerResumeDownloadTest.java | 18 ++++++----
.../file/remote/FtpConsumerSkipDotFilesTest.java | 6 ++--
.../file/remote/FtpConsumerTemplateTest.java | 17 +++++----
.../FtpConsumerTemplateUseListFalseTest.java | 13 ++++---
...FtpConsumerThrowExceptionOnLoginFailedTest.java | 8 +++--
.../FtpConsumerUsingFTPClientConfigTest.java | 6 ++--
.../file/remote/FtpConsumerWithCharsetTest.java | 26 +++++++++-----
.../remote/FtpConsumerWithNoFileOptionTest.java | 9 +++--
.../file/remote/FtpEndpointURISanitizedTest.java | 4 ++-
.../file/remote/FtpIllegalOptionsTest.java | 6 ++--
.../component/file/remote/FtpLoginNoRetryTest.java | 8 +++--
.../camel/component/file/remote/FtpLoginTest.java | 11 ++++--
.../FtpNoReconnectAttemptUnknownHostTest.java | 2 +-
.../FtpPollEnrichBridgeErrorHandlerTest.java | 5 +--
...llEnrichConsumeWithDisconnectAndDeleteTest.java | 12 +++++--
.../remote/FtpPollingConsumerIdleMessageTest.java | 8 +++--
.../file/remote/FtpPollingConsumerTest.java | 8 +++--
...pProducerAllowNullBodyFileAlreadyExistTest.java | 6 ++--
.../file/remote/FtpProducerAllowNullBodyTest.java | 10 ++++--
.../file/remote/FtpProducerBuildDirectoryTest.java | 7 ++--
.../FtpProducerBuildPartOfDirectoryTest.java | 9 +++--
.../file/remote/FtpProducerConcurrentTest.java | 6 ++--
.../remote/FtpProducerConnectErrorsHeaderTest.java | 2 +-
.../FtpProducerDisconnectOnBatchCompleteTest.java | 12 ++++---
.../file/remote/FtpProducerDisconnectTest.java | 13 ++++---
.../file/remote/FtpProducerDoneFileNameTest.java | 27 +++++++++------
.../file/remote/FtpProducerExpressionTest.java | 9 +++--
...FtpProducerFileExistAppendNoFileBeforeTest.java | 8 +++--
.../remote/FtpProducerFileExistAppendTest.java | 8 +++--
.../file/remote/FtpProducerFileExistFailTest.java | 13 ++++---
.../remote/FtpProducerFileExistIgnoreTest.java | 8 +++--
...pProducerFileExistOverrideNoFileBeforeTest.java | 8 +++--
.../remote/FtpProducerFileExistOverrideTest.java | 6 ++--
.../FtpProducerFileExistOverrideTwoUploadTest.java | 5 ++-
.../remote/FtpProducerFileWithCharsetTest.java | 26 +++++++++-----
.../FtpProducerFileWithPathNoStepwiseTest.java | 7 ++--
...ileWithPathPathSeparatorAutoNoStepwiseTest.java | 8 +++--
...ileWithPathPathSeparatorUnixNoStepwiseTest.java | 8 +++--
...WithPathPathSeparatorWindowsNoStepwiseTest.java | 8 +++--
.../file/remote/FtpProducerFileWithPathTest.java | 7 ++--
.../FtpProducerJailStartingDirectoryTest.java | 6 +++-
.../file/remote/FtpProducerMoveExistingTest.java | 9 ++++-
.../remote/FtpProducerMultipleSiteCommandTest.java | 7 ++--
.../file/remote/FtpProducerRawPasswordTest.java | 7 ++--
...tpProducerRecipientListParallelTimeoutTest.java | 6 ++--
.../file/remote/FtpProducerRecipientListTest.java | 10 +++---
.../file/remote/FtpProducerReplyStringTest.java | 2 +-
.../remote/FtpProducerRootFileExistFailTest.java | 13 ++++---
.../file/remote/FtpProducerSendNoopFalseTest.java | 7 ++--
.../file/remote/FtpProducerSiteCommandTest.java | 7 ++--
.../remote/FtpProducerTempFileExistIssueTest.java | 7 +++-
.../file/remote/FtpProducerTempPrefixTest.java | 7 ++--
.../remote/FtpProducerToDMoveExistingTest.java | 4 ++-
.../FtpReconnectAttemptServerStoppedTest.java | 2 +-
.../remote/FtpReconnectAttemptUnknownHostTest.java | 2 +-
.../file/remote/FtpRecursiveDepth2Test.java | 2 +-
.../file/remote/FtpRecursiveDepth3Test.java | 2 +-
.../file/remote/FtpRecursiveDepthTest.java | 2 +-
.../file/remote/FtpServerTestSupport.java | 18 ++++++----
.../remote/FtpShutdownCompleteAllTasksTest.java | 10 +++---
.../FtpShutdownCompleteCurrentTaskOnlyTest.java | 10 +++---
.../file/remote/FtpSimpleConsumeAbsoluteTest.java | 2 +-
...ectoryParseWithAbsoluteDepthNoStepwiseTest.java | 2 +-
.../FtpSimpleConsumeStreamingPartialReadTest.java | 5 ++-
.../file/remote/FtpSimpleConsumeStreamingTest.java | 4 ++-
...impleConsumeStreamingWithMultipleFilesTest.java | 4 ++-
.../component/file/remote/FtpSoTimeoutTest.java | 40 ++++++++++++++--------
.../file/remote/FtpStreamingMoveTest.java | 11 +++---
.../FtpThrowExceptionOnConnectionFailedTest.java | 8 +++--
...FtpUtilsExtractDirNameFromAbsolutePathTest.java | 4 +--
.../file/remote/FtpsServerTestSupport.java | 10 ++++--
.../file/remote/OsgiParserFactoryTest.java | 15 ++++----
.../component/file/remote/PaddyRouteTest.java | 5 ++-
.../RecipientListErrorHandlingIssueTest.java | 2 +-
...tRemoteFilePollingConsumerPollStrategyTest.java | 6 ++--
.../remote/RemoteFileIgnoreDoPollErrorTest.java | 20 ++++++-----
.../RemoteFileProduceOverruleOnlyOnceTest.java | 8 +++--
...llEnrichConsumeWithDisconnectAndDeleteTest.java | 12 +++++--
.../remote/ToFtpTempFileTargetFileExistTest.java | 10 +++---
.../file/remote/UriConfigurationTest.java | 15 +++++---
.../remote/manual/FtpConsumerCamelManualTest.java | 14 ++++----
.../FtpConsumerCamelRecursiveManualTest.java | 14 ++++----
...ConsumerCamelRecursiveToAbsoluteManualTest.java | 14 ++++----
.../FtpConsumerNotStepwiseCamelManualTest.java | 14 ++++----
...onsumerNotStepwiseCamelRecursiveManualTest.java | 14 ++++----
...StepwiseCamelRecursiveToAbsoluteManualTest.java | 14 ++++----
.../remote/manual/FtpConsumerScottManualTest.java | 14 ++++----
.../FtpConsumerScottRecursiveManualTest.java | 14 ++++----
...FromSftpRecursiveNotStepwiseNoBasePathTest.java | 6 ++--
.../file/remote/sftp/SftpChangedReadLockTest.java | 12 ++++---
.../component/file/remote/sftp/SftpChmodTest.java | 13 ++++---
.../file/remote/sftp/SftpConsumeTemplateTest.java | 5 ++-
.../remote/sftp/SftpConsumerAutoCreateTest.java | 9 +++--
.../remote/sftp/SftpConsumerDisconnectTest.java | 10 +++---
.../sftp/SftpConsumerProcessStrategyTest.java | 8 +++--
.../remote/sftp/SftpConsumerWithCharsetTest.java | 5 ++-
.../file/remote/sftp/SftpECKeyFileConsumeTest.java | 2 +-
.../remote/sftp/SftpFromSedaDeleteFileTest.java | 10 +++---
.../file/remote/sftp/SftpKeyConsumeTest.java | 2 +-
.../file/remote/sftp/SftpKeyFileConsumeTest.java | 2 +-
.../remote/sftp/SftpKeyPairDSAConsumeTest.java | 6 ++--
.../remote/sftp/SftpKeyPairRSAConsumeTest.java | 6 ++--
.../sftp/SftpKeyUriConsumeFromClasspathTest.java | 2 +-
.../file/remote/sftp/SftpKeyUriConsumeTest.java | 2 +-
.../file/remote/sftp/SftpProduceTempFileTest.java | 9 +++--
.../SftpProducerFileWithPathNoStepwiseTest.java | 7 ++--
.../remote/sftp/SftpProducerFileWithPathTest.java | 7 ++--
.../remote/sftp/SftpProducerMoveExistingTest.java | 9 ++++-
.../remote/sftp/SftpProducerWithCharsetTest.java | 7 ++--
.../file/remote/sftp/SftpServerTestSupport.java | 16 ++++++---
.../file/remote/sftp/SftpSetCipherTest.java | 7 ++--
.../file/remote/sftp/SftpSetOperationsTest.java | 7 ++--
.../sftp/SftpSimpleConsumeRecursiveTest.java | 2 +-
.../SftpSimpleConsumeStreamingPartialReadTest.java | 5 ++-
.../sftp/SftpSimpleConsumeStreamingTest.java | 4 ++-
...impleConsumeStreamingWithMultipleFilesTest.java | 4 ++-
.../file/remote/sftp/SftpSimpleConsumeTest.java | 2 +-
.../sftp/SftpSimpleConsumeThroughProxyTest.java | 2 +-
.../remote/sftp/SftpSimpleIPV6ConsumeTest.java | 6 ++--
.../sftp/SftpSimpleProduceDisconnectTest.java | 9 +++--
.../sftp/SftpSimpleProduceNotStepwiseTest.java | 11 +++---
.../file/remote/sftp/SftpSimpleProduceTest.java | 11 +++---
.../sftp/SftpSimpleProduceThroughProxyTest.java | 11 +++---
.../file/remote/sftp/SftpUseListFalseTest.java | 2 +-
.../src/main/docs/test-junit5.adoc | 2 ++
249 files changed, 1261 insertions(+), 765 deletions(-)
diff --git a/components/camel-ftp/pom.xml b/components/camel-ftp/pom.xml
index 9d1b88f..89855e4 100644
--- a/components/camel-ftp/pom.xml
+++ b/components/camel-ftp/pom.xml
@@ -56,7 +56,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -65,6 +65,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<scope>test</scope>
@@ -155,6 +160,12 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <version>${mockito-version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/BaseServerTestSupport.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/BaseServerTestSupport.java
index b14d58f..e32fa8e 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/BaseServerTestSupport.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/BaseServerTestSupport.java
@@ -17,15 +17,18 @@
package org.apache.camel.component.file.remote;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
public class BaseServerTestSupport extends CamelTestSupport {
+
+ protected static final String LS = System.lineSeparator();
+
protected int port;
private boolean portInitialized;
- @Before
+ @BeforeEach
public void initPort() throws Exception {
if (!portInitialized) {
// call only once per test method (Some tests can call this method manually in setUp method,
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/ConsumerTemplateFtpShutdownTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/ConsumerTemplateFtpShutdownTest.java
index 336063e..314beff 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/ConsumerTemplateFtpShutdownTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/ConsumerTemplateFtpShutdownTest.java
@@ -17,7 +17,9 @@
package org.apache.camel.component.file.remote;
import org.apache.camel.Exchange;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
*
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpTempFileNameTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpTempFileNameTest.java
index 9133180..d041e01 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpTempFileNameTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpTempFileNameTest.java
@@ -21,7 +21,9 @@ import java.io.File;
import org.apache.camel.Exchange;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
*
@@ -37,7 +39,7 @@ public class FileToFtpTempFileNameTest extends FtpServerTestSupport {
assertTrue(notify.matchesMockWaitTime());
File file = new File(FTP_ROOT_DIR + "/out/sub/hello.txt");
- assertTrue("File should exists " + file, file.exists());
+ assertTrue(file.exists(), "File should exists " + file);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithClientAuthTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithClientAuthTest.java
index d0dfb9d..9c46711 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithClientAuthTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithClientAuthTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test the ftps component over SSL (explicit) with client authentication
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithoutClientAuthTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithoutClientAuthTest.java
index 72c68e2..df72e92 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithoutClientAuthTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithoutClientAuthTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test the ftps component over SSL (explicit) without client authentication
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitTLSWithClientAuthTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitTLSWithClientAuthTest.java
index 6175c27..f801a47 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitTLSWithClientAuthTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitTLSWithClientAuthTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test the ftps component over TLS (explicit) with client authentication
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitTLSWithoutClientAuthTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitTLSWithoutClientAuthTest.java
index 71d04cd..07b6608 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitTLSWithoutClientAuthTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitTLSWithoutClientAuthTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test the ftps component over TLS (explicit) without client authentication
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitSSLWithClientAuthTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitSSLWithClientAuthTest.java
index e71182a..afb0aa6 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitSSLWithClientAuthTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitSSLWithClientAuthTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test the ftps component over SSL (implicit) with client authentication
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitSSLWithoutClientAuthTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitSSLWithoutClientAuthTest.java
index 4b28c23..81dde79 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitSSLWithoutClientAuthTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitSSLWithoutClientAuthTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test the ftps component over SSL (implicit) without client authentication
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitTLSWithClientAuthTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitTLSWithClientAuthTest.java
index 5301d96..274cb23 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitTLSWithClientAuthTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitTLSWithClientAuthTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test the ftps component over TLS (implicit) with client authentication
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitTLSWithoutClientAuthTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitTLSWithoutClientAuthTest.java
index 5f0a92f..639ccb9 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitTLSWithoutClientAuthTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitTLSWithoutClientAuthTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test the ftps component over TLS (implicit) without client authentication
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithCustomKeyAndTrustStorePropertiesTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithCustomKeyAndTrustStorePropertiesTest.java
index b7dfca3..cff8b4c 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithCustomKeyAndTrustStorePropertiesTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithCustomKeyAndTrustStorePropertiesTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test the ftps component over SSL (explicit) and without client authentication
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithCustomTrustStorePropertiesTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithCustomTrustStorePropertiesTest.java
index 568800c..bc3ccc1 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithCustomTrustStorePropertiesTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithCustomTrustStorePropertiesTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test the ftps component over SSL (explicit) and without client authentication
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithDefaultSettingsIPV6Test.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithDefaultSettingsIPV6Test.java
index e0599ad..d00260a 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithDefaultSettingsIPV6Test.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithDefaultSettingsIPV6Test.java
@@ -18,13 +18,13 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
/**
* Test the ftps component over TLS (explicit) and without client authentication
*/
-@Ignore
+@Disabled
public class FileToFtpsWithDefaultSettingsIPV6Test extends FtpsServerExplicitTLSWithoutClientAuthTestSupport {
private String getFtpUrl() {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithDefaultSettingsTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithDefaultSettingsTest.java
index 8e4ab70..f243c40 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithDefaultSettingsTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithDefaultSettingsTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test the ftps component over TLS (explicit) and without client authentication
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithFtpClientConfigRefTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithFtpClientConfigRefTest.java
index 40db73e..9c84452 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithFtpClientConfigRefTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithFtpClientConfigRefTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.commons.net.ftp.FTPSClient;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test the ftps component over SSL (explicit) and without client authentication
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFilePercentSignInPasswordTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFilePercentSignInPasswordTest.java
index 8bef48d..0b047b6 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFilePercentSignInPasswordTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFilePercentSignInPasswordTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class FromFilePercentSignInPasswordTest extends FtpServerTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileToFtpDefaultRootRenameStrategyTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileToFtpDefaultRootRenameStrategyTest.java
index 8467aaf..059201e 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileToFtpDefaultRootRenameStrategyTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileToFtpDefaultRootRenameStrategyTest.java
@@ -24,13 +24,15 @@ import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.IOConverter;
-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.assertTrue;
public class FromFileToFtpDefaultRootRenameStrategyTest extends FtpServerTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileToFtpDeleteTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileToFtpDeleteTest.java
index a28fcbf..47ac0d0 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileToFtpDeleteTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileToFtpDeleteTest.java
@@ -22,7 +22,10 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class FromFileToFtpDeleteTest extends FtpServerTestSupport {
@@ -44,11 +47,11 @@ public class FromFileToFtpDeleteTest extends FtpServerTestSupport {
// file should be deleted
File file = new File("target/delete/hello.txt");
- assertFalse("File should be deleted", file.exists());
+ assertFalse(file.exists(), "File should be deleted");
// file should exists on ftp server
file = new File(FTP_ROOT_DIR + "/hello.txt");
- assertTrue("File should exist on ftp server", file.exists());
+ assertTrue(file.exists(), "File should exist on ftp server");
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileToFtpTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileToFtpTest.java
index 3bf5ff9..ac22df6 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileToFtpTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileToFtpTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class FromFileToFtpTest extends FtpServerTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileToFtpWithChmodTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileToFtpWithChmodTest.java
index 2b86289..c95158f 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileToFtpWithChmodTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileToFtpWithChmodTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class FromFileToFtpWithChmodTest extends FtpServerTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileTransferLoggingLevelTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileTransferLoggingLevelTest.java
index e18274cd..dd9ee72 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileTransferLoggingLevelTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileTransferLoggingLevelTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class FromFileTransferLoggingLevelTest extends FtpServerTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileTransferLoggingLevelVerboseTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileTransferLoggingLevelVerboseTest.java
index babdf07..dbe6870 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileTransferLoggingLevelVerboseTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileTransferLoggingLevelVerboseTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class FromFileTransferLoggingLevelVerboseTest extends FtpServerTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpActivePortRangeTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpActivePortRangeTest.java
index f026768..cd091ae 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpActivePortRangeTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpActivePortRangeTest.java
@@ -21,8 +21,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class FromFtpActivePortRangeTest extends FtpServerTestSupport {
@@ -31,7 +31,7 @@ public class FromFtpActivePortRangeTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpAsyncProcessTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpAsyncProcessTest.java
index ccc9342..aefa3d1 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpAsyncProcessTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpAsyncProcessTest.java
@@ -24,7 +24,9 @@ import org.apache.camel.AsyncCallback;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.support.AsyncProcessorSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
/**
*
@@ -54,10 +56,10 @@ public class FromFtpAsyncProcessTest extends FtpServerTestSupport {
Thread.sleep(1000);
File hello = new File(FTP_ROOT_DIR + "/async/hello.txt");
- assertFalse("File should not exist " + hello, hello.exists());
+ assertFalse(hello.exists(), "File should not exist " + hello);
File bye = new File(FTP_ROOT_DIR + "/async/bye.txt");
- assertFalse("File should not exist " + bye, bye.exists());
+ assertFalse(bye.exists(), "File should not exist " + bye);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpClientConfigRefTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpClientConfigRefTest.java
index c3b09cc..a309cdf 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpClientConfigRefTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpClientConfigRefTest.java
@@ -23,8 +23,8 @@ import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.commons.net.ftp.FTPClientConfig;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class FromFtpClientConfigRefTest extends FtpServerTestSupport {
@@ -43,7 +43,7 @@ public class FromFtpClientConfigRefTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpClientDataTimeoutTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpClientDataTimeoutTest.java
index fb56682..9e85058 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpClientDataTimeoutTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpClientDataTimeoutTest.java
@@ -21,8 +21,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class FromFtpClientDataTimeoutTest extends FtpServerTestSupport {
@@ -31,7 +31,7 @@ public class FromFtpClientDataTimeoutTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpClientSoTimeout2Test.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpClientSoTimeout2Test.java
index aee18c5..6eac7d7 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpClientSoTimeout2Test.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpClientSoTimeout2Test.java
@@ -21,8 +21,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class FromFtpClientSoTimeout2Test extends FtpServerTestSupport {
@@ -31,7 +31,7 @@ public class FromFtpClientSoTimeout2Test extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpClientSoTimeout3Test.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpClientSoTimeout3Test.java
index 40bdb6b..794772f 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpClientSoTimeout3Test.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpClientSoTimeout3Test.java
@@ -20,9 +20,11 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.commons.net.ftp.FTPFile;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Test re-creating operations
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpClientSoTimeoutTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpClientSoTimeoutTest.java
index 90cb2f6..2f3119c 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpClientSoTimeoutTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpClientSoTimeoutTest.java
@@ -21,8 +21,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class FromFtpClientSoTimeoutTest extends FtpServerTestSupport {
@@ -31,7 +31,7 @@ public class FromFtpClientSoTimeoutTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpConsumerTemplateRollbackTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpConsumerTemplateRollbackTest.java
index 91eae9b..660b37f 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpConsumerTemplateRollbackTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpConsumerTemplateRollbackTest.java
@@ -22,8 +22,13 @@ import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.component.file.GenericFileOperationFailedException;
-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.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
public class FromFtpConsumerTemplateRollbackTest extends FtpServerTestSupport {
@@ -37,7 +42,7 @@ public class FromFtpConsumerTemplateRollbackTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
@@ -68,7 +73,7 @@ public class FromFtpConsumerTemplateRollbackTest extends FtpServerTestSupport {
// assert file is created
File file = new File(FTP_ROOT_DIR + "/deletefile/hello.txt");
- assertTrue("The file should exists", file.exists());
+ assertTrue(file.exists(), "The file should exists");
}
}
\ No newline at end of file
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpConsumerTemplateTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpConsumerTemplateTest.java
index 442385a..667e03a 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpConsumerTemplateTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpConsumerTemplateTest.java
@@ -21,8 +21,12 @@ import java.io.File;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
-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.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class FromFtpConsumerTemplateTest extends FtpServerTestSupport {
@@ -31,7 +35,7 @@ public class FromFtpConsumerTemplateTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
@@ -44,7 +48,7 @@ public class FromFtpConsumerTemplateTest extends FtpServerTestSupport {
// assert the file is deleted
File file = new File(FTP_ROOT_DIR + "/deletefile/hello.txt");
- assertFalse("The file should have been deleted", file.exists());
+ assertFalse(file.exists(), "The file should have been deleted");
}
private void prepareFtpServer() throws Exception {
@@ -61,7 +65,7 @@ public class FromFtpConsumerTemplateTest extends FtpServerTestSupport {
// assert file is created
File file = new File(FTP_ROOT_DIR + "/deletefile/hello.txt");
- assertTrue("The file should exists", file.exists());
+ assertTrue(file.exists(), "The file should exists");
}
}
\ No newline at end of file
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDeleteFileTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDeleteFileTest.java
index 09c35a7..1a79103 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDeleteFileTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDeleteFileTest.java
@@ -23,8 +23,11 @@ import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Unit test to test delete option.
@@ -36,7 +39,7 @@ public class FromFtpDeleteFileTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
@@ -54,7 +57,7 @@ public class FromFtpDeleteFileTest extends FtpServerTestSupport {
// assert the file is deleted
File file = new File(FTP_ROOT_DIR + "/deletefile/hello.txt");
- assertFalse("The file should have been deleted", file.exists());
+ assertFalse(file.exists(), "The file should have been deleted");
}
private void prepareFtpServer() throws Exception {
@@ -71,7 +74,7 @@ public class FromFtpDeleteFileTest extends FtpServerTestSupport {
// assert file is created
File file = new File(FTP_ROOT_DIR + "/deletefile/hello.txt");
- assertTrue("The file should exists", file.exists());
+ assertTrue(file.exists(), "The file should exists");
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDirectoryToBinaryFilesTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDirectoryToBinaryFilesTest.java
index 9f7819b..4e7a1da 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDirectoryToBinaryFilesTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDirectoryToBinaryFilesTest.java
@@ -22,8 +22,10 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.IOConverter;
-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.assertTrue;
/**
* Unit test to verify that we can pool a BINARY file in a directory from the
@@ -37,7 +39,7 @@ public class FromFtpDirectoryToBinaryFilesTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
@@ -51,17 +53,17 @@ public class FromFtpDirectoryToBinaryFilesTest extends FtpServerTestSupport {
Exchange ex = resultEndpoint.getExchanges().get(0);
byte[] bytes = ex.getIn().getBody(byte[].class);
- assertTrue("Logo size wrong", bytes.length > 10000);
+ assertTrue(bytes.length > 10000, "Logo size wrong");
// assert the file
File file = new File("target/ftptest/logo1.jpeg");
- assertTrue("The binary file should exists", file.exists());
- assertTrue("Logo size wrong", file.length() > 10000);
+ assertTrue(file.exists(), "The binary file should exists");
+ assertTrue(file.length() > 10000, "Logo size wrong");
// assert the file
file = new File("target/ftptest/logo.jpeg");
- assertTrue(" The binary file should exists", file.exists());
- assertTrue("Logo size wrong", file.length() > 10000);
+ assertTrue(file.exists(), " The binary file should exists");
+ assertTrue(file.length() > 10000, "Logo size wrong");
}
private void prepareFtpServer() throws Exception {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDoNotDeleteFileIfProcessFailsTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDoNotDeleteFileIfProcessFailsTest.java
index e1175e1..b7ffaed 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDoNotDeleteFileIfProcessFailsTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDoNotDeleteFileIfProcessFailsTest.java
@@ -24,8 +24,10 @@ import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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.assertTrue;
public class FromFtpDoNotDeleteFileIfProcessFailsTest extends FtpServerTestSupport {
@@ -34,7 +36,7 @@ public class FromFtpDoNotDeleteFileIfProcessFailsTest extends FtpServerTestSuppo
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
@@ -53,7 +55,7 @@ public class FromFtpDoNotDeleteFileIfProcessFailsTest extends FtpServerTestSuppo
// assert the file is deleted
File file = new File(FTP_ROOT_DIR + "/deletefile/hello.txt");
- assertTrue("The file should NOT have been deleted", file.exists());
+ assertTrue(file.exists(), "The file should NOT have been deleted");
}
private void prepareFtpServer() throws Exception {
@@ -70,7 +72,7 @@ public class FromFtpDoNotDeleteFileIfProcessFailsTest extends FtpServerTestSuppo
// assert file is created
File file = new File(FTP_ROOT_DIR + "/deletefile/hello.txt");
- assertTrue("The file should exists", file.exists());
+ assertTrue(file.exists(), "The file should exists");
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpExclusiveReadNoneStrategyTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpExclusiveReadNoneStrategyTest.java
index edd870c..bba9bfc 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpExclusiveReadNoneStrategyTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpExclusiveReadNoneStrategyTest.java
@@ -24,10 +24,16 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.camel.test.junit5.TestSupport.createDirectory;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
/**
* Unit test to verify *NON* exclusive read.
*/
@@ -40,12 +46,10 @@ public class FromFtpExclusiveReadNoneStrategyTest extends FtpServerTestSupport {
+ "&readLock=none&delay=500";
}
+ // Cannot test on windows due file system works differently with file locks
+ @DisabledOnOs(OS.WINDOWS)
@Test
public void testPollFileWhileSlowFileIsBeingWrittenUsingNonExclusiveRead() throws Exception {
- // cannot test on windows due file system works differently with file locks
- if (isPlatform("windows")) {
- return;
- }
context.addRoutes(new RouteBuilder() {
@Override
@@ -70,7 +74,7 @@ public class FromFtpExclusiveReadNoneStrategyTest extends FtpServerTestSupport {
// file currently in progress of being written - so we get only the Hello World part
String body = mock.getReceivedExchanges().get(0).getIn().getBody(String.class);
LOG.debug("Body is: " + body);
- assertFalse("Should not wait and read the entire file", body.endsWith("Bye World"));
+ assertFalse(body.endsWith("Bye World"), "Should not wait and read the entire file");
}
private static class MySlowFileProcessor implements Processor {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpFilterTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpFilterTest.java
index 97350fe..0f6e5f6 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpFilterTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpFilterTest.java
@@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.file.GenericFile;
import org.apache.camel.component.file.GenericFileFilter;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Unit test to test filter option.
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpKeepLastModifiedTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpKeepLastModifiedTest.java
index 53f9a7d..212f510 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpKeepLastModifiedTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpKeepLastModifiedTest.java
@@ -21,8 +21,11 @@ import java.io.File;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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.assertNotSame;
/**
* Unit test to test keepLastModified option.
@@ -34,7 +37,7 @@ public class FromFtpKeepLastModifiedTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
template.sendBodyAndHeader(getFtpUrl(), "Hello World", "CamelFileName", "hello.txt");
@@ -61,7 +64,7 @@ public class FromFtpKeepLastModifiedTest extends FtpServerTestSupport {
long t1 = mock.getReceivedExchanges().get(0).getIn().getHeader(Exchange.FILE_LAST_MODIFIED, long.class);
long t2 = new File("target/keep/out/hello.txt").lastModified();
- assertEquals("Timestamp should have been kept", t1, t2);
+ assertEquals(t1, t2, "Timestamp should have been kept");
}
@Test
@@ -85,7 +88,7 @@ public class FromFtpKeepLastModifiedTest extends FtpServerTestSupport {
long t1 = mock.getReceivedExchanges().get(0).getIn().getHeader(Exchange.FILE_LAST_MODIFIED, long.class);
long t2 = new File("target/keep/out/hello.txt").lastModified();
- assertNotSame("Timestamp should NOT have been kept", t1, t2);
+ assertNotSame(t1, t2, "Timestamp should NOT have been kept");
}
@Test
@@ -109,6 +112,6 @@ public class FromFtpKeepLastModifiedTest extends FtpServerTestSupport {
long t1 = mock.getReceivedExchanges().get(0).getIn().getHeader(Exchange.FILE_LAST_MODIFIED, long.class);
long t2 = new File("target/keep/out/hello.txt").lastModified();
- assertNotSame("Timestamp should NOT have been kept", t1, t2);
+ assertNotSame(t1, t2, "Timestamp should NOT have been kept");
}
}
\ No newline at end of file
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileAbsoluteFolderRecursiveTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileAbsoluteFolderRecursiveTest.java
index 77a2e5d..98d4af3 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileAbsoluteFolderRecursiveTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileAbsoluteFolderRecursiveTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Unit test based on end user problem with SFTP on Windows
@@ -33,7 +33,7 @@ public class FromFtpMoveFileAbsoluteFolderRecursiveTest extends FtpServerTestSup
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePostfixTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePostfixTest.java
index 3a04d3a..60be9f7 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePostfixTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePostfixTest.java
@@ -23,8 +23,10 @@ import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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.assertTrue;
/**
* Unit test to test consumer.moveNamePostfix option.
@@ -37,7 +39,7 @@ public class FromFtpMoveFilePostfixTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
@@ -67,7 +69,7 @@ public class FromFtpMoveFilePostfixTest extends FtpServerTestSupport {
// assert file is created
File file = new File(FTP_ROOT_DIR + "/movefile/hello.txt");
- assertTrue("The file should exists", file.exists());
+ assertTrue(file.exists(), "The file should exists");
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePrefixTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePrefixTest.java
index 8123094..347ebba 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePrefixTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePrefixTest.java
@@ -23,8 +23,10 @@ import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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.assertTrue;
/**
* Unit test to test consumer.moveNamePrefix option.
@@ -37,7 +39,7 @@ public class FromFtpMoveFilePrefixTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
@@ -67,7 +69,7 @@ public class FromFtpMoveFilePrefixTest extends FtpServerTestSupport {
// assert file is created
File file = new File(FTP_ROOT_DIR + "/movefile/hello.txt");
- assertTrue("The file should exists", file.exists());
+ assertTrue(file.exists(), "The file should exists");
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileRecursiveTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileRecursiveTest.java
index ea64260..1b4196f 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileRecursiveTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileRecursiveTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Unit test based on end user problem with SFTP on Windows
@@ -33,7 +33,7 @@ public class FromFtpMoveFileRecursiveTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileTest.java
index 5c2d550..5462071 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileTest.java
@@ -23,8 +23,10 @@ import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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.assertTrue;
/**
* Unit test to test both consumer.moveNamePrefix and consumer.moveNamePostfix options.
@@ -37,7 +39,7 @@ public class FromFtpMoveFileTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
@@ -67,7 +69,7 @@ public class FromFtpMoveFileTest extends FtpServerTestSupport {
// assert file is created
File file = new File(FTP_ROOT_DIR + "/movefile/hello.txt");
- assertTrue("The file should exists", file.exists());
+ assertTrue(file.exists(), "The file should exists");
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileToHiddenFolderRecursiveTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileToHiddenFolderRecursiveTest.java
index 9b19985..221fc89 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileToHiddenFolderRecursiveTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileToHiddenFolderRecursiveTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Unit test based on end user problem with SFTP on Windows
@@ -33,7 +33,7 @@ public class FromFtpMoveFileToHiddenFolderRecursiveTest extends FtpServerTestSup
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoEndpointPathRelativeMoveToAbsoluteTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoEndpointPathRelativeMoveToAbsoluteTest.java
index 407d4a7..80b9ded 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoEndpointPathRelativeMoveToAbsoluteTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoEndpointPathRelativeMoveToAbsoluteTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class FromFtpNoEndpointPathRelativeMoveToAbsoluteTest extends FtpServerTestSupport {
@@ -30,7 +30,7 @@ public class FromFtpNoEndpointPathRelativeMoveToAbsoluteTest extends FtpServerTe
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoFilesTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoFilesTest.java
index a211559..2a07821 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoFilesTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoFilesTest.java
@@ -18,7 +18,10 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.createDirectory;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
/**
* Unit test to verify polling a server with no files to poll.
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoopIdempotentFalseTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoopIdempotentFalseTest.java
index 82e534d..7e09e55 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoopIdempotentFalseTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoopIdempotentFalseTest.java
@@ -23,8 +23,10 @@ import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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.assertTrue;
/**
* Unit test to test noop and idempotent option.
@@ -36,7 +38,7 @@ public class FromFtpNoopIdempotentFalseTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
@@ -52,7 +54,7 @@ public class FromFtpNoopIdempotentFalseTest extends FtpServerTestSupport {
// assert the file is still there
File file = new File(FTP_ROOT_DIR + "/noop/hello.txt");
- assertTrue("The file should exists", file.exists());
+ assertTrue(file.exists(), "The file should exists");
}
private void prepareFtpServer() throws Exception {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoopTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoopTest.java
index d0005a8..58a79bc 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoopTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoopTest.java
@@ -23,8 +23,10 @@ import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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.assertTrue;
/**
* Unit test to test noop option.
@@ -36,7 +38,7 @@ public class FromFtpNoopTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
@@ -52,7 +54,7 @@ public class FromFtpNoopTest extends FtpServerTestSupport {
// assert the file is still there
File file = new File(FTP_ROOT_DIR + "/noop/hello.txt");
- assertTrue("The file should exists", file.exists());
+ assertTrue(file.exists(), "The file should exists");
}
private void prepareFtpServer() throws Exception {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNotDownloadTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNotDownloadTest.java
index ed55a38..4b4c887 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNotDownloadTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNotDownloadTest.java
@@ -22,8 +22,11 @@ import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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.assertNull;
/**
*
@@ -35,7 +38,7 @@ public class FromFtpNotDownloadTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
@@ -68,7 +71,7 @@ public class FromFtpNotDownloadTest extends FtpServerTestSupport {
public void configure() throws Exception {
from(getFtpUrl()).process(new Processor() {
public void process(Exchange exchange) throws Exception {
- assertNull("Should not download the file", exchange.getIn().getBody());
+ assertNull(exchange.getIn().getBody(), "Should not download the file");
assertEquals("hello.txt", exchange.getIn().getHeader(Exchange.FILE_NAME));
}
}).to("mock:result");
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPassiveModeTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPassiveModeTest.java
index 6456902..4f560495 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPassiveModeTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPassiveModeTest.java
@@ -21,8 +21,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class FromFtpPassiveModeTest extends FtpServerTestSupport {
@@ -31,7 +31,7 @@ public class FromFtpPassiveModeTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPollFileOnlyTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPollFileOnlyTest.java
index c351848..d1f8ccd 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPollFileOnlyTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPollFileOnlyTest.java
@@ -21,8 +21,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Unit test to poll a file from the FTP server and not a folder as most test is.
@@ -34,7 +34,7 @@ public class FromFtpPollFileOnlyTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveDeleteTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveDeleteTest.java
index 7412671..8968bc9 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveDeleteTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveDeleteTest.java
@@ -24,8 +24,11 @@ import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Unit test to test preMove with delete option.
@@ -37,7 +40,7 @@ public class FromFtpPreMoveDeleteTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
@@ -54,7 +57,7 @@ public class FromFtpPreMoveDeleteTest extends FtpServerTestSupport {
// and file should be deleted
Thread.sleep(1000);
File file = new File(FTP_ROOT_DIR + "/movefile/work/hello.txt");
- assertFalse("The file should have been deleted", file.exists());
+ assertFalse(file.exists(), "The file should have been deleted");
}
private void prepareFtpServer() throws Exception {
@@ -78,7 +81,7 @@ public class FromFtpPreMoveDeleteTest extends FtpServerTestSupport {
public void process(Exchange exchange) throws Exception {
// assert the file is pre moved
File file = new File(FTP_ROOT_DIR + "/movefile/work/hello.txt");
- assertTrue("The file should have been moved", file.exists());
+ assertTrue(file.exists(), "The file should have been moved");
}
}).to("mock:result");
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFileExpressionTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFileExpressionTest.java
index a95eda9..e0fe1bc 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFileExpressionTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFileExpressionTest.java
@@ -24,8 +24,10 @@ import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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.assertTrue;
/**
* Unit test to test preMove option.
@@ -38,7 +40,7 @@ public class FromFtpPreMoveFileExpressionTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
@@ -67,7 +69,7 @@ public class FromFtpPreMoveFileExpressionTest extends FtpServerTestSupport {
// assert file is created
File file = new File(FTP_ROOT_DIR + "/movefile/hello.txt");
- assertTrue("The file should exists", file.exists());
+ assertTrue(file.exists(), "The file should exists");
}
@Override
@@ -78,7 +80,7 @@ public class FromFtpPreMoveFileExpressionTest extends FtpServerTestSupport {
public void process(Exchange exchange) throws Exception {
// assert the file is pre moved
File file = new File(FTP_ROOT_DIR + "/inprogress/hello.bak");
- assertTrue("The file should have been moved", file.exists());
+ assertTrue(file.exists(), "The file should have been moved");
}
}).to("mock:result");
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePostfixTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePostfixTest.java
index 9eec421..9f02382 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePostfixTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePostfixTest.java
@@ -23,8 +23,10 @@ import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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.assertTrue;
/**
* Unit test to test preMoveNamePostfix option.
@@ -37,7 +39,7 @@ public class FromFtpPreMoveFilePostfixTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
@@ -53,7 +55,7 @@ public class FromFtpPreMoveFilePostfixTest extends FtpServerTestSupport {
// assert the file is moved
File file = new File(FTP_ROOT_DIR + "/movefile/hello.txt.old");
- assertTrue("The file should have been moved", file.exists());
+ assertTrue(file.exists(), "The file should have been moved");
}
private void prepareFtpServer() throws Exception {
@@ -70,7 +72,7 @@ public class FromFtpPreMoveFilePostfixTest extends FtpServerTestSupport {
// assert file is created
File file = new File(FTP_ROOT_DIR + "/movefile/hello.txt");
- assertTrue("The file should exists", file.exists());
+ assertTrue(file.exists(), "The file should exists");
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePrefixTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePrefixTest.java
index 4c99511..5ce7295 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePrefixTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePrefixTest.java
@@ -23,8 +23,10 @@ import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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.assertTrue;
/**
* Unit test to test preMoveNamePrefix option.
@@ -37,7 +39,7 @@ public class FromFtpPreMoveFilePrefixTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
@@ -53,7 +55,7 @@ public class FromFtpPreMoveFilePrefixTest extends FtpServerTestSupport {
// assert the file is moved
File file = new File(FTP_ROOT_DIR + "/movefile/done/hello.txt");
- assertTrue("The file should have been moved", file.exists());
+ assertTrue(file.exists(), "The file should have been moved");
}
private void prepareFtpServer() throws Exception {
@@ -70,7 +72,7 @@ public class FromFtpPreMoveFilePrefixTest extends FtpServerTestSupport {
// assert file is created
File file = new File(FTP_ROOT_DIR + "/movefile/hello.txt");
- assertTrue("The file should exists", file.exists());
+ assertTrue(file.exists(), "The file should exists");
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveNoopTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveNoopTest.java
index 35235a4..d60397b 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveNoopTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveNoopTest.java
@@ -24,8 +24,10 @@ import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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.assertTrue;
/**
* Unit test to test preMove with noop option.
@@ -37,7 +39,7 @@ public class FromFtpPreMoveNoopTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
@@ -54,7 +56,7 @@ public class FromFtpPreMoveNoopTest extends FtpServerTestSupport {
// and file should be kept there
Thread.sleep(1000);
File file = new File(FTP_ROOT_DIR + "/movefile/work/hello.txt");
- assertTrue("The file should exists", file.exists());
+ assertTrue(file.exists(), "The file should exists");
}
private void prepareFtpServer() throws Exception {
@@ -78,7 +80,7 @@ public class FromFtpPreMoveNoopTest extends FtpServerTestSupport {
public void process(Exchange exchange) throws Exception {
// assert the file is pre moved
File file = new File(FTP_ROOT_DIR + "/movefile/work/hello.txt");
- assertTrue("The file should have been moved", file.exists());
+ assertTrue(file.exists(), "The file should have been moved");
}
}).to("mock:result");
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRecursiveNoopTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRecursiveNoopTest.java
index 28f05ff..f39944f 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRecursiveNoopTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRecursiveNoopTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class FromFtpRecursiveNoopTest extends FtpServerTestSupport {
@@ -30,7 +30,7 @@ public class FromFtpRecursiveNoopTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRecursiveNotStepwiseNoBasePathTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRecursiveNotStepwiseNoBasePathTest.java
index e8e91f9..e70a81a 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRecursiveNotStepwiseNoBasePathTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRecursiveNotStepwiseNoBasePathTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class FromFtpRecursiveNotStepwiseNoBasePathTest extends FtpServerTestSupport {
@@ -29,7 +29,7 @@ public class FromFtpRecursiveNotStepwiseNoBasePathTest extends FtpServerTestSupp
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRegexPatternTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRegexPatternTest.java
index e333f35..ec14659 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRegexPatternTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRegexPatternTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Unit test to verify regexPattern option.
@@ -32,7 +32,7 @@ public class FromFtpRegexPatternTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileFilterDirectoryTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileFilterDirectoryTest.java
index 8dc69da..75bcc66 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileFilterDirectoryTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileFilterDirectoryTest.java
@@ -21,8 +21,10 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.file.GenericFile;
import org.apache.camel.component.file.GenericFileFilter;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
/**
* Unit test to verify FTP filter option.
@@ -37,19 +39,16 @@ public class FromFtpRemoteFileFilterDirectoryTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
}
+ // Skip testing on AIX as it have an issue with this test with the file filter
+ @DisabledOnOs(OS.AIX)
@Test
public void testFtpFilter() throws Exception {
- if (isPlatform("aix")) {
- // skip testing on AIX as it have an issue with this test with the
- // file filter
- return;
- }
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileFilterTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileFilterTest.java
index 9ca16d6..a6cee87 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileFilterTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileFilterTest.java
@@ -21,8 +21,10 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.file.GenericFile;
import org.apache.camel.component.file.GenericFileFilter;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
/**
* Unit test to verify FTP filter option.
@@ -37,19 +39,16 @@ public class FromFtpRemoteFileFilterTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
}
+ // Skip testing on AIX as it have an issue with this test with the file filter
+ @DisabledOnOs(OS.AIX)
@Test
public void testFtpFilter() throws Exception {
- if (isPlatform("aix")) {
- // skip testing on AIX as it have an issue with this test with the
- // file filter
- return;
- }
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(2);
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSortByExpressionTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSortByExpressionTest.java
index 5d2bf26..ca35748 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSortByExpressionTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSortByExpressionTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Unit test to verify remotefile sortby option.
@@ -31,7 +31,7 @@ public class FromFtpRemoteFileSortByExpressionTest extends FtpServerTestSupport
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSortByIgnoreCaseExpressionTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSortByIgnoreCaseExpressionTest.java
index e6bec50..d4866bb 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSortByIgnoreCaseExpressionTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSortByIgnoreCaseExpressionTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Unit test to verify remotefile sortby option.
@@ -31,7 +31,7 @@ public class FromFtpRemoteFileSortByIgnoreCaseExpressionTest extends FtpServerTe
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSortByNestedExpressionTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSortByNestedExpressionTest.java
index 813b9a3..7051461 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSortByNestedExpressionTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSortByNestedExpressionTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Unit test to verify remotefile sort by option.
@@ -31,7 +31,7 @@ public class FromFtpRemoteFileSortByNestedExpressionTest extends FtpServerTestSu
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSorterTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSorterTest.java
index 6bf1acb..1365cdc 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSorterTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSorterTest.java
@@ -21,8 +21,8 @@ import java.util.Comparator;
import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Unit test to verify remotefile sorter option.
@@ -37,7 +37,7 @@ public class FromFtpRemoteFileSorterTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSedaDeleteFileTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSedaDeleteFileTest.java
index b452e2b..193abf9 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSedaDeleteFileTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSedaDeleteFileTest.java
@@ -23,8 +23,11 @@ import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Unit test to test delete option.
@@ -36,7 +39,7 @@ public class FromFtpSedaDeleteFileTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
@@ -54,7 +57,7 @@ public class FromFtpSedaDeleteFileTest extends FtpServerTestSupport {
// assert the file is deleted
File file = new File(FTP_ROOT_DIR + "/deletefile/hello.txt");
- assertFalse("The file should have been deleted", file.exists());
+ assertFalse(file.exists(), "The file should have been deleted");
}
private void prepareFtpServer() throws Exception {
@@ -71,7 +74,7 @@ public class FromFtpSedaDeleteFileTest extends FtpServerTestSupport {
// assert file is created
File file = new File(FTP_ROOT_DIR + "/deletefile/hello.txt");
- assertTrue("The file should exists", file.exists());
+ assertTrue(file.exists(), "The file should exists");
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpServerLanguageCodeAndTimeoutTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpServerLanguageCodeAndTimeoutTest.java
index 655ee47..1e7e492 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpServerLanguageCodeAndTimeoutTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpServerLanguageCodeAndTimeoutTest.java
@@ -21,8 +21,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class FromFtpServerLanguageCodeAndTimeoutTest extends FtpServerTestSupport {
@@ -32,7 +32,7 @@ public class FromFtpServerLanguageCodeAndTimeoutTest extends FtpServerTestSuppor
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpServerLanguageCodeTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpServerLanguageCodeTest.java
index e692f50..0c2dd21 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpServerLanguageCodeTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpServerLanguageCodeTest.java
@@ -21,8 +21,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class FromFtpServerLanguageCodeTest extends FtpServerTestSupport {
@@ -31,7 +31,7 @@ public class FromFtpServerLanguageCodeTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSetNamesWithMultiDirectoriesTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSetNamesWithMultiDirectoriesTest.java
index 44e29fa..61ec51c 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSetNamesWithMultiDirectoriesTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSetNamesWithMultiDirectoriesTest.java
@@ -25,8 +25,11 @@ import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.IOConverter;
-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.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Unit test to verify that using option setNames and having multi remote directories the files
@@ -39,7 +42,7 @@ public class FromFtpSetNamesWithMultiDirectoriesTest extends FtpServerTestSuppor
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/ftpsetnamestest");
super.setUp();
@@ -60,17 +63,17 @@ public class FromFtpSetNamesWithMultiDirectoriesTest extends FtpServerTestSuppor
Exchange ex = resultEndpoint.getExchanges().get(0);
byte[] bytes = ex.getIn().getBody(byte[].class);
- assertTrue("Logo size wrong", bytes.length > 10000);
+ assertTrue(bytes.length > 10000, "Logo size wrong");
// assert the file
File file = new File("target/ftpsetnamestest/data1/logo1.jpeg");
- assertTrue("The binary file should exists", file.exists());
- assertTrue("Logo size wrong", file.length() > 10000);
+ assertTrue(file.exists(), "The binary file should exists");
+ assertTrue(file.length() > 10000, "Logo size wrong");
// assert the file
file = new File("target/ftpsetnamestest/data2/logo2.png");
- assertTrue(" The binary file should exists", file.exists());
- assertTrue("Logo size wrong", file.length() > 50000);
+ assertTrue(file.exists(), " The binary file should exists");
+ assertTrue(file.length() > 50000, "Logo size wrong");
}
private void prepareFtpServer() throws Exception {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleNoEndpointPathRelativeMoveToAbsoluteTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleNoEndpointPathRelativeMoveToAbsoluteTest.java
index 74c811e..2476e41 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleNoEndpointPathRelativeMoveToAbsoluteTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleNoEndpointPathRelativeMoveToAbsoluteTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class FromFtpSimpleNoEndpointPathRelativeMoveToAbsoluteTest extends FtpServerTestSupport {
@@ -30,7 +30,7 @@ public class FromFtpSimpleNoEndpointPathRelativeMoveToAbsoluteTest extends FtpSe
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleNoEndpointPathRelativeMoveToRelativeTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleNoEndpointPathRelativeMoveToRelativeTest.java
index 952e407..6c04429 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleNoEndpointPathRelativeMoveToRelativeTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleNoEndpointPathRelativeMoveToRelativeTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class FromFtpSimpleNoEndpointPathRelativeMoveToRelativeTest extends FtpServerTestSupport {
@@ -30,7 +30,7 @@ public class FromFtpSimpleNoEndpointPathRelativeMoveToRelativeTest extends FtpSe
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleRelativeMoveToAbsoluteTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleRelativeMoveToAbsoluteTest.java
index 4e6427e..3bd1fdd 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleRelativeMoveToAbsoluteTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleRelativeMoveToAbsoluteTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class FromFtpSimpleRelativeMoveToAbsoluteTest extends FtpServerTestSupport {
@@ -30,7 +30,7 @@ public class FromFtpSimpleRelativeMoveToAbsoluteTest extends FtpServerTestSuppor
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleRelativeMoveToRelativeTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleRelativeMoveToRelativeTest.java
index 1bef554..fe704cf 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleRelativeMoveToRelativeTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimpleRelativeMoveToRelativeTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class FromFtpSimpleRelativeMoveToRelativeTest extends FtpServerTestSupport {
@@ -30,7 +30,7 @@ public class FromFtpSimpleRelativeMoveToRelativeTest extends FtpServerTestSuppor
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimulateNetworkIssueRecoverTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimulateNetworkIssueRecoverTest.java
index 352845b..5b03234 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimulateNetworkIssueRecoverTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSimulateNetworkIssueRecoverTest.java
@@ -21,7 +21,10 @@ import org.apache.camel.Consumer;
import org.apache.camel.Endpoint;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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.assertTrue;
/**
* Simulate network issues by using a custom poll strategy to force exceptions
@@ -51,7 +54,7 @@ public class FromFtpSimulateNetworkIssueRecoverTest extends FtpServerTestSupport
Thread.sleep(2000);
- assertTrue("Should have tried at least 3 times was " + counter, counter >= 3);
+ assertTrue(counter >= 3, "Should have tried at least 3 times was " + counter);
assertEquals(2, rollback);
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpStartingDirAndFileNameClashTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpStartingDirAndFileNameClashTest.java
index c2f558e..d1a53f2 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpStartingDirAndFileNameClashTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpStartingDirAndFileNameClashTest.java
@@ -21,8 +21,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class FromFtpStartingDirAndFileNameClashTest extends FtpServerTestSupport {
@@ -31,7 +31,7 @@ public class FromFtpStartingDirAndFileNameClashTest extends FtpServerTestSupport
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpThirdPoolOkTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpThirdPoolOkTest.java
index 70d2206..9ef4ede 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpThirdPoolOkTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpThirdPoolOkTest.java
@@ -21,8 +21,13 @@ import java.io.File;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-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.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class FromFtpThirdPoolOkTest extends FtpServerTestSupport {
@@ -34,7 +39,7 @@ public class FromFtpThirdPoolOkTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/thirdpool");
super.setUp();
@@ -57,7 +62,7 @@ public class FromFtpThirdPoolOkTest extends FtpServerTestSupport {
// assert the file is deleted
File file = new File(FTP_ROOT_DIR + "/thirdpool/hello.txt");
- assertFalse("The file should have been deleted", file.exists());
+ assertFalse(file.exists(), "The file should have been deleted");
}
@Override
@@ -76,7 +81,7 @@ public class FromFtpThirdPoolOkTest extends FtpServerTestSupport {
if (counter < 3) {
// file should exists
File file = new File(FTP_ROOT_DIR + "/thirdpool/hello.txt");
- assertTrue("The file should NOT have been deleted", file.exists());
+ assertTrue(file.exists(), "The file should NOT have been deleted");
throw new IllegalArgumentException("Forced by unittest");
}
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToAsciiFileNoBodyConversionTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToAsciiFileNoBodyConversionTest.java
index e7be6c9..ea77665 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToAsciiFileNoBodyConversionTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToAsciiFileNoBodyConversionTest.java
@@ -21,8 +21,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Unit testing a FTP ASCII transfer that Camel provides the needed conversion to String from
@@ -35,7 +35,7 @@ public class FromFtpToAsciiFileNoBodyConversionTest extends FtpServerTestSupport
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToAsciiFileTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToAsciiFileTest.java
index aadb093..5e8cb98 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToAsciiFileTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToAsciiFileTest.java
@@ -23,8 +23,10 @@ import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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.assertTrue;
/**
* Unit test to verify that we can pool an ASCII file from the FTP Server and store it on a local file path
@@ -36,7 +38,7 @@ public class FromFtpToAsciiFileTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
@@ -52,8 +54,8 @@ public class FromFtpToAsciiFileTest extends FtpServerTestSupport {
// assert the file
File file = new File("target/ftptest/deleteme.txt");
- assertTrue("The ASCII file should exists", file.exists());
- assertTrue("File size wrong", file.length() > 10);
+ assertTrue(file.exists(), "The ASCII file should exists");
+ assertTrue(file.length() > 10, "File size wrong");
}
private void prepareFtpServer() throws Exception {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFileTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFileTest.java
index c3fdf44..5efddb4 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFileTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFileTest.java
@@ -24,8 +24,10 @@ import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.IOConverter;
-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.assertTrue;
/**
* Unit test to verify that we can pool a BINARY file from the FTP Server and store it on a local file path
@@ -39,7 +41,7 @@ public class FromFtpToBinaryFileTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
@@ -52,12 +54,12 @@ public class FromFtpToBinaryFileTest extends FtpServerTestSupport {
resultEndpoint.assertIsSatisfied();
Exchange ex = resultEndpoint.getExchanges().get(0);
byte[] bytes = ex.getIn().getBody(byte[].class);
- assertTrue("Logo size wrong", bytes.length > 10000);
+ assertTrue(bytes.length > 10000, "Logo size wrong");
// assert the file
File file = new File("target/ftptest/deleteme.jpg");
- assertTrue("The binary file should exists", file.exists());
- assertTrue("Logo size wrong", file.length() > 10000);
+ assertTrue(file.exists(), "The binary file should exists");
+ assertTrue(file.length() > 10000, "Logo size wrong");
}
private void prepareFtpServer() throws Exception {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFilesTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFilesTest.java
index 1beabe6..f0c9c4d 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFilesTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFilesTest.java
@@ -24,8 +24,10 @@ import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.IOConverter;
-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.assertTrue;
/**
* Unit test to verify that we can pool a BINARY file from the FTP Server and store it on a local file path
@@ -39,7 +41,7 @@ public class FromFtpToBinaryFilesTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
@@ -52,17 +54,17 @@ public class FromFtpToBinaryFilesTest extends FtpServerTestSupport {
resultEndpoint.assertIsSatisfied();
Exchange ex = resultEndpoint.getExchanges().get(0);
byte[] bytes = ex.getIn().getBody(byte[].class);
- assertTrue("Logo size wrong", bytes.length > 10000);
+ assertTrue(bytes.length > 10000, "Logo size wrong");
// assert the file
File file = new File("target/ftptest/logo.jpeg");
- assertTrue(" The binary file should exists", file.exists());
- assertTrue("Logo size wrong", file.length() > 10000);
+ assertTrue(file.exists(), " The binary file should exists");
+ assertTrue(file.length() > 10000, "Logo size wrong");
// assert the file
file = new File("target/ftptest/a/logo1.jpeg");
- assertTrue("The binary file should exists", file.exists());
- assertTrue("Logo size wrong", file.length() > 10000);
+ assertTrue(file.exists(), "The binary file should exists");
+ assertTrue(file.length() > 10000, "Logo size wrong");
}
private void prepareFtpServer() throws Exception {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinarySampleTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinarySampleTest.java
index f1321ef..9a35052 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinarySampleTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinarySampleTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
/**
* Unit test used for FTP wiki documentation
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToFileNoFileNameHeaderTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToFileNoFileNameHeaderTest.java
index 3aa0362..feb641e 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToFileNoFileNameHeaderTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToFileNoFileNameHeaderTest.java
@@ -21,8 +21,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Unit test for consuming files from a FTP Server to files where we want to use the filename
@@ -35,7 +35,7 @@ public class FromFtpToFileNoFileNameHeaderTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToMockTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToMockTest.java
index a44a7c0..63bd499 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToMockTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToMockTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class FromFtpToMockTest extends FtpServerTestSupport {
protected String expectedBody = "Hello there!";
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpTwoSlashesIssueTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpTwoSlashesIssueTest.java
index 2d9ef75..786a57c 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpTwoSlashesIssueTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpTwoSlashesIssueTest.java
@@ -23,8 +23,10 @@ import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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.assertTrue;
/**
* Issue with using 2 slashes
@@ -36,7 +38,7 @@ public class FromFtpTwoSlashesIssueTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
@@ -64,7 +66,7 @@ public class FromFtpTwoSlashesIssueTest extends FtpServerTestSupport {
// assert file is created
File file = new File(FTP_ROOT_DIR + "/hello.txt");
- assertTrue("The file should exists", file.exists());
+ assertTrue(file.exists(), "The file should exists");
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpUseListFalseTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpUseListFalseTest.java
index 60fd0c3..3fd530c 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpUseListFalseTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpUseListFalseTest.java
@@ -21,8 +21,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Unit test to poll a fixed file from the FTP server without using the list command.
@@ -35,7 +35,7 @@ public class FromFtpUseListFalseTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromQueueThenConsumeFtpToMockTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromQueueThenConsumeFtpToMockTest.java
index b79275d..fae0216 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromQueueThenConsumeFtpToMockTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromQueueThenConsumeFtpToMockTest.java
@@ -23,8 +23,8 @@ import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Unit test based on user forum question
@@ -44,7 +44,7 @@ public class FromQueueThenConsumeFtpToMockTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpAnonymousTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpAnonymousTest.java
index 9d400c1..aa73421 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpAnonymousTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpAnonymousTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Unit test that ftp consumer for anonymous login
@@ -35,7 +35,7 @@ public class FtpAnonymousTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginConnectionLeakTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginConnectionLeakTest.java
index dfc8baf..8a3d3d1 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginConnectionLeakTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginConnectionLeakTest.java
@@ -28,7 +28,10 @@ import javax.net.SocketFactory;
import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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.assertTrue;
public class FtpBadLoginConnectionLeakTest extends FtpServerTestSupport {
@@ -56,8 +59,8 @@ public class FtpBadLoginConnectionLeakTest extends FtpServerTestSupport {
stopCamelContext();
for (Map.Entry<Integer, boolean[]> socketStats : socketAudits.entrySet()) {
- assertTrue("Socket should be connected", socketStats.getValue()[0]);
- assertEquals("Socket should be closed", socketStats.getValue()[0], socketStats.getValue()[1]);
+ assertTrue(socketStats.getValue()[0], "Socket should be connected");
+ assertEquals(socketStats.getValue()[0], socketStats.getValue()[1], "Socket should be closed");
}
mock.assertIsSatisfied();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginInProducerConnectionLeakTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginInProducerConnectionLeakTest.java
index 3c24cbf..5127fcc 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginInProducerConnectionLeakTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginInProducerConnectionLeakTest.java
@@ -26,7 +26,10 @@ import java.util.Map;
import javax.net.SocketFactory;
import org.apache.camel.BindToRegistry;
-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.assertTrue;
public class FtpBadLoginInProducerConnectionLeakTest extends FtpServerTestSupport {
@@ -53,11 +56,11 @@ public class FtpBadLoginInProducerConnectionLeakTest extends FtpServerTestSuppor
}
}
- assertEquals("Expected 2 socket connections to be created", 2, socketAudits.size());
+ assertEquals(2, socketAudits.size(), "Expected 2 socket connections to be created");
for (Map.Entry<Integer, boolean[]> socketStats : socketAudits.entrySet()) {
- assertTrue("Socket should be connected", socketStats.getValue()[0]);
- assertEquals("Socket should be closed", socketStats.getValue()[0], socketStats.getValue()[1]);
+ assertTrue(socketStats.getValue()[0], "Socket should be connected");
+ assertEquals(socketStats.getValue()[0], socketStats.getValue()[1], "Socket should be closed");
}
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginMockNoopConnectionLeakTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginMockNoopConnectionLeakTest.java
index 909399d..faedfcf 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginMockNoopConnectionLeakTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginMockNoopConnectionLeakTest.java
@@ -29,13 +29,21 @@ import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.commons.net.ftp.FTPClient;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Test which checks leaking connections when FTP server returns correct status for NOOP operation.
*/
public class FtpBadLoginMockNoopConnectionLeakTest extends FtpServerTestSupport {
+
+ private static final Logger LOG = LoggerFactory.getLogger(FtpBadLoginMockNoopConnectionLeakTest.class);
+
/**
* Mapping of socket hashcode to two element tab ([connect() called, close() called])
*/
@@ -50,7 +58,7 @@ public class FtpBadLoginMockNoopConnectionLeakTest extends FtpServerTestSupport
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
@@ -75,8 +83,8 @@ public class FtpBadLoginMockNoopConnectionLeakTest extends FtpServerTestSupport
stopCamelContext();
for (Map.Entry<Integer, boolean[]> socketStats : socketAudits.entrySet()) {
- assertTrue("Socket should be connected", socketStats.getValue()[0]);
- assertEquals("Socket should be closed", socketStats.getValue()[0], socketStats.getValue()[1]);
+ assertTrue(socketStats.getValue()[0], "Socket should be connected");
+ assertEquals(socketStats.getValue()[0], socketStats.getValue()[1], "Socket should be closed");
}
mock.assertIsSatisfied();
@@ -132,7 +140,7 @@ public class FtpBadLoginMockNoopConnectionLeakTest extends FtpServerTestSupport
@Override
public void connect(SocketAddress endpoint, int timeout) throws IOException {
- log.info("Connecting socket {}", System.identityHashCode(this));
+ LOG.info("Connecting socket {}", System.identityHashCode(this));
super.connect(endpoint, timeout);
boolean[] value = socketAudits.get(System.identityHashCode(this));
value[0] = true;
@@ -140,7 +148,7 @@ public class FtpBadLoginMockNoopConnectionLeakTest extends FtpServerTestSupport
@Override
public synchronized void close() throws IOException {
- log.info("Disconnecting socket {}", System.identityHashCode(this));
+ LOG.info("Disconnecting socket {}", System.identityHashCode(this));
super.close();
boolean[] value = socketAudits.get(System.identityHashCode(this));
value[1] = true;
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBrowsableEndpointTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBrowsableEndpointTest.java
index e7e3714..3d9202e 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBrowsableEndpointTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBrowsableEndpointTest.java
@@ -22,7 +22,12 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.spi.BrowsableEndpoint;
import org.apache.camel.support.processor.idempotent.MemoryIdempotentRepository;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.createDirectory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class FtpBrowsableEndpointTest extends FtpServerTestSupport {
@@ -64,7 +69,7 @@ public class FtpBrowsableEndpointTest extends FtpServerTestSupport {
// and the file is still there
File file = new File(FTP_ROOT_DIR + "/browse/a.txt");
- assertTrue("File should exist " + file, file.exists());
+ assertTrue(file.exists(), "File should exist " + file);
}
@Test
@@ -90,9 +95,9 @@ public class FtpBrowsableEndpointTest extends FtpServerTestSupport {
// and the files is still there
File fileA = new File(FTP_ROOT_DIR + "/browse/a.txt");
- assertTrue("File should exist " + fileA, fileA.exists());
+ assertTrue(fileA.exists(), "File should exist " + fileA);
File fileB = new File(FTP_ROOT_DIR + "/browse/b.txt");
- assertTrue("File should exist " + fileB, fileB.exists());
+ assertTrue(fileB.exists(), "File should exist " + fileB);
}
@Test
@@ -120,10 +125,10 @@ public class FtpBrowsableEndpointTest extends FtpServerTestSupport {
// and the files is still there
File fileA = new File(FTP_ROOT_DIR + "/browse/a.txt");
- assertTrue("File should exist " + fileA, fileA.exists());
+ assertTrue(fileA.exists(), "File should exist " + fileA);
File fileB = new File(FTP_ROOT_DIR + "/browse/foo/b.txt");
- assertTrue("File should exist " + fileB, fileB.exists());
+ assertTrue(fileB.exists(), "File should exist " + fileB);
File fileC = new File(FTP_ROOT_DIR + "/browse/bar/c.txt");
- assertTrue("File should exist " + fileC, fileC.exists());
+ assertTrue(fileC.exists(), "File should exist " + fileC);
}
}
\ No newline at end of file
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpChangedReadLockTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpChangedReadLockTest.java
index 039f3eed..2da08f1 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpChangedReadLockTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpChangedReadLockTest.java
@@ -21,10 +21,13 @@ import java.io.FileOutputStream;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.camel.test.junit5.TestSupport.createDirectory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
*
*/
@@ -48,7 +51,7 @@ public class FtpChangedReadLockTest extends FtpServerTestSupport {
String content = context.getTypeConverter().convertTo(String.class, new File("target/changed/out/slowfile.dat"));
String[] lines = content.split(LS);
- assertEquals("There should be 20 lines in the file", 20, lines.length);
+ assertEquals(20, lines.length, "There should be 20 lines in the file");
for (int i = 0; i < 20; i++) {
assertEquals("Line " + i, lines[i]);
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpChangedRootDirReadLockTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpChangedRootDirReadLockTest.java
index 7c4db98..b5a8bb1 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpChangedRootDirReadLockTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpChangedRootDirReadLockTest.java
@@ -21,10 +21,13 @@ import java.io.FileOutputStream;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.camel.test.junit5.TestSupport.createDirectory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
*
*/
@@ -48,7 +51,7 @@ public class FtpChangedRootDirReadLockTest extends FtpServerTestSupport {
String content = context.getTypeConverter().convertTo(String.class, new File("target/out/slowfile.dat"));
String[] lines = content.split(LS);
- assertEquals("There should be 20 lines in the file", 20, lines.length);
+ assertEquals(20, lines.length, "There should be 20 lines in the file");
for (int i = 0; i < 20; i++) {
assertEquals("Line " + i, lines[i]);
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpChangedZeroLengthReadLockTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpChangedZeroLengthReadLockTest.java
index ca21b54..66393dd 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpChangedZeroLengthReadLockTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpChangedZeroLengthReadLockTest.java
@@ -20,7 +20,9 @@ import java.io.FileOutputStream;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.createDirectory;
/**
*
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConnectTimeoutTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConnectTimeoutTest.java
index aba2784..0f16dd3 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConnectTimeoutTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConnectTimeoutTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class FtpConnectTimeoutTest extends FtpServerTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerAbsolutePathTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerAbsolutePathTest.java
index bc04816..a68bf61 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerAbsolutePathTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerAbsolutePathTest.java
@@ -22,8 +22,11 @@ import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class FtpConsumerAbsolutePathTest extends FtpServerTestSupport {
@@ -32,7 +35,7 @@ public class FtpConsumerAbsolutePathTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/lwd");
super.setUp();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerAsyncStressTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerAsyncStressTest.java
index 9fc8924..70ddc3f 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerAsyncStressTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerAsyncStressTest.java
@@ -22,8 +22,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class FtpConsumerAsyncStressTest extends FtpServerTestSupport {
@@ -34,7 +34,7 @@ public class FtpConsumerAsyncStressTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
for (int i = 0; i < files; i++) {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerAutoCreateTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerAutoCreateTest.java
index e663879..2b84c26 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerAutoCreateTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerAutoCreateTest.java
@@ -19,10 +19,13 @@ package org.apache.camel.component.file.remote;
import java.io.File;
import org.apache.camel.component.file.GenericFileOperationFailedException;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
public class FtpConsumerAutoCreateTest extends FtpServerTestSupport {
@@ -31,7 +34,7 @@ public class FtpConsumerAutoCreateTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerBodyAsStringTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerBodyAsStringTest.java
index 8d9c50b..b2bf235 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerBodyAsStringTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerBodyAsStringTest.java
@@ -22,8 +22,11 @@ import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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;
public class FtpConsumerBodyAsStringTest extends FtpServerTestSupport {
@@ -32,7 +35,7 @@ public class FtpConsumerBodyAsStringTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDeleteNoWritePermissionTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDeleteNoWritePermissionTest.java
index 22f2f6b..f3c96e7 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDeleteNoWritePermissionTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDeleteNoWritePermissionTest.java
@@ -19,8 +19,10 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.Exchange;
import org.apache.camel.PollingConsumer;
import org.apache.camel.component.file.GenericFileOperationFailedException;
-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.assertNotNull;
/**
* User does not have write permissions so can't deleted consumed file.
@@ -33,7 +35,7 @@ public class FtpConsumerDeleteNoWritePermissionTest extends FtpServerTestSupport
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
@@ -44,7 +46,7 @@ public class FtpConsumerDeleteNoWritePermissionTest extends FtpServerTestSupport
PollingConsumer consumer = context.getEndpoint(getFtpUrl()).createPollingConsumer();
consumer.start();
Exchange out = consumer.receive(3000);
- assertNotNull("Should get the file", out);
+ assertNotNull(out, "Should get the file");
try {
// give consumer time to try to delete the file
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDirectoriesNotMatchedTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDirectoriesNotMatchedTest.java
index 4840df6..46b8ead 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDirectoriesNotMatchedTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDirectoriesNotMatchedTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Unit test that ftp consumer will not match directories (CAMEL-920)
@@ -32,7 +32,7 @@ public class FtpConsumerDirectoriesNotMatchedTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDisconnectTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDisconnectTest.java
index 05091f4..c1ff883 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDisconnectTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDisconnectTest.java
@@ -18,8 +18,11 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
import org.apache.commons.net.ftp.FTPClient;
-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.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class FtpConsumerDisconnectTest extends FtpServerTestSupport {
@@ -28,7 +31,7 @@ public class FtpConsumerDisconnectTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
@@ -61,8 +64,8 @@ public class FtpConsumerDisconnectTest extends FtpServerTestSupport {
Thread.sleep(2000);
FtpEndpoint<?> endpoint = context.getEndpoint(getFtpUrl(), FtpEndpoint.class);
- assertFalse("The FTPClient should be already disconnected", endpoint.getFtpClient().isConnected());
- assertTrue("The FtpEndpoint should be configured to disconnect", endpoint.isDisconnect());
+ assertFalse(endpoint.getFtpClient().isConnected(), "The FTPClient should be already disconnected");
+ assertTrue(endpoint.isDisconnect(), "The FtpEndpoint should be configured to disconnect");
}
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDoneFileNameFixedTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDoneFileNameFixedTest.java
index ad96f79..bcd88d4 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDoneFileNameFixedTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDoneFileNameFixedTest.java
@@ -20,7 +20,9 @@ import java.io.File;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
public class FtpConsumerDoneFileNameFixedTest extends FtpServerTestSupport {
@@ -53,7 +55,7 @@ public class FtpConsumerDoneFileNameFixedTest extends FtpServerTestSupport {
// done file should be deleted now
File file = new File(FTP_ROOT_DIR + "done/fin.dat");
- assertFalse("Done file should be deleted: " + file, file.exists());
+ assertFalse(file.exists(), "Done file should be deleted: " + file);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDoneFileNameTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDoneFileNameTest.java
index 2517e4b..16fe3aa 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDoneFileNameTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDoneFileNameTest.java
@@ -20,7 +20,9 @@ import java.io.File;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
public class FtpConsumerDoneFileNameTest extends FtpServerTestSupport {
@@ -53,7 +55,7 @@ public class FtpConsumerDoneFileNameTest extends FtpServerTestSupport {
// done file should be deleted now
File file = new File(FTP_ROOT_DIR + "done/hello.dat");
- assertFalse("Done file should be deleted: " + file, file.exists());
+ assertFalse(file.exists(), "Done file should be deleted: " + file);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDualDoneFileNameTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDualDoneFileNameTest.java
index 74b2ae1..97fd4bf 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDualDoneFileNameTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDualDoneFileNameTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class FtpConsumerDualDoneFileNameTest extends FtpServerTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerExcludeNameTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerExcludeNameTest.java
index f35ac27..8adb816 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerExcludeNameTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerExcludeNameTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Unit test that ftp consumer will exclude pre and postfixes
@@ -32,7 +32,7 @@ public class FtpConsumerExcludeNameTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerFileSplitTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerFileSplitTest.java
index 9c0e227..d58da12 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerFileSplitTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerFileSplitTest.java
@@ -21,7 +21,7 @@ import java.io.File;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class FtpConsumerFileSplitTest extends FtpServerTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIPV6BodyAsStringTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIPV6BodyAsStringTest.java
index b75ff6c..30a484b 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIPV6BodyAsStringTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIPV6BodyAsStringTest.java
@@ -22,11 +22,14 @@ import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+@Disabled
public class FtpConsumerIPV6BodyAsStringTest extends FtpServerTestSupport {
private String getFtpUrl() {
@@ -34,7 +37,7 @@ public class FtpConsumerIPV6BodyAsStringTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIdempotentKeyChangedIssueTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIdempotentKeyChangedIssueTest.java
index 884b155..bda2784 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIdempotentKeyChangedIssueTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIdempotentKeyChangedIssueTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class FtpConsumerIdempotentKeyChangedIssueTest extends FtpServerTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIdempotentMemoryRefTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIdempotentMemoryRefTest.java
index 14fb8ce..9f470fa 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIdempotentMemoryRefTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIdempotentMemoryRefTest.java
@@ -20,7 +20,10 @@ import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.support.processor.idempotent.MemoryIdempotentRepository;
-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.assertTrue;
/**
* Memory repo test
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIdempotentRefTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIdempotentRefTest.java
index df21bea..5f019f9 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIdempotentRefTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIdempotentRefTest.java
@@ -20,7 +20,10 @@ import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.IdempotentRepository;
-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.assertTrue;
/**
* Unit test for the idempotentRepository # option.
@@ -61,7 +64,7 @@ public class FtpConsumerIdempotentRefTest extends FtpServerTestSupport {
Thread.sleep(2000);
assertMockEndpointsSatisfied();
- assertTrue("MyIdempotentRepository should have been invoked", invoked);
+ assertTrue(invoked, "MyIdempotentRepository should have been invoked");
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIdempotentTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIdempotentTest.java
index 1f94fac..8b6bc8a 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIdempotentTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIdempotentTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Unit test for the idempotent=true option.
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIncludeNameTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIncludeNameTest.java
index 764f73b..238ca3e 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIncludeNameTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIncludeNameTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Unit test that ftp consumer will include pre and postfixes
@@ -32,7 +32,7 @@ public class FtpConsumerIncludeNameTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerLocalWorkDirectoryAsAbsolutePathTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerLocalWorkDirectoryAsAbsolutePathTest.java
index 8d3ad1b..3381e36 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerLocalWorkDirectoryAsAbsolutePathTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerLocalWorkDirectoryAsAbsolutePathTest.java
@@ -26,8 +26,14 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.IOConverter;
import org.apache.camel.util.FileUtil;
-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.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class FtpConsumerLocalWorkDirectoryAsAbsolutePathTest extends FtpServerTestSupport {
@@ -39,7 +45,7 @@ public class FtpConsumerLocalWorkDirectoryAsAbsolutePathTest extends FtpServerTe
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/lwd");
deleteDirectory("target/out");
@@ -60,11 +66,11 @@ public class FtpConsumerLocalWorkDirectoryAsAbsolutePathTest extends FtpServerTe
// now the lwd file should be deleted
File local = new File("target/lwd/hello.txt");
- assertFalse("Local work file should have been deleted", local.exists());
+ assertFalse(local.exists(), "Local work file should have been deleted");
// and the out file should exists
File out = new File("target/out/hello.txt");
- assertTrue("file should exists", out.exists());
+ assertTrue(out.exists(), "file should exists");
assertEquals("Hello World", IOConverter.toString(out, null));
}
@@ -89,8 +95,8 @@ public class FtpConsumerLocalWorkDirectoryAsAbsolutePathTest extends FtpServerTe
public void process(Exchange exchange) throws Exception {
File body = exchange.getIn().getBody(File.class);
assertNotNull(body);
- assertTrue("Should be absolute path", body.isAbsolute());
- assertTrue("Local work file should exists", body.exists());
+ assertTrue(body.isAbsolute(), "Should be absolute path");
+ assertTrue(body.exists(), "Local work file should exists");
assertEquals(FileUtil.normalizePath(base + "/hello.txt"), body.getPath());
}
}).to("mock:result", "file://target/out");
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerLocalWorkDirectoryDirectTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerLocalWorkDirectoryDirectTest.java
index cc3639a..f74bf41 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerLocalWorkDirectoryDirectTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerLocalWorkDirectoryDirectTest.java
@@ -24,8 +24,13 @@ import org.apache.camel.Producer;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.converter.IOConverter;
-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.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class FtpConsumerLocalWorkDirectoryDirectTest extends FtpServerTestSupport {
@@ -35,7 +40,7 @@ public class FtpConsumerLocalWorkDirectoryDirectTest extends FtpServerTestSuppor
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/lwd");
deleteDirectory("target/out");
@@ -60,16 +65,16 @@ public class FtpConsumerLocalWorkDirectoryDirectTest extends FtpServerTestSuppor
@Test
public void testLocalWorkDirectory() throws Exception {
NotifyBuilder notify = new NotifyBuilder(context).whenDone(1).create();
- assertTrue("Should process one file", notify.matchesMockWaitTime());
+ assertTrue(notify.matchesMockWaitTime(), "Should process one file");
// and the out file should exists
File out = new File("target/out/hello.txt");
- assertTrue("file should exists", out.exists());
+ assertTrue(out.exists(), "file should exists");
assertEquals("Hello World", IOConverter.toString(out, null));
// now the lwd file should be deleted
File local = new File("target/lwd/hello.txt");
- assertFalse("Local work file should have been deleted", local.exists());
+ assertFalse(local.exists(), "Local work file should have been deleted");
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerLocalWorkDirectoryTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerLocalWorkDirectoryTest.java
index 5ee2ca8..ce07cb7 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerLocalWorkDirectoryTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerLocalWorkDirectoryTest.java
@@ -27,8 +27,14 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.IOConverter;
import org.apache.camel.util.FileUtil;
-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.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class FtpConsumerLocalWorkDirectoryTest extends FtpServerTestSupport {
@@ -38,7 +44,7 @@ public class FtpConsumerLocalWorkDirectoryTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/lwd");
deleteDirectory("target/out");
@@ -76,12 +82,12 @@ public class FtpConsumerLocalWorkDirectoryTest extends FtpServerTestSupport {
// and the out file should exists
File out = new File("target/out/hello.txt");
- assertTrue("file should exists", out.exists());
+ assertTrue(out.exists(), "file should exists");
assertEquals("Hello World", IOConverter.toString(out, null));
// now the lwd file should be deleted
File local = new File("target/lwd/hello.txt");
- assertFalse("Local work file should have been deleted", local.exists());
+ assertFalse(local.exists(), "Local work file should have been deleted");
}
@Override
@@ -93,7 +99,7 @@ public class FtpConsumerLocalWorkDirectoryTest extends FtpServerTestSupport {
public void process(Exchange exchange) throws Exception {
File body = exchange.getIn().getBody(File.class);
assertNotNull(body);
- assertTrue("Local work file should exists", body.exists());
+ assertTrue(body.exists(), "Local work file should exists");
assertEquals(FileUtil.normalizePath("target/lwd/hello.txt"), body.getPath());
}
}).to("mock:result", "file://target/out");
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerMaxMessagesPerPollTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerMaxMessagesPerPollTest.java
index 63660ab..5973309 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerMaxMessagesPerPollTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerMaxMessagesPerPollTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class FtpConsumerMaxMessagesPerPollTest extends FtpServerTestSupport {
@@ -29,7 +29,7 @@ public class FtpConsumerMaxMessagesPerPollTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerMoveExpressionTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerMoveExpressionTest.java
index 4e0260c..8ebc480 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerMoveExpressionTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerMoveExpressionTest.java
@@ -23,8 +23,11 @@ import java.util.Date;
import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Unit test for FTP using expression (file language)
@@ -39,7 +42,7 @@ public class FtpConsumerMoveExpressionTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
deleteDirectory("target/filelanguage");
@@ -59,7 +62,7 @@ public class FtpConsumerMoveExpressionTest extends FtpServerTestSupport {
String now = new SimpleDateFormat("yyyyMMdd").format(new Date());
File file = new File(FTP_ROOT_DIR + "/filelanguage/backup/" + now + "/123-report2.bak");
- assertTrue("File should have been renamed", file.exists());
+ assertTrue(file.exists(), "File should have been renamed");
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerMultipleDirectoriesTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerMultipleDirectoriesTest.java
index f19c498..9114d3d1 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerMultipleDirectoriesTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerMultipleDirectoriesTest.java
@@ -20,8 +20,12 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
-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.assertDirectoryEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class FtpConsumerMultipleDirectoriesTest extends FtpServerTestSupport {
@@ -30,7 +34,7 @@ public class FtpConsumerMultipleDirectoriesTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerNotEagerMaxMessagesPerPollTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerNotEagerMaxMessagesPerPollTest.java
index f4145b9..d99c2bf 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerNotEagerMaxMessagesPerPollTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerNotEagerMaxMessagesPerPollTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class FtpConsumerNotEagerMaxMessagesPerPollTest extends FtpServerTestSupport {
@@ -30,7 +30,7 @@ public class FtpConsumerNotEagerMaxMessagesPerPollTest extends FtpServerTestSupp
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerProcessStrategyTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerProcessStrategyTest.java
index 9eee5a8..8b24bce 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerProcessStrategyTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerProcessStrategyTest.java
@@ -22,7 +22,11 @@ import org.apache.camel.component.file.GenericFile;
import org.apache.camel.component.file.GenericFileEndpoint;
import org.apache.camel.component.file.GenericFileOperations;
import org.apache.camel.component.file.GenericFileProcessStrategy;
-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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class FtpConsumerProcessStrategyTest extends FtpServerTestSupport {
@@ -44,7 +48,7 @@ public class FtpConsumerProcessStrategyTest extends FtpServerTestSupport {
String out = consumer.receiveBody(getFtpUrl(), 5000, String.class);
assertNotNull(out);
assertTrue(out.startsWith("Hello World"));
- assertEquals("Begin should have been invoked 1 times", 1, myStrategy.getInvoked());
+ assertEquals(1, myStrategy.getInvoked(), "Begin should have been invoked 1 times");
}
private static class MyStrategy implements GenericFileProcessStrategy {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerRelativeFileNameTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerRelativeFileNameTest.java
index 0fb09a2..0bf72a7 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerRelativeFileNameTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerRelativeFileNameTest.java
@@ -19,8 +19,10 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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.assertDirectoryEquals;
public class FtpConsumerRelativeFileNameTest extends FtpServerTestSupport {
@@ -29,7 +31,7 @@ public class FtpConsumerRelativeFileNameTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
sendFile(getFtpUrl(), "Hello World", "target/filename-consumer-hello.txt");
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerReplyStringTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerReplyStringTest.java
index 138f131..945f63c 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerReplyStringTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerReplyStringTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class FtpConsumerReplyStringTest extends FtpServerTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerResumeDownloadTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerResumeDownloadTest.java
index 2059f1c..905fcf9 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerResumeDownloadTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerResumeDownloadTest.java
@@ -23,8 +23,14 @@ import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.IOConverter;
-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.createDirectory;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class FtpConsumerResumeDownloadTest extends FtpServerTestSupport {
@@ -34,7 +40,7 @@ public class FtpConsumerResumeDownloadTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/lwd");
deleteDirectory("target/out");
@@ -73,16 +79,16 @@ public class FtpConsumerResumeDownloadTest extends FtpServerTestSupport {
// and the out file should exists
File out = new File("target/out/hello.txt");
- assertTrue("file should exists", out.exists());
+ assertTrue(out.exists(), "file should exists");
assertEquals("Hello\nWorld\nI was here", IOConverter.toString(out, null));
// now the lwd file should be deleted
File local = new File("target/lwd/hello.txt");
- assertFalse("Local work file should have been deleted", local.exists());
+ assertFalse(local.exists(), "Local work file should have been deleted");
// and so the in progress
File temp = new File("target/lwd/hello.txt.inprogress");
- assertFalse("Local work file should have been deleted", temp.exists());
+ assertFalse(temp.exists(), "Local work file should have been deleted");
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerSkipDotFilesTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerSkipDotFilesTest.java
index 773b402..b8b79e4 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerSkipDotFilesTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerSkipDotFilesTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Unit test that ftp consumer will skip any files starting with a dot
@@ -31,7 +31,7 @@ public class FtpConsumerSkipDotFilesTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerTemplateTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerTemplateTest.java
index d734655..26939c8 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerTemplateTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerTemplateTest.java
@@ -21,8 +21,13 @@ import java.io.File;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
-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.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class FtpConsumerTemplateTest extends FtpServerTestSupport {
@@ -31,7 +36,7 @@ public class FtpConsumerTemplateTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
@@ -61,7 +66,7 @@ public class FtpConsumerTemplateTest extends FtpServerTestSupport {
// file should still exists
Thread.sleep(500);
File file = new File(FTP_ROOT_DIR + "/template/hello.txt");
- assertTrue("The file should exist: " + file, file.exists());
+ assertTrue(file.exists(), "The file should exist: " + file);
}
@Test
@@ -92,7 +97,7 @@ public class FtpConsumerTemplateTest extends FtpServerTestSupport {
// file should still exists
Thread.sleep(500);
File file = new File(FTP_ROOT_DIR + "/template/hello.txt");
- assertTrue("The file should exist: " + file, file.exists());
+ assertTrue(file.exists(), "The file should exist: " + file);
}
private void prepareFtpServer() throws Exception {
@@ -107,7 +112,7 @@ public class FtpConsumerTemplateTest extends FtpServerTestSupport {
// assert file is created
File file = new File(FTP_ROOT_DIR + "/template/hello.txt");
- assertTrue("The file should exist: " + file, file.exists());
+ assertTrue(file.exists(), "The file should exist: " + file);
}
}
\ No newline at end of file
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerTemplateUseListFalseTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerTemplateUseListFalseTest.java
index 86e59bb..250eac1 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerTemplateUseListFalseTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerTemplateUseListFalseTest.java
@@ -19,8 +19,11 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
-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.assertNull;
/**
* Unit test to poll a fixed file from the FTP server without using the list command.
@@ -33,7 +36,7 @@ public class FtpConsumerTemplateUseListFalseTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
@@ -46,11 +49,11 @@ public class FtpConsumerTemplateUseListFalseTest extends FtpServerTestSupport {
// try a 2nd time and the file is deleted
data = consumer.receiveBody(getFtpUrl() + "&fileName=report.txt", 1000, String.class);
- assertNull("The file should no longer exist", data);
+ assertNull(data, "The file should no longer exist");
// and try a non existing file name
data = consumer.receiveBody(getFtpUrl() + "&fileName=report2.txt", 1000, String.class);
- assertNull("The file should no longer exist", data);
+ assertNull(data, "The file should no longer exist");
}
private void prepareFtpServer() throws Exception {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerThrowExceptionOnLoginFailedTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerThrowExceptionOnLoginFailedTest.java
index 6898134..3560885 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerThrowExceptionOnLoginFailedTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerThrowExceptionOnLoginFailedTest.java
@@ -26,7 +26,11 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.file.GenericFileOperationFailedException;
import org.apache.camel.spi.PollingConsumerPollStrategy;
import org.apache.camel.support.service.ServiceSupport;
-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.assertTrue;
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
/**
* Unit test for login failure due bad password and no re connect attempts allowed
@@ -55,7 +59,7 @@ public class FtpConsumerThrowExceptionOnLoginFailedTest extends FtpServerTestSup
Thread.sleep(1000);
Consumer consumer = context.getRoute("foo").getConsumer();
- assertTrue("Consumer should be stopped", ((ServiceSupport)consumer).isStopped());
+ assertTrue(((ServiceSupport)consumer).isStopped(), "Consumer should be stopped");
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerUsingFTPClientConfigTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerUsingFTPClientConfigTest.java
index 728f3b6..4311f1c 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerUsingFTPClientConfigTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerUsingFTPClientConfigTest.java
@@ -20,8 +20,8 @@ import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.commons.net.ftp.FTPClientConfig;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Unit test for ftpClientConfig option.
@@ -33,7 +33,7 @@ public class FtpConsumerUsingFTPClientConfigTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerWithCharsetTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerWithCharsetTest.java
index 84cb842..8447f41 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerWithCharsetTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerWithCharsetTest.java
@@ -26,11 +26,19 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.util.IOHelper;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class FtpConsumerWithCharsetTest extends FtpServerTestSupport {
+ private static final Logger LOG = LoggerFactory.getLogger(FtpConsumerWithCharsetTest.class);
+
private final String payload = "\u00e6\u00f8\u00e5 \u00a9";
private String getFtpUrl() {
@@ -38,34 +46,34 @@ public class FtpConsumerWithCharsetTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
byte[] iso = payload.getBytes("iso-8859-1");
byte[] utf = payload.getBytes("utf-8");
- log.debug("iso: {}", new String(iso, Charset.forName("iso-8859-1")));
- log.debug("utf: {}", new String(utf, Charset.forName("utf-8")));
+ LOG.debug("iso: {}", new String(iso, Charset.forName("iso-8859-1")));
+ LOG.debug("utf: {}", new String(utf, Charset.forName("utf-8")));
for (byte b : iso) {
- log.debug("iso byte: {}", b);
+ LOG.debug("iso byte: {}", b);
}
for (byte b : utf) {
- log.debug("utf byte: {}", b);
+ LOG.debug("utf byte: {}", b);
}
prepareFtpServer();
// Check that the payload exists in upload and is in iso charset.ß
File file = new File(FTP_ROOT_DIR + "/upload/iso.txt");
- assertTrue("The uploaded file should exists", file.exists());
+ assertTrue(file.exists(), "The uploaded file should exists");
// Lets also test byte wise
InputStream fis = IOHelper.buffered(new FileInputStream(file));
byte[] buffer = new byte[100];
int len = fis.read(buffer);
- assertTrue("Should read data: " + len, len != -1);
+ assertTrue(len != -1, "Should read data: " + len);
byte[] data = new byte[len];
System.arraycopy(buffer, 0, data, 0, len);
fis.close();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerWithNoFileOptionTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerWithNoFileOptionTest.java
index d8c1aef..94dc163 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerWithNoFileOptionTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerWithNoFileOptionTest.java
@@ -20,8 +20,11 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
-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;
/**
* Unit test CAMEL-1247
@@ -33,7 +36,7 @@ public class FtpConsumerWithNoFileOptionTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpEndpointURISanitizedTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpEndpointURISanitizedTest.java
index c1814b5..0735e21 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpEndpointURISanitizedTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpEndpointURISanitizedTest.java
@@ -19,9 +19,11 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.Consumer;
import org.apache.camel.Endpoint;
import org.apache.camel.Producer;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertFalse;
/**
* Test to ensure the FtpEndpoint URI is sanitized.
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpIllegalOptionsTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpIllegalOptionsTest.java
index b5557f9..1174838 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpIllegalOptionsTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpIllegalOptionsTest.java
@@ -18,8 +18,10 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.fail;
public class FtpIllegalOptionsTest extends CamelTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpLoginNoRetryTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpLoginNoRetryTest.java
index ae3d214..b727abb 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpLoginNoRetryTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpLoginNoRetryTest.java
@@ -22,7 +22,11 @@ import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.component.file.GenericFileOperationFailedException;
-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.assertFalse;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Unit test for login failure due bad password and no re connect attempts
@@ -41,7 +45,7 @@ public class FtpLoginNoRetryTest extends FtpServerTestSupport {
// assert file NOT created
File file = new File(FTP_ROOT_DIR + "login/report.txt");
- assertFalse("The file should NOT exists", file.exists());
+ assertFalse(file.exists(), "The file should NOT exists");
}
private void uploadFile(String username, String password) throws Exception {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpLoginTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpLoginTest.java
index 478357f..03d037f 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpLoginTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpLoginTest.java
@@ -22,7 +22,12 @@ import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.component.file.GenericFileOperationFailedException;
-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.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Unit test for login failure due bad password and login with accepted password
@@ -41,7 +46,7 @@ public class FtpLoginTest extends FtpServerTestSupport {
// assert file NOT created
File file = new File(FTP_ROOT_DIR + "/login/report.txt");
- assertFalse("The file should NOT exists", file.exists());
+ assertFalse(file.exists(), "The file should NOT exists");
}
@Test
@@ -50,7 +55,7 @@ public class FtpLoginTest extends FtpServerTestSupport {
// assert file created
File file = new File(FTP_ROOT_DIR + "/login/report.txt");
- assertTrue("The file should exists", file.exists());
+ assertTrue(file.exists(), "The file should exists");
}
private void uploadFile(String username, String password) throws Exception {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpNoReconnectAttemptUnknownHostTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpNoReconnectAttemptUnknownHostTest.java
index cec2e65..bb56790 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpNoReconnectAttemptUnknownHostTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpNoReconnectAttemptUnknownHostTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class FtpNoReconnectAttemptUnknownHostTest extends FtpServerTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpPollEnrichBridgeErrorHandlerTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpPollEnrichBridgeErrorHandlerTest.java
index 3a914bc..fd971f5 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpPollEnrichBridgeErrorHandlerTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpPollEnrichBridgeErrorHandlerTest.java
@@ -20,9 +20,10 @@ import org.apache.camel.AggregationStrategy;
import org.apache.camel.Exchange;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.support.ExchangeHelper.copyResultsPreservePattern;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class FtpPollEnrichBridgeErrorHandlerTest extends BaseServerTestSupport {
@@ -47,7 +48,7 @@ public class FtpPollEnrichBridgeErrorHandlerTest extends BaseServerTestSupport {
assertNotNull(out);
Exception caught = out.getProperty(Exchange.EXCEPTION_CAUGHT, Exception.class);
- assertNotNull("Should store caught exception", caught);
+ assertNotNull(caught, "Should store caught exception");
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpPollEnrichConsumeWithDisconnectAndDeleteTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpPollEnrichConsumeWithDisconnectAndDeleteTest.java
index a81db95..025f167 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpPollEnrichConsumeWithDisconnectAndDeleteTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpPollEnrichConsumeWithDisconnectAndDeleteTest.java
@@ -22,10 +22,16 @@ import org.apache.camel.Exchange;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
public class FtpPollEnrichConsumeWithDisconnectAndDeleteTest extends FtpServerTestSupport {
+ private static final Logger LOG = LoggerFactory.getLogger(FtpPollEnrichConsumeWithDisconnectAndDeleteTest.class);
+
@Test
public void testFtpSimpleConsume() throws Exception {
if (!canTest()) {
@@ -54,12 +60,12 @@ public class FtpPollEnrichConsumeWithDisconnectAndDeleteTest extends FtpServerTe
fileExists = file.exists();
if (fileExists) {
- log.info("Will check that file has been deleted again in 200ms");
+ LOG.info("Will check that file has been deleted again in 200ms");
Thread.sleep(200);
}
}
- assertFalse("The file should have been deleted", fileExists);
+ assertFalse(fileExists, "The file should have been deleted");
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpPollingConsumerIdleMessageTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpPollingConsumerIdleMessageTest.java
index aa74c70..69f1b21 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpPollingConsumerIdleMessageTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpPollingConsumerIdleMessageTest.java
@@ -20,8 +20,10 @@ import java.io.File;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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.assertTrue;
/**
* Test to verify that the polling consumer delivers an empty Exchange when the
@@ -39,7 +41,7 @@ public class FtpPollingConsumerIdleMessageTest extends FtpServerTestSupport {
assertTrue(mock.getExchanges().get(1).getIn().getBody() == null);
}
- @Before
+ @BeforeEach
public void setup() throws Exception {
new File(FTP_ROOT_DIR + "/polling").mkdirs();
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpPollingConsumerTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpPollingConsumerTest.java
index d94a3cf..c26b653 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpPollingConsumerTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpPollingConsumerTest.java
@@ -20,7 +20,11 @@ import java.io.File;
import org.apache.camel.Exchange;
import org.apache.camel.PollingConsumer;
-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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
*
@@ -51,7 +55,7 @@ public class FtpPollingConsumerTest extends FtpServerTestSupport {
Thread.sleep(1000);
File file = new File(FTP_ROOT_DIR + "/polling/bye.txt");
- assertTrue("File should exist " + file, file.exists());
+ assertTrue(file.exists(), "File should exist " + file);
consumer.stop();
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerAllowNullBodyFileAlreadyExistTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerAllowNullBodyFileAlreadyExistTest.java
index 70f3b95..2153d51 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerAllowNullBodyFileAlreadyExistTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerAllowNullBodyFileAlreadyExistTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class FtpProducerAllowNullBodyFileAlreadyExistTest extends FtpServerTestSupport {
@@ -29,7 +29,7 @@ public class FtpProducerAllowNullBodyFileAlreadyExistTest extends FtpServerTestS
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
template.sendBodyAndHeader(getFtpUrl(), "Hello world", Exchange.FILE_NAME, "hello.txt");
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerAllowNullBodyTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerAllowNullBodyTest.java
index cb37b3c..9503eec 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerAllowNullBodyTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerAllowNullBodyTest.java
@@ -20,7 +20,13 @@ import java.io.File;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.component.file.GenericFileOperationFailedException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.assertFileExists;
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
public class FtpProducerAllowNullBodyTest extends FtpServerTestSupport {
@@ -45,7 +51,7 @@ public class FtpProducerAllowNullBodyTest extends FtpServerTestSupport {
assertTrue(cause.getMessage().endsWith("allowNullBody.txt"));
}
- assertFalse("allowNullBody set to false with null body should not create a new file", new File(FTP_ROOT_DIR + "/allownull/allowNullBody.txt").exists());
+ assertFalse(new File(FTP_ROOT_DIR + "/allownull/allowNullBody.txt").exists(), "allowNullBody set to false with null body should not create a new file");
}
}
\ No newline at end of file
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerBuildDirectoryTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerBuildDirectoryTest.java
index ae7f43e..8abca38 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerBuildDirectoryTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerBuildDirectoryTest.java
@@ -19,7 +19,10 @@ package org.apache.camel.component.file.remote;
import java.io.File;
import org.apache.camel.converter.IOConverter;
-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.assertTrue;
/**
* Unit test to verify that Camel can build remote directory on FTP server if missing (full or part of).
@@ -35,7 +38,7 @@ public class FtpProducerBuildDirectoryTest extends FtpServerTestSupport {
sendFile(getFtpUrl(), "Hello World", "claus.txt");
File file = new File(FTP_ROOT_DIR + "/upload/user/claus/claus.txt");
- assertTrue("The uploaded file should exists", file.exists());
+ assertTrue(file.exists(), "The uploaded file should exists");
assertEquals("Hello World", IOConverter.toString(file, null));
}
}
\ No newline at end of file
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerBuildPartOfDirectoryTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerBuildPartOfDirectoryTest.java
index 07ffa93..9ed5005 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerBuildPartOfDirectoryTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerBuildPartOfDirectoryTest.java
@@ -19,7 +19,10 @@ package org.apache.camel.component.file.remote;
import java.io.File;
import org.apache.camel.converter.IOConverter;
-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.assertTrue;
/**
* Unit test to verify that Camel can build remote directory on FTP server if missing (full or part of).
@@ -35,7 +38,7 @@ public class FtpProducerBuildPartOfDirectoryTest extends FtpServerTestSupport {
sendFile(getFtpUrl(), "Bye World", "claus.txt");
File file = new File(FTP_ROOT_DIR + "/upload/user/claus/claus.txt");
- assertTrue("The uploaded file should exists", file.exists());
- assertEquals("Bye World", IOConverter.toString(file, null));
+ assertTrue(file.exists(), "The uploaded file should exists");
+ assertEquals(IOConverter.toString(file, null), "Bye World");
}
}
\ No newline at end of file
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerConcurrentTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerConcurrentTest.java
index 947937f..22d190f 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerConcurrentTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerConcurrentTest.java
@@ -21,13 +21,13 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
/**
* Concurrent producers test.
*/
-@Ignore("TODO: investigate for Camel 3.0")
+@Disabled("TODO: investigate for Camel 3.0")
public class FtpProducerConcurrentTest extends FtpServerTestSupport {
private String getFtpUrl() {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerConnectErrorsHeaderTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerConnectErrorsHeaderTest.java
index aac5c3b..85ed008 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerConnectErrorsHeaderTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerConnectErrorsHeaderTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class FtpProducerConnectErrorsHeaderTest extends FtpServerTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerDisconnectOnBatchCompleteTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerDisconnectOnBatchCompleteTest.java
index f6c9032..8e2d1d4 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerDisconnectOnBatchCompleteTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerDisconnectOnBatchCompleteTest.java
@@ -19,15 +19,17 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.commons.net.ftp.FTPClient;
-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.language.simple.SimpleLanguage.simple;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class FtpProducerDisconnectOnBatchCompleteTest extends FtpServerTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
@@ -47,8 +49,8 @@ public class FtpProducerDisconnectOnBatchCompleteTest extends FtpServerTestSuppo
Thread.sleep(2000);
FtpEndpoint<?> endpoint = context.getEndpoint(getFtpUrl(), FtpEndpoint.class);
- assertFalse("The FTPClient should be already disconnected", endpoint.getFtpClient().isConnected());
- assertTrue("The FtpEndpoint should be configured to disconnect", endpoint.isDisconnectOnBatchComplete());
+ assertFalse(endpoint.getFtpClient().isConnected(), "The FTPClient should be already disconnected");
+ assertTrue(endpoint.isDisconnectOnBatchComplete(), "The FtpEndpoint should be configured to disconnect");
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerDisconnectTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerDisconnectTest.java
index 0311b90..761ed61 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerDisconnectTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerDisconnectTest.java
@@ -17,13 +17,16 @@
package org.apache.camel.component.file.remote;
import org.apache.commons.net.ftp.FTPClient;
-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.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class FtpProducerDisconnectTest extends FtpServerTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
@@ -42,8 +45,8 @@ public class FtpProducerDisconnectTest extends FtpServerTestSupport {
sendFile(getFtpUrl(), "Hello World", "claus.txt");
FtpEndpoint<?> endpoint = context.getEndpoint(getFtpUrl(), FtpEndpoint.class);
- assertFalse("The FTPClient should be already disconnected", endpoint.getFtpClient().isConnected());
- assertTrue("The FtpEndpoint should be configured to disconnect", endpoint.isDisconnect());
+ assertFalse(endpoint.getFtpClient().isConnected(), "The FTPClient should be already disconnected");
+ assertTrue(endpoint.isDisconnect(), "The FtpEndpoint should be configured to disconnect");
}
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerDoneFileNameTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerDoneFileNameTest.java
index 9e099ba..fabe335 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerDoneFileNameTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerDoneFileNameTest.java
@@ -21,7 +21,12 @@ import java.io.File;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.Exchange;
import org.apache.camel.ExpressionIllegalSyntaxException;
-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.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
public class FtpProducerDoneFileNameTest extends FtpServerTestSupport {
@@ -34,10 +39,10 @@ public class FtpProducerDoneFileNameTest extends FtpServerTestSupport {
template.sendBodyAndHeader(getFtpUrl() + "&doneFileName=done", "Hello World", Exchange.FILE_NAME, "hello.txt");
File file = new File(FTP_ROOT_DIR + "/done/hello.txt");
- assertEquals("File should exists", true, file.exists());
+ assertEquals(true, file.exists(), "File should exists");
File done = new File(FTP_ROOT_DIR + "/done/done");
- assertEquals("Done file should exists", true, done.exists());
+ assertEquals(true, done.exists(), "Done file should exists");
}
@Test
@@ -45,10 +50,10 @@ public class FtpProducerDoneFileNameTest extends FtpServerTestSupport {
template.sendBodyAndHeader(getFtpUrl() + "&doneFileName=done-${file:name}", "Hello World", Exchange.FILE_NAME, "hello.txt");
File file = new File(FTP_ROOT_DIR + "/done/hello.txt");
- assertEquals("File should exists", true, file.exists());
+ assertEquals(true, file.exists(), "File should exists");
File done = new File(FTP_ROOT_DIR + "/done/done-hello.txt");
- assertEquals("Done file should exists", true, done.exists());
+ assertEquals(true, done.exists(), "Done file should exists");
}
@Test
@@ -56,10 +61,10 @@ public class FtpProducerDoneFileNameTest extends FtpServerTestSupport {
template.sendBodyAndHeader(getFtpUrl() + "&doneFileName=${file:name}.done", "Hello World", Exchange.FILE_NAME, "hello.txt");
File file = new File(FTP_ROOT_DIR + "/done/hello.txt");
- assertEquals("File should exists", true, file.exists());
+ assertEquals(true, file.exists(), "File should exists");
File done = new File(FTP_ROOT_DIR + "/done/hello.txt.done");
- assertEquals("Done file should exists", true, done.exists());
+ assertEquals(true, done.exists(), "Done file should exists");
}
@Test
@@ -67,10 +72,10 @@ public class FtpProducerDoneFileNameTest extends FtpServerTestSupport {
template.sendBodyAndHeader(getFtpUrl() + "&doneFileName=${file:name.noext}.done", "Hello World", Exchange.FILE_NAME, "hello.txt");
File file = new File(FTP_ROOT_DIR + "/done/hello.txt");
- assertEquals("File should exists", true, file.exists());
+ assertEquals(true, file.exists(), "File should exists");
File done = new File(FTP_ROOT_DIR + "/done/hello.done");
- assertEquals("Done file should exists", true, done.exists());
+ assertEquals(true, done.exists(), "Done file should exists");
}
@Test
@@ -80,7 +85,7 @@ public class FtpProducerDoneFileNameTest extends FtpServerTestSupport {
fail("Should have thrown exception");
} catch (CamelExecutionException e) {
ExpressionIllegalSyntaxException cause = assertIsInstanceOf(ExpressionIllegalSyntaxException.class, e.getCause());
- assertTrue(cause.getMessage(), cause.getMessage().endsWith("Cannot resolve reminder: ${file:parent}/foo"));
+ assertTrue(cause.getMessage().endsWith("Cannot resolve reminder: ${file:parent}/foo"), cause.getMessage());
}
}
@@ -91,7 +96,7 @@ public class FtpProducerDoneFileNameTest extends FtpServerTestSupport {
fail("Should have thrown exception");
} catch (CamelExecutionException e) {
IllegalArgumentException cause = assertIsInstanceOf(IllegalArgumentException.class, e.getCause());
- assertTrue(cause.getMessage(), cause.getMessage().startsWith("doneFileName must be specified and not empty"));
+ assertTrue(cause.getMessage().startsWith("doneFileName must be specified and not empty"), cause.getMessage());
}
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerExpressionTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerExpressionTest.java
index d07a0dc..83d7ffa 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerExpressionTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerExpressionTest.java
@@ -21,8 +21,11 @@ import java.util.Calendar;
import java.util.Date;
import org.apache.camel.BindToRegistry;
-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.assertFileExists;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
/**
* Unit test for FTP using expression (file language)
@@ -37,7 +40,7 @@ public class FtpProducerExpressionTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
deleteDirectory("target/filelanguage");
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistAppendNoFileBeforeTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistAppendNoFileBeforeTest.java
index 5d9664c..05e5561 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistAppendNoFileBeforeTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistAppendNoFileBeforeTest.java
@@ -19,8 +19,10 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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.deleteDirectory;
public class FtpProducerFileExistAppendNoFileBeforeTest extends FtpServerTestSupport {
@@ -29,7 +31,7 @@ public class FtpProducerFileExistAppendNoFileBeforeTest extends FtpServerTestSup
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
deleteDirectory("target/exist");
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistAppendTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistAppendTest.java
index 7491b15..509e302 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistAppendTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistAppendTest.java
@@ -19,8 +19,10 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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.deleteDirectory;
public class FtpProducerFileExistAppendTest extends FtpServerTestSupport {
private static final boolean ON_WINDOWS = System.getProperty("os.name").startsWith("Windows");
@@ -30,7 +32,7 @@ public class FtpProducerFileExistAppendTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
deleteDirectory("target/exist");
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistFailTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistFailTest.java
index 5828477..4b0574e 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistFailTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistFailTest.java
@@ -21,8 +21,13 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.file.GenericFileOperationFailedException;
import org.apache.camel.component.mock.MockEndpoint;
-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.deleteDirectory;
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
public class FtpProducerFileExistFailTest extends FtpServerTestSupport {
@@ -31,7 +36,7 @@ public class FtpProducerFileExistFailTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
deleteDirectory("target/exist");
@@ -50,7 +55,7 @@ public class FtpProducerFileExistFailTest extends FtpServerTestSupport {
fail("Should have thrown an exception");
} catch (CamelExecutionException e) {
GenericFileOperationFailedException cause = assertIsInstanceOf(GenericFileOperationFailedException.class, e.getCause());
- assertEquals("File already exist: exist/hello.txt. Cannot write new file.", cause.getMessage());
+ assertEquals(cause.getMessage(), "File already exist: exist/hello.txt. Cannot write new file.");
}
assertMockEndpointsSatisfied();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistIgnoreTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistIgnoreTest.java
index 3423ca6..0e016eb 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistIgnoreTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistIgnoreTest.java
@@ -19,8 +19,10 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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.deleteDirectory;
public class FtpProducerFileExistIgnoreTest extends FtpServerTestSupport {
@@ -29,7 +31,7 @@ public class FtpProducerFileExistIgnoreTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
deleteDirectory("target/exist");
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistOverrideNoFileBeforeTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistOverrideNoFileBeforeTest.java
index 12a30e3..2d54190 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistOverrideNoFileBeforeTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistOverrideNoFileBeforeTest.java
@@ -19,8 +19,10 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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.deleteDirectory;
public class FtpProducerFileExistOverrideNoFileBeforeTest extends FtpServerTestSupport {
@@ -29,7 +31,7 @@ public class FtpProducerFileExistOverrideNoFileBeforeTest extends FtpServerTestS
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
deleteDirectory("target/exist");
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistOverrideTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistOverrideTest.java
index b4b8900..01b4241 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistOverrideTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistOverrideTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class FtpProducerFileExistOverrideTest extends FtpServerTestSupport {
@@ -29,7 +29,7 @@ public class FtpProducerFileExistOverrideTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
template.sendBodyAndHeader(getFtpUrl(), "Hello World", Exchange.FILE_NAME, "hello.txt");
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistOverrideTwoUploadTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistOverrideTwoUploadTest.java
index 8770a4f..8675f55 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistOverrideTwoUploadTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileExistOverrideTwoUploadTest.java
@@ -19,7 +19,10 @@ package org.apache.camel.component.file.remote;
import java.io.File;
import org.apache.camel.Exchange;
-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.assertTrue;
public class FtpProducerFileExistOverrideTwoUploadTest extends FtpServerTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithCharsetTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithCharsetTest.java
index 8e05fa1..95af957 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithCharsetTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithCharsetTest.java
@@ -23,10 +23,18 @@ import java.nio.charset.Charset;
import org.apache.camel.converter.IOConverter;
import org.apache.camel.util.IOHelper;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class FtpProducerFileWithCharsetTest extends FtpServerTestSupport {
+
+ private static final Logger LOG = LoggerFactory.getLogger(FtpPollEnrichConsumeWithDisconnectAndDeleteTest.class);
+
private String payload = "\u00e6\u00f8\u00e5 \u00a9";
private String getFtpUrl() {
@@ -34,19 +42,19 @@ public class FtpProducerFileWithCharsetTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
byte[] utf = payload.getBytes("utf-8");
byte[] iso = payload.getBytes("iso-8859-1");
- log.debug("utf: {}", new String(utf, Charset.forName("utf-8")));
- log.debug("iso: {}", new String(iso, Charset.forName("iso-8859-1")));
+ LOG.debug("utf: {}", new String(utf, Charset.forName("utf-8")));
+ LOG.debug("iso: {}", new String(iso, Charset.forName("iso-8859-1")));
for (byte b : utf) {
- log.debug("utf byte: {}", b);
+ LOG.debug("utf byte: {}", b);
}
for (byte b : iso) {
- log.debug("iso byte: {}", b);
+ LOG.debug("iso byte: {}", b);
}
super.setUp();
}
@@ -56,7 +64,7 @@ public class FtpProducerFileWithCharsetTest extends FtpServerTestSupport {
sendFile(getFtpUrl(), payload, "charset/iso.txt");
File file = new File(FTP_ROOT_DIR + "/upload/charset/iso.txt");
- assertTrue("The uploaded file should exists", file.exists());
+ assertTrue(file.exists(), "The uploaded file should exists");
String fileContent = new String(IOConverter.toByteArray(file), "iso-8859-1");
assertEquals(fileContent, payload);
@@ -65,7 +73,7 @@ public class FtpProducerFileWithCharsetTest extends FtpServerTestSupport {
byte[] buffer = new byte[100];
int len = fis.read(buffer);
- assertTrue("Should read data: " + len, len != -1);
+ assertTrue(len != -1, "Should read data: " + len);
byte[] data = new byte[len];
System.arraycopy(buffer, 0, data, 0, len);
fis.close();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithPathNoStepwiseTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithPathNoStepwiseTest.java
index 07fdd9b..a8ed12d 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithPathNoStepwiseTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithPathNoStepwiseTest.java
@@ -19,7 +19,10 @@ package org.apache.camel.component.file.remote;
import java.io.File;
import org.apache.camel.converter.IOConverter;
-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.assertTrue;
public class FtpProducerFileWithPathNoStepwiseTest extends FtpServerTestSupport {
@@ -32,7 +35,7 @@ public class FtpProducerFileWithPathNoStepwiseTest extends FtpServerTestSupport
sendFile(getFtpUrl(), "Hello World", "hello/claus.txt");
File file = new File(FTP_ROOT_DIR + "/upload/hello/claus.txt");
- assertTrue("The uploaded file should exists", file.exists());
+ assertTrue(file.exists(), "The uploaded file should exists");
assertEquals("Hello World", IOConverter.toString(file, null));
}
}
\ No newline at end of file
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithPathPathSeparatorAutoNoStepwiseTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithPathPathSeparatorAutoNoStepwiseTest.java
index 29131a5..a1c16c7 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithPathPathSeparatorAutoNoStepwiseTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithPathPathSeparatorAutoNoStepwiseTest.java
@@ -21,7 +21,11 @@ import java.io.File;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.converter.IOConverter;
-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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class FtpProducerFileWithPathPathSeparatorAutoNoStepwiseTest extends FtpServerTestSupport {
@@ -40,7 +44,7 @@ public class FtpProducerFileWithPathPathSeparatorAutoNoStepwiseTest extends FtpS
assertNotNull(out);
File file = new File(FTP_ROOT_DIR + "/upload/hello/claus.txt");
- assertTrue("The uploaded file should exists", file.exists());
+ assertTrue(file.exists(), "The uploaded file should exists");
assertEquals("Hello World", IOConverter.toString(file, null));
assertEquals("upload/hello/claus.txt", out.getIn().getHeader(Exchange.FILE_NAME_PRODUCED));
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithPathPathSeparatorUnixNoStepwiseTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithPathPathSeparatorUnixNoStepwiseTest.java
index 88f48e0..a670b73 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithPathPathSeparatorUnixNoStepwiseTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithPathPathSeparatorUnixNoStepwiseTest.java
@@ -21,7 +21,11 @@ import java.io.File;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.converter.IOConverter;
-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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class FtpProducerFileWithPathPathSeparatorUnixNoStepwiseTest extends FtpServerTestSupport {
@@ -40,7 +44,7 @@ public class FtpProducerFileWithPathPathSeparatorUnixNoStepwiseTest extends FtpS
assertNotNull(out);
File file = new File(FTP_ROOT_DIR + "/upload/hello/claus.txt");
- assertTrue("The uploaded file should exists", file.exists());
+ assertTrue(file.exists(), "The uploaded file should exists");
assertEquals("Hello World", IOConverter.toString(file, null));
assertEquals("upload/hello/claus.txt", out.getIn().getHeader(Exchange.FILE_NAME_PRODUCED));
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithPathPathSeparatorWindowsNoStepwiseTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithPathPathSeparatorWindowsNoStepwiseTest.java
index 1a90fd6..39765be 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithPathPathSeparatorWindowsNoStepwiseTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithPathPathSeparatorWindowsNoStepwiseTest.java
@@ -21,7 +21,11 @@ import java.io.File;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.converter.IOConverter;
-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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class FtpProducerFileWithPathPathSeparatorWindowsNoStepwiseTest extends FtpServerTestSupport {
@@ -40,7 +44,7 @@ public class FtpProducerFileWithPathPathSeparatorWindowsNoStepwiseTest extends F
assertNotNull(out);
File file = new File(FTP_ROOT_DIR + "/upload/hello/claus.txt");
- assertTrue("The uploaded file should exists", file.exists());
+ assertTrue(file.exists(), "The uploaded file should exists");
assertEquals("Hello World", IOConverter.toString(file, null));
assertEquals("upload/hello\\claus.txt", out.getIn().getHeader(Exchange.FILE_NAME_PRODUCED));
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithPathTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithPathTest.java
index 08e7fe5..67c690c 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithPathTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileWithPathTest.java
@@ -19,7 +19,10 @@ package org.apache.camel.component.file.remote;
import java.io.File;
import org.apache.camel.converter.IOConverter;
-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.assertTrue;
public class FtpProducerFileWithPathTest extends FtpServerTestSupport {
@@ -32,7 +35,7 @@ public class FtpProducerFileWithPathTest extends FtpServerTestSupport {
sendFile(getFtpUrl(), "Hello World", "hello/claus.txt");
File file = new File(FTP_ROOT_DIR + "/upload/hello/claus.txt");
- assertTrue("The uploaded file should exists", file.exists());
+ assertTrue(file.exists(), "The uploaded file should exists");
assertEquals("Hello World", IOConverter.toString(file, null));
}
}
\ No newline at end of file
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerJailStartingDirectoryTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerJailStartingDirectoryTest.java
index fd4353c..f0d8e51 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerJailStartingDirectoryTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerJailStartingDirectoryTest.java
@@ -19,7 +19,11 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
public class FtpProducerJailStartingDirectoryTest extends FtpServerTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerMoveExistingTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerMoveExistingTest.java
index adde74d..8b58b13 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerMoveExistingTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerMoveExistingTest.java
@@ -21,7 +21,14 @@ import java.io.File;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.Exchange;
import org.apache.camel.component.file.GenericFileOperationFailedException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.assertFileExists;
+import static org.apache.camel.test.junit5.TestSupport.assertFileNotExists;
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
/**
*
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerMultipleSiteCommandTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerMultipleSiteCommandTest.java
index 811c592..e93c0d3 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerMultipleSiteCommandTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerMultipleSiteCommandTest.java
@@ -20,7 +20,10 @@ import java.io.File;
import org.apache.camel.BindToRegistry;
import org.apache.camel.converter.IOConverter;
-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.assertTrue;
public class FtpProducerMultipleSiteCommandTest extends FtpServerTestSupport {
@@ -36,7 +39,7 @@ public class FtpProducerMultipleSiteCommandTest extends FtpServerTestSupport {
sendFile(getFtpUrl(), "Hello World", "hello.txt");
File file = new File(FTP_ROOT_DIR + "/site/hello.txt");
- assertTrue("The uploaded file should exists", file.exists());
+ assertTrue(file.exists(), "The uploaded file should exists");
assertEquals("Hello World", IOConverter.toString(file, null));
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerRawPasswordTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerRawPasswordTest.java
index 861c27a..7b69761 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerRawPasswordTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerRawPasswordTest.java
@@ -19,7 +19,10 @@ package org.apache.camel.component.file.remote;
import java.io.File;
import org.apache.camel.converter.IOConverter;
-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.assertTrue;
/**
* Unit test for password parameter using RAW value
@@ -39,7 +42,7 @@ public class FtpProducerRawPasswordTest extends FtpServerTestSupport {
sendFile(getFtpUrl(), "Hello World", "camel.txt");
File file = new File(FTP_ROOT_DIR + "/upload/camel.txt");
- assertTrue("The uploaded file should exists", file.exists());
+ assertTrue(file.exists(), "The uploaded file should exists");
assertEquals("Hello World", IOConverter.toString(file, null));
}
}
\ No newline at end of file
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerRecipientListParallelTimeoutTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerRecipientListParallelTimeoutTest.java
index 99d1504..2d9c913 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerRecipientListParallelTimeoutTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerRecipientListParallelTimeoutTest.java
@@ -20,13 +20,13 @@ import org.apache.camel.AggregationStrategy;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
/**
* Unit test to verify that Camel can build remote directory on FTP server if missing (full or part of).
*/
-@Ignore("Run this test manually")
+@Disabled("Run this test manually")
public class FtpProducerRecipientListParallelTimeoutTest extends FtpServerTestSupport {
private String getFtpUrl() {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerRecipientListTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerRecipientListTest.java
index c13e46f..bed154f 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerRecipientListTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerRecipientListTest.java
@@ -19,7 +19,9 @@ package org.apache.camel.component.file.remote;
import java.io.File;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class FtpProducerRecipientListTest extends FtpServerTestSupport {
@@ -34,13 +36,13 @@ public class FtpProducerRecipientListTest extends FtpServerTestSupport {
template.sendBodyAndHeader("direct:start", "Hi World", "foo", getFtpUrl() + "&fileName=hi.txt");
File file1 = new File(FTP_ROOT_DIR + "/list/hello.txt");
- assertTrue("File should exists " + file1, file1.exists());
+ assertTrue(file1.exists(), "File should exists " + file1);
File file2 = new File(FTP_ROOT_DIR + "/list/bye.txt");
- assertTrue("File should exists " + file2, file1.exists());
+ assertTrue(file1.exists(), "File should exists " + file2);
File file3 = new File(FTP_ROOT_DIR + "/list/hi.txt");
- assertTrue("File should exists " + file3, file1.exists());
+ assertTrue(file1.exists(), "File should exists " + file3);
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerReplyStringTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerReplyStringTest.java
index 6db19b8..ae7a1c7 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerReplyStringTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerReplyStringTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class FtpProducerReplyStringTest extends FtpServerTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerRootFileExistFailTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerRootFileExistFailTest.java
index 0d608c7..a597081 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerRootFileExistFailTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerRootFileExistFailTest.java
@@ -19,8 +19,13 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.Exchange;
import org.apache.camel.component.file.GenericFileOperationFailedException;
-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.assertFileExists;
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
public class FtpProducerRootFileExistFailTest extends FtpServerTestSupport {
@@ -29,7 +34,7 @@ public class FtpProducerRootFileExistFailTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
// create existing file on ftp server
@@ -43,7 +48,7 @@ public class FtpProducerRootFileExistFailTest extends FtpServerTestSupport {
fail("Should have thrown an exception");
} catch (CamelExecutionException e) {
GenericFileOperationFailedException cause = assertIsInstanceOf(GenericFileOperationFailedException.class, e.getCause());
- assertEquals("File already exist: hello.txt. Cannot write new file.", cause.getMessage());
+ assertEquals(cause.getMessage(), "File already exist: hello.txt. Cannot write new file.");
}
// root file should still exist
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerSendNoopFalseTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerSendNoopFalseTest.java
index 46fc060..5997255 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerSendNoopFalseTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerSendNoopFalseTest.java
@@ -19,7 +19,10 @@ package org.apache.camel.component.file.remote;
import java.io.File;
import org.apache.camel.converter.IOConverter;
-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.assertTrue;
public class FtpProducerSendNoopFalseTest extends FtpServerTestSupport {
@@ -32,7 +35,7 @@ public class FtpProducerSendNoopFalseTest extends FtpServerTestSupport {
sendFile(getFtpUrl(), "Hello World", "hello/claus.txt");
File file = new File(FTP_ROOT_DIR + "/upload/hello/claus.txt");
- assertTrue("The uploaded file should exists", file.exists());
+ assertTrue(file.exists(), "The uploaded file should exists");
assertEquals("Hello World", IOConverter.toString(file, null));
}
}
\ No newline at end of file
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerSiteCommandTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerSiteCommandTest.java
index 5bccbeb..3d572c9 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerSiteCommandTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerSiteCommandTest.java
@@ -19,7 +19,10 @@ package org.apache.camel.component.file.remote;
import java.io.File;
import org.apache.camel.converter.IOConverter;
-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.assertTrue;
public class FtpProducerSiteCommandTest extends FtpServerTestSupport {
@@ -32,7 +35,7 @@ public class FtpProducerSiteCommandTest extends FtpServerTestSupport {
sendFile(getFtpUrl(), "Hello World", "hello.txt");
File file = new File(FTP_ROOT_DIR + "/site/hello.txt");
- assertTrue("The uploaded file should exists", file.exists());
+ assertTrue(file.exists(), "The uploaded file should exists");
assertEquals("Hello World", IOConverter.toString(file, null));
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerTempFileExistIssueTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerTempFileExistIssueTest.java
index 0989ddc..8278aa8 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerTempFileExistIssueTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerTempFileExistIssueTest.java
@@ -21,7 +21,12 @@ import java.io.File;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.Exchange;
import org.apache.camel.component.file.GenericFileOperationFailedException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
public class FtpProducerTempFileExistIssueTest extends FtpServerTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerTempPrefixTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerTempPrefixTest.java
index c27021d..1e5770a 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerTempPrefixTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerTempPrefixTest.java
@@ -19,7 +19,10 @@ package org.apache.camel.component.file.remote;
import java.io.File;
import org.apache.camel.converter.IOConverter;
-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.assertTrue;
/**
* Unit test to verify that Camel can build remote directory on FTP server if missing (full or part of).
@@ -35,7 +38,7 @@ public class FtpProducerTempPrefixTest extends FtpServerTestSupport {
sendFile(getFtpUrl(), "Hello World", "claus.txt");
File file = new File(FTP_ROOT_DIR + "/upload/user/claus/claus.txt");
- assertTrue("The uploaded file should exists", file.exists());
+ assertTrue(file.exists(), "The uploaded file should exists");
assertEquals("Hello World", IOConverter.toString(file, null));
}
}
\ No newline at end of file
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerToDMoveExistingTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerToDMoveExistingTest.java
index de57eb2..8820a10 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerToDMoveExistingTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerToDMoveExistingTest.java
@@ -21,7 +21,9 @@ import java.util.Map;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.assertFileExists;
/**
*
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpReconnectAttemptServerStoppedTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpReconnectAttemptServerStoppedTest.java
index 070ae3b..da2fe96 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpReconnectAttemptServerStoppedTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpReconnectAttemptServerStoppedTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class FtpReconnectAttemptServerStoppedTest extends FtpServerTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpReconnectAttemptUnknownHostTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpReconnectAttemptUnknownHostTest.java
index aa2ff91..f2cc554 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpReconnectAttemptUnknownHostTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpReconnectAttemptUnknownHostTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class FtpReconnectAttemptUnknownHostTest extends FtpServerTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpRecursiveDepth2Test.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpRecursiveDepth2Test.java
index f2a84af..350c275 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpRecursiveDepth2Test.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpRecursiveDepth2Test.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class FtpRecursiveDepth2Test extends FtpServerTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpRecursiveDepth3Test.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpRecursiveDepth3Test.java
index cf81142..02a6ce6 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpRecursiveDepth3Test.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpRecursiveDepth3Test.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class FtpRecursiveDepth3Test extends FtpServerTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpRecursiveDepthTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpRecursiveDepthTest.java
index e2fb805..2496d86 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpRecursiveDepthTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpRecursiveDepthTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class FtpRecursiveDepthTest extends FtpServerTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java
index c7006bf..003a53a 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java
@@ -29,10 +29,14 @@ import org.apache.ftpserver.ftplet.UserManager;
import org.apache.ftpserver.listener.ListenerFactory;
import org.apache.ftpserver.usermanager.ClearTextPasswordEncryptor;
import org.apache.ftpserver.usermanager.PropertiesUserManagerFactory;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.apache.camel.language.simple.SimpleLanguage.simple;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Base class for unit testing using a FTPServer
@@ -43,11 +47,13 @@ public abstract class FtpServerTestSupport extends BaseServerTestSupport {
protected static final File USERS_FILE = new File("./src/test/resources/users.properties");
protected static final String DEFAULT_LISTENER = "default";
+ private static final Logger LOG = LoggerFactory.getLogger(FtpServerTestSupport.class);
+
protected FtpServer ftpServer;
protected boolean canTest;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory(FTP_ROOT_DIR);
@@ -72,7 +78,7 @@ public abstract class FtpServerTestSupport extends BaseServerTestSupport {
String name = System.getProperty("os.name");
String message = nsae.getMessage();
- log.warn("SunX509 is not avail on this platform [{}] Testing is skipped! Real cause: {}", name, message);
+ LOG.warn("SunX509 is not avail on this platform [{}] Testing is skipped! Real cause: {}", name, message);
} else {
// some other error then throw it so the test can fail
throw e;
@@ -81,7 +87,7 @@ public abstract class FtpServerTestSupport extends BaseServerTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
super.tearDown();
@@ -103,7 +109,7 @@ public abstract class FtpServerTestSupport extends BaseServerTestSupport {
protected FtpServerFactory createFtpServerFactory() throws Exception {
assertTrue(USERS_FILE.exists());
- assertTrue("Port number is not initialized in an expected range: " + getPort(), getPort() > 0);
+ assertTrue(getPort() > 0, "Port number is not initialized in an expected range: " + getPort());
NativeFileSystemFactory fsf = new NativeFileSystemFactory();
fsf.setCreateHome(true);
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpShutdownCompleteAllTasksTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpShutdownCompleteAllTasksTest.java
index 17df4da..69d9c9b 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpShutdownCompleteAllTasksTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpShutdownCompleteAllTasksTest.java
@@ -20,8 +20,10 @@ import org.apache.camel.Exchange;
import org.apache.camel.ShutdownRunningTask;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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;
/**
* Unit test to verify shutdown.
@@ -33,7 +35,7 @@ public class FtpShutdownCompleteAllTasksTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
@@ -63,7 +65,7 @@ public class FtpShutdownCompleteAllTasksTest extends FtpServerTestSupport {
context.stop();
// should route all 5
- assertEquals("Should complete all messages", 5, bar.getReceivedCounter());
+ assertEquals(5, bar.getReceivedCounter(), "Should complete all messages");
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpShutdownCompleteCurrentTaskOnlyTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpShutdownCompleteCurrentTaskOnlyTest.java
index bc40332..45eb2a8 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpShutdownCompleteCurrentTaskOnlyTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpShutdownCompleteCurrentTaskOnlyTest.java
@@ -20,8 +20,10 @@ import org.apache.camel.Exchange;
import org.apache.camel.ShutdownRunningTask;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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.assertTrue;
/**
* Unit test to verify shutdown.
@@ -33,7 +35,7 @@ public class FtpShutdownCompleteCurrentTaskOnlyTest extends FtpServerTestSupport
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
@@ -64,7 +66,7 @@ public class FtpShutdownCompleteCurrentTaskOnlyTest extends FtpServerTestSupport
context.stop();
// should NOT route all 5
- assertTrue("Should NOT complete all messages, was: " + bar.getReceivedCounter(), bar.getReceivedCounter() < 5);
+ assertTrue(bar.getReceivedCounter() < 5, "Should NOT complete all messages, was: " + bar.getReceivedCounter());
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeAbsoluteTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeAbsoluteTest.java
index 8553594..879ec06 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeAbsoluteTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeAbsoluteTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class FtpSimpleConsumeAbsoluteTest extends FtpServerTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeDirectoryParseWithAbsoluteDepthNoStepwiseTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeDirectoryParseWithAbsoluteDepthNoStepwiseTest.java
index ef1c37b..f90d1b2 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeDirectoryParseWithAbsoluteDepthNoStepwiseTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeDirectoryParseWithAbsoluteDepthNoStepwiseTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class FtpSimpleConsumeDirectoryParseWithAbsoluteDepthNoStepwiseTest extends FtpServerTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeStreamingPartialReadTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeStreamingPartialReadTest.java
index 96f41e6..e8d285b 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeStreamingPartialReadTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeStreamingPartialReadTest.java
@@ -24,7 +24,10 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.file.GenericFile;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class FtpSimpleConsumeStreamingPartialReadTest extends FtpServerTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeStreamingTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeStreamingTest.java
index 92fcb06..73c5425 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeStreamingTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeStreamingTest.java
@@ -22,7 +22,9 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.file.GenericFile;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class FtpSimpleConsumeStreamingTest extends FtpServerTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeStreamingWithMultipleFilesTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeStreamingWithMultipleFilesTest.java
index 56819a2..0186c74 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeStreamingWithMultipleFilesTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeStreamingWithMultipleFilesTest.java
@@ -22,7 +22,9 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.file.GenericFile;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class FtpSimpleConsumeStreamingWithMultipleFilesTest extends FtpServerTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSoTimeoutTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSoTimeoutTest.java
index 45172f4..b47b95a 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSoTimeoutTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSoTimeoutTest.java
@@ -17,16 +17,20 @@
package org.apache.camel.component.file.remote;
import java.net.ServerSocket;
+import java.util.concurrent.TimeUnit;
import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.commons.net.ftp.FTPClient;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* Test class used to demonstrate the problematic disconnect sequence of the {@link FtpOperations}.
@@ -43,7 +47,7 @@ public class FtpSoTimeoutTest extends CamelTestSupport {
// --- Set up
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
// the created server socket makes it possible for the FTP client to establish the socket connection.
// However, no message will ever be sent back, thus a read timeout should occur within FTPClient#__getReply()
@@ -52,7 +56,7 @@ public class FtpSoTimeoutTest extends CamelTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
super.tearDown();
if (serverSocket != null) {
@@ -90,17 +94,23 @@ public class FtpSoTimeoutTest extends CamelTestSupport {
// --- Tests
- @Test(timeout = 10000, expected = CamelExecutionException.class)
+ @Test
+ @Timeout(value = 10, unit = TimeUnit.SECONDS)
public void testWithDefaultTimeout() throws Exception {
- // send exchange to the route using the custom FTPClient (with a default timeout)
- // the soTimeout triggers in time and test is successful
- template.sendBody("direct:with", "");
+ assertThrows(CamelExecutionException.class, () -> {
+ // send exchange to the route using the custom FTPClient (with a default timeout)
+ // the soTimeout triggers in time and test is successful
+ template.sendBody("direct:with", "");
+ });
}
-
- @Test(timeout = 10000, expected = CamelExecutionException.class)
+
+ @Test
+ @Timeout(value = 10, unit = TimeUnit.SECONDS)
public void testWithoutDefaultTimeout() throws Exception {
- // send exchange to the route using the default FTPClient (without a default timeout)
- // the soTimeout never triggers and test fails after its own timeout
- template.sendBody("direct:without", "");
+ assertThrows(CamelExecutionException.class, () -> {
+ // send exchange to the route using the default FTPClient (without a default timeout)
+ // the soTimeout never triggers and test fails after its own timeout
+ template.sendBody("direct:without", "");
+ });
}
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpStreamingMoveTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpStreamingMoveTest.java
index 4f2c157..5b8b93f 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpStreamingMoveTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpStreamingMoveTest.java
@@ -22,8 +22,11 @@ import java.io.InputStream;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.file.GenericFile;
import org.apache.camel.component.mock.MockEndpoint;
-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.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class FtpStreamingMoveTest extends FtpServerTestSupport {
@@ -32,7 +35,7 @@ public class FtpStreamingMoveTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
deleteDirectory("target/mymove");
@@ -60,7 +63,7 @@ public class FtpStreamingMoveTest extends FtpServerTestSupport {
Thread.sleep(1000);
File file = new File(FTP_ROOT_DIR + "/mymove/done/hello.txt");
- assertTrue("File should have been renamed", file.exists());
+ assertTrue(file.exists(), "File should have been renamed");
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpThrowExceptionOnConnectionFailedTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpThrowExceptionOnConnectionFailedTest.java
index eac20e6..f173b7f 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpThrowExceptionOnConnectionFailedTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpThrowExceptionOnConnectionFailedTest.java
@@ -22,7 +22,11 @@ import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.component.file.GenericFileOperationFailedException;
-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.assertFalse;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Unit test for login failure due bad password and no re connect attempts allowed
@@ -41,7 +45,7 @@ public class FtpThrowExceptionOnConnectionFailedTest extends FtpServerTestSuppor
// assert file NOT created
File file = new File(FTP_ROOT_DIR + "login/report.txt");
- assertFalse("The file should NOT exists", file.exists());
+ assertFalse(file.exists(), "The file should NOT exists");
}
private void uploadFile(String username, String password) throws Exception {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpUtilsExtractDirNameFromAbsolutePathTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpUtilsExtractDirNameFromAbsolutePathTest.java
index 540e81f..4cb3a69 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpUtilsExtractDirNameFromAbsolutePathTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpUtilsExtractDirNameFromAbsolutePathTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.component.file.remote;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class FtpUtilsExtractDirNameFromAbsolutePathTest {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpsServerTestSupport.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpsServerTestSupport.java
index 88bfc9c..39e1ec9 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpsServerTestSupport.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpsServerTestSupport.java
@@ -23,18 +23,24 @@ import org.apache.camel.util.ObjectHelper;
import org.apache.ftpserver.FtpServerFactory;
import org.apache.ftpserver.listener.ListenerFactory;
import org.apache.ftpserver.ssl.SslConfigurationFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Abstract base class for unit testing using a secure FTP Server (over SSL/TLS)
*/
public abstract class FtpsServerTestSupport extends FtpServerTestSupport {
-
+
protected static final String AUTH_VALUE_SSL = "SSLv3";
protected static final String AUTH_VALUE_TLS = "TLSv1.2";
protected static final File FTPSERVER_KEYSTORE = new File("./src/test/resources/server.jks");
protected static final String FTPSERVER_KEYSTORE_PASSWORD = "password";
+ private static final Logger LOG = LoggerFactory.getLogger(FtpsServerTestSupport.class);
+
@Override
protected FtpServerFactory createFtpServerFactory() throws Exception {
try {
@@ -45,7 +51,7 @@ public abstract class FtpsServerTestSupport extends FtpServerTestSupport {
if (nsae != null) {
String name = System.getProperty("os.name");
String message = nsae.getMessage();
- log.warn("SunX509 is not avail on this platform [{}] Testing is skipped! Real cause: {}", name, message);
+ LOG.warn("SunX509 is not avail on this platform [{}] Testing is skipped! Real cause: {}", name, message);
return null;
} else {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/OsgiParserFactoryTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/OsgiParserFactoryTest.java
index 27710a5..9488ef5 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/OsgiParserFactoryTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/OsgiParserFactoryTest.java
@@ -27,24 +27,25 @@ import org.apache.commons.net.ftp.parser.OS2FTPEntryParser;
import org.apache.commons.net.ftp.parser.OS400FTPEntryParser;
import org.apache.commons.net.ftp.parser.UnixFTPEntryParser;
import org.apache.commons.net.ftp.parser.VMSVersioningFTPEntryParser;
-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.hamcrest.core.IsInstanceOf.instanceOf;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class OsgiParserFactoryTest {
private static final OsgiParserFactory OSGI_PARSER_FACTORY = new OsgiParserFactory(null);
+
@Mock
private FTPClientConfig ftpClientConfig;
- @Before
+ @BeforeEach
public void setup() {
when(ftpClientConfig.getDefaultDateFormatStr()).thenReturn("yyyy-MM-dd");
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/PaddyRouteTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/PaddyRouteTest.java
index 7524a86..bd84a41 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/PaddyRouteTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/PaddyRouteTest.java
@@ -20,7 +20,10 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* An unit test based on Paddy having trouble with SFTP.
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/RecipientListErrorHandlingIssueTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/RecipientListErrorHandlingIssueTest.java
index dd309b9..031558d 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/RecipientListErrorHandlingIssueTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/RecipientListErrorHandlingIssueTest.java
@@ -22,7 +22,7 @@ import java.util.Map;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class RecipientListErrorHandlingIssueTest extends FtpServerTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/RemoteEndPointRemoteFilePollingConsumerPollStrategyTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/RemoteEndPointRemoteFilePollingConsumerPollStrategyTest.java
index 8e729c7..979df90 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/RemoteEndPointRemoteFilePollingConsumerPollStrategyTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/RemoteEndPointRemoteFilePollingConsumerPollStrategyTest.java
@@ -16,8 +16,10 @@
*/
package org.apache.camel.component.file.remote;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class RemoteEndPointRemoteFilePollingConsumerPollStrategyTest extends CamelTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/RemoteFileIgnoreDoPollErrorTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/RemoteFileIgnoreDoPollErrorTest.java
index 24b2a02..3e49530 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/RemoteFileIgnoreDoPollErrorTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/RemoteFileIgnoreDoPollErrorTest.java
@@ -25,8 +25,12 @@ import org.apache.camel.Processor;
import org.apache.camel.component.file.GenericFile;
import org.apache.camel.component.file.GenericFileOperationFailedException;
import org.apache.camel.component.file.GenericFileProducer;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
public class RemoteFileIgnoreDoPollErrorTest {
private final RemoteFileEndpoint<Object> remoteFileEndpoint = new RemoteFileEndpoint<Object>() {
@@ -55,14 +59,14 @@ public class RemoteFileIgnoreDoPollErrorTest {
public void testReadDirErrorIsHandled() throws Exception {
RemoteFileConsumer<Object> consumer = getRemoteFileConsumer("true", true);
boolean result = consumer.doSafePollSubDirectory("anyPath", "adir", new ArrayList<GenericFile<Object>>(), 0);
- Assert.assertTrue(result);
+ assertTrue(result);
}
@Test
public void testReadDirErrorIsHandledWithNoMorePoll() throws Exception {
RemoteFileConsumer<Object> consumer = getRemoteFileConsumer("false", true);
boolean result = consumer.doSafePollSubDirectory("anyPath", "adir", new ArrayList<GenericFile<Object>>(), 0);
- Assert.assertFalse(result);
+ assertFalse(result);
}
@Test
@@ -70,9 +74,9 @@ public class RemoteFileIgnoreDoPollErrorTest {
RemoteFileConsumer<Object> consumer = getRemoteFileConsumer("IllegalStateException", false);
try {
consumer.doSafePollSubDirectory("anyPath", "adir", new ArrayList<GenericFile<Object>>(), 0);
- Assert.fail("Must throw wrapped IllegalStateException in GenericFileOperationFailedException");
+ fail("Must throw wrapped IllegalStateException in GenericFileOperationFailedException");
} catch (GenericFileOperationFailedException e) {
- Assert.assertTrue(e.getCause() instanceof IllegalStateException);
+ assertTrue(e.getCause() instanceof IllegalStateException);
}
}
@@ -81,9 +85,9 @@ public class RemoteFileIgnoreDoPollErrorTest {
RemoteFileConsumer<Object> consumer = getRemoteFileConsumer("GenericFileOperationFailedException", false);
try {
consumer.doSafePollSubDirectory("anyPath", "adir", new ArrayList<GenericFile<Object>>(), 0);
- Assert.fail("Must throw GenericFileOperationFailedException");
+ fail("Must throw GenericFileOperationFailedException");
} catch (GenericFileOperationFailedException e) {
- Assert.assertNull(e.getCause());
+ assertNull(e.getCause());
}
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/RemoteFileProduceOverruleOnlyOnceTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/RemoteFileProduceOverruleOnlyOnceTest.java
index 91d7479..0258b50 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/RemoteFileProduceOverruleOnlyOnceTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/RemoteFileProduceOverruleOnlyOnceTest.java
@@ -22,8 +22,10 @@ import java.util.Map;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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.deleteDirectory;
/**
*
@@ -46,7 +48,7 @@ public class RemoteFileProduceOverruleOnlyOnceTest extends FtpServerTestSupport
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/out");
super.setUp();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/SftpPollEnrichConsumeWithDisconnectAndDeleteTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/SftpPollEnrichConsumeWithDisconnectAndDeleteTest.java
index 56f2083..cccd06e 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/SftpPollEnrichConsumeWithDisconnectAndDeleteTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/SftpPollEnrichConsumeWithDisconnectAndDeleteTest.java
@@ -23,10 +23,16 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.file.remote.sftp.SftpServerTestSupport;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
public class SftpPollEnrichConsumeWithDisconnectAndDeleteTest extends SftpServerTestSupport {
+ private static final Logger LOG = LoggerFactory.getLogger(SftpPollEnrichConsumeWithDisconnectAndDeleteTest.class);
+
@Test
public void testSftpSimpleConsume() throws Exception {
if (!canTest()) {
@@ -55,12 +61,12 @@ public class SftpPollEnrichConsumeWithDisconnectAndDeleteTest extends SftpServer
fileExists = file.exists();
if (fileExists) {
- log.info("Will check that file has been deleted again in 200ms");
+ LOG.info("Will check that file has been deleted again in 200ms");
Thread.sleep(200);
}
}
- assertFalse("The file should have been deleted", fileExists);
+ assertFalse(fileExists, "The file should have been deleted");
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/ToFtpTempFileTargetFileExistTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/ToFtpTempFileTargetFileExistTest.java
index 552538e..85aa289 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/ToFtpTempFileTargetFileExistTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/ToFtpTempFileTargetFileExistTest.java
@@ -23,8 +23,10 @@ import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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.assertTrue;
public class ToFtpTempFileTargetFileExistTest extends FtpServerTestSupport {
@@ -34,7 +36,7 @@ public class ToFtpTempFileTargetFileExistTest extends FtpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prepareFtpServer();
@@ -65,7 +67,7 @@ public class ToFtpTempFileTargetFileExistTest extends FtpServerTestSupport {
// assert file is created
File file = new File(FTP_ROOT_DIR + "/tempfile/foo/bar/message.txt");
- assertTrue("The file should exists", file.exists());
+ assertTrue(file.exists(), "The file should exists");
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/UriConfigurationTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/UriConfigurationTest.java
index e16d9ed..db5a324 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/UriConfigurationTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/UriConfigurationTest.java
@@ -18,8 +18,13 @@ package org.apache.camel.component.file.remote;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit5.TestSupport;
+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.assertNull;
public class UriConfigurationTest extends CamelTestSupport {
@@ -160,11 +165,11 @@ public class UriConfigurationTest extends CamelTestSupport {
}
private void assertRemoteFileEndpointFile(String endpointUri, String expectedFile) {
- RemoteFileEndpoint<?> endpoint = resolveMandatoryEndpoint(context, endpointUri, RemoteFileEndpoint.class);
- assertNotNull("Could not find endpoint: " + endpointUri, endpoint);
+ RemoteFileEndpoint<?> endpoint = TestSupport.resolveMandatoryEndpoint(context, endpointUri, RemoteFileEndpoint.class);
+ assertNotNull(endpoint, "Could not find endpoint: " + endpointUri);
String file = endpoint.getConfiguration().getDirectory();
- assertEquals("For uri: " + endpointUri + " the file is not equal", expectedFile, file);
+ assertEquals(expectedFile, file, "For uri: " + endpointUri + " the file is not equal");
}
@Test
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelManualTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelManualTest.java
index ab8a24d..7840962 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelManualTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelManualTest.java
@@ -17,16 +17,18 @@
package org.apache.camel.component.file.remote.manual;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore("Run this test manually")
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+
+@Disabled("Run this test manually")
public class FtpConsumerCamelManualTest extends CamelTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/ftptest");
super.setUp();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelRecursiveManualTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelRecursiveManualTest.java
index 1135625..6dd6e2d 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelRecursiveManualTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelRecursiveManualTest.java
@@ -17,16 +17,18 @@
package org.apache.camel.component.file.remote.manual;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore("Run this test manually")
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+
+@Disabled("Run this test manually")
public class FtpConsumerCamelRecursiveManualTest extends CamelTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/ftptest");
super.setUp();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelRecursiveToAbsoluteManualTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelRecursiveToAbsoluteManualTest.java
index f97992e..cf5cebd 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelRecursiveToAbsoluteManualTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerCamelRecursiveToAbsoluteManualTest.java
@@ -17,16 +17,18 @@
package org.apache.camel.component.file.remote.manual;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore("Run this test manually")
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+
+@Disabled("Run this test manually")
public class FtpConsumerCamelRecursiveToAbsoluteManualTest extends CamelTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/ftptest");
super.setUp();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelManualTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelManualTest.java
index 0280a9e..d9eb930 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelManualTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelManualTest.java
@@ -17,16 +17,18 @@
package org.apache.camel.component.file.remote.manual;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore("Run this test manually")
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+
+@Disabled("Run this test manually")
public class FtpConsumerNotStepwiseCamelManualTest extends CamelTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/ftptest");
super.setUp();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelRecursiveManualTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelRecursiveManualTest.java
index a4ccc22..feb8b1e 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelRecursiveManualTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelRecursiveManualTest.java
@@ -17,16 +17,18 @@
package org.apache.camel.component.file.remote.manual;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore("Run this test manually")
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+
+@Disabled("Run this test manually")
public class FtpConsumerNotStepwiseCamelRecursiveManualTest extends CamelTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/ftptest");
super.setUp();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelRecursiveToAbsoluteManualTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelRecursiveToAbsoluteManualTest.java
index fbde292..73d237e 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelRecursiveToAbsoluteManualTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerNotStepwiseCamelRecursiveToAbsoluteManualTest.java
@@ -17,16 +17,18 @@
package org.apache.camel.component.file.remote.manual;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore("Run this test manually")
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+
+@Disabled("Run this test manually")
public class FtpConsumerNotStepwiseCamelRecursiveToAbsoluteManualTest extends CamelTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/ftptest");
super.setUp();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerScottManualTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerScottManualTest.java
index 52b77a8..ae1ba2c 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerScottManualTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerScottManualTest.java
@@ -17,16 +17,18 @@
package org.apache.camel.component.file.remote.manual;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore("Run this test manually")
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+
+@Disabled("Run this test manually")
public class FtpConsumerScottManualTest extends CamelTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/ftptest");
super.setUp();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerScottRecursiveManualTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerScottRecursiveManualTest.java
index eefcc8a..a437299 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerScottRecursiveManualTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/manual/FtpConsumerScottRecursiveManualTest.java
@@ -17,16 +17,18 @@
package org.apache.camel.component.file.remote.manual;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore("Run this test manually")
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+
+@Disabled("Run this test manually")
public class FtpConsumerScottRecursiveManualTest extends CamelTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/ftptest");
super.setUp();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/FromSftpRecursiveNotStepwiseNoBasePathTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/FromSftpRecursiveNotStepwiseNoBasePathTest.java
index 110510a..c91729d 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/FromSftpRecursiveNotStepwiseNoBasePathTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/FromSftpRecursiveNotStepwiseNoBasePathTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.file.remote.sftp;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class FromSftpRecursiveNotStepwiseNoBasePathTest extends SftpServerTestSupport {
@@ -30,7 +30,7 @@ public class FromSftpRecursiveNotStepwiseNoBasePathTest extends SftpServerTestSu
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
rootDirMode = true;
super.setUp();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpChangedReadLockTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpChangedReadLockTest.java
index afc9d02..56fe4e4 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpChangedReadLockTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpChangedReadLockTest.java
@@ -21,11 +21,15 @@ import java.io.FileOutputStream;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.camel.test.junit5.TestSupport.createDirectory;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
*
*/
@@ -39,7 +43,7 @@ public class SftpChangedReadLockTest extends SftpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/changed");
super.setUp();
@@ -63,7 +67,7 @@ public class SftpChangedReadLockTest extends SftpServerTestSupport {
String content = context.getTypeConverter().convertTo(String.class, new File("target/changed/out/slowfile.dat"));
String[] lines = content.split(LS);
- assertEquals("There should be 20 lines in the file", 20, lines.length);
+ assertEquals(20, lines.length, "There should be 20 lines in the file");
for (int i = 0; i < 20; i++) {
assertEquals("Line " + i, lines[i]);
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpChmodTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpChmodTest.java
index 5727026..0fefea6 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpChmodTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpChmodTest.java
@@ -19,7 +19,11 @@ package org.apache.camel.component.file.remote.sftp;
import java.io.File;
import org.apache.camel.Exchange;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnJre;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class SftpChmodTest extends SftpServerTestSupport {
@@ -29,15 +33,10 @@ public class SftpChmodTest extends SftpServerTestSupport {
return;
}
- // see https://issues.apache.org/jira/browse/SSHD-267
- if (isJava16()) {
- return;
- }
-
template.sendBodyAndHeader("sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR + "?username=admin&password=admin&chmod=777", "Hello World", Exchange.FILE_NAME, "hello.txt");
File file = new File(FTP_ROOT_DIR + "/hello.txt");
- assertTrue("File should exist: " + file, file.exists());
+ assertTrue(file.exists(), "File should exist: " + file);
assertEquals("Hello World", context.getTypeConverter().convertTo(String.class, file));
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpConsumeTemplateTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpConsumeTemplateTest.java
index 17ff1cb..4251f75 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpConsumeTemplateTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpConsumeTemplateTest.java
@@ -17,7 +17,10 @@
package org.apache.camel.component.file.remote.sftp;
import org.apache.camel.Exchange;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class SftpConsumeTemplateTest extends SftpServerTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpConsumerAutoCreateTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpConsumerAutoCreateTest.java
index c01fa5b..99fd4d2 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpConsumerAutoCreateTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpConsumerAutoCreateTest.java
@@ -21,8 +21,11 @@ import java.io.File;
import org.apache.camel.Exchange;
import org.apache.camel.component.file.GenericFileOperationFailedException;
import org.apache.camel.component.file.remote.SftpEndpoint;
-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.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
public class SftpConsumerAutoCreateTest extends SftpServerTestSupport {
@@ -31,7 +34,7 @@ public class SftpConsumerAutoCreateTest extends SftpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpConsumerDisconnectTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpConsumerDisconnectTest.java
index eb2a95d..57a5dc9 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpConsumerDisconnectTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpConsumerDisconnectTest.java
@@ -24,10 +24,12 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.commons.io.FileUtils;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
+@Disabled
public class SftpConsumerDisconnectTest extends SftpServerTestSupport {
private static final String SAMPLE_FILE_NAME_1 = String.format("sample-1-%s.txt", SftpConsumerDisconnectTest.class.getSimpleName());
private static final String SAMPLE_FILE_NAME_2 = String.format("sample-2-%s.txt", SftpConsumerDisconnectTest.class.getSimpleName());
@@ -57,7 +59,7 @@ public class SftpConsumerDisconnectTest extends SftpServerTestSupport {
// File is deleted
File deletedFile = new File(FTP_ROOT_DIR + "/" + SAMPLE_FILE_NAME_1);
- assertFalse("File should have been deleted: " + deletedFile, deletedFile.exists());
+ assertFalse(deletedFile.exists(), "File should have been deleted: " + deletedFile);
}
@Test
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpConsumerProcessStrategyTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpConsumerProcessStrategyTest.java
index 9bff904..08ea600 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpConsumerProcessStrategyTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpConsumerProcessStrategyTest.java
@@ -22,7 +22,11 @@ import org.apache.camel.component.file.GenericFile;
import org.apache.camel.component.file.GenericFileEndpoint;
import org.apache.camel.component.file.GenericFileOperations;
import org.apache.camel.component.file.GenericFileProcessStrategy;
-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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class SftpConsumerProcessStrategyTest extends SftpServerTestSupport {
@@ -42,7 +46,7 @@ public class SftpConsumerProcessStrategyTest extends SftpServerTestSupport {
assertNotNull(out);
// Apache SSHD appends \u0000 at last byte in retrieved file
assertTrue(out.startsWith("Hello World"));
- assertEquals("CustomProcessStrategy should have been invoked 1 times", 1, myStrategy.getInvoked());
+ assertEquals(1, myStrategy.getInvoked(), "CustomProcessStrategy should have been invoked 1 times");
}
private static class MyStrategy implements GenericFileProcessStrategy {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpConsumerWithCharsetTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpConsumerWithCharsetTest.java
index cdc9ece..e720364 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpConsumerWithCharsetTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpConsumerWithCharsetTest.java
@@ -25,7 +25,10 @@ import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.file.remote.RemoteFile;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.commons.io.FileUtils;
-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.assertNotNull;
public class SftpConsumerWithCharsetTest extends SftpServerTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpECKeyFileConsumeTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpECKeyFileConsumeTest.java
index 9137e8e..f14ea71 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpECKeyFileConsumeTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpECKeyFileConsumeTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.sshd.server.auth.pubkey.PublickeyAuthenticator;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class SftpECKeyFileConsumeTest extends SftpServerTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpFromSedaDeleteFileTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpFromSedaDeleteFileTest.java
index 6b562dd..2ea8921 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpFromSedaDeleteFileTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpFromSedaDeleteFileTest.java
@@ -22,8 +22,10 @@ import java.io.IOException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.commons.io.FileUtils;
-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.assertFalse;
/**
* Unit test to test delete option.
@@ -37,7 +39,7 @@ public class SftpFromSedaDeleteFileTest extends SftpServerTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
createSampleFile();
@@ -55,7 +57,7 @@ public class SftpFromSedaDeleteFileTest extends SftpServerTestSupport {
// assert the file is deleted
File file = new File(FTP_ROOT_DIR + "/hello.txt");
- assertFalse("The file should have been deleted", file.exists());
+ assertFalse(file.exists(), "The file should have been deleted");
}
private void createSampleFile() throws IOException {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyConsumeTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyConsumeTest.java
index f847dce..ca8b60b 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyConsumeTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyConsumeTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.util.IOHelper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class SftpKeyConsumeTest extends SftpServerTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyFileConsumeTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyFileConsumeTest.java
index 966922c..8f9c589 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyFileConsumeTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyFileConsumeTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.sshd.server.auth.pubkey.PublickeyAuthenticator;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class SftpKeyFileConsumeTest extends SftpServerTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyPairDSAConsumeTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyPairDSAConsumeTest.java
index 819f39e..fa8b159 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyPairDSAConsumeTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyPairDSAConsumeTest.java
@@ -23,14 +23,14 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.sshd.server.auth.pubkey.PublickeyAuthenticator;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
public class SftpKeyPairDSAConsumeTest extends SftpServerTestSupport {
private static KeyPair keyPair;
- @BeforeClass
+ @BeforeAll
public static void createKeys() throws Exception {
KeyPairGenerator keyGen = KeyPairGenerator.getInstance("DSA");
keyGen.initialize(1024);
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyPairRSAConsumeTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyPairRSAConsumeTest.java
index 3e93ae2..2ddfb96 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyPairRSAConsumeTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyPairRSAConsumeTest.java
@@ -29,14 +29,14 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.util.IOHelper;
import org.apache.sshd.server.auth.pubkey.PublickeyAuthenticator;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
public class SftpKeyPairRSAConsumeTest extends SftpServerTestSupport {
private static KeyPair keyPair;
- @BeforeClass
+ @BeforeAll
public static void createKeys() throws Exception {
KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA");
keyGen.initialize(2048);
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyUriConsumeFromClasspathTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyUriConsumeFromClasspathTest.java
index ba80d73..d44406c 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyUriConsumeFromClasspathTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyUriConsumeFromClasspathTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.file.remote.sftp;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class SftpKeyUriConsumeFromClasspathTest extends SftpServerTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyUriConsumeTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyUriConsumeTest.java
index 309377c..183583b 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyUriConsumeTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyUriConsumeTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.file.remote.sftp;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class SftpKeyUriConsumeTest extends SftpServerTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpProduceTempFileTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpProduceTempFileTest.java
index a234d27..53bbaa2 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpProduceTempFileTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpProduceTempFileTest.java
@@ -20,7 +20,10 @@ import java.io.File;
import org.apache.camel.Exchange;
import org.apache.camel.util.FileUtil;
-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.assertTrue;
public class SftpProduceTempFileTest extends SftpServerTestSupport {
@@ -34,7 +37,7 @@ public class SftpProduceTempFileTest extends SftpServerTestSupport {
+ "?username=admin&password=admin&tempFileName=temp-${file:name}", "Hello World", Exchange.FILE_NAME, "hello.txt");
File file = new File(FTP_ROOT_DIR + "/hello.txt");
- assertTrue("File should exist: " + file, file.exists());
+ assertTrue(file.exists(), "File should exist: " + file);
assertEquals("Hello World", context.getTypeConverter().convertTo(String.class, file));
}
@@ -48,7 +51,7 @@ public class SftpProduceTempFileTest extends SftpServerTestSupport {
+ "/?username=admin&password=admin&tempFileName=temp-${file:name}", "Hello World", Exchange.FILE_NAME, "hello.txt");
File file = new File("hello.txt");
- assertTrue("File should exist: " + file, file.exists());
+ assertTrue(file.exists(), "File should exist: " + file);
assertEquals("Hello World", context.getTypeConverter().convertTo(String.class, file));
// delete file when we are done testing
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpProducerFileWithPathNoStepwiseTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpProducerFileWithPathNoStepwiseTest.java
index bd6dc86..b7d507b 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpProducerFileWithPathNoStepwiseTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpProducerFileWithPathNoStepwiseTest.java
@@ -20,7 +20,10 @@ import java.io.File;
import org.apache.camel.Exchange;
import org.apache.camel.converter.IOConverter;
-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.assertTrue;
public class SftpProducerFileWithPathNoStepwiseTest extends SftpServerTestSupport {
@@ -37,7 +40,7 @@ public class SftpProducerFileWithPathNoStepwiseTest extends SftpServerTestSuppor
template.sendBodyAndHeader(getFtpUrl(), "Hello World", Exchange.FILE_NAME, "hello/claus.txt");
File file = new File(FTP_ROOT_DIR + "/hello/claus.txt");
- assertTrue("The uploaded file should exists", file.exists());
+ assertTrue(file.exists(), "The uploaded file should exists");
assertEquals("Hello World", IOConverter.toString(file, null));
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpProducerFileWithPathTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpProducerFileWithPathTest.java
index 0742754..0adef5d 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpProducerFileWithPathTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpProducerFileWithPathTest.java
@@ -20,7 +20,10 @@ import java.io.File;
import org.apache.camel.Exchange;
import org.apache.camel.converter.IOConverter;
-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.assertTrue;
public class SftpProducerFileWithPathTest extends SftpServerTestSupport {
@@ -37,7 +40,7 @@ public class SftpProducerFileWithPathTest extends SftpServerTestSupport {
template.sendBodyAndHeader(getFtpUrl(), "Hello World", Exchange.FILE_NAME, "hello/claus.txt");
File file = new File(FTP_ROOT_DIR + "/hello/claus.txt");
- assertTrue("The uploaded file should exists", file.exists());
+ assertTrue(file.exists(), "The uploaded file should exists");
assertEquals("Hello World", IOConverter.toString(file, null));
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpProducerMoveExistingTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpProducerMoveExistingTest.java
index dabb245..18852ee 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpProducerMoveExistingTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpProducerMoveExistingTest.java
@@ -21,7 +21,14 @@ import java.io.File;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.Exchange;
import org.apache.camel.component.file.GenericFileOperationFailedException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.assertFileExists;
+import static org.apache.camel.test.junit5.TestSupport.assertFileNotExists;
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
/**
*
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpProducerWithCharsetTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpProducerWithCharsetTest.java
index 1080f37..27d7508 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpProducerWithCharsetTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpProducerWithCharsetTest.java
@@ -20,7 +20,10 @@ import java.io.File;
import org.apache.camel.Exchange;
import org.apache.commons.io.FileUtils;
-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.assertTrue;
public class SftpProducerWithCharsetTest extends SftpServerTestSupport {
@@ -37,7 +40,7 @@ public class SftpProducerWithCharsetTest extends SftpServerTestSupport {
template.sendBodyAndHeader(getSftpUri(), SAMPLE_FILE_PAYLOAD, Exchange.FILE_NAME, SAMPLE_FILE_NAME);
File file = new File(FTP_ROOT_DIR + "/" + SAMPLE_FILE_NAME);
- assertTrue("The uploaded file should exist", file.exists());
+ assertTrue(file.exists(), "The uploaded file should exist");
String storedPayload = FileUtils.readFileToString(file, SAMPLE_FILE_CHARSET);
assertEquals(SAMPLE_FILE_PAYLOAD, storedPayload);
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpServerTestSupport.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpServerTestSupport.java
index aa79c8a..0aa44c7 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpServerTestSupport.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpServerTestSupport.java
@@ -34,12 +34,18 @@ import org.apache.sshd.server.SshServer;
import org.apache.sshd.server.auth.pubkey.PublickeyAuthenticator;
import org.apache.sshd.server.scp.ScpCommandFactory;
import org.apache.sshd.server.subsystem.sftp.SftpSubsystemFactory;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.apache.camel.test.junit5.TestSupport.createDirectory;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
public class SftpServerTestSupport extends BaseServerTestSupport {
protected static final String FTP_ROOT_DIR = "target/res/home";
+ private static final Logger LOG = LoggerFactory.getLogger(SftpServerTestSupport.class);
private static final String KNOWN_HOSTS = "[localhost]:%d ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDdfIWeSV4o68dRrKS"
+ "zFd/Bk51E65UTmmSrmW0O1ohtzi6HzsDPjXgCtlTt3FqTcfFfI92IlTr4JWqC9UK1QT1ZTeng0MkPQmv68hDANHbt5CpETZHjW5q4OOgWhV"
+ "vj5IyOC2NZHtKlJBkdsMAa15ouOOJLzBvAvbqOR/yUROsEiQ==";
@@ -51,7 +57,7 @@ public class SftpServerTestSupport extends BaseServerTestSupport {
private String simulatedUserSsh = "./target/user-home/.ssh";
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory(FTP_ROOT_DIR);
@@ -92,7 +98,7 @@ public class SftpServerTestSupport extends BaseServerTestSupport {
String name = System.getProperty("os.name");
String message = nsae.getMessage();
- log.warn("SunX509 is not avail on this platform [{}] Testing is skipped! Real cause: {}", name, message);
+ LOG.warn("SunX509 is not avail on this platform [{}] Testing is skipped! Real cause: {}", name, message);
} else {
// some other error then throw it so the test can fail
throw e;
@@ -105,7 +111,7 @@ public class SftpServerTestSupport extends BaseServerTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
if (oldUserHome != null) {
System.setProperty("user.home", oldUserHome);
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSetCipherTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSetCipherTest.java
index b7cc15f..f676fce 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSetCipherTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSetCipherTest.java
@@ -20,7 +20,10 @@ import java.io.File;
import org.apache.camel.Exchange;
import org.apache.camel.component.file.remote.SftpEndpoint;
-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.assertTrue;
public class SftpSetCipherTest extends SftpServerTestSupport {
@@ -36,7 +39,7 @@ public class SftpSetCipherTest extends SftpServerTestSupport {
// test setting the cipher doesn't interfere with message payload
File file = new File(FTP_ROOT_DIR + "/hello.txt");
- assertTrue("File should exist: " + file, file.exists());
+ assertTrue(file.exists(), "File should exist: " + file);
assertEquals("Hello World", context.getTypeConverter().convertTo(String.class, file));
// did we actually set the correct cipher?
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSetOperationsTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSetOperationsTest.java
index 468e258..b924ca6 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSetOperationsTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSetOperationsTest.java
@@ -20,7 +20,10 @@ import java.io.File;
import org.apache.camel.Exchange;
import org.apache.camel.component.file.remote.SftpEndpoint;
-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.assertTrue;
public class SftpSetOperationsTest extends SftpServerTestSupport {
@@ -38,7 +41,7 @@ public class SftpSetOperationsTest extends SftpServerTestSupport {
// test setting the cipher doesn't interfere with message payload
File file = new File(FTP_ROOT_DIR + "/hello.txt");
- assertTrue("File should exist: " + file, file.exists());
+ assertTrue(file.exists(), "File should exist: " + file);
assertEquals("Hello World", context.getTypeConverter().convertTo(String.class, file));
// did we actually set the preferedAuthentifications
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeRecursiveTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeRecursiveTest.java
index 500ed16..c220cad 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeRecursiveTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeRecursiveTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.file.remote.sftp;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class SftpSimpleConsumeRecursiveTest extends SftpServerTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeStreamingPartialReadTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeStreamingPartialReadTest.java
index d8c4589..11b11c2 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeStreamingPartialReadTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeStreamingPartialReadTest.java
@@ -24,7 +24,10 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.file.GenericFile;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests that a file move can occur on the server even if the remote stream was only partially read.
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeStreamingTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeStreamingTest.java
index 0321ed8..d699756 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeStreamingTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeStreamingTest.java
@@ -22,7 +22,9 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.file.GenericFile;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class SftpSimpleConsumeStreamingTest extends SftpServerTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeStreamingWithMultipleFilesTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeStreamingWithMultipleFilesTest.java
index 4fd7d59..c51f23f 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeStreamingWithMultipleFilesTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeStreamingWithMultipleFilesTest.java
@@ -22,7 +22,9 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.file.GenericFile;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class SftpSimpleConsumeStreamingWithMultipleFilesTest extends SftpServerTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeTest.java
index 8933410..dbe094c 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.file.remote.sftp;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class SftpSimpleConsumeTest extends SftpServerTestSupport {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeThroughProxyTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeThroughProxyTest.java
index dd425e3..846e9d4 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeThroughProxyTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeThroughProxyTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.littleshoot.proxy.DefaultHttpProxyServer;
import org.littleshoot.proxy.HttpProxyServer;
import org.littleshoot.proxy.ProxyAuthorizationHandler;
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleIPV6ConsumeTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleIPV6ConsumeTest.java
index e46b6e0..0856c69 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleIPV6ConsumeTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleIPV6ConsumeTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.component.file.remote.sftp;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore
+@Disabled
public class SftpSimpleIPV6ConsumeTest extends SftpServerTestSupport {
@Test
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleProduceDisconnectTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleProduceDisconnectTest.java
index c18496a..ebf539c 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleProduceDisconnectTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleProduceDisconnectTest.java
@@ -19,7 +19,10 @@ package org.apache.camel.component.file.remote.sftp;
import java.io.File;
import org.apache.camel.Exchange;
-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.assertTrue;
public class SftpSimpleProduceDisconnectTest extends SftpServerTestSupport {
@@ -32,7 +35,7 @@ public class SftpSimpleProduceDisconnectTest extends SftpServerTestSupport {
template.sendBodyAndHeader("sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR + "?username=admin&password=admin", "Hello World", Exchange.FILE_NAME, "hello.txt");
File file = new File(FTP_ROOT_DIR + "/hello.txt");
- assertTrue("File should exist: " + file, file.exists());
+ assertTrue(file.exists(), "File should exist: " + file);
assertEquals("Hello World", context.getTypeConverter().convertTo(String.class, file));
// restart the SFTP server now
@@ -42,7 +45,7 @@ public class SftpSimpleProduceDisconnectTest extends SftpServerTestSupport {
template.sendBodyAndHeader("sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR + "?username=admin&password=admin", "Hello World", Exchange.FILE_NAME, "hello1.txt");
file = new File(FTP_ROOT_DIR + "/hello1.txt");
- assertTrue("File should exist: " + file, file.exists());
+ assertTrue(file.exists(), "File should exist: " + file);
assertEquals("Hello World", context.getTypeConverter().convertTo(String.class, file));
}
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleProduceNotStepwiseTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleProduceNotStepwiseTest.java
index aea7cf7..f14c6a2 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleProduceNotStepwiseTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleProduceNotStepwiseTest.java
@@ -19,7 +19,10 @@ package org.apache.camel.component.file.remote.sftp;
import java.io.File;
import org.apache.camel.Exchange;
-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.assertTrue;
public class SftpSimpleProduceNotStepwiseTest extends SftpServerTestSupport {
@@ -32,7 +35,7 @@ public class SftpSimpleProduceNotStepwiseTest extends SftpServerTestSupport {
template.sendBodyAndHeader("sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR + "?username=admin&password=admin&stepwise=false", "Hello World", Exchange.FILE_NAME, "hello.txt");
File file = new File(FTP_ROOT_DIR + "/hello.txt");
- assertTrue("File should exist: " + file, file.exists());
+ assertTrue(file.exists(), "File should exist: " + file);
assertEquals("Hello World", context.getTypeConverter().convertTo(String.class, file));
}
@@ -45,7 +48,7 @@ public class SftpSimpleProduceNotStepwiseTest extends SftpServerTestSupport {
template.sendBodyAndHeader("sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR + "/mysub?username=admin&password=admin&stepwise=false", "Bye World", Exchange.FILE_NAME, "bye.txt");
File file = new File(FTP_ROOT_DIR + "/mysub/bye.txt");
- assertTrue("File should exist: " + file, file.exists());
+ assertTrue(file.exists(), "File should exist: " + file);
assertEquals("Bye World", context.getTypeConverter().convertTo(String.class, file));
}
@@ -59,7 +62,7 @@ public class SftpSimpleProduceNotStepwiseTest extends SftpServerTestSupport {
"Farewell World", Exchange.FILE_NAME, "farewell.txt");
File file = new File(FTP_ROOT_DIR + "/mysub/myother/farewell.txt");
- assertTrue("File should exist: " + file, file.exists());
+ assertTrue(file.exists(), "File should exist: " + file);
assertEquals("Farewell World", context.getTypeConverter().convertTo(String.class, file));
}
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleProduceTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleProduceTest.java
index 2eb2f8e..e8ce250 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleProduceTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleProduceTest.java
@@ -19,7 +19,10 @@ package org.apache.camel.component.file.remote.sftp;
import java.io.File;
import org.apache.camel.Exchange;
-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.assertTrue;
public class SftpSimpleProduceTest extends SftpServerTestSupport {
@@ -32,7 +35,7 @@ public class SftpSimpleProduceTest extends SftpServerTestSupport {
template.sendBodyAndHeader("sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR + "?username=admin&password=admin", "Hello World", Exchange.FILE_NAME, "hello.txt");
File file = new File(FTP_ROOT_DIR + "/hello.txt");
- assertTrue("File should exist: " + file, file.exists());
+ assertTrue(file.exists(), "File should exist: " + file);
assertEquals("Hello World", context.getTypeConverter().convertTo(String.class, file));
}
@@ -45,7 +48,7 @@ public class SftpSimpleProduceTest extends SftpServerTestSupport {
template.sendBodyAndHeader("sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR + "/mysub?username=admin&password=admin", "Bye World", Exchange.FILE_NAME, "bye.txt");
File file = new File(FTP_ROOT_DIR + "/mysub/bye.txt");
- assertTrue("File should exist: " + file, file.exists());
+ assertTrue(file.exists(), "File should exist: " + file);
assertEquals("Bye World", context.getTypeConverter().convertTo(String.class, file));
}
@@ -58,7 +61,7 @@ public class SftpSimpleProduceTest extends SftpServerTestSupport {
template.sendBodyAndHeader("sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR + "/mysub/myother?username=admin&password=admin", "Farewell World", Exchange.FILE_NAME, "farewell.txt");
File file = new File(FTP_ROOT_DIR + "/mysub/myother/farewell.txt");
- assertTrue("File should exist: " + file, file.exists());
+ assertTrue(file.exists(), "File should exist: " + file);
assertEquals("Farewell World", context.getTypeConverter().convertTo(String.class, file));
}
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleProduceThroughProxyTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleProduceThroughProxyTest.java
index a269be9..b6498d3 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleProduceThroughProxyTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleProduceThroughProxyTest.java
@@ -22,11 +22,14 @@ import com.jcraft.jsch.ProxyHTTP;
import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.test.AvailablePortFinder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.littleshoot.proxy.DefaultHttpProxyServer;
import org.littleshoot.proxy.HttpProxyServer;
import org.littleshoot.proxy.ProxyAuthorizationHandler;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class SftpSimpleProduceThroughProxyTest extends SftpServerTestSupport {
private final int proxyPort = AvailablePortFinder.getNextAvailable();
@@ -50,7 +53,7 @@ public class SftpSimpleProduceThroughProxyTest extends SftpServerTestSupport {
template.sendBodyAndHeader("sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR + "?username=admin&password=admin&proxy=#proxy", "Hello World", Exchange.FILE_NAME, "hello.txt");
File file = new File(FTP_ROOT_DIR + "/hello.txt");
- assertTrue("File should exist: " + file, file.exists());
+ assertTrue(file.exists(), "File should exist: " + file);
assertEquals("Hello World", context.getTypeConverter().convertTo(String.class, file));
proxyServer.stop();
@@ -75,7 +78,7 @@ public class SftpSimpleProduceThroughProxyTest extends SftpServerTestSupport {
template.sendBodyAndHeader("sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR + "/mysub?username=admin&password=admin&proxy=#proxy", "Bye World", Exchange.FILE_NAME, "bye.txt");
File file = new File(FTP_ROOT_DIR + "/mysub/bye.txt");
- assertTrue("File should exist: " + file, file.exists());
+ assertTrue(file.exists(), "File should exist: " + file);
assertEquals("Bye World", context.getTypeConverter().convertTo(String.class, file));
proxyServer.stop();
@@ -101,7 +104,7 @@ public class SftpSimpleProduceThroughProxyTest extends SftpServerTestSupport {
"farewell.txt");
File file = new File(FTP_ROOT_DIR + "/mysub/myother/farewell.txt");
- assertTrue("File should exist: " + file, file.exists());
+ assertTrue(file.exists(), "File should exist: " + file);
assertEquals("Farewell World", context.getTypeConverter().convertTo(String.class, file));
proxyServer.stop();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpUseListFalseTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpUseListFalseTest.java
index b7a5b25..ef34037 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpUseListFalseTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpUseListFalseTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.file.remote.sftp;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class SftpUseListFalseTest extends SftpServerTestSupport {
diff --git a/components/camel-test-junit5/src/main/docs/test-junit5.adoc b/components/camel-test-junit5/src/main/docs/test-junit5.adoc
index 41fc9ab..99f3b5c 100644
--- a/components/camel-test-junit5/src/main/docs/test-junit5.adoc
+++ b/components/camel-test-junit5/src/main/docs/test-junit5.adoc
@@ -65,6 +65,8 @@ Tips: It's possible to run JUnit4 & JUnit5 based camel tests side by side includ
* `TestSupport` static methods should be imported where needed, for instance `import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf`
* Usage of the field `CamelTestSupport.log` should be replaced by another logger, for instance `org.slf4j.LoggerFactory.getLogger(MyCamelTest.class);`
* Usage of the method `CamelTestSupport.createRegistry` should be replaced by `CamelTestSupport.createCamelRegistry()`
+* Usage of methods `CamelTestSupport.*Directory` should be replaced by `TestSupport.*Directory`
+* Usage of methods `CamelTestSupport.assert*` should be replaced by `TestSupport.assert*`
* Overrides of `isCreateCamelContextPerClass()` returning `false` should be removed
* Overrides of `isCreateCamelContextPerClass()` returning `true` should be replaced by `@TestInstance(Lifecycle.PER_CLASS)`