working

Author: SentryMan

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

@@ -8,7 +8,6 @@
 
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
-import javax.lang.model.element.TypeElement;
 import javax.lang.model.element.VariableElement;
 
 // TODO: better name???
@@ -20,7 +19,7 @@ public record ElementAnnotationContainer(
     Map<GenericType, String> typeUse2) {
 
   static ElementAnnotationContainer create(Element element) {
-    final var hasValid = !(element instanceof TypeElement) && ValidPrism.isPresent(element);
+    final var hasValid = ValidPrism.isPresent(element);
     String rawType;
     Map<GenericType, String> typeUse1;
     Map<GenericType, String> typeUse2;
@@ -50,7 +49,7 @@ static ElementAnnotationContainer create(Element element) {
 
     final var annotations =
         element.getAnnotationMirrors().stream()
-            .filter(m -> !hasValid && !ValidPrism.isInstance(m))
+            .filter(m -> !ValidPrism.isInstance(m))
             .collect(
                 toMap(
                     a -> GenericType.parse(a.getAnnotationType().toString()),

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

@@ -26,6 +26,10 @@ final class FieldReader {
   private final boolean classLevel;
 
   FieldReader(Element element, List<String> genericTypeParams) {
+    this(element, genericTypeParams, false);
+  }
+
+  FieldReader(Element element, List<String> genericTypeParams, boolean classLevel) {
     this.genericTypeParams = genericTypeParams;
     this.fieldName = element.getSimpleName().toString();
     this.publicField = element.getModifiers().contains(Modifier.PUBLIC);
@@ -36,7 +40,7 @@ final class FieldReader {
     adapterShortType = initAdapterShortType(shortType);
     adapterFieldName = initShortName();
     this.optionalValidation = Util.isNullable(element);
-    this.classLevel = element instanceof TypeElement;
+    this.classLevel = classLevel;
   }
 
   private String initAdapterShortType(String shortType) {
@@ -137,7 +141,13 @@ private void writeGetValue(Append writer, String suffix) {
 
   void writeValidate(Append writer) {
     if (classLevel) {
-      writer.append("    %s.validate(value, request, field);", adapterFieldName);
+      writer.append(
+          """
+    		    if (!request.hasViolations()) {
+    		      %s.validate(value, request, field);
+    		    }
+    		""",
+          adapterFieldName);
       writer.eol().eol();
       return;
     }
@@ -168,8 +178,12 @@ public void writeConstructor(Append writer) {
     writer.append("    this.%s = ", adapterFieldName).eol();
 
     new AdapterHelper(
-        writer, elementAnnotations, "        ", PrimitiveUtil.wrap(genericType.shortType()), genericType)
-      .write();
+            writer,
+            elementAnnotations,
+            "        ",
+            PrimitiveUtil.wrap(genericType.shortType()),
+            genericType)
+        .write();
     writer.append(";").eol().eol();
   }
 

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

@@ -58,7 +58,7 @@ void read(TypeElement type) {
       }
     }
 
-    final var classAdapter = new FieldReader(type, genericTypeParams);
+    final var classAdapter = new FieldReader(type, genericTypeParams, true);
     if (classAdapter.hasAnnotations()) {
       localFields.add(classAdapter);
     }

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

@@ -260,7 +260,9 @@ static String initLower(String name) {
   /** Return the base type given the ValidationAdapter type. */
   static String baseTypeOfAdapter(String adapterFullName) {
     final var element = element(adapterFullName);
-
+    if (element == null) {
+      throw new NullPointerException("Element not found for [" + adapterFullName + "]");
+    }
     return Optional.of(element.getSuperclass())
         .filter(t -> t.toString().contains("io.avaje.validation.adapter.AbstractConstraintAdapter"))
         .or(validationAdapter(element))

validator/src/main/java/io/avaje/validation/adapter/AbstractContainerAdapter.java

@@ -6,9 +6,7 @@
  */
 public abstract class AbstractContainerAdapter<T> implements ValidationAdapter<T> {
 
-	/**
-	 * Adapter placed on the container type
-	 */
+  /** Adapter placed on the container type */
   protected final ValidationAdapter<T> initalAdapter;
 
   protected ValidationAdapter<Object> multiAdapter;

validator/src/main/java/io/avaje/validation/adapter/ValidationRequest.java

@@ -26,4 +26,7 @@ public interface ValidationRequest {
 
   /** Throw ConstraintViolationException if there are violations in this request. */
   void throwWithViolations() throws ConstraintViolationException;
+
+  /** return true if there are violations in this request. */
+  boolean hasViolations();
 }

validator/src/main/java/io/avaje/validation/core/DRequest.java

@@ -36,7 +36,7 @@ private String currentPath() {
     final StringBuilder sb = new StringBuilder(70);
     final var descendingIterator = pathStack.descendingIterator();
     while (descendingIterator.hasNext()) {
-      String next = descendingIterator.next();
+      final String next = descendingIterator.next();
       if (next.charAt(0) == '[') {
         sb.append(next).append(']');
       } else {
@@ -79,4 +79,14 @@ public void throwWithViolations() {
   public List<Class<?>> groups() {
     return groups;
   }
+
+  @Override
+  public String toString() {
+    return violations.toString();
+  }
+
+  @Override
+  public boolean hasViolations() {
+    return !violations.isEmpty();
+  }
 }