diff --git a/modules/openapi-generator/src/main/resources/JavaVertXWebServer/apiHandler.mustache b/modules/openapi-generator/src/main/resources/JavaVertXWebServer/apiHandler.mustache index 594ef7f27594..26a64d231a5f 100644 --- a/modules/openapi-generator/src/main/resources/JavaVertXWebServer/apiHandler.mustache +++ b/modules/openapi-generator/src/main/resources/JavaVertXWebServer/apiHandler.mustache @@ -39,32 +39,7 @@ public class {{classname}}Handler { HttpServerResponse response = routingContext.response(); {{#returnType}}Single{{/returnType}}{{^returnType}}Completable{{/returnType}}.defer( () -> { -{{#allParams}} -{{^isBodyParam}} -{{^isListContainer}} -{{#isHeaderParam}} - {{{dataType}}} {{paramName}} = ParameterCast.to{{dataType}}(routingContext.request().getHeader("{{baseName}}")); -{{/isHeaderParam}} -{{#isPathParam}} - {{{dataType}}} {{paramName}} = ParameterCast.to{{dataType}}(routingContext.pathParams().get("{{baseName}}")); -{{/isPathParam}} -{{#isQueryParam}} - {{{dataType}}} {{paramName}} = ParameterCast.to{{dataType}}(routingContext.queryParams().get("{{baseName}}")); -{{/isQueryParam}} -{{#isFormParam}} -{{^isFile}} - {{{dataType}}} {{paramName}} = ParameterCast.to{{dataType}}(routingContext.request().getFormAttribute("{{baseName}}")); -{{/isFile}} -{{#isFile}} - {{{dataType}}} {{paramName}} = routingContext.fileUploads().iterator().next(); -{{/isFile}} -{{/isFormParam}} -{{/isListContainer}} -{{#isListContainer}} - {{{dataType}}} {{paramName}} = routingContext.request().params().getAll("{{baseName}}"); -{{/isListContainer}} -{{/isBodyParam}} -{{/allParams}} +{{#allParams}}{{^isBodyParam}}{{>headerParams}}{{>pathParams}}{{>queryParams}}{{>formParams}}{{/isBodyParam}}{{/allParams}} {{#allParams}} {{#isBodyParam}} String jsonString = routingContext.getBodyAsString(); diff --git a/modules/openapi-generator/src/main/resources/JavaVertXWebServer/formParams.mustache b/modules/openapi-generator/src/main/resources/JavaVertXWebServer/formParams.mustache new file mode 100644 index 000000000000..0e5c83e603c6 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/JavaVertXWebServer/formParams.mustache @@ -0,0 +1,18 @@ +{{#isFormParam}} +{{^isListContainer}} +{{^isFile}} +{{#isModel}} + {{{dataType}}} {{paramName}} = ParameterCast.toObject(routingContext.request().getFormAttribute("{{baseName}}"), {{dataType}}.class); +{{/isModel}} +{{^isModel}} + {{{dataType}}} {{paramName}} = ParameterCast.to{{dataType}}(routingContext.request().getFormAttribute("{{baseName}}")); +{{/isModel}} +{{/isFile}} +{{#isFile}} + {{{dataType}}} {{paramName}} = routingContext.fileUploads().iterator().next(); +{{/isFile}} +{{/isListContainer}} +{{#isListContainer}} + {{{dataType}}} {{paramName}} = routingContext.request().params().getAll("{{baseName}}"); +{{/isListContainer}} +{{/isFormParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaVertXWebServer/headerParams.mustache b/modules/openapi-generator/src/main/resources/JavaVertXWebServer/headerParams.mustache new file mode 100644 index 000000000000..381992315427 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/JavaVertXWebServer/headerParams.mustache @@ -0,0 +1,13 @@ +{{#isHeaderParam}} +{{^isListContainer}} +{{#isModel}} + {{{dataType}}} {{paramName}} = ParameterCast.toObject(routingContext.request().getHeader("{{baseName}}"), {{dataType}}.class); +{{/isModel}} +{{^isModel}} + {{{dataType}}} {{paramName}} = ParameterCast.to{{dataType}}(routingContext.request().getHeader("{{baseName}}")); +{{/isModel}} +{{/isListContainer}} +{{#isListContainer}} + {{{dataType}}} {{paramName}} = routingContext.request().params().getAll("{{baseName}}"); +{{/isListContainer}} +{{/isHeaderParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaVertXWebServer/pathParams.mustache b/modules/openapi-generator/src/main/resources/JavaVertXWebServer/pathParams.mustache new file mode 100644 index 000000000000..7c62bcefc56f --- /dev/null +++ b/modules/openapi-generator/src/main/resources/JavaVertXWebServer/pathParams.mustache @@ -0,0 +1,13 @@ +{{#isPathParam}} +{{^isListContainer}} +{{#isModel}} + {{{dataType}}} {{paramName}} = ParameterCast.toObject(routingContext.pathParams().get("{{baseName}}"), {{dataType}}.class); +{{/isModel}} +{{^isModel}} + {{{dataType}}} {{paramName}} = ParameterCast.to{{dataType}}(routingContext.pathParams().get("{{baseName}}")); +{{/isModel}} +{{/isListContainer}} +{{#isListContainer}} + {{{dataType}}} {{paramName}} = routingContext.request().params().getAll("{{baseName}}"); +{{/isListContainer}} +{{/isPathParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaVertXWebServer/queryParams.mustache b/modules/openapi-generator/src/main/resources/JavaVertXWebServer/queryParams.mustache new file mode 100644 index 000000000000..efb6b55008d0 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/JavaVertXWebServer/queryParams.mustache @@ -0,0 +1,13 @@ +{{#isQueryParam}} +{{^isListContainer}} +{{#isModel}} + {{{dataType}}} {{paramName}} = ParameterCast.toObject(routingContext.queryParams().get("{{baseName}}"), {{dataType}}.class); +{{/isModel}} +{{^isModel}} + {{{dataType}}} {{paramName}} = ParameterCast.to{{dataType}}(routingContext.queryParams().get("{{baseName}}")); +{{/isModel}} +{{/isListContainer}} +{{#isListContainer}} + {{{dataType}}} {{paramName}} = routingContext.request().params().getAll("{{baseName}}"); +{{/isListContainer}} +{{/isQueryParam}} \ No newline at end of file diff --git a/samples/server/petstore/java-vertx-web/rx/.openapi-generator/VERSION b/samples/server/petstore/java-vertx-web/rx/.openapi-generator/VERSION index c3a2c7076fa8..d168f1d8bdaa 100644 --- a/samples/server/petstore/java-vertx-web/rx/.openapi-generator/VERSION +++ b/samples/server/petstore/java-vertx-web/rx/.openapi-generator/VERSION @@ -1 +1 @@ -4.2.0-SNAPSHOT \ No newline at end of file +4.2.1-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/api/PetApiHandler.java b/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/api/PetApiHandler.java index e6e5f140a094..62cbd7774bb6 100644 --- a/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/api/PetApiHandler.java +++ b/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/api/PetApiHandler.java @@ -41,6 +41,7 @@ private void addPet(RoutingContext routingContext) { HttpServerResponse response = routingContext.response(); Single.defer( () -> { + String jsonString = routingContext.getBodyAsString(); Pet pet = jsonString == null ? null : Json.decodeValue(jsonString, new TypeReference(){}); logger.info("Parameter pet is {}", pet); @@ -68,6 +69,7 @@ private void deletePet(RoutingContext routingContext) { Single.defer( () -> { Long petId = ParameterCast.toLong(routingContext.pathParams().get("petId")); String apiKey = ParameterCast.toString(routingContext.request().getHeader("api_key")); + logger.info("Parameter petId is {}", petId); logger.info("Parameter apiKey is {}", apiKey); return apiImpl.deletePet(petId, apiKey); @@ -93,6 +95,7 @@ private void findPetsByStatus(RoutingContext routingContext) { Single.defer( () -> { List status = routingContext.request().params().getAll("status"); + logger.info("Parameter status is {}", status); return apiImpl.findPetsByStatus(status); }) @@ -117,6 +120,7 @@ private void findPetsByTags(RoutingContext routingContext) { Single.defer( () -> { List tags = routingContext.request().params().getAll("tags"); + logger.info("Parameter tags is {}", tags); return apiImpl.findPetsByTags(tags); }) @@ -141,6 +145,7 @@ private void getPetById(RoutingContext routingContext) { Single.defer( () -> { Long petId = ParameterCast.toLong(routingContext.pathParams().get("petId")); + logger.info("Parameter petId is {}", petId); return apiImpl.getPetById(petId); }) @@ -164,6 +169,7 @@ private void updatePet(RoutingContext routingContext) { HttpServerResponse response = routingContext.response(); Single.defer( () -> { + String jsonString = routingContext.getBodyAsString(); Pet pet = jsonString == null ? null : Json.decodeValue(jsonString, new TypeReference(){}); logger.info("Parameter pet is {}", pet); @@ -192,6 +198,7 @@ private void updatePetWithForm(RoutingContext routingContext) { Long petId = ParameterCast.toLong(routingContext.pathParams().get("petId")); String name = ParameterCast.toString(routingContext.request().getFormAttribute("name")); String status = ParameterCast.toString(routingContext.request().getFormAttribute("status")); + logger.info("Parameter petId is {}", petId); logger.info("Parameter name is {}", name); logger.info("Parameter status is {}", status); @@ -220,6 +227,7 @@ private void uploadFile(RoutingContext routingContext) { Long petId = ParameterCast.toLong(routingContext.pathParams().get("petId")); String additionalMetadata = ParameterCast.toString(routingContext.request().getFormAttribute("additionalMetadata")); FileUpload file = routingContext.fileUploads().iterator().next(); + logger.info("Parameter petId is {}", petId); logger.info("Parameter additionalMetadata is {}", additionalMetadata); logger.info("Parameter file is {}", file); diff --git a/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/api/StoreApiHandler.java b/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/api/StoreApiHandler.java index b108bfc3953e..49c14ad203bc 100644 --- a/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/api/StoreApiHandler.java +++ b/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/api/StoreApiHandler.java @@ -36,6 +36,7 @@ private void deleteOrder(RoutingContext routingContext) { Single.defer( () -> { String orderId = ParameterCast.toString(routingContext.pathParams().get("orderId")); + logger.info("Parameter orderId is {}", orderId); return apiImpl.deleteOrder(orderId); }) @@ -59,6 +60,7 @@ private void getInventory(RoutingContext routingContext) { HttpServerResponse response = routingContext.response(); Single.defer( () -> { + return apiImpl.getInventory(); }) .subscribe( @@ -82,6 +84,7 @@ private void getOrderById(RoutingContext routingContext) { Single.defer( () -> { Long orderId = ParameterCast.toLong(routingContext.pathParams().get("orderId")); + logger.info("Parameter orderId is {}", orderId); return apiImpl.getOrderById(orderId); }) @@ -105,6 +108,7 @@ private void placeOrder(RoutingContext routingContext) { HttpServerResponse response = routingContext.response(); Single.defer( () -> { + String jsonString = routingContext.getBodyAsString(); Order order = jsonString == null ? null : Json.decodeValue(jsonString, new TypeReference(){}); logger.info("Parameter order is {}", order); diff --git a/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/api/UserApiHandler.java b/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/api/UserApiHandler.java index 825e42954e05..633541a27f58 100644 --- a/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/api/UserApiHandler.java +++ b/samples/server/petstore/java-vertx-web/rx/src/main/java/org/openapitools/vertxweb/server/api/UserApiHandler.java @@ -39,6 +39,7 @@ private void createUser(RoutingContext routingContext) { HttpServerResponse response = routingContext.response(); Single.defer( () -> { + String jsonString = routingContext.getBodyAsString(); User user = jsonString == null ? null : Json.decodeValue(jsonString, new TypeReference(){}); logger.info("Parameter user is {}", user); @@ -64,6 +65,7 @@ private void createUsersWithArrayInput(RoutingContext routingContext) { HttpServerResponse response = routingContext.response(); Single.defer( () -> { + String jsonString = routingContext.getBodyAsString(); List user = jsonString == null ? null : Json.decodeValue(jsonString, new TypeReference>(){}); logger.info("Parameter user is {}", user); @@ -89,6 +91,7 @@ private void createUsersWithListInput(RoutingContext routingContext) { HttpServerResponse response = routingContext.response(); Single.defer( () -> { + String jsonString = routingContext.getBodyAsString(); List user = jsonString == null ? null : Json.decodeValue(jsonString, new TypeReference>(){}); logger.info("Parameter user is {}", user); @@ -115,6 +118,7 @@ private void deleteUser(RoutingContext routingContext) { Single.defer( () -> { String username = ParameterCast.toString(routingContext.pathParams().get("username")); + logger.info("Parameter username is {}", username); return apiImpl.deleteUser(username); }) @@ -139,6 +143,7 @@ private void getUserByName(RoutingContext routingContext) { Single.defer( () -> { String username = ParameterCast.toString(routingContext.pathParams().get("username")); + logger.info("Parameter username is {}", username); return apiImpl.getUserByName(username); }) @@ -164,6 +169,7 @@ private void loginUser(RoutingContext routingContext) { Single.defer( () -> { String username = ParameterCast.toString(routingContext.queryParams().get("username")); String password = ParameterCast.toString(routingContext.queryParams().get("password")); + logger.info("Parameter username is {}", username); logger.info("Parameter password is {}", password); return apiImpl.loginUser(username, password); @@ -188,6 +194,7 @@ private void logoutUser(RoutingContext routingContext) { HttpServerResponse response = routingContext.response(); Single.defer( () -> { + return apiImpl.logoutUser(); }) .subscribe( @@ -211,6 +218,7 @@ private void updateUser(RoutingContext routingContext) { Single.defer( () -> { String username = ParameterCast.toString(routingContext.pathParams().get("username")); + String jsonString = routingContext.getBodyAsString(); User user = jsonString == null ? null : Json.decodeValue(jsonString, new TypeReference(){}); logger.info("Parameter username is {}", username);