Skip to content

Commit d3c9a5a

Browse files
klalitlkuma37
klalit
authored and
lkuma37
committed
https://github.com/OpenAPITools/openapi-generator/issues/9725
1 parent fc0553f commit d3c9a5a

File tree

5 files changed

+29
-103
lines changed

5 files changed

+29
-103
lines changed

‎modules/openapi-generator/src/main/resources/JavaVertXWebServer/apiHandler.mustache

-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ public class {{classname}}Handler {
5555

5656
api.{{operationId}}({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}})
5757
.onSuccess(apiResponse -> {
58-
routingContext.response().setStatusCode(apiResponse.getStatusCode());
5958
routingContext.response().setStatusCode(apiResponse.getStatusCode());
6059
apiResponse.sendResponse(routingContext);
6160
})

‎samples/server/petstore/java-vertx-web/src/main/java/org/openapitools/vertxweb/server/ApiResponse.java

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
package org.openapitools.vertxweb.server;
2+
import io.vertx.ext.web.RoutingContext;
23

34
public class ApiResponse<T> {
45
private final T data;
@@ -32,6 +33,12 @@ public T getData() {
3233
public int getStatusCode() {
3334
return statusCode;
3435
}
35-
}
36-
3736

37+
public void sendResponse(RoutingContext routingContext){
38+
if (this.hasData()) {
39+
routingContext.json(this.getData());
40+
} else {
41+
routingContext.response().end();
42+
}
43+
}
44+
}

‎samples/server/petstore/java-vertx-web/src/main/java/org/openapitools/vertxweb/server/api/PetApiHandler.java

+8-40
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,7 @@ private void addPet(RoutingContext routingContext) {
5858
api.addPet(pet)
5959
.onSuccess(apiResponse -> {
6060
routingContext.response().setStatusCode(apiResponse.getStatusCode());
61-
if (apiResponse.hasData()) {
62-
routingContext.json(apiResponse.getData());
63-
} else {
64-
routingContext.response().end();
65-
}
61+
apiResponse.sendResponse(routingContext);
6662
})
6763
.onFailure(routingContext::fail);
6864
}
@@ -82,11 +78,7 @@ private void deletePet(RoutingContext routingContext) {
8278
api.deletePet(petId, apiKey)
8379
.onSuccess(apiResponse -> {
8480
routingContext.response().setStatusCode(apiResponse.getStatusCode());
85-
if (apiResponse.hasData()) {
86-
routingContext.json(apiResponse.getData());
87-
} else {
88-
routingContext.response().end();
89-
}
81+
apiResponse.sendResponse(routingContext);
9082
})
9183
.onFailure(routingContext::fail);
9284
}
@@ -104,11 +96,7 @@ private void findPetsByStatus(RoutingContext routingContext) {
10496
api.findPetsByStatus(status)
10597
.onSuccess(apiResponse -> {
10698
routingContext.response().setStatusCode(apiResponse.getStatusCode());
107-
if (apiResponse.hasData()) {
108-
routingContext.json(apiResponse.getData());
109-
} else {
110-
routingContext.response().end();
111-
}
99+
apiResponse.sendResponse(routingContext);
112100
})
113101
.onFailure(routingContext::fail);
114102
}
@@ -126,11 +114,7 @@ private void findPetsByTags(RoutingContext routingContext) {
126114
api.findPetsByTags(tags)
127115
.onSuccess(apiResponse -> {
128116
routingContext.response().setStatusCode(apiResponse.getStatusCode());
129-
if (apiResponse.hasData()) {
130-
routingContext.json(apiResponse.getData());
131-
} else {
132-
routingContext.response().end();
133-
}
117+
apiResponse.sendResponse(routingContext);
134118
})
135119
.onFailure(routingContext::fail);
136120
}
@@ -148,11 +132,7 @@ private void getPetById(RoutingContext routingContext) {
148132
api.getPetById(petId)
149133
.onSuccess(apiResponse -> {
150134
routingContext.response().setStatusCode(apiResponse.getStatusCode());
151-
if (apiResponse.hasData()) {
152-
routingContext.json(apiResponse.getData());
153-
} else {
154-
routingContext.response().end();
155-
}
135+
apiResponse.sendResponse(routingContext);
156136
})
157137
.onFailure(routingContext::fail);
158138
}
@@ -171,11 +151,7 @@ private void updatePet(RoutingContext routingContext) {
171151
api.updatePet(pet)
172152
.onSuccess(apiResponse -> {
173153
routingContext.response().setStatusCode(apiResponse.getStatusCode());
174-
if (apiResponse.hasData()) {
175-
routingContext.json(apiResponse.getData());
176-
} else {
177-
routingContext.response().end();
178-
}
154+
apiResponse.sendResponse(routingContext);
179155
})
180156
.onFailure(routingContext::fail);
181157
}
@@ -196,11 +172,7 @@ private void updatePetWithForm(RoutingContext routingContext) {
196172
api.updatePetWithForm(petId, formBody)
197173
.onSuccess(apiResponse -> {
198174
routingContext.response().setStatusCode(apiResponse.getStatusCode());
199-
if (apiResponse.hasData()) {
200-
routingContext.json(apiResponse.getData());
201-
} else {
202-
routingContext.response().end();
203-
}
175+
apiResponse.sendResponse(routingContext);
204176
})
205177
.onFailure(routingContext::fail);
206178
}
@@ -220,11 +192,7 @@ private void uploadFile(RoutingContext routingContext) {
220192
api.uploadFile(petId, file)
221193
.onSuccess(apiResponse -> {
222194
routingContext.response().setStatusCode(apiResponse.getStatusCode());
223-
if (apiResponse.hasData()) {
224-
routingContext.json(apiResponse.getData());
225-
} else {
226-
routingContext.response().end();
227-
}
195+
apiResponse.sendResponse(routingContext);
228196
})
229197
.onFailure(routingContext::fail);
230198
}

