Connection 패키지명 변경

jdekim43 · jdekim43 · commit 8c74d6cd5fc4 · 2019-02-18T20:38:23.000+01:00
diff --git a/src/main/java/kr/jadekim/rxjava/websocket/JWebSocket.java b/src/main/java/kr/jadekim/rxjava/websocket/JWebSocket.java
@@ -1,9 +1,9 @@
 package kr.jadekim.rxjava.websocket;
 
 import kr.jadekim.rxjava.websocket.annotation.WebSocketClient;
-import kr.jadekim.rxjava.websocket.httpclient.Connection;
-import kr.jadekim.rxjava.websocket.httpclient.ConnectionFactory;
-import kr.jadekim.rxjava.websocket.httpclient.LazyConnectionFactory;
+import kr.jadekim.rxjava.websocket.connection.Connection;
+import kr.jadekim.rxjava.websocket.connection.ConnectionFactory;
+import kr.jadekim.rxjava.websocket.connection.LazyConnectionFactory;
 import kr.jadekim.rxjava.websocket.inbound.InboundParser;
 import kr.jadekim.rxjava.websocket.listener.SimpleWebSocketEventListener;
 import kr.jadekim.rxjava.websocket.listener.WebSocketEventListener;
diff --git a/src/main/java/kr/jadekim/rxjava/websocket/annotation/WebSocketClient.java b/src/main/java/kr/jadekim/rxjava/websocket/annotation/WebSocketClient.java
@@ -1,7 +1,7 @@
 package kr.jadekim.rxjava.websocket.annotation;
 
-import kr.jadekim.rxjava.websocket.httpclient.ConnectionFactory;
-import kr.jadekim.rxjava.websocket.httpclient.okhttp.OkHttpConnectionFactory;
+import kr.jadekim.rxjava.websocket.connection.ConnectionFactory;
+import kr.jadekim.rxjava.websocket.connection.okhttp.OkHttpConnectionFactory;
 import kr.jadekim.rxjava.websocket.inbound.DefaultInboundParser;
 import kr.jadekim.rxjava.websocket.inbound.InboundParser;
 import kr.jadekim.rxjava.websocket.listener.SimpleWebSocketEventListener;
diff --git a/src/main/java/kr/jadekim/rxjava/websocket/connection/Connection.java b/src/main/java/kr/jadekim/rxjava/websocket/connection/Connection.java
@@ -1,4 +1,4 @@
-package kr.jadekim.rxjava.websocket.httpclient;
+package kr.jadekim.rxjava.websocket.connection;
 
 import io.reactivex.Observable;
 
diff --git a/src/main/java/kr/jadekim/rxjava/websocket/connection/ConnectionFactory.java b/src/main/java/kr/jadekim/rxjava/websocket/connection/ConnectionFactory.java
@@ -1,4 +1,4 @@
-package kr.jadekim.rxjava.websocket.httpclient;
+package kr.jadekim.rxjava.websocket.connection;
 
 import kr.jadekim.rxjava.websocket.listener.WebSocketEventListener;
 
diff --git a/src/main/java/kr/jadekim/rxjava/websocket/connection/LazyConnection.java b/src/main/java/kr/jadekim/rxjava/websocket/connection/LazyConnection.java
@@ -1,4 +1,4 @@
-package kr.jadekim.rxjava.websocket.httpclient;
+package kr.jadekim.rxjava.websocket.connection;
 
 import io.reactivex.Observable;
 import io.reactivex.ObservableSource;
diff --git a/src/main/java/kr/jadekim/rxjava/websocket/connection/LazyConnectionFactory.java b/src/main/java/kr/jadekim/rxjava/websocket/connection/LazyConnectionFactory.java
@@ -1,4 +1,4 @@
-package kr.jadekim.rxjava.websocket.httpclient;
+package kr.jadekim.rxjava.websocket.connection;
 
 import kr.jadekim.rxjava.websocket.listener.WebSocketEventListener;
 
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
@@ -1,9 +1,9 @@
-package kr.jadekim.rxjava.websocket.httpclient.okhttp;
+package kr.jadekim.rxjava.websocket.connection.okhttp;
 
 import io.reactivex.Observable;
 import io.reactivex.ObservableEmitter;
 import io.reactivex.ObservableOnSubscribe;
