From 3d6bd48b6752ac8c105b98237e47448c3b9055f2 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Mon, 26 Oct 2020 12:38:01 +0800 Subject: [PATCH] [JAX-RS] replace isListContainer with isArray (#7806) * replace isListContainer with isArray * update serviceFormParams.mustache --- .../src/main/resources/JavaJaxRS/formParams.mustache | 2 +- .../resources/JavaJaxRS/libraries/jersey1/formParams.mustache | 2 +- .../src/main/resources/JavaJaxRS/serviceFormParams.mustache | 2 +- .../codegen/java/jaxrs/JavaJerseyServerCodegenTest.java | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/formParams.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/formParams.mustache index 6580e896f6a..bb84392b9c3 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/formParams.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/formParams.mustache @@ -1,2 +1,2 @@ {{#isFormParam}}{{^isFile}}@ApiParam(value = "{{{description}}}"{{#required}}, required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}){{#vendorExtensions.x-multipart}}@FormDataParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/vendorExtensions.x-multipart}}{{^vendorExtensions.x-multipart}} {{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} @FormParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/vendorExtensions.x-multipart}}{{/isFile}}{{#isFile}} -{{^isListContainer}} @FormDataParam("{{baseName}}") FormDataBodyPart {{paramName}}Bodypart {{/isListContainer}}{{#isListContainer}} @FormDataParam("{{baseName}}") List {{paramName}}Bodypart {{/isListContainer}}{{/isFile}}{{/isFormParam}} \ No newline at end of file +{{^isArray}} @FormDataParam("{{baseName}}") FormDataBodyPart {{paramName}}Bodypart {{/isArray}}{{#isArray}} @FormDataParam("{{baseName}}") List {{paramName}}Bodypart {{/isArray}}{{/isFile}}{{/isFormParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey1/formParams.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey1/formParams.mustache index 55febc473f6..d02af8c3d3d 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey1/formParams.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey1/formParams.mustache @@ -1 +1 @@ -{{#isFormParam}}{{^isFile}}{{^vendorExtensions.x-multipart}}@ApiParam(value = "{{{description}}}"{{#required}}, required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}){{/vendorExtensions.x-multipart}}{{#vendorExtensions.x-multipart}}@FormDataParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/vendorExtensions.x-multipart}}{{^vendorExtensions.x-multipart}} {{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} @FormParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/vendorExtensions.x-multipart}}{{/isFile}}{{#isFile}}{{^isListContainer}}@FormDataParam("{{baseName}}") FormDataBodyPart {{paramName}}Bodypart{{/isListContainer}}{{#isListContainer}}@FormDataParam("{{baseName}}") List {{paramName}}Bodypart{{/isListContainer}}{{/isFile}}{{/isFormParam}} \ No newline at end of file +{{#isFormParam}}{{^isFile}}{{^vendorExtensions.x-multipart}}@ApiParam(value = "{{{description}}}"{{#required}}, required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}){{/vendorExtensions.x-multipart}}{{#vendorExtensions.x-multipart}}@FormDataParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/vendorExtensions.x-multipart}}{{^vendorExtensions.x-multipart}} {{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} @FormParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/vendorExtensions.x-multipart}}{{/isFile}}{{#isFile}}{{^isArray}}@FormDataParam("{{baseName}}") FormDataBodyPart {{paramName}}Bodypart{{/isArray}}{{#isArray}}@FormDataParam("{{baseName}}") List {{paramName}}Bodypart{{/isArray}}{{/isFile}}{{/isFormParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/serviceFormParams.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/serviceFormParams.mustache index 9834749e13b..fa3f638ae95 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/serviceFormParams.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/serviceFormParams.mustache @@ -1 +1 @@ -{{#isFormParam}}{{^isFile}}{{{dataType}}} {{paramName}}{{/isFile}}{{#isFile}}{{^isListContainer}}FormDataBodyPart {{paramName}}Bodypart{{/isListContainer}}{{#isListContainer}}List {{paramName}}Bodypart{{/isListContainer}}{{/isFile}}{{/isFormParam}} \ No newline at end of file +{{#isFormParam}}{{^isFile}}{{{dataType}}} {{paramName}}{{/isFile}}{{#isFile}}{{^isArray}}FormDataBodyPart {{paramName}}Bodypart{{/isArray}}{{#isArray}}List {{paramName}}Bodypart{{/isArray}}{{/isFile}}{{/isFormParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJerseyServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJerseyServerCodegenTest.java index 1ebcf6d7537..fb950fbe552 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJerseyServerCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJerseyServerCodegenTest.java @@ -137,8 +137,7 @@ public class JavaJerseyServerCodegenTest extends JavaJaxrsBaseTest { // Check files for Array final String[] fileA = new String[] { "MultipartArrayApiService.java", "MultipartArrayApi.java", "MultipartArrayApiServiceImpl.java"}; for (String f : fileA) { - // comment out below as it's causing build failure - //assertFileContains( files.get(f).toPath(), "List files"); + assertFileContains( files.get(f).toPath(), "List files"); } }