Move some methods from static HttpUtils to Uri

Author: slandelle

client/src/main/java/org/asynchttpclient/RequestBuilderBase.java

@@ -43,7 +43,6 @@
 import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_TYPE;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.asynchttpclient.util.HttpUtils.extractContentTypeCharsetAttribute;
-import static org.asynchttpclient.util.HttpUtils.validateSupportedScheme;
 import static org.asynchttpclient.util.MiscUtils.isNonEmpty;
 import static org.asynchttpclient.util.MiscUtils.withDefault;
 
@@ -603,7 +602,7 @@ private Uri computeUri() {
       LOGGER.debug("setUrl hasn't been invoked. Using {}", DEFAULT_REQUEST_URL);
       tempUri = DEFAULT_REQUEST_URL;
     } else {
-      validateSupportedScheme(tempUri);
+      Uri.validateSupportedScheme(tempUri);
     }
 
     return uriEncoder.encode(tempUri, queryParams);

client/src/main/java/org/asynchttpclient/channel/ChannelPoolPartitioning.java

@@ -15,7 +15,6 @@
 import org.asynchttpclient.proxy.ProxyServer;
 import org.asynchttpclient.proxy.ProxyType;
 import org.asynchttpclient.uri.Uri;
-import org.asynchttpclient.util.HttpUtils;
 
 public interface ChannelPoolPartitioning {
 
@@ -26,7 +25,7 @@ enum PerHostChannelPoolPartitioning implements ChannelPoolPartitioning {
     INSTANCE;
 
     public Object getPartitionKey(Uri uri, String virtualHost, ProxyServer proxyServer) {
-      String targetHostBaseUrl = HttpUtils.getBaseUrl(uri);
+      String targetHostBaseUrl = uri.getBaseUrl();
       if (proxyServer == null) {
         if (virtualHost == null) {
           return targetHostBaseUrl;

client/src/main/java/org/asynchttpclient/netty/channel/NettyConnectListener.java

@@ -31,8 +31,6 @@
 import java.net.ConnectException;
 import java.net.InetSocketAddress;
 
-import static org.asynchttpclient.util.HttpUtils.getBaseUrl;
-
 /**
  * Non Blocking connect.
  */
@@ -178,7 +176,7 @@ public void onFailure(Channel channel, Throwable cause) {
     LOGGER.debug("Failed to recover from connect exception: {} with channel {}", cause, channel);
 
     boolean printCause = cause.getMessage() != null;
-    String printedCause = printCause ? cause.getMessage() : getBaseUrl(future.getUri());
+    String printedCause = printCause ? cause.getMessage() : future.getUri().getBaseUrl();
     ConnectException e = new ConnectException(printedCause);
     e.initCause(cause);
     future.abort(e);

client/src/main/java/org/asynchttpclient/netty/handler/intercept/Redirect30xInterceptor.java

@@ -40,7 +40,6 @@
 import static org.asynchttpclient.util.HttpConstants.Methods.GET;
 import static org.asynchttpclient.util.HttpConstants.ResponseStatusCodes.*;
 import static org.asynchttpclient.util.HttpUtils.followRedirect;
-import static org.asynchttpclient.util.HttpUtils.isSameBase;
 import static org.asynchttpclient.util.MiscUtils.isNonEmpty;
 import static org.asynchttpclient.util.ThrowableUtil.unknownStackTrace;
 
@@ -136,7 +135,7 @@ else if (request.getBodyGenerator() != null)
               requestBuilder.addOrReplaceCookie(cookie);
         }
 
-        boolean sameBase = isSameBase(request.getUri(), newUri);
+        boolean sameBase = request.getUri().isSameBase(newUri);
 
         if (sameBase) {
           // we can only assume the virtual host is still valid if the baseUrl is the same

client/src/main/java/org/asynchttpclient/netty/request/NettyRequestFactory.java

@@ -221,7 +221,7 @@ public NettyRequest newNettyRequest(Request request, boolean performConnectReque
   private String requestUri(Uri uri, ProxyServer proxyServer, boolean connect) {
     if (connect) {
       // proxy tunnelling, connect need host and explicit port
-      return getAuthority(uri);
+      return uri.getAuthority();
 
     } else if (proxyServer != null && !uri.isSecured() && proxyServer.getProxyType().isHttp()) {
       // proxy over HTTP, need full url

client/src/main/java/org/asynchttpclient/uri/Uri.java

@@ -168,6 +168,24 @@ public String toRelativeUrl() {
     return sb.toString();
   }
 
+  public String getBaseUrl() {
+    return scheme + "://" + host + ":" + getExplicitPort();
+  }
+
+  public String getAuthority() {
+    return host + ":" + getExplicitPort();
+  }
+
+  public boolean isSameBase(Uri other) {
+    return scheme.equals(other.getScheme())
+      && host.equals(other.getHost())
+      && getExplicitPort() == other.getExplicitPort();
+  }
+
+  public String getNonEmptyPath() {
+    return isNonEmpty(path) ? path : "/";
+  }
+
   @Override
   public String toString() {
     // for now, but might change
@@ -243,4 +261,13 @@ public boolean equals(Object obj) {
       return false;
     return true;
   }
+
+  public static void validateSupportedScheme(Uri uri) {
+    final String scheme = uri.getScheme();
+    if (scheme == null || !scheme.equalsIgnoreCase(HTTP) && !scheme.equalsIgnoreCase(HTTPS)
+      && !scheme.equalsIgnoreCase(WS) && !scheme.equalsIgnoreCase(WSS)) {
+      throw new IllegalArgumentException("The URI scheme, of the URI " + uri
+        + ", must be equal (ignoring case) to 'http', 'https', 'ws', or 'wss'");
+    }
+  }
 }

client/src/main/java/org/asynchttpclient/util/AuthenticatorUtils.java

@@ -27,7 +27,6 @@
 import static io.netty.handler.codec.http.HttpHeaderNames.PROXY_AUTHORIZATION;
 import static java.nio.charset.StandardCharsets.ISO_8859_1;
 import static org.asynchttpclient.Dsl.realm;
-import static org.asynchttpclient.util.HttpUtils.getNonEmptyPath;
 import static org.asynchttpclient.util.MiscUtils.isNonEmpty;
 
 public final class AuthenticatorUtils {
@@ -58,7 +57,7 @@ public static String computeRealmURI(Uri uri, boolean useAbsoluteURI, boolean om
     if (useAbsoluteURI) {
       return omitQuery && MiscUtils.isNonEmpty(uri.getQuery()) ? uri.withNewQuery(null).toUrl() : uri.toUrl();
     } else {
-      String path = getNonEmptyPath(uri);
+      String path = uri.getNonEmptyPath();
       return omitQuery || !MiscUtils.isNonEmpty(uri.getQuery()) ? path : path + "?" + uri.getQuery();
     }
   }

client/src/main/java/org/asynchttpclient/util/HttpUtils.java

@@ -27,7 +27,6 @@
 import java.util.concurrent.ThreadLocalRandom;
 
 import static java.nio.charset.StandardCharsets.*;
-import static org.asynchttpclient.util.MiscUtils.isNonEmpty;
 
 /**
  * {@link org.asynchttpclient.AsyncHttpClient} common utilities.
@@ -133,37 +132,6 @@ public static String patchContentTypeWithBoundaryAttribute(CharSequence base, by
     return sb.append(' ').append(CONTENT_TYPE_BOUNDARY_ATTRIBUTE).append(new String(boundary, US_ASCII)).toString();
   }
 
-  public static void validateSupportedScheme(Uri uri) {
-    final String scheme = uri.getScheme();
-    if (scheme == null || !scheme.equalsIgnoreCase("http") && !scheme.equalsIgnoreCase("https")
-            && !scheme.equalsIgnoreCase("ws") && !scheme.equalsIgnoreCase("wss")) {
-      throw new IllegalArgumentException("The URI scheme, of the URI " + uri
-              + ", must be equal (ignoring case) to 'http', 'https', 'ws', or 'wss'");
-    }
-  }
-
-  public static String getBaseUrl(Uri uri) {
-    // getAuthority duplicate but we don't want to re-concatenate
-    return uri.getScheme() + "://" + uri.getHost() + ":" + uri.getExplicitPort();
-  }
-
-  public static String getAuthority(Uri uri) {
-    return uri.getHost() + ":" + uri.getExplicitPort();
-  }
-
-  public static boolean isSameBase(Uri uri1, Uri uri2) {
-    return uri1.getScheme().equals(uri2.getScheme()) && uri1.getHost().equals(uri2.getHost())
-            && uri1.getExplicitPort() == uri2.getExplicitPort();
-  }
-
-  /**
-   * @param uri the uri
-   * @return the raw path or "/" if it's null
-   */
-  public static String getNonEmptyPath(Uri uri) {
-    return isNonEmpty(uri.getPath()) ? uri.getPath() : "/";
-  }
-
   public static boolean followRedirect(AsyncHttpClientConfig config, Request request) {
     return request.getFollowRedirect() != null ? request.getFollowRedirect() : config.isFollowRedirect();
   }

client/src/test/java/org/asynchttpclient/uri/UriTest.java

@@ -269,4 +269,62 @@ public void creatingUriWithMissingSchemeThrowsIllegalArgumentException() {
   public void creatingUriWithMissingHostThrowsIllegalArgumentException() {
     Uri.create("http://");
   }
+
+  @Test
+  public void testGetAuthority() {
+    Uri uri = Uri.create("http://stackoverflow.com/questions/17814461/jacoco-maven-testng-0-test-coverage");
+    assertEquals(uri.getAuthority(), "stackoverflow.com:80", "Incorrect authority returned from getAuthority");
+  }
+
+  @Test
+  public void testGetAuthorityWithPortInUrl() {
+    Uri uri = Uri.create("http://stackoverflow.com:8443/questions/17814461/jacoco-maven-testng-0-test-coverage");
+    assertEquals(uri.getAuthority(), "stackoverflow.com:8443", "Incorrect authority returned from getAuthority");
+  }
+
+  @Test
+  public void testGetBaseUrl() {
+    Uri uri = Uri.create("http://stackoverflow.com:8443/questions/17814461/jacoco-maven-testng-0-test-coverage");
+    assertEquals(uri.getBaseUrl(), "http://stackoverflow.com:8443", "Incorrect base URL returned from getBaseURL");
+  }
+
+  @Test
+  public void testIsSameBaseUrlReturnsFalseWhenPortDifferent() {
+    Uri uri1 = Uri.create("http://stackoverflow.com:8443/questions/17814461/jacoco-maven-testng-0-test-coverage");
+    Uri uri2 = Uri.create("http://stackoverflow.com:8442/questions/1057564/pretty-git-branch-graphs");
+    assertFalse(uri1.isSameBase(uri2), "Base URLs should be different, but true was returned from isSameBase");
+  }
+
+  @Test
+  public void testIsSameBaseUrlReturnsFalseWhenSchemeDifferent() {
+    Uri uri1 = Uri.create("http://stackoverflow.com:8443/questions/17814461/jacoco-maven-testng-0-test-coverage");
+    Uri uri2 = Uri.create("ws://stackoverflow.com:8443/questions/1057564/pretty-git-branch-graphs");
+    assertFalse(uri1.isSameBase(uri2), "Base URLs should be different, but true was returned from isSameBase");
+  }
+
+  @Test
+  public void testIsSameBaseUrlReturnsFalseWhenHostDifferent() {
+    Uri uri1 = Uri.create("http://stackoverflow.com:8443/questions/17814461/jacoco-maven-testng-0-test-coverage");
+    Uri uri2 = Uri.create("http://example.com:8443/questions/1057564/pretty-git-branch-graphs");
+    assertFalse(uri1.isSameBase(uri2), "Base URLs should be different, but true was returned from isSameBase");
+  }
+
+  @Test
+  public void testIsSameBaseUrlReturnsTrueWhenOneUriHasDefaultPort() {
+    Uri uri1 = Uri.create("http://stackoverflow.com:80/questions/17814461/jacoco-maven-testng-0-test-coverage");
+    Uri uri2 = Uri.create("http://stackoverflow.com/questions/1057564/pretty-git-branch-graphs");
+    assertTrue(uri1.isSameBase(uri2), "Base URLs should be same, but false was returned from isSameBase");
+  }
+
+  @Test
+  public void testGetPathWhenPathIsNonEmpty() {
+    Uri uri = Uri.create("http://stackoverflow.com:8443/questions/17814461/jacoco-maven-testng-0-test-coverage");
+    assertEquals(uri.getNonEmptyPath(), "/questions/17814461/jacoco-maven-testng-0-test-coverage", "Incorrect path returned from getNonEmptyPath");
+  }
+
+  @Test
+  public void testGetPathWhenPathIsEmpty() {
+    Uri uri = Uri.create("http://stackoverflow.com");
+    assertEquals(uri.getNonEmptyPath(), "/", "Incorrect path returned from getNonEmptyPath");
+  }
 }

client/src/test/java/org/asynchttpclient/util/HttpUtilsTest.java

@@ -44,69 +44,6 @@ private static String toUsAsciiString(ByteBuffer buf) {
     }
   }
 
-  @Test
-  public void testGetAuthority() {
-    Uri uri = Uri.create("http://stackoverflow.com/questions/17814461/jacoco-maven-testng-0-test-coverage");
-    String authority = HttpUtils.getAuthority(uri);
-    assertEquals(authority, "stackoverflow.com:80", "Incorrect authority returned from getAuthority");
-  }
-
-  @Test
-  public void testGetAuthorityWithPortInUrl() {
-    Uri uri = Uri.create("http://stackoverflow.com:8443/questions/17814461/jacoco-maven-testng-0-test-coverage");
-    String authority = HttpUtils.getAuthority(uri);
-    assertEquals(authority, "stackoverflow.com:8443", "Incorrect authority returned from getAuthority");
-  }
-
-  @Test
-  public void testGetBaseUrl() {
-    Uri uri = Uri.create("http://stackoverflow.com:8443/questions/17814461/jacoco-maven-testng-0-test-coverage");
-    String baseUrl = HttpUtils.getBaseUrl(uri);
-    assertEquals(baseUrl, "http://stackoverflow.com:8443", "Incorrect base URL returned from getBaseURL");
-  }
-
-  @Test
-  public void testIsSameBaseUrlReturnsFalseWhenPortDifferent() {
-    Uri uri1 = Uri.create("http://stackoverflow.com:8443/questions/17814461/jacoco-maven-testng-0-test-coverage");
-    Uri uri2 = Uri.create("http://stackoverflow.com:8442/questions/1057564/pretty-git-branch-graphs");
-    assertFalse(HttpUtils.isSameBase(uri1, uri2), "Base URLs should be different, but true was returned from isSameBase");
-  }
-
-  @Test
-  public void testIsSameBaseUrlReturnsFalseWhenSchemeDifferent() {
-    Uri uri1 = Uri.create("http://stackoverflow.com:8443/questions/17814461/jacoco-maven-testng-0-test-coverage");
-    Uri uri2 = Uri.create("ws://stackoverflow.com:8443/questions/1057564/pretty-git-branch-graphs");
-    assertFalse(HttpUtils.isSameBase(uri1, uri2), "Base URLs should be different, but true was returned from isSameBase");
-  }
-
-  @Test
-  public void testIsSameBaseUrlReturnsFalseWhenHostDifferent() {
-    Uri uri1 = Uri.create("http://stackoverflow.com:8443/questions/17814461/jacoco-maven-testng-0-test-coverage");
-    Uri uri2 = Uri.create("http://example.com:8443/questions/1057564/pretty-git-branch-graphs");
-    assertFalse(HttpUtils.isSameBase(uri1, uri2), "Base URLs should be different, but true was returned from isSameBase");
-  }
-
-  @Test
-  public void testGetPathWhenPathIsNonEmpty() {
-    Uri uri = Uri.create("http://stackoverflow.com:8443/questions/17814461/jacoco-maven-testng-0-test-coverage");
-    String path = HttpUtils.getNonEmptyPath(uri);
-    assertEquals(path, "/questions/17814461/jacoco-maven-testng-0-test-coverage", "Incorrect path returned from getNonEmptyPath");
-  }
-
-  @Test
-  public void testGetPathWhenPathIsEmpty() {
-    Uri uri = Uri.create("http://stackoverflow.com");
-    String path = HttpUtils.getNonEmptyPath(uri);
-    assertEquals(path, "/", "Incorrect path returned from getNonEmptyPath");
-  }
-
-  @Test
-  public void testIsSameBaseUrlReturnsTrueWhenOneUriHasDefaultPort() {
-    Uri uri1 = Uri.create("http://stackoverflow.com:80/questions/17814461/jacoco-maven-testng-0-test-coverage");
-    Uri uri2 = Uri.create("http://stackoverflow.com/questions/1057564/pretty-git-branch-graphs");
-    assertTrue(HttpUtils.isSameBase(uri1, uri2), "Base URLs should be same, but false was returned from isSameBase");
-  }
-
   @Test
   public void testExtractCharsetWithoutQuotes() {
     Charset charset = HttpUtils.extractContentTypeCharsetAttribute("text/html; charset=iso-8859-1");