[camel] branch master updated: Update documentation for aggregation strategies in pre-completion mode (#3968)

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new 9becdbd  Update documentation for aggregation strategies in pre-completion mode (#3968)
9becdbd is described below

commit 9becdbdca9198ca45b5ba097a048238f33f5960b
Author: Pierre Klink <pk...@users.noreply.github.com>
AuthorDate: Fri Jul 3 06:23:21 2020 +0200

    Update documentation for aggregation strategies in pre-completion mode (#3968)
---
 .../org/apache/camel/catalog/docs/aggregate-eip.adoc          |  9 +++------
 .../src/main/docs/modules/eips/pages/aggregate-eip.adoc       | 11 ++++-------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aggregate-eip.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aggregate-eip.adoc
index da31cb8..5dba2d7 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aggregate-eip.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aggregate-eip.adoc
@@ -132,7 +132,7 @@ exchange is aggregated to determine if we are complete or not.
 The configured aggregationStrategy can implement the
 Predicate interface and will be used as the completionPredicate if no
 completionPredicate is configured. The configured aggregationStrategy can
-implement `PreCompletionAwareAggregationStrategy` and will be used as
+override the `preComplete` method and will be used as
 the completionPredicate in pre-complete check mode. See further below
 for more details.
 * completionFromBatchConsumer - Special option for
@@ -159,9 +159,8 @@ There can be use-cases where you want the incoming
 xref:latest@manual:ROOT:exchange.adoc[Exchange] to determine if the correlation group
 should pre-complete, and then the incoming
 xref:latest@manual:ROOT:exchange.adoc[Exchange] is starting a new group from scratch. To
-determine this the `AggregationStrategy` can
-implement `PreCompletionAwareAggregationStrategy` which has
-a `preComplete` method:
+determine this the `AggregationStrategy` must override the `canPreComplete` method
+which has to return `true`.
 
 [source,java]
 ----
@@ -183,8 +182,6 @@ so the group would contain only that new incoming exchange. This is
 known as pre-completion mode. And when the aggregation is in
 pre-completion mode, then only the following completions are in use
 
-* aggregationStrategy must
-implement `PreCompletionAwareAggregationStrategy` xxx
 * completionTimeout or completionInterval can also be used as fallback
 completions
 * any other completion are not used (such as by size, from batch
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 da31cb8..630a9302 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
@@ -132,7 +132,7 @@ exchange is aggregated to determine if we are complete or not.
 The configured aggregationStrategy can implement the
 Predicate interface and will be used as the completionPredicate if no
 completionPredicate is configured. The configured aggregationStrategy can
-implement `PreCompletionAwareAggregationStrategy` and will be used as
+override the `preComplete` method and will be used as
 the completionPredicate in pre-complete check mode. See further below
 for more details.
 * completionFromBatchConsumer - Special option for
@@ -158,10 +158,9 @@ aggregator. If not provided Camel will thrown an Exception on startup.
 There can be use-cases where you want the incoming
 xref:latest@manual:ROOT:exchange.adoc[Exchange] to determine if the correlation group
 should pre-complete, and then the incoming
-xref:latest@manual:ROOT:exchange.adoc[Exchange] is starting a new group from scratch. To
-determine this the `AggregationStrategy` can
-implement `PreCompletionAwareAggregationStrategy` which has
-a `preComplete` method:
+xref:latest@manual:ROOT:exchange.adoc[Exchange] is starting a new group from scratch. o
+determine this the `AggregationStrategy` must override the `canPreComplete` method
+which has to return `true`.
 
 [source,java]
 ----
@@ -183,8 +182,6 @@ so the group would contain only that new incoming exchange. This is
 known as pre-completion mode. And when the aggregation is in
 pre-completion mode, then only the following completions are in use
 
-* aggregationStrategy must
-implement `PreCompletionAwareAggregationStrategy` xxx
 * completionTimeout or completionInterval can also be used as fallback
 completions
 * any other completion are not used (such as by size, from batch