Fix JaxRS-Jersey template for files upload (#2570)

* Fix JaxRS-Jersey template for files

For #2474

* Samples

* PR Review

* Samples

* Add openapi3 to sample script jaxrs server all

* Sample

Author: Zomzog

bin/java-jaxrs-petstore-server-all.sh

@@ -18,4 +18,6 @@
 ./bin/jaxrs-spec-petstore-server.sh
 ./bin/jaxrs-usetags-petstore-server.sh
 
+./bin/openapi3/jaxrs-jersey-petstore.sh
+
 echo " Please run ./bin/jaxrs-cxf-petstore-server-test-data.sh manually instead"

modules/openapi-generator/src/main/resources/JavaJaxRS/api.mustache

@@ -76,7 +76,7 @@ public class {{classname}}  {
         {{/hasMore}}{{/responses}} })
     public Response {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}},{{/allParams}}@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.{{nickname}}({{#allParams}}{{#isFile}}{{paramName}}InputStream, {{paramName}}Detail{{/isFile}}{{^isFile}}{{paramName}}{{/isFile}},{{/allParams}}securityContext);
+        return delegate.{{nickname}}({{#allParams}}{{#isFormParam}}{{#isFile}}{{paramName}}InputStream, {{paramName}}Detail{{/isFile}}{{/isFormParam}}{{^isFile}}{{paramName}}{{/isFile}}{{^isFormParam}}{{#isFile}}{{paramName}}{{/isFile}}{{/isFormParam}}, {{/allParams}}securityContext);
     }
 {{/operation}}
 }

samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/AnotherFakeApi.java

@@ -65,6 +65,6 @@ public AnotherFakeApi(@Context ServletConfig servletContext) {
     public Response call123testSpecialTags(@ApiParam(value = "client model" ,required=true) @NotNull @Valid Client body
 ,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.call123testSpecialTags(body,securityContext);
+        return delegate.call123testSpecialTags(body, securityContext);
     }
 }

samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApi.java

@@ -75,7 +75,7 @@ public FakeApi(@Context ServletConfig servletContext) {
     public Response createXmlItem(@ApiParam(value = "XmlItem Body" ,required=true) @NotNull @Valid XmlItem xmlItem
 ,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.createXmlItem(xmlItem,securityContext);
+        return delegate.createXmlItem(xmlItem, securityContext);
     }
     @POST
     @Path("/outer/boolean")
@@ -87,7 +87,7 @@ public Response createXmlItem(@ApiParam(value = "XmlItem Body" ,required=true) @
     public Response fakeOuterBooleanSerialize(@ApiParam(value = "Input boolean as post body" ) Boolean body
 ,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.fakeOuterBooleanSerialize(body,securityContext);
+        return delegate.fakeOuterBooleanSerialize(body, securityContext);
     }
     @POST
     @Path("/outer/composite")
@@ -99,7 +99,7 @@ public Response fakeOuterBooleanSerialize(@ApiParam(value = "Input boolean as po
     public Response fakeOuterCompositeSerialize(@ApiParam(value = "Input composite as post body" ) @Valid OuterComposite body
 ,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.fakeOuterCompositeSerialize(body,securityContext);
+        return delegate.fakeOuterCompositeSerialize(body, securityContext);
     }
     @POST
     @Path("/outer/number")
@@ -111,7 +111,7 @@ public Response fakeOuterCompositeSerialize(@ApiParam(value = "Input composite a
     public Response fakeOuterNumberSerialize(@ApiParam(value = "Input number as post body" ) BigDecimal body
 ,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.fakeOuterNumberSerialize(body,securityContext);
+        return delegate.fakeOuterNumberSerialize(body, securityContext);
     }
     @POST
     @Path("/outer/string")
@@ -123,7 +123,7 @@ public Response fakeOuterNumberSerialize(@ApiParam(value = "Input number as post
     public Response fakeOuterStringSerialize(@ApiParam(value = "Input string as post body" ) String body
 ,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.fakeOuterStringSerialize(body,securityContext);
+        return delegate.fakeOuterStringSerialize(body, securityContext);
     }
     @PUT
     @Path("/body-with-file-schema")
@@ -135,7 +135,7 @@ public Response fakeOuterStringSerialize(@ApiParam(value = "Input string as post
     public Response testBodyWithFileSchema(@ApiParam(value = "" ,required=true) @NotNull @Valid FileSchemaTestClass body
 ,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.testBodyWithFileSchema(body,securityContext);
+        return delegate.testBodyWithFileSchema(body, securityContext);
     }
     @PUT
     @Path("/body-with-query-params")
@@ -148,7 +148,7 @@ public Response testBodyWithQueryParams(@ApiParam(value = "",required=true) @Que
 ,@ApiParam(value = "" ,required=true) @NotNull @Valid User body
 ,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.testBodyWithQueryParams(query,body,securityContext);
+        return delegate.testBodyWithQueryParams(query, body, securityContext);
     }
     @PATCH
 
@@ -160,7 +160,7 @@ public Response testBodyWithQueryParams(@ApiParam(value = "",required=true) @Que
     public Response testClientModel(@ApiParam(value = "client model" ,required=true) @NotNull @Valid Client body
 ,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.testClientModel(body,securityContext);
+        return delegate.testClientModel(body, securityContext);
     }
     @POST
 
@@ -191,7 +191,7 @@ public Response testEndpointParameters(@ApiParam(value = "None", required=true)
 ,@ApiParam(value = "None")  @FormParam("callback")  String paramCallback
 ,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.testEndpointParameters(number,_double,patternWithoutDelimiter,_byte,integer,int32,int64,_float,string,binaryInputStream, binaryDetail,date,dateTime,password,paramCallback,securityContext);
+        return delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binaryInputStream, binaryDetail, date, dateTime, password, paramCallback, securityContext);
     }
     @GET
 
@@ -212,7 +212,7 @@ public Response testEnumParameters(@ApiParam(value = "Header parameter enum test
 ,@ApiParam(value = "Form parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue="-efg")  @DefaultValue("-efg") @FormParam("enum_form_string")  String enumFormString
 ,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.testEnumParameters(enumHeaderStringArray,enumHeaderString,enumQueryStringArray,enumQueryString,enumQueryInteger,enumQueryDouble,enumFormStringArray,enumFormString,securityContext);
+        return delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, securityContext);
     }
     @DELETE
 
@@ -229,7 +229,7 @@ public Response testGroupParameters(@ApiParam(value = "Required String in group
 ,@ApiParam(value = "Integer in group parameters") @QueryParam("int64_group") Long int64Group
 ,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.testGroupParameters(requiredStringGroup,requiredBooleanGroup,requiredInt64Group,stringGroup,booleanGroup,int64Group,securityContext);
+        return delegate.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, securityContext);
     }
     @POST
     @Path("/inline-additionalProperties")
@@ -241,7 +241,7 @@ public Response testGroupParameters(@ApiParam(value = "Required String in group
     public Response testInlineAdditionalProperties(@ApiParam(value = "request body" ,required=true) @NotNull @Valid Map<String, String> param
 ,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.testInlineAdditionalProperties(param,securityContext);
+        return delegate.testInlineAdditionalProperties(param, securityContext);
     }
     @GET
     @Path("/jsonFormData")
@@ -254,7 +254,7 @@ public Response testJsonFormData(@ApiParam(value = "field1", required=true)  @Fo
 ,@ApiParam(value = "field2", required=true)  @FormParam("param2")  String param2
 ,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.testJsonFormData(param,param2,securityContext);
+        return delegate.testJsonFormData(param, param2, securityContext);
     }
     @POST
     @Path("/{petId}/uploadImageWithRequiredFile")
@@ -275,6 +275,6 @@ public Response uploadFileWithRequiredFile(@ApiParam(value = "ID of pet to updat
 ,@ApiParam(value = "Additional data to pass to server")@FormDataParam("additionalMetadata")  String additionalMetadata
 ,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.uploadFileWithRequiredFile(petId,requiredFileInputStream, requiredFileDetail,additionalMetadata,securityContext);
+        return delegate.uploadFileWithRequiredFile(petId, requiredFileInputStream, requiredFileDetail, additionalMetadata, securityContext);
     }
 }

samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java

@@ -67,6 +67,6 @@ public FakeClassnameTestApi(@Context ServletConfig servletContext) {
     public Response testClassname(@ApiParam(value = "client model" ,required=true) @NotNull @Valid Client body
 ,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.testClassname(body,securityContext);
+        return delegate.testClassname(body, securityContext);
     }
 }

samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApi.java

@@ -72,7 +72,7 @@ public PetApi(@Context ServletConfig servletContext) {
     public Response addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) @NotNull @Valid Pet body
 ,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.addPet(body,securityContext);
+        return delegate.addPet(body, securityContext);
     }
     @DELETE
     @Path("/{petId}")
@@ -90,7 +90,7 @@ public Response deletePet(@ApiParam(value = "Pet id to delete",required=true) @P
 ,@ApiParam(value = "" )@HeaderParam("api_key") String apiKey
 ,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.deletePet(petId,apiKey,securityContext);
+        return delegate.deletePet(petId, apiKey, securityContext);
     }
     @GET
     @Path("/findByStatus")
@@ -109,7 +109,7 @@ public Response deletePet(@ApiParam(value = "Pet id to delete",required=true) @P
     public Response findPetsByStatus(@ApiParam(value = "Status values that need to be considered for filter",required=true, allowableValues="available, pending, sold", defaultValue="new ArrayList<>()") @DefaultValue("new ArrayList<>()") @QueryParam("status") List<String> status
 ,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.findPetsByStatus(status,securityContext);
+        return delegate.findPetsByStatus(status, securityContext);
     }
     @GET
     @Path("/findByTags")
@@ -128,7 +128,7 @@ public Response findPetsByStatus(@ApiParam(value = "Status values that need to b
     public Response findPetsByTags(@ApiParam(value = "Tags to filter by",required=true, defaultValue="new ArrayList<>()") @DefaultValue("new ArrayList<>()") @QueryParam("tags") List<String> tags
 ,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.findPetsByTags(tags,securityContext);
+        return delegate.findPetsByTags(tags, securityContext);
     }
     @GET
     @Path("/{petId}")
@@ -146,7 +146,7 @@ public Response findPetsByTags(@ApiParam(value = "Tags to filter by",required=tr
     public Response getPetById(@ApiParam(value = "ID of pet to return",required=true) @PathParam("petId") Long petId
 ,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.getPetById(petId,securityContext);
+        return delegate.getPetById(petId, securityContext);
     }
     @PUT
 
@@ -167,7 +167,7 @@ public Response getPetById(@ApiParam(value = "ID of pet to return",required=true
     public Response updatePet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) @NotNull @Valid Pet body
 ,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.updatePet(body,securityContext);
+        return delegate.updatePet(body, securityContext);
     }
     @POST
     @Path("/{petId}")
@@ -186,7 +186,7 @@ public Response updatePetWithForm(@ApiParam(value = "ID of pet that needs to be
 ,@ApiParam(value = "Updated status of the pet")  @FormParam("status")  String status
 ,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.updatePetWithForm(petId,name,status,securityContext);
+        return delegate.updatePetWithForm(petId, name, status, securityContext);
     }
     @POST
     @Path("/{petId}/uploadImage")
@@ -207,6 +207,6 @@ public Response uploadFile(@ApiParam(value = "ID of pet to update",required=true
             @FormDataParam("file") FormDataContentDisposition fileDetail
 ,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.uploadFile(petId,additionalMetadata,fileInputStream, fileDetail,securityContext);
+        return delegate.uploadFile(petId, additionalMetadata, fileInputStream, fileDetail, securityContext);
     }
 }

samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApi.java

@@ -68,7 +68,7 @@ public StoreApi(@Context ServletConfig servletContext) {
     public Response deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathParam("order_id") String orderId
 ,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.deleteOrder(orderId,securityContext);
+        return delegate.deleteOrder(orderId, securityContext);
     }
     @GET
     @Path("/inventory")
@@ -97,7 +97,7 @@ public Response getInventory(@Context SecurityContext securityContext)
     public Response getOrderById(@ApiParam(value = "ID of pet that needs to be fetched",required=true) @PathParam("order_id") Long orderId
 ,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.getOrderById(orderId,securityContext);
+        return delegate.getOrderById(orderId, securityContext);
     }
     @POST
     @Path("/order")
@@ -111,6 +111,6 @@ public Response getOrderById(@ApiParam(value = "ID of pet that needs to be fetch
     public Response placeOrder(@ApiParam(value = "order placed for purchasing the pet" ,required=true) @NotNull @Valid Order body
 ,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.placeOrder(body,securityContext);
+        return delegate.placeOrder(body, securityContext);
     }
 }

samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/UserApi.java

@@ -66,7 +66,7 @@ public UserApi(@Context ServletConfig servletContext) {
     public Response createUser(@ApiParam(value = "Created user object" ,required=true) @NotNull @Valid User body
 ,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.createUser(body,securityContext);
+        return delegate.createUser(body, securityContext);
     }
     @POST
     @Path("/createWithArray")
@@ -78,7 +78,7 @@ public Response createUser(@ApiParam(value = "Created user object" ,required=tru
     public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true) @NotNull @Valid List<User> body
 ,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.createUsersWithArrayInput(body,securityContext);
+        return delegate.createUsersWithArrayInput(body, securityContext);
     }
     @POST
     @Path("/createWithList")
@@ -90,7 +90,7 @@ public Response createUsersWithArrayInput(@ApiParam(value = "List of user object
     public Response createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true) @NotNull @Valid List<User> body
 ,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.createUsersWithListInput(body,securityContext);
+        return delegate.createUsersWithListInput(body, securityContext);
     }
     @DELETE
     @Path("/{username}")
@@ -104,7 +104,7 @@ public Response createUsersWithListInput(@ApiParam(value = "List of user object"
     public Response deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathParam("username") String username
 ,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.deleteUser(username,securityContext);
+        return delegate.deleteUser(username, securityContext);
     }
     @GET
     @Path("/{username}")
@@ -120,7 +120,7 @@ public Response deleteUser(@ApiParam(value = "The name that needs to be deleted"
     public Response getUserByName(@ApiParam(value = "The name that needs to be fetched. Use user1 for testing.",required=true) @PathParam("username") String username
 ,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.getUserByName(username,securityContext);
+        return delegate.getUserByName(username, securityContext);
     }
     @GET
     @Path("/login")
@@ -135,7 +135,7 @@ public Response loginUser(@ApiParam(value = "The user name for login",required=t
 ,@ApiParam(value = "The password for login in clear text",required=true) @QueryParam("password") String password
 ,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.loginUser(username,password,securityContext);
+        return delegate.loginUser(username, password, securityContext);
     }
     @GET
     @Path("/logout")
@@ -161,6 +161,6 @@ public Response updateUser(@ApiParam(value = "name that need to be deleted",requ
 ,@ApiParam(value = "Updated user object" ,required=true) @NotNull @Valid User body
 ,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.updateUser(username,body,securityContext);
+        return delegate.updateUser(username, body, securityContext);
     }
 }

samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/AnotherFakeApi.java

@@ -65,6 +65,6 @@ public AnotherFakeApi(@Context ServletConfig servletContext) {
     public Response call123testSpecialTags(@ApiParam(value = "client model" ,required=true) @NotNull @Valid Client client
 ,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.call123testSpecialTags(client,securityContext);
+        return delegate.call123testSpecialTags(client, securityContext);
     }
 }