Change HttpClient tests to use jakarta.validation (from javax)

avaje · Mar 19, 2023 · 11fafa5 · 11fafa5
1 parent 040f319
commit 11fafa5
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 15 deletions.
diff --git a/http-client/pom.xml b/http-client/pom.xml
@@ -80,7 +80,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-hibernate-validator</artifactId>
-      <version>2.8</version>
+      <version>3.2</version>
       <scope>test</scope>
     </dependency>
 
@@ -106,20 +106,14 @@
                 <path>
                   <groupId>io.avaje</groupId>
                   <artifactId>avaje-inject-generator</artifactId>
-                  <version>8.10</version>
+                  <version>9.0-RC3</version>
                 </path>
               </annotationProcessorPaths>
             </configuration>
           </execution>
         </executions>
       </plugin>
 
-
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>3.0.0-M6</version>
-      </plugin>
-
     </plugins>
   </build>
 </project>
diff --git a/http-client/src/test/java/org/example/webserver/HelloController.java b/http-client/src/test/java/org/example/webserver/HelloController.java
@@ -3,9 +3,8 @@
 import io.avaje.http.api.*;
 import io.javalin.http.Context;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.time.LocalDate;
-import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Base64;
 import java.util.List;

diff --git a/http-client/src/test/java/org/example/webserver/HelloForm.java b/http-client/src/test/java/org/example/webserver/HelloForm.java
@@ -4,11 +4,11 @@
 
 import org.hibernate.validator.constraints.URL;
 
-import javax.validation.Valid;
-import javax.validation.constraints.Email;
-import javax.validation.constraints.Future;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.Future;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import java.time.LocalDate;
 
 @Valid

diff --git a/tests/test-javalin-jsonb/src/main/resources/public/openapi.json b/tests/test-javalin-jsonb/src/main/resources/public/openapi.json
@@ -726,6 +726,21 @@
 						"schema" : {
 							"type" : "string"
 						}
+					},
+					{
+						"name" : "type",
+						"in" : "query",
+						"schema" : {
+							"type" : "array",
+							"items" : {
+								"type" : "string",
+								"enum" : [
+									"PROXY",
+									"HIDE_N_SEEK",
+									"FFA"
+								]
+							}
+						}
 					}
 				],
 				"responses" : {