Skip to content

Commit 5c3ca08

Browse files
rbygraverbygrave
committed
Format only changes
1 parent 90a2496 commit 5c3ca08

File tree

9 files changed

+462
-87
lines changed

9 files changed

+462
-87
lines changed

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

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
11
package io.avaje.http.generator.javalin;
22

33
import io.avaje.http.api.MediaType;
4-
import io.avaje.http.generator.core.Append;
5-
import io.avaje.http.generator.core.MethodParam;
6-
import io.avaje.http.generator.core.MethodReader;
7-
import io.avaje.http.generator.core.PathSegments;
8-
import io.avaje.http.generator.core.ProcessingContext;
9-
import io.avaje.http.generator.core.UType;
10-
import io.avaje.http.generator.core.Util;
11-
import io.avaje.http.generator.core.WebMethod;
4+
import io.avaje.http.generator.core.*;
125

13-
/** Write code to register Web route for a given controller method. */
6+
/**
7+
* Write code to register Web route for a given controller method.
8+
*/
149
class ControllerMethodWriter {
1510

1611
private final MethodReader method;
@@ -19,8 +14,7 @@ class ControllerMethodWriter {
1914
private final ProcessingContext ctx;
2015
private final boolean useJsonB;
2116

22-
ControllerMethodWriter(
23-
MethodReader method, Append writer, ProcessingContext ctx, boolean useJsonB) {
17+
ControllerMethodWriter(MethodReader method, Append writer, ProcessingContext ctx, boolean useJsonB) {
2418
this.method = method;
2519
this.writer = writer;
2620
this.webMethod = method.getWebMethod();
@@ -33,9 +27,7 @@ void write(boolean requestScoped) {
3327
final var segments = method.getPathSegments();
3428
final var fullPath = segments.fullPath();
3529

36-
writer
37-
.append(" ApiBuilder.%s(\"%s\", ctx -> {", webMethod.name().toLowerCase(), fullPath)
38-
.eol();
30+
writer.append(" ApiBuilder.%s(\"%s\", ctx -> {", webMethod.name().toLowerCase(), fullPath).eol();
3931
writer.append(" ctx.status(%s);", method.getStatusCode()).eol();
4032

4133
final var matrixSegments = segments.matrixSegments();
@@ -97,10 +89,7 @@ private void writeContextReturn() {
9789
if (produces == null || MediaType.APPLICATION_JSON.equalsIgnoreCase(produces)) {
9890
if (useJsonB) {
9991
final var uType = UType.parse(method.getReturnType());
100-
writer.append(
101-
" %sJsonType.toJson(result, ctx.contentType(\"application/json\").outputStream());",
102-
uType.shortName());
103-
92+
writer.append(" %sJsonType.toJson(result, ctx.contentType(\"application/json\").outputStream());", uType.shortName());
10493
} else {
10594
writer.append(" ctx.json(result);");
10695
}

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

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,21 @@
11
package io.avaje.http.generator.javalin;
22

3+
import io.avaje.http.generator.core.*;
4+
35
import java.io.IOException;
46
import java.util.Map;
57

6-
import io.avaje.http.generator.core.BaseControllerWriter;
7-
import io.avaje.http.generator.core.Constants;
8-
import io.avaje.http.generator.core.ControllerReader;
9-
import io.avaje.http.generator.core.JsonBUtil;
10-
import io.avaje.http.generator.core.MethodReader;
11-
import io.avaje.http.generator.core.PrimitiveUtil;
12-
import io.avaje.http.generator.core.ProcessingContext;
13-
import io.avaje.http.generator.core.UType;
14-
15-
/** Write Javalin specific Controller WebRoute handling adapter. */
8+
/**
9+
* Write Javalin specific Controller WebRoute handling adapter.
10+
*/
1611
class ControllerWriter extends BaseControllerWriter {
1712

1813
private static final String AT_GENERATED = "@Generated(\"avaje-javalin-generator\")";
1914
private static final String API_BUILDER = "io.javalin.apibuilder.ApiBuilder";
2015
private final boolean useJsonB;
2116
private final Map<String, UType> jsonTypes;
2217

23-
ControllerWriter(ControllerReader reader, ProcessingContext ctx, boolean jsonB)
24-
throws IOException {
18+
ControllerWriter(ControllerReader reader, ProcessingContext ctx, boolean jsonB) throws IOException {
2519
super(reader, ctx);
2620
this.useJsonB = jsonB;
2721
if (useJsonB) {
@@ -64,11 +58,11 @@ private void writeClassStart() {
6458
writer.append(AT_GENERATED).eol();
6559
writer.append("@Component").eol();
6660
writer
67-
.append("public class ")
68-
.append(shortName)
69-
.append("$Route implements WebRoutes {")
70-
.eol()
71-
.eol();
61+
.append("public class ")
62+
.append(shortName)
63+
.append("$Route implements WebRoutes {")
64+
.eol()
65+
.eol();
7266

7367
var controllerName = "controller";
7468
var controllerType = shortName;
@@ -83,13 +77,8 @@ private void writeClassStart() {
8377
}
8478

8579
for (final UType type : jsonTypes.values()) {
86-
writer
87-
.append(
88-
" private final JsonType<%s> %sJsonType;",
89-
PrimitiveUtil.wrap(type.full()), type.shortName())
90-
.eol();
80+
writer.append(" private final JsonType<%s> %sJsonType;", PrimitiveUtil.wrap(type.full()), type.shortName()).eol();
9181
}
92-
9382
writer.eol();
9483

9584
writer.append(" public %s$Route(%s %s", shortName, controllerType, controllerName);

‎http-generator-javalin/src/main/java/io/avaje/http/generator/javalin/JavalinAdapter.java‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
package io.avaje.http.generator.javalin;
22

3-
import java.util.List;
3+
import io.avaje.http.generator.core.*;
44

5-
import io.avaje.http.generator.core.Append;
6-
import io.avaje.http.generator.core.ControllerReader;
7-
import io.avaje.http.generator.core.ParamType;
8-
import io.avaje.http.generator.core.PlatformAdapter;
9-
import io.avaje.http.generator.core.UType;
5+
import java.util.List;
106

117
class JavalinAdapter implements PlatformAdapter {
128

@@ -68,8 +64,7 @@ public void writeReadParameter(Append writer, ParamType paramType, String paramN
6864
}
6965

7066
@Override
71-
public void writeReadParameter(
72-
Append writer, ParamType paramType, String paramName, String paramDefault) {
67+
public void writeReadParameter(Append writer, ParamType paramType, String paramName, String paramDefault) {
7368
writer.append("withDefault(ctx.%s(\"%s\"), \"%s\")", paramType, paramName, paramDefault);
7469
}
7570
}

‎http-generator-javalin/src/main/java/io/avaje/http/generator/javalin/JavalinProcessor.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package io.avaje.http.generator.javalin;
22

3-
import java.io.IOException;
4-
53
import io.avaje.http.generator.core.BaseProcessor;
64
import io.avaje.http.generator.core.ControllerReader;
75
import io.avaje.http.generator.core.PlatformAdapter;
86
import io.avaje.http.generator.core.ProcessingContext;
97

8+
import java.io.IOException;
9+
1010
public class JavalinProcessor extends BaseProcessor {
1111

1212
private boolean useJsonB;
@@ -30,8 +30,7 @@ protected PlatformAdapter providePlatformAdapter() {
3030
}
3131

3232
@Override
33-
public void writeControllerAdapter(ProcessingContext ctx, ControllerReader reader)
34-
throws IOException {
33+
public void writeControllerAdapter(ProcessingContext ctx, ControllerReader reader) throws IOException {
3534
new ControllerWriter(reader, ctx, useJsonB).write();
3635
}
3736
}

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,7 @@ void writeHandler(boolean requestScoped) {
5050
.orElseThrow()
5151
.getUType()
5252
.shortName();
53-
writer
54-
.append(" var %s = %sJsonType.fromJson(req.content().inputStream());", method.getBodyName(), fieldName)
55-
.eol();
53+
writer.append(" var %s = %sJsonType.fromJson(req.content().inputStream());", method.getBodyName(), fieldName).eol();
5654

5755
} else {
5856
// use default helidon content negotiation

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

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,21 @@
11
package io.avaje.http.generator.helidon.nima;
22

3+
import io.avaje.http.generator.core.*;
4+
35
import java.io.IOException;
46
import java.util.List;
57
import java.util.Map;
68

7-
import io.avaje.http.generator.core.BaseControllerWriter;
8-
import io.avaje.http.generator.core.Constants;
9-
import io.avaje.http.generator.core.ControllerReader;
10-
import io.avaje.http.generator.core.JsonBUtil;
11-
import io.avaje.http.generator.core.MethodReader;
12-
import io.avaje.http.generator.core.PrimitiveUtil;
13-
import io.avaje.http.generator.core.ProcessingContext;
14-
import io.avaje.http.generator.core.UType;
15-
16-
/** Write Helidon specific web route adapter (a Helidon Service). */
9+
/**
10+
* Write Helidon specific web route adapter (a Helidon Service).
11+
*/
1712
class ControllerWriter extends BaseControllerWriter {
1813

1914
private static final String AT_GENERATED = "@Generated(\"avaje-helidon-nima-generator\")";
2015
private final boolean useJsonB;
2116
private final Map<String, UType> jsonTypes;
2217

23-
ControllerWriter(ControllerReader reader, ProcessingContext ctx, boolean jsonB)
24-
throws IOException {
18+
ControllerWriter(ControllerReader reader, ProcessingContext ctx, boolean jsonB) throws IOException {
2519
super(reader, ctx);
2620
this.useJsonB = jsonB;
2721
if (useJsonB) {
@@ -50,9 +44,9 @@ void write() {
5044

5145
private List<ControllerMethodWriter> writerMethods() {
5246
return reader.getMethods().stream()
53-
.filter(MethodReader::isWebMethod)
54-
.map(it -> new ControllerMethodWriter(it, writer, ctx, useJsonB))
55-
.toList();
47+
.filter(MethodReader::isWebMethod)
48+
.map(it -> new ControllerMethodWriter(it, writer, ctx, useJsonB))
49+
.toList();
5650
}
5751

5852
private void writeAddRoutes() {
@@ -93,11 +87,7 @@ private void writeClassStart() {
9387
writer.append(" private final Validator validator;").eol();
9488
}
9589
for (final UType type : jsonTypes.values()) {
96-
writer
97-
.append(
98-
" private final JsonType<%s> %sJsonType;",
99-
PrimitiveUtil.wrap(type.full()), type.shortName())
100-
.eol();
90+
writer.append(" private final JsonType<%s> %sJsonType;", PrimitiveUtil.wrap(type.full()), type.shortName()).eol();
10191
}
10292
writer.eol();
10393

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
package io.avaje.http.generator.helidon.nima;
22

3-
import java.util.List;
3+
import io.avaje.http.generator.core.*;
44

5-
import io.avaje.http.generator.core.Append;
6-
import io.avaje.http.generator.core.ControllerReader;
7-
import io.avaje.http.generator.core.ParamType;
8-
import io.avaje.http.generator.core.PlatformAdapter;
9-
import io.avaje.http.generator.core.UType;
5+
import java.util.List;
106

117
class NimaPlatformAdapter implements PlatformAdapter {
128

@@ -30,7 +26,7 @@ public String platformVariable(String rawType) {
3026
if (HELIDON_FORMPARAMS.equals(rawType)) {
3127
return "formParams";
3228
}
33-
return "unknownVariable for: "+rawType;
29+
return "unknownVariable for: " + rawType;
3430
}
3531

3632
@Override

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package io.avaje.http.generator.helidon.nima;
22

3-
import java.io.IOException;
4-
53
import io.avaje.http.generator.core.BaseProcessor;
64
import io.avaje.http.generator.core.ControllerReader;
75
import io.avaje.http.generator.core.PlatformAdapter;
86
import io.avaje.http.generator.core.ProcessingContext;
97

8+
import java.io.IOException;
9+
1010
public class NimaProcessor extends BaseProcessor {
1111

1212
private boolean jsonB;
@@ -30,8 +30,7 @@ protected PlatformAdapter providePlatformAdapter() {
3030
}
3131

3232
@Override
33-
public void writeControllerAdapter(ProcessingContext ctx, ControllerReader reader)
34-
throws IOException {
33+
public void writeControllerAdapter(ProcessingContext ctx, ControllerReader reader) throws IOException {
3534
new ControllerWriter(reader, ctx, jsonB).write();
3635
}
3736
}

0 commit comments

Comments
 (0)