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 3bd5805c84593a265249dd3ce2b3ef5ab5431aa4
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Tue Jun 23 09:17:28 2020 +0200
Regen
---
.../src/main/docs/modules/eips/pages/aggregate-eip.adoc | 6 +++---
.../src/main/docs/modules/eips/pages/batch-config-eip.adoc | 2 +-
.../src/main/docs/modules/eips/pages/circuitBreaker-eip.adoc | 2 +-
.../docs/modules/eips/pages/faultToleranceConfiguration-eip.adoc | 4 ++--
.../src/main/docs/modules/eips/pages/hystrixConfiguration-eip.adoc | 5 +++--
.../src/main/docs/modules/eips/pages/multicast-eip.adoc | 2 +-
.../src/main/docs/modules/eips/pages/pollEnrich-eip.adoc | 2 +-
.../src/main/docs/modules/eips/pages/recipientList-eip.adoc | 2 +-
.../src/main/docs/modules/eips/pages/saga-eip.adoc | 5 +++--
.../src/main/docs/modules/eips/pages/sample-eip.adoc | 4 ++--
.../src/main/docs/modules/eips/pages/split-eip.adoc | 2 +-
.../src/main/docs/modules/eips/pages/stream-config-eip.adoc | 4 ++--
.../src/main/docs/modules/eips/pages/throttle-eip.adoc | 2 +-
13 files changed, 22 insertions(+), 20 deletions(-)
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/aggregate-eip.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/aggregate-eip.adoc
index a27492a..da31cb8 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/aggregate-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/aggregate-eip.adoc
@@ -40,9 +40,9 @@ The Aggregate EIP supports 27 options which are listed below:
| *strategyMethodName* | This option can be used to explicit declare the
method name to use, when using POJOs as the AggregationStrategy. | | String
| *strategyMethodAllowNull* | If this option is false then the aggregate
method is not used for the very first aggregation. If this option is true then
null values is used as the oldExchange (at the very first aggregation), when
using POJOs as the AggregationStrategy. | false | Boolean
| *completionSize* | Number of messages aggregated before the aggregation is
complete. This option can be set as either a fixed value or using an Expression
which allows you to evaluate a size dynamically - will use Integer as result.
If both are set Camel will fallback to use the fixed value if the Expression
result was null or 0. | | Integer
-| *completionInterval* | A repeating period in millis by which the aggregator
will complete all current aggregated exchanges. Camel has a background task
which is triggered every period. You cannot use this option together with
completionTimeout, only one of them can be used. | | Long
-| *completionTimeout* | Time in millis that an aggregated exchange should be
inactive before its complete (timeout). This option can be set as either a
fixed value or using an Expression which allows you to evaluate a timeout
dynamically - will use Long as result. If both are set Camel will fallback to
use the fixed value if the Expression result was null or 0. You cannot use this
option together with completionInterval, only one of the two can be used. By
default the timeout checker run [...]
-| *completionTimeoutChecker Interval* | Interval in millis that is used by the
background task that checks for timeouts ( org.apache.camel.TimeoutMap ). By
default the timeout checker runs every second. The timeout is an approximation
and there is no guarantee that the a timeout is triggered exactly after the
timeout value. It is not recommended to use very low timeout values or checker
intervals. | 1000 | Long
+| *completionInterval* | A repeating period in millis by which the aggregator
will complete all current aggregated exchanges. Camel has a background task
which is triggered every period. You cannot use this option together with
completionTimeout, only one of them can be used. | | String
+| *completionTimeout* | Time in millis that an aggregated exchange should be
inactive before its complete (timeout). This option can be set as either a
fixed value or using an Expression which allows you to evaluate a timeout
dynamically - will use Long as result. If both are set Camel will fallback to
use the fixed value if the Expression result was null or 0. You cannot use this
option together with completionInterval, only one of the two can be used. By
default the timeout checker run [...]
+| *completionTimeoutChecker Interval* | Interval in millis that is used by the
background task that checks for timeouts ( org.apache.camel.TimeoutMap ). By
default the timeout checker runs every second. The timeout is an approximation
and there is no guarantee that the a timeout is triggered exactly after the
timeout value. It is not recommended to use very low timeout values or checker
intervals. | 1s | String
| *completionFromBatchConsumer* | Enables the batch completion mode where we
aggregate from a org.apache.camel.BatchConsumer and aggregate the total number
of exchanges the org.apache.camel.BatchConsumer has reported as total by
checking the exchange property org.apache.camel.Exchange#BATCH_COMPLETE when
its complete. This option cannot be used together with
discardOnAggregationFailure. | false | Boolean
| *completionOnNewCorrelation Group* | Enables completion on all previous
groups when a new incoming correlation group. This can for example be used to
complete groups with same correlation keys when they are in consecutive order.
Notice when this is enabled then only 1 correlation group can be in progress as
when a new correlation group starts, then the previous groups is forced
completed. | false | Boolean
| *eagerCheckCompletion* | Use eager completion checking which means that the
completionPredicate will use the incoming Exchange. As opposed to without eager
completion checking the completionPredicate will use the aggregated Exchange. |
false | Boolean
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/batch-config-eip.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/batch-config-eip.adoc
index b348cc6..b1e6bc9 100644
---
a/core/camel-core-engine/src/main/docs/modules/eips/pages/batch-config-eip.adoc
+++
b/core/camel-core-engine/src/main/docs/modules/eips/pages/batch-config-eip.adoc
@@ -14,7 +14,7 @@ The Batch-config EIP supports 5 options which are listed
below:
|===
| Name | Description | Default | Type
| *batchSize* | Sets the size of the batch to be re-ordered. The default size
is 100. | 100 | Integer
-| *batchTimeout* | Sets the timeout for collecting elements to be re-ordered.
The default timeout is 1000 msec. | 1000 | Long
+| *batchTimeout* | Sets the timeout for collecting elements to be re-ordered.
The default timeout is 1000 msec. | 1s | String
| *allowDuplicates* | Whether to allow duplicates. | false | Boolean
| *reverse* | Whether to reverse the ordering. | false | Boolean
| *ignoreInvalidExchanges* | Whether to ignore invalid exchanges | false |
Boolean
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/circuitBreaker-eip.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/circuitBreaker-eip.adoc
index ba55f49..95e8fc0 100644
---
a/core/camel-core-engine/src/main/docs/modules/eips/pages/circuitBreaker-eip.adoc
+++
b/core/camel-core-engine/src/main/docs/modules/eips/pages/circuitBreaker-eip.adoc
@@ -29,7 +29,7 @@ The Circuit Breaker EIP supports 4 options which are listed
below:
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *hystrixConfiguration* | *Deprecated:* Configures the circuit breaker to use
Hystrix with the given configuration. | | HystrixConfigurationDefinition
+| *hystrixConfiguration* | Configures the circuit breaker to use Hystrix with
the given configuration. | | HystrixConfigurationDefinition
| *resilience4jConfiguration* | Configures the circuit breaker to use
Resilience4j with the given configuration. | |
Resilience4jConfigurationDefinition
| *faultToleranceConfiguration* | Configures the circuit breaker to use
MicroProfile Fault Tolerance with the given configuration. | |
FaultToleranceConfigurationDefinition
| *configurationRef* | Refers to a circuit breaker configuration (such as
hystrix, resillience4j, or microprofile-fault-tolerance) to use for configuring
the circuit breaker EIP. | | String
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/faultToleranceConfiguration-eip.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/faultToleranceConfiguration-eip.adoc
index 9d346cb..11e52c3 100644
---
a/core/camel-core-engine/src/main/docs/modules/eips/pages/faultToleranceConfiguration-eip.adoc
+++
b/core/camel-core-engine/src/main/docs/modules/eips/pages/faultToleranceConfiguration-eip.adoc
@@ -13,12 +13,12 @@ The Fault Tolerance Configuration EIP supports 13 options
which are listed below
|===
| Name | Description | Default | Type
| *circuitBreakerRef* | Refers to an existing
io.smallrye.faulttolerance.core.circuit.breaker.CircuitBreaker instance to
lookup and use from the registry. When using this, then any other circuit
breaker options are not in use. | | String
-| *delay* | Control how long the circuit breaker stays open. The value are in
seconds and the default is 5 seconds. | 5 | Long
+| *delay* | Control how long the circuit breaker stays open. The value are in
seconds and the default is 5 seconds. | 5s | String
| *successThreshold* | Controls the number of trial calls which are allowed
when the circuit breaker is half-open | 1 | Integer
| *requestVolumeThreshold* | Controls the size of the rolling window used when
the circuit breaker is closed | 20 | Integer
| *failureRatio* | Configures the failure rate threshold in percentage. If the
failure rate is equal or greater than the threshold the CircuitBreaker
transitions to open and starts short-circuiting calls. The threshold must be
greater than 0 and not greater than 100. Default value is 50 percentage. | 50 |
Integer
| *timeoutEnabled* | Whether timeout is enabled or not on the circuit breaker.
Default is false. | false | Boolean
-| *timeoutDuration* | Configures the thread execution timeout. Default value
is 1 second. | 1000 | Long
+| *timeoutDuration* | Configures the thread execution timeout. Default value
is 1 second. | 1s | String
| *timeoutPoolSize* | Configures the pool size of the thread pool when timeout
is enabled. Default value is 10. | 10 | Integer
| *timeoutScheduledExecutor ServiceRef* | References to a custom thread pool
to use when timeout is enabled | | String
| *bulkheadEnabled* | Whether bulkhead is enabled or not on the circuit
breaker. Default is false. | false | Boolean
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/hystrixConfiguration-eip.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/hystrixConfiguration-eip.adoc
index a8facd8..99b094d 100644
---
a/core/camel-core-engine/src/main/docs/modules/eips/pages/hystrixConfiguration-eip.adoc
+++
b/core/camel-core-engine/src/main/docs/modules/eips/pages/hystrixConfiguration-eip.adoc
@@ -1,9 +1,10 @@
[[hystrixConfiguration-eip]]
-= Hystrix Configuration EIP
+= Hystrix Configuration EIP (deprecated)
:docTitle: Hystrix Configuration
:description: Hystrix Circuit Breaker EIP configuration
:since:
-:supportLevel: Stable
+:supportLevel: Stable-deprecated
+:deprecated: *deprecated*
// eip options: START
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/multicast-eip.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/multicast-eip.adoc
index a608a20..132df0e 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/multicast-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/multicast-eip.adoc
@@ -25,7 +25,7 @@ The Multicast EIP supports 12 options which are listed below:
| *executorServiceRef* | Refers to a custom Thread Pool to be used for
parallel processing. Notice if you set this option, then parallel processing is
automatic implied, and you do not have to enable that option as well. | |
String
| *streaming* | If enabled then Camel will process replies out-of-order, eg in
the order they come back. If disabled, Camel will process replies in the same
order as defined by the multicast. | false | Boolean
| *stopOnException* | Will now stop further processing if an exception or
failure occurred during processing of an org.apache.camel.Exchange and the
caused exception will be thrown. Will also stop if processing the exchange
failed (has a fault message) or an exception was thrown and handled by the
error handler (such as using onException). In all situations the multicast will
stop further processing. This is the same behavior as in pipeline, which is
used by the routing engine. The defau [...]
-| *timeout* | Sets a total timeout specified in millis, when using parallel
processing. If the Multicast hasn't been able to send and process all replies
within the given timeframe, then the timeout triggers and the Multicast breaks
out and continues. Notice if you provide a TimeoutAwareAggregationStrategy then
the timeout method is invoked before breaking out. If the timeout is reached
with running tasks still remaining, certain tasks for which it is difficult for
Camel to shut down in [...]
+| *timeout* | Sets a total timeout specified in millis, when using parallel
processing. If the Multicast hasn't been able to send and process all replies
within the given timeframe, then the timeout triggers and the Multicast breaks
out and continues. Notice if you provide a TimeoutAwareAggregationStrategy then
the timeout method is invoked before breaking out. If the timeout is reached
with running tasks still remaining, certain tasks for which it is difficult for
Camel to shut down in [...]
| *onPrepareRef* | Uses the Processor when preparing the
org.apache.camel.Exchange to be send. This can be used to deep-clone messages
that should be send, or any custom logic needed before the exchange is send. |
| String
| *shareUnitOfWork* | Shares the org.apache.camel.spi.UnitOfWork with the
parent and each of the sub messages. Multicast will by default not share unit
of work between the parent exchange and each multicasted exchange. This means
each sub exchange has its own individual unit of work. | false | Boolean
| *parallelAggregate* | If enabled then the aggregate method on
AggregationStrategy can be called concurrently. Notice that this would require
the implementation of AggregationStrategy to be implemented as thread-safe. By
default this is false meaning that Camel synchronizes the call to the aggregate
method. Though in some use-cases this can be used to archive higher performance
when the AggregationStrategy is implemented as thread-safe. | false | Boolean
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/pollEnrich-eip.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/pollEnrich-eip.adoc
index 9c8451e..5c1178c 100644
---
a/core/camel-core-engine/src/main/docs/modules/eips/pages/pollEnrich-eip.adoc
+++
b/core/camel-core-engine/src/main/docs/modules/eips/pages/pollEnrich-eip.adoc
@@ -43,7 +43,7 @@ The Poll Enrich EIP supports 7 options which are listed below:
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *timeout* | Timeout in millis when polling from the external service. The
timeout has influence about the poll enrich behavior. It basically operations
in three different modes: negative value - Waits until a message is available
and then returns it. Warning that this method could block indefinitely if no
messages are available. 0 - Attempts to receive a message exchange immediately
without waiting and returning null if a message exchange is not available yet.
positive value - Attempts [...]
+| *timeout* | Timeout in millis when polling from the external service. The
timeout has influence about the poll enrich behavior. It basically operations
in three different modes: negative value - Waits until a message is available
and then returns it. Warning that this method could block indefinitely if no
messages are available. 0 - Attempts to receive a message exchange immediately
without waiting and returning null if a message exchange is not available yet.
positive value - Attempts [...]
| *strategyRef* | Refers to an AggregationStrategy to be used to merge the
reply from the external service, into a single outgoing message. By default
Camel will use the reply from the external service as outgoing message. | |
String
| *strategyMethodName* | This option can be used to explicit declare the
method name to use, when using POJOs as the AggregationStrategy. | | String
| *strategyMethodAllowNull* | If this option is false then the aggregate
method is not used if there was no data to enrich. If this option is true then
null values is used as the oldExchange (when no data to enrich), when using
POJOs as the AggregationStrategy. | false | Boolean
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/recipientList-eip.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/recipientList-eip.adoc
index 3b9034e..87079a0 100644
---
a/core/camel-core-engine/src/main/docs/modules/eips/pages/recipientList-eip.adoc
+++
b/core/camel-core-engine/src/main/docs/modules/eips/pages/recipientList-eip.adoc
@@ -28,7 +28,7 @@ The Recipient List EIP supports 15 options which are listed
below:
| *stopOnException* | Will now stop further processing if an exception or
failure occurred during processing of an org.apache.camel.Exchange and the
caused exception will be thrown. Will also stop if processing the exchange
failed (has a fault message) or an exception was thrown and handled by the
error handler (such as using onException). In all situations the recipient list
will stop further processing. This is the same behavior as in pipeline, which
is used by the routing engine. The [...]
| *ignoreInvalidEndpoints* | Ignore the invalidate endpoint exception when try
to create a producer with that endpoint | false | Boolean
| *streaming* | If enabled then Camel will process replies out-of-order, eg in
the order they come back. If disabled, Camel will process replies in the same
order as defined by the recipient list. | false | Boolean
-| *timeout* | Sets a total timeout specified in millis, when using parallel
processing. If the Recipient List hasn't been able to send and process all
replies within the given timeframe, then the timeout triggers and the Recipient
List breaks out and continues. Notice if you provide a
TimeoutAwareAggregationStrategy then the timeout method is invoked before
breaking out. If the timeout is reached with running tasks still remaining,
certain tasks for which it is difficult for Camel to shu [...]
+| *timeout* | Sets a total timeout specified in millis, when using parallel
processing. If the Recipient List hasn't been able to send and process all
replies within the given timeframe, then the timeout triggers and the Recipient
List breaks out and continues. Notice if you provide a
TimeoutAwareAggregationStrategy then the timeout method is invoked before
breaking out. If the timeout is reached with running tasks still remaining,
certain tasks for which it is difficult for Camel to shu [...]
| *onPrepareRef* | Uses the Processor when preparing the
org.apache.camel.Exchange to be send. This can be used to deep-clone messages
that should be send, or any custom logic needed before the exchange is send. |
| String
| *shareUnitOfWork* | Shares the org.apache.camel.spi.UnitOfWork with the
parent and each of the sub messages. Recipient List will by default not share
unit of work between the parent exchange and each recipient exchange. This
means each sub exchange has its own individual unit of work. | false | Boolean
| *cacheSize* | Sets the maximum size used by the
org.apache.camel.spi.ProducerCache which is used to cache and reuse producers
when using this recipient list, when uris are reused. Beware that when using
dynamic endpoints then it affects how well the cache can be utilized. If each
dynamic endpoint is unique then its best to turn of caching by setting this to
-1, which allows Camel to not cache both the producers and endpoints; they are
regarded as prototype scoped and will be stopped an [...]
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/saga-eip.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/saga-eip.adoc
index a5491fa..e16b875 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/saga-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/saga-eip.adoc
@@ -25,14 +25,15 @@ with the purpose of restoring the status that was present
before the flow execut
Compensating actions can be declared in Camel routes using the Java or XML DSL
and will be invoked by Camel only when needed (if the saga is cancelled due to
an error).
// eip options: START
-The Saga EIP supports 7 options which are listed below:
+The Saga EIP supports 8 options which are listed below:
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
| *propagation* | Set the Saga propagation mode (REQUIRED, REQUIRES_NEW,
MANDATORY, SUPPORTS, NOT_SUPPORTED, NEVER). | REQUIRED | SagaPropagation
| *completionMode* | Determine how the saga should be considered complete.
When set to AUTO, the saga is completed when the exchange that initiates the
saga is processed successfully, or compensated when it completes exceptionally.
When set to MANUAL, the user must complete or compensate the saga using the
saga:complete or saga:compensate endpoints. | AUTO | SagaCompletionMode
-| *timeoutInMilliseconds* | Set the maximum amount of time for the Saga. After
the timeout is expired, the saga will be compensated automatically (unless a
different decision has been taken in the meantime). | | Long
+| *timeoutInMilliseconds* | *Deprecated* Set the maximum amount of time for
the Saga. After the timeout is expired, the saga will be compensated
automatically (unless a different decision has been taken in the meantime).
Deprecation note: Use timeout instead | | Long
+| *timeout* | Set the maximum amount of time for the Saga. After the timeout
is expired, the saga will be compensated automatically (unless a different
decision has been taken in the meantime). | | String
| *compensation* | The compensation endpoint URI that must be called to
compensate all changes done in the route. The route corresponding to the
compensation URI must perform compensation and complete without error. If
errors occur during compensation, the saga service may call again the
compensation URI to retry. | | SagaActionUriDefinition
| *completion* | The completion endpoint URI that will be called when the Saga
is completed successfully. The route corresponding to the completion URI must
perform completion tasks and terminate without error. If errors occur during
completion, the saga service may call again the completion URI to retry. | |
SagaActionUriDefinition
| *option* | Allows to save properties of the current exchange in order to
re-use them in a compensation/completion callback route. Options are usually
helpful e.g. to store and retrieve identifiers of objects that should be
deleted in compensating actions. Option values will be transformed into input
headers of the compensation/completion exchange. | | List
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/sample-eip.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/sample-eip.adoc
index 097fa51..d8f7e76 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/sample-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/sample-eip.adoc
@@ -16,9 +16,9 @@ The Sample EIP supports 3 options which are listed below:
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *samplePeriod* | Sets the sample period during which only a single Exchange
will pass through. | 1 | Long
+| *samplePeriod* | Sets the sample period during which only a single Exchange
will pass through. | 1s | String
| *messageFrequency* | Sets the sample message count which only a single
Exchange will pass through after this many received. | | Long
-| *units* | Sets the time units for the sample period, defaulting to seconds.
| SECONDS | TimeUnit
+| *units* | *Deprecated* Sets the time units for the sample period, defaulting
to seconds. Deprecation note: Use samplePeriod extended syntax instead |
SECONDS | TimeUnit
|===
// eip options: END
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/split-eip.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/split-eip.adoc
index ebd803e..52848b2 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/split-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/split-eip.adoc
@@ -25,7 +25,7 @@ The Split EIP supports 12 options which are listed below:
| *executorServiceRef* | Refers to a custom Thread Pool to be used for
parallel processing. Notice if you set this option, then parallel processing is
automatic implied, and you do not have to enable that option as well. | |
String
| *streaming* | When in streaming mode, then the splitter splits the original
message on-demand, and each splitted message is processed one by one. This
reduces memory usage as the splitter do not split all the messages first, but
then we do not know the total size, and therefore the
org.apache.camel.Exchange#SPLIT_SIZE is empty. In non-streaming mode (default)
the splitter will split each message first, to know the total size, and then
process each message one by one. This requires to k [...]
| *stopOnException* | Will now stop further processing if an exception or
failure occurred during processing of an org.apache.camel.Exchange and the
caused exception will be thrown. Will also stop if processing the exchange
failed (has a fault message) or an exception was thrown and handled by the
error handler (such as using onException). In all situations the splitter will
stop further processing. This is the same behavior as in pipeline, which is
used by the routing engine. The defaul [...]
-| *timeout* | Sets a total timeout specified in millis, when using parallel
processing. If the Splitter hasn't been able to split and process all the sub
messages within the given timeframe, then the timeout triggers and the Splitter
breaks out and continues. Notice if you provide a
TimeoutAwareAggregationStrategy then the timeout method is invoked before
breaking out. If the timeout is reached with running tasks still remaining,
certain tasks for which it is difficult for Camel to shut [...]
+| *timeout* | Sets a total timeout specified in millis, when using parallel
processing. If the Splitter hasn't been able to split and process all the sub
messages within the given timeframe, then the timeout triggers and the Splitter
breaks out and continues. Notice if you provide a
TimeoutAwareAggregationStrategy then the timeout method is invoked before
breaking out. If the timeout is reached with running tasks still remaining,
certain tasks for which it is difficult for Camel to shut [...]
| *onPrepareRef* | Uses the Processor when preparing the
org.apache.camel.Exchange to be send. This can be used to deep-clone messages
that should be send, or any custom logic needed before the exchange is send. |
| String
| *shareUnitOfWork* | Shares the org.apache.camel.spi.UnitOfWork with the
parent and each of the sub messages. Splitter will by default not share unit of
work between the parent exchange and each splitted exchange. This means each
splitted exchange has its own individual unit of work. | false | Boolean
| *parallelAggregate* | If enabled then the aggregate method on
AggregationStrategy can be called concurrently. Notice that this would require
the implementation of AggregationStrategy to be implemented as thread-safe. By
default this is false meaning that Camel synchronizes the call to the aggregate
method. Though in some use-cases this can be used to archive higher performance
when the AggregationStrategy is implemented as thread-safe. | false | Boolean
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/stream-config-eip.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/stream-config-eip.adoc
index e96b6a9..58f9407 100644
---
a/core/camel-core-engine/src/main/docs/modules/eips/pages/stream-config-eip.adoc
+++
b/core/camel-core-engine/src/main/docs/modules/eips/pages/stream-config-eip.adoc
@@ -14,8 +14,8 @@ The Stream-config EIP supports 6 options which are listed
below:
|===
| Name | Description | Default | Type
| *capacity* | Sets the capacity of the resequencer's inbound queue. | 100 |
Integer
-| *timeout* | Sets minimum time to wait for missing elements (messages). |
1000 | Long
-| *deliveryAttemptInterval* | Sets the interval in milli seconds the stream
resequencer will at most wait while waiting for condition of being able to
deliver. | 1000 | Long
+| *timeout* | Sets minimum time to wait for missing elements (messages). | 1s
| String
+| *deliveryAttemptInterval* | Sets the interval in milli seconds the stream
resequencer will at most wait while waiting for condition of being able to
deliver. | 1s | String
| *ignoreInvalidExchanges* | Whether to ignore invalid exchanges | false |
Boolean
| *comparatorRef* | To use a custom comparator | | String
| *rejectOld* | If true, throws an exception when messages older than the last
delivered message are processed | false | Boolean
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/throttle-eip.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/throttle-eip.adoc
index c35a9a3..ea40ca3 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/throttle-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/throttle-eip.adoc
@@ -17,7 +17,7 @@ The Throttle EIP supports 6 options which are listed below:
| 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. | | ExpressionSubElementDefinition
| *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
+| *timePeriodMillis* | Sets the time period during which the maximum request
count is valid for | 1000 | String
| *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
