Simplify API: remove HttpConnectionProvider

src/main/java/io/socket/engineio/client/Socket.java

@@ -12,6 +12,7 @@ import org.json.JSONException;
 
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;
+import java.net.Proxy;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.*;
@@ -128,11 +129,9 @@ public class Socket extends Emitter {
     private Future pingIntervalTimer;
     private SSLContext sslContext;
     private HostnameVerifier hostnameVerifier;
-    public String proxyHost;
-    public int proxyPort = -1;
+    public Proxy proxy;
     public String proxyLogin;
     public String proxyPassword;
-    private HttpConnectionProvider httpConnectionProvider;
 
     private ReadyState readyState;
     private ScheduledExecutorService heartbeatScheduler;
@@ -210,11 +209,9 @@ public class Socket extends Emitter {
         this.policyPort = opts.policyPort != 0 ? opts.policyPort : 843;
         this.rememberUpgrade = opts.rememberUpgrade;
         this.hostnameVerifier = opts.hostnameVerifier != null ? opts.hostnameVerifier : defaultHostnameVerifier;
-        this.proxyHost = opts.proxyHost;
-        this.proxyPort = opts.proxyPort;
+        this.proxy = opts.proxy;
         this.proxyLogin = opts.proxyLogin;
         this.proxyPassword = opts.proxyPassword;
-        this.httpConnectionProvider = opts.httpConnectionProvider;
     }
 
     public static void setDefaultSSLContext(SSLContext sslContext) {
@@ -281,11 +278,9 @@ public class Socket extends Emitter {
         opts.policyPort = this.policyPort;
         opts.socket = this;
         opts.hostnameVerifier = this.hostnameVerifier;
-        opts.proxyHost = this.proxyHost;
-        opts.proxyPort = this.proxyPort;
+        opts.proxy = this.proxy;
         opts.proxyLogin = this.proxyLogin;
         opts.proxyPassword = this.proxyPassword;
-        opts.httpConnectionProvider = this.httpConnectionProvider;
 
         Transport transport;
         if (WebSocket.NAME.equals(name)) {