camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject camel git commit: CAMEL-8305: Aggregate make it more consistent to mandate an aggregation strategy to be configured, therefore deprecating groupExchanges which should be configured as strategy instead.
Date Mon, 02 Feb 2015 11:45:10 GMT
Repository: camel
Updated Branches:
  refs/heads/master c503d2d20 -> 2c581c428


CAMEL-8305: Aggregate make it more consistent to mandate an aggregation strategy to be configured,
therefore deprecating groupExchanges which should be configured as strategy instead.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2c581c42
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2c581c42
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2c581c42

Branch: refs/heads/master
Commit: 2c581c4282da3919eac6f76a58e5d23a42eeb855
Parents: c503d2d
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Mon Feb 2 12:44:51 2015 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Mon Feb 2 12:45:06 2015 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/camel/model/AggregateDefinition.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/2c581c42/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java b/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
index 7313c12..ce1695e 100644
--- a/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
@@ -86,7 +86,7 @@ public class AggregateDefinition extends ProcessorDefinition<AggregateDefinition
     private String timeoutCheckerExecutorServiceRef;
     @XmlAttribute
     private String aggregationRepositoryRef;
-    @XmlAttribute(required = true)
+    @XmlAttribute
     private String strategyRef;
     @XmlAttribute
     private String strategyMethodName;
@@ -101,6 +101,7 @@ public class AggregateDefinition extends ProcessorDefinition<AggregateDefinition
     @XmlAttribute
     private Boolean completionFromBatchConsumer;
     @XmlAttribute
+    @Deprecated
     private Boolean groupExchanges;
     @XmlAttribute
     private Boolean eagerCheckCompletion;
@@ -803,7 +804,10 @@ public class AggregateDefinition extends ProcessorDefinition<AggregateDefinition
     /**
      * Enables grouped exchanges, so the aggregator will group all aggregated exchanges into
a single
      * combined Exchange holding all the aggregated exchanges in a {@link java.util.List}.
+     *
+     * @deprecated use {@link GroupedExchangeAggregationStrategy} as aggregation strategy
instead.
      */
+    @Deprecated
     public AggregateDefinition groupExchanges() {
         setGroupExchanges(true);
         // must use eager check when using grouped exchanges


Mime
View raw message