perf: 优化测试工具，完全支持在不使用启动注解的情况下验证约束注解的逻辑

stick-i · stick-i · commit de5ec3d68ca4 · 2024-10-31T11:33:21.000+08:00
diff --git a/spel-validator-core/src/main/java/cn/sticki/spel/validator/core/SpelValidExecutor.java b/spel-validator-core/src/main/java/cn/sticki/spel/validator/core/SpelValidExecutor.java
@@ -15,6 +15,7 @@
 import java.lang.reflect.Method;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
 
 /**
  * spel 相关注解的执行器，对使用了 {@link SpelConstraint} 进行标记的注解执行校验。
@@ -62,6 +63,25 @@ public static ObjectValidResult validateObject(@NotNull Object verifiedObject) {
         return validateObject(verifiedObject, Collections.emptySet());
     }
 
+    /**
+     * 验证对象
+     * <p>
+     * 如果对象中有任意使用了 spel 约束注解的字段，则会对该字段进行校验。
+     *
+     * @param verifiedObject 被校验的对象
+     * @param validateGroups 分组信息，只有同组的注解才会被校验
+     * @return 对象校验结果
+     */
+    @NotNull
+    public static ObjectValidResult validateObject(@NotNull Object verifiedObject, String[] validateGroups) {
+        if (validateGroups == null) {
+            return validateObject(verifiedObject);
+        }
+        // 获取分组信息
+        Set<Object> groups = Arrays.stream(validateGroups).map(it -> SpelParser.parse(it, verifiedObject)).collect(Collectors.toSet());
+        return validateObject(verifiedObject, groups);
+    }
+
     /**
      * 验证对象
      * <p>
@@ -73,6 +93,9 @@ public static ObjectValidResult validateObject(@NotNull Object verifiedObject) {
      */
     @NotNull
     public static ObjectValidResult validateObject(@NotNull Object verifiedObject, @NotNull Set<Object> validateGroups) {
+        Objects.requireNonNull(verifiedObject);
+        Objects.requireNonNull(validateGroups);
+
         long startTime = System.nanoTime();
         log.debug("Spel validate start, class [{}], groups [{}]", verifiedObject.getClass().getName(), validateGroups);
         log.debug("Verified object [{}]", verifiedObject);
diff --git a/spel-validator-jakarta/src/main/java/cn/sticki/spel/validator/jakarta/SpelValidator.java b/spel-validator-jakarta/src/main/java/cn/sticki/spel/validator/jakarta/SpelValidator.java
@@ -8,10 +8,6 @@
 import jakarta.validation.ConstraintValidatorContext;
 import lombok.extern.slf4j.Slf4j;
 
-import java.util.Arrays;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 /**
  * {@link SpelValid} 的实际校验器
  *
@@ -41,11 +37,8 @@ public boolean isValid(Object value, ConstraintValidatorContext context) {
             return true;
         }
 
-        // 获取分组信息
-        Set<Object> groups = Arrays.stream(spelValid.spelGroups()).map(it -> SpelParser.parse(it, value)).collect(Collectors.toSet());
-
         // 校验对象
-        ObjectValidResult validateObjectResult = SpelValidExecutor.validateObject(value, groups);
+        ObjectValidResult validateObjectResult = SpelValidExecutor.validateObject(value, spelValid.spelGroups());
 
         // 构建错误信息
         buildConstraintViolation(validateObjectResult, context);
diff --git a/spel-validator-javax/src/main/java/cn/sticki/spel/validator/javax/SpelValidator.java b/spel-validator-javax/src/main/java/cn/sticki/spel/validator/javax/SpelValidator.java
@@ -8,9 +8,6 @@
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
-import java.util.Arrays;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 /**
  * {@link SpelValid} 的实际校验器
@@ -41,11 +38,8 @@ public boolean isValid(Object value, ConstraintValidatorContext context) {
             return true;
         }
 
-        // 获取分组信息
-        Set<Object> groups = Arrays.stream(spelValid.spelGroups()).map(it -> SpelParser.parse(it, value)).collect(Collectors.toSet());
-
         // 校验对象
-        ObjectValidResult validateObjectResult = SpelValidExecutor.validateObject(value, groups);
+        ObjectValidResult validateObjectResult = SpelValidExecutor.validateObject(value, spelValid.spelGroups());
 
         // 构建错误信息
         buildConstraintViolation(validateObjectResult, context);
diff --git a/spel-validator-javax/src/test/java/cn/sticki/spel/validator/javax/bean/SpelAssertTestBean.java b/spel-validator-javax/src/test/java/cn/sticki/spel/validator/javax/bean/SpelAssertTestBean.java
@@ -1,7 +1,6 @@
 package cn.sticki.spel.validator.javax.bean;
 
 import cn.sticki.spel.validator.core.constrain.SpelAssert;
-import cn.sticki.spel.validator.javax.SpelValid;
 import cn.sticki.spel.validator.javax.util.ID;
 import cn.sticki.spel.validator.javax.util.VerifyFailedField;
 import cn.sticki.spel.validator.javax.util.VerifyObject;
@@ -20,7 +19,7 @@
 public class SpelAssertTestBean {
 
     @Data
-    @SpelValid(spelGroups = "#this.group")
+    // @SpelValid(spelGroups = "#this.group")
     public static class ParamTestBean implements ID {
 
         private int id;
@@ -58,7 +57,7 @@ public static List<VerifyObject> paramTestCase() {
                 bean,
                 VerifyFailedField.of(ParamTestBean::getTest2),
                 VerifyFailedField.of(ParamTestBean::getTest4, "test4")
-        ));
+        ).setGroups("#this.group"));
 
         ParamTestBean bean2 = new ParamTestBean();
         bean2.setId(2);
@@ -68,7 +67,7 @@ public static List<VerifyObject> paramTestCase() {
                 bean2,
                 VerifyFailedField.of(ParamTestBean::getTest2),
                 VerifyFailedField.of(ParamTestBean::getTest5, "group1")
-        ));
+        ).setGroups("#this.group"));
 
         ParamTestBean bean3 = new ParamTestBean();
         bean3.setId(3);
@@ -77,7 +76,7 @@ public static List<VerifyObject> paramTestCase() {
         list.add(VerifyObject.of(
                 bean3,
                 VerifyFailedField.of(ParamTestBean::getTest2)
-        ));
+        ).setGroups("#this.group"));
 
         ParamTestBean bean4 = new ParamTestBean();
         bean4.setId(4);
@@ -88,13 +87,13 @@ public static List<VerifyObject> paramTestCase() {
                 VerifyFailedField.of(ParamTestBean::getTest2),
                 VerifyFailedField.of(ParamTestBean::getTest4, "test4"),
                 VerifyFailedField.of(ParamTestBean::getTest6, "group2")
-        ));
+        ).setGroups("#this.group"));
 
         return list;
     }
 
     @Data
-    @SpelValid
+    // @SpelValid
     public static class EmptyTestBean {
 
         @SpelAssert(condition = "true", assertTrue = "")
diff --git a/spel-validator-javax/src/test/java/cn/sticki/spel/validator/javax/bean/SpelMaxTestBean.java b/spel-validator-javax/src/test/java/cn/sticki/spel/validator/javax/bean/SpelMaxTestBean.java
@@ -1,7 +1,6 @@
 package cn.sticki.spel.validator.javax.bean;
 
 import cn.sticki.spel.validator.core.constrain.SpelMax;
-import cn.sticki.spel.validator.javax.SpelValid;
 import cn.sticki.spel.validator.javax.util.ID;
 import cn.sticki.spel.validator.javax.util.VerifyFailedField;
 import cn.sticki.spel.validator.javax.util.VerifyObject;
@@ -27,7 +26,7 @@ public class SpelMaxTestBean {
      */
     @Data
     @Builder
-    @SpelValid
+    // @SpelValid
     public static class ParamTestBean implements ID {
 
         private int id;
diff --git a/spel-validator-javax/src/test/java/cn/sticki/spel/validator/javax/bean/SpelMinTestBean.java b/spel-validator-javax/src/test/java/cn/sticki/spel/validator/javax/bean/SpelMinTestBean.java
@@ -1,7 +1,6 @@
 package cn.sticki.spel.validator.javax.bean;
 
 import cn.sticki.spel.validator.core.constrain.SpelMin;
-import cn.sticki.spel.validator.javax.SpelValid;
 import cn.sticki.spel.validator.javax.util.ID;
 import cn.sticki.spel.validator.javax.util.VerifyFailedField;
 import cn.sticki.spel.validator.javax.util.VerifyObject;
@@ -27,7 +26,7 @@ public class SpelMinTestBean {
      */
     @Data
     @Builder
-    @SpelValid
+    // @SpelValid
     public static class ParamTestBean implements ID {
 
         private int id;
@@ -164,7 +163,7 @@ public static List<VerifyObject> paramTestCase() {
      */
     @Data
     @Builder
-    @SpelValid
+    // @SpelValid
     public static class RepeatableTestBean implements ID {
 
         private int id;
@@ -240,7 +239,7 @@ public static List<VerifyObject> repeatableTestCase() {
      */
     @Data
     @Builder
-    @SpelValid
+    // @SpelValid
     public static class ParamTestBean2 implements ID {
 
         private int id;
@@ -311,7 +310,7 @@ public static List<VerifyObject> paramTest2Case() {
      */
     @Data
     @Builder
-    @SpelValid
+    // @SpelValid
     public static class ValueTypeTestBean implements ID {
 
         private int id;
@@ -513,7 +512,7 @@ public static List<VerifyObject> valueTypeTestCase() {
      */
     @Data
     @Builder
-    @SpelValid
+    // @SpelValid
     public static class NotSupportValueTypeTestBean implements ID {
 
         private int id;
diff --git a/spel-validator-javax/src/test/java/cn/sticki/spel/validator/javax/util/ValidateUtil.java b/spel-validator-javax/src/test/java/cn/sticki/spel/validator/javax/util/ValidateUtil.java
@@ -34,11 +34,11 @@ public class ValidateUtil {
      *
      * @return 校验结果
      */
-    public static ObjectValidResult validate(Object obj) {
+    public static ObjectValidResult validate(Object obj, String[] spelGroups) {
         // 如果对象没有使用 SpelValid 注解，则直接调用验证执行器进行验证
         // 这种情况下，只会验证本框架提供的约束注解
         if (!obj.getClass().isAnnotationPresent(SpelValid.class)) {
-            return SpelValidExecutor.validateObject(obj);
+            return SpelValidExecutor.validateObject(obj, spelGroups);
         }
 
         // 通过 @Valid 的方式进行验证
@@ -74,6 +74,7 @@ public static boolean checkConstraintResult(List<VerifyObject> verifyObjectList)
      */
     public static boolean checkConstraintResult(VerifyObject verifyObject) {
         Object object = verifyObject.getObject();
+        String[] spelGroups = verifyObject.getSpelGroups();
         Collection<VerifyFailedField> verifyFailedFields = verifyObject.getVerifyFailedFields();
         boolean expectException = verifyObject.isExpectException();
 
@@ -84,7 +85,7 @@ public static boolean checkConstraintResult(VerifyObject verifyObject) {
         int failCount = 0;
         try {
             // 执行约束校验
-            ObjectValidResult validResult = ValidateUtil.validate(object);
+            ObjectValidResult validResult = ValidateUtil.validate(object, spelGroups);
             failCount += processVerifyResult(verifyFailedFields, ConstraintViolationSet.of(validResult.getErrors()));
         } catch (Exception e) {
             if (expectException) {
@@ -164,5 +165,4 @@ private static int processVerifyResult(Collection<VerifyFailedField> verifyFaile
         return failCount;
     }
 
-
 }
diff --git a/spel-validator-javax/src/test/java/cn/sticki/spel/validator/javax/util/VerifyObject.java b/spel-validator-javax/src/test/java/cn/sticki/spel/validator/javax/util/VerifyObject.java
@@ -1,6 +1,7 @@
 package cn.sticki.spel.validator.javax.util;
 
 import lombok.Data;
+import org.intellij.lang.annotations.Language;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -30,6 +31,12 @@ public class VerifyObject {
      */
     private boolean expectException;
 
+    /**
+     * spel 分组参数，当 object 未使用 @SpelValid 注解时，该参数生效
+     */
+    @Language("spel")
+    private String[] spelGroups;
+
     private VerifyObject() {
     }
 
@@ -107,4 +114,9 @@ public static VerifyObject of(Object object, Collection<VerifyFailedField> verif
         return verifyObject;
     }
 
+    public VerifyObject setGroups(@Language("spel") String... spelGroups) {
+        this.spelGroups = spelGroups;
+        return this;
+    }
+
 }
