Repository: camel Updated Branches: refs/heads/master fd57cfcab -> 741118e3f
Replaced deprecated method ".groupExchanges()". Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ad3bfc0f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ad3bfc0f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ad3bfc0f Branch: refs/heads/master Commit: ad3bfc0f2014349954bb9058ef5f9dbd8afebcd1 Parents: f81f9da Author: 1984shekhar <shekhar.cs...@yahoo.co.in> Authored: Thu Jun 9 23:10:54 2016 +0530 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Jun 10 08:40:51 2016 +0200 ---------------------------------------------------------------------- .../aggregator/AggregateGroupedExchangeBatchSizeTest.java | 7 +++---- .../AggregateGroupedExchangeCompletionSizeTest.java | 4 ++-- .../AggregateGroupedExchangeMultipleCorrelationTest.java | 7 +++---- .../aggregator/AggregateGroupedExchangeSizePredicateTest.java | 3 ++- .../aggregator/AggregateGroupedExchangeSizeTest.java | 3 ++- .../apache/camel/util/DumpModelAsXmlAggregateRouteTest.java | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/ad3bfc0f/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeBatchSizeTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeBatchSizeTest.java b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeBatchSizeTest.java index f958547..f441940 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeBatchSizeTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeBatchSizeTest.java @@ -22,6 +22,7 @@ import org.apache.camel.ContextTestSupport; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.processor.aggregate.GroupedExchangeAggregationStrategy; /** * Unit test for aggregate grouped exchanges. @@ -75,12 +76,10 @@ public class AggregateGroupedExchangeBatchSizeTest extends ContextTestSupport { // our route is aggregating from the direct queue and sending the response to the mock from("direct:start") .log("Aggregator received ${body}") - // aggregated all use same expression - .aggregate(constant(true)).completionSize(2) + // aggregated all use same expression and group the exchanges so we get one single exchange containing all the others + .aggregate(new GroupedExchangeAggregationStrategy()).constant(true).completionSize(2) // wait for 0.5 seconds to aggregate .completionTimeout(500L) - // group the exchanges so we get one single exchange containing all the others - .groupExchanges() .to("mock:result"); // END SNIPPET: e1 } http://git-wip-us.apache.org/repos/asf/camel/blob/ad3bfc0f/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeCompletionSizeTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeCompletionSizeTest.java b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeCompletionSizeTest.java index 7031add..d9e96e0 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeCompletionSizeTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeCompletionSizeTest.java @@ -19,6 +19,7 @@ package org.apache.camel.processor.aggregator; import org.apache.camel.ContextTestSupport; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.processor.aggregate.GroupedExchangeAggregationStrategy; /** * Unit test for aggregate grouped exchanges. @@ -44,8 +45,7 @@ public class AggregateGroupedExchangeCompletionSizeTest extends ContextTestSuppo return new RouteBuilder() { public void configure() throws Exception { from("direct:start") - .aggregate(constant(true)).completionSize(3) - .groupExchanges() + .aggregate(new GroupedExchangeAggregationStrategy()).constant(true).completionSize(3) .to("mock:result"); } }; http://git-wip-us.apache.org/repos/asf/camel/blob/ad3bfc0f/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeMultipleCorrelationTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeMultipleCorrelationTest.java b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeMultipleCorrelationTest.java index b1a10b7..86c35af 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeMultipleCorrelationTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeMultipleCorrelationTest.java @@ -22,6 +22,7 @@ import org.apache.camel.ContextTestSupport; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.processor.aggregate.GroupedExchangeAggregationStrategy; /** * Unit test for aggregate grouped exchanges. @@ -77,10 +78,8 @@ public class AggregateGroupedExchangeMultipleCorrelationTest extends ContextTest // START SNIPPET: e1 // our route is aggregating from the direct queue and sending the response to the mock from("direct:start") - // aggregate all using the foo header - .aggregate(header("foo")) - // group the exchanges so we get one single exchange containing all the others - .groupExchanges() + // aggregate all using the foo header and group the exchanges so we get one single exchange containing all the others + .aggregate(header("foo"),new GroupedExchangeAggregationStrategy()) // wait for 1 seconds to aggregate .completionTimeout(1000L) .to("mock:result"); http://git-wip-us.apache.org/repos/asf/camel/blob/ad3bfc0f/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeSizePredicateTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeSizePredicateTest.java b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeSizePredicateTest.java index 9e386fb..c0a74dd 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeSizePredicateTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeSizePredicateTest.java @@ -22,6 +22,7 @@ import org.apache.camel.ContextTestSupport; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.processor.aggregate.GroupedExchangeAggregationStrategy; /** * Unit test for aggregate grouped exchanges completed by size @@ -64,7 +65,7 @@ public class AggregateGroupedExchangeSizePredicateTest extends ContextTestSuppor public void configure() throws Exception { from("direct:start") // must use eagerCheckCompletion so we can check the groupSize header on the incoming exchange - .aggregate(constant(true)).groupExchanges().eagerCheckCompletion().completionSize(header("groupSize")) + .aggregate(new GroupedExchangeAggregationStrategy()).constant(true).eagerCheckCompletion().completionSize(header("groupSize")) .to("mock:result") .end(); } http://git-wip-us.apache.org/repos/asf/camel/blob/ad3bfc0f/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeSizeTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeSizeTest.java b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeSizeTest.java index ca8911a..f723ad4 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeSizeTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateGroupedExchangeSizeTest.java @@ -22,6 +22,7 @@ import org.apache.camel.ContextTestSupport; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.processor.aggregate.GroupedExchangeAggregationStrategy; /** * Unit test for aggregate grouped exchanges completed by size @@ -65,7 +66,7 @@ public class AggregateGroupedExchangeSizeTest extends ContextTestSupport { return new RouteBuilder() { public void configure() throws Exception { from("direct:start") - .aggregate(constant(true)).groupExchanges().completionSize(3) + .aggregate(new GroupedExchangeAggregationStrategy()).constant(true).completionSize(3) .to("mock:result") .end(); } http://git-wip-us.apache.org/repos/asf/camel/blob/ad3bfc0f/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlAggregateRouteTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlAggregateRouteTest.java b/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlAggregateRouteTest.java index ecf927e..7148d6d 100644 --- a/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlAggregateRouteTest.java +++ b/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlAggregateRouteTest.java @@ -19,6 +19,7 @@ package org.apache.camel.util; import org.apache.camel.ContextTestSupport; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.model.ModelHelper; +import org.apache.camel.processor.aggregate.GroupedExchangeAggregationStrategy; /** * @@ -42,9 +43,8 @@ public class DumpModelAsXmlAggregateRouteTest extends ContextTestSupport { public void configure() throws Exception { from("direct:start").routeId("myRoute") .to("log:input") - .aggregate().header("userId") - .groupExchanges().completionSize(3) - .to("mock:aggregate") + .aggregate(header("userId"),new GroupedExchangeAggregationStrategy()).completionSize(3) + .to("mock:aggregate") .end() .to("mock:result"); }