-import kr.jadekim.rxjava.websocket.httpclient.Connection;
+import kr.jadekim.rxjava.websocket.connection.Connection;
 import kr.jadekim.rxjava.websocket.listener.WebSocketEventListener;
 import okhttp3.*;
 import okio.ByteString;
diff --git a/src/main/java/kr/jadekim/rxjava/websocket/connection/okhttp/OkHttpConnectionFactory.java b/src/main/java/kr/jadekim/rxjava/websocket/connection/okhttp/OkHttpConnectionFactory.java
@@ -1,7 +1,7 @@
-package kr.jadekim.rxjava.websocket.httpclient.okhttp;
+package kr.jadekim.rxjava.websocket.connection.okhttp;
 
-import kr.jadekim.rxjava.websocket.httpclient.Connection;
-import kr.jadekim.rxjava.websocket.httpclient.ConnectionFactory;
+import kr.jadekim.rxjava.websocket.connection.Connection;
+import kr.jadekim.rxjava.websocket.connection.ConnectionFactory;
 import kr.jadekim.rxjava.websocket.listener.WebSocketEventListener;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
@@ -11,6 +11,10 @@ public class OkHttpConnectionFactory implements ConnectionFactory {
     private OkHttpClient okHttpClient;
     private Request baseRequest;
 
+    public OkHttpConnectionFactory() {
+        this.okHttpClient = new OkHttpClient.Builder().build();
+    }
+
     public OkHttpConnectionFactory(OkHttpClient okHttpClient) {
         this.okHttpClient = okHttpClient;
     }
diff --git a/src/main/java/kr/jadekim/rxjava/websocket/listener/SimpleWebSocketEventListener.java b/src/main/java/kr/jadekim/rxjava/websocket/listener/SimpleWebSocketEventListener.java
@@ -1,7 +1,7 @@
 package kr.jadekim.rxjava.websocket.listener;
 
 import kr.jadekim.rxjava.websocket.filter.ChannelFilter;
-import kr.jadekim.rxjava.websocket.httpclient.Connection;
+import kr.jadekim.rxjava.websocket.connection.Connection;
 
 import java.util.Map;
 
diff --git a/src/main/java/kr/jadekim/rxjava/websocket/listener/WebSocketEventListener.java b/src/main/java/kr/jadekim/rxjava/websocket/listener/WebSocketEventListener.java
@@ -1,7 +1,7 @@
 package kr.jadekim.rxjava.websocket.listener;
 
 import kr.jadekim.rxjava.websocket.filter.ChannelFilter;
-import kr.jadekim.rxjava.websocket.httpclient.Connection;
+import kr.jadekim.rxjava.websocket.connection.Connection;
 
 import java.util.Map;
 
diff --git a/src/main/java/kr/jadekim/rxjava/websocket/processor/MessageSender.java b/src/main/java/kr/jadekim/rxjava/websocket/processor/MessageSender.java
@@ -6,7 +6,7 @@
 import io.reactivex.functions.Consumer;
 import io.reactivex.schedulers.Schedulers;
 import io.reactivex.subjects.PublishSubject;
-import kr.jadekim.rxjava.websocket.httpclient.Connection;
+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/WebSocket.java b/src/main/java/kr/jadekim/rxjava/websocket/processor/WebSocket.java
@@ -1,7 +1,7 @@
 package kr.jadekim.rxjava.websocket.processor;
 
 import io.reactivex.Completable;
-import kr.jadekim.rxjava.websocket.httpclient.Connection;
+import kr.jadekim.rxjava.websocket.connection.Connection;
 import kr.jadekim.rxjava.websocket.inbound.InboundParser;
 import kr.jadekim.rxjava.websocket.listener.WebSocketEventListener;
 import kr.jadekim.rxjava.websocket.outbound.OutboundSerializer;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package kr.jadekim.rxjava.websocket.httpclient;`
	`1`	`+package kr.jadekim.rxjava.websocket.connection;`
`2`	`2`
`3`	`3`	`import io.reactivex.Observable;`
`4`	`4`