Drop Proxy.getURI, close AsyncHttpClient#586

Author: Stephane Landelle

src/main/java/com/ning/http/client/ProxyServer.java

@@ -16,13 +16,10 @@
  */
 package com.ning.http.client;
 
-import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import com.ning.http.util.AsyncHttpProviderUtils;
-
 /**
  * Represents a proxy server.
  */
@@ -53,7 +50,7 @@ public String toString() {
     private final String principal;
     private final String password;
     private final int port;
-    private final URI uri;
+    private final String url;
     private String encoding = "UTF-8";
     private String ntlmDomain = System.getProperty("http.auth.ntlm.domain", "");
 
@@ -63,7 +60,7 @@ public ProxyServer(final Protocol protocol, final String host, final int port, S
         this.port = port;
         this.principal = principal;
         this.password = password;
-        uri = AsyncHttpProviderUtils.createNonEmptyPathURI(toString());
+        this.url = protocol + "://" + host + ":" + port;
     }
 
     public ProxyServer(final String host, final int port, String principal, String password) {
@@ -102,10 +99,6 @@ public String getPassword() {
         return password;
     }
 
-    public URI getURI() {
-        return uri;
-    }
-
     public ProxyServer setEncoding(String encoding) {
         this.encoding = encoding;
         return this;
@@ -138,9 +131,13 @@ public String getNtlmDomain() {
         return ntlmDomain;
     }
 
+    public String getUrl() {
+        return url;
+    }
+
     @Override
     public String toString() {
-        return protocol + "://" + host + ":" + port;
+        return url;
     }
 }
 

src/main/java/com/ning/http/client/providers/grizzly/GrizzlyAsyncHttpProvider.java

@@ -2590,10 +2590,7 @@ public void updated(Connection result) {
         private static String getPoolKey(Request request, ProxyServer proxyServer) {
             String serverPart =
                     request.getConnectionPoolKeyStrategy().getKey(request.getURI());
-            return proxyServer != null
-                    ? AsyncHttpProviderUtils.getBaseUrl(proxyServer.getURI())
-                         + serverPart
-                    : serverPart;
+            return proxyServer != null ? proxyServer.getUrl() + serverPart : serverPart;
         }
 
         // ------------------------------------------------------ Nested Classes

src/main/java/com/ning/http/client/providers/netty/NettyAsyncHttpProvider.java

@@ -1329,7 +1329,7 @@ private String getPoolKey(NettyResponseFuture<?> future) {
 
     private String getPoolKey(URI uri, ProxyServer proxy, ConnectionPoolKeyStrategy strategy) {
         String serverPart = strategy.getKey(uri);
-        return proxy != null ? AsyncHttpProviderUtils.getBaseUrl(proxy.getURI()) + serverPart : serverPart;
+        return proxy != null ? proxy.getUrl() + serverPart : serverPart;
     }
 
     private void drainChannel(final ChannelHandlerContext ctx, final NettyResponseFuture<?> future) {