Move UriComponents.getNonEmptyPath to AsyncHttpProviderUtils

Stephane Landelle · Stephane Landelle · commit 6fcbe4220b89 · 2014-07-09T20:54:25.000+02:00
diff --git a/api/src/main/java/org/asynchttpclient/uri/UriComponents.java b/api/src/main/java/org/asynchttpclient/uri/UriComponents.java
@@ -66,15 +66,6 @@ public String getQuery() {
         return query;
     }
 
-    /**
-     * Convenient for HTTP layer when targeting server root
-     * 
-     * @return the raw path or "/" if it's null
-     */
-    public String getNonEmptyPath() {
-        return isNonEmpty(path) ? path : "/";
-    }
-
     public String getPath() {
         return path;
     }
diff --git a/api/src/main/java/org/asynchttpclient/util/AsyncHttpProviderUtils.java b/api/src/main/java/org/asynchttpclient/util/AsyncHttpProviderUtils.java
@@ -12,6 +12,8 @@
  */
 package org.asynchttpclient.util;
 
+import static org.asynchttpclient.util.MiscUtils.isNonEmpty;
+
 import org.asynchttpclient.AsyncHttpClientConfig;
 import org.asynchttpclient.AsyncHttpProvider;
 import org.asynchttpclient.HttpResponseBodyPart;
@@ -102,6 +104,15 @@ public final static int getDefaultPort(UriComponents uri) {
         return port;
     }
 
