This is an automated email from the ASF dual-hosted git repository. onders pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit 53ca1fbcf160e70982f396c8c455907f196c6bdb Author: onders86 <ondersezgin+git...@gmail.com> AuthorDate: Sun Jun 10 01:38:45 2018 +0300 CAMEL-6840 - fix for java docs and review comments --- camel-core/src/main/docs/eips/throttle-eip.adoc | 2 +- .../src/main/java/org/apache/camel/model/ProcessorDefinition.java | 4 ++-- .../src/main/java/org/apache/camel/model/ThrottleDefinition.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/camel-core/src/main/docs/eips/throttle-eip.adoc b/camel-core/src/main/docs/eips/throttle-eip.adoc index 7ae5472..aa0582b 100644 --- a/camel-core/src/main/docs/eips/throttle-eip.adoc +++ b/camel-core/src/main/docs/eips/throttle-eip.adoc @@ -11,12 +11,12 @@ The Throttle EIP supports 6 options which are listed below: [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type +| *correlationExpression* | The expression used to calculate the correlation key to use for throttle grouping. The Exchange which has the same correlation key is throttled together. | | NamespaceAware Expression | *executorServiceRef* | To use a custom thread pool (ScheduledExecutorService) by the throttler. | | String | *timePeriodMillis* | Sets the time period during which the maximum request count is valid for | 1000 | Long | *asyncDelayed* | Enables asynchronous delay which means the thread will not block while delaying. | false | Boolean | *callerRunsWhenRejected* | Whether or not the caller should run the task when it was rejected by the thread pool. Is by default true | true | Boolean | *rejectExecution* | Whether or not throttler throws the ThrottlerRejectedExecutionException when the exchange exceeds the request limit Is by default false | false | Boolean -| *correlationExpression* | The expression used to calculate the correlation key to use for throttle grouping. The Exchange which has the same correlation key is throttled together. | | NamespaceAware Expression |=== // eip options: END diff --git a/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java index e4622e7..8a5fbf1 100644 --- a/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java @@ -2296,8 +2296,8 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type> * Will default use a time period of 1 second, so setting the maximumRequestCount to eg 10 * will default ensure at most 10 messages per second. * - * @param maximumRequestCount an expression to calculate the maximum request count * @param correlationExpressionKey is a correlation key that can throttle by the given key instead of overall throttling + * @param maximumRequestCount an expression to calculate the maximum request count * @return the builder */ public ThrottleDefinition throttle(long correlationExpressionKey, Expression maximumRequestCount) { @@ -2317,8 +2317,8 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type> * Will default use a time period of 1 second, so setting the maximumRequestCount to eg 10 * will default ensure at most 10 messages per second. * - * @param maximumRequestCount an expression to calculate the maximum request count * @param correlationExpressionKey is a correlation key as an expression that can throttle by the given key instead of overall throttling + * @param maximumRequestCount an expression to calculate the maximum request count * @return the builder */ public ThrottleDefinition throttle(Expression correlationExpressionKey, Expression maximumRequestCount) { diff --git a/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java index 7bd5213..06ac79c 100644 --- a/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java @@ -44,6 +44,8 @@ import org.apache.camel.spi.RouteContext; public class ThrottleDefinition extends ExpressionNode implements ExecutorServiceAwareDefinition<ThrottleDefinition> { // TODO: Camel 3.0 Should not support outputs + @XmlElement(name = "correlationExpression") + private ExpressionSubElementDefinition correlationExpression; @XmlTransient private ExecutorService executorService; @XmlAttribute @@ -56,8 +58,6 @@ public class ThrottleDefinition extends ExpressionNode implements ExecutorServic private Boolean callerRunsWhenRejected; @XmlAttribute private Boolean rejectExecution; - @XmlElement(name = "correlationExpression") - private ExpressionSubElementDefinition correlationExpression; public ThrottleDefinition() { } -- To stop receiving notification emails like this one, please contact ond...@apache.org.