‎samples/server/petstore/java-vertx-web/src/main/java/org/openapitools/vertxweb/server/api/StoreApiHandler.java

+4-20
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,7 @@ private void deleteOrder(RoutingContext routingContext) {
5151
api.deleteOrder(orderId)
5252
.onSuccess(apiResponse -> {
5353
routingContext.response().setStatusCode(apiResponse.getStatusCode());
54-
if (apiResponse.hasData()) {
55-
routingContext.json(apiResponse.getData());
56-
} else {
57-
routingContext.response().end();
58-
}
54+
apiResponse.sendResponse(routingContext);
5955
})
6056
.onFailure(routingContext::fail);
6157
}
@@ -71,11 +67,7 @@ private void getInventory(RoutingContext routingContext) {
7167
api.getInventory()
7268
.onSuccess(apiResponse -> {
7369
routingContext.response().setStatusCode(apiResponse.getStatusCode());
74-
if (apiResponse.hasData()) {
75-
routingContext.json(apiResponse.getData());
76-
} else {
77-
routingContext.response().end();
78-
}
70+
apiResponse.sendResponse(routingContext);
7971
})
8072
.onFailure(routingContext::fail);
8173
}
@@ -93,11 +85,7 @@ private void getOrderById(RoutingContext routingContext) {
9385
api.getOrderById(orderId)
9486
.onSuccess(apiResponse -> {
9587
routingContext.response().setStatusCode(apiResponse.getStatusCode());
96-
if (apiResponse.hasData()) {
97-
routingContext.json(apiResponse.getData());
98-
} else {
99-
routingContext.response().end();
100-
}
88+
apiResponse.sendResponse(routingContext);
10189
})
10290
.onFailure(routingContext::fail);
10391
}
@@ -116,11 +104,7 @@ private void placeOrder(RoutingContext routingContext) {
116104
api.placeOrder(order)
117105
.onSuccess(apiResponse -> {
118106
routingContext.response().setStatusCode(apiResponse.getStatusCode());
119-
if (apiResponse.hasData()) {
120-
routingContext.json(apiResponse.getData());
121-
} else {
122-
routingContext.response().end();
123-
}
107+
apiResponse.sendResponse(routingContext);
124108
})
125109
.onFailure(routingContext::fail);
126110
}

‎samples/server/petstore/java-vertx-web/src/main/java/org/openapitools/vertxweb/server/api/UserApiHandler.java