+    /**
+     * Convenient for HTTP layer when targeting server root
+     * 
+     * @return the raw path or "/" if it's null
+     */
+    public final static String getNonEmptyPath(UriComponents uri) {
+        return isNonEmpty(uri.getPath()) ? uri.getPath() : "/";
+    }
+
     public static String constructUserAgent(Class<? extends AsyncHttpProvider> httpProvider, AsyncHttpClientConfig config) {
         return new StringBuilder("AHC (").append(httpProvider.getSimpleName()).append(" - ").append(System.getProperty("os.name"))
                 .append(" - ").append(System.getProperty("os.version")).append(" - ").append(System.getProperty("java.version"))
diff --git a/providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/filters/AsyncHttpClientFilter.java b/providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/filters/AsyncHttpClientFilter.java
@@ -16,6 +16,7 @@
 import static org.asynchttpclient.providers.grizzly.filters.SwitchingSSLFilter.getHandshakeError;
 import static org.asynchttpclient.providers.grizzly.GrizzlyAsyncHttpProvider.NTLM_ENGINE;
 import static org.asynchttpclient.util.AsyncHttpProviderUtils.getAuthority;
+import static org.asynchttpclient.util.AsyncHttpProviderUtils.getNonEmptyPath;
 import static org.asynchttpclient.util.AuthenticatorUtils.computeBasicAuthentication;
 import static org.asynchttpclient.util.AuthenticatorUtils.computeDigestAuthentication;
 import static org.asynchttpclient.util.MiscUtils.isNonEmpty;
@@ -238,7 +239,7 @@ private boolean sendAsGrizzlyRequest(
             final int port = uri.getPort();
             requestPacket.setRequestURI(uri.getHost() + ':' + (port == -1 ? 443 : port));
         } else {
-            requestPacket.setRequestURI(uri.getNonEmptyPath());
+            requestPacket.setRequestURI(getNonEmptyPath(uri));
         }
 
         final BodyHandler bodyHandler = isPayloadAllowed(method) ?
diff --git a/providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/statushandler/AuthorizationHandler.java b/providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/statushandler/AuthorizationHandler.java
@@ -13,6 +13,7 @@
 
 package org.asynchttpclient.providers.grizzly.statushandler;
 
+import static org.asynchttpclient.util.AsyncHttpProviderUtils.getNonEmptyPath;
 import static org.asynchttpclient.providers.grizzly.statushandler.StatusHandler.InvocationStatus.STOP;
 
 import org.asynchttpclient.Realm;
@@ -67,7 +68,7 @@ public boolean handleStatus(final HttpResponsePacket responsePacket, final HttpT
         responsePacket.setSkipRemainder(true); // ignore the remainder of the response
 
         final Request req = httpTransactionContext.getRequest();
-        realm = new Realm.RealmBuilder().clone(realm).setScheme(realm.getAuthScheme()).setUri(req.getURI().getNonEmptyPath())
+        realm = new Realm.RealmBuilder().clone(realm).setScheme(realm.getAuthScheme()).setUri(getNonEmptyPath(req.getURI()))
                 .setMethodName(req.getMethod()).setUsePreemptiveAuth(true).parseWWWAuthenticateHeader(auth).build();
         String lowerCaseAuth = auth.toLowerCase(Locale.ENGLISH);
         if (lowerCaseAuth.startsWith("basic")) {
diff --git a/providers/netty/src/main/java/org/asynchttpclient/providers/netty/handler/HttpProtocol.java b/providers/netty/src/main/java/org/asynchttpclient/providers/netty/handler/HttpProtocol.java
@@ -20,6 +20,7 @@
 import static io.netty.handler.codec.http.HttpResponseStatus.PROXY_AUTHENTICATION_REQUIRED;
 import static io.netty.handler.codec.http.HttpResponseStatus.UNAUTHORIZED;
 import static org.asynchttpclient.providers.netty.util.HttpUtil.isNTLM;
+import static org.asynchttpclient.util.AsyncHttpProviderUtils.getNonEmptyPath;
 import static org.asynchttpclient.util.MiscUtils.isNonEmpty;
 
 import org.asynchttpclient.AsyncHandler;
@@ -87,7 +88,7 @@ private Realm kerberosChallenge(List<String> proxyAuth, Request request, ProxySe
             headers.add(HttpHeaders.Names.AUTHORIZATION, "Negotiate " + challengeHeader);
 
             return newRealmBuilder(realm)//
-                    .setUri(uri.getNonEmptyPath())//
+                    .setUri(getNonEmptyPath(uri))//
                     .setMethodName(request.getMethod())//
                     .setScheme(Realm.AuthScheme.KERBEROS)//
                     .build();
@@ -127,7 +128,7 @@ private Realm ntlmChallenge(List<String> wwwAuth, Request request, ProxyServer p
             future.getAndSetAuth(false);
             return newRealmBuilder(realm)//
                     .setScheme(realm.getAuthScheme())//
-                    .setUri(uri.getNonEmptyPath())//
+                    .setUri(getNonEmptyPath(uri))//
                     .setMethodName(request.getMethod())//
                     .setNtlmMessageType2Received(true)//
                     .build();
@@ -137,7 +138,7 @@ private Realm ntlmChallenge(List<String> wwwAuth, Request request, ProxyServer p
             Realm.AuthScheme authScheme = realm != null ? realm.getAuthScheme() : Realm.AuthScheme.NTLM;
             return newRealmBuilder(realm)//
                     .setScheme(authScheme)//
-                    .setUri(request.getURI().getNonEmptyPath())//
+                    .setUri(getNonEmptyPath(request.getURI()))//
                     .setMethodName(request.getMethod())//
                     .build();
         }
@@ -153,7 +154,7 @@ private Realm ntlmProxyChallenge(List<String> wwwAuth, Request request, ProxySer
 
         return newRealmBuilder(realm)//
                 // .setScheme(realm.getAuthScheme())
-                .setUri(request.getURI().getNonEmptyPath())//
+                .setUri(getNonEmptyPath(request.getURI()))//
                 .setMethodName(request.getMethod()).build();
     }
 
@@ -208,15 +209,16 @@ private void markAsDone(NettyResponseFuture<?> future, final Channel channel) {
     private final String computeRealmURI(Realm realm, UriComponents requestURI) {
         if (realm.isUseAbsoluteURI()) {
             if (realm.isOmitQuery() && isNonEmpty(requestURI.getQuery())) {
-                return requestURI.withNewQuery(null).toString();
+                return requestURI.withNewQuery(null).toUrl();
             } else {
-                return requestURI.toString();
+                return requestURI.toUrl();
             }
         } else {
+            String path = getNonEmptyPath(requestURI);
             if (realm.isOmitQuery() || !isNonEmpty(requestURI.getQuery())) {
-                return requestURI.getNonEmptyPath();
+                return path;
             } else {
-                return requestURI.getNonEmptyPath() + "?" + requestURI.getQuery();
+                return path + "?" + requestURI.getQuery();
             }
         }
     }
@@ -241,9 +243,14 @@ private boolean handleUnauthorizedAndExit(int statusCode, Realm realm, final Req
                         return true;
                     }
                 } else {
-                    newRealm = new Realm.RealmBuilder().clone(realm).setScheme(realm.getAuthScheme()).setUri(request.getURI().getNonEmptyPath())
-                            .setMethodName(request.getMethod()).setUsePreemptiveAuth(true)
-                            .parseWWWAuthenticateHeader(authenticateHeaders.get(0)).build();
+                    newRealm = new Realm.RealmBuilder()//
+                            .clone(realm)//
+                            .setScheme(realm.getAuthScheme())//
+                            .setUri(getNonEmptyPath(request.getURI()))//
+                            .setMethodName(request.getMethod())//
+                            .setUsePreemptiveAuth(true)//
+                            .parseWWWAuthenticateHeader(authenticateHeaders.get(0))//
+                            .build();
                 }
 
                 String realmURI = computeRealmURI(newRealm, request.getURI());
diff --git a/providers/netty/src/main/java/org/asynchttpclient/providers/netty/request/NettyRequestFactory.java b/providers/netty/src/main/java/org/asynchttpclient/providers/netty/request/NettyRequestFactory.java
@@ -19,6 +19,7 @@
 import static org.asynchttpclient.providers.netty.util.HttpUtil.isSecure;
 import static org.asynchttpclient.providers.netty.util.HttpUtil.isWebSocket;
 import static org.asynchttpclient.util.AsyncHttpProviderUtils.DEFAULT_CHARSET;
+import static org.asynchttpclient.util.AsyncHttpProviderUtils.getNonEmptyPath;
 import static org.asynchttpclient.util.MiscUtils.isNonEmpty;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.DefaultFullHttpRequest;
@@ -78,11 +79,13 @@ private String requestUri(UriComponents uri, ProxyServer proxyServer, HttpMethod
         else if (proxyServer != null && !(isSecure(uri) && config.isUseRelativeURIsWithSSLProxies()))
             return uri.toString();
 
-        else if (uri.getQuery() != null)
-            return uri.getNonEmptyPath() + "?" + uri.getQuery();
-
-        else
-            return uri.getNonEmptyPath();
+        else {
+            String path = getNonEmptyPath(uri);
+            if (isNonEmpty(uri.getQuery()))
+                return path + "?" + uri.getQuery();
+            else
+                return path;
+        }
     }
 
     private String hostHeader(Request request, UriComponents uri, Realm realm) {
