Fix JaxRS-Jersey template for files upload

[Zomzog]

PR checklist

• Read the contribution guidelines.
• Ran the shell script under ./bin/ to update Petstore sample so that CIs can verify the change. (For instance, only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in .\bin\windows\.
• Filed the PR against the correct branch: master, 3.4.x, 4.0.x. Default: master.
• Copied the technical committee to review the pull request if your PR is targeting a particular programming language.

Description of the PR

Remove specific File management from template to align it with the service.

fix #2474

@bbdouglas (2017/07) @sreeshas (2017/08) @jfiala (2017/08) @lukoyanov (2017/09) @cbornet (2017/09) @jeff9finger (2018/01) @karismann (2019/03)

[karismann]

thanks for you PR but with this change, it seem like there is a regression with type file in OAS2 :

      parameters:
        - in: formData
          name: jarFile
          description: Jar File to upload
          required: true
          type: file

    public Response addPet(
            @FormDataParam("jarFile") InputStream jarFileInputStream,
            @FormDataParam("jarFile") FormDataContentDisposition jarFileDetail
,@Context SecurityContext securityContext)
    throws NotFoundException {
        return delegate.addPet(jarFile, securityContext);
    }

you can refer to swagger-api/swagger-codegen#3300

[karismann]

actually the real problem is the missing isFormParam in this condition. the formParams.mustache who generate an InputStream and an FormDataContentDisposition variables are conditionned with the isFormParam so this line should be fixed with :

return delegate.{{nickname}}({{#allParams}}{{#isFormParam}}{{#isFile}}{{paramName}}InputStream, {{paramName}}Detail{{/isFile}}{{/isFormParam}}{{^isFile}}{{paramName}}{{/isFile}},{{/allParams}}securityContext);

to solve the issue

[Zomzog]

I've changed the template with something inspired by your solution.

I've tried it with the issue's sample and this one :

  /Plugin:
    post:
      summary: uploads an image
      description: ''
      operationId: uploadFile
      requestBody:
        content:
          multipart/form-data:
            schema:
              type: object
              properties:
                additionalMetadata:
                  description: Additional data to pass to server
                  type: string
                file:
                  description: file to upload
                  type: string
                  format: binary

[karismann]

thanks . can you please push your new commit to your branch "2474" to update the PR ?

[Zomzog]

It can be useful. Done.

[karismann]

LGTM
circle-ci error doesn't seem to be caused by this change
can you please edit the PR description and add "fix #2474" to auto-close the related issue when PR will be merged ? thanks

[wing328]

Please update the samples:

     @GET
     @Path("/logout")
@@ -161,6 +161,6 @@ public class UserApi  {
 ,@ApiParam(value = "Updated user object" ,required=true) @NotNull @Valid User user
 ,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.updateUser(username,user,securityContext);
+        return delegate.updateUser(username, user, securityContext);
     }
 }
Perform git status
On branch Zomzog-2474
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

	modified:   samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/AnotherFakeApi.java
	modified:   samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java
	modified:   samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
	modified:   samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApi.java
	modified:   samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApi.java
	modified:   samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/UserApi.java

Tested via https://circleci.com/gh/OpenAPITools/openapi-generator/5930#tests/containers/2

[Zomzog]

I've updated java-jaxrs-petstore-server-all.sh to run also this sample and run it.

[wing328]

CircleCI test passed via https://circleci.com/gh/OpenAPITools/openapi-generator/5932