Removed lambdas

Author: e507804

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

@@ -527,24 +527,23 @@ public class ApiClient {
         updateParamsForAuth(authNames, queryParams, headerParams);
 
         Map<String, String> params = new HashMap<>();
-        final UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(basePath).path(path).encode();
+        final UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(basePath).path(path);
 
         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));
-                    });
+                for(int i = 0; i < e.getValue().size(); 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.buildAndExpand(params).toUri());
+        final BodyBuilder requestBuilder = RequestEntity.method(method, builder.build(params));
         if(accept != null) {
             requestBuilder.accept(accept.toArray(new MediaType[accept.size()]));
         }

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

@@ -522,11 +522,10 @@ public <T> T invokeAPI(String path, HttpMethod method, MultiValueMap<String, Str
             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));
-                    });
+                for(int i = 0; i < e.getValue().size(); i++) {
+                    keys.add(e.getKey(), "{" + e.getKey() + i + "}");
+                    params.put(e.getKey() + i, e.getValue().get(i));
+                }
             }
 
             builder.queryParams(keys);