Merge pull request #8 from SentryMan/hmm

refactor init and use size adapter

Author: rbygrave

validator/src/main/java/io/avaje/validation/adapter/AnnotationValidationAdapter.java renamed to validator/src/main/java/io/avaje/validation/AnnotationValidationAdapter.java

@@ -1,17 +1,16 @@
-package io.avaje.validation.adapter;
+package io.avaje.validation;
 
 import java.lang.reflect.Type;
 import java.util.Map;
-import java.util.Objects;
 
-import io.avaje.validation.Validator;
+import io.avaje.validation.adapter.ValidationAdapter;
 import io.avaje.validation.core.MessageInterpolator;
 
 public interface AnnotationValidationAdapter<T> extends ValidationAdapter<T> {
 
   //void validate(T type, ValidationRequest req);
 
-  default AnnotationValidationAdapter<T> init(Map<String, String> annotationValueMap) {
+  default AnnotationValidationAdapter<T> init(Map<String, Object> annotationValueMap) {
     return this;
   }
 

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

@@ -29,4 +29,10 @@ public String propertyName() {
   public String message() {
     return message;
   }
+
+  @Override
+  public String toString() {
+
+    return message;
+  }
 }

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

@@ -1,17 +1,17 @@
 package io.avaje.validation;
 
-import io.avaje.validation.adapter.AnnotationValidationAdapter;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.ServiceLoader;
+
 import io.avaje.validation.adapter.CoreValidation;
 import io.avaje.validation.adapter.ValidationAdapter;
 import io.avaje.validation.adapter.ValidatorComponent;
 import io.avaje.validation.core.DefaultBootstrap;
 import io.avaje.validation.spi.Bootstrap;
 
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-import java.util.Iterator;
-import java.util.ServiceLoader;
-
 public interface Validator {
 
   void validate(Object any) throws ConstraintViolationException;
@@ -29,7 +29,7 @@ static Builder builder() {
 
   <T> ValidationAdapter<T> adapter(Type type);
 
-  <T> AnnotationValidationAdapter<T> annotationAdapter(Class<? extends Annotation> cls);
+  <T> AnnotationValidationAdapter<T> annotationAdapter(Class<? extends Annotation> cls, Map<String, Object> annotationAttributes);
 
   CoreValidation core();
 

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

@@ -1,11 +1,7 @@
 package io.avaje.validation.adapter;
 
-import java.util.Collection;
-
 public interface CoreValidation {
 
     /** Return true to continue validation on this value if needed */
     boolean required(Object value, ValidationRequest ctx, String propertyName);
-
-    boolean collection(ValidationRequest ctx, String propertyName, Collection<?> collection, int minSize, int maxSize);
 }

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

@@ -15,6 +15,7 @@
  */
 package io.avaje.validation.adapter;
 
+import io.avaje.validation.AnnotationValidationAdapter;
 import io.avaje.validation.Validator;
 
 import java.lang.reflect.Type;
@@ -44,6 +45,20 @@ default boolean validateAll(Collection<T> value, ValidationRequest req, String p
     return true;
   }
 
+  default boolean validateAll(T[] value, ValidationRequest req, String propertName) {
+    if (propertName != null) {
+      req.pushPath(propertName);
+    }
+    int index = -1;
+    for (T element : value) {
+      validate(element, req, String.valueOf(++index));
+    }
+    if (propertName != null) {
+      req.popPath();
+    }
+    return true;
+  }
+
   default AnnotationValidationAdapter<T> andThen(ValidationAdapter<? super T> after) {
     Objects.requireNonNull(after);
     return (value, req, propertyName) -> {

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

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

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

@@ -3,8 +3,6 @@
 import io.avaje.validation.adapter.CoreValidation;
 import io.avaje.validation.adapter.ValidationRequest;
 
-import java.util.Collection;
-
 final class DCoreValidation implements CoreValidation {
 
     @Override
@@ -15,23 +13,4 @@ public boolean required(Object value, ValidationRequest ctx, String propertyName
         }
         return true;
     }
-
-    @Override
-    public boolean collection(ValidationRequest ctx, String propertyName, Collection<?> collection, int minSize, int maxSize) {
-        if (collection == null) {
-            if (minSize != -1) {
-                ctx.addViolation("CollectionNull", propertyName);
-            }
-            return false;
-        }
-        final int size = collection.size();
-        if (size < minSize) {
-            ctx.addViolation("CollectionMinSize", propertyName);
-        }
-        if (maxSize > 0 && size > maxSize) {
-            ctx.addViolation("CollectionMaxSize", propertyName);
-        }
-        // also validate the collection elements
-        return size > 0;
-    }
 }

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

@@ -8,18 +8,17 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.ServiceLoader;
 import java.util.concurrent.ConcurrentHashMap;
 
-import io.avaje.validation.adapter.AnnotationValidationAdapter;
-import io.avaje.validation.adapter.AnnotationValidationAdapter.Factory;
-import io.avaje.validation.adapter.CoreValidation;
-import io.avaje.validation.adapter.ValidationAdapter;
+import io.avaje.validation.AnnotationValidationAdapter;
+import io.avaje.validation.AnnotationValidationAdapter.Factory;
 import io.avaje.validation.ValidationType;
 import io.avaje.validation.Validator;
+import io.avaje.validation.adapter.CoreValidation;
+import io.avaje.validation.adapter.ValidationAdapter;
 import io.avaje.validation.adapter.ValidatorComponent;
 
 /** Default implementation of Validator. */
@@ -77,9 +76,9 @@ public <T> ValidationAdapter<T> adapter(Class<T> cls) {
 
   @Override
   public <T> AnnotationValidationAdapter<T> annotationAdapter(
-      Class<? extends Annotation> cls) {
+      Class<? extends Annotation> cls, Map<String, Object> annotationAttributes) {
 
-    return builder.annotationAdapter(cls);
+    return builder.<T>annotationAdapter(cls).init(annotationAttributes);
   }
 
   @Override

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

@@ -4,6 +4,7 @@
 
 /** Default bootstrap of Validator. */
 public final class DefaultBootstrap {
+  private DefaultBootstrap() {}
 
   /** Create the Validator.Builder. */
   public static Validator.Builder builder() {