Use Method AOP from main Validator Module

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>
@@ -27,7 +27,7 @@
     <nexus.staging.autoReleaseAfterClose>true</nexus.staging.autoReleaseAfterClose>
     <java.version>17</java.version>
     <java.release>17</java.release>
-    <inject.version>9.3</inject.version>
+    <inject.version>9.4-SNAPSHOT</inject.version>
     <http.version>1.45</http.version>
   </properties>
 

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/AdapterHelper.java

@@ -33,26 +33,25 @@ static void writeAdapterWithValues(
 
     if (!typeUse1.isEmpty()
         && (isAssignable2Interface(genericType.topType(), "java.lang.Iterable"))) {
-      writer.eol().append("%s    .list()", indent);
+      writer.append("%s    .list()", indent);
       final var t = genericType.firstParamType();
       writeTypeUse(writer, indent, t, typeUse1, genericType);
 
     } else if ((!typeUse1.isEmpty() || !typeUse2.isEmpty())
         && "java.util.Map".equals(genericType.topType())) {
 
-      writer.eol().append("%s    .mapKeys()", indent);
+      writer.append("%s    .mapKeys()", indent);
       writeTypeUse(writer, indent, genericType.firstParamType(), typeUse1, genericType);
 
-      writer.eol().append("%s    .mapValues()", indent);
+      writer.append("%s    .mapValues()", indent);
       writeTypeUse(writer, indent, genericType.secondParamType(), typeUse2, false, genericType);
 
     } else if (genericType.topType().contains("[]") && hasValid) {
 
-      writer.eol().append("%s    .array()", indent);
+      writer.append("%s    .array()", indent);
       writeTypeUse(writer, indent, genericType.firstParamType(), typeUse1, genericType);
     } else if (hasValid) {
       writer
-          .eol()
           .append(
               "%s    .andThen(ctx.adapter(%s.class))",
               indent, Util.shortName(genericType.topType()));
@@ -85,7 +84,7 @@ private static void writeTypeUse(
       }
       final var k = a.getKey().shortName();
       final var v = a.getValue();
-      writer.eol().append("%s    .andThenMulti(ctx.adapter(%s.class,%s))", indent, k, v);
+      writer.append("%s    .andThenMulti(ctx.adapter(%s.class,%s))", indent, k, v);
     }
 
     if (!Util.isBasicType(paramType)
@@ -94,7 +93,6 @@ private static void writeTypeUse(
             .anyMatch(Constants.VALID_ANNOTATIONS::contains)) {
 
       writer
-          .eol()
           .append(
               "%s    .andThenMulti(ctx.adapter(%s.class))",
               indent,

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

@@ -1,7 +1,5 @@
 package io.avaje.validation.generator;
 
-import static io.avaje.validation.generator.ProcessingContext.useEnhancedSwitch;
-
 import java.io.IOException;
 import java.io.Writer;
 
@@ -46,7 +44,4 @@ Append append(String format, Object... args) {
     return append(String.format(format, args));
   }
 
-  public Append appendSwitchCase() {
-    return append(useEnhancedSwitch() ? " -> {" : ":");
-  }
 }

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

@@ -11,6 +11,9 @@ final class Constants {
   public static final String VALID_SPI = "io.avaje.validation.spi.*";
   public static final String VALIDATOR = "io.avaje.validation.Validator";
   public static final String COMPONENT = "io.avaje.inject.Component";
+  static final String SINGLETON_JAKARTA = "jakarta.inject.Singleton";
+  static final String SINGLETON_JAVAX = "javax.inject.Singleton";
+
   public static final Set<String> VALID_ANNOTATIONS =
       Set.of(
           AvajeValidPrism.PRISM_TYPE,

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

@@ -28,6 +28,7 @@ private static final class Ctx {
     private final Elements elements;
     private final Types types;
     private final int jdkVersion;
+    private final String diAnnotation;
 
     Ctx(ProcessingEnvironment env) {
       this.env = env;
@@ -36,6 +37,15 @@ private static final class Ctx {
       this.elements = env.getElementUtils();
       this.types = env.getTypeUtils();
       this.jdkVersion = env.getSourceVersion().ordinal();
+
+      final var useComponent = elements.getTypeElement(Constants.COMPONENT) != null;
+
+      final var jakarta = elements.getTypeElement(Constants.SINGLETON_JAKARTA) != null;
+
+      diAnnotation =
+          (useComponent
+              ? Constants.COMPONENT
+              : jakarta ? Constants.SINGLETON_JAKARTA : Constants.SINGLETON_JAVAX);
     }
   }
 
@@ -45,19 +55,15 @@ static void init(ProcessingEnvironment processingEnv) {
     CTX.set(new Ctx(processingEnv));
   }
 
-  static boolean useEnhancedSwitch() {
-    return jdkVersion() >= 14;
-  }
-
   static int jdkVersion() {
     return CTX.get().jdkVersion;
   }
 
   static boolean isAssignable2Interface(String type, String superType) {
     return type.equals(superType)
         || Optional.ofNullable(element(type)).stream()
-        .flatMap(ProcessingContext::superTypes)
-        .anyMatch(superType::equals);
+            .flatMap(ProcessingContext::superTypes)
+            .anyMatch(superType::equals);
   }
 
   public static Stream<String> superTypes(Element element) {
@@ -107,6 +113,10 @@ static ProcessingEnvironment env() {
     return CTX.get().env;
   }
 
+  static String diAnnotation() {
+    return CTX.get().diAnnotation;
+  }
+
   static void clear() {
     CTX.remove();
   }

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

@@ -1,6 +1,7 @@
 package io.avaje.validation.generator;
 
 import static io.avaje.validation.generator.ProcessingContext.createWriter;
+import static io.avaje.validation.generator.ProcessingContext.diAnnotation;
 
 import java.io.IOException;
 import java.io.Writer;
@@ -14,7 +15,6 @@ final class SimpleParamBeanWriter {
   private final String adapterPackage;
   private final String adapterFullName;
   private Append writer;
-  private static boolean writeAspect = true;
 
   SimpleParamBeanWriter(ValidMethodReader beanReader) {
     this.beanReader = beanReader;
@@ -53,23 +53,23 @@ void write() throws IOException {
   }
 
   private void writeImports() {
-    beanReader.writeImports(writer, writeAspect);
+    beanReader.writeImports(writer);
   }
 
   private void writePackage() {
     writer.append("package %s;", adapterPackage).eol().eol();
   }
 
   private void writeClassStart() {
-    writer.append("@Generated").eol();
-    writer.append("@Component").eol();
-    if (writeAspect) {
-      writer.append("@Component.Import(AOPMethodValidator.class)").eol();
-      writeAspect = false;
-    }
-
-    writer.append("public final class %s implements MethodAdapterProvider", adapterShortName);
-    writer.append("{").eol().eol();
+    writer
+        .append(
+            """
+    		@Generated
+    		@%s
+    		public final class %s implements MethodAdapterProvider {
+    		""",
+            Util.shortName(diAnnotation()), adapterShortName)
+        .eol();
   }
 
   private void writeMethods() {

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

@@ -1,6 +1,7 @@
 package io.avaje.validation.generator;
 
 import static java.util.stream.Collectors.joining;
+import static io.avaje.validation.generator.ProcessingContext.diAnnotation;
 
 import java.util.List;
 import java.util.Set;
@@ -24,7 +25,7 @@ final class ValidMethodReader {
     this.params = element.getParameters();
     importTypes.add(type);
     importTypes.add("java.util.List");
-    importTypes.add(Constants.COMPONENT);
+    importTypes.add(diAnnotation());
     importTypes.add("java.util.Set");
     importTypes.add("java.util.Map");
     importTypes.add("io.avaje.validation.inject.aspect.MethodAdapterProvider");
@@ -44,16 +45,12 @@ private Set<String> importTypes() {
     if (Util.validImportType(type)) {
       importTypes.add(type);
     }
-
     paramAnnotations.forEach(a -> a.addImports(importTypes));
     returnElementAnnotation.addImports(importTypes);
     return importTypes;
   }
 
-  public void writeImports(Append writer, boolean writeAspect) {
-    if (writeAspect) {
-      importTypes.add("io.avaje.validation.inject.aspect.AOPMethodValidator");
-    }
+  public void writeImports(Append writer) {
     for (final String importType : importTypes()) {
       if (Util.validImportType(importType)) {
         writer.append("import %s;", importType).eol();

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);
@@ -252,15 +252,14 @@ private void writeAdapter(TypeElement typeElement, BeanReader beanReader) {
   }
 
   private void writeParamProviderForMethod(Set<ExecutableElement> elements) {
-    if (element(ComponentPrism.PRISM_TYPE) == null) {
-      throw new IllegalStateException("ValidateMethod can only be used with Avaje Inject Beans");
-    }
+
     for (final ExecutableElement executableElement : elements) {
 
       if (executableElement.getEnclosingElement().getAnnotationMirrors().stream()
           .map(m -> m.getAnnotationType().toString())
           .noneMatch(s -> s.contains("Singleton") || s.contains("Component"))) {
-        throw new IllegalStateException("ValidateMethod can only be used with Avaje Inject Beans");
+        throw new IllegalStateException(
+            "The ValidMethod Annotation can only be used with JSR-330 Injectable Classes");
       }
       writeParamProvider(executableElement);
     }

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>