Repository: camel Updated Branches: refs/heads/master 5719d8260 -> fd659c108
Upgrade camel-rx test to be java 8 style Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fd659c10 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fd659c10 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fd659c10 Branch: refs/heads/master Commit: fd659c108272b1873abdf1244fc300e824d051da Parents: 5719d82 Author: Claus Ibsen <davscl...@apache.org> Authored: Fri Apr 8 14:41:22 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Apr 8 14:57:49 2016 +0200 ---------------------------------------------------------------------- .../org/apache/camel/rx/ObservableBody.java | 2 +- .../java/org/apache/camel/rx/ReactiveCamel.java | 7 +----- .../org/apache/camel/rx/CamelOperatorTest.java | 17 ++++--------- .../org/apache/camel/rx/ObservableBodyTest.java | 14 ++--------- .../apache/camel/rx/ObservableMessageTest.java | 14 ++--------- .../test/java/org/apache/camel/rx/Order.java | 2 -- .../java/org/apache/camel/rx/RxTestSupport.java | 2 -- .../java/org/apache/camel/rx/SendToUoWTest.java | 8 +------ .../apache/camel/rx/ToObservableAndMapTest.java | 20 ++++------------ .../apache/camel/rx/ToObservableBodyTest.java | 25 +++----------------- .../org/apache/camel/rx/ToObservableTest.java | 10 ++------ .../apache/camel/rx/ToObservableUoWTest.java | 8 ++----- 12 files changed, 22 insertions(+), 107 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/fd659c10/components/camel-rx/src/main/java/org/apache/camel/rx/ObservableBody.java ---------------------------------------------------------------------- diff --git a/components/camel-rx/src/main/java/org/apache/camel/rx/ObservableBody.java b/components/camel-rx/src/main/java/org/apache/camel/rx/ObservableBody.java index 737d255..920fce7 100644 --- a/components/camel-rx/src/main/java/org/apache/camel/rx/ObservableBody.java +++ b/components/camel-rx/src/main/java/org/apache/camel/rx/ObservableBody.java @@ -22,7 +22,7 @@ import org.apache.camel.rx.support.ObservableProcessor; /** * A base class for a {@link org.apache.camel.Processor} which allows you to process * messages using an {@link rx.Observable < org.apache.camel.Message>} by implementing the - * abstract {@link org.apache.camel.rx.support.ObservableProcessor#configure(rx.Observable}) method. + * abstract {@link org.apache.camel.rx.support.ObservableProcessor#configure(rx.Observable) method. */ public abstract class ObservableBody<T> extends ObservableProcessor<T> { private final Class<T> bodyType; http://git-wip-us.apache.org/repos/asf/camel/blob/fd659c10/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 d1365bb..beb3bf1 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 @@ -141,11 +141,6 @@ public class ReactiveCamel { * Return a newly created {@link Observable} without conversion */ protected Observable<Exchange> createEndpointObservable(final Endpoint endpoint) { - return new EndpointObservable<Exchange>(endpoint, new EndpointSubscribeFunc<Exchange>(endpoint, new Func1<Exchange, Exchange>() { - @Override - public Exchange call(Exchange exchange) { - return exchange; - } - })); + return new EndpointObservable<Exchange>(endpoint, new EndpointSubscribeFunc<Exchange>(endpoint, exchange -> exchange)); } } http://git-wip-us.apache.org/repos/asf/camel/blob/fd659c10/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 17811c2..ca37ca1 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 @@ -22,14 +22,11 @@ import org.apache.camel.Exchange; import org.apache.camel.component.mock.MockEndpoint; import org.junit.Test; import rx.Subscription; -import rx.functions.Func1; import rx.observables.ConnectableObservable; import static com.jayway.restassured.RestAssured.given; import static org.hamcrest.Matchers.containsString; -/** - */ public class CamelOperatorTest extends RxTestSupport { @Test @@ -61,21 +58,15 @@ public class CamelOperatorTest extends RxTestSupport { // Define an InOut route ConnectableObservable<Exchange> inOut = reactiveCamel.from("restlet:http://localhost:9080/test?restletMethod=POST";) - .map(new Func1<Exchange, Exchange>() { // Convert body to String - @Override - public Exchange call(Exchange exchange) { + .map(exchange -> { exchange.getIn().setBody(exchange.getIn().getBody(String.class)); return exchange; - } - }) + }) .lift(reactiveCamel.to("log:inOut")) - .map(new Func1<Exchange, Exchange>() { // Change body for response - @Override - public Exchange call(Exchange exchange) { + .map(exchange -> { exchange.getIn().setBody(exchange.getIn().getBody(String.class) + " back"); return exchange; - } - }) + }) .lift(reactiveCamel.to(mockEndpoint4)) .publish(); http://git-wip-us.apache.org/repos/asf/camel/blob/fd659c10/components/camel-rx/src/test/java/org/apache/camel/rx/ObservableBodyTest.java ---------------------------------------------------------------------- diff --git a/components/camel-rx/src/test/java/org/apache/camel/rx/ObservableBodyTest.java b/components/camel-rx/src/test/java/org/apache/camel/rx/ObservableBodyTest.java index c9478c2..52995fc 100644 --- a/components/camel-rx/src/test/java/org/apache/camel/rx/ObservableBodyTest.java +++ b/components/camel-rx/src/test/java/org/apache/camel/rx/ObservableBodyTest.java @@ -25,8 +25,6 @@ import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.Test; import rx.Observable; -import rx.functions.Action1; -import rx.functions.Func1; public class ObservableBodyTest extends CamelTestSupport { protected MyObservableBody observableBody = new MyObservableBody(); @@ -55,17 +53,9 @@ public class ObservableBodyTest extends CamelTestSupport { @Override protected void configure(Observable<String> observable) { // lets process the messages using the RX API - observable.map(new Func1<String, String>() { - @Override - public String call(String body) { - return "Hello " + body; - } - }).subscribe(new Action1<String>() { - @Override - public void call(String body) { + observable.map(body -> "Hello " + body).subscribe(body -> { template.sendBody(resultEndpoint, body); - } - }); + }); } } http://git-wip-us.apache.org/repos/asf/camel/blob/fd659c10/components/camel-rx/src/test/java/org/apache/camel/rx/ObservableMessageTest.java ---------------------------------------------------------------------- diff --git a/components/camel-rx/src/test/java/org/apache/camel/rx/ObservableMessageTest.java b/components/camel-rx/src/test/java/org/apache/camel/rx/ObservableMessageTest.java index 1370419..93b45d4 100644 --- a/components/camel-rx/src/test/java/org/apache/camel/rx/ObservableMessageTest.java +++ b/components/camel-rx/src/test/java/org/apache/camel/rx/ObservableMessageTest.java @@ -26,8 +26,6 @@ import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.Test; import rx.Observable; -import rx.functions.Action1; -import rx.functions.Func1; public class ObservableMessageTest extends CamelTestSupport { protected MyObservableMessage observableMessage = new MyObservableMessage(); @@ -52,17 +50,9 @@ public class ObservableMessageTest extends CamelTestSupport { @Override protected void configure(Observable<Message> observable) { // lets process the messages using the RX API - observable.map(new Func1<Message, String>() { - @Override - public String call(Message message) { - return "Hello " + message.getBody(String.class); - } - }).subscribe(new Action1<String>() { - @Override - public void call(String body) { + observable.map(message -> "Hello " + message.getBody(String.class)).subscribe(body -> { template.sendBody(resultEndpoint, body); - } - }); + }); } } http://git-wip-us.apache.org/repos/asf/camel/blob/fd659c10/components/camel-rx/src/test/java/org/apache/camel/rx/Order.java ---------------------------------------------------------------------- diff --git a/components/camel-rx/src/test/java/org/apache/camel/rx/Order.java b/components/camel-rx/src/test/java/org/apache/camel/rx/Order.java index 5d98e20..c1c7141 100644 --- a/components/camel-rx/src/test/java/org/apache/camel/rx/Order.java +++ b/components/camel-rx/src/test/java/org/apache/camel/rx/Order.java @@ -16,8 +16,6 @@ */ package org.apache.camel.rx; -/** - */ public class Order { private final String id; private final double amount; http://git-wip-us.apache.org/repos/asf/camel/blob/fd659c10/components/camel-rx/src/test/java/org/apache/camel/rx/RxTestSupport.java ---------------------------------------------------------------------- diff --git a/components/camel-rx/src/test/java/org/apache/camel/rx/RxTestSupport.java b/components/camel-rx/src/test/java/org/apache/camel/rx/RxTestSupport.java index 86fcc87..eea9229 100644 --- a/components/camel-rx/src/test/java/org/apache/camel/rx/RxTestSupport.java +++ b/components/camel-rx/src/test/java/org/apache/camel/rx/RxTestSupport.java @@ -22,8 +22,6 @@ import org.apache.camel.impl.DefaultCamelContext; import org.junit.After; import org.junit.Before; -/** - */ public abstract class RxTestSupport { protected CamelContext camelContext; protected ReactiveCamel reactiveCamel; http://git-wip-us.apache.org/repos/asf/camel/blob/fd659c10/components/camel-rx/src/test/java/org/apache/camel/rx/SendToUoWTest.java ---------------------------------------------------------------------- diff --git a/components/camel-rx/src/test/java/org/apache/camel/rx/SendToUoWTest.java b/components/camel-rx/src/test/java/org/apache/camel/rx/SendToUoWTest.java index 0852c3d..c8d2f6a 100644 --- a/components/camel-rx/src/test/java/org/apache/camel/rx/SendToUoWTest.java +++ b/components/camel-rx/src/test/java/org/apache/camel/rx/SendToUoWTest.java @@ -17,7 +17,6 @@ package org.apache.camel.rx; import org.apache.camel.Exchange; -import org.apache.camel.Processor; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.SynchronizationAdapter; import org.junit.Assert; @@ -36,12 +35,7 @@ public class SendToUoWTest extends RxTestSupport { final MockEndpoint mockEndpoint = camelContext.getEndpoint("mock:results", MockEndpoint.class); mockEndpoint.expectedBodiesReceived((Object[]) expectedBodies); - mockEndpoint.whenAnyExchangeReceived(new Processor() { - @Override - public void process(Exchange exchange) throws Exception { - exchange.addOnCompletion(onCompletion); - } - }); + mockEndpoint.whenAnyExchangeReceived(exchange -> exchange.addOnCompletion(onCompletion)); // lets send events on the observable to the camel endpoint reactiveCamel.sendTo(someObservable, "mock:results"); http://git-wip-us.apache.org/repos/asf/camel/blob/fd659c10/components/camel-rx/src/test/java/org/apache/camel/rx/ToObservableAndMapTest.java ---------------------------------------------------------------------- diff --git a/components/camel-rx/src/test/java/org/apache/camel/rx/ToObservableAndMapTest.java b/components/camel-rx/src/test/java/org/apache/camel/rx/ToObservableAndMapTest.java index a73a711..0daddd8 100644 --- a/components/camel-rx/src/test/java/org/apache/camel/rx/ToObservableAndMapTest.java +++ b/components/camel-rx/src/test/java/org/apache/camel/rx/ToObservableAndMapTest.java @@ -23,11 +23,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import rx.Observable; -import rx.functions.Action1; -import rx.functions.Func1; -/** - */ public class ToObservableAndMapTest extends RxTestSupport { private static final Logger LOG = LoggerFactory.getLogger(ToObservableAndMapTest.class); @@ -40,20 +36,12 @@ public class ToObservableAndMapTest extends RxTestSupport { "timer://foo?fixedRate=true&period=100"); // transform the stream - Observable<String> observable = observableMessage.map(new Func1<Message, String>() { - @Override - public String call(Message message) { - return "Transformed value: headers " + message.getHeaders(); - } - }); - - observable.take(4).subscribe(new Action1<String>() { - @Override - public void call(String body) { + Observable<String> observable = observableMessage.map(message -> "Transformed value: headers " + message.getHeaders()); + + observable.take(4).subscribe(body -> { LOG.info(body); producerTemplate.sendBody(mockEndpoint, body); - } - }); + }); mockEndpoint.assertIsSatisfied(); } http://git-wip-us.apache.org/repos/asf/camel/blob/fd659c10/components/camel-rx/src/test/java/org/apache/camel/rx/ToObservableBodyTest.java ---------------------------------------------------------------------- diff --git a/components/camel-rx/src/test/java/org/apache/camel/rx/ToObservableBodyTest.java b/components/camel-rx/src/test/java/org/apache/camel/rx/ToObservableBodyTest.java index 0a753f9..3c4649e 100644 --- a/components/camel-rx/src/test/java/org/apache/camel/rx/ToObservableBodyTest.java +++ b/components/camel-rx/src/test/java/org/apache/camel/rx/ToObservableBodyTest.java @@ -22,11 +22,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import rx.Observable; -import rx.functions.Action1; -import rx.functions.Func1; -/** - */ public class ToObservableBodyTest extends RxTestSupport { private static final Logger LOG = LoggerFactory.getLogger(ToObservableBodyTest.class); @@ -37,28 +33,13 @@ public class ToObservableBodyTest extends RxTestSupport { // lets consume, filter and map events Observable<Order> observable = reactiveCamel.toObservable("seda:orders", Order.class); - Observable<String> largeOrderIds = observable.filter(new Func1<Order, Boolean>() { - @Override - public Boolean call(Order order) { - return order.getAmount() > 100.0; - } - }).map(new Func1<Order, String>() { - @Override - public String call(Order order) { - return order.getId(); - } - }); - + Observable<String> largeOrderIds = observable.filter(order -> order.getAmount() > 100.0).map(order -> order.getId()); // lets route the largeOrderIds to the mock endpoint for testing - largeOrderIds.take(2).subscribe(new Action1<String>() { - @Override - public void call(String body) { + largeOrderIds.take(2).subscribe(body -> { LOG.info("Processing " + body); producerTemplate.sendBody(mockEndpoint, body); - } - }); - + }); // now lets send some orders in Order[] orders = {new Order("a", 49.95), new Order("b", 125.50), new Order("c", 22.95), http://git-wip-us.apache.org/repos/asf/camel/blob/fd659c10/components/camel-rx/src/test/java/org/apache/camel/rx/ToObservableTest.java ---------------------------------------------------------------------- diff --git a/components/camel-rx/src/test/java/org/apache/camel/rx/ToObservableTest.java b/components/camel-rx/src/test/java/org/apache/camel/rx/ToObservableTest.java index 300580a..c534e8f 100644 --- a/components/camel-rx/src/test/java/org/apache/camel/rx/ToObservableTest.java +++ b/components/camel-rx/src/test/java/org/apache/camel/rx/ToObservableTest.java @@ -23,10 +23,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import rx.Observable; -import rx.functions.Action1; -/** - */ public class ToObservableTest extends RxTestSupport { private static final Logger LOG = LoggerFactory.getLogger(ToObservableTest.class); @@ -36,14 +33,11 @@ public class ToObservableTest extends RxTestSupport { mockEndpoint.expectedMessageCount(4); Observable<Message> observable = reactiveCamel.toObservable("timer://foo?fixedRate=true&period=100"); - observable.take(4).subscribe(new Action1<Message>() { - @Override - public void call(Message message) { + observable.take(4).subscribe(message -> { String body = "Processing message headers " + message.getHeaders(); LOG.info(body); producerTemplate.sendBody(mockEndpoint, body); - } - }); + }); mockEndpoint.assertIsSatisfied(); } http://git-wip-us.apache.org/repos/asf/camel/blob/fd659c10/components/camel-rx/src/test/java/org/apache/camel/rx/ToObservableUoWTest.java ---------------------------------------------------------------------- diff --git a/components/camel-rx/src/test/java/org/apache/camel/rx/ToObservableUoWTest.java b/components/camel-rx/src/test/java/org/apache/camel/rx/ToObservableUoWTest.java index 88a5b2f..9a4e82b 100644 --- a/components/camel-rx/src/test/java/org/apache/camel/rx/ToObservableUoWTest.java +++ b/components/camel-rx/src/test/java/org/apache/camel/rx/ToObservableUoWTest.java @@ -24,7 +24,6 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.util.FileUtil; import org.junit.Test; import rx.Observable; -import rx.functions.Action1; public class ToObservableUoWTest extends RxTestSupport { @@ -40,13 +39,10 @@ public class ToObservableUoWTest extends RxTestSupport { mockEndpoint.expectedBodiesReceivedInAnyOrder("Hello World", "Bye World"); Observable<Message> observable = reactiveCamel.toObservable("file://target/foo?move=done"); - observable.subscribe(new Action1<Message>() { - @Override - public void call(Message message) { + observable.subscribe(message -> { String body = message.getBody(String.class); producerTemplate.sendBody("mock:results", body); - } - }); + }); producerTemplate.sendBodyAndHeader("file://target/foo", "Hello World", Exchange.FILE_NAME, "hello.txt"); producerTemplate.sendBodyAndHeader("file://target/foo", "Bye World", Exchange.FILE_NAME, "bye.txt");
