Merge pull request #54 from hardyeats/rxjava2

Issue #48 : Convert from RxJava 1 to RxJava 2.

Author: NaikSoftware

example-client/build.gradle

@@ -31,9 +31,9 @@ dependencies {
     compile 'com.android.support:appcompat-v7:25.2.0'
     compile 'org.java-websocket:java-websocket:1.3.2'
     compile 'com.android.support:recyclerview-v7:25.2.0'
-    compile 'io.reactivex:rxandroid:1.2.1'
-    compile 'com.squareup.retrofit2:converter-gson:2.1.0'
-    compile 'com.squareup.retrofit2:adapter-rxjava:2.1.0'
-    compile 'com.squareup.retrofit2:retrofit:2.1.0'
+    compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
+    compile 'com.squareup.retrofit2:converter-gson:2.3.0'
+    compile 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
+    compile 'com.squareup.retrofit2:retrofit:2.3.0'
     compile project(':lib')
 }

example-client/src/main/java/ua/naiksoftware/stompclientexample/ExampleRepository.java

@@ -1,14 +1,14 @@
 package ua.naiksoftware.stompclientexample;
 
+import io.reactivex.Flowable;
 import retrofit2.http.POST;
 import retrofit2.http.Query;
-import rx.Observable;
 
 /**
  * Created by Naik on 24.02.17.
  */
 public interface ExampleRepository {
 
     @POST("hello-convert-and-send")
-    Observable<Void> sendRestEcho(@Query("msg") String message);
+    Flowable<Void> sendRestEcho(@Query("msg") String message);
 }

example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java

@@ -1,7 +1,7 @@
 package ua.naiksoftware.stompclientexample;
 
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
@@ -19,10 +19,10 @@
 import java.util.List;
 import java.util.Locale;
 
-import rx.Observable;
-import rx.Subscription;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.FlowableTransformer;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
 import ua.naiksoftware.stomp.Stomp;
 import ua.naiksoftware.stomp.client.StompClient;
 
