Add RequestBuilder.setURI, like setUrl, backport AsyncHttpClient#405

Author: Stephane Landelle

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

@@ -370,7 +370,12 @@ protected RequestBuilderBase(Class<T> derived, Request prototype) {
     }
 
     public T setUrl(String url) {
-        request.originalUri = buildURI(url);
+        return setURI(URI.create(url));
+    }
+
+    public T setURI(URI uri) {
+        request.originalUri = uri;
+        addQueryParameters(request.originalUri);
         request.uri = null;
         request.rawUri = null;
         return derived.cast(this);
@@ -386,32 +391,7 @@ public T setLocalInetAddress(InetAddress address) {
         return derived.cast(this);
     }
 
-    private URI buildURI(String url) {
-        URI uri = URI.create(url);
-
-        if (uri.getRawPath() == null) {
-            // AHC-96
-            // Let's try to derive it
-            StringBuilder buildedUrl = new StringBuilder();
-
-            if (uri.getScheme() != null) {
-                buildedUrl.append(uri.getScheme());
-                buildedUrl.append("://");
-            }
-
-            if (uri.getAuthority() != null) {
-                buildedUrl.append(uri.getAuthority());
-            }
-            if (url.indexOf("://") == -1) {
-                String s = buildedUrl.toString();
-                url = s + url.substring(uri.getScheme().length() + 1);
-                return buildURI(url);
-            } else {
-                throw new IllegalArgumentException("Invalid url "
-                        + uri.toString());
-            }
-        }
-
+    private void addQueryParameters(URI uri) {
         if (isNonEmpty(uri.getRawQuery())) {
             String[] queries = uri.getRawQuery().split("&");
             int pos;
@@ -432,7 +412,6 @@ private URI buildURI(String url) {
                 }
             }
         }
-        return uri;
     }
 
     public T setVirtualHost(String virtualHost) {