Skip to content

Commit 86e9aec

Browse files
committed
No effective change - bump tests to Nima version ALPHA4, inject 8.12-RC3 + tidy
1 parent 90e0907 commit 86e9aec

File tree

6 files changed

+11
-14
lines changed

6 files changed

+11
-14
lines changed

http-generator-core/src/main/java/io/avaje/http/generator/core/Util.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
import javax.lang.model.type.TypeKind;
99
import javax.lang.model.type.TypeMirror;
1010
import javax.lang.model.util.SimpleAnnotationValueVisitor8;
11-
import java.util.*;
11+
import java.util.ArrayList;
12+
import java.util.Collections;
13+
import java.util.List;
1214

1315
public class Util {
1416

@@ -38,7 +40,7 @@ public static String typeDef(TypeMirror typeMirror) {
3840
}
3941
}
4042

41-
public static String trimAnnotations(String type) {
43+
public static String trimAnnotations(String type) {
4244
int pos = type.indexOf("@");
4345
if (pos == -1) {
4446
return type;
@@ -79,7 +81,7 @@ public static String shortName(String fullType, boolean role) {
7981
int p = fullType.lastIndexOf('.');
8082
if (p == -1) {
8183
return fullType;
82-
} else if (fullType.startsWith("java")||role) {
84+
} else if (fullType.startsWith("java") || role) {
8385
return fullType.substring(p + 1);
8486
} else {
8587
var result = "";

tests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<assertj.version>3.24.1</assertj.version>
2020
<jackson.version>2.14.1</jackson.version>
2121
<jex.version>2.5</jex.version>
22-
<avaje-inject.version>8.12-RC1</avaje-inject.version>
22+
<avaje-inject.version>8.12-RC3</avaje-inject.version>
2323
</properties>
2424

2525
<modules>

tests/test-javalin-jsonb/src/main/java/org/example/myapp/web/test/OpenAPIController.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,21 +75,18 @@ Person testPost(Person b) {
7575
description = "Some other Error",
7676
type = ErrorResponse.class)
7777
})
78-
Person testPostl(List<Person> m) {
79-
78+
Person testPostList(List<Person> m) {
8079
return new Person(0, "baby");
8180
}
8281

8382
@Put("/put")
8483
@Produces(value = MediaType.TEXT_PLAIN, defaultStatus = 203)
8584
@OpenAPIResponse(responseCode = "204", type = String.class)
8685
String testDefaultStatus(Context ctx) {
87-
8886
if (ctx.contentType().equals(MediaType.APPLICATION_PDF)) {
8987
ctx.status(204);
9088
return "";
9189
}
92-
9390
return "only partial info";
9491
}
9592
}

tests/test-javalin-jsonb/src/main/java/org/example/myapp/web/test/TestController.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ byte[] testBytes() {
4444

4545
@Get("/ctx")
4646
void testVoid(Context ctx) {
47-
4847
ctx.result("success path:" + ctx.path());
4948
}
5049

tests/test-nima-jsonb/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@
3636
<dependency>
3737
<groupId>io.helidon.nima.webserver</groupId>
3838
<artifactId>helidon-nima-webserver</artifactId>
39-
<version>4.0.0-ALPHA2</version>
39+
<version>4.0.0-ALPHA4</version>
4040
</dependency>
4141
<dependency>
4242
<groupId>io.helidon.nima.http.media</groupId>
4343
<artifactId>helidon-nima-http-media-jsonb</artifactId>
44-
<version>4.0.0-ALPHA2</version>
44+
<version>4.0.0-ALPHA4</version>
4545
</dependency>
4646
<dependency>
4747
<groupId>io.avaje</groupId>

tests/test-nima/pom.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1818
</properties>
1919

20-
2120
<dependencies>
2221
<dependency>
2322
<groupId>io.avaje</groupId>
@@ -33,12 +32,12 @@
3332
<dependency>
3433
<groupId>io.helidon.nima.webserver</groupId>
3534
<artifactId>helidon-nima-webserver</artifactId>
36-
<version>4.0.0-ALPHA2</version>
35+
<version>4.0.0-ALPHA4</version>
3736
</dependency>
3837
<dependency>
3938
<groupId>io.helidon.nima.http.media</groupId>
4039
<artifactId>helidon-nima-http-media-jsonb</artifactId>
41-
<version>4.0.0-ALPHA2</version>
40+
<version>4.0.0-ALPHA4</version>
4241
</dependency>
4342

4443
<!-- <dependency>-->

0 commit comments

Comments
 (0)