Merge branch 'plugin-two' of github.com:SentryMan/avaje-validator

Author: rbygrave

blackbox-test/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-validator-parent</artifactId>
-    <version>0.11</version>
+    <version>0.12</version>
   </parent>
 
   <artifactId>validator-blackbox-test</artifactId>

blackbox-test/src/main/java/example/avaje/method/MethodTest.java

@@ -3,7 +3,7 @@
 import java.util.List;
 
 import io.avaje.http.api.Validator;
-import io.avaje.validation.inject.aspect.ValidateMethod;
+import io.avaje.validation.ValidMethod;
 import jakarta.inject.Singleton;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
@@ -15,7 +15,7 @@ public class MethodTest {
   public MethodTest(Validator apiValidator) {}
 
   @NotNull
-  @ValidateMethod
+  @ValidMethod
   String test(@NotEmpty List<@NotNull String> str, @Positive int inty, String regular) {
     return regular;
   }

pom.xml

@@ -10,7 +10,7 @@
 
   <groupId>io.avaje</groupId>
   <artifactId>avaje-validator-parent</artifactId>
-  <version>0.11</version>
+  <version>0.12</version>
 
   <packaging>pom</packaging>
   <name>validator parent</name>

validator-constraints/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>io.avaje</groupId>
 		<artifactId>avaje-validator-parent</artifactId>
-		<version>0.11</version>
+		<version>0.12</version>
 	</parent>
 	<artifactId>validator-constraints</artifactId>
-</project>
+</project>

validator-generator/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-validator-parent</artifactId>
-    <version>0.11</version>
+    <version>0.12</version>
   </parent>
 
   <artifactId>avaje-validator-generator</artifactId>

validator-generator/src/main/java/io/avaje/validation/generator/ValidationProcessor.java

@@ -35,7 +35,7 @@
   AvajeConstraintPrism.PRISM_TYPE,
   JakartaConstraintPrism.PRISM_TYPE,
   JavaxConstraintPrism.PRISM_TYPE,
-  ValidateMethodPrism.PRISM_TYPE
+  ValidMethodPrism.PRISM_TYPE
 })
 public final class ValidationProcessor extends AbstractProcessor {
 
@@ -102,7 +102,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
         .map(round::getElementsAnnotatedWith)
         .ifPresent(this::writeAdapters);
 
-    Optional.ofNullable(element(ValidateMethodPrism.PRISM_TYPE))
+    Optional.ofNullable(element(ValidMethodPrism.PRISM_TYPE))
         .map(round::getElementsAnnotatedWith)
         .map(ElementFilter::methodsIn)
         .ifPresent(this::writeParamProviderForMethod);

validator-generator/src/main/java/io/avaje/validation/generator/package-info.java

@@ -19,7 +19,7 @@
 @GeneratePrism(io.avaje.validation.spi.MetaData.class)
 @GeneratePrism(io.avaje.validation.spi.MetaData.Factory.class)
 @GeneratePrism(io.avaje.validation.spi.MetaData.AnnotationFactory.class)
-@GeneratePrism(io.avaje.validation.inject.aspect.ValidateMethod.class)
+@GeneratePrism(io.avaje.validation.ValidMethod.class)
 @GeneratePrism(io.avaje.inject.Component.class)
 @GeneratePrism(io.avaje.validation.spi.BuilderCustomizer.class)
 package io.avaje.validation.generator;

validator-generator/src/test/java/io/avaje/validation/generator/models/valid/methods/MethodTest.java

@@ -3,16 +3,16 @@
 import java.util.List;
 
 import io.avaje.inject.Component;
+import io.avaje.validation.ValidMethod;
 import io.avaje.validation.constraints.NotEmpty;
 import io.avaje.validation.constraints.Positive;
 import io.avaje.validation.constraints.Valid;
 import io.avaje.validation.generator.models.valid.CrewMate;
-import io.avaje.validation.inject.aspect.ValidateMethod;
 
 @Component
 public class MethodTest {
   @NotEmpty
-  @ValidateMethod
+  @ValidMethod
   String test(@NotEmpty List<@Valid CrewMate> crew, @Positive int inty, String regular) {
     return regular;
   }

validator-http-plugin/pom.xml

@@ -5,15 +5,15 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-validator-parent</artifactId>
-    <version>0.11</version>
+    <version>0.12</version>
   </parent>
   <artifactId>avaje-validator-http-plugin</artifactId>
   <name>validator-http-plugin</name>
   <dependencies>
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-validator</artifactId>
-      <version>0.10</version>
+      <version>0.11</version>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>

validator-inject-plugin/pom.xml

@@ -5,16 +5,15 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-validator-parent</artifactId>
-    <version>0.11</version>
+    <version>0.12</version>
   </parent>
   <artifactId>avaje-validator-inject-plugin</artifactId>
   <name>validator-inject-plugin</name>
   <dependencies>
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-validator</artifactId>
-      <!-- TODO complete the circle later -->
-      <version>0.10</version>
+      <version>0.11</version>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>

validator-inject-plugin/src/main/java/io/avaje/validation/inject/aspect/AOPMethodValidator.java

@@ -10,9 +10,10 @@
 import io.avaje.inject.PostConstruct;
 import io.avaje.inject.aop.AspectProvider;
 import io.avaje.inject.aop.MethodInterceptor;
+import io.avaje.validation.ValidMethod;
 import io.avaje.validation.adapter.ValidationContext;
 
-public final class AOPMethodValidator implements AspectProvider<ValidateMethod> {
+public final class AOPMethodValidator implements AspectProvider<ValidMethod> {
 
   private List<BiConsumer<ValidationContext, Map<Method, MethodAdapterProvider>>> consumers =
       new ArrayList<>();
@@ -25,7 +26,7 @@ public void post(ValidationContext ctx, Map<Method, MethodAdapterProvider> map)
   }
 
   @Override
-  public MethodInterceptor interceptor(Method method, ValidateMethod aspectAnnotation) {
+  public MethodInterceptor interceptor(Method method, ValidMethod aspectAnnotation) {
 
     final var localeStr = aspectAnnotation.locale();
     final Locale locale;

validator-inject-plugin/src/main/java/io/avaje/validation/inject/aspect/ValidateMethod.java

@@ -10,10 +10,10 @@
 import io.avaje.inject.BeanScopeBuilder;
 import io.avaje.inject.aop.AspectProvider;
 import io.avaje.inject.spi.GenericType;
+import io.avaje.validation.ValidMethod;
 import io.avaje.validation.Validator;
 import io.avaje.validation.inject.aspect.AOPMethodValidator;
 import io.avaje.validation.inject.aspect.MethodAdapterProvider;
-import io.avaje.validation.inject.aspect.ValidateMethod;
 
 /** Plugin for avaje inject that provides a default Jsonb instance. */
 public final class DefaultValidatorProvider implements io.avaje.inject.spi.Plugin {
@@ -25,7 +25,7 @@ public Class<?>[] provides() {
 
   @Override
   public Class<?>[] providesAspects() {
-    return new Class<?>[] {ValidateMethod.class};
+    return new Class<?>[] {ValidMethod.class};
   }
 
   @Override
@@ -79,7 +79,7 @@ private void validator(BeanScopeBuilder builder) {
   private void paramAspect(BeanScopeBuilder builder) {
     builder.provideDefault(
         null,
-        new GenericType<AspectProvider<ValidateMethod>>() {}.type(),
+        new GenericType<AspectProvider<ValidMethod>>() {}.type(),
         () -> {
           final var methodValidator = new AOPMethodValidator();
 

validator-inject-plugin/src/main/java/io/avaje/validation/inject/spi/DefaultValidatorProvider.java

@@ -7,17 +7,18 @@
 import io.avaje.inject.aop.Invocation;
 import io.avaje.inject.aop.InvocationException;
 import io.avaje.inject.aop.MethodInterceptor;
+import io.avaje.validation.ValidMethod;
 
 public final class MethodTest$Proxy extends MethodTest {
 
   private final Method test0;
   private final MethodInterceptor test0ValidateParams;
 
-  public MethodTest$Proxy(AspectProvider<ValidateMethod> validateParams) {
+  public MethodTest$Proxy(AspectProvider<ValidMethod> validateParams) {
     try {
       test0 = MethodTest.class.getDeclaredMethod("test", List.class, int.class, String.class);
       test0ValidateParams =
-          validateParams.interceptor(test0, test0.getAnnotation(ValidateMethod.class));
+          validateParams.interceptor(test0, test0.getAnnotation(ValidMethod.class));
 
     } catch (final Exception e) {
       throw new IllegalStateException(e);

validator-inject-plugin/src/test/java/io/avaje/validation/inject/aspect/MethodTest$Proxy.java

@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import io.avaje.validation.ValidMethod;
 import io.avaje.validation.constraints.NotEmpty;
 import io.avaje.validation.constraints.NotNull;
 import io.avaje.validation.constraints.Positive;
@@ -10,6 +11,6 @@
 @Singleton
 public class MethodTest {
 
-  @ValidateMethod
+  @ValidMethod
   public void test(@NotEmpty List<@NotNull String> str, @Positive int inty, String regular) {}
 }

validator-inject-plugin/src/test/java/io/avaje/validation/inject/aspect/MethodTest.java

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-validator-parent</artifactId>
-    <version>0.11</version>
+    <version>0.12</version>
   </parent>
 
   <artifactId>avaje-validator</artifactId>
@@ -24,15 +24,15 @@
       <artifactId>avaje-validator-http-plugin</artifactId>
       <version>${project.version}</version>
     </dependency>
-    
+
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject</artifactId>
       <version>${inject.version}</version>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
-    
+
     <dependency>
       <groupId>jakarta.validation</groupId>
       <artifactId>jakarta.validation-api</artifactId>