You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2019/09/02 14:28:35 UTC
[camel] branch master updated (e04577c -> 4c5fcc0)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from e04577c Updating ActiveMQ
new 0a79ae3 CAMEL-13917: Configuring endpoints with consumer. prefix for consumer options is no longer supported as they should be regular options instead. This also avoid reflection setting properties.
new eee4e0e CAMEL-13925: camel-seda - SedaConsumer should extend DefaultConsumer
new 0315fba CAMEL-13917: Configuring endpoints with consumer. prefix for consumer options is no longer supported as they should be regular options instead. This also avoid reflection setting properties.
new aa19fb2 CAMEL-13917: Configuring endpoints with consumer. prefix for consumer options is no longer supported as they should be regular options instead. This also avoid reflection setting properties.
new a3539d9 CAMEL-13917: Configuring endpoints with consumer. prefix for consumer options is no longer supported as they should be regular options instead. This also avoid reflection setting properties.
new 7900b29 CAMEL-13917: Configuring endpoints with consumer. prefix for consumer options is no longer supported as they should be regular options instead. This also avoid reflection setting properties.
new fdaa12d CAMEL-13917: Configuring endpoints with consumer. prefix for consumer options is no longer supported as they should be regular options instead. This also avoid reflection setting properties.
new 944f7db CAMEL-13917: Configuring endpoints with consumer. prefix for consumer options is no longer supported as they should be regular options instead. This also avoid reflection setting properties.
new 8fb880d CAMEL-13929: camel3 - ApiEndpoint should extend ScheduledPollEndpoint
new efca3b1 CAMEL-13917: Configuring endpoints with consumer. prefix for consumer options is no longer supported as they should be regular options instead. This also avoid reflection setting properties.
new 4c5fcc0 Regen
The 11 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:
MIGRATION.md | 4 +
.../atom/AtomEntryPollingConsumerTest.java | 6 +-
.../AtomEntryPollingConsumerWithBasicAuthTest.java | 6 +-
.../camel/component/atom/AtomEntrySortTest.java | 4 +-
.../camel/component/atom/AtomGoodBlogsTest.java | 2 +-
.../atom/AtomPollingConsumerIdleMessageTest.java | 2 +-
.../component/atom/AtomPollingLowDelayTest.java | 2 +-
.../component/atom/AtomPollingUnthrottledTest.java | 2 +-
.../apache/camel/component/atom/AtomRouteTest.java | 2 +-
.../camel/component/aws/sqs/SqsComponent.java | 2 +-
.../beanstalk/ConsumerCompletionTest.java | 2 +-
.../component/beanstalk/ImmediateConsumerTest.java | 2 +-
.../bindy/csv/BindyCsvUnmarshallTest-context.xml | 4 +-
.../blueprint/handler/CamelNamespaceHandler.java | 3 -
.../camel-csv/src/main/docs/csv-dataformat.adoc | 2 +-
.../elsql/ElSqlConsumerDynamicParameterTest.java | 2 +-
.../src/main/docs/facebook-component.adoc | 2 +-
.../facebook/FacebookComponentConsumerTest.java | 6 +-
.../camel-file/src/main/docs/file-component.adoc | 12 +-
...LWithClientAuthAndSSLContextParametersTest.java | 2 +-
.../FileToFtpsExplicitSSLWithClientAuthTest.java | 2 +-
...lientAuthAndGlobalSSLContextParametersTest.java | 2 +-
...thoutClientAuthAndSSLContextParametersTest.java | 2 +-
...FileToFtpsExplicitSSLWithoutClientAuthTest.java | 2 +-
...SWithClientAuthAndSSLContextParametersTest.java | 2 +-
.../FileToFtpsExplicitTLSWithClientAuthTest.java | 2 +-
...thoutClientAuthAndSSLContextParametersTest.java | 2 +-
...FileToFtpsExplicitTLSWithoutClientAuthTest.java | 2 +-
...LWithClientAuthAndSSLContextParametersTest.java | 2 +-
.../FileToFtpsImplicitSSLWithClientAuthTest.java | 2 +-
...thoutClientAuthAndSSLContextParametersTest.java | 2 +-
...FileToFtpsImplicitSSLWithoutClientAuthTest.java | 2 +-
...SWithClientAuthAndSSLContextParametersTest.java | 2 +-
.../FileToFtpsImplicitTLSWithClientAuthTest.java | 2 +-
...thoutClientAuthAndSSLContextParametersTest.java | 2 +-
...FileToFtpsImplicitTLSWithoutClientAuthTest.java | 2 +-
...psWithCustomKeyAndTrustStorePropertiesTest.java | 2 +-
...leToFtpsWithCustomTrustStorePropertiesTest.java | 2 +-
.../FileToFtpsWithDefaultSettingsIPV6Test.java | 2 +-
.../remote/FileToFtpsWithDefaultSettingsTest.java | 2 +-
.../FileToFtpsWithFtpClientConfigRefTest.java | 2 +-
.../remote/FromFilePercentSignInPasswordTest.java | 4 +-
...lePercentSignInPasswordUserInfoEncodedTest.java | 2 +-
.../FromFilePercentSignInPasswordUserInfoTest.java | 2 +-
.../file/remote/FromFileToFtpNotStepwiseTest.java | 2 +-
.../component/file/remote/FromFileToFtpTest.java | 4 +-
.../file/remote/FromFileToFtpWithChmodTest.java | 4 +-
.../FromFtpExclusiveReadNoneStrategyTest.java | 2 +-
.../remote/FromFtpMoveFileNotStepwiseTest.java | 2 +-
.../FromFtpMoveFilePostfixNotStepwiseTest.java | 2 +-
.../file/remote/FromFtpMoveFilePostfixTest.java | 2 +-
.../FromFtpMoveFilePrefixNotStepwiseTest.java | 2 +-
.../file/remote/FromFtpMoveFilePrefixTest.java | 2 +-
.../component/file/remote/FromFtpMoveFileTest.java | 2 +-
.../component/file/remote/FromFtpNoFilesTest.java | 2 +-
.../remote/FromFtpPreMoveFileExpressionTest.java | 2 +-
.../FromFtpPreMoveFilePrefixNotStepwiseTest.java | 2 +-
.../file/remote/FromFtpPreMoveFilePrefixTest.java | 2 +-
.../FromFtpRemoteFileSortByExpressionTest.java | 2 +-
...tpRemoteFileSortByIgnoreCaseExpressionTest.java | 2 +-
...romFtpRemoteFileSortByNestedExpressionTest.java | 2 +-
.../file/remote/FromFtpToBinaryFileTest.java | 2 +-
.../file/remote/FromFtpToBinaryFilesTest.java | 6 +-
.../file/remote/FromFtpToBinarySampleTest.java | 2 +-
.../file/remote/FtpConsumerBodyAsStringTest.java | 2 +-
.../FtpConsumerDeleteNoWritePermissionTest.java | 2 +-
.../remote/FtpConsumerIPV6BodyAsStringTest.java | 2 +-
.../file/remote/FtpConsumerMoveExpressionTest.java | 2 +-
.../remote/FtpConsumerMultipleDirectoriesTest.java | 2 +-
.../remote/FtpConsumerWithNoFileOptionTest.java | 2 +-
.../FtpPollEnrichBridgeErrorHandlerTest.java | 2 +-
.../remote/FtpProducerConnectErrorsHeaderTest.java | 2 +-
.../src/main/docs/hipchat-component.adoc | 2 +-
.../camel/component/hipchat/HipchatEndpoint.java | 22 +-
.../camel-http/src/main/docs/http-component.adoc | 2 +-
.../camel/component/ironmq/IronMQComponent.java | 4 +-
.../camel-jetty/src/main/docs/jetty-component.adoc | 44 +--
.../apache/camel/component/jpa/JpaComponent.java | 1 +
.../apache/camel/component/jpa/JpaEndpoint.java | 20 +-
.../camel/component/jpa/JpaComponentTest.java | 2 +-
.../jpa/JpaWithNamedQueryAndParametersTest.java | 5 +-
.../camel/component/jpa/JpaWithNamedQueryTest.java | 4 +-
.../component/jpa/JpaWithNativeQueryTest.java | 2 +-
.../jpa/JpaWithNativeQueryWithResultClassTest.java | 2 +-
.../camel/component/jpa/JpaWithQueryTest.java | 2 +-
.../camel/processor/jpa/JpaNonTXRollbackTest.java | 2 +-
.../jpa/JpaRouteSkipLockedEntityTest.java | 4 +-
.../camel/processor/jpa/JpaTXRollbackTest.java | 2 +-
.../src/main/docs/linkedin-component.adoc | 2 +-
.../camel-mail/src/main/docs/mail-component.adoc | 6 +-
.../apache/camel/component/mail/MailEndpoint.java | 4 +-
.../mail/AdditionalMailPropertiesTest.java | 4 +-
.../camel/component/mail/FromFileSendMailTest.java | 4 +-
.../mail/MailAttachmentDuplicateNamesTest.java | 2 +-
.../mail/MailAttachmentRedeliveryTest.java | 2 +-
.../camel/component/mail/MailAttachmentTest.java | 2 +-
.../mail/MailAttachmentsUmlautIssueTest.java | 2 +-
.../component/mail/MailBatchConsumerTest.java | 2 +-
.../component/mail/MailCollectionHeaderTest.java | 2 +-
.../component/mail/MailCommitOnCompletionTest.java | 2 +-
.../mail/MailConsumerIdleMessageTest.java | 2 +-
.../mail/MailConsumerUnsupportedCharsetTest.java | 2 +-
.../mail/MailContentTypeResolverTest.java | 2 +-
.../camel/component/mail/MailConvertersTest.java | 2 +-
.../camel/component/mail/MailCopyToTest.java | 2 +-
.../camel/component/mail/MailDisconnectTest.java | 2 +-
.../mail/MailDoNotDeleteIfProcessFailsTest.java | 2 +-
.../camel/component/mail/MailFetchSizeTest.java | 2 +-
.../component/mail/MailFetchSizeZeroTest.java | 2 +-
...aderOverrulePreConfigurationRecipientsTest.java | 2 +-
.../component/mail/MailHtmlAttachmentTest.java | 2 +-
...IdempotentRepositoryDuplicateNotRemoveTest.java | 2 +-
.../MailIdempotentRepositoryDuplicateTest.java | 2 +-
.../mail/MailIdempotentRepositoryTest.java | 2 +-
.../component/mail/MailMaxMessagesPerPollTest.java | 2 +-
.../component/mail/MailMimeDecodeHeadersTest.java | 4 +-
.../component/mail/MailMultipleRecipientsTest.java | 8 +-
.../mail/MailNameAndEmailInRecipientTest.java | 4 +-
.../component/mail/MailPollEnrichNoMailTest.java | 2 +-
.../camel/component/mail/MailPollEnrichTest.java | 2 +-
.../component/mail/MailPostProcessActionTest.java | 2 +-
.../mail/MailProcessOnlyUnseenMessagesTest.java | 2 +-
.../mail/MailProducerUnsupportedCharsetTest.java | 4 +-
.../camel/component/mail/MailReplyToTest.java | 2 +-
.../apache/camel/component/mail/MailRouteTest.java | 4 +-
.../camel/component/mail/MailSearchTermTest.java | 2 +-
.../MailSearchTermUriConfigLast24HoursTest.java | 2 +-
.../mail/MailSearchTermUriConfigTest.java | 2 +-
.../mail/MailShutdownCompleteAllTasksTest.java | 2 +-
.../MailShutdownCompleteCurrentTaskOnlyTest.java | 2 +-
.../camel/component/mail/MailSortTermTest.java | 2 +-
.../component/mail/MailSortTermThreeTest.java | 2 +-
.../camel/component/mail/MailSortTermTwoTest.java | 2 +-
.../component/mail/MailSplitAttachmentsTest.java | 2 +-
.../camel/component/mail/MailSubjectTest.java | 2 +-
.../component/mail/MailUsernameWithAtSignTest.java | 2 +-
.../component/mail/MailUsingCustomSessionTest.java | 2 +-
.../component/mail/MimeMessageConsumeTest.java | 4 +-
.../mail/MimeMultipartAlternativeTest.java | 2 +-
...imeMultipartAlternativeWithContentTypeTest.java | 2 +-
...MultipartAlternativeWithLongerFilenameTest.java | 2 +-
.../mail/MultipleDestinationConsumeTest.java | 2 +-
.../mail/NestedMimeMessageConsumeTest.java | 4 +-
.../camel/component/mail/RawMailMessageTest.java | 8 +-
.../SslContextParametersMailRouteTest.java | 2 +-
.../mail/SpringMailSplitAttachmentsTest.xml | 2 +-
.../camel/component/mybatis/MyBatisEndpoint.java | 6 +-
.../camel/component/mybatis/MyBatisQueueTest.java | 2 +-
.../mybatis/MyBatisRouteEmptyResultSetTest.java | 2 +-
.../src/main/docs/olingo2-component.adoc | 29 +-
.../camel/component/olingo2/Olingo2Component.java | 6 -
.../component/olingo2/Olingo2Configuration.java | 14 +
.../camel/component/olingo2/Olingo2Endpoint.java | 7 +-
.../olingo2/Olingo2ComponentConsumerTest.java | 22 +-
.../component/olingo2/Olingo2SampleServer.java | 2 +-
.../src/main/docs/olingo4-component.adoc | 27 +-
.../component/olingo4/Olingo4Configuration.java | 14 +
.../camel/component/olingo4/Olingo4Endpoint.java | 7 +-
.../olingo4/Olingo4ComponentConsumerTest.java | 30 +-
.../camel-rss/src/main/docs/rss-component.adoc | 8 +-
.../camel-rss/src/main/docs/rss-dataformat.adoc | 2 +-
.../camel/component/rss/RssEndpointTest.java | 8 +-
.../component/rss/RssEntryPollingConsumerTest.java | 2 +-
.../RssEntryPollingConsumerWithBasicAuthTest.java | 2 +-
.../rss/RssEntryPollingConsumerWithFilterTest.java | 2 +-
.../component/rss/RssEntrySortDefaultsTest.java | 4 +-
.../camel/component/rss/RssEntrySortTest.java | 4 +-
.../apache/camel/component/rss/RssFilterTest.java | 2 +-
.../rss/RssMultipleEndpointsIssueTest.java | 4 +-
...sPollingConsumerWithFeedHeaderDisabledTest.java | 2 +-
.../camel/dataformat/rss/RssConverterTest.java | 4 +-
.../camel/dataformat/rss/RssDataFormatTest.java | 4 +-
.../dataformat/rss/RssFilterWithXPathTest.java | 2 +-
.../apache/camel/component/seda/SedaConsumer.java | 85 ++---
.../sql/SqlConsumerDeleteBatchCompleteTest.java | 2 +-
.../component/sql/SqlConsumerDeleteFailedTest.java | 2 +-
.../camel/component/sql/SqlConsumerDeleteTest.java | 2 +-
.../sql/SqlConsumerDeleteTransformTest.java | 2 +-
.../sql/SqlConsumerDynamicParameterTest.java | 2 +-
.../sql/SqlConsumerMaxMessagesPerPollTest.java | 2 +-
.../sql/SqlConsumerOutputTypeSelectListTest.java | 2 +-
...lConsumerOutputTypeSelectListWithClassTest.java | 2 +-
.../sql/SqlConsumerOutputTypeSelectOneTest.java | 8 +-
.../sql/SqlConsumerOutputTypeStreamListTest.java | 6 +-
.../camel/component/sql/SqlConsumerTest.java | 2 +-
...qlProducerAlwaysPopulateStatementFalseTest.java | 2 +-
.../SqlProducerAlwaysPopulateStatementTest.java | 2 +-
.../src/main/docs/tarfile-dataformat.adoc | 4 +-
.../tarfile/TarFileMultipleFilesSplitterTest.java | 2 +-
.../dataformat/tarfile/TarSplitterRouteTest.java | 2 +-
.../AggregationStrategyWithPreservationTest.java | 2 +-
.../tarfile/TarAggregationStrategyTest.java | 2 +-
.../tarfile/SpringTarSplitterRouteTest.xml | 2 +-
.../src/main/docs/twilio-component.adoc | 17 +-
.../component/twitter/AbstractTwitterEndpoint.java | 2 +-
.../src/main/docs/zendesk-component.adoc | 17 +-
.../src/main/docs/zipfile-dataformat.adoc | 4 +-
.../zipfile/ZipFileMultipleFilesSplitterTest.java | 2 +-
.../dataformat/zipfile/ZipSplitterRouteTest.java | 2 +-
.../AggregationStrategyWithPreservationTest.java | 2 +-
.../zipfile/ZipAggregationStrategyTest.java | 2 +-
.../zipfile/SpringZipSplitterRouteTest.xml | 2 +-
components/readme.adoc | 4 +-
.../camel/component/file/FileConfigureTest.java | 6 +-
...ileConsumerBridgeRouteExceptionHandlerTest.java | 2 +-
.../FileConsumerCustomExceptionHandlerTest.java | 2 +-
.../file/FileConsumerPollStrategyNotBeginTest.java | 2 +-
...FileConsumerPollStrategyPolledMessagesTest.java | 2 +-
.../file/FileConsumerPollStrategyTest.java | 2 +-
.../scheduler/SchedulerNoPolledMessagesTest.java | 2 +-
.../impl/DefaultComponentValidateURITest.java | 20 +-
...edPollEndpointConfigureConsumerRestartTest.java | 146 -------
.../CustomConsumerExceptionHandlerTest.java | 2 +-
.../DeadLetterChannelAlwaysHandledTest.java | 2 +-
...tConsumerBridgeErrorHandlerOnExceptionTest.java | 2 +-
...ltConsumerBridgeErrorHandlerRedeliveryTest.java | 2 +-
.../DefaultConsumerBridgeErrorHandlerTest.java | 2 +-
...cheduledPollConsumerBridgeErrorHandlerTest.java | 2 +-
.../enricher/PollEnrichBridgeErrorHandlerTest.java | 2 +-
.../impl/RuntimeCamelCatalogTest.java | 8 -
.../dsl/HipchatEndpointBuilderFactory.java | 8 +-
.../dsl/Olingo2EndpointBuilderFactory.java | 421 +++++++++++++++++++++
.../dsl/Olingo4EndpointBuilderFactory.java | 421 +++++++++++++++++++++
.../endpoint/dsl/TwilioEndpointBuilderFactory.java | 395 +++++++++++++++++++
.../dsl/ZendeskEndpointBuilderFactory.java | 396 +++++++++++++++++++
.../BridgeExceptionHandlerToErrorHandler.java | 2 +-
.../org/apache/camel/support/DefaultEndpoint.java | 75 +---
.../camel/support/ScheduledPollConsumer.java | 10 +-
.../camel/support/ScheduledPollEndpoint.java | 133 +++----
.../support/component/AbstractApiEndpoint.java | 4 +-
.../modules/ROOT/pages/csv-dataformat.adoc | 2 +-
.../modules/ROOT/pages/facebook-component.adoc | 2 +-
.../modules/ROOT/pages/file-component.adoc | 12 +-
.../modules/ROOT/pages/hipchat-component.adoc | 2 +-
.../modules/ROOT/pages/http-component.adoc | 2 +-
.../modules/ROOT/pages/jetty-component.adoc | 44 +--
.../modules/ROOT/pages/linkedin-component.adoc | 2 +-
.../modules/ROOT/pages/mail-component.adoc | 6 +-
.../modules/ROOT/pages/olingo2-component.adoc | 29 +-
.../modules/ROOT/pages/olingo4-component.adoc | 27 +-
.../modules/ROOT/pages/rss-component.adoc | 8 +-
.../modules/ROOT/pages/rss-dataformat.adoc | 2 +-
.../modules/ROOT/pages/tarfile-dataformat.adoc | 4 +-
.../modules/ROOT/pages/twilio-component.adoc | 17 +-
.../modules/ROOT/pages/zendesk-component.adoc | 17 +-
.../modules/ROOT/pages/zipfile-dataformat.adoc | 4 +-
examples/camel-example-jooq/README.adoc | 2 +-
.../resources/META-INF/spring/camel-context.xml | 2 +-
.../example/spring/boot/rest/jpa/Application.java | 4 +-
.../springboot/HttpComponentConfiguration.java | 32 +-
.../JettyHttpComponentConfiguration9.java | 386 +++++++++----------
.../springboot/Olingo2ComponentConfiguration.java | 14 +
.../springboot/Olingo4ComponentConfiguration.java | 14 +
253 files changed, 2543 insertions(+), 1022 deletions(-)
delete mode 100644 core/camel-core/src/test/java/org/apache/camel/impl/ScheduledPollEndpointConfigureConsumerRestartTest.java
[camel] 09/11: CAMEL-13929: camel3 - ApiEndpoint should extend
ScheduledPollEndpoint
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8fb880df9bb2535913d09f791789b639adc958ce
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Sep 2 15:36:38 2019 +0200
CAMEL-13929: camel3 - ApiEndpoint should extend ScheduledPollEndpoint
---
.../java/org/apache/camel/support/component/AbstractApiEndpoint.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/component/AbstractApiEndpoint.java b/core/camel-support/src/main/java/org/apache/camel/support/component/AbstractApiEndpoint.java
index da4b2c9..46d4bec 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/component/AbstractApiEndpoint.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/component/AbstractApiEndpoint.java
@@ -31,7 +31,7 @@ import org.apache.camel.Component;
import org.apache.camel.spi.ExecutorServiceManager;
import org.apache.camel.spi.ThreadPoolProfile;
import org.apache.camel.spi.UriParam;
-import org.apache.camel.support.DefaultEndpoint;
+import org.apache.camel.support.ScheduledPollEndpoint;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory;
* Abstract base class for API Component Endpoints.
*/
public abstract class AbstractApiEndpoint<E extends ApiName, T>
- extends DefaultEndpoint implements PropertyNamesInterceptor, PropertiesInterceptor {
+ extends ScheduledPollEndpoint implements PropertyNamesInterceptor, PropertiesInterceptor {
// thread pool executor with Endpoint Class name as keys
private static Map<String, ExecutorService> executorServiceMap = new ConcurrentHashMap<>();
[camel] 01/11: CAMEL-13917: Configuring endpoints with consumer.
prefix for consumer options is no longer supported as they should be
regular options instead. This also avoid reflection setting properties.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0a79ae35b59ec7474b5a15f16325f0d03551bbc5
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Sep 2 09:38:43 2019 +0200
CAMEL-13917: Configuring endpoints with consumer. prefix for consumer options is no longer supported as they should be regular options instead. This also avoid reflection setting properties.
---
.../camel/component/file/FileConfigureTest.java | 6 +-
...ileConsumerBridgeRouteExceptionHandlerTest.java | 2 +-
.../FileConsumerCustomExceptionHandlerTest.java | 2 +-
.../file/FileConsumerPollStrategyNotBeginTest.java | 2 +-
...FileConsumerPollStrategyPolledMessagesTest.java | 2 +-
.../file/FileConsumerPollStrategyTest.java | 2 +-
.../scheduler/SchedulerNoPolledMessagesTest.java | 2 +-
.../impl/DefaultComponentValidateURITest.java | 20 +--
...edPollEndpointConfigureConsumerRestartTest.java | 146 ---------------------
.../CustomConsumerExceptionHandlerTest.java | 2 +-
.../DeadLetterChannelAlwaysHandledTest.java | 2 +-
...tConsumerBridgeErrorHandlerOnExceptionTest.java | 2 +-
...ltConsumerBridgeErrorHandlerRedeliveryTest.java | 2 +-
.../DefaultConsumerBridgeErrorHandlerTest.java | 2 +-
...cheduledPollConsumerBridgeErrorHandlerTest.java | 2 +-
.../enricher/PollEnrichBridgeErrorHandlerTest.java | 2 +-
.../impl/RuntimeCamelCatalogTest.java | 8 --
.../BridgeExceptionHandlerToErrorHandler.java | 2 +-
.../org/apache/camel/support/DefaultEndpoint.java | 75 ++---------
.../camel/support/ScheduledPollConsumer.java | 10 +-
.../camel/support/ScheduledPollEndpoint.java | 130 ++++++------------
21 files changed, 82 insertions(+), 341 deletions(-)
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConfigureTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConfigureTest.java
index a9679b3..bd48ffc 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConfigureTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConfigureTest.java
@@ -53,19 +53,19 @@ public class FileConfigureTest extends ContextTestSupport {
@Test
public void testUriWithParameters() throws Exception {
- FileEndpoint endpoint = resolveMandatoryEndpoint("file:///C:/camel/temp?delay=10&useFixedDelay=true&initialDelay=10&consumer.bridgeErrorHandler=true"
+ FileEndpoint endpoint = resolveMandatoryEndpoint("file:///C:/camel/temp?delay=10&useFixedDelay=true&initialDelay=10&bridgeErrorHandler=true"
+ "&autoCreate=false&startingDirectoryMustExist=true&directoryMustExist=true&readLock=changed", FileEndpoint.class);
assertNotNull("Could not find file endpoint", endpoint);
assertEquals("Get a wrong option of StartingDirectoryMustExist", true, endpoint.isStartingDirectoryMustExist());
endpoint = resolveMandatoryEndpoint("file:///C:/camel/temp?delay=10&useFixedDelay=true&initialDelay=10&startingDirectoryMustExist=true"
- + "&consumer.bridgeErrorHandler=true&autoCreate=false&directoryMustExist=true&readLock=changed", FileEndpoint.class);
+ + "&bridgeErrorHandler=true&autoCreate=false&directoryMustExist=true&readLock=changed", FileEndpoint.class);
assertNotNull("Could not find file endpoint", endpoint);
assertEquals("Get a wrong option of StartingDirectoryMustExist", true, endpoint.isStartingDirectoryMustExist());
endpoint = resolveMandatoryEndpoint("file:///C:/camel/temp?delay=10&startingDirectoryMustExist=true&useFixedDelay=true&initialDelay=10"
- + "&consumer.bridgeErrorHandler=true&autoCreate=false&directoryMustExist=true&readLock=changed", FileEndpoint.class);
+ + "&bridgeErrorHandler=true&autoCreate=false&directoryMustExist=true&readLock=changed", FileEndpoint.class);
assertNotNull("Could not find file endpoint", endpoint);
assertEquals("Get a wrong option of StartingDirectoryMustExist", true, endpoint.isStartingDirectoryMustExist());
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBridgeRouteExceptionHandlerTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBridgeRouteExceptionHandlerTest.java
index a06ff24..eb84f82 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBridgeRouteExceptionHandlerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBridgeRouteExceptionHandlerTest.java
@@ -67,7 +67,7 @@ public class FileConsumerBridgeRouteExceptionHandlerTest extends ContextTestSupp
// bridge the consumer to use the Camel routing error handler
// the exclusiveReadLockStrategy is only configured because this
// is from an unit test, so we use that to simulate exceptions
- from("file:target/data/nospace?exclusiveReadLockStrategy=#myReadLockStrategy&consumer.bridgeErrorHandler=true&initialDelay=0&delay=10").convertBodyTo(String.class)
+ from("file:target/data/nospace?exclusiveReadLockStrategy=#myReadLockStrategy&bridgeErrorHandler=true&initialDelay=0&delay=10").convertBodyTo(String.class)
.to("mock:result");
}
};
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCustomExceptionHandlerTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCustomExceptionHandlerTest.java
index 2eb2658..327d87f 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCustomExceptionHandlerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCustomExceptionHandlerTest.java
@@ -83,7 +83,7 @@ public class FileConsumerCustomExceptionHandlerTest extends ContextTestSupport {
// our custom exception handler on the consumer
// the exclusiveReadLockStrategy is only configured because this
// is from an unit test, so we use that to simulate exceptions
- from("file:target/data/nospace?exclusiveReadLockStrategy=#myReadLockStrategy&consumer.exceptionHandler=#myExceptionHandler&initialDelay=0&delay=10")
+ from("file:target/data/nospace?exclusiveReadLockStrategy=#myReadLockStrategy&exceptionHandler=#myExceptionHandler&initialDelay=0&delay=10")
.convertBodyTo(String.class).to("mock:result");
}
};
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyNotBeginTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyNotBeginTest.java
index bf8284c..5a8149d 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyNotBeginTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyNotBeginTest.java
@@ -35,7 +35,7 @@ public class FileConsumerPollStrategyNotBeginTest extends ContextTestSupport {
private static int counter;
private static volatile String event = "";
- private String fileUrl = "file://target/data/pollstrategy/?consumer.pollStrategy=#myPoll&noop=true&initialDelay=0&delay=10";
+ private String fileUrl = "file://target/data/pollstrategy/?pollStrategy=#myPoll&noop=true&initialDelay=0&delay=10";
@Override
protected JndiRegistry createRegistry() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyPolledMessagesTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyPolledMessagesTest.java
index 6c80674..fc3c634 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyPolledMessagesTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyPolledMessagesTest.java
@@ -38,7 +38,7 @@ public class FileConsumerPollStrategyPolledMessagesTest extends ContextTestSuppo
private static int maxPolls;
private final CountDownLatch latch = new CountDownLatch(1);
- private String fileUrl = "file://target/data/pollstrategy/?consumer.pollStrategy=#myPoll&initialDelay=0&delay=10";
+ private String fileUrl = "file://target/data/pollstrategy/?pollStrategy=#myPoll&initialDelay=0&delay=10";
@Override
protected JndiRegistry createRegistry() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyTest.java
index ad0c81b..7695d4b 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyTest.java
@@ -35,7 +35,7 @@ public class FileConsumerPollStrategyTest extends ContextTestSupport {
private static int counter;
private static String event = "";
- private String fileUrl = "file://target/data/pollstrategy/?consumer.pollStrategy=#myPoll&noop=true&initialDelay=0&delay=10";
+ private String fileUrl = "file://target/data/pollstrategy/?pollStrategy=#myPoll&noop=true&initialDelay=0&delay=10";
@Override
protected JndiRegistry createRegistry() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/scheduler/SchedulerNoPolledMessagesTest.java b/core/camel-core/src/test/java/org/apache/camel/component/scheduler/SchedulerNoPolledMessagesTest.java
index f5b9564..a9c903a 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/scheduler/SchedulerNoPolledMessagesTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/scheduler/SchedulerNoPolledMessagesTest.java
@@ -42,7 +42,7 @@ public class SchedulerNoPolledMessagesTest extends ContextTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() {
- from("scheduler://foo?delay=100&backoffMultiplier=10&backoffIdleThreshold=2").log("Fired scheduler").process(new Processor() {
+ from("scheduler://foo?delay=100&backoffMultiplier=10&backoffIdleThreshold=2&scheduler.concurrentTasks=2").log("Fired scheduler").process(new Processor() {
@Override
public void process(Exchange exchange) throws Exception {
// force no messages to be polled which should affect
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentValidateURITest.java b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentValidateURITest.java
index 01a9942..69400e2 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentValidateURITest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentValidateURITest.java
@@ -64,21 +64,9 @@ public class DefaultComponentValidateURITest extends ContextTestSupport {
@Test
public void testScheduledPollConsumerOptions() throws Exception {
- // test that we support both notations of scheduled polling consumer
- // options
+ // test that we support both notations of scheduled polling consumer options
- // with consumer. prefix
- Endpoint endpint = context.getEndpoint("file://target/data/foo?consumer.delay=1000");
- assertNotNull(endpint);
-
- endpint = context.getEndpoint("file://target/data/foo?consumer.delay=1000&consumer.initialDelay=5000");
- assertNotNull(endpint);
-
- endpint = context.getEndpoint("file://target/data/foo?consumer.delay=1000&consumer.initialDelay=5000&consumer.useFixedDelay=false");
- assertNotNull(endpint);
-
- // without consumer. prefix
- endpint = context.getEndpoint("file://foo2?delay=1000");
+ Endpoint endpint = context.getEndpoint("file://foo2?delay=1000");
assertNotNull(endpint);
endpint = context.getEndpoint("file://foo2?delay=1000&initialDelay=5000");
@@ -86,10 +74,6 @@ public class DefaultComponentValidateURITest extends ContextTestSupport {
endpint = context.getEndpoint("file://foo2?delay=1000&initialDelay=5000&useFixedDelay=false");
assertNotNull(endpint);
-
- // combined with and without consumer. prefix
- endpint = context.getEndpoint("file://foo3?delay=1000&consumer.initialDelay=5000&useFixedDelay=false");
- assertNotNull(endpint);
}
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/ScheduledPollEndpointConfigureConsumerRestartTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/ScheduledPollEndpointConfigureConsumerRestartTest.java
deleted file mode 100644
index 619437c..0000000
--- a/core/camel-core/src/test/java/org/apache/camel/impl/ScheduledPollEndpointConfigureConsumerRestartTest.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.impl;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.Consumer;
-import org.apache.camel.ContextTestSupport;
-import org.apache.camel.Endpoint;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.Producer;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.support.DefaultExchange;
-import org.apache.camel.support.ScheduledPollConsumer;
-import org.apache.camel.support.ScheduledPollEndpoint;
-import org.junit.Test;
-
-/**
- *
- */
-public class ScheduledPollEndpointConfigureConsumerRestartTest extends ContextTestSupport {
-
- private MyEndpoint my;
- private Map<String, Object> props = new HashMap<>();
-
- @Test
- public void testRestart() throws Exception {
- getMockEndpoint("mock:result").expectedMinimumMessageCount(1);
-
- assertMockEndpointsSatisfied();
-
- assertEquals("Hello", getMockEndpoint("mock:result").getExchanges().get(0).getIn().getBody());
- assertEquals(123, getMockEndpoint("mock:result").getExchanges().get(0).getIn().getHeader("foo"));
-
- // restart route
- resetMocks();
- context.getRouteController().stopRoute("foo");
-
- getMockEndpoint("mock:result").expectedMinimumMessageCount(1);
-
- // start route
- context.getRouteController().startRoute("foo");
-
- assertMockEndpointsSatisfied();
-
- assertEquals("Hello", getMockEndpoint("mock:result").getExchanges().get(0).getIn().getBody());
- assertEquals(123, getMockEndpoint("mock:result").getExchanges().get(0).getIn().getHeader("foo"));
-
- }
-
- @Override
- protected RouteBuilder createRouteBuilder() throws Exception {
- return new RouteBuilder() {
- @Override
- public void configure() throws Exception {
- props.put("foo", 123);
- props.put("bar", "Hello");
- props.put("delay", 1000);
-
- my = new MyEndpoint();
- my.setCamelContext(context);
- my.setConsumerProperties(props);
-
- from(my).routeId("foo").to("mock:result");
- }
- };
- }
-
- private static class MyEndpoint extends ScheduledPollEndpoint {
-
- @Override
- public Producer createProducer() throws Exception {
- return null;
- }
-
- @Override
- public Consumer createConsumer(Processor processor) throws Exception {
- MyConsumer answer = new MyConsumer(this, processor);
- configureConsumer(answer);
- return answer;
- }
-
- @Override
- public boolean isSingleton() {
- return true;
- }
-
- @Override
- protected String createEndpointUri() {
- return "myendpoint:foo";
- }
- }
-
- public static final class MyConsumer extends ScheduledPollConsumer {
-
- private int foo;
- private String bar;
-
- public MyConsumer(Endpoint endpoint, Processor processor) {
- super(endpoint, processor);
- }
-
- public int getFoo() {
- return foo;
- }
-
- public void setFoo(int foo) {
- this.foo = foo;
- }
-
- public String getBar() {
- return bar;
- }
-
- public void setBar(String bar) {
- this.bar = bar;
- }
-
- @Override
- protected int poll() throws Exception {
- Exchange exchange = new DefaultExchange(getEndpoint());
- exchange.getIn().setBody(bar);
- exchange.getIn().setHeader("foo", foo);
-
- getProcessor().process(exchange);
-
- return 1;
- }
- }
-}
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/CustomConsumerExceptionHandlerTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/CustomConsumerExceptionHandlerTest.java
index 33895cf..70c11b7 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/CustomConsumerExceptionHandlerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/CustomConsumerExceptionHandlerTest.java
@@ -55,7 +55,7 @@ public class CustomConsumerExceptionHandlerTest extends ContextTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("seda:foo?synchronous=true&consumer.exceptionHandler=#myHandler").routeId("foo").to("mock:foo").to("direct:bar").to("mock:result");
+ from("seda:foo?synchronous=true&exceptionHandler=#myHandler").routeId("foo").to("mock:foo").to("direct:bar").to("mock:result");
from("direct:bar").routeId("bar").onException(IllegalArgumentException.class).maximumRedeliveries(3).redeliveryDelay(0).end().to("mock:bar")
.throwException(new IllegalArgumentException("Forced"));
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelAlwaysHandledTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelAlwaysHandledTest.java
index d6dc446..0c40754 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelAlwaysHandledTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelAlwaysHandledTest.java
@@ -57,7 +57,7 @@ public class DeadLetterChannelAlwaysHandledTest extends ContextTestSupport {
public void configure() throws Exception {
errorHandler(deadLetterChannel("mock:dead"));
- from("seda:foo?synchronous=true&consumer.exceptionHandler=#myHandler").routeId("foo").to("mock:foo").to("direct:bar").to("mock:result");
+ from("seda:foo?synchronous=true&exceptionHandler=#myHandler").routeId("foo").to("mock:foo").to("direct:bar").to("mock:result");
from("direct:bar").routeId("bar").onException(IllegalArgumentException.class).maximumRedeliveries(3).redeliveryDelay(0).end().to("mock:bar")
.throwException(new IllegalArgumentException("Forced"));
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/DefaultConsumerBridgeErrorHandlerOnExceptionTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/DefaultConsumerBridgeErrorHandlerOnExceptionTest.java
index c3712da..557b37a 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/DefaultConsumerBridgeErrorHandlerOnExceptionTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/DefaultConsumerBridgeErrorHandlerOnExceptionTest.java
@@ -72,7 +72,7 @@ public class DefaultConsumerBridgeErrorHandlerOnExceptionTest extends ContextTes
// handler,
// so the above error handler will trigger if exceptions also
// occurs inside the consumer
- from("my:foo?consumer.bridgeErrorHandler=true").to("log:foo").to("mock:result");
+ from("my:foo?bridgeErrorHandler=true").to("log:foo").to("mock:result");
from("direct:error").to("mock:b").log("Error happened due ${exception.message}");
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/DefaultConsumerBridgeErrorHandlerRedeliveryTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/DefaultConsumerBridgeErrorHandlerRedeliveryTest.java
index e1aab13..6d1029c 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/DefaultConsumerBridgeErrorHandlerRedeliveryTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/DefaultConsumerBridgeErrorHandlerRedeliveryTest.java
@@ -71,7 +71,7 @@ public class DefaultConsumerBridgeErrorHandlerRedeliveryTest extends DefaultCons
// handler,
// so the above error handler will trigger if exceptions also
// occurs inside the consumer
- from("my:foo?consumer.bridgeErrorHandler=true").to("log:foo").to("mock:result");
+ from("my:foo?bridgeErrorHandler=true").to("log:foo").to("mock:result");
}
};
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/DefaultConsumerBridgeErrorHandlerTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/DefaultConsumerBridgeErrorHandlerTest.java
index 070e4b6..1e09f4a 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/DefaultConsumerBridgeErrorHandlerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/DefaultConsumerBridgeErrorHandlerTest.java
@@ -70,7 +70,7 @@ public class DefaultConsumerBridgeErrorHandlerTest extends ContextTestSupport {
// handler,
// so the above error handler will trigger if exceptions also
// occurs inside the consumer
- from("my:foo?consumer.bridgeErrorHandler=true").to("log:foo").to("mock:result");
+ from("my:foo?bridgeErrorHandler=true").to("log:foo").to("mock:result");
}
};
// END SNIPPET: e1
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/DefaultScheduledPollConsumerBridgeErrorHandlerTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/DefaultScheduledPollConsumerBridgeErrorHandlerTest.java
index 88e6d7b..ea60f8a 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/DefaultScheduledPollConsumerBridgeErrorHandlerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/DefaultScheduledPollConsumerBridgeErrorHandlerTest.java
@@ -62,7 +62,7 @@ public class DefaultScheduledPollConsumerBridgeErrorHandlerTest extends ContextT
// handler,
// so the above error handler will trigger if exceptions also
// occurs inside the consumer
- from("my:foo?consumer.bridgeErrorHandler=true").to("log:foo").to("mock:result");
+ from("my:foo?bridgeErrorHandler=true").to("log:foo").to("mock:result");
}
};
// END SNIPPET: e1
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnrichBridgeErrorHandlerTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnrichBridgeErrorHandlerTest.java
index 4f69cec..17fba5b 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnrichBridgeErrorHandlerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnrichBridgeErrorHandlerTest.java
@@ -65,7 +65,7 @@ public class PollEnrichBridgeErrorHandlerTest extends ContextTestSupport {
from("seda:start")
// bridge the error handler when doing a polling so we can
// let Camel's error handler decide what to do
- .pollEnrich("file:target/data/foo?initialDelay=0&delay=10&pollStrategy=#myPoll&consumer.bridgeErrorHandler=true", 10000, new UseLatestAggregationStrategy())
+ .pollEnrich("file:target/data/foo?initialDelay=0&delay=10&pollStrategy=#myPoll&bridgeErrorHandler=true", 10000, new UseLatestAggregationStrategy())
.to("mock:result");
}
};
diff --git a/core/camel-core/src/test/java/org/apache/camel/runtimecatalog/impl/RuntimeCamelCatalogTest.java b/core/camel-core/src/test/java/org/apache/camel/runtimecatalog/impl/RuntimeCamelCatalogTest.java
index 1c3c5ae..d950e66 100644
--- a/core/camel-core/src/test/java/org/apache/camel/runtimecatalog/impl/RuntimeCamelCatalogTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/runtimecatalog/impl/RuntimeCamelCatalogTest.java
@@ -215,18 +215,10 @@ public class RuntimeCamelCatalogTest {
result = catalog.validateEndpointProperties("timer://foo?fixedRate=#fixed&delay=#myDelay");
assertTrue(result.isSuccess());
- // optional consumer. prefix
- result = catalog.validateEndpointProperties("file:inbox?consumer.delay=5000&consumer.greedy=true");
- assertTrue(result.isSuccess());
-
// optional without consumer. prefix
result = catalog.validateEndpointProperties("file:inbox?delay=5000&greedy=true");
assertTrue(result.isSuccess());
- // mixed optional without consumer. prefix
- result = catalog.validateEndpointProperties("file:inbox?delay=5000&consumer.greedy=true");
- assertTrue(result.isSuccess());
-
// prefix
result = catalog.validateEndpointProperties("file:inbox?delay=5000&scheduler.foo=123&scheduler.bar=456");
assertTrue(result.isSuccess());
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/BridgeExceptionHandlerToErrorHandler.java b/core/camel-support/src/main/java/org/apache/camel/support/BridgeExceptionHandlerToErrorHandler.java
index 234a36b..5ca068a 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/BridgeExceptionHandlerToErrorHandler.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/BridgeExceptionHandlerToErrorHandler.java
@@ -26,7 +26,7 @@ import org.apache.camel.spi.UnitOfWork;
* process the caused exception to send the message into the Camel routing engine
* which allows to let the routing engine handle the exception.
* <p/>
- * An endpoint can be configured with <tt>consumer.bridgeErrorHandler=true</tt> in the URI
+ * An endpoint can be configured with <tt>bridgeErrorHandler=true</tt> in the URI
* to enable this {@link BridgeExceptionHandlerToErrorHandler} on the consumer.
* The consumer must extend the {@link DefaultConsumer}, to support this, if not an
* {@link IllegalArgumentException} is thrown upon startup.
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/DefaultEndpoint.java b/core/camel-support/src/main/java/org/apache/camel/support/DefaultEndpoint.java
index ff7b490..c796dd8 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/DefaultEndpoint.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/DefaultEndpoint.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.support;
-import java.util.HashMap;
import java.util.Map;
import org.apache.camel.AsyncProducer;
@@ -28,7 +27,6 @@ import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.PollingConsumer;
-import org.apache.camel.ResolveEndpointFailedException;
import org.apache.camel.spi.ExceptionHandler;
import org.apache.camel.spi.HasId;
import org.apache.camel.spi.PropertyConfigurer;
@@ -36,7 +34,6 @@ import org.apache.camel.spi.PropertyConfigurerAware;
import org.apache.camel.spi.UriParam;
import org.apache.camel.support.service.ServiceSupport;
import org.apache.camel.util.ObjectHelper;
-import org.apache.camel.util.PropertiesHelper;
import org.apache.camel.util.StringHelper;
import org.apache.camel.util.URISupport;
@@ -84,9 +81,6 @@ public abstract class DefaultEndpoint extends ServiceSupport implements Endpoint
@UriParam(label = "advanced",
description = "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities")
private boolean basicPropertyBinding;
- // these options are not really in use any option related to the consumer has a specific option on the endpoint
- // and consumerProperties was added from the very start of Camel.
- private Map<String, Object> consumerProperties;
// pooling consumer options only related to EventDrivenPollingConsumer which are very seldom in use
// so lets not expose them in the component docs as it will be included in every component
private int pollingConsumerQueueSize = 1000;
@@ -396,10 +390,7 @@ public abstract class DefaultEndpoint extends ServiceSupport implements Endpoint
@Override
public void configureProperties(Map<String, Object> options) {
- Map<String, Object> consumerProperties = PropertiesHelper.extractProperties(options, "consumer.");
- if (consumerProperties != null && !consumerProperties.isEmpty()) {
- setConsumerProperties(consumerProperties);
- }
+ // noop
}
/**
@@ -477,56 +468,25 @@ public abstract class DefaultEndpoint extends ServiceSupport implements Endpoint
return false;
}
- public Map<String, Object> getConsumerProperties() {
- if (consumerProperties == null) {
- // must create empty if none exists
- consumerProperties = new HashMap<>();
- }
- return consumerProperties;
- }
-
- public void setConsumerProperties(Map<String, Object> consumerProperties) {
- // append consumer properties
- if (consumerProperties != null && !consumerProperties.isEmpty()) {
- if (this.consumerProperties == null) {
- this.consumerProperties = new HashMap<>(consumerProperties);
- } else {
- this.consumerProperties.putAll(consumerProperties);
- }
- }
- }
-
protected void configureConsumer(Consumer consumer) throws Exception {
// inject CamelContext
if (consumer instanceof CamelContextAware) {
((CamelContextAware) consumer).setCamelContext(getCamelContext());
}
- if (consumerProperties != null) {
- // use a defensive copy of the consumer properties as the methods below will remove the used properties
- // and in case we restart routes, we need access to the original consumer properties again
- Map<String, Object> copy = new HashMap<>(consumerProperties);
-
- // configure consumer
- setProperties(consumer, copy);
-
- // special consumer.bridgeErrorHandler option
- Object bridge = copy.remove("bridgeErrorHandler");
- if ("true".equals(bridge)) {
- if (consumer instanceof DefaultConsumer) {
- DefaultConsumer defaultConsumer = (DefaultConsumer) consumer;
- defaultConsumer.setExceptionHandler(new BridgeExceptionHandlerToErrorHandler(defaultConsumer));
- } else {
- throw new IllegalArgumentException("Option consumer.bridgeErrorHandler is only supported by endpoints,"
- + " having their consumer extend DefaultConsumer. The consumer is a " + consumer.getClass().getName() + " class.");
- }
+ if (bridgeErrorHandler) {
+ if (consumer instanceof DefaultConsumer) {
+ DefaultConsumer defaultConsumer = (DefaultConsumer) consumer;
+ defaultConsumer.setExceptionHandler(new BridgeExceptionHandlerToErrorHandler(defaultConsumer));
+ } else {
+ throw new IllegalArgumentException("Option bridgeErrorHandler is only supported by endpoints,"
+ + " having their consumer extend DefaultConsumer. The consumer is a " + consumer.getClass().getName() + " class.");
}
-
- if (!this.isLenientProperties() && copy.size() > 0) {
- throw new ResolveEndpointFailedException(this.getEndpointUri(), "There are " + copy.size()
- + " parameters that couldn't be set on the endpoint consumer."
- + " Check the uri if the parameters are spelt correctly and that they are properties of the endpoint."
- + " Unknown consumer parameters=[" + copy + "]");
+ }
+ if (exceptionHandler != null) {
+ if (consumer instanceof DefaultConsumer) {
+ DefaultConsumer defaultConsumer = (DefaultConsumer) consumer;
+ defaultConsumer.setExceptionHandler(exceptionHandler);
}
}
}
@@ -537,14 +497,7 @@ public abstract class DefaultEndpoint extends ServiceSupport implements Endpoint
@Override
protected void doInit() throws Exception {
- // the bridgeErrorHandler/exceptionHandler was originally configured with consumer. prefix, such as consumer.bridgeErrorHandler=true
- // so if they have been configured on the endpoint then map to the old naming style
- if (bridgeErrorHandler) {
- getConsumerProperties().put("bridgeErrorHandler", "true");
- }
- if (exceptionHandler != null) {
- getConsumerProperties().put("exceptionHandler", exceptionHandler);
- }
+ // noop
}
@Override
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java b/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java
index 4b1b630..1e052a5 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java
@@ -413,15 +413,17 @@ public abstract class ScheduledPollConsumer extends DefaultConsumer implements R
}
if (scheduler == null) {
- scheduler = new DefaultScheduledPollConsumerScheduler(scheduledExecutorService);
+ DefaultScheduledPollConsumerScheduler scheduler = new DefaultScheduledPollConsumerScheduler(scheduledExecutorService);
+ scheduler.setDelay(delay);
+ scheduler.setInitialDelay(initialDelay);
+ scheduler.setTimeUnit(timeUnit);
+ scheduler.setUseFixedDelay(useFixedDelay);
+ this.scheduler = scheduler;
}
scheduler.setCamelContext(getEndpoint().getCamelContext());
scheduler.onInit(this);
// configure scheduler with options from this consumer
- Map<String, Object> properties = new LinkedHashMap<>();
- getEndpoint().getCamelContext().adapt(ExtendedCamelContext.class).getBeanIntrospection().getProperties(this, properties, null);
- PropertyBindingSupport.build().bind(getEndpoint().getCamelContext(), scheduler, properties);
if (schedulerProperties != null && !schedulerProperties.isEmpty()) {
// need to use a copy in case the consumer is restarted so we keep the properties
Map<String, Object> copy = new LinkedHashMap<>(schedulerProperties);
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollEndpoint.java b/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollEndpoint.java
index 52c0e05..c3ec3d9 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollEndpoint.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollEndpoint.java
@@ -16,12 +16,12 @@
*/
package org.apache.camel.support;
-import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import org.apache.camel.Component;
+import org.apache.camel.Consumer;
import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.LoggingLevel;
import org.apache.camel.PollingConsumer;
@@ -42,54 +42,54 @@ public abstract class ScheduledPollEndpoint extends DefaultEndpoint {
private transient ScheduledPollConsumerScheduler consumerScheduler;
// if adding more options then align with org.apache.camel.support.ScheduledPollConsumer
- @UriParam(optionalPrefix = "consumer.", defaultValue = "true", label = "consumer,scheduler",
+ @UriParam(defaultValue = "true", label = "consumer,scheduler",
description = "Whether the scheduler should be auto started.")
private boolean startScheduler = true;
- @UriParam(optionalPrefix = "consumer.", defaultValue = "1000", label = "consumer,scheduler",
+ @UriParam(defaultValue = "1000", label = "consumer,scheduler",
description = "Milliseconds before the first poll starts."
+ " You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour).")
private long initialDelay = 1000;
- @UriParam(optionalPrefix = "consumer.", defaultValue = "500", label = "consumer,scheduler",
+ @UriParam(defaultValue = "500", label = "consumer,scheduler",
description = "Milliseconds before the next poll."
+ " You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour).")
private long delay = 500;
- @UriParam(optionalPrefix = "consumer.", defaultValue = "MILLISECONDS", label = "consumer,scheduler",
+ @UriParam(defaultValue = "MILLISECONDS", label = "consumer,scheduler",
description = "Time unit for initialDelay and delay options.")
private TimeUnit timeUnit = TimeUnit.MILLISECONDS;
- @UriParam(optionalPrefix = "consumer.", defaultValue = "true", label = "consumer,scheduler",
+ @UriParam(defaultValue = "true", label = "consumer,scheduler",
description = "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details.")
private boolean useFixedDelay = true;
- @UriParam(optionalPrefix = "consumer.", label = "consumer,advanced",
+ @UriParam(label = "consumer,advanced",
description = "A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation"
+ " to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel.")
private PollingConsumerPollStrategy pollStrategy = new DefaultPollingConsumerPollStrategy();
- @UriParam(optionalPrefix = "consumer.", defaultValue = "TRACE", label = "consumer,scheduler",
+ @UriParam(defaultValue = "TRACE", label = "consumer,scheduler",
description = "The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that.")
private LoggingLevel runLoggingLevel = LoggingLevel.TRACE;
- @UriParam(optionalPrefix = "consumer.", label = "consumer",
+ @UriParam(label = "consumer",
description = "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead.")
private boolean sendEmptyMessageWhenIdle;
- @UriParam(optionalPrefix = "consumer.", label = "consumer,scheduler",
+ @UriParam(label = "consumer,scheduler",
description = "If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages.")
private boolean greedy;
- @UriParam(optionalPrefix = "consumer.", enums = "none,spring,quartz",
+ @UriParam(enums = "none,spring,quartz",
defaultValue = "none", label = "consumer,scheduler", description = "To use a cron scheduler from either camel-spring or camel-quartz component")
private String scheduler = "none";
@UriParam(prefix = "scheduler.", multiValue = true, label = "consumer,scheduler",
description = "To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler.")
private Map<String, Object> schedulerProperties;
- @UriParam(optionalPrefix = "consumer.", label = "consumer,scheduler",
+ @UriParam(label = "consumer,scheduler",
description = "Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool.")
private ScheduledExecutorService scheduledExecutorService;
- @UriParam(optionalPrefix = "consumer.", label = "consumer,scheduler",
+ @UriParam(label = "consumer,scheduler",
description = "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row."
+ " The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again."
+ " When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.")
private int backoffMultiplier;
- @UriParam(optionalPrefix = "consumer.", label = "consumer,scheduler",
+ @UriParam(label = "consumer,scheduler",
description = "The number of subsequent idle polls that should happen before the backoffMultipler should kick-in.")
private int backoffIdleThreshold;
- @UriParam(optionalPrefix = "consumer.", label = "consumer,scheduler",
+ @UriParam(label = "consumer,scheduler",
description = "The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in.")
private int backoffErrorThreshold;
@@ -101,16 +101,22 @@ public abstract class ScheduledPollEndpoint extends DefaultEndpoint {
}
@Override
+ protected void configureConsumer(Consumer consumer) throws Exception {
+ super.configureConsumer(consumer);
+ doConfigureConsumer(consumer);
+ }
+
+ @Override
public void configureProperties(Map<String, Object> options) {
super.configureProperties(options);
- configureScheduledPollConsumerProperties(options, getConsumerProperties());
+ configureScheduledPollConsumerProperties(options);
}
- protected void configureScheduledPollConsumerProperties(Map<String, Object> options, Map<String, Object> consumerProperties) {
+ protected void configureScheduledPollConsumerProperties(Map<String, Object> options) {
// special for scheduled poll consumers as we want to allow end users to configure its options
// from the URI parameters without the consumer. prefix
Map<String, Object> schedulerProperties = PropertiesHelper.extractProperties(options, "scheduler.");
- if (schedulerProperties != null && !schedulerProperties.isEmpty()) {
+ if (!schedulerProperties.isEmpty()) {
setSchedulerProperties(schedulerProperties);
}
@@ -143,81 +149,31 @@ public abstract class ScheduledPollEndpoint extends DefaultEndpoint {
}
}
- @Override
- protected void configurePollingConsumer(PollingConsumer consumer) throws Exception {
- Map<String, Object> copy = new HashMap<>(getConsumerProperties());
- Map<String, Object> throwaway = new HashMap<>();
-
- // filter out unwanted options which is intended for the scheduled poll consumer
- // as these options are not supported on the polling consumer
- configureScheduledPollConsumerProperties(copy, throwaway);
-
- // configure consumer
- setProperties(consumer, copy);
-
- if (!isLenientProperties() && copy.size() > 0) {
- throw new ResolveEndpointFailedException(this.getEndpointUri(), "There are " + copy.size()
- + " parameters that couldn't be set on the endpoint polling consumer."
- + " Check the uri if the parameters are spelt correctly and that they are properties of the endpoint."
- + " Unknown consumer parameters=[" + copy + "]");
- }
- }
-
- protected void initConsumerProperties() {
- // must setup consumer properties before we are ready to start
- Map<String, Object> options = getConsumerProperties();
- if (!options.containsKey("startScheduler")) {
- options.put("startScheduler", isStartScheduler());
- }
- if (!options.containsKey("initialDelay")) {
- options.put("initialDelay", getInitialDelay());
- }
- if (!options.containsKey("delay")) {
- options.put("delay", getDelay());
- }
- if (!options.containsKey("timeUnit")) {
- options.put("timeUnit", getTimeUnit());
- }
- if (!options.containsKey("useFixedDelay")) {
- options.put("useFixedDelay", isUseFixedDelay());
- }
- if (!options.containsKey("pollStrategy")) {
- options.put("pollStrategy", getPollStrategy());
- }
- if (!options.containsKey("runLoggingLevel")) {
- options.put("runLoggingLevel", getRunLoggingLevel());
- }
- if (!options.containsKey("sendEmptyMessageWhenIdle")) {
- options.put("sendEmptyMessageWhenIdle", isSendEmptyMessageWhenIdle());
- }
- if (!options.containsKey("greedy")) {
- options.put("greedy", isGreedy());
- }
- if (!options.containsKey("scheduler")) {
- // the scheduler implementation
- options.put("scheduler", consumerScheduler);
- }
- if (!options.containsKey("schedulerProperties")) {
- options.put("schedulerProperties", getSchedulerProperties());
- }
- if (!options.containsKey("scheduledExecutorService")) {
- options.put("scheduledExecutorService", getScheduledExecutorService());
- }
- if (!options.containsKey("backoffMultiplier")) {
- options.put("backoffMultiplier", getBackoffMultiplier());
- }
- if (!options.containsKey("backoffIdleThreshold")) {
- options.put("backoffIdleThreshold", getBackoffIdleThreshold());
- }
- if (!options.containsKey("backoffErrorThreshold")) {
- options.put("backoffErrorThreshold", getBackoffErrorThreshold());
+ protected void doConfigureConsumer(Consumer consumer) {
+ if (consumer instanceof ScheduledPollConsumer) {
+ ScheduledPollConsumer spc = (ScheduledPollConsumer) consumer;
+ spc.setBackoffErrorThreshold(backoffErrorThreshold);
+ spc.setBackoffIdleThreshold(backoffIdleThreshold);
+ spc.setBackoffMultiplier(backoffMultiplier);
+ spc.setDelay(delay);
+ spc.setGreedy(greedy);
+ spc.setInitialDelay(initialDelay);
+ spc.setPollStrategy(pollStrategy);
+ spc.setRunLoggingLevel(runLoggingLevel);
+ spc.setScheduledExecutorService(scheduledExecutorService);
+ spc.setSendEmptyMessageWhenIdle(sendEmptyMessageWhenIdle);
+ spc.setTimeUnit(timeUnit);
+ spc.setUseFixedDelay(useFixedDelay);
+ spc.setStartScheduler(startScheduler);
+ spc.setScheduler(consumerScheduler);
+ spc.setSchedulerProperties(schedulerProperties);
}
}
@Override
protected void doStart() throws Exception {
- initConsumerProperties();
super.doStart();
+ // noop
}
@Override
[camel] 03/11: CAMEL-13917: Configuring endpoints with consumer.
prefix for consumer options is no longer supported as they should be
regular options instead. This also avoid reflection setting properties.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0315fbaa3b4f0c0864ab4d216b04fc754d1eec6b
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Sep 2 10:31:03 2019 +0200
CAMEL-13917: Configuring endpoints with consumer. prefix for consumer options is no longer supported as they should be regular options instead. This also avoid reflection setting properties.
---
.../camel/component/atom/AtomEntryPollingConsumerTest.java | 6 +++---
.../atom/AtomEntryPollingConsumerWithBasicAuthTest.java | 6 +++---
.../org/apache/camel/component/atom/AtomEntrySortTest.java | 4 ++--
.../org/apache/camel/component/atom/AtomGoodBlogsTest.java | 2 +-
.../component/atom/AtomPollingConsumerIdleMessageTest.java | 2 +-
.../apache/camel/component/atom/AtomPollingLowDelayTest.java | 2 +-
.../camel/component/atom/AtomPollingUnthrottledTest.java | 2 +-
.../java/org/apache/camel/component/atom/AtomRouteTest.java | 2 +-
.../dataformat/bindy/csv/BindyCsvUnmarshallTest-context.xml | 4 ++--
components/camel-csv/src/main/docs/csv-dataformat.adoc | 2 +-
.../component/elsql/ElSqlConsumerDynamicParameterTest.java | 2 +-
.../camel-facebook/src/main/docs/facebook-component.adoc | 2 +-
.../component/facebook/FacebookComponentConsumerTest.java | 4 ++--
components/camel-file/src/main/docs/file-component.adoc | 12 +++++-------
...ExplicitSSLWithClientAuthAndSSLContextParametersTest.java | 2 +-
.../file/remote/FileToFtpsExplicitSSLWithClientAuthTest.java | 2 +-
...SLWithoutClientAuthAndGlobalSSLContextParametersTest.java | 2 +-
...licitSSLWithoutClientAuthAndSSLContextParametersTest.java | 2 +-
.../remote/FileToFtpsExplicitSSLWithoutClientAuthTest.java | 2 +-
...ExplicitTLSWithClientAuthAndSSLContextParametersTest.java | 2 +-
.../file/remote/FileToFtpsExplicitTLSWithClientAuthTest.java | 2 +-
...licitTLSWithoutClientAuthAndSSLContextParametersTest.java | 2 +-
.../remote/FileToFtpsExplicitTLSWithoutClientAuthTest.java | 2 +-
...ImplicitSSLWithClientAuthAndSSLContextParametersTest.java | 2 +-
.../file/remote/FileToFtpsImplicitSSLWithClientAuthTest.java | 2 +-
...licitSSLWithoutClientAuthAndSSLContextParametersTest.java | 2 +-
.../remote/FileToFtpsImplicitSSLWithoutClientAuthTest.java | 2 +-
...ImplicitTLSWithClientAuthAndSSLContextParametersTest.java | 2 +-
.../file/remote/FileToFtpsImplicitTLSWithClientAuthTest.java | 2 +-
...licitTLSWithoutClientAuthAndSSLContextParametersTest.java | 2 +-
.../remote/FileToFtpsImplicitTLSWithoutClientAuthTest.java | 2 +-
.../FileToFtpsWithCustomKeyAndTrustStorePropertiesTest.java | 2 +-
.../remote/FileToFtpsWithCustomTrustStorePropertiesTest.java | 2 +-
.../file/remote/FileToFtpsWithDefaultSettingsIPV6Test.java | 2 +-
.../file/remote/FileToFtpsWithDefaultSettingsTest.java | 2 +-
.../file/remote/FileToFtpsWithFtpClientConfigRefTest.java | 2 +-
.../file/remote/FromFilePercentSignInPasswordTest.java | 4 ++--
.../FromFilePercentSignInPasswordUserInfoEncodedTest.java | 2 +-
.../remote/FromFilePercentSignInPasswordUserInfoTest.java | 2 +-
.../component/file/remote/FromFileToFtpNotStepwiseTest.java | 2 +-
.../camel/component/file/remote/FromFileToFtpTest.java | 4 ++--
.../component/file/remote/FromFileToFtpWithChmodTest.java | 4 ++--
.../file/remote/FromFtpExclusiveReadNoneStrategyTest.java | 2 +-
.../file/remote/FromFtpMoveFileNotStepwiseTest.java | 2 +-
.../file/remote/FromFtpMoveFilePostfixNotStepwiseTest.java | 2 +-
.../component/file/remote/FromFtpMoveFilePostfixTest.java | 2 +-
.../file/remote/FromFtpMoveFilePrefixNotStepwiseTest.java | 2 +-
.../component/file/remote/FromFtpMoveFilePrefixTest.java | 2 +-
.../camel/component/file/remote/FromFtpMoveFileTest.java | 2 +-
.../camel/component/file/remote/FromFtpNoFilesTest.java | 2 +-
.../file/remote/FromFtpPreMoveFileExpressionTest.java | 2 +-
.../file/remote/FromFtpPreMoveFilePrefixNotStepwiseTest.java | 2 +-
.../component/file/remote/FromFtpPreMoveFilePrefixTest.java | 2 +-
.../file/remote/FromFtpRemoteFileSortByExpressionTest.java | 2 +-
.../FromFtpRemoteFileSortByIgnoreCaseExpressionTest.java | 2 +-
.../remote/FromFtpRemoteFileSortByNestedExpressionTest.java | 2 +-
.../camel/component/file/remote/FromFtpToBinaryFileTest.java | 2 +-
.../component/file/remote/FromFtpToBinaryFilesTest.java | 6 +++---
.../component/file/remote/FromFtpToBinarySampleTest.java | 2 +-
.../component/file/remote/FtpConsumerBodyAsStringTest.java | 2 +-
.../file/remote/FtpConsumerDeleteNoWritePermissionTest.java | 2 +-
.../file/remote/FtpConsumerIPV6BodyAsStringTest.java | 2 +-
.../component/file/remote/FtpConsumerMoveExpressionTest.java | 2 +-
.../file/remote/FtpConsumerMultipleDirectoriesTest.java | 2 +-
.../file/remote/FtpConsumerWithNoFileOptionTest.java | 2 +-
.../file/remote/FtpPollEnrichBridgeErrorHandlerTest.java | 2 +-
.../file/remote/FtpProducerConnectErrorsHeaderTest.java | 2 +-
.../src/main/docs/linkedin-component.adoc | 2 +-
components/camel-mail/src/main/docs/mail-component.adoc | 6 +++---
.../camel/component/mail/AdditionalMailPropertiesTest.java | 4 ++--
.../apache/camel/component/mail/FromFileSendMailTest.java | 4 ++--
.../component/mail/MailAttachmentDuplicateNamesTest.java | 2 +-
.../camel/component/mail/MailAttachmentRedeliveryTest.java | 2 +-
.../org/apache/camel/component/mail/MailAttachmentTest.java | 2 +-
.../camel/component/mail/MailAttachmentsUmlautIssueTest.java | 2 +-
.../apache/camel/component/mail/MailBatchConsumerTest.java | 2 +-
.../camel/component/mail/MailCollectionHeaderTest.java | 2 +-
.../camel/component/mail/MailCommitOnCompletionTest.java | 2 +-
.../camel/component/mail/MailConsumerIdleMessageTest.java | 2 +-
.../component/mail/MailConsumerUnsupportedCharsetTest.java | 2 +-
.../camel/component/mail/MailContentTypeResolverTest.java | 2 +-
.../org/apache/camel/component/mail/MailConvertersTest.java | 2 +-
.../java/org/apache/camel/component/mail/MailCopyToTest.java | 2 +-
.../org/apache/camel/component/mail/MailDisconnectTest.java | 2 +-
.../component/mail/MailDoNotDeleteIfProcessFailsTest.java | 2 +-
.../org/apache/camel/component/mail/MailFetchSizeTest.java | 2 +-
.../apache/camel/component/mail/MailFetchSizeZeroTest.java | 2 +-
.../MailHeaderOverrulePreConfigurationRecipientsTest.java | 2 +-
.../apache/camel/component/mail/MailHtmlAttachmentTest.java | 2 +-
.../mail/MailIdempotentRepositoryDuplicateNotRemoveTest.java | 2 +-
.../mail/MailIdempotentRepositoryDuplicateTest.java | 2 +-
.../camel/component/mail/MailIdempotentRepositoryTest.java | 2 +-
.../camel/component/mail/MailMaxMessagesPerPollTest.java | 2 +-
.../camel/component/mail/MailMimeDecodeHeadersTest.java | 4 ++--
.../camel/component/mail/MailMultipleRecipientsTest.java | 8 ++++----
.../component/mail/MailNameAndEmailInRecipientTest.java | 4 ++--
.../camel/component/mail/MailPollEnrichNoMailTest.java | 2 +-
.../org/apache/camel/component/mail/MailPollEnrichTest.java | 2 +-
.../camel/component/mail/MailPostProcessActionTest.java | 2 +-
.../component/mail/MailProcessOnlyUnseenMessagesTest.java | 2 +-
.../component/mail/MailProducerUnsupportedCharsetTest.java | 4 ++--
.../org/apache/camel/component/mail/MailReplyToTest.java | 2 +-
.../java/org/apache/camel/component/mail/MailRouteTest.java | 4 ++--
.../org/apache/camel/component/mail/MailSearchTermTest.java | 2 +-
.../mail/MailSearchTermUriConfigLast24HoursTest.java | 2 +-
.../camel/component/mail/MailSearchTermUriConfigTest.java | 2 +-
.../component/mail/MailShutdownCompleteAllTasksTest.java | 2 +-
.../mail/MailShutdownCompleteCurrentTaskOnlyTest.java | 2 +-
.../org/apache/camel/component/mail/MailSortTermTest.java | 2 +-
.../apache/camel/component/mail/MailSortTermThreeTest.java | 2 +-
.../org/apache/camel/component/mail/MailSortTermTwoTest.java | 2 +-
.../camel/component/mail/MailSplitAttachmentsTest.java | 2 +-
.../org/apache/camel/component/mail/MailSubjectTest.java | 2 +-
.../camel/component/mail/MailUsernameWithAtSignTest.java | 2 +-
.../camel/component/mail/MailUsingCustomSessionTest.java | 2 +-
.../apache/camel/component/mail/MimeMessageConsumeTest.java | 4 ++--
.../camel/component/mail/MimeMultipartAlternativeTest.java | 2 +-
.../mail/MimeMultipartAlternativeWithContentTypeTest.java | 2 +-
.../mail/MimeMultipartAlternativeWithLongerFilenameTest.java | 2 +-
.../camel/component/mail/MultipleDestinationConsumeTest.java | 2 +-
.../camel/component/mail/NestedMimeMessageConsumeTest.java | 4 ++--
.../org/apache/camel/component/mail/RawMailMessageTest.java | 8 ++++----
.../mail/security/SslContextParametersMailRouteTest.java | 2 +-
.../camel/component/mail/SpringMailSplitAttachmentsTest.xml | 2 +-
.../src/main/docs/olingo2-component.adoc | 2 +-
.../component/olingo2/Olingo2ComponentConsumerTest.java | 8 ++++----
.../component/olingo4/Olingo4ComponentConsumerTest.java | 8 ++++----
components/camel-rss/src/main/docs/rss-component.adoc | 8 ++++----
components/camel-rss/src/main/docs/rss-dataformat.adoc | 2 +-
.../camel/component/rss/RssEntryPollingConsumerTest.java | 2 +-
.../rss/RssEntryPollingConsumerWithBasicAuthTest.java | 2 +-
.../component/rss/RssEntryPollingConsumerWithFilterTest.java | 2 +-
.../apache/camel/component/rss/RssEntrySortDefaultsTest.java | 4 ++--
.../org/apache/camel/component/rss/RssEntrySortTest.java | 4 ++--
.../java/org/apache/camel/component/rss/RssFilterTest.java | 2 +-
.../camel/component/rss/RssMultipleEndpointsIssueTest.java | 4 ++--
.../rss/RssPollingConsumerWithFeedHeaderDisabledTest.java | 2 +-
.../org/apache/camel/dataformat/rss/RssConverterTest.java | 4 ++--
.../org/apache/camel/dataformat/rss/RssDataFormatTest.java | 4 ++--
.../apache/camel/dataformat/rss/RssFilterWithXPathTest.java | 2 +-
.../component/sql/SqlConsumerDeleteBatchCompleteTest.java | 2 +-
.../camel/component/sql/SqlConsumerDeleteFailedTest.java | 2 +-
.../apache/camel/component/sql/SqlConsumerDeleteTest.java | 2 +-
.../camel/component/sql/SqlConsumerDeleteTransformTest.java | 2 +-
.../camel/component/sql/SqlConsumerDynamicParameterTest.java | 2 +-
.../component/sql/SqlConsumerMaxMessagesPerPollTest.java | 2 +-
.../component/sql/SqlConsumerOutputTypeSelectListTest.java | 2 +-
.../sql/SqlConsumerOutputTypeSelectListWithClassTest.java | 2 +-
.../component/sql/SqlConsumerOutputTypeSelectOneTest.java | 8 ++++----
.../component/sql/SqlConsumerOutputTypeStreamListTest.java | 6 +++---
.../java/org/apache/camel/component/sql/SqlConsumerTest.java | 2 +-
.../sql/SqlProducerAlwaysPopulateStatementFalseTest.java | 2 +-
.../sql/SqlProducerAlwaysPopulateStatementTest.java | 2 +-
.../camel-tarfile/src/main/docs/tarfile-dataformat.adoc | 4 ++--
.../dataformat/tarfile/TarFileMultipleFilesSplitterTest.java | 2 +-
.../camel/dataformat/tarfile/TarSplitterRouteTest.java | 2 +-
.../tarfile/AggregationStrategyWithPreservationTest.java | 2 +-
.../aggregate/tarfile/TarAggregationStrategyTest.java | 2 +-
.../camel/dataformat/tarfile/SpringTarSplitterRouteTest.xml | 2 +-
.../camel-zipfile/src/main/docs/zipfile-dataformat.adoc | 4 ++--
.../dataformat/zipfile/ZipFileMultipleFilesSplitterTest.java | 2 +-
.../camel/dataformat/zipfile/ZipSplitterRouteTest.java | 2 +-
.../zipfile/AggregationStrategyWithPreservationTest.java | 2 +-
.../aggregate/zipfile/ZipAggregationStrategyTest.java | 2 +-
.../camel/dataformat/zipfile/SpringZipSplitterRouteTest.xml | 2 +-
165 files changed, 218 insertions(+), 220 deletions(-)
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerTest.java
index 026f6d9..9020638 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerTest.java
@@ -60,11 +60,11 @@ public class AtomEntryPollingConsumerTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("atom:file:src/test/data/feed.atom?splitEntries=true&consumer.delay=500").to("mock:result1");
+ from("atom:file:src/test/data/feed.atom?splitEntries=true&delay=500").to("mock:result1");
- from("atom:file:src/test/data/feed.atom?splitEntries=true&filter=false&consumer.delay=500").to("mock:result2");
+ from("atom:file:src/test/data/feed.atom?splitEntries=true&filter=false&delay=500").to("mock:result2");
- from("atom:file:src/test/data/feed.atom?splitEntries=true&filter=true&lastUpdate=#myDate&consumer.delay=500").to("mock:result3");
+ from("atom:file:src/test/data/feed.atom?splitEntries=true&filter=true&lastUpdate=#myDate&delay=500").to("mock:result3");
}
};
}
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerWithBasicAuthTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerWithBasicAuthTest.java
index d104d02..3ed62cd 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerWithBasicAuthTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerWithBasicAuthTest.java
@@ -26,13 +26,13 @@ public class AtomEntryPollingConsumerWithBasicAuthTest extends AtomEntryPollingC
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("atom:http://localhost:" + JettyTestServer.getInstance().port + "/?splitEntries=true&consumer.delay=500&username=camel&password=camelPass")
+ from("atom:http://localhost:" + JettyTestServer.getInstance().port + "/?splitEntries=true&delay=500&username=camel&password=camelPass")
.to("mock:result1");
- from("atom:http://localhost:" + JettyTestServer.getInstance().port + "/?splitEntries=true&filter=false&consumer.delay=500&username=camel&password=camelPass")
+ from("atom:http://localhost:" + JettyTestServer.getInstance().port + "/?splitEntries=true&filter=false&delay=500&username=camel&password=camelPass")
.to("mock:result2");
- from("atom:http://localhost:" + JettyTestServer.getInstance().port + "/?splitEntries=true&filter=true&lastUpdate=#myDate&consumer.delay=500&username=camel&password=camelPass")
+ from("atom:http://localhost:" + JettyTestServer.getInstance().port + "/?splitEntries=true&filter=true&lastUpdate=#myDate&delay=500&username=camel&password=camelPass")
.to("mock:result3");
}
};
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntrySortTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntrySortTest.java
index cfd024e..bdd9646 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntrySortTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntrySortTest.java
@@ -56,8 +56,8 @@ public class AtomEntrySortTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("atom:file:src/test/data/unsortedfeed.atom?splitEntries=true&sortEntries=true&consumer.delay=50").to("mock:sorted");
- from("atom:file:src/test/data/unsortedfeed.atom?splitEntries=true&sortEntries=false&consumer.delay=50").to("mock:unsorted");
+ from("atom:file:src/test/data/unsortedfeed.atom?splitEntries=true&sortEntries=true&delay=50").to("mock:sorted");
+ from("atom:file:src/test/data/unsortedfeed.atom?splitEntries=true&sortEntries=false&delay=50").to("mock:unsorted");
}
};
}
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomGoodBlogsTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomGoodBlogsTest.java
index 202fd5f..13c99a7 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomGoodBlogsTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomGoodBlogsTest.java
@@ -66,7 +66,7 @@ public class AtomGoodBlogsTest extends TestSupport {
// and restart - but as Camel by default uses the UpdatedDateFilter it will only deliver new
// blog entries to "seda:feeds". So only when James Straham updates his blog with a new entry
// Camel will create an exchange for the seda:feeds.
- from("atom:file:src/test/data/feed.atom?splitEntries=true&consumer.delay=1000").to("seda:feeds");
+ from("atom:file:src/test/data/feed.atom?splitEntries=true&delay=1000").to("seda:feeds");
// From the feeds we filter each blot entry by using our blog service class
from("seda:feeds").filter().method("blogService", "isGoodBlog").to("seda:goodBlogs");
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerIdleMessageTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerIdleMessageTest.java
index 413c454..fc013e1 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerIdleMessageTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerIdleMessageTest.java
@@ -41,7 +41,7 @@ public class AtomPollingConsumerIdleMessageTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("atom:file:src/test/data/empty-feed.atom?splitEntries=true&consumer.delay=50&consumer.initialDelay=0"
+ from("atom:file:src/test/data/empty-feed.atom?splitEntries=true&delay=50&initialDelay=0"
+ "&feedHeader=false&sendEmptyMessageWhenIdle=true")
.to("mock:result");
}
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingLowDelayTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingLowDelayTest.java
index cb01a43..960a7f7 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingLowDelayTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingLowDelayTest.java
@@ -38,7 +38,7 @@ public class AtomPollingLowDelayTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("atom:file:src/test/data/feed.atom?splitEntries=true&consumer.delay=100&consumer.initialDelay=0").to("mock:result");
+ from("atom:file:src/test/data/feed.atom?splitEntries=true&delay=100&initialDelay=0").to("mock:result");
}
};
}
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingUnthrottledTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingUnthrottledTest.java
index 2f86e1b..1996603 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingUnthrottledTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingUnthrottledTest.java
@@ -36,7 +36,7 @@ public class AtomPollingUnthrottledTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("atom:file:src/test/data/feed.atom?splitEntries=true&throttleEntries=false&consumer.initialDelay=0").to("mock:result");
+ from("atom:file:src/test/data/feed.atom?splitEntries=true&throttleEntries=false&initialDelay=0").to("mock:result");
}
};
}
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomRouteTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomRouteTest.java
index 44eb00a..3cd5d3f 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomRouteTest.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomRouteTest.java
@@ -64,7 +64,7 @@ public class AtomRouteTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("atom:file:src/test/data/feed.atom?consumer.delay=500").to("mock:results");
+ from("atom:file:src/test/data/feed.atom?delay=500").to("mock:results");
}
};
}
diff --git a/components/camel-bindy/src/test/resources/org/apache/camel/dataformat/bindy/csv/BindyCsvUnmarshallTest-context.xml b/components/camel-bindy/src/test/resources/org/apache/camel/dataformat/bindy/csv/BindyCsvUnmarshallTest-context.xml
index 02c205a..89a1610 100644
--- a/components/camel-bindy/src/test/resources/org/apache/camel/dataformat/bindy/csv/BindyCsvUnmarshallTest-context.xml
+++ b/components/camel-bindy/src/test/resources/org/apache/camel/dataformat/bindy/csv/BindyCsvUnmarshallTest-context.xml
@@ -27,8 +27,8 @@
<camelContext xmlns="http://camel.apache.org/schema/spring">
<route>
- <from uri="file://src/test/data?noop=true&consumer.initialDelay=2000" />
- <to uri="test:file://src/test/data?noop=true&consumer.initialDelay=2000" />
+ <from uri="file://src/test/data?noop=true&initialDelay=2000" />
+ <to uri="test:file://src/test/data?noop=true&initialDelay=2000" />
</route>
</camelContext>
</beans>
\ No newline at end of file
diff --git a/components/camel-csv/src/main/docs/csv-dataformat.adoc b/components/camel-csv/src/main/docs/csv-dataformat.adoc
index 78b219f..b35ee68 100644
--- a/components/camel-csv/src/main/docs/csv-dataformat.adoc
+++ b/components/camel-csv/src/main/docs/csv-dataformat.adoc
@@ -219,7 +219,7 @@ public void doHandleCsvData(List<List<String>> csvData)
------------------------------------------------------------------------------------------------
<route>
<!-- poll every 10 seconds -->
- <from uri="file:///some/path/to/pickup/csvfiles?delete=true&consumer.delay=10000" />
+ <from uri="file:///some/path/to/pickup/csvfiles?delete=true&delay=10000" />
<unmarshal><csv /></unmarshal>
<to uri="bean:myCsvHandler?method=doHandleCsvData" />
</route>
diff --git a/components/camel-elsql/src/test/java/org/apache/camel/component/elsql/ElSqlConsumerDynamicParameterTest.java b/components/camel-elsql/src/test/java/org/apache/camel/component/elsql/ElSqlConsumerDynamicParameterTest.java
index f7963b2..192bcf5 100644
--- a/components/camel-elsql/src/test/java/org/apache/camel/component/elsql/ElSqlConsumerDynamicParameterTest.java
+++ b/components/camel-elsql/src/test/java/org/apache/camel/component/elsql/ElSqlConsumerDynamicParameterTest.java
@@ -75,7 +75,7 @@ public class ElSqlConsumerDynamicParameterTest extends CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("elsql:projectsByIdBean:elsql/projects.elsql?dataSource=#dataSource&consumer.initialDelay=0&consumer.delay=50").routeId("foo").noAutoStartup()
+ from("elsql:projectsByIdBean:elsql/projects.elsql?dataSource=#dataSource&initialDelay=0&delay=50").routeId("foo").noAutoStartup()
.to("mock:result");
}
};
diff --git a/components/camel-facebook/src/main/docs/facebook-component.adoc b/components/camel-facebook/src/main/docs/facebook-component.adoc
index b1f9ef9..ef33a5c 100644
--- a/components/camel-facebook/src/main/docs/facebook-component.adoc
+++ b/components/camel-facebook/src/main/docs/facebook-component.adoc
@@ -351,7 +351,7 @@ your home feed:
[source,java]
-----------------------------------------------
- from("facebook://home?consumer.delay=5000")
+ from("facebook://home?delay=5000")
.to("bean:blah");
-----------------------------------------------
diff --git a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentConsumerTest.java b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentConsumerTest.java
index b0bddaf..6ac98b5 100644
--- a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentConsumerTest.java
+++ b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentConsumerTest.java
@@ -129,13 +129,13 @@ public class FacebookComponentConsumerTest extends CamelFacebookTestSupport {
if (!excludedNames.contains(name)) {
// consumer.sendEmptyMessageWhenIdle is true since user may not have some items like events
from("facebook://" + name + "?reading.limit=10&reading.locale=en.US&reading.since="
- + since + "&consumer.initialDelay=1000&consumer.sendEmptyMessageWhenIdle=true&"
+ + since + "&initialDelay=1000&consumer.sendEmptyMessageWhenIdle=true&"
+ getOauthParams())
.to("mock:consumeResult" + name);
}
from("facebook://" + name + "?query=cheese&reading.limit=10&reading.locale=en.US&reading.since="
- + since + "&consumer.initialDelay=1000&" + getOauthParams())
+ + since + "&initialDelay=1000&" + getOauthParams())
.to("mock:consumeQueryResult" + name);
}
diff --git a/components/camel-file/src/main/docs/file-component.adoc b/components/camel-file/src/main/docs/file-component.adoc
index fc16ba0..e695a8a 100644
--- a/components/camel-file/src/main/docs/file-component.adoc
+++ b/components/camel-file/src/main/docs/file-component.adoc
@@ -1128,13 +1128,11 @@ directories, to avoid traversing down unwanted directories.
For example to skip any directories which starts with `"skip"` in the
name, can be implemented as follows:
-== Using consumer.bridgeErrorHandler
-
-*Available as of Camel 2.10*
+== Using bridgeErrorHandler
If you want to use the Camel Error Handler to
deal with any exception occurring in the file consumer, then you can
-enable the `consumer.bridgeErrorHandler` option as shown below:
+enable the `bridgeErrorHandler` option as shown below:
[source,java]
----
@@ -1147,7 +1145,7 @@ onException(IOException.class)
// this is the file route that pickup files, notice how we bridge the consumer to use the Camel routing error handler
// the exclusiveReadLockStrategy is only configured because this is from an unit test, so we use that to simulate exceptions
-from("file:target/nospace?consumer.bridgeErrorHandler=true")
+from("file:target/nospace?bridgeErrorHandler=true")
.convertBodyTo(String.class)
.to("mock:result");
----
@@ -1155,8 +1153,8 @@ from("file:target/nospace?consumer.bridgeErrorHandler=true")
So all you have to do is to enable this option, and the error handler in
the route will take it from there.
-IMPORTANT: *Important when using consumer.bridgeErrorHandler*
-When using consumer.bridgeErrorHandler, then
+IMPORTANT: *Important when using bridgeErrorHandler*
+When using bridgeErrorHandler, then
interceptors, OnCompletions
does *not* apply. The Exchange is processed directly
by the Camel Error Handler, and does not allow
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithClientAuthAndSSLContextParametersTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithClientAuthAndSSLContextParametersTest.java
index b4c51b2..067e49a 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithClientAuthAndSSLContextParametersTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithClientAuthAndSSLContextParametersTest.java
@@ -47,7 +47,7 @@ public class FileToFtpsExplicitSSLWithClientAuthAndSSLContextParametersTest exte
@Override
protected String getFtpUrl() {
- return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=2000&disableSecureDataChannelDefaults=true"
+ return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&initialDelay=2000&disableSecureDataChannelDefaults=true"
+ "&implicit=false&sslContextParameters=#sslContextParameters&delete=true";
}
}
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 4f05426..d0dfb9d 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
@@ -26,7 +26,7 @@ import org.junit.Test;
public class FileToFtpsExplicitSSLWithClientAuthTest extends FtpsServerExplicitSSLWithClientAuthTestSupport {
protected String getFtpUrl() {
- return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=2000&disableSecureDataChannelDefaults=true"
+ return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&initialDelay=2000&disableSecureDataChannelDefaults=true"
+ "&securityProtocol=SSLv3&implicit=false&ftpClient.keyStore.file=./src/test/resources/server.jks&ftpClient.keyStore.type=JKS"
+ "&ftpClient.keyStore.algorithm=SunX509&ftpClient.keyStore.password=password&ftpClient.keyStore.keyPassword=password&delete=true";
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithoutClientAuthAndGlobalSSLContextParametersTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithoutClientAuthAndGlobalSSLContextParametersTest.java
index 89f60dd..de1e5d7 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithoutClientAuthAndGlobalSSLContextParametersTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithoutClientAuthAndGlobalSSLContextParametersTest.java
@@ -45,7 +45,7 @@ public class FileToFtpsExplicitSSLWithoutClientAuthAndGlobalSSLContextParameters
@Override
protected String getFtpUrl() {
- return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=2000&disableSecureDataChannelDefaults=true"
+ return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&initialDelay=2000&disableSecureDataChannelDefaults=true"
+ "&implicit=false&delete=true";
}
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithoutClientAuthAndSSLContextParametersTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithoutClientAuthAndSSLContextParametersTest.java
index 3c4835e..3524af0 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithoutClientAuthAndSSLContextParametersTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithoutClientAuthAndSSLContextParametersTest.java
@@ -41,7 +41,7 @@ public class FileToFtpsExplicitSSLWithoutClientAuthAndSSLContextParametersTest e
@Override
protected String getFtpUrl() {
- return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=2000&disableSecureDataChannelDefaults=true"
+ return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&initialDelay=2000&disableSecureDataChannelDefaults=true"
+ "&implicit=false&sslContextParameters=#sslContextParameters&delete=true";
}
}
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 ecdf54f..72c68e2 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
@@ -26,7 +26,7 @@ import org.junit.Test;
public class FileToFtpsExplicitSSLWithoutClientAuthTest extends FtpsServerExplicitSSLWithoutClientAuthTestSupport {
protected String getFtpUrl() {
- return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=2000&disableSecureDataChannelDefaults=true&delete=true"
+ return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&initialDelay=2000&disableSecureDataChannelDefaults=true&delete=true"
+ "&securityProtocol=SSLv3&implicit=false";
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitTLSWithClientAuthAndSSLContextParametersTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitTLSWithClientAuthAndSSLContextParametersTest.java
index 2f3ef64..b9935d2 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitTLSWithClientAuthAndSSLContextParametersTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitTLSWithClientAuthAndSSLContextParametersTest.java
@@ -47,7 +47,7 @@ public class FileToFtpsExplicitTLSWithClientAuthAndSSLContextParametersTest exte
@Override
protected String getFtpUrl() {
- return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=2000&disableSecureDataChannelDefaults=true"
+ return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&initialDelay=2000&disableSecureDataChannelDefaults=true"
+ "&implicit=false&sslContextParameters=#sslContextParameters&delete=true";
}
}
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 8a903e7..6175c27 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
@@ -26,7 +26,7 @@ import org.junit.Test;
public class FileToFtpsExplicitTLSWithClientAuthTest extends FtpsServerExplicitTLSWithClientAuthTestSupport {
protected String getFtpUrl() {
- return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=2000&disableSecureDataChannelDefaults=true"
+ return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&initialDelay=2000&disableSecureDataChannelDefaults=true"
+ "&securityProtocol=TLSv1.2&implicit=false&ftpClient.keyStore.file=./src/test/resources/server.jks&ftpClient.keyStore.type=JKS"
+ "&ftpClient.keyStore.algorithm=SunX509&ftpClient.keyStore.password=password&ftpClient.keyStore.keyPassword=password&delete=true";
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitTLSWithoutClientAuthAndSSLContextParametersTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitTLSWithoutClientAuthAndSSLContextParametersTest.java
index 939a751..63a7525 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitTLSWithoutClientAuthAndSSLContextParametersTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitTLSWithoutClientAuthAndSSLContextParametersTest.java
@@ -40,7 +40,7 @@ public class FileToFtpsExplicitTLSWithoutClientAuthAndSSLContextParametersTest e
@Override
protected String getFtpUrl() {
- return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=2000&disableSecureDataChannelDefaults=true"
+ return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&initialDelay=2000&disableSecureDataChannelDefaults=true"
+ "&implicit=false&sslContextParameters=#sslContextParameters&delete=true";
}
}
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 d47f08a..71d04cd 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
@@ -26,7 +26,7 @@ import org.junit.Test;
public class FileToFtpsExplicitTLSWithoutClientAuthTest extends FtpsServerExplicitTLSWithoutClientAuthTestSupport {
protected String getFtpUrl() {
- return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=2000&disableSecureDataChannelDefaults=true"
+ return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&initialDelay=2000&disableSecureDataChannelDefaults=true"
+ "&securityProtocol=TLSv1.2&implicit=false&delete=true";
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitSSLWithClientAuthAndSSLContextParametersTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitSSLWithClientAuthAndSSLContextParametersTest.java
index d02153f..4c31501 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitSSLWithClientAuthAndSSLContextParametersTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitSSLWithClientAuthAndSSLContextParametersTest.java
@@ -46,7 +46,7 @@ public class FileToFtpsImplicitSSLWithClientAuthAndSSLContextParametersTest exte
@Override
protected String getFtpUrl() {
- return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=2000&disableSecureDataChannelDefaults=true"
+ return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&initialDelay=2000&disableSecureDataChannelDefaults=true"
+ "&implicit=true&sslContextParameters=#sslContextParameters&delete=true";
}
}
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 4fefde3..e71182a 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
@@ -26,7 +26,7 @@ import org.junit.Test;
public class FileToFtpsImplicitSSLWithClientAuthTest extends FtpsServerImplicitSSLWithClientAuthTestSupport {
protected String getFtpUrl() {
- return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=2000&disableSecureDataChannelDefaults=true"
+ return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&initialDelay=2000&disableSecureDataChannelDefaults=true"
+ "&securityProtocol=SSLv3&implicit=true&ftpClient.keyStore.file=./src/test/resources/server.jks&ftpClient.keyStore.type=JKS"
+ "&ftpClient.keyStore.algorithm=SunX509&ftpClient.keyStore.password=password&ftpClient.keyStore.keyPassword=password&delete=true";
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitSSLWithoutClientAuthAndSSLContextParametersTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitSSLWithoutClientAuthAndSSLContextParametersTest.java
index 43c9e09..64d3599 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitSSLWithoutClientAuthAndSSLContextParametersTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitSSLWithoutClientAuthAndSSLContextParametersTest.java
@@ -40,7 +40,7 @@ public class FileToFtpsImplicitSSLWithoutClientAuthAndSSLContextParametersTest e
@Override
protected String getFtpUrl() {
- return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=2000&disableSecureDataChannelDefaults=true"
+ return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&initialDelay=2000&disableSecureDataChannelDefaults=true"
+ "&implicit=true&sslContextParameters=#sslContextParameters&delete=true";
}
}
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 5cda433..4b28c23 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
@@ -26,7 +26,7 @@ import org.junit.Test;
public class FileToFtpsImplicitSSLWithoutClientAuthTest extends FtpsServerImplicitSSLWithoutClientAuthTestSupport {
protected String getFtpUrl() {
- return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=2000&disableSecureDataChannelDefaults=true"
+ return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&initialDelay=2000&disableSecureDataChannelDefaults=true"
+ "&securityProtocol=SSLv3&implicit=true&delete=true";
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitTLSWithClientAuthAndSSLContextParametersTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitTLSWithClientAuthAndSSLContextParametersTest.java
index 65baf8a..75c5846 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitTLSWithClientAuthAndSSLContextParametersTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitTLSWithClientAuthAndSSLContextParametersTest.java
@@ -46,7 +46,7 @@ public class FileToFtpsImplicitTLSWithClientAuthAndSSLContextParametersTest exte
@Override
protected String getFtpUrl() {
- return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=2000&disableSecureDataChannelDefaults=true"
+ return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&initialDelay=2000&disableSecureDataChannelDefaults=true"
+ "&implicit=true&sslContextParameters=#sslContextParameters&delete=true";
}
}
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 326419f..5301d96 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
@@ -26,7 +26,7 @@ import org.junit.Test;
public class FileToFtpsImplicitTLSWithClientAuthTest extends FtpsServerImplicitTLSWithClientAuthTestSupport {
protected String getFtpUrl() {
- return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=2000&disableSecureDataChannelDefaults=true"
+ return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&initialDelay=2000&disableSecureDataChannelDefaults=true"
+ "&securityProtocol=TLSv1.2&implicit=true&ftpClient.keyStore.file=./src/test/resources/server.jks&ftpClient.keyStore.type=JKS"
+ "&ftpClient.keyStore.algorithm=SunX509&ftpClient.keyStore.password=password&ftpClient.keyStore.keyPassword=password&delete=true";
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitTLSWithoutClientAuthAndSSLContextParametersTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitTLSWithoutClientAuthAndSSLContextParametersTest.java
index 7da9a6e..6e34671 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitTLSWithoutClientAuthAndSSLContextParametersTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitTLSWithoutClientAuthAndSSLContextParametersTest.java
@@ -40,7 +40,7 @@ public class FileToFtpsImplicitTLSWithoutClientAuthAndSSLContextParametersTest e
@Override
protected String getFtpUrl() {
- return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=2000&disableSecureDataChannelDefaults=true"
+ return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&initialDelay=2000&disableSecureDataChannelDefaults=true"
+ "&implicit=true&sslContextParameters=#sslContextParameters&delete=true";
}
}
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 6f960e3..5f0a92f 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
@@ -26,7 +26,7 @@ import org.junit.Test;
public class FileToFtpsImplicitTLSWithoutClientAuthTest extends FtpsServerImplicitTLSWithoutClientAuthTestSupport {
protected String getFtpUrl() {
- return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=2000&disableSecureDataChannelDefaults=true"
+ return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&initialDelay=2000&disableSecureDataChannelDefaults=true"
+ "&securityProtocol=TLSv1.2&implicit=true&delete=true";
}
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 b542f02..b7dfca3 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
@@ -26,7 +26,7 @@ import org.junit.Test;
public class FileToFtpsWithCustomKeyAndTrustStorePropertiesTest extends FtpsServerExplicitSSLWithClientAuthTestSupport {
private String getFtpUrl() {
- return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=2000&disableSecureDataChannelDefaults=true"
+ return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&initialDelay=2000&disableSecureDataChannelDefaults=true"
+ "&securityProtocol=SSLv3&implicit=false&ftpClient.keyStore.file=./src/test/resources/server.jks&ftpClient.keyStore.type=JKS"
+ "&ftpClient.keyStore.algorithm=SunX509&ftpClient.keyStore.password=password&ftpClient.keyStore.keyPassword=password"
+ "&ftpClient.trustStore.file=./src/test/resources/server.jks&ftpClient.trustStore.type=JKS"
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 f0f523a..568800c 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
@@ -26,7 +26,7 @@ import org.junit.Test;
public class FileToFtpsWithCustomTrustStorePropertiesTest extends FtpsServerExplicitSSLWithoutClientAuthTestSupport {
private String getFtpUrl() {
- return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=2000&disableSecureDataChannelDefaults=true"
+ return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&initialDelay=2000&disableSecureDataChannelDefaults=true"
+ "&securityProtocol=SSLv3&implicit=false&ftpClient.trustStore.file=./src/test/resources/server.jks&ftpClient.trustStore.type=JKS"
+ "&ftpClient.trustStore.algorithm=SunX509&ftpClient.trustStore.password=password&delete=true";
}
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 1e18197..e0599ad 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
@@ -28,7 +28,7 @@ import org.junit.Test;
public class FileToFtpsWithDefaultSettingsIPV6Test extends FtpsServerExplicitTLSWithoutClientAuthTestSupport {
private String getFtpUrl() {
- return "ftps://admin@[::1]:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=2000&disableSecureDataChannelDefaults=true&delete=true";
+ return "ftps://admin@[::1]:" + getPort() + "/tmp2/camel?password=admin&initialDelay=2000&disableSecureDataChannelDefaults=true&delete=true";
}
@Test
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 a6d3082..8e4ab70 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
@@ -26,7 +26,7 @@ import org.junit.Test;
public class FileToFtpsWithDefaultSettingsTest extends FtpsServerExplicitTLSWithoutClientAuthTestSupport {
private String getFtpUrl() {
- return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=2000&disableSecureDataChannelDefaults=true&delete=true";
+ return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&initialDelay=2000&disableSecureDataChannelDefaults=true&delete=true";
}
@Test
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 f9cd26e..40db73e 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
@@ -34,7 +34,7 @@ public class FileToFtpsWithFtpClientConfigRefTest extends FtpsServerExplicitSSLW
private FTPSClient client1 = new FTPSClient("SSLv3");
private String getFtpUrl(boolean in) {
- return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=2000&ftpClient=#ftpsClient" + (in ? "In" : "")
+ return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&initialDelay=2000&ftpClient=#ftpsClient" + (in ? "In" : "")
+ "&disableSecureDataChannelDefaults=true&delete=true";
}
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 c5d8fea..8bef48d 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
@@ -23,7 +23,7 @@ import org.junit.Test;
public class FromFilePercentSignInPasswordTest extends FtpServerTestSupport {
protected String getFtpUrl() {
- return "ftp://localhost:" + getPort() + "/tmp3/camel?username=us@r&password=t%25st&consumer.initialDelay=3000";
+ return "ftp://localhost:" + getPort() + "/tmp3/camel?username=us@r&password=t%25st&initialDelay=3000";
}
@Test
@@ -40,7 +40,7 @@ public class FromFilePercentSignInPasswordTest extends FtpServerTestSupport {
public void configure() throws Exception {
from(getFtpUrl()).to("mock:result");
- from("file:src/main/data?noop=true&consumer.delay=3000").to(getFtpUrl());
+ from("file:src/main/data?noop=true&delay=3000").to(getFtpUrl());
}
};
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFilePercentSignInPasswordUserInfoEncodedTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFilePercentSignInPasswordUserInfoEncodedTest.java
index 5548a7a..0cf91ec 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFilePercentSignInPasswordUserInfoEncodedTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFilePercentSignInPasswordUserInfoEncodedTest.java
@@ -20,7 +20,7 @@ public class FromFilePercentSignInPasswordUserInfoEncodedTest extends FromFilePe
@Override
protected String getFtpUrl() {
- return "ftp://us%40r:t%25st@localhost:" + getPort() + "/tmp3/camel?consumer.initialDelay=3000";
+ return "ftp://us%40r:t%25st@localhost:" + getPort() + "/tmp3/camel?initialDelay=3000";
}
}
\ No newline at end of file
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFilePercentSignInPasswordUserInfoTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFilePercentSignInPasswordUserInfoTest.java
index ad10110..456c67a 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFilePercentSignInPasswordUserInfoTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFilePercentSignInPasswordUserInfoTest.java
@@ -22,7 +22,7 @@ public class FromFilePercentSignInPasswordUserInfoTest extends FromFilePercentSi
protected String getFtpUrl() {
// the user info is not encoded, but we should be forgiving and allow the user to use
// the user name and password out of the box as is
- return "ftp://us@r:t%st@localhost:" + getPort() + "/tmp3/camel?consumer.initialDelay=3000";
+ return "ftp://us@r:t%st@localhost:" + getPort() + "/tmp3/camel?initialDelay=3000";
}
}
\ No newline at end of file
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileToFtpNotStepwiseTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileToFtpNotStepwiseTest.java
index a90985e..99ceb1d 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileToFtpNotStepwiseTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileToFtpNotStepwiseTest.java
@@ -20,7 +20,7 @@ public class FromFileToFtpNotStepwiseTest extends FromFileToFtpTest {
@Override
protected String getFtpUrl() {
- return "ftp://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=3000&stepwise=false";
+ return "ftp://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&initialDelay=3000&stepwise=false";
}
}
\ No newline at end of file
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 2b4983e..3bf5ff9 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
@@ -23,7 +23,7 @@ import org.junit.Test;
public class FromFileToFtpTest extends FtpServerTestSupport {
protected String getFtpUrl() {
- return "ftp://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=3000";
+ return "ftp://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&initialDelay=3000";
}
@Test
@@ -39,7 +39,7 @@ public class FromFileToFtpTest extends FtpServerTestSupport {
return new RouteBuilder() {
public void configure() throws Exception {
from(getFtpUrl()).to("mock:result");
- from("file:src/main/data?noop=true&consumer.delay=3000").to(getFtpUrl());
+ from("file:src/main/data?noop=true&delay=3000").to(getFtpUrl());
}
};
}
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 cf180d2..2b86289 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
@@ -23,7 +23,7 @@ import org.junit.Test;
public class FromFileToFtpWithChmodTest extends FtpServerTestSupport {
protected String getFtpUrl() {
- return "ftp://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=3000&chmod=777";
+ return "ftp://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&initialDelay=3000&chmod=777";
}
@Test
@@ -39,7 +39,7 @@ public class FromFileToFtpWithChmodTest extends FtpServerTestSupport {
return new RouteBuilder() {
public void configure() throws Exception {
from(getFtpUrl()).to("mock:result");
- from("file:src/main/data?noop=true&consumer.delay=3000").to(getFtpUrl());
+ from("file:src/main/data?noop=true&delay=3000").to(getFtpUrl());
}
};
}
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 f215ead..edd870c 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
@@ -37,7 +37,7 @@ public class FromFtpExclusiveReadNoneStrategyTest extends FtpServerTestSupport {
private String getFtpUrl() {
return "ftp://admin@localhost:" + getPort() + "/slowfile?password=admin"
- + "&readLock=none&consumer.delay=500";
+ + "&readLock=none&delay=500";
}
@Test
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileNotStepwiseTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileNotStepwiseTest.java
index 34a9445..d5a87c1 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileNotStepwiseTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileNotStepwiseTest.java
@@ -24,7 +24,7 @@ public class FromFtpMoveFileNotStepwiseTest extends FromFtpMoveFileTest {
@Override
protected String getFtpUrl() {
return "ftp://admin@localhost:" + getPort() + "/movefile?password=admin&binary=false"
- + "&move=done/sub2/${file:name}.old&consumer.delay=5000&stepwise=false";
+ + "&move=done/sub2/${file:name}.old&delay=5000&stepwise=false";
}
}
\ No newline at end of file
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePostfixNotStepwiseTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePostfixNotStepwiseTest.java
index 040c593..2955b91 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePostfixNotStepwiseTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePostfixNotStepwiseTest.java
@@ -24,7 +24,7 @@ public class FromFtpMoveFilePostfixNotStepwiseTest extends FromFtpMoveFilePostfi
@Override
protected String getFtpUrl() {
return "ftp://admin@localhost:" + getPort() + "/movefile?password=admin&binary=false"
- + "&move=${file:name}.old&consumer.delay=5000&stepwise=false";
+ + "&move=${file:name}.old&delay=5000&stepwise=false";
}
}
\ No newline at end of file
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 7d6269e..3a04d3a 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
@@ -33,7 +33,7 @@ public class FromFtpMoveFilePostfixTest extends FtpServerTestSupport {
protected String getFtpUrl() {
return "ftp://admin@localhost:" + getPort() + "/movefile?password=admin&binary=false"
- + "&move=${file:name}.old&consumer.delay=5000";
+ + "&move=${file:name}.old&delay=5000";
}
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePrefixNotStepwiseTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePrefixNotStepwiseTest.java
index 06e21e1..1c332fc 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePrefixNotStepwiseTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePrefixNotStepwiseTest.java
@@ -23,7 +23,7 @@ public class FromFtpMoveFilePrefixNotStepwiseTest extends FromFtpMoveFilePrefixT
@Override
protected String getFtpUrl() {
- return "ftp://admin@localhost:" + getPort() + "/movefile?password=admin&binary=false&consumer.delay=5000"
+ return "ftp://admin@localhost:" + getPort() + "/movefile?password=admin&binary=false&delay=5000"
+ "&move=done/${file:name}&stepwise=false";
}
}
\ No newline at end of file
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 664c503..8123094 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
@@ -32,7 +32,7 @@ import org.junit.Test;
public class FromFtpMoveFilePrefixTest extends FtpServerTestSupport {
protected String getFtpUrl() {
- return "ftp://admin@localhost:" + getPort() + "/movefile?password=admin&binary=false&consumer.delay=5000"
+ return "ftp://admin@localhost:" + getPort() + "/movefile?password=admin&binary=false&delay=5000"
+ "&move=done/${file:name}";
}
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 2c2581d..5c2d550 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
@@ -33,7 +33,7 @@ public class FromFtpMoveFileTest extends FtpServerTestSupport {
protected String getFtpUrl() {
return "ftp://admin@localhost:" + getPort() + "/movefile?password=admin&binary=false"
- + "&move=done/sub2/${file:name}.old&consumer.delay=5000";
+ + "&move=done/sub2/${file:name}.old&delay=5000";
}
@Override
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 b079cfa..a211559 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
@@ -26,7 +26,7 @@ import org.junit.Test;
public class FromFtpNoFilesTest extends FtpServerTestSupport {
private String getFtpUrl() {
- return "ftp://admin@localhost:" + getPort() + "/slowfile?password=admin&binary=false&readLock=rename&consumer.delay=2000";
+ return "ftp://admin@localhost:" + getPort() + "/slowfile?password=admin&binary=false&readLock=rename&delay=2000";
}
@Test
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 fd9c82d..a95eda9 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
@@ -33,7 +33,7 @@ import org.junit.Test;
public class FromFtpPreMoveFileExpressionTest extends FtpServerTestSupport {
private String getFtpUrl() {
- return "ftp://admin@localhost:" + getPort() + "/movefile?password=admin&binary=false&consumer.delay=5000"
+ return "ftp://admin@localhost:" + getPort() + "/movefile?password=admin&binary=false&delay=5000"
+ "&preMove=../inprogress/${file:name.noext}.bak";
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePrefixNotStepwiseTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePrefixNotStepwiseTest.java
index 8a184e9..54afd34 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePrefixNotStepwiseTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePrefixNotStepwiseTest.java
@@ -23,7 +23,7 @@ public class FromFtpPreMoveFilePrefixNotStepwiseTest extends FromFtpPreMoveFileP
@Override
protected String getFtpUrl() {
- return "ftp://admin@localhost:" + getPort() + "/movefile?password=admin&binary=false&consumer.delay=5000"
+ return "ftp://admin@localhost:" + getPort() + "/movefile?password=admin&binary=false&delay=5000"
+ "&preMove=done/${file:name}&stepwise=false";
}
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 ab608fb..4c99511 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
@@ -32,7 +32,7 @@ import org.junit.Test;
public class FromFtpPreMoveFilePrefixTest extends FtpServerTestSupport {
protected String getFtpUrl() {
- return "ftp://admin@localhost:" + getPort() + "/movefile?password=admin&binary=false&consumer.delay=5000"
+ return "ftp://admin@localhost:" + getPort() + "/movefile?password=admin&binary=false&delay=5000"
+ "&preMove=done/${file:name}";
}
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 e00fd8d..5d2bf26 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
@@ -27,7 +27,7 @@ import org.junit.Test;
public class FromFtpRemoteFileSortByExpressionTest extends FtpServerTestSupport {
private String getFtpUrl() {
- return "ftp://admin@localhost:" + getPort() + "/sortby?password=admin&consumer.delay=5000";
+ return "ftp://admin@localhost:" + getPort() + "/sortby?password=admin&delay=5000";
}
@Override
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 8553af3..e6bec50 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
@@ -27,7 +27,7 @@ import org.junit.Test;
public class FromFtpRemoteFileSortByIgnoreCaseExpressionTest extends FtpServerTestSupport {
private String getFtpUrl() {
- return "ftp://admin@localhost:" + getPort() + "/sortbyignore?password=admin&consumer.delay=5000";
+ return "ftp://admin@localhost:" + getPort() + "/sortbyignore?password=admin&delay=5000";
}
@Override
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 abeea25..813b9a3 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
@@ -27,7 +27,7 @@ import org.junit.Test;
public class FromFtpRemoteFileSortByNestedExpressionTest extends FtpServerTestSupport {
private String getFtpUrl() {
- return "ftp://admin@localhost:" + getPort() + "/sortbynested?password=admin&consumer.delay=5000";
+ return "ftp://admin@localhost:" + getPort() + "/sortbynested?password=admin&delay=5000";
}
@Override
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 a3ea280..c3fdf44 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
@@ -35,7 +35,7 @@ public class FromFtpToBinaryFileTest extends FtpServerTestSupport {
// must user "consumer." prefix on the parameters to the file component
private String getFtpUrl() {
return "ftp://admin@localhost:" + getPort() + "/tmp4/camel?password=admin&binary=true"
- + "&consumer.delay=5000&recursive=false";
+ + "&delay=5000&recursive=false";
}
@Override
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 c93ba6c..1beabe6 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
@@ -35,7 +35,7 @@ public class FromFtpToBinaryFilesTest extends FtpServerTestSupport {
// must user "consumer." prefix on the parameters to the file component
private String getFtpUrl() {
return "ftp://admin@localhost:" + getPort() + "/incoming?password=admin&binary=true"
- + "&consumer.delay=2000&recursive=true";
+ + "&delay=2000&recursive=true";
}
@Override
@@ -69,7 +69,7 @@ public class FromFtpToBinaryFilesTest extends FtpServerTestSupport {
// prepares the FTP Server by creating a file on the server that we want to unit
// test that we can pool and store as a local file
String ftpUrl = "ftp://admin@localhost:" + getPort() + "/incoming?password=admin&binary=true"
- + "&consumer.delay=2000&recursive=false";
+ + "&delay=2000&recursive=false";
Endpoint endpoint = context.getEndpoint(ftpUrl);
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody(IOConverter.toFile("src/test/data/ftpbinarytest/logo.jpeg"));
@@ -80,7 +80,7 @@ public class FromFtpToBinaryFilesTest extends FtpServerTestSupport {
producer.stop();
ftpUrl = "ftp://admin@localhost:" + getPort() + "/incoming/a?password=admin&binary=true"
- + "&consumer.delay=2000&recursive=false";
+ + "&delay=2000&recursive=false";
endpoint = context.getEndpoint(ftpUrl);
exchange = endpoint.createExchange();
exchange.getIn().setBody(IOConverter.toFile("src/test/data/ftpbinarytest/logo1.jpeg"));
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 c5d6741..f1321ef 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
@@ -45,7 +45,7 @@ public class FromFtpToBinarySampleTest extends CamelTestSupport {
// notice that the FTPConsumer properties must be prefixed with "consumer." in the URL
// the delay parameter is from the FileConsumer component so we should use consumer.delay as
// the URI parameter name. The FTP Component is an extension of the File Component.
- from("ftp://tiger:scott@localhost/public/reports?binary=true&consumer.delay=" + delay).
+ from("ftp://tiger:scott@localhost/public/reports?binary=true&delay=" + delay).
to("file://target/test-reports");
}
};
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 0920933..8d9c50b 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
@@ -28,7 +28,7 @@ import org.junit.Test;
public class FtpConsumerBodyAsStringTest extends FtpServerTestSupport {
private String getFtpUrl() {
- return "ftp://admin@localhost:" + getPort() + "/tmp4/camel?password=admin&consumer.delay=5000";
+ return "ftp://admin@localhost:" + getPort() + "/tmp4/camel?password=admin&delay=5000";
}
@Override
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 3392971..22f2f6b 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
@@ -29,7 +29,7 @@ public class FtpConsumerDeleteNoWritePermissionTest extends FtpServerTestSupport
private String getFtpUrl() {
return "ftp://dummy@localhost:" + getPort() + "/deletenoperm?password=foo"
- + "&delete=true&consumer.delay=5000";
+ + "&delete=true&delay=5000";
}
@Override
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 02c7f6b..b75ff6c 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
@@ -30,7 +30,7 @@ import org.junit.Test;
public class FtpConsumerIPV6BodyAsStringTest extends FtpServerTestSupport {
private String getFtpUrl() {
- return "ftp://admin@[::1]:" + getPort() + "/tmp4/camel?password=admin&consumer.delay=5000";
+ return "ftp://admin@[::1]:" + getPort() + "/tmp4/camel?password=admin&delay=5000";
}
@Override
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 7dee799..4e0260c 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
@@ -35,7 +35,7 @@ public class FtpConsumerMoveExpressionTest extends FtpServerTestSupport {
private MyGuidGenerator guid = new MyGuidGenerator();
private String getFtpUrl() {
- return "ftp://admin@localhost:" + getPort() + "/filelanguage?password=admin&consumer.delay=5000";
+ return "ftp://admin@localhost:" + getPort() + "/filelanguage?password=admin&delay=5000";
}
@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 132953e..f19c498 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
@@ -26,7 +26,7 @@ import org.junit.Test;
public class FtpConsumerMultipleDirectoriesTest extends FtpServerTestSupport {
private String getFtpUrl() {
- return "ftp://admin@localhost:" + getPort() + "/multidir/?password=admin&recursive=true&consumer.delay=5000&sortBy=file:path";
+ return "ftp://admin@localhost:" + getPort() + "/multidir/?password=admin&recursive=true&delay=5000&sortBy=file:path";
}
@Override
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 cac9949..d8c1aef 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
@@ -29,7 +29,7 @@ import org.junit.Test;
public class FtpConsumerWithNoFileOptionTest extends FtpServerTestSupport {
private String getFtpUrl() {
- return "ftp://admin@localhost:" + getPort() + "?password=admin&consumer.delay=5000";
+ return "ftp://admin@localhost:" + getPort() + "?password=admin&delay=5000";
}
@Override
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 675c0fc..3a914bc 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
@@ -32,7 +32,7 @@ public class FtpPollEnrichBridgeErrorHandlerTest extends BaseServerTestSupport {
// and turn of auto create as that will pre-login to check if the directory exists
// and in case of connection error then throw that as an exception
private String uri = "ftp://admin@localhost:" + getPort() + "/unknown/?password=admin"
- + "&maximumReconnectAttempts=0&autoCreate=false&throwExceptionOnConnectFailed=true&consumer.bridgeErrorHandler=true";
+ + "&maximumReconnectAttempts=0&autoCreate=false&throwExceptionOnConnectFailed=true&bridgeErrorHandler=true";
@Test
public void testPollEnrich() throws Exception {
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 f5be253..aac5c3b 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
@@ -23,7 +23,7 @@ import org.junit.Test;
public class FtpProducerConnectErrorsHeaderTest extends FtpServerTestSupport {
private String getFtpUrl() {
- return "ftp://xxx@localhost:" + getPort() + "/tmp4/camel?password=xxx&consumer.delay=5000";
+ return "ftp://xxx@localhost:" + getPort() + "/tmp4/camel?password=xxx&delay=5000";
}
@Test
diff --git a/components/camel-linkedin/camel-linkedin-component/src/main/docs/linkedin-component.adoc b/components/camel-linkedin/camel-linkedin-component/src/main/docs/linkedin-component.adoc
index 8715e0c..1d783a7 100644
--- a/components/camel-linkedin/camel-linkedin-component/src/main/docs/linkedin-component.adoc
+++ b/components/camel-linkedin/camel-linkedin-component/src/main/docs/linkedin-component.adoc
@@ -714,7 +714,7 @@ The following route polls user's connections every 30 seconds:
[source,java]
-------------------------------------------------------------------------------------
- from("linkedin://people/connections?consumer.timeUnit=SECONDS&consumer.delay=30")
+ from("linkedin://people/connections?consumer.timeUnit=SECONDS&delay=30")
.to("bean:foo");
-------------------------------------------------------------------------------------
diff --git a/components/camel-mail/src/main/docs/mail-component.adoc b/components/camel-mail/src/main/docs/mail-component.adoc
index 4bc14bd..22c4080 100644
--- a/components/camel-mail/src/main/docs/mail-component.adoc
+++ b/components/camel-mail/src/main/docs/mail-component.adoc
@@ -500,7 +500,7 @@ interval, `consumer.delay`, as 60000 milliseconds = 60 seconds.
[source,java]
-------------------------------------------------------
from("imap://admin@mymailserver.com
- password=secret&unseen=true&consumer.delay=60000")
+ password=secret&unseen=true&delay=60000")
.to("seda://mails");
-------------------------------------------------------
@@ -537,7 +537,7 @@ extensive documentation on how to do this.
[source,java]
-------------------------------------------------------------------------------------
from("imaps://imap.gmail.com?username=YOUR_USERNAME@gmail.com&password=YOUR_PASSWORD"
- + "&delete=false&unseen=true&consumer.delay=60000").to("log:newmail");
+ + "&delete=false&unseen=true&delay=60000").to("log:newmail");
-------------------------------------------------------------------------------------
The preceding route polls the Google mail inbox for new mails once every
@@ -565,7 +565,7 @@ SSL sample:
[source,java]
---------------------------------------------------------------------------------------
from("imaps://imap.gmail.com?username=YOUR_USERNAME@gmail.com&password=YOUR_PASSWORD"
- + "&delete=false&unseen=true&consumer.delay=60000").process(new MyMailProcessor());
+ + "&delete=false&unseen=true&delay=60000").process(new MyMailProcessor());
---------------------------------------------------------------------------------------
Instead of logging the mail we use a processor where we can process the
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/AdditionalMailPropertiesTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/AdditionalMailPropertiesTest.java
index a30ea65..66df506 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/AdditionalMailPropertiesTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/AdditionalMailPropertiesTest.java
@@ -34,7 +34,7 @@ public class AdditionalMailPropertiesTest extends CamelTestSupport {
// clear mailbox
Mailbox.clearAll();
- MailEndpoint endpoint = context.getEndpoint("pop3://localhost?username=james&mail.pop3.forgettopheaders=true&consumer.initialDelay=100&consumer.delay=100", MailEndpoint.class);
+ MailEndpoint endpoint = context.getEndpoint("pop3://localhost?username=james&mail.pop3.forgettopheaders=true&initialDelay=100&delay=100", MailEndpoint.class);
Properties prop = endpoint.getConfiguration().getAdditionalJavaMailProperties();
assertEquals("true", prop.get("mail.pop3.forgettopheaders"));
}
@@ -59,7 +59,7 @@ public class AdditionalMailPropertiesTest extends CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("pop3://james@localhost?mail.pop3.forgettopheaders=true&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
+ from("pop3://james@localhost?mail.pop3.forgettopheaders=true&initialDelay=100&delay=100").to("mock:result");
}
};
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/FromFileSendMailTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/FromFileSendMailTest.java
index b42350e..97d67f5 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/FromFileSendMailTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/FromFileSendMailTest.java
@@ -51,11 +51,11 @@ public class FromFileSendMailTest extends CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("file://target/mailtext?consumer.initialDelay=100&consumer.delay=100")
+ from("file://target/mailtext?initialDelay=100&delay=100")
.setHeader("Subject", constant("Hello World"))
.setHeader("To", constant("james@localhost"))
.setHeader("From", constant("claus@localhost"))
- .to("smtp://localhost?password=secret&username=claus&consumer.initialDelay=100&consumer.delay=100", "mock:result");
+ .to("smtp://localhost?password=secret&username=claus&initialDelay=100&delay=100", "mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentDuplicateNamesTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentDuplicateNamesTest.java
index 3c79550..dc86fe5 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentDuplicateNamesTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentDuplicateNamesTest.java
@@ -91,7 +91,7 @@ public class MailAttachmentDuplicateNamesTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://james@mymailserver.com?password=secret&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
+ from("pop3://james@mymailserver.com?password=secret&initialDelay=100&delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java
index 8b82bf9..300a6b7 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java
@@ -100,7 +100,7 @@ public class MailAttachmentRedeliveryTest extends CamelTestSupport {
public void configure() throws Exception {
onException(IllegalArgumentException.class).maximumRedeliveries(3).redeliveryDelay(0);
- from("pop3://james@mymailserver.com?password=secret&consumer.initialDelay=100&consumer.delay=100")
+ from("pop3://james@mymailserver.com?password=secret&initialDelay=100&delay=100")
.process(new Processor() {
private int counter;
@Override
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java
index 7700349..242cd85 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java
@@ -99,7 +99,7 @@ public class MailAttachmentTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://james@mymailserver.com?password=secret&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
+ from("pop3://james@mymailserver.com?password=secret&initialDelay=100&delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentsUmlautIssueTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentsUmlautIssueTest.java
index 2cf703b..08a26dc 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentsUmlautIssueTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentsUmlautIssueTest.java
@@ -96,7 +96,7 @@ public class MailAttachmentsUmlautIssueTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://james@mymailserver.com?password=secret&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
+ from("pop3://james@mymailserver.com?password=secret&initialDelay=100&delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailBatchConsumerTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailBatchConsumerTest.java
index 539643e..33f8a03 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailBatchConsumerTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailBatchConsumerTest.java
@@ -89,7 +89,7 @@ public class MailBatchConsumerTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://jones@localhost?password=secret&consumer.initialDelay=100&consumer.delay=100"
+ from("pop3://jones@localhost?password=secret&initialDelay=100&delay=100"
+ "&delete=true").to("mock:result");
}
};
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCollectionHeaderTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCollectionHeaderTest.java
index 6f39de5..baf376f 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCollectionHeaderTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCollectionHeaderTest.java
@@ -53,7 +53,7 @@ public class MailCollectionHeaderTest extends CamelTestSupport {
public void configure() throws Exception {
from("direct:a").to("smtp://localhost?username=james@localhost");
- from("pop3://localhost?username=james&password=secret&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
+ from("pop3://localhost?username=james&password=secret&initialDelay=100&delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCommitOnCompletionTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCommitOnCompletionTest.java
index 2fff6aa..97c8cbc 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCommitOnCompletionTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCommitOnCompletionTest.java
@@ -82,7 +82,7 @@ public class MailCommitOnCompletionTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://jones@localhost?password=secret&delete=true&consumer.initialDelay=100&consumer.delay=100")
+ from("pop3://jones@localhost?password=secret&delete=true&initialDelay=100&delay=100")
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
// now f*** up and create a new OUT Message (without propagating the IN message)
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerIdleMessageTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerIdleMessageTest.java
index 7a0db19..866d827 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerIdleMessageTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerIdleMessageTest.java
@@ -41,7 +41,7 @@ public class MailConsumerIdleMessageTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("pop3://james@localhost?password=foo&consumer.initialDelay=100&consumer.delay=100&sendEmptyMessageWhenIdle=true")
+ from("pop3://james@localhost?password=foo&initialDelay=100&delay=100&sendEmptyMessageWhenIdle=true")
.to("mock:result");
}
};
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerUnsupportedCharsetTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerUnsupportedCharsetTest.java
index ebad2ab..bd0e28f 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerUnsupportedCharsetTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerUnsupportedCharsetTest.java
@@ -66,7 +66,7 @@ public class MailConsumerUnsupportedCharsetTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://jones@localhost?password=secret&consumer.initialDelay=100&consumer.delay=100&ignoreUnsupportedCharset=true").to("mock:result");
+ from("pop3://jones@localhost?password=secret&initialDelay=100&delay=100&ignoreUnsupportedCharset=true").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeResolverTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeResolverTest.java
index e6639f5..d2506b8 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeResolverTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeResolverTest.java
@@ -94,7 +94,7 @@ public class MailContentTypeResolverTest extends CamelTestSupport {
}
});
- from("pop3://james@mymailserver.com?password=secret&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
+ from("pop3://james@mymailserver.com?password=secret&initialDelay=100&delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConvertersTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConvertersTest.java
index 48cabf4..25061a9 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConvertersTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConvertersTest.java
@@ -152,7 +152,7 @@ public class MailConvertersTest extends CamelTestSupport {
public void configure() throws Exception {
from("direct:a").to("smtp://localhost?username=james@localhost");
- from("pop3://localhost?username=james&password=secret&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
+ from("pop3://localhost?username=james&password=secret&initialDelay=100&delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCopyToTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCopyToTest.java
index a1749d2..f37f008 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCopyToTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCopyToTest.java
@@ -78,7 +78,7 @@ public class MailCopyToTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("imap://jones@localhost?password=secret©To=backup&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
+ from("imap://jones@localhost?password=secret©To=backup&initialDelay=100&delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDisconnectTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDisconnectTest.java
index 7aef573..a2f4ebb 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDisconnectTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDisconnectTest.java
@@ -51,7 +51,7 @@ public class MailDisconnectTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://jones@localhost?password=secret&disconnect=true&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
+ from("pop3://jones@localhost?password=secret&disconnect=true&initialDelay=100&delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDoNotDeleteIfProcessFailsTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDoNotDeleteIfProcessFailsTest.java
index 70239a4..80ccfcf 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDoNotDeleteIfProcessFailsTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDoNotDeleteIfProcessFailsTest.java
@@ -86,7 +86,7 @@ public class MailDoNotDeleteIfProcessFailsTest extends CamelTestSupport {
// no redelivery for unit test as we want it to be polled next time
onException(IllegalArgumentException.class).to("mock:error");
- from("imap://localhost?username=claus&password=secret&unseen=true&consumer.initialDelay=100&consumer.delay=100")
+ from("imap://localhost?username=claus&password=secret&unseen=true&initialDelay=100&delay=100")
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
counter++;
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeTest.java
index 6bcfd46..0174b40 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeTest.java
@@ -97,7 +97,7 @@ public class MailFetchSizeTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://jones@localhost?password=secret&fetchSize=2&consumer.delay=2000"
+ from("pop3://jones@localhost?password=secret&fetchSize=2&delay=2000"
+ "&delete=true").to("mock:result");
}
};
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeZeroTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeZeroTest.java
index 7f46a53..9396a58 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeZeroTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeZeroTest.java
@@ -79,7 +79,7 @@ public class MailFetchSizeZeroTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://bill@localhost?password=secret&fetchSize=0&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
+ from("pop3://bill@localhost?password=secret&fetchSize=0&initialDelay=100&delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHeaderOverrulePreConfigurationRecipientsTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHeaderOverrulePreConfigurationRecipientsTest.java
index 0a56765..9c2e8d8 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHeaderOverrulePreConfigurationRecipientsTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHeaderOverrulePreConfigurationRecipientsTest.java
@@ -55,7 +55,7 @@ public class MailHeaderOverrulePreConfigurationRecipientsTest extends CamelTestS
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://claus@localhost?to=someone@outhere.com&cc=none@world.com&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
+ from("pop3://claus@localhost?to=someone@outhere.com&cc=none@world.com&initialDelay=100&delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java
index 38ec468..17c7290 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java
@@ -99,7 +99,7 @@ public class MailHtmlAttachmentTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://james@mymailserver.com?password=secret&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
+ from("pop3://james@mymailserver.com?password=secret&initialDelay=100&delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateNotRemoveTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateNotRemoveTest.java
index e369e0b..8e49f35 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateNotRemoveTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateNotRemoveTest.java
@@ -52,7 +52,7 @@ public class MailIdempotentRepositoryDuplicateNotRemoveTest extends MailIdempote
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("imap://jones@localhost?password=secret&idempotentRepository=#myRepo&idempotentRepositoryRemoveOnCommit=false&consumer.initialDelay=100&consumer.delay=100")
+ from("imap://jones@localhost?password=secret&idempotentRepository=#myRepo&idempotentRepositoryRemoveOnCommit=false&initialDelay=100&delay=100")
.routeId("foo").noAutoStartup()
.to("mock:result");
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateTest.java
index af015a0..ad2cf36 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateTest.java
@@ -94,7 +94,7 @@ public class MailIdempotentRepositoryDuplicateTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("imap://jones@localhost?password=secret&idempotentRepository=#myRepo&consumer.initialDelay=100&consumer.delay=100").routeId("foo").noAutoStartup()
+ from("imap://jones@localhost?password=secret&idempotentRepository=#myRepo&initialDelay=100&delay=100").routeId("foo").noAutoStartup()
.to("mock:result");
}
};
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryTest.java
index 00de672..99dbf06 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryTest.java
@@ -90,7 +90,7 @@ public class MailIdempotentRepositoryTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("imap://jones@localhost?password=secret&idempotentRepository=#myRepo&consumer.initialDelay=100&consumer.delay=100").routeId("foo").noAutoStartup()
+ from("imap://jones@localhost?password=secret&idempotentRepository=#myRepo&initialDelay=100&delay=100").routeId("foo").noAutoStartup()
.to("mock:result");
}
};
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMaxMessagesPerPollTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMaxMessagesPerPollTest.java
index 46a7a9e..19f2e24 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMaxMessagesPerPollTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMaxMessagesPerPollTest.java
@@ -86,7 +86,7 @@ public class MailMaxMessagesPerPollTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://jones@localhost?password=secret&consumer.initialDelay=100&consumer.delay=100&maxMessagesPerPoll=3"
+ from("pop3://jones@localhost?password=secret&initialDelay=100&delay=100&maxMessagesPerPoll=3"
+ "&delete=true").to("mock:result");
}
};
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMimeDecodeHeadersTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMimeDecodeHeadersTest.java
index 1351fd1..fb4fd55 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMimeDecodeHeadersTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMimeDecodeHeadersTest.java
@@ -97,10 +97,10 @@ public class MailMimeDecodeHeadersTest extends CamelTestSupport {
.setHeader("subject", constant(nonAsciiSubject))
.to("smtp://plain@localhost", "smtp://decoded@localhost");
- from("pop3://localhost?username=plain&password=secret&consumer.initialDelay=100&consumer.delay=100")
+ from("pop3://localhost?username=plain&password=secret&initialDelay=100&delay=100")
.to("mock:plain");
- from("pop3://localhost?username=decoded&password=secret&consumer.initialDelay=100&consumer.delay=100&mimeDecodeHeaders=true")
+ from("pop3://localhost?username=decoded&password=secret&initialDelay=100&delay=100&mimeDecodeHeaders=true")
.to("mock:decoded");
}
};
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java
index f547254..3def2ff 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java
@@ -78,13 +78,13 @@ public class MailMultipleRecipientsTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://claus@localhost?consumer.initialDelay=100&consumer.delay=100").to("mock:claus");
+ from("pop3://claus@localhost?initialDelay=100&delay=100").to("mock:claus");
- from("pop3://willem@localhost?consumer.initialDelay=100&consumer.delay=100").to("mock:willem");
+ from("pop3://willem@localhost?initialDelay=100&delay=100").to("mock:willem");
- from("pop3://hadrian@localhost?consumer.initialDelay=100&consumer.delay=100").to("mock:hadrian");
+ from("pop3://hadrian@localhost?initialDelay=100&delay=100").to("mock:hadrian");
- from("pop3://tracy@localhost?consumer.initialDelay=100&consumer.delay=100").to("mock:tracy");
+ from("pop3://tracy@localhost?initialDelay=100&delay=100").to("mock:tracy");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNameAndEmailInRecipientTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNameAndEmailInRecipientTest.java
index fcd62f1..f07a5a1 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNameAndEmailInRecipientTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNameAndEmailInRecipientTest.java
@@ -56,9 +56,9 @@ public class MailNameAndEmailInRecipientTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://davsclaus@localhost?consumer.initialDelay=100&consumer.delay=100").to("mock:davsclaus");
+ from("pop3://davsclaus@localhost?initialDelay=100&delay=100").to("mock:davsclaus");
- from("pop3://jstrachan@localhost?consumer.initialDelay=100&consumer.delay=100").to("mock:jstrachan");
+ from("pop3://jstrachan@localhost?initialDelay=100&delay=100").to("mock:jstrachan");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichNoMailTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichNoMailTest.java
index 21e1586..84a55aa 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichNoMailTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichNoMailTest.java
@@ -73,7 +73,7 @@ public class MailPollEnrichNoMailTest extends CamelTestSupport {
return new RouteBuilder() {
public void configure() throws Exception {
from("direct:start")
- .pollEnrich("pop3://bill@localhost?password=secret&consumer.initialDelay=100&consumer.delay=100", 0)
+ .pollEnrich("pop3://bill@localhost?password=secret&initialDelay=100&delay=100", 0)
.to("log:mail", "mock:result");
}
};
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichTest.java
index a878242..46b9952 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichTest.java
@@ -91,7 +91,7 @@ public class MailPollEnrichTest extends CamelTestSupport {
return new RouteBuilder() {
public void configure() throws Exception {
from("direct:start")
- .pollEnrich("pop3://bill@localhost?password=secret&consumer.initialDelay=100&consumer.delay=100", 5000)
+ .pollEnrich("pop3://bill@localhost?password=secret&initialDelay=100&delay=100", 5000)
.to("log:mail", "mock:result");
}
};
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPostProcessActionTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPostProcessActionTest.java
index 7fde918..d411946 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPostProcessActionTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPostProcessActionTest.java
@@ -96,7 +96,7 @@ public class MailPostProcessActionTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://bill@localhost?password=secret&postProcessAction=#postProcessAction&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
+ from("pop3://bill@localhost?password=secret&postProcessAction=#postProcessAction&initialDelay=100&delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProcessOnlyUnseenMessagesTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProcessOnlyUnseenMessagesTest.java
index ccb561b..5397133 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProcessOnlyUnseenMessagesTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProcessOnlyUnseenMessagesTest.java
@@ -89,7 +89,7 @@ public class MailProcessOnlyUnseenMessagesTest extends CamelTestSupport {
public void configure() throws Exception {
from("direct:a").to("smtp://claus@localhost");
- from("imap://localhost?username=claus&password=secret&unseen=true&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
+ from("imap://localhost?username=claus&password=secret&unseen=true&initialDelay=100&delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java
index a366b4a..be6edf0 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java
@@ -41,7 +41,7 @@ public class MailProducerUnsupportedCharsetTest extends CamelTestSupport {
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("pop3://jones@localhost?password=secret&consumer.initialDelay=100&consumer.delay=100&ignoreUnsupportedCharset=true").to("mock:result");
+ from("pop3://jones@localhost?password=secret&initialDelay=100&delay=100&ignoreUnsupportedCharset=true").to("mock:result");
}
});
context.start();
@@ -70,7 +70,7 @@ public class MailProducerUnsupportedCharsetTest extends CamelTestSupport {
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("pop3://jones@localhost?password=secret&consumer.initialDelay=100&consumer.delay=100&ignoreUnsupportedCharset=false").to("mock:result");
+ from("pop3://jones@localhost?password=secret&initialDelay=100&delay=100&ignoreUnsupportedCharset=false").to("mock:result");
}
});
context.start();
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailReplyToTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailReplyToTest.java
index 906cb16..867e145 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailReplyToTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailReplyToTest.java
@@ -83,7 +83,7 @@ public class MailReplyToTest extends CamelTestSupport {
from("direct:b")
.to("smtp://christian@localhost?subject=Camel&replyTo=noReply1@localhost,noReply2@localhost");
- from("pop3://localhost?username=christian&password=secret&consumer.initialDelay=100&consumer.delay=100")
+ from("pop3://localhost?username=christian&password=secret&initialDelay=100&delay=100")
.to("mock:result");
}
};
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java
index e7fc34e..427c8f4 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java
@@ -111,7 +111,7 @@ public class MailRouteTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("pop3://route-test-james@localhost?consumer.initialDelay=100&consumer.delay=100").to("direct:a");
+ from("pop3://route-test-james@localhost?initialDelay=100&delay=100").to("direct:a");
// must use fixed to option to send the mail to the given
// reciever, as we have polled
@@ -124,7 +124,7 @@ public class MailRouteTest extends CamelTestSupport {
.setHeader("to", constant("route-test-result@localhost; route-test-copy@localhost"))
.to("smtp://localhost");
- from("pop3://route-test-result@localhost?consumer.initialDelay=100&consumer.delay=100").convertBodyTo(String.class)
+ from("pop3://route-test-result@localhost?initialDelay=100&delay=100").convertBodyTo(String.class)
.to("mock:result");
}
};
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermTest.java
index ae696cd..2418169 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermTest.java
@@ -120,7 +120,7 @@ public class MailSearchTermTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://bill@localhost?password=secret&searchTerm=#myTerm&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
+ from("pop3://bill@localhost?password=secret&searchTerm=#myTerm&initialDelay=100&delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigLast24HoursTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigLast24HoursTest.java
index dd2031f..e3d13da 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigLast24HoursTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigLast24HoursTest.java
@@ -119,7 +119,7 @@ public class MailSearchTermUriConfigLast24HoursTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://bill@localhost?password=secret&searchTerm.fromSentDate=now-24h&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
+ from("pop3://bill@localhost?password=secret&searchTerm.fromSentDate=now-24h&initialDelay=100&delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigTest.java
index 8374330..5f45dd2 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigTest.java
@@ -104,7 +104,7 @@ public class MailSearchTermUriConfigTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://bill@localhost?password=secret&searchTerm.subjectOrBody=Camel&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
+ from("pop3://bill@localhost?password=secret&searchTerm.subjectOrBody=Camel&initialDelay=100&delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteAllTasksTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteAllTasksTest.java
index 8e670d6..68c8c03 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteAllTasksTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteAllTasksTest.java
@@ -53,7 +53,7 @@ public class MailShutdownCompleteAllTasksTest extends CamelTestSupport {
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("pop3://jones@localhost?password=secret&consumer.initialDelay=100&consumer.delay=100").routeId("route1")
+ from("pop3://jones@localhost?password=secret&initialDelay=100&delay=100").routeId("route1")
// let it complete all tasks during shutdown
.shutdownRunningTask(ShutdownRunningTask.CompleteAllTasks)
.delay(500).to("mock:bar");
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteCurrentTaskOnlyTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteCurrentTaskOnlyTest.java
index 77f353c..a10da51 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteCurrentTaskOnlyTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteCurrentTaskOnlyTest.java
@@ -83,7 +83,7 @@ public class MailShutdownCompleteCurrentTaskOnlyTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://jones@localhost?password=secret&consumer.initialDelay=100&consumer.delay=100").routeId("route1")
+ from("pop3://jones@localhost?password=secret&initialDelay=100&delay=100").routeId("route1")
// let it complete only current task so we shutdown faster
.shutdownRunningTask(ShutdownRunningTask.CompleteCurrentTaskOnly)
.delay(1000).to("seda:foo");
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTest.java
index 0e35d14..5fc38c8 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTest.java
@@ -111,7 +111,7 @@ public class MailSortTermTest extends CamelTestSupport {
public void configure() throws Exception {
context.setAutoStartup(false);
- from("pop3://bill@localhost?password=secret&searchTerm=#searchTerm&sortTerm=#sortAscendingDate&consumer.initialDelay=100&consumer.delay=100")
+ from("pop3://bill@localhost?password=secret&searchTerm=#searchTerm&sortTerm=#sortAscendingDate&initialDelay=100&delay=100")
.to("mock:resultAscending");
}
};
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermThreeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermThreeTest.java
index 915ee2d..c62c7ec 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermThreeTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermThreeTest.java
@@ -111,7 +111,7 @@ public class MailSortTermThreeTest extends CamelTestSupport {
public void configure() throws Exception {
context.setAutoStartup(false);
- from("imap://bill@localhost?password=secret&sortTerm=#sortDescendingDate&consumer.initialDelay=100&consumer.delay=100").to("mock:resultDescendingImap");
+ from("imap://bill@localhost?password=secret&sortTerm=#sortDescendingDate&initialDelay=100&delay=100").to("mock:resultDescendingImap");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTwoTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTwoTest.java
index 237f1e5..604b5c8 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTwoTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTwoTest.java
@@ -111,7 +111,7 @@ public class MailSortTermTwoTest extends CamelTestSupport {
public void configure() throws Exception {
context.setAutoStartup(false);
- from("pop3://bill@localhost?password=secret&sortTerm=#sortDescendingDate&consumer.initialDelay=100&consumer.delay=100").to("mock:resultDescending");
+ from("pop3://bill@localhost?password=secret&sortTerm=#sortDescendingDate&initialDelay=100&delay=100").to("mock:resultDescending");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSplitAttachmentsTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSplitAttachmentsTest.java
index d824bcc..1357e85 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSplitAttachmentsTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSplitAttachmentsTest.java
@@ -93,7 +93,7 @@ public class MailSplitAttachmentsTest extends CamelTestSupport {
@Override
public void configure() throws Exception {
// START SNIPPET: e1
- from("pop3://james@mymailserver.com?password=secret&consumer.initialDelay=100&consumer.delay=100")
+ from("pop3://james@mymailserver.com?password=secret&initialDelay=100&delay=100")
.to("log:email")
// use the SplitAttachmentsExpression which will split the message per attachment
.split(splitAttachmentsExpression)
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSubjectTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSubjectTest.java
index 4c881f1..594bd51 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSubjectTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSubjectTest.java
@@ -55,7 +55,7 @@ public class MailSubjectTest extends CamelTestSupport {
from("direct:a").setHeader("subject", constant(subject)).to("smtp://james2@localhost");
// END SNIPPET: e1
- from("pop3://localhost?username=james2&password=secret&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
+ from("pop3://localhost?username=james2&password=secret&initialDelay=100&delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsernameWithAtSignTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsernameWithAtSignTest.java
index adf34e0..cbadd91 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsernameWithAtSignTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsernameWithAtSignTest.java
@@ -46,7 +46,7 @@ public class MailUsernameWithAtSignTest extends CamelTestSupport {
public void configure() throws Exception {
from("direct:a").to("smtp://localhost?username=james@localhost");
- from("pop3://localhost?username=james&password=secret&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
+ from("pop3://localhost?username=james&password=secret&initialDelay=100&delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingCustomSessionTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingCustomSessionTest.java
index 6f34be3..f40c001 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingCustomSessionTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingCustomSessionTest.java
@@ -80,7 +80,7 @@ public class MailUsingCustomSessionTest extends CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("pop3://james@localhost?session=#myCustomMailSession&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
+ from("pop3://james@localhost?session=#myCustomMailSession&initialDelay=100&delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMessageConsumeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMessageConsumeTest.java
index f171b66..5150624 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMessageConsumeTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMessageConsumeTest.java
@@ -133,8 +133,8 @@ public class MimeMessageConsumeTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("pop3://james3@localhost?consumer.initialDelay=100&consumer.delay=100").removeHeader("to").to("smtp://james4@localhost");
- from("pop3://james4@localhost?consumer.initialDelay=200&consumer.delay=100").convertBodyTo(String.class).to("mock:result");
+ from("pop3://james3@localhost?initialDelay=100&delay=100").removeHeader("to").to("smtp://james4@localhost");
+ from("pop3://james4@localhost?initialDelay=200&delay=100").convertBodyTo(String.class).to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java
index c781b0f..34def5a 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java
@@ -98,7 +98,7 @@ public class MimeMultipartAlternativeTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://ryan@mymailserver.com?password=secret&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
+ from("pop3://ryan@mymailserver.com?password=secret&initialDelay=100&delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithContentTypeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithContentTypeTest.java
index e3eec28..52f6c0e 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithContentTypeTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithContentTypeTest.java
@@ -84,7 +84,7 @@ public class MimeMultipartAlternativeWithContentTypeTest extends CamelTestSuppor
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://sachin@mymailserver.com?password=secret&consumer.initialDelay=100&consumer.delay=100&contentType=text/html; charset=UTF-8").to("mock:result");
+ from("pop3://sachin@mymailserver.com?password=secret&initialDelay=100&delay=100&contentType=text/html; charset=UTF-8").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithLongerFilenameTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithLongerFilenameTest.java
index 1fa0ce9..9ffdbc3 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithLongerFilenameTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithLongerFilenameTest.java
@@ -98,7 +98,7 @@ public class MimeMultipartAlternativeWithLongerFilenameTest extends CamelTestSup
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("pop3://ryan@mymailserver.com?password=secret&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
+ from("pop3://ryan@mymailserver.com?password=secret&initialDelay=100&delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MultipleDestinationConsumeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MultipleDestinationConsumeTest.java
index 6ab0885..fe09d67 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MultipleDestinationConsumeTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MultipleDestinationConsumeTest.java
@@ -109,7 +109,7 @@ public class MultipleDestinationConsumeTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("pop3://james@localhost?password=foo&consumer.initialDelay=100&consumer.delay=100").to("mock:result");
+ from("pop3://james@localhost?password=foo&initialDelay=100&delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/NestedMimeMessageConsumeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/NestedMimeMessageConsumeTest.java
index 323e074..5a27ffd 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/NestedMimeMessageConsumeTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/NestedMimeMessageConsumeTest.java
@@ -91,8 +91,8 @@ public class NestedMimeMessageConsumeTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("pop3://james3@localhost?consumer.initialDelay=100&consumer.delay=100").removeHeader("to").to("smtp://james4@localhost");
- from("pop3://james4@localhost?consumer.initialDelay=200&consumer.delay=100").convertBodyTo(String.class).to("mock:result");
+ from("pop3://james3@localhost?initialDelay=100&delay=100").removeHeader("to").to("smtp://james4@localhost");
+ from("pop3://james4@localhost?initialDelay=200&delay=100").convertBodyTo(String.class).to("mock:result");
}
};
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java
index 3078531..6372bb0 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java
@@ -156,16 +156,16 @@ public class RawMailMessageTest extends CamelTestSupport {
public void configure() throws Exception {
from("pop3://davsclaus@apache.org").to("mock:mail");
- from("pop3://jonesRawPop3@localhost?password=secret&consumer.initialDelay=100&consumer.delay=100&delete=true&mapMailMessage=false")
+ from("pop3://jonesRawPop3@localhost?password=secret&initialDelay=100&delay=100&delete=true&mapMailMessage=false")
.to("mock://rawMessagePop3");
- from("imap://jonesRawImap@localhost?password=secret&consumer.initialDelay=100&consumer.delay=100&delete=true&mapMailMessage=false")
+ from("imap://jonesRawImap@localhost?password=secret&initialDelay=100&delay=100&delete=true&mapMailMessage=false")
.to("mock://rawMessageImap");
- from("pop3://jonesPop3@localhost?password=secret&consumer.initialDelay=100&consumer.delay=100&delete=true")
+ from("pop3://jonesPop3@localhost?password=secret&initialDelay=100&delay=100&delete=true")
.to("mock://normalMessagePop3");
- from("imap://jonesImap@localhost?password=secret&consumer.initialDelay=100&consumer.delay=100&delete=true")
+ from("imap://jonesImap@localhost?password=secret&initialDelay=100&delay=100&delete=true")
.to("mock://normalMessageImap");
}
};
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/SslContextParametersMailRouteTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/SslContextParametersMailRouteTest.java
index 097c859..0cefbe9 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/SslContextParametersMailRouteTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/SslContextParametersMailRouteTest.java
@@ -55,7 +55,7 @@ public class SslContextParametersMailRouteTest extends CamelTestSupport {
public void configure() {
from("imaps://" + imapHost + "?username=" + username + "&password=" + password
- + "&delete=false&unseen=true&fetchSize=1&consumer.useFixedDelay=true&consumer.initialDelay=100&consumer.delay=100").to("mock:in");
+ + "&delete=false&unseen=true&fetchSize=1&consumer.useFixedDelay=true&initialDelay=100&delay=100").to("mock:in");
from("direct:in").to("smtps://" + smtpHost + "?username=" + username + "&password=" + password);
}
diff --git a/components/camel-mail/src/test/resources/org/apache/camel/component/mail/SpringMailSplitAttachmentsTest.xml b/components/camel-mail/src/test/resources/org/apache/camel/component/mail/SpringMailSplitAttachmentsTest.xml
index 06eb1b5..5905c72 100644
--- a/components/camel-mail/src/test/resources/org/apache/camel/component/mail/SpringMailSplitAttachmentsTest.xml
+++ b/components/camel-mail/src/test/resources/org/apache/camel/component/mail/SpringMailSplitAttachmentsTest.xml
@@ -28,7 +28,7 @@
<camelContext xmlns="http://camel.apache.org/schema/spring">
<route>
- <from uri="pop3://james@mymailserver.com?password=secret&consumer.initialDelay=100&consumer.delay=100"/>
+ <from uri="pop3://james@mymailserver.com?password=secret&initialDelay=100&delay=100"/>
<to uri="log:email"/>
<split>
<ref>splitAttachments</ref>
diff --git a/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc b/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc
index a22535f..2a4d460 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc
+++ b/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc
@@ -330,6 +330,6 @@ consumer endpoint will produce an *ODataFeed* value the first time, and
[source,java]
---------------------------------------------------------------------------------------------------------
-from("olingo2://read/Manufacturers?queryParams=#paramsBean&consumer.timeUnit=SECONDS&consumer.delay=30")
+from("olingo2://read/Manufacturers?queryParams=#paramsBean&consumer.timeUnit=SECONDS&delay=30")
.to("bean:blah");
---------------------------------------------------------------------------------------------------------
diff --git a/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2ComponentConsumerTest.java b/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2ComponentConsumerTest.java
index c817b1d..9226c57 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2ComponentConsumerTest.java
+++ b/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2ComponentConsumerTest.java
@@ -88,7 +88,7 @@ public class Olingo2ComponentConsumerTest extends AbstractOlingo2TestSupport {
RouteBuilder builder = new RouteBuilder() {
public void configure() {
- from("olingo2://read/Manufacturers?filterAlreadySeen=true&" + "consumer.delay=2&consumer.sendEmptyMessageWhenIdle=true&" + "consumer.splitResult=false")
+ from("olingo2://read/Manufacturers?filterAlreadySeen=true&" + "delay=2&consumer.sendEmptyMessageWhenIdle=true&" + "consumer.splitResult=false")
.to("mock:consumer-alreadyseen");
};
};
@@ -138,7 +138,7 @@ public class Olingo2ComponentConsumerTest extends AbstractOlingo2TestSupport {
RouteBuilder builder = new RouteBuilder() {
public void configure() {
- from("olingo2://read/Manufacturers?filterAlreadySeen=true&" + "consumer.delay=2&consumer.sendEmptyMessageWhenIdle=false&" + "consumer.splitResult=false")
+ from("olingo2://read/Manufacturers?filterAlreadySeen=true&" + "delay=2&consumer.sendEmptyMessageWhenIdle=false&" + "consumer.splitResult=false")
.to("mock:consumer-alreadyseen");
};
};
@@ -176,7 +176,7 @@ public class Olingo2ComponentConsumerTest extends AbstractOlingo2TestSupport {
RouteBuilder builder = new RouteBuilder() {
public void configure() {
- from("olingo2://read/Manufacturers('1')?filterAlreadySeen=true&" + "consumer.delay=2&consumer.sendEmptyMessageWhenIdle=true&" + "consumer.splitResult=true")
+ from("olingo2://read/Manufacturers('1')?filterAlreadySeen=true&" + "delay=2&consumer.sendEmptyMessageWhenIdle=true&" + "consumer.splitResult=true")
.to("mock:consumer-splitresult-kp-manufacturer");
};
};
@@ -226,7 +226,7 @@ public class Olingo2ComponentConsumerTest extends AbstractOlingo2TestSupport {
RouteBuilder builder = new RouteBuilder() {
public void configure() {
- from("olingo2://read/Manufacturers('1')?filterAlreadySeen=true&" + "consumer.delay=2&consumer.sendEmptyMessageWhenIdle=false&" + "consumer.splitResult=true")
+ from("olingo2://read/Manufacturers('1')?filterAlreadySeen=true&" + "delay=2&consumer.sendEmptyMessageWhenIdle=false&" + "consumer.splitResult=true")
.to("mock:consumer-splitresult-kp-manufacturer");
};
};
diff --git a/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/Olingo4ComponentConsumerTest.java b/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/Olingo4ComponentConsumerTest.java
index bbad81e..b5c3d01 100644
--- a/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/Olingo4ComponentConsumerTest.java
+++ b/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/Olingo4ComponentConsumerTest.java
@@ -97,7 +97,7 @@ public class Olingo4ComponentConsumerTest extends AbstractOlingo4TestSupport {
RouteBuilder builder = new RouteBuilder() {
public void configure() {
- from("olingo4://read/" + PEOPLE + "?consumer.delay=2&consumer.sendEmptyMessageWhenIdle=true&consumer.splitResult=false&filterAlreadySeen=true")
+ from("olingo4://read/" + PEOPLE + "?delay=2&consumer.sendEmptyMessageWhenIdle=true&consumer.splitResult=false&filterAlreadySeen=true")
.to("mock:consumer-alreadyseen");
};
};
@@ -148,7 +148,7 @@ public class Olingo4ComponentConsumerTest extends AbstractOlingo4TestSupport {
RouteBuilder builder = new RouteBuilder() {
public void configure() {
- from("olingo4://read/" + PEOPLE + "?consumer.delay=2&consumer.sendEmptyMessageWhenIdle=false&consumer.splitResult=false&filterAlreadySeen=true")
+ from("olingo4://read/" + PEOPLE + "?delay=2&consumer.sendEmptyMessageWhenIdle=false&consumer.splitResult=false&filterAlreadySeen=true")
.to("mock:consumer-alreadyseen");
};
};
@@ -186,7 +186,7 @@ public class Olingo4ComponentConsumerTest extends AbstractOlingo4TestSupport {
RouteBuilder builder = new RouteBuilder() {
public void configure() {
- from("olingo4://read/" + AIRPORTS + "('KSFO')" + "?filterAlreadySeen=true&" + "consumer.delay=2&consumer.sendEmptyMessageWhenIdle=true&"
+ from("olingo4://read/" + AIRPORTS + "('KSFO')" + "?filterAlreadySeen=true&" + "delay=2&consumer.sendEmptyMessageWhenIdle=true&"
+ "consumer.splitResult=true").to("mock:consumer-splitresult-kp-airport");
};
};
@@ -236,7 +236,7 @@ public class Olingo4ComponentConsumerTest extends AbstractOlingo4TestSupport {
RouteBuilder builder = new RouteBuilder() {
public void configure() {
- from("olingo4://read/" + AIRPORTS + "('KSFO')" + "?filterAlreadySeen=true&" + "consumer.delay=2&consumer.sendEmptyMessageWhenIdle=false&"
+ from("olingo4://read/" + AIRPORTS + "('KSFO')" + "?filterAlreadySeen=true&" + "delay=2&consumer.sendEmptyMessageWhenIdle=false&"
+ "consumer.splitResult=true").to("mock:consumer-splitresult-kp-airport");
};
};
diff --git a/components/camel-rss/src/main/docs/rss-component.adoc b/components/camel-rss/src/main/docs/rss-component.adoc
index 4f1ca0c..de520e6 100644
--- a/components/camel-rss/src/main/docs/rss-component.adoc
+++ b/components/camel-rss/src/main/docs/rss-component.adoc
@@ -176,18 +176,18 @@ convert between String (as XML) and ROME RSS model objects.
* unmarshal = from XML `String` to ROME `SyndFeed`
A route using the RSS dataformat will look like this:
-`from("rss:file:src/test/data/rss20.xml?splitEntries=false&consumer.delay=1000").marshal().rss().to("mock:marshal");`
+`from("rss:file:src/test/data/rss20.xml?splitEntries=false&delay=1000").marshal().rss().to("mock:marshal");`
The purpose of this feature is to make it possible to use Camel's built-in expressions for manipulating RSS messages. As shown below, an
XPath expression can be used to filter the RSS message. In the following example, on ly entries with Camel in the title will get through the filter.
- `from("rss:file:src/test/data/rss20.xml?splitEntries=true&consumer.delay=100").marshal().rss().filter().xpath("//item/title[contains(.,'Camel')]").to("mock:result");`
+ `from("rss:file:src/test/data/rss20.xml?splitEntries=true&delay=100").marshal().rss().filter().xpath("//item/title[contains(.,'Camel')]").to("mock:result");`
TIP: *Query parameters*
If the URL for the RSS feed uses query parameters, this component will
resolve them. For example if the feed uses `alt=rss`, then the following example will be resolved:
-`from("rss:http://someserver.com/feeds/posts/default?alt=rss&splitEntries=false&consumer.delay=1000").to("bean:rss");`
+`from("rss:http://someserver.com/feeds/posts/default?alt=rss&splitEntries=false&delay=1000").to("bean:rss");`
== Filtering entries
@@ -197,7 +197,7 @@ Bean Integration to implement your own
conditions. For instance, a filter equivalent to the XPath example above
would be:
-`from("rss:file:src/test/data/rss20.xml?splitEntries=true&consumer.delay=100").
+`from("rss:file:src/test/data/rss20.xml?splitEntries=true&delay=100").
filter().method("myFilterBean", "titleContainsCamel").to("mock:result");`
The custom bean for this would be:
diff --git a/components/camel-rss/src/main/docs/rss-dataformat.adoc b/components/camel-rss/src/main/docs/rss-dataformat.adoc
index 4c9535f..4f6c9c1 100644
--- a/components/camel-rss/src/main/docs/rss-dataformat.adoc
+++ b/components/camel-rss/src/main/docs/rss-dataformat.adoc
@@ -19,7 +19,7 @@ TIP: *Query parameters*
If the URL for the RSS feed uses query parameters, this component will
understand them as well, for example if the feed uses `alt=rss`, then
you can for example do
-`from("rss:http://someserver.com/feeds/posts/default?alt=rss&splitEntries=false&consumer.delay=1000").to("bean:rss");`
+`from("rss:http://someserver.com/feeds/posts/default?alt=rss&splitEntries=false&delay=1000").to("bean:rss");`
== Options
diff --git a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerTest.java b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerTest.java
index 8eeb9dc..6508c69 100644
--- a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerTest.java
+++ b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerTest.java
@@ -34,7 +34,7 @@ public class RssEntryPollingConsumerTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("rss:file:src/test/data/rss20.xml?splitEntries=true&sortEntries=true&consumer.delay=100").to("mock:result");
+ from("rss:file:src/test/data/rss20.xml?splitEntries=true&sortEntries=true&delay=100").to("mock:result");
}
};
}
diff --git a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithBasicAuthTest.java b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithBasicAuthTest.java
index ea9519c..6bc8c4f 100644
--- a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithBasicAuthTest.java
+++ b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithBasicAuthTest.java
@@ -36,7 +36,7 @@ public class RssEntryPollingConsumerWithBasicAuthTest extends CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("rss:http://localhost:" + JettyTestServer.getInstance().port + "/?splitEntries=true&sortEntries=true&consumer.delay=100&username=camel&password=camelPass").to("mock:result");
+ from("rss:http://localhost:" + JettyTestServer.getInstance().port + "/?splitEntries=true&sortEntries=true&delay=100&username=camel&password=camelPass").to("mock:result");
}
};
}
diff --git a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithFilterTest.java b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithFilterTest.java
index 30f60fc..2e8d0e5 100644
--- a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithFilterTest.java
+++ b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithFilterTest.java
@@ -54,7 +54,7 @@ public class RssEntryPollingConsumerWithFilterTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("rss:file:src/test/data/rss20.xml?splitEntries=true&consumer.delay=100").
+ from("rss:file:src/test/data/rss20.xml?splitEntries=true&delay=100").
filter().method("myBean", "isAfterDate").to("mock:result");
}
};
diff --git a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntrySortDefaultsTest.java b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntrySortDefaultsTest.java
index 0b57d38..acd3ca5 100644
--- a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntrySortDefaultsTest.java
+++ b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntrySortDefaultsTest.java
@@ -23,10 +23,10 @@ public class RssEntrySortDefaultsTest extends RssEntrySortTest {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("rss:file:src/test/data/rss20.xml?splitEntries=true&sortEntries=true&consumer.delay=50").to("mock:sorted");
+ from("rss:file:src/test/data/rss20.xml?splitEntries=true&sortEntries=true&delay=50").to("mock:sorted");
// should NOT sort by default
- from("rss:file:src/test/data/rss20.xml?splitEntries=true&consumer.delay=50").to("mock:unsorted");
+ from("rss:file:src/test/data/rss20.xml?splitEntries=true&delay=50").to("mock:unsorted");
}
};
}
diff --git a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntrySortTest.java b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntrySortTest.java
index b4a83a2..2652fb3 100644
--- a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntrySortTest.java
+++ b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntrySortTest.java
@@ -58,8 +58,8 @@ public class RssEntrySortTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("rss:file:src/test/data/rss20.xml?splitEntries=true&sortEntries=true&consumer.delay=50").to("mock:sorted");
- from("rss:file:src/test/data/rss20.xml?splitEntries=true&sortEntries=false&consumer.delay=50").to("mock:unsorted");
+ from("rss:file:src/test/data/rss20.xml?splitEntries=true&sortEntries=true&delay=50").to("mock:sorted");
+ from("rss:file:src/test/data/rss20.xml?splitEntries=true&sortEntries=false&delay=50").to("mock:unsorted");
}
};
}
diff --git a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssFilterTest.java b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssFilterTest.java
index c8436dd..725fdb3 100644
--- a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssFilterTest.java
+++ b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssFilterTest.java
@@ -48,7 +48,7 @@ public class RssFilterTest extends CamelTestSupport {
// START SNIPPET: ex1
// only entries with Camel in the title will get through the filter
- from("rss:file:src/test/data/rss20.xml?splitEntries=true&consumer.delay=100").
+ from("rss:file:src/test/data/rss20.xml?splitEntries=true&delay=100").
filter().method("myFilterBean", "titleContainsCamel").to("mock:result");
// END SNIPPET: ex1
}
diff --git a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssMultipleEndpointsIssueTest.java b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssMultipleEndpointsIssueTest.java
index 9048abd..32464db 100644
--- a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssMultipleEndpointsIssueTest.java
+++ b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssMultipleEndpointsIssueTest.java
@@ -41,9 +41,9 @@ public class RssMultipleEndpointsIssueTest extends CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("rss:http://www.iafrica.com/pls/cms/grapevine.xml?consumer.initialDelay=2000").to("mock:a");
+ from("rss:http://www.iafrica.com/pls/cms/grapevine.xml?initialDelay=2000").to("mock:a");
- from("rss:http://www.iafrica.com/pls/cms/grapevine.xml?p_section=world_news&consumer.initialDelay=3000").to("mock:b");
+ from("rss:http://www.iafrica.com/pls/cms/grapevine.xml?p_section=world_news&initialDelay=3000").to("mock:b");
}
};
}
diff --git a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerWithFeedHeaderDisabledTest.java b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerWithFeedHeaderDisabledTest.java
index bbeb1c2..ec87332 100644
--- a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerWithFeedHeaderDisabledTest.java
+++ b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerWithFeedHeaderDisabledTest.java
@@ -41,7 +41,7 @@ public class RssPollingConsumerWithFeedHeaderDisabledTest extends CamelTestSuppo
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("rss:file:src/test/data/rss20.xml?splitEntries=false&consumer.delay=500&feedHeader=false").to("mock:result");
+ from("rss:file:src/test/data/rss20.xml?splitEntries=false&delay=500&feedHeader=false").to("mock:result");
}
};
}
diff --git a/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssConverterTest.java b/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssConverterTest.java
index 8ab11a8..a25ff95 100644
--- a/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssConverterTest.java
+++ b/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssConverterTest.java
@@ -27,9 +27,9 @@ public class RssConverterTest extends RssDataFormatTest {
return new RouteBuilder() {
public void configure() throws Exception {
// START SNIPPET: ex
- from("rss:file:src/test/data/rss20.xml?splitEntries=false&consumer.delay=1000").convertBodyTo(String.class).to("mock:marshal");
+ from("rss:file:src/test/data/rss20.xml?splitEntries=false&delay=1000").convertBodyTo(String.class).to("mock:marshal");
// END SNIPPET: ex
- from("rss:file:src/test/data/rss20.xml?splitEntries=false&consumer.delay=1500").convertBodyTo(String.class).convertBodyTo(SyndFeed.class).to("mock:unmarshal");
+ from("rss:file:src/test/data/rss20.xml?splitEntries=false&delay=1500").convertBodyTo(String.class).convertBodyTo(SyndFeed.class).to("mock:unmarshal");
}
};
}
diff --git a/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssDataFormatTest.java b/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssDataFormatTest.java
index af4e255..6999e74 100644
--- a/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssDataFormatTest.java
+++ b/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssDataFormatTest.java
@@ -59,9 +59,9 @@ public class RssDataFormatTest extends CamelTestSupport {
return new RouteBuilder() {
public void configure() throws Exception {
// START SNIPPET: ex
- from("rss:file:src/test/data/rss20.xml?splitEntries=false&consumer.delay=1000").marshal().rss().to("mock:marshal");
+ from("rss:file:src/test/data/rss20.xml?splitEntries=false&delay=1000").marshal().rss().to("mock:marshal");
// END SNIPPET: ex
- from("rss:file:src/test/data/rss20.xml?splitEntries=false&consumer.delay=1500").marshal().rss().unmarshal().rss().to("mock:unmarshal");
+ from("rss:file:src/test/data/rss20.xml?splitEntries=false&delay=1500").marshal().rss().unmarshal().rss().to("mock:unmarshal");
}
};
}
diff --git a/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssFilterWithXPathTest.java b/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssFilterWithXPathTest.java
index 9c2864f..ee39e39 100644
--- a/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssFilterWithXPathTest.java
+++ b/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssFilterWithXPathTest.java
@@ -27,7 +27,7 @@ public class RssFilterWithXPathTest extends RssFilterTest {
public void configure() throws Exception {
// START SNIPPET: ex
// only entries with Camel in the title will get through the filter
- from("rss:file:src/test/data/rss20.xml?splitEntries=true&consumer.delay=100")
+ from("rss:file:src/test/data/rss20.xml?splitEntries=true&delay=100")
.marshal().rss().filter().xpath("//item/title[contains(.,'Camel')]").to("mock:result");
// END SNIPPET: ex
}
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteBatchCompleteTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteBatchCompleteTest.java
index 225e2f3..4867837 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteBatchCompleteTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteBatchCompleteTest.java
@@ -80,7 +80,7 @@ public class SqlConsumerDeleteBatchCompleteTest extends CamelTestSupport {
public void configure() throws Exception {
getContext().getComponent("sql", SqlComponent.class).setDataSource(db);
- from("sql:select * from projects order by id?consumer.initialDelay=0&consumer.delay=50&consumer.onConsumeBatchComplete=delete from projects")
+ from("sql:select * from projects order by id?initialDelay=0&delay=50&consumer.onConsumeBatchComplete=delete from projects")
.to("mock:result");
}
};
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteFailedTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteFailedTest.java
index 03a49fc..0541951 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteFailedTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteFailedTest.java
@@ -89,7 +89,7 @@ public class SqlConsumerDeleteFailedTest extends CamelTestSupport {
getContext().getComponent("sql", SqlComponent.class).setDataSource(db);
from("sql:select * from projects where license <> 'BAD' order by id"
- + "?consumer.initialDelay=0&consumer.delay=50"
+ + "?initialDelay=0&delay=50"
+ "&consumer.onConsume=delete from projects where id = :#id"
+ "&consumer.onConsumeFailed=update projects set license = 'BAD' where id = :#id")
.process(new Processor() {
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTest.java
index 85ebd3c..6245ed5 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTest.java
@@ -94,7 +94,7 @@ public class SqlConsumerDeleteTest extends CamelTestSupport {
public void configure() throws Exception {
getContext().getComponent("sql", SqlComponent.class).setDataSource(db);
- from("sql:select * from projects order by id?consumer.initialDelay=0&consumer.delay=50&consumer.onConsume=delete from projects where id = :#id")
+ from("sql:select * from projects order by id?initialDelay=0&delay=50&consumer.onConsume=delete from projects where id = :#id")
.to("mock:result");
}
};
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTransformTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTransformTest.java
index 436743e..3a638dc 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTransformTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTransformTest.java
@@ -82,7 +82,7 @@ public class SqlConsumerDeleteTransformTest extends CamelTestSupport {
// even if we transform the exchange we can still do onConsume as we have the original data at
// the point when onConsume is executed
- from("sql:select * from projects order by id?consumer.initialDelay=0&consumer.delay=50&consumer.onConsume=delete from projects where id = :#id")
+ from("sql:select * from projects order by id?initialDelay=0&delay=50&consumer.onConsume=delete from projects where id = :#id")
.transform().simple("The project is ${body[project]}")
.to("mock:result");
}
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDynamicParameterTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDynamicParameterTest.java
index 92b2fa9..402ad92 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDynamicParameterTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDynamicParameterTest.java
@@ -84,7 +84,7 @@ public class SqlConsumerDynamicParameterTest extends CamelTestSupport {
public void configure() throws Exception {
getContext().getComponent("sql", SqlComponent.class).setDataSource(db);
- from("sql:select * from projects where id = :#${bean:myIdGenerator.nextId}?consumer.initialDelay=0&consumer.delay=50")
+ from("sql:select * from projects where id = :#${bean:myIdGenerator.nextId}?initialDelay=0&delay=50")
.routeId("foo").noAutoStartup()
.to("mock:result");
}
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerMaxMessagesPerPollTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerMaxMessagesPerPollTest.java
index ac1f195..30957ff 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerMaxMessagesPerPollTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerMaxMessagesPerPollTest.java
@@ -94,7 +94,7 @@ public class SqlConsumerMaxMessagesPerPollTest extends CamelTestSupport {
getContext().setTracing(true);
getContext().getComponent("sql", SqlComponent.class).setDataSource(db);
- from("sql:select * from projects where processed = false order by id?maxMessagesPerPoll=2&consumer.initialDelay=0&consumer.delay=50")
+ from("sql:select * from projects where processed = false order by id?maxMessagesPerPoll=2&initialDelay=0&delay=50")
.to("mock:result")
.to("sql:update projects set processed = true where id = :#id");
}
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListTest.java
index da5926d..1ed21a3 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListTest.java
@@ -85,7 +85,7 @@ public class SqlConsumerOutputTypeSelectListTest extends CamelTestSupport {
public void configure() throws Exception {
getContext().getComponent("sql", SqlComponent.class).setDataSource(db);
- from("sql:select * from projects order by id?outputType=SelectList&consumer.initialDelay=0&consumer.delay=50")
+ from("sql:select * from projects order by id?outputType=SelectList&initialDelay=0&delay=50")
.to("mock:result");
}
};
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListWithClassTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListWithClassTest.java
index a38c19b..916df35 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListWithClassTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListWithClassTest.java
@@ -86,7 +86,7 @@ public class SqlConsumerOutputTypeSelectListWithClassTest extends CamelTestSuppo
public void configure() throws Exception {
getContext().getComponent("sql", SqlComponent.class).setDataSource(db);
- from("sql:select * from projects order by id?outputType=SelectList&outputClass=org.apache.camel.component.sql.ProjectModel&consumer.initialDelay=0&consumer.delay=50")
+ from("sql:select * from projects order by id?outputType=SelectList&outputClass=org.apache.camel.component.sql.ProjectModel&initialDelay=0&delay=50")
.to("mock:result");
}
};
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectOneTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectOneTest.java
index 19ca9d2..279db4b 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectOneTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectOneTest.java
@@ -61,7 +61,7 @@ public class SqlConsumerOutputTypeSelectOneTest {
camel1.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("sql:select * from projects where id=3?outputType=SelectOne&outputClass=org.apache.camel.component.sql.ProjectModel&consumer.initialDelay=0&consumer.delay=50")
+ from("sql:select * from projects where id=3?outputType=SelectOne&outputClass=org.apache.camel.component.sql.ProjectModel&initialDelay=0&delay=50")
.to("mock:result");
}
});
@@ -85,7 +85,7 @@ public class SqlConsumerOutputTypeSelectOneTest {
camel1.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("sql:select * from projects where id=3?outputType=SelectOne&consumer.initialDelay=0&consumer.delay=50")
+ from("sql:select * from projects where id=3?outputType=SelectOne&initialDelay=0&delay=50")
.to("mock:result");
}
});
@@ -109,7 +109,7 @@ public class SqlConsumerOutputTypeSelectOneTest {
camel1.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("sql:select project from projects where id=3?outputType=SelectOne&consumer.initialDelay=0&consumer.delay=50")
+ from("sql:select project from projects where id=3?outputType=SelectOne&initialDelay=0&delay=50")
.to("mock:result");
}
});
@@ -131,7 +131,7 @@ public class SqlConsumerOutputTypeSelectOneTest {
camel1.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("sql:select count(*) from projects?outputType=SelectOne&consumer.initialDelay=0&consumer.delay=50")
+ from("sql:select count(*) from projects?outputType=SelectOne&initialDelay=0&delay=50")
.to("mock:result");
}
});
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeStreamListTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeStreamListTest.java
index 1e7cd46..ddb2a1c 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeStreamListTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeStreamListTest.java
@@ -99,18 +99,18 @@ public class SqlConsumerOutputTypeStreamListTest extends CamelTestSupport {
public void configure() {
getContext().getComponent("sql", SqlComponent.class).setDataSource(db);
- from("sql:select * from projects order by id?outputType=StreamList&consumer.initialDelay=0&consumer.delay=50").routeId("route1").noAutoStartup()
+ from("sql:select * from projects order by id?outputType=StreamList&initialDelay=0&delay=50").routeId("route1").noAutoStartup()
.to("log:stream")
.to("mock:result");
- from("sql:select * from projects order by id?outputType=StreamList&consumer.initialDelay=0&consumer.delay=50").routeId("route2").noAutoStartup()
+ from("sql:select * from projects order by id?outputType=StreamList&initialDelay=0&delay=50").routeId("route2").noAutoStartup()
.to("log:stream")
.split(body()).streaming()
.to("log:row")
.to("mock:result")
.end();
- from("sql:select * from projects order by id?outputType=StreamList&outputClass=org.apache.camel.component.sql.ProjectModel&consumer.initialDelay=0&consumer.delay=50")
+ from("sql:select * from projects order by id?outputType=StreamList&outputClass=org.apache.camel.component.sql.ProjectModel&initialDelay=0&delay=50")
.routeId("route3").noAutoStartup()
.to("log:stream")
.split(body()).streaming()
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerTest.java
index ab411a7..b30b5a3 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerTest.java
@@ -79,7 +79,7 @@ public class SqlConsumerTest extends CamelTestSupport {
public void configure() throws Exception {
getContext().getComponent("sql", SqlComponent.class).setDataSource(db);
- from("sql:select * from projects order by id?consumer.initialDelay=0&consumer.delay=50")
+ from("sql:select * from projects order by id?initialDelay=0&delay=50")
.to("mock:result");
}
};
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementFalseTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementFalseTest.java
index 52f7ecc..5e98554 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementFalseTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementFalseTest.java
@@ -93,7 +93,7 @@ public class SqlProducerAlwaysPopulateStatementFalseTest extends CamelTestSuppor
getContext().getComponent("sql", SqlComponent.class).setDataSource(db);
from("direct:start")
- .to("sql:select * from projects where license = 'ASF' order by id?alwaysPopulateStatement=false&prepareStatementStrategy=#myStrategy&consumer.initialDelay=0&consumer.delay=50")
+ .to("sql:select * from projects where license = 'ASF' order by id?alwaysPopulateStatement=false&prepareStatementStrategy=#myStrategy&initialDelay=0&delay=50")
.to("mock:result");
}
};
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementTest.java
index f3f6fee..0071ae8 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementTest.java
@@ -92,7 +92,7 @@ public class SqlProducerAlwaysPopulateStatementTest extends CamelTestSupport {
getContext().getComponent("sql", SqlComponent.class).setDataSource(db);
from("direct:start")
- .to("sql:select * from projects where license = 'ASF' order by id?alwaysPopulateStatement=true&prepareStatementStrategy=#myStrategy&consumer.initialDelay=0&consumer.delay=50")
+ .to("sql:select * from projects where license = 'ASF' order by id?alwaysPopulateStatement=true&prepareStatementStrategy=#myStrategy&initialDelay=0&delay=50")
.to("mock:result");
}
};
diff --git a/components/camel-tarfile/src/main/docs/tarfile-dataformat.adoc b/components/camel-tarfile/src/main/docs/tarfile-dataformat.adoc
index c3af1c7..f632a6d 100644
--- a/components/camel-tarfile/src/main/docs/tarfile-dataformat.adoc
+++ b/components/camel-tarfile/src/main/docs/tarfile-dataformat.adoc
@@ -120,7 +120,7 @@ work.
----------------------------------------------------------------------------------------------------
TarFileDataFormat tarFile = new TarFileDataFormat();
tarFile.setUsingIterator(true);
- from("file:src/test/resources/org/apache/camel/dataformat/tarfile/?consumer.delay=1000&noop=true")
+ from("file:src/test/resources/org/apache/camel/dataformat/tarfile/?delay=1000&noop=true")
.unmarshal(tarFile)
.split(body(Iterator.class))
.streaming()
@@ -133,7 +133,7 @@ like this
[source,java]
----------------------------------------------------------------------------------------------------
- from("file:src/test/resources/org/apache/camel/dataformat/tarfile?consumer.delay=1000&noop=true")
+ from("file:src/test/resources/org/apache/camel/dataformat/tarfile?delay=1000&noop=true")
.split(new TarSplitter())
.streaming()
.process(new UnTarpedMessageProcessor())
diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileMultipleFilesSplitterTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileMultipleFilesSplitterTest.java
index b50a7d6..bac24d7 100644
--- a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileMultipleFilesSplitterTest.java
+++ b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileMultipleFilesSplitterTest.java
@@ -48,7 +48,7 @@ public class TarFileMultipleFilesSplitterTest extends TarSplitterRouteTest {
// Untar file and Split it according to FileEntry
TarFileDataFormat tarFile = new TarFileDataFormat();
tarFile.setUsingIterator(true);
- from("file:src/test/resources/org/apache/camel/dataformat/tarfile/data/?consumer.delay=1000&noop=true")
+ from("file:src/test/resources/org/apache/camel/dataformat/tarfile/data/?delay=1000&noop=true")
.unmarshal(tarFile)
.split(bodyAs(Iterator.class))
.streaming()
diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarSplitterRouteTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarSplitterRouteTest.java
index 1c48715..c33f930 100644
--- a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarSplitterRouteTest.java
+++ b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarSplitterRouteTest.java
@@ -38,7 +38,7 @@ public class TarSplitterRouteTest extends CamelTestSupport {
@Override
public void configure() throws Exception {
// Untar file and Split it according to FileEntry
- from("file:src/test/resources/org/apache/camel/dataformat/tarfile/data?consumer.delay=1000&noop=true")
+ from("file:src/test/resources/org/apache/camel/dataformat/tarfile/data?delay=1000&noop=true")
.log("Start processing big file: ${header.CamelFileName}")
.split(new TarSplitter()).streaming()
.convertBodyTo(String.class).to("mock:processTarEntry")
diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/AggregationStrategyWithPreservationTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/AggregationStrategyWithPreservationTest.java
index 9bdc0c1..23770fa 100644
--- a/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/AggregationStrategyWithPreservationTest.java
+++ b/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/AggregationStrategyWithPreservationTest.java
@@ -87,7 +87,7 @@ public class AggregationStrategyWithPreservationTest extends CamelTestSupport {
@Override
public void configure() throws Exception {
// Untar file and Split it according to FileEntry
- from("file:src/test/resources/org/apache/camel/aggregate/tarfile/data?consumer.delay=1000&noop=true&recursive=true")
+ from("file:src/test/resources/org/apache/camel/aggregate/tarfile/data?delay=1000&noop=true&recursive=true")
.aggregate(tar)
.constant(true)
.completionFromBatchConsumer()
diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/TarAggregationStrategyTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/TarAggregationStrategyTest.java
index c613e91..b26cde2 100644
--- a/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/TarAggregationStrategyTest.java
+++ b/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/TarAggregationStrategyTest.java
@@ -76,7 +76,7 @@ public class TarAggregationStrategyTest extends CamelTestSupport {
@Override
public void configure() throws Exception {
// Untar file and Split it according to FileEntry
- from("file:src/test/resources/org/apache/camel/aggregate/tarfile/data?consumer.delay=1000&noop=true")
+ from("file:src/test/resources/org/apache/camel/aggregate/tarfile/data?delay=1000&noop=true")
.setHeader("foo", constant("bar"))
.aggregate(tar)
.constant(true)
diff --git a/components/camel-tarfile/src/test/resources/org/apache/camel/dataformat/tarfile/SpringTarSplitterRouteTest.xml b/components/camel-tarfile/src/test/resources/org/apache/camel/dataformat/tarfile/SpringTarSplitterRouteTest.xml
index 9c3216b..6c4c2b5 100644
--- a/components/camel-tarfile/src/test/resources/org/apache/camel/dataformat/tarfile/SpringTarSplitterRouteTest.xml
+++ b/components/camel-tarfile/src/test/resources/org/apache/camel/dataformat/tarfile/SpringTarSplitterRouteTest.xml
@@ -31,7 +31,7 @@
<camelContext xmlns="http://camel.apache.org/schema/spring">
<route>
- <from uri="file:src/test/resources/org/apache/camel/dataformat/tarfile/data?consumer.delay=1000&noop=true"/>
+ <from uri="file:src/test/resources/org/apache/camel/dataformat/tarfile/data?delay=1000&noop=true"/>
<split streaming="true">
<!-- refer to our custom expression, using ref tag -->
<ref>tarSplitter</ref>
diff --git a/components/camel-zipfile/src/main/docs/zipfile-dataformat.adoc b/components/camel-zipfile/src/main/docs/zipfile-dataformat.adoc
index 4755cd5..19d663d 100644
--- a/components/camel-zipfile/src/main/docs/zipfile-dataformat.adoc
+++ b/components/camel-zipfile/src/main/docs/zipfile-dataformat.adoc
@@ -127,7 +127,7 @@ work.
ZipFileDataFormat zipFile = new ZipFileDataFormat();
zipFile.setUsingIterator(true);
-from("file:src/test/resources/org/apache/camel/dataformat/zipfile/?consumer.delay=1000&noop=true")
+from("file:src/test/resources/org/apache/camel/dataformat/zipfile/?delay=1000&noop=true")
.unmarshal(zipFile)
.split(body(Iterator.class)).streaming()
.process(new UnZippedMessageProcessor())
@@ -139,7 +139,7 @@ like this
[source,java]
----
-from("file:src/test/resources/org/apache/camel/dataformat/zipfile?consumer.delay=1000&noop=true")
+from("file:src/test/resources/org/apache/camel/dataformat/zipfile?delay=1000&noop=true")
.split(new ZipSplitter()).streaming()
.process(new UnZippedMessageProcessor())
.end();
diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileMultipleFilesSplitterTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileMultipleFilesSplitterTest.java
index c2c04ac..fe3cf94 100644
--- a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileMultipleFilesSplitterTest.java
+++ b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileMultipleFilesSplitterTest.java
@@ -45,7 +45,7 @@ public class ZipFileMultipleFilesSplitterTest extends ZipSplitterRouteTest {
// Unzip file and Split it according to FileEntry
ZipFileDataFormat zipFile = new ZipFileDataFormat();
zipFile.setUsingIterator(true);
- from("file:src/test/resources/org/apache/camel/dataformat/zipfile/data/?consumer.delay=1000&noop=true")
+ from("file:src/test/resources/org/apache/camel/dataformat/zipfile/data/?delay=1000&noop=true")
.unmarshal(zipFile)
.split(bodyAs(Iterator.class))
.streaming()
diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterRouteTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterRouteTest.java
index 34be2ff..571eda4 100644
--- a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterRouteTest.java
+++ b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterRouteTest.java
@@ -36,7 +36,7 @@ public class ZipSplitterRouteTest extends CamelTestSupport {
@Override
public void configure() throws Exception {
// Unzip file and Split it according to FileEntry
- from("file:src/test/resources/org/apache/camel/dataformat/zipfile/data?consumer.delay=1000&noop=true")
+ from("file:src/test/resources/org/apache/camel/dataformat/zipfile/data?delay=1000&noop=true")
.log("Start processing big file: ${header.CamelFileName}")
.split(new ZipSplitter()).streaming()
.to("log:entry")
diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/AggregationStrategyWithPreservationTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/AggregationStrategyWithPreservationTest.java
index a923716..acd2dd6 100644
--- a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/AggregationStrategyWithPreservationTest.java
+++ b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/AggregationStrategyWithPreservationTest.java
@@ -80,7 +80,7 @@ public class AggregationStrategyWithPreservationTest extends CamelTestSupport {
@Override
public void configure() throws Exception {
// Unzip file and Split it according to FileEntry
- from("file:src/test/resources/org/apache/camel/aggregate/zipfile/data?consumer.delay=1000&noop=true&recursive=true")
+ from("file:src/test/resources/org/apache/camel/aggregate/zipfile/data?delay=1000&noop=true&recursive=true")
.aggregate(new ZipAggregationStrategy(true, true))
.constant(true)
.completionFromBatchConsumer()
diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyTest.java
index c928e23..8d39d8b 100644
--- a/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyTest.java
+++ b/components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyTest.java
@@ -71,7 +71,7 @@ public class ZipAggregationStrategyTest extends CamelTestSupport {
@Override
public void configure() throws Exception {
// Unzip file and Split it according to FileEntry
- from("file:src/test/resources/org/apache/camel/aggregate/zipfile/data?consumer.delay=1000&noop=true")
+ from("file:src/test/resources/org/apache/camel/aggregate/zipfile/data?delay=1000&noop=true")
.setHeader("foo", constant("bar"))
.aggregate(new ZipAggregationStrategy())
.constant(true)
diff --git a/components/camel-zipfile/src/test/resources/org/apache/camel/dataformat/zipfile/SpringZipSplitterRouteTest.xml b/components/camel-zipfile/src/test/resources/org/apache/camel/dataformat/zipfile/SpringZipSplitterRouteTest.xml
index 77c7608..77155fe 100644
--- a/components/camel-zipfile/src/test/resources/org/apache/camel/dataformat/zipfile/SpringZipSplitterRouteTest.xml
+++ b/components/camel-zipfile/src/test/resources/org/apache/camel/dataformat/zipfile/SpringZipSplitterRouteTest.xml
@@ -31,7 +31,7 @@
<camelContext xmlns="http://camel.apache.org/schema/spring">
<route>
- <from uri="file:src/test/resources/org/apache/camel/dataformat/zipfile/data?consumer.delay=1000&noop=true"/>
+ <from uri="file:src/test/resources/org/apache/camel/dataformat/zipfile/data?delay=1000&noop=true"/>
<split streaming="true">
<!-- refer to our custom expression, using ref tag -->
<ref>zipSplitter</ref>
[camel] 06/11: CAMEL-13917: Configuring endpoints with consumer.
prefix for consumer options is no longer supported as they should be
regular options instead. This also avoid reflection setting properties.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7900b297ce12d7d92215408d8d96acfb063b2749
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Sep 2 12:18:12 2019 +0200
CAMEL-13917: Configuring endpoints with consumer. prefix for consumer options is no longer supported as they should be regular options instead. This also avoid reflection setting properties.
---
.../src/main/java/org/apache/camel/component/aws/sqs/SqsComponent.java | 2 +-
.../org/apache/camel/component/beanstalk/ConsumerCompletionTest.java | 2 +-
.../org/apache/camel/component/beanstalk/ImmediateConsumerTest.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsComponent.java b/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsComponent.java
index e6ec965..fd6b4c3 100644
--- a/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsComponent.java
+++ b/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsComponent.java
@@ -94,7 +94,7 @@ public class SqsComponent extends DefaultComponent {
}
SqsEndpoint sqsEndpoint = new SqsEndpoint(uri, this, configuration);
- sqsEndpoint.setConsumerProperties(parameters);
+ setProperties(sqsEndpoint, parameters);
return sqsEndpoint;
}
diff --git a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/ConsumerCompletionTest.java b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/ConsumerCompletionTest.java
index cea9569..b596d83 100644
--- a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/ConsumerCompletionTest.java
+++ b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/ConsumerCompletionTest.java
@@ -149,7 +149,7 @@ public class ConsumerCompletionTest extends BeanstalkMockTestSupport {
return new RouteBuilder() {
@Override
public void configure() {
- from("beanstalk:tube?consumer.onFailure=release").routeId("foo")
+ from("beanstalk:tube?onFailure=release").routeId("foo")
.process(processor).to("mock:result");
}
};
diff --git a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/ImmediateConsumerTest.java b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/ImmediateConsumerTest.java
index 9631742..17d17b0 100644
--- a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/ImmediateConsumerTest.java
+++ b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/ImmediateConsumerTest.java
@@ -96,7 +96,7 @@ public class ImmediateConsumerTest extends BeanstalkMockTestSupport {
return new RouteBuilder() {
@Override
public void configure() {
- from("beanstalk:tube?consumer.awaitJob=false").process(processor).to("mock:result");
+ from("beanstalk:tube?awaitJob=false").process(processor).to("mock:result");
}
};
}
[camel] 10/11: CAMEL-13917: Configuring endpoints with consumer.
prefix for consumer options is no longer supported as they should be
regular options instead. This also avoid reflection setting properties.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit efca3b12a326082e685494d51308c6a1f5f27114
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Sep 2 16:01:55 2019 +0200
CAMEL-13917: Configuring endpoints with consumer. prefix for consumer options is no longer supported as they should be regular options instead. This also avoid reflection setting properties.
---
.../src/main/docs/olingo2-component.adoc | 18 +-
.../src/main/docs/olingo4-component.adoc | 18 +-
.../camel/component/rss/RssEndpointTest.java | 8 +-
.../src/main/docs/twilio-component.adoc | 17 +-
.../src/main/docs/zendesk-component.adoc | 17 +-
.../dsl/Olingo2EndpointBuilderFactory.java | 421 +++++++++++++++++++++
.../dsl/Olingo4EndpointBuilderFactory.java | 421 +++++++++++++++++++++
.../endpoint/dsl/TwilioEndpointBuilderFactory.java | 395 +++++++++++++++++++
.../dsl/ZendeskEndpointBuilderFactory.java | 396 +++++++++++++++++++
examples/camel-example-jooq/README.adoc | 2 +-
.../resources/META-INF/spring/camel-context.xml | 2 +-
.../example/spring/boot/rest/jpa/Application.java | 4 +-
.../springboot/Olingo2ComponentConfiguration.java | 14 +
.../springboot/Olingo4ComponentConfiguration.java | 14 +
14 files changed, 1732 insertions(+), 15 deletions(-)
diff --git a/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc b/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc
index 83929b5..7e13c36 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc
+++ b/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc
@@ -82,7 +82,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (17 parameters):
+=== Query Parameters (33 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -100,11 +100,27 @@ with the following path and query parameters:
| *socketTimeout* (common) | HTTP request timeout in milliseconds, defaults to 30,000 (30 seconds) | 30000 | int
| *sslContextParameters* (common) | To configure security using SSLContextParameters | | SSLContextParameters
| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
+| *sendEmptyMessageWhenIdle* (consumer) | If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead. | false | boolean
+| *splitResult* (consumer) | For endpoints that return an array or collection, a consumer endpoint will map every element to distinct messages, unless splitResult is set to false. | true | boolean
| *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | | ExceptionHandler
| *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. | | ExchangePattern
+| *pollStrategy* (consumer) | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. | | PollingConsumerPoll Strategy
| *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
+| *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. | | int
+| *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. | | int
+| *backoffMultiplier* (scheduler) | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. | | int
+| *delay* (scheduler) | Milliseconds before the next poll. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 500 | long
+| *greedy* (scheduler) | If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages. | false | boolean
+| *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
+| *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
+| *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. | | ScheduledExecutor Service
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | String
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. | | Map
+| *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
+| *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
+| *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
|===
// endpoint options: END
// spring-boot-auto-configure options: START
diff --git a/components/camel-olingo4/camel-olingo4-component/src/main/docs/olingo4-component.adoc b/components/camel-olingo4/camel-olingo4-component/src/main/docs/olingo4-component.adoc
index 9977a56..79e2c36 100644
--- a/components/camel-olingo4/camel-olingo4-component/src/main/docs/olingo4-component.adoc
+++ b/components/camel-olingo4/camel-olingo4-component/src/main/docs/olingo4-component.adoc
@@ -83,7 +83,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (17 parameters):
+=== Query Parameters (33 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -101,11 +101,27 @@ with the following path and query parameters:
| *socketTimeout* (common) | HTTP request timeout in milliseconds, defaults to 30,000 (30 seconds) | 30000 | int
| *sslContextParameters* (common) | To configure security using SSLContextParameters | | SSLContextParameters
| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
+| *sendEmptyMessageWhenIdle* (consumer) | If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead. | false | boolean
+| *splitResult* (consumer) | For endpoints that return an array or collection, a consumer endpoint will map every element to distinct messages, unless splitResult is set to false. | true | boolean
| *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | | ExceptionHandler
| *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. | | ExchangePattern
+| *pollStrategy* (consumer) | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. | | PollingConsumerPoll Strategy
| *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
+| *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. | | int
+| *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. | | int
+| *backoffMultiplier* (scheduler) | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. | | int
+| *delay* (scheduler) | Milliseconds before the next poll. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 500 | long
+| *greedy* (scheduler) | If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages. | false | boolean
+| *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
+| *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
+| *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. | | ScheduledExecutor Service
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | String
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. | | Map
+| *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
+| *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
+| *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
|===
// endpoint options: END
// spring-boot-auto-configure options: START
diff --git a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEndpointTest.java b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEndpointTest.java
index d483f7a..ffcd530 100644
--- a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEndpointTest.java
+++ b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEndpointTest.java
@@ -16,9 +16,6 @@
*/
package org.apache.camel.component.rss;
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.camel.builder.RouteBuilder;
public class RssEndpointTest extends RssPollingConsumerTest {
@@ -31,10 +28,7 @@ public class RssEndpointTest extends RssPollingConsumerTest {
rss.setCamelContext(context);
rss.setFeedUri("file:src/test/data/rss20.xml");
rss.setSplitEntries(false);
-
- Map<String, Object> map = new HashMap<>();
- map.put("delay", 100);
- rss.setConsumerProperties(map);
+ rss.setDelay(100);
context.addEndpoint("myrss", rss);
diff --git a/components/camel-twilio/src/main/docs/twilio-component.adoc b/components/camel-twilio/src/main/docs/twilio-component.adoc
index 1367880..0402b29 100644
--- a/components/camel-twilio/src/main/docs/twilio-component.adoc
+++ b/components/camel-twilio/src/main/docs/twilio-component.adoc
@@ -58,7 +58,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (7 parameters):
+=== Query Parameters (22 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -66,11 +66,26 @@ with the following path and query parameters:
| Name | Description | Default | Type
| *inBody* (common) | Sets the name of a parameter to be passed in the exchange In Body | | String
| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
+| *sendEmptyMessageWhenIdle* (consumer) | If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead. | false | boolean
| *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | | ExceptionHandler
| *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. | | ExchangePattern
+| *pollStrategy* (consumer) | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. | | PollingConsumerPoll Strategy
| *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
+| *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. | | int
+| *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. | | int
+| *backoffMultiplier* (scheduler) | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. | | int
+| *delay* (scheduler) | Milliseconds before the next poll. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 500 | long
+| *greedy* (scheduler) | If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages. | false | boolean
+| *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
+| *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
+| *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. | | ScheduledExecutor Service
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | String
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. | | Map
+| *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
+| *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
+| *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
|===
// endpoint options: END
// spring-boot-auto-configure options: START
diff --git a/components/camel-zendesk/src/main/docs/zendesk-component.adoc b/components/camel-zendesk/src/main/docs/zendesk-component.adoc
index c6e0e3f..afcc1ac 100644
--- a/components/camel-zendesk/src/main/docs/zendesk-component.adoc
+++ b/components/camel-zendesk/src/main/docs/zendesk-component.adoc
@@ -54,7 +54,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (12 parameters):
+=== Query Parameters (27 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -63,11 +63,26 @@ with the following path and query parameters:
| *inBody* (common) | Sets the name of a parameter to be passed in the exchange In Body | | String
| *serverUrl* (common) | The server URL to connect. | | String
| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
+| *sendEmptyMessageWhenIdle* (consumer) | If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead. | false | boolean
| *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | | ExceptionHandler
| *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. | | ExchangePattern
+| *pollStrategy* (consumer) | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. | | PollingConsumerPoll Strategy
| *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
+| *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. | | int
+| *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. | | int
+| *backoffMultiplier* (scheduler) | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. | | int
+| *delay* (scheduler) | Milliseconds before the next poll. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 500 | long
+| *greedy* (scheduler) | If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages. | false | boolean
+| *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
+| *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
+| *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. | | ScheduledExecutor Service
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | String
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. | | Map
+| *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
+| *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
+| *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
| *oauthToken* (security) | The OAuth token. | | String
| *password* (security) | The password. | | String
| *token* (security) | The security token. | | String
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/Olingo2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/Olingo2EndpointBuilderFactory.java
index 669f6c6..74d62c2 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/Olingo2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/Olingo2EndpointBuilderFactory.java
@@ -17,12 +17,16 @@
package org.apache.camel.builder.endpoint.dsl;
import java.util.Map;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
import javax.annotation.Generated;
import org.apache.camel.ExchangePattern;
+import org.apache.camel.LoggingLevel;
import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
import org.apache.camel.spi.ExceptionHandler;
+import org.apache.camel.spi.PollingConsumerPollStrategy;
/**
* Communicates with OData 2.0 services using Apache Olingo.
@@ -332,6 +336,391 @@ public interface Olingo2EndpointBuilderFactory {
doSetProperty("bridgeErrorHandler", bridgeErrorHandler);
return this;
}
+ /**
+ * If the polling consumer did not poll any files, you can enable this
+ * option to send an empty message (no body) instead.
+ *
+ * The option is a: <code>boolean</code> type.
+ *
+ * Group: consumer
+ */
+ default Olingo2EndpointConsumerBuilder sendEmptyMessageWhenIdle(
+ boolean sendEmptyMessageWhenIdle) {
+ doSetProperty("sendEmptyMessageWhenIdle", sendEmptyMessageWhenIdle);
+ return this;
+ }
+ /**
+ * If the polling consumer did not poll any files, you can enable this
+ * option to send an empty message (no body) instead.
+ *
+ * The option will be converted to a <code>boolean</code> type.
+ *
+ * Group: consumer
+ */
+ default Olingo2EndpointConsumerBuilder sendEmptyMessageWhenIdle(
+ String sendEmptyMessageWhenIdle) {
+ doSetProperty("sendEmptyMessageWhenIdle", sendEmptyMessageWhenIdle);
+ return this;
+ }
+ /**
+ * For endpoints that return an array or collection, a consumer endpoint
+ * will map every element to distinct messages, unless splitResult is
+ * set to false.
+ *
+ * The option is a: <code>boolean</code> type.
+ *
+ * Group: consumer
+ */
+ default Olingo2EndpointConsumerBuilder splitResult(boolean splitResult) {
+ doSetProperty("splitResult", splitResult);
+ return this;
+ }
+ /**
+ * For endpoints that return an array or collection, a consumer endpoint
+ * will map every element to distinct messages, unless splitResult is
+ * set to false.
+ *
+ * The option will be converted to a <code>boolean</code> type.
+ *
+ * Group: consumer
+ */
+ default Olingo2EndpointConsumerBuilder splitResult(String splitResult) {
+ doSetProperty("splitResult", splitResult);
+ return this;
+ }
+ /**
+ * The number of subsequent error polls (failed due some error) that
+ * should happen before the backoffMultipler should kick-in.
+ *
+ * The option is a: <code>int</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo2EndpointConsumerBuilder backoffErrorThreshold(
+ int backoffErrorThreshold) {
+ doSetProperty("backoffErrorThreshold", backoffErrorThreshold);
+ return this;
+ }
+ /**
+ * The number of subsequent error polls (failed due some error) that
+ * should happen before the backoffMultipler should kick-in.
+ *
+ * The option will be converted to a <code>int</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo2EndpointConsumerBuilder backoffErrorThreshold(
+ String backoffErrorThreshold) {
+ doSetProperty("backoffErrorThreshold", backoffErrorThreshold);
+ return this;
+ }
+ /**
+ * The number of subsequent idle polls that should happen before the
+ * backoffMultipler should kick-in.
+ *
+ * The option is a: <code>int</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo2EndpointConsumerBuilder backoffIdleThreshold(
+ int backoffIdleThreshold) {
+ doSetProperty("backoffIdleThreshold", backoffIdleThreshold);
+ return this;
+ }
+ /**
+ * The number of subsequent idle polls that should happen before the
+ * backoffMultipler should kick-in.
+ *
+ * The option will be converted to a <code>int</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo2EndpointConsumerBuilder backoffIdleThreshold(
+ String backoffIdleThreshold) {
+ doSetProperty("backoffIdleThreshold", backoffIdleThreshold);
+ return this;
+ }
+ /**
+ * To let the scheduled polling consumer backoff if there has been a
+ * number of subsequent idles/errors in a row. The multiplier is then
+ * the number of polls that will be skipped before the next actual
+ * attempt is happening again. When this option is in use then
+ * backoffIdleThreshold and/or backoffErrorThreshold must also be
+ * configured.
+ *
+ * The option is a: <code>int</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo2EndpointConsumerBuilder backoffMultiplier(
+ int backoffMultiplier) {
+ doSetProperty("backoffMultiplier", backoffMultiplier);
+ return this;
+ }
+ /**
+ * To let the scheduled polling consumer backoff if there has been a
+ * number of subsequent idles/errors in a row. The multiplier is then
+ * the number of polls that will be skipped before the next actual
+ * attempt is happening again. When this option is in use then
+ * backoffIdleThreshold and/or backoffErrorThreshold must also be
+ * configured.
+ *
+ * The option will be converted to a <code>int</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo2EndpointConsumerBuilder backoffMultiplier(
+ String backoffMultiplier) {
+ doSetProperty("backoffMultiplier", backoffMultiplier);
+ return this;
+ }
+ /**
+ * Milliseconds before the next poll. You can also specify time values
+ * using units, such as 60s (60 seconds), 5m30s (5 minutes and 30
+ * seconds), and 1h (1 hour).
+ *
+ * The option is a: <code>long</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo2EndpointConsumerBuilder delay(long delay) {
+ doSetProperty("delay", delay);
+ return this;
+ }
+ /**
+ * Milliseconds before the next poll. You can also specify time values
+ * using units, such as 60s (60 seconds), 5m30s (5 minutes and 30
+ * seconds), and 1h (1 hour).
+ *
+ * The option will be converted to a <code>long</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo2EndpointConsumerBuilder delay(String delay) {
+ doSetProperty("delay", delay);
+ return this;
+ }
+ /**
+ * If greedy is enabled, then the ScheduledPollConsumer will run
+ * immediately again, if the previous run polled 1 or more messages.
+ *
+ * The option is a: <code>boolean</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo2EndpointConsumerBuilder greedy(boolean greedy) {
+ doSetProperty("greedy", greedy);
+ return this;
+ }
+ /**
+ * If greedy is enabled, then the ScheduledPollConsumer will run
+ * immediately again, if the previous run polled 1 or more messages.
+ *
+ * The option will be converted to a <code>boolean</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo2EndpointConsumerBuilder greedy(String greedy) {
+ doSetProperty("greedy", greedy);
+ return this;
+ }
+ /**
+ * Milliseconds before the first poll starts. You can also specify time
+ * values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30
+ * seconds), and 1h (1 hour).
+ *
+ * The option is a: <code>long</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo2EndpointConsumerBuilder initialDelay(long initialDelay) {
+ doSetProperty("initialDelay", initialDelay);
+ return this;
+ }
+ /**
+ * Milliseconds before the first poll starts. You can also specify time
+ * values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30
+ * seconds), and 1h (1 hour).
+ *
+ * The option will be converted to a <code>long</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo2EndpointConsumerBuilder initialDelay(String initialDelay) {
+ doSetProperty("initialDelay", initialDelay);
+ return this;
+ }
+ /**
+ * The consumer logs a start/complete log line when it polls. This
+ * option allows you to configure the logging level for that.
+ *
+ * The option is a: <code>org.apache.camel.LoggingLevel</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo2EndpointConsumerBuilder runLoggingLevel(
+ LoggingLevel runLoggingLevel) {
+ doSetProperty("runLoggingLevel", runLoggingLevel);
+ return this;
+ }
+ /**
+ * The consumer logs a start/complete log line when it polls. This
+ * option allows you to configure the logging level for that.
+ *
+ * The option will be converted to a
+ * <code>org.apache.camel.LoggingLevel</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo2EndpointConsumerBuilder runLoggingLevel(
+ String runLoggingLevel) {
+ doSetProperty("runLoggingLevel", runLoggingLevel);
+ return this;
+ }
+ /**
+ * Allows for configuring a custom/shared thread pool to use for the
+ * consumer. By default each consumer has its own single threaded thread
+ * pool.
+ *
+ * The option is a:
+ * <code>java.util.concurrent.ScheduledExecutorService</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo2EndpointConsumerBuilder scheduledExecutorService(
+ ScheduledExecutorService scheduledExecutorService) {
+ doSetProperty("scheduledExecutorService", scheduledExecutorService);
+ return this;
+ }
+ /**
+ * Allows for configuring a custom/shared thread pool to use for the
+ * consumer. By default each consumer has its own single threaded thread
+ * pool.
+ *
+ * The option will be converted to a
+ * <code>java.util.concurrent.ScheduledExecutorService</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo2EndpointConsumerBuilder scheduledExecutorService(
+ String scheduledExecutorService) {
+ doSetProperty("scheduledExecutorService", scheduledExecutorService);
+ return this;
+ }
+ /**
+ * To use a cron scheduler from either camel-spring or camel-quartz
+ * component.
+ *
+ * The option is a: <code>java.lang.String</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo2EndpointConsumerBuilder scheduler(String scheduler) {
+ doSetProperty("scheduler", scheduler);
+ return this;
+ }
+ /**
+ * To configure additional properties when using a custom scheduler or
+ * any of the Quartz, Spring based scheduler.
+ *
+ * The option is a: <code>java.util.Map<java.lang.String,
+ * java.lang.Object></code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo2EndpointConsumerBuilder schedulerProperties(
+ Map<String, Object> schedulerProperties) {
+ doSetProperty("schedulerProperties", schedulerProperties);
+ return this;
+ }
+ /**
+ * To configure additional properties when using a custom scheduler or
+ * any of the Quartz, Spring based scheduler.
+ *
+ * The option will be converted to a
+ * <code>java.util.Map<java.lang.String, java.lang.Object></code>
+ * type.
+ *
+ * Group: scheduler
+ */
+ default Olingo2EndpointConsumerBuilder schedulerProperties(
+ String schedulerProperties) {
+ doSetProperty("schedulerProperties", schedulerProperties);
+ return this;
+ }
+ /**
+ * Whether the scheduler should be auto started.
+ *
+ * The option is a: <code>boolean</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo2EndpointConsumerBuilder startScheduler(
+ boolean startScheduler) {
+ doSetProperty("startScheduler", startScheduler);
+ return this;
+ }
+ /**
+ * Whether the scheduler should be auto started.
+ *
+ * The option will be converted to a <code>boolean</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo2EndpointConsumerBuilder startScheduler(
+ String startScheduler) {
+ doSetProperty("startScheduler", startScheduler);
+ return this;
+ }
+ /**
+ * Time unit for initialDelay and delay options.
+ *
+ * The option is a: <code>java.util.concurrent.TimeUnit</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo2EndpointConsumerBuilder timeUnit(TimeUnit timeUnit) {
+ doSetProperty("timeUnit", timeUnit);
+ return this;
+ }
+ /**
+ * Time unit for initialDelay and delay options.
+ *
+ * The option will be converted to a
+ * <code>java.util.concurrent.TimeUnit</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo2EndpointConsumerBuilder timeUnit(String timeUnit) {
+ doSetProperty("timeUnit", timeUnit);
+ return this;
+ }
+ /**
+ * Controls if fixed delay or fixed rate is used. See
+ * ScheduledExecutorService in JDK for details.
+ *
+ * The option is a: <code>boolean</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo2EndpointConsumerBuilder useFixedDelay(
+ boolean useFixedDelay) {
+ doSetProperty("useFixedDelay", useFixedDelay);
+ return this;
+ }
+ /**
+ * Controls if fixed delay or fixed rate is used. See
+ * ScheduledExecutorService in JDK for details.
+ *
+ * The option will be converted to a <code>boolean</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo2EndpointConsumerBuilder useFixedDelay(
+ String useFixedDelay) {
+ doSetProperty("useFixedDelay", useFixedDelay);
+ return this;
+ }
}
/**
@@ -401,6 +790,38 @@ public interface Olingo2EndpointBuilderFactory {
return this;
}
/**
+ * A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing
+ * you to provide your custom implementation to control error handling
+ * usually occurred during the poll operation before an Exchange have
+ * been created and being routed in Camel.
+ *
+ * The option is a:
+ * <code>org.apache.camel.spi.PollingConsumerPollStrategy</code> type.
+ *
+ * Group: consumer (advanced)
+ */
+ default AdvancedOlingo2EndpointConsumerBuilder pollStrategy(
+ PollingConsumerPollStrategy pollStrategy) {
+ doSetProperty("pollStrategy", pollStrategy);
+ return this;
+ }
+ /**
+ * A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing
+ * you to provide your custom implementation to control error handling
+ * usually occurred during the poll operation before an Exchange have
+ * been created and being routed in Camel.
+ *
+ * The option will be converted to a
+ * <code>org.apache.camel.spi.PollingConsumerPollStrategy</code> type.
+ *
+ * Group: consumer (advanced)
+ */
+ default AdvancedOlingo2EndpointConsumerBuilder pollStrategy(
+ String pollStrategy) {
+ doSetProperty("pollStrategy", pollStrategy);
+ return this;
+ }
+ /**
* Whether the endpoint should use basic property binding (Camel 2.x) or
* the newer property binding with additional capabilities.
*
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/Olingo4EndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/Olingo4EndpointBuilderFactory.java
index 06d0a2d..0b9c2d0 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/Olingo4EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/Olingo4EndpointBuilderFactory.java
@@ -17,12 +17,16 @@
package org.apache.camel.builder.endpoint.dsl;
import java.util.Map;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
import javax.annotation.Generated;
import org.apache.camel.ExchangePattern;
+import org.apache.camel.LoggingLevel;
import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
import org.apache.camel.spi.ExceptionHandler;
+import org.apache.camel.spi.PollingConsumerPollStrategy;
/**
* Communicates with OData 4.0 services using Apache Olingo OData API.
@@ -332,6 +336,391 @@ public interface Olingo4EndpointBuilderFactory {
doSetProperty("bridgeErrorHandler", bridgeErrorHandler);
return this;
}
+ /**
+ * If the polling consumer did not poll any files, you can enable this
+ * option to send an empty message (no body) instead.
+ *
+ * The option is a: <code>boolean</code> type.
+ *
+ * Group: consumer
+ */
+ default Olingo4EndpointConsumerBuilder sendEmptyMessageWhenIdle(
+ boolean sendEmptyMessageWhenIdle) {
+ doSetProperty("sendEmptyMessageWhenIdle", sendEmptyMessageWhenIdle);
+ return this;
+ }
+ /**
+ * If the polling consumer did not poll any files, you can enable this
+ * option to send an empty message (no body) instead.
+ *
+ * The option will be converted to a <code>boolean</code> type.
+ *
+ * Group: consumer
+ */
+ default Olingo4EndpointConsumerBuilder sendEmptyMessageWhenIdle(
+ String sendEmptyMessageWhenIdle) {
+ doSetProperty("sendEmptyMessageWhenIdle", sendEmptyMessageWhenIdle);
+ return this;
+ }
+ /**
+ * For endpoints that return an array or collection, a consumer endpoint
+ * will map every element to distinct messages, unless splitResult is
+ * set to false.
+ *
+ * The option is a: <code>boolean</code> type.
+ *
+ * Group: consumer
+ */
+ default Olingo4EndpointConsumerBuilder splitResult(boolean splitResult) {
+ doSetProperty("splitResult", splitResult);
+ return this;
+ }
+ /**
+ * For endpoints that return an array or collection, a consumer endpoint
+ * will map every element to distinct messages, unless splitResult is
+ * set to false.
+ *
+ * The option will be converted to a <code>boolean</code> type.
+ *
+ * Group: consumer
+ */
+ default Olingo4EndpointConsumerBuilder splitResult(String splitResult) {
+ doSetProperty("splitResult", splitResult);
+ return this;
+ }
+ /**
+ * The number of subsequent error polls (failed due some error) that
+ * should happen before the backoffMultipler should kick-in.
+ *
+ * The option is a: <code>int</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo4EndpointConsumerBuilder backoffErrorThreshold(
+ int backoffErrorThreshold) {
+ doSetProperty("backoffErrorThreshold", backoffErrorThreshold);
+ return this;
+ }
+ /**
+ * The number of subsequent error polls (failed due some error) that
+ * should happen before the backoffMultipler should kick-in.
+ *
+ * The option will be converted to a <code>int</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo4EndpointConsumerBuilder backoffErrorThreshold(
+ String backoffErrorThreshold) {
+ doSetProperty("backoffErrorThreshold", backoffErrorThreshold);
+ return this;
+ }
+ /**
+ * The number of subsequent idle polls that should happen before the
+ * backoffMultipler should kick-in.
+ *
+ * The option is a: <code>int</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo4EndpointConsumerBuilder backoffIdleThreshold(
+ int backoffIdleThreshold) {
+ doSetProperty("backoffIdleThreshold", backoffIdleThreshold);
+ return this;
+ }
+ /**
+ * The number of subsequent idle polls that should happen before the
+ * backoffMultipler should kick-in.
+ *
+ * The option will be converted to a <code>int</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo4EndpointConsumerBuilder backoffIdleThreshold(
+ String backoffIdleThreshold) {
+ doSetProperty("backoffIdleThreshold", backoffIdleThreshold);
+ return this;
+ }
+ /**
+ * To let the scheduled polling consumer backoff if there has been a
+ * number of subsequent idles/errors in a row. The multiplier is then
+ * the number of polls that will be skipped before the next actual
+ * attempt is happening again. When this option is in use then
+ * backoffIdleThreshold and/or backoffErrorThreshold must also be
+ * configured.
+ *
+ * The option is a: <code>int</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo4EndpointConsumerBuilder backoffMultiplier(
+ int backoffMultiplier) {
+ doSetProperty("backoffMultiplier", backoffMultiplier);
+ return this;
+ }
+ /**
+ * To let the scheduled polling consumer backoff if there has been a
+ * number of subsequent idles/errors in a row. The multiplier is then
+ * the number of polls that will be skipped before the next actual
+ * attempt is happening again. When this option is in use then
+ * backoffIdleThreshold and/or backoffErrorThreshold must also be
+ * configured.
+ *
+ * The option will be converted to a <code>int</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo4EndpointConsumerBuilder backoffMultiplier(
+ String backoffMultiplier) {
+ doSetProperty("backoffMultiplier", backoffMultiplier);
+ return this;
+ }
+ /**
+ * Milliseconds before the next poll. You can also specify time values
+ * using units, such as 60s (60 seconds), 5m30s (5 minutes and 30
+ * seconds), and 1h (1 hour).
+ *
+ * The option is a: <code>long</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo4EndpointConsumerBuilder delay(long delay) {
+ doSetProperty("delay", delay);
+ return this;
+ }
+ /**
+ * Milliseconds before the next poll. You can also specify time values
+ * using units, such as 60s (60 seconds), 5m30s (5 minutes and 30
+ * seconds), and 1h (1 hour).
+ *
+ * The option will be converted to a <code>long</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo4EndpointConsumerBuilder delay(String delay) {
+ doSetProperty("delay", delay);
+ return this;
+ }
+ /**
+ * If greedy is enabled, then the ScheduledPollConsumer will run
+ * immediately again, if the previous run polled 1 or more messages.
+ *
+ * The option is a: <code>boolean</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo4EndpointConsumerBuilder greedy(boolean greedy) {
+ doSetProperty("greedy", greedy);
+ return this;
+ }
+ /**
+ * If greedy is enabled, then the ScheduledPollConsumer will run
+ * immediately again, if the previous run polled 1 or more messages.
+ *
+ * The option will be converted to a <code>boolean</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo4EndpointConsumerBuilder greedy(String greedy) {
+ doSetProperty("greedy", greedy);
+ return this;
+ }
+ /**
+ * Milliseconds before the first poll starts. You can also specify time
+ * values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30
+ * seconds), and 1h (1 hour).
+ *
+ * The option is a: <code>long</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo4EndpointConsumerBuilder initialDelay(long initialDelay) {
+ doSetProperty("initialDelay", initialDelay);
+ return this;
+ }
+ /**
+ * Milliseconds before the first poll starts. You can also specify time
+ * values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30
+ * seconds), and 1h (1 hour).
+ *
+ * The option will be converted to a <code>long</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo4EndpointConsumerBuilder initialDelay(String initialDelay) {
+ doSetProperty("initialDelay", initialDelay);
+ return this;
+ }
+ /**
+ * The consumer logs a start/complete log line when it polls. This
+ * option allows you to configure the logging level for that.
+ *
+ * The option is a: <code>org.apache.camel.LoggingLevel</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo4EndpointConsumerBuilder runLoggingLevel(
+ LoggingLevel runLoggingLevel) {
+ doSetProperty("runLoggingLevel", runLoggingLevel);
+ return this;
+ }
+ /**
+ * The consumer logs a start/complete log line when it polls. This
+ * option allows you to configure the logging level for that.
+ *
+ * The option will be converted to a
+ * <code>org.apache.camel.LoggingLevel</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo4EndpointConsumerBuilder runLoggingLevel(
+ String runLoggingLevel) {
+ doSetProperty("runLoggingLevel", runLoggingLevel);
+ return this;
+ }
+ /**
+ * Allows for configuring a custom/shared thread pool to use for the
+ * consumer. By default each consumer has its own single threaded thread
+ * pool.
+ *
+ * The option is a:
+ * <code>java.util.concurrent.ScheduledExecutorService</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo4EndpointConsumerBuilder scheduledExecutorService(
+ ScheduledExecutorService scheduledExecutorService) {
+ doSetProperty("scheduledExecutorService", scheduledExecutorService);
+ return this;
+ }
+ /**
+ * Allows for configuring a custom/shared thread pool to use for the
+ * consumer. By default each consumer has its own single threaded thread
+ * pool.
+ *
+ * The option will be converted to a
+ * <code>java.util.concurrent.ScheduledExecutorService</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo4EndpointConsumerBuilder scheduledExecutorService(
+ String scheduledExecutorService) {
+ doSetProperty("scheduledExecutorService", scheduledExecutorService);
+ return this;
+ }
+ /**
+ * To use a cron scheduler from either camel-spring or camel-quartz
+ * component.
+ *
+ * The option is a: <code>java.lang.String</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo4EndpointConsumerBuilder scheduler(String scheduler) {
+ doSetProperty("scheduler", scheduler);
+ return this;
+ }
+ /**
+ * To configure additional properties when using a custom scheduler or
+ * any of the Quartz, Spring based scheduler.
+ *
+ * The option is a: <code>java.util.Map<java.lang.String,
+ * java.lang.Object></code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo4EndpointConsumerBuilder schedulerProperties(
+ Map<String, Object> schedulerProperties) {
+ doSetProperty("schedulerProperties", schedulerProperties);
+ return this;
+ }
+ /**
+ * To configure additional properties when using a custom scheduler or
+ * any of the Quartz, Spring based scheduler.
+ *
+ * The option will be converted to a
+ * <code>java.util.Map<java.lang.String, java.lang.Object></code>
+ * type.
+ *
+ * Group: scheduler
+ */
+ default Olingo4EndpointConsumerBuilder schedulerProperties(
+ String schedulerProperties) {
+ doSetProperty("schedulerProperties", schedulerProperties);
+ return this;
+ }
+ /**
+ * Whether the scheduler should be auto started.
+ *
+ * The option is a: <code>boolean</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo4EndpointConsumerBuilder startScheduler(
+ boolean startScheduler) {
+ doSetProperty("startScheduler", startScheduler);
+ return this;
+ }
+ /**
+ * Whether the scheduler should be auto started.
+ *
+ * The option will be converted to a <code>boolean</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo4EndpointConsumerBuilder startScheduler(
+ String startScheduler) {
+ doSetProperty("startScheduler", startScheduler);
+ return this;
+ }
+ /**
+ * Time unit for initialDelay and delay options.
+ *
+ * The option is a: <code>java.util.concurrent.TimeUnit</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo4EndpointConsumerBuilder timeUnit(TimeUnit timeUnit) {
+ doSetProperty("timeUnit", timeUnit);
+ return this;
+ }
+ /**
+ * Time unit for initialDelay and delay options.
+ *
+ * The option will be converted to a
+ * <code>java.util.concurrent.TimeUnit</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo4EndpointConsumerBuilder timeUnit(String timeUnit) {
+ doSetProperty("timeUnit", timeUnit);
+ return this;
+ }
+ /**
+ * Controls if fixed delay or fixed rate is used. See
+ * ScheduledExecutorService in JDK for details.
+ *
+ * The option is a: <code>boolean</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo4EndpointConsumerBuilder useFixedDelay(
+ boolean useFixedDelay) {
+ doSetProperty("useFixedDelay", useFixedDelay);
+ return this;
+ }
+ /**
+ * Controls if fixed delay or fixed rate is used. See
+ * ScheduledExecutorService in JDK for details.
+ *
+ * The option will be converted to a <code>boolean</code> type.
+ *
+ * Group: scheduler
+ */
+ default Olingo4EndpointConsumerBuilder useFixedDelay(
+ String useFixedDelay) {
+ doSetProperty("useFixedDelay", useFixedDelay);
+ return this;
+ }
}
/**
@@ -401,6 +790,38 @@ public interface Olingo4EndpointBuilderFactory {
return this;
}
/**
+ * A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing
+ * you to provide your custom implementation to control error handling
+ * usually occurred during the poll operation before an Exchange have
+ * been created and being routed in Camel.
+ *
+ * The option is a:
+ * <code>org.apache.camel.spi.PollingConsumerPollStrategy</code> type.
+ *
+ * Group: consumer (advanced)
+ */
+ default AdvancedOlingo4EndpointConsumerBuilder pollStrategy(
+ PollingConsumerPollStrategy pollStrategy) {
+ doSetProperty("pollStrategy", pollStrategy);
+ return this;
+ }
+ /**
+ * A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing
+ * you to provide your custom implementation to control error handling
+ * usually occurred during the poll operation before an Exchange have
+ * been created and being routed in Camel.
+ *
+ * The option will be converted to a
+ * <code>org.apache.camel.spi.PollingConsumerPollStrategy</code> type.
+ *
+ * Group: consumer (advanced)
+ */
+ default AdvancedOlingo4EndpointConsumerBuilder pollStrategy(
+ String pollStrategy) {
+ doSetProperty("pollStrategy", pollStrategy);
+ return this;
+ }
+ /**
* Whether the endpoint should use basic property binding (Camel 2.x) or
* the newer property binding with additional capabilities.
*
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwilioEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwilioEndpointBuilderFactory.java
index fa4bd04..1cb038c 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwilioEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwilioEndpointBuilderFactory.java
@@ -16,12 +16,17 @@
*/
package org.apache.camel.builder.endpoint.dsl;
+import java.util.Map;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
import javax.annotation.Generated;
import org.apache.camel.ExchangePattern;
+import org.apache.camel.LoggingLevel;
import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
import org.apache.camel.spi.ExceptionHandler;
+import org.apache.camel.spi.PollingConsumerPollStrategy;
/**
* The Twilio component allows you to interact with the Twilio REST APIs using
@@ -89,6 +94,364 @@ public interface TwilioEndpointBuilderFactory {
doSetProperty("bridgeErrorHandler", bridgeErrorHandler);
return this;
}
+ /**
+ * If the polling consumer did not poll any files, you can enable this
+ * option to send an empty message (no body) instead.
+ *
+ * The option is a: <code>boolean</code> type.
+ *
+ * Group: consumer
+ */
+ default TwilioEndpointConsumerBuilder sendEmptyMessageWhenIdle(
+ boolean sendEmptyMessageWhenIdle) {
+ doSetProperty("sendEmptyMessageWhenIdle", sendEmptyMessageWhenIdle);
+ return this;
+ }
+ /**
+ * If the polling consumer did not poll any files, you can enable this
+ * option to send an empty message (no body) instead.
+ *
+ * The option will be converted to a <code>boolean</code> type.
+ *
+ * Group: consumer
+ */
+ default TwilioEndpointConsumerBuilder sendEmptyMessageWhenIdle(
+ String sendEmptyMessageWhenIdle) {
+ doSetProperty("sendEmptyMessageWhenIdle", sendEmptyMessageWhenIdle);
+ return this;
+ }
+ /**
+ * The number of subsequent error polls (failed due some error) that
+ * should happen before the backoffMultipler should kick-in.
+ *
+ * The option is a: <code>int</code> type.
+ *
+ * Group: scheduler
+ */
+ default TwilioEndpointConsumerBuilder backoffErrorThreshold(
+ int backoffErrorThreshold) {
+ doSetProperty("backoffErrorThreshold", backoffErrorThreshold);
+ return this;
+ }
+ /**
+ * The number of subsequent error polls (failed due some error) that
+ * should happen before the backoffMultipler should kick-in.
+ *
+ * The option will be converted to a <code>int</code> type.
+ *
+ * Group: scheduler
+ */
+ default TwilioEndpointConsumerBuilder backoffErrorThreshold(
+ String backoffErrorThreshold) {
+ doSetProperty("backoffErrorThreshold", backoffErrorThreshold);
+ return this;
+ }
+ /**
+ * The number of subsequent idle polls that should happen before the
+ * backoffMultipler should kick-in.
+ *
+ * The option is a: <code>int</code> type.
+ *
+ * Group: scheduler
+ */
+ default TwilioEndpointConsumerBuilder backoffIdleThreshold(
+ int backoffIdleThreshold) {
+ doSetProperty("backoffIdleThreshold", backoffIdleThreshold);
+ return this;
+ }
+ /**
+ * The number of subsequent idle polls that should happen before the
+ * backoffMultipler should kick-in.
+ *
+ * The option will be converted to a <code>int</code> type.
+ *
+ * Group: scheduler
+ */
+ default TwilioEndpointConsumerBuilder backoffIdleThreshold(
+ String backoffIdleThreshold) {
+ doSetProperty("backoffIdleThreshold", backoffIdleThreshold);
+ return this;
+ }
+ /**
+ * To let the scheduled polling consumer backoff if there has been a
+ * number of subsequent idles/errors in a row. The multiplier is then
+ * the number of polls that will be skipped before the next actual
+ * attempt is happening again. When this option is in use then
+ * backoffIdleThreshold and/or backoffErrorThreshold must also be
+ * configured.
+ *
+ * The option is a: <code>int</code> type.
+ *
+ * Group: scheduler
+ */
+ default TwilioEndpointConsumerBuilder backoffMultiplier(
+ int backoffMultiplier) {
+ doSetProperty("backoffMultiplier", backoffMultiplier);
+ return this;
+ }
+ /**
+ * To let the scheduled polling consumer backoff if there has been a
+ * number of subsequent idles/errors in a row. The multiplier is then
+ * the number of polls that will be skipped before the next actual
+ * attempt is happening again. When this option is in use then
+ * backoffIdleThreshold and/or backoffErrorThreshold must also be
+ * configured.
+ *
+ * The option will be converted to a <code>int</code> type.
+ *
+ * Group: scheduler
+ */
+ default TwilioEndpointConsumerBuilder backoffMultiplier(
+ String backoffMultiplier) {
+ doSetProperty("backoffMultiplier", backoffMultiplier);
+ return this;
+ }
+ /**
+ * Milliseconds before the next poll. You can also specify time values
+ * using units, such as 60s (60 seconds), 5m30s (5 minutes and 30
+ * seconds), and 1h (1 hour).
+ *
+ * The option is a: <code>long</code> type.
+ *
+ * Group: scheduler
+ */
+ default TwilioEndpointConsumerBuilder delay(long delay) {
+ doSetProperty("delay", delay);
+ return this;
+ }
+ /**
+ * Milliseconds before the next poll. You can also specify time values
+ * using units, such as 60s (60 seconds), 5m30s (5 minutes and 30
+ * seconds), and 1h (1 hour).
+ *
+ * The option will be converted to a <code>long</code> type.
+ *
+ * Group: scheduler
+ */
+ default TwilioEndpointConsumerBuilder delay(String delay) {
+ doSetProperty("delay", delay);
+ return this;
+ }
+ /**
+ * If greedy is enabled, then the ScheduledPollConsumer will run
+ * immediately again, if the previous run polled 1 or more messages.
+ *
+ * The option is a: <code>boolean</code> type.
+ *
+ * Group: scheduler
+ */
+ default TwilioEndpointConsumerBuilder greedy(boolean greedy) {
+ doSetProperty("greedy", greedy);
+ return this;
+ }
+ /**
+ * If greedy is enabled, then the ScheduledPollConsumer will run
+ * immediately again, if the previous run polled 1 or more messages.
+ *
+ * The option will be converted to a <code>boolean</code> type.
+ *
+ * Group: scheduler
+ */
+ default TwilioEndpointConsumerBuilder greedy(String greedy) {
+ doSetProperty("greedy", greedy);
+ return this;
+ }
+ /**
+ * Milliseconds before the first poll starts. You can also specify time
+ * values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30
+ * seconds), and 1h (1 hour).
+ *
+ * The option is a: <code>long</code> type.
+ *
+ * Group: scheduler
+ */
+ default TwilioEndpointConsumerBuilder initialDelay(long initialDelay) {
+ doSetProperty("initialDelay", initialDelay);
+ return this;
+ }
+ /**
+ * Milliseconds before the first poll starts. You can also specify time
+ * values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30
+ * seconds), and 1h (1 hour).
+ *
+ * The option will be converted to a <code>long</code> type.
+ *
+ * Group: scheduler
+ */
+ default TwilioEndpointConsumerBuilder initialDelay(String initialDelay) {
+ doSetProperty("initialDelay", initialDelay);
+ return this;
+ }
+ /**
+ * The consumer logs a start/complete log line when it polls. This
+ * option allows you to configure the logging level for that.
+ *
+ * The option is a: <code>org.apache.camel.LoggingLevel</code> type.
+ *
+ * Group: scheduler
+ */
+ default TwilioEndpointConsumerBuilder runLoggingLevel(
+ LoggingLevel runLoggingLevel) {
+ doSetProperty("runLoggingLevel", runLoggingLevel);
+ return this;
+ }
+ /**
+ * The consumer logs a start/complete log line when it polls. This
+ * option allows you to configure the logging level for that.
+ *
+ * The option will be converted to a
+ * <code>org.apache.camel.LoggingLevel</code> type.
+ *
+ * Group: scheduler
+ */
+ default TwilioEndpointConsumerBuilder runLoggingLevel(
+ String runLoggingLevel) {
+ doSetProperty("runLoggingLevel", runLoggingLevel);
+ return this;
+ }
+ /**
+ * Allows for configuring a custom/shared thread pool to use for the
+ * consumer. By default each consumer has its own single threaded thread
+ * pool.
+ *
+ * The option is a:
+ * <code>java.util.concurrent.ScheduledExecutorService</code> type.
+ *
+ * Group: scheduler
+ */
+ default TwilioEndpointConsumerBuilder scheduledExecutorService(
+ ScheduledExecutorService scheduledExecutorService) {
+ doSetProperty("scheduledExecutorService", scheduledExecutorService);
+ return this;
+ }
+ /**
+ * Allows for configuring a custom/shared thread pool to use for the
+ * consumer. By default each consumer has its own single threaded thread
+ * pool.
+ *
+ * The option will be converted to a
+ * <code>java.util.concurrent.ScheduledExecutorService</code> type.
+ *
+ * Group: scheduler
+ */
+ default TwilioEndpointConsumerBuilder scheduledExecutorService(
+ String scheduledExecutorService) {
+ doSetProperty("scheduledExecutorService", scheduledExecutorService);
+ return this;
+ }
+ /**
+ * To use a cron scheduler from either camel-spring or camel-quartz
+ * component.
+ *
+ * The option is a: <code>java.lang.String</code> type.
+ *
+ * Group: scheduler
+ */
+ default TwilioEndpointConsumerBuilder scheduler(String scheduler) {
+ doSetProperty("scheduler", scheduler);
+ return this;
+ }
+ /**
+ * To configure additional properties when using a custom scheduler or
+ * any of the Quartz, Spring based scheduler.
+ *
+ * The option is a: <code>java.util.Map<java.lang.String,
+ * java.lang.Object></code> type.
+ *
+ * Group: scheduler
+ */
+ default TwilioEndpointConsumerBuilder schedulerProperties(
+ Map<String, Object> schedulerProperties) {
+ doSetProperty("schedulerProperties", schedulerProperties);
+ return this;
+ }
+ /**
+ * To configure additional properties when using a custom scheduler or
+ * any of the Quartz, Spring based scheduler.
+ *
+ * The option will be converted to a
+ * <code>java.util.Map<java.lang.String, java.lang.Object></code>
+ * type.
+ *
+ * Group: scheduler
+ */
+ default TwilioEndpointConsumerBuilder schedulerProperties(
+ String schedulerProperties) {
+ doSetProperty("schedulerProperties", schedulerProperties);
+ return this;
+ }
+ /**
+ * Whether the scheduler should be auto started.
+ *
+ * The option is a: <code>boolean</code> type.
+ *
+ * Group: scheduler
+ */
+ default TwilioEndpointConsumerBuilder startScheduler(
+ boolean startScheduler) {
+ doSetProperty("startScheduler", startScheduler);
+ return this;
+ }
+ /**
+ * Whether the scheduler should be auto started.
+ *
+ * The option will be converted to a <code>boolean</code> type.
+ *
+ * Group: scheduler
+ */
+ default TwilioEndpointConsumerBuilder startScheduler(
+ String startScheduler) {
+ doSetProperty("startScheduler", startScheduler);
+ return this;
+ }
+ /**
+ * Time unit for initialDelay and delay options.
+ *
+ * The option is a: <code>java.util.concurrent.TimeUnit</code> type.
+ *
+ * Group: scheduler
+ */
+ default TwilioEndpointConsumerBuilder timeUnit(TimeUnit timeUnit) {
+ doSetProperty("timeUnit", timeUnit);
+ return this;
+ }
+ /**
+ * Time unit for initialDelay and delay options.
+ *
+ * The option will be converted to a
+ * <code>java.util.concurrent.TimeUnit</code> type.
+ *
+ * Group: scheduler
+ */
+ default TwilioEndpointConsumerBuilder timeUnit(String timeUnit) {
+ doSetProperty("timeUnit", timeUnit);
+ return this;
+ }
+ /**
+ * Controls if fixed delay or fixed rate is used. See
+ * ScheduledExecutorService in JDK for details.
+ *
+ * The option is a: <code>boolean</code> type.
+ *
+ * Group: scheduler
+ */
+ default TwilioEndpointConsumerBuilder useFixedDelay(
+ boolean useFixedDelay) {
+ doSetProperty("useFixedDelay", useFixedDelay);
+ return this;
+ }
+ /**
+ * Controls if fixed delay or fixed rate is used. See
+ * ScheduledExecutorService in JDK for details.
+ *
+ * The option will be converted to a <code>boolean</code> type.
+ *
+ * Group: scheduler
+ */
+ default TwilioEndpointConsumerBuilder useFixedDelay(String useFixedDelay) {
+ doSetProperty("useFixedDelay", useFixedDelay);
+ return this;
+ }
}
/**
@@ -158,6 +521,38 @@ public interface TwilioEndpointBuilderFactory {
return this;
}
/**
+ * A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing
+ * you to provide your custom implementation to control error handling
+ * usually occurred during the poll operation before an Exchange have
+ * been created and being routed in Camel.
+ *
+ * The option is a:
+ * <code>org.apache.camel.spi.PollingConsumerPollStrategy</code> type.
+ *
+ * Group: consumer (advanced)
+ */
+ default AdvancedTwilioEndpointConsumerBuilder pollStrategy(
+ PollingConsumerPollStrategy pollStrategy) {
+ doSetProperty("pollStrategy", pollStrategy);
+ return this;
+ }
+ /**
+ * A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing
+ * you to provide your custom implementation to control error handling
+ * usually occurred during the poll operation before an Exchange have
+ * been created and being routed in Camel.
+ *
+ * The option will be converted to a
+ * <code>org.apache.camel.spi.PollingConsumerPollStrategy</code> type.
+ *
+ * Group: consumer (advanced)
+ */
+ default AdvancedTwilioEndpointConsumerBuilder pollStrategy(
+ String pollStrategy) {
+ doSetProperty("pollStrategy", pollStrategy);
+ return this;
+ }
+ /**
* Whether the endpoint should use basic property binding (Camel 2.x) or
* the newer property binding with additional capabilities.
*
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ZendeskEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ZendeskEndpointBuilderFactory.java
index e8febb7..00cf47d 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ZendeskEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ZendeskEndpointBuilderFactory.java
@@ -16,12 +16,17 @@
*/
package org.apache.camel.builder.endpoint.dsl;
+import java.util.Map;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
import javax.annotation.Generated;
import org.apache.camel.ExchangePattern;
+import org.apache.camel.LoggingLevel;
import org.apache.camel.builder.EndpointConsumerBuilder;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
import org.apache.camel.spi.ExceptionHandler;
+import org.apache.camel.spi.PollingConsumerPollStrategy;
/**
* Allows producing messages to manage Zendesk ticket, user, organization, etc.
@@ -100,6 +105,365 @@ public interface ZendeskEndpointBuilderFactory {
return this;
}
/**
+ * If the polling consumer did not poll any files, you can enable this
+ * option to send an empty message (no body) instead.
+ *
+ * The option is a: <code>boolean</code> type.
+ *
+ * Group: consumer
+ */
+ default ZendeskEndpointConsumerBuilder sendEmptyMessageWhenIdle(
+ boolean sendEmptyMessageWhenIdle) {
+ doSetProperty("sendEmptyMessageWhenIdle", sendEmptyMessageWhenIdle);
+ return this;
+ }
+ /**
+ * If the polling consumer did not poll any files, you can enable this
+ * option to send an empty message (no body) instead.
+ *
+ * The option will be converted to a <code>boolean</code> type.
+ *
+ * Group: consumer
+ */
+ default ZendeskEndpointConsumerBuilder sendEmptyMessageWhenIdle(
+ String sendEmptyMessageWhenIdle) {
+ doSetProperty("sendEmptyMessageWhenIdle", sendEmptyMessageWhenIdle);
+ return this;
+ }
+ /**
+ * The number of subsequent error polls (failed due some error) that
+ * should happen before the backoffMultipler should kick-in.
+ *
+ * The option is a: <code>int</code> type.
+ *
+ * Group: scheduler
+ */
+ default ZendeskEndpointConsumerBuilder backoffErrorThreshold(
+ int backoffErrorThreshold) {
+ doSetProperty("backoffErrorThreshold", backoffErrorThreshold);
+ return this;
+ }
+ /**
+ * The number of subsequent error polls (failed due some error) that
+ * should happen before the backoffMultipler should kick-in.
+ *
+ * The option will be converted to a <code>int</code> type.
+ *
+ * Group: scheduler
+ */
+ default ZendeskEndpointConsumerBuilder backoffErrorThreshold(
+ String backoffErrorThreshold) {
+ doSetProperty("backoffErrorThreshold", backoffErrorThreshold);
+ return this;
+ }
+ /**
+ * The number of subsequent idle polls that should happen before the
+ * backoffMultipler should kick-in.
+ *
+ * The option is a: <code>int</code> type.
+ *
+ * Group: scheduler
+ */
+ default ZendeskEndpointConsumerBuilder backoffIdleThreshold(
+ int backoffIdleThreshold) {
+ doSetProperty("backoffIdleThreshold", backoffIdleThreshold);
+ return this;
+ }
+ /**
+ * The number of subsequent idle polls that should happen before the
+ * backoffMultipler should kick-in.
+ *
+ * The option will be converted to a <code>int</code> type.
+ *
+ * Group: scheduler
+ */
+ default ZendeskEndpointConsumerBuilder backoffIdleThreshold(
+ String backoffIdleThreshold) {
+ doSetProperty("backoffIdleThreshold", backoffIdleThreshold);
+ return this;
+ }
+ /**
+ * To let the scheduled polling consumer backoff if there has been a
+ * number of subsequent idles/errors in a row. The multiplier is then
+ * the number of polls that will be skipped before the next actual
+ * attempt is happening again. When this option is in use then
+ * backoffIdleThreshold and/or backoffErrorThreshold must also be
+ * configured.
+ *
+ * The option is a: <code>int</code> type.
+ *
+ * Group: scheduler
+ */
+ default ZendeskEndpointConsumerBuilder backoffMultiplier(
+ int backoffMultiplier) {
+ doSetProperty("backoffMultiplier", backoffMultiplier);
+ return this;
+ }
+ /**
+ * To let the scheduled polling consumer backoff if there has been a
+ * number of subsequent idles/errors in a row. The multiplier is then
+ * the number of polls that will be skipped before the next actual
+ * attempt is happening again. When this option is in use then
+ * backoffIdleThreshold and/or backoffErrorThreshold must also be
+ * configured.
+ *
+ * The option will be converted to a <code>int</code> type.
+ *
+ * Group: scheduler
+ */
+ default ZendeskEndpointConsumerBuilder backoffMultiplier(
+ String backoffMultiplier) {
+ doSetProperty("backoffMultiplier", backoffMultiplier);
+ return this;
+ }
+ /**
+ * Milliseconds before the next poll. You can also specify time values
+ * using units, such as 60s (60 seconds), 5m30s (5 minutes and 30
+ * seconds), and 1h (1 hour).
+ *
+ * The option is a: <code>long</code> type.
+ *
+ * Group: scheduler
+ */
+ default ZendeskEndpointConsumerBuilder delay(long delay) {
+ doSetProperty("delay", delay);
+ return this;
+ }
+ /**
+ * Milliseconds before the next poll. You can also specify time values
+ * using units, such as 60s (60 seconds), 5m30s (5 minutes and 30
+ * seconds), and 1h (1 hour).
+ *
+ * The option will be converted to a <code>long</code> type.
+ *
+ * Group: scheduler
+ */
+ default ZendeskEndpointConsumerBuilder delay(String delay) {
+ doSetProperty("delay", delay);
+ return this;
+ }
+ /**
+ * If greedy is enabled, then the ScheduledPollConsumer will run
+ * immediately again, if the previous run polled 1 or more messages.
+ *
+ * The option is a: <code>boolean</code> type.
+ *
+ * Group: scheduler
+ */
+ default ZendeskEndpointConsumerBuilder greedy(boolean greedy) {
+ doSetProperty("greedy", greedy);
+ return this;
+ }
+ /**
+ * If greedy is enabled, then the ScheduledPollConsumer will run
+ * immediately again, if the previous run polled 1 or more messages.
+ *
+ * The option will be converted to a <code>boolean</code> type.
+ *
+ * Group: scheduler
+ */
+ default ZendeskEndpointConsumerBuilder greedy(String greedy) {
+ doSetProperty("greedy", greedy);
+ return this;
+ }
+ /**
+ * Milliseconds before the first poll starts. You can also specify time
+ * values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30
+ * seconds), and 1h (1 hour).
+ *
+ * The option is a: <code>long</code> type.
+ *
+ * Group: scheduler
+ */
+ default ZendeskEndpointConsumerBuilder initialDelay(long initialDelay) {
+ doSetProperty("initialDelay", initialDelay);
+ return this;
+ }
+ /**
+ * Milliseconds before the first poll starts. You can also specify time
+ * values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30
+ * seconds), and 1h (1 hour).
+ *
+ * The option will be converted to a <code>long</code> type.
+ *
+ * Group: scheduler
+ */
+ default ZendeskEndpointConsumerBuilder initialDelay(String initialDelay) {
+ doSetProperty("initialDelay", initialDelay);
+ return this;
+ }
+ /**
+ * The consumer logs a start/complete log line when it polls. This
+ * option allows you to configure the logging level for that.
+ *
+ * The option is a: <code>org.apache.camel.LoggingLevel</code> type.
+ *
+ * Group: scheduler
+ */
+ default ZendeskEndpointConsumerBuilder runLoggingLevel(
+ LoggingLevel runLoggingLevel) {
+ doSetProperty("runLoggingLevel", runLoggingLevel);
+ return this;
+ }
+ /**
+ * The consumer logs a start/complete log line when it polls. This
+ * option allows you to configure the logging level for that.
+ *
+ * The option will be converted to a
+ * <code>org.apache.camel.LoggingLevel</code> type.
+ *
+ * Group: scheduler
+ */
+ default ZendeskEndpointConsumerBuilder runLoggingLevel(
+ String runLoggingLevel) {
+ doSetProperty("runLoggingLevel", runLoggingLevel);
+ return this;
+ }
+ /**
+ * Allows for configuring a custom/shared thread pool to use for the
+ * consumer. By default each consumer has its own single threaded thread
+ * pool.
+ *
+ * The option is a:
+ * <code>java.util.concurrent.ScheduledExecutorService</code> type.
+ *
+ * Group: scheduler
+ */
+ default ZendeskEndpointConsumerBuilder scheduledExecutorService(
+ ScheduledExecutorService scheduledExecutorService) {
+ doSetProperty("scheduledExecutorService", scheduledExecutorService);
+ return this;
+ }
+ /**
+ * Allows for configuring a custom/shared thread pool to use for the
+ * consumer. By default each consumer has its own single threaded thread
+ * pool.
+ *
+ * The option will be converted to a
+ * <code>java.util.concurrent.ScheduledExecutorService</code> type.
+ *
+ * Group: scheduler
+ */
+ default ZendeskEndpointConsumerBuilder scheduledExecutorService(
+ String scheduledExecutorService) {
+ doSetProperty("scheduledExecutorService", scheduledExecutorService);
+ return this;
+ }
+ /**
+ * To use a cron scheduler from either camel-spring or camel-quartz
+ * component.
+ *
+ * The option is a: <code>java.lang.String</code> type.
+ *
+ * Group: scheduler
+ */
+ default ZendeskEndpointConsumerBuilder scheduler(String scheduler) {
+ doSetProperty("scheduler", scheduler);
+ return this;
+ }
+ /**
+ * To configure additional properties when using a custom scheduler or
+ * any of the Quartz, Spring based scheduler.
+ *
+ * The option is a: <code>java.util.Map<java.lang.String,
+ * java.lang.Object></code> type.
+ *
+ * Group: scheduler
+ */
+ default ZendeskEndpointConsumerBuilder schedulerProperties(
+ Map<String, Object> schedulerProperties) {
+ doSetProperty("schedulerProperties", schedulerProperties);
+ return this;
+ }
+ /**
+ * To configure additional properties when using a custom scheduler or
+ * any of the Quartz, Spring based scheduler.
+ *
+ * The option will be converted to a
+ * <code>java.util.Map<java.lang.String, java.lang.Object></code>
+ * type.
+ *
+ * Group: scheduler
+ */
+ default ZendeskEndpointConsumerBuilder schedulerProperties(
+ String schedulerProperties) {
+ doSetProperty("schedulerProperties", schedulerProperties);
+ return this;
+ }
+ /**
+ * Whether the scheduler should be auto started.
+ *
+ * The option is a: <code>boolean</code> type.
+ *
+ * Group: scheduler
+ */
+ default ZendeskEndpointConsumerBuilder startScheduler(
+ boolean startScheduler) {
+ doSetProperty("startScheduler", startScheduler);
+ return this;
+ }
+ /**
+ * Whether the scheduler should be auto started.
+ *
+ * The option will be converted to a <code>boolean</code> type.
+ *
+ * Group: scheduler
+ */
+ default ZendeskEndpointConsumerBuilder startScheduler(
+ String startScheduler) {
+ doSetProperty("startScheduler", startScheduler);
+ return this;
+ }
+ /**
+ * Time unit for initialDelay and delay options.
+ *
+ * The option is a: <code>java.util.concurrent.TimeUnit</code> type.
+ *
+ * Group: scheduler
+ */
+ default ZendeskEndpointConsumerBuilder timeUnit(TimeUnit timeUnit) {
+ doSetProperty("timeUnit", timeUnit);
+ return this;
+ }
+ /**
+ * Time unit for initialDelay and delay options.
+ *
+ * The option will be converted to a
+ * <code>java.util.concurrent.TimeUnit</code> type.
+ *
+ * Group: scheduler
+ */
+ default ZendeskEndpointConsumerBuilder timeUnit(String timeUnit) {
+ doSetProperty("timeUnit", timeUnit);
+ return this;
+ }
+ /**
+ * Controls if fixed delay or fixed rate is used. See
+ * ScheduledExecutorService in JDK for details.
+ *
+ * The option is a: <code>boolean</code> type.
+ *
+ * Group: scheduler
+ */
+ default ZendeskEndpointConsumerBuilder useFixedDelay(
+ boolean useFixedDelay) {
+ doSetProperty("useFixedDelay", useFixedDelay);
+ return this;
+ }
+ /**
+ * Controls if fixed delay or fixed rate is used. See
+ * ScheduledExecutorService in JDK for details.
+ *
+ * The option will be converted to a <code>boolean</code> type.
+ *
+ * Group: scheduler
+ */
+ default ZendeskEndpointConsumerBuilder useFixedDelay(
+ String useFixedDelay) {
+ doSetProperty("useFixedDelay", useFixedDelay);
+ return this;
+ }
+ /**
* The OAuth token.
*
* The option is a: <code>java.lang.String</code> type.
@@ -212,6 +576,38 @@ public interface ZendeskEndpointBuilderFactory {
return this;
}
/**
+ * A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing
+ * you to provide your custom implementation to control error handling
+ * usually occurred during the poll operation before an Exchange have
+ * been created and being routed in Camel.
+ *
+ * The option is a:
+ * <code>org.apache.camel.spi.PollingConsumerPollStrategy</code> type.
+ *
+ * Group: consumer (advanced)
+ */
+ default AdvancedZendeskEndpointConsumerBuilder pollStrategy(
+ PollingConsumerPollStrategy pollStrategy) {
+ doSetProperty("pollStrategy", pollStrategy);
+ return this;
+ }
+ /**
+ * A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing
+ * you to provide your custom implementation to control error handling
+ * usually occurred during the poll operation before an Exchange have
+ * been created and being routed in Camel.
+ *
+ * The option will be converted to a
+ * <code>org.apache.camel.spi.PollingConsumerPollStrategy</code> type.
+ *
+ * Group: consumer (advanced)
+ */
+ default AdvancedZendeskEndpointConsumerBuilder pollStrategy(
+ String pollStrategy) {
+ doSetProperty("pollStrategy", pollStrategy);
+ return this;
+ }
+ /**
* Whether the endpoint should use basic property binding (Camel 2.x) or
* the newer property binding with additional capabilities.
*
diff --git a/examples/camel-example-jooq/README.adoc b/examples/camel-example-jooq/README.adoc
index fd7cdc0..69ad705 100644
--- a/examples/camel-example-jooq/README.adoc
+++ b/examples/camel-example-jooq/README.adoc
@@ -49,7 +49,7 @@ To stop the example hit kbd:[Ctrl+c]
<!-- Consumer -->
<route id="consume-route">
- <from uri="jooq://org.apache.camel.examples.jooq.db.tables.records.BookStoreRecord?consumer.delay=5000&consumeDelete=true"/>
+ <from uri="jooq://org.apache.camel.examples.jooq.db.tables.records.BookStoreRecord?delay=5000&consumeDelete=true"/>
<log message="Consumed: ${body}"/>
</route>
</camelContext>
diff --git a/examples/camel-example-jooq/src/main/resources/META-INF/spring/camel-context.xml b/examples/camel-example-jooq/src/main/resources/META-INF/spring/camel-context.xml
index 065c0c8..ff47b4a 100644
--- a/examples/camel-example-jooq/src/main/resources/META-INF/spring/camel-context.xml
+++ b/examples/camel-example-jooq/src/main/resources/META-INF/spring/camel-context.xml
@@ -58,7 +58,7 @@
<!-- Consumer -->
<route id="consume-route">
- <from uri="jooq://org.apache.camel.examples.jooq.db.tables.records.BookStoreRecord?consumer.delay=5000&consumeDelete=true"/>
+ <from uri="jooq://org.apache.camel.examples.jooq.db.tables.records.BookStoreRecord?delay=5000&consumeDelete=true"/>
<log message="Consumed: ${body}"/>
</route>
</camelContext>
diff --git a/examples/camel-example-spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/Application.java b/examples/camel-example-spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/Application.java
index 9618659..a038353 100644
--- a/examples/camel-example-spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/Application.java
+++ b/examples/camel-example-spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/Application.java
@@ -74,8 +74,8 @@ public class Application extends SpringBootServletInitializer {
// A second route polls the DB for new orders and processes them
from("jpa:org.apache.camel.example.spring.boot.rest.jpa.Order"
- + "?consumer.namedQuery=new-orders"
- + "&consumer.delay={{example.processOrderPeriod:5s}}"
+ + "?namedQuery=new-orders"
+ + "&delay={{example.processOrderPeriod:5s}}"
+ "&consumeDelete=false")
.routeId("process-order")
.log("Processed order #id ${body.id} with ${body.amount} copies of the «${body.book.description}» book");
diff --git a/platforms/spring-boot/components-starter/camel-olingo2-starter/src/main/java/org/apache/camel/component/olingo2/springboot/Olingo2ComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-olingo2-starter/src/main/java/org/apache/camel/component/olingo2/springboot/Olingo2ComponentConfiguration.java
index 20c1249..0075b03 100644
--- a/platforms/spring-boot/components-starter/camel-olingo2-starter/src/main/java/org/apache/camel/component/olingo2/springboot/Olingo2ComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-olingo2-starter/src/main/java/org/apache/camel/component/olingo2/springboot/Olingo2ComponentConfiguration.java
@@ -143,6 +143,12 @@ public class Olingo2ComponentConfiguration
* communicated by this component.
*/
private Boolean filterAlreadySeen = false;
+ /**
+ * For endpoints that return an array or collection, a consumer endpoint
+ * will map every element to distinct messages, unless splitResult is
+ * set to false.
+ */
+ private Boolean splitResult = true;
public Olingo2ApiName getApiName() {
return apiName;
@@ -241,5 +247,13 @@ public class Olingo2ComponentConfiguration
public void setFilterAlreadySeen(Boolean filterAlreadySeen) {
this.filterAlreadySeen = filterAlreadySeen;
}
+
+ public Boolean getSplitResult() {
+ return splitResult;
+ }
+
+ public void setSplitResult(Boolean splitResult) {
+ this.splitResult = splitResult;
+ }
}
}
\ No newline at end of file
diff --git a/platforms/spring-boot/components-starter/camel-olingo4-starter/src/main/java/org/apache/camel/component/olingo4/springboot/Olingo4ComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-olingo4-starter/src/main/java/org/apache/camel/component/olingo4/springboot/Olingo4ComponentConfiguration.java
index 4524144..f562572 100644
--- a/platforms/spring-boot/components-starter/camel-olingo4-starter/src/main/java/org/apache/camel/component/olingo4/springboot/Olingo4ComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-olingo4-starter/src/main/java/org/apache/camel/component/olingo4/springboot/Olingo4ComponentConfiguration.java
@@ -143,6 +143,12 @@ public class Olingo4ComponentConfiguration
* communicated by this component.
*/
private Boolean filterAlreadySeen = false;
+ /**
+ * For endpoints that return an array or collection, a consumer endpoint
+ * will map every element to distinct messages, unless splitResult is
+ * set to false.
+ */
+ private Boolean splitResult = true;
public Olingo4ApiName getApiName() {
return apiName;
@@ -241,5 +247,13 @@ public class Olingo4ComponentConfiguration
public void setFilterAlreadySeen(Boolean filterAlreadySeen) {
this.filterAlreadySeen = filterAlreadySeen;
}
+
+ public Boolean getSplitResult() {
+ return splitResult;
+ }
+
+ public void setSplitResult(Boolean splitResult) {
+ this.splitResult = splitResult;
+ }
}
}
\ No newline at end of file
[camel] 02/11: CAMEL-13925: camel-seda - SedaConsumer should extend
DefaultConsumer
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit eee4e0e5f09bbae7574e3113bd1a612e1892fea3
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Sep 2 09:45:25 2019 +0200
CAMEL-13925: camel-seda - SedaConsumer should extend DefaultConsumer
---
.../apache/camel/component/seda/SedaConsumer.java | 85 ++++++++--------------
1 file changed, 30 insertions(+), 55 deletions(-)
diff --git a/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaConsumer.java b/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
index d5517b8..e6c2bde 100644
--- a/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
+++ b/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
@@ -24,21 +24,16 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.camel.AsyncProcessor;
-import org.apache.camel.Consumer;
-import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.ShutdownRunningTask;
import org.apache.camel.Suspendable;
-import org.apache.camel.spi.ExceptionHandler;
import org.apache.camel.spi.ShutdownAware;
import org.apache.camel.spi.Synchronization;
-import org.apache.camel.support.AsyncProcessorConverterHelper;
+import org.apache.camel.support.DefaultConsumer;
import org.apache.camel.support.EmptyAsyncCallback;
import org.apache.camel.support.ExchangeHelper;
-import org.apache.camel.support.LoggingExceptionHandler;
import org.apache.camel.support.UnitOfWorkHelper;
-import org.apache.camel.support.service.ServiceSupport;
import org.apache.camel.util.ObjectHelper;
/**
@@ -47,46 +42,23 @@ import org.apache.camel.util.ObjectHelper;
* In this implementation there is a little <i>slack period</i> when you suspend/stop the consumer, by which
* the consumer may pickup a newly arrived messages and process it. That period is up till 1 second.
*/
-public class SedaConsumer extends ServiceSupport implements Consumer, Runnable, ShutdownAware, Suspendable {
+public class SedaConsumer extends DefaultConsumer implements Runnable, ShutdownAware, Suspendable {
private final AtomicInteger taskCount = new AtomicInteger();
private volatile CountDownLatch latch;
private volatile boolean shutdownPending;
private volatile boolean forceShutdown;
- private SedaEndpoint endpoint;
- private AsyncProcessor processor;
private ExecutorService executor;
- private ExceptionHandler exceptionHandler;
private final int pollTimeout;
public SedaConsumer(SedaEndpoint endpoint, Processor processor) {
- this.endpoint = endpoint;
- this.processor = AsyncProcessorConverterHelper.convert(processor);
+ super(endpoint, processor);
this.pollTimeout = endpoint.getPollTimeout();
- this.exceptionHandler = new LoggingExceptionHandler(endpoint.getCamelContext(), getClass());
}
@Override
- public String toString() {
- return "SedaConsumer[" + endpoint + "]";
- }
-
- @Override
- public Endpoint getEndpoint() {
- return endpoint;
- }
-
- public ExceptionHandler getExceptionHandler() {
- return exceptionHandler;
- }
-
- public void setExceptionHandler(ExceptionHandler exceptionHandler) {
- this.exceptionHandler = exceptionHandler;
- }
-
- @Override
- public Processor getProcessor() {
- return processor;
+ public SedaEndpoint getEndpoint() {
+ return (SedaEndpoint) super.getEndpoint();
}
@Override
@@ -100,10 +72,10 @@ public class SedaConsumer extends ServiceSupport implements Consumer, Runnable,
public int getPendingExchangesSize() {
// the route is shutting down, so either we should purge the queue,
// or return how many exchanges are still on the queue
- if (endpoint.isPurgeWhenStopping()) {
- endpoint.purgeQueue();
+ if (getEndpoint().isPurgeWhenStopping()) {
+ getEndpoint().purgeQueue();
}
- return endpoint.getQueue().size();
+ return getEndpoint().getQueue().size();
}
@Override
@@ -159,7 +131,7 @@ public class SedaConsumer extends ServiceSupport implements Consumer, Runnable,
}
protected void doRun() {
- BlockingQueue<Exchange> queue = endpoint.getQueue();
+ BlockingQueue<Exchange> queue = getEndpoint().getQueue();
// loop while we are allowed, or if we are stopping loop until the queue is empty
while (queue != null && isRunAllowed()) {
@@ -246,9 +218,9 @@ public class SedaConsumer extends ServiceSupport implements Consumer, Runnable,
*/
protected Exchange prepareExchange(Exchange exchange) {
// send a new copied exchange with new camel context
- Exchange newExchange = ExchangeHelper.copyExchangeAndSetCamelContext(exchange, endpoint.getCamelContext());
+ Exchange newExchange = ExchangeHelper.copyExchangeAndSetCamelContext(exchange, getEndpoint().getCamelContext());
// set the from endpoint
- newExchange.setFromEndpoint(endpoint);
+ newExchange.setFromEndpoint(getEndpoint());
return newExchange;
}
@@ -265,13 +237,13 @@ public class SedaConsumer extends ServiceSupport implements Consumer, Runnable,
*/
protected void sendToConsumers(final Exchange exchange) throws Exception {
// validate multiple consumers has been enabled
- int size = endpoint.getConsumers().size();
- if (size > 1 && !endpoint.isMultipleConsumersSupported()) {
- throw new IllegalStateException("Multiple consumers for the same endpoint is not allowed: " + endpoint);
+ int size = getEndpoint().getConsumers().size();
+ if (size > 1 && !getEndpoint().isMultipleConsumersSupported()) {
+ throw new IllegalStateException("Multiple consumers for the same endpoint is not allowed: " + getEndpoint());
}
// if there are multiple consumers then multicast to them
- if (endpoint.isMultipleConsumersSupported()) {
+ if (getEndpoint().isMultipleConsumersSupported()) {
if (log.isTraceEnabled()) {
log.trace("Multicasting to {} consumers for Exchange: {}", size, exchange);
@@ -281,7 +253,7 @@ public class SedaConsumer extends ServiceSupport implements Consumer, Runnable,
final List<Synchronization> completions = exchange.handoverCompletions();
// use a multicast processor to process it
- AsyncProcessor mp = endpoint.getConsumerMulticastProcessor();
+ AsyncProcessor mp = getEndpoint().getConsumerMulticastProcessor();
ObjectHelper.notNull(mp, "ConsumerMulticastProcessor", this);
// and use the asynchronous routing engine to support it
@@ -291,40 +263,43 @@ public class SedaConsumer extends ServiceSupport implements Consumer, Runnable,
});
} else {
// use the regular processor and use the asynchronous routing engine to support it
- processor.process(exchange, EmptyAsyncCallback.get());
+ getAsyncProcessor().process(exchange, EmptyAsyncCallback.get());
}
}
@Override
protected void doStart() throws Exception {
- latch = new CountDownLatch(endpoint.getConcurrentConsumers());
+ super.doStart();
+ latch = new CountDownLatch(getEndpoint().getConcurrentConsumers());
shutdownPending = false;
forceShutdown = false;
setupTasks();
- endpoint.onStarted(this);
+ getEndpoint().onStarted(this);
}
@Override
protected void doSuspend() throws Exception {
- endpoint.onStopped(this);
+ getEndpoint().onStopped(this);
}
@Override
protected void doResume() throws Exception {
- endpoint.onStarted(this);
+ getEndpoint().onStarted(this);
}
@Override
protected void doStop() throws Exception {
// ensure queue is purged if we stop the consumer
- if (endpoint.isPurgeWhenStopping()) {
- endpoint.purgeQueue();
+ if (getEndpoint().isPurgeWhenStopping()) {
+ getEndpoint().purgeQueue();
}
- endpoint.onStopped(this);
+ getEndpoint().onStopped(this);
shutdownExecutor();
+
+ super.doStop();
}
@Override
@@ -334,7 +309,7 @@ public class SedaConsumer extends ServiceSupport implements Consumer, Runnable,
private void shutdownExecutor() {
if (executor != null) {
- endpoint.getCamelContext().getExecutorServiceManager().shutdownNow(executor);
+ getEndpoint().getCamelContext().getExecutorServiceManager().shutdownNow(executor);
executor = null;
}
}
@@ -343,11 +318,11 @@ public class SedaConsumer extends ServiceSupport implements Consumer, Runnable,
* Setup the thread pool and ensures tasks gets executed (if needed)
*/
private void setupTasks() {
- int poolSize = endpoint.getConcurrentConsumers();
+ int poolSize = getEndpoint().getConcurrentConsumers();
// create thread pool if needed
if (executor == null) {
- executor = endpoint.getCamelContext().getExecutorServiceManager().newFixedThreadPool(this, endpoint.getEndpointUri(), poolSize);
+ executor = getEndpoint().getCamelContext().getExecutorServiceManager().newFixedThreadPool(this, getEndpoint().getEndpointUri(), poolSize);
}
// submit needed number of tasks
[camel] 05/11: CAMEL-13917: Configuring endpoints with consumer.
prefix for consumer options is no longer supported as they should be
regular options instead. This also avoid reflection setting properties.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a3539d95533728fac60fb2d947a42c5c946710cf
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Sep 2 10:38:09 2019 +0200
CAMEL-13917: Configuring endpoints with consumer. prefix for consumer options is no longer supported as they should be regular options instead. This also avoid reflection setting properties.
---
MIGRATION.md | 4 ++++
.../org/apache/camel/blueprint/handler/CamelNamespaceHandler.java | 3 ---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/MIGRATION.md b/MIGRATION.md
index 680b032..1fa1eb4 100644
--- a/MIGRATION.md
+++ b/MIGRATION.md
@@ -139,6 +139,10 @@ The `rxjava2` component has been renamed to `rxjava`, and it's corresponding com
We have also renamed `camel-jetty9` to `camel-jetty`. The supported scheme is now `jetty`.
+### Using endpoint options with consumer. prefix
+
+Endpoints with `consumer.` prefix such as `consumer.delay=5000` are no longer supported (deprecated in latest Camel 2.x) and you should just use the option without the `consumer.` prefix, eg `delay=5000`.
+
### Tracing
A new tracer has been implemented and the old tracer has been removed.
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
index 4a6e4c6..c241ffd 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
@@ -1216,9 +1216,6 @@ public class CamelNamespaceHandler implements NamespaceHandler {
URI u = new URI(uri);
Map<String, Object> parameters = URISupport.parseParameters(u);
Object value = parameters.get("scheduler");
- if (value == null) {
- value = parameters.get("consumer.scheduler");
- }
if (value != null) {
// the scheduler can be quartz or spring based, so add reference to camel component
// from these components os blueprint knows about the requirement
[camel] 08/11: CAMEL-13917: Configuring endpoints with consumer.
prefix for consumer options is no longer supported as they should be
regular options instead. This also avoid reflection setting properties.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 944f7db67103f2fc18a2c38a937d1fe8ad34ace0
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Sep 2 15:31:31 2019 +0200
CAMEL-13917: Configuring endpoints with consumer. prefix for consumer options is no longer supported as they should be regular options instead. This also avoid reflection setting properties.
---
.../camel/component/mybatis/MyBatisEndpoint.java | 6 +++---
.../camel/component/mybatis/MyBatisQueueTest.java | 2 +-
.../mybatis/MyBatisRouteEmptyResultSetTest.java | 2 +-
.../src/main/docs/olingo2-component.adoc | 8 ++++----
.../camel/component/olingo2/Olingo2Component.java | 6 ------
.../component/olingo2/Olingo2Configuration.java | 14 ++++++++++++++
.../camel/component/olingo2/Olingo2Endpoint.java | 7 ++-----
.../olingo2/Olingo2ComponentConsumerTest.java | 16 ++++++++--------
.../camel/component/olingo2/Olingo2SampleServer.java | 2 +-
.../src/main/docs/olingo4-component.adoc | 6 +++---
.../component/olingo4/Olingo4Configuration.java | 14 ++++++++++++++
.../camel/component/olingo4/Olingo4Endpoint.java | 7 ++-----
.../olingo4/Olingo4ComponentConsumerTest.java | 20 ++++++++++----------
13 files changed, 63 insertions(+), 47 deletions(-)
diff --git a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisEndpoint.java b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisEndpoint.java
index 83eae40..d2d1503 100644
--- a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisEndpoint.java
+++ b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisEndpoint.java
@@ -41,11 +41,11 @@ public class MyBatisEndpoint extends BaseMyBatisEndpoint {
private boolean transacted;
@UriParam(label = "consumer", defaultValue = "0")
private int maxMessagesPerPoll;
- @UriParam(label = "consumer", optionalPrefix = "consumer.")
+ @UriParam(label = "consumer")
private String onConsume;
- @UriParam(label = "consumer", optionalPrefix = "consumer.", defaultValue = "true")
+ @UriParam(label = "consumer", defaultValue = "true")
private boolean useIterator = true;
- @UriParam(label = "consumer", optionalPrefix = "consumer.")
+ @UriParam(label = "consumer")
private boolean routeEmptyResultSet;
@UriParam(label = "consumer,advanced")
private MyBatisProcessingStrategy processingStrategy = new DefaultMyBatisProcessingStrategy();
diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisQueueTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisQueueTest.java
index c62eac1..513ac32 100644
--- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisQueueTest.java
+++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisQueueTest.java
@@ -76,7 +76,7 @@ public class MyBatisQueueTest extends MyBatisTestSupport {
return new RouteBuilder() {
public void configure() throws Exception {
// START SNIPPET: e1
- from("mybatis:selectUnprocessedAccounts?consumer.onConsume=consumeAccount").to("mock:results");
+ from("mybatis:selectUnprocessedAccounts?onConsume=consumeAccount").to("mock:results");
// END SNIPPET: e1
from("direct:start").to("mybatis:insertAccount?statementType=Insert");
diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisRouteEmptyResultSetTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisRouteEmptyResultSetTest.java
index 0b5eb41..820de39 100644
--- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisRouteEmptyResultSetTest.java
+++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisRouteEmptyResultSetTest.java
@@ -39,7 +39,7 @@ public class MyBatisRouteEmptyResultSetTest extends MyBatisTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("mybatis:selectAllAccounts?consumer.useIterator=false&consumer.routeEmptyResultSet=true").to("mock:results");
+ from("mybatis:selectAllAccounts?useIterator=false&routeEmptyResultSet=true").to("mock:results");
}
};
}
diff --git a/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc b/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc
index 2a4d460..83929b5 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc
+++ b/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc
@@ -254,11 +254,11 @@ java.util.List<java.util.Map<String, Object>> containing list of key property na
Only the *read* endpoint can be used as a consumer endpoint. Consumer
endpoints can
use http://camel.apache.org/polling-consumer.html#PollingConsumer-ScheduledPollConsumerOptions[Scheduled
-Poll Consumer Options] with a *`consumer.`* prefix to schedule endpoint
+Poll Consumer Options] to schedule endpoint
invocation. By default consumer endpoints that return an array or
collection will generate one exchange per element, and their routes will
be executed once for each exchange. This behavior can be disabled by
-setting the endpoint property *consumer.splitResult=false*.
+setting the endpoint property *splitResult=false*.
== Message Headers
@@ -273,7 +273,7 @@ API] used by the Olingo2Component. Producer endpoints can specify the
option name for incoming message body in the *`inBody`* endpoint URI
parameter. For endpoints that return an array or collection, a consumer
endpoint will map every element to distinct messages, unless
-*consumer.splitResult* is set to *false*.
+*splitResult* is set to *false*.
== Use cases
@@ -330,6 +330,6 @@ consumer endpoint will produce an *ODataFeed* value the first time, and
[source,java]
---------------------------------------------------------------------------------------------------------
-from("olingo2://read/Manufacturers?queryParams=#paramsBean&consumer.timeUnit=SECONDS&delay=30")
+from("olingo2://read/Manufacturers?queryParams=#paramsBean&timeUnit=SECONDS&delay=30")
.to("bean:blah");
---------------------------------------------------------------------------------------------------------
diff --git a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Component.java b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Component.java
index ed49da9..35e4c7e 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Component.java
+++ b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Component.java
@@ -81,13 +81,7 @@ public class Olingo2Component extends AbstractApiComponent<Olingo2ApiName, Oling
final Olingo2Configuration endpointConfiguration = createEndpointConfiguration(Olingo2ApiName.DEFAULT);
final Endpoint endpoint = createEndpoint(uri, methodName, Olingo2ApiName.DEFAULT, endpointConfiguration);
-
- // set endpoint property inBody
setProperties(endpoint, parameters);
-
- // configure endpoint properties and initialize state
- endpoint.configureProperties(parameters);
-
return endpoint;
}
diff --git a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Configuration.java b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Configuration.java
index 78b4604..4d2b6f4 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Configuration.java
+++ b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Configuration.java
@@ -65,6 +65,8 @@ public class Olingo2Configuration {
private HttpClientBuilder httpClientBuilder;
@UriParam
private boolean filterAlreadySeen;
+ @UriParam(label = "consumer", defaultValue = "true")
+ private boolean splitResult = true;
public Olingo2ApiName getApiName() {
return apiName;
@@ -214,6 +216,18 @@ public class Olingo2Configuration {
this.filterAlreadySeen = filterAlreadySeen;
}
+ public boolean isSplitResult() {
+ return splitResult;
+ }
+
+ /**
+ * For endpoints that return an array or collection, a consumer endpoint will map every element to distinct messages, unless
+ * splitResult is set to false.
+ */
+ public void setSplitResult(boolean splitResult) {
+ this.splitResult = splitResult;
+ }
+
@Override
public int hashCode() {
return new HashCodeBuilder().append(serviceUri).append(contentType).append(httpHeaders).append(connectTimeout).append(socketTimeout).append(proxy)
diff --git a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Endpoint.java b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Endpoint.java
index 05e7c06..1cf70eb 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Endpoint.java
+++ b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Endpoint.java
@@ -95,7 +95,7 @@ public class Olingo2Endpoint extends AbstractApiEndpoint<Olingo2ApiName, Olingo2
throw new IllegalArgumentException("Only read method is supported for consumer endpoints");
}
final Olingo2Consumer consumer = new Olingo2Consumer(this, processor);
- // also set consumer.* properties
+ consumer.setSplitResult(configuration.isSplitResult());
configureConsumer(consumer);
return consumer;
}
@@ -204,10 +204,7 @@ public class Olingo2Endpoint extends AbstractApiEndpoint<Olingo2ApiName, Olingo2
final Map.Entry<String, Object> entry = it.next();
final String paramName = entry.getKey();
- /**
- * Avoid swallowing consumer scheduler properties, which get
- * processed in configureProperties()
- */
+ // avoid swallowing consumer scheduler properties, which get processed in configureProperties()
if (paramName.startsWith("consumer.")) {
continue;
}
diff --git a/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2ComponentConsumerTest.java b/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2ComponentConsumerTest.java
index 9d3b875..851091a 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2ComponentConsumerTest.java
+++ b/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2ComponentConsumerTest.java
@@ -73,7 +73,7 @@ public class Olingo2ComponentConsumerTest extends AbstractOlingo2TestSupport {
* Read entity set of the People object and filter already seen items on
* subsequent exchanges Use a delay since the mock endpoint does not always
* get the correct number of exchanges before being satisfied. Note: -
- * consumer.splitResults is set to false since this ensures the first
+ * splitResults is set to false since this ensures the first
* returned message contains all the results. This is preferred for the
* purposes of this test. The default will mean the first n messages contain
* the results (where n is the result total) then subsequent messages will
@@ -88,7 +88,7 @@ public class Olingo2ComponentConsumerTest extends AbstractOlingo2TestSupport {
RouteBuilder builder = new RouteBuilder() {
public void configure() {
- from("olingo2://read/Manufacturers?filterAlreadySeen=true&" + "delay=2&sendEmptyMessageWhenIdle=true&" + "consumer.splitResult=false")
+ from("olingo2://read/Manufacturers?filterAlreadySeen=true&" + "delay=2&sendEmptyMessageWhenIdle=true&" + "splitResult=false")
.to("mock:consumer-alreadyseen");
};
};
@@ -120,7 +120,7 @@ public class Olingo2ComponentConsumerTest extends AbstractOlingo2TestSupport {
* Read entity set of the People object and filter already seen items on
* subsequent exchanges Use a delay since the mock endpoint does not always
* get the correct number of exchanges before being satisfied. Note: -
- * consumer.splitResults is set to false since this ensures the first
+ * splitResults is set to false since this ensures the first
* returned message contains all the results. -
* sendEmptyMessageWhenIdle is set to false so only 1 message
* should even be returned.
@@ -138,7 +138,7 @@ public class Olingo2ComponentConsumerTest extends AbstractOlingo2TestSupport {
RouteBuilder builder = new RouteBuilder() {
public void configure() {
- from("olingo2://read/Manufacturers?filterAlreadySeen=true&" + "delay=2&sendEmptyMessageWhenIdle=false&" + "consumer.splitResult=false")
+ from("olingo2://read/Manufacturers?filterAlreadySeen=true&" + "delay=2&sendEmptyMessageWhenIdle=false&" + "splitResult=false")
.to("mock:consumer-alreadyseen");
};
};
@@ -176,7 +176,7 @@ public class Olingo2ComponentConsumerTest extends AbstractOlingo2TestSupport {
RouteBuilder builder = new RouteBuilder() {
public void configure() {
- from("olingo2://read/Manufacturers('1')?filterAlreadySeen=true&" + "delay=2&sendEmptyMessageWhenIdle=true&" + "consumer.splitResult=true")
+ from("olingo2://read/Manufacturers('1')?filterAlreadySeen=true&" + "delay=2&sendEmptyMessageWhenIdle=true&" + "splitResult=true")
.to("mock:consumer-splitresult-kp-manufacturer");
};
};
@@ -226,7 +226,7 @@ public class Olingo2ComponentConsumerTest extends AbstractOlingo2TestSupport {
RouteBuilder builder = new RouteBuilder() {
public void configure() {
- from("olingo2://read/Manufacturers('1')?filterAlreadySeen=true&" + "delay=2&sendEmptyMessageWhenIdle=false&" + "consumer.splitResult=true")
+ from("olingo2://read/Manufacturers('1')?filterAlreadySeen=true&" + "delay=2&sendEmptyMessageWhenIdle=false&" + "splitResult=true")
.to("mock:consumer-splitresult-kp-manufacturer");
};
};
@@ -265,7 +265,7 @@ public class Olingo2ComponentConsumerTest extends AbstractOlingo2TestSupport {
RouteBuilder builder = new RouteBuilder() {
public void configure() {
- from("olingo2://read/Manufacturers('1')/Address?consumer.splitResult=true").to("mock:consumer-value");
+ from("olingo2://read/Manufacturers('1')/Address?splitResult=true").to("mock:consumer-value");
};
};
addRouteAndStartContext(builder);
@@ -298,7 +298,7 @@ public class Olingo2ComponentConsumerTest extends AbstractOlingo2TestSupport {
RouteBuilder builder = new RouteBuilder() {
public void configure() {
- from("olingo2://read/Manufacturers?consumer.splitResult=true").to("mock:consumer-splitresult");
+ from("olingo2://read/Manufacturers?splitResult=true").to("mock:consumer-splitresult");
};
};
diff --git a/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2SampleServer.java b/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2SampleServer.java
index 5f3935c..5e97e9e 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2SampleServer.java
+++ b/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2SampleServer.java
@@ -82,7 +82,7 @@ public class Olingo2SampleServer {
m.invoke(null, serviceUrl);
} catch (Throwable t) {
LOG.error("Unable to load the required sample class", t);
- throw new IOException("unable to load the required sample class");
+ throw new IOException("unable to load the required sample class", t);
}
}
}
diff --git a/components/camel-olingo4/camel-olingo4-component/src/main/docs/olingo4-component.adoc b/components/camel-olingo4/camel-olingo4-component/src/main/docs/olingo4-component.adoc
index 8aca8ab..9977a56 100644
--- a/components/camel-olingo4/camel-olingo4-component/src/main/docs/olingo4-component.adoc
+++ b/components/camel-olingo4/camel-olingo4-component/src/main/docs/olingo4-component.adoc
@@ -237,11 +237,11 @@ java.util.Map<String, Object> for In body (request)
Only the *read* endpoint can be used as a consumer endpoint. Consumer
endpoints can
use http://camel.apache.org/polling-consumer.html#PollingConsumer-ScheduledPollConsumerOptions[Scheduled
-Poll Consumer Options] with a *`consumer.`* prefix to schedule endpoint
+Poll Consumer Options] to schedule endpoint
invocation. By default consumer endpoints that return an array or
collection will generate one exchange per element, and their routes will
be executed once for each exchange. This behavior can be disabled by
-setting the endpoint property *consumer.splitResult=false*.
+setting the endpoint property *splitResult=false*.
== Message Headers
@@ -256,7 +256,7 @@ API] used by the Olingo4Component. Producer endpoints can specify the
option name for incoming message body in the *`inBody`* endpoint URI
parameter. For endpoints that return an array or collection, a consumer
endpoint will map every element to distinct messages, unless
-*consumer.splitResult* is set to *false*.
+*splitResult* is set to *false*.
== Use cases
diff --git a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Configuration.java b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Configuration.java
index d264cf3..0a519b8 100644
--- a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Configuration.java
+++ b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Configuration.java
@@ -64,6 +64,8 @@ public class Olingo4Configuration {
private HttpClientBuilder httpClientBuilder;
@UriParam
private boolean filterAlreadySeen;
+ @UriParam(label = "consumer", defaultValue = "true")
+ private boolean splitResult = true;
public Olingo4ApiName getApiName() {
return apiName;
@@ -213,6 +215,18 @@ public class Olingo4Configuration {
this.filterAlreadySeen = filterAlreadySeen;
}
+ public boolean isSplitResult() {
+ return splitResult;
+ }
+
+ /**
+ * For endpoints that return an array or collection, a consumer endpoint will map every element to distinct messages, unless
+ * splitResult is set to false.
+ */
+ public void setSplitResult(boolean splitResult) {
+ this.splitResult = splitResult;
+ }
+
@Override
public int hashCode() {
return new HashCodeBuilder().append(serviceUri).append(contentType).append(httpHeaders).append(connectTimeout).append(socketTimeout).append(proxy)
diff --git a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Endpoint.java b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Endpoint.java
index 31aa4cf..d0d37d4 100644
--- a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Endpoint.java
+++ b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Endpoint.java
@@ -95,7 +95,7 @@ public class Olingo4Endpoint extends AbstractApiEndpoint<Olingo4ApiName, Olingo4
throw new IllegalArgumentException("Only read method is supported for consumer endpoints");
}
final Olingo4Consumer consumer = new Olingo4Consumer(this, processor);
- // also set consumer.* properties
+ consumer.setSplitResult(configuration.isSplitResult());
configureConsumer(consumer);
return consumer;
}
@@ -205,10 +205,7 @@ public class Olingo4Endpoint extends AbstractApiEndpoint<Olingo4ApiName, Olingo4
final Map.Entry<String, Object> entry = it.next();
final String paramName = entry.getKey();
- /**
- * Avoid swallowing consumer scheduler properties, which get
- * processed in configureProperties()
- */
+ // Avoid swallowing consumer scheduler properties, which get processed in configureProperties()
if (paramName.startsWith("consumer.")) {
continue;
}
diff --git a/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/Olingo4ComponentConsumerTest.java b/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/Olingo4ComponentConsumerTest.java
index 55eaa40..c0ae176 100644
--- a/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/Olingo4ComponentConsumerTest.java
+++ b/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/Olingo4ComponentConsumerTest.java
@@ -82,7 +82,7 @@ public class Olingo4ComponentConsumerTest extends AbstractOlingo4TestSupport {
* Read entity set of the People object and filter already seen items on
* subsequent exchanges Use a delay since the mock endpoint does not always
* get the correct number of exchanges before being satisfied. Note: -
- * consumer.splitResults is set to false since this ensures the first
+ * splitResults is set to false since this ensures the first
* returned message contains all the results. This is preferred for the
* purposes of this test. The default will mean the first n messages contain
* the results (where n is the result total) then subsequent messages will
@@ -97,7 +97,7 @@ public class Olingo4ComponentConsumerTest extends AbstractOlingo4TestSupport {
RouteBuilder builder = new RouteBuilder() {
public void configure() {
- from("olingo4://read/" + PEOPLE + "?delay=2&sendEmptyMessageWhenIdle=true&consumer.splitResult=false&filterAlreadySeen=true")
+ from("olingo4://read/" + PEOPLE + "?delay=2&sendEmptyMessageWhenIdle=true&splitResult=false&filterAlreadySeen=true")
.to("mock:consumer-alreadyseen");
};
};
@@ -129,7 +129,7 @@ public class Olingo4ComponentConsumerTest extends AbstractOlingo4TestSupport {
* Read entity set of the People object and filter already seen items on
* subsequent exchanges Use a delay since the mock endpoint does not always
* get the correct number of exchanges before being satisfied. Note: -
- * consumer.splitResults is set to false since this ensures the first
+ * splitResults is set to false since this ensures the first
* returned message contains all the results. -
* sendEmptyMessageWhenIdle is set to false so only 1 message
* should even be returned.
@@ -148,7 +148,7 @@ public class Olingo4ComponentConsumerTest extends AbstractOlingo4TestSupport {
RouteBuilder builder = new RouteBuilder() {
public void configure() {
- from("olingo4://read/" + PEOPLE + "?delay=2&sendEmptyMessageWhenIdle=false&consumer.splitResult=false&filterAlreadySeen=true")
+ from("olingo4://read/" + PEOPLE + "?delay=2&sendEmptyMessageWhenIdle=false&splitResult=false&filterAlreadySeen=true")
.to("mock:consumer-alreadyseen");
};
};
@@ -187,7 +187,7 @@ public class Olingo4ComponentConsumerTest extends AbstractOlingo4TestSupport {
RouteBuilder builder = new RouteBuilder() {
public void configure() {
from("olingo4://read/" + AIRPORTS + "('KSFO')" + "?filterAlreadySeen=true&" + "delay=2&sendEmptyMessageWhenIdle=true&"
- + "consumer.splitResult=true").to("mock:consumer-splitresult-kp-airport");
+ + "splitResult=true").to("mock:consumer-splitresult-kp-airport");
};
};
addRouteAndStartContext(builder);
@@ -237,7 +237,7 @@ public class Olingo4ComponentConsumerTest extends AbstractOlingo4TestSupport {
RouteBuilder builder = new RouteBuilder() {
public void configure() {
from("olingo4://read/" + AIRPORTS + "('KSFO')" + "?filterAlreadySeen=true&" + "delay=2&sendEmptyMessageWhenIdle=false&"
- + "consumer.splitResult=true").to("mock:consumer-splitresult-kp-airport");
+ + "splitResult=true").to("mock:consumer-splitresult-kp-airport");
};
};
addRouteAndStartContext(builder);
@@ -274,7 +274,7 @@ public class Olingo4ComponentConsumerTest extends AbstractOlingo4TestSupport {
RouteBuilder builder = new RouteBuilder() {
public void configure() {
- from("olingo4://read/" + PEOPLE + "?consumer.splitResult=true").to("mock:consumer-splitresult");
+ from("olingo4://read/" + PEOPLE + "?splitResult=true").to("mock:consumer-splitresult");
};
};
addRouteAndStartContext(builder);
@@ -317,7 +317,7 @@ public class Olingo4ComponentConsumerTest extends AbstractOlingo4TestSupport {
RouteBuilder builder = new RouteBuilder() {
public void configure() {
- from("olingo4://read/" + TEST_PEOPLE + "/FavoriteFeature?consumer.splitResult=true").to("mock:consumer-splitresult-value");
+ from("olingo4://read/" + TEST_PEOPLE + "/FavoriteFeature?splitResult=true").to("mock:consumer-splitresult-value");
};
};
addRouteAndStartContext(builder);
@@ -343,7 +343,7 @@ public class Olingo4ComponentConsumerTest extends AbstractOlingo4TestSupport {
RouteBuilder builder = new RouteBuilder() {
public void configure() {
- from("olingo4://read/" + TEST_PEOPLE + "/AddressInfo?consumer.splitResult=true").to("mock:consumer-splitresult-collection-value");
+ from("olingo4://read/" + TEST_PEOPLE + "/AddressInfo?splitResult=true").to("mock:consumer-splitresult-collection-value");
};
};
addRouteAndStartContext(builder);
@@ -369,7 +369,7 @@ public class Olingo4ComponentConsumerTest extends AbstractOlingo4TestSupport {
RouteBuilder builder = new RouteBuilder() {
public void configure() {
- from("olingo4://read/" + TEST_PEOPLE + "/AddressInfo?consumer.splitResult=false").to("mock:consumer-nosplitresult-colleciton-value");
+ from("olingo4://read/" + TEST_PEOPLE + "/AddressInfo?splitResult=false").to("mock:consumer-nosplitresult-colleciton-value");
};
};
addRouteAndStartContext(builder);
[camel] 07/11: CAMEL-13917: Configuring endpoints with consumer.
prefix for consumer options is no longer supported as they should be
regular options instead. This also avoid reflection setting properties.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit fdaa12d4a2912c7f86e38ca02398e7d4f858e980
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Sep 2 13:31:47 2019 +0200
CAMEL-13917: Configuring endpoints with consumer. prefix for consumer options is no longer supported as they should be regular options instead. This also avoid reflection setting properties.
---
.../src/main/docs/hipchat-component.adoc | 2 +-
.../camel/component/hipchat/HipchatEndpoint.java | 22 ++++++++++++++++++----
.../camel/component/ironmq/IronMQComponent.java | 4 +---
.../apache/camel/component/jpa/JpaComponent.java | 1 +
.../apache/camel/component/jpa/JpaEndpoint.java | 20 ++++++++++----------
.../camel/component/jpa/JpaComponentTest.java | 2 +-
.../jpa/JpaWithNamedQueryAndParametersTest.java | 5 +++--
.../camel/component/jpa/JpaWithNamedQueryTest.java | 4 ++--
.../component/jpa/JpaWithNativeQueryTest.java | 2 +-
.../jpa/JpaWithNativeQueryWithResultClassTest.java | 2 +-
.../camel/component/jpa/JpaWithQueryTest.java | 2 +-
.../camel/processor/jpa/JpaNonTXRollbackTest.java | 2 +-
.../jpa/JpaRouteSkipLockedEntityTest.java | 4 ++--
.../camel/processor/jpa/JpaTXRollbackTest.java | 2 +-
.../dsl/HipchatEndpointBuilderFactory.java | 8 ++------
15 files changed, 46 insertions(+), 36 deletions(-)
diff --git a/components/camel-hipchat/src/main/docs/hipchat-component.adoc b/components/camel-hipchat/src/main/docs/hipchat-component.adoc
index 814cb0c..ea5fedc 100644
--- a/components/camel-hipchat/src/main/docs/hipchat-component.adoc
+++ b/components/camel-hipchat/src/main/docs/hipchat-component.adoc
@@ -84,7 +84,7 @@ with the following path and query parameters:
| *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. | | int
| *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. | | int
| *backoffMultiplier* (scheduler) | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. | | int
-| *delay* (scheduler) | Milliseconds before the next poll. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 500 | long
+| *delay* (scheduler) | Milliseconds before the next poll. | 5000 | long
| *greedy* (scheduler) | If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages. | false | boolean
| *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
| *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
diff --git a/components/camel-hipchat/src/main/java/org/apache/camel/component/hipchat/HipchatEndpoint.java b/components/camel-hipchat/src/main/java/org/apache/camel/component/hipchat/HipchatEndpoint.java
index d9719e1..44d0c1b 100644
--- a/components/camel-hipchat/src/main/java/org/apache/camel/component/hipchat/HipchatEndpoint.java
+++ b/components/camel-hipchat/src/main/java/org/apache/camel/component/hipchat/HipchatEndpoint.java
@@ -29,11 +29,19 @@ import org.apache.camel.support.ScheduledPollEndpoint;
@UriEndpoint(firstVersion = "2.15.0", scheme = "hipchat", title = "Hipchat", syntax = "hipchat:protocol:host:port", label = "api,cloud")
public class HipchatEndpoint extends ScheduledPollEndpoint {
+ @UriParam(defaultValue = "" + HipchatConsumer.DEFAULT_CONSUMER_DELAY, label = "consumer,scheduler",
+ description = "Milliseconds before the next poll.")
+ private long delay = HipchatConsumer.DEFAULT_CONSUMER_DELAY;
+
@UriParam
private HipchatConfiguration configuration;
public HipchatEndpoint(String uri, HipchatComponent component) {
super(uri, component);
+ //Default delay of 500 millis is too often and would result in Rate Limit error's from
+ //HipChat API as per https://www.hipchat.com/docs/apiv2/rate_limiting. End user can override using
+ //consumer.delay parameter
+ setDelay(HipchatConsumer.DEFAULT_CONSUMER_DELAY);
configuration = new HipchatConfiguration();
}
@@ -45,10 +53,6 @@ public class HipchatEndpoint extends ScheduledPollEndpoint {
@Override
public Consumer createConsumer(Processor processor) throws Exception {
HipchatConsumer consumer = new HipchatConsumer(this, processor);
- //Default delay of 500 millis is too often and would result in Rate Limit error's from
- //HipChat API as per https://www.hipchat.com/docs/apiv2/rate_limiting. End user can override using
- //consumer.delay parameter
- consumer.setDelay(HipchatConsumer.DEFAULT_CONSUMER_DELAY);
configureConsumer(consumer);
return consumer;
}
@@ -56,4 +60,14 @@ public class HipchatEndpoint extends ScheduledPollEndpoint {
public HipchatConfiguration getConfiguration() {
return configuration;
}
+
+ /**
+ * Milliseconds before the next poll.
+ */
+ @Override
+ public void setDelay(long delay) {
+ super.setDelay(delay);
+ this.delay = delay;
+ }
+
}
diff --git a/components/camel-ironmq/src/main/java/org/apache/camel/component/ironmq/IronMQComponent.java b/components/camel-ironmq/src/main/java/org/apache/camel/component/ironmq/IronMQComponent.java
index bfec0ac..e566a22 100644
--- a/components/camel-ironmq/src/main/java/org/apache/camel/component/ironmq/IronMQComponent.java
+++ b/components/camel-ironmq/src/main/java/org/apache/camel/component/ironmq/IronMQComponent.java
@@ -22,7 +22,6 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.DefaultComponent;
-import org.apache.camel.support.ScheduledPollEndpoint;
/**
* Represents the component that manages {@link IronMQEndpoint}.
@@ -52,8 +51,7 @@ public class IronMQComponent extends DefaultComponent {
}
Endpoint endpoint = new IronMQEndpoint(uri, this, ironMQConfiguration);
- ((ScheduledPollEndpoint)endpoint).setConsumerProperties(parameters);
-
+ setProperties(endpoint, parameters);
return endpoint;
}
}
diff --git a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaComponent.java b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaComponent.java
index e9458c3..252a33d 100644
--- a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaComponent.java
+++ b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaComponent.java
@@ -121,6 +121,7 @@ public class JpaComponent extends DefaultComponent {
endpoint.setEntityType(type);
}
}
+ setProperties(endpoint, options);
return endpoint;
}
diff --git a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java
index 180f1d3..14a965a 100644
--- a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java
+++ b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java
@@ -72,25 +72,25 @@ public class JpaEndpoint extends ScheduledPollEndpoint {
@UriParam(label = "consumer")
private int maxMessagesPerPoll;
- @UriParam(optionalPrefix = "consumer.")
+ @UriParam
private String query;
- @UriParam(optionalPrefix = "consumer.")
+ @UriParam
private String namedQuery;
- @UriParam(optionalPrefix = "consumer.")
+ @UriParam
private String nativeQuery;
- @UriParam(label = "consumer", optionalPrefix = "consumer.", defaultValue = "PESSIMISTIC_WRITE")
+ @UriParam(label = "consumer", defaultValue = "PESSIMISTIC_WRITE")
private LockModeType lockModeType = LockModeType.PESSIMISTIC_WRITE;
- @UriParam(label = "consumer,advanced", optionalPrefix = "consumer.", multiValue = true)
+ @UriParam(label = "consumer,advanced", multiValue = true)
private Map<String, Object> parameters;
- @UriParam(optionalPrefix = "consumer.")
+ @UriParam
private Class<?> resultClass;
- @UriParam(label = "consumer", optionalPrefix = "consumer.")
+ @UriParam(label = "consumer")
private boolean transacted;
- @UriParam(label = "consumer", optionalPrefix = "consumer.")
+ @UriParam(label = "consumer")
private boolean skipLockedEntity;
- @UriParam(label = "consumer", optionalPrefix = "consumer.")
+ @UriParam(label = "consumer")
private DeleteHandler<Object> deleteHandler;
- @UriParam(label = "consumer", optionalPrefix = "consumer.")
+ @UriParam(label = "consumer")
private DeleteHandler<Object> preDeleteHandler;
@UriParam(label = "producer", defaultValue = "true")
diff --git a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaComponentTest.java b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaComponentTest.java
index 8792a20..97796cc 100644
--- a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaComponentTest.java
+++ b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaComponentTest.java
@@ -34,7 +34,7 @@ public class JpaComponentTest extends CamelTestSupport {
assertNull(comp.getEntityManagerFactory());
assertNull(comp.getTransactionManager());
- JpaEndpoint jpa = (JpaEndpoint) comp.createEndpoint("jpa://" + SendEmail.class.getName() + "?consumer.lockModeType=PESSIMISTIC_WRITE");
+ JpaEndpoint jpa = (JpaEndpoint) comp.createEndpoint("jpa://" + SendEmail.class.getName() + "?lockModeType=PESSIMISTIC_WRITE");
JpaConsumer consumer = (JpaConsumer) jpa.createConsumer(null);
assertEquals(consumer.getLockModeType(), LockModeType.PESSIMISTIC_WRITE);
diff --git a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryAndParametersTest.java b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryAndParametersTest.java
index 3412520..4f92795 100644
--- a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryAndParametersTest.java
+++ b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryAndParametersTest.java
@@ -29,6 +29,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.examples.Customer;
+import org.apache.camel.examples.MultiSteps;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.support.SimpleRegistry;
import org.apache.camel.support.service.ServiceHelper;
@@ -76,7 +77,7 @@ public class JpaWithNamedQueryAndParametersTest extends Assert {
assertEquals("Should have no results: " + results, 0, results.size());
// lets produce some objects
- template.send(endpoint, new Processor() {
+ template.send("jpa://" + Customer.class.getName(), new Processor() {
public void process(Exchange exchange) {
Customer customer = new Customer();
customer.setName("Willem");
@@ -142,7 +143,7 @@ public class JpaWithNamedQueryAndParametersTest extends Assert {
}
protected String getEndpointUri() {
- return "jpa://" + Customer.class.getName() + "?consumer.namedQuery=findAllCustomersWithName&consumer.parameters=#params";
+ return "jpa://" + Customer.class.getName() + "?namedQuery=findAllCustomersWithName¶meters=#params";
}
@After
diff --git a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java
index 07dbd5e..5c3745b 100644
--- a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java
+++ b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java
@@ -76,7 +76,7 @@ public class JpaWithNamedQueryTest extends Assert {
assertEquals("Should have no results: " + results, 0, results.size());
// lets produce some objects
- template.send(endpoint, new Processor() {
+ template.send("jpa://" + MultiSteps.class.getName(), new Processor() {
public void process(Exchange exchange) {
exchange.getIn().setBody(new MultiSteps("foo@bar.com"));
}
@@ -173,7 +173,7 @@ public class JpaWithNamedQueryTest extends Assert {
}
protected String getEndpointUri() {
- return "jpa://" + MultiSteps.class.getName() + "?consumer.namedQuery=step1";
+ return "jpa://" + MultiSteps.class.getName() + "?namedQuery=step1";
}
@After
diff --git a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNativeQueryTest.java b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNativeQueryTest.java
index 354e991..2ce6f17 100644
--- a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNativeQueryTest.java
+++ b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNativeQueryTest.java
@@ -49,6 +49,6 @@ public class JpaWithNativeQueryTest extends JpaWithNamedQueryTest {
@Override
protected String getEndpointUri() {
- return "jpa://" + MultiSteps.class.getName() + "?consumer.nativeQuery=select * from MultiSteps where step = 1";
+ return "jpa://" + MultiSteps.class.getName() + "?nativeQuery=select * from MultiSteps where step = 1";
}
}
\ No newline at end of file
diff --git a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNativeQueryWithResultClassTest.java b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNativeQueryWithResultClassTest.java
index ed61fe7..c1d0051 100644
--- a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNativeQueryWithResultClassTest.java
+++ b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNativeQueryWithResultClassTest.java
@@ -48,6 +48,6 @@ public class JpaWithNativeQueryWithResultClassTest extends JpaWithNamedQueryTest
@Override
protected String getEndpointUri() {
- return "jpa://" + MultiSteps.class.getName() + "?consumer.resultClass=org.apache.camel.examples.MultiSteps&consumer.nativeQuery=select * from MultiSteps where step = 1";
+ return "jpa://" + MultiSteps.class.getName() + "?resultClass=org.apache.camel.examples.MultiSteps&nativeQuery=select * from MultiSteps where step = 1";
}
}
\ No newline at end of file
diff --git a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithQueryTest.java b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithQueryTest.java
index 5f534df..eb3dcba 100644
--- a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithQueryTest.java
+++ b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithQueryTest.java
@@ -27,6 +27,6 @@ public class JpaWithQueryTest extends JpaWithNamedQueryTest {
@Override
protected String getEndpointUri() {
- return "jpa://" + MultiSteps.class.getName() + "?consumer.query=select o from " + entityName + " o where o.step = 1";
+ return "jpa://" + MultiSteps.class.getName() + "?query=select o from " + entityName + " o where o.step = 1";
}
}
\ No newline at end of file
diff --git a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaNonTXRollbackTest.java b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaNonTXRollbackTest.java
index 3d2a6ab..2d102e4 100644
--- a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaNonTXRollbackTest.java
+++ b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaNonTXRollbackTest.java
@@ -60,7 +60,7 @@ public class JpaNonTXRollbackTest extends AbstractJpaTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("jpa://" + SendEmail.class.getName() + "?consumer.transacted=false&delay=100").routeId("foo").noAutoStartup()
+ from("jpa://" + SendEmail.class.getName() + "?transacted=false&delay=100").routeId("foo").noAutoStartup()
.to("mock:start")
.process(new Processor() {
@Override
diff --git a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteSkipLockedEntityTest.java b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteSkipLockedEntityTest.java
index 1842998..b7d5929 100644
--- a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteSkipLockedEntityTest.java
+++ b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteSkipLockedEntityTest.java
@@ -68,9 +68,9 @@ public class JpaRouteSkipLockedEntityTest extends AbstractJpaTest {
return new SpringRouteBuilder() {
@Override
public void configure() {
- String options = "?consumer.skipLockedEntity=true"; //&consumer.lockModeType=PESSIMISTIC_FORCE_INCREMENT";
+ String options = "?skipLockedEntity=true"; //&lockModeType=PESSIMISTIC_FORCE_INCREMENT";
from("jpa://" + VersionedItem.class.getName() + options).routeId("first").autoStartup(false).bean(new WaitLatch()).log("route1: ${body}").to("mock:result1");
- from("jpa2://select" + options + "&consumer.query=select s from VersionedItem s").routeId("second").autoStartup(false).bean(new WaitLatch()).log("route2: ${body}").to("mock:result2");
+ from("jpa2://select" + options + "&query=select s from VersionedItem s").routeId("second").autoStartup(false).bean(new WaitLatch()).log("route2: ${body}").to("mock:result2");
}
};
}
diff --git a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaTXRollbackTest.java b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaTXRollbackTest.java
index e6e5c83..d71d3c3 100644
--- a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaTXRollbackTest.java
+++ b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaTXRollbackTest.java
@@ -57,7 +57,7 @@ public class JpaTXRollbackTest extends AbstractJpaTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("jpa://" + SendEmail.class.getName() + "?consumer.transacted=true&delay=1000").routeId("foo").noAutoStartup()
+ from("jpa://" + SendEmail.class.getName() + "?transacted=true&delay=1000").routeId("foo").noAutoStartup()
.process(new Processor() {
@Override
public void process(Exchange exchange) throws Exception {
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HipchatEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HipchatEndpointBuilderFactory.java
index 5150886..ce93336 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HipchatEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HipchatEndpointBuilderFactory.java
@@ -245,9 +245,7 @@ public interface HipchatEndpointBuilderFactory {
return this;
}
/**
- * Milliseconds before the next poll. You can also specify time values
- * using units, such as 60s (60 seconds), 5m30s (5 minutes and 30
- * seconds), and 1h (1 hour).
+ * Milliseconds before the next poll.
*
* The option is a: <code>long</code> type.
*
@@ -258,9 +256,7 @@ public interface HipchatEndpointBuilderFactory {
return this;
}
/**
- * Milliseconds before the next poll. You can also specify time values
- * using units, such as 60s (60 seconds), 5m30s (5 minutes and 30
- * seconds), and 1h (1 hour).
+ * Milliseconds before the next poll.
*
* The option will be converted to a <code>long</code> type.
*
[camel] 11/11: Regen
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4c5fcc0d3c68a7f5abfffa2a5b21cf267375ef80
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Sep 2 16:27:45 2019 +0200
Regen
---
.../camel-http/src/main/docs/http-component.adoc | 2 +-
.../camel-jetty/src/main/docs/jetty-component.adoc | 44 +--
.../src/main/docs/olingo2-component.adoc | 3 +-
.../src/main/docs/olingo4-component.adoc | 3 +-
components/readme.adoc | 4 +-
.../modules/ROOT/pages/csv-dataformat.adoc | 2 +-
.../modules/ROOT/pages/facebook-component.adoc | 2 +-
.../modules/ROOT/pages/file-component.adoc | 12 +-
.../modules/ROOT/pages/hipchat-component.adoc | 2 +-
.../modules/ROOT/pages/http-component.adoc | 2 +-
.../modules/ROOT/pages/jetty-component.adoc | 44 +--
.../modules/ROOT/pages/linkedin-component.adoc | 2 +-
.../modules/ROOT/pages/mail-component.adoc | 6 +-
.../modules/ROOT/pages/olingo2-component.adoc | 29 +-
.../modules/ROOT/pages/olingo4-component.adoc | 27 +-
.../modules/ROOT/pages/rss-component.adoc | 8 +-
.../modules/ROOT/pages/rss-dataformat.adoc | 2 +-
.../modules/ROOT/pages/tarfile-dataformat.adoc | 4 +-
.../modules/ROOT/pages/twilio-component.adoc | 17 +-
.../modules/ROOT/pages/zendesk-component.adoc | 17 +-
.../modules/ROOT/pages/zipfile-dataformat.adoc | 4 +-
.../springboot/HttpComponentConfiguration.java | 32 +-
.../JettyHttpComponentConfiguration9.java | 386 ++++++++++-----------
23 files changed, 360 insertions(+), 294 deletions(-)
diff --git a/components/camel-http/src/main/docs/http-component.adoc b/components/camel-http/src/main/docs/http-component.adoc
index b577695..42420f2 100644
--- a/components/camel-http/src/main/docs/http-component.adoc
+++ b/components/camel-http/src/main/docs/http-component.adoc
@@ -65,9 +65,9 @@ The HTTP component supports 18 options, which are listed below.
| *connectionRequest Timeout* (timeout) | The timeout in milliseconds used when requesting a connection from the connection manager. A timeout value of zero is interpreted as an infinite timeout. A timeout value of zero is interpreted as an infinite timeout. A negative value is interpreted as undefined (system default). Default: -1 | -1 | int
| *connectTimeout* (timeout) | Determines the timeout in milliseconds until a connection is established. A timeout value of zero is interpreted as an infinite timeout. A timeout value of zero is interpreted as an infinite timeout. A negative value is interpreted as undefined (system default). Default: -1 | -1 | int
| *socketTimeout* (timeout) | Defines the socket timeout (SO_TIMEOUT) in milliseconds, which is the timeout for waiting for data or, put differently, a maximum period inactivity between two consecutive data packets). A timeout value of zero is interpreted as an infinite timeout. A negative value is interpreted as undefined (system default). Default: -1 | -1 | int
+| *allowJavaSerialized Object* (advanced) | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | boolean
| *httpBinding* (advanced) | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. | | HttpBinding
| *httpConfiguration* (advanced) | To use the shared HttpConfiguration as base configuration. | | HttpConfiguration
-| *allowJavaSerialized Object* (advanced) | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | boolean
| *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. | | HeaderFilterStrategy
| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
|===
diff --git a/components/camel-jetty/src/main/docs/jetty-component.adoc b/components/camel-jetty/src/main/docs/jetty-component.adoc
index 9c7430e..63ce839 100644
--- a/components/camel-jetty/src/main/docs/jetty-component.adoc
+++ b/components/camel-jetty/src/main/docs/jetty-component.adoc
@@ -56,36 +56,36 @@ The Jetty component supports 33 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *sslKeyPassword* (security) | The key password, which is used to access the certificate's key entry in the keystore (this is the same password that is supplied to the keystore command's -keypass option). | | String
-| *sslPassword* (security) | The ssl password, which is required to access the keystore file (this is the same password that is supplied to the keystore command's -storepass option). | | String
-| *keystore* (security) | Specifies the location of the Java keystore file, which contains the Jetty server's own X.509 certificate in a key entry. | | String
-| *errorHandler* (advanced) | This option is used to set the ErrorHandler that Jetty server uses. | | ErrorHandler
-| *sslSocketConnectors* (security) | A map which contains per port number specific SSL connectors. | | Map
-| *socketConnectors* (security) | A map which contains per port number specific HTTP connectors. Uses the same principle as sslSocketConnectors. | | Map
-| *httpClientMinThreads* (producer) | To set a value for minimum number of threads in HttpClient thread pool. Notice that both a min and max size must be configured. | | Integer
-| *httpClientMaxThreads* (producer) | To set a value for maximum number of threads in HttpClient thread pool. Notice that both a min and max size must be configured. | | Integer
-| *minThreads* (consumer) | To set a value for minimum number of threads in server thread pool. Notice that both a min and max size must be configured. | | Integer
-| *maxThreads* (consumer) | To set a value for maximum number of threads in server thread pool. Notice that both a min and max size must be configured. | | Integer
-| *threadPool* (consumer) | To use a custom thread pool for the server. This option should only be used in special circumstances. | | ThreadPool
+| *continuationTimeout* (consumer) | Allows to set a timeout in millis when using Jetty as consumer (server). By default Jetty uses 30000. You can use a value of = 0 to never expire. If a timeout occurs then the request will be expired and Jetty will return back a http error 503 to the client. This option is only in use when using Jetty with the Asynchronous Routing Engine. | 30000 | Long
| *enableJmx* (consumer) | If this option is true, Jetty JMX support will be enabled for this endpoint. | false | boolean
-| *jettyHttpBinding* (advanced) | To use a custom org.apache.camel.component.jetty.JettyHttpBinding, which are used to customize how a response should be written for the producer. | | JettyHttpBinding
+| *errorHandler* (advanced) | This option is used to set the ErrorHandler that Jetty server uses. | | ErrorHandler
| *httpBinding* (advanced) | Not to be used - use JettyHttpBinding instead. | | HttpBinding
+| *httpClientMaxThreads* (producer) | To set a value for maximum number of threads in HttpClient thread pool. Notice that both a min and max size must be configured. | | Integer
+| *httpClientMinThreads* (producer) | To set a value for minimum number of threads in HttpClient thread pool. Notice that both a min and max size must be configured. | | Integer
| *httpConfiguration* (advanced) | Jetty component does not use HttpConfiguration. | | HttpConfiguration
+| *jettyHttpBinding* (advanced) | To use a custom org.apache.camel.component.jetty.JettyHttpBinding, which are used to customize how a response should be written for the producer. | | JettyHttpBinding
+| *keystore* (security) | Specifies the location of the Java keystore file, which contains the Jetty server's own X.509 certificate in a key entry. | | String
+| *maxThreads* (consumer) | To set a value for maximum number of threads in server thread pool. Notice that both a min and max size must be configured. | | Integer
| *mbContainer* (advanced) | To use a existing configured org.eclipse.jetty.jmx.MBeanContainer if JMX is enabled that Jetty uses for registering mbeans. | | MBeanContainer
-| *sslSocketConnector Properties* (security) | A map which contains general SSL connector properties. | | Map
-| *socketConnector Properties* (security) | A map which contains general HTTP connector properties. Uses the same principle as sslSocketConnectorProperties. | | Map
-| *continuationTimeout* (consumer) | Allows to set a timeout in millis when using Jetty as consumer (server). By default Jetty uses 30000. You can use a value of = 0 to never expire. If a timeout occurs then the request will be expired and Jetty will return back a http error 503 to the client. This option is only in use when using Jetty with the Asynchronous Routing Engine. | 30000 | Long
-| *useContinuation* (consumer) | Whether or not to use Jetty continuations for the Jetty Server. | true | boolean
-| *sslContextParameters* (security) | To configure security using SSLContextParameters | | SSLContextParameters
-| *useGlobalSslContext Parameters* (security) | Enable usage of global SSL context parameters | false | boolean
-| *responseBufferSize* (consumer) | Allows to configure a custom value of the response buffer size on the Jetty connectors. | | Integer
+| *minThreads* (consumer) | To set a value for minimum number of threads in server thread pool. Notice that both a min and max size must be configured. | | Integer
+| *proxyHost* (proxy) | To use a http proxy to configure the hostname. | | String
+| *proxyPort* (proxy) | To use a http proxy to configure the port number. | | Integer
| *requestBufferSize* (consumer) | Allows to configure a custom value of the request buffer size on the Jetty connectors. | | Integer
| *requestHeaderSize* (consumer) | Allows to configure a custom value of the request header size on the Jetty connectors. | | Integer
+| *responseBufferSize* (consumer) | Allows to configure a custom value of the response buffer size on the Jetty connectors. | | Integer
| *responseHeaderSize* (consumer) | Allows to configure a custom value of the response header size on the Jetty connectors. | | Integer
-| *proxyHost* (proxy) | To use a http proxy to configure the hostname. | | String
-| *proxyPort* (proxy) | To use a http proxy to configure the port number. | | Integer
-| *useXForwardedFor Header* (consumer) | To use the X-Forwarded-For header in HttpServletRequest.getRemoteAddr. | false | boolean
| *sendServerVersion* (consumer) | If the option is true, jetty will send the server header with the jetty version information to the client which sends the request. NOTE please make sure there is no any other camel-jetty endpoint is share the same port, otherwise this option may not work as expected. | true | boolean
+| *socketConnector Properties* (security) | A map which contains general HTTP connector properties. Uses the same principle as sslSocketConnectorProperties. | | Map
+| *socketConnectors* (security) | A map which contains per port number specific HTTP connectors. Uses the same principle as sslSocketConnectors. | | Map
+| *sslContextParameters* (security) | To configure security using SSLContextParameters | | SSLContextParameters
+| *sslKeyPassword* (security) | The key password, which is used to access the certificate's key entry in the keystore (this is the same password that is supplied to the keystore command's -keypass option). | | String
+| *sslPassword* (security) | The ssl password, which is required to access the keystore file (this is the same password that is supplied to the keystore command's -storepass option). | | String
+| *sslSocketConnector Properties* (security) | A map which contains general SSL connector properties. | | Map
+| *sslSocketConnectors* (security) | A map which contains per port number specific SSL connectors. | | Map
+| *threadPool* (consumer) | To use a custom thread pool for the server. This option should only be used in special circumstances. | | ThreadPool
+| *useContinuation* (consumer) | Whether or not to use Jetty continuations for the Jetty Server. | true | boolean
+| *useGlobalSslContext Parameters* (security) | Enable usage of global SSL context parameters | false | boolean
+| *useXForwardedFor Header* (consumer) | To use the X-Forwarded-For header in HttpServletRequest.getRemoteAddr. | false | boolean
| *allowJavaSerialized Object* (advanced) | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | boolean
| *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. | | HeaderFilterStrategy
| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
diff --git a/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc b/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc
index 7e13c36..9af682a 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc
+++ b/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc
@@ -139,7 +139,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
-The component supports 15 options, which are listed below.
+The component supports 16 options, which are listed below.
@@ -158,6 +158,7 @@ The component supports 15 options, which are listed below.
| *camel.component.olingo2.configuration.proxy* | HTTP proxy server configuration | | HttpHost
| *camel.component.olingo2.configuration.service-uri* | Target OData service base URI, e.g. \http://services.odata.org/OData/OData.svc | | String
| *camel.component.olingo2.configuration.socket-timeout* | HTTP request timeout in milliseconds, defaults to 30,000 (30 seconds) | 30000 | Integer
+| *camel.component.olingo2.configuration.split-result* | For endpoints that return an array or collection, a consumer endpoint will map every element to distinct messages, unless splitResult is set to false. | true | Boolean
| *camel.component.olingo2.configuration.ssl-context-parameters* | To configure security using SSLContextParameters | | SSLContextParameters
| *camel.component.olingo2.enabled* | Enable olingo2 component | true | Boolean
| *camel.component.olingo2.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters. | false | Boolean
diff --git a/components/camel-olingo4/camel-olingo4-component/src/main/docs/olingo4-component.adoc b/components/camel-olingo4/camel-olingo4-component/src/main/docs/olingo4-component.adoc
index 79e2c36..adf3769 100644
--- a/components/camel-olingo4/camel-olingo4-component/src/main/docs/olingo4-component.adoc
+++ b/components/camel-olingo4/camel-olingo4-component/src/main/docs/olingo4-component.adoc
@@ -140,7 +140,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
-The component supports 15 options, which are listed below.
+The component supports 16 options, which are listed below.
@@ -159,6 +159,7 @@ The component supports 15 options, which are listed below.
| *camel.component.olingo4.configuration.proxy* | HTTP proxy server configuration | | HttpHost
| *camel.component.olingo4.configuration.service-uri* | Target OData service base URI, e.g. \http://services.odata.org/OData/OData.svc | | String
| *camel.component.olingo4.configuration.socket-timeout* | HTTP request timeout in milliseconds, defaults to 30,000 (30 seconds) | 30000 | Integer
+| *camel.component.olingo4.configuration.split-result* | For endpoints that return an array or collection, a consumer endpoint will map every element to distinct messages, unless splitResult is set to false. | true | Boolean
| *camel.component.olingo4.configuration.ssl-context-parameters* | To configure security using SSLContextParameters | | SSLContextParameters
| *camel.component.olingo4.enabled* | Enable olingo4 component | true | Boolean
| *camel.component.olingo4.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters. | false | Boolean
diff --git a/components/readme.adoc b/components/readme.adoc
index 3638b06..3f536e8 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -1053,12 +1053,14 @@ Number of Languages: 17 in 11 JAR artifacts (0 deprecated)
== Miscellaneous Components
// others: START
-Number of Miscellaneous Components: 34 in 34 JAR artifacts (0 deprecated)
+Number of Miscellaneous Components: 35 in 35 JAR artifacts (0 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
| Component | Available From | Description
+| link:camel-activemq/src/main/docs/activemq.adoc[Activemq] (camel-activemq) | | ActiveMQ component for Camel
+
| link:camel-attachments/src/main/docs/attachments.adoc[Attachments] (camel-attachments) | 3.0 | Java Attachments support for Camel Message
| link:camel-blueprint/src/main/docs/blueprint.adoc[Blueprint] (camel-blueprint) | 2.4 | Using Camel with OSGi Blueprint
diff --git a/docs/components/modules/ROOT/pages/csv-dataformat.adoc b/docs/components/modules/ROOT/pages/csv-dataformat.adoc
index b3265f3..8a96562 100644
--- a/docs/components/modules/ROOT/pages/csv-dataformat.adoc
+++ b/docs/components/modules/ROOT/pages/csv-dataformat.adoc
@@ -220,7 +220,7 @@ public void doHandleCsvData(List<List<String>> csvData)
------------------------------------------------------------------------------------------------
<route>
<!-- poll every 10 seconds -->
- <from uri="file:///some/path/to/pickup/csvfiles?delete=true&consumer.delay=10000" />
+ <from uri="file:///some/path/to/pickup/csvfiles?delete=true&delay=10000" />
<unmarshal><csv /></unmarshal>
<to uri="bean:myCsvHandler?method=doHandleCsvData" />
</route>
diff --git a/docs/components/modules/ROOT/pages/facebook-component.adoc b/docs/components/modules/ROOT/pages/facebook-component.adoc
index 8a224c9..119d30e 100644
--- a/docs/components/modules/ROOT/pages/facebook-component.adoc
+++ b/docs/components/modules/ROOT/pages/facebook-component.adoc
@@ -352,7 +352,7 @@ your home feed:
[source,java]
-----------------------------------------------
- from("facebook://home?consumer.delay=5000")
+ from("facebook://home?delay=5000")
.to("bean:blah");
-----------------------------------------------
diff --git a/docs/components/modules/ROOT/pages/file-component.adoc b/docs/components/modules/ROOT/pages/file-component.adoc
index d9b4991..6735a76 100644
--- a/docs/components/modules/ROOT/pages/file-component.adoc
+++ b/docs/components/modules/ROOT/pages/file-component.adoc
@@ -1129,13 +1129,11 @@ directories, to avoid traversing down unwanted directories.
For example to skip any directories which starts with `"skip"` in the
name, can be implemented as follows:
-== Using consumer.bridgeErrorHandler
-
-*Available as of Camel 2.10*
+== Using bridgeErrorHandler
If you want to use the Camel Error Handler to
deal with any exception occurring in the file consumer, then you can
-enable the `consumer.bridgeErrorHandler` option as shown below:
+enable the `bridgeErrorHandler` option as shown below:
[source,java]
----
@@ -1148,7 +1146,7 @@ onException(IOException.class)
// this is the file route that pickup files, notice how we bridge the consumer to use the Camel routing error handler
// the exclusiveReadLockStrategy is only configured because this is from an unit test, so we use that to simulate exceptions
-from("file:target/nospace?consumer.bridgeErrorHandler=true")
+from("file:target/nospace?bridgeErrorHandler=true")
.convertBodyTo(String.class)
.to("mock:result");
----
@@ -1156,8 +1154,8 @@ from("file:target/nospace?consumer.bridgeErrorHandler=true")
So all you have to do is to enable this option, and the error handler in
the route will take it from there.
-IMPORTANT: *Important when using consumer.bridgeErrorHandler*
-When using consumer.bridgeErrorHandler, then
+IMPORTANT: *Important when using bridgeErrorHandler*
+When using bridgeErrorHandler, then
interceptors, OnCompletions
does *not* apply. The Exchange is processed directly
by the Camel Error Handler, and does not allow
diff --git a/docs/components/modules/ROOT/pages/hipchat-component.adoc b/docs/components/modules/ROOT/pages/hipchat-component.adoc
index 755a76c..a2d3bda 100644
--- a/docs/components/modules/ROOT/pages/hipchat-component.adoc
+++ b/docs/components/modules/ROOT/pages/hipchat-component.adoc
@@ -85,7 +85,7 @@ with the following path and query parameters:
| *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. | | int
| *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. | | int
| *backoffMultiplier* (scheduler) | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. | | int
-| *delay* (scheduler) | Milliseconds before the next poll. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 500 | long
+| *delay* (scheduler) | Milliseconds before the next poll. | 5000 | long
| *greedy* (scheduler) | If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages. | false | boolean
| *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
| *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
diff --git a/docs/components/modules/ROOT/pages/http-component.adoc b/docs/components/modules/ROOT/pages/http-component.adoc
index 34c3651..e2939d6 100644
--- a/docs/components/modules/ROOT/pages/http-component.adoc
+++ b/docs/components/modules/ROOT/pages/http-component.adoc
@@ -66,9 +66,9 @@ The HTTP component supports 18 options, which are listed below.
| *connectionRequest Timeout* (timeout) | The timeout in milliseconds used when requesting a connection from the connection manager. A timeout value of zero is interpreted as an infinite timeout. A timeout value of zero is interpreted as an infinite timeout. A negative value is interpreted as undefined (system default). Default: -1 | -1 | int
| *connectTimeout* (timeout) | Determines the timeout in milliseconds until a connection is established. A timeout value of zero is interpreted as an infinite timeout. A timeout value of zero is interpreted as an infinite timeout. A negative value is interpreted as undefined (system default). Default: -1 | -1 | int
| *socketTimeout* (timeout) | Defines the socket timeout (SO_TIMEOUT) in milliseconds, which is the timeout for waiting for data or, put differently, a maximum period inactivity between two consecutive data packets). A timeout value of zero is interpreted as an infinite timeout. A negative value is interpreted as undefined (system default). Default: -1 | -1 | int
+| *allowJavaSerialized Object* (advanced) | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | boolean
| *httpBinding* (advanced) | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. | | HttpBinding
| *httpConfiguration* (advanced) | To use the shared HttpConfiguration as base configuration. | | HttpConfiguration
-| *allowJavaSerialized Object* (advanced) | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | boolean
| *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. | | HeaderFilterStrategy
| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
|===
diff --git a/docs/components/modules/ROOT/pages/jetty-component.adoc b/docs/components/modules/ROOT/pages/jetty-component.adoc
index aa0a5aa..f3776d4 100644
--- a/docs/components/modules/ROOT/pages/jetty-component.adoc
+++ b/docs/components/modules/ROOT/pages/jetty-component.adoc
@@ -57,36 +57,36 @@ The Jetty component supports 33 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *sslKeyPassword* (security) | The key password, which is used to access the certificate's key entry in the keystore (this is the same password that is supplied to the keystore command's -keypass option). | | String
-| *sslPassword* (security) | The ssl password, which is required to access the keystore file (this is the same password that is supplied to the keystore command's -storepass option). | | String
-| *keystore* (security) | Specifies the location of the Java keystore file, which contains the Jetty server's own X.509 certificate in a key entry. | | String
-| *errorHandler* (advanced) | This option is used to set the ErrorHandler that Jetty server uses. | | ErrorHandler
-| *sslSocketConnectors* (security) | A map which contains per port number specific SSL connectors. | | Map
-| *socketConnectors* (security) | A map which contains per port number specific HTTP connectors. Uses the same principle as sslSocketConnectors. | | Map
-| *httpClientMinThreads* (producer) | To set a value for minimum number of threads in HttpClient thread pool. Notice that both a min and max size must be configured. | | Integer
-| *httpClientMaxThreads* (producer) | To set a value for maximum number of threads in HttpClient thread pool. Notice that both a min and max size must be configured. | | Integer
-| *minThreads* (consumer) | To set a value for minimum number of threads in server thread pool. Notice that both a min and max size must be configured. | | Integer
-| *maxThreads* (consumer) | To set a value for maximum number of threads in server thread pool. Notice that both a min and max size must be configured. | | Integer
-| *threadPool* (consumer) | To use a custom thread pool for the server. This option should only be used in special circumstances. | | ThreadPool
+| *continuationTimeout* (consumer) | Allows to set a timeout in millis when using Jetty as consumer (server). By default Jetty uses 30000. You can use a value of = 0 to never expire. If a timeout occurs then the request will be expired and Jetty will return back a http error 503 to the client. This option is only in use when using Jetty with the Asynchronous Routing Engine. | 30000 | Long
| *enableJmx* (consumer) | If this option is true, Jetty JMX support will be enabled for this endpoint. | false | boolean
-| *jettyHttpBinding* (advanced) | To use a custom org.apache.camel.component.jetty.JettyHttpBinding, which are used to customize how a response should be written for the producer. | | JettyHttpBinding
+| *errorHandler* (advanced) | This option is used to set the ErrorHandler that Jetty server uses. | | ErrorHandler
| *httpBinding* (advanced) | Not to be used - use JettyHttpBinding instead. | | HttpBinding
+| *httpClientMaxThreads* (producer) | To set a value for maximum number of threads in HttpClient thread pool. Notice that both a min and max size must be configured. | | Integer
+| *httpClientMinThreads* (producer) | To set a value for minimum number of threads in HttpClient thread pool. Notice that both a min and max size must be configured. | | Integer
| *httpConfiguration* (advanced) | Jetty component does not use HttpConfiguration. | | HttpConfiguration
+| *jettyHttpBinding* (advanced) | To use a custom org.apache.camel.component.jetty.JettyHttpBinding, which are used to customize how a response should be written for the producer. | | JettyHttpBinding
+| *keystore* (security) | Specifies the location of the Java keystore file, which contains the Jetty server's own X.509 certificate in a key entry. | | String
+| *maxThreads* (consumer) | To set a value for maximum number of threads in server thread pool. Notice that both a min and max size must be configured. | | Integer
| *mbContainer* (advanced) | To use a existing configured org.eclipse.jetty.jmx.MBeanContainer if JMX is enabled that Jetty uses for registering mbeans. | | MBeanContainer
-| *sslSocketConnector Properties* (security) | A map which contains general SSL connector properties. | | Map
-| *socketConnector Properties* (security) | A map which contains general HTTP connector properties. Uses the same principle as sslSocketConnectorProperties. | | Map
-| *continuationTimeout* (consumer) | Allows to set a timeout in millis when using Jetty as consumer (server). By default Jetty uses 30000. You can use a value of = 0 to never expire. If a timeout occurs then the request will be expired and Jetty will return back a http error 503 to the client. This option is only in use when using Jetty with the Asynchronous Routing Engine. | 30000 | Long
-| *useContinuation* (consumer) | Whether or not to use Jetty continuations for the Jetty Server. | true | boolean
-| *sslContextParameters* (security) | To configure security using SSLContextParameters | | SSLContextParameters
-| *useGlobalSslContext Parameters* (security) | Enable usage of global SSL context parameters | false | boolean
-| *responseBufferSize* (consumer) | Allows to configure a custom value of the response buffer size on the Jetty connectors. | | Integer
+| *minThreads* (consumer) | To set a value for minimum number of threads in server thread pool. Notice that both a min and max size must be configured. | | Integer
+| *proxyHost* (proxy) | To use a http proxy to configure the hostname. | | String
+| *proxyPort* (proxy) | To use a http proxy to configure the port number. | | Integer
| *requestBufferSize* (consumer) | Allows to configure a custom value of the request buffer size on the Jetty connectors. | | Integer
| *requestHeaderSize* (consumer) | Allows to configure a custom value of the request header size on the Jetty connectors. | | Integer
+| *responseBufferSize* (consumer) | Allows to configure a custom value of the response buffer size on the Jetty connectors. | | Integer
| *responseHeaderSize* (consumer) | Allows to configure a custom value of the response header size on the Jetty connectors. | | Integer
-| *proxyHost* (proxy) | To use a http proxy to configure the hostname. | | String
-| *proxyPort* (proxy) | To use a http proxy to configure the port number. | | Integer
-| *useXForwardedFor Header* (consumer) | To use the X-Forwarded-For header in HttpServletRequest.getRemoteAddr. | false | boolean
| *sendServerVersion* (consumer) | If the option is true, jetty will send the server header with the jetty version information to the client which sends the request. NOTE please make sure there is no any other camel-jetty endpoint is share the same port, otherwise this option may not work as expected. | true | boolean
+| *socketConnector Properties* (security) | A map which contains general HTTP connector properties. Uses the same principle as sslSocketConnectorProperties. | | Map
+| *socketConnectors* (security) | A map which contains per port number specific HTTP connectors. Uses the same principle as sslSocketConnectors. | | Map
+| *sslContextParameters* (security) | To configure security using SSLContextParameters | | SSLContextParameters
+| *sslKeyPassword* (security) | The key password, which is used to access the certificate's key entry in the keystore (this is the same password that is supplied to the keystore command's -keypass option). | | String
+| *sslPassword* (security) | The ssl password, which is required to access the keystore file (this is the same password that is supplied to the keystore command's -storepass option). | | String
+| *sslSocketConnector Properties* (security) | A map which contains general SSL connector properties. | | Map
+| *sslSocketConnectors* (security) | A map which contains per port number specific SSL connectors. | | Map
+| *threadPool* (consumer) | To use a custom thread pool for the server. This option should only be used in special circumstances. | | ThreadPool
+| *useContinuation* (consumer) | Whether or not to use Jetty continuations for the Jetty Server. | true | boolean
+| *useGlobalSslContext Parameters* (security) | Enable usage of global SSL context parameters | false | boolean
+| *useXForwardedFor Header* (consumer) | To use the X-Forwarded-For header in HttpServletRequest.getRemoteAddr. | false | boolean
| *allowJavaSerialized Object* (advanced) | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | boolean
| *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. | | HeaderFilterStrategy
| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
diff --git a/docs/components/modules/ROOT/pages/linkedin-component.adoc b/docs/components/modules/ROOT/pages/linkedin-component.adoc
index 30038f5..c15d632 100644
--- a/docs/components/modules/ROOT/pages/linkedin-component.adoc
+++ b/docs/components/modules/ROOT/pages/linkedin-component.adoc
@@ -715,7 +715,7 @@ The following route polls user's connections every 30 seconds:
[source,java]
-------------------------------------------------------------------------------------
- from("linkedin://people/connections?consumer.timeUnit=SECONDS&consumer.delay=30")
+ from("linkedin://people/connections?consumer.timeUnit=SECONDS&delay=30")
.to("bean:foo");
-------------------------------------------------------------------------------------
diff --git a/docs/components/modules/ROOT/pages/mail-component.adoc b/docs/components/modules/ROOT/pages/mail-component.adoc
index 09008da..a995f69 100644
--- a/docs/components/modules/ROOT/pages/mail-component.adoc
+++ b/docs/components/modules/ROOT/pages/mail-component.adoc
@@ -501,7 +501,7 @@ interval, `consumer.delay`, as 60000 milliseconds = 60 seconds.
[source,java]
-------------------------------------------------------
from("imap://admin@mymailserver.com
- password=secret&unseen=true&consumer.delay=60000")
+ password=secret&unseen=true&delay=60000")
.to("seda://mails");
-------------------------------------------------------
@@ -538,7 +538,7 @@ extensive documentation on how to do this.
[source,java]
-------------------------------------------------------------------------------------
from("imaps://imap.gmail.com?username=YOUR_USERNAME@gmail.com&password=YOUR_PASSWORD"
- + "&delete=false&unseen=true&consumer.delay=60000").to("log:newmail");
+ + "&delete=false&unseen=true&delay=60000").to("log:newmail");
-------------------------------------------------------------------------------------
The preceding route polls the Google mail inbox for new mails once every
@@ -566,7 +566,7 @@ SSL sample:
[source,java]
---------------------------------------------------------------------------------------
from("imaps://imap.gmail.com?username=YOUR_USERNAME@gmail.com&password=YOUR_PASSWORD"
- + "&delete=false&unseen=true&consumer.delay=60000").process(new MyMailProcessor());
+ + "&delete=false&unseen=true&delay=60000").process(new MyMailProcessor());
---------------------------------------------------------------------------------------
Instead of logging the mail we use a processor where we can process the
diff --git a/docs/components/modules/ROOT/pages/olingo2-component.adoc b/docs/components/modules/ROOT/pages/olingo2-component.adoc
index f7cb154..664d29f 100644
--- a/docs/components/modules/ROOT/pages/olingo2-component.adoc
+++ b/docs/components/modules/ROOT/pages/olingo2-component.adoc
@@ -83,7 +83,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (17 parameters):
+=== Query Parameters (33 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -101,11 +101,27 @@ with the following path and query parameters:
| *socketTimeout* (common) | HTTP request timeout in milliseconds, defaults to 30,000 (30 seconds) | 30000 | int
| *sslContextParameters* (common) | To configure security using SSLContextParameters | | SSLContextParameters
| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
+| *sendEmptyMessageWhenIdle* (consumer) | If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead. | false | boolean
+| *splitResult* (consumer) | For endpoints that return an array or collection, a consumer endpoint will map every element to distinct messages, unless splitResult is set to false. | true | boolean
| *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | | ExceptionHandler
| *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. | | ExchangePattern
+| *pollStrategy* (consumer) | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. | | PollingConsumerPoll Strategy
| *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
+| *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. | | int
+| *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. | | int
+| *backoffMultiplier* (scheduler) | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. | | int
+| *delay* (scheduler) | Milliseconds before the next poll. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 500 | long
+| *greedy* (scheduler) | If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages. | false | boolean
+| *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
+| *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
+| *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. | | ScheduledExecutor Service
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | String
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. | | Map
+| *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
+| *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
+| *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
|===
// endpoint options: END
// spring-boot-auto-configure options: START
@@ -124,7 +140,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
-The component supports 15 options, which are listed below.
+The component supports 16 options, which are listed below.
@@ -143,6 +159,7 @@ The component supports 15 options, which are listed below.
| *camel.component.olingo2.configuration.proxy* | HTTP proxy server configuration | | HttpHost
| *camel.component.olingo2.configuration.service-uri* | Target OData service base URI, e.g. \http://services.odata.org/OData/OData.svc | | String
| *camel.component.olingo2.configuration.socket-timeout* | HTTP request timeout in milliseconds, defaults to 30,000 (30 seconds) | 30000 | Integer
+| *camel.component.olingo2.configuration.split-result* | For endpoints that return an array or collection, a consumer endpoint will map every element to distinct messages, unless splitResult is set to false. | true | Boolean
| *camel.component.olingo2.configuration.ssl-context-parameters* | To configure security using SSLContextParameters | | SSLContextParameters
| *camel.component.olingo2.enabled* | Enable olingo2 component | true | Boolean
| *camel.component.olingo2.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters. | false | Boolean
@@ -255,11 +272,11 @@ java.util.List<java.util.Map<String, Object>> containing list of key property na
Only the *read* endpoint can be used as a consumer endpoint. Consumer
endpoints can
use http://camel.apache.org/polling-consumer.html#PollingConsumer-ScheduledPollConsumerOptions[Scheduled
-Poll Consumer Options] with a *`consumer.`* prefix to schedule endpoint
+Poll Consumer Options] to schedule endpoint
invocation. By default consumer endpoints that return an array or
collection will generate one exchange per element, and their routes will
be executed once for each exchange. This behavior can be disabled by
-setting the endpoint property *consumer.splitResult=false*.
+setting the endpoint property *splitResult=false*.
== Message Headers
@@ -274,7 +291,7 @@ API] used by the Olingo2Component. Producer endpoints can specify the
option name for incoming message body in the *`inBody`* endpoint URI
parameter. For endpoints that return an array or collection, a consumer
endpoint will map every element to distinct messages, unless
-*consumer.splitResult* is set to *false*.
+*splitResult* is set to *false*.
== Use cases
@@ -331,6 +348,6 @@ consumer endpoint will produce an *ODataFeed* value the first time, and
[source,java]
---------------------------------------------------------------------------------------------------------
-from("olingo2://read/Manufacturers?queryParams=#paramsBean&consumer.timeUnit=SECONDS&consumer.delay=30")
+from("olingo2://read/Manufacturers?queryParams=#paramsBean&timeUnit=SECONDS&delay=30")
.to("bean:blah");
---------------------------------------------------------------------------------------------------------
diff --git a/docs/components/modules/ROOT/pages/olingo4-component.adoc b/docs/components/modules/ROOT/pages/olingo4-component.adoc
index c380d8a..7e6eadf 100644
--- a/docs/components/modules/ROOT/pages/olingo4-component.adoc
+++ b/docs/components/modules/ROOT/pages/olingo4-component.adoc
@@ -84,7 +84,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (17 parameters):
+=== Query Parameters (33 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -102,11 +102,27 @@ with the following path and query parameters:
| *socketTimeout* (common) | HTTP request timeout in milliseconds, defaults to 30,000 (30 seconds) | 30000 | int
| *sslContextParameters* (common) | To configure security using SSLContextParameters | | SSLContextParameters
| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
+| *sendEmptyMessageWhenIdle* (consumer) | If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead. | false | boolean
+| *splitResult* (consumer) | For endpoints that return an array or collection, a consumer endpoint will map every element to distinct messages, unless splitResult is set to false. | true | boolean
| *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | | ExceptionHandler
| *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. | | ExchangePattern
+| *pollStrategy* (consumer) | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. | | PollingConsumerPoll Strategy
| *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
+| *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. | | int
+| *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. | | int
+| *backoffMultiplier* (scheduler) | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. | | int
+| *delay* (scheduler) | Milliseconds before the next poll. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 500 | long
+| *greedy* (scheduler) | If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages. | false | boolean
+| *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
+| *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
+| *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. | | ScheduledExecutor Service
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | String
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. | | Map
+| *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
+| *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
+| *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
|===
// endpoint options: END
// spring-boot-auto-configure options: START
@@ -125,7 +141,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
-The component supports 15 options, which are listed below.
+The component supports 16 options, which are listed below.
@@ -144,6 +160,7 @@ The component supports 15 options, which are listed below.
| *camel.component.olingo4.configuration.proxy* | HTTP proxy server configuration | | HttpHost
| *camel.component.olingo4.configuration.service-uri* | Target OData service base URI, e.g. \http://services.odata.org/OData/OData.svc | | String
| *camel.component.olingo4.configuration.socket-timeout* | HTTP request timeout in milliseconds, defaults to 30,000 (30 seconds) | 30000 | Integer
+| *camel.component.olingo4.configuration.split-result* | For endpoints that return an array or collection, a consumer endpoint will map every element to distinct messages, unless splitResult is set to false. | true | Boolean
| *camel.component.olingo4.configuration.ssl-context-parameters* | To configure security using SSLContextParameters | | SSLContextParameters
| *camel.component.olingo4.enabled* | Enable olingo4 component | true | Boolean
| *camel.component.olingo4.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters. | false | Boolean
@@ -238,11 +255,11 @@ java.util.Map<String, Object> for In body (request)
Only the *read* endpoint can be used as a consumer endpoint. Consumer
endpoints can
use http://camel.apache.org/polling-consumer.html#PollingConsumer-ScheduledPollConsumerOptions[Scheduled
-Poll Consumer Options] with a *`consumer.`* prefix to schedule endpoint
+Poll Consumer Options] to schedule endpoint
invocation. By default consumer endpoints that return an array or
collection will generate one exchange per element, and their routes will
be executed once for each exchange. This behavior can be disabled by
-setting the endpoint property *consumer.splitResult=false*.
+setting the endpoint property *splitResult=false*.
== Message Headers
@@ -257,7 +274,7 @@ API] used by the Olingo4Component. Producer endpoints can specify the
option name for incoming message body in the *`inBody`* endpoint URI
parameter. For endpoints that return an array or collection, a consumer
endpoint will map every element to distinct messages, unless
-*consumer.splitResult* is set to *false*.
+*splitResult* is set to *false*.
== Use cases
diff --git a/docs/components/modules/ROOT/pages/rss-component.adoc b/docs/components/modules/ROOT/pages/rss-component.adoc
index 7fda8ad..d850341 100644
--- a/docs/components/modules/ROOT/pages/rss-component.adoc
+++ b/docs/components/modules/ROOT/pages/rss-component.adoc
@@ -177,18 +177,18 @@ convert between String (as XML) and ROME RSS model objects.
* unmarshal = from XML `String` to ROME `SyndFeed`
A route using the RSS dataformat will look like this:
-`from("rss:file:src/test/data/rss20.xml?splitEntries=false&consumer.delay=1000").marshal().rss().to("mock:marshal");`
+`from("rss:file:src/test/data/rss20.xml?splitEntries=false&delay=1000").marshal().rss().to("mock:marshal");`
The purpose of this feature is to make it possible to use Camel's built-in expressions for manipulating RSS messages. As shown below, an
XPath expression can be used to filter the RSS message. In the following example, on ly entries with Camel in the title will get through the filter.
- `from("rss:file:src/test/data/rss20.xml?splitEntries=true&consumer.delay=100").marshal().rss().filter().xpath("//item/title[contains(.,'Camel')]").to("mock:result");`
+ `from("rss:file:src/test/data/rss20.xml?splitEntries=true&delay=100").marshal().rss().filter().xpath("//item/title[contains(.,'Camel')]").to("mock:result");`
TIP: *Query parameters*
If the URL for the RSS feed uses query parameters, this component will
resolve them. For example if the feed uses `alt=rss`, then the following example will be resolved:
-`from("rss:http://someserver.com/feeds/posts/default?alt=rss&splitEntries=false&consumer.delay=1000").to("bean:rss");`
+`from("rss:http://someserver.com/feeds/posts/default?alt=rss&splitEntries=false&delay=1000").to("bean:rss");`
== Filtering entries
@@ -198,7 +198,7 @@ Bean Integration to implement your own
conditions. For instance, a filter equivalent to the XPath example above
would be:
-`from("rss:file:src/test/data/rss20.xml?splitEntries=true&consumer.delay=100").
+`from("rss:file:src/test/data/rss20.xml?splitEntries=true&delay=100").
filter().method("myFilterBean", "titleContainsCamel").to("mock:result");`
The custom bean for this would be:
diff --git a/docs/components/modules/ROOT/pages/rss-dataformat.adoc b/docs/components/modules/ROOT/pages/rss-dataformat.adoc
index 9ce6336..08a00c4 100644
--- a/docs/components/modules/ROOT/pages/rss-dataformat.adoc
+++ b/docs/components/modules/ROOT/pages/rss-dataformat.adoc
@@ -20,7 +20,7 @@ TIP: *Query parameters*
If the URL for the RSS feed uses query parameters, this component will
understand them as well, for example if the feed uses `alt=rss`, then
you can for example do
-`from("rss:http://someserver.com/feeds/posts/default?alt=rss&splitEntries=false&consumer.delay=1000").to("bean:rss");`
+`from("rss:http://someserver.com/feeds/posts/default?alt=rss&splitEntries=false&delay=1000").to("bean:rss");`
== Options
diff --git a/docs/components/modules/ROOT/pages/tarfile-dataformat.adoc b/docs/components/modules/ROOT/pages/tarfile-dataformat.adoc
index 15a2e0a..fcb9c31 100644
--- a/docs/components/modules/ROOT/pages/tarfile-dataformat.adoc
+++ b/docs/components/modules/ROOT/pages/tarfile-dataformat.adoc
@@ -121,7 +121,7 @@ work.
----------------------------------------------------------------------------------------------------
TarFileDataFormat tarFile = new TarFileDataFormat();
tarFile.setUsingIterator(true);
- from("file:src/test/resources/org/apache/camel/dataformat/tarfile/?consumer.delay=1000&noop=true")
+ from("file:src/test/resources/org/apache/camel/dataformat/tarfile/?delay=1000&noop=true")
.unmarshal(tarFile)
.split(body(Iterator.class))
.streaming()
@@ -134,7 +134,7 @@ like this
[source,java]
----------------------------------------------------------------------------------------------------
- from("file:src/test/resources/org/apache/camel/dataformat/tarfile?consumer.delay=1000&noop=true")
+ from("file:src/test/resources/org/apache/camel/dataformat/tarfile?delay=1000&noop=true")
.split(new TarSplitter())
.streaming()
.process(new UnTarpedMessageProcessor())
diff --git a/docs/components/modules/ROOT/pages/twilio-component.adoc b/docs/components/modules/ROOT/pages/twilio-component.adoc
index fe81a0a..ce64a4b 100644
--- a/docs/components/modules/ROOT/pages/twilio-component.adoc
+++ b/docs/components/modules/ROOT/pages/twilio-component.adoc
@@ -59,7 +59,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (7 parameters):
+=== Query Parameters (22 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -67,11 +67,26 @@ with the following path and query parameters:
| Name | Description | Default | Type
| *inBody* (common) | Sets the name of a parameter to be passed in the exchange In Body | | String
| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
+| *sendEmptyMessageWhenIdle* (consumer) | If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead. | false | boolean
| *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | | ExceptionHandler
| *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. | | ExchangePattern
+| *pollStrategy* (consumer) | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. | | PollingConsumerPoll Strategy
| *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
+| *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. | | int
+| *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. | | int
+| *backoffMultiplier* (scheduler) | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. | | int
+| *delay* (scheduler) | Milliseconds before the next poll. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 500 | long
+| *greedy* (scheduler) | If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages. | false | boolean
+| *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
+| *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
+| *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. | | ScheduledExecutor Service
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | String
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. | | Map
+| *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
+| *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
+| *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
|===
// endpoint options: END
// spring-boot-auto-configure options: START
diff --git a/docs/components/modules/ROOT/pages/zendesk-component.adoc b/docs/components/modules/ROOT/pages/zendesk-component.adoc
index 4d36374..9076f4f 100644
--- a/docs/components/modules/ROOT/pages/zendesk-component.adoc
+++ b/docs/components/modules/ROOT/pages/zendesk-component.adoc
@@ -55,7 +55,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (12 parameters):
+=== Query Parameters (27 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -64,11 +64,26 @@ with the following path and query parameters:
| *inBody* (common) | Sets the name of a parameter to be passed in the exchange In Body | | String
| *serverUrl* (common) | The server URL to connect. | | String
| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
+| *sendEmptyMessageWhenIdle* (consumer) | If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead. | false | boolean
| *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | | ExceptionHandler
| *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. | | ExchangePattern
+| *pollStrategy* (consumer) | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. | | PollingConsumerPoll Strategy
| *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
+| *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. | | int
+| *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. | | int
+| *backoffMultiplier* (scheduler) | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. | | int
+| *delay* (scheduler) | Milliseconds before the next poll. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 500 | long
+| *greedy* (scheduler) | If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages. | false | boolean
+| *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
+| *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
+| *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. | | ScheduledExecutor Service
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | String
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. | | Map
+| *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
+| *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
+| *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
| *oauthToken* (security) | The OAuth token. | | String
| *password* (security) | The password. | | String
| *token* (security) | The security token. | | String
diff --git a/docs/components/modules/ROOT/pages/zipfile-dataformat.adoc b/docs/components/modules/ROOT/pages/zipfile-dataformat.adoc
index d8af1cc..48e7a55 100644
--- a/docs/components/modules/ROOT/pages/zipfile-dataformat.adoc
+++ b/docs/components/modules/ROOT/pages/zipfile-dataformat.adoc
@@ -128,7 +128,7 @@ work.
ZipFileDataFormat zipFile = new ZipFileDataFormat();
zipFile.setUsingIterator(true);
-from("file:src/test/resources/org/apache/camel/dataformat/zipfile/?consumer.delay=1000&noop=true")
+from("file:src/test/resources/org/apache/camel/dataformat/zipfile/?delay=1000&noop=true")
.unmarshal(zipFile)
.split(body(Iterator.class)).streaming()
.process(new UnZippedMessageProcessor())
@@ -140,7 +140,7 @@ like this
[source,java]
----
-from("file:src/test/resources/org/apache/camel/dataformat/zipfile?consumer.delay=1000&noop=true")
+from("file:src/test/resources/org/apache/camel/dataformat/zipfile?delay=1000&noop=true")
.split(new ZipSplitter()).streaming()
.process(new UnZippedMessageProcessor())
.end();
diff --git a/platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentConfiguration.java
index 3aee84f..2d100d0 100644
--- a/platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentConfiguration.java
@@ -117,6 +117,14 @@ public class HttpComponentConfiguration
*/
private Integer socketTimeout = -1;
/**
+ * Whether to allow java serialization when a request uses
+ * context-type=application/x-java-serialized-object. This is by default
+ * turned off. If you enable this then be aware that Java will deserialize
+ * the incoming data from the request to Java and that can be a potential
+ * security risk.
+ */
+ private Boolean allowJavaSerializedObject = false;
+ /**
* To use a custom HttpBinding to control the mapping between Camel message
* and HttpClient. The option is a org.apache.camel.http.common.HttpBinding
* type.
@@ -128,14 +136,6 @@ public class HttpComponentConfiguration
*/
private String httpConfiguration;
/**
- * Whether to allow java serialization when a request uses
- * context-type=application/x-java-serialized-object. This is by default
- * turned off. If you enable this then be aware that Java will deserialize
- * the incoming data from the request to Java and that can be a potential
- * security risk.
- */
- private Boolean allowJavaSerializedObject = false;
- /**
* To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter
* header to and from Camel message. The option is a
* org.apache.camel.spi.HeaderFilterStrategy type.
@@ -252,6 +252,14 @@ public class HttpComponentConfiguration
this.socketTimeout = socketTimeout;
}
+ public Boolean getAllowJavaSerializedObject() {
+ return allowJavaSerializedObject;
+ }
+
+ public void setAllowJavaSerializedObject(Boolean allowJavaSerializedObject) {
+ this.allowJavaSerializedObject = allowJavaSerializedObject;
+ }
+
public String getHttpBinding() {
return httpBinding;
}
@@ -268,14 +276,6 @@ public class HttpComponentConfiguration
this.httpConfiguration = httpConfiguration;
}
- public Boolean getAllowJavaSerializedObject() {
- return allowJavaSerializedObject;
- }
-
- public void setAllowJavaSerializedObject(Boolean allowJavaSerializedObject) {
- this.allowJavaSerializedObject = allowJavaSerializedObject;
- }
-
public String getHeaderFilterStrategy() {
return headerFilterStrategy;
}
diff --git a/platforms/spring-boot/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java b/platforms/spring-boot/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java
index e135dd9..ac7e5ee 100644
--- a/platforms/spring-boot/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java
+++ b/platforms/spring-boot/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java
@@ -40,159 +40,159 @@ public class JettyHttpComponentConfiguration9
*/
private Boolean enabled;
/**
- * The key password, which is used to access the certificate's key entry in
- * the keystore (this is the same password that is supplied to the keystore
- * command's -keypass option).
- */
- private String sslKeyPassword;
- /**
- * The ssl password, which is required to access the keystore file (this is
- * the same password that is supplied to the keystore command's -storepass
- * option).
+ * Allows to set a timeout in millis when using Jetty as consumer (server).
+ * By default Jetty uses 30000. You can use a value of = 0 to never expire.
+ * If a timeout occurs then the request will be expired and Jetty will
+ * return back a http error 503 to the client. This option is only in use
+ * when using Jetty with the Asynchronous Routing Engine.
*/
- private String sslPassword;
+ private Long continuationTimeout = 30000L;
/**
- * Specifies the location of the Java keystore file, which contains the
- * Jetty server's own X.509 certificate in a key entry.
+ * If this option is true, Jetty JMX support will be enabled for this
+ * endpoint.
*/
- private String keystore;
+ private Boolean enableJmx = false;
/**
* This option is used to set the ErrorHandler that Jetty server uses. The
* option is a org.eclipse.jetty.server.handler.ErrorHandler type.
*/
private String errorHandler;
/**
- * A map which contains per port number specific SSL connectors.
+ * Not to be used - use JettyHttpBinding instead. The option is a
+ * org.apache.camel.http.common.HttpBinding type.
*/
- private Map<Integer, Connector> sslSocketConnectors;
+ private String httpBinding;
/**
- * A map which contains per port number specific HTTP connectors. Uses the
- * same principle as sslSocketConnectors.
+ * To set a value for maximum number of threads in HttpClient thread pool.
+ * Notice that both a min and max size must be configured.
*/
- private Map<Integer, Connector> socketConnectors;
+ private Integer httpClientMaxThreads;
/**
* To set a value for minimum number of threads in HttpClient thread pool.
* Notice that both a min and max size must be configured.
*/
private Integer httpClientMinThreads;
/**
- * To set a value for maximum number of threads in HttpClient thread pool.
- * Notice that both a min and max size must be configured.
+ * Jetty component does not use HttpConfiguration. The option is a
+ * org.apache.camel.http.common.HttpConfiguration type.
*/
- private Integer httpClientMaxThreads;
+ private String httpConfiguration;
/**
- * To set a value for minimum number of threads in server thread pool.
- * Notice that both a min and max size must be configured.
+ * To use a custom org.apache.camel.component.jetty.JettyHttpBinding, which
+ * are used to customize how a response should be written for the producer.
+ * The option is a org.apache.camel.component.jetty.JettyHttpBinding type.
*/
- private Integer minThreads;
+ private String jettyHttpBinding;
+ /**
+ * Specifies the location of the Java keystore file, which contains the
+ * Jetty server's own X.509 certificate in a key entry.
+ */
+ private String keystore;
/**
* To set a value for maximum number of threads in server thread pool.
* Notice that both a min and max size must be configured.
*/
private Integer maxThreads;
/**
- * To use a custom thread pool for the server. This option should only be
- * used in special circumstances. The option is a
- * org.eclipse.jetty.util.thread.ThreadPool type.
+ * To use a existing configured org.eclipse.jetty.jmx.MBeanContainer if JMX
+ * is enabled that Jetty uses for registering mbeans. The option is a
+ * org.eclipse.jetty.jmx.MBeanContainer type.
*/
- private String threadPool;
+ private String mbContainer;
/**
- * If this option is true, Jetty JMX support will be enabled for this
- * endpoint.
+ * To set a value for minimum number of threads in server thread pool.
+ * Notice that both a min and max size must be configured.
*/
- private Boolean enableJmx = false;
+ private Integer minThreads;
/**
- * To use a custom org.apache.camel.component.jetty.JettyHttpBinding, which
- * are used to customize how a response should be written for the producer.
- * The option is a org.apache.camel.component.jetty.JettyHttpBinding type.
+ * To use a http proxy to configure the hostname.
*/
- private String jettyHttpBinding;
+ private String proxyHost;
/**
- * Not to be used - use JettyHttpBinding instead. The option is a
- * org.apache.camel.http.common.HttpBinding type.
+ * To use a http proxy to configure the port number.
*/
- private String httpBinding;
+ private Integer proxyPort;
/**
- * Jetty component does not use HttpConfiguration. The option is a
- * org.apache.camel.http.common.HttpConfiguration type.
+ * Allows to configure a custom value of the request buffer size on the
+ * Jetty connectors.
*/
- private String httpConfiguration;
+ private Integer requestBufferSize;
/**
- * To use a existing configured org.eclipse.jetty.jmx.MBeanContainer if JMX
- * is enabled that Jetty uses for registering mbeans. The option is a
- * org.eclipse.jetty.jmx.MBeanContainer type.
+ * Allows to configure a custom value of the request header size on the
+ * Jetty connectors.
*/
- private String mbContainer;
+ private Integer requestHeaderSize;
/**
- * A map which contains general SSL connector properties.
+ * Allows to configure a custom value of the response buffer size on the
+ * Jetty connectors.
*/
- private Map<String, Object> sslSocketConnectorProperties;
+ private Integer responseBufferSize;
+ /**
+ * Allows to configure a custom value of the response header size on the
+ * Jetty connectors.
+ */
+ private Integer responseHeaderSize;
+ /**
+ * If the option is true, jetty will send the server header with the jetty
+ * version information to the client which sends the request. NOTE please
+ * make sure there is no any other camel-jetty endpoint is share the same
+ * port, otherwise this option may not work as expected.
+ */
+ private Boolean sendServerVersion = true;
/**
* A map which contains general HTTP connector properties. Uses the same
* principle as sslSocketConnectorProperties.
*/
private Map<String, Object> socketConnectorProperties;
/**
- * Allows to set a timeout in millis when using Jetty as consumer (server).
- * By default Jetty uses 30000. You can use a value of = 0 to never expire.
- * If a timeout occurs then the request will be expired and Jetty will
- * return back a http error 503 to the client. This option is only in use
- * when using Jetty with the Asynchronous Routing Engine.
- */
- private Long continuationTimeout = 30000L;
- /**
- * Whether or not to use Jetty continuations for the Jetty Server.
+ * A map which contains per port number specific HTTP connectors. Uses the
+ * same principle as sslSocketConnectors.
*/
- private Boolean useContinuation = true;
+ private Map<Integer, Connector> socketConnectors;
/**
* To configure security using SSLContextParameters. The option is a
* org.apache.camel.support.jsse.SSLContextParameters type.
*/
private String sslContextParameters;
/**
- * Enable usage of global SSL context parameters
+ * The key password, which is used to access the certificate's key entry in
+ * the keystore (this is the same password that is supplied to the keystore
+ * command's -keypass option).
*/
- private Boolean useGlobalSslContextParameters = false;
+ private String sslKeyPassword;
/**
- * Allows to configure a custom value of the response buffer size on the
- * Jetty connectors.
+ * The ssl password, which is required to access the keystore file (this is
+ * the same password that is supplied to the keystore command's -storepass
+ * option).
*/
- private Integer responseBufferSize;
+ private String sslPassword;
/**
- * Allows to configure a custom value of the request buffer size on the
- * Jetty connectors.
+ * A map which contains general SSL connector properties.
*/
- private Integer requestBufferSize;
+ private Map<String, Object> sslSocketConnectorProperties;
/**
- * Allows to configure a custom value of the request header size on the
- * Jetty connectors.
+ * A map which contains per port number specific SSL connectors.
*/
- private Integer requestHeaderSize;
+ private Map<Integer, Connector> sslSocketConnectors;
/**
- * Allows to configure a custom value of the response header size on the
- * Jetty connectors.
+ * To use a custom thread pool for the server. This option should only be
+ * used in special circumstances. The option is a
+ * org.eclipse.jetty.util.thread.ThreadPool type.
*/
- private Integer responseHeaderSize;
+ private String threadPool;
/**
- * To use a http proxy to configure the hostname.
+ * Whether or not to use Jetty continuations for the Jetty Server.
*/
- private String proxyHost;
+ private Boolean useContinuation = true;
/**
- * To use a http proxy to configure the port number.
+ * Enable usage of global SSL context parameters
*/
- private Integer proxyPort;
+ private Boolean useGlobalSslContextParameters = false;
/**
* To use the X-Forwarded-For header in HttpServletRequest.getRemoteAddr.
*/
private Boolean useXForwardedForHeader = false;
/**
- * If the option is true, jetty will send the server header with the jetty
- * version information to the client which sends the request. NOTE please
- * make sure there is no any other camel-jetty endpoint is share the same
- * port, otherwise this option may not work as expected.
- */
- private Boolean sendServerVersion = true;
- /**
* Whether to allow java serialization when a request uses
* context-type=application/x-java-serialized-object. This is by default
* turned off. If you enable this then be aware that Java will deserialize
@@ -212,28 +212,20 @@ public class JettyHttpComponentConfiguration9
*/
private Boolean basicPropertyBinding = false;
- public String getSslKeyPassword() {
- return sslKeyPassword;
- }
-
- public void setSslKeyPassword(String sslKeyPassword) {
- this.sslKeyPassword = sslKeyPassword;
- }
-
- public String getSslPassword() {
- return sslPassword;
+ public Long getContinuationTimeout() {
+ return continuationTimeout;
}
- public void setSslPassword(String sslPassword) {
- this.sslPassword = sslPassword;
+ public void setContinuationTimeout(Long continuationTimeout) {
+ this.continuationTimeout = continuationTimeout;
}
- public String getKeystore() {
- return keystore;
+ public Boolean getEnableJmx() {
+ return enableJmx;
}
- public void setKeystore(String keystore) {
- this.keystore = keystore;
+ public void setEnableJmx(Boolean enableJmx) {
+ this.enableJmx = enableJmx;
}
public String getErrorHandler() {
@@ -244,21 +236,20 @@ public class JettyHttpComponentConfiguration9
this.errorHandler = errorHandler;
}
- public Map<Integer, Connector> getSslSocketConnectors() {
- return sslSocketConnectors;
+ public String getHttpBinding() {
+ return httpBinding;
}
- public void setSslSocketConnectors(
- Map<Integer, Connector> sslSocketConnectors) {
- this.sslSocketConnectors = sslSocketConnectors;
+ public void setHttpBinding(String httpBinding) {
+ this.httpBinding = httpBinding;
}
- public Map<Integer, Connector> getSocketConnectors() {
- return socketConnectors;
+ public Integer getHttpClientMaxThreads() {
+ return httpClientMaxThreads;
}
- public void setSocketConnectors(Map<Integer, Connector> socketConnectors) {
- this.socketConnectors = socketConnectors;
+ public void setHttpClientMaxThreads(Integer httpClientMaxThreads) {
+ this.httpClientMaxThreads = httpClientMaxThreads;
}
public Integer getHttpClientMinThreads() {
@@ -269,20 +260,28 @@ public class JettyHttpComponentConfiguration9
this.httpClientMinThreads = httpClientMinThreads;
}
- public Integer getHttpClientMaxThreads() {
- return httpClientMaxThreads;
+ public String getHttpConfiguration() {
+ return httpConfiguration;
}
- public void setHttpClientMaxThreads(Integer httpClientMaxThreads) {
- this.httpClientMaxThreads = httpClientMaxThreads;
+ public void setHttpConfiguration(String httpConfiguration) {
+ this.httpConfiguration = httpConfiguration;
}
- public Integer getMinThreads() {
- return minThreads;
+ public String getJettyHttpBinding() {
+ return jettyHttpBinding;
}
- public void setMinThreads(Integer minThreads) {
- this.minThreads = minThreads;
+ public void setJettyHttpBinding(String jettyHttpBinding) {
+ this.jettyHttpBinding = jettyHttpBinding;
+ }
+
+ public String getKeystore() {
+ return keystore;
+ }
+
+ public void setKeystore(String keystore) {
+ this.keystore = keystore;
}
public Integer getMaxThreads() {
@@ -293,61 +292,76 @@ public class JettyHttpComponentConfiguration9
this.maxThreads = maxThreads;
}
- public String getThreadPool() {
- return threadPool;
+ public String getMbContainer() {
+ return mbContainer;
}
- public void setThreadPool(String threadPool) {
- this.threadPool = threadPool;
+ public void setMbContainer(String mbContainer) {
+ this.mbContainer = mbContainer;
}
- public Boolean getEnableJmx() {
- return enableJmx;
+ public Integer getMinThreads() {
+ return minThreads;
}
- public void setEnableJmx(Boolean enableJmx) {
- this.enableJmx = enableJmx;
+ public void setMinThreads(Integer minThreads) {
+ this.minThreads = minThreads;
}
- public String getJettyHttpBinding() {
- return jettyHttpBinding;
+ public String getProxyHost() {
+ return proxyHost;
}
- public void setJettyHttpBinding(String jettyHttpBinding) {
- this.jettyHttpBinding = jettyHttpBinding;
+ public void setProxyHost(String proxyHost) {
+ this.proxyHost = proxyHost;
}
- public String getHttpBinding() {
- return httpBinding;
+ public Integer getProxyPort() {
+ return proxyPort;
}
- public void setHttpBinding(String httpBinding) {
- this.httpBinding = httpBinding;
+ public void setProxyPort(Integer proxyPort) {
+ this.proxyPort = proxyPort;
}
- public String getHttpConfiguration() {
- return httpConfiguration;
+ public Integer getRequestBufferSize() {
+ return requestBufferSize;
}
- public void setHttpConfiguration(String httpConfiguration) {
- this.httpConfiguration = httpConfiguration;
+ public void setRequestBufferSize(Integer requestBufferSize) {
+ this.requestBufferSize = requestBufferSize;
}
- public String getMbContainer() {
- return mbContainer;
+ public Integer getRequestHeaderSize() {
+ return requestHeaderSize;
}
- public void setMbContainer(String mbContainer) {
- this.mbContainer = mbContainer;
+ public void setRequestHeaderSize(Integer requestHeaderSize) {
+ this.requestHeaderSize = requestHeaderSize;
}
- public Map<String, Object> getSslSocketConnectorProperties() {
- return sslSocketConnectorProperties;
+ public Integer getResponseBufferSize() {
+ return responseBufferSize;
}
- public void setSslSocketConnectorProperties(
- Map<String, Object> sslSocketConnectorProperties) {
- this.sslSocketConnectorProperties = sslSocketConnectorProperties;
+ public void setResponseBufferSize(Integer responseBufferSize) {
+ this.responseBufferSize = responseBufferSize;
+ }
+
+ public Integer getResponseHeaderSize() {
+ return responseHeaderSize;
+ }
+
+ public void setResponseHeaderSize(Integer responseHeaderSize) {
+ this.responseHeaderSize = responseHeaderSize;
+ }
+
+ public Boolean getSendServerVersion() {
+ return sendServerVersion;
+ }
+
+ public void setSendServerVersion(Boolean sendServerVersion) {
+ this.sendServerVersion = sendServerVersion;
}
public Map<String, Object> getSocketConnectorProperties() {
@@ -359,20 +373,12 @@ public class JettyHttpComponentConfiguration9
this.socketConnectorProperties = socketConnectorProperties;
}
- public Long getContinuationTimeout() {
- return continuationTimeout;
- }
-
- public void setContinuationTimeout(Long continuationTimeout) {
- this.continuationTimeout = continuationTimeout;
- }
-
- public Boolean getUseContinuation() {
- return useContinuation;
+ public Map<Integer, Connector> getSocketConnectors() {
+ return socketConnectors;
}
- public void setUseContinuation(Boolean useContinuation) {
- this.useContinuation = useContinuation;
+ public void setSocketConnectors(Map<Integer, Connector> socketConnectors) {
+ this.socketConnectors = socketConnectors;
}
public String getSslContextParameters() {
@@ -383,61 +389,63 @@ public class JettyHttpComponentConfiguration9
this.sslContextParameters = sslContextParameters;
}
- public Boolean getUseGlobalSslContextParameters() {
- return useGlobalSslContextParameters;
+ public String getSslKeyPassword() {
+ return sslKeyPassword;
}
- public void setUseGlobalSslContextParameters(
- Boolean useGlobalSslContextParameters) {
- this.useGlobalSslContextParameters = useGlobalSslContextParameters;
+ public void setSslKeyPassword(String sslKeyPassword) {
+ this.sslKeyPassword = sslKeyPassword;
}
- public Integer getResponseBufferSize() {
- return responseBufferSize;
+ public String getSslPassword() {
+ return sslPassword;
}
- public void setResponseBufferSize(Integer responseBufferSize) {
- this.responseBufferSize = responseBufferSize;
+ public void setSslPassword(String sslPassword) {
+ this.sslPassword = sslPassword;
}
- public Integer getRequestBufferSize() {
- return requestBufferSize;
+ public Map<String, Object> getSslSocketConnectorProperties() {
+ return sslSocketConnectorProperties;
}
- public void setRequestBufferSize(Integer requestBufferSize) {
- this.requestBufferSize = requestBufferSize;
+ public void setSslSocketConnectorProperties(
+ Map<String, Object> sslSocketConnectorProperties) {
+ this.sslSocketConnectorProperties = sslSocketConnectorProperties;
}
- public Integer getRequestHeaderSize() {
- return requestHeaderSize;
+ public Map<Integer, Connector> getSslSocketConnectors() {
+ return sslSocketConnectors;
}
- public void setRequestHeaderSize(Integer requestHeaderSize) {
- this.requestHeaderSize = requestHeaderSize;
+ public void setSslSocketConnectors(
+ Map<Integer, Connector> sslSocketConnectors) {
+ this.sslSocketConnectors = sslSocketConnectors;
}
- public Integer getResponseHeaderSize() {
- return responseHeaderSize;
+ public String getThreadPool() {
+ return threadPool;
}
- public void setResponseHeaderSize(Integer responseHeaderSize) {
- this.responseHeaderSize = responseHeaderSize;
+ public void setThreadPool(String threadPool) {
+ this.threadPool = threadPool;
}
- public String getProxyHost() {
- return proxyHost;
+ public Boolean getUseContinuation() {
+ return useContinuation;
}
- public void setProxyHost(String proxyHost) {
- this.proxyHost = proxyHost;
+ public void setUseContinuation(Boolean useContinuation) {
+ this.useContinuation = useContinuation;
}
- public Integer getProxyPort() {
- return proxyPort;
+ public Boolean getUseGlobalSslContextParameters() {
+ return useGlobalSslContextParameters;
}
- public void setProxyPort(Integer proxyPort) {
- this.proxyPort = proxyPort;
+ public void setUseGlobalSslContextParameters(
+ Boolean useGlobalSslContextParameters) {
+ this.useGlobalSslContextParameters = useGlobalSslContextParameters;
}
public Boolean getUseXForwardedForHeader() {
@@ -448,14 +456,6 @@ public class JettyHttpComponentConfiguration9
this.useXForwardedForHeader = useXForwardedForHeader;
}
- public Boolean getSendServerVersion() {
- return sendServerVersion;
- }
-
- public void setSendServerVersion(Boolean sendServerVersion) {
- this.sendServerVersion = sendServerVersion;
- }
-
public Boolean getAllowJavaSerializedObject() {
return allowJavaSerializedObject;
}
[camel] 04/11: CAMEL-13917: Configuring endpoints with consumer.
prefix for consumer options is no longer supported as they should be
regular options instead. This also avoid reflection setting properties.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit aa19fb2bb6e849fef35398c1dd31e30a5148a961
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Sep 2 10:35:06 2019 +0200
CAMEL-13917: Configuring endpoints with consumer. prefix for consumer options is no longer supported as they should be regular options instead. This also avoid reflection setting properties.
---
.../component/facebook/FacebookComponentConsumerTest.java | 4 ++--
.../java/org/apache/camel/component/mail/MailEndpoint.java | 4 ++--
.../mail/security/SslContextParametersMailRouteTest.java | 2 +-
.../component/olingo2/Olingo2ComponentConsumerTest.java | 14 +++++++-------
.../component/olingo4/Olingo4ComponentConsumerTest.java | 14 +++++++-------
.../camel/component/twitter/AbstractTwitterEndpoint.java | 2 +-
.../org/apache/camel/support/ScheduledPollEndpoint.java | 3 ---
7 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentConsumerTest.java b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentConsumerTest.java
index 6ac98b5..95f89a7 100644
--- a/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentConsumerTest.java
+++ b/components/camel-facebook/src/test/java/org/apache/camel/component/facebook/FacebookComponentConsumerTest.java
@@ -127,9 +127,9 @@ public class FacebookComponentConsumerTest extends CamelFacebookTestSupport {
for (String name : searchNames) {
if (!excludedNames.contains(name)) {
- // consumer.sendEmptyMessageWhenIdle is true since user may not have some items like events
+ // sendEmptyMessageWhenIdle is true since user may not have some items like events
from("facebook://" + name + "?reading.limit=10&reading.locale=en.US&reading.since="
- + since + "&initialDelay=1000&consumer.sendEmptyMessageWhenIdle=true&"
+ + since + "&initialDelay=1000&sendEmptyMessageWhenIdle=true&"
+ getOauthParams())
.to("mock:consumeResult" + name);
}
diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
index f925d8a..a1b9bbf 100644
--- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
+++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
@@ -39,7 +39,7 @@ import org.apache.camel.support.ScheduledPollEndpoint;
label = "mail")
public class MailEndpoint extends ScheduledPollEndpoint implements HeaderFilterStrategyAware {
- @UriParam(optionalPrefix = "consumer.", defaultValue = "" + MailConsumer.DEFAULT_CONSUMER_DELAY, label = "consumer,scheduler",
+ @UriParam(defaultValue = "" + MailConsumer.DEFAULT_CONSUMER_DELAY, label = "consumer,scheduler",
description = "Milliseconds before the next poll.")
private long delay = MailConsumer.DEFAULT_CONSUMER_DELAY;
@@ -78,7 +78,7 @@ public class MailEndpoint extends ScheduledPollEndpoint implements HeaderFilterS
super(uri, component);
this.configuration = configuration;
// ScheduledPollConsumer default delay is 500 millis and that is too often for polling a mailbox,
- // so we override with a new default value. End user can override this value by providing a consumer.delay parameter
+ // so we override with a new default value. End user can override this value by providing a delay parameter
setDelay(MailConsumer.DEFAULT_CONSUMER_DELAY);
}
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/SslContextParametersMailRouteTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/SslContextParametersMailRouteTest.java
index 0cefbe9..21208ab 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/SslContextParametersMailRouteTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/SslContextParametersMailRouteTest.java
@@ -55,7 +55,7 @@ public class SslContextParametersMailRouteTest extends CamelTestSupport {
public void configure() {
from("imaps://" + imapHost + "?username=" + username + "&password=" + password
- + "&delete=false&unseen=true&fetchSize=1&consumer.useFixedDelay=true&initialDelay=100&delay=100").to("mock:in");
+ + "&delete=false&unseen=true&fetchSize=1&useFixedDelay=true&initialDelay=100&delay=100").to("mock:in");
from("direct:in").to("smtps://" + smtpHost + "?username=" + username + "&password=" + password);
}
diff --git a/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2ComponentConsumerTest.java b/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2ComponentConsumerTest.java
index 9226c57..9d3b875 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2ComponentConsumerTest.java
+++ b/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2ComponentConsumerTest.java
@@ -88,7 +88,7 @@ public class Olingo2ComponentConsumerTest extends AbstractOlingo2TestSupport {
RouteBuilder builder = new RouteBuilder() {
public void configure() {
- from("olingo2://read/Manufacturers?filterAlreadySeen=true&" + "delay=2&consumer.sendEmptyMessageWhenIdle=true&" + "consumer.splitResult=false")
+ from("olingo2://read/Manufacturers?filterAlreadySeen=true&" + "delay=2&sendEmptyMessageWhenIdle=true&" + "consumer.splitResult=false")
.to("mock:consumer-alreadyseen");
};
};
@@ -122,7 +122,7 @@ public class Olingo2ComponentConsumerTest extends AbstractOlingo2TestSupport {
* get the correct number of exchanges before being satisfied. Note: -
* consumer.splitResults is set to false since this ensures the first
* returned message contains all the results. -
- * consumer.sendEmptyMessageWhenIdle is set to false so only 1 message
+ * sendEmptyMessageWhenIdle is set to false so only 1 message
* should even be returned.
*/
@Test
@@ -138,7 +138,7 @@ public class Olingo2ComponentConsumerTest extends AbstractOlingo2TestSupport {
RouteBuilder builder = new RouteBuilder() {
public void configure() {
- from("olingo2://read/Manufacturers?filterAlreadySeen=true&" + "delay=2&consumer.sendEmptyMessageWhenIdle=false&" + "consumer.splitResult=false")
+ from("olingo2://read/Manufacturers?filterAlreadySeen=true&" + "delay=2&sendEmptyMessageWhenIdle=false&" + "consumer.splitResult=false")
.to("mock:consumer-alreadyseen");
};
};
@@ -164,7 +164,7 @@ public class Olingo2ComponentConsumerTest extends AbstractOlingo2TestSupport {
/**
* WithPredicate in address FilterAlreadySeen: true SplitResults: true
- * consumer.sendEmptyMessageWhenIdle: true
+ * sendEmptyMessageWhenIdle: true
*
* @throws Exception
*/
@@ -176,7 +176,7 @@ public class Olingo2ComponentConsumerTest extends AbstractOlingo2TestSupport {
RouteBuilder builder = new RouteBuilder() {
public void configure() {
- from("olingo2://read/Manufacturers('1')?filterAlreadySeen=true&" + "delay=2&consumer.sendEmptyMessageWhenIdle=true&" + "consumer.splitResult=true")
+ from("olingo2://read/Manufacturers('1')?filterAlreadySeen=true&" + "delay=2&sendEmptyMessageWhenIdle=true&" + "consumer.splitResult=true")
.to("mock:consumer-splitresult-kp-manufacturer");
};
};
@@ -208,7 +208,7 @@ public class Olingo2ComponentConsumerTest extends AbstractOlingo2TestSupport {
/**
* WithPredicate in address FilterAlreadySeen: true SplitResults: true
- * consumer.sendEmptyMessageWhenIdle: false
+ * sendEmptyMessageWhenIdle: false
*
* @throws Exception
*/
@@ -226,7 +226,7 @@ public class Olingo2ComponentConsumerTest extends AbstractOlingo2TestSupport {
RouteBuilder builder = new RouteBuilder() {
public void configure() {
- from("olingo2://read/Manufacturers('1')?filterAlreadySeen=true&" + "delay=2&consumer.sendEmptyMessageWhenIdle=false&" + "consumer.splitResult=true")
+ from("olingo2://read/Manufacturers('1')?filterAlreadySeen=true&" + "delay=2&sendEmptyMessageWhenIdle=false&" + "consumer.splitResult=true")
.to("mock:consumer-splitresult-kp-manufacturer");
};
};
diff --git a/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/Olingo4ComponentConsumerTest.java b/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/Olingo4ComponentConsumerTest.java
index b5c3d01..55eaa40 100644
--- a/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/Olingo4ComponentConsumerTest.java
+++ b/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/Olingo4ComponentConsumerTest.java
@@ -97,7 +97,7 @@ public class Olingo4ComponentConsumerTest extends AbstractOlingo4TestSupport {
RouteBuilder builder = new RouteBuilder() {
public void configure() {
- from("olingo4://read/" + PEOPLE + "?delay=2&consumer.sendEmptyMessageWhenIdle=true&consumer.splitResult=false&filterAlreadySeen=true")
+ from("olingo4://read/" + PEOPLE + "?delay=2&sendEmptyMessageWhenIdle=true&consumer.splitResult=false&filterAlreadySeen=true")
.to("mock:consumer-alreadyseen");
};
};
@@ -131,7 +131,7 @@ public class Olingo4ComponentConsumerTest extends AbstractOlingo4TestSupport {
* get the correct number of exchanges before being satisfied. Note: -
* consumer.splitResults is set to false since this ensures the first
* returned message contains all the results. -
- * consumer.sendEmptyMessageWhenIdle is set to false so only 1 message
+ * sendEmptyMessageWhenIdle is set to false so only 1 message
* should even be returned.
*/
@Test
@@ -148,7 +148,7 @@ public class Olingo4ComponentConsumerTest extends AbstractOlingo4TestSupport {
RouteBuilder builder = new RouteBuilder() {
public void configure() {
- from("olingo4://read/" + PEOPLE + "?delay=2&consumer.sendEmptyMessageWhenIdle=false&consumer.splitResult=false&filterAlreadySeen=true")
+ from("olingo4://read/" + PEOPLE + "?delay=2&sendEmptyMessageWhenIdle=false&consumer.splitResult=false&filterAlreadySeen=true")
.to("mock:consumer-alreadyseen");
};
};
@@ -174,7 +174,7 @@ public class Olingo4ComponentConsumerTest extends AbstractOlingo4TestSupport {
/**
* WithPredicate in address FilterAlreadySeen: true SplitResults: true
- * consumer.sendEmptyMessageWhenIdle: true
+ * sendEmptyMessageWhenIdle: true
*
* @throws Exception
*/
@@ -186,7 +186,7 @@ public class Olingo4ComponentConsumerTest extends AbstractOlingo4TestSupport {
RouteBuilder builder = new RouteBuilder() {
public void configure() {
- from("olingo4://read/" + AIRPORTS + "('KSFO')" + "?filterAlreadySeen=true&" + "delay=2&consumer.sendEmptyMessageWhenIdle=true&"
+ from("olingo4://read/" + AIRPORTS + "('KSFO')" + "?filterAlreadySeen=true&" + "delay=2&sendEmptyMessageWhenIdle=true&"
+ "consumer.splitResult=true").to("mock:consumer-splitresult-kp-airport");
};
};
@@ -218,7 +218,7 @@ public class Olingo4ComponentConsumerTest extends AbstractOlingo4TestSupport {
/**
* WithPredicate in address FilterAlreadySeen: true SplitResults: true
- * consumer.sendEmptyMessageWhenIdle: false
+ * sendEmptyMessageWhenIdle: false
*
* @throws Exception
*/
@@ -236,7 +236,7 @@ public class Olingo4ComponentConsumerTest extends AbstractOlingo4TestSupport {
RouteBuilder builder = new RouteBuilder() {
public void configure() {
- from("olingo4://read/" + AIRPORTS + "('KSFO')" + "?filterAlreadySeen=true&" + "delay=2&consumer.sendEmptyMessageWhenIdle=false&"
+ from("olingo4://read/" + AIRPORTS + "('KSFO')" + "?filterAlreadySeen=true&" + "delay=2&sendEmptyMessageWhenIdle=false&"
+ "consumer.splitResult=true").to("mock:consumer-splitresult-kp-airport");
};
};
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/AbstractTwitterEndpoint.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/AbstractTwitterEndpoint.java
index 3c4ac98..bd4d659 100644
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/AbstractTwitterEndpoint.java
+++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/AbstractTwitterEndpoint.java
@@ -29,7 +29,7 @@ public abstract class AbstractTwitterEndpoint extends DefaultPollingEndpoint imp
public static final long DEFAULT_CONSUMER_DELAY = 30 * 1000L;
- @UriParam(optionalPrefix = "consumer.", defaultValue = "" + DEFAULT_CONSUMER_DELAY, label = "consumer,scheduler",
+ @UriParam(defaultValue = "" + DEFAULT_CONSUMER_DELAY, label = "consumer,scheduler",
description = "Milliseconds before the next poll.")
private long delay = DEFAULT_CONSUMER_DELAY;
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollEndpoint.java b/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollEndpoint.java
index c3ec3d9..1533e45 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollEndpoint.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollEndpoint.java
@@ -22,10 +22,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.Component;
import org.apache.camel.Consumer;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.LoggingLevel;
-import org.apache.camel.PollingConsumer;
-import org.apache.camel.ResolveEndpointFailedException;
import org.apache.camel.spi.PollingConsumerPollStrategy;
import org.apache.camel.spi.ScheduledPollConsumerScheduler;
import org.apache.camel.spi.UriParam;