From c3afff535af5f56605ac649ff322408cde649819 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=ED=98=84=EC=84=B1=ED=95=84?= Date: Tue, 7 May 2024 14:39:54 +0900 Subject: [PATCH] =?UTF-8?q?import=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/condition/ConditionMatcher.java | 1 - .../condition/ConditionMatcherService.java | 3 +- .../api/condition/HeaderMatcher.java | 3 +- .../api/condition/JsonPathMatcher.java | 3 +- .../testmaster/api/condition/PathMatcher.java | 3 +- .../api/condition/QueryMatcher.java | 3 +- .../api/controller/MockApiController.java | 11 +- .../api/controller/MockApiHandlerMapping.java | 5 +- .../controller/MockRouteMgmtController.java | 11 +- .../testmaster/api/dto/MockRequest.java | 2 +- .../testmaster/api/dto/MockResponseDTO.java | 2 +- .../api/dto/MockRouteRegisterDTO.java | 5 +- .../testmaster/api/dto/MockRouteSearch.java | 1 - .../api/dto/MockRouteUpdateDTO.java | 4 +- .../testmaster/api/entity/MockCondition.java | 8 +- .../testmaster/api/entity/MockResponse.java | 15 ++- .../testmaster/api/entity/MockRoute.java | 9 +- .../api/mapper/MockRouteMapper.java | 9 +- .../api/service/MockRouteService.java | 9 +- .../controller/ApiClientPageController.java | 3 +- .../controller/ApiRequestMgmtController.java | 12 +- .../controller/ApiScenarioMgmtController.java | 9 +- .../client/dto/ApiCollectionDTO.java | 2 +- .../client/dto/ApiLayoutItemTreeBuilder.java | 111 +++++++++--------- .../testmaster/client/dto/ApiRequestDTO.java | 2 +- .../client/dto/internal/ScenarioNode.java | 1 - .../client/entity/ApiCollection.java | 9 +- .../client/entity/ApiRequestHistory.java | 9 +- .../client/entity/ApiRequestInfo.java | 8 +- .../testmaster/client/entity/ApiScenario.java | 8 +- .../client/mapper/ApiLayoutItemMapper.java | 1 - .../client/mapper/ApiScenarioMapper.java | 3 +- .../repository/ApiCollectionRepository.java | 3 +- .../repository/ApiScenarioRepository.java | 3 +- .../client/service/ApiRequestMgmtService.java | 7 +- .../service/ApiRequestMigrationService.java | 9 +- .../service/ApiScenarioMgmtService.java | 7 +- .../client/service/HttpHandler.java | 1 - .../client/service/NettyHttpApiClient.java | 17 ++- .../testmaster/common/entity/Auditable.java | 9 +- .../CustomGlobalExceptionHandler.java | 3 +- .../exception/PortalErrorController.java | 5 +- .../PortalGlobalExceptionHandler.java | 3 +- .../common/mapper/CommonMapper.java | 11 +- ...ReloadableResourceBundleMessageSource.java | 9 +- .../testmaster/common/search/BaseSearch.java | 3 +- .../common/search/ColumnSearchModel.java | 3 +- .../testmaster/common/search/SearchModel.java | 3 +- .../common/util/EncryptionUtil.java | 7 +- .../common/util/SpecificationUtil.java | 9 +- .../common/validator/PasswordMatch.java | 6 +- .../validator/PasswordMatchValidator.java | 7 +- .../testmaster/common/validator/UniqueId.java | 6 +- .../common/validator/UniqueRoute.java | 6 +- .../validator/UniqueRouteValidator.java | 3 +- .../validator/UniqueUserIdValidator.java | 1 - .../testmaster/config/AuditorAwareImpl.java | 3 +- .../PortalAuthenticationFailureHandler.java | 7 +- .../config/PortalAuthenticationManager.java | 6 +- .../PortalAuthenticationSuccessHandler.java | 11 +- .../testmaster/config/WebMvcConfig.java | 1 - .../testmaster/loadtest/dto/LoadTestDTO.java | 6 - .../loadtest/service/CallableVirtualUser.java | 1 - .../login/controller/LoginController.java | 9 +- .../controller/ServerMgmtController.java | 9 +- .../testmaster/server/dto/ServerSearch.java | 3 +- .../server/repository/ServerRepository.java | 3 +- .../server/service/ServerMgmtService.java | 3 +- .../user/controller/UserMgmtController.java | 6 +- .../user/dto/PasswordChangeRequestDTO.java | 1 - .../testmaster/user/dto/UserRegisterDTO.java | 5 +- .../testmaster/user/dto/UserSearch.java | 1 - .../testmaster/user/dto/UserUpdateDTO.java | 3 +- .../testmaster/user/entity/StaffUser.java | 9 +- .../eactive/testmaster/user/entity/User.java | 16 +-- .../testmaster/user/entity/UserGroup.java | 6 +- .../user/repository/StaffUserRepository.java | 3 +- .../user/service/StaffUserService.java | 7 +- .../testmaster/user/service/UserService.java | 3 +- 79 files changed, 294 insertions(+), 254 deletions(-) diff --git a/src/main/java/com/eactive/testmaster/api/condition/ConditionMatcher.java b/src/main/java/com/eactive/testmaster/api/condition/ConditionMatcher.java index 3d426fa..832a1df 100644 --- a/src/main/java/com/eactive/testmaster/api/condition/ConditionMatcher.java +++ b/src/main/java/com/eactive/testmaster/api/condition/ConditionMatcher.java @@ -2,7 +2,6 @@ package com.eactive.testmaster.api.condition; import com.eactive.testmaster.api.dto.MockRequest; import com.eactive.testmaster.api.entity.MockCondition; - import java.util.Map; public interface ConditionMatcher { diff --git a/src/main/java/com/eactive/testmaster/api/condition/ConditionMatcherService.java b/src/main/java/com/eactive/testmaster/api/condition/ConditionMatcherService.java index 06a1b76..2b45e8e 100644 --- a/src/main/java/com/eactive/testmaster/api/condition/ConditionMatcherService.java +++ b/src/main/java/com/eactive/testmaster/api/condition/ConditionMatcherService.java @@ -1,11 +1,10 @@ package com.eactive.testmaster.api.condition; -import org.springframework.stereotype.Service; - import java.util.List; import java.util.Map; import java.util.function.Function; import java.util.stream.Collectors; +import org.springframework.stereotype.Service; @Service(value = "ConditionMatcherService") public class ConditionMatcherService { diff --git a/src/main/java/com/eactive/testmaster/api/condition/HeaderMatcher.java b/src/main/java/com/eactive/testmaster/api/condition/HeaderMatcher.java index 46f7d24..1b5dcf3 100644 --- a/src/main/java/com/eactive/testmaster/api/condition/HeaderMatcher.java +++ b/src/main/java/com/eactive/testmaster/api/condition/HeaderMatcher.java @@ -2,9 +2,8 @@ package com.eactive.testmaster.api.condition; import com.eactive.testmaster.api.dto.MockRequest; import com.eactive.testmaster.api.entity.MockCondition; -import org.springframework.stereotype.Component; - import java.util.Map; +import org.springframework.stereotype.Component; @Component public class HeaderMatcher implements ConditionMatcher { diff --git a/src/main/java/com/eactive/testmaster/api/condition/JsonPathMatcher.java b/src/main/java/com/eactive/testmaster/api/condition/JsonPathMatcher.java index d4fe06c..b3f953e 100644 --- a/src/main/java/com/eactive/testmaster/api/condition/JsonPathMatcher.java +++ b/src/main/java/com/eactive/testmaster/api/condition/JsonPathMatcher.java @@ -4,9 +4,8 @@ import com.eactive.testmaster.api.dto.MockRequest; import com.eactive.testmaster.api.entity.MockCondition; import com.jayway.jsonpath.JsonPath; import com.jayway.jsonpath.PathNotFoundException; -import org.springframework.stereotype.Component; - import java.util.Map; +import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/com/eactive/testmaster/api/condition/PathMatcher.java b/src/main/java/com/eactive/testmaster/api/condition/PathMatcher.java index 543ed07..96f507b 100644 --- a/src/main/java/com/eactive/testmaster/api/condition/PathMatcher.java +++ b/src/main/java/com/eactive/testmaster/api/condition/PathMatcher.java @@ -2,9 +2,8 @@ package com.eactive.testmaster.api.condition; import com.eactive.testmaster.api.dto.MockRequest; import com.eactive.testmaster.api.entity.MockCondition; -import org.springframework.stereotype.Component; - import java.util.Map; +import org.springframework.stereotype.Component; @Component public class PathMatcher implements ConditionMatcher { diff --git a/src/main/java/com/eactive/testmaster/api/condition/QueryMatcher.java b/src/main/java/com/eactive/testmaster/api/condition/QueryMatcher.java index 86a0d80..53eeb1e 100644 --- a/src/main/java/com/eactive/testmaster/api/condition/QueryMatcher.java +++ b/src/main/java/com/eactive/testmaster/api/condition/QueryMatcher.java @@ -2,9 +2,8 @@ package com.eactive.testmaster.api.condition; import com.eactive.testmaster.api.dto.MockRequest; import com.eactive.testmaster.api.entity.MockCondition; -import org.springframework.stereotype.Component; - import java.util.Map; +import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/com/eactive/testmaster/api/controller/MockApiController.java b/src/main/java/com/eactive/testmaster/api/controller/MockApiController.java index 6301edd..186f7dd 100644 --- a/src/main/java/com/eactive/testmaster/api/controller/MockApiController.java +++ b/src/main/java/com/eactive/testmaster/api/controller/MockApiController.java @@ -7,6 +7,11 @@ import com.eactive.testmaster.api.entity.MockCondition; import com.eactive.testmaster.api.entity.MockResponse; import com.eactive.testmaster.api.entity.MockRoute; import com.eactive.testmaster.api.service.MockRouteService; +import java.io.IOException; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import javax.servlet.http.HttpServletRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.HttpHeaders; @@ -15,12 +20,6 @@ import org.springframework.http.ResponseEntity; import org.springframework.util.AntPathMatcher; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; -import java.io.IOException; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - @RestController public class MockApiController { diff --git a/src/main/java/com/eactive/testmaster/api/controller/MockApiHandlerMapping.java b/src/main/java/com/eactive/testmaster/api/controller/MockApiHandlerMapping.java index c909a15..0edbb8a 100644 --- a/src/main/java/com/eactive/testmaster/api/controller/MockApiHandlerMapping.java +++ b/src/main/java/com/eactive/testmaster/api/controller/MockApiHandlerMapping.java @@ -3,6 +3,8 @@ package com.eactive.testmaster.api.controller; import com.eactive.testmaster.api.entity.MockRoute; import com.eactive.testmaster.api.service.MockRouteService; import com.eactive.testmaster.config.CsrfExclusionService; +import javax.annotation.PostConstruct; +import javax.servlet.http.HttpServletRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -11,9 +13,6 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.servlet.mvc.method.RequestMappingInfo; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; -import javax.annotation.PostConstruct; -import javax.servlet.http.HttpServletRequest; - @Component public class MockApiHandlerMapping { diff --git a/src/main/java/com/eactive/testmaster/api/controller/MockRouteMgmtController.java b/src/main/java/com/eactive/testmaster/api/controller/MockRouteMgmtController.java index b2db690..f0f6a00 100644 --- a/src/main/java/com/eactive/testmaster/api/controller/MockRouteMgmtController.java +++ b/src/main/java/com/eactive/testmaster/api/controller/MockRouteMgmtController.java @@ -7,6 +7,8 @@ import com.eactive.testmaster.api.dto.MockRouteUpdateDTO; import com.eactive.testmaster.api.entity.MockRoute; import com.eactive.testmaster.api.mapper.MockRouteMapper; import com.eactive.testmaster.api.service.MockRouteService; +import java.util.List; +import javax.annotation.PostConstruct; import org.apache.commons.lang3.StringUtils; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -15,12 +17,13 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.validation.BindingResult; import org.springframework.validation.Validator; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.servlet.ModelAndView; -import javax.annotation.PostConstruct; -import java.util.List; - @Controller @RequestMapping("/mgmt/routes") public class MockRouteMgmtController { diff --git a/src/main/java/com/eactive/testmaster/api/dto/MockRequest.java b/src/main/java/com/eactive/testmaster/api/dto/MockRequest.java index 49e4ed9..1a1715d 100644 --- a/src/main/java/com/eactive/testmaster/api/dto/MockRequest.java +++ b/src/main/java/com/eactive/testmaster/api/dto/MockRequest.java @@ -1,11 +1,11 @@ package com.eactive.testmaster.api.dto; -import javax.servlet.http.HttpServletRequest; import java.io.IOException; import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.stream.Collectors; +import javax.servlet.http.HttpServletRequest; public class MockRequest { diff --git a/src/main/java/com/eactive/testmaster/api/dto/MockResponseDTO.java b/src/main/java/com/eactive/testmaster/api/dto/MockResponseDTO.java index 428f6c8..f97b960 100644 --- a/src/main/java/com/eactive/testmaster/api/dto/MockResponseDTO.java +++ b/src/main/java/com/eactive/testmaster/api/dto/MockResponseDTO.java @@ -1,8 +1,8 @@ package com.eactive.testmaster.api.dto; -import javax.validation.constraints.Min; import java.util.ArrayList; import java.util.List; +import javax.validation.constraints.Min; public class MockResponseDTO { diff --git a/src/main/java/com/eactive/testmaster/api/dto/MockRouteRegisterDTO.java b/src/main/java/com/eactive/testmaster/api/dto/MockRouteRegisterDTO.java index 2ded42a..682d5e5 100644 --- a/src/main/java/com/eactive/testmaster/api/dto/MockRouteRegisterDTO.java +++ b/src/main/java/com/eactive/testmaster/api/dto/MockRouteRegisterDTO.java @@ -1,11 +1,10 @@ package com.eactive.testmaster.api.dto; import com.eactive.testmaster.common.validator.UniqueRoute; - -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.Size; import java.util.ArrayList; import java.util.List; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.Size; @UniqueRoute(path = "pathPattern", method = "method") public class MockRouteRegisterDTO { diff --git a/src/main/java/com/eactive/testmaster/api/dto/MockRouteSearch.java b/src/main/java/com/eactive/testmaster/api/dto/MockRouteSearch.java index f4d5478..b852b40 100644 --- a/src/main/java/com/eactive/testmaster/api/dto/MockRouteSearch.java +++ b/src/main/java/com/eactive/testmaster/api/dto/MockRouteSearch.java @@ -5,7 +5,6 @@ import com.eactive.testmaster.common.search.BaseSearch; import com.eactive.testmaster.common.search.ColumnSearchModel; import com.eactive.testmaster.common.search.SearchCondition; import com.eactive.testmaster.common.search.SearchModel; - import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/eactive/testmaster/api/dto/MockRouteUpdateDTO.java b/src/main/java/com/eactive/testmaster/api/dto/MockRouteUpdateDTO.java index e1a2b67..f7aac22 100644 --- a/src/main/java/com/eactive/testmaster/api/dto/MockRouteUpdateDTO.java +++ b/src/main/java/com/eactive/testmaster/api/dto/MockRouteUpdateDTO.java @@ -1,9 +1,9 @@ package com.eactive.testmaster.api.dto; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.Size; import java.util.ArrayList; import java.util.List; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.Size; public class MockRouteUpdateDTO { diff --git a/src/main/java/com/eactive/testmaster/api/entity/MockCondition.java b/src/main/java/com/eactive/testmaster/api/entity/MockCondition.java index c61c736..cc748c4 100644 --- a/src/main/java/com/eactive/testmaster/api/entity/MockCondition.java +++ b/src/main/java/com/eactive/testmaster/api/entity/MockCondition.java @@ -1,7 +1,13 @@ package com.eactive.testmaster.api.entity; -import javax.persistence.*; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.Table; @Entity @Table(name = "MOCK_RESPONSE_CONDITION") diff --git a/src/main/java/com/eactive/testmaster/api/entity/MockResponse.java b/src/main/java/com/eactive/testmaster/api/entity/MockResponse.java index 3448106..7abac78 100644 --- a/src/main/java/com/eactive/testmaster/api/entity/MockResponse.java +++ b/src/main/java/com/eactive/testmaster/api/entity/MockResponse.java @@ -1,10 +1,23 @@ package com.eactive.testmaster.api.entity; -import javax.persistence.*; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.persistence.CascadeType; +import javax.persistence.CollectionTable; +import javax.persistence.Column; +import javax.persistence.ElementCollection; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.Lob; +import javax.persistence.ManyToOne; +import javax.persistence.MapKeyColumn; +import javax.persistence.OneToMany; +import javax.persistence.Table; @Entity @Table(name = "MOCK_RESPONSE") diff --git a/src/main/java/com/eactive/testmaster/api/entity/MockRoute.java b/src/main/java/com/eactive/testmaster/api/entity/MockRoute.java index 9c733c4..8784775 100644 --- a/src/main/java/com/eactive/testmaster/api/entity/MockRoute.java +++ b/src/main/java/com/eactive/testmaster/api/entity/MockRoute.java @@ -1,8 +1,15 @@ package com.eactive.testmaster.api.entity; -import javax.persistence.*; import java.util.ArrayList; import java.util.List; +import javax.persistence.CascadeType; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.OneToMany; +import javax.persistence.Table; @Entity diff --git a/src/main/java/com/eactive/testmaster/api/mapper/MockRouteMapper.java b/src/main/java/com/eactive/testmaster/api/mapper/MockRouteMapper.java index 1d64cb9..8af9cdb 100644 --- a/src/main/java/com/eactive/testmaster/api/mapper/MockRouteMapper.java +++ b/src/main/java/com/eactive/testmaster/api/mapper/MockRouteMapper.java @@ -7,17 +7,16 @@ import com.eactive.testmaster.api.dto.MockRouteUpdateDTO; import com.eactive.testmaster.api.entity.MockResponse; import com.eactive.testmaster.api.entity.MockRoute; import com.eactive.testmaster.common.mapper.CommonMapper; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.Named; import org.mapstruct.ReportingPolicy; import org.springframework.stereotype.Component; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - @Mapper(componentModel = "spring", uses = {CommonMapper.class}, unmappedTargetPolicy = ReportingPolicy.IGNORE) diff --git a/src/main/java/com/eactive/testmaster/api/service/MockRouteService.java b/src/main/java/com/eactive/testmaster/api/service/MockRouteService.java index a82b1cc..ac68e89 100644 --- a/src/main/java/com/eactive/testmaster/api/service/MockRouteService.java +++ b/src/main/java/com/eactive/testmaster/api/service/MockRouteService.java @@ -5,6 +5,10 @@ import com.eactive.testmaster.api.entity.MockResponse; import com.eactive.testmaster.api.entity.MockRoute; import com.eactive.testmaster.api.repository.MockRouteRepository; import com.eactive.testmaster.common.exception.NotFoundException; +import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; +import java.util.List; +import javax.transaction.Transactional; import org.apache.commons.beanutils.BeanUtils; import org.hibernate.Hibernate; import org.springframework.beans.factory.annotation.Autowired; @@ -13,11 +17,6 @@ import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.domain.Specification; import org.springframework.stereotype.Service; -import javax.transaction.Transactional; -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.List; - @Service @Transactional public class MockRouteService { diff --git a/src/main/java/com/eactive/testmaster/client/controller/ApiClientPageController.java b/src/main/java/com/eactive/testmaster/client/controller/ApiClientPageController.java index 9bd38b9..ff63fe3 100644 --- a/src/main/java/com/eactive/testmaster/client/controller/ApiClientPageController.java +++ b/src/main/java/com/eactive/testmaster/client/controller/ApiClientPageController.java @@ -2,13 +2,12 @@ package com.eactive.testmaster.client.controller; import com.eactive.testmaster.server.entity.Server; import com.eactive.testmaster.server.repository.ServerRepository; +import java.util.List; import org.springframework.security.access.annotation.Secured; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.GetMapping; -import java.util.List; - @Controller public class ApiClientPageController { diff --git a/src/main/java/com/eactive/testmaster/client/controller/ApiRequestMgmtController.java b/src/main/java/com/eactive/testmaster/client/controller/ApiRequestMgmtController.java index 98f424e..2089edd 100644 --- a/src/main/java/com/eactive/testmaster/client/controller/ApiRequestMgmtController.java +++ b/src/main/java/com/eactive/testmaster/client/controller/ApiRequestMgmtController.java @@ -12,12 +12,14 @@ import com.eactive.testmaster.client.service.ApiRequestMgmtService; import com.eactive.testmaster.common.util.SecurityUtil; import com.eactive.testmaster.user.entity.StaffUser; import com.eactive.testmaster.user.service.UserService; -import javax.transaction.Transactional; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - import java.util.List; +import javax.transaction.Transactional; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; @RestController public class ApiRequestMgmtController { diff --git a/src/main/java/com/eactive/testmaster/client/controller/ApiScenarioMgmtController.java b/src/main/java/com/eactive/testmaster/client/controller/ApiScenarioMgmtController.java index f3ca973..3a1955d 100644 --- a/src/main/java/com/eactive/testmaster/client/controller/ApiScenarioMgmtController.java +++ b/src/main/java/com/eactive/testmaster/client/controller/ApiScenarioMgmtController.java @@ -7,11 +7,14 @@ import com.eactive.testmaster.client.service.ApiScenarioMgmtService; import com.eactive.testmaster.common.util.SecurityUtil; import com.eactive.testmaster.user.entity.StaffUser; import com.eactive.testmaster.user.service.UserService; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.List; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/mgmt/api_scenario") diff --git a/src/main/java/com/eactive/testmaster/client/dto/ApiCollectionDTO.java b/src/main/java/com/eactive/testmaster/client/dto/ApiCollectionDTO.java index c0877c0..e66bfdd 100644 --- a/src/main/java/com/eactive/testmaster/client/dto/ApiCollectionDTO.java +++ b/src/main/java/com/eactive/testmaster/client/dto/ApiCollectionDTO.java @@ -1,8 +1,8 @@ package com.eactive.testmaster.client.dto; -import javax.validation.constraints.NotEmpty; import java.util.ArrayList; import java.util.List; +import javax.validation.constraints.NotEmpty; public class ApiCollectionDTO { diff --git a/src/main/java/com/eactive/testmaster/client/dto/ApiLayoutItemTreeBuilder.java b/src/main/java/com/eactive/testmaster/client/dto/ApiLayoutItemTreeBuilder.java index d7a128c..5dcf593 100644 --- a/src/main/java/com/eactive/testmaster/client/dto/ApiLayoutItemTreeBuilder.java +++ b/src/main/java/com/eactive/testmaster/client/dto/ApiLayoutItemTreeBuilder.java @@ -1,6 +1,5 @@ package com.eactive.testmaster.client.dto; -import java.util.ArrayList; import java.util.Comparator; import java.util.HashMap; import java.util.List; @@ -253,60 +252,60 @@ public class ApiLayoutItemTreeBuilder { return siblings.get(closestIndex); } - public static void main(String[] args) { - ApiLayoutItemDTO root = new ApiLayoutItemDTO(); - root.setId(1L); - root.setLoutName("ROOT"); - root.setLoutItemDepth(0); - root.setChildren(new ArrayList<>(List.of( - new ApiLayoutItemDTO(2L, 1L, "Field", "Child 2", 1, 10, "TEST11"), - new ApiLayoutItemDTO(3L, 1L, "Group", "Child 3", 1, 0, ""), - new ApiLayoutItemDTO(4L, 1L, "Field", "Child 4", 1, 10, "TEST21"), - new ApiLayoutItemDTO(5L, 1L, "Field", "Child 5", 1, 10, "TEST22"), -// new ApiLayoutItemDTO(6L, 1L, "Group", "Child 6", 1, 0, ""), - new ApiLayoutItemDTO(7L, 1L, "Field", "Child 7", 1, 10, "TEST31"), - new ApiLayoutItemDTO(8L, 1L, "Field", "Child 8", 1, 10, "TEST33"), - new ApiLayoutItemDTO(9L, 1L, "Group", "Child 9", 1, 0, ""), - new ApiLayoutItemDTO(10L, 1L, "Field", "Child 10", 1, 10, "TEST31"), - new ApiLayoutItemDTO(11L, 1L, "Field", "Child 11", 1, 10, "TEST33") - ))); - - for (ApiLayoutItemDTO item : root.getChildren()) { - item.setChildOccCnt(1); - } - - System.out.println("Before moving:"); - printTree(root); - - moveNodeDepth(root, getNodeById(root, 4L), getNodeById(root, 4L).getLoutItemDepth() + 1); - printTree(root); - moveNodeDepth(root, getNodeById(root, 5L), getNodeById(root, 5L).getLoutItemDepth() + 1); - printTree(root); - moveNodeDepth(root, getNodeById(root, 7L), getNodeById(root, 7L).getLoutItemDepth() + 1); - printTree(root); - moveNodeDepth(root, getNodeById(root, 8L), getNodeById(root, 8L).getLoutItemDepth() + 1); - printTree(root); - moveNodeDepth(root, getNodeById(root, 10L), getNodeById(root, 10L).getLoutItemDepth() + 1); - printTree(root); - moveNodeDepth(root, getNodeById(root, 11L), getNodeById(root, 11L).getLoutItemDepth() + 1); - printTree(root); - moveNodeDepth(root, getNodeById(root, 9L), getNodeById(root, 9L).getLoutItemDepth() + 1); - printTree(root); -// moveNodeDepth(root, getNodeById(root, 6L), getNodeById(root, 6L).getLoutItemDepth() + 1); +// public static void main(String[] args) { +// ApiLayoutItemDTO root = new ApiLayoutItemDTO(); +// root.setId(1L); +// root.setLoutName("ROOT"); +// root.setLoutItemDepth(0); +// root.setChildren(new ArrayList<>(List.of( +// new ApiLayoutItemDTO(2L, 1L, "Field", "Child 2", 1, 10, "TEST11"), +// new ApiLayoutItemDTO(3L, 1L, "Group", "Child 3", 1, 0, ""), +// new ApiLayoutItemDTO(4L, 1L, "Field", "Child 4", 1, 10, "TEST21"), +// new ApiLayoutItemDTO(5L, 1L, "Field", "Child 5", 1, 10, "TEST22"), +//// new ApiLayoutItemDTO(6L, 1L, "Group", "Child 6", 1, 0, ""), +// new ApiLayoutItemDTO(7L, 1L, "Field", "Child 7", 1, 10, "TEST31"), +// new ApiLayoutItemDTO(8L, 1L, "Field", "Child 8", 1, 10, "TEST33"), +// new ApiLayoutItemDTO(9L, 1L, "Group", "Child 9", 1, 0, ""), +// new ApiLayoutItemDTO(10L, 1L, "Field", "Child 10", 1, 10, "TEST31"), +// new ApiLayoutItemDTO(11L, 1L, "Field", "Child 11", 1, 10, "TEST33") +// ))); +// +// for (ApiLayoutItemDTO item : root.getChildren()) { +// item.setChildOccCnt(1); +// } +// +// System.out.println("Before moving:"); // printTree(root); - moveNodeDepth(root, getNodeById(root, 9L), getNodeById(root, 9L).getLoutItemDepth() - 1); - printTree(root); - - moveNodeDepth(root, getNodeById(root, 9L), getNodeById(root, 9L).getLoutItemDepth() - 1); - printTree(root); - - moveNode(root, getNodeById(root, 9L), true); - - moveNodeDepth(root, getNodeById(root, 3L), getNodeById(root, 3L).getLoutItemDepth() + 1); - printTree(root); - - ApiLayoutDTO layout = new ApiLayoutDTO(); - layout.setComputedLayoutItemRoot(root); - System.out.println(layout.buildMessage()); - } +// +// moveNodeDepth(root, getNodeById(root, 4L), getNodeById(root, 4L).getLoutItemDepth() + 1); +// printTree(root); +// moveNodeDepth(root, getNodeById(root, 5L), getNodeById(root, 5L).getLoutItemDepth() + 1); +// printTree(root); +// moveNodeDepth(root, getNodeById(root, 7L), getNodeById(root, 7L).getLoutItemDepth() + 1); +// printTree(root); +// moveNodeDepth(root, getNodeById(root, 8L), getNodeById(root, 8L).getLoutItemDepth() + 1); +// printTree(root); +// moveNodeDepth(root, getNodeById(root, 10L), getNodeById(root, 10L).getLoutItemDepth() + 1); +// printTree(root); +// moveNodeDepth(root, getNodeById(root, 11L), getNodeById(root, 11L).getLoutItemDepth() + 1); +// printTree(root); +// moveNodeDepth(root, getNodeById(root, 9L), getNodeById(root, 9L).getLoutItemDepth() + 1); +// printTree(root); +//// moveNodeDepth(root, getNodeById(root, 6L), getNodeById(root, 6L).getLoutItemDepth() + 1); +//// printTree(root); +// moveNodeDepth(root, getNodeById(root, 9L), getNodeById(root, 9L).getLoutItemDepth() - 1); +// printTree(root); +// +// moveNodeDepth(root, getNodeById(root, 9L), getNodeById(root, 9L).getLoutItemDepth() - 1); +// printTree(root); +// +// moveNode(root, getNodeById(root, 9L), true); +// +// moveNodeDepth(root, getNodeById(root, 3L), getNodeById(root, 3L).getLoutItemDepth() + 1); +// printTree(root); +// +// ApiLayoutDTO layout = new ApiLayoutDTO(); +// layout.setComputedLayoutItemRoot(root); +// System.out.println(layout.buildMessage()); +// } } diff --git a/src/main/java/com/eactive/testmaster/client/dto/ApiRequestDTO.java b/src/main/java/com/eactive/testmaster/client/dto/ApiRequestDTO.java index 0609eaa..b41a0a6 100644 --- a/src/main/java/com/eactive/testmaster/client/dto/ApiRequestDTO.java +++ b/src/main/java/com/eactive/testmaster/client/dto/ApiRequestDTO.java @@ -1,9 +1,9 @@ package com.eactive.testmaster.client.dto; import java.io.Serializable; -import javax.validation.constraints.NotNull; import java.util.ArrayList; import java.util.List; +import javax.validation.constraints.NotNull; public class ApiRequestDTO implements Serializable { diff --git a/src/main/java/com/eactive/testmaster/client/dto/internal/ScenarioNode.java b/src/main/java/com/eactive/testmaster/client/dto/internal/ScenarioNode.java index 1aeafca..cf99df9 100644 --- a/src/main/java/com/eactive/testmaster/client/dto/internal/ScenarioNode.java +++ b/src/main/java/com/eactive/testmaster/client/dto/internal/ScenarioNode.java @@ -2,7 +2,6 @@ package com.eactive.testmaster.client.dto.internal; import com.eactive.testmaster.client.dto.ApiRequestDTO; import com.fasterxml.jackson.annotation.JsonProperty; -import java.io.Serializable; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/eactive/testmaster/client/entity/ApiCollection.java b/src/main/java/com/eactive/testmaster/client/entity/ApiCollection.java index 1addd08..0572a25 100644 --- a/src/main/java/com/eactive/testmaster/client/entity/ApiCollection.java +++ b/src/main/java/com/eactive/testmaster/client/entity/ApiCollection.java @@ -1,10 +1,15 @@ package com.eactive.testmaster.client.entity; import com.eactive.testmaster.user.entity.StaffUser; - -import javax.persistence.*; import java.util.ArrayList; import java.util.List; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.JoinTable; +import javax.persistence.ManyToMany; +import javax.persistence.ManyToOne; +import javax.persistence.Table; @Entity @Table(name = "API_COLLECTION") diff --git a/src/main/java/com/eactive/testmaster/client/entity/ApiRequestHistory.java b/src/main/java/com/eactive/testmaster/client/entity/ApiRequestHistory.java index 102ede8..9eea350 100644 --- a/src/main/java/com/eactive/testmaster/client/entity/ApiRequestHistory.java +++ b/src/main/java/com/eactive/testmaster/client/entity/ApiRequestHistory.java @@ -2,10 +2,13 @@ package com.eactive.testmaster.client.entity; import com.eactive.testmaster.server.entity.Server; import com.eactive.testmaster.user.entity.StaffUser; -import org.hibernate.annotations.Type; - -import javax.persistence.*; import java.time.LocalDateTime; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import org.hibernate.annotations.Type; public class ApiRequestHistory { @Id diff --git a/src/main/java/com/eactive/testmaster/client/entity/ApiRequestInfo.java b/src/main/java/com/eactive/testmaster/client/entity/ApiRequestInfo.java index 7ff572d..15e61a2 100644 --- a/src/main/java/com/eactive/testmaster/client/entity/ApiRequestInfo.java +++ b/src/main/java/com/eactive/testmaster/client/entity/ApiRequestInfo.java @@ -2,9 +2,13 @@ package com.eactive.testmaster.client.entity; import com.eactive.testmaster.server.entity.Server; import com.eactive.testmaster.user.entity.StaffUser; - -import javax.persistence.*; import java.util.Objects; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.Lob; +import javax.persistence.ManyToOne; +import javax.persistence.Table; @Entity diff --git a/src/main/java/com/eactive/testmaster/client/entity/ApiScenario.java b/src/main/java/com/eactive/testmaster/client/entity/ApiScenario.java index db56832..956c564 100644 --- a/src/main/java/com/eactive/testmaster/client/entity/ApiScenario.java +++ b/src/main/java/com/eactive/testmaster/client/entity/ApiScenario.java @@ -1,8 +1,12 @@ package com.eactive.testmaster.client.entity; import com.eactive.testmaster.user.entity.StaffUser; - -import javax.persistence.*; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.Lob; +import javax.persistence.ManyToOne; +import javax.persistence.Table; @Entity @Table(name = "API_SCENARIO") diff --git a/src/main/java/com/eactive/testmaster/client/mapper/ApiLayoutItemMapper.java b/src/main/java/com/eactive/testmaster/client/mapper/ApiLayoutItemMapper.java index a821bbf..3486f1f 100644 --- a/src/main/java/com/eactive/testmaster/client/mapper/ApiLayoutItemMapper.java +++ b/src/main/java/com/eactive/testmaster/client/mapper/ApiLayoutItemMapper.java @@ -4,7 +4,6 @@ import com.eactive.testmaster.client.dto.ApiLayoutItemDTO; import com.eactive.testmaster.client.entity.ApiLayoutItem; import com.eactive.testmaster.client.repository.ApiLayoutItemRepository; import com.eactive.testmaster.common.mapper.CommonMapper; -import com.fasterxml.jackson.databind.ObjectMapper; import java.util.List; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; diff --git a/src/main/java/com/eactive/testmaster/client/mapper/ApiScenarioMapper.java b/src/main/java/com/eactive/testmaster/client/mapper/ApiScenarioMapper.java index c84cbb1..c02f42b 100644 --- a/src/main/java/com/eactive/testmaster/client/mapper/ApiScenarioMapper.java +++ b/src/main/java/com/eactive/testmaster/client/mapper/ApiScenarioMapper.java @@ -3,13 +3,12 @@ package com.eactive.testmaster.client.mapper; import com.eactive.testmaster.client.dto.ApiScenarioDTO; import com.eactive.testmaster.client.entity.ApiScenario; import com.eactive.testmaster.client.repository.ApiScenarioRepository; +import java.util.List; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.util.List; - @Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) @Component public abstract class ApiScenarioMapper { diff --git a/src/main/java/com/eactive/testmaster/client/repository/ApiCollectionRepository.java b/src/main/java/com/eactive/testmaster/client/repository/ApiCollectionRepository.java index cc7c81b..18379da 100644 --- a/src/main/java/com/eactive/testmaster/client/repository/ApiCollectionRepository.java +++ b/src/main/java/com/eactive/testmaster/client/repository/ApiCollectionRepository.java @@ -2,11 +2,10 @@ package com.eactive.testmaster.client.repository; import com.eactive.testmaster.client.entity.ApiCollection; import com.eactive.testmaster.user.entity.StaffUser; +import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -import java.util.List; - public interface ApiCollectionRepository extends JpaRepository, JpaSpecificationExecutor { List findAllByOwner(StaffUser owner); diff --git a/src/main/java/com/eactive/testmaster/client/repository/ApiScenarioRepository.java b/src/main/java/com/eactive/testmaster/client/repository/ApiScenarioRepository.java index 63cfc6f..e65936e 100644 --- a/src/main/java/com/eactive/testmaster/client/repository/ApiScenarioRepository.java +++ b/src/main/java/com/eactive/testmaster/client/repository/ApiScenarioRepository.java @@ -2,11 +2,10 @@ package com.eactive.testmaster.client.repository; import com.eactive.testmaster.client.entity.ApiScenario; import com.eactive.testmaster.user.entity.StaffUser; +import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -import java.util.List; - public interface ApiScenarioRepository extends JpaRepository, JpaSpecificationExecutor { List findAllByOwner(StaffUser owner); diff --git a/src/main/java/com/eactive/testmaster/client/service/ApiRequestMgmtService.java b/src/main/java/com/eactive/testmaster/client/service/ApiRequestMgmtService.java index 1d23b0a..2bb9c14 100644 --- a/src/main/java/com/eactive/testmaster/client/service/ApiRequestMgmtService.java +++ b/src/main/java/com/eactive/testmaster/client/service/ApiRequestMgmtService.java @@ -6,14 +6,13 @@ import com.eactive.testmaster.client.repository.ApiCollectionRepository; import com.eactive.testmaster.client.repository.ApiRequestRepository; import com.eactive.testmaster.common.exception.NotFoundException; import com.eactive.testmaster.user.entity.StaffUser; +import java.util.List; +import java.util.UUID; +import javax.transaction.Transactional; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.thymeleaf.util.StringUtils; -import javax.transaction.Transactional; -import java.util.List; -import java.util.UUID; - @Service @Transactional public class ApiRequestMgmtService { diff --git a/src/main/java/com/eactive/testmaster/client/service/ApiRequestMigrationService.java b/src/main/java/com/eactive/testmaster/client/service/ApiRequestMigrationService.java index d65a24e..9b60a04 100644 --- a/src/main/java/com/eactive/testmaster/client/service/ApiRequestMigrationService.java +++ b/src/main/java/com/eactive/testmaster/client/service/ApiRequestMigrationService.java @@ -1,17 +1,16 @@ package com.eactive.testmaster.client.service; import com.eactive.testmaster.client.repository.ApiRequestRepository; +import java.sql.Connection; +import java.sql.Statement; +import javax.sql.DataSource; +import javax.transaction.Transactional; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.context.ApplicationContext; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Service; -import javax.sql.DataSource; -import javax.transaction.Transactional; -import java.sql.Connection; -import java.sql.Statement; - @Service @Transactional diff --git a/src/main/java/com/eactive/testmaster/client/service/ApiScenarioMgmtService.java b/src/main/java/com/eactive/testmaster/client/service/ApiScenarioMgmtService.java index 5dba37e..19c4eb8 100644 --- a/src/main/java/com/eactive/testmaster/client/service/ApiScenarioMgmtService.java +++ b/src/main/java/com/eactive/testmaster/client/service/ApiScenarioMgmtService.java @@ -2,12 +2,11 @@ package com.eactive.testmaster.client.service; import com.eactive.testmaster.client.entity.ApiScenario; import com.eactive.testmaster.client.repository.ApiScenarioRepository; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.transaction.Transactional; import java.util.List; import java.util.UUID; +import javax.transaction.Transactional; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; @Service @Transactional diff --git a/src/main/java/com/eactive/testmaster/client/service/HttpHandler.java b/src/main/java/com/eactive/testmaster/client/service/HttpHandler.java index 8fbc845..ab16072 100644 --- a/src/main/java/com/eactive/testmaster/client/service/HttpHandler.java +++ b/src/main/java/com/eactive/testmaster/client/service/HttpHandler.java @@ -7,7 +7,6 @@ import io.netty.channel.SimpleChannelInboundHandler; import io.netty.handler.codec.http.FullHttpResponse; import io.netty.handler.codec.http.HttpHeaders; import io.netty.util.CharsetUtil; - import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/eactive/testmaster/client/service/NettyHttpApiClient.java b/src/main/java/com/eactive/testmaster/client/service/NettyHttpApiClient.java index 28ad237..2946669 100644 --- a/src/main/java/com/eactive/testmaster/client/service/NettyHttpApiClient.java +++ b/src/main/java/com/eactive/testmaster/client/service/NettyHttpApiClient.java @@ -15,20 +15,29 @@ import io.netty.channel.ChannelOption; import io.netty.channel.EventLoopGroup; import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.socket.nio.NioSocketChannel; -import io.netty.handler.codec.http.*; +import io.netty.handler.codec.http.DefaultFullHttpRequest; +import io.netty.handler.codec.http.DefaultHttpHeaders; +import io.netty.handler.codec.http.HttpClientCodec; +import io.netty.handler.codec.http.HttpContentDecompressor; +import io.netty.handler.codec.http.HttpHeaderNames; +import io.netty.handler.codec.http.HttpHeaderValues; +import io.netty.handler.codec.http.HttpHeaders; +import io.netty.handler.codec.http.HttpMethod; +import io.netty.handler.codec.http.HttpObjectAggregator; +import io.netty.handler.codec.http.HttpRequest; +import io.netty.handler.codec.http.HttpVersion; import io.netty.handler.ssl.SslContext; import io.netty.handler.ssl.SslContextBuilder; import io.netty.handler.ssl.util.InsecureTrustManagerFactory; import io.netty.util.CharsetUtil; +import java.util.concurrent.CompletableFuture; +import javax.net.ssl.SSLException; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.net.ssl.SSLException; -import java.util.concurrent.CompletableFuture; - @Service public class NettyHttpApiClient implements ApiClient { diff --git a/src/main/java/com/eactive/testmaster/common/entity/Auditable.java b/src/main/java/com/eactive/testmaster/common/entity/Auditable.java index c29111e..77f9349 100644 --- a/src/main/java/com/eactive/testmaster/common/entity/Auditable.java +++ b/src/main/java/com/eactive/testmaster/common/entity/Auditable.java @@ -1,5 +1,9 @@ package com.eactive.testmaster.common.entity; +import java.time.LocalDateTime; +import javax.persistence.Column; +import javax.persistence.EntityListeners; +import javax.persistence.MappedSuperclass; import org.hibernate.annotations.Type; import org.springframework.data.annotation.CreatedBy; import org.springframework.data.annotation.CreatedDate; @@ -7,11 +11,6 @@ import org.springframework.data.annotation.LastModifiedBy; import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import javax.persistence.Column; -import javax.persistence.EntityListeners; -import javax.persistence.MappedSuperclass; -import java.time.LocalDateTime; - @MappedSuperclass @EntityListeners(AuditingEntityListener.class) public abstract class Auditable { diff --git a/src/main/java/com/eactive/testmaster/common/exception/CustomGlobalExceptionHandler.java b/src/main/java/com/eactive/testmaster/common/exception/CustomGlobalExceptionHandler.java index 9714901..88d3a5a 100644 --- a/src/main/java/com/eactive/testmaster/common/exception/CustomGlobalExceptionHandler.java +++ b/src/main/java/com/eactive/testmaster/common/exception/CustomGlobalExceptionHandler.java @@ -1,5 +1,6 @@ package com.eactive.testmaster.common.exception; +import java.time.LocalDateTime; import org.springframework.core.annotation.Order; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -9,8 +10,6 @@ import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.context.request.WebRequest; import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; -import java.time.LocalDateTime; - @Order(1) @RestControllerAdvice(annotations = RestController.class) public class CustomGlobalExceptionHandler extends ResponseEntityExceptionHandler { diff --git a/src/main/java/com/eactive/testmaster/common/exception/PortalErrorController.java b/src/main/java/com/eactive/testmaster/common/exception/PortalErrorController.java index 9ca8dcd..c156eb5 100644 --- a/src/main/java/com/eactive/testmaster/common/exception/PortalErrorController.java +++ b/src/main/java/com/eactive/testmaster/common/exception/PortalErrorController.java @@ -1,14 +1,13 @@ package com.eactive.testmaster.common.exception; +import javax.servlet.RequestDispatcher; +import javax.servlet.http.HttpServletRequest; import org.springframework.boot.web.servlet.error.ErrorController; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; -import javax.servlet.RequestDispatcher; -import javax.servlet.http.HttpServletRequest; - @Controller public class PortalErrorController implements ErrorController { diff --git a/src/main/java/com/eactive/testmaster/common/exception/PortalGlobalExceptionHandler.java b/src/main/java/com/eactive/testmaster/common/exception/PortalGlobalExceptionHandler.java index 44836cf..edcba78 100644 --- a/src/main/java/com/eactive/testmaster/common/exception/PortalGlobalExceptionHandler.java +++ b/src/main/java/com/eactive/testmaster/common/exception/PortalGlobalExceptionHandler.java @@ -1,6 +1,7 @@ package com.eactive.testmaster.common.exception; +import javax.servlet.http.HttpServletRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.annotation.Order; @@ -9,8 +10,6 @@ import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.servlet.ModelAndView; -import javax.servlet.http.HttpServletRequest; - @ControllerAdvice(annotations = Controller.class) @Order(2) public class PortalGlobalExceptionHandler { diff --git a/src/main/java/com/eactive/testmaster/common/mapper/CommonMapper.java b/src/main/java/com/eactive/testmaster/common/mapper/CommonMapper.java index e7336f0..8c84526 100644 --- a/src/main/java/com/eactive/testmaster/common/mapper/CommonMapper.java +++ b/src/main/java/com/eactive/testmaster/common/mapper/CommonMapper.java @@ -1,17 +1,16 @@ package com.eactive.testmaster.common.mapper; import com.eactive.testmaster.client.dto.ApiRequestKeyValueDTO; -import org.mapstruct.Mapper; -import org.mapstruct.Named; -import org.mapstruct.ReportingPolicy; -import org.springframework.security.core.GrantedAuthority; -import org.springframework.util.StringUtils; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.stream.Collectors; +import org.mapstruct.Mapper; +import org.mapstruct.Named; +import org.mapstruct.ReportingPolicy; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.util.StringUtils; @Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) diff --git a/src/main/java/com/eactive/testmaster/common/message/PortalReloadableResourceBundleMessageSource.java b/src/main/java/com/eactive/testmaster/common/message/PortalReloadableResourceBundleMessageSource.java index 7faeae5..a03a5c6 100644 --- a/src/main/java/com/eactive/testmaster/common/message/PortalReloadableResourceBundleMessageSource.java +++ b/src/main/java/com/eactive/testmaster/common/message/PortalReloadableResourceBundleMessageSource.java @@ -1,13 +1,12 @@ package com.eactive.testmaster.common.message; -import org.apache.commons.lang3.StringUtils; -import org.springframework.core.io.Resource; -import org.springframework.core.io.support.PathMatchingResourcePatternResolver; -import org.springframework.core.io.support.ResourcePatternResolver; - import java.io.IOException; import java.util.ArrayList; import java.util.List; +import org.apache.commons.lang3.StringUtils; +import org.springframework.core.io.Resource; +import org.springframework.core.io.support.PathMatchingResourcePatternResolver; +import org.springframework.core.io.support.ResourcePatternResolver; public class PortalReloadableResourceBundleMessageSource extends org.springframework.context.support.ReloadableResourceBundleMessageSource { private static final String CLASSPATH_PREFIX = "classpath:"; diff --git a/src/main/java/com/eactive/testmaster/common/search/BaseSearch.java b/src/main/java/com/eactive/testmaster/common/search/BaseSearch.java index fd3da81..a00483c 100644 --- a/src/main/java/com/eactive/testmaster/common/search/BaseSearch.java +++ b/src/main/java/com/eactive/testmaster/common/search/BaseSearch.java @@ -1,8 +1,7 @@ package com.eactive.testmaster.common.search; -import org.springframework.data.jpa.domain.Specification; - import java.util.List; +import org.springframework.data.jpa.domain.Specification; /** * Overview: diff --git a/src/main/java/com/eactive/testmaster/common/search/ColumnSearchModel.java b/src/main/java/com/eactive/testmaster/common/search/ColumnSearchModel.java index 1e18ca6..3a40563 100644 --- a/src/main/java/com/eactive/testmaster/common/search/ColumnSearchModel.java +++ b/src/main/java/com/eactive/testmaster/common/search/ColumnSearchModel.java @@ -1,11 +1,10 @@ package com.eactive.testmaster.common.search; import com.eactive.testmaster.common.util.SpecificationUtil; +import java.util.Collection; import org.springframework.data.jpa.domain.Specification; import org.springframework.util.ObjectUtils; -import java.util.Collection; - public class ColumnSearchModel implements SearchModel { private String column; diff --git a/src/main/java/com/eactive/testmaster/common/search/SearchModel.java b/src/main/java/com/eactive/testmaster/common/search/SearchModel.java index 86ad86d..8e96d41 100644 --- a/src/main/java/com/eactive/testmaster/common/search/SearchModel.java +++ b/src/main/java/com/eactive/testmaster/common/search/SearchModel.java @@ -1,8 +1,7 @@ package com.eactive.testmaster.common.search; -import org.springframework.data.jpa.domain.Specification; - import java.io.Serializable; +import org.springframework.data.jpa.domain.Specification; public interface SearchModel extends Serializable { diff --git a/src/main/java/com/eactive/testmaster/common/util/EncryptionUtil.java b/src/main/java/com/eactive/testmaster/common/util/EncryptionUtil.java index c9896fc..9465cc5 100644 --- a/src/main/java/com/eactive/testmaster/common/util/EncryptionUtil.java +++ b/src/main/java/com/eactive/testmaster/common/util/EncryptionUtil.java @@ -1,11 +1,10 @@ package com.eactive.testmaster.common.util; -import org.apache.commons.codec.binary.Base64; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Component; - import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; +import org.apache.commons.codec.binary.Base64; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Component; /** * @author diff --git a/src/main/java/com/eactive/testmaster/common/util/SpecificationUtil.java b/src/main/java/com/eactive/testmaster/common/util/SpecificationUtil.java index eceac2a..1a3a479 100644 --- a/src/main/java/com/eactive/testmaster/common/util/SpecificationUtil.java +++ b/src/main/java/com/eactive/testmaster/common/util/SpecificationUtil.java @@ -1,11 +1,14 @@ package com.eactive.testmaster.common.util; +import java.util.Collection; +import javax.persistence.criteria.CriteriaBuilder; +import javax.persistence.criteria.Join; +import javax.persistence.criteria.JoinType; +import javax.persistence.criteria.Path; +import javax.persistence.criteria.Root; import org.hibernate.query.criteria.internal.path.PluralAttributePath; import org.springframework.data.jpa.domain.Specification; -import javax.persistence.criteria.*; -import java.util.Collection; - public class SpecificationUtil { diff --git a/src/main/java/com/eactive/testmaster/common/validator/PasswordMatch.java b/src/main/java/com/eactive/testmaster/common/validator/PasswordMatch.java index 2648d28..ee22d6e 100644 --- a/src/main/java/com/eactive/testmaster/common/validator/PasswordMatch.java +++ b/src/main/java/com/eactive/testmaster/common/validator/PasswordMatch.java @@ -1,8 +1,12 @@ package com.eactive.testmaster.common.validator; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; import javax.validation.Constraint; import javax.validation.Payload; -import java.lang.annotation.*; @Constraint(validatedBy = PasswordMatchValidator.class) @Target({ElementType.TYPE}) diff --git a/src/main/java/com/eactive/testmaster/common/validator/PasswordMatchValidator.java b/src/main/java/com/eactive/testmaster/common/validator/PasswordMatchValidator.java index 5e92349..748f02e 100644 --- a/src/main/java/com/eactive/testmaster/common/validator/PasswordMatchValidator.java +++ b/src/main/java/com/eactive/testmaster/common/validator/PasswordMatchValidator.java @@ -1,14 +1,13 @@ package com.eactive.testmaster.common.validator; import com.eactive.testmaster.common.util.ApplicationContextUtil; +import java.util.Objects; +import javax.validation.ConstraintValidator; +import javax.validation.ConstraintValidatorContext; import org.apache.commons.beanutils.PropertyUtils; import org.springframework.context.MessageSource; import org.springframework.context.i18n.LocaleContextHolder; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; -import java.util.Objects; - public class PasswordMatchValidator implements ConstraintValidator { private String field1; diff --git a/src/main/java/com/eactive/testmaster/common/validator/UniqueId.java b/src/main/java/com/eactive/testmaster/common/validator/UniqueId.java index 79f875e..c87d47d 100644 --- a/src/main/java/com/eactive/testmaster/common/validator/UniqueId.java +++ b/src/main/java/com/eactive/testmaster/common/validator/UniqueId.java @@ -1,8 +1,12 @@ package com.eactive.testmaster.common.validator; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; import javax.validation.Constraint; import javax.validation.Payload; -import java.lang.annotation.*; @Constraint(validatedBy = UniqueUserIdValidator.class) @Target({ElementType.FIELD}) diff --git a/src/main/java/com/eactive/testmaster/common/validator/UniqueRoute.java b/src/main/java/com/eactive/testmaster/common/validator/UniqueRoute.java index a0283de..6dabd5a 100644 --- a/src/main/java/com/eactive/testmaster/common/validator/UniqueRoute.java +++ b/src/main/java/com/eactive/testmaster/common/validator/UniqueRoute.java @@ -1,8 +1,12 @@ package com.eactive.testmaster.common.validator; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; import javax.validation.Constraint; import javax.validation.Payload; -import java.lang.annotation.*; @Constraint(validatedBy = UniqueRouteValidator.class) @Target({ElementType.TYPE}) diff --git a/src/main/java/com/eactive/testmaster/common/validator/UniqueRouteValidator.java b/src/main/java/com/eactive/testmaster/common/validator/UniqueRouteValidator.java index b8ac8fb..7eb5c28 100644 --- a/src/main/java/com/eactive/testmaster/common/validator/UniqueRouteValidator.java +++ b/src/main/java/com/eactive/testmaster/common/validator/UniqueRouteValidator.java @@ -2,10 +2,9 @@ package com.eactive.testmaster.common.validator; import com.eactive.testmaster.api.repository.MockRouteRepository; import com.eactive.testmaster.common.util.ApplicationContextUtil; -import org.apache.commons.beanutils.PropertyUtils; - import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; +import org.apache.commons.beanutils.PropertyUtils; public class UniqueRouteValidator implements ConstraintValidator { diff --git a/src/main/java/com/eactive/testmaster/common/validator/UniqueUserIdValidator.java b/src/main/java/com/eactive/testmaster/common/validator/UniqueUserIdValidator.java index c76718d..f16804e 100644 --- a/src/main/java/com/eactive/testmaster/common/validator/UniqueUserIdValidator.java +++ b/src/main/java/com/eactive/testmaster/common/validator/UniqueUserIdValidator.java @@ -3,7 +3,6 @@ package com.eactive.testmaster.common.validator; import com.eactive.testmaster.common.exception.UserNotFoundException; import com.eactive.testmaster.common.util.ApplicationContextUtil; import com.eactive.testmaster.user.service.UserService; - import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; diff --git a/src/main/java/com/eactive/testmaster/config/AuditorAwareImpl.java b/src/main/java/com/eactive/testmaster/config/AuditorAwareImpl.java index b44b317..fc37e56 100644 --- a/src/main/java/com/eactive/testmaster/config/AuditorAwareImpl.java +++ b/src/main/java/com/eactive/testmaster/config/AuditorAwareImpl.java @@ -1,9 +1,8 @@ package com.eactive.testmaster.config; import com.eactive.testmaster.common.util.SecurityUtil; -import org.springframework.data.domain.AuditorAware; - import java.util.Optional; +import org.springframework.data.domain.AuditorAware; public class AuditorAwareImpl implements AuditorAware { diff --git a/src/main/java/com/eactive/testmaster/config/PortalAuthenticationFailureHandler.java b/src/main/java/com/eactive/testmaster/config/PortalAuthenticationFailureHandler.java index 8095988..52de242 100644 --- a/src/main/java/com/eactive/testmaster/config/PortalAuthenticationFailureHandler.java +++ b/src/main/java/com/eactive/testmaster/config/PortalAuthenticationFailureHandler.java @@ -7,6 +7,9 @@ import com.eactive.testmaster.user.entity.StaffUser; import com.eactive.testmaster.user.entity.User; import com.eactive.testmaster.user.repository.StaffUserRepository; import com.eactive.testmaster.user.service.UserService; +import java.io.IOException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.core.AuthenticationException; @@ -15,10 +18,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - @Service @Transactional public class PortalAuthenticationFailureHandler implements AuthenticationFailureHandler { diff --git a/src/main/java/com/eactive/testmaster/config/PortalAuthenticationManager.java b/src/main/java/com/eactive/testmaster/config/PortalAuthenticationManager.java index db4afe6..4da4ef7 100644 --- a/src/main/java/com/eactive/testmaster/config/PortalAuthenticationManager.java +++ b/src/main/java/com/eactive/testmaster/config/PortalAuthenticationManager.java @@ -5,7 +5,11 @@ import com.eactive.testmaster.common.util.EncryptionUtil; import com.eactive.testmaster.user.entity.User; import com.eactive.testmaster.user.service.UserService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.authentication.*; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.authentication.BadCredentialsException; +import org.springframework.security.authentication.DisabledException; +import org.springframework.security.authentication.LockedException; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.AuthenticationException; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/src/main/java/com/eactive/testmaster/config/PortalAuthenticationSuccessHandler.java b/src/main/java/com/eactive/testmaster/config/PortalAuthenticationSuccessHandler.java index b65b9cb..3d96652 100644 --- a/src/main/java/com/eactive/testmaster/config/PortalAuthenticationSuccessHandler.java +++ b/src/main/java/com/eactive/testmaster/config/PortalAuthenticationSuccessHandler.java @@ -2,6 +2,11 @@ package com.eactive.testmaster.config; import com.eactive.testmaster.user.entity.User; import com.eactive.testmaster.user.service.UserService; +import java.io.IOException; +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.Authentication; import org.springframework.security.core.userdetails.UserDetails; @@ -9,12 +14,6 @@ import org.springframework.security.web.authentication.AuthenticationSuccessHand import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - @Service @Transactional diff --git a/src/main/java/com/eactive/testmaster/config/WebMvcConfig.java b/src/main/java/com/eactive/testmaster/config/WebMvcConfig.java index e6272dc..6623444 100644 --- a/src/main/java/com/eactive/testmaster/config/WebMvcConfig.java +++ b/src/main/java/com/eactive/testmaster/config/WebMvcConfig.java @@ -1,6 +1,5 @@ package com.eactive.testmaster.config; -import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/com/eactive/testmaster/loadtest/dto/LoadTestDTO.java b/src/main/java/com/eactive/testmaster/loadtest/dto/LoadTestDTO.java index 282ede0..ff9e40f 100644 --- a/src/main/java/com/eactive/testmaster/loadtest/dto/LoadTestDTO.java +++ b/src/main/java/com/eactive/testmaster/loadtest/dto/LoadTestDTO.java @@ -1,12 +1,6 @@ package com.eactive.testmaster.loadtest.dto; -import com.eactive.testmaster.client.entity.ApiScenario; -import com.eactive.testmaster.user.entity.StaffUser; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; - public class LoadTestDTO { private String id; diff --git a/src/main/java/com/eactive/testmaster/loadtest/service/CallableVirtualUser.java b/src/main/java/com/eactive/testmaster/loadtest/service/CallableVirtualUser.java index b2bab25..b5b64e4 100644 --- a/src/main/java/com/eactive/testmaster/loadtest/service/CallableVirtualUser.java +++ b/src/main/java/com/eactive/testmaster/loadtest/service/CallableVirtualUser.java @@ -3,7 +3,6 @@ package com.eactive.testmaster.loadtest.service; import com.eactive.testmaster.loadtest.dto.LoadTestDTO; import java.util.Map; import java.util.concurrent.Callable; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/eactive/testmaster/login/controller/LoginController.java b/src/main/java/com/eactive/testmaster/login/controller/LoginController.java index 79f0bd6..9cd7c96 100644 --- a/src/main/java/com/eactive/testmaster/login/controller/LoginController.java +++ b/src/main/java/com/eactive/testmaster/login/controller/LoginController.java @@ -1,6 +1,10 @@ package com.eactive.testmaster.login.controller; import com.eactive.testmaster.user.service.UserService; +import java.util.Map; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; import org.apache.commons.lang3.StringUtils; import org.springframework.http.ResponseEntity; import org.springframework.security.core.Authentication; @@ -12,11 +16,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -import java.util.Map; - /** * 일반 로그인을 처리하는 컨트롤러 클래스 * diff --git a/src/main/java/com/eactive/testmaster/server/controller/ServerMgmtController.java b/src/main/java/com/eactive/testmaster/server/controller/ServerMgmtController.java index 8d7b59e..cdf103f 100644 --- a/src/main/java/com/eactive/testmaster/server/controller/ServerMgmtController.java +++ b/src/main/java/com/eactive/testmaster/server/controller/ServerMgmtController.java @@ -5,6 +5,7 @@ import com.eactive.testmaster.server.dto.ServerSearch; import com.eactive.testmaster.server.entity.Server; import com.eactive.testmaster.server.mapper.ServerMapper; import com.eactive.testmaster.server.service.ServerMgmtService; +import java.util.List; import org.apache.commons.lang3.StringUtils; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -13,9 +14,11 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.validation.BindingResult; import org.springframework.validation.Validator; -import org.springframework.web.bind.annotation.*; - -import java.util.List; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; @Controller diff --git a/src/main/java/com/eactive/testmaster/server/dto/ServerSearch.java b/src/main/java/com/eactive/testmaster/server/dto/ServerSearch.java index 6b2709b..c99e62a 100644 --- a/src/main/java/com/eactive/testmaster/server/dto/ServerSearch.java +++ b/src/main/java/com/eactive/testmaster/server/dto/ServerSearch.java @@ -5,10 +5,9 @@ import com.eactive.testmaster.common.search.ColumnSearchModel; import com.eactive.testmaster.common.search.SearchCondition; import com.eactive.testmaster.common.search.SearchModel; import com.eactive.testmaster.server.entity.Server; -import org.apache.commons.lang3.StringUtils; - import java.util.ArrayList; import java.util.List; +import org.apache.commons.lang3.StringUtils; public class ServerSearch implements BaseSearch { diff --git a/src/main/java/com/eactive/testmaster/server/repository/ServerRepository.java b/src/main/java/com/eactive/testmaster/server/repository/ServerRepository.java index 440aed3..f3b2f0f 100644 --- a/src/main/java/com/eactive/testmaster/server/repository/ServerRepository.java +++ b/src/main/java/com/eactive/testmaster/server/repository/ServerRepository.java @@ -1,11 +1,10 @@ package com.eactive.testmaster.server.repository; import com.eactive.testmaster.server.entity.Server; +import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -import java.util.List; - public interface ServerRepository extends JpaRepository, JpaSpecificationExecutor { diff --git a/src/main/java/com/eactive/testmaster/server/service/ServerMgmtService.java b/src/main/java/com/eactive/testmaster/server/service/ServerMgmtService.java index 843ef07..943d60d 100644 --- a/src/main/java/com/eactive/testmaster/server/service/ServerMgmtService.java +++ b/src/main/java/com/eactive/testmaster/server/service/ServerMgmtService.java @@ -3,14 +3,13 @@ package com.eactive.testmaster.server.service; import com.eactive.testmaster.common.exception.NotFoundException; import com.eactive.testmaster.server.entity.Server; import com.eactive.testmaster.server.repository.ServerRepository; +import javax.transaction.Transactional; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.domain.Specification; import org.springframework.stereotype.Service; -import javax.transaction.Transactional; - @Service @Transactional public class ServerMgmtService { diff --git a/src/main/java/com/eactive/testmaster/user/controller/UserMgmtController.java b/src/main/java/com/eactive/testmaster/user/controller/UserMgmtController.java index 2be9b59..e1236f8 100644 --- a/src/main/java/com/eactive/testmaster/user/controller/UserMgmtController.java +++ b/src/main/java/com/eactive/testmaster/user/controller/UserMgmtController.java @@ -15,7 +15,11 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.validation.BindingResult; import org.springframework.validation.Validator; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; @Controller @RequestMapping("/mgmt/users") diff --git a/src/main/java/com/eactive/testmaster/user/dto/PasswordChangeRequestDTO.java b/src/main/java/com/eactive/testmaster/user/dto/PasswordChangeRequestDTO.java index dd07ffc..ba9728e 100644 --- a/src/main/java/com/eactive/testmaster/user/dto/PasswordChangeRequestDTO.java +++ b/src/main/java/com/eactive/testmaster/user/dto/PasswordChangeRequestDTO.java @@ -1,7 +1,6 @@ package com.eactive.testmaster.user.dto; import com.eactive.testmaster.common.validator.PasswordMatch; - import javax.validation.constraints.NotEmpty; @PasswordMatch(input = "newPassword", confirm = "newPassword2") diff --git a/src/main/java/com/eactive/testmaster/user/dto/UserRegisterDTO.java b/src/main/java/com/eactive/testmaster/user/dto/UserRegisterDTO.java index 34f8a0d..c5b075b 100644 --- a/src/main/java/com/eactive/testmaster/user/dto/UserRegisterDTO.java +++ b/src/main/java/com/eactive/testmaster/user/dto/UserRegisterDTO.java @@ -3,10 +3,9 @@ package com.eactive.testmaster.user.dto; import com.eactive.testmaster.common.validator.PasswordMatch; import com.eactive.testmaster.common.validator.UniqueId; import com.eactive.testmaster.user.entity.UserStatus; -import org.hibernate.validator.constraints.Length; - -import javax.validation.constraints.NotEmpty; import java.io.Serializable; +import javax.validation.constraints.NotEmpty; +import org.hibernate.validator.constraints.Length; @PasswordMatch(input = "password", confirm = "password2") public class UserRegisterDTO implements Serializable { diff --git a/src/main/java/com/eactive/testmaster/user/dto/UserSearch.java b/src/main/java/com/eactive/testmaster/user/dto/UserSearch.java index 9299be4..5b49178 100644 --- a/src/main/java/com/eactive/testmaster/user/dto/UserSearch.java +++ b/src/main/java/com/eactive/testmaster/user/dto/UserSearch.java @@ -6,7 +6,6 @@ import com.eactive.testmaster.common.search.SearchCondition; import com.eactive.testmaster.common.search.SearchModel; import com.eactive.testmaster.user.entity.StaffUser; import com.eactive.testmaster.user.entity.UserStatus; - import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/eactive/testmaster/user/dto/UserUpdateDTO.java b/src/main/java/com/eactive/testmaster/user/dto/UserUpdateDTO.java index 5dfb738..615a98e 100644 --- a/src/main/java/com/eactive/testmaster/user/dto/UserUpdateDTO.java +++ b/src/main/java/com/eactive/testmaster/user/dto/UserUpdateDTO.java @@ -2,10 +2,9 @@ package com.eactive.testmaster.user.dto; import com.eactive.testmaster.common.entity.EnabledStatus; import com.eactive.testmaster.user.entity.UserStatus; - +import java.io.Serializable; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; -import java.io.Serializable; public class UserUpdateDTO implements Serializable { diff --git a/src/main/java/com/eactive/testmaster/user/entity/StaffUser.java b/src/main/java/com/eactive/testmaster/user/entity/StaffUser.java index 9aff658..c6f337e 100644 --- a/src/main/java/com/eactive/testmaster/user/entity/StaffUser.java +++ b/src/main/java/com/eactive/testmaster/user/entity/StaffUser.java @@ -1,7 +1,14 @@ package com.eactive.testmaster.user.entity; -import javax.persistence.*; import java.util.Objects; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.Table; +import javax.persistence.Transient; /** * PT_USER 내부사용자정보 diff --git a/src/main/java/com/eactive/testmaster/user/entity/User.java b/src/main/java/com/eactive/testmaster/user/entity/User.java index 2a2eed2..0f0a959 100644 --- a/src/main/java/com/eactive/testmaster/user/entity/User.java +++ b/src/main/java/com/eactive/testmaster/user/entity/User.java @@ -2,20 +2,22 @@ package com.eactive.testmaster.user.entity; import com.eactive.testmaster.common.entity.Auditable; import com.eactive.testmaster.common.entity.EnabledStatus; +import java.io.Serializable; +import java.time.LocalDateTime; import java.util.ArrayList; +import java.util.Collection; import java.util.List; -import java.util.Objects; +import javax.persistence.Column; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; +import javax.persistence.Id; +import javax.persistence.MappedSuperclass; +import javax.persistence.Transient; import org.hibernate.annotations.Type; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; -import javax.persistence.*; -import java.io.Serializable; -import java.time.LocalDateTime; -import java.util.Arrays; -import java.util.Collection; - @MappedSuperclass public abstract class User extends Auditable implements Serializable, UserDetails { diff --git a/src/main/java/com/eactive/testmaster/user/entity/UserGroup.java b/src/main/java/com/eactive/testmaster/user/entity/UserGroup.java index 88fd474..565eeaf 100644 --- a/src/main/java/com/eactive/testmaster/user/entity/UserGroup.java +++ b/src/main/java/com/eactive/testmaster/user/entity/UserGroup.java @@ -1,8 +1,12 @@ package com.eactive.testmaster.user.entity; -import javax.persistence.*; import java.io.Serializable; import java.util.List; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.Id; +import javax.persistence.OneToMany; +import javax.persistence.Table; @Entity @Table(name = "PT_USER_GROUP") diff --git a/src/main/java/com/eactive/testmaster/user/repository/StaffUserRepository.java b/src/main/java/com/eactive/testmaster/user/repository/StaffUserRepository.java index cd565dc..c5f3c8b 100644 --- a/src/main/java/com/eactive/testmaster/user/repository/StaffUserRepository.java +++ b/src/main/java/com/eactive/testmaster/user/repository/StaffUserRepository.java @@ -1,12 +1,11 @@ package com.eactive.testmaster.user.repository; import com.eactive.testmaster.user.entity.StaffUser; +import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.stereotype.Repository; -import java.util.Optional; - @Repository public interface StaffUserRepository extends JpaRepository, JpaSpecificationExecutor { diff --git a/src/main/java/com/eactive/testmaster/user/service/StaffUserService.java b/src/main/java/com/eactive/testmaster/user/service/StaffUserService.java index d3bdbff..a12ba37 100644 --- a/src/main/java/com/eactive/testmaster/user/service/StaffUserService.java +++ b/src/main/java/com/eactive/testmaster/user/service/StaffUserService.java @@ -1,10 +1,13 @@ package com.eactive.testmaster.user.service; +import static com.eactive.testmaster.user.service.UserService.USER_NOT_FOUND_MESSAGE; + import com.eactive.testmaster.common.entity.EnabledStatus; import com.eactive.testmaster.common.exception.UserNotFoundException; import com.eactive.testmaster.user.entity.StaffUser; import com.eactive.testmaster.user.entity.UserStatus; import com.eactive.testmaster.user.repository.StaffUserRepository; +import java.util.UUID; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -12,10 +15,6 @@ import org.springframework.data.jpa.domain.Specification; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.UUID; - -import static com.eactive.testmaster.user.service.UserService.USER_NOT_FOUND_MESSAGE; - @Service @Transactional public class StaffUserService { diff --git a/src/main/java/com/eactive/testmaster/user/service/UserService.java b/src/main/java/com/eactive/testmaster/user/service/UserService.java index 4a0e180..e910b81 100644 --- a/src/main/java/com/eactive/testmaster/user/service/UserService.java +++ b/src/main/java/com/eactive/testmaster/user/service/UserService.java @@ -6,14 +6,13 @@ import com.eactive.testmaster.common.util.EncryptionUtil; import com.eactive.testmaster.user.entity.StaffUser; import com.eactive.testmaster.user.entity.User; import com.eactive.testmaster.user.repository.StaffUserRepository; +import java.time.LocalDateTime; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.stereotype.Service; -import java.time.LocalDateTime; - @Service //@Transactional(propagation = Propagation.NESTED) public class UserService implements UserDetailsService {