You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by sl...@apache.org on 2010/02/17 19:05:23 UTC
svn commit: r911127 - in /camel/trunk/components/camel-scala/src:
main/scala/org/apache/camel/scala/dsl/
main/scala/org/apache/camel/scala/dsl/builder/
test/scala/org/apache/camel/scala/dsl/
Author: slewis
Date: Wed Feb 17 18:05:23 2010
New Revision: 911127
URL: http://svn.apache.org/viewvc?rev=911127&view=rev
Log:
CAMEL-2841 - Update camel-scala to match aggregator overhaul
Modified:
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAggregateDefinition.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AggregatorTest.scala
Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala?rev=911127&r1=911126&r2=911127&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala Wed Feb 17 18:05:23 2010
@@ -27,7 +27,7 @@
*/
trait DSL {
- def aggregate(expression: Exchange => Any) : SAggregateDefinition
+ def aggregate(expression: Exchange => Any, strategy: AggregationStrategy) : SAggregateDefinition
def aop : SAOPDefinition
def as[Target](toType: Class[Target]) : DSL
def attempt : STryDefinition
Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala?rev=911127&r1=911126&r2=911127&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala Wed Feb 17 18:05:23 2010
@@ -149,7 +149,7 @@
def wiretap(uri: String) = wrap(target.wireTap(uri))
def wiretap(uri: String, expression: Exchange => Any) = wrap(target.wireTap(uri, expression))
- def aggregate(expression: Exchange => Any) = SAggregateDefinition(target.aggregate(expression))
+ def aggregate(expression: Exchange => Any, strategy: AggregationStrategy) = SAggregateDefinition(target.aggregate(expression, strategy))
/**
* Helper method to return this Scala type instead of creating another wrapper type for the processor
Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAggregateDefinition.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAggregateDefinition.scala?rev=911127&r1=911126&r2=911127&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAggregateDefinition.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAggregateDefinition.scala Wed Feb 17 18:05:23 2010
@@ -37,16 +37,19 @@
}
def strategy(strategy: AggregationStrategy) = wrap(target.setAggregationStrategy(strategy))
- def strategy(ref: String) = wrap(target.setStrategyRef(ref));
- def batchTimout(period: Period) = wrap(target.setBatchTimeout(period.milliseconds))
- def completion(predicate: Exchange => Any) = wrap(target.completionPredicate(predicate))
+ def aggregationRepositoryRef(ref: String) = wrap(target.setAggregationRepositoryRef(ref))
+ def strategyRef(ref: String) = wrap(target.setStrategyRef(ref))
- def batchSize(count: Int) = wrap(target.batchSize(count))
- def outBatchSize(count: Int) = wrap(target.outBatchSize(count))
+ def completionSize(count: Int) = wrap(target.completionSize(count))
+ def completionTimeout(period: Period) = wrap(target.setCompletionTimeout(period.milliseconds))
+ def closeCorrelationKeyOnCompletion(count: Int) = wrap(target.setCloseCorrelationKeyOnCompletion(count))
+ def parallelProcessing = wrap(target.parallelProcessing)
+ def completionFromBatchConsumer = wrap(target.completionFromBatchConsumer)
+ def eagerCheckCompletion = wrap(target.eagerCheckCompletion)
+ def ignoreBadCorrelationKeys = wrap(target.ignoreBadCorrelationKeys)
def groupExchanges = wrap(target.groupExchanges)
- def batchSizeFromConsumer = wrap(target.batchSizeFromConsumer)
override def wrap(block: => Unit) = super.wrap(block).asInstanceOf[SAggregateDefinition]
}
Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala?rev=911127&r1=911126&r2=911127&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala Wed Feb 17 18:05:23 2010
@@ -131,7 +131,7 @@
def unmarshal(format: DataFormatDefinition) = stack.top.unmarshal(format)
def wiretap(uri: String) = stack.top.wiretap(uri)
def wiretap(uri: String, expression: Exchange => Any) = stack.top.wiretap(uri, expression)
- def aggregate(expression: Exchange => Any) = stack.top.aggregate(expression)
+ def aggregate(expression: Exchange => Any, strategy: AggregationStrategy) = stack.top.aggregate(expression, strategy)
// delegate to Java builder
def errorHandler(error: ErrorHandlerBuilder) = builder.setErrorHandlerBuilder(error)
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AggregatorTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AggregatorTest.scala?rev=911127&r1=911126&r2=911127&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AggregatorTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AggregatorTest.scala Wed Feb 17 18:05:23 2010
@@ -17,6 +17,7 @@
package org.apache.camel.scala.dsl;
import org.w3c.dom.Document
+import org.apache.camel.processor.aggregate.UseLatestAggregationStrategy;
import scala.dsl.builder.RouteBuilder
/**
@@ -34,7 +35,7 @@
}
}
}
-
+
def testBlockAggregator = {
"mock:b" expect { _.received("message " + count) }
test {
@@ -43,16 +44,16 @@
}
}
}
-
+
val builder =
new RouteBuilder {
//START SNIPPET: simple
- "direct:a" aggregate (_.in[String].substring(0, 7)) to "mock:a"
+ "direct:a" aggregate (_.in[String].substring(0, 7), new UseLatestAggregationStrategy()) completionSize(100) to "mock:a"
//END SNIPPET: simple
//START SNIPPET: block
"direct:b" ==> {
- aggregate(_.in[String].substring(0,7)) {
+ aggregate(_.in[String].substring(0,7), new UseLatestAggregationStrategy()).completionSize(100) {
to ("mock:b")
}
}