diff --git a/api/pom.xml b/api/pom.xml index a29e288b7d9a7e6f1a40048bd03657a81f7eb4fe..20184065a576e2e6865671a620b273821c0ef81d 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -88,7 +88,7 @@ org.projectlombok lombok - 1.18.16 + 1.18.28 org.projectlombok diff --git a/api/src/main/java/dev/jianmu/api/controller/AuthController.java b/api/src/main/java/dev/jianmu/api/controller/AuthController.java index cbf1de70d86c690c25d387875fad91ff7825c8b5..2f89b6c76ed88cdb5f4e20052d6f4639924d16f8 100644 --- a/api/src/main/java/dev/jianmu/api/controller/AuthController.java +++ b/api/src/main/java/dev/jianmu/api/controller/AuthController.java @@ -4,14 +4,15 @@ import dev.jianmu.api.dto.JwtResponse; import dev.jianmu.api.dto.LoginDto; import dev.jianmu.api.jwt.JwtProvider; import dev.jianmu.api.jwt.JwtSession; -import dev.jianmu.infrastructure.jackson2.JsonUtil; import dev.jianmu.application.exception.DataNotFoundException; import dev.jianmu.application.exception.NotAllowAuthSignInException; +import dev.jianmu.infrastructure.jackson2.JsonUtil; import dev.jianmu.infrastructure.jwt.JwtProperties; import dev.jianmu.user.repository.UserRepository; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import org.springframework.http.ResponseEntity; -import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.authentication.AuthenticationProvider; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; @@ -20,8 +21,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.validation.Valid; - /** * @author Ethan Liu * @class AuthController @@ -32,13 +31,13 @@ import javax.validation.Valid; @RequestMapping("auth") @Tag(name = "Auth", description = "Auth API") public class AuthController { - private final AuthenticationManager authenticationManager; + private final AuthenticationProvider authenticationProvider; private final JwtProvider jwtProvider; private final UserRepository userRepository; private final JwtProperties jwtProperties; - public AuthController(AuthenticationManager authenticationManager, JwtProvider jwtProvider, UserRepository userRepository, JwtProperties jwtProperties) { - this.authenticationManager = authenticationManager; + public AuthController(AuthenticationProvider authenticationProvider, JwtProvider jwtProvider, UserRepository userRepository, JwtProperties jwtProperties) { + this.authenticationProvider = authenticationProvider; this.jwtProvider = jwtProvider; this.userRepository = userRepository; this.jwtProperties = jwtProperties; @@ -50,7 +49,7 @@ public class AuthController { var user = this.userRepository.findByUsername(loginDto.getUsername()) .orElseThrow(() -> new DataNotFoundException("未找到该用户名")); - Authentication authentication = this.authenticationManager.authenticate( + Authentication authentication = this.authenticationProvider.authenticate( new UsernamePasswordAuthenticationToken(JsonUtil.jsonToString(JwtSession.builder() .id(user.getId()) .username(user.getUsername()) diff --git a/api/src/main/java/dev/jianmu/api/controller/GitController.java b/api/src/main/java/dev/jianmu/api/controller/GitController.java index 8e6234388e986b14e36f7cd3f0f27f2ba8f12cc5..239d31ea17d78c6c2e92f917cb26e470999d130e 100644 --- a/api/src/main/java/dev/jianmu/api/controller/GitController.java +++ b/api/src/main/java/dev/jianmu/api/controller/GitController.java @@ -7,9 +7,9 @@ import dev.jianmu.application.service.GitApplication; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import org.springframework.web.bind.annotation.*; -import javax.validation.Valid; import java.util.Map; /** diff --git a/api/src/main/java/dev/jianmu/api/controller/OAuth2Controller.java b/api/src/main/java/dev/jianmu/api/controller/OAuth2Controller.java index 6312cb5d2babe8d062b799bc7662732d1774734a..4e44d79228ad78edda8a57df8b89cc122f44d341 100644 --- a/api/src/main/java/dev/jianmu/api/controller/OAuth2Controller.java +++ b/api/src/main/java/dev/jianmu/api/controller/OAuth2Controller.java @@ -25,9 +25,10 @@ import dev.jianmu.user.aggregate.User; import dev.jianmu.user.repository.UserRepository; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.authentication.AuthenticationProvider; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; @@ -35,7 +36,6 @@ import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; -import javax.validation.Valid; import java.util.List; import java.util.Optional; @@ -50,16 +50,16 @@ import java.util.Optional; @Tag(name = "oauth2控制器", description = "oauth2控制器") public class OAuth2Controller { private final UserRepository userRepository; - private final AuthenticationManager authenticationManager; + private final AuthenticationProvider authenticationProvider; private final JwtProvider jwtProvider; private final JwtProperties jwtProperties; private final OAuth2Properties oAuth2Properties; private final GlobalProperties globalProperties; - public OAuth2Controller(UserRepository userRepository, AuthenticationManager authenticationManager, JwtProvider jwtProvider, JwtProperties jwtProperties, OAuth2Properties oAuth2Properties, GlobalProperties globalProperties) { + public OAuth2Controller(UserRepository userRepository, AuthenticationProvider authenticationProvider, JwtProvider jwtProvider, JwtProperties jwtProperties, OAuth2Properties oAuth2Properties, GlobalProperties globalProperties) { this.userRepository = userRepository; this.jwtProvider = jwtProvider; - this.authenticationManager = authenticationManager; + this.authenticationProvider = authenticationProvider; this.jwtProperties = jwtProperties; this.oAuth2Properties = oAuth2Properties; this.globalProperties = globalProperties; @@ -134,7 +134,7 @@ public class OAuth2Controller { this.userRepository.update(user); } - Authentication authentication = this.authenticationManager.authenticate( + Authentication authentication = this.authenticationProvider.authenticate( new UsernamePasswordAuthenticationToken(JsonUtil.jsonToString(JwtSession.builder() .avatarUrl(user.getAvatarUrl()) .id(user.getId()) diff --git a/api/src/main/java/dev/jianmu/api/controller/ProjectController.java b/api/src/main/java/dev/jianmu/api/controller/ProjectController.java index e2bb1e6e055583de55ac5db421ed2ad45d7f491b..e993c323750d5832d2a08230b537ba6a4d973962 100644 --- a/api/src/main/java/dev/jianmu/api/controller/ProjectController.java +++ b/api/src/main/java/dev/jianmu/api/controller/ProjectController.java @@ -18,11 +18,10 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.validation.Valid; - /** * @author Ethan Liu * @class ProjectController diff --git a/api/src/main/java/dev/jianmu/api/controller/ProjectGroupController.java b/api/src/main/java/dev/jianmu/api/controller/ProjectGroupController.java index adb8a510f54228fca34de94bd9e2627d6cefa694..e477e0f898826ec85aad45837a161c7472a05931 100644 --- a/api/src/main/java/dev/jianmu/api/controller/ProjectGroupController.java +++ b/api/src/main/java/dev/jianmu/api/controller/ProjectGroupController.java @@ -9,10 +9,9 @@ import dev.jianmu.application.service.ProjectGroupApplication; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import org.springframework.web.bind.annotation.*; -import javax.validation.Valid; - /** * @class ProjectGroupController * @description 项目组API diff --git a/api/src/main/java/dev/jianmu/api/controller/RestExceptionHandler.java b/api/src/main/java/dev/jianmu/api/controller/RestExceptionHandler.java index d416e593a72fb45ee161f82770705ea10447ccfd..9952d1120efb602f143df96c543ac8a62e233294 100644 --- a/api/src/main/java/dev/jianmu/api/controller/RestExceptionHandler.java +++ b/api/src/main/java/dev/jianmu/api/controller/RestExceptionHandler.java @@ -3,6 +3,7 @@ package dev.jianmu.api.controller; import dev.jianmu.api.vo.ErrorMessage; import dev.jianmu.application.exception.DataNotFoundException; import dev.jianmu.infrastructure.exception.DBException; +import jakarta.validation.ConstraintViolationException; import org.apache.catalina.connector.ClientAbortException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -18,7 +19,6 @@ import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.context.request.WebRequest; import org.springframework.web.method.HandlerMethod; -import javax.validation.ConstraintViolationException; import java.sql.SQLException; import java.sql.SQLIntegrityConstraintViolationException; import java.time.LocalDateTime; diff --git a/api/src/main/java/dev/jianmu/api/controller/SecretController.java b/api/src/main/java/dev/jianmu/api/controller/SecretController.java index fd81f6aa548fe556f42f0e3b5054876f81a8708e..2a4d481018da35712a796d9c849a39c2fdd89a6b 100644 --- a/api/src/main/java/dev/jianmu/api/controller/SecretController.java +++ b/api/src/main/java/dev/jianmu/api/controller/SecretController.java @@ -1,24 +1,16 @@ package dev.jianmu.api.controller; -import com.github.pagehelper.PageInfo; import dev.jianmu.api.dto.KVPairDto; import dev.jianmu.api.dto.NamespaceDto; -import dev.jianmu.api.dto.NamespaceSearchDto; import dev.jianmu.api.mapper.KVPairDtoMapper; import dev.jianmu.api.mapper.NamespaceDtoMapper; -import dev.jianmu.application.exception.DataNotFoundException; import dev.jianmu.application.service.SecretApplication; -import dev.jianmu.secret.aggregate.KVPair; -import dev.jianmu.secret.aggregate.Namespace; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import org.springframework.web.bind.annotation.*; -import javax.validation.Valid; -import java.util.List; -import java.util.stream.Collectors; - /** * @class SecretController * @description 密钥管理接口 diff --git a/api/src/main/java/dev/jianmu/api/controller/ViewController.java b/api/src/main/java/dev/jianmu/api/controller/ViewController.java index 7d79d991e378da0880db890d3ad6a39a15012ccf..0ee52f3e18eed98f8f625f8ca9fcbe72744d971d 100644 --- a/api/src/main/java/dev/jianmu/api/controller/ViewController.java +++ b/api/src/main/java/dev/jianmu/api/controller/ViewController.java @@ -21,14 +21,14 @@ import dev.jianmu.workflow.aggregate.parameter.Parameter; import dev.jianmu.workflow.aggregate.process.ProcessStatus; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; import org.springframework.core.io.FileSystemResource; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.mvc.method.annotation.SseEmitter; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.BufferedInputStream; import java.io.FileInputStream; import java.io.IOException; diff --git a/api/src/main/java/dev/jianmu/api/controller/WebHookController.java b/api/src/main/java/dev/jianmu/api/controller/WebHookController.java index ea9c489e49529db7dac6f12bf2fc04fd5dbeafa5..23937daab83af8695cea2e89e43f2c2c857e6b47 100644 --- a/api/src/main/java/dev/jianmu/api/controller/WebHookController.java +++ b/api/src/main/java/dev/jianmu/api/controller/WebHookController.java @@ -1,5 +1,10 @@ package dev.jianmu.api.controller; +import dev.jianmu.api.vo.WebhookResult; +import dev.jianmu.application.service.TriggerApplication; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; import org.springframework.stereotype.Controller; import org.springframework.util.AntPathMatcher; import org.springframework.web.bind.annotation.RequestHeader; @@ -11,13 +16,6 @@ import org.springframework.web.servlet.HandlerMapping; import java.net.URLDecoder; import java.nio.charset.StandardCharsets; -import javax.servlet.http.HttpServletRequest; - -import dev.jianmu.api.vo.WebhookResult; -import dev.jianmu.application.service.TriggerApplication; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; - /** * @author Ethan Liu * @class WebHookController diff --git a/api/src/main/java/dev/jianmu/api/controller/WorkerController.java b/api/src/main/java/dev/jianmu/api/controller/WorkerController.java index 989eb460c810b933b5f83c825af23d19eb7c5364..15a09185c7ba3a49ab540fef30e79e74591a48bc 100644 --- a/api/src/main/java/dev/jianmu/api/controller/WorkerController.java +++ b/api/src/main/java/dev/jianmu/api/controller/WorkerController.java @@ -18,6 +18,9 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; import org.springframework.dao.CannotAcquireLockException; import org.springframework.dao.DeadlockLoserDataAccessException; import org.springframework.http.HttpStatus; @@ -27,9 +30,6 @@ import org.springframework.retry.annotation.Retryable; import org.springframework.web.bind.annotation.*; import org.springframework.web.context.request.async.DeferredResult; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.IOException; /** diff --git a/api/src/main/java/dev/jianmu/api/dto/AuthorizationUrlGettingDto.java b/api/src/main/java/dev/jianmu/api/dto/AuthorizationUrlGettingDto.java index 7dab4403500b7a1be5ddd6035c785c1787bf30bd..00eb0d8326b13774e25c16e3b1b1577ecf3b4603 100644 --- a/api/src/main/java/dev/jianmu/api/dto/AuthorizationUrlGettingDto.java +++ b/api/src/main/java/dev/jianmu/api/dto/AuthorizationUrlGettingDto.java @@ -1,13 +1,12 @@ package dev.jianmu.api.dto; import dev.jianmu.oauth2.api.enumeration.ThirdPartyTypeEnum; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; import lombok.Getter; import lombok.Setter; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; - /** * @author huangxi * @class AuthorizationUrlGettingDto diff --git a/api/src/main/java/dev/jianmu/api/dto/DslTextDto.java b/api/src/main/java/dev/jianmu/api/dto/DslTextDto.java index a9d7836031988b62887b048de63ae7f69f63cf29..4378018ca6c71820710166f667e5c2f1195678a3 100644 --- a/api/src/main/java/dev/jianmu/api/dto/DslTextDto.java +++ b/api/src/main/java/dev/jianmu/api/dto/DslTextDto.java @@ -1,13 +1,12 @@ package dev.jianmu.api.dto; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotBlank; - /** * @class DslTextDto * @description DslTextDto diff --git a/api/src/main/java/dev/jianmu/api/dto/GitRepoDto.java b/api/src/main/java/dev/jianmu/api/dto/GitRepoDto.java index 3a382548487ad0e45fe4e6c80bcb7726e5cfb422..05de3e4bb3a6ecfd33099a77ac3c5810d0d132d8 100644 --- a/api/src/main/java/dev/jianmu/api/dto/GitRepoDto.java +++ b/api/src/main/java/dev/jianmu/api/dto/GitRepoDto.java @@ -2,14 +2,13 @@ package dev.jianmu.api.dto; import dev.jianmu.project.aggregate.Credential; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - /** * @class GitRepoDto * @description GitRepoDto diff --git a/api/src/main/java/dev/jianmu/api/dto/KVPairDto.java b/api/src/main/java/dev/jianmu/api/dto/KVPairDto.java index 6a4b3d83f4825630a7840119fa5957223477055c..36646685269457e24f854350bd48ea421c053d64 100644 --- a/api/src/main/java/dev/jianmu/api/dto/KVPairDto.java +++ b/api/src/main/java/dev/jianmu/api/dto/KVPairDto.java @@ -1,14 +1,13 @@ package dev.jianmu.api.dto; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Pattern; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Pattern; - /** * @class KVPairDto * @description 键值对Dto diff --git a/api/src/main/java/dev/jianmu/api/dto/LogRandomSubscribingDto.java b/api/src/main/java/dev/jianmu/api/dto/LogRandomSubscribingDto.java index f81b28f00ee7ccd6f4a052e156f6e0e3b715abc6..c0b20684984d7d89ccce7fb0eda613922996e16b 100644 --- a/api/src/main/java/dev/jianmu/api/dto/LogRandomSubscribingDto.java +++ b/api/src/main/java/dev/jianmu/api/dto/LogRandomSubscribingDto.java @@ -1,13 +1,12 @@ package dev.jianmu.api.dto; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotNull; - /** * @author Daihw * @class LogRandomSubscribingDto diff --git a/api/src/main/java/dev/jianmu/api/dto/LogSubscribingDto.java b/api/src/main/java/dev/jianmu/api/dto/LogSubscribingDto.java index 83697e078b3b01617879ba652cd455b0551d220f..c399c2fa8e9da853021dcf1a3cfdf53f5dfc3cb1 100644 --- a/api/src/main/java/dev/jianmu/api/dto/LogSubscribingDto.java +++ b/api/src/main/java/dev/jianmu/api/dto/LogSubscribingDto.java @@ -1,13 +1,12 @@ package dev.jianmu.api.dto; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotNull; - /** * @class LogSubscribingDto * @description LogSubscribingDto diff --git a/api/src/main/java/dev/jianmu/api/dto/LoginDto.java b/api/src/main/java/dev/jianmu/api/dto/LoginDto.java index b85e230573509f959cafaf7e466538cf2f37a16e..99819ed4d558c3bec8812a4766aeaefb76382fba 100644 --- a/api/src/main/java/dev/jianmu/api/dto/LoginDto.java +++ b/api/src/main/java/dev/jianmu/api/dto/LoginDto.java @@ -1,13 +1,12 @@ package dev.jianmu.api.dto; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotBlank; - /** * @class LoginDto * @description LoginDto diff --git a/api/src/main/java/dev/jianmu/api/dto/NamespaceDto.java b/api/src/main/java/dev/jianmu/api/dto/NamespaceDto.java index dd1692323150e405cfabd7c0fba4c2e2112c7126..d3920fb10d8322692cf4ba62a3f7c4b63a63dcff 100644 --- a/api/src/main/java/dev/jianmu/api/dto/NamespaceDto.java +++ b/api/src/main/java/dev/jianmu/api/dto/NamespaceDto.java @@ -1,14 +1,13 @@ package dev.jianmu.api.dto; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Pattern; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Pattern; - /** * @class NamespaceDto * @description 命名空间Dto diff --git a/api/src/main/java/dev/jianmu/api/dto/NodeDefinitionDto.java b/api/src/main/java/dev/jianmu/api/dto/NodeDefinitionDto.java index 8928f5731eebeb31c8002e0702e79e04b0d14397..5dde577323674c90b352fecc52365ca21f540e22 100644 --- a/api/src/main/java/dev/jianmu/api/dto/NodeDefinitionDto.java +++ b/api/src/main/java/dev/jianmu/api/dto/NodeDefinitionDto.java @@ -1,13 +1,12 @@ package dev.jianmu.api.dto; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import javax.validation.constraints.NotBlank; - /** * @class NodeDefinitionDto * @description NodeDefinitionDto diff --git a/api/src/main/java/dev/jianmu/api/dto/Oauth2LoggingDto.java b/api/src/main/java/dev/jianmu/api/dto/Oauth2LoggingDto.java index 48b8c2eee6ab514cbea7eca33af2906426d63162..df139358ca9d8b28a4e35a65b4a17efd702abc7c 100644 --- a/api/src/main/java/dev/jianmu/api/dto/Oauth2LoggingDto.java +++ b/api/src/main/java/dev/jianmu/api/dto/Oauth2LoggingDto.java @@ -1,13 +1,12 @@ package dev.jianmu.api.dto; import dev.jianmu.oauth2.api.enumeration.ThirdPartyTypeEnum; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; import lombok.Getter; import lombok.Setter; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; - /** * @author huangxi * @class Oauth2LoggingDto diff --git a/api/src/main/java/dev/jianmu/api/dto/ProjectGroupAddingDto.java b/api/src/main/java/dev/jianmu/api/dto/ProjectGroupAddingDto.java index b4cde16333b5bb41b933e9369d746b246905f35d..a06a7eabeaffa1386ec9704f34f343fd16019453 100644 --- a/api/src/main/java/dev/jianmu/api/dto/ProjectGroupAddingDto.java +++ b/api/src/main/java/dev/jianmu/api/dto/ProjectGroupAddingDto.java @@ -1,12 +1,12 @@ package dev.jianmu.api.dto; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotNull; import java.util.List; /** diff --git a/api/src/main/java/dev/jianmu/api/dto/ProjectGroupDto.java b/api/src/main/java/dev/jianmu/api/dto/ProjectGroupDto.java index ffb25633a092820389865836f1331d976231097d..60983c410075526f83b7dc4cdea705730e56b637 100644 --- a/api/src/main/java/dev/jianmu/api/dto/ProjectGroupDto.java +++ b/api/src/main/java/dev/jianmu/api/dto/ProjectGroupDto.java @@ -1,15 +1,14 @@ package dev.jianmu.api.dto; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; - /** * @author Daihw * @class ProjectGroupDto diff --git a/api/src/main/java/dev/jianmu/api/dto/ProjectGroupSortUpdatingDto.java b/api/src/main/java/dev/jianmu/api/dto/ProjectGroupSortUpdatingDto.java index b1d322026f6ceb09c0faf1aa6d2bea9d0764ec3c..7d1a9dfe79c28d6bde6fd7e6e07af8f179d50ef1 100644 --- a/api/src/main/java/dev/jianmu/api/dto/ProjectGroupSortUpdatingDto.java +++ b/api/src/main/java/dev/jianmu/api/dto/ProjectGroupSortUpdatingDto.java @@ -1,13 +1,12 @@ package dev.jianmu.api.dto; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotBlank; - /** * @author Daihw * @class ProjectGroupSortUpdateDto diff --git a/api/src/main/java/dev/jianmu/api/dto/ProjectSortUpdatingDto.java b/api/src/main/java/dev/jianmu/api/dto/ProjectSortUpdatingDto.java index ca93e2bc84e8ac78bfda37a788c61a0ab486a8bb..30c7098917b1a10dac502e11ece09e9fe6af70d0 100644 --- a/api/src/main/java/dev/jianmu/api/dto/ProjectSortUpdatingDto.java +++ b/api/src/main/java/dev/jianmu/api/dto/ProjectSortUpdatingDto.java @@ -1,13 +1,12 @@ package dev.jianmu.api.dto; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotBlank; - /** * @author Daihw * @class ProjectSortUpdatingDto diff --git a/api/src/main/java/dev/jianmu/api/dto/ProjectTriggeringDto.java b/api/src/main/java/dev/jianmu/api/dto/ProjectTriggeringDto.java index eda03298b17597048f2a66c17c6d9918fae5bcf2..20cdd224f0866000e2e58da69f93af4ef62920db 100644 --- a/api/src/main/java/dev/jianmu/api/dto/ProjectTriggeringDto.java +++ b/api/src/main/java/dev/jianmu/api/dto/ProjectTriggeringDto.java @@ -1,10 +1,10 @@ package dev.jianmu.api.dto; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotBlank; import lombok.Getter; -import javax.validation.Valid; -import javax.validation.constraints.NotBlank; import java.util.List; import java.util.Map; import java.util.stream.Collectors; diff --git a/api/src/main/java/dev/jianmu/api/dto/ProjectViewingIdsDto.java b/api/src/main/java/dev/jianmu/api/dto/ProjectViewingIdsDto.java index cb47050544bd030870a17cc5d71c6a05141e88ff..29bab86c9c4777866cd882af0d72bac4a65a6e16 100644 --- a/api/src/main/java/dev/jianmu/api/dto/ProjectViewingIdsDto.java +++ b/api/src/main/java/dev/jianmu/api/dto/ProjectViewingIdsDto.java @@ -1,9 +1,9 @@ package dev.jianmu.api.dto; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; -import javax.validation.constraints.NotNull; import java.util.List; @Getter diff --git a/api/src/main/java/dev/jianmu/api/dto/TaskInstanceAcceptingDto.java b/api/src/main/java/dev/jianmu/api/dto/TaskInstanceAcceptingDto.java index f364dd4e021d975f2f2b89d3af33a3343a89271e..10f4ea86a75c1e59475d30e7493b22b6c16f2231 100644 --- a/api/src/main/java/dev/jianmu/api/dto/TaskInstanceAcceptingDto.java +++ b/api/src/main/java/dev/jianmu/api/dto/TaskInstanceAcceptingDto.java @@ -1,13 +1,12 @@ package dev.jianmu.api.dto; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import javax.validation.constraints.NotNull; - /** * @class TaskInstanceAcceptingDto * @description TaskInstanceAcceptingDto diff --git a/api/src/main/java/dev/jianmu/api/dto/TaskInstanceUpdatingDto.java b/api/src/main/java/dev/jianmu/api/dto/TaskInstanceUpdatingDto.java index 4daa03c89698452a9c9cf7c6181a18818f5f2a88..ebd3cf46249becf7de71079b2b69d30bcfa7d9e6 100644 --- a/api/src/main/java/dev/jianmu/api/dto/TaskInstanceUpdatingDto.java +++ b/api/src/main/java/dev/jianmu/api/dto/TaskInstanceUpdatingDto.java @@ -1,14 +1,12 @@ package dev.jianmu.api.dto; -import dev.jianmu.task.aggregate.InstanceStatus; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import javax.validation.constraints.NotNull; - /** * @class TaskInstanceUpdatingDto * @description TaskInstanceUpdatingDto diff --git a/api/src/main/java/dev/jianmu/api/dto/TransformerDto.java b/api/src/main/java/dev/jianmu/api/dto/TransformerDto.java index 37416be40780959b90e79eb45c42d8ac0e98954c..1d1260f685c60405d81c1093b9f6f0e16aa6bb16 100644 --- a/api/src/main/java/dev/jianmu/api/dto/TransformerDto.java +++ b/api/src/main/java/dev/jianmu/api/dto/TransformerDto.java @@ -1,14 +1,12 @@ package dev.jianmu.api.dto; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - /** * @class TransformerDto * @description TransformerDto diff --git a/api/src/main/java/dev/jianmu/api/dto/WebRequestDto.java b/api/src/main/java/dev/jianmu/api/dto/WebRequestDto.java index a91f87643b38d6abf92a471067824b38930fb0a5..413f56a13395870842ab158fa022ef90befac05f 100644 --- a/api/src/main/java/dev/jianmu/api/dto/WebRequestDto.java +++ b/api/src/main/java/dev/jianmu/api/dto/WebRequestDto.java @@ -1,13 +1,12 @@ package dev.jianmu.api.dto; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import javax.validation.constraints.NotEmpty; - /** * @class WebRequestDto * @description WebRequestDto diff --git a/api/src/main/java/dev/jianmu/api/eventhandler/ProjectEventHandler.java b/api/src/main/java/dev/jianmu/api/eventhandler/ProjectEventHandler.java index 54b662178b1f0748349bf8a916afd4d25e147a14..b4537e58c2a5317cc29a41b0a977a45f570e515a 100644 --- a/api/src/main/java/dev/jianmu/api/eventhandler/ProjectEventHandler.java +++ b/api/src/main/java/dev/jianmu/api/eventhandler/ProjectEventHandler.java @@ -1,23 +1,18 @@ package dev.jianmu.api.eventhandler; -import org.springframework.context.event.EventListener; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; -import org.springframework.transaction.event.TransactionPhase; -import org.springframework.transaction.event.TransactionalEventListener; - import dev.jianmu.application.command.WorkflowStartCmd; import dev.jianmu.application.service.ProjectApplication; import dev.jianmu.application.service.ProjectGroupApplication; import dev.jianmu.application.service.TriggerApplication; import dev.jianmu.application.service.internal.WorkflowInstanceInternalApplication; import dev.jianmu.infrastructure.lock.DistributedLock; -import dev.jianmu.project.event.CreatedEvent; -import dev.jianmu.project.event.DeletedEvent; -import dev.jianmu.project.event.TrashEvent; -import dev.jianmu.project.event.MovedEvent; -import dev.jianmu.project.event.TriggerEvent; +import dev.jianmu.project.event.*; import lombok.extern.slf4j.Slf4j; +import org.springframework.context.event.EventListener; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Component; +import org.springframework.transaction.event.TransactionPhase; +import org.springframework.transaction.event.TransactionalEventListener; /** * @author Ethan Liu diff --git a/api/src/main/java/dev/jianmu/api/interceptor/WorkerInterceptor.java b/api/src/main/java/dev/jianmu/api/interceptor/WorkerInterceptor.java index 48aecafb7e75e251784428a722845c6b50317c22..74d29fd05f290cb0c899c281b372bed9b679ea10 100644 --- a/api/src/main/java/dev/jianmu/api/interceptor/WorkerInterceptor.java +++ b/api/src/main/java/dev/jianmu/api/interceptor/WorkerInterceptor.java @@ -1,14 +1,13 @@ package dev.jianmu.api.interceptor; import dev.jianmu.infrastructure.GlobalProperties; -import org.apache.http.HttpStatus; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.apache.hc.core5.http.HttpStatus; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; import org.springframework.web.servlet.HandlerInterceptor; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - /** * @class WorkerInterceptor * @description WorkerInterceptor diff --git a/api/src/main/java/dev/jianmu/api/jwt/DisableSecurityConfig.java b/api/src/main/java/dev/jianmu/api/jwt/DisableSecurityConfig.java index 75f38cba654b8586caab91f152e0996dde528513..6705424537f02f25c0f5a85c8540938c1e09ae62 100644 --- a/api/src/main/java/dev/jianmu/api/jwt/DisableSecurityConfig.java +++ b/api/src/main/java/dev/jianmu/api/jwt/DisableSecurityConfig.java @@ -3,11 +3,10 @@ package dev.jianmu.api.jwt; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; -import org.springframework.security.config.annotation.web.builders.WebSecurity; +import org.springframework.security.authentication.AuthenticationProvider; +import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer; /** * @author Ethan Liu @@ -17,17 +16,18 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur */ @Configuration @EnableWebSecurity -@EnableGlobalMethodSecurity(prePostEnabled = true) +@EnableMethodSecurity @ConditionalOnProperty(prefix = "jianmu", name = "auth-mode", havingValue = "false") -public class DisableSecurityConfig extends WebSecurityConfigurerAdapter { +public class DisableSecurityConfig { + @Bean - @Override - public AuthenticationManager authenticationManagerBean() throws Exception { - return super.authenticationManagerBean(); + public AuthenticationProvider authenticationProvider() { + return null; } - @Override - public void configure(WebSecurity web) throws Exception { - web.ignoring().antMatchers("/**"); + @Bean + public WebSecurityCustomizer webSecurityCustomizer() { + return (web) -> web.ignoring().anyRequest(); } + } diff --git a/api/src/main/java/dev/jianmu/api/jwt/JwtAuthEntryPoint.java b/api/src/main/java/dev/jianmu/api/jwt/JwtAuthEntryPoint.java index 986527e3d50eb19ac08ce5ca3b94eabaf6269392..9ab613ff2333bc608b264b78563603f59b5a2a72 100644 --- a/api/src/main/java/dev/jianmu/api/jwt/JwtAuthEntryPoint.java +++ b/api/src/main/java/dev/jianmu/api/jwt/JwtAuthEntryPoint.java @@ -1,14 +1,14 @@ package dev.jianmu.api.jwt; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.stereotype.Component; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; /** diff --git a/api/src/main/java/dev/jianmu/api/jwt/JwtAuthTokenFilter.java b/api/src/main/java/dev/jianmu/api/jwt/JwtAuthTokenFilter.java index 9ead2f61dfb7b7b42e9ecea5af0260c9c665e0a3..319d2bcaa7c5b7a73b33bd942ad0eb90135d9836 100644 --- a/api/src/main/java/dev/jianmu/api/jwt/JwtAuthTokenFilter.java +++ b/api/src/main/java/dev/jianmu/api/jwt/JwtAuthTokenFilter.java @@ -3,6 +3,10 @@ package dev.jianmu.api.jwt; import dev.jianmu.infrastructure.jackson2.JsonUtil; import dev.jianmu.infrastructure.jwt.JwtProperties; import dev.jianmu.oauth2.api.config.OAuth2Properties; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.web.authentication.WebAuthenticationDetailsSource; @@ -10,10 +14,6 @@ import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; import org.springframework.web.filter.OncePerRequestFilter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; /** diff --git a/api/src/main/java/dev/jianmu/api/jwt/ReadonlySecurityConfig.java b/api/src/main/java/dev/jianmu/api/jwt/ReadonlySecurityConfig.java index 75bed5960e016178fb95dea392854eadcf50f85f..49c101c26e055310a3a09302a2e285e571057f56 100644 --- a/api/src/main/java/dev/jianmu/api/jwt/ReadonlySecurityConfig.java +++ b/api/src/main/java/dev/jianmu/api/jwt/ReadonlySecurityConfig.java @@ -3,15 +3,16 @@ package dev.jianmu.api.jwt; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; -import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; +import org.springframework.security.authentication.AuthenticationProvider; +import org.springframework.security.authentication.dao.DaoAuthenticationProvider; +import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; /** @@ -22,9 +23,9 @@ import org.springframework.security.web.authentication.UsernamePasswordAuthentic */ @Configuration @EnableWebSecurity -@EnableGlobalMethodSecurity(prePostEnabled = true) +@EnableMethodSecurity @ConditionalOnProperty(prefix = "jianmu", name = "auth-mode", havingValue = "readonly", matchIfMissing = true) -public class ReadonlySecurityConfig extends WebSecurityConfigurerAdapter { +public class ReadonlySecurityConfig { private final JwtUserDetailsService jwtUserDetailsService; private final JwtAuthEntryPoint jwtAuthEntryPoint; private final JwtAuthTokenFilter jwtAuthTokenFilter; @@ -52,25 +53,26 @@ public class ReadonlySecurityConfig extends WebSecurityConfigurerAdapter { return new BCryptPasswordEncoder(); } + @Bean - @Override - public AuthenticationManager authenticationManagerBean() throws Exception { - return super.authenticationManagerBean(); + public AuthenticationProvider authenticationProvider() { + DaoAuthenticationProvider authenticationProvider = new DaoAuthenticationProvider(); + authenticationProvider.setUserDetailsService(jwtUserDetailsService); + authenticationProvider.setPasswordEncoder(passwordEncoder()); + return authenticationProvider; } - @Override - protected void configure(AuthenticationManagerBuilder auth) throws Exception { - auth.userDetailsService(jwtUserDetailsService).passwordEncoder(passwordEncoder()); - } - @Override - protected void configure(HttpSecurity http) throws Exception { - http.cors().and().csrf().disable() - .exceptionHandling().authenticationEntryPoint(jwtAuthEntryPoint).and() - .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and() - .authorizeRequests().antMatchers("/auth/**").permitAll() - .antMatchers(AUTH_WHITELIST).permitAll() + @Bean + public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { + http.cors(AbstractHttpConfigurer::disable).csrf(AbstractHttpConfigurer::disable) + .exceptionHandling(customizer->customizer.authenticationEntryPoint(jwtAuthEntryPoint)) + .sessionManagement(customizer -> customizer.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) + .authorizeRequests() + .requestMatchers("/auth/**").permitAll() + .requestMatchers(AUTH_WHITELIST).permitAll() .anyRequest().authenticated(); http.addFilterBefore(jwtAuthTokenFilter, UsernamePasswordAuthenticationFilter.class); + return http.build(); } } diff --git a/api/src/main/java/dev/jianmu/api/jwt/WebSecurityConfig.java b/api/src/main/java/dev/jianmu/api/jwt/WebSecurityConfig.java index 69582d738b42009aebd28070af8a5e3134c81194..c0e19cf95f392f9fc19eebd9f04b11942fcefcc5 100644 --- a/api/src/main/java/dev/jianmu/api/jwt/WebSecurityConfig.java +++ b/api/src/main/java/dev/jianmu/api/jwt/WebSecurityConfig.java @@ -3,15 +3,16 @@ package dev.jianmu.api.jwt; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; -import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; +import org.springframework.security.authentication.AuthenticationProvider; +import org.springframework.security.authentication.dao.DaoAuthenticationProvider; +import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; /** @@ -22,9 +23,10 @@ import org.springframework.security.web.authentication.UsernamePasswordAuthentic */ @Configuration @EnableWebSecurity -@EnableGlobalMethodSecurity(prePostEnabled = true) +@EnableMethodSecurity @ConditionalOnProperty(prefix = "jianmu", name = "auth-mode", havingValue = "true") -public class WebSecurityConfig extends WebSecurityConfigurerAdapter { +public class WebSecurityConfig { + private final JwtUserDetailsService jwtUserDetailsService; private final JwtAuthEntryPoint jwtAuthEntryPoint; private final JwtAuthTokenFilter jwtAuthTokenFilter; @@ -54,24 +56,25 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { } @Bean - @Override - public AuthenticationManager authenticationManagerBean() throws Exception { - return super.authenticationManagerBean(); + public AuthenticationProvider authenticationProvider() { + DaoAuthenticationProvider authenticationProvider = new DaoAuthenticationProvider(); + authenticationProvider.setUserDetailsService(jwtUserDetailsService); + authenticationProvider.setPasswordEncoder(passwordEncoder()); + return authenticationProvider; } - @Override - protected void configure(AuthenticationManagerBuilder auth) throws Exception { - auth.userDetailsService(jwtUserDetailsService).passwordEncoder(passwordEncoder()); - } - @Override - protected void configure(HttpSecurity http) throws Exception { - http.cors().and().csrf().disable() - .exceptionHandling().authenticationEntryPoint(jwtAuthEntryPoint).and() - .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and() - .authorizeRequests().antMatchers("/auth/**").permitAll() - .antMatchers(AUTH_WHITELIST).permitAll() + @Bean + public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { + http.cors(AbstractHttpConfigurer::disable).csrf(AbstractHttpConfigurer::disable) + .exceptionHandling(customizer->customizer.authenticationEntryPoint(jwtAuthEntryPoint)) + .sessionManagement(customizer -> customizer.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) + .authorizeRequests() + .requestMatchers("/auth/**").permitAll() + .requestMatchers(AUTH_WHITELIST).permitAll() .anyRequest().authenticated(); http.addFilterBefore(jwtAuthTokenFilter, UsernamePasswordAuthenticationFilter.class); + return http.build(); } + } diff --git a/api/src/main/java/dev/jianmu/api/mapper/ProjectMapper.java b/api/src/main/java/dev/jianmu/api/mapper/ProjectMapper.java index 3ecbaa0eebc6aae7e684cba6625abbf491d2d4d0..d488a1b0bf4106f587da7d75b392e259a0daa73c 100644 --- a/api/src/main/java/dev/jianmu/api/mapper/ProjectMapper.java +++ b/api/src/main/java/dev/jianmu/api/mapper/ProjectMapper.java @@ -2,7 +2,6 @@ package dev.jianmu.api.mapper; import dev.jianmu.api.vo.ProjectDetailVo; import dev.jianmu.api.vo.ProjectVo; -import dev.jianmu.application.query.NodeDef; import dev.jianmu.project.aggregate.Project; import dev.jianmu.workflow.aggregate.process.AsyncTaskInstance; import org.mapstruct.Mapper; @@ -11,8 +10,6 @@ import org.mapstruct.MappingConstants; import org.mapstruct.ValueMapping; import org.mapstruct.factory.Mappers; -import java.util.List; - /** * @class ProjectMapper * @description ProjectMapper diff --git a/api/src/main/java/dev/jianmu/api/vo/ProjectDetailVo.java b/api/src/main/java/dev/jianmu/api/vo/ProjectDetailVo.java index 265fbea930057709715958832220f55b0d9c78d1..cc88c6ac17c1f83ebd52c96a7a1c7c32b85af7a7 100644 --- a/api/src/main/java/dev/jianmu/api/vo/ProjectDetailVo.java +++ b/api/src/main/java/dev/jianmu/api/vo/ProjectDetailVo.java @@ -1,6 +1,5 @@ package dev.jianmu.api.vo; -import dev.jianmu.application.query.NodeDef; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; @@ -8,7 +7,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.time.LocalDateTime; -import java.util.List; /** * @class ProjectDetailVo diff --git a/api/src/main/java/dev/jianmu/api/vo/TriggerDefinitionVo.java b/api/src/main/java/dev/jianmu/api/vo/TriggerDefinitionVo.java index 74c75f482731be860ccd5036a2b4b985f36b782c..20f0eefe985198de59c0e4b30a308d1a4574be9e 100644 --- a/api/src/main/java/dev/jianmu/api/vo/TriggerDefinitionVo.java +++ b/api/src/main/java/dev/jianmu/api/vo/TriggerDefinitionVo.java @@ -3,7 +3,10 @@ package dev.jianmu.api.vo; import dev.jianmu.trigger.aggregate.WebhookAuth; import dev.jianmu.trigger.aggregate.WebhookParameter; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; import java.util.List; diff --git a/api/src/main/resources/application.yml b/api/src/main/resources/application.yml index 4bd884c23121a0d9c009baad2c5e93c66f970e0d..7510de0471d1d81851007d56dd4bf335f4943038 100644 --- a/api/src/main/resources/application.yml +++ b/api/src/main/resources/application.yml @@ -43,6 +43,7 @@ mybatis: jdbc-type-for-null: null jianmu: + auth-mode: true api: jwtSecret: A1KLCSAFHCASLHVCAHVKJAHSVWGEEQKWBY3CJBTI9G20ZPXYFGAVEHQUTPWOURHOO5CKVOIE2RYMP4L9JRG3ZROSWLBXCSHBMCLGUHGHMOPZD7BLHQNLLH7JLVLHOJBGM5IQVYER2EKFXL9HPRKXVWZYHB9VUQ6VJEWC0UMDU67KWNP6TUG1TDPSG1OLYZ0OO4KWI0TB2SMQCPKIGWDJEM7VIIO4JLWY0SSV6C0SAVBP0WZXPYDUWGDYCI7XXHBWO3ITTBEKX7Z9YC6RNIATMWGOJLF3DCQSQAEHRERFE41DLLV9VSOQFFH2CCSKAIUY24LE3MGA2QMMY7MI0IDV jwtExpirationMs: 86400000 diff --git a/api/src/test/java/dev/jianmu/api/ElServiceTest.java b/api/src/test/java/dev/jianmu/api/ElServiceTest.java index 223dbbdb55f4a6db9a5b6de101832fcb2f29c811..328d1c3dc29860c9d5efc380fe5e09ca0d5b24b1 100644 --- a/api/src/test/java/dev/jianmu/api/ElServiceTest.java +++ b/api/src/test/java/dev/jianmu/api/ElServiceTest.java @@ -3,12 +3,11 @@ package dev.jianmu.api; import dev.jianmu.workflow.aggregate.parameter.Parameter; import dev.jianmu.workflow.el.Expression; import dev.jianmu.workflow.el.ExpressionLanguage; +import jakarta.annotation.Resource; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; -import javax.annotation.Resource; - import static org.junit.jupiter.api.Assertions.assertEquals; /** diff --git a/api/src/test/java/dev/jianmu/api/WorkflowIntegrationTest.java b/api/src/test/java/dev/jianmu/api/WorkflowIntegrationTest.java index 76db8f2416f2a7a64f2c3026fffab502f2c28bde..eb89b0dc8513c85e7a90695103cbd1c8987f1da2 100644 --- a/api/src/test/java/dev/jianmu/api/WorkflowIntegrationTest.java +++ b/api/src/test/java/dev/jianmu/api/WorkflowIntegrationTest.java @@ -2,15 +2,16 @@ package dev.jianmu.api; import dev.jianmu.workflow.aggregate.definition.*; import dev.jianmu.workflow.repository.WorkflowRepository; +import jakarta.annotation.Resource; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.annotation.Rollback; import org.springframework.test.context.ActiveProfiles; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; -import java.util.*; +import java.util.List; +import java.util.Optional; +import java.util.Set; /** * @class dev.jianmu.web.WorkflowIntegrationTest diff --git a/api/src/test/java/dev/jianmu/api/WorkflowTaskTriggerParameterInstanceIntegrationTest.java b/api/src/test/java/dev/jianmu/api/WorkflowTaskTriggerParameterInstanceIntegrationTest.java index 6147321a2b53ccac7f82eec49e317eaa9cd9248c..79de70f81b8925369ae9e852de94c71890bfcea8 100644 --- a/api/src/test/java/dev/jianmu/api/WorkflowTaskTriggerParameterInstanceIntegrationTest.java +++ b/api/src/test/java/dev/jianmu/api/WorkflowTaskTriggerParameterInstanceIntegrationTest.java @@ -1,13 +1,13 @@ package dev.jianmu.api; import dev.jianmu.application.exception.DataNotFoundException; -import dev.jianmu.application.service.WorkflowInstanceApplication; import dev.jianmu.application.service.internal.WorkflowInstanceInternalApplication; import dev.jianmu.workflow.aggregate.definition.*; import dev.jianmu.workflow.aggregate.process.WorkflowInstance; import dev.jianmu.workflow.el.ExpressionLanguage; import dev.jianmu.workflow.repository.WorkflowInstanceRepository; import dev.jianmu.workflow.service.WorkflowInstanceDomainService; +import jakarta.annotation.Resource; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.slf4j.Logger; @@ -16,8 +16,9 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; -import java.util.*; +import java.util.List; +import java.util.Optional; +import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/api/src/test/java/dev/jianmu/api/WorkflowTest.java b/api/src/test/java/dev/jianmu/api/WorkflowTest.java index f94da3be91ec7a12da0961c0d21ebc7cc1e11aed..1987d3ad6bc8e46d06b6d264d529db42d4fc067a 100644 --- a/api/src/test/java/dev/jianmu/api/WorkflowTest.java +++ b/api/src/test/java/dev/jianmu/api/WorkflowTest.java @@ -2,13 +2,13 @@ package dev.jianmu.api; import dev.jianmu.workflow.aggregate.definition.*; import dev.jianmu.workflow.repository.WorkflowRepository; +import jakarta.annotation.Resource; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.Rollback; import org.springframework.test.context.ActiveProfiles; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; import java.util.List; import java.util.Set; diff --git a/application/src/main/java/dev/jianmu/application/service/ParameterApplication.java b/application/src/main/java/dev/jianmu/application/service/ParameterApplication.java index 23268f5f59064c3c92e0b41d46c7c46a2262ac9e..451bb02865d42c0481c2f0ff8afb80ca58ba9a41 100644 --- a/application/src/main/java/dev/jianmu/application/service/ParameterApplication.java +++ b/application/src/main/java/dev/jianmu/application/service/ParameterApplication.java @@ -1,14 +1,11 @@ package dev.jianmu.application.service; import dev.jianmu.workflow.aggregate.parameter.Parameter; -import dev.jianmu.workflow.aggregate.parameter.SecretParameter; import dev.jianmu.workflow.repository.ParameterRepository; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.List; import java.util.Set; -import java.util.stream.Collectors; /** * @class ParameterApplication diff --git a/application/src/main/java/dev/jianmu/application/service/ProjectApplication.java b/application/src/main/java/dev/jianmu/application/service/ProjectApplication.java index b17487be7818c028f30af6c489a94bcdf25cb334..b6318d39f41b9d10342b5fad6e0d90c59babd07a 100644 --- a/application/src/main/java/dev/jianmu/application/service/ProjectApplication.java +++ b/application/src/main/java/dev/jianmu/application/service/ProjectApplication.java @@ -14,17 +14,9 @@ import dev.jianmu.infrastructure.jgit.JgitService; import dev.jianmu.infrastructure.mybatis.project.ProjectRepositoryImpl; import dev.jianmu.infrastructure.storage.StorageService; import dev.jianmu.project.aggregate.*; -import dev.jianmu.project.event.CreatedEvent; -import dev.jianmu.project.event.DeletedEvent; -import dev.jianmu.project.event.TrashEvent; -import dev.jianmu.project.event.MovedEvent; -import dev.jianmu.project.event.TriggerEvent; +import dev.jianmu.project.event.*; import dev.jianmu.project.query.ProjectVo; -import dev.jianmu.project.repository.GitRepoRepository; -import dev.jianmu.project.repository.ProjectGroupRepository; -import dev.jianmu.project.repository.ProjectLastExecutionRepository; -import dev.jianmu.project.repository.ProjectLinkGroupRepository; -import dev.jianmu.project.repository.TrashProjectRepository; +import dev.jianmu.project.repository.*; import dev.jianmu.secret.aggregate.CredentialManager; import dev.jianmu.task.aggregate.TaskInstance; import dev.jianmu.task.aggregate.Volume; diff --git a/application/src/main/java/dev/jianmu/application/service/TriggerApplication.java b/application/src/main/java/dev/jianmu/application/service/TriggerApplication.java index bb3e485faad786bdfd1a762ab819feaa81d4afa2..a09bd8e218b26f031acf8f6fad693f88639f4e03 100644 --- a/application/src/main/java/dev/jianmu/application/service/TriggerApplication.java +++ b/application/src/main/java/dev/jianmu/application/service/TriggerApplication.java @@ -6,45 +6,6 @@ import com.jayway.jsonpath.Configuration; import com.jayway.jsonpath.JsonPath; import com.jayway.jsonpath.Option; import com.jayway.jsonpath.PathNotFoundException; - -import org.quartz.CronScheduleBuilder; -import org.quartz.CronTrigger; -import org.quartz.JobBuilder; -import org.quartz.JobDetail; -import org.quartz.JobKey; -import org.quartz.Scheduler; -import org.quartz.SchedulerException; -import org.quartz.TriggerBuilder; -import org.quartz.TriggerKey; -import org.springframework.context.ApplicationEventPublisher; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.MultiValueMap; -import org.springframework.util.ObjectUtils; -import org.springframework.web.util.UriComponentsBuilder; - -import java.io.IOException; -import java.net.URLDecoder; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; -import java.text.SimpleDateFormat; -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Optional; -import java.util.function.Function; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import java.util.stream.Collectors; - -import javax.servlet.http.HttpServletRequest; - import dev.jianmu.application.dsl.webhook.WebhookDslParser; import dev.jianmu.application.exception.DataNotFoundException; import dev.jianmu.el.ElContext; @@ -67,11 +28,31 @@ import dev.jianmu.workflow.el.Expression; import dev.jianmu.workflow.el.ExpressionLanguage; import dev.jianmu.workflow.repository.ParameterRepository; import dev.jianmu.workflow.repository.WorkflowRepository; +import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; +import org.quartz.*; +import org.springframework.context.ApplicationEventPublisher; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.MultiValueMap; +import org.springframework.util.ObjectUtils; +import org.springframework.web.util.UriComponentsBuilder; + +import java.io.IOException; +import java.net.URLDecoder; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.text.SimpleDateFormat; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.util.*; +import java.util.function.Function; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.stream.Collectors; -import static java.util.stream.Collectors.groupingBy; -import static java.util.stream.Collectors.mapping; -import static java.util.stream.Collectors.toList; +import static java.util.stream.Collectors.*; /** * @author Ethan Liu diff --git a/application/src/main/java/dev/jianmu/application/service/internal/WorkerInternalApplication.java b/application/src/main/java/dev/jianmu/application/service/internal/WorkerInternalApplication.java index c64260f5c18a2505699fe56af3dcfe67ec3ad698..5bd0d8a3df09c2fa8304fde23ba07c308a8227b9 100644 --- a/application/src/main/java/dev/jianmu/application/service/internal/WorkerInternalApplication.java +++ b/application/src/main/java/dev/jianmu/application/service/internal/WorkerInternalApplication.java @@ -42,8 +42,9 @@ import dev.jianmu.workflow.repository.ParameterRepository; import dev.jianmu.workflow.repository.WorkflowInstanceRepository; import dev.jianmu.workflow.repository.WorkflowRepository; import dev.jianmu.workflow.service.ParameterDomainService; +import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; -import org.apache.http.HttpStatus; +import org.apache.hc.core5.http.HttpStatus; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationEventPublisher; @@ -51,7 +52,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; -import javax.servlet.http.HttpServletResponse; import java.io.BufferedWriter; import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/application/src/main/java/dev/jianmu/application/service/internal/WorkflowInternalApplication.java b/application/src/main/java/dev/jianmu/application/service/internal/WorkflowInternalApplication.java index 06a41082ee7b3cf0f0ada42376910f7339127c9c..7ee81d9a81f67e2f13c8fa764fe882bee86775b9 100644 --- a/application/src/main/java/dev/jianmu/application/service/internal/WorkflowInternalApplication.java +++ b/application/src/main/java/dev/jianmu/application/service/internal/WorkflowInternalApplication.java @@ -21,13 +21,13 @@ import dev.jianmu.workflow.repository.WorkflowInstanceRepository; import dev.jianmu.workflow.repository.WorkflowRepository; import dev.jianmu.workflow.service.ParameterDomainService; import dev.jianmu.workflow.service.WorkflowDomainService; +import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.context.ApplicationEventPublisher; import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; import java.util.*; import java.util.stream.Collectors; diff --git a/el/pom.xml b/el/pom.xml index 1f59b344728cb4b9010ee737a3b3b5063344583c..e677c40303b25b192e14a7b2f38a739f10de4a46 100644 --- a/el/pom.xml +++ b/el/pom.xml @@ -32,8 +32,8 @@ - 11 - 11 + 17 + 17 UTF-8 diff --git a/el/src/main/java/dev/jianmu/el/antlr4/JianMuElLexer.java b/el/src/main/java/dev/jianmu/el/antlr4/JianMuElLexer.java index 9c3765689dc7e57ddfed79441e1ad5e1f24b8fad..4ff9e23174d4b2d3159206017a5829ccc2f67d6e 100644 --- a/el/src/main/java/dev/jianmu/el/antlr4/JianMuElLexer.java +++ b/el/src/main/java/dev/jianmu/el/antlr4/JianMuElLexer.java @@ -2,14 +2,12 @@ package dev.jianmu.el.antlr4; -import org.antlr.v4.runtime.Lexer; -import org.antlr.v4.runtime.CharStream; -import org.antlr.v4.runtime.Token; -import org.antlr.v4.runtime.TokenStream; import org.antlr.v4.runtime.*; -import org.antlr.v4.runtime.atn.*; +import org.antlr.v4.runtime.atn.ATN; +import org.antlr.v4.runtime.atn.ATNDeserializer; +import org.antlr.v4.runtime.atn.LexerATNSimulator; +import org.antlr.v4.runtime.atn.PredictionContextCache; import org.antlr.v4.runtime.dfa.DFA; -import org.antlr.v4.runtime.misc.*; @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"}) public class JianMuElLexer extends Lexer { diff --git a/el/src/main/java/dev/jianmu/el/antlr4/JianMuElParser.java b/el/src/main/java/dev/jianmu/el/antlr4/JianMuElParser.java index 9db98febd6f3794e832c87e65bf8b4602e082200..8abe065ac988573e51896f09294f212491afd0d5 100644 --- a/el/src/main/java/dev/jianmu/el/antlr4/JianMuElParser.java +++ b/el/src/main/java/dev/jianmu/el/antlr4/JianMuElParser.java @@ -2,14 +2,17 @@ package dev.jianmu.el.antlr4; -import org.antlr.v4.runtime.atn.*; -import org.antlr.v4.runtime.dfa.DFA; import org.antlr.v4.runtime.*; -import org.antlr.v4.runtime.misc.*; -import org.antlr.v4.runtime.tree.*; +import org.antlr.v4.runtime.atn.ATN; +import org.antlr.v4.runtime.atn.ATNDeserializer; +import org.antlr.v4.runtime.atn.ParserATNSimulator; +import org.antlr.v4.runtime.atn.PredictionContextCache; +import org.antlr.v4.runtime.dfa.DFA; +import org.antlr.v4.runtime.tree.ParseTreeListener; +import org.antlr.v4.runtime.tree.ParseTreeVisitor; +import org.antlr.v4.runtime.tree.TerminalNode; + import java.util.List; -import java.util.Iterator; -import java.util.ArrayList; @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"}) public class JianMuElParser extends Parser { diff --git a/el/src/test/java/dev/jianmu/el/BooleanTest.java b/el/src/test/java/dev/jianmu/el/BooleanTest.java index 739ae4de07afa1d401bd5fb23ddf90f3b9318dda..41f45f20356d9194b2f5f65ba3fa9327ee8cae28 100644 --- a/el/src/test/java/dev/jianmu/el/BooleanTest.java +++ b/el/src/test/java/dev/jianmu/el/BooleanTest.java @@ -1,6 +1,5 @@ package dev.jianmu.el; -import dev.jianmu.el.El; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/el/src/test/java/dev/jianmu/el/ComplexTest.java b/el/src/test/java/dev/jianmu/el/ComplexTest.java index ff1441f1cd174c5e53bf8e129a3e7dc0814ecd40..2fb6f951c2e37f84f4ce8ac2a3547f8533b11ad3 100644 --- a/el/src/test/java/dev/jianmu/el/ComplexTest.java +++ b/el/src/test/java/dev/jianmu/el/ComplexTest.java @@ -1,7 +1,5 @@ package dev.jianmu.el; -import dev.jianmu.el.El; -import dev.jianmu.el.ElContext; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/el/src/test/java/dev/jianmu/el/NullOperationTest.java b/el/src/test/java/dev/jianmu/el/NullOperationTest.java index 7db8230676fc7572dac91efb0f520ee03b315ed1..4491c118d316a17c7aa116441945442422e0f0ad 100644 --- a/el/src/test/java/dev/jianmu/el/NullOperationTest.java +++ b/el/src/test/java/dev/jianmu/el/NullOperationTest.java @@ -1,6 +1,5 @@ package dev.jianmu.el; -import dev.jianmu.el.El; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/el/src/test/java/dev/jianmu/el/NumberArithmeticTest.java b/el/src/test/java/dev/jianmu/el/NumberArithmeticTest.java index cca9795fa5a1c18c12ebd0b53b85be23d7c41076..c99b42dc8514e2e820583f5ff999532d3b4de087 100644 --- a/el/src/test/java/dev/jianmu/el/NumberArithmeticTest.java +++ b/el/src/test/java/dev/jianmu/el/NumberArithmeticTest.java @@ -1,6 +1,5 @@ package dev.jianmu.el; -import dev.jianmu.el.El; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/el/src/test/java/dev/jianmu/el/NumberLogicTest.java b/el/src/test/java/dev/jianmu/el/NumberLogicTest.java index 53b6b10941c5cada4cd3302876b69ef9516638b5..341b6d37ac9fa771f42f10aa7c35c8ca26fde3a5 100644 --- a/el/src/test/java/dev/jianmu/el/NumberLogicTest.java +++ b/el/src/test/java/dev/jianmu/el/NumberLogicTest.java @@ -1,6 +1,5 @@ package dev.jianmu.el; -import dev.jianmu.el.El; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/el/src/test/java/dev/jianmu/el/PreCompileTest.java b/el/src/test/java/dev/jianmu/el/PreCompileTest.java index 5663cb38041ee79000ad2ba93ea2f74800aa07cb..3db4161647068d124f57a40365ddc00dbea7a6df 100644 --- a/el/src/test/java/dev/jianmu/el/PreCompileTest.java +++ b/el/src/test/java/dev/jianmu/el/PreCompileTest.java @@ -1,7 +1,5 @@ package dev.jianmu.el; -import dev.jianmu.el.El; -import dev.jianmu.el.ElContext; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/el/src/test/java/dev/jianmu/el/StringTemplateTest.java b/el/src/test/java/dev/jianmu/el/StringTemplateTest.java index 292c19a921fd1597fa4090db2cfc90c5a33ba6c8..a912472a650ce13a4b7d40ac79dad1252df08882 100644 --- a/el/src/test/java/dev/jianmu/el/StringTemplateTest.java +++ b/el/src/test/java/dev/jianmu/el/StringTemplateTest.java @@ -1,7 +1,5 @@ package dev.jianmu.el; -import dev.jianmu.el.El; -import dev.jianmu.el.ElContext; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/el/src/test/java/dev/jianmu/el/StringTest.java b/el/src/test/java/dev/jianmu/el/StringTest.java index 17ba1560c14423de9ebab0283820593cc1b8abaa..81ffe3b62b0bac3f1089efa6316c260e1534ceb6 100644 --- a/el/src/test/java/dev/jianmu/el/StringTest.java +++ b/el/src/test/java/dev/jianmu/el/StringTest.java @@ -1,6 +1,5 @@ package dev.jianmu.el; -import dev.jianmu.el.El; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/el/src/test/java/dev/jianmu/el/TypeCastingTest.java b/el/src/test/java/dev/jianmu/el/TypeCastingTest.java index 020f91675bd1f9785b3f641d6a33252d9c65a3ee..fc3dfcef29c22dddbf3722da39e4754bef386bb9 100644 --- a/el/src/test/java/dev/jianmu/el/TypeCastingTest.java +++ b/el/src/test/java/dev/jianmu/el/TypeCastingTest.java @@ -1,6 +1,5 @@ package dev.jianmu.el; -import dev.jianmu.el.El; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/embedded-worker/pom.xml b/embedded-worker/pom.xml index 5a7e1bd760e3e9d9d7f320c456ca14072618488c..d224a6ee3339eda967026f77bf1dd83df2d2bcb8 100644 --- a/embedded-worker/pom.xml +++ b/embedded-worker/pom.xml @@ -12,8 +12,8 @@ embedded-worker - 11 - 11 + 17 + 17 \ No newline at end of file diff --git a/event/pom.xml b/event/pom.xml index adfdded418b14e53051edc1d77985aac20f3fef4..4eecb6cb3398b6f4dd7248ae8c1e160278aca0e1 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -11,8 +11,8 @@ event - 11 - 11 + 17 + 17 UTF-8 diff --git a/git-repo-core/pom.xml b/git-repo-core/pom.xml index 8b3549c92cdd30fa628ac7d50019e272cd108085..5a43e1474430dabccd7554968d0cef253292013c 100644 --- a/git-repo-core/pom.xml +++ b/git-repo-core/pom.xml @@ -13,8 +13,8 @@ git-repo-core - 11 - 11 + 17 + 17 UTF-8 \ No newline at end of file diff --git a/infrastructure/pom.xml b/infrastructure/pom.xml index f867e207cc7aeeb0ace1cb8ba84cde7517a38053..96f95aed725c39d0e216b8a9024f0213b20596d0 100644 --- a/infrastructure/pom.xml +++ b/infrastructure/pom.xml @@ -127,9 +127,9 @@ - org.apache.httpcomponents - httpclient - 4.5.13 + org.apache.httpcomponents.client5 + httpclient5 + 5.1.3 @@ -153,7 +153,7 @@ com.github.pagehelper pagehelper-spring-boot-starter - 1.4.2 + 1.4.7 @@ -208,6 +208,7 @@ mysql mysql-connector-java + 8.0.30 diff --git a/infrastructure/src/main/java/dev/jianmu/infrastructure/GlobalProperties.java b/infrastructure/src/main/java/dev/jianmu/infrastructure/GlobalProperties.java index e0ed8c97b854e78cd286e75b2f106e34ea1ae08f..854d50b34023f0cce3f1d618b38ce9559c3d95e7 100644 --- a/infrastructure/src/main/java/dev/jianmu/infrastructure/GlobalProperties.java +++ b/infrastructure/src/main/java/dev/jianmu/infrastructure/GlobalProperties.java @@ -1,13 +1,12 @@ package dev.jianmu.infrastructure; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; import org.springframework.validation.annotation.Validated; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - /** * @author Ethan Liu * @class GlobalProperties diff --git a/infrastructure/src/main/java/dev/jianmu/infrastructure/client/RestTemplateConfig.java b/infrastructure/src/main/java/dev/jianmu/infrastructure/client/RestTemplateConfig.java index 5e645b0dd676415935f4220ba296027e4d87220a..154993b63a1187292b058a0058252753446cf422 100644 --- a/infrastructure/src/main/java/dev/jianmu/infrastructure/client/RestTemplateConfig.java +++ b/infrastructure/src/main/java/dev/jianmu/infrastructure/client/RestTemplateConfig.java @@ -1,8 +1,8 @@ package dev.jianmu.infrastructure.client; -import org.apache.http.client.HttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.impl.client.LaxRedirectStrategy; +import org.apache.hc.client5.http.classic.HttpClient; +import org.apache.hc.client5.http.impl.DefaultRedirectStrategy; +import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; @@ -19,8 +19,9 @@ public class RestTemplateConfig { @Bean public RestTemplate restTemplate() { HttpComponentsClientHttpRequestFactory factory = new HttpComponentsClientHttpRequestFactory(); - HttpClient httpClient = HttpClientBuilder.create() - .setRedirectStrategy(new LaxRedirectStrategy()) + HttpClient httpClient = + HttpClientBuilder.create() + .setRedirectStrategy(new DefaultRedirectStrategy()) .build(); factory.setConnectTimeout(15000); factory.setReadTimeout(15000); diff --git a/infrastructure/src/main/java/dev/jianmu/infrastructure/credential/CredentialProperties.java b/infrastructure/src/main/java/dev/jianmu/infrastructure/credential/CredentialProperties.java index fa4eb191c10ad9b5261a1c44bea03cece6393d54..a64070fb7accc97b0a25caa19bb858503b095e78 100644 --- a/infrastructure/src/main/java/dev/jianmu/infrastructure/credential/CredentialProperties.java +++ b/infrastructure/src/main/java/dev/jianmu/infrastructure/credential/CredentialProperties.java @@ -1,15 +1,14 @@ package dev.jianmu.infrastructure.credential; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.core.io.Resource; import org.springframework.stereotype.Component; import org.springframework.validation.annotation.Validated; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - /** * @class VaultProperties * @description VaultProperties diff --git a/infrastructure/src/main/java/dev/jianmu/infrastructure/elimpl/EvaluationFailure.java b/infrastructure/src/main/java/dev/jianmu/infrastructure/elimpl/EvaluationFailure.java index c78cdbba2f454435a53d619a9c20ed9b71b7a1f7..34d599ec5f4db0312c325bdc4f1289146b3dad49 100644 --- a/infrastructure/src/main/java/dev/jianmu/infrastructure/elimpl/EvaluationFailure.java +++ b/infrastructure/src/main/java/dev/jianmu/infrastructure/elimpl/EvaluationFailure.java @@ -2,7 +2,6 @@ package dev.jianmu.infrastructure.elimpl; import dev.jianmu.workflow.aggregate.parameter.Parameter; import dev.jianmu.workflow.el.EvaluationResult; -import dev.jianmu.workflow.el.ResultType; /** * @class EvaluationFailure diff --git a/infrastructure/src/main/java/dev/jianmu/infrastructure/lock/impl/RedissonLock.java b/infrastructure/src/main/java/dev/jianmu/infrastructure/lock/impl/RedissonLock.java index 9b050f7fe4f049a12eec9c8bd4e636363a01e3dd..853a7e910a69e6a1fb850171b5633c68d6b91d3f 100644 --- a/infrastructure/src/main/java/dev/jianmu/infrastructure/lock/impl/RedissonLock.java +++ b/infrastructure/src/main/java/dev/jianmu/infrastructure/lock/impl/RedissonLock.java @@ -1,11 +1,11 @@ package dev.jianmu.infrastructure.lock.impl; import dev.jianmu.infrastructure.lock.DistributedLock; +import jakarta.annotation.Resource; import org.redisson.api.RedissonClient; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; -import javax.annotation.Resource; import java.util.concurrent.locks.Lock; /** diff --git a/infrastructure/src/main/java/dev/jianmu/infrastructure/mapper/node/NodeDefinitionVersionMapper.java b/infrastructure/src/main/java/dev/jianmu/infrastructure/mapper/node/NodeDefinitionVersionMapper.java index 7aa849b1728bebb02961e2d35db4ac9c14175622..ff721d23c4322338e65d1a98e6b451dec9e0ef63 100644 --- a/infrastructure/src/main/java/dev/jianmu/infrastructure/mapper/node/NodeDefinitionVersionMapper.java +++ b/infrastructure/src/main/java/dev/jianmu/infrastructure/mapper/node/NodeDefinitionVersionMapper.java @@ -1,7 +1,7 @@ package dev.jianmu.infrastructure.mapper.node; -import dev.jianmu.node.definition.aggregate.NodeDefinitionVersion; import dev.jianmu.infrastructure.typehandler.NodeParameterListTypeHandler; +import dev.jianmu.node.definition.aggregate.NodeDefinitionVersion; import org.apache.ibatis.annotations.*; import java.util.List; diff --git a/infrastructure/src/main/java/dev/jianmu/infrastructure/mapper/project/TrashProjectMapper.java b/infrastructure/src/main/java/dev/jianmu/infrastructure/mapper/project/TrashProjectMapper.java index d0944acd39bc98c71fa3991ae85a68c40386fa1e..5d07612c226cb9aaae50f0643eed174dc884f01a 100644 --- a/infrastructure/src/main/java/dev/jianmu/infrastructure/mapper/project/TrashProjectMapper.java +++ b/infrastructure/src/main/java/dev/jianmu/infrastructure/mapper/project/TrashProjectMapper.java @@ -1,5 +1,6 @@ package dev.jianmu.infrastructure.mapper.project; +import dev.jianmu.project.aggregate.Project; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Result; @@ -7,8 +8,6 @@ import org.apache.ibatis.annotations.Select; import java.util.Optional; -import dev.jianmu.project.aggregate.Project; - /** * @class TrashProjectMapper * @description TrashProjectMapper diff --git a/infrastructure/src/main/java/dev/jianmu/infrastructure/mapper/task/InstanceParameterMapper.java b/infrastructure/src/main/java/dev/jianmu/infrastructure/mapper/task/InstanceParameterMapper.java index f24309c8a3bf1423b47bed08337b034b28e385b4..81d77e0ca4bbc7b6927dfddf1edafa922c684ef7 100644 --- a/infrastructure/src/main/java/dev/jianmu/infrastructure/mapper/task/InstanceParameterMapper.java +++ b/infrastructure/src/main/java/dev/jianmu/infrastructure/mapper/task/InstanceParameterMapper.java @@ -1,16 +1,11 @@ package dev.jianmu.infrastructure.mapper.task; -import org.apache.ibatis.annotations.Delete; -import org.apache.ibatis.annotations.Insert; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Result; -import org.apache.ibatis.annotations.Select; +import dev.jianmu.task.aggregate.InstanceParameter; +import org.apache.ibatis.annotations.*; import java.util.List; import java.util.Set; -import dev.jianmu.task.aggregate.InstanceParameter; - /** * @author Ethan Liu * @class InstanceParameterMapper diff --git a/infrastructure/src/main/java/dev/jianmu/infrastructure/mapper/trigger/TriggerEventParameterMapper.java b/infrastructure/src/main/java/dev/jianmu/infrastructure/mapper/trigger/TriggerEventParameterMapper.java index b43da5dbcb4fb85e9bda09d539fa3276d548f864..a3ff565bc89d16beaef63d80fa6f650958ebae37 100644 --- a/infrastructure/src/main/java/dev/jianmu/infrastructure/mapper/trigger/TriggerEventParameterMapper.java +++ b/infrastructure/src/main/java/dev/jianmu/infrastructure/mapper/trigger/TriggerEventParameterMapper.java @@ -1,15 +1,10 @@ package dev.jianmu.infrastructure.mapper.trigger; -import org.apache.ibatis.annotations.Delete; -import org.apache.ibatis.annotations.Insert; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Result; -import org.apache.ibatis.annotations.Select; +import dev.jianmu.trigger.event.TriggerEventParameter; +import org.apache.ibatis.annotations.*; import java.util.List; -import dev.jianmu.trigger.event.TriggerEventParameter; - /** * @author Ethan Liu * @class TriggerEventParameterMapper diff --git a/infrastructure/src/main/java/dev/jianmu/infrastructure/mapper/trigger/WebRequestMapper.java b/infrastructure/src/main/java/dev/jianmu/infrastructure/mapper/trigger/WebRequestMapper.java index 97ab9bc6731927d387e3e5bee67e14acbf0edc56..e809f5a667467ea6334c15c0f859582452e01b9c 100644 --- a/infrastructure/src/main/java/dev/jianmu/infrastructure/mapper/trigger/WebRequestMapper.java +++ b/infrastructure/src/main/java/dev/jianmu/infrastructure/mapper/trigger/WebRequestMapper.java @@ -1,7 +1,10 @@ package dev.jianmu.infrastructure.mapper.trigger; import dev.jianmu.trigger.aggregate.WebRequest; -import org.apache.ibatis.annotations.*; +import org.apache.ibatis.annotations.Insert; +import org.apache.ibatis.annotations.Result; +import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; import java.util.List; import java.util.Optional; diff --git a/infrastructure/src/main/java/dev/jianmu/infrastructure/mybatis/project/ProjectLinkGroupRepositoryImpl.java b/infrastructure/src/main/java/dev/jianmu/infrastructure/mybatis/project/ProjectLinkGroupRepositoryImpl.java index 5b70ce7def1e36217a51a5f185762934d367ad3c..75ce33e5a715317e1a02ea9c09e606dac7d2b625 100644 --- a/infrastructure/src/main/java/dev/jianmu/infrastructure/mybatis/project/ProjectLinkGroupRepositoryImpl.java +++ b/infrastructure/src/main/java/dev/jianmu/infrastructure/mybatis/project/ProjectLinkGroupRepositoryImpl.java @@ -1,7 +1,5 @@ package dev.jianmu.infrastructure.mybatis.project; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import dev.jianmu.infrastructure.mapper.project.ProjectLinkGroupMapper; import dev.jianmu.project.aggregate.ProjectLinkGroup; import dev.jianmu.project.repository.ProjectLinkGroupRepository; diff --git a/infrastructure/src/main/java/dev/jianmu/infrastructure/mybatis/project/TrashProjectRepositoryImpl.java b/infrastructure/src/main/java/dev/jianmu/infrastructure/mybatis/project/TrashProjectRepositoryImpl.java index 060ffac9fb32dd6d31931ea3cc67d8ab755ce272..f5e9039d8a281a118a95947a71b1df06e765b919 100644 --- a/infrastructure/src/main/java/dev/jianmu/infrastructure/mybatis/project/TrashProjectRepositoryImpl.java +++ b/infrastructure/src/main/java/dev/jianmu/infrastructure/mybatis/project/TrashProjectRepositoryImpl.java @@ -1,12 +1,11 @@ package dev.jianmu.infrastructure.mybatis.project; -import org.springframework.stereotype.Repository; - -import java.util.Optional; - import dev.jianmu.infrastructure.mapper.project.TrashProjectMapper; import dev.jianmu.project.aggregate.Project; import dev.jianmu.project.repository.TrashProjectRepository; +import org.springframework.stereotype.Repository; + +import java.util.Optional; /** * @class TrashProjectRepositoryImpl diff --git a/infrastructure/src/main/java/dev/jianmu/infrastructure/mybatis/trigger/TriggerEventRepositoryImpl.java b/infrastructure/src/main/java/dev/jianmu/infrastructure/mybatis/trigger/TriggerEventRepositoryImpl.java index cec488fe61232732bbff3221696c4c4580a3c74b..00e3a9a5e6759bf0e30aad960aa639511c7299a4 100644 --- a/infrastructure/src/main/java/dev/jianmu/infrastructure/mybatis/trigger/TriggerEventRepositoryImpl.java +++ b/infrastructure/src/main/java/dev/jianmu/infrastructure/mybatis/trigger/TriggerEventRepositoryImpl.java @@ -1,14 +1,13 @@ package dev.jianmu.infrastructure.mybatis.trigger; -import org.springframework.stereotype.Repository; - -import java.util.List; -import java.util.Optional; - import dev.jianmu.infrastructure.mapper.trigger.TriggerEventMapper; import dev.jianmu.infrastructure.mapper.trigger.TriggerEventParameterMapper; import dev.jianmu.trigger.event.TriggerEvent; import dev.jianmu.trigger.repository.TriggerEventRepository; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.Optional; /** * @author Ethan Liu diff --git a/infrastructure/src/main/java/dev/jianmu/infrastructure/mybatis/workflow/WorkflowInstanceRepositoryImpl.java b/infrastructure/src/main/java/dev/jianmu/infrastructure/mybatis/workflow/WorkflowInstanceRepositoryImpl.java index b3309769fd962f4cd3a1d31a1e3bd63299f2b4c1..adbb4cbea1df7c8d469e2eb01d88f9482cfb044d 100644 --- a/infrastructure/src/main/java/dev/jianmu/infrastructure/mybatis/workflow/WorkflowInstanceRepositoryImpl.java +++ b/infrastructure/src/main/java/dev/jianmu/infrastructure/mybatis/workflow/WorkflowInstanceRepositoryImpl.java @@ -6,13 +6,13 @@ import dev.jianmu.infrastructure.mapper.workflow.WorkflowInstanceMapper; import dev.jianmu.workflow.aggregate.process.ProcessStatus; import dev.jianmu.workflow.aggregate.process.WorkflowInstance; import dev.jianmu.workflow.repository.WorkflowInstanceRepository; +import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationEventPublisher; import org.springframework.stereotype.Repository; -import javax.annotation.Resource; import java.util.List; import java.util.Optional; diff --git a/infrastructure/src/main/java/dev/jianmu/infrastructure/mybatis/workflow/WorkflowRepositoryImpl.java b/infrastructure/src/main/java/dev/jianmu/infrastructure/mybatis/workflow/WorkflowRepositoryImpl.java index 8858ae8ed356eadfeb8284b346da4f9a2270244d..cfa701dab64effb11dfb045895ff2f81d81e308b 100644 --- a/infrastructure/src/main/java/dev/jianmu/infrastructure/mybatis/workflow/WorkflowRepositoryImpl.java +++ b/infrastructure/src/main/java/dev/jianmu/infrastructure/mybatis/workflow/WorkflowRepositoryImpl.java @@ -4,10 +4,10 @@ import dev.jianmu.infrastructure.exception.DBException; import dev.jianmu.infrastructure.mapper.workflow.WorkflowMapper; import dev.jianmu.workflow.aggregate.definition.Workflow; import dev.jianmu.workflow.repository.WorkflowRepository; +import jakarta.annotation.Resource; import org.springframework.context.ApplicationEventPublisher; import org.springframework.stereotype.Repository; -import javax.annotation.Resource; import java.util.List; import java.util.Optional; diff --git a/infrastructure/src/main/java/dev/jianmu/infrastructure/typehandler/NodeParameterListTypeHandler.java b/infrastructure/src/main/java/dev/jianmu/infrastructure/typehandler/NodeParameterListTypeHandler.java index 602706110408630e6fe29036629a789b40e2c929..ce4b42020dd24723d242f77b2c4b983e2a11e86c 100644 --- a/infrastructure/src/main/java/dev/jianmu/infrastructure/typehandler/NodeParameterListTypeHandler.java +++ b/infrastructure/src/main/java/dev/jianmu/infrastructure/typehandler/NodeParameterListTypeHandler.java @@ -5,8 +5,8 @@ import com.fasterxml.jackson.databind.JavaType; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator; import com.fasterxml.jackson.databind.module.SimpleModule; -import dev.jianmu.node.definition.aggregate.NodeParameter; import dev.jianmu.infrastructure.jackson2.UnmodifiableSetDeserializer; +import dev.jianmu.node.definition.aggregate.NodeParameter; import org.apache.ibatis.type.BaseTypeHandler; import org.apache.ibatis.type.JdbcType; diff --git a/infrastructure/src/main/java/dev/jianmu/infrastructure/typehandler/StringListTypeHandler.java b/infrastructure/src/main/java/dev/jianmu/infrastructure/typehandler/StringListTypeHandler.java index 587c7ab54819ba580cb10181cdc03038329a4fbf..a3e1c7fb40411cec006a3ad75c48d812a67aa7c9 100644 --- a/infrastructure/src/main/java/dev/jianmu/infrastructure/typehandler/StringListTypeHandler.java +++ b/infrastructure/src/main/java/dev/jianmu/infrastructure/typehandler/StringListTypeHandler.java @@ -6,8 +6,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator; import com.fasterxml.jackson.databind.module.SimpleModule; import dev.jianmu.infrastructure.jackson2.UnmodifiableListDeserializer; -import dev.jianmu.infrastructure.jackson2.UnmodifiableSetDeserializer; -import dev.jianmu.workflow.aggregate.definition.Node; import dev.jianmu.workflow.aggregate.definition.Start; import org.apache.ibatis.type.BaseTypeHandler; import org.apache.ibatis.type.JdbcType; @@ -17,7 +15,6 @@ import java.io.IOException; import java.nio.charset.StandardCharsets; import java.sql.*; import java.util.List; -import java.util.Set; /** * @class StringListTypeHandler diff --git a/infrastructure/src/main/java/dev/jianmu/infrastructure/worker/unit/Runner.java b/infrastructure/src/main/java/dev/jianmu/infrastructure/worker/unit/Runner.java index 564abd8e94b7b00e10f7ec085fafcdae3bf54df8..bf2a2c14f1c98be21dfa15bf313e5c1be2572b6a 100644 --- a/infrastructure/src/main/java/dev/jianmu/infrastructure/worker/unit/Runner.java +++ b/infrastructure/src/main/java/dev/jianmu/infrastructure/worker/unit/Runner.java @@ -2,7 +2,6 @@ package dev.jianmu.infrastructure.worker.unit; import com.fasterxml.jackson.annotation.JsonProperty; import dev.jianmu.infrastructure.worker.K8sVolumeMount; -import dev.jianmu.infrastructure.worker.VolumeMount; import dev.jianmu.infrastructure.worker.WorkerSecret; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/node-definition/pom.xml b/node-definition/pom.xml index 2f1f1d479f62b080b5c9633d8c7cfe586fec0367..a40f17ae2942c8304e656161e8a8ba798e37df24 100644 --- a/node-definition/pom.xml +++ b/node-definition/pom.xml @@ -12,8 +12,8 @@ node-definition - 11 - 11 + 17 + 17 \ No newline at end of file diff --git a/oauth2/pom.xml b/oauth2/pom.xml index d3d299b39216732be7983423ada6b661367bc1e5..73b859ea831a9363cad12bd9d6fefea4087ab7ce 100644 --- a/oauth2/pom.xml +++ b/oauth2/pom.xml @@ -12,8 +12,8 @@ oauth2 - 11 - 11 + 17 + 17 diff --git a/oauth2/src/main/java/dev/jianmu/oauth2/api/config/OAuth2Properties.java b/oauth2/src/main/java/dev/jianmu/oauth2/api/config/OAuth2Properties.java index f48936c5722a115019e3c05ae75e364a0bf16041..dd6233867bd991e7871ec24d2ab94ef56ac4d38a 100644 --- a/oauth2/src/main/java/dev/jianmu/oauth2/api/config/OAuth2Properties.java +++ b/oauth2/src/main/java/dev/jianmu/oauth2/api/config/OAuth2Properties.java @@ -13,7 +13,6 @@ import org.springframework.core.env.Environment; import org.springframework.stereotype.Component; import org.springframework.validation.annotation.Validated; -import javax.validation.Valid; import java.util.Objects; /** diff --git a/oauth2/src/main/java/dev/jianmu/oauth2/api/impl/GitlinkApi.java b/oauth2/src/main/java/dev/jianmu/oauth2/api/impl/GitlinkApi.java index 4e69238b701390411fc0221d7aca03a78e99e1ac..91b50808980c4aa68446964a009dc34df33f84d2 100644 --- a/oauth2/src/main/java/dev/jianmu/oauth2/api/impl/GitlinkApi.java +++ b/oauth2/src/main/java/dev/jianmu/oauth2/api/impl/GitlinkApi.java @@ -5,13 +5,13 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import dev.jianmu.oauth2.api.OAuth2Api; import dev.jianmu.oauth2.api.config.OAuth2Properties; +import dev.jianmu.oauth2.api.exception.*; import dev.jianmu.oauth2.api.impl.dto.gitlink.LoggingDto; import dev.jianmu.oauth2.api.impl.vo.gitlink.*; import dev.jianmu.oauth2.api.vo.IBranchesVo; import dev.jianmu.oauth2.api.vo.IRepoMemberVo; import dev.jianmu.oauth2.api.vo.IRepoVo; import dev.jianmu.oauth2.api.vo.IUserInfoVo; -import dev.jianmu.oauth2.api.exception.*; import org.springframework.http.*; import org.springframework.stereotype.Component; import org.springframework.util.MultiValueMap; diff --git a/oauth2/src/main/java/dev/jianmu/oauth2/api/vo/AllowLoginVo.java b/oauth2/src/main/java/dev/jianmu/oauth2/api/vo/AllowLoginVo.java index fd4109be0fc6b67470d2c69d5e34033b6123d4fd..2072d9f93c0b6689980b0b8382650f9b8ace1fbd 100644 --- a/oauth2/src/main/java/dev/jianmu/oauth2/api/vo/AllowLoginVo.java +++ b/oauth2/src/main/java/dev/jianmu/oauth2/api/vo/AllowLoginVo.java @@ -1,9 +1,9 @@ package dev.jianmu.oauth2.api.vo; +import jakarta.validation.constraints.NotBlank; import lombok.Getter; import lombok.Setter; -import javax.validation.constraints.NotBlank; import java.util.List; /** diff --git a/pom.xml b/pom.xml index d93b1dbfcac0bb67a64ba8955fa8b8cdbab9617d..978e8ee37bc36e404492ddb1caa8ab9ff63099c9 100644 --- a/pom.xml +++ b/pom.xml @@ -28,8 +28,8 @@ - 11 - 11 + 17 + 17 UTF-8 1.36.0 @@ -86,7 +86,7 @@ org.springframework.boot spring-boot-dependencies - 2.7.0 + 3.1.2 pom import diff --git a/project-core/pom.xml b/project-core/pom.xml index 00012fe614f1d2f0ad16e6aa4cffeb4a98669147..55dd97f74577c9f8c2cdd6bd39d0d3938b55970c 100644 --- a/project-core/pom.xml +++ b/project-core/pom.xml @@ -12,8 +12,8 @@ project-core - 11 - 11 + 17 + 17 \ No newline at end of file diff --git a/project-core/src/main/java/dev/jianmu/project/repository/TrashProjectRepository.java b/project-core/src/main/java/dev/jianmu/project/repository/TrashProjectRepository.java index ad4d5e5c2028f6847a30c04d00f59a4a77a3197a..6d9f80c8a7ba3e20f55c9f57e0569941c37514d8 100644 --- a/project-core/src/main/java/dev/jianmu/project/repository/TrashProjectRepository.java +++ b/project-core/src/main/java/dev/jianmu/project/repository/TrashProjectRepository.java @@ -1,9 +1,9 @@ package dev.jianmu.project.repository; -import java.util.Optional; - import dev.jianmu.project.aggregate.Project; +import java.util.Optional; + /** * @class TrashProjectRepository * @description TrashProjectRepository diff --git a/secret-core/pom.xml b/secret-core/pom.xml index 19f5009da4d57b5e3797c0f7bb243d5f11216291..a2d6f3d9edcf7b75958cd5f853f47b04639ee452 100644 --- a/secret-core/pom.xml +++ b/secret-core/pom.xml @@ -12,8 +12,8 @@ secret-core - 11 - 11 + 17 + 17 \ No newline at end of file diff --git a/task-core/pom.xml b/task-core/pom.xml index bfc5ffe932a7a975ee8e02746c305e0c960443b0..266219571ec8d354707914905dbfd2d70015c529 100644 --- a/task-core/pom.xml +++ b/task-core/pom.xml @@ -12,8 +12,8 @@ task-core - 11 - 11 + 17 + 17 \ No newline at end of file diff --git a/task-core/src/main/java/dev/jianmu/task/repository/TaskInstanceRepository.java b/task-core/src/main/java/dev/jianmu/task/repository/TaskInstanceRepository.java index 3452979e6f9f73ee99292c0942bbd72ed173cd2c..9a5d96fefe5e120d9c5a23ad2a4b28f224b547f6 100644 --- a/task-core/src/main/java/dev/jianmu/task/repository/TaskInstanceRepository.java +++ b/task-core/src/main/java/dev/jianmu/task/repository/TaskInstanceRepository.java @@ -3,7 +3,6 @@ package dev.jianmu.task.repository; import dev.jianmu.task.aggregate.InstanceStatus; import dev.jianmu.task.aggregate.TaskInstance; -import java.util.Collection; import java.util.List; import java.util.Optional; diff --git a/trigger-core/pom.xml b/trigger-core/pom.xml index 2b30acb0c2a701e7e8fa732c47c192ebb08dffa0..d0b0ee41c981a6741fe99d5976c9ecce8e1ecea7 100644 --- a/trigger-core/pom.xml +++ b/trigger-core/pom.xml @@ -12,8 +12,8 @@ trigger-core - 11 - 11 + 17 + 17 \ No newline at end of file diff --git a/user-core/pom.xml b/user-core/pom.xml index 3ac29c18696ffe8e8809322756467114600a8617..e41fdb2f79ce7a8c6fb899585328fc21f64727fd 100644 --- a/user-core/pom.xml +++ b/user-core/pom.xml @@ -12,8 +12,8 @@ user-core - 11 - 11 + 17 + 17 \ No newline at end of file diff --git a/worker-core/pom.xml b/worker-core/pom.xml index 5bb4b4fab4343d2d4cf8dee4c2c35f07f7ebe761..1339fc49faa1136a9c665ba62973b93a1e1b776f 100644 --- a/worker-core/pom.xml +++ b/worker-core/pom.xml @@ -12,8 +12,8 @@ worker-core - 11 - 11 + 17 + 17 \ No newline at end of file diff --git a/workflow-core/pom.xml b/workflow-core/pom.xml index f0dac0a962a8e1ae08b98ee333e13237efaa74af..1d2db4ddce8f82c1c7072e0fb53a7b0d6530ab64 100644 --- a/workflow-core/pom.xml +++ b/workflow-core/pom.xml @@ -13,8 +13,8 @@ workflow-core - 11 - 11 + 17 + 17 UTF-8 diff --git a/workflow-core/src/main/java/dev/jianmu/workflow/aggregate/definition/BaseNode.java b/workflow-core/src/main/java/dev/jianmu/workflow/aggregate/definition/BaseNode.java index e47e017203525cab2e7cf5fc69755a81910c452b..1ba1f2f52ffed1c059b9a2a08aa17d87ca42e978 100644 --- a/workflow-core/src/main/java/dev/jianmu/workflow/aggregate/definition/BaseNode.java +++ b/workflow-core/src/main/java/dev/jianmu/workflow/aggregate/definition/BaseNode.java @@ -2,7 +2,10 @@ package dev.jianmu.workflow.aggregate.definition; import dev.jianmu.workflow.aggregate.process.FailureMode; -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; /** * @author Ethan Liu diff --git a/workflow-core/src/main/java/dev/jianmu/workflow/aggregate/process/WorkflowInstance.java b/workflow-core/src/main/java/dev/jianmu/workflow/aggregate/process/WorkflowInstance.java index 24779a3bd31ff05010ba304b3cb159478f815c28..2bf039d1f72832e16a222f0c977cc2428f953196 100644 --- a/workflow-core/src/main/java/dev/jianmu/workflow/aggregate/process/WorkflowInstance.java +++ b/workflow-core/src/main/java/dev/jianmu/workflow/aggregate/process/WorkflowInstance.java @@ -1,10 +1,9 @@ package dev.jianmu.workflow.aggregate.process; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import dev.jianmu.workflow.aggregate.AggregateRoot; import dev.jianmu.workflow.event.process.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.time.LocalDateTime; import java.util.UUID; diff --git a/workflow-core/src/test/java/dev.jianmu.workflow/PrintEventSubscriber.java b/workflow-core/src/test/java/dev.jianmu.workflow/PrintEventSubscriber.java index 69d66bfee64da61e3e3c6089b1196b810618e39c..518dadcdbfa4800b11eb54448ba19ad41dc63d34 100644 --- a/workflow-core/src/test/java/dev.jianmu.workflow/PrintEventSubscriber.java +++ b/workflow-core/src/test/java/dev.jianmu.workflow/PrintEventSubscriber.java @@ -1,7 +1,10 @@ package dev.jianmu.workflow; -import dev.jianmu.workflow.event.*; -import dev.jianmu.workflow.event.definition.*; +import dev.jianmu.workflow.event.DomainEventPublisher; +import dev.jianmu.workflow.event.DomainEventSubscriber; +import dev.jianmu.workflow.event.definition.NodeActivatingEvent; +import dev.jianmu.workflow.event.definition.WorkflowEndEvent; +import dev.jianmu.workflow.event.definition.WorkflowStartEvent; import dev.jianmu.workflow.event.process.*; /**