Merge branch 'feature-validator'

ccoderJava · ccoderJava · commit d790ed01074b · 2025-05-24T16:08:00.000+08:00
diff --git a/summer-validator/src/main/java/com/dianpoint/summer/validator/ValidationRules.java b/summer-validator/src/main/java/com/dianpoint/summer/validator/ValidationRules.java
@@ -1,5 +1,7 @@
 package com.dianpoint.summer.validator;
 
+import java.util.*;
+
 /**
  * @author: congccoder
  * @email: congccoder@gmail.com | <a href="https://github.com/ccoderJava">github-homepage</a>
@@ -42,4 +44,45 @@ public static ValidationRule<Integer> max(int value) {
                 ValidationResult.failure("不能大于" + value, "integer");
     }
 
+    //设置collections相关的校验规则
+    public static <C extends Collection<?>> ValidationRule<C> minsize(int min) {
+        return collection -> collection != null && collection.size() >= min ?
+                ValidationResult.success() :
+                ValidationResult.failure("集合大小不能小于" + min, "collection");
+    }
+
+    public static <C extends Collection<?>> ValidationRule<C> maxSize(int max) {
+        return collection -> collection != null && collection.size() <= max ?
+                ValidationResult.success() :
+                ValidationResult.failure("集合大小不能大于" + max, "collection");
+    }
+
+    public static <C extends Collection<?>> ValidationRule<C> range(int min, int max) {
+        return collection -> collection != null && collection.size() >= min && collection.size() <= max ?
+                ValidationResult.success() :
+                ValidationResult.failure(String.format("集合大小必须在[%s,%s]之间", min, max), "collection");
+    }
+
+    public static <E, C extends Collection<E>> ValidationRule<C> uniqueElements() {
+        return collection -> {
+            if (collection == null) {
+                return ValidationResult.success();
+            }
+            Set<E> uniqueSet = new LinkedHashSet<>();
+            List<E> duplicates = new ArrayList<>();
+
+            for (E element : collection) {
+                if (!uniqueSet.add(element)) {
+                    //set中添加失败代表元素element已经存在
+                    duplicates.add(element);
+                }
+            }
+            return duplicates.isEmpty() ?
+                    ValidationResult.success() :
+                    ValidationResult.failure("集合中包含重复元素" + duplicates, "collection");
+
+        };
+    }
+
+
 }
diff --git a/summer-validator/src/main/java/com/dianpoint/summer/validator/Validators.java b/summer-validator/src/main/java/com/dianpoint/summer/validator/Validators.java
@@ -3,7 +3,11 @@
 import com.dianpoint.summer.validator.validator.AnnotationValidatorAdapter;
 import com.dianpoint.summer.validator.validator.GenericValidator;
 import com.dianpoint.summer.validator.validator.Validator;
+import com.dianpoint.summer.validator.validator.collection.CollectionValidator;
+import com.dianpoint.summer.validator.validator.collection.DefaultCollectionValidator;
 
+import java.util.Collection;
+import java.util.List;
 import java.util.Objects;
 import java.util.function.Predicate;
 
@@ -44,5 +48,12 @@ public static <T> Validator<T> annotated(Class<T> targetClass) {
         return AnnotationValidatorAdapter.create(targetClass);
     }
 
+    //针对collection创建校验器
+
+    public static <E, C extends Collection<E>> CollectionValidator<E, C> collection(Class<C> collectionType, Class<E> elementType) {
+        return new DefaultCollectionValidator<>(collectionType, elementType);
+    }
+
+    //重载一下list 和set两种collection的校验器
 
 }
diff --git a/summer-validator/src/main/java/com/dianpoint/summer/validator/annotations/HandlesAnnotation.java b/summer-validator/src/main/java/com/dianpoint/summer/validator/annotations/HandlesAnnotation.java
@@ -0,0 +1,15 @@
+package com.dianpoint.summer.validator.annotations;
+
+import java.lang.annotation.*;
+
+/**
+ * @author: congccoder
+ * @email: congccoder@gmail.com | <a href="https://github.com/ccoderJava">github-homepage</a>
+ * @date: 2025/5/22 21:30
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface HandlesAnnotation {
+
+    Class<? extends Annotation> value();
+}
diff --git a/summer-validator/src/main/java/com/dianpoint/summer/validator/annotations/NotNull.java b/summer-validator/src/main/java/com/dianpoint/summer/validator/annotations/NotNull.java
@@ -11,8 +11,7 @@
  * @date: 2025/5/20 21:10
  */
 
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.FIELD, ElementType.TYPE})
+@HandlesAnnotation(value = NotNull.class)
 public @interface NotNull {
 
     String message() default "不能为空";
diff --git a/summer-validator/src/main/java/com/dianpoint/summer/validator/annotations/Pattern.java b/summer-validator/src/main/java/com/dianpoint/summer/validator/annotations/Pattern.java
@@ -11,8 +11,7 @@
  * @date: 2025/5/20 21:11
  */
 
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.FIELD, ElementType.TYPE})
+@HandlesAnnotation(value = Pattern.class)
 public @interface Pattern {
 
     String regex();
diff --git a/summer-validator/src/main/java/com/dianpoint/summer/validator/processor/AnnotationProcessorRegister.java b/summer-validator/src/main/java/com/dianpoint/summer/validator/processor/AnnotationProcessorRegister.java
@@ -1,13 +1,17 @@
 package com.dianpoint.summer.validator.processor;
 
+import com.dianpoint.summer.validator.annotations.HandlesAnnotation;
 import com.dianpoint.summer.validator.annotations.NotNull;
 import com.dianpoint.summer.validator.annotations.Pattern;
 import com.dianpoint.summer.validator.constraintvalidators.NotNullProcessor;
 import com.dianpoint.summer.validator.constraintvalidators.PatternProcessor;
+import com.dianpoint.summer.validator.utils.ClassScanner;
 
 import java.lang.annotation.Annotation;
+import java.lang.reflect.Modifier;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * @author: congccoder
@@ -19,11 +23,6 @@ public class AnnotationProcessorRegister {
 
     private static final Map<Class<? extends Annotation>, AnnotationProcessor> PROCESSORS = new HashMap<>();
 
-    static {
-        PROCESSORS.put(NotNull.class, new NotNullProcessor());
-        PROCESSORS.put(Pattern.class, new PatternProcessor());
-    }
-
     public static void register(Class<? extends Annotation> annotationType, AnnotationProcessor annotationProcessor) {
         PROCESSORS.put(annotationType, annotationProcessor);
     }
@@ -36,5 +35,26 @@ public static boolean hasProcessor(Class<? extends Annotation> annotationType) {
         return PROCESSORS.containsKey(annotationType);
     }
 
+    public static void scanAndRegisterAnnotationProcessor(String packageName) {
+        try {
+            ClassScanner classScanner = new ClassScanner();
+            Set<Class<?>> classes = classScanner.scan(packageName);
+            for (Class<?> clazz : classes) {
+                if (AnnotationProcessor.class.isAssignableFrom(clazz) &&
+                        !Modifier.isAbstract(clazz.getModifiers())) {
+
+                    HandlesAnnotation annotation = clazz.getAnnotation(HandlesAnnotation.class);
+                    if (annotation != null) {
+                        AnnotationProcessor handler = (AnnotationProcessor) clazz.getDeclaredConstructor().newInstance();
+                        register(annotation.value(), handler);
+                    }
+                }
+            }
+        } catch (Exception e) {
+            throw new RuntimeException("扫描注解处理器失败", e);
+
+        }
+    }
+
 
 }
diff --git a/summer-validator/src/main/java/com/dianpoint/summer/validator/utils/AnnotationProcessingUtils.java b/summer-validator/src/main/java/com/dianpoint/summer/validator/utils/AnnotationProcessingUtils.java
@@ -0,0 +1,84 @@
+package com.dianpoint.summer.validator.utils;
+
+import com.dianpoint.summer.validator.ValidationResult;
+import com.dianpoint.summer.validator.processor.AnnotationProcessor;
+import com.dianpoint.summer.validator.processor.AnnotationProcessorRegister;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author: congccoder
+ * @email: congccoder@gmail.com | <a href="https://github.com/ccoderJava">github-homepage</a>
+ * @date: 2025/5/22 21:18
+ */
+
+public class AnnotationProcessingUtils {
+
+    static {
+        // 初始化时扫描并注册所有处理器
+        AnnotationProcessorRegister.scanAndRegisterAnnotationProcessor("com.dianpoint.summer.validator");
+    }
+
+    // 处理对象上的校验注解
+    public static <T> List<ValidationResult> processAnnotations(T object) {
+        if (object == null) {
+            return java.util.Collections.singletonList(
+                    ValidationResult.failure("校验对象不能为null", "object"));
+        }
+
+        List<ValidationResult> results = new ArrayList<>();
+        Class<?> clazz = object.getClass();
+
+        // 处理类上的所有字段
+        for (Field field : clazz.getDeclaredFields()) {
+            field.setAccessible(true);
+            results.addAll(processAnnotationsOnField(object, field));
+        }
+
+        return results;
+    }
+
+    private static List<ValidationResult> processAnnotationsOnField(Object target, Field field) {
+        List<ValidationResult> results = new ArrayList<>();
+
+        for (Annotation annotation : field.getAnnotations()) {
+            // 处理直接注解
+            results.addAll(processAnnotation(target, field, annotation));
+
+            // 处理组合注解（注解上的注解）
+            results.addAll(processMetaAnnotations(target, field, annotation));
+        }
+
+        return results;
+    }
+
+    private static List<ValidationResult> processAnnotation(Object target, Field field, Annotation annotation) {
+        Class<? extends Annotation> annotationType = annotation.annotationType();
+        AnnotationProcessor handler = AnnotationProcessorRegister.getProcessor(annotationType);
+
+        if (handler != null) {
+            return handler.process(target, field, annotation);
+        }
+
+        return java.util.Collections.emptyList();
+    }
+
+    private static List<ValidationResult> processMetaAnnotations(Object target, Field field, Annotation annotation) {
+        List<ValidationResult> results = new ArrayList<>();
+
+        // 获取注解上的元注解
+        for (Annotation metaAnnotation : annotation.annotationType().getAnnotations()) {
+            if (metaAnnotation.annotationType().getPackage().getName().startsWith("java.lang")) {
+                continue; // 跳过Java内置注解
+            }
+
+            results.addAll(processAnnotation(target, field, metaAnnotation));
+            results.addAll(processMetaAnnotations(target, field, metaAnnotation));
+        }
+
+        return results;
+    }
+}
diff --git a/summer-validator/src/main/java/com/dianpoint/summer/validator/utils/ClassScanner.java b/summer-validator/src/main/java/com/dianpoint/summer/validator/utils/ClassScanner.java
@@ -0,0 +1,42 @@
+package com.dianpoint.summer.validator.utils;
+
+import java.io.File;
+import java.net.URL;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * @author: congccoder
+ * @email: congccoder@gmail.com | <a href="https://github.com/ccoderJava">github-homepage</a>
+ * @date: 2025/5/22 21:21
+ */
+
+public class ClassScanner {
+
+    public Set<Class<?>> scan(String packageName) {
+
+        Set<Class<?>> classes = new HashSet<>();
+        String path = packageName.replace('.', '/');
+        try {
+            ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+            URL resource = classLoader.getResource(path);
+            if (resource == null) {
+                return classes;
+            }
+            File directory = new File(resource.getFile());
+            if (directory.exists()) {
+                for (File file : directory.listFiles()) {
+                    if (file.isDirectory()) {
+                        classes.addAll(scan(packageName + "." + file.getName()));
+                    } else if (file.getName().endsWith(".class")) {
+                        String className = packageName + '.' + file.getName().substring(0, file.getName().length() - 6);
+                        classes.add(Class.forName(className));
+                    }
+                }
+            }
+        } catch (Exception e) {
+            throw new RuntimeException("扫描失败", e);
+        }
+        return classes;
+    }
+}
diff --git a/summer-validator/src/main/java/com/dianpoint/summer/validator/validator/AnnotationValidatorAdapter.java b/summer-validator/src/main/java/com/dianpoint/summer/validator/validator/AnnotationValidatorAdapter.java
@@ -3,6 +3,7 @@
 
 import com.dianpoint.summer.validator.ValidationResult;
 import com.dianpoint.summer.validator.ValidationRule;
+import com.dianpoint.summer.validator.utils.AnnotationProcessingUtils;
 
 import java.util.Collections;
 import java.util.List;
@@ -44,8 +45,17 @@ public Validator<T> addRule(Predicate<T> condition, String errorMessage, String
 
     @Override
     public List<ValidationResult> validate(T target) {
-        //TODO 处理注解类校验
-        return Collections.emptyList();
+        if (target == null) {
+            return java.util.Collections.singletonList(
+                    ValidationResult.failure("校验对象不能为null", "object"));
+        }
+        List<ValidationResult> results = AnnotationProcessingUtils.processAnnotations(target);
+
+        if (skipOnFirstFailure && !results.isEmpty()) {
+            return java.util.Collections.singletonList(results.get(0));
+        }
+
+        return results;
     }
 
     @Override
diff --git a/summer-validator/src/main/java/com/dianpoint/summer/validator/validator/collection/CollectionValidator.java b/summer-validator/src/main/java/com/dianpoint/summer/validator/validator/collection/CollectionValidator.java
diff --git a/summer-validator/src/main/java/com/dianpoint/summer/validator/validator/collection/DefaultCollectionValidator.java b/summer-validator/src/main/java/com/dianpoint/summer/validator/validator/collection/DefaultCollectionValidator.java
diff --git a/summer-validator/src/test/java/com/dianpoint/summer/validator/test/ValidatorDemo.java b/summer-validator/src/test/java/com/dianpoint/summer/validator/test/ValidatorDemo.java
