Skip to content

Commit 11fafa5

Browse files
committed
Change HttpClient tests to use jakarta.validation (from javax)
1 parent 040f319 commit 11fafa5

File tree

4 files changed

+23
-15
lines changed

4 files changed

+23
-15
lines changed

http-client/pom.xml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
<dependency>
8181
<groupId>io.avaje</groupId>
8282
<artifactId>avaje-http-hibernate-validator</artifactId>
83-
<version>2.8</version>
83+
<version>3.2</version>
8484
<scope>test</scope>
8585
</dependency>
8686

@@ -106,20 +106,14 @@
106106
<path>
107107
<groupId>io.avaje</groupId>
108108
<artifactId>avaje-inject-generator</artifactId>
109-
<version>8.10</version>
109+
<version>9.0-RC3</version>
110110
</path>
111111
</annotationProcessorPaths>
112112
</configuration>
113113
</execution>
114114
</executions>
115115
</plugin>
116116

117-
118-
<plugin>
119-
<artifactId>maven-surefire-plugin</artifactId>
120-
<version>3.0.0-M6</version>
121-
</plugin>
122-
123117
</plugins>
124118
</build>
125119
</project>

http-client/src/test/java/org/example/webserver/HelloController.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
import io.avaje.http.api.*;
44
import io.javalin.http.Context;
55

6-
import javax.validation.Valid;
6+
import jakarta.validation.Valid;
77
import java.time.LocalDate;
8-
import java.time.ZoneId;
98
import java.util.ArrayList;
109
import java.util.Base64;
1110
import java.util.List;

http-client/src/test/java/org/example/webserver/HelloForm.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
import org.hibernate.validator.constraints.URL;
66

7-
import javax.validation.Valid;
8-
import javax.validation.constraints.Email;
9-
import javax.validation.constraints.Future;
10-
import javax.validation.constraints.NotNull;
11-
import javax.validation.constraints.Size;
7+
import jakarta.validation.Valid;
8+
import jakarta.validation.constraints.Email;
9+
import jakarta.validation.constraints.Future;
10+
import jakarta.validation.constraints.NotNull;
11+
import jakarta.validation.constraints.Size;
1212
import java.time.LocalDate;
1313

1414
@Valid

tests/test-javalin-jsonb/src/main/resources/public/openapi.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -726,6 +726,21 @@
726726
"schema" : {
727727
"type" : "string"
728728
}
729+
},
730+
{
731+
"name" : "type",
732+
"in" : "query",
733+
"schema" : {
734+
"type" : "array",
735+
"items" : {
736+
"type" : "string",
737+
"enum" : [
738+
"PROXY",
739+
"HIDE_N_SEEK",
740+
"FFA"
741+
]
742+
}
743+
}
729744
}
730745
],
731746
"responses" : {

0 commit comments

Comments
 (0)