Upgrade to RxJava 3.0.0-RC2, change package

Author: akarnokd

README.md

@@ -17,7 +17,7 @@ Library to convert between RxJava 1.x and 3.x reactive types.
 
 ```
 dependencies {
-    compile "com.github.akarnokd:rxjava3-interop:3.0.0-RC1"
+    compile "com.github.akarnokd:rxjava3-interop:3.0.0-RC2"
 }
 ```
 
@@ -31,21 +31,21 @@ Maven search:
 ### Convert between the reactive base types
 
 ```java
-import hu.akarnokd.rxjava.interop.RxJavaInterop;
+import hu.akarnokd.rxjava3.interop.RxJavaInterop;
 
 // convert from 1.x to 3.x
 
-io.reactivex.Flowable    f2 = RxJavaInterop.toV2Flowable(rx.Observable);
+io.reactivex.Flowable    f2 = RxJavaInterop.toV3Flowable(rx.Observable);
 
-io.reactivex.Observable  o2 = RxJavaInterop.toV2Observable(rx.Observable);
+io.reactivex.Observable  o2 = RxJavaInterop.toV3Observable(rx.Observable);
 
-io.reactive.Single       s2 = RxJavaInterop.toV2Single(rx.Single);
+io.reactive.Single       s2 = RxJavaInterop.toV3Single(rx.Single);
 
-io.reactivex.Completable c2 = RxJavaInterop.toV2Completable(rx.Completable);
+io.reactivex.Completable c2 = RxJavaInterop.toV3Completable(rx.Completable);
 
-io.reactivex.Maybe m2s = RxJavaInterop.toV2Maybe(rx.Single);
+io.reactivex.Maybe m2s = RxJavaInterop.toV3Maybe(rx.Single);
 
-io.reactivex.Maybe m2c = RxJavaInterop.toV2Maybe(rx.Completable);
+io.reactivex.Maybe m2c = RxJavaInterop.toV3Maybe(rx.Completable);
 
 // convert from 3.x to 1.x
 
@@ -69,9 +69,9 @@ Note that 3.x `Subject`s and `FlowableProcessor`s support only the same input an
 ```java
 // convert from 1.x to 3.x
 
-io.reactivex.subjects.Subject sj2 = RxJavaInterop.toV2Subject(rx.subjects.Subject);
+io.reactivex.subjects.Subject sj2 = RxJavaInterop.toV3Subject(rx.subjects.Subject);
 
-io.reactivex.processors.FlowableProcessor fp2 = RxJavaInterop.toV2Processor(rx.subjects.Subject);
+io.reactivex.processors.FlowableProcessor fp2 = RxJavaInterop.toV3Processor(rx.subjects.Subject);
 
 // convert from 3.x to 1.x
 
