Skip to content

Commit 4f7d80d

Browse files
rbygraverbygrave
committed
Code style only changes - new lines etc
1 parent afb8003 commit 4f7d80d

File tree

3 files changed

+48
-87
lines changed

3 files changed

+48
-87
lines changed

‎http-generator-nima/src/main/java/io/avaje/http/generator/helidon/nima/ControllerMethodWriter.java‎

Lines changed: 40 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
package io.avaje.http.generator.helidon.nima;
22

3+
import io.avaje.http.api.MediaType;
4+
import io.avaje.http.generator.core.*;
5+
36
import java.util.Optional;
47

5-
import io.avaje.http.api.MediaType;
6-
import io.avaje.http.generator.core.Append;
7-
import io.avaje.http.generator.core.MethodParam;
8-
import io.avaje.http.generator.core.MethodReader;
9-
import io.avaje.http.generator.core.ParamType;
10-
import io.avaje.http.generator.core.PathSegments;
11-
import io.avaje.http.generator.core.ProcessingContext;
12-
import io.avaje.http.generator.core.WebMethod;
13-
14-
/** Write code to register Web route for a given controller method. */
8+
/**
9+
* Write code to register Web route for a given controller method.
10+
*/
1511
class ControllerMethodWriter {
1612

1713
private final MethodReader method;
@@ -20,58 +16,51 @@ class ControllerMethodWriter {
2016
private final ProcessingContext ctx;
2117
private final boolean useJsonB;
2218

23-
ControllerMethodWriter(
24-
MethodReader method, Append writer, ProcessingContext ctx, boolean useJsonB) {
19+
ControllerMethodWriter(MethodReader method, Append writer, ProcessingContext ctx, boolean useJsonB) {
2520
this.method = method;
2621
this.writer = writer;
27-
webMethod = method.getWebMethod();
22+
this.webMethod = method.getWebMethod();
2823
this.ctx = ctx;
2924
this.useJsonB = useJsonB;
3025
}
3126

3227
void writeRule() {
3328
final var fullPath = method.getFullPath();
3429
writer
35-
.append(
36-
" rules.%s(\"%s\", this::_%s);",
37-
webMethod.name().toLowerCase(), fullPath, method.simpleName())
38-
.eol();
30+
.append(
31+
" rules.%s(\"%s\", this::_%s);",
32+
webMethod.name().toLowerCase(), fullPath, method.simpleName())
33+
.eol();
3934
}
4035

4136
void writeHandler(boolean requestScoped) {
42-
writer.append(" private void _%s(ServerRequest req, ServerResponse res", method.simpleName());
43-
44-
writer.append(") {").eol();
37+
writer.append(" private void _%s(ServerRequest req, ServerResponse res) {", method.simpleName()).eol();
4538
final var bodyType = method.getBodyType();
4639
if (bodyType != null) {
4740
if (useJsonB) {
48-
4941
writer
50-
.append(
51-
" var %s = %sBodyJsonType.fromJson(req.content().inputStream());",
52-
method.getBodyName(), method.simpleName())
53-
.eol();
42+
.append(
43+
" var %s = %sBodyJsonType.fromJson(req.content().inputStream());",
44+
method.getBodyName(), method.simpleName())
45+
.eol();
5446

5547
} else {
5648
// use default helidon content negotiation
5749
method.getParams().stream()
58-
.filter(MethodParam::isBody)
59-
.forEach(
60-
param -> {
61-
final var type = param.getUType();
62-
writer.append(" var %s = req.content().as(", method.getBodyName());
63-
64-
if (type.param0() != null) {
65-
writer.append("new io.helidon.common.GenericType<%s>() {}", type.full());
66-
} else {
67-
writer.append("%s.class", type.full());
68-
}
69-
70-
writer.append(");").eol();
71-
});
50+
.filter(MethodParam::isBody)
51+
.forEach(
52+
param -> {
53+
final var type = param.getUType();
54+
writer.append(" var %s = req.content().as(", method.getBodyName());
55+
if (type.param0() != null) {
56+
writer.append("new io.helidon.common.GenericType<%s>() {}", type.full());
57+
} else {
58+
writer.append("%s.class", type.full());
59+
}
60+
writer.append(");").eol();
61+
});
7262
}
73-
} else if (method.getParams().stream()
74-
.anyMatch(p -> p.isForm() || ParamType.FORMPARAM.equals(p.getParamType()))) {
63+
} else if (method.getParams().stream().anyMatch(p -> p.isForm() || ParamType.FORMPARAM.equals(p.getParamType()))) {
7564
writer.append(" var formParams = req.content().as(Parameters.class);").eol();
7665
}
7766

@@ -91,10 +80,8 @@ void writeHandler(boolean requestScoped) {
9180
writer.append(" ");
9281
if (!method.isVoid()) {
9382
writer.append("var result = ");
94-
} else if (method.isVoid()
95-
&& params.stream().noneMatch(p -> "ServerResponse".equals(p.getShortType()))) {
96-
throw new IllegalStateException(
97-
"Void controller methods must have a ServerResponse parameter");
83+
} else if (method.isVoid() && params.stream().noneMatch(p -> "ServerResponse".equals(p.getShortType()))) {
84+
throw new IllegalStateException("Void controller methods must have a ServerResponse parameter");
9885
}
9986

10087
if (method.includeValidate()) {
@@ -118,14 +105,14 @@ void writeHandler(boolean requestScoped) {
118105
if (!method.isVoid()) {
119106
writeContextReturn();
120107
if (useJsonB
121-
&& !"byte[]".equals(method.getReturnType().toString())
122-
&& (method.getProduces() == null
123-
|| method.getProduces().toLowerCase().contains("json"))) {
108+
&& !"byte[]".equals(method.getReturnType().toString())
109+
&& (method.getProduces() == null
110+
|| method.getProduces().toLowerCase().contains("json"))) {
124111

125112
writer
126-
.append(
127-
" %sReturnedJsonType.toJson(result, res.outputStream());", method.simpleName())
128-
.eol();
113+
.append(
114+
" %sReturnedJsonType.toJson(result, res.outputStream());", method.simpleName())
115+
.eol();
129116

130117
} else {
131118
writer.append(" res.send(result);").eol();
@@ -136,19 +123,14 @@ void writeHandler(boolean requestScoped) {
136123

137124
private void writeContextReturn() {
138125
final var producesOp = Optional.ofNullable(method.getProduces());
139-
140126
if (producesOp.isEmpty() && !useJsonB) {
141127
return;
142128
}
143129

144130
final var produces = producesOp.orElse(MediaType.APPLICATION_JSON);
145-
final var contentTypeString =
146-
" res.headers().contentType(io.helidon.common.http.HttpMediaType.";
147-
131+
final var contentTypeString = " res.headers().contentType(io.helidon.common.http.HttpMediaType.";
148132
switch (produces.toLowerCase()) {
149-
case MediaType.APPLICATION_JSON -> writer
150-
.append(contentTypeString + "APPLICATION_JSON);")
151-
.eol();
133+
case MediaType.APPLICATION_JSON -> writer.append(contentTypeString + "APPLICATION_JSON);").eol();
152134
case MediaType.TEXT_HTML -> writer.append(contentTypeString + "TEXT_HTML);").eol();
153135
case MediaType.TEXT_PLAIN -> writer.append(contentTypeString + "TEXT_PLAIN);").eol();
154136
default -> writer.append(contentTypeString + "create(\"%s\"));", produces).eol();

‎http-generator-nima/src/main/java/io/avaje/http/generator/helidon/nima/ControllerWriter.java‎

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,9 @@ class ControllerWriter extends BaseControllerWriter {
1919
private static final String AT_GENERATED = "@Generated(\"avaje-helidon-nima-generator\")";
2020
private final boolean useJsonB;
2121

22-
ControllerWriter(ControllerReader reader, ProcessingContext ctx, boolean jsonB)
23-
throws IOException {
22+
ControllerWriter(ControllerReader reader, ProcessingContext ctx, boolean jsonB) throws IOException {
2423
super(reader, ctx);
25-
useJsonB = jsonB;
24+
this.useJsonB = jsonB;
2625
if (useJsonB) {
2726
reader.addImportType("io.avaje.jsonb.Jsonb");
2827
reader.addImportType("io.avaje.jsonb.JsonType");
@@ -74,12 +73,7 @@ private void writeRoutes(List<ControllerMethodWriter> methods) {
7473
private void writeClassStart() {
7574
writer.append(AT_GENERATED).eol();
7675
writer.append("@Component").eol();
77-
writer
78-
.append("public class ")
79-
.append(shortName)
80-
.append("$Route implements HttpService {")
81-
.eol()
82-
.eol();
76+
writer.append("public class %s$Route implements HttpService {", shortName).eol().eol();
8377

8478
var controllerName = "controller";
8579
var controllerType = shortName;
@@ -99,35 +93,29 @@ private void writeClassStart() {
9993
reader.getMethods().stream()
10094
.filter(MethodReader::isWebMethod)
10195
.filter(m -> !"byte[]".equals(m.getReturnType().toString()))
102-
.filter(
103-
m -> m.getProduces() == null || m.getProduces().toLowerCase().contains("json"))
96+
.filter(m -> m.getProduces() == null || m.getProduces().toLowerCase().contains("json"))
10497
.toList();
10598
writeJsonBTypeFields(jsonMethods);
10699
} else {
107100
jsonMethods = null;
108101
}
109-
110102
writer.eol();
111103

112104
writer.append(" public %s$Route(%s %s", shortName, controllerType, controllerName);
113105
if (reader.isIncludeValidator()) {
114106
writer.append(", Validator validator");
115107
}
116-
117108
if (useJsonB) {
118109
writer.append(", Jsonb jsonB");
119110
}
120-
121111
writer.append(") {").eol();
122112
writer.append(" this.%s = %s;", controllerName, controllerName).eol();
123113
if (reader.isIncludeValidator()) {
124114
writer.append(" this.validator = validator;").eol();
125115
}
126-
127116
if (useJsonB) {
128117
writeJsonBTypeAssignments(jsonMethods);
129118
}
130-
131119
writer.append(" }").eol().eol();
132120
}
133121

@@ -167,28 +155,23 @@ public void writeJsonBTypeFields(List<MethodReader> jsonMethods) {
167155
}
168156
writer.append(" %sReturnedJsonType;", methodReader.simpleName()).eol();
169157
} else {
170-
throw new UnsupportedOperationException(
171-
"Only Objects are supported with Jsonb Return Types");
158+
throw new UnsupportedOperationException("Only Objects are supported with Jsonb Return Types");
172159
}
173160
}
174161
}
175162

176163
public void writeJsonBTypeAssignments(List<MethodReader> jsonMethods) {
177-
178164
for (final MethodReader methodReader : jsonMethods) {
179165
// body types
180166
writeBodyJsonType(methodReader);
181-
182167
if (methodReader.isVoid()) {
183168
continue;
184169
}
185-
186170
writeReturnJsonType(methodReader);
187171
}
188172
}
189173

190174
private void writeBodyJsonType(MethodReader methodReader) {
191-
192175
if (methodReader.getBodyType() != null) {
193176
methodReader.getParams().stream()
194177
.filter(MethodParam::isBody)
@@ -220,7 +203,6 @@ private void writeBodyJsonType(MethodReader methodReader) {
220203
}
221204

222205
void writeReturnJsonType(MethodReader methodReader) {
223-
224206
if (methodReader.getReturnType() instanceof final DeclaredType fullType) {
225207
final var typeArgs = fullType.getTypeArguments();
226208
final var typeArgSize = typeArgs.size();
@@ -251,8 +233,7 @@ void writeReturnJsonType(MethodReader methodReader) {
251233
writer.append(";").eol();
252234

253235
} else {
254-
throw new UnsupportedOperationException(
255-
"Only Objects and Strings are supported with Jsonb Controller Return Types");
236+
throw new UnsupportedOperationException("Only Objects and Strings are supported with Jsonb Controller Return Types");
256237
}
257238
}
258239
}

‎http-generator-nima/src/main/java/io/avaje/http/generator/helidon/nima/NimaProcessor.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
public class NimaProcessor extends BaseProcessor {
1111

12-
boolean jsonB;
12+
private boolean jsonB;
1313

1414
public NimaProcessor() {
1515
try {
@@ -30,9 +30,7 @@ protected PlatformAdapter providePlatformAdapter() {
3030
}
3131

3232
@Override
33-
public void writeControllerAdapter(ProcessingContext ctx, ControllerReader reader)
34-
throws IOException {
35-
33+
public void writeControllerAdapter(ProcessingContext ctx, ControllerReader reader) throws IOException {
3634
new ControllerWriter(reader, ctx, jsonB).write();
3735
}
3836
}

0 commit comments

Comments
 (0)