Polish

Author: cmoine-swi

docs/generators/jaxrs-spec.md

@@ -66,7 +66,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 | parentVersion                            | parent version in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect                                                                                                                                                                                                 | |null|
 | prependFormOrBodyParameters              | Add form or body parameters to the beginning of the parameter list.                                                                                                                                                                                                                                                                         | |false|
 | returnResponse                           | Whether generate API interface should return `javax.ws.rs.core.Response` instead of a deserialized entity. Only useful if interfaceOnly is true.                                                                                                                                                                                            | |false|
-| returnJbossResponse                      | Whether generate API interface should return `org.jboss.resteasy.reactive.RestResponse` instead of a deserialized entity. Only useful if interfaceOnly is true. This flag has the priority over the `returnResponse` flag                                                                                                                   | |false|
+| returnJBossResponse                      | Whether generate API interface should return `org.jboss.resteasy.reactive.RestResponse` instead of a deserialized entity. Only useful if interfaceOnly is true. This flag has the priority over the `returnResponse` flag                                                                                                                   | |false|
 | scmConnection                            | SCM connection in generated pom.xml                                                                                                                                                                                                                                                                                                         | |scm:git:git@github.com:openapitools/openapi-generator.git|
 | scmDeveloperConnection                   | SCM developer connection in generated pom.xml                                                                                                                                                                                                                                                                                               | |scm:git:git@github.com:openapitools/openapi-generator.git|
 | scmUrl                                   | SCM URL in generated pom.xml                                                                                                                                                                                                                                                                                                                | |https://github.com/openapitools/openapi-generator|

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java

