Repository: camel Updated Branches: refs/heads/master f1dbb4852 -> 74a62c590
CAMEL-7521: Added parallelAggregate option to mutlicast/splitter/recipient list eips. Added option to scala dsl. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/74a62c59 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/74a62c59 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/74a62c59 Branch: refs/heads/master Commit: 74a62c5901aacf3bb4017a58c1a178cac30adf7d Parents: f1dbb48 Author: Claus Ibsen <[email protected]> Authored: Fri Jul 4 13:48:19 2014 +0200 Committer: Claus Ibsen <[email protected]> Committed: Fri Jul 4 13:48:19 2014 +0200 ---------------------------------------------------------------------- .../scala/org/apache/camel/scala/dsl/SMulticastDefinition.scala | 5 +++++ .../scala/org/apache/camel/scala/dsl/SSplitDefinition.scala | 4 +++- .../test/scala/org/apache/camel/scala/dsl/MulticastTest.scala | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/74a62c59/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SMulticastDefinition.scala ---------------------------------------------------------------------- diff --git a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SMulticastDefinition.scala b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SMulticastDefinition.scala index 9d24f0b..e55f811 100644 --- a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SMulticastDefinition.scala +++ b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SMulticastDefinition.scala @@ -35,8 +35,13 @@ case class SMulticastDefinition(override val target: MulticastDefinition)(implic def strategy(strategy: AggregationStrategy) = wrap(target.setAggregationStrategy(strategy)) + @Deprecated def parallel = wrap(target.parallelProcessing) + def parallelProcessing = wrap(target.parallelProcessing) + + def parallelAggregate = wrap(target.parallelAggregate) + def streaming = wrap(target.streaming) def stopOnException = wrap(target.stopOnException()) http://git-wip-us.apache.org/repos/asf/camel/blob/74a62c59/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SSplitDefinition.scala ---------------------------------------------------------------------- diff --git a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SSplitDefinition.scala b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SSplitDefinition.scala index 355bc89..e135251 100644 --- a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SSplitDefinition.scala +++ b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SSplitDefinition.scala @@ -31,7 +31,9 @@ case class SSplitDefinition(override val target: SplitDefinition)(implicit val b def aggregationStrategyRef(ref: String) = wrap(target.aggregationStrategyRef(ref)) def parallelProcessing = wrap(target.parallelProcessing) - + + def parallelAggregate = wrap(target.parallelAggregate) + def streaming = wrap(target.streaming) def stopOnException = wrap(target.stopOnException) http://git-wip-us.apache.org/repos/asf/camel/blob/74a62c59/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/MulticastTest.scala ---------------------------------------------------------------------- diff --git a/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/MulticastTest.scala b/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/MulticastTest.scala index b9e30df..a8b5d3d 100644 --- a/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/MulticastTest.scala +++ b/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/MulticastTest.scala @@ -65,7 +65,7 @@ class SMulticastParallelTest extends MulticastParallelTest with RouteBuilderSupp } "direct:start" ==> { - multicast.strategy(appendBodies).parallel { + multicast.strategy(appendBodies).parallelProcessing { to("direct:a") to("direct:b") }