@@ -35,7 +35,7 @@ public class MainActivity extends AppCompatActivity {
     private SimpleAdapter mAdapter;
     private List<String> mDataSet = new ArrayList<>();
     private StompClient mStompClient;
-    private Subscription mRestPingSubscription;
+    private Disposable mRestPingDisposable;
     private final SimpleDateFormat mTimeFormat = new SimpleDateFormat("HH:mm:ss", Locale.getDefault());
     private RecyclerView mRecyclerView;
     private Gson mGson = new GsonBuilder().create();
@@ -100,7 +100,7 @@ public void sendEchoViaStomp(View v) {
     }
 
     public void sendEchoViaRest(View v) {
-        mRestPingSubscription = RestClient.getInstance().getExampleRepository()
+        mRestPingDisposable = RestClient.getInstance().getExampleRepository()
                 .sendRestEcho("Echo REST " + mTimeFormat.format(new Date()))
                 .compose(applySchedulers())
                 .subscribe(aVoid -> {
@@ -122,8 +122,8 @@ private void toast(String text) {
         Toast.makeText(this, text, Toast.LENGTH_SHORT).show();
     }
 
-    protected <T> Observable.Transformer<T, T> applySchedulers() {
-        return rObservable -> rObservable
+    protected <T> FlowableTransformer<T, T> applySchedulers() {
+        return tFlowable -> tFlowable
                 .unsubscribeOn(Schedulers.newThread())
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread());
@@ -132,7 +132,7 @@ protected <T> Observable.Transformer<T, T> applySchedulers() {
     @Override
     protected void onDestroy() {
         mStompClient.disconnect();
-        if (mRestPingSubscription != null) mRestPingSubscription.unsubscribe();
+        if (mRestPingDisposable != null) mRestPingDisposable.dispose();
         super.onDestroy();
     }
 }

example-client/src/main/java/ua/naiksoftware/stompclientexample/RestClient.java

@@ -1,7 +1,7 @@
 package ua.naiksoftware.stompclientexample;
 
 import retrofit2.Retrofit;
-import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory;
+import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
 import retrofit2.converter.gson.GsonConverterFactory;
 
 /**
@@ -33,7 +33,7 @@ public static RestClient getInstance() {
     private RestClient() {
         Retrofit retrofit = new Retrofit.Builder().baseUrl("http://" + ANDROID_EMULATOR_LOCALHOST + ":" + SERVER_PORT + "/")
                 .addConverterFactory(GsonConverterFactory.create())
-                .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
+                .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
                 .build();
         mExampleRepository = retrofit.create(ExampleRepository.class);
     }

lib/build.gradle

@@ -32,7 +32,7 @@ android {
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     testCompile 'junit:junit:4.12'
-    compile 'io.reactivex:rxjava:1.2.0'
+    compile "io.reactivex.rxjava2:rxjava:2.1.2"
     // Supported transports
     provided "org.java-websocket:java-websocket:1.3.2"
     provided 'com.squareup.okhttp3:okhttp:3.8.0'

lib/src/main/java/ua/naiksoftware/stomp/ConnectionProvider.java

@@ -1,6 +1,6 @@
 package ua.naiksoftware.stomp;
 
-import rx.Observable;
+import io.reactivex.Flowable;
 
 /**
  * Created by naik on 05.05.16.
@@ -10,17 +10,17 @@ public interface ConnectionProvider {
     /**
      * Subscribe this for receive stomp messages
      */
-    Observable<String> messages();
+    Flowable<String> messages();
 
     /**
      * Sending stomp messages via you ConnectionProvider.
      * onError if not connected or error detected will be called, or onCompleted id sending started
      * TODO: send messages with ACK
      */
-    Observable<Void> send(String stompMessage);
+    Flowable<Void> send(String stompMessage);
 
     /**
      * Subscribe this for receive #LifecycleEvent events
      */
-    Observable<LifecycleEvent> getLifecycleReceiver();
+    Flowable<LifecycleEvent> getLifecycleReceiver();
 }

lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java

@@ -9,15 +9,16 @@
 import java.util.Map;
 import java.util.TreeMap;
 
+import io.reactivex.BackpressureStrategy;
+import io.reactivex.Flowable;
+import io.reactivex.FlowableEmitter;
 import okhttp3.Headers;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
 import okhttp3.WebSocket;
 import okhttp3.WebSocketListener;
 import okio.ByteString;
-import rx.Observable;
-import rx.Subscriber;
 
 /* package */ class OkHttpConnectionProvider implements ConnectionProvider {
 
@@ -27,40 +28,37 @@
     private final Map<String, String> mConnectHttpHeaders;
     private final OkHttpClient mOkHttpClient;
 
-    private final List<Subscriber<? super LifecycleEvent>> mLifecycleSubscribers;
-    private final List<Subscriber<? super String>> mMessagesSubscribers;
+    private final List<FlowableEmitter<? super LifecycleEvent>> mLifecycleEmitters;
+    private final List<FlowableEmitter<? super String>> mMessagesEmitters;
 
     private WebSocket openedSocked;
 
 
     /* package */ OkHttpConnectionProvider(String uri, Map<String, String> connectHttpHeaders, OkHttpClient okHttpClient) {
         mUri = uri;
         mConnectHttpHeaders = connectHttpHeaders != null ? connectHttpHeaders : new HashMap<>();
-        mLifecycleSubscribers = new ArrayList<>();
-        mMessagesSubscribers = new ArrayList<>();
+        mLifecycleEmitters = new ArrayList<>();
+        mMessagesEmitters = new ArrayList<>();
         mOkHttpClient = okHttpClient;
     }
 
     @Override
-    public Observable<String> messages() {
-        Observable<String> observable = Observable.<String>create(subscriber -> {
-            mMessagesSubscribers.add(subscriber);
-
-        }).doOnUnsubscribe(() -> {
-            Iterator<Subscriber<? super String>> iterator = mMessagesSubscribers.iterator();
-            while (iterator.hasNext()) {
-                if (iterator.next().isUnsubscribed()) iterator.remove();
-            }
-
-            if (mMessagesSubscribers.size() < 1) {
-                Log.d(TAG, "Close web socket connection now in thread " + Thread.currentThread());
-                openedSocked.close(1000, "");
-                openedSocked = null;
-            }
-        });
+    public Flowable<String> messages() {
+        Flowable<String> flowable = Flowable.<String>create(mMessagesEmitters::add, BackpressureStrategy.BUFFER)
+            .doOnCancel(() -> {
+                Iterator<FlowableEmitter<? super String>> iterator = mMessagesEmitters.iterator();
+                while (iterator.hasNext()) {
+                    if (iterator.next().isCancelled()) iterator.remove();
+                }
 
+                if (mMessagesEmitters.size() < 1) {
+                    Log.d(TAG, "Close web socket connection now in thread " + Thread.currentThread());
+                    openedSocked.close(1000, "");
+                    openedSocked = null;
+                }
+            });
         createWebSocketConnection();
-        return observable;
+        return flowable;
     }
 
     private void createWebSocketConnection() {
@@ -112,29 +110,27 @@ public void onFailure(WebSocket webSocket, Throwable t, Response response) {
     }
 
     @Override
-    public Observable<Void> send(String stompMessage) {
-        return Observable.create(subscriber -> {
+    public Flowable<Void> send(String stompMessage) {
+        return Flowable.create(subscriber -> {
             if (openedSocked == null) {
                 subscriber.onError(new IllegalStateException("Not connected yet"));
             } else {
                 Log.d(TAG, "Send STOMP message: " + stompMessage);
                 openedSocked.send(stompMessage);
-                subscriber.onCompleted();
+                subscriber.onComplete();
             }
-        });
+        }, BackpressureStrategy.BUFFER);
     }
 
     @Override
-    public Observable<LifecycleEvent> getLifecycleReceiver() {
-        return Observable.<LifecycleEvent>create(subscriber -> {
-            mLifecycleSubscribers.add(subscriber);
-
-        }).doOnUnsubscribe(() -> {
-            Iterator<Subscriber<? super LifecycleEvent>> iterator = mLifecycleSubscribers.iterator();
-            while (iterator.hasNext()) {
-                if (iterator.next().isUnsubscribed()) iterator.remove();
-            }
-        });
+    public Flowable<LifecycleEvent> getLifecycleReceiver() {
+        return Flowable.<LifecycleEvent>create(mLifecycleEmitters::add, BackpressureStrategy.BUFFER)
+            .doOnCancel(() -> {
+                Iterator<FlowableEmitter<? super LifecycleEvent>> iterator = mLifecycleEmitters.iterator();
+                while (iterator.hasNext()) {
+                    if (iterator.next().isCancelled()) iterator.remove();
+                }
+            });
     }
 
     private TreeMap<String, String> headersAsMap(Response response) {
@@ -154,14 +150,14 @@ private void addConnectionHeadersToBuilder(Request.Builder requestBuilder, Map<S
 
     private void emitLifecycleEvent(LifecycleEvent lifecycleEvent) {
         Log.d(TAG, "Emit lifecycle event: " + lifecycleEvent.getType().name());
-        for (Subscriber<? super LifecycleEvent> subscriber : mLifecycleSubscribers) {
+        for (FlowableEmitter<? super LifecycleEvent> subscriber : mLifecycleEmitters) {
             subscriber.onNext(lifecycleEvent);
         }
     }
 
     private void emitMessage(String stompMessage) {
         Log.d(TAG, "Emit STOMP message: " + stompMessage);
-        for (Subscriber<? super String> subscriber : mMessagesSubscribers) {
+        for (FlowableEmitter<? super String> subscriber : mMessagesEmitters) {
             subscriber.onNext(stompMessage);
         }
     }