fixes issue with useRawUrl, queryString decode/encode and redirecting

Author: mbknor

pom.xml

@@ -9,7 +9,7 @@
     <groupId>com.ning</groupId>
     <artifactId>async-http-client</artifactId>
     <name>Asynchronous Http Client</name>
-    <version>1.6.4</version>
+    <version>1.6.4_rawUrlFix</version>
     <packaging>jar</packaging>
     <description>
         Async Http Client library purpose is to allow Java applications to easily execute HTTP requests and

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

@@ -215,8 +215,8 @@ public class BoundRequestBuilder extends RequestBuilderBase<BoundRequestBuilder>
          */
         protected String baseURL;
 
-        private BoundRequestBuilder(String reqType) {
-            super(BoundRequestBuilder.class, reqType);
+        private BoundRequestBuilder(String reqType, boolean useRawUrl) {
+            super(BoundRequestBuilder.class, reqType, useRawUrl);
         }
 
         private BoundRequestBuilder(Request prototype) {
@@ -557,7 +557,7 @@ private final static AsyncHttpProvider loadDefaultProvider(String className, Asy
     }
 
     protected BoundRequestBuilder requestBuilder(String reqType, String url) {
-        return new BoundRequestBuilder(reqType).setUrl(url).setSignatureCalculator(signatureCalculator);
+        return new BoundRequestBuilder(reqType, config.isUseRawUrl()).setUrl(url).setSignatureCalculator(signatureCalculator);
     }
 
     protected BoundRequestBuilder requestBuilder(Request prototype) {

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

@@ -190,4 +190,6 @@ public static interface EntityWriter {
      */
     public String getBodyEncoding();
 
+    public boolean isUseRawUrl();
+
 }

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

@@ -25,12 +25,17 @@
  * Builder for a {@link Request}.
  */
 public class RequestBuilder extends RequestBuilderBase<RequestBuilder> {
+
     public RequestBuilder() {
-        super(RequestBuilder.class, "GET");
+        super(RequestBuilder.class, "GET", false);
     }
 
     public RequestBuilder(String method) {
-        super(RequestBuilder.class, method);
+        super(RequestBuilder.class, method, false);
+    }
+
+    public RequestBuilder(String method, boolean useRawUrl) {
+        super(RequestBuilder.class, method, useRawUrl);
     }
 
     public RequestBuilder(Request prototype) {

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

@@ -58,8 +58,10 @@ private static final class RequestImpl implements Request {
         private PerRequestConfig perRequestConfig;
         private long rangeOffset = 0;
         public String charset;
+        private boolean useRawUrl = false;
 
-        public RequestImpl() {
+        public RequestImpl(boolean useRawUrl) {
+            this.useRawUrl = useRawUrl;
         }
 
         public RequestImpl(Request prototype) {
@@ -86,6 +88,7 @@ public RequestImpl(Request prototype) {
                 this.perRequestConfig = prototype.getPerRequestConfig();
                 this.rangeOffset = prototype.getRangeOffset();
                 this.charset = prototype.getBodyEncoding();
+                this.useRawUrl = prototype.isUseRawUrl();
             }
         }
 
@@ -274,20 +277,27 @@ public String toString() {
 
             return sb.toString();
         }
+
+        public boolean isUseRawUrl() {
+            return useRawUrl;
+        }
     }
 
     private final Class<T> derived;
     protected final RequestImpl request;
+    protected boolean useRawUrl = false;
 
-    protected RequestBuilderBase(Class<T> derived, String method) {
+    protected RequestBuilderBase(Class<T> derived, String method, boolean rawUrls) {
         this.derived = derived;
-        request = new RequestImpl();
+        request = new RequestImpl(rawUrls);
         request.method = method;
+        this.useRawUrl = rawUrls;
     }
 
     protected RequestBuilderBase(Class<T> derived, Request prototype) {
         this.derived = derived;
         request = new RequestImpl(prototype);
+        this.useRawUrl = prototype.isUseRawUrl();
     }
 
     public T setUrl(String url) {
@@ -330,7 +340,11 @@ private String buildUrl(String url) {
                     addQueryParameter(query, null);
                 }else{
                     try {
-                        addQueryParameter(URLDecoder.decode(query.substring(0, pos), "UTF-8") , URLDecoder.decode(query.substring(pos +1), "UTF-8"));
+                        if (this.useRawUrl) {
+                            addQueryParameter(query.substring(0, pos) , query.substring(pos +1));
+                        } else {
+                            addQueryParameter(URLDecoder.decode(query.substring(0, pos), "UTF-8") , URLDecoder.decode(query.substring(pos +1), "UTF-8"));
+                        }
                     }
                     catch ( UnsupportedEncodingException e ) {
                         throw new RuntimeException(e);

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

@@ -403,7 +403,7 @@ public final static class Builder implements DerivedBuilder {
         private SimpleAHCTransferListener listener = null;
 
         public Builder() {
-            requestBuilder = new RequestBuilder("GET");
+            requestBuilder = new RequestBuilder("GET", false);
         }
 
         private Builder(SimpleAsyncHttpClient client) {