Use AsyncHttpProviderUtils.getHost/getPort (avoids -1 for default port problem)

Author: wsargent

providers/netty/src/main/java/org/asynchttpclient/providers/netty/NettyAsyncHttpProvider.java

@@ -22,6 +22,7 @@
 import org.asynchttpclient.Request;
 import org.asynchttpclient.providers.netty.channel.Channels;
 import org.asynchttpclient.providers.netty.request.NettyRequestSender;
+import org.asynchttpclient.util.AsyncHttpProviderUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -73,7 +74,9 @@ public void close() {
     @Override
     public <T> ListenableFuture<T> execute(Request request, final AsyncHandler<T> asyncHandler) throws IOException {
         final URI uri = request.getURI();
-        channels.configureProcessor(requestSender, closed, uri.getHost(), uri.getPort());
+        final String host = AsyncHttpProviderUtils.getHost(uri);
+        final int port = AsyncHttpProviderUtils.getPort(uri);
+        channels.configureProcessor(requestSender, closed, host, port);
 
         return requestSender.sendRequest(request, asyncHandler, null, false);
     }

providers/netty/src/main/java/org/asynchttpclient/providers/netty/channel/Channels.java

@@ -32,6 +32,7 @@
 import org.asynchttpclient.providers.netty.handler.Processor;
 import org.asynchttpclient.providers.netty.request.NettyRequestSender;
 import org.asynchttpclient.providers.netty.util.CleanupChannelGroup;
+import org.asynchttpclient.util.AsyncHttpProviderUtils;
 import org.asynchttpclient.util.SslUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -374,7 +375,9 @@ public Channel pollAndVerifyCachedChannel(URI uri, ProxyServer proxy, Connection
             LOGGER.debug("Using cached Channel {}\n for uri {}\n", channel, uri);
 
             try {
-                verifyChannelPipeline(channel.pipeline(), uri.getScheme(), uri.getHost(), uri.getPort());
+                final String host = AsyncHttpProviderUtils.getHost(uri);
+                final int port = AsyncHttpProviderUtils.getPort(uri);
+                verifyChannelPipeline(channel.pipeline(), uri.getScheme(), host, port);
             } catch (Exception ex) {
                 LOGGER.debug(ex.getMessage(), ex);
             }

providers/netty/src/main/java/org/asynchttpclient/providers/netty/handler/HttpProtocol.java

@@ -320,8 +320,10 @@ private boolean handleConnectOKAndExit(int statusCode, Realm realm, final Reques
 
             try {
                 LOGGER.debug("Connecting to proxy {} for scheme {}", proxyServer, request.getUrl());
-                URI uri = request.getURI();
-                channels.upgradeProtocol(channel.pipeline(), uri.getScheme(), uri.getHost(), uri.getPort());
+                final URI uri = request.getURI();
+                final String host = AsyncHttpProviderUtils.getHost(uri);
+                final int port = AsyncHttpProviderUtils.getPort(uri);
+                channels.upgradeProtocol(channel.pipeline(), uri.getScheme(), host, port);
             } catch (Throwable ex) {
                 channels.abort(future, ex);
             }