fixed query map with array parameter bug (OpenFeign#1220)

dharmeshjogadia · web-flow · commit 9a86fa8e99b3 · 2020-06-02T17:40:46.000+12:00
* fixed query map with array parameter bug
diff --git a/core/src/main/java/feign/ReflectiveFeign.java b/core/src/main/java/feign/ReflectiveFeign.java
@@ -312,6 +312,11 @@ private RequestTemplate addQueryMapQueryParameters(Map<String, Object> queryMap,
                 : encoded ? nextObject.toString()
                     : UriUtils.encode(nextObject.toString()));
           }
+        } else if (currValue instanceof Object[]) {
+          for (Object value : (Object[]) currValue) {
+            values.add(value == null ? null
+                : encoded ? value.toString() : UriUtils.encode(value.toString()));
+          }
         } else {
           values.add(currValue == null ? null
               : encoded ? currValue.toString() : UriUtils.encode(currValue.toString()));
diff --git a/core/src/test/java/feign/FeignTest.java b/core/src/test/java/feign/FeignTest.java
@@ -24,6 +24,7 @@
 import okhttp3.mockwebserver.MockWebServer;
 import okhttp3.mockwebserver.SocketPolicy;
 import okio.Buffer;
+import org.assertj.core.util.Maps;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -66,6 +67,18 @@ public void iterableQueryParams() throws Exception {
         .hasPath("/?1=user&2=apple&2=pear");
   }
 
+  @Test
+  public void arrayQueryMapParams() throws Exception {
+    server.enqueue(new MockResponse().setBody("foo"));
+
+    TestInterface api = new TestInterfaceBuilder().target("http://localhost:" + server.getPort());
+
+    api.queryArrParams(Maps.newHashMap("1", new String[] {"apple", "pear"}));
+
+    assertThat(server.takeRequest())
+        .hasPath("/?1=apple&1=pear");
+  }
+
   @Test
   public void postTemplateParamsResolve() throws Exception {
     server.enqueue(new MockResponse().setBody("foo"));
@@ -947,6 +960,9 @@ void form(
     @RequestLine("GET /?1={1}&2={2}")
     Response queryParams(@Param("1") String one, @Param("2") Iterable<String> twos);
 
+    @RequestLine("GET /")
+    Response queryArrParams(@QueryMap Map<String, String[]> twos);
+
     @RequestLine("POST /?date={date}")
     void expand(@Param(value = "date", expander = DateToMillis.class) Date date);
 
