From b0f55064242615717789b3d62880e482ea72a23a Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Wed, 3 Jul 2024 23:23:06 +0800
Subject: [PATCH] =?UTF-8?q?refactor(core):=20=E4=BC=98=E5=8C=96=20JSR=2030?=
 =?UTF-8?q?3=20=E6=A0=A1=E9=AA=8C=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/util/validate/ValidationUtils.java   | 22 -------------------
 .../starter/core/util/validate/Validator.java | 20 +++++++++++++++++
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/continew-starter-core/src/main/java/top/continew/starter/core/util/validate/ValidationUtils.java b/continew-starter-core/src/main/java/top/continew/starter/core/util/validate/ValidationUtils.java
index e16f6412..8518e2f2 100644
--- a/continew-starter-core/src/main/java/top/continew/starter/core/util/validate/ValidationUtils.java
+++ b/continew-starter-core/src/main/java/top/continew/starter/core/util/validate/ValidationUtils.java
@@ -16,14 +16,9 @@
 
 package top.continew.starter.core.util.validate;
 
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.text.CharSequenceUtil;
-import cn.hutool.core.util.ReflectUtil;
-import cn.hutool.extra.spring.SpringUtil;
-import jakarta.validation.ConstraintViolation;
 import top.continew.starter.core.exception.BadRequestException;
 
-import java.util.Set;
 import java.util.function.BooleanSupplier;
 
 /**
@@ -178,21 +173,4 @@ public class ValidationUtils extends Validator {
     public static void throwIf(BooleanSupplier conditionSupplier, String template, Object... params) {
         throwIf(conditionSupplier, CharSequenceUtil.format(template, params), EXCEPTION_TYPE);
     }
-
-    /**
-     * JSR 303 校验
-     *
-     * @param obj    被校验对象
-     * @param groups 分组
-     */
-    public static void validate(Object obj, Class<?>... groups) {
-        jakarta.validation.Validator validator = SpringUtil.getBean(jakarta.validation.Validator.class);
-        Set<ConstraintViolation<Object>> violations = validator.validate(obj, groups);
-        if (CollUtil.isEmpty(violations)) {
-            return;
-        }
-        throw ReflectUtil.newInstance(EXCEPTION_TYPE, violations.stream()
-            .map(ConstraintViolation::getMessage)
-            .findFirst());
-    }
 }
diff --git a/continew-starter-core/src/main/java/top/continew/starter/core/util/validate/Validator.java b/continew-starter-core/src/main/java/top/continew/starter/core/util/validate/Validator.java
index 9fe230f5..1fcc5e17 100644
--- a/continew-starter-core/src/main/java/top/continew/starter/core/util/validate/Validator.java
+++ b/continew-starter-core/src/main/java/top/continew/starter/core/util/validate/Validator.java
@@ -19,9 +19,13 @@ package top.continew.starter.core.util.validate;
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ReflectUtil;
+import cn.hutool.extra.spring.SpringUtil;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Set;
 import java.util.function.BooleanSupplier;
 
 /**
@@ -32,6 +36,8 @@ import java.util.function.BooleanSupplier;
  */
 public class Validator {
     private static final Logger log = LoggerFactory.getLogger(Validator.class);
+    private static final jakarta.validation.Validator VALIDATOR = SpringUtil
+        .getBean(jakarta.validation.Validator.class);
 
     protected Validator() {
     }
@@ -195,4 +201,18 @@ public class Validator {
             throw ReflectUtil.newInstance(exceptionType, message);
         }
     }
+
+    /**
+     * JSR 303 校验
+     *
+     * @param obj    被校验对象
+     * @param groups 分组
+     * @since 2.3.0
+     */
+    public static void validate(Object obj, Class<?>... groups) {
+        Set<ConstraintViolation<Object>> violations = VALIDATOR.validate(obj, groups);
+        if (!violations.isEmpty()) {
+            throw new ConstraintViolationException(violations);
+        }
+    }
 }