✨ 添加集合类型校验

Author: ccoderJava

summer-validator/src/main/java/com/dianpoint/summer/validator/validator/collection/CollectionValidator.java

@@ -41,4 +41,37 @@ public interface CollectionValidator<E, C extends Collection<E>> extends Validat
      */
     CollectionValidator<E, C> elementValidator(Validator<E> validator);
 
+    //为集合类型增加addRule 避免使用时访问的是接口validator
+
+
+    /**
+     * 为集合添加校验规则
+     *
+     * @param rule 校验规则
+     * @return 当前校验器实例 支持链式调用
+     */
+    @Override
+    CollectionValidator<E, C> addRule(ValidationRule<C> rule);
+
+    /**
+     * 为集合添加基于predicate的校验规则
+     *
+     * @param condition    集合
+     * @param errorMessage 校验失败时的错误信息
+     * @return 当前校验器实例，支持链式调用
+     */
+    @Override
+    CollectionValidator<E, C> addRule(Predicate<C> condition, String errorMessage);
+
+
+    /**
+     * 为集合添加基于predicate的校验规则
+     *
+     * @param condition    集合
+     * @param errorMessage 校验失败时的错误信息
+     * @param fieldName    字段名
+     * @return 当前校验器失败，支持链式调用
+     */
+    @Override
+    CollectionValidator<E, C> addRule(Predicate<C> condition, String errorMessage, String fieldName);
 }

summer-validator/src/main/java/com/dianpoint/summer/validator/validator/collection/DefaultCollectionValidator.java

@@ -27,6 +27,24 @@ public DefaultCollectionValidator(Class<C> collectionType, Class<E> elementType)
     }
 
 
+    @Override
+    public CollectionValidator<E, C> addRule(ValidationRule<C> rule) {
+        super.addRule(rule);
+        return this;
+    }
+
+    @Override
+    public CollectionValidator<E, C> addRule(Predicate<C> condition, String errorMessage) {
+        super.addRule(condition, errorMessage);
+        return this;
+    }
+
+    @Override
+    public CollectionValidator<E, C> addRule(Predicate<C> condition, String errorMessage, String fieldName) {
+        super.addRule(condition, errorMessage, fieldName);
+        return this;
+    }
+
     @Override
     public CollectionValidator<E, C> elementRule(ValidationRule<E> rule) {
         if (elementValidator == null) {
@@ -65,7 +83,7 @@ public List<ValidationResult> validate(C collection) {
             for (ValidationResult elementResult : elementResults) {
                 if (elementResult.isFailure()) {
                     results.add(ValidationResult.failure(String.format("元素[%s]:%s collection[%s]", index
-                            , elementResult.getErrorMessage(), index)));
+                            , elementResult.getErrorMessage(), index), "collection"));
                 }
             }
             index++;

summer-validator/src/test/java/com/dianpoint/summer/validator/test/ValidatorDemo.java

@@ -5,9 +5,12 @@
 import com.dianpoint.summer.validator.ValidationRules;
 import com.dianpoint.summer.validator.Validators;
 import com.dianpoint.summer.validator.test.cases.User;
+import com.dianpoint.summer.validator.validator.Validator;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
+import java.util.function.Predicate;
 
 /**
  * @author: congccoder
@@ -25,7 +28,11 @@ public static void main(String[] args) {
 
 //        validateObject();
 
-        validateCollectionString();
+//        validateCollectionString();
+
+//        validateCollectionObjects();
+
+        validateAnnotation();
     }
 
     static void validateEmail(String email) {
@@ -60,20 +67,58 @@ static void validateObject() {
     static void validateCollectionString() {
         List<String> strList = Arrays.asList("张三", "李四", "", null, "王五", "小王");
         List<ValidationResult> validationResults = Validators.collection(List.class, String.class)
-                .elementRule(str -> str != null, "元素不等为null")
-                .elementRule(str -> str.isEmpty(), "元素不能为空字符串")
                 .addRule(ValidationRules.minsize(1))
                 .addRule(ValidationRules.maxSize(10))
                 .addRule(ValidationRules.range(3, 5))
+                .elementRule(notNull(), "元素不等为null")
+                .elementRule(notEmpty(), "元素不能为空字符串")
                 .validate(strList);
 
         printResults(validationResults);
     }
 
+    static void validateCollectionObjects() {
+        List<User> users = Arrays.asList(
+                new User("张三", "123@mail.com"),
+                new User("", "1234@gmail.com"),
+                new User(null, ""),
+                null
+        );
+
+        Validator<User> userValidators = Validators.<User>generic()
+                .addRule(user -> user.getUsername() != null && !user.getUsername().isEmpty(),
+                        "用户名不能为空")
+                .addRule(user -> user.getEmail() != null && user.getEmail().contains("@"), "邮箱格式不正确");
+
+        List<ValidationResult> validationResults = Validators.collection(List.class, User.class).elementValidator(userValidators).validate(users);
+        printResults(validationResults);
+    }
+
+    static void validateAnnotation() {
+        User user = new User(null, "123@mail.com");
+        List<ValidationResult> validationResults = Validators.annotated(User.class).validate(user);
+        printResults(validationResults);
+    }
+
 
     static void printResults(List<ValidationResult> validateResult) {
         for (ValidationResult result : validateResult) {
             System.out.println(result.getFieldName() + "校验结果:" + result.getErrorMessage());
         }
     }
+
+
+    //辅助断言工具
+
+    static Predicate<String> notEmpty() {
+        return str -> !str.isEmpty();
+    }
+
+    static Predicate<String> notNull() {
+        return Objects::nonNull;
+    }
+
+    static Predicate<String> notBlank() {
+        return notEmpty().and(notNull());
+    }
 }