From fe39bd0d64ae90079d0907411439980219a399f1 Mon Sep 17 00:00:00 2001
From: Feivur <feivur.dev@gmail.com>
Date: Mon, 6 Apr 2020 14:08:21 +0300
Subject: [PATCH] migrate to rxJava3

---
 build.gradle                                        |  5 ++---
 .../rxjava/websocket/connection/Connection.java     |  2 +-
 .../rxjava/websocket/connection/LazyConnection.java | 13 ++++++-------
 .../connection/okhttp/OkHttpConnection.java         |  6 +++---
 .../websocket/processor/ChannelDistributor.java     | 12 ++++++------
 .../rxjava/websocket/processor/ChannelStream.java   | 10 +++++-----
 .../rxjava/websocket/processor/MessageSender.java   | 12 ++++++------
 .../rxjava/websocket/processor/StreamRouter.java    | 10 +++++-----
 .../rxjava/websocket/processor/WebSocket.java       |  2 +-
 .../websocket/processor/WebSocketClientProxy.java   |  4 ++--
 10 files changed, 37 insertions(+), 39 deletions(-)

diff --git a/build.gradle b/build.gradle
index 910b305..19da0f3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -31,9 +31,8 @@ task javadocJar(type: Jar) {
 }
 
 dependencies {
-    implementation "io.reactivex.rxjava2:rxjava:2.2.4"
-
-    compileOnly 'com.squareup.okhttp3:okhttp:3.12.0'
+    implementation 'io.reactivex.rxjava3:rxjava:3.0.0'
+    compileOnly 'com.squareup.okhttp3:okhttp:4.0.1'
     compileOnly 'com.google.code.gson:gson:2.8.5'
 }
 
