fix validation

Author: SentryMan

http-hibernate-validator/pom.xml

@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject</artifactId>
-      <version>10.1</version>
+      <version>11.0</version>
       <scope>provided</scope>
     </dependency>
 

tests/test-javalin/pom.xml

@@ -56,8 +56,14 @@
 
     <dependency>
       <groupId>io.avaje</groupId>
-      <artifactId>avaje-http-hibernate-validator</artifactId>
-      <version>3.5-RC3</version>
+      <artifactId>avaje-validator</artifactId>
+      <version>2.3</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-validator-constraints</artifactId>
+      <version>2.3</version>
     </dependency>
 
     <dependency>
@@ -81,6 +87,12 @@
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
+    
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-validator-generator</artifactId>
+      <version>2.3</version>
+    </dependency>
 
 
     <!-- test dependencies -->

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

@@ -1,9 +1,9 @@
 package org.example.myapp.web;
 
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.Email;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
+import io.avaje.validation.constraints.Email;
+import io.avaje.validation.constraints.NotNull;
+import io.avaje.validation.constraints.Size;
+import io.avaje.validation.constraints.Valid;
 
 @Valid
 public class GetBeanForm {

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

@@ -21,10 +21,10 @@
 import io.avaje.http.api.Post;
 import io.avaje.http.api.Produces;
 import io.avaje.http.api.QueryParam;
+import io.avaje.http.api.Valid;
 import io.javalin.http.Context;
 import io.swagger.v3.oas.annotations.Hidden;
 import jakarta.inject.Inject;
-import jakarta.validation.Valid;
 
 /**
  * Hello resource manager.

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

@@ -2,13 +2,12 @@
 
 import java.time.LocalDate;
 
-import org.hibernate.validator.constraints.URL;
-
-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 io.avaje.validation.constraints.Email;
+import io.avaje.validation.constraints.Future;
+import io.avaje.validation.constraints.NotNull;
+import io.avaje.validation.constraints.Size;
+import io.avaje.validation.constraints.URI;
+import io.avaje.validation.constraints.Valid;
 
 @Valid
 public class HelloForm {
@@ -19,7 +18,7 @@ public class HelloForm {
   @Email @Size(max = 100)
   String email;
 
-  @URL
+  @URI
   String url;
 
   @Future

tests/test-javalin/src/test/java/org/example/myapp/HelloControllerTest.java

@@ -45,7 +45,7 @@ void hello() {
   @Test
   void hello2() {
 
-    TypeRef<List<HelloDto>> listDto = new TypeRef<List<HelloDto>>() { };
+    TypeRef<List<HelloDto>> listDto = new TypeRef<>() { };
     final List<HelloDto> beans = given()
       .get(baseUrl + "/hello")
       .then()
@@ -65,7 +65,7 @@ void hello2() {
 
   @Test
   void helloAsyncRequestHandling() {
-    TypeRef<List<HelloDto>> listDto = new TypeRef<List<HelloDto>>() { };
+    TypeRef<List<HelloDto>> listDto = new TypeRef<>() { };
     final List<HelloDto> beans = given()
       .get(baseUrl + "/hello/async")
       .then()
@@ -209,9 +209,7 @@ void postForm_validation_expect_badRequest() {
       .as(ErrorResponse.class);
 
     assertNotNull(res);
-    assertThat(res.getMessage()).contains("failed validation");
-    assertThat(res.get("url")).isEqualTo("must be a valid URL");
-    assertThat(res.get("name")).isEqualTo("must not be null");
+    assertThat(res.getMessage()).contains("must not be null");
 
     try {
       client.request()
@@ -229,7 +227,8 @@ void postForm_validation_expect_badRequest() {
       assertEquals(422, httpResponse.statusCode());
 
       final ErrorResponse errorResponse = e.bean(ErrorResponse.class);
-      assertThat(errorResponse.get("url")).isEqualTo("must be a valid URL");
+
+      assertThat(res.getMessage()).contains("must not be null");
       assertThat(errorResponse.get("name")).isEqualTo("must not be null");
     }
   }