From 65b6660c55861068da401b65823d27a36a18b64d Mon Sep 17 00:00:00 2001
From: Benjamin Douglas <bbdouglas@gmail.com>
Date: Fri, 24 Mar 2017 07:04:11 -0700
Subject: [PATCH] Fixes a bug in #5142 for multi-word parameters (#5185)

In the convenience class defined for generating a Map of query parameters, the
parameter name was mistakenly being set to the Java variable name, not the
actual parameter name. These are often the same, but can be different in the
case of multi-word parameters, such as in the sample API's `enum_query_string`
vs `enumQueryString`.
---
 .../src/main/resources/Java/libraries/feign/api.mustache    | 2 +-
 .../feign/src/main/java/io/swagger/client/api/FakeApi.java  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/api.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/api.mustache
index df26e39fc55..6aadf2305d1 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/api.mustache
@@ -80,7 +80,7 @@ public interface {{classname}} extends ApiClient.Api {
   public static class {{operationIdCamelCase}}QueryParams extends HashMap<String, Object> {
       {{#queryParams}}
     public {{operationIdCamelCase}}QueryParams {{paramName}}(final {{{dataType}}} value) {
-      put("{{paramName}}", value);
+      put("{{baseName}}", value);
       return this;
     }
       {{/queryParams}}
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeApi.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeApi.java
index 0e634f7bc6e..ab0b9b2bd4f 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeApi.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeApi.java
@@ -114,15 +114,15 @@ public interface FakeApi extends ApiClient.Api {
    */
   public static class TestEnumParametersQueryParams extends HashMap<String, Object> {
     public TestEnumParametersQueryParams enumQueryStringArray(final List<String> value) {
-      put("enumQueryStringArray", value);
+      put("enum_query_string_array", value);
       return this;
     }
     public TestEnumParametersQueryParams enumQueryString(final String value) {
-      put("enumQueryString", value);
+      put("enum_query_string", value);
       return this;
     }
     public TestEnumParametersQueryParams enumQueryInteger(final Integer value) {
-      put("enumQueryInteger", value);
+      put("enum_query_integer", value);
       return this;
     }
   }