Fix example

Author: NaikSoftware

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

@@ -1,5 +1,6 @@
 package ua.naiksoftware.stompclientexample;
 
+import io.reactivex.Completable;
 import io.reactivex.Flowable;
 import retrofit2.http.POST;
 import retrofit2.http.Query;
@@ -10,5 +11,5 @@
 public interface ExampleRepository {
 
     @POST("hello-convert-and-send")
-    Flowable<Void> sendRestEcho(@Query("msg") String message);
+    Completable sendRestEcho(@Query("msg") String message);
 }

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

@@ -11,15 +11,13 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
-import org.java_websocket.WebSocket;
-
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 
-import io.reactivex.FlowableTransformer;
+import io.reactivex.CompletableTransformer;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
@@ -56,7 +54,7 @@ public void disconnectStomp(View view) {
     }
 
     public void connectStomp(View view) {
-        mStompClient = Stomp.over(WebSocket.class, "ws://" + ANDROID_EMULATOR_LOCALHOST
+        mStompClient = Stomp.over(Stomp.ConnectionProvider.JWS, "ws://" + ANDROID_EMULATOR_LOCALHOST
                 + ":" + RestClient.SERVER_PORT + "/example-endpoint/websocket");
 
         mStompClient.lifecycle()
@@ -91,7 +89,7 @@ public void connectStomp(View view) {
     public void sendEchoViaStomp(View v) {
         mStompClient.send("/topic/hello-msg-mapping", "Echo STOMP " + mTimeFormat.format(new Date()))
                 .compose(applySchedulers())
-                .subscribe(aVoid -> {
+                .subscribe(() -> {
                     Log.d(TAG, "STOMP echo send successfully");
                 }, throwable -> {
                     Log.e(TAG, "Error send STOMP echo", throwable);
@@ -103,7 +101,7 @@ public void sendEchoViaRest(View v) {
         mRestPingDisposable = RestClient.getInstance().getExampleRepository()
                 .sendRestEcho("Echo REST " + mTimeFormat.format(new Date()))
                 .compose(applySchedulers())
-                .subscribe(aVoid -> {
+                .subscribe(() -> {
                     Log.d(TAG, "REST echo send successfully");
                 }, throwable -> {
                     Log.e(TAG, "Error send REST echo", throwable);
@@ -122,8 +120,8 @@ private void toast(String text) {
         Toast.makeText(this, text, Toast.LENGTH_SHORT).show();
     }
 
-    protected <T> FlowableTransformer<T, T> applySchedulers() {
-        return tFlowable -> tFlowable
+    protected CompletableTransformer applySchedulers() {
+        return upstream -> upstream
                 .unsubscribeOn(Schedulers.newThread())
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread());

lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java

@@ -132,7 +132,6 @@ public void connect(@Nullable List<StompHeader> _headers) {
                 .subscribe(stompMessage -> {
                     mConnected = true;
                     isConnecting = false;
-//                    mConnectionFuture.complete(true);
                 });
     }