This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new b5aeec711d30 CAMEL-22460: Fix doc to not refer to non-exisit API that
was migrated into AggregationStrategy by default.
b5aeec711d30 is described below
commit b5aeec711d304e6ab467714c81926aa65a0619f1
Author: Claus Ibsen <[email protected]>
AuthorDate: Wed Dec 17 11:49:21 2025 +0100
CAMEL-22460: Fix doc to not refer to non-exisit API that was migrated into
AggregationStrategy by default.
---
.../camel/catalog/components/dynamic-router.json | 2 +-
.../org/apache/camel/catalog/models/multicast.json | 2 +-
.../apache/camel/catalog/models/recipientList.json | 2 +-
.../org/apache/camel/catalog/models/split.json | 2 +-
.../apache/camel/catalog/schemas/camel-spring.xsd | 22 +++++++-------
.../apache/camel/catalog/schemas/camel-xml-io.xsd | 22 +++++++-------
.../dynamicrouter/routing/dynamic-router.json | 2 +-
.../routing/DynamicRouterConfiguration.java | 11 ++++---
.../main/java/org/apache/camel/RecipientList.java | 7 ++---
.../docs/modules/eips/pages/aggregate-eip.adoc | 11 +++----
.../docs/modules/eips/pages/recipientList-eip.adoc | 2 +-
.../META-INF/org/apache/camel/model/multicast.json | 2 +-
.../org/apache/camel/model/recipientList.json | 2 +-
.../META-INF/org/apache/camel/model/split.json | 2 +-
.../apache/camel/model/MulticastDefinition.java | 12 ++++----
.../camel/model/RecipientListDefinition.java | 23 +++++++++++----
.../org/apache/camel/model/SplitDefinition.java | 18 +++++-------
.../processor/aggregate/AggregateProcessor.java | 2 +-
.../dsl/DynamicRouterEndpointBuilderFactory.java | 34 ++++++++++------------
.../dsl/yaml/deserializers/ModelDeserializers.java | 6 ++--
.../generated/resources/schema/camelYamlDsl.json | 6 ++--
21 files changed, 98 insertions(+), 94 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dynamic-router.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dynamic-router.json
index 97146fc92aae..b036fec91116 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dynamic-router.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dynamic-router.json
@@ -46,7 +46,7 @@
"stopOnException": { "index": 15, "kind": "parameter", "displayName":
"Stop On Exception", "group": "common", "label": "common", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.dynamicrouter.routing.DynamicRouterConfiguration",
"configurationField": "configuration", "description": "Will stop further
processing if an exception or failure occur [...]
"streaming": { "index": 16, "kind": "parameter", "displayName":
"Streaming", "group": "common", "label": "common", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.dynamicrouter.routing.DynamicRouterConfiguration",
"configurationField": "configuration", "description": "If enabled, then Camel
will process replies out-of-order (e.g., in the orde [...]
"synchronous": { "index": 17, "kind": "parameter", "displayName":
"Synchronous", "group": "common", "label": "common", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.dynamicrouter.routing.DynamicRouterConfiguration",
"configurationField": "configuration", "description": "Sets whether synchronous
processing should be strictly used. When enabl [...]
- "timeout": { "index": 18, "kind": "parameter", "displayName": "Timeout",
"group": "common", "label": "common", "required": false, "type": "integer",
"javaType": "long", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": -1, "configurationClass":
"org.apache.camel.component.dynamicrouter.routing.DynamicRouterConfiguration",
"configurationField": "configuration", "description": "Sets a total timeout
specified in milliseconds, when using parallel processing. If th [...]
+ "timeout": { "index": 18, "kind": "parameter", "displayName": "Timeout",
"group": "common", "label": "common", "required": false, "type": "integer",
"javaType": "long", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": -1, "configurationClass":
"org.apache.camel.component.dynamicrouter.routing.DynamicRouterConfiguration",
"configurationField": "configuration", "description": "Sets a total timeout
specified in millis, when using parallel processing. If the Dyna [...]
"warnDroppedMessage": { "index": 19, "kind": "parameter", "displayName":
"Warn Dropped Message", "group": "common", "label": "common", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false,
"configurationClass":
"org.apache.camel.component.dynamicrouter.routing.DynamicRouterConfiguration",
"configurationField": "configuration", "description": "Flag to log a warning if
no predicates match for an exc [...]
"lazyStartProducer": { "index": 20, "kind": "parameter", "displayName":
"Lazy Start Producer", "group": "producer (advanced)", "label":
"producer,advanced", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Whether the producer should be started
lazy (on the first message). By starting lazy you can use this to allow
CamelContext and routes to startup in situations where a produ [...]
}
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/multicast.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/multicast.json
index d694495e2530..eb18b00c910f 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/multicast.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/multicast.json
@@ -24,7 +24,7 @@
"synchronous": { "index": 9, "kind": "attribute", "displayName":
"Synchronous", "group": "common", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Sets whether
synchronous processing should be strictly used. When enabled then the same
thread is used to continue routing after the multicast is complete, even if
parallel processing is enabled." },
"streaming": { "index": 10, "kind": "attribute", "displayName":
"Streaming", "group": "common", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "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." },
"stopOnException": { "index": 11, "kind": "attribute", "displayName":
"Stop On Exception", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"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 processin [...]
- "timeout": { "index": 12, "kind": "attribute", "displayName": "Timeout",
"group": "advanced", "label": "advanced", "required": false, "type":
"duration", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "0", "description": "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 Multi [...]
+ "timeout": { "index": 12, "kind": "attribute", "displayName": "Timeout",
"group": "advanced", "label": "advanced", "required": false, "type":
"duration", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "0", "description": "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 Multi [...]
"executorService": { "index": 13, "kind": "attribute", "displayName":
"Executor Service", "group": "advanced", "label": "advanced", "required":
false, "type": "object", "javaType": "java.util.concurrent.ExecutorService",
"deprecated": false, "autowired": false, "secret": false, "description":
"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." },
"onPrepare": { "index": 14, "kind": "attribute", "displayName": "On
Prepare", "group": "advanced", "label": "advanced", "required": false, "type":
"object", "javaType": "org.apache.camel.Processor", "deprecated": false,
"autowired": false, "secret": false, "description": "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." },
"shareUnitOfWork": { "index": 15, "kind": "attribute", "displayName":
"Share Unit Of Work", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"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 [...]
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/recipientList.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/recipientList.json
index d0d5c65693b2..0ffc153c60a0 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/recipientList.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/recipientList.json
@@ -24,7 +24,7 @@
"parallelAggregate": { "index": 9, "kind": "attribute", "displayName":
"Parallel Aggregate", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": true,
"autowired": false, "secret": false, "defaultValue": false, "description": "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 thre [...]
"parallelProcessing": { "index": 10, "kind": "attribute", "displayName":
"Parallel Processing", "group": "common", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "If enabled then sending
messages to the recipients occurs concurrently. Note the caller thread will
still wait until all messages has been fully processed, before it continues.
Its only the sending and pro [...]
"synchronous": { "index": 11, "kind": "attribute", "displayName":
"Synchronous", "group": "common", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Sets whether
synchronous processing should be strictly used. When enabled then the same
thread is used to continue routing after the recipient list is complete, even
if parallel processing is enabled." },
- "timeout": { "index": 12, "kind": "attribute", "displayName": "Timeout",
"group": "common", "required": false, "type": "duration", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "0", "description": "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 o [...]
+ "timeout": { "index": 12, "kind": "attribute", "displayName": "Timeout",
"group": "common", "required": false, "type": "duration", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "0", "description": "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 o [...]
"executorService": { "index": 13, "kind": "attribute", "displayName":
"Executor Service", "group": "advanced", "label": "advanced", "required":
false, "type": "object", "javaType": "java.util.concurrent.ExecutorService",
"deprecated": false, "autowired": false, "secret": false, "description": "To
use 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." },
"stopOnException": { "index": 14, "kind": "attribute", "displayName":
"Stop On Exception", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"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 processin [...]
"ignoreInvalidEndpoints": { "index": 15, "kind": "attribute",
"displayName": "Ignore Invalid Endpoints", "group": "advanced", "label":
"advanced", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Ignore the invalidate endpoint exception
when try to create a producer with that endpoint" },
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/split.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/split.json
index ce5ba9adbb72..1b1933693401 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/split.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/split.json
@@ -26,7 +26,7 @@
"synchronous": { "index": 11, "kind": "attribute", "displayName":
"Synchronous", "group": "common", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Sets whether
synchronous processing should be strictly used. When enabled then the same
thread is used to continue routing after the split is complete, even if
parallel processing is enabled." },
"streaming": { "index": 12, "kind": "attribute", "displayName":
"Streaming", "group": "common", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "When in streaming mode,
then the splitter splits the original message on-demand, and each split message
is processed one by one. This reduces memory usage as the splitter do not split
all the messages first, but then we do n [...]
"stopOnException": { "index": 13, "kind": "attribute", "displayName":
"Stop On Exception", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"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 processin [...]
- "timeout": { "index": 14, "kind": "attribute", "displayName": "Timeout",
"group": "advanced", "label": "advanced", "required": false, "type":
"duration", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "0", "description": "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 [...]
+ "timeout": { "index": 14, "kind": "attribute", "displayName": "Timeout",
"group": "advanced", "label": "advanced", "required": false, "type":
"duration", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "0", "description": "Sets a total
timeout specified in millis, when using parallel processing. If the Splitter
hasn't been able to send and process all replies within the given timeframe,
then the timeout triggers and the Splitt [...]
"executorService": { "index": 15, "kind": "attribute", "displayName":
"Executor Service", "group": "advanced", "label": "advanced", "required":
false, "type": "object", "javaType": "java.util.concurrent.ExecutorService",
"deprecated": false, "autowired": false, "secret": false, "description": "To
use a custom Thread Pool to be used for parallel processing. Notice if you set
this option, then parallel processing is automatically implied, and you do not
have to enable that option as well." },
"onPrepare": { "index": 16, "kind": "attribute", "displayName": "On
Prepare", "group": "advanced", "label": "advanced", "required": false, "type":
"object", "javaType": "org.apache.camel.Processor", "deprecated": false,
"autowired": false, "secret": false, "description": "Uses the Processor when
preparing the org.apache.camel.Exchange to be sent. This can be used to
deep-clone messages that should be sent, or any custom logic needed before the
exchange is sent." },
"shareUnitOfWork": { "index": 17, "kind": "attribute", "displayName":
"Share Unit Of Work", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"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 split exchan [...]
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
index a81ebdef25a4..b3d10e2eb135 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
@@ -11221,9 +11221,9 @@ behavior is to not stop but continue processing till
the end. Default value: fal
<![CDATA[
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
-a graceful manner may continue to run. So use this option with a bit of care.
Default value: 0
+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 a graceful manner
may continue to run. So use this option with
+a bit of care. Default value: 0
]]>
</xs:documentation>
</xs:annotation>
@@ -12255,9 +12255,9 @@ routing after the recipient list is complete, even if
parallel processing is ena
<![CDATA[
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
-shut down in a graceful manner may continue to run. So use this option with a
bit of care. Default value: 0
+continues. 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 a
graceful manner may continue to run. So
+use this option with a bit of care. Default value: 0
]]>
</xs:documentation>
</xs:annotation>
@@ -13924,11 +13924,11 @@ behavior is to not stop but continue processing till
the end. Default value: fal
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
-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 down in a graceful manner may continue to run. So use this option with a
bit of care. Default value: 0
+Sets a total timeout specified in millis, when using parallel processing. If
the Splitter hasn't been able to send and
+process all replies within the given timeframe, then the timeout triggers and
the Splitter breaks out and continues. 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 a graceful manner
may continue to run. So use this option with
+a bit of care. Default value: 0
]]>
</xs:documentation>
</xs:annotation>
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-xml-io.xsd
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-xml-io.xsd
index 1cd11ac5bbf2..d0ea0a2d90bb 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-xml-io.xsd
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-xml-io.xsd
@@ -9894,9 +9894,9 @@ behavior is to not stop but continue processing till the
end. Default value: fal
<![CDATA[
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
-a graceful manner may continue to run. So use this option with a bit of care.
Default value: 0
+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 a graceful manner
may continue to run. So use this option with
+a bit of care. Default value: 0
]]>
</xs:documentation>
</xs:annotation>
@@ -10949,9 +10949,9 @@ routing after the recipient list is complete, even if
parallel processing is ena
<![CDATA[
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
-shut down in a graceful manner may continue to run. So use this option with a
bit of care. Default value: 0
+continues. 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 a
graceful manner may continue to run. So
+use this option with a bit of care. Default value: 0
]]>
</xs:documentation>
</xs:annotation>
@@ -12618,11 +12618,11 @@ behavior is to not stop but continue processing till
the end. Default value: fal
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
-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 down in a graceful manner may continue to run. So use this option with a
bit of care. Default value: 0
+Sets a total timeout specified in millis, when using parallel processing. If
the Splitter hasn't been able to send and
+process all replies within the given timeframe, then the timeout triggers and
the Splitter breaks out and continues. 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 a graceful manner
may continue to run. So use this option with
+a bit of care. Default value: 0
]]>
</xs:documentation>
</xs:annotation>
diff --git
a/components/camel-dynamic-router/src/generated/resources/META-INF/org/apache/camel/component/dynamicrouter/routing/dynamic-router.json
b/components/camel-dynamic-router/src/generated/resources/META-INF/org/apache/camel/component/dynamicrouter/routing/dynamic-router.json
index 97146fc92aae..b036fec91116 100644
---
a/components/camel-dynamic-router/src/generated/resources/META-INF/org/apache/camel/component/dynamicrouter/routing/dynamic-router.json
+++
b/components/camel-dynamic-router/src/generated/resources/META-INF/org/apache/camel/component/dynamicrouter/routing/dynamic-router.json
@@ -46,7 +46,7 @@
"stopOnException": { "index": 15, "kind": "parameter", "displayName":
"Stop On Exception", "group": "common", "label": "common", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.dynamicrouter.routing.DynamicRouterConfiguration",
"configurationField": "configuration", "description": "Will stop further
processing if an exception or failure occur [...]
"streaming": { "index": 16, "kind": "parameter", "displayName":
"Streaming", "group": "common", "label": "common", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.dynamicrouter.routing.DynamicRouterConfiguration",
"configurationField": "configuration", "description": "If enabled, then Camel
will process replies out-of-order (e.g., in the orde [...]
"synchronous": { "index": 17, "kind": "parameter", "displayName":
"Synchronous", "group": "common", "label": "common", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.dynamicrouter.routing.DynamicRouterConfiguration",
"configurationField": "configuration", "description": "Sets whether synchronous
processing should be strictly used. When enabl [...]
- "timeout": { "index": 18, "kind": "parameter", "displayName": "Timeout",
"group": "common", "label": "common", "required": false, "type": "integer",
"javaType": "long", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": -1, "configurationClass":
"org.apache.camel.component.dynamicrouter.routing.DynamicRouterConfiguration",
"configurationField": "configuration", "description": "Sets a total timeout
specified in milliseconds, when using parallel processing. If th [...]
+ "timeout": { "index": 18, "kind": "parameter", "displayName": "Timeout",
"group": "common", "label": "common", "required": false, "type": "integer",
"javaType": "long", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": -1, "configurationClass":
"org.apache.camel.component.dynamicrouter.routing.DynamicRouterConfiguration",
"configurationField": "configuration", "description": "Sets a total timeout
specified in millis, when using parallel processing. If the Dyna [...]
"warnDroppedMessage": { "index": 19, "kind": "parameter", "displayName":
"Warn Dropped Message", "group": "common", "label": "common", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false,
"configurationClass":
"org.apache.camel.component.dynamicrouter.routing.DynamicRouterConfiguration",
"configurationField": "configuration", "description": "Flag to log a warning if
no predicates match for an exc [...]
"lazyStartProducer": { "index": 20, "kind": "parameter", "displayName":
"Lazy Start Producer", "group": "producer (advanced)", "label":
"producer,advanced", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Whether the producer should be started
lazy (on the first message). By starting lazy you can use this to allow
CamelContext and routes to startup in situations where a produ [...]
}
diff --git
a/components/camel-dynamic-router/src/main/java/org/apache/camel/component/dynamicrouter/routing/DynamicRouterConfiguration.java
b/components/camel-dynamic-router/src/main/java/org/apache/camel/component/dynamicrouter/routing/DynamicRouterConfiguration.java
index f4c77b94f212..e8d67b232cb8 100644
---
a/components/camel-dynamic-router/src/main/java/org/apache/camel/component/dynamicrouter/routing/DynamicRouterConfiguration.java
+++
b/components/camel-dynamic-router/src/main/java/org/apache/camel/component/dynamicrouter/routing/DynamicRouterConfiguration.java
@@ -111,12 +111,11 @@ public class DynamicRouterConfiguration {
private boolean streaming;
/**
- * Sets a total timeout specified in milliseconds, when using parallel
processing. If the Multicast has not been
- * able to send and process all replies within the given timeframe, then
the timeout triggers and the Multicast
- * breaks out and continues. Notice that, 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 a graceful manner) may
continue to run. So use this option with a
- * bit of care.
+ * Sets a total timeout specified in millis, when using parallel
processing. If the Dynamic Router hasn't been able
+ * to send and process all replies within the given timeframe, then the
timeout triggers and the Dynamic Router
+ * breaks out and continues. 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 a graceful
+ * manner may continue to run. So use this option with a bit of care.
*/
@UriParam(label = "common", defaultValue = "-1")
private long timeout;
diff --git a/core/camel-api/src/main/java/org/apache/camel/RecipientList.java
b/core/camel-api/src/main/java/org/apache/camel/RecipientList.java
index f52f771b9337..62f6b8bb2093 100644
--- a/core/camel-api/src/main/java/org/apache/camel/RecipientList.java
+++ b/core/camel-api/src/main/java/org/apache/camel/RecipientList.java
@@ -102,10 +102,9 @@ public @interface RecipientList {
/**
* 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 shut down in a graceful manner may
continue to run. So use this option with a
- * bit of care.
+ * breaks out and continues. 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 a graceful
+ * manner may continue to run. So use this option with a bit of care.
*/
long timeout() default 0;
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 cac9dba60d47..37cbc710cffb 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
@@ -175,9 +175,8 @@ AggregationStrategy agg =
AggregationStrategies.flexible(Integer.class)
=== Aggregating on timeout
-If your aggregation strategy implements
-`TimeoutAwareAggregationStrategy`, then Camel will invoke the `timeout`
-method when the timeout occurs. Notice that the values for index and
+Camel invokes the `timeout` method on `AggregationStrategy` when the timeout
occurs.
+Notice that the values for index and
total parameters will be -1, and the timeout parameter will be provided
only if configured as a fixed value. You must *not* throw any exceptions
from the `timeout` method.
@@ -282,11 +281,9 @@ completions
* any other completions are not used (such as by size, from batch consumer,
etc.)
* _eagerCheckCompletion_ is implied as `true`, but the option has no effect
-=== CompletionAwareAggregationStrategy
+=== Completion AggregationStrategy
-If your aggregation strategy implements
-`CompletionAwareAggregationStrategy`, then Camel will invoke the
-`onComplete` method when the aggregated `Exchange` is completed. This
+Camel invokes the `onComplete` on `AggregationStrategy` method when the
aggregated `Exchange` is completed. This
allows you to do any last minute custom logic such as to clean up some
resources, or additional work on the exchange as it's now completed.
You must *not* throw any exceptions from the `onCompletion` method.
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 02b20303e642..c7340d9a28de 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
@@ -338,7 +338,7 @@ This allows you to deal with the timeout in the
`AggregationStrategy` if you rea
.Timeout is total
====
The timeout is total, which means that after X time, Camel will aggregate the
messages which have completed within the timeframe.
-The remainder will be canceled. Camel will also only invoke the `timeout`
method in the `TimeoutAwareAggregationStrategy` once, for the first index which
caused the timeout.
+The remainder will be canceled. Camel will also only invoke the `timeout`
method in the `AggregationStrategy` once, for the first index which caused the
timeout.
====
=== Using ExchangePattern in recipients
diff --git
a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/multicast.json
b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/multicast.json
index d694495e2530..eb18b00c910f 100644
---
a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/multicast.json
+++
b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/multicast.json
@@ -24,7 +24,7 @@
"synchronous": { "index": 9, "kind": "attribute", "displayName":
"Synchronous", "group": "common", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Sets whether
synchronous processing should be strictly used. When enabled then the same
thread is used to continue routing after the multicast is complete, even if
parallel processing is enabled." },
"streaming": { "index": 10, "kind": "attribute", "displayName":
"Streaming", "group": "common", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "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." },
"stopOnException": { "index": 11, "kind": "attribute", "displayName":
"Stop On Exception", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"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 processin [...]
- "timeout": { "index": 12, "kind": "attribute", "displayName": "Timeout",
"group": "advanced", "label": "advanced", "required": false, "type":
"duration", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "0", "description": "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 Multi [...]
+ "timeout": { "index": 12, "kind": "attribute", "displayName": "Timeout",
"group": "advanced", "label": "advanced", "required": false, "type":
"duration", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "0", "description": "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 Multi [...]
"executorService": { "index": 13, "kind": "attribute", "displayName":
"Executor Service", "group": "advanced", "label": "advanced", "required":
false, "type": "object", "javaType": "java.util.concurrent.ExecutorService",
"deprecated": false, "autowired": false, "secret": false, "description":
"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." },
"onPrepare": { "index": 14, "kind": "attribute", "displayName": "On
Prepare", "group": "advanced", "label": "advanced", "required": false, "type":
"object", "javaType": "org.apache.camel.Processor", "deprecated": false,
"autowired": false, "secret": false, "description": "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." },
"shareUnitOfWork": { "index": 15, "kind": "attribute", "displayName":
"Share Unit Of Work", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"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 [...]
diff --git
a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/recipientList.json
b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/recipientList.json
index d0d5c65693b2..0ffc153c60a0 100644
---
a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/recipientList.json
+++
b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/recipientList.json
@@ -24,7 +24,7 @@
"parallelAggregate": { "index": 9, "kind": "attribute", "displayName":
"Parallel Aggregate", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": true,
"autowired": false, "secret": false, "defaultValue": false, "description": "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 thre [...]
"parallelProcessing": { "index": 10, "kind": "attribute", "displayName":
"Parallel Processing", "group": "common", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "If enabled then sending
messages to the recipients occurs concurrently. Note the caller thread will
still wait until all messages has been fully processed, before it continues.
Its only the sending and pro [...]
"synchronous": { "index": 11, "kind": "attribute", "displayName":
"Synchronous", "group": "common", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Sets whether
synchronous processing should be strictly used. When enabled then the same
thread is used to continue routing after the recipient list is complete, even
if parallel processing is enabled." },
- "timeout": { "index": 12, "kind": "attribute", "displayName": "Timeout",
"group": "common", "required": false, "type": "duration", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "0", "description": "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 o [...]
+ "timeout": { "index": 12, "kind": "attribute", "displayName": "Timeout",
"group": "common", "required": false, "type": "duration", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "0", "description": "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 o [...]
"executorService": { "index": 13, "kind": "attribute", "displayName":
"Executor Service", "group": "advanced", "label": "advanced", "required":
false, "type": "object", "javaType": "java.util.concurrent.ExecutorService",
"deprecated": false, "autowired": false, "secret": false, "description": "To
use 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." },
"stopOnException": { "index": 14, "kind": "attribute", "displayName":
"Stop On Exception", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"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 processin [...]
"ignoreInvalidEndpoints": { "index": 15, "kind": "attribute",
"displayName": "Ignore Invalid Endpoints", "group": "advanced", "label":
"advanced", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Ignore the invalidate endpoint exception
when try to create a producer with that endpoint" },
diff --git
a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/split.json
b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/split.json
index ce5ba9adbb72..1b1933693401 100644
---
a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/split.json
+++
b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/split.json
@@ -26,7 +26,7 @@
"synchronous": { "index": 11, "kind": "attribute", "displayName":
"Synchronous", "group": "common", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Sets whether
synchronous processing should be strictly used. When enabled then the same
thread is used to continue routing after the split is complete, even if
parallel processing is enabled." },
"streaming": { "index": 12, "kind": "attribute", "displayName":
"Streaming", "group": "common", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "When in streaming mode,
then the splitter splits the original message on-demand, and each split message
is processed one by one. This reduces memory usage as the splitter do not split
all the messages first, but then we do n [...]
"stopOnException": { "index": 13, "kind": "attribute", "displayName":
"Stop On Exception", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"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 processin [...]
- "timeout": { "index": 14, "kind": "attribute", "displayName": "Timeout",
"group": "advanced", "label": "advanced", "required": false, "type":
"duration", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "0", "description": "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 [...]
+ "timeout": { "index": 14, "kind": "attribute", "displayName": "Timeout",
"group": "advanced", "label": "advanced", "required": false, "type":
"duration", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "0", "description": "Sets a total
timeout specified in millis, when using parallel processing. If the Splitter
hasn't been able to send and process all replies within the given timeframe,
then the timeout triggers and the Splitt [...]
"executorService": { "index": 15, "kind": "attribute", "displayName":
"Executor Service", "group": "advanced", "label": "advanced", "required":
false, "type": "object", "javaType": "java.util.concurrent.ExecutorService",
"deprecated": false, "autowired": false, "secret": false, "description": "To
use a custom Thread Pool to be used for parallel processing. Notice if you set
this option, then parallel processing is automatically implied, and you do not
have to enable that option as well." },
"onPrepare": { "index": 16, "kind": "attribute", "displayName": "On
Prepare", "group": "advanced", "label": "advanced", "required": false, "type":
"object", "javaType": "org.apache.camel.Processor", "deprecated": false,
"autowired": false, "secret": false, "description": "Uses the Processor when
preparing the org.apache.camel.Exchange to be sent. This can be used to
deep-clone messages that should be sent, or any custom logic needed before the
exchange is sent." },
"shareUnitOfWork": { "index": 17, "kind": "attribute", "displayName":
"Share Unit Of Work", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"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 split exchan [...]
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/MulticastDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/MulticastDefinition.java
index 49d6ec063f85..68139539528e 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/MulticastDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/MulticastDefinition.java
@@ -436,9 +436,9 @@ public class MulticastDefinition extends
OutputDefinition<MulticastDefinition>
/**
* 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 a graceful manner may continue to
run. So use this option with a bit of care.
+ * and continues. 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 a graceful manner may continue
+ * to run. So use this option with a bit of care.
*
* @param timeout timeout in millis
* @return the builder
@@ -450,9 +450,9 @@ public class MulticastDefinition extends
OutputDefinition<MulticastDefinition>
/**
* 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 a graceful manner may continue to
run. So use this option with a bit of care.
+ * and continues. 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 a graceful manner may continue
+ * to run. So use this option with a bit of care.
*
* @param timeout timeout in millis
* @return the builder
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/RecipientListDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/RecipientListDefinition.java
index e253e8490d44..39fd7a5fe886 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/RecipientListDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/RecipientListDefinition.java
@@ -442,16 +442,29 @@ public class RecipientListDefinition<Type extends
ProcessorDefinition<Type>> ext
/**
* 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 shut down in a graceful manner may
continue to run. So use this option with a
- * bit of care.
+ * breaks out and continues. 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 a graceful
+ * manner may continue to run. So use this option with a bit of care.
*
* @param timeout timeout in millis
* @return the builder
*/
public RecipientListDefinition<Type> timeout(long timeout) {
- setTimeout(Long.toString(timeout));
+ return timeout(Long.toString(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. 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 a graceful
+ * manner may continue to run. So use this option with a bit of care.
+ *
+ * @param timeout timeout in millis
+ * @return the builder
+ */
+ public RecipientListDefinition<Type> timeout(String timeout) {
+ setTimeout(timeout);
return this;
}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/SplitDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/SplitDefinition.java
index 3934f60447b3..a32db4e58602 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/SplitDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/SplitDefinition.java
@@ -505,11 +505,10 @@ public class SplitDefinition extends OutputExpressionNode
implements ExecutorSer
/**
* 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 down in a graceful manner may
continue to run. So use this option with a
- * bit of care.
+ * send and process all replies within the given timeframe, then the
timeout triggers and the Splitter breaks out
+ * and continues. 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 a graceful manner may continue
+ * to run. So use this option with a bit of care.
*
* @param timeout timeout in millis
* @return the builder
@@ -520,11 +519,10 @@ public class SplitDefinition extends OutputExpressionNode
implements ExecutorSer
/**
* 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 down in a graceful manner may
continue to run. So use this option with a
- * bit of care.
+ * send and process all replies within the given timeframe, then the
timeout triggers and the Splitter breaks out
+ * and continues. 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 a graceful manner may continue
+ * to run. So use this option with a bit of care.
*
* @param timeout timeout in millis
* @return the builder
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
index 0c77970cd9f3..0f82dd55243a 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
@@ -1520,7 +1520,7 @@ public class AggregateProcessor extends
BaseProcessorSupport
CamelContextAware.trySetCamelContext(aggregationStrategy,
camelContext);
if (aggregationStrategy.canPreComplete()) {
preCompletion = true;
- LOG.info("PreCompletionAwareAggregationStrategy detected.
Aggregator {} is in pre-completion mode.", getId());
+ LOG.info("Aggregator {} is in pre-completion mode.", getId());
}
if (!preCompletion) {
diff --git
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DynamicRouterEndpointBuilderFactory.java
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DynamicRouterEndpointBuilderFactory.java
index 343405eeb0b2..090629ff004e 100644
---
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DynamicRouterEndpointBuilderFactory.java
+++
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DynamicRouterEndpointBuilderFactory.java
@@ -570,15 +570,14 @@ public interface DynamicRouterEndpointBuilderFactory {
return this;
}
/**
- * Sets a total timeout specified in milliseconds, when using parallel
- * processing. If the Multicast has not been able to send and process
- * all replies within the given timeframe, then the timeout triggers
and
- * the Multicast breaks out and continues. Notice that, 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 a graceful manner) may continue to run. So use this
- * option with a bit of care.
+ * Sets a total timeout specified in millis, when using parallel
+ * processing. If the Dynamic Router hasn't been able to send and
+ * process all replies within the given timeframe, then the timeout
+ * triggers and the Dynamic Router breaks out and continues. 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 a graceful manner may continue
to
+ * run. So use this option with a bit of care.
*
* The option is a: <code>long</code> type.
*
@@ -593,15 +592,14 @@ public interface DynamicRouterEndpointBuilderFactory {
return this;
}
/**
- * Sets a total timeout specified in milliseconds, when using parallel
- * processing. If the Multicast has not been able to send and process
- * all replies within the given timeframe, then the timeout triggers
and
- * the Multicast breaks out and continues. Notice that, 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 a graceful manner) may continue to run. So use this
- * option with a bit of care.
+ * Sets a total timeout specified in millis, when using parallel
+ * processing. If the Dynamic Router hasn't been able to send and
+ * process all replies within the given timeframe, then the timeout
+ * triggers and the Dynamic Router breaks out and continues. 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 a graceful manner may continue
to
+ * run. So use this option with a bit of care.
*
* The option will be converted to a <code>long</code> type.
*
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
index 6b0a462ce456..46bcabb3e3fe 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
@@ -10460,7 +10460,7 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@YamlProperty(name = "stopOnException", type = "boolean",
defaultValue = "false", description = "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 proce [...]
@YamlProperty(name = "streaming", type = "boolean",
defaultValue = "false", description = "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.", displayName =
"Streaming"),
@YamlProperty(name = "synchronous", type = "boolean",
defaultValue = "false", description = "Sets whether synchronous processing
should be strictly used. When enabled then the same thread is used to continue
routing after the multicast is complete, even if parallel processing is
enabled.", displayName = "Synchronous"),
- @YamlProperty(name = "timeout", type = "string",
defaultValue = "0", description = "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 [...]
+ @YamlProperty(name = "timeout", type = "string",
defaultValue = "0", description = "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. The timeout method is invoked before
breaking out. If the timeout is reached with running tasks still remaining,
certain tasks for which it is difficu [...]
}
)
public static class MulticastDefinitionDeserializer extends
YamlDeserializerBase<MulticastDefinition> {
@@ -13525,7 +13525,7 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@YamlProperty(name = "stopOnException", type = "boolean",
defaultValue = "false", description = "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 [...]
@YamlProperty(name = "streaming", type = "boolean",
defaultValue = "false", description = "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.",
displayName = "Streaming"),
@YamlProperty(name = "synchronous", type = "boolean",
defaultValue = "false", description = "Sets whether synchronous processing
should be strictly used. When enabled then the same thread is used to continue
routing after the recipient list is complete, even if parallel processing is
enabled.", displayName = "Synchronous"),
- @YamlProperty(name = "timeout", type = "string",
defaultValue = "0", description = "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 wi [...]
+ @YamlProperty(name = "timeout", type = "string",
defaultValue = "0", description = "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. The timeout method is invoked
before breaking out. If the timeout is reached with running tasks still
remaining, certain tasks for which it [...]
}
)
public static class RecipientListDefinitionDeserializer extends
YamlDeserializerBase<RecipientListDefinition> {
@@ -18017,7 +18017,7 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@YamlProperty(name = "stopOnException", type = "boolean",
defaultValue = "false", description = "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 proces [...]
@YamlProperty(name = "streaming", type = "boolean",
defaultValue = "false", description = "When in streaming mode, then the
splitter splits the original message on-demand, and each split 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 [...]
@YamlProperty(name = "synchronous", type = "boolean",
defaultValue = "false", description = "Sets whether synchronous processing
should be strictly used. When enabled then the same thread is used to continue
routing after the split is complete, even if parallel processing is enabled.",
displayName = "Synchronous"),
- @YamlProperty(name = "timeout", type = "string",
defaultValue = "0", description = "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 [...]
+ @YamlProperty(name = "timeout", type = "string",
defaultValue = "0", description = "Sets a total timeout specified in millis,
when using parallel processing. If the Splitter hasn't been able to send and
process all replies within the given timeframe, then the timeout triggers and
the Splitter breaks out and continues. 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 [...]
}
)
public static class SplitDefinitionDeserializer extends
YamlDeserializerBase<SplitDefinition> {
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
index 4dda9ac12eab..d8175092a74a 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
@@ -3627,7 +3627,7 @@
"timeout" : {
"type" : "string",
"title" : "Timeout",
- "description" : "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 t [...]
+ "description" : "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. 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 a graceful
manner may continue to run. So use [...]
"default" : "0"
}
}
@@ -4827,7 +4827,7 @@
"timeout" : {
"type" : "string",
"title" : "Timeout",
- "description" : "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 f [...]
+ "description" : "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. 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 a
graceful manner may continue to ru [...]
"default" : "0"
},
"constant" : { },
@@ -7317,7 +7317,7 @@
"timeout" : {
"type" : "string",
"title" : "Timeout",
- "description" : "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 [...]
+ "description" : "Sets a total timeout specified in millis, when
using parallel processing. If the Splitter hasn't been able to send and process
all replies within the given timeframe, then the timeout triggers and the
Splitter breaks out and continues. 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 a graceful
manner may continue to run. So use th [...]
"default" : "0"
},
"constant" : { },