+8-40
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,7 @@ private void createUser(RoutingContext routingContext) {
5656
api.createUser(user)
5757
.onSuccess(apiResponse -> {
5858
routingContext.response().setStatusCode(apiResponse.getStatusCode());
59-
if (apiResponse.hasData()) {
60-
routingContext.json(apiResponse.getData());
61-
} else {
62-
routingContext.response().end();
63-
}
59+
apiResponse.sendResponse(routingContext);
6460
})
6561
.onFailure(routingContext::fail);
6662
}
@@ -79,11 +75,7 @@ private void createUsersWithArrayInput(RoutingContext routingContext) {
7975
api.createUsersWithArrayInput(user)
8076
.onSuccess(apiResponse -> {
8177
routingContext.response().setStatusCode(apiResponse.getStatusCode());
82-
if (apiResponse.hasData()) {
83-
routingContext.json(apiResponse.getData());
84-
} else {
85-
routingContext.response().end();
86-
}
78+
apiResponse.sendResponse(routingContext);
8779
})
8880
.onFailure(routingContext::fail);
8981
}
@@ -102,11 +94,7 @@ private void createUsersWithListInput(RoutingContext routingContext) {
10294
api.createUsersWithListInput(user)
10395
.onSuccess(apiResponse -> {
10496
routingContext.response().setStatusCode(apiResponse.getStatusCode());
105-
if (apiResponse.hasData()) {
106-
routingContext.json(apiResponse.getData());
107-
} else {
108-
routingContext.response().end();
109-
}
97+
apiResponse.sendResponse(routingContext);
11098
})
11199
.onFailure(routingContext::fail);
112100
}
@@ -124,11 +112,7 @@ private void deleteUser(RoutingContext routingContext) {
124112
api.deleteUser(username)
125113
.onSuccess(apiResponse -> {
126114
routingContext.response().setStatusCode(apiResponse.getStatusCode());
127-
if (apiResponse.hasData()) {
128-
routingContext.json(apiResponse.getData());
129-
} else {
130-
routingContext.response().end();
131-
}
115+
apiResponse.sendResponse(routingContext);
132116
})
133117
.onFailure(routingContext::fail);
134118
}
@@ -146,11 +130,7 @@ private void getUserByName(RoutingContext routingContext) {
146130
api.getUserByName(username)
147131
.onSuccess(apiResponse -> {
148132
routingContext.response().setStatusCode(apiResponse.getStatusCode());
149-
if (apiResponse.hasData()) {
150-
routingContext.json(apiResponse.getData());
151-
} else {
152-
routingContext.response().end();
153-
}
133+
apiResponse.sendResponse(routingContext);
154134
})
155135
.onFailure(routingContext::fail);
156136
}
@@ -170,11 +150,7 @@ private void loginUser(RoutingContext routingContext) {
170150
api.loginUser(username, password)
171151
.onSuccess(apiResponse -> {
172152
routingContext.response().setStatusCode(apiResponse.getStatusCode());
173-
if (apiResponse.hasData()) {
174-
routingContext.json(apiResponse.getData());
175-
} else {
176-
routingContext.response().end();
177-
}
153+
apiResponse.sendResponse(routingContext);
178154
})
179155
.onFailure(routingContext::fail);
180156
}
@@ -190,11 +166,7 @@ private void logoutUser(RoutingContext routingContext) {
190166
api.logoutUser()
191167
.onSuccess(apiResponse -> {
192168
routingContext.response().setStatusCode(apiResponse.getStatusCode());
193-
if (apiResponse.hasData()) {
194-
routingContext.json(apiResponse.getData());
195-
} else {
196-
routingContext.response().end();
197-
}
169+
apiResponse.sendResponse(routingContext);
198170
})
199171
.onFailure(routingContext::fail);
200172
}
@@ -215,11 +187,7 @@ private void updateUser(RoutingContext routingContext) {
215187
api.updateUser(username, user)
216188
.onSuccess(apiResponse -> {
217189
routingContext.response().setStatusCode(apiResponse.getStatusCode());
218-
if (apiResponse.hasData()) {
219-
routingContext.json(apiResponse.getData());
220-
} else {
221-
routingContext.response().end();
222-
}
190+
apiResponse.sendResponse(routingContext);
223191
})
224192
.onFailure(routingContext::fail);
225193
}

0 commit comments

Comments
 (0)