Merge pull request #3 from SentryMan/andThen

slightly refactor annotation validator

Author: rob-bygrave

validator/src/main/java/io/avaje/validation/AnnotationValidationAdapter.java

@@ -0,0 +1,36 @@
+package io.avaje.validation;
+
+import java.lang.reflect.Type;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+
+import io.avaje.validation.core.MessageInterpolator;
+
+public interface AnnotationValidationAdapter<T> {
+
+  void validate(T type, Set<ConstraintViolation> violations);
+
+  default AnnotationValidationAdapter<T> init(Map<String, String> annotationValueMap) {
+    return this;
+  }
+
+  default AnnotationValidationAdapter<T> andThen(AnnotationValidationAdapter<? super T> after) {
+    Objects.requireNonNull(after);
+    return (t, v) -> {
+      validate(t, v);
+      after.validate(t, v);
+    };
+  }
+  /** Factory for creating a ValidationAdapter. */
+  public interface Factory {
+
+    /**
+     * Create and return a ValidationAdapter given the type and annotations or return null.
+     *
+     * <p>Returning null means that the adapter could be created by another factory.
+     */
+    AnnotationValidationAdapter<?> create(
+        Type annotationType, Validator context, MessageInterpolator interpolator);
+  }
+}

validator/src/main/java/io/avaje/validation/ValidationAdapter.java

