You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/04/21 16:59:46 UTC
[1/2] camel git commit: CAMEL-9892 wrapped completionPredicate and
added Unit Test
Repository: camel
Updated Branches:
refs/heads/master 622a71d67 -> add6c68e6
CAMEL-9892 wrapped completionPredicate and added Unit Test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/add6c68e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/add6c68e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/add6c68e
Branch: refs/heads/master
Commit: add6c68e678bb6e01d74cad3629b552a4394c665
Parents: a1a4c2e
Author: Bob Gaudaen <bo...@gmail.com>
Authored: Wed Apr 20 16:27:33 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Apr 21 16:57:27 2016 +0200
----------------------------------------------------------------------
.../camel/scala/dsl/SAggregateDefinition.scala | 2 +-
.../apache/camel/scala/dsl/AggregatorTest.scala | 26 +++++++++++++++++---
2 files changed, 23 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/add6c68e/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAggregateDefinition.scala
----------------------------------------------------------------------
diff --git a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAggregateDefinition.scala b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAggregateDefinition.scala
index acdf4ab..3ef3434 100644
--- a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAggregateDefinition.scala
+++ b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAggregateDefinition.scala
@@ -65,6 +65,6 @@ case class SAggregateDefinition(override val target: AggregateDefinition)(implic
def completionPredicate(filter: Exchange => Any) = {
// uses implicit conversion
val predicate = filter
- target.completionPredicate(predicate)
+ wrap(target.completionPredicate(predicate))
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/add6c68e/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AggregatorTest.scala
----------------------------------------------------------------------
diff --git a/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AggregatorTest.scala b/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AggregatorTest.scala
index dcb27bb..b8b1cda 100644
--- a/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AggregatorTest.scala
+++ b/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AggregatorTest.scala
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,12 +16,12 @@
*/
package org.apache.camel.scala.dsl
+import org.apache.camel.Exchange
+import org.apache.camel.builder.ExchangeBuilder.anExchange
import org.apache.camel.processor.BodyInAggregatingStrategy
import org.apache.camel.processor.aggregate.UseLatestAggregationStrategy
+import org.apache.camel.scala.dsl.builder.RouteBuilder
import org.junit.Test
-import builder.RouteBuilder
-import org.apache.camel.Exchange
-import org.apache.camel.builder.ExchangeBuilder.anExchange
/**
* Test case for message aggregator
@@ -88,6 +88,18 @@ class AggregatorTest extends ScalaTestSupport {
}
}
+ @Test
+ def testAggregatePredicateWithBlock() {
+ "mock:aggregated" expect {
+ _.received("A+B+C")
+ }
+ test {
+ "direct:predicate-block" ! "A"
+ "direct:predicate-block" ! "B"
+ "direct:predicate-block" ! "C"
+ }
+ }
+
val builder =
new RouteBuilder {
"direct:completion-size" ==> {
@@ -119,5 +131,11 @@ class AggregatorTest extends ScalaTestSupport {
"direct:predicate" ==> {
aggregate("constant", new BodyInAggregatingStrategy()) completionPredicate (_.in[String].contains("A+B+C")) to "mock:aggregated"
}
+
+ "direct:predicate-block" ==> {
+ aggregate("constant", new BodyInAggregatingStrategy()).completionPredicate(_.in[String].contains("A+B+C")) {
+ to("mock:aggregated")
+ }
+ }
}
}
\ No newline at end of file
[2/2] camel git commit: CAMEL-9892 Renamed endpoints for readability
Posted by da...@apache.org.
CAMEL-9892 Renamed endpoints for readability
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a1a4c2e0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a1a4c2e0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a1a4c2e0
Branch: refs/heads/master
Commit: a1a4c2e0974e6a6ec7d4364fab9523e13967008a
Parents: 622a71d
Author: Bob Gaudaen <bo...@gmail.com>
Authored: Wed Apr 20 16:24:21 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Apr 21 16:57:27 2016 +0200
----------------------------------------------------------------------
.../apache/camel/scala/dsl/AggregatorTest.scala | 70 ++++++++++----------
1 file changed, 36 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a1a4c2e0/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AggregatorTest.scala
----------------------------------------------------------------------
diff --git a/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AggregatorTest.scala b/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AggregatorTest.scala
index 874730e..dcb27bb 100644
--- a/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AggregatorTest.scala
+++ b/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AggregatorTest.scala
@@ -27,95 +27,97 @@ import org.apache.camel.builder.ExchangeBuilder.anExchange
* Test case for message aggregator
*/
class AggregatorTest extends ScalaTestSupport {
-
+
val count = 100
-
+
@Test
def testSimpleAggregator() {
- "mock:a" expect { _.received("message " + count) }
+ "mock:aggregated" expect {
+ _.received("message " + count)
+ }
test {
for (i <- 1 to count) {
- "direct:a" ! ("message " + i)
+ "direct:completion-size" ! ("message " + i)
}
}
}
- @Test
- def testBlockAggregator() {
- "mock:b" expect { _.received("message " + count) }
+ @Test
+ def testBlockAggregator() {
+ "mock:aggregated" expect {
+ _.received("message " + count)
+ }
test {
for (i <- 1 to count) {
- "direct:b" ! ("message " + i)
+ "direct:completion-size-block" ! ("message " + i)
}
}
}
@Test
def testWrappingFunctionalAggregator() {
- "mock:c" expect {
+ "mock:aggregated" expect {
_.received("foobar")
}
test {
- "direct:c" ! "foo"
- "direct:c" ! "bar"
+ "direct:functional-aggregator-wrapped" ! "foo"
+ "direct:functional-aggregator-wrapped" ! "bar"
}
}
@Test
def testFunctionalAggregator() {
- "mock:d" expect {
+ "mock:aggregated" expect {
_.received("foobar")
}
test {
- "direct:d" ! "foo"
- "direct:d" ! "bar"
+ "direct:functional-aggregator" ! "foo"
+ "direct:functional-aggregator" ! "bar"
}
}
@Test
def testAggregateSimplePredicate() {
- "mock:e" expect {
+ "mock:aggregated" expect {
_.received("A+B+C")
}
test {
- "direct:e" ! "A"
- "direct:e" ! "B"
- "direct:e" ! "C"
+ "direct:predicate" ! "A"
+ "direct:predicate" ! "B"
+ "direct:predicate" ! "C"
}
}
val builder =
new RouteBuilder {
- "direct:a" ==> {
- aggregate (_.in[String].substring(0, 7), new UseLatestAggregationStrategy()) completionSize 100 to "mock:a" }
+ "direct:completion-size" ==> {
+ aggregate(_.in[String].substring(0, 7), new UseLatestAggregationStrategy()) completionSize count to "mock:aggregated"
+ }
- //START SNIPPET: block
- "direct:b" ==> {
- aggregate(_.in[String].substring(0,7), new UseLatestAggregationStrategy()).completionSize(100) {
- to ("mock:b")
- }
- }
- //END SNIPPET: block
+ "direct:completion-size-block" ==> {
+ aggregate(_.in[String].substring(0, 7), new UseLatestAggregationStrategy()).completionSize(count) {
+ to("mock:aggregated")
+ }
+ }
- "direct:c" ==> {
+ "direct:functional-aggregator-wrapped" ==> {
val aggregator = (oldEx: Exchange, newEx: Exchange) => oldEx match {
case null => newEx.in[String]
case _ => oldEx.in[String] + newEx.in[String]
}
- aggregate ("constant", aggregator) completionSize 2 to "mock:c"
+ aggregate("constant", aggregator) completionSize 2 to "mock:aggregated"
}
- "direct:d" ==> {
+ "direct:functional-aggregator" ==> {
val aggregator = (oldEx: Exchange, newEx: Exchange) => oldEx match {
case null => newEx
case _ => anExchange(newEx.getContext).withBody(oldEx.in[String] + newEx.in[String]).build
}
- aggregate ("constant", aggregator) completionSize 2 to "mock:d"
+ aggregate("constant", aggregator) completionSize 2 to "mock:aggregated"
}
- "direct:e" ==> {
- aggregate("constant", new BodyInAggregatingStrategy()) completionPredicate(_.in[String].contains("A+B+C")) to "mock:e"
+ "direct:predicate" ==> {
+ aggregate("constant", new BodyInAggregatingStrategy()) completionPredicate (_.in[String].contains("A+B+C")) to "mock:aggregated"
}
}
-
}
\ No newline at end of file