Refactored to address bug and simplify testing

Author: Ignacio-Vidal

docs/generators/jaxrs-cxf-cdi.md

@@ -82,7 +82,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |title|a title describing the application| |OpenAPI Server|
 |useBeanValidation|Use BeanValidation API annotations| |true|
 |useJakartaEe|whether to use Jakarta EE namespace instead of javax| |false|
-|useJakartaSecurityAnnotations|Whether to generate Jakarta security annotations (@RolesAllowed, @PermitAll). Currently only supported when library is set to quarkus.| |false|
+|useJakartaSecurityAnnotations|Whether to generate Jakarta security annotations (@RolesAllowed, @PermitAll). Requires useJakartaEe=true. Currently only supported when library is set to quarkus.| |false|
 |useMicroProfileOpenAPIAnnotations|Whether to generate Microprofile OpenAPI annotations. Only valid when library is set to quarkus.| |false|
 |useMutiny|Whether to use Smallrye Mutiny instead of CompletionStage for asynchronous computation. Only valid when library is set to quarkus.| |false|
 |useOneOfInterfaces|whether to use a java interface to describe a set of oneOf options, where each option is a class that implements the interface| |false|

samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/api/PetApi.java

@@ -66,7 +66,7 @@ public class PetApi {
                 @org.eclipse.microprofile.openapi.annotations.media.Content(mediaType="application/json")
             })
         })
-    public Response addPet(@Valid @NotNull Pet pet) {
+        public Response addPet(@Valid @NotNull Pet pet) {
         return Response.ok().entity("magic!").build();
     }
 
@@ -83,7 +83,7 @@ public Response addPet(@Valid @NotNull Pet pet) {
 
             })
         })
-    public Response deletePet(@PathParam("petId") @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="Pet id to delete") Long petId) {
+        public Response deletePet(@PathParam("petId") @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="Pet id to delete") Long petId) {
         return Response.ok().entity("magic!").build();
     }
 
@@ -106,7 +106,7 @@ public Response deletePet(@PathParam("petId") @org.eclipse.microprofile.openapi.
                 @org.eclipse.microprofile.openapi.annotations.media.Content(mediaType="application/json")
             })
         })
-    public Response findPetsByStatus(@Deprecated @QueryParam("status") @NotNull  @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="Status values that need to be considered for filter")  List<String> status) {
+        public Response findPetsByStatus(@Deprecated @QueryParam("status") @NotNull  @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="Status values that need to be considered for filter")  List<String> status) {
         return Response.ok().entity("magic!").build();
     }
 
@@ -130,7 +130,7 @@ public Response findPetsByStatus(@Deprecated @QueryParam("status") @NotNull  @or
                 @org.eclipse.microprofile.openapi.annotations.media.Content(mediaType="application/json")
             })
         })
-    public Response findPetsByTags(@QueryParam("tags") @NotNull  @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="Tags to filter by")  List<String> tags) {
+        public Response findPetsByTags(@QueryParam("tags") @NotNull  @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="Tags to filter by")  List<String> tags) {
         return Response.ok().entity("magic!").build();
     }
 
@@ -157,7 +157,7 @@ public Response findPetsByTags(@QueryParam("tags") @NotNull  @org.eclipse.microp
                 @org.eclipse.microprofile.openapi.annotations.media.Content(mediaType="application/json")
             })
         })
-    public Response getPetById(@PathParam("petId") @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="ID of pet to return") Long petId) {
+        public Response getPetById(@PathParam("petId") @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="ID of pet to return") Long petId) {
         return Response.ok().entity("magic!").build();
     }
 
@@ -188,7 +188,7 @@ public Response getPetById(@PathParam("petId") @org.eclipse.microprofile.openapi
                 @org.eclipse.microprofile.openapi.annotations.media.Content(mediaType="application/json")
             })
         })
-    public Response updatePet(@Valid @NotNull Pet pet) {
+        public Response updatePet(@Valid @NotNull Pet pet) {
         return Response.ok().entity("magic!").build();
     }
 
@@ -206,7 +206,7 @@ public Response updatePet(@Valid @NotNull Pet pet) {
 
             })
         })
-    public Response updatePetWithForm(@PathParam("petId") @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="ID of pet that needs to be updated") Long petId,@FormParam(value = "name")  String name,@FormParam(value = "status")  String status) {
+        public Response updatePetWithForm(@PathParam("petId") @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="ID of pet that needs to be updated") Long petId,@FormParam(value = "name")  String name,@FormParam(value = "status")  String status) {
         return Response.ok().entity("magic!").build();
     }
 
@@ -225,7 +225,7 @@ public Response updatePetWithForm(@PathParam("petId") @org.eclipse.microprofile.
                 @org.eclipse.microprofile.openapi.annotations.media.Content(mediaType="application/json", schema = @org.eclipse.microprofile.openapi.annotations.media.Schema(implementation = ModelApiResponse.class))
             })
         })
-    public Response uploadFile(@PathParam("petId") @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="ID of pet to update") Long petId,@FormParam(value = "additionalMetadata")  String additionalMetadata,@FormParam(value = "file") InputStream _fileInputStream) {
+        public Response uploadFile(@PathParam("petId") @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="ID of pet to update") Long petId,@FormParam(value = "additionalMetadata")  String additionalMetadata,@FormParam(value = "file") InputStream _fileInputStream) {
         return Response.ok().entity("magic!").build();
     }
 

samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/api/StoreApi.java

@@ -60,7 +60,7 @@ public class StoreApi {
 
             })
         })
