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 e75eace3431 CAMEL-18384: Deprecate parallelAggregation option on EIPs
e75eace3431 is described below
commit e75eace3431d727bdd503a666239cf9b6b7fee79
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Tue Jul 2 12:54:39 2024 +0200
CAMEL-18384: Deprecate parallelAggregation option on EIPs
---
.../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 | 24 +++++++++++-----------
.../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 | 6 ++++++
.../camel/model/RecipientListDefinition.java | 6 ++++++
.../org/apache/camel/model/SplitDefinition.java | 6 ++++++
.../apache/camel/processor/MulticastProcessor.java | 1 +
.../modules/dataformats/pages/pgp-dataformat.adoc | 2 +-
.../dsl/yaml/deserializers/ModelDeserializers.java | 6 +++---
.../generated/resources/schema/camelYamlDsl.json | 9 +++++---
14 files changed, 47 insertions(+), 25 deletions(-)
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 1477200300f..fd0dc0c21b3 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
@@ -18,7 +18,7 @@
"aggregationStrategy": { "index": 3, "kind": "attribute", "displayName":
"Aggregation Strategy", "group": "common", "required": false, "type": "object",
"javaType": "org.apache.camel.AggregationStrategy", "deprecated": false,
"autowired": false, "secret": false, "description": "Refers to an
AggregationStrategy to be used to assemble the replies from the multicasts,
into a single outgoing message from the Multicast. By default Camel will use
the last reply as the outgoing message. You [...]
"aggregationStrategyMethodName": { "index": 4, "kind": "attribute",
"displayName": "Aggregation Strategy Method Name", "group": "advanced",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "This option can be used to explicit declare the method name to
use, when using POJOs as the AggregationStrategy." },
"aggregationStrategyMethodAllowNull": { "index": 5, "kind": "attribute",
"displayName": "Aggregation Strategy Method Allow Null", "group": "advanced",
"label": "advanced", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "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 [...]
- "parallelAggregate": { "index": 6, "kind": "attribute", "displayName":
"Parallel Aggregate", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"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 thr [...]
+ "parallelAggregate": { "index": 6, "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": 7, "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 multicasts occurs concurrently. Note the caller thread will
still wait until all messages has been fully processed, before it continues.
Its only the sending and proc [...]
"synchronous": { "index": 8, "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": 9, "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." },
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 9e513dc9aa8..024240e23b3 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
@@ -20,7 +20,7 @@
"aggregationStrategy": { "index": 5, "kind": "attribute", "displayName":
"Aggregation Strategy", "group": "common", "required": false, "type": "object",
"javaType": "org.apache.camel.AggregationStrategy", "deprecated": false,
"autowired": false, "secret": false, "description": "Sets the
AggregationStrategy to be used to assemble the replies from the recipients,
into a single outgoing message from the RecipientList. By default Camel will
use the last reply as the outgoing message. You [...]
"aggregationStrategyMethodName": { "index": 6, "kind": "attribute",
"displayName": "Aggregation Strategy Method Name", "group": "advanced",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "This option can be used to explicit declare the method name to
use, when using POJOs as the AggregationStrategy." },
"aggregationStrategyMethodAllowNull": { "index": 7, "kind": "attribute",
"displayName": "Aggregation Strategy Method Allow Null", "group": "advanced",
"label": "advanced", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "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 [...]
- "parallelAggregate": { "index": 8, "kind": "attribute", "displayName":
"Parallel Aggregate", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"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 thr [...]
+ "parallelAggregate": { "index": 8, "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": 9, "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 proc [...]
"synchronous": { "index": 10, "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": 11, "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 [...]
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 2366c0faa9d..d3c031ece25 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
@@ -20,7 +20,7 @@
"aggregationStrategy": { "index": 5, "kind": "attribute", "displayName":
"Aggregation Strategy", "group": "common", "required": false, "type": "object",
"javaType": "org.apache.camel.AggregationStrategy", "deprecated": false,
"autowired": false, "secret": false, "description": "Sets a reference to the
AggregationStrategy to be used to assemble the replies from the split messages,
into a single outgoing message from the Splitter. By default Camel will use the
original incoming message [...]
"aggregationStrategyMethodName": { "index": 6, "kind": "attribute",
"displayName": "Aggregation Strategy Method Name", "group": "advanced",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "This option can be used to explicit declare the method name to
use, when using POJOs as the AggregationStrategy." },
"aggregationStrategyMethodAllowNull": { "index": 7, "kind": "attribute",
"displayName": "Aggregation Strategy Method Allow Null", "group": "advanced",
"label": "advanced", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "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 [...]
- "parallelAggregate": { "index": 8, "kind": "attribute", "displayName":
"Parallel Aggregate", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"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 thr [...]
+ "parallelAggregate": { "index": 8, "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": 9, "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
processing each split messages occurs concurrently. Note the caller thread will
still wait until all messages has been fully processed, before it continues.
It's only processing the sub mess [...]
"synchronous": { "index": 10, "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": 11, "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 [...]
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 01402d4588f..19f8a80fcbd 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
@@ -10680,10 +10680,10 @@ Default value: false
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
-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. Default value:
false
+Deprecated: 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.
Default value: false
]]>
</xs:documentation>
</xs:annotation>
@@ -11701,10 +11701,10 @@ Default value: false
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
-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. Default value:
false
+Deprecated: 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.
Default value: false
]]>
</xs:documentation>
</xs:annotation>
@@ -13333,10 +13333,10 @@ Default value: false
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
-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. Default value:
false
+Deprecated: 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.
Default value: false
]]>
</xs:documentation>
</xs:annotation>
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 1477200300f..fd0dc0c21b3 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
@@ -18,7 +18,7 @@
"aggregationStrategy": { "index": 3, "kind": "attribute", "displayName":
"Aggregation Strategy", "group": "common", "required": false, "type": "object",
"javaType": "org.apache.camel.AggregationStrategy", "deprecated": false,
"autowired": false, "secret": false, "description": "Refers to an
AggregationStrategy to be used to assemble the replies from the multicasts,
into a single outgoing message from the Multicast. By default Camel will use
the last reply as the outgoing message. You [...]
"aggregationStrategyMethodName": { "index": 4, "kind": "attribute",
"displayName": "Aggregation Strategy Method Name", "group": "advanced",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "This option can be used to explicit declare the method name to
use, when using POJOs as the AggregationStrategy." },
"aggregationStrategyMethodAllowNull": { "index": 5, "kind": "attribute",
"displayName": "Aggregation Strategy Method Allow Null", "group": "advanced",
"label": "advanced", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "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 [...]
- "parallelAggregate": { "index": 6, "kind": "attribute", "displayName":
"Parallel Aggregate", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"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 thr [...]
+ "parallelAggregate": { "index": 6, "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": 7, "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 multicasts occurs concurrently. Note the caller thread will
still wait until all messages has been fully processed, before it continues.
Its only the sending and proc [...]
"synchronous": { "index": 8, "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": 9, "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." },
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 9e513dc9aa8..024240e23b3 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
@@ -20,7 +20,7 @@
"aggregationStrategy": { "index": 5, "kind": "attribute", "displayName":
"Aggregation Strategy", "group": "common", "required": false, "type": "object",
"javaType": "org.apache.camel.AggregationStrategy", "deprecated": false,
"autowired": false, "secret": false, "description": "Sets the
AggregationStrategy to be used to assemble the replies from the recipients,
into a single outgoing message from the RecipientList. By default Camel will
use the last reply as the outgoing message. You [...]
"aggregationStrategyMethodName": { "index": 6, "kind": "attribute",
"displayName": "Aggregation Strategy Method Name", "group": "advanced",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "This option can be used to explicit declare the method name to
use, when using POJOs as the AggregationStrategy." },
"aggregationStrategyMethodAllowNull": { "index": 7, "kind": "attribute",
"displayName": "Aggregation Strategy Method Allow Null", "group": "advanced",
"label": "advanced", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "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 [...]
- "parallelAggregate": { "index": 8, "kind": "attribute", "displayName":
"Parallel Aggregate", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"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 thr [...]
+ "parallelAggregate": { "index": 8, "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": 9, "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 proc [...]
"synchronous": { "index": 10, "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": 11, "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 [...]
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 2366c0faa9d..d3c031ece25 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
@@ -20,7 +20,7 @@
"aggregationStrategy": { "index": 5, "kind": "attribute", "displayName":
"Aggregation Strategy", "group": "common", "required": false, "type": "object",
"javaType": "org.apache.camel.AggregationStrategy", "deprecated": false,
"autowired": false, "secret": false, "description": "Sets a reference to the
AggregationStrategy to be used to assemble the replies from the split messages,
into a single outgoing message from the Splitter. By default Camel will use the
original incoming message [...]
"aggregationStrategyMethodName": { "index": 6, "kind": "attribute",
"displayName": "Aggregation Strategy Method Name", "group": "advanced",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "This option can be used to explicit declare the method name to
use, when using POJOs as the AggregationStrategy." },
"aggregationStrategyMethodAllowNull": { "index": 7, "kind": "attribute",
"displayName": "Aggregation Strategy Method Allow Null", "group": "advanced",
"label": "advanced", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "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 [...]
- "parallelAggregate": { "index": 8, "kind": "attribute", "displayName":
"Parallel Aggregate", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"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 thr [...]
+ "parallelAggregate": { "index": 8, "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": 9, "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
processing each split messages occurs concurrently. Note the caller thread will
still wait until all messages has been fully processed, before it continues.
It's only processing the sub mess [...]
"synchronous": { "index": 10, "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": 11, "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 [...]
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 fdb270410eb..6f5c5276e2c 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
@@ -57,6 +57,7 @@ public class MulticastDefinition extends
OutputDefinition<MulticastDefinition>
@XmlAttribute
@Metadata(label = "advanced", javaType = "java.lang.Boolean")
private String aggregationStrategyMethodAllowNull;
+ @Deprecated(since = "4.7.0")
@XmlAttribute
@Metadata(label = "advanced", javaType = "java.lang.Boolean")
private String parallelAggregate;
@@ -285,6 +286,7 @@ public class MulticastDefinition extends
OutputDefinition<MulticastDefinition>
*
* @return the builder
*/
+ @Deprecated(since = "4.7.0")
public MulticastDefinition parallelAggregate() {
setParallelAggregate(Boolean.toString(true));
return this;
@@ -298,6 +300,7 @@ public class MulticastDefinition extends
OutputDefinition<MulticastDefinition>
*
* @return the builder
*/
+ @Deprecated(since = "4.7.0")
public MulticastDefinition parallelAggregate(boolean parallelAggregate) {
setParallelAggregate(Boolean.toString(parallelAggregate));
return this;
@@ -311,6 +314,7 @@ public class MulticastDefinition extends
OutputDefinition<MulticastDefinition>
*
* @return the builder
*/
+ @Deprecated(since = "4.7.0")
public MulticastDefinition parallelAggregate(String parallelAggregate) {
setParallelAggregate(parallelAggregate);
return this;
@@ -579,10 +583,12 @@ public class MulticastDefinition extends
OutputDefinition<MulticastDefinition>
this.shareUnitOfWork = shareUnitOfWork;
}
+ @Deprecated(since = "4.7.0")
public String getParallelAggregate() {
return parallelAggregate;
}
+ @Deprecated(since = "4.7.0")
public void setParallelAggregate(String parallelAggregate) {
this.parallelAggregate = parallelAggregate;
}
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 00b7223f3e2..cb394224180 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
@@ -59,6 +59,7 @@ public class RecipientListDefinition<Type extends
ProcessorDefinition<Type>> ext
@XmlAttribute
@Metadata(label = "advanced", javaType = "java.lang.Boolean")
private String aggregationStrategyMethodAllowNull;
+ @Deprecated(since = "4.7.0")
@XmlAttribute
@Metadata(label = "advanced", javaType = "java.lang.Boolean")
private String parallelAggregate;
@@ -277,6 +278,7 @@ public class RecipientListDefinition<Type extends
ProcessorDefinition<Type>> ext
*
* @return the builder
*/
+ @Deprecated(since = "4.7.0")
public RecipientListDefinition<Type> parallelAggregate() {
return parallelAggregate(Boolean.toString(true));
}
@@ -289,6 +291,7 @@ public class RecipientListDefinition<Type extends
ProcessorDefinition<Type>> ext
*
* @return the builder
*/
+ @Deprecated(since = "4.7.0")
public RecipientListDefinition<Type> parallelAggregate(boolean
parallelAggregate) {
setParallelAggregate(Boolean.toString(parallelAggregate));
return this;
@@ -302,6 +305,7 @@ public class RecipientListDefinition<Type extends
ProcessorDefinition<Type>> ext
*
* @return the builder
*/
+ @Deprecated(since = "4.7.0")
public RecipientListDefinition<Type> parallelAggregate(String
parallelAggregate) {
setParallelAggregate(parallelAggregate);
return this;
@@ -639,10 +643,12 @@ public class RecipientListDefinition<Type extends
ProcessorDefinition<Type>> ext
this.cacheSize = cacheSize;
}
+ @Deprecated(since = "4.7.0")
public String getParallelAggregate() {
return parallelAggregate;
}
+ @Deprecated(since = "4.7.0")
public void setParallelAggregate(String parallelAggregate) {
this.parallelAggregate = parallelAggregate;
}
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 65ce3a7671d..193a91ba96d 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
@@ -57,6 +57,7 @@ public class SplitDefinition extends OutputExpressionNode
implements ExecutorSer
@XmlAttribute
@Metadata(label = "advanced", javaType = "java.lang.Boolean")
private String aggregationStrategyMethodAllowNull;
+ @Deprecated(since = "4.7.0")
@XmlAttribute
@Metadata(label = "advanced", javaType = "java.lang.Boolean")
private String parallelAggregate;
@@ -273,6 +274,7 @@ public class SplitDefinition extends OutputExpressionNode
implements ExecutorSer
*
* @return the builder
*/
+ @Deprecated(since = "4.7.0")
public SplitDefinition parallelAggregate() {
return parallelAggregate(true);
}
@@ -285,6 +287,7 @@ public class SplitDefinition extends OutputExpressionNode
implements ExecutorSer
*
* @return the builder
*/
+ @Deprecated(since = "4.7.0")
public SplitDefinition parallelAggregate(boolean parallelAggregate) {
return parallelAggregate(Boolean.toString(parallelAggregate));
}
@@ -297,6 +300,7 @@ public class SplitDefinition extends OutputExpressionNode
implements ExecutorSer
*
* @return the builder
*/
+ @Deprecated(since = "4.7.0")
public SplitDefinition parallelAggregate(String parallelAggregate) {
setParallelAggregate(parallelAggregate);
return this;
@@ -611,10 +615,12 @@ public class SplitDefinition extends OutputExpressionNode
implements ExecutorSer
this.streaming = streaming;
}
+ @Deprecated(since = "4.7.0")
public String getParallelAggregate() {
return parallelAggregate;
}
+ @Deprecated(since = "4.7.0")
public void setParallelAggregate(String parallelAggregate) {
this.parallelAggregate = parallelAggregate;
}
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java
index 67efcdd56c1..22cc8c8082f 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java
@@ -1304,6 +1304,7 @@ public class MulticastProcessor extends
AsyncProcessorSupport
return parallelProcessing;
}
+ @Deprecated(since = "4.7.0")
public boolean isParallelAggregate() {
return parallelAggregate;
}
diff --git a/docs/components/modules/dataformats/pages/pgp-dataformat.adoc
b/docs/components/modules/dataformats/pages/pgp-dataformat.adoc
index fa95d0dbf6b..f1eb50a4943 120000
--- a/docs/components/modules/dataformats/pages/pgp-dataformat.adoc
+++ b/docs/components/modules/dataformats/pages/pgp-dataformat.adoc
@@ -1 +1 @@
-../../../../../components/camel-crypto-pgp/src/main/docs/pgp-dataformat.adoc
\ No newline at end of file
+../../../../../components/camel-crypto/src/main/docs/pgp-dataformat.adoc
\ No newline at end of file
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 52fdd9f59cb..44e740222ce 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
@@ -9729,7 +9729,7 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@YamlProperty(name = "id", type = "string", description =
"Sets the id of this node", displayName = "Id"),
@YamlProperty(name = "inheritErrorHandler", type =
"boolean"),
@YamlProperty(name = "onPrepare", type = "string",
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.", displayName = "On Prepare"),
- @YamlProperty(name = "parallelAggregate", type =
"boolean", 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 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 impleme [...]
+ @YamlProperty(name = "parallelAggregate", type =
"boolean", deprecated = true, 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
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 Aggregation [...]
@YamlProperty(name = "parallelProcessing", type =
"boolean", description = "If enabled then sending messages to the multicasts
occurs concurrently. Note the caller thread will still wait until all messages
has been fully processed, before it continues. Its only the sending and
processing the replies from the multicasts which happens concurrently. When
parallel processing is enabled, then the Camel routing engin will continue
processing using last used thread from the [...]
@YamlProperty(name = "shareUnitOfWork", type = "boolean",
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 exchange. This means each sub
exchange has its own individual unit of work.", displayName = "Share Unit Of
Work"),
@YamlProperty(name = "steps", type =
"array:org.apache.camel.model.ProcessorDefinition"),
@@ -12531,7 +12531,7 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@YamlProperty(name = "ignoreInvalidEndpoints", type =
"boolean", description = "Ignore the invalidate endpoint exception when try to
create a producer with that endpoint", displayName = "Ignore Invalid
Endpoints"),
@YamlProperty(name = "inheritErrorHandler", type =
"boolean"),
@YamlProperty(name = "onPrepare", type = "string",
description = "Uses the Processor when preparing the org.apache.camel.Exchange
to be used send. This can be used to deep-clone messages that should be send,
or any custom logic needed before the exchange is send.", displayName = "On
Prepare"),
- @YamlProperty(name = "parallelAggregate", type =
"boolean", 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 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 impleme [...]
+ @YamlProperty(name = "parallelAggregate", type =
"boolean", deprecated = true, 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
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 Aggregation [...]
@YamlProperty(name = "parallelProcessing", type =
"boolean", 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
processing the replies from the recipients which happens concurrently. When
parallel processing is enabled, then the Camel routing engin will continue
processing using last used thread from the [...]
@YamlProperty(name = "shareUnitOfWork", type = "boolean",
description = "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.", displayName = "Share Unit Of
Work"),
@YamlProperty(name = "stopOnException", type = "boolean",
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 processing. This is the [...]
@@ -17022,7 +17022,7 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@YamlProperty(name = "id", type = "string", description =
"Sets the id of this node", displayName = "Id"),
@YamlProperty(name = "inheritErrorHandler", type =
"boolean"),
@YamlProperty(name = "onPrepare", type = "string",
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.", displayName = "On Prepare"),
- @YamlProperty(name = "parallelAggregate", type =
"boolean", 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 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 impleme [...]
+ @YamlProperty(name = "parallelAggregate", type =
"boolean", deprecated = true, 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
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 Aggregation [...]
@YamlProperty(name = "parallelProcessing", type =
"boolean", description = "If enabled then processing each split messages occurs
concurrently. Note the caller thread will still wait until all messages has
been fully processed, before it continues. It's only processing the sub
messages from the splitter which happens concurrently. When parallel processing
is enabled, then the Camel routing engin will continue processing using last
used thread from the parallel thread [...]
@YamlProperty(name = "shareUnitOfWork", type = "boolean",
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 exchange. This means each split
exchange has its own individual unit of work.", displayName = "Share Unit Of
Work"),
@YamlProperty(name = "steps", type =
"array:org.apache.camel.model.ProcessorDefinition"),
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 512a6bb3174..8efb1bdc629 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
@@ -3334,7 +3334,8 @@
"parallelAggregate" : {
"type" : "boolean",
"title" : "Parallel Aggregate",
- "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 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."
+ "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 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.",
+ "deprecated" : true
},
"parallelProcessing" : {
"type" : "boolean",
@@ -4275,7 +4276,8 @@
"parallelAggregate" : {
"type" : "boolean",
"title" : "Parallel Aggregate",
- "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 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."
+ "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 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.",
+ "deprecated" : true
},
"parallelProcessing" : {
"type" : "boolean",
@@ -6584,7 +6586,8 @@
"parallelAggregate" : {
"type" : "boolean",
"title" : "Parallel Aggregate",
- "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 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."
+ "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 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.",
+ "deprecated" : true
},
"parallelProcessing" : {
"type" : "boolean",
