You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2015/04/03 03:20:46 UTC
[1/2] camel git commit: Fixed the CS error of camel-gson and
camel-xstream
Repository: camel
Updated Branches:
refs/heads/master c67392fe1 -> c91c41d1a
Fixed the CS error of camel-gson and camel-xstream
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c91c41d1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c91c41d1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c91c41d1
Branch: refs/heads/master
Commit: c91c41d1af2f05ae9827cc5960129e422860d480
Parents: 3c3b0ed
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Apr 3 09:20:00 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Apr 3 09:20:31 2015 +0800
----------------------------------------------------------------------
.../component/gson/SpringGsonJsonDataFormatTest.java | 6 +++---
.../dataformat/xstream/MarshalDomainObjectJSONTest.java | 10 +++++-----
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c91c41d1/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonJsonDataFormatTest.java
----------------------------------------------------------------------
diff --git a/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonJsonDataFormatTest.java b/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonJsonDataFormatTest.java
index cece6fd..751f99b 100644
--- a/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonJsonDataFormatTest.java
+++ b/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonJsonDataFormatTest.java
@@ -58,9 +58,9 @@ public class SpringGsonJsonDataFormatTest extends CamelSpringTestSupport {
Object marshalled = template.requestBody("direct:inPretty", in);
String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled);
- String expected = "{\n" +
- " \"name\": \"Camel\"" +
- "\n}";
+ String expected = "{\n"
+ + " \"name\": \"Camel\""
+ + "\n}";
assertEquals(expected, marshalledAsString);
template.sendBody("direct:backPretty", marshalled);
http://git-wip-us.apache.org/repos/asf/camel/blob/c91c41d1/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONTest.java
----------------------------------------------------------------------
diff --git a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONTest.java b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONTest.java
index 6c3cdac..55fbdf0 100644
--- a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONTest.java
+++ b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONTest.java
@@ -37,11 +37,11 @@ public class MarshalDomainObjectJSONTest extends MarshalDomainObjectTest {
Object marshalled = template.requestBody("direct:inPretty", order);
String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled);
// the line-separator used by JsonWriter is "\n", even on windows
- String expected = "{\"org.apache.camel.dataformat.xstream.PurchaseOrder\": {\n" +
- " \"name\": \"pretty printed Camel\",\n"+
- " \"price\": 7.91,\n" +
- " \"amount\": 1.0\n" +
- "}}";
+ String expected = "{\"org.apache.camel.dataformat.xstream.PurchaseOrder\": {\n"
+ + " \"name\": \"pretty printed Camel\",\n"
+ + " \"price\": 7.91,\n"
+ + " \"amount\": 1.0\n"
+ + "}}";
assertEquals(expected, marshalledAsString);
template.sendBody("direct:backPretty", marshalled);
[2/2] camel git commit: CAMEL-7833 Added convenience method
ReactiveCamel.to(...). Changed test to highlight the idea of creating routes
with RX.
Posted by ni...@apache.org.
CAMEL-7833 Added convenience method ReactiveCamel.to(...).
Changed test to highlight the idea of creating routes with RX.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3c3b0edd
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3c3b0edd
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3c3b0edd
Branch: refs/heads/master
Commit: 3c3b0edddfe555e1bfd247258c4f1aa4806d3b38
Parents: c67392f
Author: Jyrki Ruuskanen <yu...@kotikone.fi>
Authored: Thu Apr 2 22:38:55 2015 +0300
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Apr 3 09:20:31 2015 +0800
----------------------------------------------------------------------
.../java/org/apache/camel/rx/ReactiveCamel.java | 14 ++++++++++++++
.../org/apache/camel/rx/CamelOperatorTest.java | 17 +++++++++++++----
2 files changed, 27 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3c3b0edd/components/camel-rx/src/main/java/org/apache/camel/rx/ReactiveCamel.java
----------------------------------------------------------------------
diff --git a/components/camel-rx/src/main/java/org/apache/camel/rx/ReactiveCamel.java b/components/camel-rx/src/main/java/org/apache/camel/rx/ReactiveCamel.java
index 368cb53..678c4e8 100644
--- a/components/camel-rx/src/main/java/org/apache/camel/rx/ReactiveCamel.java
+++ b/components/camel-rx/src/main/java/org/apache/camel/rx/ReactiveCamel.java
@@ -92,6 +92,20 @@ public class ReactiveCamel {
}
}
+ /**
+ * Convenience method for creating CamelOperator instances
+ */
+ public CamelOperator to(String uri) throws Exception {
+ return new CamelOperator(camelContext, uri);
+ }
+
+ /**
+ * Convenience method for creating CamelOperator instances
+ */
+ public CamelOperator to(Endpoint endpoint) throws Exception {
+ return new CamelOperator(endpoint);
+ }
+
public CamelContext getCamelContext() {
return camelContext;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/3c3b0edd/components/camel-rx/src/test/java/org/apache/camel/rx/CamelOperatorTest.java
----------------------------------------------------------------------
diff --git a/components/camel-rx/src/test/java/org/apache/camel/rx/CamelOperatorTest.java b/components/camel-rx/src/test/java/org/apache/camel/rx/CamelOperatorTest.java
index 8667e3b..f0bacc3 100644
--- a/components/camel-rx/src/test/java/org/apache/camel/rx/CamelOperatorTest.java
+++ b/components/camel-rx/src/test/java/org/apache/camel/rx/CamelOperatorTest.java
@@ -24,6 +24,8 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import rx.Observable;
+import rx.Subscription;
+import rx.observables.ConnectableObservable;
/**
*/
@@ -39,12 +41,16 @@ public class CamelOperatorTest extends RxTestSupport {
mockEndpoint2.expectedMessageCount(1);
mockEndpoint3.expectedMessageCount(1);
- Observable<Message> result = reactiveCamel.toObservable("direct:start")
- .lift(new CamelOperator(camelContext, "mock:results1"))
+ ConnectableObservable<Message> route = reactiveCamel.toObservable("direct:start")
+ .lift(new CamelOperator(mockEndpoint1))
.lift(new CamelOperator(camelContext, "log:foo"))
.debounce(1, TimeUnit.SECONDS)
- .lift(new CamelOperator(mockEndpoint2));
- reactiveCamel.sendTo(result, "mock:results3");
+ .lift(reactiveCamel.to(mockEndpoint2))
+ .lift(reactiveCamel.to("mock:results3"))
+ .publish();
+
+ // Start the route
+ Subscription routeSubscription = route.connect();
// Send two test messages
producerTemplate.sendBody("direct:start", "<test/>");
@@ -53,5 +59,8 @@ public class CamelOperatorTest extends RxTestSupport {
mockEndpoint1.assertIsSatisfied();
mockEndpoint2.assertIsSatisfied();
mockEndpoint3.assertIsSatisfied();
+
+ // Stop the route
+ routeSubscription.unsubscribe();
}
}