Merge pull request AsyncHttpClient#1098 from truslan/pre-uri-set-npe-patch-1

fixed NPE that occured when setting query params before url was set

Author: slandelle

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

@@ -252,7 +252,8 @@ public void resetCookies() {
 
     public void resetQuery() {
         queryParams = null;
-        this.uri = this.uri.withNewQuery(null);
+        if (this.uri != null)
+            this.uri = this.uri.withNewQuery(null);
     }
 
     public void resetFormParams() {
@@ -344,7 +345,7 @@ public T setQueryParams(Map<String, List<String>> map) {
 
     public T setQueryParams(List<Param> params) {
         // reset existing query
-        if (isNonEmpty(this.uri.getQuery()))
+        if (this.uri != null && isNonEmpty(this.uri.getQuery()))
             this.uri = this.uri.withNewQuery(null);
         queryParams = params;
         return asDerivedType();

client/src/test/java/org/asynchttpclient/RequestBuilderTest.java

@@ -16,17 +16,14 @@
 package org.asynchttpclient;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.Collections.singletonList;
 import static org.asynchttpclient.Dsl.get;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.ExecutionException;
 
 import org.asynchttpclient.cookie.Cookie;
@@ -151,4 +148,13 @@ public void testAddOrReplaceCookies() {
         requestBuilder.addOrReplaceCookie(cookie3);
         assertEquals(requestBuilder.cookies.size(), 2, "cookie size must be 2 after adding 1 more cookie i.e. cookie3");
     }
+
+    @Test
+    public void testSettingQueryParamsBeforeUrlShouldNotProduceNPE() {
+        RequestBuilder requestBuilder = new RequestBuilder();
+        requestBuilder.setQueryParams(singletonList(new Param("key", "value")));
+        requestBuilder.setUrl("http://localhost");
+        Request request = requestBuilder.build();
+        assertEquals(request.getUrl(), "http://localhost?key=value");
+    }
 }