Merge branch 'okhttp3' into 'master'

Use okhttp3 instead of old one



See merge request !5

Author: jacek-marchwicki

README.md

@@ -2,7 +2,7 @@
 JavaWebsocketClient is library is simple library for Websocket connection in rx for java and Android.
 It is designed to be fast and fault tolerant.
 
-Currently we use okhttp for websocket connection because okhttp is simple and well tested solution.
+Currently we use okhttp3 for websocket connection because okhttp3 is simple and well tested solution.
 
 [![Build Status](https://travis-ci.org/jacek-marchwicki/JavaWebsocketClient.svg?branch=master)](https://travis-ci.org/jacek-marchwicki/JavaWebsocketClient)
 [![Build Status](https://gitlab-ci.appunite.net/projects/33/status.png?ref=master)](https://gitlab-ci.appunite.net/projects/33?ref=master)
@@ -100,7 +100,7 @@ To run example first run [websocket server](websockets-server/README.md), than u
 to your gradle file:
 
 ```groovy
-compile "com.appunite:websockets-rxjava:3.0.0"
+compile "com.appunite:websockets-rxjava:4.0.0"
 ```
 		
 ## License

websockets-rxjava-example/src/main/java/com/appunite/socket/MainActivity.java

@@ -33,8 +33,8 @@
 import com.example.model.MessageType;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.squareup.okhttp.OkHttpClient;
-import com.squareup.okhttp.Request;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
 
 import rx.android.schedulers.AndroidSchedulers;
 import rx.android.view.ViewActions;

websockets-rxjava-example/src/test/java/com/example/RxObjectWebSocketsRealTest.java

@@ -23,8 +23,8 @@
 import com.example.model.MessageType;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.squareup.okhttp.OkHttpClient;
-import com.squareup.okhttp.Request;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
 
 import org.junit.Before;
 import org.junit.Ignore;

websockets-rxjava-example/src/test/java/com/example/RxWebSocketsRealTest.java

@@ -18,8 +18,8 @@
 
 import com.appunite.websocket.rx.RxWebSockets;
 import com.appunite.websocket.rx.messages.RxEvent;
-import com.squareup.okhttp.OkHttpClient;
-import com.squareup.okhttp.Request;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
 
 import org.junit.Before;
 import org.junit.Ignore;

websockets-rxjava-example/src/test/java/com/example/SocketRealTest.java

@@ -24,8 +24,8 @@
 import com.example.model.MessageType;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.squareup.okhttp.OkHttpClient;
-import com.squareup.okhttp.Request;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
 
 import org.junit.Before;
 import org.junit.Ignore;

websockets-rxjava/build.gradle

@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    compile 'com.squareup.okhttp:okhttp-ws:2.5.0'
+    compile 'com.squareup.okhttp3:okhttp-ws:3.1.1'
     compile "io.reactivex:rxjava:1.0.9"
     compile "com.google.code.findbugs:jsr305:2.0.1"
 
@@ -46,7 +46,7 @@ signing {
 }
 group = "com.appunite"
 archivesBaseName = "websockets-rxjava"
-version = "3.0.1"
+version = "4.0.0"
 
 if (!project.hasProperty("ossrhUsername")) {
     project.ext.setProperty("ossrhUsername", null)

websockets-rxjava/src/main/java/com/appunite/websocket/rx/RxMoreObservables.java

@@ -21,14 +21,15 @@
 import com.appunite.websocket.rx.object.RxObjectWebSockets;
 import com.appunite.websocket.rx.object.messages.RxObjectEventConn;
 import com.appunite.websocket.rx.messages.RxEventConn;
-import com.squareup.okhttp.ws.WebSocket;
+
+import okhttp3.RequestBody;
+import okhttp3.ws.WebSocket;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javax.annotation.Nonnull;
 
-import okio.Buffer;
 import rx.Observable;
 import rx.Observer;
 import rx.Subscriber;
@@ -48,7 +49,7 @@ private static Observable<Object> sendMessage(final @Nonnull WebSocket sender, f
             public void call(Subscriber<? super Object> subscriber) {
                 try {
                     logger.log(Level.FINE, "sendStringMessage: {0}", message);
-                    sender.sendMessage(WebSocket.PayloadType.TEXT, new Buffer().writeUtf8(message));
+                    sender.sendMessage(RequestBody.create(WebSocket.TEXT, message));
                     subscriber.onNext(new Object());
                     subscriber.onCompleted();
                 } catch (Exception e) {

websockets-rxjava/src/main/java/com/appunite/websocket/rx/RxWebSockets.java

@@ -23,20 +23,20 @@
 import com.appunite.websocket.rx.messages.RxEventDisconnected;
 import com.appunite.websocket.rx.messages.RxEventPong;
 import com.appunite.websocket.rx.messages.RxEventStringMessage;
-import com.squareup.okhttp.OkHttpClient;
-import com.squareup.okhttp.Request;
-import com.squareup.okhttp.Response;
-import com.squareup.okhttp.ws.WebSocket;
-import com.squareup.okhttp.ws.WebSocketCall;
-import com.squareup.okhttp.ws.WebSocketListener;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+import okhttp3.ws.WebSocket;
+import okhttp3.ws.WebSocketCall;
+import okhttp3.ws.WebSocketListener;
 
 import java.io.IOException;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import okio.Buffer;
-import okio.BufferedSource;
 import rx.Observable;
 import rx.Subscriber;
 import rx.functions.Action0;
@@ -122,19 +122,19 @@ private void returnException(IOException e) {
                     }
 
                     @Override
-                    public void onMessage(BufferedSource payload, WebSocket.PayloadType type) throws IOException {
+                    public void onMessage(ResponseBody message) throws IOException {
                         try {
                             final WebSocket sender = webSocketOrNull();
                             if (sender == null) {
                                 return;
                             }
-                            if (WebSocket.PayloadType.BINARY.equals(type)) {
-                                subscriber.onNext(new RxEventBinaryMessage(sender, payload.readByteArray()));
-                            } else if (WebSocket.PayloadType.TEXT.equals(type)) {
-                                subscriber.onNext(new RxEventStringMessage(sender, payload.readUtf8()));
+                            if (WebSocket.BINARY.equals(message.contentType())) {
+                                subscriber.onNext(new RxEventBinaryMessage(sender, message.bytes()));
+                            } else if (WebSocket.TEXT.equals(message.contentType())) {
+                                subscriber.onNext(new RxEventStringMessage(sender, message.string()));
                             }
                         } finally {
-                            payload.close();
+                            message.close();
                         }
                     }
 

websockets-rxjava/src/main/java/com/appunite/websocket/rx/messages/RxEventBinaryMessage.java

@@ -16,7 +16,7 @@
 
 package com.appunite.websocket.rx.messages;
 
-import com.squareup.okhttp.ws.WebSocket;
+import okhttp3.ws.WebSocket;
 
 import java.util.Arrays;
 

websockets-rxjava/src/main/java/com/appunite/websocket/rx/messages/RxEventBinaryMessageAbs.java

@@ -16,7 +16,7 @@
 
 package com.appunite.websocket.rx.messages;
 
-import com.squareup.okhttp.ws.WebSocket;
+import okhttp3.ws.WebSocket;
 
 import javax.annotation.Nonnull;