Skip to content

Commit 68b7759

Browse files
SentryManSentryMan
committed
fix tests
1 parent 811de3b commit 68b7759

File tree

14 files changed

+54
-77
lines changed

14 files changed

+54
-77
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,5 @@ build/
1313
*.Module
1414
dependency-reduced-pom.xml
1515
.DS_Store
16+
tests/test-sigma/avaje-processors.txt
17+
tests/test-sigma/io.avaje.jsonb.spi.JsonbExtension

‎tests/pom.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,26 @@
4343
</modules>
4444
</profile>
4545
</profiles>
46+
47+
<dependencies>
48+
<dependency>
49+
<groupId>io.avaje</groupId>
50+
<artifactId>avaje-validator</artifactId>
51+
<version>2.3</version>
52+
</dependency>
53+
54+
<dependency>
55+
<groupId>io.avaje</groupId>
56+
<artifactId>avaje-validator-constraints</artifactId>
57+
<version>2.3</version>
58+
</dependency>
59+
60+
<dependency>
61+
<groupId>io.avaje</groupId>
62+
<artifactId>avaje-validator-generator</artifactId>
63+
<version>2.3</version>
64+
</dependency>
65+
66+
</dependencies>
4667

4768
</project>

‎tests/test-javalin-jsonb/pom.xml

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -54,19 +54,7 @@
5454
<artifactId>swagger-annotations</artifactId>
5555
<version>${swagger.version}</version>
5656
</dependency>
57-
58-
<dependency>
59-
<groupId>io.avaje</groupId>
60-
<artifactId>avaje-validator</artifactId>
61-
<version>2.3</version>
62-
</dependency>
63-
64-
<dependency>
65-
<groupId>io.avaje</groupId>
66-
<artifactId>avaje-validator-constraints</artifactId>
67-
<version>2.3</version>
68-
</dependency>
69-
57+
7058
<!-- java annotation processors -->
7159

7260
<dependency>
@@ -96,13 +84,6 @@
9684
<scope>provided</scope>
9785
</dependency>
9886

99-
<dependency>
100-
<groupId>io.avaje</groupId>
101-
<artifactId>avaje-validator-generator</artifactId>
102-
<version>2.3</version>
103-
</dependency>
104-
105-
10687
<!-- test dependencies -->
10788
<dependency>
10889
<groupId>io.avaje</groupId>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@
33
import java.util.List;
44
import java.util.Set;
55

6-
import org.jetbrains.annotations.NotNull;
7-
86
import io.avaje.http.api.Header;
97
import io.avaje.http.api.Ignore;
108
import io.avaje.http.api.QueryParam;
119
import io.avaje.jsonb.Json;
1210
import io.avaje.validation.constraints.Email;
11+
import io.avaje.validation.constraints.NotNull;
1312
import io.avaje.validation.constraints.Size;
1413
import io.avaje.validation.constraints.Valid;
1514

‎tests/test-javalin/pom.xml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,6 @@
6060
<version>2.3</version>
6161
</dependency>
6262

63-
<dependency>
64-
<groupId>io.avaje</groupId>
65-
<artifactId>avaje-validator-constraints</artifactId>
66-
<version>2.3</version>
67-
</dependency>
68-
6963
<dependency>
7064
<groupId>io.swagger.core.v3</groupId>
7165
<artifactId>swagger-annotations</artifactId>
@@ -87,13 +81,6 @@
8781
<version>${project.version}</version>
8882
<scope>provided</scope>
8983
</dependency>
90-
91-
<dependency>
92-
<groupId>io.avaje</groupId>
93-
<artifactId>avaje-validator-generator</artifactId>
94-
<version>2.3</version>
95-
</dependency>
96-
9784

9885
<!-- test dependencies -->
9986
<dependency>

‎tests/test-jex/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,6 @@
5454
<version>${project.version}</version>
5555
</dependency>
5656

57-
<dependency>
58-
<groupId>io.avaje</groupId>
59-
<artifactId>avaje-http-hibernate-validator</artifactId>
60-
<version>3.5-RC3</version>
61-
</dependency>
62-
6357
<dependency>
6458
<groupId>io.swagger.core.v3</groupId>
6559
<artifactId>swagger-annotations</artifactId>

‎tests/test-jex/src/main/java/org/example/Main.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
package org.example;
22

33
import io.avaje.http.api.ValidationException;
4-
import io.avaje.http.api.Validator;
54
import io.avaje.inject.BeanScope;
6-
import io.avaje.inject.InjectModule;
75
import io.avaje.jex.Jex;
86
import io.avaje.jex.Routing;
97

108
import java.util.LinkedHashMap;
119
import java.util.Map;
1210

