From db70b6daf4c81f586d5923d10150207e2175e4c2 Mon Sep 17 00:00:00 2001 From: rpf <1103907900@qq.com> Date: Tue, 2 Jan 2024 16:13:19 +0800 Subject: [PATCH 1/5] dependency upgrade:jdk11->17/springboot2.7.8->3.2.1 --- devops/it/pom.xml | 7 ++++--- .../devops/it/todo/common/domain/IdEntity.java | 8 ++++---- .../compute/controller/ComputeController.java | 8 ++++---- .../todo/kernel/controller/TodoController.java | 14 +++++++------- .../dew/devops/it/todo/kernel/domain/Todo.java | 8 ++++---- .../todo/kernel/repository/TodoRepository.java | 2 +- .../notifier/controller/NotifierController.java | 2 +- .../dew/example/auth/AuthExampleController.java | 2 +- .../dew/example/bone/BoneExampleInitiator.java | 2 +- .../example/cluster/ClusterExampleInitiator.java | 2 +- .../dew/example/hbase/HBaseExampleInitiator.java | 2 +- .../example/idempotent/IdempotentService.java | 2 +- .../src/main/java/group/idealworld/dew/Dew.java | 4 ++-- .../java/group/idealworld/dew/DewStartup.java | 4 ++-- .../dew/core/auth/AuthAutoConfiguration.java | 2 +- .../dew/core/auth/BasicAuthAdapter.java | 2 +- .../utils/convert/ConvertAutoConfiguration.java | 2 +- .../core/web/error/ErrorAutoConfiguration.java | 4 ++-- .../dew/core/web/error/ErrorController.java | 6 +++--- .../web/interceptor/BasicHandlerInterceptor.java | 4 ++-- .../interceptor/IdentInfoHandlerInterceptor.java | 6 +++--- .../InterceptorWebAutoConfiguration.java | 2 +- .../interceptor/RouterHandlerInterceptor.java | 6 +++--- .../web/interceptor/TokenHandlerInterceptor.java | 4 ++-- .../src/test/java/com/trc/test/GeneralTest.java | 2 +- .../java/com/trc/test/auth/AuthController.java | 2 +- .../cluster/spi/hazelcast/HazelcastAdapter.java | 4 ++-- .../cluster/spi/mqtt/MqttAutoConfiguration.java | 2 +- .../spi/rabbit/RabbitAutoConfiguration.java | 2 +- .../spi/redis/RedisAutoConfiguration.java | 2 +- framework/modules/cluster-rocket/pom.xml | 1 + .../SkyWalkingTracingAutoConfiguration.java | 2 +- .../skywalking/interceptor/TraceInterceptor.java | 4 ++-- .../idealworld/dew/core/hbase/HBaseTest.java | 2 +- .../IdempotentHandlerInterceptor.java | 14 +++++++------- .../dew/ossutils/general/impl/ObsService.java | 2 +- framework/modules/parent-starter/pom.xml | 8 ++++---- .../idealworld/dew/test/PostgreSqlExtension.java | 16 ++++++++-------- 38 files changed, 85 insertions(+), 83 deletions(-) diff --git a/devops/it/pom.xml b/devops/it/pom.xml index eb83fd679..6adcdd71f 100644 --- a/devops/it/pom.xml +++ b/devops/it/pom.xml @@ -27,7 +27,7 @@ 3.0.0-RC3 - 1.8 + 17 UTF-8 ${project.build.sourceEncoding} ${project.build.sourceEncoding} @@ -121,7 +121,7 @@ org.codehaus.mojo properties-maven-plugin - 1.0.0 + 1.2.1 initialize @@ -139,6 +139,7 @@ org.apache.maven.plugins maven-failsafe-plugin + 3.2.3 ${dew.it.skip} @@ -154,7 +155,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.10.1 + 3.12.1 ${maven.compiler.source} ${maven.compiler.source} diff --git a/devops/it/src/it/todo/backend/libraries/common/src/main/java/group/idealworld/dew/devops/it/todo/common/domain/IdEntity.java b/devops/it/src/it/todo/backend/libraries/common/src/main/java/group/idealworld/dew/devops/it/todo/common/domain/IdEntity.java index 1d75de648..7e431ecd5 100644 --- a/devops/it/src/it/todo/backend/libraries/common/src/main/java/group/idealworld/dew/devops/it/todo/common/domain/IdEntity.java +++ b/devops/it/src/it/todo/backend/libraries/common/src/main/java/group/idealworld/dew/devops/it/todo/common/domain/IdEntity.java @@ -16,10 +16,10 @@ package group.idealworld.dew.devops.it.todo.common.domain; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; /** * Id entity. diff --git a/devops/it/src/it/todo/backend/services/compute/src/main/java/group/idealworld/dew/devops/it/todo/compute/controller/ComputeController.java b/devops/it/src/it/todo/backend/services/compute/src/main/java/group/idealworld/dew/devops/it/todo/compute/controller/ComputeController.java index 4bdc9c20e..8a8f72a59 100644 --- a/devops/it/src/it/todo/backend/services/compute/src/main/java/group/idealworld/dew/devops/it/todo/compute/controller/ComputeController.java +++ b/devops/it/src/it/todo/backend/services/compute/src/main/java/group/idealworld/dew/devops/it/todo/compute/controller/ComputeController.java @@ -16,9 +16,9 @@ package group.idealworld.dew.devops.it.todo.compute.controller; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import group.idealworld.dew.devops.it.todo.compute.service.ComputeService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -33,7 +33,7 @@ * @author gudaoxuri */ @RestController -@Api("TODO计算") +@Tag(name = "TODO计算") @RequestMapping("/") public class ComputeController { @@ -49,7 +49,7 @@ public class ComputeController { * @throws ScriptException the script exception */ @PutMapping("compute") - @ApiOperation(value = "执行计算") + @Operation(summary = "执行计算") public String compute(@RequestBody String jsCode) throws ScriptException { return computeService.compute(jsCode); } diff --git a/devops/it/src/it/todo/backend/services/kernel/src/main/java/group/idealworld/dew/devops/it/todo/kernel/controller/TodoController.java b/devops/it/src/it/todo/backend/services/kernel/src/main/java/group/idealworld/dew/devops/it/todo/kernel/controller/TodoController.java index 0c33e97f8..cb33cd98b 100644 --- a/devops/it/src/it/todo/backend/services/kernel/src/main/java/group/idealworld/dew/devops/it/todo/kernel/controller/TodoController.java +++ b/devops/it/src/it/todo/backend/services/kernel/src/main/java/group/idealworld/dew/devops/it/todo/kernel/controller/TodoController.java @@ -17,10 +17,10 @@ package group.idealworld.dew.devops.it.todo.kernel.controller; import com.ecfront.dew.common.Page; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import group.idealworld.dew.devops.it.todo.kernel.domain.Todo; import group.idealworld.dew.devops.it.todo.kernel.service.TodoService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -31,7 +31,7 @@ */ @RestController // Swagger文档注解 -@Api("TODO示例") +@Tag(name = "TODO示例") @RequestMapping("/api") public class TodoController { @@ -46,7 +46,7 @@ public class TodoController { * @return the page */ @GetMapping("") - @ApiOperation(value = "获取Todo列表") + @Operation(summary = "获取Todo列表") public Page findAll(@RequestParam(value = "pageNumber", required = false, defaultValue = "1") int pageNumber, @RequestParam(value = "pageSize", required = false, defaultValue = "10") int pageSize) { return todoService.list(pageNumber, pageSize); @@ -59,7 +59,7 @@ public Page findAll(@RequestParam(value = "pageNumber", required = false, * @return the int */ @PostMapping("") - @ApiOperation(value = "添加Todo记录") + @Operation(summary = "添加Todo记录") public Todo add(@RequestBody String content) { return todoService.add(content); } @@ -70,7 +70,7 @@ public Todo add(@RequestBody String content) { * @param id the id */ @DeleteMapping("{id}") - @ApiOperation(value = "删除Todo记录") + @Operation(summary = "删除Todo记录") public boolean delete(@PathVariable("id") int id) { return todoService.delete(id); } @@ -82,7 +82,7 @@ public boolean delete(@PathVariable("id") int id) { * @param afterBy the after by */ @PutMapping("{id}/sort") - @ApiOperation(value = "调整Todo记录顺序") + @Operation(summary = "调整Todo记录顺序") public boolean sort(@PathVariable("id") int id, @RequestParam(value = "afterBy") int afterBy) { return todoService.sort(id, afterBy); diff --git a/devops/it/src/it/todo/backend/services/kernel/src/main/java/group/idealworld/dew/devops/it/todo/kernel/domain/Todo.java b/devops/it/src/it/todo/backend/services/kernel/src/main/java/group/idealworld/dew/devops/it/todo/kernel/domain/Todo.java index dca858caf..9f4348e7e 100644 --- a/devops/it/src/it/todo/backend/services/kernel/src/main/java/group/idealworld/dew/devops/it/todo/kernel/domain/Todo.java +++ b/devops/it/src/it/todo/backend/services/kernel/src/main/java/group/idealworld/dew/devops/it/todo/kernel/domain/Todo.java @@ -20,10 +20,10 @@ import org.hibernate.annotations.CreationTimestamp; import org.hibernate.annotations.UpdateTimestamp; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import java.util.Date; /** diff --git a/devops/it/src/it/todo/backend/services/kernel/src/main/java/group/idealworld/dew/devops/it/todo/kernel/repository/TodoRepository.java b/devops/it/src/it/todo/backend/services/kernel/src/main/java/group/idealworld/dew/devops/it/todo/kernel/repository/TodoRepository.java index c2d5858f0..5b834aae9 100644 --- a/devops/it/src/it/todo/backend/services/kernel/src/main/java/group/idealworld/dew/devops/it/todo/kernel/repository/TodoRepository.java +++ b/devops/it/src/it/todo/backend/services/kernel/src/main/java/group/idealworld/dew/devops/it/todo/kernel/repository/TodoRepository.java @@ -19,7 +19,7 @@ import group.idealworld.dew.devops.it.todo.kernel.domain.Todo; import org.springframework.data.jpa.repository.JpaRepository; -import javax.annotation.Resource; +import jakarta.annotation.Resource; /** * The interface To-do repository. diff --git a/devops/it/src/it/todo/backend/services/notifier/src/main/java/group/idealworld/dew/devops/it/todo/notifier/controller/NotifierController.java b/devops/it/src/it/todo/backend/services/notifier/src/main/java/group/idealworld/dew/devops/it/todo/notifier/controller/NotifierController.java index 0fd6e3439..9b74a26a2 100644 --- a/devops/it/src/it/todo/backend/services/notifier/src/main/java/group/idealworld/dew/devops/it/todo/notifier/controller/NotifierController.java +++ b/devops/it/src/it/todo/backend/services/notifier/src/main/java/group/idealworld/dew/devops/it/todo/notifier/controller/NotifierController.java @@ -22,7 +22,7 @@ import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; /** * Notifier controller. diff --git a/examples/auth-example/src/main/java/group/idealworld/dew/example/auth/AuthExampleController.java b/examples/auth-example/src/main/java/group/idealworld/dew/example/auth/AuthExampleController.java index 7146a73e2..067b06d9f 100644 --- a/examples/auth-example/src/main/java/group/idealworld/dew/example/auth/AuthExampleController.java +++ b/examples/auth-example/src/main/java/group/idealworld/dew/example/auth/AuthExampleController.java @@ -23,7 +23,7 @@ import group.idealworld.dew.example.auth.dto.OptInfoExt; import org.springframework.web.bind.annotation.*; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import java.util.HashMap; import java.util.Map; import java.util.Optional; diff --git a/examples/bone-example/src/main/java/group/idealworld/dew/example/bone/BoneExampleInitiator.java b/examples/bone-example/src/main/java/group/idealworld/dew/example/bone/BoneExampleInitiator.java index 2699b9e54..2feef8c39 100644 --- a/examples/bone-example/src/main/java/group/idealworld/dew/example/bone/BoneExampleInitiator.java +++ b/examples/bone-example/src/main/java/group/idealworld/dew/example/bone/BoneExampleInitiator.java @@ -22,7 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; /** * 在根路径创建用于初始化数据/行为的类. diff --git a/examples/cluster-example/src/main/java/group/idealworld/dew/example/cluster/ClusterExampleInitiator.java b/examples/cluster-example/src/main/java/group/idealworld/dew/example/cluster/ClusterExampleInitiator.java index 7768f80d7..8c40183f5 100644 --- a/examples/cluster-example/src/main/java/group/idealworld/dew/example/cluster/ClusterExampleInitiator.java +++ b/examples/cluster-example/src/main/java/group/idealworld/dew/example/cluster/ClusterExampleInitiator.java @@ -24,7 +24,7 @@ import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import java.io.Serializable; /** diff --git a/examples/hbase-example/src/main/java/group/idealworld/dew/example/hbase/HBaseExampleInitiator.java b/examples/hbase-example/src/main/java/group/idealworld/dew/example/hbase/HBaseExampleInitiator.java index 0e61dea93..bafda3976 100644 --- a/examples/hbase-example/src/main/java/group/idealworld/dew/example/hbase/HBaseExampleInitiator.java +++ b/examples/hbase-example/src/main/java/group/idealworld/dew/example/hbase/HBaseExampleInitiator.java @@ -23,7 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; /** * Cluster example initiator. diff --git a/examples/idempotent-example/src/main/java/group/idealworld/dew/example/idempotent/IdempotentService.java b/examples/idempotent-example/src/main/java/group/idealworld/dew/example/idempotent/IdempotentService.java index 8278f9729..de7c86b09 100644 --- a/examples/idempotent-example/src/main/java/group/idealworld/dew/example/idempotent/IdempotentService.java +++ b/examples/idempotent-example/src/main/java/group/idealworld/dew/example/idempotent/IdempotentService.java @@ -22,7 +22,7 @@ import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; /** * 演示通过MQ等非HTTP调用的幂等处理. diff --git a/framework/modules/boot-starter/src/main/java/group/idealworld/dew/Dew.java b/framework/modules/boot-starter/src/main/java/group/idealworld/dew/Dew.java index 73956fe37..4c3d92ec0 100644 --- a/framework/modules/boot-starter/src/main/java/group/idealworld/dew/Dew.java +++ b/framework/modules/boot-starter/src/main/java/group/idealworld/dew/Dew.java @@ -40,8 +40,8 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Configuration; -import javax.annotation.PostConstruct; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.PostConstruct; +import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; import java.net.InetAddress; import java.util.*; diff --git a/framework/modules/boot-starter/src/main/java/group/idealworld/dew/DewStartup.java b/framework/modules/boot-starter/src/main/java/group/idealworld/dew/DewStartup.java index 68ddce149..f52bbd0a3 100644 --- a/framework/modules/boot-starter/src/main/java/group/idealworld/dew/DewStartup.java +++ b/framework/modules/boot-starter/src/main/java/group/idealworld/dew/DewStartup.java @@ -24,8 +24,8 @@ import org.springframework.core.annotation.Order; import org.springframework.web.client.RestTemplate; -import javax.annotation.PostConstruct; -import javax.servlet.*; +import jakarta.annotation.PostConstruct; +import jakarta.servlet.*; import java.io.IOException; /** diff --git a/framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/auth/AuthAutoConfiguration.java b/framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/auth/AuthAutoConfiguration.java index ca425998b..2fff7bd9a 100644 --- a/framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/auth/AuthAutoConfiguration.java +++ b/framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/auth/AuthAutoConfiguration.java @@ -21,7 +21,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; /** * Auth auto configuration. diff --git a/framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/auth/BasicAuthAdapter.java b/framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/auth/BasicAuthAdapter.java index 25e9c6dca..7fd34ba3e 100644 --- a/framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/auth/BasicAuthAdapter.java +++ b/framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/auth/BasicAuthAdapter.java @@ -23,7 +23,7 @@ import group.idealworld.dew.core.auth.dto.OptInfo; import group.idealworld.dew.core.cluster.ClusterCache; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; diff --git a/framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/basic/utils/convert/ConvertAutoConfiguration.java b/framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/basic/utils/convert/ConvertAutoConfiguration.java index 48a9b7c71..639c7481b 100644 --- a/framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/basic/utils/convert/ConvertAutoConfiguration.java +++ b/framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/basic/utils/convert/ConvertAutoConfiguration.java @@ -22,7 +22,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; /** * Convert auto configuration. diff --git a/framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/web/error/ErrorAutoConfiguration.java b/framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/web/error/ErrorAutoConfiguration.java index 6cb8f8596..849ca1109 100644 --- a/framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/web/error/ErrorAutoConfiguration.java +++ b/framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/web/error/ErrorAutoConfiguration.java @@ -28,8 +28,8 @@ import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.DispatcherServlet; -import javax.annotation.PostConstruct; -import javax.servlet.Servlet; +import jakarta.annotation.PostConstruct; +import jakarta.servlet.Servlet; /** * Error auto configuration. diff --git a/framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/web/error/ErrorController.java b/framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/web/error/ErrorController.java index ffb69c7d4..db61027f4 100644 --- a/framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/web/error/ErrorController.java +++ b/framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/web/error/ErrorController.java @@ -41,9 +41,9 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.ServletRequestWrapper; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletRequestWrapper; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import javax.validation.ConstraintViolationException; import java.io.IOException; import java.util.List; diff --git a/framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/web/interceptor/BasicHandlerInterceptor.java b/framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/web/interceptor/BasicHandlerInterceptor.java index cfb7092a8..70fef4ea4 100644 --- a/framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/web/interceptor/BasicHandlerInterceptor.java +++ b/framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/web/interceptor/BasicHandlerInterceptor.java @@ -21,8 +21,8 @@ import org.slf4j.LoggerFactory; import org.springframework.web.servlet.AsyncHandlerInterceptor; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * 基础拦截器. diff --git a/framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/web/interceptor/IdentInfoHandlerInterceptor.java b/framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/web/interceptor/IdentInfoHandlerInterceptor.java index 312524371..a8cc17fd3 100644 --- a/framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/web/interceptor/IdentInfoHandlerInterceptor.java +++ b/framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/web/interceptor/IdentInfoHandlerInterceptor.java @@ -27,9 +27,9 @@ import org.slf4j.LoggerFactory; import org.springframework.web.servlet.AsyncHandlerInterceptor; -import javax.security.auth.message.AuthException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.security.auth.message.AuthException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.Arrays; diff --git a/framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/web/interceptor/InterceptorWebAutoConfiguration.java b/framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/web/interceptor/InterceptorWebAutoConfiguration.java index 305e06933..3e894bd8d 100644 --- a/framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/web/interceptor/InterceptorWebAutoConfiguration.java +++ b/framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/web/interceptor/InterceptorWebAutoConfiguration.java @@ -27,7 +27,7 @@ import org.springframework.web.servlet.config.annotation.PathMatchConfigurer; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; /** * Interceptor web auto configuration. diff --git a/framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/web/interceptor/RouterHandlerInterceptor.java b/framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/web/interceptor/RouterHandlerInterceptor.java index 7a152aa5c..8298e0655 100644 --- a/framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/web/interceptor/RouterHandlerInterceptor.java +++ b/framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/web/interceptor/RouterHandlerInterceptor.java @@ -27,9 +27,9 @@ import org.springframework.util.ObjectUtils; import org.springframework.web.servlet.AsyncHandlerInterceptor; -import javax.security.auth.message.AuthException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.security.auth.message.AuthException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.*; import java.util.stream.Collectors; diff --git a/framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/web/interceptor/TokenHandlerInterceptor.java b/framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/web/interceptor/TokenHandlerInterceptor.java index 719c58fb7..49f710a0c 100644 --- a/framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/web/interceptor/TokenHandlerInterceptor.java +++ b/framework/modules/boot-starter/src/main/java/group/idealworld/dew/core/web/interceptor/TokenHandlerInterceptor.java @@ -24,8 +24,8 @@ import org.slf4j.LoggerFactory; import org.springframework.web.servlet.AsyncHandlerInterceptor; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.net.URLDecoder; import java.nio.charset.StandardCharsets; diff --git a/framework/modules/boot-starter/src/test/java/com/trc/test/GeneralTest.java b/framework/modules/boot-starter/src/test/java/com/trc/test/GeneralTest.java index f2045c5ba..72530ad19 100644 --- a/framework/modules/boot-starter/src/test/java/com/trc/test/GeneralTest.java +++ b/framework/modules/boot-starter/src/test/java/com/trc/test/GeneralTest.java @@ -30,7 +30,7 @@ import org.springframework.test.context.junit.jupiter.SpringExtension; import org.testcontainers.junit.jupiter.Testcontainers; -import javax.annotation.Resource; +import jakarta.annotation.Resource; /** diff --git a/framework/modules/boot-starter/src/test/java/com/trc/test/auth/AuthController.java b/framework/modules/boot-starter/src/test/java/com/trc/test/auth/AuthController.java index b2f5a78dd..253d7787b 100644 --- a/framework/modules/boot-starter/src/test/java/com/trc/test/auth/AuthController.java +++ b/framework/modules/boot-starter/src/test/java/com/trc/test/auth/AuthController.java @@ -22,7 +22,7 @@ import group.idealworld.dew.core.DewContext; import org.springframework.web.bind.annotation.*; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import java.util.HashMap; import java.util.Map; diff --git a/framework/modules/cluster-hazelcast/src/main/java/group/idealworld/dew/core/cluster/spi/hazelcast/HazelcastAdapter.java b/framework/modules/cluster-hazelcast/src/main/java/group/idealworld/dew/core/cluster/spi/hazelcast/HazelcastAdapter.java index 4e57b6465..1d9aef411 100644 --- a/framework/modules/cluster-hazelcast/src/main/java/group/idealworld/dew/core/cluster/spi/hazelcast/HazelcastAdapter.java +++ b/framework/modules/cluster-hazelcast/src/main/java/group/idealworld/dew/core/cluster/spi/hazelcast/HazelcastAdapter.java @@ -20,8 +20,8 @@ import com.hazelcast.client.config.ClientConfig; import com.hazelcast.core.HazelcastInstance; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; /** * Hazelcast adapter. diff --git a/framework/modules/cluster-mqtt/src/main/java/group/idealworld/dew/core/cluster/spi/mqtt/MqttAutoConfiguration.java b/framework/modules/cluster-mqtt/src/main/java/group/idealworld/dew/core/cluster/spi/mqtt/MqttAutoConfiguration.java index d4d97454c..9513dcd1e 100644 --- a/framework/modules/cluster-mqtt/src/main/java/group/idealworld/dew/core/cluster/spi/mqtt/MqttAutoConfiguration.java +++ b/framework/modules/cluster-mqtt/src/main/java/group/idealworld/dew/core/cluster/spi/mqtt/MqttAutoConfiguration.java @@ -25,7 +25,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; /** * Mqtt auto configuration. diff --git a/framework/modules/cluster-rabbit/src/main/java/group/idealworld/dew/core/cluster/spi/rabbit/RabbitAutoConfiguration.java b/framework/modules/cluster-rabbit/src/main/java/group/idealworld/dew/core/cluster/spi/rabbit/RabbitAutoConfiguration.java index ef6fbac7f..7895b0baa 100644 --- a/framework/modules/cluster-rabbit/src/main/java/group/idealworld/dew/core/cluster/spi/rabbit/RabbitAutoConfiguration.java +++ b/framework/modules/cluster-rabbit/src/main/java/group/idealworld/dew/core/cluster/spi/rabbit/RabbitAutoConfiguration.java @@ -24,7 +24,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; /** * Rabbit auto configuration. diff --git a/framework/modules/cluster-redis/src/main/java/group/idealworld/dew/core/cluster/spi/redis/RedisAutoConfiguration.java b/framework/modules/cluster-redis/src/main/java/group/idealworld/dew/core/cluster/spi/redis/RedisAutoConfiguration.java index 255a1d5d8..2b3e8ec67 100644 --- a/framework/modules/cluster-redis/src/main/java/group/idealworld/dew/core/cluster/spi/redis/RedisAutoConfiguration.java +++ b/framework/modules/cluster-redis/src/main/java/group/idealworld/dew/core/cluster/spi/redis/RedisAutoConfiguration.java @@ -40,7 +40,7 @@ import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.serializer.RedisSerializer; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import java.net.UnknownHostException; import java.util.HashMap; import java.util.Map; diff --git a/framework/modules/cluster-rocket/pom.xml b/framework/modules/cluster-rocket/pom.xml index cd3a2aa8f..870ea5819 100644 --- a/framework/modules/cluster-rocket/pom.xml +++ b/framework/modules/cluster-rocket/pom.xml @@ -43,6 +43,7 @@ org.apache.rocketmq rocketmq-spring-boot-starter ${rocket.version} + group.idealworld.dew diff --git a/framework/modules/cluster-skywalking/src/main/java/groop/idealworld/dew/core/cluster/spi/skywalking/SkyWalkingTracingAutoConfiguration.java b/framework/modules/cluster-skywalking/src/main/java/groop/idealworld/dew/core/cluster/spi/skywalking/SkyWalkingTracingAutoConfiguration.java index 49815988a..5bc821e7d 100644 --- a/framework/modules/cluster-skywalking/src/main/java/groop/idealworld/dew/core/cluster/spi/skywalking/SkyWalkingTracingAutoConfiguration.java +++ b/framework/modules/cluster-skywalking/src/main/java/groop/idealworld/dew/core/cluster/spi/skywalking/SkyWalkingTracingAutoConfiguration.java @@ -6,7 +6,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; /** * Created on 2022/9/25. diff --git a/framework/modules/cluster-skywalking/src/main/java/groop/idealworld/dew/core/cluster/spi/skywalking/interceptor/TraceInterceptor.java b/framework/modules/cluster-skywalking/src/main/java/groop/idealworld/dew/core/cluster/spi/skywalking/interceptor/TraceInterceptor.java index f1508b743..4a8d7cd96 100644 --- a/framework/modules/cluster-skywalking/src/main/java/groop/idealworld/dew/core/cluster/spi/skywalking/interceptor/TraceInterceptor.java +++ b/framework/modules/cluster-skywalking/src/main/java/groop/idealworld/dew/core/cluster/spi/skywalking/interceptor/TraceInterceptor.java @@ -10,8 +10,8 @@ import org.springframework.util.StringUtils; import org.springframework.web.servlet.HandlerInterceptor; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * @author yiye diff --git a/framework/modules/hbase-starter/src/test/java/group/idealworld/dew/core/hbase/HBaseTest.java b/framework/modules/hbase-starter/src/test/java/group/idealworld/dew/core/hbase/HBaseTest.java index 2ca9b0fc1..28e597eec 100644 --- a/framework/modules/hbase-starter/src/test/java/group/idealworld/dew/core/hbase/HBaseTest.java +++ b/framework/modules/hbase-starter/src/test/java/group/idealworld/dew/core/hbase/HBaseTest.java @@ -31,7 +31,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit.jupiter.SpringExtension; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import java.io.IOException; /** diff --git a/framework/modules/idempotent-starter/src/main/java/group/idealworld/dew/idempotent/interceptor/IdempotentHandlerInterceptor.java b/framework/modules/idempotent-starter/src/main/java/group/idealworld/dew/idempotent/interceptor/IdempotentHandlerInterceptor.java index 441528297..ecb877d15 100644 --- a/framework/modules/idempotent-starter/src/main/java/group/idealworld/dew/idempotent/interceptor/IdempotentHandlerInterceptor.java +++ b/framework/modules/idempotent-starter/src/main/java/group/idealworld/dew/idempotent/interceptor/IdempotentHandlerInterceptor.java @@ -24,17 +24,17 @@ import group.idealworld.dew.idempotent.strategy.StrategyEnum; import org.springframework.util.ObjectUtils; import org.springframework.web.method.HandlerMethod; -import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.web.servlet.HandlerInterceptor; /** * Idempotent handler interceptor. * * @author gudaoxuri */ -public class IdempotentHandlerInterceptor extends HandlerInterceptorAdapter { +public class IdempotentHandlerInterceptor implements HandlerInterceptor { private DewIdempotentConfig dewIdempotentConfig; @@ -51,7 +51,7 @@ public IdempotentHandlerInterceptor(DewIdempotentConfig dewIdempotentConfig) { public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { Idempotent idempotent = ((HandlerMethod) handler).getMethod().getAnnotation(Idempotent.class); if (idempotent == null) { - return super.preHandle(request, response, handler); + return HandlerInterceptor.super.preHandle(request, response, handler); } // 参数设置 String optType = "[" + request.getMethod() + "]" + Dew.Info.name + "/" + request.getRequestURI(); @@ -62,7 +62,7 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons } if (ObjectUtils.isEmpty(optId)) { // optId不存在，表示忽略幂等检查，强制执行 - return super.preHandle(request, response, handler); + return HandlerInterceptor.super.preHandle(request, response, handler); } if (!DewIdempotent.existOptTypeInfo(optType)) { long expireMs = idempotent.expireMs() == -1 ? dewIdempotentConfig.getDefaultExpireMs() : idempotent.expireMs(); @@ -72,7 +72,7 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons } switch (DewIdempotent.process(optType, optId)) { case NOT_EXIST: - return super.preHandle(request, response, handler); + return HandlerInterceptor.super.preHandle(request, response, handler); case UN_CONFIRM: ErrorController.error(request, response, 409, "The last operation was still going on, please wait.", IdempotentException.class.getName()); diff --git a/framework/modules/ossutils-starter/src/main/java/groop/idealworld/dew/ossutils/general/impl/ObsService.java b/framework/modules/ossutils-starter/src/main/java/groop/idealworld/dew/ossutils/general/impl/ObsService.java index 780758a63..581eccdc2 100644 --- a/framework/modules/ossutils-starter/src/main/java/groop/idealworld/dew/ossutils/general/impl/ObsService.java +++ b/framework/modules/ossutils-starter/src/main/java/groop/idealworld/dew/ossutils/general/impl/ObsService.java @@ -20,7 +20,7 @@ import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.io.*; import java.util.HashMap; import java.util.Map; diff --git a/framework/modules/parent-starter/pom.xml b/framework/modules/parent-starter/pom.xml index 58dd2c3e0..5f7c36f04 100644 --- a/framework/modules/parent-starter/pom.xml +++ b/framework/modules/parent-starter/pom.xml @@ -23,7 +23,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.8 + 3.2.1 @@ -35,7 +35,7 @@ 3.0.0-RC3 - 11 + 17 UTF-8 ${project.build.sourceEncoding} ${project.build.sourceEncoding} @@ -85,7 +85,7 @@ 14.0.0 3.2.12 - 3.6.0 + 3.9.0 2.3.0 1.3.3 1.18 @@ -246,7 +246,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.10.1 + 3.12.1 ${java.version} ${java.version} diff --git a/framework/modules/test-starter/src/main/java/group/idealworld/dew/test/PostgreSqlExtension.java b/framework/modules/test-starter/src/main/java/group/idealworld/dew/test/PostgreSqlExtension.java index e737cdda3..c245fcebd 100644 --- a/framework/modules/test-starter/src/main/java/group/idealworld/dew/test/PostgreSqlExtension.java +++ b/framework/modules/test-starter/src/main/java/group/idealworld/dew/test/PostgreSqlExtension.java @@ -33,17 +33,17 @@ public class PostgreSqlExtension implements BeforeAllCallback { private static final Logger logger = LoggerFactory.getLogger(PostgreSqlExtension.class); - private static final JdbcDatabaseContainer postgreSQLContainer = new PostgreSQLContainer(DockerImageName.parse("postgres:15.2")); + private static final JdbcDatabaseContainer POSTGRESQL_CONTAINER = new PostgreSQLContainer(DockerImageName.parse("postgres:alpine")); @Override public void beforeAll(ExtensionContext extensionContext) { var scriptPath = ClassLoader.getSystemResource("").getPath() + "/sql/pg_init.sql"; if (new File(scriptPath).exists()) { - postgreSQLContainer.withInitScript("sql/pg_init.sql"); + POSTGRESQL_CONTAINER.withInitScript("sql/pg_init.sql"); } - postgreSQLContainer.start(); - logger.info("Test postgresql port: " + postgreSQLContainer.getFirstMappedPort() - + ", username: " + postgreSQLContainer.getUsername() + ", password: " + postgreSQLContainer.getPassword()); + POSTGRESQL_CONTAINER.start(); + logger.info("Test postgresql port: " + POSTGRESQL_CONTAINER.getExposedPorts() + + ", username: " + POSTGRESQL_CONTAINER.getUsername() + ", password: " + POSTGRESQL_CONTAINER.getPassword()); } public static class Initializer @@ -51,9 +51,9 @@ public static class Initializer @Override public void initialize(ConfigurableApplicationContext configurableApplicationContext) { TestPropertyValues.of( - "spring.datasource.url=" + postgreSQLContainer.getJdbcUrl(), - "spring.datasource.username=" + postgreSQLContainer.getUsername(), - "spring.datasource.password=" + postgreSQLContainer.getPassword() + "spring.datasource.url=" + POSTGRESQL_CONTAINER.getJdbcUrl(), + "spring.datasource.username=" + POSTGRESQL_CONTAINER.getUsername(), + "spring.datasource.password=" + POSTGRESQL_CONTAINER.getPassword() ).applyTo(configurableApplicationContext.getEnvironment()); } } From fecbf4e9cf24f9bda0b4c4f9338ab864f348214a Mon Sep 17 00:00:00 2001 From: rpf <1103907900@qq.com> Date: Tue, 2 Jan 2024 16:57:41 +0800 Subject: [PATCH 2/5] codeql-analysis.yml support jdk17 --- .github/workflows/codeql-analysis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index e4c84fa1f..60e25a087 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -57,6 +57,8 @@ jobs: # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild uses: github/codeql-action/autobuild@v2 + with: + java-version: 17 # ℹ️ Command-line programs to run using the OS shell. # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun From fc04f207a1d61fa879ee253f23bd5a784234e432 Mon Sep 17 00:00:00 2001 From: rpf <1103907900@qq.com> Date: Tue, 2 Jan 2024 17:15:54 +0800 Subject: [PATCH 3/5] add log --- .github/workflows/codeql-analysis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 60e25a087..811ebb0d5 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -60,6 +60,10 @@ jobs: with: java-version: 17 + - name: Print Java Version + run: + echo "Java Version: ${{ matrix.java-version }}" + # ℹ️ Command-line programs to run using the OS shell. # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun From 8eeff0655641b6356eb15be7daab6f8a2cccc20f Mon Sep 17 00:00:00 2001 From: rpf <1103907900@qq.com> Date: Tue, 2 Jan 2024 17:36:02 +0800 Subject: [PATCH 4/5] set java version --- .github/workflows/codeql-analysis.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 811ebb0d5..2c5b7e562 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -51,18 +51,14 @@ jobs: # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs # queries: security-extended,security-and-quality - + - uses: actions/setup-java@v1 + with: + java-version: 17 # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild uses: github/codeql-action/autobuild@v2 - with: - java-version: 17 - - - name: Print Java Version - run: - echo "Java Version: ${{ matrix.java-version }}" # ℹ️ Command-line programs to run using the OS shell. # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun From a796ded8b4cedcb17d7ce6344aad006e885640d2 Mon Sep 17 00:00:00 2001 From: rpf <1103907900@qq.com> Date: Tue, 2 Jan 2024 18:10:03 +0800 Subject: [PATCH 5/5] sync redis config modify --- .../dew/core/cluster/spi/redis/RedisAutoConfiguration.java | 5 ++++- .../data/redis/MultiConnectionConfiguration.java | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/framework/modules/cluster-redis/src/main/java/group/idealworld/dew/core/cluster/spi/redis/RedisAutoConfiguration.java b/framework/modules/cluster-redis/src/main/java/group/idealworld/dew/core/cluster/spi/redis/RedisAutoConfiguration.java index 2b3e8ec67..47736a151 100644 --- a/framework/modules/cluster-redis/src/main/java/group/idealworld/dew/core/cluster/spi/redis/RedisAutoConfiguration.java +++ b/framework/modules/cluster-redis/src/main/java/group/idealworld/dew/core/cluster/spi/redis/RedisAutoConfiguration.java @@ -27,6 +27,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.boot.autoconfigure.data.redis.LettuceClientConfigurationBuilderCustomizer; import org.springframework.boot.autoconfigure.data.redis.MultiConnectionConfiguration; +import org.springframework.boot.autoconfigure.data.redis.RedisConnectionDetails; import org.springframework.boot.autoconfigure.data.redis.RedisProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.ApplicationContext; @@ -80,6 +81,8 @@ public class RedisAutoConfiguration { @Autowired private RedisTemplate redisTemplate = new RedisTemplate<>(); + @Autowired + private RedisConnectionDetails redisConnectionDetails; private static final Map> REDIS_TEMPLATES = new HashMap<>(); @@ -101,7 +104,7 @@ private void initMultiDS(Map properties) { ConfigurableListableBeanFactory beanFactory = ((ConfigurableApplicationContext) applicationContext).getBeanFactory(); for (Map.Entry prop : properties.entrySet()) { LettuceConnectionFactory redisConnectionFactory = new MultiConnectionConfiguration(prop.getValue(), standaloneConfigurationProvider, - sentinelConfigurationProvider, clusterConfigurationProvider).redisConnectionFactory(builderCustomizers, clientResources); + sentinelConfigurationProvider, clusterConfigurationProvider, redisConnectionDetails).redisConnectionFactory(builderCustomizers, clientResources); redisConnectionFactory.afterPropertiesSet(); RedisTemplate redisTemplate = new RedisTemplate<>(); redisTemplate.setConnectionFactory(redisConnectionFactory); diff --git a/framework/modules/cluster-redis/src/main/java/org/springframework/boot/autoconfigure/data/redis/MultiConnectionConfiguration.java b/framework/modules/cluster-redis/src/main/java/org/springframework/boot/autoconfigure/data/redis/MultiConnectionConfiguration.java index 24b92526a..f258ac510 100644 --- a/framework/modules/cluster-redis/src/main/java/org/springframework/boot/autoconfigure/data/redis/MultiConnectionConfiguration.java +++ b/framework/modules/cluster-redis/src/main/java/org/springframework/boot/autoconfigure/data/redis/MultiConnectionConfiguration.java @@ -40,8 +40,9 @@ public class MultiConnectionConfiguration extends LettuceConnectionConfiguration */ public MultiConnectionConfiguration(RedisProperties properties, ObjectProvider standaloneConfigurationProvider, ObjectProvider sentinelConfigurationProvider, - ObjectProvider clusterConfigurationProvider) { - super(properties, standaloneConfigurationProvider, sentinelConfigurationProvider, clusterConfigurationProvider); + ObjectProvider clusterConfigurationProvider, + RedisConnectionDetails redisConnectionDetails) { + super(properties, standaloneConfigurationProvider, sentinelConfigurationProvider, clusterConfigurationProvider, redisConnectionDetails, null); } @Override