Merge branch 'master' into default-validator-handler

SentryMan · web-flow · commit dde97b11ee9f · 2025-11-22T15:12:31.000-05:00
diff --git a/http-generator-core/src/main/java/io/avaje/http/generator/core/BaseProcessor.java b/http-generator-core/src/main/java/io/avaje/http/generator/core/BaseProcessor.java
@@ -19,7 +19,6 @@
 import javax.annotation.processing.SupportedOptions;
 import javax.lang.model.SourceVersion;
 import javax.lang.model.element.Element;
-import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.Modifier;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.util.ElementFilter;
@@ -54,11 +53,12 @@ public SourceVersion getSupportedSourceVersion() {
   @Override
   public Set<String> getSupportedAnnotationTypes() {
     return Set.of(
-      PathPrism.PRISM_TYPE,
-      ControllerPrism.PRISM_TYPE,
-      OpenAPIDefinitionPrism.PRISM_TYPE,
-      MappedParamPrism.PRISM_TYPE,
-      MapImportPrism.PRISM_TYPE);
+        PathPrism.PRISM_TYPE,
+        ControllerPrism.PRISM_TYPE,
+        OpenAPIDefinitionPrism.PRISM_TYPE,
+        MappedParamPrism.PRISM_TYPE,
+        MapImportPrism.PRISM_TYPE,
+        HttpValidPrism.PRISM_TYPE);
   }
 
   @Override
@@ -91,7 +91,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
     if (round.errorRaised()) {
       return false;
     }
-
+    getElements(round, HttpValidPrism.PRISM_TYPE).forEach(this::warnValid);
     for (final var type : ElementFilter.typesIn(getElements(round, MappedParamPrism.PRISM_TYPE))) {
       var prism = MappedParamPrism.getInstanceOn(type);
       registerParamMapping(type, prism.factoryMethod());
@@ -148,6 +148,12 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
     return false;
   }
 
