Removed the usage of the deprecated API in camel-rx
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b62e932b Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b62e932b Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b62e932b Branch: refs/heads/master Commit: b62e932b162af5dccfcdc3daa087ba21924b7d21 Parents: b3fed9d Author: Willem Jiang <willem.ji...@gmail.com> Authored: Fri Jun 6 13:13:03 2014 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Fri Jun 6 14:42:41 2014 +0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/camel/rx/ReactiveCamel.java | 2 +- .../java/org/apache/camel/rx/support/EndpointSubscribeFunc.java | 2 +- .../java/org/apache/camel/rx/support/EndpointSubscription.java | 2 +- .../java/org/apache/camel/rx/support/ExchangeToBodyFunc1.java | 2 +- .../java/org/apache/camel/rx/support/ExchangeToMessageFunc1.java | 2 +- .../java/org/apache/camel/rx/support/ObservableProcessor.java | 3 +-- .../java/org/apache/camel/rx/support/ProcessorToObserver.java | 2 +- .../src/test/java/org/apache/camel/rx/ObservableBodyTest.java | 4 ++-- .../src/test/java/org/apache/camel/rx/ObservableMessageTest.java | 4 ++-- .../test/java/org/apache/camel/rx/ToObservableAndMapTest.java | 4 ++-- .../src/test/java/org/apache/camel/rx/ToObservableBodyTest.java | 4 ++-- .../src/test/java/org/apache/camel/rx/ToObservableTest.java | 2 +- 12 files changed, 16 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/b62e932b/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 b104ebf..368cb53 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 @@ -27,7 +27,7 @@ import org.apache.camel.rx.support.ExchangeToMessageFunc1; import org.apache.camel.rx.support.ObserverSender; import org.apache.camel.util.CamelContextHelper; import rx.Observable; -import rx.util.functions.Func1; +import rx.functions.Func1; /** * Provides the <a href="https://rx.codeplex.com/";>Reactive Extensions</a> support for http://git-wip-us.apache.org/repos/asf/camel/blob/b62e932b/components/camel-rx/src/main/java/org/apache/camel/rx/support/EndpointSubscribeFunc.java ---------------------------------------------------------------------- diff --git a/components/camel-rx/src/main/java/org/apache/camel/rx/support/EndpointSubscribeFunc.java b/components/camel-rx/src/main/java/org/apache/camel/rx/support/EndpointSubscribeFunc.java index 7e6cf17..d118f5a 100644 --- a/components/camel-rx/src/main/java/org/apache/camel/rx/support/EndpointSubscribeFunc.java +++ b/components/camel-rx/src/main/java/org/apache/camel/rx/support/EndpointSubscribeFunc.java @@ -22,7 +22,7 @@ import rx.Observable; import rx.Observer; import rx.Subscriber; import rx.Subscription; -import rx.util.functions.Func1; +import rx.functions.Func1; public class EndpointSubscribeFunc<T> implements Observable.OnSubscribeFunc<T>, Observable.OnSubscribe<T> { http://git-wip-us.apache.org/repos/asf/camel/blob/b62e932b/components/camel-rx/src/main/java/org/apache/camel/rx/support/EndpointSubscription.java ---------------------------------------------------------------------- diff --git a/components/camel-rx/src/main/java/org/apache/camel/rx/support/EndpointSubscription.java b/components/camel-rx/src/main/java/org/apache/camel/rx/support/EndpointSubscription.java index 8769561..f7c8f6c 100644 --- a/components/camel-rx/src/main/java/org/apache/camel/rx/support/EndpointSubscription.java +++ b/components/camel-rx/src/main/java/org/apache/camel/rx/support/EndpointSubscription.java @@ -26,7 +26,7 @@ import org.apache.camel.Processor; import org.apache.camel.util.ServiceHelper; import rx.Observer; import rx.Subscription; -import rx.util.functions.Func1; +import rx.functions.Func1; /** * An RX {@link Subscription} on a Camel {@link Endpoint} http://git-wip-us.apache.org/repos/asf/camel/blob/b62e932b/components/camel-rx/src/main/java/org/apache/camel/rx/support/ExchangeToBodyFunc1.java ---------------------------------------------------------------------- diff --git a/components/camel-rx/src/main/java/org/apache/camel/rx/support/ExchangeToBodyFunc1.java b/components/camel-rx/src/main/java/org/apache/camel/rx/support/ExchangeToBodyFunc1.java index 98effe1..e8fb350 100644 --- a/components/camel-rx/src/main/java/org/apache/camel/rx/support/ExchangeToBodyFunc1.java +++ b/components/camel-rx/src/main/java/org/apache/camel/rx/support/ExchangeToBodyFunc1.java @@ -19,7 +19,7 @@ package org.apache.camel.rx.support; import org.apache.camel.Exchange; import org.apache.camel.Message; -import rx.util.functions.Func1; +import rx.functions.Func1; /** * A simple {@link Func1} to convert an {@link Exchange} to the given type using the http://git-wip-us.apache.org/repos/asf/camel/blob/b62e932b/components/camel-rx/src/main/java/org/apache/camel/rx/support/ExchangeToMessageFunc1.java ---------------------------------------------------------------------- diff --git a/components/camel-rx/src/main/java/org/apache/camel/rx/support/ExchangeToMessageFunc1.java b/components/camel-rx/src/main/java/org/apache/camel/rx/support/ExchangeToMessageFunc1.java index 6f54100..59911f3 100644 --- a/components/camel-rx/src/main/java/org/apache/camel/rx/support/ExchangeToMessageFunc1.java +++ b/components/camel-rx/src/main/java/org/apache/camel/rx/support/ExchangeToMessageFunc1.java @@ -19,7 +19,7 @@ package org.apache.camel.rx.support; import org.apache.camel.Exchange; import org.apache.camel.Message; -import rx.util.functions.Func1; +import rx.functions.Func1; /** * A simple {@link Func1} to convert an {@link Exchange} to its IN {@link Message} http://git-wip-us.apache.org/repos/asf/camel/blob/b62e932b/components/camel-rx/src/main/java/org/apache/camel/rx/support/ObservableProcessor.java ---------------------------------------------------------------------- diff --git a/components/camel-rx/src/main/java/org/apache/camel/rx/support/ObservableProcessor.java b/components/camel-rx/src/main/java/org/apache/camel/rx/support/ObservableProcessor.java index cf03583..7767a58 100644 --- a/components/camel-rx/src/main/java/org/apache/camel/rx/support/ObservableProcessor.java +++ b/components/camel-rx/src/main/java/org/apache/camel/rx/support/ObservableProcessor.java @@ -19,11 +19,10 @@ package org.apache.camel.rx.support; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.support.ServiceSupport; - import rx.Observable; +import rx.functions.Func1; import rx.subjects.PublishSubject; import rx.subjects.Subject; -import rx.util.functions.Func1; /** * A base class for implementing a {@link Processor} which provides access to an {@link Observable} http://git-wip-us.apache.org/repos/asf/camel/blob/b62e932b/components/camel-rx/src/main/java/org/apache/camel/rx/support/ProcessorToObserver.java ---------------------------------------------------------------------- diff --git a/components/camel-rx/src/main/java/org/apache/camel/rx/support/ProcessorToObserver.java b/components/camel-rx/src/main/java/org/apache/camel/rx/support/ProcessorToObserver.java index fff8668..cfbe4bc 100644 --- a/components/camel-rx/src/main/java/org/apache/camel/rx/support/ProcessorToObserver.java +++ b/components/camel-rx/src/main/java/org/apache/camel/rx/support/ProcessorToObserver.java @@ -20,7 +20,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import rx.Observer; -import rx.util.functions.Func1; +import rx.functions.Func1; /** * A {@link Processor} which invokes an underling {@link Observer} as messages http://git-wip-us.apache.org/repos/asf/camel/blob/b62e932b/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 5b2cf41..c9478c2 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,8 @@ import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.Test; import rx.Observable; -import rx.util.functions.Action1; -import rx.util.functions.Func1; +import rx.functions.Action1; +import rx.functions.Func1; public class ObservableBodyTest extends CamelTestSupport { protected MyObservableBody observableBody = new MyObservableBody(); http://git-wip-us.apache.org/repos/asf/camel/blob/b62e932b/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 d952797..1370419 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,8 @@ import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.Test; import rx.Observable; -import rx.util.functions.Action1; -import rx.util.functions.Func1; +import rx.functions.Action1; +import rx.functions.Func1; public class ObservableMessageTest extends CamelTestSupport { protected MyObservableMessage observableMessage = new MyObservableMessage(); http://git-wip-us.apache.org/repos/asf/camel/blob/b62e932b/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 b159918..a73a711 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,8 +23,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import rx.Observable; -import rx.util.functions.Action1; -import rx.util.functions.Func1; +import rx.functions.Action1; +import rx.functions.Func1; /** */ http://git-wip-us.apache.org/repos/asf/camel/blob/b62e932b/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 6974e8b..0a753f9 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,8 +22,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import rx.Observable; -import rx.util.functions.Action1; -import rx.util.functions.Func1; +import rx.functions.Action1; +import rx.functions.Func1; /** */ http://git-wip-us.apache.org/repos/asf/camel/blob/b62e932b/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 a670333..300580a 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,7 +23,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import rx.Observable; -import rx.util.functions.Action1; +import rx.functions.Action1; /** */
