From bea842178fbb05bb54ce44822e56ca0a2589771c Mon Sep 17 00:00:00 2001 From: byteblogs168 <598092184@qq.com> Date: Sun, 3 Sep 2023 22:16:04 +0800 Subject: [PATCH] =?UTF-8?q?feat:2.3.0=20=E4=BF=AE=E5=A4=8D=E5=9B=9E?= =?UTF-8?q?=E8=B0=83=E6=89=A7=E8=A1=8C=E5=99=A8=E8=8E=B7=E5=8F=96=E7=9A=84?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../actor/exec/ExecCallbackUnitActor.java | 13 +-- .../generator/task/AbstractGenerator.java | 2 + .../RetryTaskMoreThresholdAlarmSchedule.java | 4 +- example/.gitignore | 31 ------ example/Dockerfile | 13 --- example/pom.xml | 100 ----------------- example/src/demo.sql | 42 -------- .../java/com/example/ExampleApplication.java | 24 ----- .../ExampleClientHttpRequestInterceptor.java | 45 -------- .../ExampleFeignRequestInterceptor.java | 25 ----- .../java/com/example/client/DemoClient.java | 16 --- .../java/com/example/client/FeignConfig.java | 51 --------- .../example/config/RestTemplateConfig.java | 37 ------- .../example/controller/SchoolController.java | 44 -------- .../SchoolStudentTeacherController.java | 20 ---- .../example/controller/StudentController.java | 35 ------ .../example/controller/TeacherController.java | 49 --------- .../example/controller/TestDdlController.java | 57 ---------- .../controller/TestStatusCodeController.java | 47 -------- .../example/demo/CustomAsyncCreateTask.java | 27 ----- .../example/demo/CustomSyncCreateTask.java | 29 ----- .../com/example/demo/MyExecutorMethod.java | 23 ---- .../com/example/demo/NestMethodService.java | 65 ----------- .../java/com/example/demo/RemoteService.java | 22 ---- .../example/demo/RetryRegisterService.java | 29 ----- .../com/example/demo/TestEventListener.java | 22 ---- .../TestExistsTransactionalRetryService.java | 64 ----------- .../TestExistsTransactionalRetryService2.java | 58 ---------- ...estRetryMethodComplexParamaterService.java | 37 ------- .../example/demo/TestRetryMethodService.java | 33 ------ .../demo/TestRetryStrategyService.java | 47 -------- .../java/com/example/mapper/SchoolMapper.java | 18 ---- .../mapper/SchoolStudentTeacherMapper.java | 18 ---- .../com/example/mapper/StudentMapper.java | 18 ---- .../com/example/mapper/TeacherMapper.java | 18 ---- .../src/main/java/com/example/model/Cat.java | 14 --- .../src/main/java/com/example/model/Dog.java | 13 --- .../com/example/model/TransactionalEvent.java | 18 ---- .../src/main/java/com/example/model/Zoo.java | 17 --- .../src/main/java/com/example/po/School.java | 35 ------ .../com/example/po/SchoolStudentTeacher.java | 39 ------- .../src/main/java/com/example/po/Student.java | 33 ------ .../src/main/java/com/example/po/Teacher.java | 33 ------ example/src/main/resources/application.yml | 41 ------- example/src/main/resources/logback-boot.xml | 51 --------- .../main/resources/mapper/SchoolMapper.xml | 14 --- .../mapper/SchoolStudentTeacherMapper.xml | 15 --- .../main/resources/mapper/StudentMapper.xml | 14 --- .../main/resources/mapper/TeacherMapper.xml | 14 --- .../com/example/EasyRetryTemplateTest.java | 75 ------------- .../com/example/ExampleApplicationTests.java | 46 -------- .../ExistsTransactionalRetryServiceTest.java | 102 ------------------ .../com/example/NestMethodServiceTest.java | 43 -------- ...etryMethodComplexParamaterServiceTest.java | 71 ------------ .../com/example/RetryRegisterServiceTest.java | 45 -------- .../example/TestRetryMethodServiceTest.java | 40 ------- .../example/TestRetryStrategyServiceTest.java | 33 ------ 57 files changed, 11 insertions(+), 1978 deletions(-) delete mode 100644 example/.gitignore delete mode 100755 example/Dockerfile delete mode 100644 example/pom.xml delete mode 100644 example/src/demo.sql delete mode 100644 example/src/main/java/com/example/ExampleApplication.java delete mode 100644 example/src/main/java/com/example/ExampleClientHttpRequestInterceptor.java delete mode 100644 example/src/main/java/com/example/ExampleFeignRequestInterceptor.java delete mode 100644 example/src/main/java/com/example/client/DemoClient.java delete mode 100644 example/src/main/java/com/example/client/FeignConfig.java delete mode 100644 example/src/main/java/com/example/config/RestTemplateConfig.java delete mode 100644 example/src/main/java/com/example/controller/SchoolController.java delete mode 100644 example/src/main/java/com/example/controller/SchoolStudentTeacherController.java delete mode 100644 example/src/main/java/com/example/controller/StudentController.java delete mode 100644 example/src/main/java/com/example/controller/TeacherController.java delete mode 100644 example/src/main/java/com/example/controller/TestDdlController.java delete mode 100644 example/src/main/java/com/example/controller/TestStatusCodeController.java delete mode 100644 example/src/main/java/com/example/demo/CustomAsyncCreateTask.java delete mode 100644 example/src/main/java/com/example/demo/CustomSyncCreateTask.java delete mode 100644 example/src/main/java/com/example/demo/MyExecutorMethod.java delete mode 100644 example/src/main/java/com/example/demo/NestMethodService.java delete mode 100644 example/src/main/java/com/example/demo/RemoteService.java delete mode 100644 example/src/main/java/com/example/demo/RetryRegisterService.java delete mode 100644 example/src/main/java/com/example/demo/TestEventListener.java delete mode 100644 example/src/main/java/com/example/demo/TestExistsTransactionalRetryService.java delete mode 100644 example/src/main/java/com/example/demo/TestExistsTransactionalRetryService2.java delete mode 100644 example/src/main/java/com/example/demo/TestRetryMethodComplexParamaterService.java delete mode 100644 example/src/main/java/com/example/demo/TestRetryMethodService.java delete mode 100644 example/src/main/java/com/example/demo/TestRetryStrategyService.java delete mode 100644 example/src/main/java/com/example/mapper/SchoolMapper.java delete mode 100644 example/src/main/java/com/example/mapper/SchoolStudentTeacherMapper.java delete mode 100644 example/src/main/java/com/example/mapper/StudentMapper.java delete mode 100644 example/src/main/java/com/example/mapper/TeacherMapper.java delete mode 100644 example/src/main/java/com/example/model/Cat.java delete mode 100644 example/src/main/java/com/example/model/Dog.java delete mode 100644 example/src/main/java/com/example/model/TransactionalEvent.java delete mode 100644 example/src/main/java/com/example/model/Zoo.java delete mode 100644 example/src/main/java/com/example/po/School.java delete mode 100644 example/src/main/java/com/example/po/SchoolStudentTeacher.java delete mode 100644 example/src/main/java/com/example/po/Student.java delete mode 100644 example/src/main/java/com/example/po/Teacher.java delete mode 100644 example/src/main/resources/application.yml delete mode 100644 example/src/main/resources/logback-boot.xml delete mode 100644 example/src/main/resources/mapper/SchoolMapper.xml delete mode 100644 example/src/main/resources/mapper/SchoolStudentTeacherMapper.xml delete mode 100644 example/src/main/resources/mapper/StudentMapper.xml delete mode 100644 example/src/main/resources/mapper/TeacherMapper.xml delete mode 100644 example/src/test/java/com/example/EasyRetryTemplateTest.java delete mode 100644 example/src/test/java/com/example/ExampleApplicationTests.java delete mode 100644 example/src/test/java/com/example/ExistsTransactionalRetryServiceTest.java delete mode 100644 example/src/test/java/com/example/NestMethodServiceTest.java delete mode 100644 example/src/test/java/com/example/RetryMethodComplexParamaterServiceTest.java delete mode 100644 example/src/test/java/com/example/RetryRegisterServiceTest.java delete mode 100644 example/src/test/java/com/example/TestRetryMethodServiceTest.java delete mode 100644 example/src/test/java/com/example/TestRetryStrategyServiceTest.java diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/exec/ExecCallbackUnitActor.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/exec/ExecCallbackUnitActor.java index 2a9de232..ebf63e93 100644 --- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/exec/ExecCallbackUnitActor.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/exec/ExecCallbackUnitActor.java @@ -127,13 +127,14 @@ public class ExecCallbackUnitActor extends AbstractActor { // 回调参数 RetryCallbackDTO retryCallbackDTO = new RetryCallbackDTO(); - retryCallbackDTO.setIdempotentId(retryTask.getIdempotentId()); + retryCallbackDTO.setIdempotentId(callbackTask.getIdempotentId()); + // 重试任务的状态 retryCallbackDTO.setRetryStatus(retryTask.getRetryStatus()); - retryCallbackDTO.setArgsStr(retryTask.getArgsStr()); - retryCallbackDTO.setScene(retryTask.getSceneName()); - retryCallbackDTO.setGroup(retryTask.getGroupName()); - retryCallbackDTO.setExecutorName(retryTask.getExecutorName()); - retryCallbackDTO.setUniqueId(retryTask.getUniqueId()); + retryCallbackDTO.setArgsStr(callbackTask.getArgsStr()); + retryCallbackDTO.setScene(callbackTask.getSceneName()); + retryCallbackDTO.setGroup(callbackTask.getGroupName()); + retryCallbackDTO.setExecutorName(callbackTask.getExecutorName()); + retryCallbackDTO.setUniqueId(callbackTask.getUniqueId()); RpcClient rpcClient = RequestBuilder.newBuilder() .hostPort(serverNode.getHostPort()) diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/generator/task/AbstractGenerator.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/generator/task/AbstractGenerator.java index 982dd089..a1731b8a 100644 --- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/generator/task/AbstractGenerator.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/generator/task/AbstractGenerator.java @@ -2,6 +2,7 @@ package com.aizuda.easy.retry.server.support.generator.task; import cn.hutool.core.lang.Assert; import cn.hutool.core.lang.Pair; +import cn.hutool.core.util.StrUtil; import com.aizuda.easy.retry.common.core.enums.RetryStatusEnum; import com.aizuda.easy.retry.common.core.log.LogUtils; import com.aizuda.easy.retry.common.core.util.JsonUtil; @@ -120,6 +121,7 @@ public abstract class AbstractGenerator implements TaskGenerator { retryTask.setGroupName(taskContext.getGroupName()); retryTask.setSceneName(taskContext.getSceneName()); retryTask.setRetryStatus(initStatus(taskContext)); + retryTask.setBizNo(Optional.ofNullable(retryTask.getBizNo()).orElse(StrUtil.EMPTY)); retryTask.setCreateDt(now); retryTask.setUpdateDt(now); diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/schedule/RetryTaskMoreThresholdAlarmSchedule.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/schedule/RetryTaskMoreThresholdAlarmSchedule.java index 6ad5eb96..8daffb4a 100644 --- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/schedule/RetryTaskMoreThresholdAlarmSchedule.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/schedule/RetryTaskMoreThresholdAlarmSchedule.java @@ -38,8 +38,8 @@ import java.util.List; public class RetryTaskMoreThresholdAlarmSchedule extends AbstractSchedule implements Lifecycle { private static String retryTaskMoreThresholdTextMessageFormatter = "{}环境 重试数据监控 \n" + - "> 名称:{} \n" + - "> 时间:{} \n" + + "> 组名称:{} \n" + + "> 告警时间:{} \n" + "> **共计:{}** \n"; private final EasyRetryAlarmFactory easyRetryAlarmFactory; diff --git a/example/.gitignore b/example/.gitignore deleted file mode 100644 index 8f237d59..00000000 --- a/example/.gitignore +++ /dev/null @@ -1,31 +0,0 @@ -HELP.md -/target/ -!.mvn/wrapper/maven-wrapper.jar - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ -/build/ - -### VS Code ### -.vscode/ - -.flattened-pom.xml diff --git a/example/Dockerfile b/example/Dockerfile deleted file mode 100755 index 4979f5ab..00000000 --- a/example/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM openjdk:8-jdk-alpine -MAINTAINER www.byteblogs.com - -ADD ./target/easy-retry-example.jar easy-retry-example.jar - -#对外暴漏的端口号 -EXPOSE 8088 - -WORKDIR / - -#开机启动 -ENTRYPOINT ["sh","-c","java -jar $JAVA_OPTS /easy-retry-example.jar $PARAMS"] - diff --git a/example/pom.xml b/example/pom.xml deleted file mode 100644 index 7524e65e..00000000 --- a/example/pom.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 2.5.6 - - - - com.example - example - 1.1.0 - example - Demo project for Spring Boot - - - 1.8 - - - - - org.springframework.boot - spring-boot-starter-web - - - - org.projectlombok - lombok - true - - - org.springframework.boot - spring-boot-starter-test - test - - - com.aizuda - easy-retry-client-starter - 2.1.0-SNAPSHOT - - - com.baomidou - mybatis-plus-boot-starter - 3.5.1 - - - com.baomidou - mybatis-plus-generator - 3.5.1 - - - org.freemarker - freemarker - 2.3.28 - compile - - - mysql - mysql-connector-java - 5.1.46 - - - org.awaitility - awaitility - 4.1.1 - - - com.squareup.okhttp3 - okhttp - 4.2.0 - - - - org.springframework.cloud - spring-cloud-starter-openfeign - 3.0.3 - - - - - easy-retry-example - - - org.springframework.boot - spring-boot-maven-plugin - - - - org.projectlombok - lombok - - - - - - - - diff --git a/example/src/demo.sql b/example/src/demo.sql deleted file mode 100644 index 4a7eee3d..00000000 --- a/example/src/demo.sql +++ /dev/null @@ -1,42 +0,0 @@ -create database demo; - -CREATE TABLE `school` -( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', - `name` varchar(64) NOT NULL COMMENT '名称', - `address` varchar(128) NOT NULL COMMENT '密码', - `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='学校'; - -CREATE TABLE `student` -( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', - `name` varchar(64) NOT NULL COMMENT '姓名', - `age` tinyint NOT NULL COMMENT '年龄', - `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='学生'; - -CREATE TABLE `teacher` -( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', - `name` varchar(64) NOT NULL COMMENT '姓名', - `age` tinyint NOT NULL COMMENT '年龄', - `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='教师'; - -CREATE TABLE `school_student_teacher` -( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', - `school_id` bigint(20) NOT NULL COMMENT '学校id', - `teacher_id` bigint(20) NOT NULL COMMENT '教师id', - `student_id` bigint(20) NOT NULL COMMENT '学生id', - `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='学校学生老师表'; diff --git a/example/src/main/java/com/example/ExampleApplication.java b/example/src/main/java/com/example/ExampleApplication.java deleted file mode 100644 index cc0fc962..00000000 --- a/example/src/main/java/com/example/ExampleApplication.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.example; - -import com.aizuda.easy.retry.client.starter.EnableEasyRetry; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -//import org.springframework.cloud.netflix.feign.EnableFeignClients; -import org.springframework.cloud.openfeign.EnableFeignClients; -import org.springframework.context.annotation.EnableAspectJAutoProxy; -import org.springframework.core.Ordered; -import org.springframework.transaction.annotation.EnableTransactionManagement; - -@SpringBootApplication -@EnableFeignClients(basePackages = "com.example.client") -@EnableEasyRetry(group = "example_group") -@EnableAspectJAutoProxy -//@EnableTransactionManagement(order = Ordered.LOWEST_PRECEDENCE - 10) -@EnableTransactionManagement -public class ExampleApplication { - - public static void main(String[] args) { - SpringApplication.run(ExampleApplication.class, args); - } - -} diff --git a/example/src/main/java/com/example/ExampleClientHttpRequestInterceptor.java b/example/src/main/java/com/example/ExampleClientHttpRequestInterceptor.java deleted file mode 100644 index a7d6b820..00000000 --- a/example/src/main/java/com/example/ExampleClientHttpRequestInterceptor.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.example; - -import com.aizuda.easy.retry.client.core.plugin.RequestHeaderPlugins; -import com.aizuda.easy.retry.client.core.plugin.ResponseHeaderPlugins; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpRequest; -import org.springframework.http.client.ClientHttpRequestExecution; -import org.springframework.http.client.ClientHttpRequestInterceptor; -import org.springframework.http.client.ClientHttpResponse; - -import java.io.IOException; -import java.util.Map; - -/** - * RestTemplate 拦截器 - * - * @author: www.byteblogs.com - * @date : 2022-04-17 15:22 - */ -public class ExampleClientHttpRequestInterceptor implements ClientHttpRequestInterceptor { - - @Override - public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution) throws IOException { - - before(request); - - ClientHttpResponse execute = execution.execute(request, body); - - after(execute); - - return execute; - } - - private void after(ClientHttpResponse execute) { - ResponseHeaderPlugins.responseHeader(execute.getHeaders()); - } - - private void before(HttpRequest request) { - - Map header = RequestHeaderPlugins.requestHeader(); - HttpHeaders headers = request.getHeaders(); - header.forEach((key, value) -> headers.add(key, value)); - - } -} diff --git a/example/src/main/java/com/example/ExampleFeignRequestInterceptor.java b/example/src/main/java/com/example/ExampleFeignRequestInterceptor.java deleted file mode 100644 index f7a3a35e..00000000 --- a/example/src/main/java/com/example/ExampleFeignRequestInterceptor.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.example; - -import com.aizuda.easy.retry.client.core.plugin.RequestHeaderPlugins; -import feign.RequestInterceptor; -import feign.RequestTemplate; -import org.springframework.stereotype.Component; - -import java.util.Map; - -/** - * @author: www.byteblogs.com - * @date : 2022-05-16 15:05 - */ -@Component -public class ExampleFeignRequestInterceptor implements RequestInterceptor { - - @Override - public void apply(RequestTemplate requestTemplate) { - - Map header = RequestHeaderPlugins.requestHeader(); - header.forEach((key, value) -> requestTemplate.header(key, value)); - - } - -} diff --git a/example/src/main/java/com/example/client/DemoClient.java b/example/src/main/java/com/example/client/DemoClient.java deleted file mode 100644 index a287b70e..00000000 --- a/example/src/main/java/com/example/client/DemoClient.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.example.client; - -import com.aizuda.easy.retry.common.core.model.Result; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; - -/** - * @author: www.byteblogs.com - * @date : 2022-05-16 15:32 - */ -@FeignClient(name = "daemoClient", url = "http://127.0.0.1:8089") -public interface DemoClient { - - @GetMapping("/school/id") - Result get(); -} diff --git a/example/src/main/java/com/example/client/FeignConfig.java b/example/src/main/java/com/example/client/FeignConfig.java deleted file mode 100644 index 8489a5c3..00000000 --- a/example/src/main/java/com/example/client/FeignConfig.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.example.client; - -import com.aizuda.easy.retry.client.core.plugin.ResponseHeaderPlugins; -import feign.FeignException; -import feign.Response; -import feign.codec.DecodeException; -import feign.codec.Decoder; -import feign.codec.StringDecoder; -import org.springframework.beans.factory.ObjectFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.http.HttpMessageConverters; -import org.springframework.cloud.openfeign.support.SpringDecoder; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -import java.io.IOException; -import java.lang.reflect.Type; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * @author: www.byteblogs.com - * @date : 2022-05-17 08:03 - */ -@Configuration -public class FeignConfig { - - @Bean - public Decoder decoder(@Autowired HttpMessageConverters httpMessageConverters) { - - ObjectFactory objectFactory = () -> httpMessageConverters; - - return new SpringDecoder(objectFactory) { - @Override - public Object decode(Response response, Type type) throws IOException, DecodeException, FeignException { - - Map> headers = response.headers(); - - Map> header = new HashMap<>(); - headers.forEach((key, value)-> { - header.put(key, (List) value); - }); - - ResponseHeaderPlugins.responseHeader(header); - return super.decode(response, type); - } - }; - } -} diff --git a/example/src/main/java/com/example/config/RestTemplateConfig.java b/example/src/main/java/com/example/config/RestTemplateConfig.java deleted file mode 100644 index 343fee1a..00000000 --- a/example/src/main/java/com/example/config/RestTemplateConfig.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.example.config; - -import com.example.ExampleClientHttpRequestInterceptor; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.http.client.ClientHttpRequestFactory; -import org.springframework.http.client.OkHttp3ClientHttpRequestFactory; -import org.springframework.web.client.RestTemplate; - -import java.util.Collections; - -/** - * @author: www.byteblogs.com - * @date : 2022-03-09 14:19 - */ -@Configuration -public class RestTemplateConfig { - - @Bean - public RestTemplate restTemplate(ClientHttpRequestFactory factory){ - RestTemplate restTemplate = new RestTemplate(factory); - restTemplate.setInterceptors(Collections.singletonList(new ExampleClientHttpRequestInterceptor())); - return restTemplate; - } - - @Bean - public ClientHttpRequestFactory okHttp3ClientHttpRequestFactory(){ - OkHttp3ClientHttpRequestFactory factory = new OkHttp3ClientHttpRequestFactory(); - factory.setReadTimeout(5000); - factory.setConnectTimeout(5000); - factory.setConnectTimeout(3000); - factory.setWriteTimeout(5000); - return factory; - } - - -} diff --git a/example/src/main/java/com/example/controller/SchoolController.java b/example/src/main/java/com/example/controller/SchoolController.java deleted file mode 100644 index 5764a6db..00000000 --- a/example/src/main/java/com/example/controller/SchoolController.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.example.controller; - -import com.aizuda.easy.retry.client.core.intercepter.RetrySiteSnapshot; -import com.aizuda.easy.retry.common.core.constant.SystemConstants; -import com.aizuda.easy.retry.common.core.model.Result; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.HashMap; -import java.util.Map; - -/** - *

- * 学校 前端控制器 - *

- * - * @author www.byteblogs.com - * @since 2022-03-24 - */ -@RestController -@RequestMapping("/school") -public class SchoolController { - - @GetMapping("/id") - public Result getSchool(HttpServletRequest request, HttpServletResponse response) { - - String header = request.getHeader(SystemConstants.EASY_RETRY_HEAD_KEY); - System.out.println(header); - - if (RetrySiteSnapshot.isRetryFlow()) { - response.addHeader(SystemConstants.EASY_RETRY_STATUS_CODE_KEY, SystemConstants.EASY_RETRY_STATUS_CODE); - } - - if (true) { - throw new UnsupportedOperationException("异常测试"); - } - - return new Result(0, "school"); - } - -} diff --git a/example/src/main/java/com/example/controller/SchoolStudentTeacherController.java b/example/src/main/java/com/example/controller/SchoolStudentTeacherController.java deleted file mode 100644 index 35d2e77b..00000000 --- a/example/src/main/java/com/example/controller/SchoolStudentTeacherController.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.example.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.stereotype.Controller; - -/** - *

- * 学校学生老师表 前端控制器 - *

- * - * @author www.byteblogs.com - * @since 2022-03-24 - */ -@Controller -@RequestMapping("/school-student-teacher") -public class SchoolStudentTeacherController { - -} diff --git a/example/src/main/java/com/example/controller/StudentController.java b/example/src/main/java/com/example/controller/StudentController.java deleted file mode 100644 index 55d5adb8..00000000 --- a/example/src/main/java/com/example/controller/StudentController.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.example.controller; - - -import com.aizuda.easy.retry.common.core.annotation.OriginalControllerReturnValue; -import com.example.demo.TestExistsTransactionalRetryService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RestController; - -import java.util.UUID; - -/** - *

- * 学生 前端控制器 - *

- * - * @author www.byteblogs.com - * @since 2022-03-24 - */ -@RestController -@RequestMapping("/student") -public class StudentController { - - @Autowired - private TestExistsTransactionalRetryService testExistsTransactionalRetryService; - - @GetMapping("query") - @OriginalControllerReturnValue - public String get() { - return testExistsTransactionalRetryService.testSimpleInsert(UUID.randomUUID().toString()); - } -} diff --git a/example/src/main/java/com/example/controller/TeacherController.java b/example/src/main/java/com/example/controller/TeacherController.java deleted file mode 100644 index cb6feec5..00000000 --- a/example/src/main/java/com/example/controller/TeacherController.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.example.controller; - -import com.aizuda.easy.retry.client.core.annotation.Retryable; -import com.aizuda.easy.retry.common.core.model.Result; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.client.RestTemplate; - -/** - *

- * 教师 前端控制器 - *

- * - * @author www.byteblogs.com - * @since 2022-03-24 - */ -@RestController -@RequestMapping("/teacher") -public class TeacherController { - - @Autowired - private RestTemplate restTemplate; - - @GetMapping("test-ddl") - public Result testDDL() { - Result result = restTemplate.getForObject("http://127.0.0.1:8088/school/id", Result.class); - result = restTemplate.getForObject("http://127.0.0.1:8088/school/id", Result.class); - result = restTemplate.getForObject("http://127.0.0.1:8088/school/id", Result.class); - result = restTemplate.getForObject("http://127.0.0.1:8088/school/id", Result.class); - - if (result.getStatus() == 0) { - throw new UnsupportedOperationException(result.getMessage()); - } - return result; - } - - @GetMapping("test-status-code") - @Retryable(scene = "testStatusCode", isThrowException = false) - public Result testStatusCode() { - Result result = restTemplate.getForObject("http://127.0.0.1:8088/school/id", Result.class); - - if (result.getStatus() == 0) { - throw new UnsupportedOperationException(result.getMessage()); - } - return result; - } -} diff --git a/example/src/main/java/com/example/controller/TestDdlController.java b/example/src/main/java/com/example/controller/TestDdlController.java deleted file mode 100644 index 4554a812..00000000 --- a/example/src/main/java/com/example/controller/TestDdlController.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.example.controller; - -import com.aizuda.easy.retry.client.core.annotation.Retryable; -import com.aizuda.easy.retry.client.core.retryer.RetryType; -import com.aizuda.easy.retry.common.core.model.Result; -import com.example.client.DemoClient; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.client.RestTemplate; - -/** - * @author: www.byteblogs.com - * @date : 2022-05-19 08:21 - */ -@RequestMapping("/ddl") -@RestController -public class TestDdlController { - - @Autowired - private RestTemplate restTemplate; - - @Autowired - private DemoClient demoClient; - - @GetMapping("rest-template") - public Result testDDL() { - Result result = restTemplate.getForObject("http://127.0.0.1:8088/school/id", Result.class); - - if (result.getStatus() == 0) { - throw new UnsupportedOperationException(result.getMessage()); - } - return result; - } - - @GetMapping("test-feign") - public Result feign() { - Result result = demoClient.get(); - if (result.getStatus() == 0) { - throw new UnsupportedOperationException(result.getMessage()); - } - return result; - - } - - @GetMapping("test-retry-header-controller-transfer") - @Retryable(scene = "testRetryHeaderControllerTransfer", retryStrategy = RetryType.ONLY_LOCAL) - public Result testRetryHeaderTransfer() { - Result result = demoClient.get(); - if (result.getStatus() == 0) { - throw new UnsupportedOperationException(result.getMessage()); - } - return result; - - } -} diff --git a/example/src/main/java/com/example/controller/TestStatusCodeController.java b/example/src/main/java/com/example/controller/TestStatusCodeController.java deleted file mode 100644 index c236722a..00000000 --- a/example/src/main/java/com/example/controller/TestStatusCodeController.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.example.controller; - -import com.aizuda.easy.retry.client.core.annotation.Retryable; -import com.aizuda.easy.retry.common.core.model.Result; -import com.example.client.DemoClient; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.client.RestTemplate; - -/** - * @author: www.byteblogs.com - * @date : 2022-05-19 08:24 - */ -@RequestMapping("/status-code") -@RestController -public class TestStatusCodeController { - - @Autowired - private RestTemplate restTemplate; - - @Autowired - private DemoClient demoClient; - - @GetMapping("rest-template") - @Retryable(scene = "testRestTemplateStatusCode") - public Result testRestTemplateStatusCode() { - Result result = restTemplate.getForObject("http://127.0.0.1:8088/school/id", Result.class); - - if (result.getStatus() == 0) { - throw new UnsupportedOperationException(result.getMessage()); - } - return result; - } - - @GetMapping("feign") - @Retryable(scene = "testFeignStatusCode") - public Result testFeignStatusCode() { - Result result = demoClient.get(); - - if (result.getStatus() == 0) { - throw new UnsupportedOperationException(result.getMessage()); - } - return result; - } -} diff --git a/example/src/main/java/com/example/demo/CustomAsyncCreateTask.java b/example/src/main/java/com/example/demo/CustomAsyncCreateTask.java deleted file mode 100644 index 755dd2e6..00000000 --- a/example/src/main/java/com/example/demo/CustomAsyncCreateTask.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.example.demo; - -import com.aizuda.easy.retry.client.core.annotation.ExecutorMethodRegister; -import com.aizuda.easy.retry.client.core.strategy.ExecutorMethod; -import com.aizuda.easy.retry.common.core.util.JsonUtil; -import lombok.extern.slf4j.Slf4j; - -/** - * 测试手动重试并同步上报任务 - * - * @author: www.byteblogs.com - * @date : 2022-03-07 14:07 - * @since 1.3.0 - */ -@ExecutorMethodRegister(scene = CustomAsyncCreateTask.SCENE, async = true, forceReport = true) -@Slf4j -public class CustomAsyncCreateTask implements ExecutorMethod { - - public static final String SCENE = "customAsyncCreateTask"; - - @Override - public Object doExecute(Object obj) { - log.info(SCENE + " params:[{}]", JsonUtil.toJsonString(obj)); - return "测试成功"; - } - -} diff --git a/example/src/main/java/com/example/demo/CustomSyncCreateTask.java b/example/src/main/java/com/example/demo/CustomSyncCreateTask.java deleted file mode 100644 index 19a902d3..00000000 --- a/example/src/main/java/com/example/demo/CustomSyncCreateTask.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.example.demo; - -import com.aizuda.easy.retry.client.core.annotation.ExecutorMethodRegister; -import com.aizuda.easy.retry.client.core.strategy.ExecutorMethod; -import com.aizuda.easy.retry.common.core.util.JsonUtil; -import lombok.extern.slf4j.Slf4j; - -import java.util.concurrent.TimeUnit; - -/** - * 测试手动重试并同步上报任务 - * - * @author: www.byteblogs.com - * @date : 2022-03-07 14:07 - * @since 1.3.0 - */ -@ExecutorMethodRegister(scene = CustomSyncCreateTask.SCENE, async = false, timeout = 10000, unit = TimeUnit.MILLISECONDS, forceReport = true) -@Slf4j -public class CustomSyncCreateTask implements ExecutorMethod { - - public static final String SCENE = "customSyncCreateTask"; - - @Override - public Object doExecute(Object obj) { - log.info(SCENE + " params:[{}]", JsonUtil.toJsonString(obj)); - return "测试成功"; - } - -} diff --git a/example/src/main/java/com/example/demo/MyExecutorMethod.java b/example/src/main/java/com/example/demo/MyExecutorMethod.java deleted file mode 100644 index 430913f0..00000000 --- a/example/src/main/java/com/example/demo/MyExecutorMethod.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.example.demo; - -import com.aizuda.easy.retry.client.core.strategy.ExecutorMethod; -import com.aizuda.easy.retry.common.core.util.JsonUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - - -/** - * @author: www.byteblogs.com - * @date : 2022-03-07 14:07 - */ -@Component -@Slf4j -public class MyExecutorMethod implements ExecutorMethod { - - @Override - public Object doExecute(Object params) { - log.info("测试自定义重试方法 MyExecutorMethod params:[{}]", JsonUtil.toJsonString(params)); - return "测试成功"; - } - -} diff --git a/example/src/main/java/com/example/demo/NestMethodService.java b/example/src/main/java/com/example/demo/NestMethodService.java deleted file mode 100644 index 21f68464..00000000 --- a/example/src/main/java/com/example/demo/NestMethodService.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.example.demo; - -import com.aizuda.easy.retry.client.core.annotation.Retryable; -import com.aizuda.easy.retry.client.core.exception.EasyRetryClientException; -import com.aizuda.easy.retry.client.core.intercepter.RetrySiteSnapshot; -import com.aizuda.easy.retry.client.core.intercepter.RetrySiteSnapshot.EnumStage; -import com.aizuda.easy.retry.client.core.retryer.EasyRetryTemplate; -import com.aizuda.easy.retry.client.core.retryer.RetryTaskTemplateBuilder; -import com.aizuda.easy.retry.common.core.model.Result; -import com.example.model.Zoo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - -import java.time.LocalDateTime; -import java.util.Random; -import java.util.UUID; - -/** - * @author: www.byteblogs.com - * @date : 2022-03-27 22:37 - */ -@Component -public class NestMethodService { - - @Autowired - private TestExistsTransactionalRetryService testExistsTransactionalRetryService; - @Autowired - private RemoteService remoteService; - - @Retryable(scene = "testNestMethod" , isThrowException = false) - @Transactional - public void testNestMethod() { - testExistsTransactionalRetryService.testSimpleInsert(UUID.randomUUID().toString()); - } - - @Retryable(scene = "testNestMethodForCustomSyncCreateTask" , isThrowException = false) - @Transactional - public void testNestMethodForCustomSyncCreateTask() { - - if (RetrySiteSnapshot.getStage() == null || RetrySiteSnapshot.getStage() == EnumStage.LOCAL.getStage()) { - throw new EasyRetryClientException("测试注解重试和手动重试"); - } - - // 同步强制上报 - Zoo zoo = new Zoo(); - zoo.setNow(LocalDateTime.now()); - EasyRetryTemplate retryTemplate = RetryTaskTemplateBuilder.newBuilder() - .withExecutorMethod(CustomSyncCreateTask.class) - .withParam(zoo) - .withScene(CustomSyncCreateTask.SCENE) - .build(); - - retryTemplate.executeRetry(); - - // 异步强制上报 - zoo.setNow(LocalDateTime.now()); - retryTemplate = RetryTaskTemplateBuilder.newBuilder() - .withExecutorMethod(CustomAsyncCreateTask.class) - .withParam(zoo) - .withScene(CustomAsyncCreateTask.SCENE) - .build(); - retryTemplate.executeRetry(); - } -} diff --git a/example/src/main/java/com/example/demo/RemoteService.java b/example/src/main/java/com/example/demo/RemoteService.java deleted file mode 100644 index 88c54dae..00000000 --- a/example/src/main/java/com/example/demo/RemoteService.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.example.demo; - -import com.aizuda.easy.retry.common.core.model.Result; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import org.springframework.web.client.RestTemplate; - -/** - * @author: www.byteblogs.com - * @date : 2022-03-26 10:14 - */ -@Component -public class RemoteService { - - @Autowired - private RestTemplate restTemplate; - - public Result call() { - return restTemplate.getForObject("http://127.0.0.1:8089/school/id", Result.class); -// return new Result(); - } -} diff --git a/example/src/main/java/com/example/demo/RetryRegisterService.java b/example/src/main/java/com/example/demo/RetryRegisterService.java deleted file mode 100644 index b7766c4f..00000000 --- a/example/src/main/java/com/example/demo/RetryRegisterService.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.example.demo; - -import cn.hutool.core.lang.UUID; -import com.aizuda.easy.retry.client.core.annotation.Retryable; -import com.aizuda.easy.retry.client.core.retryer.RetryType; -import com.example.model.Cat; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @author: www.byteblogs.com - * @date : 2022-03-04 16:07 - */ -@Service -public class RetryRegisterService { - - /** - * 测试简单的异常情况 - */ - @Retryable(scene = "errorMethod1") - public String errorMethod1(List name) { - - double i = 1 / 0; - - return "这是一个简单的异常方法"; - } - -} diff --git a/example/src/main/java/com/example/demo/TestEventListener.java b/example/src/main/java/com/example/demo/TestEventListener.java deleted file mode 100644 index c70da0cf..00000000 --- a/example/src/main/java/com/example/demo/TestEventListener.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.example.demo; - -import com.example.model.TransactionalEvent; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; -import org.springframework.transaction.event.TransactionPhase; -import org.springframework.transaction.event.TransactionalEventListener; - -/** - * @author: www.byteblogs.com - * @date : 2023-04-25 22:46 - */ -@Component -@Slf4j -public class TestEventListener { - - @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT, fallbackExecution = true) - public void beforeConfirmSell(TransactionalEvent event) { - log.info("触发beforeConfirmSell事件 [{}]", event); - - } -} diff --git a/example/src/main/java/com/example/demo/TestExistsTransactionalRetryService.java b/example/src/main/java/com/example/demo/TestExistsTransactionalRetryService.java deleted file mode 100644 index ebb45519..00000000 --- a/example/src/main/java/com/example/demo/TestExistsTransactionalRetryService.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.example.demo; - -import com.aizuda.easy.retry.client.core.annotation.Retryable; -import com.aizuda.easy.retry.common.core.context.SpringContext; -import com.aizuda.easy.retry.common.core.model.Result; -import com.example.mapper.SchoolMapper; -import com.example.mapper.StudentMapper; -import com.example.model.TransactionalEvent; -import com.example.po.School; -import com.example.po.Student; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - -import java.time.LocalDateTime; -import java.util.UUID; - -/** - * @author: www.byteblogs.com - * @date : 2022-03-26 09:08 - */ -@Component -public class TestExistsTransactionalRetryService { - - @Autowired - private SchoolMapper schoolMapper; - - @Autowired - private StudentMapper studentMapper; - - @Autowired - private RemoteService remoteService; - - @Retryable(scene = "testSimpleInsert", bizNo = "#name", localTimes = 3, isThrowException = false) - @Transactional - public String testSimpleInsert(String name) { - - School school = new School(); - school.setName(name); - school.setAddress(UUID.randomUUID().toString()); - school.setCreateDt(LocalDateTime.now()); - school.setUpdateDt(LocalDateTime.now()); - schoolMapper.insert(school); - - Student student = new Student(); - student.setName(name); - student.setAge(1); - student.setCreateDt(LocalDateTime.now()); - student.setUpdateDt(LocalDateTime.now()); - studentMapper.insert(student); - - Result call = remoteService.call(); - System.out.println("-------------->"+call.getMessage()); - if (call.getStatus() == 0) { - throw new UnsupportedOperationException("调用远程失败" + school.getAddress()); - } - -// TransactionalEvent event = new TransactionalEvent<>("123"); -// SpringContext.CONTEXT.publishEvent(event); - - return "testSimpleInsert"+school.getAddress(); - } - -} diff --git a/example/src/main/java/com/example/demo/TestExistsTransactionalRetryService2.java b/example/src/main/java/com/example/demo/TestExistsTransactionalRetryService2.java deleted file mode 100644 index 4ead79e9..00000000 --- a/example/src/main/java/com/example/demo/TestExistsTransactionalRetryService2.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.example.demo; - -import com.aizuda.easy.retry.client.core.annotation.Retryable; -import com.aizuda.easy.retry.common.core.context.SpringContext; -import com.aizuda.easy.retry.common.core.model.Result; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.example.mapper.SchoolMapper; -import com.example.mapper.StudentMapper; -import com.example.model.TransactionalEvent; -import com.example.po.School; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - -import java.time.LocalDateTime; -import java.util.UUID; - -/** - * @author: www.byteblogs.com - * @date : 2022-03-26 09:08 - */ -@Component -public class TestExistsTransactionalRetryService2 { - - @Autowired - private SchoolMapper schoolMapper; - - @Autowired - private StudentMapper studentMapper; - - @Autowired - private RemoteService remoteService; - - @Retryable(scene = "testSimpleUpdate", bizNo = "#name", localTimes = 5) - @Transactional - public String testSimpleUpdate(Long id) { - - School school = new School(); - school.setAddress(UUID.randomUUID().toString()); - school.setCreateDt(LocalDateTime.now()); - school.setUpdateDt(LocalDateTime.now()); - schoolMapper.update(school, new LambdaQueryWrapper() - .eq(School::getId, id)); - - - Result call = remoteService.call(); - System.out.println("-------------->"+call.getMessage()); - if (call.getStatus() == 0) { - throw new UnsupportedOperationException("调用远程失败"); - } - - TransactionalEvent event = new TransactionalEvent<>("123"); - SpringContext.CONTEXT.publishEvent(event); - - return "testSimpleInsert"+school.getAddress(); - } - -} diff --git a/example/src/main/java/com/example/demo/TestRetryMethodComplexParamaterService.java b/example/src/main/java/com/example/demo/TestRetryMethodComplexParamaterService.java deleted file mode 100644 index 7fecbb68..00000000 --- a/example/src/main/java/com/example/demo/TestRetryMethodComplexParamaterService.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.example.demo; - -import com.aizuda.easy.retry.client.core.annotation.Retryable; -import com.aizuda.easy.retry.common.core.log.LogUtils; -import com.example.model.Dog; -import com.example.model.Zoo; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -import java.time.LocalDateTime; -import java.util.List; - -/** - * @author: www.byteblogs.com - * @date : 2022-03-07 14:06 - */ -@Component -@Slf4j -public class TestRetryMethodComplexParamaterService { - - @Retryable(scene = "testRetryMethodForZoo") - public String testRetryMethod(Zoo zoo) { - LogUtils.debug(log,"testRetryMethodForZoo zoo:[{}]", zoo); - double i = 1 / 0; - - return "测试自定义重试方法"; - } - - @Retryable(scene = "testRetryMethodForZooList") - public String testRetryMethod(List zoo, Dog dog) { - LogUtils.debug(log, "testRetryMethodForZooList zoo:[{}] dog:[{}]", zoo, dog); - double i = 1 / 0; - return "测试自定义重试方法"; - } - - -} diff --git a/example/src/main/java/com/example/demo/TestRetryMethodService.java b/example/src/main/java/com/example/demo/TestRetryMethodService.java deleted file mode 100644 index 8917c94f..00000000 --- a/example/src/main/java/com/example/demo/TestRetryMethodService.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.example.demo; - -import com.aizuda.easy.retry.client.core.annotation.Retryable; -import com.aizuda.easy.retry.client.core.retryer.RetryType; -import com.example.client.DemoClient; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * @author: www.byteblogs.com - * @date : 2022-03-07 14:06 - */ -@Component -public class TestRetryMethodService { - - @Autowired - private DemoClient demoClient; - - @Retryable(scene = "testRetryMethod", retryMethod = MyExecutorMethod.class, retryStrategy = RetryType.ONLY_REMOTE) - public String testRetryMethod(String p) { - double i = 1 / 0; - return "测试自定义重试方法"; - } - - @Retryable(scene = "testRetryHeaderTransfer", retryStrategy = RetryType.ONLY_LOCAL, localTimes = 1) - public String testRetryHeaderTransfer(String p) { - demoClient.get(); - demoClient.get(); - demoClient.get(); - double i = 1 / 0; - return "测试重试流量标识服务间传递"; - } -} diff --git a/example/src/main/java/com/example/demo/TestRetryStrategyService.java b/example/src/main/java/com/example/demo/TestRetryStrategyService.java deleted file mode 100644 index c8669278..00000000 --- a/example/src/main/java/com/example/demo/TestRetryStrategyService.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.example.demo; - -import com.aizuda.easy.retry.client.core.annotation.Retryable; -import com.aizuda.easy.retry.client.core.retryer.RetryType; -import org.springframework.stereotype.Component; - -/** - * @author: www.byteblogs.com - * @date : 2022-03-07 14:03 - */ -@Component -public class TestRetryStrategyService { - - /** - * 测试仅内存重试和远程重试 - */ - @Retryable(scene = "errorMethodForLocalAndRemote", localTimes = 3, retryStrategy = RetryType.LOCAL_REMOTE) - public String errorMethodForLocalAndRemote(String name) { - - double i = 1 / 0; - - return "这是一个简单的异常方法"; - } - - /** - * 测试仅内存重试 - */ - @Retryable(scene = "errorMethodForOnlyLocal", localTimes = 3, retryStrategy = RetryType.ONLY_LOCAL) - public String errorMethodForOnlyLocal(String name) { - - double i = 1 / 0; - - return "测试仅内存重试"; - } - - /** - * 测试仅内存重试 - */ - @Retryable(scene = "errorMethodForOnlyRemote", bizNo = "#name", localTimes = 3, retryStrategy = RetryType.ONLY_REMOTE) - public String errorMethodForOnlyRemote(String name) { - - double i = 1 / 0; - - return "测试仅内存重试"; - } - -} diff --git a/example/src/main/java/com/example/mapper/SchoolMapper.java b/example/src/main/java/com/example/mapper/SchoolMapper.java deleted file mode 100644 index a228dc46..00000000 --- a/example/src/main/java/com/example/mapper/SchoolMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.example.mapper; - -import com.example.po.School; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - *

- * 学校 Mapper 接口 - *

- * - * @author www.byteblogs.com - * @since 2022-03-24 - */ -@Mapper -public interface SchoolMapper extends BaseMapper { - -} diff --git a/example/src/main/java/com/example/mapper/SchoolStudentTeacherMapper.java b/example/src/main/java/com/example/mapper/SchoolStudentTeacherMapper.java deleted file mode 100644 index a69bb184..00000000 --- a/example/src/main/java/com/example/mapper/SchoolStudentTeacherMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.example.mapper; - -import com.example.po.SchoolStudentTeacher; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - *

- * 学校学生老师表 Mapper 接口 - *

- * - * @author www.byteblogs.com - * @since 2022-03-24 - */ -@Mapper -public interface SchoolStudentTeacherMapper extends BaseMapper { - -} diff --git a/example/src/main/java/com/example/mapper/StudentMapper.java b/example/src/main/java/com/example/mapper/StudentMapper.java deleted file mode 100644 index d64bceb3..00000000 --- a/example/src/main/java/com/example/mapper/StudentMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.example.mapper; - -import com.example.po.Student; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - *

- * 学生 Mapper 接口 - *

- * - * @author www.byteblogs.com - * @since 2022-03-24 - */ -@Mapper -public interface StudentMapper extends BaseMapper { - -} diff --git a/example/src/main/java/com/example/mapper/TeacherMapper.java b/example/src/main/java/com/example/mapper/TeacherMapper.java deleted file mode 100644 index 75df8440..00000000 --- a/example/src/main/java/com/example/mapper/TeacherMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.example.mapper; - -import com.example.po.Teacher; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - *

- * 教师 Mapper 接口 - *

- * - * @author www.byteblogs.com - * @since 2022-03-24 - */ -@Mapper -public interface TeacherMapper extends BaseMapper { - -} diff --git a/example/src/main/java/com/example/model/Cat.java b/example/src/main/java/com/example/model/Cat.java deleted file mode 100644 index 5698d3d1..00000000 --- a/example/src/main/java/com/example/model/Cat.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.example.model; - -import lombok.Data; - -/** - * @author: www.byteblogs.com - * @date : 2022-03-21 11:17 - */ -@Data -public class Cat { - private String name; - private int age; - -} diff --git a/example/src/main/java/com/example/model/Dog.java b/example/src/main/java/com/example/model/Dog.java deleted file mode 100644 index c0c4fb98..00000000 --- a/example/src/main/java/com/example/model/Dog.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.example.model; - -import lombok.Data; - -/** - * @author: www.byteblogs.com - * @date : 2022-03-21 11:17 - */ -@Data -public class Dog { - private String name; - private int age; -} diff --git a/example/src/main/java/com/example/model/TransactionalEvent.java b/example/src/main/java/com/example/model/TransactionalEvent.java deleted file mode 100644 index ab94c1a5..00000000 --- a/example/src/main/java/com/example/model/TransactionalEvent.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.example.model; - -import lombok.Getter; -import org.springframework.context.ApplicationEvent; - -/** - * @author: www.byteblogs.com - * @date : 2023-04-25 22:48 - */ -@Getter -public class TransactionalEvent extends ApplicationEvent { - - private T data; - - public TransactionalEvent(final T source) { - super(source); - } -} diff --git a/example/src/main/java/com/example/model/Zoo.java b/example/src/main/java/com/example/model/Zoo.java deleted file mode 100644 index 1020ddb5..00000000 --- a/example/src/main/java/com/example/model/Zoo.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.example.model; - -import lombok.Data; - -import java.time.LocalDateTime; -import java.util.List; - -/** - * @author: www.byteblogs.com - * @date : 2022-03-21 11:17 - */ -@Data -public class Zoo { - private Dog dog; - private List list; - private LocalDateTime now; -} diff --git a/example/src/main/java/com/example/po/School.java b/example/src/main/java/com/example/po/School.java deleted file mode 100644 index c9bcb2ee..00000000 --- a/example/src/main/java/com/example/po/School.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.example.po; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import lombok.Data; - -import java.io.Serializable; -import java.time.LocalDateTime; - - -/** - *

- * 学校 - *

- * - * @author www.byteblogs.com - * @since 2022-03-24 - */ -@Data -public class School implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId(value = "id", type = IdType.AUTO) - private Long id; - - private String name; - - private String address; - - private LocalDateTime createDt; - - private LocalDateTime updateDt; - -} diff --git a/example/src/main/java/com/example/po/SchoolStudentTeacher.java b/example/src/main/java/com/example/po/SchoolStudentTeacher.java deleted file mode 100644 index 91fdd621..00000000 --- a/example/src/main/java/com/example/po/SchoolStudentTeacher.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.example.po; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; -import java.time.LocalDateTime; - - -/** - *

- * 学校学生老师表 - *

- * - * @author www.byteblogs.com - * @since 2022-03-24 - */ -@TableName("school_student_teacher") -@Data -public class SchoolStudentTeacher implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId(value = "id", type = IdType.AUTO) - private Long id; - - private Long schoolId; - - private Long teacherId; - - private Long studentId; - - private LocalDateTime createDt; - - private LocalDateTime updateDt; - -} diff --git a/example/src/main/java/com/example/po/Student.java b/example/src/main/java/com/example/po/Student.java deleted file mode 100644 index e773ec7d..00000000 --- a/example/src/main/java/com/example/po/Student.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.example.po; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; -import java.time.LocalDateTime; -import lombok.Data; - -/** - *

- * 学生 - *

- * - * @author www.byteblogs.com - * @since 2022-03-24 - */ -@Data -public class Student implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId(value = "id", type = IdType.AUTO) - private Long id; - - private String name; - - private Integer age; - - private LocalDateTime createDt; - - private LocalDateTime updateDt; - -} diff --git a/example/src/main/java/com/example/po/Teacher.java b/example/src/main/java/com/example/po/Teacher.java deleted file mode 100644 index cc9b4c53..00000000 --- a/example/src/main/java/com/example/po/Teacher.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.example.po; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; -import java.time.LocalDateTime; -import lombok.Data; - -/** - *

- * 教师 - *

- * - * @author www.byteblogs.com - * @since 2022-03-24 - */ -@Data -public class Teacher implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId(value = "id", type = IdType.AUTO) - private Long id; - - private String name; - - private Integer age; - - private LocalDateTime createDt; - - private LocalDateTime updateDt; - -} diff --git a/example/src/main/resources/application.yml b/example/src/main/resources/application.yml deleted file mode 100644 index 8e42e92b..00000000 --- a/example/src/main/resources/application.yml +++ /dev/null @@ -1,41 +0,0 @@ -server: - port: 8088 -spring: - profiles: - active: dev - datasource: - name: x_retry - url: jdbc:mysql://localhost:3306/demo?useSSL=false&characterEncoding=utf8&useUnicode=true - username: root - password: root - type: com.zaxxer.hikari.HikariDataSource - driver-class-name: com.mysql.jdbc.Driver - hikari: - connection-timeout: 30000 - minimum-idle: 5 - maximum-pool-size: 20 - auto-commit: true - idle-timeout: 30000 - pool-name: demo - max-lifetime: 1800000 - connection-test-query: SELECT 1 -mybatis-plus: - mapper-locations: classpath:/mapper/*.xml - typeAliasesPackage: com.x.retry.server.persistence.mybatis.po - global-config: - db-config: - field-strategy: NOT_EMPTY - capital-mode: false - logic-delete-value: 1 - logic-not-delete-value: 0 - configuration: - map-underscore-to-camel-case: true - cache-enabled: true - -logging: - config: classpath:logback-boot.xml - -easy-retry: - server: - host: 127.0.0.1 - port: 1788 diff --git a/example/src/main/resources/logback-boot.xml b/example/src/main/resources/logback-boot.xml deleted file mode 100644 index 35571c6b..00000000 --- a/example/src/main/resources/logback-boot.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - %d %p (%file:%line\)- %m%n - - UTF-8 - - - - - - - log/sys.log - - - - - - log/sys.%d.%i.log - - 30 - true - - - 10MB - - - - - - %d %p (%file:%line\)- %m%n - - - UTF-8 - - - - - - - - - - - - - diff --git a/example/src/main/resources/mapper/SchoolMapper.xml b/example/src/main/resources/mapper/SchoolMapper.xml deleted file mode 100644 index 58794354..00000000 --- a/example/src/main/resources/mapper/SchoolMapper.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/example/src/main/resources/mapper/SchoolStudentTeacherMapper.xml b/example/src/main/resources/mapper/SchoolStudentTeacherMapper.xml deleted file mode 100644 index 389a9747..00000000 --- a/example/src/main/resources/mapper/SchoolStudentTeacherMapper.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/example/src/main/resources/mapper/StudentMapper.xml b/example/src/main/resources/mapper/StudentMapper.xml deleted file mode 100644 index 0bcce15e..00000000 --- a/example/src/main/resources/mapper/StudentMapper.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/example/src/main/resources/mapper/TeacherMapper.xml b/example/src/main/resources/mapper/TeacherMapper.xml deleted file mode 100644 index ec97cae7..00000000 --- a/example/src/main/resources/mapper/TeacherMapper.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/example/src/test/java/com/example/EasyRetryTemplateTest.java b/example/src/test/java/com/example/EasyRetryTemplateTest.java deleted file mode 100644 index ecea9243..00000000 --- a/example/src/test/java/com/example/EasyRetryTemplateTest.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.example; - -import com.aizuda.easy.retry.client.core.retryer.EasyRetryTemplate; -import com.aizuda.easy.retry.client.core.retryer.RetryTaskTemplateBuilder; -import com.aizuda.easy.retry.common.core.model.Result; -import com.example.demo.CustomAsyncCreateTask; -import com.example.demo.CustomSyncCreateTask; -import com.example.demo.NestMethodService; -import com.example.demo.RemoteService; -import com.example.model.Cat; -import com.example.model.Zoo; -import lombok.extern.slf4j.Slf4j; -import org.junit.jupiter.api.Test; -import org.mockito.Mockito; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; - -import java.time.LocalDateTime; -import java.util.UUID; - -/** - * @author: www.byteblogs.com - * @date : 2023-05-10 13:47 - */ -@SpringBootTest -@Slf4j -public class EasyRetryTemplateTest { - - @Autowired - private NestMethodService nestMethodService; - @MockBean - private RemoteService remoteService; - - @Test - public void generateAsyncTaskTest() throws InterruptedException { - - Cat cat = new Cat(); - cat.setName("zsd"); - Zoo zoo = new Zoo(); - zoo.setNow(LocalDateTime.now()); - EasyRetryTemplate retryTemplate = RetryTaskTemplateBuilder.newBuilder() - .withExecutorMethod(CustomAsyncCreateTask.class) - .withParam(zoo) - .withScene(CustomAsyncCreateTask.SCENE) - .build(); - - retryTemplate.executeRetry(); - - Thread.sleep(90000); - } - - @Test - public void generateSyncTask() { - - Zoo zoo = new Zoo(); - zoo.setNow(LocalDateTime.now()); - EasyRetryTemplate retryTemplate = RetryTaskTemplateBuilder.newBuilder() - .withExecutorMethod(CustomSyncCreateTask.class) - .withParam(zoo) - .withScene(CustomSyncCreateTask.SCENE) - .build(); - - retryTemplate.executeRetry(); - - } - - @Test - public void testNestMethodForCustomSyncCreateTask() throws InterruptedException { - nestMethodService.testNestMethodForCustomSyncCreateTask(); - - Thread.sleep(90000); - } - -} diff --git a/example/src/test/java/com/example/ExampleApplicationTests.java b/example/src/test/java/com/example/ExampleApplicationTests.java deleted file mode 100644 index 7843cc3f..00000000 --- a/example/src/test/java/com/example/ExampleApplicationTests.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.example; - -import com.aizuda.easy.retry.common.core.model.Result; -import com.example.client.DemoClient; -import com.example.mapper.SchoolMapper; -import com.example.po.School; -import lombok.extern.slf4j.Slf4j; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.web.client.RestTemplate; - -@SpringBootTest -@Slf4j -public class ExampleApplicationTests { - - @Autowired - private SchoolMapper schoolMapper; - - @Autowired - private RestTemplate restTemplate; - - @Autowired(required = false) - private DemoClient demoClient; - - @Test - public void demoClient() { - Result s = demoClient.get(); - System.out.println(s); - } - - @Test - public void test() { - School school = new School(); - school.setAddress("上海"); - school.setName("复旦"); - schoolMapper.insert(school); - } - - @Test - public void test1() { - String template = restTemplate.getForObject("http://127.0.0.1:8088/school/id", String.class); - System.out.println(template); - } - -} diff --git a/example/src/test/java/com/example/ExistsTransactionalRetryServiceTest.java b/example/src/test/java/com/example/ExistsTransactionalRetryServiceTest.java deleted file mode 100644 index e13b5009..00000000 --- a/example/src/test/java/com/example/ExistsTransactionalRetryServiceTest.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.example; - -import com.aizuda.easy.retry.common.core.model.Result; -import com.example.demo.RemoteService; -import com.example.demo.TestExistsTransactionalRetryService; -import com.example.demo.TestExistsTransactionalRetryService2; -import lombok.SneakyThrows; -import lombok.extern.slf4j.Slf4j; -import org.junit.jupiter.api.Test; -import org.mockito.Mockito; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; - -import java.util.UUID; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; - -/** - * @author: www.byteblogs.com - * @date : 2022-03-26 09:12 - */ -@SpringBootTest -@Slf4j -public class ExistsTransactionalRetryServiceTest { - - @Autowired - private TestExistsTransactionalRetryService testExistsTransactionalRetryService; - @MockBean - private RemoteService remoteService; - @Autowired - private TestExistsTransactionalRetryService2 testExistsTransactionalRetryService2; - - @SneakyThrows - @Test - public void testSimpleInsert() { - - Mockito.when(remoteService.call()) - .thenReturn(new Result(0, "1")) - .thenReturn(new Result(0, "2")) - .thenReturn(new Result(0, "3")) - .thenReturn(new Result(0, "4")) - .thenReturn(new Result(0, "5")) - ; - try { - String s = testExistsTransactionalRetryService.testSimpleInsert(UUID.randomUUID().toString()); - System.out.println(s); - } catch (Exception e) { - log.error("重试未成功", e); - } - - Thread.sleep(90000); - - } - - @SneakyThrows - @Test - public void testSimpleUpdate() { - - Mockito.when(remoteService.call()) - .thenReturn(new Result(0, "1")) - .thenReturn(new Result(0, "2")) - .thenReturn(new Result(0, "3")) - .thenReturn(new Result(0, "4")) - .thenReturn(new Result(1, "5")) - ; - try { - String s = testExistsTransactionalRetryService2.testSimpleUpdate(5651L); - System.out.println(s); - } catch (Exception e) { - log.error("", e); - } - - Thread.sleep(90000); - - } - - @SneakyThrows - @Test - public void syncTestSimpleInsert() { - ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(10, 50, 1, TimeUnit.SECONDS, new LinkedBlockingQueue<>()); - - Mockito.when(remoteService.call()) - .thenReturn(new Result(0, "1")) - .thenReturn(new Result(0, "2")) - .thenReturn(new Result(0, "3")) - .thenReturn(new Result(0, "4")) - .thenReturn(new Result(5, "5")) - ; - try { - for (int i = 0; i < 1000; i++) { - threadPoolExecutor.execute(() -> testExistsTransactionalRetryService.testSimpleInsert(UUID.randomUUID().toString())); - } - } catch (Exception e) { - log.error("", e); - } - - Thread.sleep(900000); - - } -} diff --git a/example/src/test/java/com/example/NestMethodServiceTest.java b/example/src/test/java/com/example/NestMethodServiceTest.java deleted file mode 100644 index 0b21971b..00000000 --- a/example/src/test/java/com/example/NestMethodServiceTest.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.example; - -import com.aizuda.easy.retry.common.core.model.Result; -import com.example.demo.NestMethodService; -import com.example.demo.RemoteService; -import lombok.SneakyThrows; -import org.junit.jupiter.api.Test; -import org.mockito.Mockito; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; - -/** - * @author: www.byteblogs.com - * @date : 2022-03-27 22:40 - */ -@SpringBootTest -public class NestMethodServiceTest { - - @Autowired - private NestMethodService nestMethodService; - @MockBean - private RemoteService remoteService; - - @SneakyThrows - @Test - public void testNestMethod() { - Mockito.when(remoteService.call()) - .thenReturn(new Result(0, "1")) - .thenReturn(new Result(0, "2")) - .thenReturn(new Result(0, "3")) - .thenReturn(new Result(0, "4")) - .thenReturn(new Result(1, "5")) - ; - try { - nestMethodService.testNestMethod(); - } catch (Exception e) { - System.out.println(e); - } - - Thread.sleep(90000); - } -} diff --git a/example/src/test/java/com/example/RetryMethodComplexParamaterServiceTest.java b/example/src/test/java/com/example/RetryMethodComplexParamaterServiceTest.java deleted file mode 100644 index 918e1ba5..00000000 --- a/example/src/test/java/com/example/RetryMethodComplexParamaterServiceTest.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.example; - -import com.example.demo.TestRetryMethodComplexParamaterService; -import com.example.model.Cat; -import com.example.model.Dog; -import com.example.model.Zoo; -import lombok.SneakyThrows; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; - -import java.util.Arrays; -import java.util.UUID; - -/** - * @author: www.byteblogs.com - * @date : 2022-03-21 11:32 - */ -@SpringBootTest -public class RetryMethodComplexParamaterServiceTest { - - @Autowired - private TestRetryMethodComplexParamaterService testRetryMethodComplexParamaterService; - - @SneakyThrows - @Test - public void testRetryMethodForZoo() { - Zoo zoo = new Zoo(); - - Dog dog = new Dog(); - dog.setName(UUID.randomUUID().toString()); - dog.setAge(10); - zoo.setDog(dog); - - Cat cat = new Cat(); - cat.setAge(1); - cat.setName(UUID.randomUUID().toString()); - zoo.setList(Arrays.asList(cat)); - - try { - testRetryMethodComplexParamaterService.testRetryMethod(zoo); - } catch (Exception e) { - } - - Thread.sleep(90000); - } - - @SneakyThrows - @Test - public void testRetryMethodForZooList() { - Zoo zoo = new Zoo(); - - Dog dog = new Dog(); - dog.setName(UUID.randomUUID().toString()); - dog.setAge(10); - zoo.setDog(dog); - - Cat cat = new Cat(); - cat.setAge(1); - cat.setName(UUID.randomUUID().toString()); - zoo.setList(Arrays.asList(cat)); - - try { - testRetryMethodComplexParamaterService.testRetryMethod(Arrays.asList(zoo), dog); - } catch (Exception e) { - } - - Thread.sleep(90000); - } - -} diff --git a/example/src/test/java/com/example/RetryRegisterServiceTest.java b/example/src/test/java/com/example/RetryRegisterServiceTest.java deleted file mode 100644 index 0410f74f..00000000 --- a/example/src/test/java/com/example/RetryRegisterServiceTest.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.example; - -import com.example.demo.RetryRegisterService; -import com.example.model.Cat; -import lombok.SneakyThrows; -import org.apache.commons.lang.StringUtils; -import org.awaitility.Awaitility; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; - -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; -import java.util.concurrent.Callable; -import java.util.concurrent.TimeUnit; - -/** - * @author: www.byteblogs.com - * @date : 2022-03-04 17:29 - */ -@SpringBootTest -public class RetryRegisterServiceTest { - - @Autowired - private RetryRegisterService retryRegisterService; - - @SneakyThrows - @Test - public void errorMethod1() { - - try { - List list = new ArrayList<>(); - Cat cat = new Cat(); - cat.setName(UUID.randomUUID().toString()); - list.add(cat); - retryRegisterService.errorMethod1(list); - } catch (Exception e) { - } - - Thread.sleep(90000); - - } - -} diff --git a/example/src/test/java/com/example/TestRetryMethodServiceTest.java b/example/src/test/java/com/example/TestRetryMethodServiceTest.java deleted file mode 100644 index f39d43bf..00000000 --- a/example/src/test/java/com/example/TestRetryMethodServiceTest.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.example; - -import com.example.demo.TestRetryMethodService; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; - -import java.util.UUID; - -/** - * @author: www.byteblogs.com - * @date : 2022-03-07 14:09 - */ -@SpringBootTest -public class TestRetryMethodServiceTest { - - @Autowired - public TestRetryMethodService retryMethodService; - - @Test - public void testRetryMethod() throws InterruptedException { - try { - retryMethodService.testRetryMethod(UUID.randomUUID().toString()); - }catch (Exception e) { - - } - Thread.sleep(90000); - } - - @Test - public void testRetryHeaderTransfer() throws InterruptedException { - try { - retryMethodService.testRetryHeaderTransfer(UUID.randomUUID().toString()); - }catch (Exception e) { - - } - Thread.sleep(90000); - } - -} diff --git a/example/src/test/java/com/example/TestRetryStrategyServiceTest.java b/example/src/test/java/com/example/TestRetryStrategyServiceTest.java deleted file mode 100644 index badf8f55..00000000 --- a/example/src/test/java/com/example/TestRetryStrategyServiceTest.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.example; - -import com.example.demo.TestRetryStrategyService; -import lombok.SneakyThrows; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; - -import java.util.UUID; - -/** - * @author: www.byteblogs.com - * @date : 2022-03-07 14:03 - */ -@SpringBootTest -public class TestRetryStrategyServiceTest { - - @Autowired - private TestRetryStrategyService testRetryStrategyService; - - @Test - public void errorMethodForOnlyLocal() { - testRetryStrategyService.errorMethodForOnlyLocal(UUID.randomUUID().toString()); - } - - @SneakyThrows - @Test - public void errorMethodForOnlyRemote() { - testRetryStrategyService.errorMethodForOnlyRemote(UUID.randomUUID().toString()); - Thread.sleep(90000); - } - -}