Skip to content

[vertx-web] need a mechanism to override the behaviour (JSON) without changing the handler definition #9726

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

[vertx-web] need a mechanism to override the behaviour (JSON) without changing the handler definition #9726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
28e6cc7
https://github.com/OpenAPITools/openapi-generator/issues/9725
Jun 8, 2021
e4b8555
https://github.com/OpenAPITools/openapi-generator/issues/9725
klalit Jun 8, 2021
fc0553f
Merge branch 'master' of https://github.com/klalit/openapi-generator
Jun 9, 2021
d3c9a5a
https://github.com/OpenAPITools/openapi-generator/issues/9725
klalit Jun 17, 2021
443af1e
Merge branch 'OpenAPITools:master' into master
klalit Jun 18, 2021
d8daca3
Merge branch 'master' into master
klalit Aug 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions modules/openapi-generator/src/main/resources/JavaVertXWebServer/apiHandler.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
9 changes: 9 additions & 0 deletions ...openapi-generator/src/main/resources/JavaVertXWebServer/supportFiles/ApiResponse.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
package {{invokerPackage}};
import io.vertx.ext.web.RoutingContext;

public class ApiResponse<T> {
private final T data;
Expand Down Expand Up @@ -32,4 +33,12 @@ public class ApiResponse<T> {
public int getStatusCode() {
return statusCode;
}

public void sendResponse(RoutingContext routingContext){
if (this.hasData()) {
routingContext.json(this.getData());
} else {
routingContext.response().end();
}
}
}
9 changes: 9 additions & 0 deletions ...r/petstore/java-vertx-web/src/main/java/org/openapitools/vertxweb/server/ApiResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
package org.openapitools.vertxweb.server;
import io.vertx.ext.web.RoutingContext;

public class ApiResponse<T> {
private final T data;
Expand Down Expand Up @@ -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();
}
}
}
48 changes: 8 additions & 40 deletions ...tore/java-vertx-web/src/main/java/org/openapitools/vertxweb/server/api/PetApiHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand Down
24 changes: 4 additions & 20 deletions ...re/java-vertx-web/src/main/java/org/openapitools/vertxweb/server/api/StoreApiHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand Down
48 changes: 8 additions & 40 deletions ...ore/java-vertx-web/src/main/java/org/openapitools/vertxweb/server/api/UserApiHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand Down