13-
@InjectModule(requires = Validator.class)
1411
public class Main {
1512

1613
public static void main(String[] args) {

‎tests/test-jex/src/main/java/org/example/web/HelloDto.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.example.web;
22

3-
import jakarta.validation.Valid;
4-
import jakarta.validation.constraints.NotNull;
3+
import io.avaje.validation.constraints.NotNull;
4+
import io.avaje.validation.constraints.Valid;
55

66
@Valid
77
public class HelloDto {

‎tests/test-nima-jsonb/.project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<projectDescription>
3-
<name>test-nima</name>
3+
<name>test-nima-jsonb</name>
44
<comment></comment>
55
<projects>
66
</projects>

‎tests/test-nima-jsonb/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@
3333
<artifactId>avaje-jsonb</artifactId>
3434
<version>2.3</version>
3535
</dependency>
36-
<dependency>
37-
<groupId>io.avaje</groupId>
38-
<artifactId>avaje-http-hibernate-validator</artifactId>
39-
<version>3.3</version>
40-
</dependency>
4136
<dependency>
4237
<groupId>io.helidon.webserver</groupId>
4338
<artifactId>helidon-webserver</artifactId>
@@ -92,6 +87,11 @@
9287
<artifactId>avaje-jsonb-generator</artifactId>
9388
<version>2.3</version>
9489
</path>
90+
<path>
91+
<groupId>io.avaje</groupId>
92+
<artifactId>avaje-validator-generator</artifactId>
93+
<version>2.3</version>
94+
</path>
9595
</annotationProcessorPaths>
9696
</configuration>
9797
</plugin>

‎tests/test-nima-jsonb/src/test/java/org/example/TestPair.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
package org.example;
22

3-
import io.avaje.http.api.Validator;
3+
import java.util.List;
4+
import java.util.Locale;
5+
46
import io.avaje.http.api.context.ThreadLocalRequestContextResolver;
57
import io.avaje.http.client.HttpClient;
6-
import io.avaje.http.hibernate.validator.BeanValidator;
78
import io.avaje.jsonb.Jsonb;
9+
import io.avaje.validation.http.BeanValidator;
810
import io.helidon.webserver.WebServer;
911
import io.helidon.webserver.http.HttpRouting;
1012

@@ -38,7 +40,7 @@ void stop() {
3840
private static HttpRouting.Builder routing() {
3941
HttpRouting.Builder routing = HttpRouting.builder();
4042

41-
var beanValidator = new BeanValidator();
43+
var beanValidator = new BeanValidator(List.of(Locale.getDefault()));
4244
Jsonb jsonb = Jsonb.builder().build();
4345

4446
var ec = new ErrorController();

‎tests/test-sigma/pom.xml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,7 @@
4242
<artifactId>avaje-http-api</artifactId>
4343
<version>${project.version}</version>
4444
</dependency>
45-
46-
<dependency>
47-
<groupId>io.avaje</groupId>
48-
<artifactId>avaje-http-hibernate-validator</artifactId>
49-
<version>3.5-RC3</version>
50-
</dependency>
51-
45+
5246
<dependency>
5347
<groupId>io.swagger.core.v3</groupId>
5448
<artifactId>swagger-annotations</artifactId>

‎tests/test-sigma/src/main/java/org/example/myapp/web/GetBeanForm.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
import io.avaje.http.api.Ignore;
88
import io.avaje.http.api.QueryParam;
99
import io.avaje.jsonb.Json;
10-
import jakarta.validation.Valid;
11-
import jakarta.validation.constraints.Email;
12-
import jakarta.validation.constraints.NotNull;
13-
import jakarta.validation.constraints.Size;
10+
import io.avaje.validation.constraints.Email;
11+
import io.avaje.validation.constraints.NotNull;
12+
import io.avaje.validation.constraints.Size;
13+
import io.avaje.validation.constraints.Valid;
1414

1515
@Json
1616
@Valid

‎tests/test-sigma/src/main/java/org/example/myapp/web/HelloForm.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22

33
import java.time.LocalDate;
44

5-
import org.hibernate.validator.constraints.URL;
6-
75
import io.avaje.jsonb.Json;
8-
import jakarta.validation.Valid;
9-
import jakarta.validation.constraints.Email;
10-
import jakarta.validation.constraints.Future;
11-
import jakarta.validation.constraints.NotNull;
12-
import jakarta.validation.constraints.Size;
6+
import io.avaje.validation.constraints.Email;
7+
import io.avaje.validation.constraints.Future;
8+
import io.avaje.validation.constraints.NotNull;
9+
import io.avaje.validation.constraints.Size;
10+
import io.avaje.validation.constraints.URI;
11+
import io.avaje.validation.constraints.Valid;
1312

1413
@Json
1514
@Valid
@@ -22,10 +21,11 @@ public class HelloForm {
2221
@Email
2322
@Size(max = 100)
2423
String email;
25-
@URL
26-
private String url;
27-
@Future
28-
public LocalDate startDate;
24+
25+
@URI
26+
private String url;
27+
@Future
28+
public LocalDate startDate;
2929

3030
public HelloForm(String name, String email) {
3131
this.name = name;

0 commit comments

Comments
 (0)