Preparing for release

Author: forresthopkinsa

README.md

@@ -4,7 +4,7 @@
 
 ## Overview
 
-**Note that this is a FORK of a project by NaikSoftware! This version is purely to avoid using RetroLambda!**
+**Note that this is a FORK of a project by NaikSoftware! This version is made to avoid using RetroLambda! (Scroll down to see other changes)**
 
 This library provides support for [STOMP protocol](https://stomp.github.io/) over Websockets.
 
@@ -19,7 +19,7 @@ repositories {
     maven { url "https://jitpack.io" }
 }
 dependencies {
-    compile 'com.github.forresthopkinsa:StompProtocolAndroid:{latest version}'
+    compile 'com.github.forresthopkinsa:StompProtocolAndroid:1.4.0'
 }
 ```
 
@@ -29,11 +29,17 @@ You can use this library two ways:
   - If you have Java 8 compatiblity and Jack enabled, this library will work for you
 - Using the new Native Java 8 support
   - As of this writing, you must be using Android Studio Canary to use this feature.
+  - Has been tested in the following environments:
+    - Canary 9, Gradle plugin v3.0.0-alpha9
+    - Canary 8, Gradle plugin v3.0.0-alpha8
+  - It *should* work in all 3.0.0+ versions
   - You can find more info on the [Releases Page](https://github.com/forresthopkinsa/StompProtocolAndroid/releases)
 
 However, *this fork is NOT compatible with Retrolambda.*
 If you have RL as a dependency, then you should be using the [upstream version](https://github.com/NaikSoftware/StompProtocolAndroid) of this project!
 
+Finally, please take bugs and questions to the [Issues page](https://github.com/forresthopkinsa/StompProtocolAndroid/issues)! I'll try to answer within one business day.
+
 ## Example backend (Spring Boot)
 
 **WebSocketConfig.java**
@@ -71,7 +77,7 @@ class SocketController {
 }
 ```
 
-Check out the full example server https://github.com/NaikSoftware/stomp-protocol-example-server
+Check out the [full example server](https://github.com/NaikSoftware/stomp-protocol-example-server)
 
 ## Example library usage
 
@@ -104,7 +110,7 @@ Check out the full example server https://github.com/NaikSoftware/stomp-protocol
 
 ```
 
-See the full example https://github.com/NaikSoftware/StompProtocolAndroid/tree/master/example-client
+See the [full example](https://github.com/NaikSoftware/StompProtocolAndroid/tree/master/example-client)
 
 Method `Stomp.over` consume class for create connection as first parameter.
 You must provide dependency for lib and pass class.
@@ -134,7 +140,7 @@ client.lifecycle().subscribe(lifecycleEvent -> {
 
 **Custom client**
 
-You can use a custom OkHttpClient (for example, [if you want to allow untrusted HTTPS](getUnsafeOkHttpClient())) using the four-argument overload of Stomp.over, like so:
+You can use a custom OkHttpClient (for example, [if you want to allow untrusted HTTPS](https://gist.github.com/grow2014/b6969d8f0cfc0f0a1b2bf12f84973dec)) using the four-argument overload of Stomp.over, like so:
 
 ``` java
 client = Stomp.over(WebSocket.class, address, null, getUnsafeOkHttpClient());

lib/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 
-group='com.github.NaikSoftware'
+group='com.github.forresthopkinsa'
 
 android {
     compileSdkVersion 25
@@ -37,6 +37,7 @@ dependencies {
     // Supported transports
     compile 'org.java-websocket:java-websocket:1.3.2'
     compile 'com.squareup.okhttp3:okhttp:3.8.1'
+    implementation 'com.android.support:support-annotations:24.2.0'
 }
 
 task sourcesJar(type: Jar) {

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

@@ -1,6 +1,6 @@
 package ua.naiksoftware.stomp;
 
-import org.java_websocket.WebSocket;
+import android.support.annotation.Nullable;
 
 import java.util.Map;
 
@@ -19,19 +19,19 @@
  */
 public class Stomp {
 
-    public static StompClient over(Class clazz, String uri) {
-        return over(clazz, uri, null, null);
+    public static StompClient over(Transport transport, String uri) {
+        return over(transport, uri, null, null);
     }
 
     /**
      *
-     * @param clazz class for using as transport
+     * @param transport transport method
      * @param uri URI to connect
      * @param connectHttpHeaders HTTP headers, will be passed with handshake query, may be null
      * @return StompClient for receiving and sending messages. Call #StompClient.connect
      */
-    public static StompClient over(Class clazz, String uri, Map<String, String> connectHttpHeaders) {
-        return over(clazz, uri, connectHttpHeaders, null);
+    public static StompClient over(Transport transport, String uri, Map<String, String> connectHttpHeaders) {
+        return over(transport, uri, connectHttpHeaders, null);
     }
 
     /**
@@ -40,49 +40,32 @@ public static StompClient over(Class clazz, String uri, Map<String, String> conn
      *     <li>{@code org.java_websocket.WebSocket}: cannot accept an existing client</li>
      *     <li>{@code okhttp3.WebSocket}: can accept a non-null instance of {@code okhttp3.OkHttpClient}</li>
      * </ul>
-     * @param clazz class for using as transport
+     * @param transport transport method
      * @param uri URI to connect
      * @param connectHttpHeaders HTTP headers, will be passed with handshake query, may be null
-     * @param webSocketClient Existing client that will be used to open the WebSocket connection, may be null to use default client
+     * @param okHttpClient Existing client that will be used to open the WebSocket connection, may be null to use default client
      * @return StompClient for receiving and sending messages. Call #StompClient.connect
      */
-    public static StompClient over(Class clazz, String uri, Map<String, String> connectHttpHeaders, Object webSocketClient) {
-        try {
-            if (Class.forName("org.java_websocket.WebSocket") != null && clazz == WebSocket.class) {
-
-                if (webSocketClient != null) {
-                    throw new IllegalArgumentException("You cannot pass a webSocketClient with 'org.java_websocket.WebSocket'. use null instead.");
-                }
-
-                return createStompClient(new WebSocketsConnectionProvider(uri, connectHttpHeaders));
+    public static StompClient over(Transport transport, String uri, @Nullable Map<String, String> connectHttpHeaders, @Nullable OkHttpClient okHttpClient) {
+        if (transport == Transport.JWS) {
+            if (okHttpClient != null) {
+                throw new IllegalArgumentException("You cannot pass a webSocketClient with 'org.java_websocket.WebSocket'. use null instead.");
             }
-        } catch (ClassNotFoundException e) {}
-        try {
-            if (Class.forName("okhttp3.WebSocket") != null && clazz == okhttp3.WebSocket.class) {
-
-                OkHttpClient okHttpClient = getOkHttpClient(webSocketClient);
+            return createStompClient(new WebSocketsConnectionProvider(uri, connectHttpHeaders));
+        }
 
-                return createStompClient(new OkHttpConnectionProvider(uri, connectHttpHeaders, okHttpClient));
-            }
-        } catch (ClassNotFoundException e) {}
+        if (transport == Transport.OKHTTP) {
+            return createStompClient(new OkHttpConnectionProvider(uri, connectHttpHeaders, (okHttpClient == null) ? new OkHttpClient() : okHttpClient));
+        }
 
-        throw new RuntimeException("Not supported overlay transport: " + clazz.getName());
+        throw new IllegalArgumentException("Transport type not supported: " + transport.toString());
     }
 
     private static StompClient createStompClient(ConnectionProvider connectionProvider) {
         return new StompClient(connectionProvider);
     }
 
-    private static OkHttpClient getOkHttpClient(Object webSocketClient) {
-        if (webSocketClient != null) {
-            if (webSocketClient instanceof OkHttpClient) {
-                return (OkHttpClient) webSocketClient;
-            } else {
-                throw new IllegalArgumentException("You must pass a non-null instance of an 'okhttp3.OkHttpClient'. Or pass null to use a default websocket client.");
-            }
-        } else {
-            // default http client
-            return new OkHttpClient();
-        }
+    public enum Transport {
+        OKHTTP, JWS
     }
 }