Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/view/DotViewTest.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/view/DotViewTest.java?rev=910860&r1=910859&r2=910860&view=diff ============================================================================== --- camel/trunk/camel-core/src/test/java/org/apache/camel/view/DotViewTest.java (original) +++ camel/trunk/camel-core/src/test/java/org/apache/camel/view/DotViewTest.java Wed Feb 17 08:27:25 2010 @@ -19,6 +19,8 @@ import org.apache.camel.ContextTestSupport; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.builder.xml.XPathBuilder; +import org.apache.camel.processor.aggregate.UseLatestAggregationStrategy; + import static org.apache.camel.builder.xml.XPathBuilder.xpath; /** @@ -88,7 +90,9 @@ static class AggreagateRoute extends RouteBuilder { public void configure() throws Exception { - from("seda:foo").aggregate(constant("messageId")).to("seda:aggregated"); + from("seda:foo") + .aggregate(constant("messageId"), new UseLatestAggregationStrategy()).completionTimeout(1000L). + to("seda:aggregated"); } }
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/AggregratedJmsRouteTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/AggregratedJmsRouteTest.java?rev=910860&r1=910859&r2=910860&view=diff ============================================================================== --- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/AggregratedJmsRouteTest.java (original) +++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/AggregratedJmsRouteTest.java Wed Feb 17 08:27:25 2010 @@ -16,7 +16,6 @@ */ package org.apache.camel.component.jms; - import javax.jms.ConnectionFactory; import org.apache.activemq.ActiveMQConnectionFactory; @@ -95,7 +94,7 @@ } return newExchange; } - }).to("mock:result"); + }).completionTimeout(2000L).to("mock:result"); from(multicastEndpointUri).to("jms:queue:point1", "jms:queue:point2", "jms:queue:point3"); from("jms:queue:point1").process(new MyProcessor()).to("jms:queue:reply"); Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringAggregateFromWireTapTest.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringAggregateFromWireTapTest.xml?rev=910860&r1=910859&r2=910860&view=diff ============================================================================== --- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringAggregateFromWireTapTest.xml (original) +++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringAggregateFromWireTapTest.xml Wed Feb 17 08:27:25 2010 @@ -31,7 +31,7 @@ <route> <from uri="direct:tap"/> - <aggregate batchSize="2" batchTimeout="5000" strategyRef="myStrategy"> + <aggregate completionSize="2" completionTimeout="5000" strategyRef="myStrategy"> <correlationExpression><constant>true</constant></correlationExpression> <to uri="direct:aggregated"/> </aggregate> Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator-custom-strategy.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator-custom-strategy.xml?rev=910860&r1=910859&r2=910860&view=diff ============================================================================== --- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator-custom-strategy.xml (original) +++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator-custom-strategy.xml Wed Feb 17 08:27:25 2010 @@ -26,7 +26,7 @@ <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring";> <route> <from uri="direct:start"/> - <aggregate strategyRef="aggregatorStrategy"> + <aggregate strategyRef="aggregatorStrategy" completionTimeout="1000"> <correlationExpression> <simple>header.cheese</simple> </correlationExpression> Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml?rev=910860&r1=910859&r2=910860&view=diff ============================================================================== --- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml (original) +++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml Wed Feb 17 08:27:25 2010 @@ -22,83 +22,51 @@ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd "> - <!-- START SNIPPET: example --> - <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring";> - <route> - <from uri="direct:start"/> - <aggregate> - <correlationExpression> - <simple>header.cheese</simple> - </correlationExpression> - <to uri="mock:result"/> - </aggregate> - </route> - - <route> - <from uri="seda:header"/> - <process ref="setHeaderProcessor"/> - <to uri="direct:temp"/> - </route> - - <route> - <from uri="direct:temp"/> - <aggregate> - <correlationExpression> - <simple>header.cheese</simple> - </correlationExpression> - <to uri="mock:result"/> - </aggregate> - </route> - - <route> - <from uri="direct:predicate"/> - <aggregate strategyRef="myAggregatorStrategy"> - <correlationExpression> - <simple>header.cheese</simple> - </correlationExpression> - <to uri="mock:result"/> - <completionPredicate> - <method bean="myAggregatorStrategy" method="isCompleted"/> - </completionPredicate> - </aggregate> - </route> - - <route> - <from uri="direct:outBatchPredicate"/> - <aggregate strategyRef="myAggregatorStrategy" outBatchSize="10"> - <correlationExpression> - <simple>header.cheese</simple> - </correlationExpression> - <to uri="mock:result"/> - <completionPredicate> - <method bean="myAggregatorStrategy" method="isCompleted"/> - </completionPredicate> - </aggregate> - </route> - - <!-- This route turns off in batching by setting batchSize to 1 to run unit test for out batching. - Normal use cases may not want to disable in batching - --> - <route> - <from uri="direct:outBatchNoInBatching"/> - <aggregate strategyRef="myAggregatorStrategy" batchSize="1" outBatchSize="10"> - <correlationExpression> - <simple>header.cheese</simple> - </correlationExpression> - <to uri="mock:result"/> - <completionPredicate> - <method bean="myAggregatorStrategy" method="isCompleted"/> - </completionPredicate> - </aggregate> - </route> - </camelContext> - <!-- END SNIPPET: example --> - - - <bean id="myAggregatorStrategy" class="org.apache.camel.processor.MyAggregationStrategy"/> - <bean id="setHeaderProcessor" class="org.apache.camel.spring.processor.SetHeaderProcessor"> - <property name="headerName" value ="visited"/> - <property name="headerValue" value ="true"/> - </bean> + <!-- START SNIPPET: example --> + <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring";> + + <route> + <from uri="direct:start"/> + <aggregate strategyRef="latestAggregationStrategy" completionTimeout="1000"> + <correlationExpression> + <simple>header.cheese</simple> + </correlationExpression> + <to uri="mock:result"/> + </aggregate> + </route> + + <route> + <from uri="seda:header"/> + <setHeader headerName="visited"> + <constant>true</constant> + </setHeader> + <aggregate strategyRef="latestAggregationStrategy" completionTimeout="1000"> + <correlationExpression> + <simple>header.cheese</simple> + </correlationExpression> + <to uri="mock:result"/> + </aggregate> + </route> + + <route> + <from uri="direct:predicate"/> + <aggregate strategyRef="myAggregatorStrategy"> + <correlationExpression> + <simple>header.cheese</simple> + </correlationExpression> + <completionPredicate> + <simple>${header.aggregated} == 5</simple> + </completionPredicate> + <to uri="mock:result"/> + </aggregate> + </route> + + + </camelContext> + <!-- END SNIPPET: example --> + + <bean id="latestAggregationStrategy" class="org.apache.camel.processor.aggregate.UseLatestAggregationStrategy"/> + + <bean id="myAggregatorStrategy" class="org.apache.camel.processor.MyAggregationStrategy"/> </beans> Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/scattergather/scatter-gather.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/scattergather/scatter-gather.xml?rev=910860&r1=910859&r2=910860&view=diff ============================================================================== --- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/scattergather/scatter-gather.xml (original) +++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/scattergather/scatter-gather.xml Wed Feb 17 08:27:25 2010 @@ -32,7 +32,7 @@ </route> <route> <from uri="seda:quoteAggregator"/> - <aggregate strategyRef="aggregatorStrategy"> + <aggregate strategyRef="aggregatorStrategy" completionTimeout="1000"> <correlationExpression> <header>quoteRequestId</header> </correlationExpression> Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/AggregateDefinitionRenderer.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/AggregateDefinitionRenderer.java?rev=910860&r1=910859&r2=910860&view=diff ============================================================================== --- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/AggregateDefinitionRenderer.java (original) +++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/AggregateDefinitionRenderer.java Wed Feb 17 08:27:25 2010 @@ -32,15 +32,15 @@ ExpressionRenderer.render(buffer, aggregate.getExpression()); - if (aggregate.getBatchTimeout() != null) { - buffer.append(".batchTimeout(").append(aggregate.getBatchTimeout()); - buffer.append(aggregate.getBatchTimeout() < 1000L ? "L)" : ")"); + if (aggregate.getCompletionTimeout() != null) { + buffer.append(".completionTimeout(").append(aggregate.getCompletionTimeout()); + buffer.append(aggregate.getCompletionTimeout() < 1000L ? "L)" : ")"); } - if (aggregate.getBatchSize() != null) { - buffer.append(".batchSize(").append(aggregate.getBatchSize()).append(")"); + if (aggregate.getCompletionSize() != null) { + buffer.append(".completionSize(").append(aggregate.getCompletionSize()).append(")"); } - if (aggregate.getGroupExchanges() != null && aggregate.getGroupExchanges()) { + if (aggregate.isGroupExchanges() != null && aggregate.isGroupExchanges()) { buffer.append(".groupExchanges()"); } } Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/AggregateDSLTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/AggregateDSLTest.java?rev=910860&r1=910859&r2=910860&view=diff ============================================================================== --- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/AggregateDSLTest.java (original) +++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/AggregateDSLTest.java Wed Feb 17 08:27:25 2010 @@ -40,14 +40,14 @@ @Test public void testAggregateGroupedExchange() throws Exception { - String dsl = "from(\"direct:start\").aggregate().simple(\"id\").batchTimeout(500L).groupExchanges().to(\"mock:result\")"; + String dsl = "from(\"direct:start\").aggregate().simple(\"id\").completionTimeout(500L).groupExchanges().to(\"mock:result\")"; assertEquals(dsl, render(dsl)); } @Test public void testAggregateTimeoutOnly() throws Exception { - String dsl = "from(\"direct:start\").aggregate(header(\"id\")).batchTimeout(3000).batchSize(0).to(\"mock:result\")"; - String expected = "from(\"direct:start\").aggregate().header(\"id\").batchTimeout(3000).batchSize(0).to(\"mock:result\")"; + String dsl = "from(\"direct:start\").aggregate(header(\"id\")).completionTimeout(3000).completionSize(0).to(\"mock:result\")"; + String expected = "from(\"direct:start\").aggregate().header(\"id\").completionTimeout(3000).completionSize(0).to(\"mock:result\")"; assertEquals(expected, render(dsl)); } Modified: camel/trunk/examples/camel-example-cafe/src/main/java/org/apache/camel/example/cafe/CafeRouteBuilder.java URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cafe/src/main/java/org/apache/camel/example/cafe/CafeRouteBuilder.java?rev=910860&r1=910859&r2=910860&view=diff ============================================================================== --- camel/trunk/examples/camel-example-cafe/src/main/java/org/apache/camel/example/cafe/CafeRouteBuilder.java (original) +++ camel/trunk/examples/camel-example-cafe/src/main/java/org/apache/camel/example/cafe/CafeRouteBuilder.java Wed Feb 17 08:27:25 2010 @@ -82,11 +82,10 @@ from("seda:hotDrinks?concurrentConsumers=3").to("bean:barista?method=prepareHotDrink").to("direct:deliveries"); from("direct:deliveries") - .aggregate(new CafeAggregationStrategy()).method("waiter", "checkOrder") - .batchTimeout(5 * 1000L) + .aggregate(new CafeAggregationStrategy()).method("waiter", "checkOrder").completionTimeout(5 * 1000L) .to("bean:waiter?method=prepareDelivery") .to("bean:waiter?method=deliverCafes"); - + } //END SNIPPET: RouteConfig Modified: camel/trunk/examples/camel-example-cafe/src/main/resources/META-INF/spring/camel-context.xml URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cafe/src/main/resources/META-INF/spring/camel-context.xml?rev=910860&r1=910859&r2=910860&view=diff ============================================================================== --- camel/trunk/examples/camel-example-cafe/src/main/resources/META-INF/spring/camel-context.xml (original) +++ camel/trunk/examples/camel-example-cafe/src/main/resources/META-INF/spring/camel-context.xml Wed Feb 17 08:27:25 2010 @@ -51,7 +51,7 @@ </route> <route> <from uri="direct:deliveries"/> - <aggregate strategyRef="aggregatorStrategy" > + <aggregate strategyRef="aggregatorStrategy" completionTimeout="5000"> <correlationExpression> <method bean="waiter" method="checkOrder" /> </correlationExpression>
