Bump to avaje-inject 6.0, hibernate-validator 6.2.0.Final

Author: rbygrave

http-hibernate-validator/pom.xml

@@ -4,12 +4,12 @@
 
   <groupId>io.avaje</groupId>
   <artifactId>avaje-http-hibernate-validator</artifactId>
-  <version>2.0</version>
+  <version>2.5</version>
 
   <parent>
     <groupId>org.avaje</groupId>
     <artifactId>java8-oss</artifactId>
-    <version>2.3</version>
+    <version>3.1</version>
   </parent>
 
   <scm>
@@ -22,26 +22,26 @@
     <dependency>
       <groupId>org.hibernate.validator</groupId>
       <artifactId>hibernate-validator</artifactId>
-      <version>6.1.0.Final</version>
+      <version>6.2.0.Final</version>
     </dependency>
 
     <dependency>
       <groupId>org.glassfish</groupId>
       <artifactId>javax.el</artifactId>
-      <version>3.0.1-b09</version>
+      <version>3.0.1-b12</version>
     </dependency>
 
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-api</artifactId>
-      <version>1.2</version>
+      <version>1.4</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject</artifactId>
-      <version>4.0</version>
+      <version>6.0.RC4</version>
       <scope>provided</scope>
     </dependency>
 
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject-generator</artifactId>
-      <version>4.0</version>
+      <version>6.0.RC4</version>
       <scope>provided</scope>
     </dependency>
 

http-hibernate-validator/src/main/java/io/avaje/http/hibernate/validator/BeanValidator.java

@@ -5,6 +5,7 @@
 import io.avaje.http.api.Validator;
 
 import jakarta.inject.Singleton;
+
 import javax.validation.ConstraintViolation;
 import javax.validation.Path;
 import javax.validation.Validation;
@@ -20,17 +21,14 @@ public class BeanValidator implements Validator {
 
   @Override
   public void validate(Object bean) {
-
     Set<ConstraintViolation<Object>> violations = factory.getValidator().validate(bean);
     if (!violations.isEmpty()) {
       throwExceptionWith(violations);
     }
   }
 
   private void throwExceptionWith(Set<ConstraintViolation<Object>> violations) {
-
-    Map<String,Object> errors = new LinkedHashMap<>();
-
+    Map<String, Object> errors = new LinkedHashMap<>();
     for (ConstraintViolation<?> violation : violations) {
       Path path = violation.getPropertyPath();
       String message = violation.getMessage();

http-hibernate-validator/src/main/java/io/avaje/http/hibernate/validator/package-info.java

@@ -1,4 +1,4 @@
-@ContextModule(name = "javalin-validator", provides = "validator")
+@InjectModule(name = "bean-validator", provides = "validator")
 package io.avaje.http.hibernate.validator;
 
-import io.avaje.inject.ContextModule;
+import io.avaje.inject.InjectModule;