Have a getUrl shortcut on Request without having to grab the UriComponents, close AsyncHttpClient#689

Author: Stephane Landelle

api/src/main/java/org/asynchttpclient/Request.java

@@ -47,6 +47,8 @@ public interface Request {
 
     UriComponents getURI();
 
+    String getUrl();
+
     /**
      * Return the InetAddress to override
      *

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

@@ -99,6 +99,11 @@ public RequestImpl(Request prototype) {
             }
         }
 
+        @Override
+        public String getUrl() {
+            return uri.toUrl();
+        }
+
         @Override
         public String getMethod() {
             return method;
@@ -229,7 +234,7 @@ public List<Param> getQueryParams() {
 
         @Override
         public String toString() {
-            StringBuilder sb = new StringBuilder(getURI().toUrl());
+            StringBuilder sb = new StringBuilder(getUrl());
 
             sb.append("\t");
             sb.append(method);

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

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

api/src/test/java/org/asynchttpclient/async/AsyncProvidersBasicTest.java

@@ -73,7 +73,7 @@ public void asyncProviderEncodingTest() throws Exception {
         AsyncHttpClient client = getAsyncHttpClient(null);
         try {
             Request request = new RequestBuilder("GET").setUrl(getTargetUrl() + "?q=+%20x").build();
-            assertEquals(request.getURI().toUrl(), getTargetUrl() + "?q=%20%20x");
+            assertEquals(request.getUrl(), getTargetUrl() + "?q=%20%20x");
 
             String url = client.executeRequest(request, new AsyncCompletionHandler<String>() {
                 @Override

api/src/test/java/org/asynchttpclient/async/RequestBuilderTest.java

@@ -70,7 +70,7 @@ public void testEncodesQueryParameters() throws UnsupportedEncodingException {
             }
             String expValue = sb.toString();
             Request request = builder.build();
-            assertEquals(request.getURI().toUrl(), "http://example.com/?name=" + expValue);
+            assertEquals(request.getUrl(), "http://example.com/?name=" + expValue);
         }
     }
 
@@ -93,7 +93,7 @@ public void testParsesQueryParams() throws IOException, ExecutionException, Inte
                 .addQueryParam("param2", "value2")
                 .build();
 
-        assertEquals(request.getURI().toUrl(), "http://foo.com/?param1=value1&param2=value2");
+        assertEquals(request.getUrl(), "http://foo.com/?param1=value1&param2=value2");
         List<Param> params = request.getQueryParams();
         assertEquals(params.size(), 2);
         assertEquals(params.get(0), new Param("param1", "value1"));
@@ -104,14 +104,14 @@ public void testParsesQueryParams() throws IOException, ExecutionException, Inte
     public void testUserProvidedRequestMethod() {
         Request req = new RequestBuilder("ABC").setUrl("http://foo.com").build();
         assertEquals(req.getMethod(), "ABC");
-        assertEquals(req.getURI().toUrl(), "http://foo.com/");
+        assertEquals(req.getUrl(), "http://foo.com/");
     }
 
     @Test(groups = {"standalone", "default_provider"})
     public void testPercentageEncodedUserInfo() {
         final Request req = new RequestBuilder("GET").setUrl("http://hello:wor%[email protected]").build();
         assertEquals(req.getMethod(), "GET");
-        assertEquals(req.getURI().toUrl(), "http://hello:wor%[email protected]");
+        assertEquals(req.getUrl(), "http://hello:wor%[email protected]");
     }
 
     @Test(groups = {"standalone", "default_provider"})

providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/filters/ProxyFilter.java

@@ -66,7 +66,7 @@ public NextAction handleWrite(FilterChainContext ctx) throws IOException {
                 assert (context != null);
                 Request req = context.getRequest();
                 if (!secure) {
-                    request.setRequestURI(req.getURI().toUrl());
+                    request.setRequestURI(req.getUrl());
                 }
                 addProxyHeaders(getRealm(req), request);
             }

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

@@ -137,7 +137,7 @@ public void onFutureFailure(Channel channel, Throwable cause) {
         LOGGER.debug("Failed to recover from exception: {} with channel {}", cause, channel);
 
         boolean printCause = cause != null && cause.getMessage() != null;
-        String url = future.getURI().toUrl();
+        String url = future.getUrl();
         String printedCause = printCause ? cause.getMessage() + " to " + url : url;
         ConnectException e = new ConnectException(printedCause);
         if (cause != null)