@@ -130,7 +130,7 @@ public JavaJAXRSSpecServerCodegen() {
         cliOptions.add(CliOption.newBoolean(GENERATE_POM, "Whether to generate pom.xml if the file does not already exist.").defaultValue(String.valueOf(generatePom)));
         cliOptions.add(CliOption.newBoolean(INTERFACE_ONLY, "Whether to generate only API interface stubs without the server files.").defaultValue(String.valueOf(interfaceOnly)));
         cliOptions.add(CliOption.newBoolean(RETURN_RESPONSE, "Whether generate API interface should return javax.ws.rs.core.Response instead of a deserialized entity. Only useful if interfaceOnly is true.").defaultValue(String.valueOf(returnResponse)));
-        cliOptions.add(CliOption.newBoolean(RETURN_JBOSS_RESPONSE, "Whether generate API interface should return `org.jboss.resteasy.reactive.RestResponse` instead of a deserialized entity. Only useful if interfaceOnly is true. This flag has the priority over the 'returnResponse' flag.").defaultValue(String.valueOf(returnJbossResponse)));
+        cliOptions.add(CliOption.newBoolean(RETURN_JBOSS_RESPONSE, "Whether generate API interface should return org.jboss.resteasy.reactive.RestResponse instead of a deserialized entity. Only useful if interfaceOnly is true. This flag has the priority over the returnResponse flag.").defaultValue(String.valueOf(returnJbossResponse)));
         cliOptions.add(CliOption.newBoolean(USE_SWAGGER_ANNOTATIONS, "Whether to generate Swagger annotations.", useSwaggerAnnotations));
         cliOptions.add(CliOption.newBoolean(USE_MICROPROFILE_OPENAPI_ANNOTATIONS, "Whether to generate Microprofile OpenAPI annotations. Only valid when library is set to quarkus.", useMicroProfileOpenAPIAnnotations));
         cliOptions.add(CliOption.newString(OPEN_API_SPEC_FILE_LOCATION, "Location where the file containing the spec will be generated in the output folder. No file generated when set to null or empty string."));

modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/apiMethod.mustache

@@ -40,6 +40,6 @@
                 {{^vendorExtensions.x-java-is-response-void}}@org.eclipse.microprofile.openapi.annotations.media.Content(schema = @org.eclipse.microprofile.openapi.annotations.media.Schema(implementation = {{{baseType}}}.class{{#vendorExtensions.x-microprofile-open-api-return-schema-container}}, type = {{{.}}} {{/vendorExtensions.x-microprofile-open-api-return-schema-container}}{{#vendorExtensions.x-microprofile-open-api-return-unique-items}}, uniqueItems = true {{/vendorExtensions.x-microprofile-open-api-return-unique-items}})){{/vendorExtensions.x-java-is-response-void}}
             }){{^-last}},{{/-last}}{{/responses}}
         }){{/hasProduces}}{{/useMicroProfileOpenAPIAnnotations}}
-    public {{#supportAsync}}{{#useMutiny}}Uni{{/useMutiny}}{{^useMutiny}}CompletionStage{{/useMutiny}}<{{/supportAsync}}{{#returnJBossResponse}}{{{returnType}}}{{/returnJBossResponse}}{{^returnJBossResponse}}Response{{/returnJBossResponse}}{{#supportAsync}}>{{/supportAsync}} {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>cookieParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}) {
+    public {{#supportAsync}}{{#useMutiny}}Uni{{/useMutiny}}{{^useMutiny}}CompletionStage{{/useMutiny}}<{{/supportAsync}}{{#returnJBossResponse}}{{>returnResponseTypeInterface}}{{/returnJBossResponse}}{{^returnJBossResponse}}Response{{/returnJBossResponse}}{{#supportAsync}}>{{/supportAsync}} {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>cookieParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}) {
         return {{#supportAsync}}{{#useMutiny}}Uni.createFrom().item({{/useMutiny}}{{^useMutiny}}CompletableFuture.supplyAsync(() -> {{/useMutiny}}{{/supportAsync}}Response.ok().entity("magic!").build(){{#supportAsync}}){{/supportAsync}};
     }

modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java

@@ -536,7 +536,7 @@ public void generateApiWithAsyncSupportAndInterfaceOnlyAndJBossResponse() throws
         codegen.setLibrary(QUARKUS_LIBRARY);
         codegen.additionalProperties().put(SUPPORT_ASYNC, true); //Given support async is enabled
         codegen.additionalProperties().put(INTERFACE_ONLY, true); //And only interfaces are generated
-        codegen.additionalProperties().put(RETURN_JBOSS_RESPONSE, true); //And return type is Response
+        codegen.additionalProperties().put(RETURN_JBOSS_RESPONSE, true); //And return type is RestResponse
 
         final ClientOptInput input = new ClientOptInput()
                 .openAPI(openAPI)
@@ -548,9 +548,10 @@ public void generateApiWithAsyncSupportAndInterfaceOnlyAndJBossResponse() throws
         //Then the java files are compilable
         validateJavaSourceFiles(files);
 
-        //And the generated interface contains CompletionStage<Response>
+        //And the generated interface contains CompletionStage<RestResponse<Pet>>
         TestUtils.ensureContainsFile(files, output, "src/gen/java/org/openapitools/api/PetApi.java");
         assertFileContains(output.toPath().resolve("src/gen/java/org/openapitools/api/PetApi.java"),
+            "\nimport org.jboss.resteasy.reactive.RestResponse;\n",
                 "\nimport java.util.concurrent.CompletionStage;\n",
                 "CompletionStage<RestResponse<Pet>> addPet", "CompletionStage<RestResponse<Void>> deletePet");
     }
@@ -1034,9 +1035,9 @@ public void generateSpecInterfaceWithJBossResponse() throws Exception {
         //And the generated interfaces contains RestResponse
         TestUtils.ensureContainsFile(files, output, "src/gen/java/org/openapitools/api/PetApi.java");
         assertFileContains(output.toPath().resolve("src/gen/java/org/openapitools/api/PetApi.java"),
-                "\nimport org.jboss.resteasy.reactive.RestResponse;\n", "RestResponse<Pet> addPet",
-            "RestResponse<Void> deletePet", "RestResponse<List<Pet>> findPetsByStatus",
-            "RestResponse<Void> updatePetWithForm", "RestResponse<ModelApiResponse> uploadFile");
+                "\nimport org.jboss.resteasy.reactive.RestResponse;\n",
+                "RestResponse<Pet> addPet", "RestResponse<Void> deletePet", "RestResponse<List<Pet>> findPetsByStatus",
+                "RestResponse<Void> updatePetWithForm", "RestResponse<ModelApiResponse> uploadFile");
     }
 
     @Test