Refactor packages

NaikSoftware · NaikSoftware · commit a2570f5220c4 · 2019-01-20T23:42:42.000+02:00
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/example-client/build.gradle b/example-client/build.gradle
@@ -49,14 +49,11 @@ dependencies {
     implementation 'androidx.recyclerview:recyclerview:1.0.0'
     implementation 'org.java-websocket:Java-WebSocket:1.3.6'
     implementation 'com.android.support:recyclerview-v7:28.0.0'
-
     // RxJava
-    // implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
-    implementation 'io.reactivex.rxjava2:rxjava:2.1.15'
-    implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
-
-    implementation 'com.squareup.retrofit2:converter-gson:2.4.0'
-    implementation 'com.squareup.retrofit2:adapter-rxjava2:2.4.0'
-    implementation 'com.squareup.retrofit2:retrofit:2.4.0'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.5'
+    implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.5.0'
+    implementation 'com.squareup.retrofit2:adapter-rxjava2:2.5.0'
+    implementation 'com.squareup.retrofit2:retrofit:2.5.0'
     implementation project(':lib')
 }
diff --git a/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java b/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
@@ -23,8 +23,8 @@
 import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
 import ua.naiksoftware.stomp.Stomp;
-import ua.naiksoftware.stomp.StompHeader;
-import ua.naiksoftware.stomp.client.StompClient;
+import ua.naiksoftware.stomp.dto.StompHeader;
+import ua.naiksoftware.stomp.StompClient;
 
 import static ua.naiksoftware.stompclientexample.RestClient.ANDROID_EMULATOR_LOCALHOST;
 
