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

Author: Stephane Landelle

src/main/java/com/ning/http/client/Request.java

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

src/main/java/com/ning/http/client/RequestBuilderBase.java

@@ -116,6 +116,10 @@ public UriComponents getURI() {
             return uri;
         }
 
+        public String getUrl() {
+            return uri.toUrl();
+        }
+
         public FluentCaseInsensitiveStringsMap getHeaders() {
             return headers;
         }
@@ -208,7 +212,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);

src/main/java/com/ning/http/client/providers/apache/ApacheAsyncHttpProvider.java

@@ -250,7 +250,7 @@ private HttpMethodBase createMethod(HttpClient client, Request request) throws I
         String methodName = request.getMethod();
         HttpMethodBase method = null;
         if (methodName.equalsIgnoreCase("POST") || methodName.equalsIgnoreCase("PUT")) {
-            EntityEnclosingMethod post = methodName.equalsIgnoreCase("POST") ? new PostMethod(request.getURI().toUrl()) : new PutMethod(request.getURI().toUrl());
+            EntityEnclosingMethod post = methodName.equalsIgnoreCase("POST") ? new PostMethod(request.getUrl()) : new PutMethod(request.getUrl());
 
             String bodyCharset = request.getBodyEncoding() == null ? DEFAULT_CHARSET.name() : request.getBodyEncoding();
 
@@ -340,13 +340,13 @@ private HttpMethodBase createMethod(HttpClient client, Request request) throws I
             }
             method = post;
         } else if (methodName.equalsIgnoreCase("DELETE")) {
-            method = new DeleteMethod(request.getURI().toUrl());
+            method = new DeleteMethod(request.getUrl());
         } else if (methodName.equalsIgnoreCase("HEAD")) {
-            method = new HeadMethod(request.getURI().toUrl());
+            method = new HeadMethod(request.getUrl());
         } else if (methodName.equalsIgnoreCase("GET")) {
-            method = new GetMethod(request.getURI().toUrl());
+            method = new GetMethod(request.getUrl());
         } else if (methodName.equalsIgnoreCase("OPTIONS")) {
-            method = new OptionsMethod(request.getURI().toUrl());
+            method = new OptionsMethod(request.getUrl());
         } else {
             throw new IllegalStateException(String.format("Invalid Method", methodName));
         }

src/main/java/com/ning/http/client/resumable/ResumableAsyncHandler.java

@@ -185,7 +185,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);
         }

src/test/java/com/ning/http/client/async/AsyncProvidersBasicTest.java

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

src/test/java/com/ning/http/client/async/RequestBuilderTest.java

@@ -72,7 +72,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);
         }
     }
 
@@ -95,7 +95,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"));
@@ -106,14 +106,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"})
@@ -130,15 +130,15 @@ public void testAddQueryParameter() throws UnsupportedEncodingException {
                 .addQueryParam("a", "1?&")
                 .addQueryParam("b", "+ =");
         Request request = rb.build();
-        assertEquals(request.getURI().toUrl(), "http://example.com/path?a=1%3F%26&b=%2B%20%3D");
+        assertEquals(request.getUrl(), "http://example.com/path?a=1%3F%26&b=%2B%20%3D");
     }
-    
+
     @Test(groups = {"standalone", "default_provider"})
     public void testRawUrlQuery() throws UnsupportedEncodingException, URISyntaxException {
         String preEncodedUrl = "http://example.com/space%20mirror.php?%3Bteile";
         RequestBuilder rb = new RequestBuilder("GET", true).setUrl(preEncodedUrl);
         Request request = rb.build();
-        assertEquals(request.getURI().toUrl(), preEncodedUrl);
+        assertEquals(request.getUrl(), preEncodedUrl);
         assertEquals(request.getURI().toURI().toString(), preEncodedUrl);
     }
 }