From 83e3c207eaf15d4dea7095748bb7f3503cc81956 Mon Sep 17 00:00:00 2001 From: dhb52 Date: Wed, 6 Nov 2024 21:28:05 +0800 Subject: [PATCH] =?UTF-8?q?fix(1.2.0-beta3-jdk8):=20=E4=BD=BF=E7=94=A8jaka?= =?UTF-8?q?rta-validation=202.x=EF=BC=8C=E5=85=BC=E5=AE=B9springboot=202.x?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../snailjob/client/job/core/client/JobEndPoint.java | 2 +- .../client/job/core/dto/RequestAddOrUpdateJobDTO.java | 6 +++--- .../client/job/core/dto/RequestUpdateStatusDTO.java | 3 ++- .../snailjob/client/job/core/util/ValidatorUtils.java | 8 ++++---- .../snailjob/client/core/client/SnailRetryEndPoint.java | 2 +- .../aizuda/snailjob/client/model/DispatchRetryDTO.java | 5 +++-- .../client/model/GenerateRetryIdempotentIdDTO.java | 3 ++- .../aizuda/snailjob/client/model/RetryCallbackDTO.java | 5 +++-- .../java/com/aizuda/snailjob/client/model/StopJobDTO.java | 5 +++-- .../snailjob/client/model/request/DispatchJobRequest.java | 5 +++-- .../snailjob/client/model/request/MapTaskRequest.java | 7 +++---- 12 files changed, 29 insertions(+), 24 deletions(-) diff --git a/pom.xml b/pom.xml index c5c357919..8dcf9d4f0 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ 0.45.0 1.2.17 1.2 - 3.0.2 + 2.0.2 2.1.3 2.0.3 2.1.3 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 629d3bfc9..7576d099f 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 @@ -23,9 +23,9 @@ import com.aizuda.snailjob.common.core.util.JsonUtil; import com.aizuda.snailjob.common.log.SnailJobLog; import com.aizuda.snailjob.common.log.enums.LogTypeEnum; import com.google.common.collect.Maps; -import jakarta.validation.Valid; import org.springframework.validation.annotation.Validated; +import javax.validation.Valid; import java.util.Objects; import java.util.concurrent.ThreadPoolExecutor; diff --git a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/dto/RequestAddOrUpdateJobDTO.java b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/dto/RequestAddOrUpdateJobDTO.java index d450a2fcd..96e14fe5a 100644 --- a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/dto/RequestAddOrUpdateJobDTO.java +++ b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/dto/RequestAddOrUpdateJobDTO.java @@ -2,14 +2,14 @@ package com.aizuda.snailjob.client.job.core.dto; import com.aizuda.snailjob.client.job.core.handler.add.Add; import com.aizuda.snailjob.client.job.core.handler.update.Update; -import com.aizuda.snailjob.client.job.core.handler.update.UpdateHandler; import com.aizuda.snailjob.common.core.enums.ExecutorTypeEnum; import com.aizuda.snailjob.common.core.enums.JobTaskTypeEnum; import com.aizuda.snailjob.common.core.enums.StatusEnum; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; import lombok.Data; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + @Data public class RequestAddOrUpdateJobDTO { diff --git a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/dto/RequestUpdateStatusDTO.java b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/dto/RequestUpdateStatusDTO.java index eeda6f46c..7a6cb8342 100644 --- a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/dto/RequestUpdateStatusDTO.java +++ b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/dto/RequestUpdateStatusDTO.java @@ -1,8 +1,9 @@ package com.aizuda.snailjob.client.job.core.dto; -import jakarta.validation.constraints.NotNull; import lombok.Data; +import javax.validation.constraints.NotNull; + /** * @author opensnail * @date 2023-10-15 16:06:20 diff --git a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/util/ValidatorUtils.java b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/util/ValidatorUtils.java index 983204ac1..9b9bf710f 100644 --- a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/util/ValidatorUtils.java +++ b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/util/ValidatorUtils.java @@ -2,10 +2,10 @@ package com.aizuda.snailjob.client.job.core.util; import cn.hutool.core.lang.Pair; import com.aizuda.snailjob.client.common.exception.SnailJobClientException; -import jakarta.validation.ConstraintViolation; -import jakarta.validation.Validation; -import jakarta.validation.Validator; +import javax.validation.ConstraintViolation; +import javax.validation.Validation; +import javax.validation.Validator; import java.util.Set; public class ValidatorUtils { @@ -31,7 +31,7 @@ public class ValidatorUtils { * @param object 待校验对象 * @throws SnailJobClientException 校验不通过，则报SnailJobClientException异常 */ - public static Pair validateEntity( Set> constraintViolations, Object object) { + public static Pair validateEntity(Set> constraintViolations, Object object) { if (!constraintViolations.isEmpty()) { StringBuilder msg = new StringBuilder(); for (ConstraintViolation constraint : constraintViolations) { 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 26a66e5a3..f3931f371 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 @@ -30,13 +30,13 @@ import com.aizuda.snailjob.common.core.util.JsonUtil; import com.aizuda.snailjob.common.log.SnailJobLog; import com.aizuda.snailjob.common.log.enums.LogTypeEnum; import com.fasterxml.jackson.core.JsonProcessingException; -import jakarta.validation.*; 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 javax.validation.Valid; import java.lang.reflect.Method; import java.util.Objects; diff --git a/snail-job-common/snail-job-common-client-api/src/main/java/com/aizuda/snailjob/client/model/DispatchRetryDTO.java b/snail-job-common/snail-job-common-client-api/src/main/java/com/aizuda/snailjob/client/model/DispatchRetryDTO.java index 7d6fa5bad..2b172b500 100644 --- a/snail-job-common/snail-job-common-client-api/src/main/java/com/aizuda/snailjob/client/model/DispatchRetryDTO.java +++ b/snail-job-common/snail-job-common-client-api/src/main/java/com/aizuda/snailjob/client/model/DispatchRetryDTO.java @@ -1,9 +1,10 @@ package com.aizuda.snailjob.client.model; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; import lombok.Data; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + /** * 服务端调度重试入参 diff --git a/snail-job-common/snail-job-common-client-api/src/main/java/com/aizuda/snailjob/client/model/GenerateRetryIdempotentIdDTO.java b/snail-job-common/snail-job-common-client-api/src/main/java/com/aizuda/snailjob/client/model/GenerateRetryIdempotentIdDTO.java index 2f40530b4..a5f2b3d55 100644 --- a/snail-job-common/snail-job-common-client-api/src/main/java/com/aizuda/snailjob/client/model/GenerateRetryIdempotentIdDTO.java +++ b/snail-job-common/snail-job-common-client-api/src/main/java/com/aizuda/snailjob/client/model/GenerateRetryIdempotentIdDTO.java @@ -1,8 +1,9 @@ package com.aizuda.snailjob.client.model; -import jakarta.validation.constraints.NotBlank; import lombok.Data; +import javax.validation.constraints.NotBlank; + /** * 生成idempotentId模型 * diff --git a/snail-job-common/snail-job-common-client-api/src/main/java/com/aizuda/snailjob/client/model/RetryCallbackDTO.java b/snail-job-common/snail-job-common-client-api/src/main/java/com/aizuda/snailjob/client/model/RetryCallbackDTO.java index ad74d93ba..4bb7c714c 100644 --- a/snail-job-common/snail-job-common-client-api/src/main/java/com/aizuda/snailjob/client/model/RetryCallbackDTO.java +++ b/snail-job-common/snail-job-common-client-api/src/main/java/com/aizuda/snailjob/client/model/RetryCallbackDTO.java @@ -1,9 +1,10 @@ package com.aizuda.snailjob.client.model; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; import lombok.Data; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + /** * 服务端调度重试入参 * diff --git a/snail-job-common/snail-job-common-client-api/src/main/java/com/aizuda/snailjob/client/model/StopJobDTO.java b/snail-job-common/snail-job-common-client-api/src/main/java/com/aizuda/snailjob/client/model/StopJobDTO.java index 40208e802..912d20d28 100644 --- a/snail-job-common/snail-job-common-client-api/src/main/java/com/aizuda/snailjob/client/model/StopJobDTO.java +++ b/snail-job-common/snail-job-common-client-api/src/main/java/com/aizuda/snailjob/client/model/StopJobDTO.java @@ -1,9 +1,10 @@ package com.aizuda.snailjob.client.model; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; import lombok.Data; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + /** * @author: opensnail * @date : 2023-09-26 15:10 diff --git a/snail-job-common/snail-job-common-client-api/src/main/java/com/aizuda/snailjob/client/model/request/DispatchJobRequest.java b/snail-job-common/snail-job-common-client-api/src/main/java/com/aizuda/snailjob/client/model/request/DispatchJobRequest.java index d3b5cb56b..a412c5acc 100644 --- a/snail-job-common/snail-job-common-client-api/src/main/java/com/aizuda/snailjob/client/model/request/DispatchJobRequest.java +++ b/snail-job-common/snail-job-common-client-api/src/main/java/com/aizuda/snailjob/client/model/request/DispatchJobRequest.java @@ -1,9 +1,10 @@ package com.aizuda.snailjob.client.model.request; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; import lombok.Data; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + /** * @author: opensnail * @date : 2023-09-26 15:10 diff --git a/snail-job-common/snail-job-common-client-api/src/main/java/com/aizuda/snailjob/client/model/request/MapTaskRequest.java b/snail-job-common/snail-job-common-client-api/src/main/java/com/aizuda/snailjob/client/model/request/MapTaskRequest.java index 5278a1e9d..8b0b33e5b 100644 --- a/snail-job-common/snail-job-common-client-api/src/main/java/com/aizuda/snailjob/client/model/request/MapTaskRequest.java +++ b/snail-job-common/snail-job-common-client-api/src/main/java/com/aizuda/snailjob/client/model/request/MapTaskRequest.java @@ -1,12 +1,11 @@ package com.aizuda.snailjob.client.model.request; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; import lombok.Data; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; import java.util.List; -import java.util.Map; /** * @author: opensnail