@@ -85,14 +85,14 @@ rx.subjects.Subject sj1b = RxJavaInterop.toV1Subject(io.reactivex.processors.Flo
 ```java
 // convert from 1.x to 3.x
 
-io.reactivex.FlowableTransformer ft2 = RxJavaInterop.toV2Transformer(rx.Observable.Transformer);
+io.reactivex.FlowableTransformer ft2 = RxJavaInterop.toV3Transformer(rx.Observable.Transformer);
 
-io.reactivex.ObservableTransformer ot2 = RxJavaInterop.toV2Transformer(
+io.reactivex.ObservableTransformer ot2 = RxJavaInterop.toV3Transformer(
                                              rx.Observable.Transformer, io.reactivex.BackpressureStrategy);
 
-io.reactivex.SingleTransformer st2 = RxJavaInterop.toV2Transformer(rx.Single.Transformer);
+io.reactivex.SingleTransformer st2 = RxJavaInterop.toV3Transformer(rx.Single.Transformer);
 
-io.reactivex.CompletableTransformer ct2 = RxJavaInterop.toV2Transformer(rx.Completable.Transformer);
+io.reactivex.CompletableTransformer ct2 = RxJavaInterop.toV3Transformer(rx.Completable.Transformer);
 
 // convert from 3.x to 1.x
 
@@ -111,7 +111,7 @@ rx.Completable.Transformer ct1 = RxJavaInterop.toV1Transformer(io.reactivex.Comp
 ```java
 // convert from 1.x to 3.x
 
-io.reactivex.FlowableOperator fo2 = RxJavaInterop.toV2Operator(rx.Observable.Operator);
+io.reactivex.FlowableOperator fo2 = RxJavaInterop.toV3Operator(rx.Observable.Operator);
 
 // convert from 3.x to 1.x
 
@@ -123,7 +123,7 @@ rx.Observable.Operator fo1 = RxJavaInterop.toV1Operator(io.reactivex.FlowableOpe
 ```java
 // convert from 1.x to 3.x
 
-io.reactivex.disposables.Disposable d2 = RxJavaInterop.toV2Disposable(rx.Subscription);
+io.reactivex.disposables.Disposable d2 = RxJavaInterop.toV3Disposable(rx.Subscription);
 
 // convert from 3.x to 1.x
 
@@ -136,7 +136,7 @@ rx.Subscription s1 = RxJavaInterop.toV1Subscription(io.reactivex.disposables.Dis
 ```java
 // convert from 1.x to 3.x
 
-io.reactivex.Scheduler s2 = RxJavaInterop.toV2Scheduler(rx.Scheduler);
+io.reactivex.Scheduler s2 = RxJavaInterop.toV3Scheduler(rx.Scheduler);
 
 // convert from 3.x to 1.x
 

build.gradle

@@ -48,9 +48,9 @@ apply plugin: 'osgi'
 dependencies {
     signature 'org.codehaus.mojo.signature:java16:1.1@signature'
 
-    compile "org.reactivestreams:reactive-streams:1.0.2"
+    compile "org.reactivestreams:reactive-streams:1.0.3-RC1"
     compile "io.reactivex:rxjava:1.3.8"
-    compile "io.reactivex.rxjava3:rxjava:3.0.0-RC1"
+    compile "io.reactivex.rxjava3:rxjava:3.0.0-RC2"
 
     testCompile group: 'junit', name: 'junit', version: '4.12'
     testCompile 'org.mockito:mockito-core:3.0.0'

gradle.properties

@@ -1 +1 @@
-version=3.0.0-RC1
+version=3.0.0-RC2

src/main/java/hu/akarnokd/rxjava/interop/CompletableV1ToCompletableV2.java src/main/java/hu/akarnokd/rxjava3/interop/CompletableV1ToCompletableV3.java

@@ -14,32 +14,32 @@
  * limitations under the License.
  */
 
-package hu.akarnokd.rxjava.interop;
+package hu.akarnokd.rxjava3.interop;
 
 /**
- * Convert a V1 Completable into a V2 Completable, composing cancellation.
+ * Convert a V1 Completable into a V3 Completable, composing cancellation.
  */
-final class CompletableV1ToCompletableV2 extends io.reactivex.Completable {
+final class CompletableV1ToCompletableV3 extends io.reactivex.rxjava3.core.Completable {
 
     final rx.Completable source;
 
-    CompletableV1ToCompletableV2(rx.Completable source) {
+    CompletableV1ToCompletableV3(rx.Completable source) {
         this.source = source;
     }
 
     @Override
-    protected void subscribeActual(io.reactivex.CompletableObserver observer) {
+    protected void subscribeActual(io.reactivex.rxjava3.core.CompletableObserver observer) {
         source.subscribe(new SourceCompletableSubscriber(observer));
     }
 
     static final class SourceCompletableSubscriber
-    implements rx.CompletableSubscriber, io.reactivex.disposables.Disposable {
+    implements rx.CompletableSubscriber, io.reactivex.rxjava3.disposables.Disposable {
 
-        final io.reactivex.CompletableObserver observer;
+        final io.reactivex.rxjava3.core.CompletableObserver observer;
 
         rx.Subscription s;
 
-        SourceCompletableSubscriber(io.reactivex.CompletableObserver observer) {
+        SourceCompletableSubscriber(io.reactivex.rxjava3.core.CompletableObserver observer) {
             this.observer = observer;
         }
 

src/main/java/hu/akarnokd/rxjava/interop/CompletableV1ToMaybeV2.java src/main/java/hu/akarnokd/rxjava3/interop/CompletableV1ToMaybeV3.java

@@ -14,32 +14,32 @@
  * limitations under the License.
  */
 
-package hu.akarnokd.rxjava.interop;
+package hu.akarnokd.rxjava3.interop;
 
 /**
- * Convert a V1 Completable into a V2 Completable, composing cancellation.
+ * Convert a V1 Completable into a V+ Completable, composing cancellation.
  */
-final class CompletableV1ToMaybeV2<T> extends io.reactivex.Maybe<T> {
+final class CompletableV1ToMaybeV3<T> extends io.reactivex.rxjava3.core.Maybe<T> {
 
     final rx.Completable source;
 
-    CompletableV1ToMaybeV2(rx.Completable source) {
+    CompletableV1ToMaybeV3(rx.Completable source) {
         this.source = source;
     }
 
     @Override
-    protected void subscribeActual(io.reactivex.MaybeObserver<? super T> observer) {
+    protected void subscribeActual(io.reactivex.rxjava3.core.MaybeObserver<? super T> observer) {
         source.subscribe(new SourceCompletableSubscriber<T>(observer));
     }
 
     static final class SourceCompletableSubscriber<T>
-    implements rx.CompletableSubscriber, io.reactivex.disposables.Disposable {
+    implements rx.CompletableSubscriber, io.reactivex.rxjava3.disposables.Disposable {
 
-        final io.reactivex.MaybeObserver<? super T> observer;
+        final io.reactivex.rxjava3.core.MaybeObserver<? super T> observer;
 
         rx.Subscription s;
 
-        SourceCompletableSubscriber(io.reactivex.MaybeObserver<? super T> observer) {
+        SourceCompletableSubscriber(io.reactivex.rxjava3.core.MaybeObserver<? super T> observer) {
             this.observer = observer;
         }
 

src/main/java/hu/akarnokd/rxjava/interop/CompletableV2ToCompletableV1.java src/main/java/hu/akarnokd/rxjava3/interop/CompletableV3ToCompletableV1.java

@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package hu.akarnokd.rxjava.interop;
+package hu.akarnokd.rxjava3.interop;
 
 /**
- * Convert a V2 Completable into a V1 Completable, composing cancellation.
+ * Convert a V3 Completable into a V1 Completable, composing cancellation.
  */
-final class CompletableV2ToCompletableV1 implements rx.Completable.OnSubscribe {
+final class CompletableV3ToCompletableV1 implements rx.Completable.OnSubscribe {
 
-    final io.reactivex.CompletableSource source;
+    final io.reactivex.rxjava3.core.CompletableSource source;
 
-    CompletableV2ToCompletableV1(io.reactivex.CompletableSource source) {
+    CompletableV3ToCompletableV1(io.reactivex.rxjava3.core.CompletableSource source) {
         this.source = source;
     }
 
@@ -33,18 +33,18 @@ public void call(rx.CompletableSubscriber observer) {
     }
 
     static final class SourceCompletableSubscriber
-    implements io.reactivex.CompletableObserver, rx.Subscription {
+    implements io.reactivex.rxjava3.core.CompletableObserver, rx.Subscription {
 
         final rx.CompletableSubscriber observer;
 
-        io.reactivex.disposables.Disposable d;
+        io.reactivex.rxjava3.disposables.Disposable d;
 
         SourceCompletableSubscriber(rx.CompletableSubscriber observer) {
             this.observer = observer;
         }
 
         @Override
-        public void onSubscribe(io.reactivex.disposables.Disposable d) {
+        public void onSubscribe(io.reactivex.rxjava3.disposables.Disposable d) {
             this.d = d;
             observer.onSubscribe(this);
         }

src/main/java/hu/akarnokd/rxjava/interop/DisposableV2ToSubscriptionV1.java src/main/java/hu/akarnokd/rxjava3/interop/DisposableV3ToSubscriptionV1.java

@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package hu.akarnokd.rxjava.interop;
+package hu.akarnokd.rxjava3.interop;
 
-import io.reactivex.disposables.Disposable;
+import io.reactivex.rxjava3.disposables.Disposable;
 import rx.Subscription;
 
 /**
- * Wraps a v2 Disposable and exposes it as a v1 Subscription.
+ * Wraps a v3 Disposable and exposes it as a v1 Subscription.
  * @since 0.11.0
  * @author Artem Zinnatulin
  */
-final class DisposableV2ToSubscriptionV1 implements Subscription {
+final class DisposableV3ToSubscriptionV1 implements Subscription {
 
     private final Disposable disposable;
 
-    DisposableV2ToSubscriptionV1(Disposable disposable) {
+    DisposableV3ToSubscriptionV1(Disposable disposable) {
         this.disposable = disposable;
     }
 

src/main/java/hu/akarnokd/rxjava/interop/FlowableV2ToObservableV1.java src/main/java/hu/akarnokd/rxjava3/interop/FlowableV3ToObservableV1.java

@@ -13,20 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package hu.akarnokd.rxjava.interop;
+package hu.akarnokd.rxjava3.interop;
 
 import java.util.concurrent.atomic.*;
 
 /**
- * Convert a V2 Flowable into a V1 Observable, composing backpressure and cancellation.
+ * Convert a V3 Flowable into a V1 Observable, composing backpressure and cancellation.
  *
  * @param <T> the value type
  */
-final class FlowableV2ToObservableV1<T> implements rx.Observable.OnSubscribe<T> {
+final class FlowableV3ToObservableV1<T> implements rx.Observable.OnSubscribe<T> {
 
     final org.reactivestreams.Publisher<T> source;
 
-    FlowableV2ToObservableV1(org.reactivestreams.Publisher<T> source) {
+    FlowableV3ToObservableV1(org.reactivestreams.Publisher<T> source) {
         this.source = source;
     }
 
@@ -42,7 +42,7 @@ public void call(rx.Subscriber<? super T> t) {
 
     static final class SourceSubscriber<T>
     extends AtomicReference<org.reactivestreams.Subscription>
-    implements io.reactivex.FlowableSubscriber<T>, rx.Subscription, rx.Producer {
+    implements io.reactivex.rxjava3.core.FlowableSubscriber<T>, rx.Subscription, rx.Producer {
 
         private static final long serialVersionUID = -6567012932544037069L;
 
@@ -58,23 +58,23 @@ static final class SourceSubscriber<T>
         @Override
         public void request(long n) {
             if (n != 0L) {
-                io.reactivex.internal.subscriptions.SubscriptionHelper.deferredRequest(this, requested, n);
+                io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper.deferredRequest(this, requested, n);
             }
         }
 
         @Override
         public void unsubscribe() {
-            io.reactivex.internal.subscriptions.SubscriptionHelper.cancel(this);
+            io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper.cancel(this);
         }
 
         @Override
         public boolean isUnsubscribed() {
-            return io.reactivex.internal.subscriptions.SubscriptionHelper.CANCELLED == get();
+            return io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper.CANCELLED == get();
         }
 
         @Override
         public void onSubscribe(org.reactivestreams.Subscription s) {
-            io.reactivex.internal.subscriptions.SubscriptionHelper.deferredSetOnce(this, requested, s);
+            io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper.deferredSetOnce(this, requested, s);
         }
 
         @Override

src/main/java/hu/akarnokd/rxjava/interop/MaybeV2ToCompletableV1.java src/main/java/hu/akarnokd/rxjava3/interop/MaybeV3ToCompletableV1.java

@@ -14,55 +14,55 @@
  * limitations under the License.
  */
 
-package hu.akarnokd.rxjava.interop;
+package hu.akarnokd.rxjava3.interop;
 
 import java.util.concurrent.atomic.AtomicReference;
 
 /**
- * Converts a V2 Maybe into a V1 Complete where an onSuccess value triggers onCompleted.
+ * Converts a V3 Maybe into a V1 Complete where an onSuccess value triggers onCompleted.
  *
  * @param <T> the value type
  */
-final class MaybeV2ToCompletableV1<T> implements rx.Completable.OnSubscribe {
+final class MaybeV3ToCompletableV1<T> implements rx.Completable.OnSubscribe {
 
-    final io.reactivex.MaybeSource<T> source;
+    final io.reactivex.rxjava3.core.MaybeSource<T> source;
 
-    MaybeV2ToCompletableV1(io.reactivex.MaybeSource<T> source) {
+    MaybeV3ToCompletableV1(io.reactivex.rxjava3.core.MaybeSource<T> source) {
         this.source = source;
     }
 
     @Override
     public void call(rx.CompletableSubscriber t) {
-        MaybeV2Observer<T> parent = new MaybeV2Observer<T>(t);
+        MaybeV3Observer<T> parent = new MaybeV3Observer<T>(t);
         t.onSubscribe(parent);
         source.subscribe(parent);
     }
 
-    static final class MaybeV2Observer<T>
-    extends AtomicReference<io.reactivex.disposables.Disposable>
-    implements io.reactivex.MaybeObserver<T>, rx.Subscription {
+    static final class MaybeV3Observer<T>
+    extends AtomicReference<io.reactivex.rxjava3.disposables.Disposable>
+    implements io.reactivex.rxjava3.core.MaybeObserver<T>, rx.Subscription {
 
         private static final long serialVersionUID = 5045507662443540605L;
 
         final rx.CompletableSubscriber actual;
 
-        MaybeV2Observer(rx.CompletableSubscriber actual) {
+        MaybeV3Observer(rx.CompletableSubscriber actual) {
             this.actual = actual;
         }
 
         @Override
         public void unsubscribe() {
-            io.reactivex.internal.disposables.DisposableHelper.dispose(this);
+            io.reactivex.rxjava3.internal.disposables.DisposableHelper.dispose(this);
         }
 
         @Override
         public boolean isUnsubscribed() {
-            return io.reactivex.internal.disposables.DisposableHelper.isDisposed(get());
+            return io.reactivex.rxjava3.internal.disposables.DisposableHelper.isDisposed(get());
         }
 
         @Override
-        public void onSubscribe(io.reactivex.disposables.Disposable d) {
-            io.reactivex.internal.disposables.DisposableHelper.setOnce(this, d);
+        public void onSubscribe(io.reactivex.rxjava3.disposables.Disposable d) {
+            io.reactivex.rxjava3.internal.disposables.DisposableHelper.setOnce(this, d);
         }
 
         @Override