use native Request type for proxy interface (instead of Jsoup.Connect…

…ion)

src/main/java/org/hatsuyuki/proxy/DebugProxy.java

@@ -3,16 +3,14 @@
 import org.jsoup.Connection;
 
 public class DebugProxy extends Proxy {
-    private final String debugHost;
-    private final int debugPort;
+    private final RemoteRequester debugger;
 
     public DebugProxy(String debugHost, int debugPort) {
-        this.debugHost = debugHost;
-        this.debugPort = debugPort;
+        this.debugger = new RemoteRequester(debugHost, debugPort);
     }
 
     @Override
-    public Response request(Connection jsoupConnection) throws Exception {
-        return new Response(jsoupConnection.proxy(debugHost, debugPort).execute());
+    public Response request(Request request) throws Exception {
+        return debugger.forward(request);
     }
 }

src/main/java/org/hatsuyuki/proxy/LocalProxy.java

@@ -17,7 +17,7 @@ public LocalProxy(Pipeline pipeline) {
     }
 
     @Override
-    public Response request(Connection jsoupConnection) throws Exception {
-        return pipeline.forward(new Request(jsoupConnection));
+    public Response request(Request request) throws Exception {
+        return pipeline.forward(request);
     }
 }

src/main/java/org/hatsuyuki/proxy/Proxy.java

@@ -6,5 +6,9 @@
  * Created by Hatsuyuki on 12/27/2016.
  */
 public abstract class Proxy {
-    public abstract Response request(Connection jsoupConnection) throws Exception;
+    public Response request(Connection jsoupConnection) throws Exception {
+        return request(new Request(jsoupConnection));
+    }
+
+    public abstract Response request(Request request) throws Exception;
 }

src/main/java/org/hatsuyuki/proxy/RealProxy.java

@@ -1,7 +1,6 @@
 package org.hatsuyuki.proxy;
 
 import org.apache.commons.io.IOUtils;
-import org.jsoup.Connection;
 
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -38,15 +37,14 @@ private boolean checkConnection() {
     }
 
     @Override
-    public Response request(Connection jsoupConnection) throws Exception {
+    public Response request(Request request) throws Exception {
         Socket socket = null;
         try {
-            int timeout = jsoupConnection.request().timeout();
+            int timeout = request.timeout();
             socket = new Socket();
             socket.setSoTimeout(timeout);
             socket.connect(new InetSocketAddress(host, port), timeout);
 
-            Request request = new Request(jsoupConnection);
             request.source = this.clientID;
 
             OutputStream out = socket.getOutputStream();