-    public Response deleteOrder(@PathParam("orderId") @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="ID of the order that needs to be deleted") String orderId) {
+        public Response deleteOrder(@PathParam("orderId") @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="ID of the order that needs to be deleted") String orderId) {
         return Response.ok().entity("magic!").build();
     }
 
@@ -78,7 +78,7 @@ public Response deleteOrder(@PathParam("orderId") @org.eclipse.microprofile.open
                 @org.eclipse.microprofile.openapi.annotations.media.Content(mediaType="application/json", schema = @org.eclipse.microprofile.openapi.annotations.media.Schema(implementation = Map.class))
             })
         })
-    public Response getInventory() {
+        public Response getInventory() {
         return Response.ok().entity("magic!").build();
     }
 
@@ -103,7 +103,7 @@ public Response getInventory() {
                 @org.eclipse.microprofile.openapi.annotations.media.Content(mediaType="application/json")
             })
         })
-    public Response getOrderById(@PathParam("orderId") @Min(1L) @Max(5L) @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="ID of pet that needs to be fetched") Long orderId) {
+        public Response getOrderById(@PathParam("orderId") @Min(1L) @Max(5L) @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="ID of pet that needs to be fetched") Long orderId) {
         return Response.ok().entity("magic!").build();
     }
 
@@ -125,7 +125,7 @@ public Response getOrderById(@PathParam("orderId") @Min(1L) @Max(5L) @org.eclips
                 @org.eclipse.microprofile.openapi.annotations.media.Content(mediaType="application/json")
             })
         })
-    public Response placeOrder(@Valid @NotNull Order order) {
+        public Response placeOrder(@Valid @NotNull Order order) {
         return Response.ok().entity("magic!").build();
     }
 

samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/api/UserApi.java

@@ -59,7 +59,7 @@ public class UserApi {
 
             })
         })
-    public Response createUser(@Valid @NotNull User user) {
+        public Response createUser(@Valid @NotNull User user) {
         return Response.ok().entity("magic!").build();
     }
 
@@ -77,7 +77,7 @@ public Response createUser(@Valid @NotNull User user) {
 
             })
         })
-    public Response createUsersWithArrayInput(@Valid @NotNull List<@Valid User> user) {
+        public Response createUsersWithArrayInput(@Valid @NotNull List<@Valid User> user) {
         return Response.ok().entity("magic!").build();
     }
 
@@ -95,7 +95,7 @@ public Response createUsersWithArrayInput(@Valid @NotNull List<@Valid User> user
 
             })
         })
-    public Response createUsersWithListInput(@Valid @NotNull List<@Valid User> user) {
+        public Response createUsersWithListInput(@Valid @NotNull List<@Valid User> user) {
         return Response.ok().entity("magic!").build();
     }
 
@@ -115,7 +115,7 @@ public Response createUsersWithListInput(@Valid @NotNull List<@Valid User> user)
 
             })
         })
-    public Response deleteUser(@PathParam("username") @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="The name that needs to be deleted") String username) {
+        public Response deleteUser(@PathParam("username") @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="The name that needs to be deleted") String username) {
         return Response.ok().entity("magic!").build();
     }
 
@@ -140,7 +140,7 @@ public Response deleteUser(@PathParam("username") @org.eclipse.microprofile.open
                 @org.eclipse.microprofile.openapi.annotations.media.Content(mediaType="application/json")
             })
         })
-    public Response getUserByName(@PathParam("username") @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="The name that needs to be fetched. Use user1 for testing.") String username) {
+        public Response getUserByName(@PathParam("username") @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="The name that needs to be fetched. Use user1 for testing.") String username) {
         return Response.ok().entity("magic!").build();
     }
 
@@ -165,7 +165,7 @@ public Response getUserByName(@PathParam("username") @org.eclipse.microprofile.o
                 @org.eclipse.microprofile.openapi.annotations.media.Content(mediaType="application/json")
             })
         })
-    public Response loginUser(@QueryParam("username") @NotNull @Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$")  @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="The user name for login")  String username,@QueryParam("password") @NotNull  @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="The password for login in clear text")  String password) {
+        public Response loginUser(@QueryParam("username") @NotNull @Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$")  @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="The user name for login")  String username,@QueryParam("password") @NotNull  @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="The password for login in clear text")  String password) {
         return Response.ok().entity("magic!").build();
     }
 
@@ -182,7 +182,7 @@ public Response loginUser(@QueryParam("username") @NotNull @Pattern(regexp="^[a-
 
             })
         })
-    public Response logoutUser() {
+        public Response logoutUser() {
         return Response.ok().entity("magic!").build();
     }
 
@@ -203,7 +203,7 @@ public Response logoutUser() {
 
             })
         })
-    public Response updateUser(@PathParam("username") @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="name that need to be deleted") String username,@Valid @NotNull User user) {
+        public Response updateUser(@PathParam("username") @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="name that need to be deleted") String username,@Valid @NotNull User user) {
         return Response.ok().entity("magic!").build();
     }
 

samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/AnotherFakeApi.java

@@ -73,7 +73,7 @@ public class AnotherFakeApi {
                 @org.eclipse.microprofile.openapi.annotations.media.Content(mediaType="application/json", schema = @org.eclipse.microprofile.openapi.annotations.media.Schema(implementation = Client.class))
             })
         })
-    public Response call123testSpecialTags(@Valid @NotNull Client client) {
+        public Response call123testSpecialTags(@Valid @NotNull Client client) {
         return Response.ok().entity("magic!").build();
     }