@@ -20,7 +20,6 @@
 
 public interface ValidationAdapter<T> {
 
-  /** */
   void validate(T value, Set<ConstraintViolation> violations);
 
   /** Factory for creating a ValidationAdapter. */

validator/src/main/java/io/avaje/validation/Validator.java

@@ -7,7 +7,6 @@
 import java.util.ServiceLoader;
 import java.util.Set;
 
-import io.avaje.validation.core.AnnotationValidationAdapter;
 import io.avaje.validation.core.DefaultBootstrap;
 import io.avaje.validation.spi.Bootstrap;
 

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

@@ -22,6 +22,7 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import io.avaje.validation.AnnotationValidationAdapter;
 import io.avaje.validation.ValidationAdapter;
 
 /** Builds and caches the ValidationAdapter adapters for DValidator. */

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

@@ -16,12 +16,13 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
+import io.avaje.validation.AnnotationValidationAdapter;
+import io.avaje.validation.AnnotationValidationAdapter.Factory;
+import io.avaje.validation.ConstraintViolation;
 import io.avaje.validation.ValidationAdapter;
 import io.avaje.validation.ValidationType;
 import io.avaje.validation.Validator;
 import io.avaje.validation.ValidatorComponent;
-import io.avaje.validation.core.AnnotationValidationAdapter.Factory;
-import io.avaje.validation.ConstraintViolation;
 
 /** Default implementation of Validator. */
 final class DValidator implements Validator {
@@ -83,11 +84,9 @@ public <T> ValidationAdapter<T> adapter(Class<T> cls) {
   }
 
   @Override
-  public <T> AnnotationValidationAdapter<T> annotationAdapter(Class<? extends Annotation> cls) {
-    final AnnotationValidationAdapter<T> result = builder.annotationAdapter(cls);
-    if (result != null) {
-      return result;
-    }
+  public <T> AnnotationValidationAdapter<T> annotationAdapter(
+      Class<? extends Annotation> cls) {
+
     return builder.annotationAdapter(cls);
   }
 

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

@@ -15,19 +15,88 @@
  */
 package io.avaje.validation.core;
 
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.time.temporal.TemporalAccessor;
 import java.util.Map;
+import java.util.Set;
 
+import io.avaje.validation.AnnotationValidationAdapter;
 import io.avaje.validation.ConstraintViolation;
 import jakarta.validation.constraints.AssertTrue;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Past;
+
 final class JakartaTypeAdapters {
 
   @SuppressWarnings({"unchecked", "rawtypes"})
   static final AnnotationValidationAdapter.Factory FACTORY =
-      (type, jsonb, interpolator) -> {
-        if (type == AssertTrue.class) return new AssertTrueAdapter(interpolator);
+      (annotationType, validator, interpolator) -> {
+        if (annotationType == AssertTrue.class) return new AssertTrueAdapter(interpolator);
+        if (annotationType == NotBlank.class) return new NotBlankAdapter(interpolator);
+        if (annotationType == Past.class) return new PastAdapter(interpolator);
         return null;
       };
 
+  private static final class PastAdapter implements AnnotationValidationAdapter<TemporalAccessor> {
+
+    private String message;
+    private final MessageInterpolator interpolator;
+
+    public PastAdapter(MessageInterpolator interpolator) {
+      this.interpolator = interpolator;
+    }
+
+    @Override
+    public AnnotationValidationAdapter<TemporalAccessor> init(
+        Map<String, String> annotationValueMap) {
+      message = interpolator.interpolate(annotationValueMap.get("message"));
+      return this;
+    }
+
+    @Override
+    public void validate(TemporalAccessor temporalAccessor, Set<ConstraintViolation> violations) {
+
+      if (temporalAccessor == null) {
+        violations.add(new ConstraintViolation(message));
+        return;
+      }
+      if (temporalAccessor instanceof LocalDate) {
+        if (LocalDate.from(temporalAccessor).isAfter(LocalDate.now())) {
+          violations.add(new ConstraintViolation(message));
+        }
+      } else if (temporalAccessor instanceof LocalTime) {
+        final LocalTime localTime = (LocalTime) temporalAccessor;
+        // handle LocalTime
+
+        // TODO do the rest of them
+      }
+    }
+  }
+
+  private static final class NotBlankAdapter implements AnnotationValidationAdapter<String> {
+
+    private String message;
+    private final MessageInterpolator interpolator;
+
+    public NotBlankAdapter(MessageInterpolator interpolator) {
+      this.interpolator = interpolator;
+    }
+
+    @Override
+    public AnnotationValidationAdapter<String> init(Map<String, String> annotationValueMap) {
+      message = interpolator.interpolate(annotationValueMap.get("message"));
+      return this;
+    }
+
+    @Override
+    public void validate(String str, Set<ConstraintViolation> violations) {
+      if (str == null || str.isBlank()) {
+        violations.add(new ConstraintViolation(message));
+      }
+    }
+  }
+
   private static final class AssertTrueAdapter implements AnnotationValidationAdapter<Boolean> {
 
     private String message;
@@ -37,17 +106,17 @@ public AssertTrueAdapter(MessageInterpolator interpolator) {
       this.interpolator = interpolator;
     }
 
-  @Override
+    @Override
     public AnnotationValidationAdapter<Boolean> init(Map<String, String> annotationValueMap) {
       message = interpolator.interpolate(annotationValueMap.get("message"));
       return this;
     }
 
     @Override
-    public ConstraintViolation validate(Boolean type) {
-      if (type) return null;
-
-      return new ConstraintViolation(message);
+    public void validate(Boolean type, Set<ConstraintViolation> violations) {
+      if (Boolean.FALSE.equals(type)) {
+        violations.add(new ConstraintViolation(message));
+      }
     }
   }
 }

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

@@ -1,19 +1,14 @@
 package io.avaje.validation.core;
 
-import java.util.Map;
+import java.util.Set;
 
+import io.avaje.validation.AnnotationValidationAdapter;
 import io.avaje.validation.ConstraintViolation;
-//TODO Create an avaje config interpolator
-public class NoopAnnotationValidator<T> implements AnnotationValidationAdapter<T> {
-
-  @Override
-  public AnnotationValidationAdapter<T> init(Map<String, String> annotationValueMap) {
 
-    return this;
-  }
+public class NoopAnnotationValidator<T> implements AnnotationValidationAdapter<T> {
 
   @Override
-  public ConstraintViolation validate(Object type) {
-    return null;
+  public void validate(T type, Set<ConstraintViolation> violations) {
+    // NOOP
   }
 }

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

@@ -3,23 +3,40 @@
 import java.util.Map;
 import java.util.Set;
 
+import io.avaje.validation.AnnotationValidationAdapter;
+import io.avaje.validation.ConstraintViolation;
 import io.avaje.validation.ValidationAdapter;
 import io.avaje.validation.Validator;
-import io.avaje.validation.ConstraintViolation;
 import jakarta.validation.constraints.AssertTrue;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Past;
 
 public final class AuthProvider$PojoAdapter implements ValidationAdapter<Pojo> {
 
   private final AnnotationValidationAdapter<Boolean> booleanAdapter;
+  private final AnnotationValidationAdapter<String> strAdapter;
+  private final AnnotationValidationAdapter<Object> dateAdapter;
 
   public AuthProvider$PojoAdapter(Validator jsonb) {
     this.booleanAdapter =
         jsonb.<Boolean>annotationAdapter(AssertTrue.class).init(Map.of("message", "not true"));
+
+    this.strAdapter =
+        jsonb
+            .<String>annotationAdapter(NotNull.class)
+            .init(Map.of("message", "null"))
+            .andThen(
+                jsonb.<String>annotationAdapter(NotBlank.class).init(Map.of("message", "empty")));
+
+    this.dateAdapter =
+        jsonb.annotationAdapter(Past.class).init(Map.of("message", "not in the past"));
   }
 
   @Override
   public void validate(Pojo value, Set<ConstraintViolation> violations) {
-
-    violations.add(booleanAdapter.validate(value.bool));
+    booleanAdapter.validate(value.bool, violations);
+    strAdapter.validate(value.str, violations);
+    dateAdapter.validate(value.date, violations);
   }
 }

validator/src/test/java/io/avaje/validation/core/AuthProvider$PojoAdapter.java

@@ -1,5 +1,15 @@
 package io.avaje.validation.core;
 
+import java.time.LocalDate;
+
 public class Pojo {
   boolean bool = false;
+  String str = "";
+  LocalDate date;
+
+  public Pojo(boolean bool, String str, LocalDate date) {
+    this.bool = bool;
+    this.str = str;
+    this.date = date;
+  }
 }

validator/src/test/java/io/avaje/validation/core/Pojo.java

@@ -2,29 +2,42 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.time.LocalDate;
+
 import org.junit.jupiter.api.Test;
 
 import io.avaje.validation.Validator;
 
 class ValidatorTest {
 
+  private final Validator validator =
+      Validator.builder().add(Pojo.class, AuthProvider$PojoAdapter::new).build();
+
   @Test
-  void testSuccess() {
+  void testAllFail() {
 
-    final var result =
-        Validator.builder()
-            .add(Pojo.class, AuthProvider$PojoAdapter::new)
-            .build()
-            .validate(new Pojo());
-    assertThat(result).isNotEmpty();
+    final var result = validator.validate(new Pojo(false, null, LocalDate.now().plusDays(3)));
+    assertThat(result).hasSize(3);
   }
 
   @Test
-  void testFail() {
-    final var pojo = new Pojo();
-    pojo.bool = true;
+  void testStrDate() {
+
+    final var result = validator.validate(new Pojo(true, "  ", LocalDate.now().plusDays(3)));
+    assertThat(result).hasSize(2);
+  }
+
+  @Test
+  void testStrOnly() {
+
+    final var result = validator.validate(new Pojo(true, "  ", LocalDate.now().minusDays(3)));
+    assertThat(result).hasSize(1);
+  }
+
+  @Test
+  void testSuccess() {
     final var result =
-        Validator.builder().add(Pojo.class, AuthProvider$PojoAdapter::new).build().validate(pojo);
+        validator.validate(new Pojo(true, " success ", LocalDate.now().minusDays(3)));
 
     assertThat(result).isEmpty();
   }