From c447379f7cb4ebfe3c047d5a02674ae139e40c8d Mon Sep 17 00:00:00 2001 From: opensnail <598092184@qq.com> Date: Tue, 28 May 2024 12:18:29 +0800 Subject: [PATCH] =?UTF-8?q?feat(sj=5F1.0.0):=20=E5=AE=A2=E6=88=B7=E7=AB=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E9=87=87=E7=94=A8@Validated+@Valid=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/job/core/client/JobEndPoint.java | 14 +++++--------- .../client/core/client/SnailRetryEndPoint.java | 16 ++++++---------- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/client/JobEndPoint.java b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/client/JobEndPoint.java index 6fb61b4c3..b285302ce 100644 --- a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/client/JobEndPoint.java +++ b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/client/JobEndPoint.java @@ -19,9 +19,11 @@ import com.aizuda.snailjob.common.core.model.Result; import com.aizuda.snailjob.common.log.SnailJobLog; import com.aizuda.snailjob.common.log.enums.LogTypeEnum; import jakarta.validation.ConstraintViolation; +import jakarta.validation.Valid; import jakarta.validation.Validation; import jakarta.validation.Validator; import jakarta.validation.ValidatorFactory; +import org.springframework.validation.annotation.Validated; import java.util.Objects; import java.util.Set; @@ -35,17 +37,11 @@ import static com.aizuda.snailjob.common.core.constant.SystemConstants.HTTP_PATH * @date : 2023-09-27 16:33 */ @SnailEndPoint +@Validated public class JobEndPoint { @Mapping(path = JOB_DISPATCH, method = RequestMethod.POST) - public Result dispatchJob(DispatchJobRequest dispatchJob) { - - ValidatorFactory vf = Validation.buildDefaultValidatorFactory(); - Validator validator = vf.getValidator(); - Set> set = validator.validate(dispatchJob); - for (final ConstraintViolation violation : set) { - return new Result<>(violation.getMessage(), Boolean.FALSE); - } + public Result dispatchJob(@Valid DispatchJobRequest dispatchJob) { try { JobContext jobContext = buildJobContext(dispatchJob); @@ -118,7 +114,7 @@ public class JobEndPoint { } @Mapping(path = JOB_STOP, method = RequestMethod.POST) - public Result stopJob(StopJobDTO interruptJob) { + public Result stopJob(@Valid StopJobDTO interruptJob) { ValidatorFactory vf = Validation.buildDefaultValidatorFactory(); Validator validator = vf.getValidator(); diff --git a/snail-job-client/snail-job-client-retry-core/src/main/java/com/aizuda/snailjob/client/core/client/SnailRetryEndPoint.java b/snail-job-client/snail-job-client-retry-core/src/main/java/com/aizuda/snailjob/client/core/client/SnailRetryEndPoint.java index 6665bab1e..fdaa14c6d 100644 --- a/snail-job-client/snail-job-client-retry-core/src/main/java/com/aizuda/snailjob/client/core/client/SnailRetryEndPoint.java +++ b/snail-job-client/snail-job-client-retry-core/src/main/java/com/aizuda/snailjob/client/core/client/SnailRetryEndPoint.java @@ -31,6 +31,7 @@ import com.aizuda.snailjob.common.log.SnailJobLog; import com.aizuda.snailjob.common.log.enums.LogTypeEnum; import com.fasterxml.jackson.core.JsonProcessingException; import jakarta.validation.ConstraintViolation; +import jakarta.validation.Valid; import jakarta.validation.Validation; import jakarta.validation.Validator; import jakarta.validation.ValidatorFactory; @@ -38,6 +39,7 @@ import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.util.ReflectionUtils; +import org.springframework.validation.annotation.Validated; import java.lang.reflect.Method; import java.util.Objects; @@ -52,6 +54,7 @@ import static com.aizuda.snailjob.common.core.constant.SystemConstants.HTTP_PATH * @date : 2022-03-09 16:33 */ @SnailEndPoint +@Validated public class SnailRetryEndPoint { @Autowired @@ -62,14 +65,7 @@ public class SnailRetryEndPoint { * 服务端调度重试入口 */ @Mapping(path = RETRY_DISPATCH, method = RequestMethod.POST) - public Result dispatch(DispatchRetryDTO executeReqDto) { - - ValidatorFactory vf = Validation.buildDefaultValidatorFactory(); - Validator validator = vf.getValidator(); - Set> set = validator.validate(executeReqDto); - for (final ConstraintViolation violation : set) { - return new Result<>(violation.getMessage(), null); - } + public Result dispatch(@Valid DispatchRetryDTO executeReqDto) { RetryerInfo retryerInfo = RetryerInfoCache.get(executeReqDto.getScene(), executeReqDto.getExecutorName()); if (Objects.isNull(retryerInfo)) { @@ -148,7 +144,7 @@ public class SnailRetryEndPoint { @Mapping(path = RETRY_CALLBACK, method = RequestMethod.POST) - public Result callback(RetryCallbackDTO callbackDTO) { + public Result callback(@Valid RetryCallbackDTO callbackDTO) { ValidatorFactory vf = Validation.buildDefaultValidatorFactory(); Validator validator = vf.getValidator(); @@ -266,7 +262,7 @@ public class SnailRetryEndPoint { * @return idempotentId */ @Mapping(path = RETRY_GENERATE_IDEM_ID, method = RequestMethod.POST) - public Result idempotentIdGenerate( + public Result idempotentIdGenerate(@Valid GenerateRetryIdempotentIdDTO generateRetryIdempotentIdDTO) { ValidatorFactory vf = Validation.buildDefaultValidatorFactory();