loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-05-13 05:00:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix an issue in Play Framework generator where a CSV is empty and transfered to the controllerImp with an empty item. (#7496)

Browse Source
This commit is contained in:
Jean-François Côté 2018-01-25 08:53:20 -05:00 committed by William Cheng
parent d1a296412e
commit e33b350c89
21 changed files with 143 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/swagger-codegen/src/main/resources/JavaPlayFramework/newApiController.mustache
View File

@ -99,9 +99,11 @@ public class {{classname}}Controller extends Controller {
List<String> {{paramName}}List = SwaggerUtils.parametersToList("{{collectionFormat}}", {{paramName}}Array); List<String> {{paramName}}List = SwaggerUtils.parametersToList("{{collectionFormat}}", {{paramName}}Array);
{{{dataType}}} {{paramName}} = new Array{{{dataType}}}(); {{{dataType}}} {{paramName}} = new Array{{{dataType}}}();
for (String curParam : {{paramName}}List) { for (String curParam : {{paramName}}List) {
if (!curParam.isEmpty()) {
//noinspection UseBulkOperation //noinspection UseBulkOperation
{{paramName}}.add({{>itemConversionBegin}}curParam{{>itemConversionEnd}}); {{paramName}}.add({{>itemConversionBegin}}curParam{{>itemConversionEnd}});
} }
}
{{/collectionFormat}} {{/collectionFormat}}
{{^collectionFormat}} {{^collectionFormat}}
String value{{paramName}} = request().getQueryString("{{baseName}}"); String value{{paramName}} = request().getQueryString("{{baseName}}");
@ -138,9 +140,11 @@ public class {{classname}}Controller extends Controller {
List<String> {{paramName}}List = SwaggerUtils.parametersToList("{{collectionFormat}}", {{paramName}}Array); List<String> {{paramName}}List = SwaggerUtils.parametersToList("{{collectionFormat}}", {{paramName}}Array);
{{{dataType}}} {{paramName}} = new Array{{{dataType}}}(); {{{dataType}}} {{paramName}} = new Array{{{dataType}}}();
for (String curParam : {{paramName}}List) { for (String curParam : {{paramName}}List) {
if (!curParam.isEmpty()) {
//noinspection UseBulkOperation //noinspection UseBulkOperation
{{paramName}}.add({{>itemConversionBegin}}curParam{{>itemConversionEnd}}); {{paramName}}.add({{>itemConversionBegin}}curParam{{>itemConversionEnd}});
} }
}
{{/collectionFormat}} {{/collectionFormat}}
{{^collectionFormat}} {{^collectionFormat}}
String value{{paramName}} = (request().body().asMultipartFormData().asFormUrlEncoded().get("{{baseName}}"))[0]; String value{{paramName}} = (request().body().asMultipartFormData().asFormUrlEncoded().get("{{baseName}}"))[0];
@ -169,9 +173,11 @@ public class {{classname}}Controller extends Controller {
List<String> {{paramName}}List = SwaggerUtils.parametersToList("{{collectionFormat}}", {{paramName}}Array); List<String> {{paramName}}List = SwaggerUtils.parametersToList("{{collectionFormat}}", {{paramName}}Array);
{{{dataType}}} {{paramName}} = new Array{{{dataType}}}(); {{{dataType}}} {{paramName}} = new Array{{{dataType}}}();
for (String curParam : {{paramName}}List) { for (String curParam : {{paramName}}List) {
if (!curParam.isEmpty()) {
//noinspection UseBulkOperation //noinspection UseBulkOperation
{{paramName}}.add({{>itemConversionBegin}}curParam{{>itemConversionEnd}}); {{paramName}}.add({{>itemConversionBegin}}curParam{{>itemConversionEnd}});
} }
}
{{/collectionFormat}} {{/collectionFormat}}
{{^collectionFormat}} {{^collectionFormat}}
String value{{paramName}} = request().getHeader("{{baseName}}"); String value{{paramName}} = request().getHeader("{{baseName}}");

2
samples/server/petstore/java-play-framework-api-package-override/.swagger-codegen/VERSION
View File

@ -1 +1 @@
2.3.0 2.4.0-SNAPSHOT

4
samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiController.java
View File

@ -75,9 +75,11 @@ public class PetApiController extends Controller {
List<String> statusList = SwaggerUtils.parametersToList("csv", statusArray); List<String> statusList = SwaggerUtils.parametersToList("csv", statusArray);
List<String> status = new ArrayList<String>(); List<String> status = new ArrayList<String>();
for (String curParam : statusList) { for (String curParam : statusList) {
if (!curParam.isEmpty()) {
//noinspection UseBulkOperation //noinspection UseBulkOperation
status.add(curParam); status.add(curParam);
} }
}
List<Pet> obj = imp.findPetsByStatus(status); List<Pet> obj = imp.findPetsByStatus(status);
if (configuration.getBoolean("useOutputBeanValidation")) { if (configuration.getBoolean("useOutputBeanValidation")) {
for (Pet curItem : obj) { for (Pet curItem : obj) {
@ -97,9 +99,11 @@ public class PetApiController extends Controller {
List<String> tagsList = SwaggerUtils.parametersToList("csv", tagsArray); List<String> tagsList = SwaggerUtils.parametersToList("csv", tagsArray);
List<String> tags = new ArrayList<String>(); List<String> tags = new ArrayList<String>();
for (String curParam : tagsList) { for (String curParam : tagsList) {
if (!curParam.isEmpty()) {
//noinspection UseBulkOperation //noinspection UseBulkOperation
tags.add(curParam); tags.add(curParam);
} }
}
List<Pet> obj = imp.findPetsByTags(tags); List<Pet> obj = imp.findPetsByTags(tags);
if (configuration.getBoolean("useOutputBeanValidation")) { if (configuration.getBoolean("useOutputBeanValidation")) {
for (Pet curItem : obj) { for (Pet curItem : obj) {

2
samples/server/petstore/java-play-framework-controller-only/.swagger-codegen/VERSION
View File

@ -1 +1 @@
2.3.0 2.4.0-SNAPSHOT

4
samples/server/petstore/java-play-framework-controller-only/app/controllers/PetApiController.java
View File

@ -71,9 +71,11 @@ public class PetApiController extends Controller {
List<String> statusList = SwaggerUtils.parametersToList("csv", statusArray); List<String> statusList = SwaggerUtils.parametersToList("csv", statusArray);
List<String> status = new ArrayList<String>(); List<String> status = new ArrayList<String>();
for (String curParam : statusList) { for (String curParam : statusList) {
if (!curParam.isEmpty()) {
//noinspection UseBulkOperation //noinspection UseBulkOperation
status.add(curParam); status.add(curParam);
} }
}
return ok(); return ok();
} }
@ -86,9 +88,11 @@ public class PetApiController extends Controller {
List<String> tagsList = SwaggerUtils.parametersToList("csv", tagsArray); List<String> tagsList = SwaggerUtils.parametersToList("csv", tagsArray);
List<String> tags = new ArrayList<String>(); List<String> tags = new ArrayList<String>();
for (String curParam : tagsList) { for (String curParam : tagsList) {
if (!curParam.isEmpty()) {
//noinspection UseBulkOperation //noinspection UseBulkOperation
tags.add(curParam); tags.add(curParam);
} }
}
return ok(); return ok();
} }

2
samples/server/petstore/java-play-framework-fake-endpoints/.swagger-codegen/VERSION
View File

@ -1 +1 @@
2.3.0 2.4.0-SNAPSHOT

6
samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java
View File

@ -243,9 +243,11 @@ public class FakeApiController extends Controller {
List<String> enumQueryStringArrayList = SwaggerUtils.parametersToList("csv", enumQueryStringArrayArray); List<String> enumQueryStringArrayList = SwaggerUtils.parametersToList("csv", enumQueryStringArrayArray);
List<String> enumQueryStringArray = new ArrayList<String>(); List<String> enumQueryStringArray = new ArrayList<String>();
for (String curParam : enumQueryStringArrayList) { for (String curParam : enumQueryStringArrayList) {
if (!curParam.isEmpty()) {
//noinspection UseBulkOperation //noinspection UseBulkOperation
enumQueryStringArray.add(curParam); enumQueryStringArray.add(curParam);
} }
}
String valueenumQueryString = request().getQueryString("enum_query_string"); String valueenumQueryString = request().getQueryString("enum_query_string");
String enumQueryString; String enumQueryString;
if (valueenumQueryString != null) { if (valueenumQueryString != null) {
@ -264,9 +266,11 @@ public class FakeApiController extends Controller {
List<String> enumFormStringArrayList = SwaggerUtils.parametersToList("csv", enumFormStringArrayArray); List<String> enumFormStringArrayList = SwaggerUtils.parametersToList("csv", enumFormStringArrayArray);
List<String> enumFormStringArray = new ArrayList<String>(); List<String> enumFormStringArray = new ArrayList<String>();
for (String curParam : enumFormStringArrayList) { for (String curParam : enumFormStringArrayList) {
if (!curParam.isEmpty()) {
//noinspection UseBulkOperation //noinspection UseBulkOperation
enumFormStringArray.add(curParam); enumFormStringArray.add(curParam);
} }
}
String valueenumFormString = (request().body().asMultipartFormData().asFormUrlEncoded().get("enum_form_string"))[0]; String valueenumFormString = (request().body().asMultipartFormData().asFormUrlEncoded().get("enum_form_string"))[0];
String enumFormString; String enumFormString;
if (valueenumFormString != null) { if (valueenumFormString != null) {
@ -285,9 +289,11 @@ public class FakeApiController extends Controller {
List<String> enumHeaderStringArrayList = SwaggerUtils.parametersToList("csv", enumHeaderStringArrayArray); List<String> enumHeaderStringArrayList = SwaggerUtils.parametersToList("csv", enumHeaderStringArrayArray);
List<String> enumHeaderStringArray = new ArrayList<String>(); List<String> enumHeaderStringArray = new ArrayList<String>();
for (String curParam : enumHeaderStringArrayList) { for (String curParam : enumHeaderStringArrayList) {
if (!curParam.isEmpty()) {
//noinspection UseBulkOperation //noinspection UseBulkOperation
enumHeaderStringArray.add(curParam); enumHeaderStringArray.add(curParam);
} }
}
String valueenumHeaderString = request().getHeader("enum_header_string"); String valueenumHeaderString = request().getHeader("enum_header_string");
String enumHeaderString; String enumHeaderString;
if (valueenumHeaderString != null) { if (valueenumHeaderString != null) {

4
samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiController.java
View File

@ -75,9 +75,11 @@ public class PetApiController extends Controller {
List<String> statusList = SwaggerUtils.parametersToList("csv", statusArray); List<String> statusList = SwaggerUtils.parametersToList("csv", statusArray);
List<String> status = new ArrayList<String>(); List<String> status = new ArrayList<String>();
for (String curParam : statusList) { for (String curParam : statusList) {
if (!curParam.isEmpty()) {
//noinspection UseBulkOperation //noinspection UseBulkOperation
status.add(curParam); status.add(curParam);
} }
}
List<Pet> obj = imp.findPetsByStatus(status); List<Pet> obj = imp.findPetsByStatus(status);
if (configuration.getBoolean("useOutputBeanValidation")) { if (configuration.getBoolean("useOutputBeanValidation")) {
for (Pet curItem : obj) { for (Pet curItem : obj) {
@ -97,9 +99,11 @@ public class PetApiController extends Controller {
List<String> tagsList = SwaggerUtils.parametersToList("csv", tagsArray); List<String> tagsList = SwaggerUtils.parametersToList("csv", tagsArray);
List<String> tags = new ArrayList<String>(); List<String> tags = new ArrayList<String>();
for (String curParam : tagsList) { for (String curParam : tagsList) {
if (!curParam.isEmpty()) {
//noinspection UseBulkOperation //noinspection UseBulkOperation
tags.add(curParam); tags.add(curParam);
} }
}
List<Pet> obj = imp.findPetsByTags(tags); List<Pet> obj = imp.findPetsByTags(tags);
if (configuration.getBoolean("useOutputBeanValidation")) { if (configuration.getBoolean("useOutputBeanValidation")) {
for (Pet curItem : obj) { for (Pet curItem : obj) {

2
samples/server/petstore/java-play-framework-no-bean-validation/.swagger-codegen/VERSION
View File

@ -1 +1 @@
2.3.0 2.4.0-SNAPSHOT

4
samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiController.java
View File

@ -68,9 +68,11 @@ public class PetApiController extends Controller {
List<String> statusList = SwaggerUtils.parametersToList("csv", statusArray); List<String> statusList = SwaggerUtils.parametersToList("csv", statusArray);
List<String> status = new ArrayList<String>(); List<String> status = new ArrayList<String>();
for (String curParam : statusList) { for (String curParam : statusList) {
if (!curParam.isEmpty()) {
//noinspection UseBulkOperation //noinspection UseBulkOperation
status.add(curParam); status.add(curParam);
} }
}
List<Pet> obj = imp.findPetsByStatus(status); List<Pet> obj = imp.findPetsByStatus(status);
JsonNode result = mapper.valueToTree(obj); JsonNode result = mapper.valueToTree(obj);
return ok(result); return ok(result);
@ -85,9 +87,11 @@ public class PetApiController extends Controller {
List<String> tagsList = SwaggerUtils.parametersToList("csv", tagsArray); List<String> tagsList = SwaggerUtils.parametersToList("csv", tagsArray);
List<String> tags = new ArrayList<String>(); List<String> tags = new ArrayList<String>();
for (String curParam : tagsList) { for (String curParam : tagsList) {
if (!curParam.isEmpty()) {
//noinspection UseBulkOperation //noinspection UseBulkOperation
tags.add(curParam); tags.add(curParam);
} }
}
List<Pet> obj = imp.findPetsByTags(tags); List<Pet> obj = imp.findPetsByTags(tags);
JsonNode result = mapper.valueToTree(obj); JsonNode result = mapper.valueToTree(obj);
return ok(result); return ok(result);

2
samples/server/petstore/java-play-framework-no-exception-handling/.swagger-codegen/VERSION
View File

@ -1 +1 @@
2.3.0 2.4.0-SNAPSHOT

4
samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiController.java
View File

@ -76,9 +76,11 @@ public class PetApiController extends Controller {
List<String> statusList = SwaggerUtils.parametersToList("csv", statusArray); List<String> statusList = SwaggerUtils.parametersToList("csv", statusArray);
List<String> status = new ArrayList<String>(); List<String> status = new ArrayList<String>();
for (String curParam : statusList) { for (String curParam : statusList) {
if (!curParam.isEmpty()) {
//noinspection UseBulkOperation //noinspection UseBulkOperation
status.add(curParam); status.add(curParam);
} }
}
List<Pet> obj = imp.findPetsByStatus(status); List<Pet> obj = imp.findPetsByStatus(status);
if (configuration.getBoolean("useOutputBeanValidation")) { if (configuration.getBoolean("useOutputBeanValidation")) {
for (Pet curItem : obj) { for (Pet curItem : obj) {
@ -98,9 +100,11 @@ public class PetApiController extends Controller {
List<String> tagsList = SwaggerUtils.parametersToList("csv", tagsArray); List<String> tagsList = SwaggerUtils.parametersToList("csv", tagsArray);
List<String> tags = new ArrayList<String>(); List<String> tags = new ArrayList<String>();
for (String curParam : tagsList) { for (String curParam : tagsList) {
if (!curParam.isEmpty()) {
//noinspection UseBulkOperation //noinspection UseBulkOperation
tags.add(curParam); tags.add(curParam);
} }
}
List<Pet> obj = imp.findPetsByTags(tags); List<Pet> obj = imp.findPetsByTags(tags);
if (configuration.getBoolean("useOutputBeanValidation")) { if (configuration.getBoolean("useOutputBeanValidation")) {
for (Pet curItem : obj) { for (Pet curItem : obj) {

2
samples/server/petstore/java-play-framework-no-interface/.swagger-codegen/VERSION
View File

@ -1 +1 @@
2.3.0 2.4.0-SNAPSHOT

4
samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiController.java
View File

@ -75,9 +75,11 @@ public class PetApiController extends Controller {
List<String> statusList = SwaggerUtils.parametersToList("csv", statusArray); List<String> statusList = SwaggerUtils.parametersToList("csv", statusArray);
List<String> status = new ArrayList<String>(); List<String> status = new ArrayList<String>();
for (String curParam : statusList) { for (String curParam : statusList) {
if (!curParam.isEmpty()) {
//noinspection UseBulkOperation //noinspection UseBulkOperation
status.add(curParam); status.add(curParam);
} }
}
List<Pet> obj = imp.findPetsByStatus(status); List<Pet> obj = imp.findPetsByStatus(status);
if (configuration.getBoolean("useOutputBeanValidation")) { if (configuration.getBoolean("useOutputBeanValidation")) {
for (Pet curItem : obj) { for (Pet curItem : obj) {
@ -97,9 +99,11 @@ public class PetApiController extends Controller {
List<String> tagsList = SwaggerUtils.parametersToList("csv", tagsArray); List<String> tagsList = SwaggerUtils.parametersToList("csv", tagsArray);
List<String> tags = new ArrayList<String>(); List<String> tags = new ArrayList<String>();
for (String curParam : tagsList) { for (String curParam : tagsList) {
if (!curParam.isEmpty()) {
//noinspection UseBulkOperation //noinspection UseBulkOperation
tags.add(curParam); tags.add(curParam);
} }
}
List<Pet> obj = imp.findPetsByTags(tags); List<Pet> obj = imp.findPetsByTags(tags);
if (configuration.getBoolean("useOutputBeanValidation")) { if (configuration.getBoolean("useOutputBeanValidation")) {
for (Pet curItem : obj) { for (Pet curItem : obj) {

2
samples/server/petstore/java-play-framework-no-swagger-ui/.swagger-codegen/VERSION
View File

@ -1 +1 @@
2.3.0 2.4.0-SNAPSHOT

4
samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiController.java
View File

@ -75,9 +75,11 @@ public class PetApiController extends Controller {
List<String> statusList = SwaggerUtils.parametersToList("csv", statusArray); List<String> statusList = SwaggerUtils.parametersToList("csv", statusArray);
List<String> status = new ArrayList<String>(); List<String> status = new ArrayList<String>();
for (String curParam : statusList) { for (String curParam : statusList) {
if (!curParam.isEmpty()) {
//noinspection UseBulkOperation //noinspection UseBulkOperation
status.add(curParam); status.add(curParam);
} }
}
List<Pet> obj = imp.findPetsByStatus(status); List<Pet> obj = imp.findPetsByStatus(status);
if (configuration.getBoolean("useOutputBeanValidation")) { if (configuration.getBoolean("useOutputBeanValidation")) {
for (Pet curItem : obj) { for (Pet curItem : obj) {
@ -97,9 +99,11 @@ public class PetApiController extends Controller {
List<String> tagsList = SwaggerUtils.parametersToList("csv", tagsArray); List<String> tagsList = SwaggerUtils.parametersToList("csv", tagsArray);
List<String> tags = new ArrayList<String>(); List<String> tags = new ArrayList<String>();
for (String curParam : tagsList) { for (String curParam : tagsList) {
if (!curParam.isEmpty()) {
//noinspection UseBulkOperation //noinspection UseBulkOperation
tags.add(curParam); tags.add(curParam);
} }
}
List<Pet> obj = imp.findPetsByTags(tags); List<Pet> obj = imp.findPetsByTags(tags);
if (configuration.getBoolean("useOutputBeanValidation")) { if (configuration.getBoolean("useOutputBeanValidation")) {
for (Pet curItem : obj) { for (Pet curItem : obj) {

2
samples/server/petstore/java-play-framework-no-wrap-calls/.swagger-codegen/VERSION
View File

@ -1 +1 @@
2.3.0 2.4.0-SNAPSHOT

4
samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiController.java
View File

@ -74,9 +74,11 @@ public class PetApiController extends Controller {
List<String> statusList = SwaggerUtils.parametersToList("csv", statusArray); List<String> statusList = SwaggerUtils.parametersToList("csv", statusArray);
List<String> status = new ArrayList<String>(); List<String> status = new ArrayList<String>();
for (String curParam : statusList) { for (String curParam : statusList) {
if (!curParam.isEmpty()) {
//noinspection UseBulkOperation //noinspection UseBulkOperation
status.add(curParam); status.add(curParam);
} }
}
List<Pet> obj = imp.findPetsByStatus(status); List<Pet> obj = imp.findPetsByStatus(status);
if (configuration.getBoolean("useOutputBeanValidation")) { if (configuration.getBoolean("useOutputBeanValidation")) {
for (Pet curItem : obj) { for (Pet curItem : obj) {
@ -96,9 +98,11 @@ public class PetApiController extends Controller {
List<String> tagsList = SwaggerUtils.parametersToList("csv", tagsArray); List<String> tagsList = SwaggerUtils.parametersToList("csv", tagsArray);
List<String> tags = new ArrayList<String>(); List<String> tags = new ArrayList<String>();
for (String curParam : tagsList) { for (String curParam : tagsList) {
if (!curParam.isEmpty()) {
//noinspection UseBulkOperation //noinspection UseBulkOperation
tags.add(curParam); tags.add(curParam);
} }
}
List<Pet> obj = imp.findPetsByTags(tags); List<Pet> obj = imp.findPetsByTags(tags);
if (configuration.getBoolean("useOutputBeanValidation")) { if (configuration.getBoolean("useOutputBeanValidation")) {
for (Pet curItem : obj) { for (Pet curItem : obj) {

2
samples/server/petstore/java-play-framework/.swagger-codegen/VERSION
View File

@ -1 +1 @@
2.3.0 2.4.0-SNAPSHOT

4
samples/server/petstore/java-play-framework/app/controllers/PetApiController.java
View File

@ -75,9 +75,11 @@ public class PetApiController extends Controller {
List<String> statusList = SwaggerUtils.parametersToList("csv", statusArray); List<String> statusList = SwaggerUtils.parametersToList("csv", statusArray);
List<String> status = new ArrayList<String>(); List<String> status = new ArrayList<String>();
for (String curParam : statusList) { for (String curParam : statusList) {
if (!curParam.isEmpty()) {
//noinspection UseBulkOperation //noinspection UseBulkOperation
status.add(curParam); status.add(curParam);
} }
}
List<Pet> obj = imp.findPetsByStatus(status); List<Pet> obj = imp.findPetsByStatus(status);
if (configuration.getBoolean("useOutputBeanValidation")) { if (configuration.getBoolean("useOutputBeanValidation")) {
for (Pet curItem : obj) { for (Pet curItem : obj) {
@ -97,9 +99,11 @@ public class PetApiController extends Controller {
List<String> tagsList = SwaggerUtils.parametersToList("csv", tagsArray); List<String> tagsList = SwaggerUtils.parametersToList("csv", tagsArray);
List<String> tags = new ArrayList<String>(); List<String> tags = new ArrayList<String>();
for (String curParam : tagsList) { for (String curParam : tagsList) {
if (!curParam.isEmpty()) {
//noinspection UseBulkOperation //noinspection UseBulkOperation
tags.add(curParam); tags.add(curParam);
} }
}
List<Pet> obj = imp.findPetsByTags(tags); List<Pet> obj = imp.findPetsByTags(tags);
if (configuration.getBoolean("useOutputBeanValidation")) { if (configuration.getBoolean("useOutputBeanValidation")) {
for (Pet curItem : obj) { for (Pet curItem : obj) {