Skip to content

Commit 3b2f017

Browse files
committed
- adjust code generator, fix output
1 parent bea7dff commit 3b2f017

2 files changed

Lines changed: 195 additions & 143 deletions

File tree

modules/jooby-apt/src/main/java/io/jooby/internal/apt/MvcRoute.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -256,26 +256,26 @@ public List<String> generateJsonRpcDispatchCase(boolean kt) {
256256

257257
if (!parameters.isEmpty()) {
258258
if (kt) {
259-
buffer.add(statement(indent(6), "parser.reader(req.params).use { reader ->"));
259+
buffer.add(statement(indent(8), "parser.reader(req.params).use { reader ->"));
260260
} else {
261261
// Correct inline try-with-resources statement
262-
buffer.add(statement(indent(6), "try (var reader = parser.reader(req.getParams())) {"));
262+
buffer.add(statement(indent(10), "try (var reader = parser.reader(req.getParams())) {"));
263263
}
264264

265265
buffer.addAll(generateRpcParameter(kt, paramList::add, true));
266266
}
267267

268-
var call = of("delegate.", getMethodName(), paramList.toString());
268+
var call = of("c.", getMethodName(), paramList.toString());
269269

270270
if (returnType.isVoid()) {
271-
buffer.add(statement(indent(8), call, semicolon(kt)));
272-
buffer.add(statement(indent(8), kt ? "null" : "return null", semicolon(kt)));
271+
buffer.add(statement(indent(12), call, semicolon(kt)));
272+
buffer.add(statement(indent(12), kt ? "null" : "return null", semicolon(kt)));
273273
} else {
274-
buffer.add(statement(indent(8), kt ? call : "return " + call, semicolon(kt)));
274+
buffer.add(statement(indent(12), kt ? call : "return " + call, semicolon(kt)));
275275
}
276276

277277
if (!parameters.isEmpty()) {
278-
buffer.add(statement(indent(6), "}"));
278+
buffer.add(statement(indent(10), "}"));
279279
}
280280
return buffer;
281281
}
@@ -731,7 +731,7 @@ private List<String> generateRpcParameter(
731731
var statements = new ArrayList<String>();
732732
var decoderInterface =
733733
isJsonRpc ? "io.jooby.jsonrpc.JsonRpcDecoder" : "io.jooby.trpc.TrpcDecoder";
734-
int baseIndent = isJsonRpc ? 8 : 4;
734+
int baseIndent = isJsonRpc ? 12 : 4;
735735

736736
for (var parameter : parameters) {
737737
var paramenterName = parameter.getName();

0 commit comments

Comments
 (0)