gtsoft/gtsoft-snail-job-server
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

fix(1.2.0-beta3-jdk8): 使用jakarta-validation 2.x，兼容springboot 2.x

Browse Source
This commit is contained in:
dhb52 2024-11-06 21:28:05 +08:00
parent 0eef186ae1
commit 83e3c207ea
12 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -31,7 +31,7 @@
<logtube.version>0.45.0</logtube.version>
<log4j.version>1.2.17</log4j.version>
<commons-logging.version>1.2</commons-logging.version>
<jakarta-validation.version>3.0.2</jakarta-validation.version>
<jakarta-validation.version>2.0.2</jakarta-validation.version>
<jakarta-mail-api.version>2.1.3</jakarta-mail-api.version>
<jakarta-mail.version>2.0.3</jakarta-mail.version>
<jakarta-activation-api.version>2.1.3</jakarta-activation-api.version>

2
snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/client/JobEndPoint.java
View File

@ -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;

6
snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/dto/RequestAddOrUpdateJobDTO.java
View File

@ -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 {

3
snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/dto/RequestUpdateStatusDTO.java
View File

@ -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

8
snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/util/ValidatorUtils.java
View File

@ -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<Boolean, String> validateEntity( Set<ConstraintViolation<Object>> constraintViolations, Object object) {
public static Pair<Boolean, String> validateEntity(Set<ConstraintViolation<Object>> constraintViolations, Object object) {
if (!constraintViolations.isEmpty()) {
StringBuilder msg = new StringBuilder();
for (ConstraintViolation<Object> constraint : constraintViolations) {

2
snail-job-client/snail-job-client-retry-core/src/main/java/com/aizuda/snailjob/client/core/client/SnailRetryEndPoint.java
View File

@ -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;

5
snail-job-common/snail-job-common-client-api/src/main/java/com/aizuda/snailjob/client/model/DispatchRetryDTO.java
View File

@ -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;
/**
* 服务端调度重试入参

3
snail-job-common/snail-job-common-client-api/src/main/java/com/aizuda/snailjob/client/model/GenerateRetryIdempotentIdDTO.java
View File

@ -1,8 +1,9 @@
package com.aizuda.snailjob.client.model;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* 生成idempotentId模型
*

5
snail-job-common/snail-job-common-client-api/src/main/java/com/aizuda/snailjob/client/model/RetryCallbackDTO.java
View File

@ -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;
/**
* 服务端调度重试入参
*

5
snail-job-common/snail-job-common-client-api/src/main/java/com/aizuda/snailjob/client/model/StopJobDTO.java
View File

@ -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

5
snail-job-common/snail-job-common-client-api/src/main/java/com/aizuda/snailjob/client/model/request/DispatchJobRequest.java
View File

@ -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

7
snail-job-common/snail-job-common-client-api/src/main/java/com/aizuda/snailjob/client/model/request/MapTaskRequest.java
View File

@ -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