diff --git a/modules/openapi-generator/src/main/resources/JavaVertXWebServer/apiHandler.mustache b/modules/openapi-generator/src/main/resources/JavaVertXWebServer/apiHandler.mustache index 807f60e5b44d..06cbf51930bf 100644 --- a/modules/openapi-generator/src/main/resources/JavaVertXWebServer/apiHandler.mustache +++ b/modules/openapi-generator/src/main/resources/JavaVertXWebServer/apiHandler.mustache @@ -56,11 +56,7 @@ public class {{classname}}Handler { api.{{operationId}}({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}}) .onSuccess(apiResponse -> { routingContext.response().setStatusCode(apiResponse.getStatusCode()); - if (apiResponse.hasData()) { - routingContext.json(apiResponse.getData()); - } else { - routingContext.response().end(); - } + apiResponse.sendResponse(routingContext); }) .onFailure(routingContext::fail); } diff --git a/modules/openapi-generator/src/main/resources/JavaVertXWebServer/supportFiles/ApiResponse.mustache b/modules/openapi-generator/src/main/resources/JavaVertXWebServer/supportFiles/ApiResponse.mustache index 4554dd577ae8..f2fa3ddc9f2b 100644 --- a/modules/openapi-generator/src/main/resources/JavaVertXWebServer/supportFiles/ApiResponse.mustache +++ b/modules/openapi-generator/src/main/resources/JavaVertXWebServer/supportFiles/ApiResponse.mustache @@ -1,4 +1,5 @@ package {{invokerPackage}}; +import io.vertx.ext.web.RoutingContext; public class ApiResponse { private final T data; @@ -32,4 +33,12 @@ public class ApiResponse { public int getStatusCode() { return statusCode; } + + public void sendResponse(RoutingContext routingContext){ + if (this.hasData()) { + routingContext.json(this.getData()); + } else { + routingContext.response().end(); + } + } } diff --git a/samples/server/petstore/java-vertx-web/src/main/java/org/openapitools/vertxweb/server/ApiResponse.java b/samples/server/petstore/java-vertx-web/src/main/java/org/openapitools/vertxweb/server/ApiResponse.java index 6e43aa3d74cd..28ab659970b0 100644 --- a/samples/server/petstore/java-vertx-web/src/main/java/org/openapitools/vertxweb/server/ApiResponse.java +++ b/samples/server/petstore/java-vertx-web/src/main/java/org/openapitools/vertxweb/server/ApiResponse.java @@ -1,4 +1,5 @@ package org.openapitools.vertxweb.server; +import io.vertx.ext.web.RoutingContext; public class ApiResponse { private final T data; @@ -32,4 +33,12 @@ public T getData() { public int getStatusCode() { return statusCode; } + + public void sendResponse(RoutingContext routingContext){ + if (this.hasData()) { + routingContext.json(this.getData()); + } else { + routingContext.response().end(); + } + } } diff --git a/samples/server/petstore/java-vertx-web/src/main/java/org/openapitools/vertxweb/server/api/PetApiHandler.java b/samples/server/petstore/java-vertx-web/src/main/java/org/openapitools/vertxweb/server/api/PetApiHandler.java index ef7ac405e2eb..9ccf7c493594 100644 --- a/samples/server/petstore/java-vertx-web/src/main/java/org/openapitools/vertxweb/server/api/PetApiHandler.java +++ b/samples/server/petstore/java-vertx-web/src/main/java/org/openapitools/vertxweb/server/api/PetApiHandler.java @@ -58,11 +58,7 @@ private void addPet(RoutingContext routingContext) { api.addPet(pet) .onSuccess(apiResponse -> { routingContext.response().setStatusCode(apiResponse.getStatusCode()); - if (apiResponse.hasData()) { - routingContext.json(apiResponse.getData()); - } else { - routingContext.response().end(); - } + apiResponse.sendResponse(routingContext); }) .onFailure(routingContext::fail); } @@ -82,11 +78,7 @@ private void deletePet(RoutingContext routingContext) { api.deletePet(petId, apiKey) .onSuccess(apiResponse -> { routingContext.response().setStatusCode(apiResponse.getStatusCode()); - if (apiResponse.hasData()) { - routingContext.json(apiResponse.getData()); - } else { - routingContext.response().end(); - } + apiResponse.sendResponse(routingContext); }) .onFailure(routingContext::fail); } @@ -104,11 +96,7 @@ private void findPetsByStatus(RoutingContext routingContext) { api.findPetsByStatus(status) .onSuccess(apiResponse -> { routingContext.response().setStatusCode(apiResponse.getStatusCode()); - if (apiResponse.hasData()) { - routingContext.json(apiResponse.getData()); - } else { - routingContext.response().end(); - } + apiResponse.sendResponse(routingContext); }) .onFailure(routingContext::fail); } @@ -126,11 +114,7 @@ private void findPetsByTags(RoutingContext routingContext) { api.findPetsByTags(tags) .onSuccess(apiResponse -> { routingContext.response().setStatusCode(apiResponse.getStatusCode()); - if (apiResponse.hasData()) { - routingContext.json(apiResponse.getData()); - } else { - routingContext.response().end(); - } + apiResponse.sendResponse(routingContext); }) .onFailure(routingContext::fail); } @@ -148,11 +132,7 @@ private void getPetById(RoutingContext routingContext) { api.getPetById(petId) .onSuccess(apiResponse -> { routingContext.response().setStatusCode(apiResponse.getStatusCode()); - if (apiResponse.hasData()) { - routingContext.json(apiResponse.getData()); - } else { - routingContext.response().end(); - } + apiResponse.sendResponse(routingContext); }) .onFailure(routingContext::fail); } @@ -171,11 +151,7 @@ private void updatePet(RoutingContext routingContext) { api.updatePet(pet) .onSuccess(apiResponse -> { routingContext.response().setStatusCode(apiResponse.getStatusCode()); - if (apiResponse.hasData()) { - routingContext.json(apiResponse.getData()); - } else { - routingContext.response().end(); - } + apiResponse.sendResponse(routingContext); }) .onFailure(routingContext::fail); } @@ -196,11 +172,7 @@ private void updatePetWithForm(RoutingContext routingContext) { api.updatePetWithForm(petId, formBody) .onSuccess(apiResponse -> { routingContext.response().setStatusCode(apiResponse.getStatusCode()); - if (apiResponse.hasData()) { - routingContext.json(apiResponse.getData()); - } else { - routingContext.response().end(); - } + apiResponse.sendResponse(routingContext); }) .onFailure(routingContext::fail); } @@ -220,11 +192,7 @@ private void uploadFile(RoutingContext routingContext) { api.uploadFile(petId, file) .onSuccess(apiResponse -> { routingContext.response().setStatusCode(apiResponse.getStatusCode()); - if (apiResponse.hasData()) { - routingContext.json(apiResponse.getData()); - } else { - routingContext.response().end(); - } + apiResponse.sendResponse(routingContext); }) .onFailure(routingContext::fail); } diff --git a/samples/server/petstore/java-vertx-web/src/main/java/org/openapitools/vertxweb/server/api/StoreApiHandler.java b/samples/server/petstore/java-vertx-web/src/main/java/org/openapitools/vertxweb/server/api/StoreApiHandler.java index 6abff2c93378..abbf97ace19a 100644 --- a/samples/server/petstore/java-vertx-web/src/main/java/org/openapitools/vertxweb/server/api/StoreApiHandler.java +++ b/samples/server/petstore/java-vertx-web/src/main/java/org/openapitools/vertxweb/server/api/StoreApiHandler.java @@ -51,11 +51,7 @@ private void deleteOrder(RoutingContext routingContext) { api.deleteOrder(orderId) .onSuccess(apiResponse -> { routingContext.response().setStatusCode(apiResponse.getStatusCode()); - if (apiResponse.hasData()) { - routingContext.json(apiResponse.getData()); - } else { - routingContext.response().end(); - } + apiResponse.sendResponse(routingContext); }) .onFailure(routingContext::fail); } @@ -71,11 +67,7 @@ private void getInventory(RoutingContext routingContext) { api.getInventory() .onSuccess(apiResponse -> { routingContext.response().setStatusCode(apiResponse.getStatusCode()); - if (apiResponse.hasData()) { - routingContext.json(apiResponse.getData()); - } else { - routingContext.response().end(); - } + apiResponse.sendResponse(routingContext); }) .onFailure(routingContext::fail); } @@ -93,11 +85,7 @@ private void getOrderById(RoutingContext routingContext) { api.getOrderById(orderId) .onSuccess(apiResponse -> { routingContext.response().setStatusCode(apiResponse.getStatusCode()); - if (apiResponse.hasData()) { - routingContext.json(apiResponse.getData()); - } else { - routingContext.response().end(); - } + apiResponse.sendResponse(routingContext); }) .onFailure(routingContext::fail); } @@ -116,11 +104,7 @@ private void placeOrder(RoutingContext routingContext) { api.placeOrder(order) .onSuccess(apiResponse -> { routingContext.response().setStatusCode(apiResponse.getStatusCode()); - if (apiResponse.hasData()) { - routingContext.json(apiResponse.getData()); - } else { - routingContext.response().end(); - } + apiResponse.sendResponse(routingContext); }) .onFailure(routingContext::fail); } diff --git a/samples/server/petstore/java-vertx-web/src/main/java/org/openapitools/vertxweb/server/api/UserApiHandler.java b/samples/server/petstore/java-vertx-web/src/main/java/org/openapitools/vertxweb/server/api/UserApiHandler.java index 85beafc942d8..f1816c054989 100644 --- a/samples/server/petstore/java-vertx-web/src/main/java/org/openapitools/vertxweb/server/api/UserApiHandler.java +++ b/samples/server/petstore/java-vertx-web/src/main/java/org/openapitools/vertxweb/server/api/UserApiHandler.java @@ -56,11 +56,7 @@ private void createUser(RoutingContext routingContext) { api.createUser(user) .onSuccess(apiResponse -> { routingContext.response().setStatusCode(apiResponse.getStatusCode()); - if (apiResponse.hasData()) { - routingContext.json(apiResponse.getData()); - } else { - routingContext.response().end(); - } + apiResponse.sendResponse(routingContext); }) .onFailure(routingContext::fail); } @@ -79,11 +75,7 @@ private void createUsersWithArrayInput(RoutingContext routingContext) { api.createUsersWithArrayInput(user) .onSuccess(apiResponse -> { routingContext.response().setStatusCode(apiResponse.getStatusCode()); - if (apiResponse.hasData()) { - routingContext.json(apiResponse.getData()); - } else { - routingContext.response().end(); - } + apiResponse.sendResponse(routingContext); }) .onFailure(routingContext::fail); } @@ -102,11 +94,7 @@ private void createUsersWithListInput(RoutingContext routingContext) { api.createUsersWithListInput(user) .onSuccess(apiResponse -> { routingContext.response().setStatusCode(apiResponse.getStatusCode()); - if (apiResponse.hasData()) { - routingContext.json(apiResponse.getData()); - } else { - routingContext.response().end(); - } + apiResponse.sendResponse(routingContext); }) .onFailure(routingContext::fail); } @@ -124,11 +112,7 @@ private void deleteUser(RoutingContext routingContext) { api.deleteUser(username) .onSuccess(apiResponse -> { routingContext.response().setStatusCode(apiResponse.getStatusCode()); - if (apiResponse.hasData()) { - routingContext.json(apiResponse.getData()); - } else { - routingContext.response().end(); - } + apiResponse.sendResponse(routingContext); }) .onFailure(routingContext::fail); } @@ -146,11 +130,7 @@ private void getUserByName(RoutingContext routingContext) { api.getUserByName(username) .onSuccess(apiResponse -> { routingContext.response().setStatusCode(apiResponse.getStatusCode()); - if (apiResponse.hasData()) { - routingContext.json(apiResponse.getData()); - } else { - routingContext.response().end(); - } + apiResponse.sendResponse(routingContext); }) .onFailure(routingContext::fail); } @@ -170,11 +150,7 @@ private void loginUser(RoutingContext routingContext) { api.loginUser(username, password) .onSuccess(apiResponse -> { routingContext.response().setStatusCode(apiResponse.getStatusCode()); - if (apiResponse.hasData()) { - routingContext.json(apiResponse.getData()); - } else { - routingContext.response().end(); - } + apiResponse.sendResponse(routingContext); }) .onFailure(routingContext::fail); } @@ -190,11 +166,7 @@ private void logoutUser(RoutingContext routingContext) { api.logoutUser() .onSuccess(apiResponse -> { routingContext.response().setStatusCode(apiResponse.getStatusCode()); - if (apiResponse.hasData()) { - routingContext.json(apiResponse.getData()); - } else { - routingContext.response().end(); - } + apiResponse.sendResponse(routingContext); }) .onFailure(routingContext::fail); } @@ -215,11 +187,7 @@ private void updateUser(RoutingContext routingContext) { api.updateUser(username, user) .onSuccess(apiResponse -> { routingContext.response().setStatusCode(apiResponse.getStatusCode()); - if (apiResponse.hasData()) { - routingContext.json(apiResponse.getData()); - } else { - routingContext.response().end(); - } + apiResponse.sendResponse(routingContext); }) .onFailure(routingContext::fail); }