Merge pull request #156 from SentryMan/contraint-only

Only Recognize Constraint Annotations

Author: rbygrave

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

@@ -2,7 +2,6 @@
 
 import static io.avaje.validation.generator.APContext.typeElement;
 import static io.avaje.validation.generator.PrimitiveUtil.isPrimitiveValidationAnnotations;
-import static java.util.function.Predicate.not;
 import static java.util.stream.Collectors.toMap;
 
 import java.util.HashMap;
@@ -25,7 +24,7 @@ public record ElementAnnotationContainer(
     Map<UType, String> typeUse2,
     Map<UType, String> crossParam) {
 
-  static ElementAnnotationContainer create(Element element, boolean classLevel) {
+  static ElementAnnotationContainer create(Element element) {
     final var hasValid = ValidPrism.isPresent(element);
 
     Map<UType, String> typeUse1;
@@ -35,23 +34,14 @@ static ElementAnnotationContainer create(Element element, boolean classLevel) {
     if (element instanceof final ExecutableElement executableElement) {
       uType = UType.parse(executableElement.getReturnType());
 
-      Optional.ofNullable(uType.param0()).map(UType::annotations).stream()
-          .flatMap(List::stream)
-          .filter(m -> !ValidPrism.isInstance(m))
-          .filter(m -> !classLevel || hasMetaConstraintAnnotation(m))
-          .collect(
-              toMap(
-                  a -> UType.parse(a.getAnnotationType()),
-                  a -> AnnotationUtil.annotationAttributeMap(a, element)));
-
     } else {
       uType = UType.parse(element.asType());
     }
 
     typeUse1 =
         Optional.ofNullable(uType.param0()).map(UType::annotations).stream()
             .flatMap(List::stream)
-            .filter(m -> !classLevel || hasMetaConstraintAnnotation(m))
+            .filter(ElementAnnotationContainer::hasMetaConstraintAnnotation)
             .collect(
                 toMap(
                     a -> UType.parse(a.getAnnotationType()),
@@ -60,7 +50,7 @@ static ElementAnnotationContainer create(Element element, boolean classLevel) {
     typeUse2 =
         Optional.ofNullable(uType.param1()).map(UType::annotations).stream()
             .flatMap(List::stream)
-            .filter(m -> !classLevel || hasMetaConstraintAnnotation(m))
+            .filter(ElementAnnotationContainer::hasMetaConstraintAnnotation)
             .collect(
                 toMap(
                     a -> UType.parse(a.getAnnotationType()),
@@ -69,7 +59,7 @@ static ElementAnnotationContainer create(Element element, boolean classLevel) {
     final var annotations =
         element.getAnnotationMirrors().stream()
             .filter(m -> !ValidPrism.isInstance(m))
-            .filter(m -> !classLevel || hasMetaConstraintAnnotation(m))
+            .filter(ElementAnnotationContainer::hasMetaConstraintAnnotation)
             .map(
                 a -> {
                   if (CrossParamConstraintPrism.isPresent(a.getAnnotationType().asElement())) {
@@ -91,7 +81,8 @@ static ElementAnnotationContainer create(Element element, boolean classLevel) {
   }
 
   static boolean hasMetaConstraintAnnotation(AnnotationMirror m) {
-    return hasMetaConstraintAnnotation(m.getAnnotationType().asElement());
+    return hasMetaConstraintAnnotation(m.getAnnotationType().asElement())
+        || ValidPrism.isInstance(m);
   }
 
   static boolean hasMetaConstraintAnnotation(Element element) {
@@ -106,13 +97,15 @@ static ElementAnnotationContainer create(VariableElement varElement) {
     final var annotations =
         uType.annotations().stream()
             .filter(m -> !ValidPrism.isInstance(m))
+            .filter(ElementAnnotationContainer::hasMetaConstraintAnnotation)
             .collect(
                 toMap(
                     a -> UType.parse(a.getAnnotationType()),
                     a -> AnnotationUtil.annotationAttributeMap(a, varElement)));
     var typeUse1 =
         Optional.ofNullable(uType.param0()).map(UType::annotations).stream()
             .flatMap(List::stream)
+            .filter(ElementAnnotationContainer::hasMetaConstraintAnnotation)
             .collect(
                 toMap(
                     a -> UType.parse(a.getAnnotationType()),
@@ -121,6 +114,7 @@ static ElementAnnotationContainer create(VariableElement varElement) {
     var typeUse2 =
         Optional.ofNullable(uType.param1()).map(UType::annotations).stream()
             .flatMap(List::stream)
+            .filter(ElementAnnotationContainer::hasMetaConstraintAnnotation)
             .collect(
                 toMap(
                     a -> UType.parse(a.getAnnotationType()),

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

@@ -35,7 +35,7 @@ final class FieldReader {
     this.fieldName = element.getSimpleName().toString();
     this.publicField = element.getModifiers().contains(Modifier.PUBLIC);
     this.element = element;
-    this.elementAnnotations = ElementAnnotationContainer.create(element, classLevel);
+    this.elementAnnotations = ElementAnnotationContainer.create(element);
     this.genericType = elementAnnotations.genericType();
     final String shortType = genericType.shortWithoutAnnotations();
     usePrimitiveValidation = isPrimitiveValidationType(shortType) && elementAnnotations.supportsPrimitiveValidation();

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

@@ -34,7 +34,7 @@ final class ValidMethodReader {
     importTypes.add("io.avaje.validation.spi.Generated");
     importTypes.add("java.lang.reflect.Method");
     paramAnnotations = params.stream().map(ElementAnnotationContainer::create).toList();
-    returnElementAnnotation = ElementAnnotationContainer.create(element, false);
+    returnElementAnnotation = ElementAnnotationContainer.create(element);
   }
 
   public String shortName() {

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

@@ -44,6 +44,7 @@ public final class ValidationProcessor extends AbstractProcessor {
   private final List<BeanReader> allReaders = new ArrayList<>();
   private final Set<String> sourceTypes = new HashSet<>();
   private final Set<String> mixInImports = new HashSet<>();
+  private final Set<String> alreadyGenerated = new HashSet<>();
   private SimpleComponentWriter componentWriter;
   private boolean readModuleInfo;
   private boolean processedAnything;
@@ -249,7 +250,7 @@ private void writeConstraintAdapters(Set<? extends Element> beans) {
   }
 
   private void writeAdapterForType(TypeElement typeElement) {
-    if (isController(typeElement)) {
+    if (isController(typeElement) || !alreadyGenerated.add(typeElement.getQualifiedName().toString())) {
       // @Valid on controller just indicating the controller request
       // payloads should be validated - ignore this one
       return;