diff --git a/src/main/java/kr/jadekim/rxjava/websocket/connection/Connection.java b/src/main/java/kr/jadekim/rxjava/websocket/connection/Connection.java
index d991366..48b0fc4 100644
--- a/src/main/java/kr/jadekim/rxjava/websocket/connection/Connection.java
+++ b/src/main/java/kr/jadekim/rxjava/websocket/connection/Connection.java
@@ -1,6 +1,6 @@
 package kr.jadekim.rxjava.websocket.connection;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 
 public interface Connection {
 
diff --git a/src/main/java/kr/jadekim/rxjava/websocket/connection/LazyConnection.java b/src/main/java/kr/jadekim/rxjava/websocket/connection/LazyConnection.java
index f462e19..dfd9f8f 100644
--- a/src/main/java/kr/jadekim/rxjava/websocket/connection/LazyConnection.java
+++ b/src/main/java/kr/jadekim/rxjava/websocket/connection/LazyConnection.java
@@ -1,8 +1,9 @@
 package kr.jadekim.rxjava.websocket.connection;
 
-import io.reactivex.Observable;
-import io.reactivex.ObservableSource;
-import io.reactivex.functions.Action;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.ObservableSource;
+import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.functions.Supplier;
 import kr.jadekim.rxjava.websocket.listener.WebSocketEventListener;
 
 import java.util.concurrent.Callable;
@@ -31,14 +32,12 @@ public String getUrl() {
 
     @Override
     public Observable<String> getInboundStream() {
-        return Observable.defer(new Callable<ObservableSource<String>>() {
-
+        return Observable.defer(new Supplier<ObservableSource<? extends String>>() {
             @Override
-            public ObservableSource<String> call() throws Exception {
+            public ObservableSource<? extends String> get() throws Throwable {
                 if (connection == null) {
                     connect();
                 }
-
                 return stream;
             }
         });
diff --git a/src/main/java/kr/jadekim/rxjava/websocket/connection/okhttp/OkHttpConnection.java b/src/main/java/kr/jadekim/rxjava/websocket/connection/okhttp/OkHttpConnection.java
index f4b93e2..9bc856f 100644
--- a/src/main/java/kr/jadekim/rxjava/websocket/connection/okhttp/OkHttpConnection.java
+++ b/src/main/java/kr/jadekim/rxjava/websocket/connection/okhttp/OkHttpConnection.java
@@ -1,8 +1,8 @@
 package kr.jadekim.rxjava.websocket.connection.okhttp;
 
-import io.reactivex.Observable;
-import io.reactivex.ObservableEmitter;
-import io.reactivex.ObservableOnSubscribe;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.ObservableEmitter;
+import io.reactivex.rxjava3.core.ObservableOnSubscribe;
 import kr.jadekim.rxjava.websocket.connection.Connection;
 import kr.jadekim.rxjava.websocket.listener.WebSocketEventListener;
 import okhttp3.*;
diff --git a/src/main/java/kr/jadekim/rxjava/websocket/processor/ChannelDistributor.java b/src/main/java/kr/jadekim/rxjava/websocket/processor/ChannelDistributor.java
index 39e39fd..655bd06 100644
--- a/src/main/java/kr/jadekim/rxjava/websocket/processor/ChannelDistributor.java
+++ b/src/main/java/kr/jadekim/rxjava/websocket/processor/ChannelDistributor.java
@@ -1,11 +1,11 @@
 package kr.jadekim.rxjava.websocket.processor;
 
-import io.reactivex.Observable;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Action;
-import io.reactivex.functions.Consumer;
-import io.reactivex.functions.Function;
-import io.reactivex.functions.Predicate;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.functions.Predicate;
 import kr.jadekim.rxjava.websocket.inbound.Inbound;
 import kr.jadekim.rxjava.websocket.inbound.InboundParser;
 import kr.jadekim.rxjava.websocket.listener.WebSocketEventListener;
diff --git a/src/main/java/kr/jadekim/rxjava/websocket/processor/ChannelStream.java b/src/main/java/kr/jadekim/rxjava/websocket/processor/ChannelStream.java
index 3d65e47..4e0794d 100644
--- a/src/main/java/kr/jadekim/rxjava/websocket/processor/ChannelStream.java
+++ b/src/main/java/kr/jadekim/rxjava/websocket/processor/ChannelStream.java
@@ -1,10 +1,10 @@
 package kr.jadekim.rxjava.websocket.processor;
 
-import io.reactivex.*;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Action;
-import io.reactivex.functions.Consumer;
-import io.reactivex.functions.Predicate;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.functions.Predicate;
 import kr.jadekim.rxjava.websocket.filter.ChannelFilter;
 import kr.jadekim.rxjava.websocket.listener.WebSocketEventListener;
 
diff --git a/src/main/java/kr/jadekim/rxjava/websocket/processor/MessageSender.java b/src/main/java/kr/jadekim/rxjava/websocket/processor/MessageSender.java
index 3a614fb..4716c7a 100644
--- a/src/main/java/kr/jadekim/rxjava/websocket/processor/MessageSender.java
+++ b/src/main/java/kr/jadekim/rxjava/websocket/processor/MessageSender.java
@@ -1,11 +1,11 @@
 package kr.jadekim.rxjava.websocket.processor;
 
-import io.reactivex.Completable;
-import io.reactivex.CompletableEmitter;
-import io.reactivex.CompletableOnSubscribe;
-import io.reactivex.functions.Consumer;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subjects.PublishSubject;
+import io.reactivex.rxjava3.core.Completable;
+import io.reactivex.rxjava3.core.CompletableEmitter;
+import io.reactivex.rxjava3.core.CompletableOnSubscribe;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.PublishSubject;
 import kr.jadekim.rxjava.websocket.connection.Connection;
 import kr.jadekim.rxjava.websocket.listener.WebSocketEventListener;
 import kr.jadekim.rxjava.websocket.outbound.OutboundSerializer;
diff --git a/src/main/java/kr/jadekim/rxjava/websocket/processor/StreamRouter.java b/src/main/java/kr/jadekim/rxjava/websocket/processor/StreamRouter.java
index a2b2ee2..e5653cf 100644
--- a/src/main/java/kr/jadekim/rxjava/websocket/processor/StreamRouter.java
+++ b/src/main/java/kr/jadekim/rxjava/websocket/processor/StreamRouter.java
@@ -1,10 +1,10 @@
 package kr.jadekim.rxjava.websocket.processor;
 
-import io.reactivex.Observable;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Action;
-import io.reactivex.functions.Consumer;
-import io.reactivex.functions.Function;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.functions.Function;
 import kr.jadekim.rxjava.websocket.inbound.Inbound;
 import kr.jadekim.rxjava.websocket.inbound.InboundParser;
 import kr.jadekim.rxjava.websocket.listener.WebSocketEventListener;
diff --git a/src/main/java/kr/jadekim/rxjava/websocket/processor/WebSocket.java b/src/main/java/kr/jadekim/rxjava/websocket/processor/WebSocket.java
index 771e1e4..a466151 100644
--- a/src/main/java/kr/jadekim/rxjava/websocket/processor/WebSocket.java
+++ b/src/main/java/kr/jadekim/rxjava/websocket/processor/WebSocket.java
@@ -1,6 +1,6 @@
 package kr.jadekim.rxjava.websocket.processor;
 
-import io.reactivex.Completable;
+import io.reactivex.rxjava3.core.Completable;
 import kr.jadekim.rxjava.websocket.connection.Connection;
 import kr.jadekim.rxjava.websocket.inbound.InboundParser;
 import kr.jadekim.rxjava.websocket.listener.WebSocketEventListener;
diff --git a/src/main/java/kr/jadekim/rxjava/websocket/processor/WebSocketClientProxy.java b/src/main/java/kr/jadekim/rxjava/websocket/processor/WebSocketClientProxy.java
index 20b30a5..ab598c2 100644
--- a/src/main/java/kr/jadekim/rxjava/websocket/processor/WebSocketClientProxy.java
+++ b/src/main/java/kr/jadekim/rxjava/websocket/processor/WebSocketClientProxy.java
@@ -1,6 +1,6 @@
 package kr.jadekim.rxjava.websocket.processor;
 
-import io.reactivex.*;
+import io.reactivex.rxjava3.core.*;
 import kr.jadekim.rxjava.websocket.annotation.*;
 
 import java.lang.annotation.Annotation;
@@ -58,7 +58,7 @@ void runMethod(Class clientClass, String sentence, Map<String, Object> parameter
         Matcher matcher = METHOD_PATTERN.matcher(sentence);
 
         if (!matcher.find()) {
-            throw new IllegalArgumentException("올바르지 않은 값입니다. : " + sentence);
+            throw new IllegalArgumentException("Wrong value:" + sentence);
         }
 
         String onStartMethodName = matcher.group();