URL parameters in GET request would not ge properly url-encoded. The + sign would not get encoded, but decoded, resulting in a space, which in turn resulted in invalid parameters on the server side

Author: e507804

modules/swagger-codegen/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache

@@ -60,6 +60,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.TimeZone;
+import java.util.stream.IntStream;
 
 import {{invokerPackage}}.auth.Authentication;
 import {{invokerPackage}}.auth.HttpBasicAuth;
@@ -524,13 +525,26 @@ public class ApiClient {
      */
     public <T> T invokeAPI(String path, HttpMethod method, MultiValueMap<String, String> queryParams, Object body, HttpHeaders headerParams, MultiValueMap<String, Object> formParams, List<MediaType> accept, MediaType contentType, String[] authNames, ParameterizedTypeReference<T> returnType) throws RestClientException {
         updateParamsForAuth(authNames, queryParams, headerParams);
-        
-        final UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(basePath).path(path);
+
+        Map<String, String> params = new HashMap<>();
+        final UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(basePath).path(path).encode();
+
         if (queryParams != null) {
             builder.queryParams(queryParams);
+            LinkedMultiValueMap<String, String> keys = new LinkedMultiValueMap<>();
+
+            for (Map.Entry<String, List<String>> e : queryParams.entrySet()) {
+                IntStream.range(0, e.getValue().size())
+                    .forEach(i -> {
+                        keys.add(e.getKey(), "{" + e.getKey() + i + "}");
+                        params.put(e.getKey() + i, e.getValue().get(i));
+                    });
+            }
+
+            builder.queryParams(keys);
         }
 
-        final BodyBuilder requestBuilder = RequestEntity.method(method, builder.build().toUri());
+        final BodyBuilder requestBuilder = RequestEntity.method(method, builder.buildAndExpand(params).toUri());
         if(accept != null) {
             requestBuilder.accept(accept.toArray(new MediaType[accept.size()]));
         }

samples/client/petstore/java/resttemplate/.swagger-codegen/VERSION

@@ -1 +1 @@
-2.4.3-SNAPSHOT
+2.4.5-SNAPSHOT

samples/client/petstore/java/resttemplate/src/main/java/io/swagger/client/ApiClient.java

@@ -49,6 +49,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.TimeZone;
+import java.util.stream.IntStream;
 
 import io.swagger.client.auth.Authentication;
 import io.swagger.client.auth.HttpBasicAuth;
@@ -512,13 +513,26 @@ protected Object selectBody(Object obj, MultiValueMap<String, Object> formParams
      */
     public <T> T invokeAPI(String path, HttpMethod method, MultiValueMap<String, String> queryParams, Object body, HttpHeaders headerParams, MultiValueMap<String, Object> formParams, List<MediaType> accept, MediaType contentType, String[] authNames, ParameterizedTypeReference<T> returnType) throws RestClientException {
         updateParamsForAuth(authNames, queryParams, headerParams);
-        
-        final UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(basePath).path(path);
+
+        Map<String, String> params = new HashMap<>();
+        final UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(basePath).path(path).encode();
+
         if (queryParams != null) {
             builder.queryParams(queryParams);
+            LinkedMultiValueMap<String, String> keys = new LinkedMultiValueMap<>();
+
+            for (Map.Entry<String, List<String>> e : queryParams.entrySet()) {
+                IntStream.range(0, e.getValue().size())
+                    .forEach(i -> {
+                        keys.add(e.getKey(), "{" + e.getKey() + i + "}");
+                        params.put(e.getKey() + i, e.getValue().get(i));
+                    });
+            }
+
+            builder.queryParams(keys);
         }
 
-        final BodyBuilder requestBuilder = RequestEntity.method(method, builder.build().toUri());
+        final BodyBuilder requestBuilder = RequestEntity.method(method, builder.buildAndExpand(params).toUri());
         if(accept != null) {
             requestBuilder.accept(accept.toArray(new MediaType[accept.size()]));
         }