This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch CAMEL-13870 in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/CAMEL-13870 by this push: new b8759e8 CAMEL-13870: Fast property configuration of Camel endpoints. Work in progress. b8759e8 is described below commit b8759e8c3ad3db20e958176552ae83c84771b344 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Wed Aug 21 21:37:03 2019 +0200 CAMEL-13870: Fast property configuration of Camel endpoints. Work in progress. --- .../camel/component/activemq/ActiveMQEndpoint.java | 4 ++-- .../apache/camel/component/amqp/AMQPEndpoint.java | 2 +- .../camel-apns/src/main/docs/apns-component.adoc | 2 +- .../camel-atom/src/main/docs/atom-component.adoc | 2 +- .../src/main/docs/aws-ddbstream-component.adoc | 2 +- .../src/main/docs/aws-kinesis-component.adoc | 2 +- .../camel-aws-s3/src/main/docs/aws-s3-component.adoc | 2 +- .../src/main/docs/aws-sqs-component.adoc | 2 +- .../src/main/docs/beanstalk-component.adoc | 2 +- .../src/main/docs/cql-component.adoc | 2 +- .../src/main/docs/couchbase-component.adoc | 2 +- .../camel-elsql/src/main/docs/elsql-component.adoc | 2 +- .../camel-etcd/src/main/docs/etcd-component.adoc | 2 +- .../src/main/docs/flatpack-component.adoc | 2 +- .../camel-sql/src/main/docs/sql-component.adoc | 2 +- .../sql/stored/ProducerBatchInvalidTest.java | 5 +++-- .../camel-ssh/src/main/docs/ssh-component.adoc | 2 +- .../endpoint/dsl/ApnsEndpointBuilderFactory.java | 20 +------------------- .../dsl/BeanstalkEndpointBuilderFactory.java | 20 +------------------- .../dsl/CassandraEndpointBuilderFactory.java | 20 +------------------- .../dsl/CouchbaseEndpointBuilderFactory.java | 20 +------------------- .../endpoint/dsl/ElsqlEndpointBuilderFactory.java | 20 +------------------- .../endpoint/dsl/EtcdEndpointBuilderFactory.java | 20 +------------------- .../endpoint/dsl/FlatpackEndpointBuilderFactory.java | 20 +------------------- .../endpoint/dsl/KinesisEndpointBuilderFactory.java | 20 +------------------- .../endpoint/dsl/S3EndpointBuilderFactory.java | 20 +------------------- .../endpoint/dsl/SqlEndpointBuilderFactory.java | 20 +------------------- .../endpoint/dsl/SqsEndpointBuilderFactory.java | 20 +------------------- .../endpoint/dsl/SshEndpointBuilderFactory.java | 20 +------------------- 29 files changed, 32 insertions(+), 247 deletions(-) diff --git a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQEndpoint.java b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQEndpoint.java index 74d553c..32a61f0 100644 --- a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQEndpoint.java +++ b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQEndpoint.java @@ -16,7 +16,6 @@ */ package org.apache.camel.component.activemq; -import org.apache.camel.component.jms.JmsConsumer; import org.apache.camel.component.jms.JmsEndpoint; import org.apache.camel.spi.UriEndpoint; @@ -24,7 +23,8 @@ import org.apache.camel.spi.UriEndpoint; * The activemq component allows messages to be sent to (or consumed from) * Apache ActiveMQ. This component extends the Camel JMS component. */ -@UriEndpoint(firstVersion = "1.0.0", scheme = "activemq", title = "ActiveMQ", syntax = "activemq:destinationType:destinationName", consumerClass = JmsConsumer.class, label = "messaging") +@UriEndpoint(firstVersion = "1.0.0", extendsScheme = "jms", scheme = "activemq", title = "ActiveMQ", syntax = "activemq:destinationType:destinationName", + label = "messaging", generateConfigurer = false) public class ActiveMQEndpoint extends JmsEndpoint { // needed for component documentation diff --git a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPEndpoint.java b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPEndpoint.java index c29bf45..210956c 100644 --- a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPEndpoint.java +++ b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPEndpoint.java @@ -28,7 +28,7 @@ import org.apache.camel.spi.UriEndpoint; * performing the AMQP connectivity. */ @UriEndpoint(firstVersion = "1.2.0", scheme = "amqp", extendsScheme = "jms", title = "AMQP", - syntax = "amqp:destinationType:destinationName", label = "messaging") + syntax = "amqp:destinationType:destinationName", label = "messaging", generateConfigurer = false) public class AMQPEndpoint extends JmsEndpoint implements AsyncEndpoint { } diff --git a/components/camel-apns/src/main/docs/apns-component.adoc b/components/camel-apns/src/main/docs/apns-component.adoc index 83d83ba..80f8e12 100644 --- a/components/camel-apns/src/main/docs/apns-component.adoc +++ b/components/camel-apns/src/main/docs/apns-component.adoc @@ -109,7 +109,7 @@ with the following path and query parameters: | *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 | ScheduledPollConsumer Scheduler +| *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 diff --git a/components/camel-atom/src/main/docs/atom-component.adoc b/components/camel-atom/src/main/docs/atom-component.adoc index f52d40a..64868dd 100644 --- a/components/camel-atom/src/main/docs/atom-component.adoc +++ b/components/camel-atom/src/main/docs/atom-component.adoc @@ -96,7 +96,7 @@ with the following path and query parameters: | *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 | ScheduledPollConsumer Scheduler +| *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 diff --git a/components/camel-aws-ddb/src/main/docs/aws-ddbstream-component.adoc b/components/camel-aws-ddb/src/main/docs/aws-ddbstream-component.adoc index d6aa480..4862c29 100644 --- a/components/camel-aws-ddb/src/main/docs/aws-ddbstream-component.adoc +++ b/components/camel-aws-ddb/src/main/docs/aws-ddbstream-component.adoc @@ -94,7 +94,7 @@ with the following path and query parameters: | *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 | ScheduledPollConsumer Scheduler +| *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 diff --git a/components/camel-aws-kinesis/src/main/docs/aws-kinesis-component.adoc b/components/camel-aws-kinesis/src/main/docs/aws-kinesis-component.adoc index 5938a25..8739d9b 100644 --- a/components/camel-aws-kinesis/src/main/docs/aws-kinesis-component.adoc +++ b/components/camel-aws-kinesis/src/main/docs/aws-kinesis-component.adoc @@ -98,7 +98,7 @@ with the following path and query parameters: | *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 | ScheduledPollConsumer Scheduler +| *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 diff --git a/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc b/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc index 1197b71..822dd0c 100644 --- a/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc +++ b/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc @@ -134,7 +134,7 @@ with the following path and query parameters: | *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 | ScheduledPollConsumer Scheduler +| *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 diff --git a/components/camel-aws-sqs/src/main/docs/aws-sqs-component.adoc b/components/camel-aws-sqs/src/main/docs/aws-sqs-component.adoc index 47681b2..b703aec 100644 --- a/components/camel-aws-sqs/src/main/docs/aws-sqs-component.adoc +++ b/components/camel-aws-sqs/src/main/docs/aws-sqs-component.adoc @@ -115,7 +115,7 @@ with the following path and query parameters: | *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 | ScheduledPollConsumer Scheduler +| *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 diff --git a/components/camel-beanstalk/src/main/docs/beanstalk-component.adoc b/components/camel-beanstalk/src/main/docs/beanstalk-component.adoc index e631066..c434c6a 100644 --- a/components/camel-beanstalk/src/main/docs/beanstalk-component.adoc +++ b/components/camel-beanstalk/src/main/docs/beanstalk-component.adoc @@ -120,7 +120,7 @@ with the following path and query parameters: | *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 | ScheduledPollConsumer Scheduler +| *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 diff --git a/components/camel-cassandraql/src/main/docs/cql-component.adoc b/components/camel-cassandraql/src/main/docs/cql-component.adoc index 33157c1..e3c7f9a 100644 --- a/components/camel-cassandraql/src/main/docs/cql-component.adoc +++ b/components/camel-cassandraql/src/main/docs/cql-component.adoc @@ -122,7 +122,7 @@ with the following path and query parameters: | *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 | ScheduledPollConsumer Scheduler +| *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 diff --git a/components/camel-couchbase/src/main/docs/couchbase-component.adoc b/components/camel-couchbase/src/main/docs/couchbase-component.adoc index 989d463..43353f0 100644 --- a/components/camel-couchbase/src/main/docs/couchbase-component.adoc +++ b/components/camel-couchbase/src/main/docs/couchbase-component.adoc @@ -110,7 +110,7 @@ with the following path and query parameters: | *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 | ScheduledPollConsumer Scheduler +| *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 diff --git a/components/camel-elsql/src/main/docs/elsql-component.adoc b/components/camel-elsql/src/main/docs/elsql-component.adoc index 165500f..631552e 100644 --- a/components/camel-elsql/src/main/docs/elsql-component.adoc +++ b/components/camel-elsql/src/main/docs/elsql-component.adoc @@ -137,7 +137,7 @@ with the following path and query parameters: | *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 | ScheduledPollConsumer Scheduler +| *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 diff --git a/components/camel-etcd/src/main/docs/etcd-component.adoc b/components/camel-etcd/src/main/docs/etcd-component.adoc index eaef04a..53ecadd 100644 --- a/components/camel-etcd/src/main/docs/etcd-component.adoc +++ b/components/camel-etcd/src/main/docs/etcd-component.adoc @@ -81,7 +81,7 @@ with the following path and query parameters: | *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 | ScheduledPollConsumer Scheduler +| *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 diff --git a/components/camel-flatpack/src/main/docs/flatpack-component.adoc b/components/camel-flatpack/src/main/docs/flatpack-component.adoc index 4349077..a24a8bf 100644 --- a/components/camel-flatpack/src/main/docs/flatpack-component.adoc +++ b/components/camel-flatpack/src/main/docs/flatpack-component.adoc @@ -101,7 +101,7 @@ with the following path and query parameters: | *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 | ScheduledPollConsumer Scheduler +| *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 diff --git a/components/camel-sql/src/main/docs/sql-component.adoc b/components/camel-sql/src/main/docs/sql-component.adoc index b72118b..f6866ea 100644 --- a/components/camel-sql/src/main/docs/sql-component.adoc +++ b/components/camel-sql/src/main/docs/sql-component.adoc @@ -188,7 +188,7 @@ with the following path and query parameters: | *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 | ScheduledPollConsumer Scheduler +| *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 diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBatchInvalidTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBatchInvalidTest.java index b3e920a..824baf4 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBatchInvalidTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerBatchInvalidTest.java @@ -19,6 +19,7 @@ package org.apache.camel.component.sql.stored; import org.apache.camel.FailedToCreateRouteException; import org.apache.camel.PropertyBindingException; import org.apache.camel.ResolveEndpointFailedException; +import org.apache.camel.TypeConversionException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.After; @@ -69,8 +70,8 @@ public class ProducerBatchInvalidTest extends CamelTestSupport { fail("Should throw exception"); } catch (FailedToCreateRouteException e) { ResolveEndpointFailedException refe = assertIsInstanceOf(ResolveEndpointFailedException.class, e.getCause()); - PropertyBindingException pbe = assertIsInstanceOf(PropertyBindingException.class, refe.getCause()); - assertEquals("batch", pbe.getPropertyName()); + TypeConversionException pbe = assertIsInstanceOf(TypeConversionException.class, refe.getCause()); + assertEquals("[true, true]", pbe.getValue().toString()); } } diff --git a/components/camel-ssh/src/main/docs/ssh-component.adoc b/components/camel-ssh/src/main/docs/ssh-component.adoc index 95e3b76..7cabb91 100644 --- a/components/camel-ssh/src/main/docs/ssh-component.adoc +++ b/components/camel-ssh/src/main/docs/ssh-component.adoc @@ -108,7 +108,7 @@ with the following path and query parameters: | *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 | ScheduledPollConsumer Scheduler +| *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 diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ApnsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ApnsEndpointBuilderFactory.java index 71c10f9..659a552 100644 --- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ApnsEndpointBuilderFactory.java +++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ApnsEndpointBuilderFactory.java @@ -27,7 +27,6 @@ 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; -import org.apache.camel.spi.ScheduledPollConsumerScheduler; /** * For sending notifications to Apple iOS devices. @@ -344,24 +343,7 @@ public interface ApnsEndpointBuilderFactory { * To use a cron scheduler from either camel-spring or camel-quartz * component. * - * The option is a: - * <code>org.apache.camel.spi.ScheduledPollConsumerScheduler</code> - * type. - * - * Group: scheduler - */ - default ApnsEndpointConsumerBuilder scheduler( - ScheduledPollConsumerScheduler scheduler) { - setProperty("scheduler", scheduler); - return this; - } - /** - * To use a cron scheduler from either camel-spring or camel-quartz - * component. - * - * The option will be converted to a - * <code>org.apache.camel.spi.ScheduledPollConsumerScheduler</code> - * type. + * The option is a: <code>java.lang.String</code> type. * * Group: scheduler */ diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BeanstalkEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BeanstalkEndpointBuilderFactory.java index e038c14..c580f9e 100644 --- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BeanstalkEndpointBuilderFactory.java +++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BeanstalkEndpointBuilderFactory.java @@ -27,7 +27,6 @@ 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; -import org.apache.camel.spi.ScheduledPollConsumerScheduler; /** * The beanstalk component is used for job retrieval and post-processing of @@ -515,24 +514,7 @@ public interface BeanstalkEndpointBuilderFactory { * To use a cron scheduler from either camel-spring or camel-quartz * component. * - * The option is a: - * <code>org.apache.camel.spi.ScheduledPollConsumerScheduler</code> - * type. - * - * Group: scheduler - */ - default BeanstalkEndpointConsumerBuilder scheduler( - ScheduledPollConsumerScheduler scheduler) { - setProperty("scheduler", scheduler); - return this; - } - /** - * To use a cron scheduler from either camel-spring or camel-quartz - * component. - * - * The option will be converted to a - * <code>org.apache.camel.spi.ScheduledPollConsumerScheduler</code> - * type. + * The option is a: <code>java.lang.String</code> type. * * Group: scheduler */ diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CassandraEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CassandraEndpointBuilderFactory.java index 8dbc48f..eba398f 100644 --- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CassandraEndpointBuilderFactory.java +++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CassandraEndpointBuilderFactory.java @@ -27,7 +27,6 @@ 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; -import org.apache.camel.spi.ScheduledPollConsumerScheduler; /** * The cql component aims at integrating Cassandra 2.0 using the CQL3 API (not @@ -515,24 +514,7 @@ public interface CassandraEndpointBuilderFactory { * To use a cron scheduler from either camel-spring or camel-quartz * component. * - * The option is a: - * <code>org.apache.camel.spi.ScheduledPollConsumerScheduler</code> - * type. - * - * Group: scheduler - */ - default CassandraEndpointConsumerBuilder scheduler( - ScheduledPollConsumerScheduler scheduler) { - setProperty("scheduler", scheduler); - return this; - } - /** - * To use a cron scheduler from either camel-spring or camel-quartz - * component. - * - * The option will be converted to a - * <code>org.apache.camel.spi.ScheduledPollConsumerScheduler</code> - * type. + * The option is a: <code>java.lang.String</code> type. * * Group: scheduler */ diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CouchbaseEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CouchbaseEndpointBuilderFactory.java index 828f163..92a770a 100644 --- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CouchbaseEndpointBuilderFactory.java +++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CouchbaseEndpointBuilderFactory.java @@ -27,7 +27,6 @@ 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; -import org.apache.camel.spi.ScheduledPollConsumerScheduler; /** * Represents a Couchbase endpoint that can query Views with a Poll strategy @@ -480,24 +479,7 @@ public interface CouchbaseEndpointBuilderFactory { * To use a cron scheduler from either camel-spring or camel-quartz * component. * - * The option is a: - * <code>org.apache.camel.spi.ScheduledPollConsumerScheduler</code> - * type. - * - * Group: scheduler - */ - default CouchbaseEndpointConsumerBuilder scheduler( - ScheduledPollConsumerScheduler scheduler) { - setProperty("scheduler", scheduler); - return this; - } - /** - * To use a cron scheduler from either camel-spring or camel-quartz - * component. - * - * The option will be converted to a - * <code>org.apache.camel.spi.ScheduledPollConsumerScheduler</code> - * type. + * The option is a: <code>java.lang.String</code> type. * * Group: scheduler */ diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ElsqlEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ElsqlEndpointBuilderFactory.java index 59a0c4c..5d4c261 100644 --- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ElsqlEndpointBuilderFactory.java +++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ElsqlEndpointBuilderFactory.java @@ -27,7 +27,6 @@ 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; -import org.apache.camel.spi.ScheduledPollConsumerScheduler; /** * The elsql component is an extension to the existing SQL Component that uses @@ -712,24 +711,7 @@ public interface ElsqlEndpointBuilderFactory { * To use a cron scheduler from either camel-spring or camel-quartz * component. * - * The option is a: - * <code>org.apache.camel.spi.ScheduledPollConsumerScheduler</code> - * type. - * - * Group: scheduler - */ - default ElsqlEndpointConsumerBuilder scheduler( - ScheduledPollConsumerScheduler scheduler) { - setProperty("scheduler", scheduler); - return this; - } - /** - * To use a cron scheduler from either camel-spring or camel-quartz - * component. - * - * The option will be converted to a - * <code>org.apache.camel.spi.ScheduledPollConsumerScheduler</code> - * type. + * The option is a: <code>java.lang.String</code> type. * * Group: scheduler */ diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EtcdEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EtcdEndpointBuilderFactory.java index 002e0a1..0730a58 100644 --- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EtcdEndpointBuilderFactory.java +++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EtcdEndpointBuilderFactory.java @@ -27,7 +27,6 @@ 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; -import org.apache.camel.spi.ScheduledPollConsumerScheduler; /** * The camel etcd component allows you to work with Etcd, a distributed reliable @@ -423,24 +422,7 @@ public interface EtcdEndpointBuilderFactory { * To use a cron scheduler from either camel-spring or camel-quartz * component. * - * The option is a: - * <code>org.apache.camel.spi.ScheduledPollConsumerScheduler</code> - * type. - * - * Group: scheduler - */ - default EtcdEndpointConsumerBuilder scheduler( - ScheduledPollConsumerScheduler scheduler) { - setProperty("scheduler", scheduler); - return this; - } - /** - * To use a cron scheduler from either camel-spring or camel-quartz - * component. - * - * The option will be converted to a - * <code>org.apache.camel.spi.ScheduledPollConsumerScheduler</code> - * type. + * The option is a: <code>java.lang.String</code> type. * * Group: scheduler */ diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FlatpackEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FlatpackEndpointBuilderFactory.java index f026959..271465e 100644 --- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FlatpackEndpointBuilderFactory.java +++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FlatpackEndpointBuilderFactory.java @@ -27,7 +27,6 @@ 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; -import org.apache.camel.spi.ScheduledPollConsumerScheduler; /** * The flatpack component supports fixed width and delimited file parsing via @@ -480,24 +479,7 @@ public interface FlatpackEndpointBuilderFactory { * To use a cron scheduler from either camel-spring or camel-quartz * component. * - * The option is a: - * <code>org.apache.camel.spi.ScheduledPollConsumerScheduler</code> - * type. - * - * Group: scheduler - */ - default FlatpackEndpointConsumerBuilder scheduler( - ScheduledPollConsumerScheduler scheduler) { - setProperty("scheduler", scheduler); - return this; - } - /** - * To use a cron scheduler from either camel-spring or camel-quartz - * component. - * - * The option will be converted to a - * <code>org.apache.camel.spi.ScheduledPollConsumerScheduler</code> - * type. + * The option is a: <code>java.lang.String</code> type. * * Group: scheduler */ diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KinesisEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KinesisEndpointBuilderFactory.java index 3c3ea9b..40c9e02 100644 --- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KinesisEndpointBuilderFactory.java +++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KinesisEndpointBuilderFactory.java @@ -27,7 +27,6 @@ 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; -import org.apache.camel.spi.ScheduledPollConsumerScheduler; /** * The aws-kinesis component is for consuming and producing records from Amazon @@ -517,24 +516,7 @@ public interface KinesisEndpointBuilderFactory { * To use a cron scheduler from either camel-spring or camel-quartz * component. * - * The option is a: - * <code>org.apache.camel.spi.ScheduledPollConsumerScheduler</code> - * type. - * - * Group: scheduler - */ - default KinesisEndpointConsumerBuilder scheduler( - ScheduledPollConsumerScheduler scheduler) { - setProperty("scheduler", scheduler); - return this; - } - /** - * To use a cron scheduler from either camel-spring or camel-quartz - * component. - * - * The option will be converted to a - * <code>org.apache.camel.spi.ScheduledPollConsumerScheduler</code> - * type. + * The option is a: <code>java.lang.String</code> type. * * Group: scheduler */ diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/S3EndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/S3EndpointBuilderFactory.java index 0fbcc15..aac5545 100644 --- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/S3EndpointBuilderFactory.java +++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/S3EndpointBuilderFactory.java @@ -27,7 +27,6 @@ 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; -import org.apache.camel.spi.ScheduledPollConsumerScheduler; /** * The aws-s3 component is used for storing and retrieving objecct from Amazon @@ -645,24 +644,7 @@ public interface S3EndpointBuilderFactory { * To use a cron scheduler from either camel-spring or camel-quartz * component. * - * The option is a: - * <code>org.apache.camel.spi.ScheduledPollConsumerScheduler</code> - * type. - * - * Group: scheduler - */ - default S3EndpointConsumerBuilder scheduler( - ScheduledPollConsumerScheduler scheduler) { - setProperty("scheduler", scheduler); - return this; - } - /** - * To use a cron scheduler from either camel-spring or camel-quartz - * component. - * - * The option will be converted to a - * <code>org.apache.camel.spi.ScheduledPollConsumerScheduler</code> - * type. + * The option is a: <code>java.lang.String</code> type. * * Group: scheduler */ diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SqlEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SqlEndpointBuilderFactory.java index b0e5a45..34f9c6d 100644 --- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SqlEndpointBuilderFactory.java +++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SqlEndpointBuilderFactory.java @@ -27,7 +27,6 @@ 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; -import org.apache.camel.spi.ScheduledPollConsumerScheduler; /** * The sql component allows you to work with databases using JDBC SQL queries. @@ -677,24 +676,7 @@ public interface SqlEndpointBuilderFactory { * To use a cron scheduler from either camel-spring or camel-quartz * component. * - * The option is a: - * <code>org.apache.camel.spi.ScheduledPollConsumerScheduler</code> - * type. - * - * Group: scheduler - */ - default SqlEndpointConsumerBuilder scheduler( - ScheduledPollConsumerScheduler scheduler) { - setProperty("scheduler", scheduler); - return this; - } - /** - * To use a cron scheduler from either camel-spring or camel-quartz - * component. - * - * The option will be converted to a - * <code>org.apache.camel.spi.ScheduledPollConsumerScheduler</code> - * type. + * The option is a: <code>java.lang.String</code> type. * * Group: scheduler */ diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SqsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SqsEndpointBuilderFactory.java index 8fbf417..4b6a1ee 100644 --- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SqsEndpointBuilderFactory.java +++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SqsEndpointBuilderFactory.java @@ -28,7 +28,6 @@ import org.apache.camel.builder.endpoint.AbstractEndpointBuilder; import org.apache.camel.spi.ExceptionHandler; import org.apache.camel.spi.HeaderFilterStrategy; import org.apache.camel.spi.PollingConsumerPollStrategy; -import org.apache.camel.spi.ScheduledPollConsumerScheduler; /** * The aws-sqs component is used for sending and receiving messages to Amazon's @@ -767,24 +766,7 @@ public interface SqsEndpointBuilderFactory { * To use a cron scheduler from either camel-spring or camel-quartz * component. * - * The option is a: - * <code>org.apache.camel.spi.ScheduledPollConsumerScheduler</code> - * type. - * - * Group: scheduler - */ - default SqsEndpointConsumerBuilder scheduler( - ScheduledPollConsumerScheduler scheduler) { - setProperty("scheduler", scheduler); - return this; - } - /** - * To use a cron scheduler from either camel-spring or camel-quartz - * component. - * - * The option will be converted to a - * <code>org.apache.camel.spi.ScheduledPollConsumerScheduler</code> - * type. + * The option is a: <code>java.lang.String</code> type. * * Group: scheduler */ diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SshEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SshEndpointBuilderFactory.java index e44b268..4c90792 100644 --- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SshEndpointBuilderFactory.java +++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SshEndpointBuilderFactory.java @@ -27,7 +27,6 @@ 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; -import org.apache.camel.spi.ScheduledPollConsumerScheduler; /** * The ssh component enables access to SSH servers such that you can send an SSH @@ -409,24 +408,7 @@ public interface SshEndpointBuilderFactory { * To use a cron scheduler from either camel-spring or camel-quartz * component. * - * The option is a: - * <code>org.apache.camel.spi.ScheduledPollConsumerScheduler</code> - * type. - * - * Group: scheduler - */ - default SshEndpointConsumerBuilder scheduler( - ScheduledPollConsumerScheduler scheduler) { - setProperty("scheduler", scheduler); - return this; - } - /** - * To use a cron scheduler from either camel-spring or camel-quartz - * component. - * - * The option will be converted to a - * <code>org.apache.camel.spi.ScheduledPollConsumerScheduler</code> - * type. + * The option is a: <code>java.lang.String</code> type. * * Group: scheduler */