Remove useless calls to Request.getUrl, close AsyncHttpClient#582

Author: Stephane Landelle

api/src/main/java/org/asynchttpclient/resumable/ResumableAsyncHandler.java

@@ -197,8 +197,9 @@ public AsyncHandler.STATE onHeadersReceived(HttpResponseHeaders headers) throws
      */
     public Request adjustRequestRange(Request request) {
 
-        if (resumableIndex.get(request.getUrl()) != null) {
-            byteTransferred.set(resumableIndex.get(request.getUrl()));
+        Long ri = resumableIndex.get(request.getUrl());
+        if (ri != null) {
+            byteTransferred.set(ri);
         }
 
         // The Resumbale

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

@@ -296,8 +296,8 @@ protected void initChannel(Channel ch) throws Exception {
         });
     }
 
-    public Bootstrap getBootstrap(String url, boolean useSSl, boolean useProxy) {
-        return (url.startsWith(WEBSOCKET) && !useProxy) ? (useSSl ? secureWebSocketBootstrap : webSocketBootstrap)
+    public Bootstrap getBootstrap(URI uri, boolean useSSl, boolean useProxy) {
+        return (uri.getScheme().startsWith(WEBSOCKET) && !useProxy) ? (useSSl ? secureWebSocketBootstrap : webSocketBootstrap)
                 : (useSSl ? secureBootstrap : plainBootstrap);
     }
 

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

@@ -257,7 +257,7 @@ private boolean handleUnauthorizedAndExit(int statusCode, Realm realm, final Req
                 Realm nr = new Realm.RealmBuilder().clone(newRealm).setUri(realmURI).build();
                 final Request nextRequest = new RequestBuilder(future.getRequest()).setHeaders(request.getHeaders()).setRealm(nr).build();
 
-                LOGGER.debug("Sending authentication to {}", request.getUrl());
+                LOGGER.debug("Sending authentication to {}", request.getURI());
                 Callback callback = new Callback(future) {
                     public void call() throws Exception {
                         channels.drainChannel(channel, future);
@@ -302,7 +302,7 @@ private boolean handleProxyAuthenticationRequiredAndExit(int statusCode,//
         if (statusCode == PROXY_AUTHENTICATION_REQUIRED.code() && realm != null) {
             List<String> proxyAuthenticateHeaders = response.headers().getAll(HttpHeaders.Names.PROXY_AUTHENTICATE);
             if (!proxyAuthenticateHeaders.isEmpty() && !future.getAndSetAuth(true)) {
-                LOGGER.debug("Sending proxy authentication to {}", request.getUrl());
+                LOGGER.debug("Sending proxy authentication to {}", request.getURI());
 
                 future.setState(NettyResponseFuture.STATE.NEW);
                 Realm newRealm = null;
@@ -346,10 +346,9 @@ private boolean handleConnectOKAndExit(int statusCode, Realm realm, final Reques
             }
 
             try {
-                LOGGER.debug("Connecting to proxy {} for scheme {}", proxyServer, request.getUrl());
-                
                 URI requestURI = request.getURI();
                 String scheme = requestURI.getScheme();
+                LOGGER.debug("Connecting to proxy {} for scheme {}", proxyServer, scheme);
                 String host = AsyncHttpProviderUtils.getHost(requestURI);
                 int port = AsyncHttpProviderUtils.getPort(requestURI);
 

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

@@ -117,7 +117,7 @@ protected boolean handleRedirectAndExit(Request request, NettyResponseFuture<?>
 
                     future.setURI(uri);
                     String newUrl = uri.toString();
-                    if (request.getUrl().startsWith(WEBSOCKET)) {
+                    if (request.getURI().getScheme().startsWith(WEBSOCKET)) {
                         newUrl = newUrl.replaceFirst(HTTP, WEBSOCKET);
                     }
 

providers/netty/src/main/java/org/asynchttpclient/providers/netty/request/NettyRequestSender.java

@@ -219,7 +219,7 @@ private <T> ListenableFuture<T> sendRequestWithNewChannel(//
         // Do not throw an exception when we need an extra connection for a redirect
         // FIXME why? This violate the max connection per host handling, right?
         boolean acquiredConnection = !reclaimCache && channels.acquireConnection(asyncHandler);
-        Bootstrap bootstrap = channels.getBootstrap(request.getUrl(), useSSl, useProxy);
+        Bootstrap bootstrap = channels.getBootstrap(request.getURI(), useSSl, useProxy);
 
         NettyConnectListener<T> connectListener = new NettyConnectListener<T>(config, this, future);
 
@@ -349,7 +349,7 @@ public <T> ListenableFuture<T> sendRequest(final Request request,//
         }
 
         // FIXME really useful? Why not do this check when building the request?
-        if (request.getUrl().startsWith(WEBSOCKET) && !validateWebSocketRequest(request, asyncHandler)) {
+        if (request.getURI().getScheme().startsWith(WEBSOCKET) && !validateWebSocketRequest(request, asyncHandler)) {
             throw new IOException("WebSocket method must be a GET");
         }