From d80c0f55467015d4182a1853ec4f01f6abfbf9aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20C=C3=B4t=C3=A9?= <jcote@stingray.com>
Date: Wed, 30 Aug 2017 05:58:24 -0400
Subject: [PATCH] [Java Play Framework] Fix a small error of using paramName
 instead of baseName (#6395)

* Fix a small error of using paramName instead of baseName

* Add sample generation
---
 .../resources/JavaPlayFramework/newApiController.mustache     | 2 +-
 .../app/controllers/FakeApiController.java                    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/JavaPlayFramework/newApiController.mustache b/modules/swagger-codegen/src/main/resources/JavaPlayFramework/newApiController.mustache
index 518d3ea5f9ff..c4577760c7e2 100644
--- a/modules/swagger-codegen/src/main/resources/JavaPlayFramework/newApiController.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaPlayFramework/newApiController.mustache
@@ -78,7 +78,7 @@ public class {{classname}}Controller extends Controller {
         }
         {{/collectionFormat}}
         {{^collectionFormat}}
-        String value{{paramName}} = request().getQueryString("{{paramName}}");
+        String value{{paramName}} = request().getQueryString("{{baseName}}");
         {{{dataType}}} {{paramName}};
         {{^required}}
         if (value{{paramName}} != null) {
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java
index dfa826fb7e62..5781e482a794 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java
@@ -230,7 +230,7 @@ public class FakeApiController extends Controller {
             //noinspection UseBulkOperation
             enumQueryStringArray.add(curParam);
         }
-        String valueenumQueryString = request().getQueryString("enumQueryString");
+        String valueenumQueryString = request().getQueryString("enum_query_string");
         String enumQueryString;
         if (valueenumQueryString != null) {
             enumQueryString = valueenumQueryString;
@@ -238,7 +238,7 @@ public class FakeApiController extends Controller {
         } else {
             enumQueryString = "-efg";
         }
-        String valueenumQueryInteger = request().getQueryString("enumQueryInteger");
+        String valueenumQueryInteger = request().getQueryString("enum_query_integer");
         Integer enumQueryInteger;
         if (valueenumQueryInteger != null) {
             enumQueryInteger = Integer.parseInt(valueenumQueryInteger);