diff --git a/lib/build.gradle b/lib/build.gradle
@@ -53,19 +53,16 @@ android {
 
 
 dependencies {
-    implementation "io.reactivex.rxjava2:rxjava:2.1.15"
-
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.5'
     // Supported transports
     api 'org.java-websocket:Java-WebSocket:1.3.6'
-    api 'com.squareup.okhttp3:okhttp:3.11.0'
-    
+    api 'com.squareup.okhttp3:okhttp:3.12.1'
     implementation 'com.android.support:support-annotations:28.0.0'
-
-    testImplementation "com.andrewreitz:spock-android:2.0.0"
+    testImplementation 'com.andrewreitz:spock-android:2.0.0'
     testImplementation 'org.testcontainers:testcontainers:1.8.0'
     testImplementation 'org.spockframework:spock-core:1.1-groovy-2.4'
     testImplementation 'org.java-websocket:Java-WebSocket:1.3.6'
-    testImplementation 'com.squareup.okhttp3:okhttp:3.11.0'
+    testImplementation 'com.squareup.okhttp3:okhttp:3.12.1'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
 }
 
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/Stomp.java b/lib/src/main/java/ua/naiksoftware/stomp/Stomp.java
@@ -6,7 +6,8 @@
 import java.util.Map;
 
 import okhttp3.OkHttpClient;
-import ua.naiksoftware.stomp.client.StompClient;
+import ua.naiksoftware.stomp.provider.OkHttpConnectionProvider;
+import ua.naiksoftware.stomp.provider.WebSocketsConnectionProvider;
 
 /**
  * Supported overlays:
@@ -62,7 +63,7 @@ public static StompClient over(@NonNull ConnectionProvider connectionProvider, S
         throw new IllegalArgumentException("ConnectionProvider type not supported: " + connectionProvider.toString());
     }
 
-    private static StompClient createStompClient(ua.naiksoftware.stomp.ConnectionProvider connectionProvider) {
+    private static StompClient createStompClient(ua.naiksoftware.stomp.provider.ConnectionProvider connectionProvider) {
         return new StompClient(connectionProvider);
     }
 
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
@@ -1,4 +1,4 @@
-package ua.naiksoftware.stomp.client;
+package ua.naiksoftware.stomp;
 
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -17,9 +17,11 @@
 import io.reactivex.disposables.Disposable;
 import io.reactivex.subjects.BehaviorSubject;
 import io.reactivex.subjects.PublishSubject;
-import ua.naiksoftware.stomp.ConnectionProvider;
-import ua.naiksoftware.stomp.LifecycleEvent;
-import ua.naiksoftware.stomp.StompHeader;
+import ua.naiksoftware.stomp.dto.StompCommand;
+import ua.naiksoftware.stomp.dto.StompMessage;
+import ua.naiksoftware.stomp.provider.ConnectionProvider;
+import ua.naiksoftware.stomp.dto.LifecycleEvent;
+import ua.naiksoftware.stomp.dto.StompHeader;
 
 /**
  * Created by naik on 05.05.16.
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/dto/LifecycleEvent.java b/lib/src/main/java/ua/naiksoftware/stomp/dto/LifecycleEvent.java
@@ -1,4 +1,4 @@
-package ua.naiksoftware.stomp;
+package ua.naiksoftware.stomp.dto;
 
 
 import java.util.TreeMap;
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/dto/StompCommand.java b/lib/src/main/java/ua/naiksoftware/stomp/dto/StompCommand.java
@@ -1,4 +1,4 @@
-package ua.naiksoftware.stomp.client;
+package ua.naiksoftware.stomp.dto;
 
 /**
  * Created by naik on 05.05.16.
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/dto/StompHeader.java b/lib/src/main/java/ua/naiksoftware/stomp/dto/StompHeader.java
@@ -1,4 +1,4 @@
-package ua.naiksoftware.stomp;
+package ua.naiksoftware.stomp.dto;
 
 /**
  * Created by naik on 05.05.16.
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/dto/StompMessage.java b/lib/src/main/java/ua/naiksoftware/stomp/dto/StompMessage.java
@@ -1,4 +1,4 @@
-package ua.naiksoftware.stomp.client;
+package ua.naiksoftware.stomp.dto;
 
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -10,8 +10,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import ua.naiksoftware.stomp.StompHeader;
-
 /**
  * Created by naik on 05.05.16.
  */
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/provider/AbstractConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/provider/AbstractConnectionProvider.java
@@ -1,4 +1,4 @@
-package ua.naiksoftware.stomp;
+package ua.naiksoftware.stomp.provider;
 
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -12,16 +12,18 @@
 import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
 import io.reactivex.subjects.PublishSubject;
-import ua.naiksoftware.stomp.client.StompCommand;
-import ua.naiksoftware.stomp.client.StompMessage;
+import ua.naiksoftware.stomp.dto.LifecycleEvent;
+import ua.naiksoftware.stomp.dto.StompHeader;
+import ua.naiksoftware.stomp.dto.StompCommand;
+import ua.naiksoftware.stomp.dto.StompMessage;
 
 /**
  * Created by forresthopkinsa on 8/8/2017.
  * <p>
  * Created because there was a lot of shared code between JWS and OkHttp connection providers.
  */
 
-abstract class AbstractConnectionProvider implements ConnectionProvider {
+public abstract class AbstractConnectionProvider implements ConnectionProvider {
 
     private static final String TAG = AbstractConnectionProvider.class.getSimpleName();
 
@@ -40,7 +42,7 @@ abstract class AbstractConnectionProvider implements ConnectionProvider {
     @NonNull
     private final PublishSubject<String> mMessagesStream;
 
-    AbstractConnectionProvider() {
+    public AbstractConnectionProvider() {
         mLifecycleStream = PublishSubject.create();
         mMessagesStream = PublishSubject.create();
     }
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/provider/ConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/provider/ConnectionProvider.java
@@ -1,8 +1,8 @@
-package ua.naiksoftware.stomp;
+package ua.naiksoftware.stomp.provider;
 
 import io.reactivex.Completable;
-import io.reactivex.Flowable;
 import io.reactivex.Observable;
+import ua.naiksoftware.stomp.dto.LifecycleEvent;
 
 /**
  * Created by naik on 05.05.16.
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/provider/OkHttpConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/provider/OkHttpConnectionProvider.java
@@ -1,4 +1,4 @@
-package ua.naiksoftware.stomp;
+package ua.naiksoftware.stomp.provider;
 
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -15,8 +15,9 @@
 import okhttp3.WebSocket;
 import okhttp3.WebSocketListener;
 import okio.ByteString;
+import ua.naiksoftware.stomp.dto.LifecycleEvent;
 
-class OkHttpConnectionProvider extends AbstractConnectionProvider {
+public class OkHttpConnectionProvider extends AbstractConnectionProvider {
 
     public static final String TAG = "OkHttpConnProvider";
 
@@ -28,7 +29,7 @@ class OkHttpConnectionProvider extends AbstractConnectionProvider {
     @Nullable
     private WebSocket openSocket;
 
-    OkHttpConnectionProvider(String uri, @Nullable Map<String, String> connectHttpHeaders, OkHttpClient okHttpClient) {
+    public OkHttpConnectionProvider(String uri, @Nullable Map<String, String> connectHttpHeaders, OkHttpClient okHttpClient) {
         super();
         mUri = uri;
         mConnectHttpHeaders = connectHttpHeaders != null ? connectHttpHeaders : new HashMap<>();
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/provider/WebSocketsConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/provider/WebSocketsConnectionProvider.java
@@ -1,4 +1,4 @@
-package ua.naiksoftware.stomp;
+package ua.naiksoftware.stomp.provider;
 
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -10,6 +10,7 @@
 import org.java_websocket.exceptions.InvalidDataException;
 import org.java_websocket.handshake.ClientHandshake;
 import org.java_websocket.handshake.ServerHandshake;
+import ua.naiksoftware.stomp.dto.LifecycleEvent;
 
 import java.net.URI;
 import java.util.HashMap;
@@ -24,7 +25,7 @@
  * Created by naik on 05.05.16.
  */
 
-class WebSocketsConnectionProvider extends AbstractConnectionProvider {
+public class WebSocketsConnectionProvider extends AbstractConnectionProvider {
 
     private static final String TAG = WebSocketsConnectionProvider.class.getSimpleName();
 
@@ -41,7 +42,7 @@ class WebSocketsConnectionProvider extends AbstractConnectionProvider {
      *
      * @param connectHttpHeaders may be null
      */
-    WebSocketsConnectionProvider(String uri, @Nullable Map<String, String> connectHttpHeaders) {
+    public WebSocketsConnectionProvider(String uri, @Nullable Map<String, String> connectHttpHeaders) {
         mUri = uri;
         mConnectHttpHeaders = connectHttpHeaders != null ? connectHttpHeaders : new HashMap<>();
     }
diff --git a/lib/src/test/groovy/ua/naiksoftware/stomp/ConnectionTests.groovy b/lib/src/test/groovy/ua/naiksoftware/stomp/ConnectionTests.groovy
@@ -1,17 +1,9 @@
 package ua.naiksoftware.stomp
 
-import groovy.util.logging.Log4j
-import groovy.util.logging.Slf4j
-import io.reactivex.Flowable
-import io.reactivex.annotations.NonNull
+
 import io.reactivex.functions.Predicate
 import io.reactivex.subscribers.TestSubscriber
-import org.testcontainers.containers.GenericContainer
-import spock.lang.Shared
-import ua.naiksoftware.stomp.Configuration
-import ua.naiksoftware.stomp.Stomp
-
-import java.util.concurrent.TimeUnit
+import ua.naiksoftware.stomp.dto.LifecycleEvent
 
 class ConnectionTests extends Configuration {
 

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,8 @@`
`6`	`6`	`import java.util.Map;`
`7`	`7`
`8`	`8`	`import okhttp3.OkHttpClient;`
`9`		`-import ua.naiksoftware.stomp.client.StompClient;`
	`9`	`+import ua.naiksoftware.stomp.provider.OkHttpConnectionProvider;`
	`10`	`+import ua.naiksoftware.stomp.provider.WebSocketsConnectionProvider;`
`10`	`11`
`11`	`12`	`/**`
`12`	`13`	`* Supported overlays:`
`@@ -62,7 +63,7 @@ public static StompClient over(@NonNull ConnectionProvider connectionProvider, S`
`62`	`63`	`throw new IllegalArgumentException("ConnectionProvider type not supported: " + connectionProvider.toString());`
`63`	`64`	`}`
`64`	`65`
`65`		`- private static StompClient createStompClient(ua.naiksoftware.stomp.ConnectionProvider connectionProvider) {`
	`66`	`+ private static StompClient createStompClient(ua.naiksoftware.stomp.provider.ConnectionProvider connectionProvider) {`
`66`	`67`	`return new StompClient(connectionProvider);`
`67`	`68`	`}`
`68`	`69`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package ua.naiksoftware.stomp;`
	`1`	`+package ua.naiksoftware.stomp.dto;`
`2`	`2`
`3`	`3`
`4`	`4`	`import java.util.TreeMap;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package ua.naiksoftware.stomp.client;`
	`1`	`+package ua.naiksoftware.stomp.dto;`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`* Created by naik on 05.05.16.`