+  private void warnValid(Element e) {
+    if (!ControllerPrism.isPresent(e) && !ControllerPrism.isPresent(e.getEnclosingElement())) {
+      logWarn(e, "%s should only be used in Controller Classes", HttpValidPrism.PRISM_TYPE);
+    }
+  }
+
   private Set<? extends Element> getElements(RoundEnvironment round, String name) {
     return Optional.ofNullable(typeElement(name))
       .map(round::getElementsAnnotatedWith)
diff --git a/http-generator-core/src/main/java/io/avaje/http/generator/core/MethodParam.java b/http-generator-core/src/main/java/io/avaje/http/generator/core/MethodParam.java
@@ -32,19 +32,19 @@ public void buildParamName(Append writer) {
   }
 
   public void buildApiDocumentation(MethodDocBuilder methodDoc) {
-    if (elementParam.paramType() != ParamType.BEANPARAM) {
+    if (elementParam.paramType() != ParamType.BEANPARAM && elementParam.paramType() != ParamType.FORM) {
       elementParam.buildApiDocumentation(methodDoc);
     } else {
       asElement(elementParam.element().asType()).getEnclosedElements().stream()
           .filter(e -> e.getKind() == ElementKind.FIELD)
           .map(VariableElement.class::cast)
-          .forEach(e -> buildDoc(methodDoc, e));
+          .forEach(e -> buildDoc(methodDoc, e, elementParam.paramType() == ParamType.FORM));
     }
   }
 
-  private static void buildDoc(MethodDocBuilder methodDoc, VariableElement e) {
+  private static void buildDoc(MethodDocBuilder methodDoc, VariableElement e, boolean form) {
     final var typeMirror = e.asType();
-    new ElementReader(e, Util.parse(typeMirror.toString()), Util.typeDef(typeMirror), ParamType.QUERYPARAM, false)
+    new ElementReader(e, Util.parse(typeMirror.toString()), Util.typeDef(typeMirror), form ? ParamType.FORMPARAM : ParamType.QUERYPARAM, form)
       .buildApiDocumentation(methodDoc);
   }
 
diff --git a/http-hibernate-validator/pom.xml b/http-hibernate-validator/pom.xml
@@ -2,17 +2,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-
-  <groupId>io.avaje</groupId>
-  <artifactId>avaje-http-hibernate-validator</artifactId>
-  <version>3.5</version>
-
   <parent>
-    <groupId>org.avaje</groupId>
-    <artifactId>java11-oss</artifactId>
-    <version>4.3</version>
-    <relativePath/>
+    <groupId>io.avaje</groupId>
+    <artifactId>avaje-http-parent</artifactId>
+    <version>3.6-RC1</version>
   </parent>
+  
+  <artifactId>avaje-http-hibernate-validator</artifactId>
 
   <scm>
     <developerConnection>scm:git:git@github.com:avaje/avaje-http.git</developerConnection>
@@ -36,14 +32,14 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-api</artifactId>
-      <version>2.6</version>
+      <version>3.6-RC1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.avaje</groupId>
-      <artifactId>avaje-inject</artifactId>
-      <version>11.0</version>
+      <artifactId>avaje-inject-generator</artifactId>
+      <version>12.1-RC3</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/http-hibernate-validator/src/main/java/io/avaje/http/hibernate/validator/BeanValidator.java b/http-hibernate-validator/src/main/java/io/avaje/http/hibernate/validator/BeanValidator.java
@@ -1,22 +1,27 @@
 package io.avaje.http.hibernate.validator;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
 
 import io.avaje.http.api.ValidationException;
 import io.avaje.http.api.ValidationException.Violation;
 import io.avaje.http.api.Validator;
 import jakarta.validation.ConstraintViolation;
 import jakarta.validation.ConstraintViolationException;
-import jakarta.validation.Validation;
-import jakarta.validation.ValidatorFactory;
 
 public class BeanValidator implements Validator {
 
-  private static final ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
+  private jakarta.validation.Validator validator;
+
+  void postConstruct(jakarta.validation.Validator validator) {
+    this.validator = validator;
+  }
 
   @Override
-  public void validate(Object bean, String acceptLanguage, Class<?>... groups) throws ValidationException {
-    final Set<ConstraintViolation<Object>> violations = factory.getValidator().validate(bean, groups);
+  public void validate(Object bean, String acceptLanguage, Class<?>... groups)
+      throws ValidationException {
+    final Set<ConstraintViolation<Object>> violations = validator.validate(bean, groups);
     if (!violations.isEmpty()) {
       throwExceptionWith(violations);
     }
diff --git a/http-hibernate-validator/src/main/java/io/avaje/http/hibernate/validator/ValidatorProvider.java b/http-hibernate-validator/src/main/java/io/avaje/http/hibernate/validator/ValidatorProvider.java
@@ -2,19 +2,26 @@
 
 import io.avaje.http.api.Validator;
 import io.avaje.inject.BeanScopeBuilder;
+import io.avaje.inject.spi.PluginProvides;
+import jakarta.validation.Validation;
 
-/**
- * Plugin for avaje inject that provides a default BeanValidator instance.
- */
+/** Plugin for avaje inject that provides a default BeanValidator instance. */
+@PluginProvides(Validator.class)
 public final class ValidatorProvider implements io.avaje.inject.spi.InjectPlugin {
 
-  @Override
-  public Class<?>[] provides() {
-    return new Class<?>[]{Validator.class};
-  }
-
   @Override
   public void apply(BeanScopeBuilder builder) {
-    builder.provideDefault(null, Validator.class, BeanValidator::new);
+    builder.provideDefault(
+        Validator.class,
+        () -> {
+          var validator = new BeanValidator();
+          builder.addPostConstruct(
+              b ->
+                  validator.postConstruct(
+                      b.getOptional(jakarta.validation.Validator.class)
+                          .orElseGet(
+                              () -> Validation.buildDefaultValidatorFactory().getValidator())));
+          return validator;
+        });
   }
-}
+}
diff --git a/http-hibernate-validator/src/main/java/module-info.java b/http-hibernate-validator/src/main/java/module-info.java
@@ -2,11 +2,9 @@
 
 module io.avaje.http.hibernate.validator {
 
-  exports io.avaje.http.hibernate.validator;
-
-  requires io.avaje.http.api;
-  requires io.avaje.inject;
-  requires jakarta.validation;
+  requires transitive io.avaje.http.api;
+  requires transitive io.avaje.inject;
+  requires transitive jakarta.validation;
 
   provides io.avaje.inject.spi.InjectExtension with ValidatorProvider;
 }
diff --git a/http-hibernate-validator/src/main/resources/META-INF/services/io.avaje.inject.spi.InjectExtension b/http-hibernate-validator/src/main/resources/META-INF/services/io.avaje.inject.spi.InjectExtension
diff --git a/pom.xml b/pom.xml
@@ -48,6 +48,7 @@
     <module>http-generator-javalin</module>
     <module>http-generator-sigma</module>
     <module>http-generator-client</module>
+    <module>http-hibernate-validator</module>
   </modules>
 
   <profiles>
diff --git a/tests/test-javalin-jsonb/src/main/java/org/example/myapp/web/test/MyForm.java b/tests/test-javalin-jsonb/src/main/java/org/example/myapp/web/test/MyForm.java
@@ -1,8 +1,12 @@
 package org.example.myapp.web.test;
 
+import io.avaje.http.api.Header;
+
 public class MyForm {
 
   public String name;
   public String email;
   public String url;
+  @Header
+  public String headString;
 }
diff --git a/tests/test-javalin-jsonb/src/main/java/org/example/myapp/web/test/OpenAPIController.java b/tests/test-javalin-jsonb/src/main/java/org/example/myapp/web/test/OpenAPIController.java
@@ -4,6 +4,7 @@
 
 import io.avaje.http.api.Controller;
 import io.avaje.http.api.Delete;
+import io.avaje.http.api.Form;
 import io.avaje.http.api.Get;
 import io.avaje.http.api.Header;
 import io.avaje.http.api.MediaType;
@@ -107,4 +108,10 @@ String testDefaultStatus(Context ctx) {
   String testPathParam(String type, @QueryParam String lastName, @QueryParam("q-2") String param2, @Header String contentLength, @Header("x-oh") String otherHeader) {
     return "only partial info";
   }
+
+  @Form
+  @Post("/form")
+  String testForm(MyForm form) {
+    return "only partial info";
+  }
 }
diff --git a/tests/test-javalin-jsonb/src/test/resources/expectedOpenApi.json b/tests/test-javalin-jsonb/src/test/resources/expectedOpenApi.json

Original file line number	Diff line number	Diff line change
`@@ -32,19 +32,19 @@ public void buildParamName(Append writer) {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`public void buildApiDocumentation(MethodDocBuilder methodDoc) {`
`35`		`- if (elementParam.paramType() != ParamType.BEANPARAM) {`
	`35`	`+ if (elementParam.paramType() != ParamType.BEANPARAM && elementParam.paramType() != ParamType.FORM) {`
`36`	`36`	`elementParam.buildApiDocumentation(methodDoc);`
`37`	`37`	`} else {`
`38`	`38`	`asElement(elementParam.element().asType()).getEnclosedElements().stream()`
`39`	`39`	`.filter(e -> e.getKind() == ElementKind.FIELD)`
`40`	`40`	`.map(VariableElement.class::cast)`
`41`		`- .forEach(e -> buildDoc(methodDoc, e));`
	`41`	`+ .forEach(e -> buildDoc(methodDoc, e, elementParam.paramType() == ParamType.FORM));`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
`45`		`- private static void buildDoc(MethodDocBuilder methodDoc, VariableElement e) {`
	`45`	`+ private static void buildDoc(MethodDocBuilder methodDoc, VariableElement e, boolean form) {`
`46`	`46`	`final var typeMirror = e.asType();`
`47`		`- new ElementReader(e, Util.parse(typeMirror.toString()), Util.typeDef(typeMirror), ParamType.QUERYPARAM, false)`
	`47`	`+ new ElementReader(e, Util.parse(typeMirror.toString()), Util.typeDef(typeMirror), form ? ParamType.FORMPARAM : ParamType.QUERYPARAM, form)`
`48`	`48`	`.buildApiDocumentation(methodDoc);`
`49`	`49`	`}`
`50`	`50`