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 2020/01/21 05:57:40 UTC
[camel] branch master updated (cf1ee3a -> f8af5df)
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 cf1ee3a camel-grape: Convert GrapeComponentTest from Groovy to Java
new aca13af CAMEL-14354: Optimize core
new f8af5df Regen
The 2 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:
.../src/main/docs/pulsar-component.adoc | 4 +--
.../camel/processor/CamelInternalProcessor.java | 2 +-
.../endpoint/dsl/PulsarEndpointBuilderFactory.java | 39 ++++++++++++++++++++++
.../modules/ROOT/pages/pulsar-component.adoc | 3 +-
.../modules/ROOT/pages/timer-component.adoc | 3 +-
5 files changed, 46 insertions(+), 5 deletions(-)
[camel] 01/02: CAMEL-14354: Optimize core
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 aca13af8cfb72b02a989b1f0ce5dc91ea57fe682
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Jan 21 06:51:27 2020 +0100
CAMEL-14354: Optimize core
---
.../main/java/org/apache/camel/processor/CamelInternalProcessor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
index 46cc50e..8da55df 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
@@ -231,7 +231,7 @@ public class CamelInternalProcessor extends DelegateAsyncProcessor {
// do uow before processing and if a value is returned the the uow wants to be processed after
// was well in the same thread
AsyncCallback async = callback;
- boolean beforeAndAfter = uow.isBeforeAfterProcess();
+ boolean beforeAndAfter = uow != null && uow.isBeforeAfterProcess();
if (beforeAndAfter) {
async = uow.beforeProcess(processor, exchange, async);
}
[camel] 02/02: 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 f8af5dfb40c09800920c80ed4f136ef448dd993a
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Jan 21 06:51:37 2020 +0100
Regen
---
.../src/main/docs/pulsar-component.adoc | 4 +--
.../endpoint/dsl/PulsarEndpointBuilderFactory.java | 39 ++++++++++++++++++++++
.../modules/ROOT/pages/pulsar-component.adoc | 3 +-
.../modules/ROOT/pages/timer-component.adoc | 3 +-
4 files changed, 45 insertions(+), 4 deletions(-)
diff --git a/components/camel-pulsar/src/main/docs/pulsar-component.adoc b/components/camel-pulsar/src/main/docs/pulsar-component.adoc
index d7e2d9a..1701a16 100644
--- a/components/camel-pulsar/src/main/docs/pulsar-component.adoc
+++ b/components/camel-pulsar/src/main/docs/pulsar-component.adoc
@@ -78,7 +78,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (27 parameters):
+=== Query Parameters (28 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -92,10 +92,10 @@ with the following path and query parameters:
| *consumerNamePrefix* (consumer) | Prefix to add to consumer names when a SHARED or FAILOVER subscription is used | cons | String
| *consumerQueueSize* (consumer) | Size of the consumer queue - defaults to 10 | 10 | int
| *numberOfConsumers* (consumer) | Number of consumers - defaults to 1 | 1 | int
+| *subscriptionInitialPosition* (consumer) | Control the initial position in the topic of a newly created subscription. Default is latest message. | LATEST | SubscriptionInitialPosition
| *subscriptionName* (consumer) | Name of the subscription to use | subs | String
| *subscriptionType* (consumer) | Type of the subscription EXCLUSIVESHAREDFAILOVER, defaults to EXCLUSIVE | EXCLUSIVE | SubscriptionType
| *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
-| *subscriptionInitialPosition* (consumer) | Controls the position of the cursor within the topic when a new subscription is created. Defaults to LATEST message. | LATEST | SubscriptionInitialPosition
| *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. | | ExchangePattern
| *batchingEnabled* (producer) | Control whether automatic batching of messages is enabled for the producer. Default is true. | true | boolean
| *batchingMaxMessages* (producer) | Set the maximum number of messages permitted in a batch. Default 1,000. | 1000 | int
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PulsarEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PulsarEndpointBuilderFactory.java
index 4b8d21b..5f01d4c 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PulsarEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PulsarEndpointBuilderFactory.java
@@ -250,6 +250,36 @@ public interface PulsarEndpointBuilderFactory {
return this;
}
/**
+ * Control the initial position in the topic of a newly created
+ * subscription. Default is latest message.
+ *
+ * The option is a:
+ * <code>org.apache.camel.component.pulsar.utils.consumers.SubscriptionInitialPosition</code> type.
+ *
+ * Default: LATEST
+ * Group: consumer
+ */
+ default PulsarEndpointConsumerBuilder subscriptionInitialPosition(
+ SubscriptionInitialPosition subscriptionInitialPosition) {
+ doSetProperty("subscriptionInitialPosition", subscriptionInitialPosition);
+ return this;
+ }
+ /**
+ * Control the initial position in the topic of a newly created
+ * subscription. Default is latest message.
+ *
+ * The option will be converted to a
+ * <code>org.apache.camel.component.pulsar.utils.consumers.SubscriptionInitialPosition</code> type.
+ *
+ * Default: LATEST
+ * Group: consumer
+ */
+ default PulsarEndpointConsumerBuilder subscriptionInitialPosition(
+ String subscriptionInitialPosition) {
+ doSetProperty("subscriptionInitialPosition", subscriptionInitialPosition);
+ return this;
+ }
+ /**
* Name of the subscription to use.
*
* The option is a: <code>java.lang.String</code> type.
@@ -942,6 +972,15 @@ public interface PulsarEndpointBuilderFactory {
/**
* Proxy enum for
+ * <code>org.apache.camel.component.pulsar.utils.consumers.SubscriptionInitialPosition</code> enum.
+ */
+ enum SubscriptionInitialPosition {
+ EARLIEST,
+ LATEST;
+ }
+
+ /**
+ * Proxy enum for
* <code>org.apache.camel.component.pulsar.utils.consumers.SubscriptionType</code> enum.
*/
enum SubscriptionType {
diff --git a/docs/components/modules/ROOT/pages/pulsar-component.adoc b/docs/components/modules/ROOT/pages/pulsar-component.adoc
index 238c9a5..8eb55b3 100644
--- a/docs/components/modules/ROOT/pages/pulsar-component.adoc
+++ b/docs/components/modules/ROOT/pages/pulsar-component.adoc
@@ -79,7 +79,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (27 parameters):
+=== Query Parameters (28 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -93,6 +93,7 @@ with the following path and query parameters:
| *consumerNamePrefix* (consumer) | Prefix to add to consumer names when a SHARED or FAILOVER subscription is used | cons | String
| *consumerQueueSize* (consumer) | Size of the consumer queue - defaults to 10 | 10 | int
| *numberOfConsumers* (consumer) | Number of consumers - defaults to 1 | 1 | int
+| *subscriptionInitialPosition* (consumer) | Control the initial position in the topic of a newly created subscription. Default is latest message. | LATEST | SubscriptionInitialPosition
| *subscriptionName* (consumer) | Name of the subscription to use | subs | String
| *subscriptionType* (consumer) | Type of the subscription EXCLUSIVESHAREDFAILOVER, defaults to EXCLUSIVE | EXCLUSIVE | SubscriptionType
| *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
diff --git a/docs/components/modules/ROOT/pages/timer-component.adoc b/docs/components/modules/ROOT/pages/timer-component.adoc
index f67fa19..d1a7d3b 100644
--- a/docs/components/modules/ROOT/pages/timer-component.adoc
+++ b/docs/components/modules/ROOT/pages/timer-component.adoc
@@ -81,7 +81,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (13 parameters):
+=== Query Parameters (14 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -90,6 +90,7 @@ with the following path and query parameters:
| *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
| *delay* (consumer) | The number of milliseconds to wait before the first event is generated. Should not be used in conjunction with the time option. The default value is 1000. 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
| *fixedRate* (consumer) | Events take place at approximately regular intervals, separated by the specified period. | false | boolean
+| *includeMetadata* (consumer) | Whether to include metadata in the exchange such as fired time, timer name, timer count etc. This information is default included. | true | boolean
| *period* (consumer) | If greater than 0, generate periodic events every period milliseconds. The default value is 1000. 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
| *repeatCount* (consumer) | Specifies a maximum limit of number of fires. So if you set it to 1, the timer will only fire once. If you set it to 5, it will only fire five times. A value of zero or negative means fire forever. | 0 | long
| *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