From 91e902af25081212c5521a15983215f4b614c7db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=ED=98=84=EC=84=B1=ED=95=84?= Date: Tue, 23 Jan 2024 11:24:09 +0900 Subject: [PATCH] =?UTF-8?q?test=20master=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- build.gradle | 4 ++-- build_docker.sh | 2 +- settings.gradle | 2 +- sonar.sh | 4 ++-- .../ElinkTestMaster.java | 2 +- .../api/condition/ConditionMatcher.java | 8 ++++---- .../condition/ConditionMatcherService.java | 2 +- .../api/condition/HeaderMatcher.java | 6 +++--- .../api/condition/JsonPathMatcher.java | 6 +++--- .../api/condition/PathMatcher.java | 6 +++--- .../api/condition/QueryMatcher.java | 6 +++--- .../api/controller/MockApiController.java | 16 +++++++-------- .../api/controller/MockApiHandlerMapping.java | 6 +++--- .../controller/MockRouteMgmtController.java | 16 +++++++-------- .../api/dto/MockConditionDTO.java | 2 +- .../api/dto/MockHeaderDTO.java | 2 +- .../api/dto/MockRequest.java | 2 +- .../api/dto/MockResponseDTO.java | 2 +- .../api/dto/MockRouteRegisterDTO.java | 4 ++-- .../api/dto/MockRouteSearch.java | 12 +++++------ .../api/dto/MockRouteUpdateDTO.java | 4 +--- .../api/entity/MockCondition.java | 2 +- .../api/entity/MockResponse.java | 2 +- .../api/entity/MockRoute.java | 2 +- .../api/mapper/MockRouteMapper.java | 16 +++++++-------- .../api/repository/MockRouteRepository.java | 4 ++-- .../api/service/MockRouteService.java | 12 +++++------ .../controller/ApiClientController.java | 8 ++++---- .../controller/ApiClientPageController.java | 6 +++--- .../controller/ApiRequestMgmtController.java | 20 +++++++++---------- .../controller/ApiScenarioMgmtController.java | 16 +++++++-------- .../client/dto/ApiCollectionDTO.java | 2 +- .../client/dto/ApiRequestDTO.java | 2 +- .../client/dto/ApiRequestKeyValueDTO.java | 2 +- .../client/dto/ApiResponse.java | 2 +- .../client/dto/ApiScenarioDTO.java | 2 +- .../client/entity/ApiCollection.java | 4 ++-- .../client/entity/ApiRequestHistory.java | 6 +++--- .../client/entity/ApiRequestInfo.java | 6 +++--- .../client/entity/ApiScenario.java | 4 ++-- .../client/mapper/ApiRequestMapper.java | 14 ++++++------- .../client/mapper/ApiScenarioMapper.java | 6 +++--- .../repository/ApiCollectionRepository.java | 6 +++--- .../repository/ApiRequestRepository.java | 4 ++-- .../repository/ApiScenarioRepository.java | 6 +++--- .../client/service/ApiRequestMgmtService.java | 14 ++++++------- .../service/ApiRequestMigrationService.java | 4 ++-- .../service/ApiScenarioMgmtService.java | 6 +++--- .../client/service/HttpHandler.java | 6 +++--- .../client/service/NettyApiClient.java | 15 +++++++------- .../common/entity/Auditable.java | 2 +- .../common/entity/EnabledStatus.java | 2 +- .../common/exception/CustomErrorResponse.java | 2 +- .../CustomGlobalExceptionHandler.java | 2 +- .../common/exception/NotFoundException.java | 2 +- .../exception/PortalErrorController.java | 2 +- .../PortalGlobalExceptionHandler.java | 2 +- .../exception/ServerNotFoundException.java | 2 +- .../exception/UserNotFoundException.java | 2 +- .../exception/UserNotLoginException.java | 2 +- .../exception/UserPasswordResetException.java | 2 +- .../interceptor/AuthenticInterceptor.java | 10 +++++----- .../common/mapper/CommonMapper.java | 4 ++-- ...ReloadableResourceBundleMessageSource.java | 2 +- .../common/search/BaseSearch.java | 2 +- .../common/search/ColumnSearchModel.java | 4 ++-- .../common/search/SearchCondition.java | 2 +- .../common/search/SearchModel.java | 2 +- .../search/SpecificationSearchModel.java | 2 +- .../common/util/ApplicationContextUtil.java | 2 +- .../common/util/EncryptionUtil.java | 2 +- .../common/util/RandomUtil.java | 2 +- .../common/util/SecurityUtil.java | 6 +++--- .../common/util/SpecificationUtil.java | 2 +- .../common/validator/PasswordMatch.java | 4 ++-- .../validator/PasswordMatchValidator.java | 4 ++-- .../common/validator/UniqueId.java | 2 +- .../common/validator/UniqueRoute.java | 2 +- .../validator/UniqueRouteValidator.java | 10 +++------- .../validator/UniqueUserIdValidator.java | 8 ++++---- .../config/AuditorAwareImpl.java | 6 +++--- .../PortalAuthenticationFailureHandler.java | 16 +++++++-------- .../config/PortalAuthenticationManager.java | 8 ++++---- .../PortalAuthenticationSuccessHandler.java | 6 +++--- .../config/PortalConfigAppDatasource.java | 2 +- .../config/PortalConfigMessageSource.java | 4 ++-- .../config/PortalConfigSecurity.java | 2 +- .../config/ServletConfig.java | 2 +- .../config/WebMvcConfig.java | 4 ++-- .../home/HomeController.java | 4 ++-- .../login/controller/LoginController.java | 6 ++---- .../login/dto/FindIdRequest.java | 2 +- .../login/dto/LoginRequestDTO.java | 2 +- .../login/service/LoginService.java | 4 ++-- .../login/service/impl/LoginServiceImpl.java | 12 +++++------ .../controller/ServerMgmtController.java | 12 +++++------ .../server/dto/ServerDTO.java | 2 +- .../server/dto/ServerSearch.java | 12 +++++------ .../server/entity/Server.java | 2 +- .../server/entity/ServerRepository.java | 2 +- .../server/mapper/ServerMapper.java | 10 +++++----- .../server/service/ServerMgmtService.java | 8 ++++---- .../user/controller/AccountController.java | 8 ++++---- .../controller/AdminRegisterController.java | 12 +++++------ .../user/controller/UserMgmtController.java | 16 +++++++-------- .../user/dto/PasswordChangeRequestDTO.java | 4 ++-- .../user/dto/UserRegisterDTO.java | 8 ++++---- .../user/dto/UserSearch.java | 14 ++++++------- .../user/dto/UserUpdateDTO.java | 6 +++--- .../user/entity/AnonymousUser.java | 2 +- .../user/entity/StaffUser.java | 2 +- .../user/entity/User.java | 6 +++--- .../user/entity/UserGroup.java | 2 +- .../user/entity/UserStatus.java | 2 +- .../user/mapper/StaffUserMapper.java | 12 +++++------ .../user/repository/StaffUserRepository.java | 4 ++-- .../user/service/StaffUserService.java | 14 ++++++------- .../user/service/UserService.java | 14 ++++++------- start.bat | 2 +- start.sh | 2 +- 121 files changed, 329 insertions(+), 338 deletions(-) rename src/main/java/com/eactive/{httpmockserver => testmaster}/ElinkTestMaster.java (93%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/api/condition/ConditionMatcher.java (56%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/api/condition/ConditionMatcherService.java (94%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/api/condition/HeaderMatcher.java (75%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/api/condition/JsonPathMatcher.java (82%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/api/condition/PathMatcher.java (75%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/api/condition/QueryMatcher.java (75%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/api/controller/MockApiController.java (91%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/api/controller/MockApiHandlerMapping.java (92%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/api/controller/MockRouteMgmtController.java (91%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/api/dto/MockConditionDTO.java (91%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/api/dto/MockHeaderDTO.java (88%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/api/dto/MockRequest.java (98%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/api/dto/MockResponseDTO.java (96%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/api/dto/MockRouteRegisterDTO.java (93%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/api/dto/MockRouteSearch.java (59%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/api/dto/MockRouteUpdateDTO.java (92%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/api/entity/MockCondition.java (95%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/api/entity/MockResponse.java (97%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/api/entity/MockRoute.java (96%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/api/mapper/MockRouteMapper.java (87%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/api/repository/MockRouteRepository.java (75%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/api/service/MockRouteService.java (91%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/client/controller/ApiClientController.java (82%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/client/controller/ApiClientPageController.java (79%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/client/controller/ApiRequestMgmtController.java (83%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/client/controller/ApiScenarioMgmtController.java (81%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/client/dto/ApiCollectionDTO.java (93%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/client/dto/ApiRequestDTO.java (98%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/client/dto/ApiRequestKeyValueDTO.java (92%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/client/dto/ApiResponse.java (94%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/client/dto/ApiScenarioDTO.java (93%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/client/entity/ApiCollection.java (91%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/client/entity/ApiRequestHistory.java (93%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/client/entity/ApiRequestInfo.java (94%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/client/entity/ApiScenario.java (90%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/client/mapper/ApiRequestMapper.java (58%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/client/mapper/ApiScenarioMapper.java (71%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/client/repository/ApiCollectionRepository.java (66%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/client/repository/ApiRequestRepository.java (69%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/client/repository/ApiScenarioRepository.java (66%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/client/service/ApiRequestMgmtService.java (88%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/client/service/ApiRequestMigrationService.java (94%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/client/service/ApiScenarioMgmtService.java (88%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/client/service/HttpHandler.java (92%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/client/service/NettyApiClient.java (90%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/common/entity/Auditable.java (97%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/common/entity/EnabledStatus.java (79%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/common/exception/CustomErrorResponse.java (91%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/common/exception/CustomGlobalExceptionHandler.java (97%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/common/exception/NotFoundException.java (73%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/common/exception/PortalErrorController.java (95%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/common/exception/PortalGlobalExceptionHandler.java (95%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/common/exception/ServerNotFoundException.java (74%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/common/exception/UserNotFoundException.java (73%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/common/exception/UserNotLoginException.java (72%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/common/exception/UserPasswordResetException.java (74%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/common/interceptor/AuthenticInterceptor.java (86%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/common/mapper/CommonMapper.java (95%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/common/message/PortalReloadableResourceBundleMessageSource.java (97%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/common/search/BaseSearch.java (98%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/common/search/ColumnSearchModel.java (93%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/common/search/SearchCondition.java (60%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/common/search/SearchModel.java (78%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/common/search/SpecificationSearchModel.java (88%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/common/util/ApplicationContextUtil.java (94%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/common/util/EncryptionUtil.java (97%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/common/util/RandomUtil.java (97%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/common/util/SecurityUtil.java (86%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/common/util/SpecificationUtil.java (98%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/common/validator/PasswordMatch.java (89%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/common/validator/PasswordMatchValidator.java (93%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/common/validator/UniqueId.java (88%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/common/validator/UniqueRoute.java (89%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/common/validator/UniqueRouteValidator.java (77%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/common/validator/UniqueUserIdValidator.java (68%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/config/AuditorAwareImpl.java (73%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/config/PortalAuthenticationFailureHandler.java (81%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/config/PortalAuthenticationManager.java (90%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/config/PortalAuthenticationSuccessHandler.java (91%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/config/PortalConfigAppDatasource.java (96%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/config/PortalConfigMessageSource.java (91%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/config/PortalConfigSecurity.java (98%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/config/ServletConfig.java (95%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/config/WebMvcConfig.java (97%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/home/HomeController.java (86%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/login/controller/LoginController.java (91%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/login/dto/FindIdRequest.java (88%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/login/dto/LoginRequestDTO.java (88%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/login/service/LoginService.java (76%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/login/service/impl/LoginServiceImpl.java (71%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/server/controller/ServerMgmtController.java (91%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/server/dto/ServerDTO.java (96%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/server/dto/ServerSearch.java (81%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/server/entity/Server.java (96%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/server/entity/ServerRepository.java (86%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/server/mapper/ServerMapper.java (84%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/server/service/ServerMgmtService.java (85%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/user/controller/AccountController.java (89%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/user/controller/AdminRegisterController.java (84%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/user/controller/UserMgmtController.java (88%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/user/dto/PasswordChangeRequestDTO.java (89%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/user/dto/UserRegisterDTO.java (90%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/user/dto/UserSearch.java (68%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/user/dto/UserUpdateDTO.java (91%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/user/entity/AnonymousUser.java (95%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/user/entity/StaffUser.java (98%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/user/entity/User.java (95%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/user/entity/UserGroup.java (95%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/user/entity/UserStatus.java (89%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/user/mapper/StaffUserMapper.java (69%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/user/repository/StaffUserRepository.java (78%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/user/service/StaffUserService.java (82%) rename src/main/java/com/eactive/{httpmockserver => testmaster}/user/service/UserService.java (86%) diff --git a/Dockerfile b/Dockerfile index 4331409..0a8941e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,4 +6,4 @@ COPY build/libs/*.jar /app/app.jar ENV JAVA_OPTS="" -ENTRYPOINT java -jar ${JAVA_OPTS} app.jar \ No newline at end of file +ENTRYPOINT java -jar ${JAVA_OPTS} app.jar diff --git a/build.gradle b/build.gradle index 907f2d5..bba3506 100644 --- a/build.gradle +++ b/build.gradle @@ -46,7 +46,7 @@ dependencies { // implementation 'io.springfox:springfox-boot-starter:3.0.0' implementation 'org.apache.httpcomponents:httpclient:4.5.14' - + implementation 'org.apache.commons:commons-lang3:3.12.0' implementation 'commons-io:commons-io:2.11.0' @@ -61,7 +61,7 @@ dependencies { } bootJar { - archiveFileName = "apim-simulator.jar" + archiveFileName = "elink-test-master.jar" } test { diff --git a/build_docker.sh b/build_docker.sh index d0d9864..d3a652d 100755 --- a/build_docker.sh +++ b/build_docker.sh @@ -1,3 +1,3 @@ ./gradlew bootJar -docker build -t simulator . +docker build -t test-master . diff --git a/settings.gradle b/settings.gradle index db8abd7..66e4714 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -rootProject.name = 'simulator-v2' +rootProject.name = 'elink-test-master' diff --git a/sonar.sh b/sonar.sh index 9c47128..b0f71cf 100755 --- a/sonar.sh +++ b/sonar.sh @@ -1,5 +1,5 @@ sed -i '' "s/\/\/ id \"org\.sonarqube/ id \"org\.sonarqube/g" ./build.gradle -./gradlew sonar -Dsonar.projectKey=simulator -Dsonar.projectName='simulator' -Dsonar.host.url=http://localhost:9000 -Dsonar.token=sqp_8363780a26613b2557b57ced47b655d077e0a310 +./gradlew sonar -Dsonar.projectKey=test-master -Dsonar.projectName='test-master' -Dsonar.host.url=http://localhost:9000 -Dsonar.token=sqp_8363780a26613b2557b57ced47b655d077e0a310 -sed -i '' "s/ id \"org\.sonarqube/\/\/ id \"org\.sonarqube/g" ./build.gradle \ No newline at end of file +sed -i '' "s/ id \"org\.sonarqube/\/\/ id \"org\.sonarqube/g" ./build.gradle diff --git a/src/main/java/com/eactive/httpmockserver/ElinkTestMaster.java b/src/main/java/com/eactive/testmaster/ElinkTestMaster.java similarity index 93% rename from src/main/java/com/eactive/httpmockserver/ElinkTestMaster.java rename to src/main/java/com/eactive/testmaster/ElinkTestMaster.java index 91ef648..590e2a3 100644 --- a/src/main/java/com/eactive/httpmockserver/ElinkTestMaster.java +++ b/src/main/java/com/eactive/testmaster/ElinkTestMaster.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver; +package com.eactive.testmaster; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/src/main/java/com/eactive/httpmockserver/api/condition/ConditionMatcher.java b/src/main/java/com/eactive/testmaster/api/condition/ConditionMatcher.java similarity index 56% rename from src/main/java/com/eactive/httpmockserver/api/condition/ConditionMatcher.java rename to src/main/java/com/eactive/testmaster/api/condition/ConditionMatcher.java index 44cfe97..3d426fa 100644 --- a/src/main/java/com/eactive/httpmockserver/api/condition/ConditionMatcher.java +++ b/src/main/java/com/eactive/testmaster/api/condition/ConditionMatcher.java @@ -1,7 +1,7 @@ -package com.eactive.httpmockserver.api.condition; +package com.eactive.testmaster.api.condition; -import com.eactive.httpmockserver.api.dto.MockRequest; -import com.eactive.httpmockserver.api.entity.MockCondition; +import com.eactive.testmaster.api.dto.MockRequest; +import com.eactive.testmaster.api.entity.MockCondition; import java.util.Map; @@ -11,4 +11,4 @@ public interface ConditionMatcher { String getType(); String getDisplayName(); -} \ No newline at end of file +} diff --git a/src/main/java/com/eactive/httpmockserver/api/condition/ConditionMatcherService.java b/src/main/java/com/eactive/testmaster/api/condition/ConditionMatcherService.java similarity index 94% rename from src/main/java/com/eactive/httpmockserver/api/condition/ConditionMatcherService.java rename to src/main/java/com/eactive/testmaster/api/condition/ConditionMatcherService.java index 09fa05f..06a1b76 100644 --- a/src/main/java/com/eactive/httpmockserver/api/condition/ConditionMatcherService.java +++ b/src/main/java/com/eactive/testmaster/api/condition/ConditionMatcherService.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.api.condition; +package com.eactive.testmaster.api.condition; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/eactive/httpmockserver/api/condition/HeaderMatcher.java b/src/main/java/com/eactive/testmaster/api/condition/HeaderMatcher.java similarity index 75% rename from src/main/java/com/eactive/httpmockserver/api/condition/HeaderMatcher.java rename to src/main/java/com/eactive/testmaster/api/condition/HeaderMatcher.java index 87e2760..46f7d24 100644 --- a/src/main/java/com/eactive/httpmockserver/api/condition/HeaderMatcher.java +++ b/src/main/java/com/eactive/testmaster/api/condition/HeaderMatcher.java @@ -1,7 +1,7 @@ -package com.eactive.httpmockserver.api.condition; +package com.eactive.testmaster.api.condition; -import com.eactive.httpmockserver.api.dto.MockRequest; -import com.eactive.httpmockserver.api.entity.MockCondition; +import com.eactive.testmaster.api.dto.MockRequest; +import com.eactive.testmaster.api.entity.MockCondition; import org.springframework.stereotype.Component; import java.util.Map; diff --git a/src/main/java/com/eactive/httpmockserver/api/condition/JsonPathMatcher.java b/src/main/java/com/eactive/testmaster/api/condition/JsonPathMatcher.java similarity index 82% rename from src/main/java/com/eactive/httpmockserver/api/condition/JsonPathMatcher.java rename to src/main/java/com/eactive/testmaster/api/condition/JsonPathMatcher.java index b161757..d4fe06c 100644 --- a/src/main/java/com/eactive/httpmockserver/api/condition/JsonPathMatcher.java +++ b/src/main/java/com/eactive/testmaster/api/condition/JsonPathMatcher.java @@ -1,7 +1,7 @@ -package com.eactive.httpmockserver.api.condition; +package com.eactive.testmaster.api.condition; -import com.eactive.httpmockserver.api.dto.MockRequest; -import com.eactive.httpmockserver.api.entity.MockCondition; +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; diff --git a/src/main/java/com/eactive/httpmockserver/api/condition/PathMatcher.java b/src/main/java/com/eactive/testmaster/api/condition/PathMatcher.java similarity index 75% rename from src/main/java/com/eactive/httpmockserver/api/condition/PathMatcher.java rename to src/main/java/com/eactive/testmaster/api/condition/PathMatcher.java index 9be3173..543ed07 100644 --- a/src/main/java/com/eactive/httpmockserver/api/condition/PathMatcher.java +++ b/src/main/java/com/eactive/testmaster/api/condition/PathMatcher.java @@ -1,7 +1,7 @@ -package com.eactive.httpmockserver.api.condition; +package com.eactive.testmaster.api.condition; -import com.eactive.httpmockserver.api.dto.MockRequest; -import com.eactive.httpmockserver.api.entity.MockCondition; +import com.eactive.testmaster.api.dto.MockRequest; +import com.eactive.testmaster.api.entity.MockCondition; import org.springframework.stereotype.Component; import java.util.Map; diff --git a/src/main/java/com/eactive/httpmockserver/api/condition/QueryMatcher.java b/src/main/java/com/eactive/testmaster/api/condition/QueryMatcher.java similarity index 75% rename from src/main/java/com/eactive/httpmockserver/api/condition/QueryMatcher.java rename to src/main/java/com/eactive/testmaster/api/condition/QueryMatcher.java index 5c4003d..86a0d80 100644 --- a/src/main/java/com/eactive/httpmockserver/api/condition/QueryMatcher.java +++ b/src/main/java/com/eactive/testmaster/api/condition/QueryMatcher.java @@ -1,7 +1,7 @@ -package com.eactive.httpmockserver.api.condition; +package com.eactive.testmaster.api.condition; -import com.eactive.httpmockserver.api.dto.MockRequest; -import com.eactive.httpmockserver.api.entity.MockCondition; +import com.eactive.testmaster.api.dto.MockRequest; +import com.eactive.testmaster.api.entity.MockCondition; import org.springframework.stereotype.Component; import java.util.Map; diff --git a/src/main/java/com/eactive/httpmockserver/api/controller/MockApiController.java b/src/main/java/com/eactive/testmaster/api/controller/MockApiController.java similarity index 91% rename from src/main/java/com/eactive/httpmockserver/api/controller/MockApiController.java rename to src/main/java/com/eactive/testmaster/api/controller/MockApiController.java index 1ca0778..54f63c2 100644 --- a/src/main/java/com/eactive/httpmockserver/api/controller/MockApiController.java +++ b/src/main/java/com/eactive/testmaster/api/controller/MockApiController.java @@ -1,12 +1,12 @@ -package com.eactive.httpmockserver.api.controller; +package com.eactive.testmaster.api.controller; -import com.eactive.httpmockserver.api.condition.ConditionMatcher; -import com.eactive.httpmockserver.api.condition.ConditionMatcherService; -import com.eactive.httpmockserver.api.dto.MockRequest; -import com.eactive.httpmockserver.api.entity.MockCondition; -import com.eactive.httpmockserver.api.entity.MockResponse; -import com.eactive.httpmockserver.api.entity.MockRoute; -import com.eactive.httpmockserver.api.service.MockRouteService; +import com.eactive.testmaster.api.condition.ConditionMatcher; +import com.eactive.testmaster.api.condition.ConditionMatcherService; +import com.eactive.testmaster.api.dto.MockRequest; +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 org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.HttpHeaders; diff --git a/src/main/java/com/eactive/httpmockserver/api/controller/MockApiHandlerMapping.java b/src/main/java/com/eactive/testmaster/api/controller/MockApiHandlerMapping.java similarity index 92% rename from src/main/java/com/eactive/httpmockserver/api/controller/MockApiHandlerMapping.java rename to src/main/java/com/eactive/testmaster/api/controller/MockApiHandlerMapping.java index aaf0d35..5eb84fc 100644 --- a/src/main/java/com/eactive/httpmockserver/api/controller/MockApiHandlerMapping.java +++ b/src/main/java/com/eactive/testmaster/api/controller/MockApiHandlerMapping.java @@ -1,7 +1,7 @@ -package com.eactive.httpmockserver.api.controller; +package com.eactive.testmaster.api.controller; -import com.eactive.httpmockserver.api.entity.MockRoute; -import com.eactive.httpmockserver.api.service.MockRouteService; +import com.eactive.testmaster.api.entity.MockRoute; +import com.eactive.testmaster.api.service.MockRouteService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/eactive/httpmockserver/api/controller/MockRouteMgmtController.java b/src/main/java/com/eactive/testmaster/api/controller/MockRouteMgmtController.java similarity index 91% rename from src/main/java/com/eactive/httpmockserver/api/controller/MockRouteMgmtController.java rename to src/main/java/com/eactive/testmaster/api/controller/MockRouteMgmtController.java index 083dd3d..1bae602 100644 --- a/src/main/java/com/eactive/httpmockserver/api/controller/MockRouteMgmtController.java +++ b/src/main/java/com/eactive/testmaster/api/controller/MockRouteMgmtController.java @@ -1,12 +1,12 @@ -package com.eactive.httpmockserver.api.controller; +package com.eactive.testmaster.api.controller; -import com.eactive.httpmockserver.api.dto.MockResponseDTO; -import com.eactive.httpmockserver.api.dto.MockRouteRegisterDTO; -import com.eactive.httpmockserver.api.dto.MockRouteSearch; -import com.eactive.httpmockserver.api.dto.MockRouteUpdateDTO; -import com.eactive.httpmockserver.api.entity.MockRoute; -import com.eactive.httpmockserver.api.mapper.MockRouteMapper; -import com.eactive.httpmockserver.api.service.MockRouteService; +import com.eactive.testmaster.api.dto.MockResponseDTO; +import com.eactive.testmaster.api.dto.MockRouteRegisterDTO; +import com.eactive.testmaster.api.dto.MockRouteSearch; +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 org.apache.commons.lang3.StringUtils; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/com/eactive/httpmockserver/api/dto/MockConditionDTO.java b/src/main/java/com/eactive/testmaster/api/dto/MockConditionDTO.java similarity index 91% rename from src/main/java/com/eactive/httpmockserver/api/dto/MockConditionDTO.java rename to src/main/java/com/eactive/testmaster/api/dto/MockConditionDTO.java index e01a843..dc6270f 100644 --- a/src/main/java/com/eactive/httpmockserver/api/dto/MockConditionDTO.java +++ b/src/main/java/com/eactive/testmaster/api/dto/MockConditionDTO.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.api.dto; +package com.eactive.testmaster.api.dto; public class MockConditionDTO { private String type; diff --git a/src/main/java/com/eactive/httpmockserver/api/dto/MockHeaderDTO.java b/src/main/java/com/eactive/testmaster/api/dto/MockHeaderDTO.java similarity index 88% rename from src/main/java/com/eactive/httpmockserver/api/dto/MockHeaderDTO.java rename to src/main/java/com/eactive/testmaster/api/dto/MockHeaderDTO.java index 13acc59..3d5bcec 100644 --- a/src/main/java/com/eactive/httpmockserver/api/dto/MockHeaderDTO.java +++ b/src/main/java/com/eactive/testmaster/api/dto/MockHeaderDTO.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.api.dto; +package com.eactive.testmaster.api.dto; public class MockHeaderDTO { diff --git a/src/main/java/com/eactive/httpmockserver/api/dto/MockRequest.java b/src/main/java/com/eactive/testmaster/api/dto/MockRequest.java similarity index 98% rename from src/main/java/com/eactive/httpmockserver/api/dto/MockRequest.java rename to src/main/java/com/eactive/testmaster/api/dto/MockRequest.java index 76faaad..6094700 100644 --- a/src/main/java/com/eactive/httpmockserver/api/dto/MockRequest.java +++ b/src/main/java/com/eactive/testmaster/api/dto/MockRequest.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.api.dto; +package com.eactive.testmaster.api.dto; import javax.servlet.http.HttpServletRequest; import java.io.IOException; diff --git a/src/main/java/com/eactive/httpmockserver/api/dto/MockResponseDTO.java b/src/main/java/com/eactive/testmaster/api/dto/MockResponseDTO.java similarity index 96% rename from src/main/java/com/eactive/httpmockserver/api/dto/MockResponseDTO.java rename to src/main/java/com/eactive/testmaster/api/dto/MockResponseDTO.java index 3dba04e..428f6c8 100644 --- a/src/main/java/com/eactive/httpmockserver/api/dto/MockResponseDTO.java +++ b/src/main/java/com/eactive/testmaster/api/dto/MockResponseDTO.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.api.dto; +package com.eactive.testmaster.api.dto; import javax.validation.constraints.Min; import java.util.ArrayList; diff --git a/src/main/java/com/eactive/httpmockserver/api/dto/MockRouteRegisterDTO.java b/src/main/java/com/eactive/testmaster/api/dto/MockRouteRegisterDTO.java similarity index 93% rename from src/main/java/com/eactive/httpmockserver/api/dto/MockRouteRegisterDTO.java rename to src/main/java/com/eactive/testmaster/api/dto/MockRouteRegisterDTO.java index 8c75d86..2ded42a 100644 --- a/src/main/java/com/eactive/httpmockserver/api/dto/MockRouteRegisterDTO.java +++ b/src/main/java/com/eactive/testmaster/api/dto/MockRouteRegisterDTO.java @@ -1,6 +1,6 @@ -package com.eactive.httpmockserver.api.dto; +package com.eactive.testmaster.api.dto; -import com.eactive.httpmockserver.common.validator.UniqueRoute; +import com.eactive.testmaster.common.validator.UniqueRoute; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.Size; diff --git a/src/main/java/com/eactive/httpmockserver/api/dto/MockRouteSearch.java b/src/main/java/com/eactive/testmaster/api/dto/MockRouteSearch.java similarity index 59% rename from src/main/java/com/eactive/httpmockserver/api/dto/MockRouteSearch.java rename to src/main/java/com/eactive/testmaster/api/dto/MockRouteSearch.java index 4cd4bab..f4d5478 100644 --- a/src/main/java/com/eactive/httpmockserver/api/dto/MockRouteSearch.java +++ b/src/main/java/com/eactive/testmaster/api/dto/MockRouteSearch.java @@ -1,10 +1,10 @@ -package com.eactive.httpmockserver.api.dto; +package com.eactive.testmaster.api.dto; -import com.eactive.httpmockserver.api.entity.MockRoute; -import com.eactive.httpmockserver.common.search.BaseSearch; -import com.eactive.httpmockserver.common.search.ColumnSearchModel; -import com.eactive.httpmockserver.common.search.SearchCondition; -import com.eactive.httpmockserver.common.search.SearchModel; +import com.eactive.testmaster.api.entity.MockRoute; +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/httpmockserver/api/dto/MockRouteUpdateDTO.java b/src/main/java/com/eactive/testmaster/api/dto/MockRouteUpdateDTO.java similarity index 92% rename from src/main/java/com/eactive/httpmockserver/api/dto/MockRouteUpdateDTO.java rename to src/main/java/com/eactive/testmaster/api/dto/MockRouteUpdateDTO.java index 191e905..e1a2b67 100644 --- a/src/main/java/com/eactive/httpmockserver/api/dto/MockRouteUpdateDTO.java +++ b/src/main/java/com/eactive/testmaster/api/dto/MockRouteUpdateDTO.java @@ -1,6 +1,4 @@ -package com.eactive.httpmockserver.api.dto; - -import com.eactive.httpmockserver.common.validator.UniqueRoute; +package com.eactive.testmaster.api.dto; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.Size; diff --git a/src/main/java/com/eactive/httpmockserver/api/entity/MockCondition.java b/src/main/java/com/eactive/testmaster/api/entity/MockCondition.java similarity index 95% rename from src/main/java/com/eactive/httpmockserver/api/entity/MockCondition.java rename to src/main/java/com/eactive/testmaster/api/entity/MockCondition.java index ce87284..c61c736 100644 --- a/src/main/java/com/eactive/httpmockserver/api/entity/MockCondition.java +++ b/src/main/java/com/eactive/testmaster/api/entity/MockCondition.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.api.entity; +package com.eactive.testmaster.api.entity; import javax.persistence.*; diff --git a/src/main/java/com/eactive/httpmockserver/api/entity/MockResponse.java b/src/main/java/com/eactive/testmaster/api/entity/MockResponse.java similarity index 97% rename from src/main/java/com/eactive/httpmockserver/api/entity/MockResponse.java rename to src/main/java/com/eactive/testmaster/api/entity/MockResponse.java index 36dd2f7..3448106 100644 --- a/src/main/java/com/eactive/httpmockserver/api/entity/MockResponse.java +++ b/src/main/java/com/eactive/testmaster/api/entity/MockResponse.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.api.entity; +package com.eactive.testmaster.api.entity; import javax.persistence.*; import java.util.ArrayList; diff --git a/src/main/java/com/eactive/httpmockserver/api/entity/MockRoute.java b/src/main/java/com/eactive/testmaster/api/entity/MockRoute.java similarity index 96% rename from src/main/java/com/eactive/httpmockserver/api/entity/MockRoute.java rename to src/main/java/com/eactive/testmaster/api/entity/MockRoute.java index 0640f49..9c733c4 100644 --- a/src/main/java/com/eactive/httpmockserver/api/entity/MockRoute.java +++ b/src/main/java/com/eactive/testmaster/api/entity/MockRoute.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.api.entity; +package com.eactive.testmaster.api.entity; import javax.persistence.*; import java.util.ArrayList; diff --git a/src/main/java/com/eactive/httpmockserver/api/mapper/MockRouteMapper.java b/src/main/java/com/eactive/testmaster/api/mapper/MockRouteMapper.java similarity index 87% rename from src/main/java/com/eactive/httpmockserver/api/mapper/MockRouteMapper.java rename to src/main/java/com/eactive/testmaster/api/mapper/MockRouteMapper.java index 3e0af86..1d64cb9 100644 --- a/src/main/java/com/eactive/httpmockserver/api/mapper/MockRouteMapper.java +++ b/src/main/java/com/eactive/testmaster/api/mapper/MockRouteMapper.java @@ -1,12 +1,12 @@ -package com.eactive.httpmockserver.api.mapper; +package com.eactive.testmaster.api.mapper; -import com.eactive.httpmockserver.api.dto.MockHeaderDTO; -import com.eactive.httpmockserver.api.dto.MockResponseDTO; -import com.eactive.httpmockserver.api.dto.MockRouteRegisterDTO; -import com.eactive.httpmockserver.api.dto.MockRouteUpdateDTO; -import com.eactive.httpmockserver.api.entity.MockResponse; -import com.eactive.httpmockserver.api.entity.MockRoute; -import com.eactive.httpmockserver.common.mapper.CommonMapper; +import com.eactive.testmaster.api.dto.MockHeaderDTO; +import com.eactive.testmaster.api.dto.MockResponseDTO; +import com.eactive.testmaster.api.dto.MockRouteRegisterDTO; +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 org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.Named; diff --git a/src/main/java/com/eactive/httpmockserver/api/repository/MockRouteRepository.java b/src/main/java/com/eactive/testmaster/api/repository/MockRouteRepository.java similarity index 75% rename from src/main/java/com/eactive/httpmockserver/api/repository/MockRouteRepository.java rename to src/main/java/com/eactive/testmaster/api/repository/MockRouteRepository.java index 823d72e..fb52080 100644 --- a/src/main/java/com/eactive/httpmockserver/api/repository/MockRouteRepository.java +++ b/src/main/java/com/eactive/testmaster/api/repository/MockRouteRepository.java @@ -1,6 +1,6 @@ -package com.eactive.httpmockserver.api.repository; +package com.eactive.testmaster.api.repository; -import com.eactive.httpmockserver.api.entity.MockRoute; +import com.eactive.testmaster.api.entity.MockRoute; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; diff --git a/src/main/java/com/eactive/httpmockserver/api/service/MockRouteService.java b/src/main/java/com/eactive/testmaster/api/service/MockRouteService.java similarity index 91% rename from src/main/java/com/eactive/httpmockserver/api/service/MockRouteService.java rename to src/main/java/com/eactive/testmaster/api/service/MockRouteService.java index 49d95eb..a82b1cc 100644 --- a/src/main/java/com/eactive/httpmockserver/api/service/MockRouteService.java +++ b/src/main/java/com/eactive/testmaster/api/service/MockRouteService.java @@ -1,10 +1,10 @@ -package com.eactive.httpmockserver.api.service; +package com.eactive.testmaster.api.service; -import com.eactive.httpmockserver.api.entity.MockCondition; -import com.eactive.httpmockserver.api.entity.MockResponse; -import com.eactive.httpmockserver.api.entity.MockRoute; -import com.eactive.httpmockserver.api.repository.MockRouteRepository; -import com.eactive.httpmockserver.common.exception.NotFoundException; +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.repository.MockRouteRepository; +import com.eactive.testmaster.common.exception.NotFoundException; import org.apache.commons.beanutils.BeanUtils; import org.hibernate.Hibernate; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/eactive/httpmockserver/client/controller/ApiClientController.java b/src/main/java/com/eactive/testmaster/client/controller/ApiClientController.java similarity index 82% rename from src/main/java/com/eactive/httpmockserver/client/controller/ApiClientController.java rename to src/main/java/com/eactive/testmaster/client/controller/ApiClientController.java index dfa242c..6503102 100644 --- a/src/main/java/com/eactive/httpmockserver/client/controller/ApiClientController.java +++ b/src/main/java/com/eactive/testmaster/client/controller/ApiClientController.java @@ -1,8 +1,8 @@ -package com.eactive.httpmockserver.client.controller; +package com.eactive.testmaster.client.controller; -import com.eactive.httpmockserver.client.dto.ApiRequestDTO; -import com.eactive.httpmockserver.client.dto.ApiResponse; -import com.eactive.httpmockserver.client.service.NettyApiClient; +import com.eactive.testmaster.client.dto.ApiRequestDTO; +import com.eactive.testmaster.client.dto.ApiResponse; +import com.eactive.testmaster.client.service.NettyApiClient; import org.springframework.validation.BindingResult; import org.springframework.validation.Validator; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/main/java/com/eactive/httpmockserver/client/controller/ApiClientPageController.java b/src/main/java/com/eactive/testmaster/client/controller/ApiClientPageController.java similarity index 79% rename from src/main/java/com/eactive/httpmockserver/client/controller/ApiClientPageController.java rename to src/main/java/com/eactive/testmaster/client/controller/ApiClientPageController.java index d8a05d5..2af8ed6 100644 --- a/src/main/java/com/eactive/httpmockserver/client/controller/ApiClientPageController.java +++ b/src/main/java/com/eactive/testmaster/client/controller/ApiClientPageController.java @@ -1,7 +1,7 @@ -package com.eactive.httpmockserver.client.controller; +package com.eactive.testmaster.client.controller; -import com.eactive.httpmockserver.server.entity.Server; -import com.eactive.httpmockserver.server.entity.ServerRepository; +import com.eactive.testmaster.server.entity.Server; +import com.eactive.testmaster.server.entity.ServerRepository; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/com/eactive/httpmockserver/client/controller/ApiRequestMgmtController.java b/src/main/java/com/eactive/testmaster/client/controller/ApiRequestMgmtController.java similarity index 83% rename from src/main/java/com/eactive/httpmockserver/client/controller/ApiRequestMgmtController.java rename to src/main/java/com/eactive/testmaster/client/controller/ApiRequestMgmtController.java index 13c54a3..8127381 100644 --- a/src/main/java/com/eactive/httpmockserver/client/controller/ApiRequestMgmtController.java +++ b/src/main/java/com/eactive/testmaster/client/controller/ApiRequestMgmtController.java @@ -1,14 +1,14 @@ -package com.eactive.httpmockserver.client.controller; +package com.eactive.testmaster.client.controller; -import com.eactive.httpmockserver.client.dto.ApiCollectionDTO; -import com.eactive.httpmockserver.client.dto.ApiRequestDTO; -import com.eactive.httpmockserver.client.entity.ApiCollection; -import com.eactive.httpmockserver.client.entity.ApiRequestInfo; -import com.eactive.httpmockserver.client.mapper.ApiRequestMapper; -import com.eactive.httpmockserver.client.service.ApiRequestMgmtService; -import com.eactive.httpmockserver.common.util.SecurityUtil; -import com.eactive.httpmockserver.user.entity.StaffUser; -import com.eactive.httpmockserver.user.service.UserService; +import com.eactive.testmaster.client.dto.ApiCollectionDTO; +import com.eactive.testmaster.client.dto.ApiRequestDTO; +import com.eactive.testmaster.client.entity.ApiCollection; +import com.eactive.testmaster.client.entity.ApiRequestInfo; +import com.eactive.testmaster.client.mapper.ApiRequestMapper; +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 org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/eactive/httpmockserver/client/controller/ApiScenarioMgmtController.java b/src/main/java/com/eactive/testmaster/client/controller/ApiScenarioMgmtController.java similarity index 81% rename from src/main/java/com/eactive/httpmockserver/client/controller/ApiScenarioMgmtController.java rename to src/main/java/com/eactive/testmaster/client/controller/ApiScenarioMgmtController.java index 8951848..f3ca973 100644 --- a/src/main/java/com/eactive/httpmockserver/client/controller/ApiScenarioMgmtController.java +++ b/src/main/java/com/eactive/testmaster/client/controller/ApiScenarioMgmtController.java @@ -1,12 +1,12 @@ -package com.eactive.httpmockserver.client.controller; +package com.eactive.testmaster.client.controller; -import com.eactive.httpmockserver.client.dto.ApiScenarioDTO; -import com.eactive.httpmockserver.client.entity.ApiScenario; -import com.eactive.httpmockserver.client.mapper.ApiScenarioMapper; -import com.eactive.httpmockserver.client.service.ApiScenarioMgmtService; -import com.eactive.httpmockserver.common.util.SecurityUtil; -import com.eactive.httpmockserver.user.entity.StaffUser; -import com.eactive.httpmockserver.user.service.UserService; +import com.eactive.testmaster.client.dto.ApiScenarioDTO; +import com.eactive.testmaster.client.entity.ApiScenario; +import com.eactive.testmaster.client.mapper.ApiScenarioMapper; +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 org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/eactive/httpmockserver/client/dto/ApiCollectionDTO.java b/src/main/java/com/eactive/testmaster/client/dto/ApiCollectionDTO.java similarity index 93% rename from src/main/java/com/eactive/httpmockserver/client/dto/ApiCollectionDTO.java rename to src/main/java/com/eactive/testmaster/client/dto/ApiCollectionDTO.java index 39eea98..c0877c0 100644 --- a/src/main/java/com/eactive/httpmockserver/client/dto/ApiCollectionDTO.java +++ b/src/main/java/com/eactive/testmaster/client/dto/ApiCollectionDTO.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.client.dto; +package com.eactive.testmaster.client.dto; import javax.validation.constraints.NotEmpty; import java.util.ArrayList; diff --git a/src/main/java/com/eactive/httpmockserver/client/dto/ApiRequestDTO.java b/src/main/java/com/eactive/testmaster/client/dto/ApiRequestDTO.java similarity index 98% rename from src/main/java/com/eactive/httpmockserver/client/dto/ApiRequestDTO.java rename to src/main/java/com/eactive/testmaster/client/dto/ApiRequestDTO.java index 367687f..35a057a 100644 --- a/src/main/java/com/eactive/httpmockserver/client/dto/ApiRequestDTO.java +++ b/src/main/java/com/eactive/testmaster/client/dto/ApiRequestDTO.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.client.dto; +package com.eactive.testmaster.client.dto; import javax.validation.constraints.NotNull; import java.util.ArrayList; diff --git a/src/main/java/com/eactive/httpmockserver/client/dto/ApiRequestKeyValueDTO.java b/src/main/java/com/eactive/testmaster/client/dto/ApiRequestKeyValueDTO.java similarity index 92% rename from src/main/java/com/eactive/httpmockserver/client/dto/ApiRequestKeyValueDTO.java rename to src/main/java/com/eactive/testmaster/client/dto/ApiRequestKeyValueDTO.java index fe631c2..62f2bf5 100644 --- a/src/main/java/com/eactive/httpmockserver/client/dto/ApiRequestKeyValueDTO.java +++ b/src/main/java/com/eactive/testmaster/client/dto/ApiRequestKeyValueDTO.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.client.dto; +package com.eactive.testmaster.client.dto; public class ApiRequestKeyValueDTO { diff --git a/src/main/java/com/eactive/httpmockserver/client/dto/ApiResponse.java b/src/main/java/com/eactive/testmaster/client/dto/ApiResponse.java similarity index 94% rename from src/main/java/com/eactive/httpmockserver/client/dto/ApiResponse.java rename to src/main/java/com/eactive/testmaster/client/dto/ApiResponse.java index 459272a..e42069b 100644 --- a/src/main/java/com/eactive/httpmockserver/client/dto/ApiResponse.java +++ b/src/main/java/com/eactive/testmaster/client/dto/ApiResponse.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.client.dto; +package com.eactive.testmaster.client.dto; import java.util.List; diff --git a/src/main/java/com/eactive/httpmockserver/client/dto/ApiScenarioDTO.java b/src/main/java/com/eactive/testmaster/client/dto/ApiScenarioDTO.java similarity index 93% rename from src/main/java/com/eactive/httpmockserver/client/dto/ApiScenarioDTO.java rename to src/main/java/com/eactive/testmaster/client/dto/ApiScenarioDTO.java index fb30449..3a99d9b 100644 --- a/src/main/java/com/eactive/httpmockserver/client/dto/ApiScenarioDTO.java +++ b/src/main/java/com/eactive/testmaster/client/dto/ApiScenarioDTO.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.client.dto; +package com.eactive.testmaster.client.dto; public class ApiScenarioDTO { diff --git a/src/main/java/com/eactive/httpmockserver/client/entity/ApiCollection.java b/src/main/java/com/eactive/testmaster/client/entity/ApiCollection.java similarity index 91% rename from src/main/java/com/eactive/httpmockserver/client/entity/ApiCollection.java rename to src/main/java/com/eactive/testmaster/client/entity/ApiCollection.java index ea57421..1addd08 100644 --- a/src/main/java/com/eactive/httpmockserver/client/entity/ApiCollection.java +++ b/src/main/java/com/eactive/testmaster/client/entity/ApiCollection.java @@ -1,6 +1,6 @@ -package com.eactive.httpmockserver.client.entity; +package com.eactive.testmaster.client.entity; -import com.eactive.httpmockserver.user.entity.StaffUser; +import com.eactive.testmaster.user.entity.StaffUser; import javax.persistence.*; import java.util.ArrayList; diff --git a/src/main/java/com/eactive/httpmockserver/client/entity/ApiRequestHistory.java b/src/main/java/com/eactive/testmaster/client/entity/ApiRequestHistory.java similarity index 93% rename from src/main/java/com/eactive/httpmockserver/client/entity/ApiRequestHistory.java rename to src/main/java/com/eactive/testmaster/client/entity/ApiRequestHistory.java index c7509a4..102ede8 100644 --- a/src/main/java/com/eactive/httpmockserver/client/entity/ApiRequestHistory.java +++ b/src/main/java/com/eactive/testmaster/client/entity/ApiRequestHistory.java @@ -1,7 +1,7 @@ -package com.eactive.httpmockserver.client.entity; +package com.eactive.testmaster.client.entity; -import com.eactive.httpmockserver.server.entity.Server; -import com.eactive.httpmockserver.user.entity.StaffUser; +import com.eactive.testmaster.server.entity.Server; +import com.eactive.testmaster.user.entity.StaffUser; import org.hibernate.annotations.Type; import javax.persistence.*; diff --git a/src/main/java/com/eactive/httpmockserver/client/entity/ApiRequestInfo.java b/src/main/java/com/eactive/testmaster/client/entity/ApiRequestInfo.java similarity index 94% rename from src/main/java/com/eactive/httpmockserver/client/entity/ApiRequestInfo.java rename to src/main/java/com/eactive/testmaster/client/entity/ApiRequestInfo.java index 1e2339a..9330589 100644 --- a/src/main/java/com/eactive/httpmockserver/client/entity/ApiRequestInfo.java +++ b/src/main/java/com/eactive/testmaster/client/entity/ApiRequestInfo.java @@ -1,7 +1,7 @@ -package com.eactive.httpmockserver.client.entity; +package com.eactive.testmaster.client.entity; -import com.eactive.httpmockserver.server.entity.Server; -import com.eactive.httpmockserver.user.entity.StaffUser; +import com.eactive.testmaster.server.entity.Server; +import com.eactive.testmaster.user.entity.StaffUser; import javax.persistence.*; import java.util.Objects; diff --git a/src/main/java/com/eactive/httpmockserver/client/entity/ApiScenario.java b/src/main/java/com/eactive/testmaster/client/entity/ApiScenario.java similarity index 90% rename from src/main/java/com/eactive/httpmockserver/client/entity/ApiScenario.java rename to src/main/java/com/eactive/testmaster/client/entity/ApiScenario.java index 17b95f9..db56832 100644 --- a/src/main/java/com/eactive/httpmockserver/client/entity/ApiScenario.java +++ b/src/main/java/com/eactive/testmaster/client/entity/ApiScenario.java @@ -1,6 +1,6 @@ -package com.eactive.httpmockserver.client.entity; +package com.eactive.testmaster.client.entity; -import com.eactive.httpmockserver.user.entity.StaffUser; +import com.eactive.testmaster.user.entity.StaffUser; import javax.persistence.*; diff --git a/src/main/java/com/eactive/httpmockserver/client/mapper/ApiRequestMapper.java b/src/main/java/com/eactive/testmaster/client/mapper/ApiRequestMapper.java similarity index 58% rename from src/main/java/com/eactive/httpmockserver/client/mapper/ApiRequestMapper.java rename to src/main/java/com/eactive/testmaster/client/mapper/ApiRequestMapper.java index e6ac981..7961990 100644 --- a/src/main/java/com/eactive/httpmockserver/client/mapper/ApiRequestMapper.java +++ b/src/main/java/com/eactive/testmaster/client/mapper/ApiRequestMapper.java @@ -1,11 +1,11 @@ -package com.eactive.httpmockserver.client.mapper; +package com.eactive.testmaster.client.mapper; -import com.eactive.httpmockserver.client.dto.ApiCollectionDTO; -import com.eactive.httpmockserver.client.dto.ApiRequestDTO; -import com.eactive.httpmockserver.client.entity.ApiCollection; -import com.eactive.httpmockserver.client.entity.ApiRequestInfo; -import com.eactive.httpmockserver.common.mapper.CommonMapper; -import com.eactive.httpmockserver.server.mapper.ServerMapper; +import com.eactive.testmaster.client.dto.ApiCollectionDTO; +import com.eactive.testmaster.client.dto.ApiRequestDTO; +import com.eactive.testmaster.client.entity.ApiCollection; +import com.eactive.testmaster.client.entity.ApiRequestInfo; +import com.eactive.testmaster.common.mapper.CommonMapper; +import com.eactive.testmaster.server.mapper.ServerMapper; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/eactive/httpmockserver/client/mapper/ApiScenarioMapper.java b/src/main/java/com/eactive/testmaster/client/mapper/ApiScenarioMapper.java similarity index 71% rename from src/main/java/com/eactive/httpmockserver/client/mapper/ApiScenarioMapper.java rename to src/main/java/com/eactive/testmaster/client/mapper/ApiScenarioMapper.java index 377de1d..7e9f38d 100644 --- a/src/main/java/com/eactive/httpmockserver/client/mapper/ApiScenarioMapper.java +++ b/src/main/java/com/eactive/testmaster/client/mapper/ApiScenarioMapper.java @@ -1,7 +1,7 @@ -package com.eactive.httpmockserver.client.mapper; +package com.eactive.testmaster.client.mapper; -import com.eactive.httpmockserver.client.dto.ApiScenarioDTO; -import com.eactive.httpmockserver.client.entity.ApiScenario; +import com.eactive.testmaster.client.dto.ApiScenarioDTO; +import com.eactive.testmaster.client.entity.ApiScenario; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/eactive/httpmockserver/client/repository/ApiCollectionRepository.java b/src/main/java/com/eactive/testmaster/client/repository/ApiCollectionRepository.java similarity index 66% rename from src/main/java/com/eactive/httpmockserver/client/repository/ApiCollectionRepository.java rename to src/main/java/com/eactive/testmaster/client/repository/ApiCollectionRepository.java index b3319eb..cc7c81b 100644 --- a/src/main/java/com/eactive/httpmockserver/client/repository/ApiCollectionRepository.java +++ b/src/main/java/com/eactive/testmaster/client/repository/ApiCollectionRepository.java @@ -1,7 +1,7 @@ -package com.eactive.httpmockserver.client.repository; +package com.eactive.testmaster.client.repository; -import com.eactive.httpmockserver.client.entity.ApiCollection; -import com.eactive.httpmockserver.user.entity.StaffUser; +import com.eactive.testmaster.client.entity.ApiCollection; +import com.eactive.testmaster.user.entity.StaffUser; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; diff --git a/src/main/java/com/eactive/httpmockserver/client/repository/ApiRequestRepository.java b/src/main/java/com/eactive/testmaster/client/repository/ApiRequestRepository.java similarity index 69% rename from src/main/java/com/eactive/httpmockserver/client/repository/ApiRequestRepository.java rename to src/main/java/com/eactive/testmaster/client/repository/ApiRequestRepository.java index 4dd8525..ba305f9 100644 --- a/src/main/java/com/eactive/httpmockserver/client/repository/ApiRequestRepository.java +++ b/src/main/java/com/eactive/testmaster/client/repository/ApiRequestRepository.java @@ -1,6 +1,6 @@ -package com.eactive.httpmockserver.client.repository; +package com.eactive.testmaster.client.repository; -import com.eactive.httpmockserver.client.entity.ApiRequestInfo; +import com.eactive.testmaster.client.entity.ApiRequestInfo; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; diff --git a/src/main/java/com/eactive/httpmockserver/client/repository/ApiScenarioRepository.java b/src/main/java/com/eactive/testmaster/client/repository/ApiScenarioRepository.java similarity index 66% rename from src/main/java/com/eactive/httpmockserver/client/repository/ApiScenarioRepository.java rename to src/main/java/com/eactive/testmaster/client/repository/ApiScenarioRepository.java index b2816a0..63cfc6f 100644 --- a/src/main/java/com/eactive/httpmockserver/client/repository/ApiScenarioRepository.java +++ b/src/main/java/com/eactive/testmaster/client/repository/ApiScenarioRepository.java @@ -1,7 +1,7 @@ -package com.eactive.httpmockserver.client.repository; +package com.eactive.testmaster.client.repository; -import com.eactive.httpmockserver.client.entity.ApiScenario; -import com.eactive.httpmockserver.user.entity.StaffUser; +import com.eactive.testmaster.client.entity.ApiScenario; +import com.eactive.testmaster.user.entity.StaffUser; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; diff --git a/src/main/java/com/eactive/httpmockserver/client/service/ApiRequestMgmtService.java b/src/main/java/com/eactive/testmaster/client/service/ApiRequestMgmtService.java similarity index 88% rename from src/main/java/com/eactive/httpmockserver/client/service/ApiRequestMgmtService.java rename to src/main/java/com/eactive/testmaster/client/service/ApiRequestMgmtService.java index 10e7d49..1d23b0a 100644 --- a/src/main/java/com/eactive/httpmockserver/client/service/ApiRequestMgmtService.java +++ b/src/main/java/com/eactive/testmaster/client/service/ApiRequestMgmtService.java @@ -1,11 +1,11 @@ -package com.eactive.httpmockserver.client.service; +package com.eactive.testmaster.client.service; -import com.eactive.httpmockserver.client.entity.ApiCollection; -import com.eactive.httpmockserver.client.entity.ApiRequestInfo; -import com.eactive.httpmockserver.client.repository.ApiCollectionRepository; -import com.eactive.httpmockserver.client.repository.ApiRequestRepository; -import com.eactive.httpmockserver.common.exception.NotFoundException; -import com.eactive.httpmockserver.user.entity.StaffUser; +import com.eactive.testmaster.client.entity.ApiCollection; +import com.eactive.testmaster.client.entity.ApiRequestInfo; +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 org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.thymeleaf.util.StringUtils; diff --git a/src/main/java/com/eactive/httpmockserver/client/service/ApiRequestMigrationService.java b/src/main/java/com/eactive/testmaster/client/service/ApiRequestMigrationService.java similarity index 94% rename from src/main/java/com/eactive/httpmockserver/client/service/ApiRequestMigrationService.java rename to src/main/java/com/eactive/testmaster/client/service/ApiRequestMigrationService.java index 5d414be..294d2d4 100644 --- a/src/main/java/com/eactive/httpmockserver/client/service/ApiRequestMigrationService.java +++ b/src/main/java/com/eactive/testmaster/client/service/ApiRequestMigrationService.java @@ -1,6 +1,6 @@ -package com.eactive.httpmockserver.client.service; +package com.eactive.testmaster.client.service; -import com.eactive.httpmockserver.client.repository.ApiRequestRepository; +import com.eactive.testmaster.client.repository.ApiRequestRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.context.ApplicationContext; diff --git a/src/main/java/com/eactive/httpmockserver/client/service/ApiScenarioMgmtService.java b/src/main/java/com/eactive/testmaster/client/service/ApiScenarioMgmtService.java similarity index 88% rename from src/main/java/com/eactive/httpmockserver/client/service/ApiScenarioMgmtService.java rename to src/main/java/com/eactive/testmaster/client/service/ApiScenarioMgmtService.java index d09675d..5dba37e 100644 --- a/src/main/java/com/eactive/httpmockserver/client/service/ApiScenarioMgmtService.java +++ b/src/main/java/com/eactive/testmaster/client/service/ApiScenarioMgmtService.java @@ -1,7 +1,7 @@ -package com.eactive.httpmockserver.client.service; +package com.eactive.testmaster.client.service; -import com.eactive.httpmockserver.client.entity.ApiScenario; -import com.eactive.httpmockserver.client.repository.ApiScenarioRepository; +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; diff --git a/src/main/java/com/eactive/httpmockserver/client/service/HttpHandler.java b/src/main/java/com/eactive/testmaster/client/service/HttpHandler.java similarity index 92% rename from src/main/java/com/eactive/httpmockserver/client/service/HttpHandler.java rename to src/main/java/com/eactive/testmaster/client/service/HttpHandler.java index 36f08c5..77bd34a 100644 --- a/src/main/java/com/eactive/httpmockserver/client/service/HttpHandler.java +++ b/src/main/java/com/eactive/testmaster/client/service/HttpHandler.java @@ -1,7 +1,7 @@ -package com.eactive.httpmockserver.client.service; +package com.eactive.testmaster.client.service; -import com.eactive.httpmockserver.client.dto.ApiRequestKeyValueDTO; -import com.eactive.httpmockserver.client.dto.ApiResponse; +import com.eactive.testmaster.client.dto.ApiRequestKeyValueDTO; +import com.eactive.testmaster.client.dto.ApiResponse; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; import io.netty.handler.codec.http.FullHttpResponse; diff --git a/src/main/java/com/eactive/httpmockserver/client/service/NettyApiClient.java b/src/main/java/com/eactive/testmaster/client/service/NettyApiClient.java similarity index 90% rename from src/main/java/com/eactive/httpmockserver/client/service/NettyApiClient.java rename to src/main/java/com/eactive/testmaster/client/service/NettyApiClient.java index 4216440..a78c8a8 100644 --- a/src/main/java/com/eactive/httpmockserver/client/service/NettyApiClient.java +++ b/src/main/java/com/eactive/testmaster/client/service/NettyApiClient.java @@ -1,11 +1,11 @@ -package com.eactive.httpmockserver.client.service; +package com.eactive.testmaster.client.service; -import com.eactive.httpmockserver.client.dto.ApiRequestDTO; -import com.eactive.httpmockserver.client.dto.ApiRequestKeyValueDTO; -import com.eactive.httpmockserver.client.dto.ApiResponse; -import com.eactive.httpmockserver.common.exception.ServerNotFoundException; -import com.eactive.httpmockserver.server.entity.Server; -import com.eactive.httpmockserver.server.entity.ServerRepository; +import com.eactive.testmaster.client.dto.ApiRequestDTO; +import com.eactive.testmaster.client.dto.ApiRequestKeyValueDTO; +import com.eactive.testmaster.client.dto.ApiResponse; +import com.eactive.testmaster.common.exception.ServerNotFoundException; +import com.eactive.testmaster.server.entity.Server; +import com.eactive.testmaster.server.entity.ServerRepository; import io.netty.bootstrap.Bootstrap; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -25,7 +25,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.net.ssl.SSLException; -import java.lang.reflect.InvocationTargetException; import java.util.concurrent.CompletableFuture; @Service diff --git a/src/main/java/com/eactive/httpmockserver/common/entity/Auditable.java b/src/main/java/com/eactive/testmaster/common/entity/Auditable.java similarity index 97% rename from src/main/java/com/eactive/httpmockserver/common/entity/Auditable.java rename to src/main/java/com/eactive/testmaster/common/entity/Auditable.java index 23e1165..c29111e 100644 --- a/src/main/java/com/eactive/httpmockserver/common/entity/Auditable.java +++ b/src/main/java/com/eactive/testmaster/common/entity/Auditable.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.common.entity; +package com.eactive.testmaster.common.entity; import org.hibernate.annotations.Type; import org.springframework.data.annotation.CreatedBy; diff --git a/src/main/java/com/eactive/httpmockserver/common/entity/EnabledStatus.java b/src/main/java/com/eactive/testmaster/common/entity/EnabledStatus.java similarity index 79% rename from src/main/java/com/eactive/httpmockserver/common/entity/EnabledStatus.java rename to src/main/java/com/eactive/testmaster/common/entity/EnabledStatus.java index f3769d4..86fb155 100644 --- a/src/main/java/com/eactive/httpmockserver/common/entity/EnabledStatus.java +++ b/src/main/java/com/eactive/testmaster/common/entity/EnabledStatus.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.common.entity; +package com.eactive.testmaster.common.entity; public enum EnabledStatus { Y("사용"), diff --git a/src/main/java/com/eactive/httpmockserver/common/exception/CustomErrorResponse.java b/src/main/java/com/eactive/testmaster/common/exception/CustomErrorResponse.java similarity index 91% rename from src/main/java/com/eactive/httpmockserver/common/exception/CustomErrorResponse.java rename to src/main/java/com/eactive/testmaster/common/exception/CustomErrorResponse.java index 0fd3c3c..74513d2 100644 --- a/src/main/java/com/eactive/httpmockserver/common/exception/CustomErrorResponse.java +++ b/src/main/java/com/eactive/testmaster/common/exception/CustomErrorResponse.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.common.exception; +package com.eactive.testmaster.common.exception; import java.time.LocalDateTime; diff --git a/src/main/java/com/eactive/httpmockserver/common/exception/CustomGlobalExceptionHandler.java b/src/main/java/com/eactive/testmaster/common/exception/CustomGlobalExceptionHandler.java similarity index 97% rename from src/main/java/com/eactive/httpmockserver/common/exception/CustomGlobalExceptionHandler.java rename to src/main/java/com/eactive/testmaster/common/exception/CustomGlobalExceptionHandler.java index 204cbac..99ad2ef 100644 --- a/src/main/java/com/eactive/httpmockserver/common/exception/CustomGlobalExceptionHandler.java +++ b/src/main/java/com/eactive/testmaster/common/exception/CustomGlobalExceptionHandler.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.common.exception; +package com.eactive.testmaster.common.exception; import org.springframework.core.annotation.Order; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/eactive/httpmockserver/common/exception/NotFoundException.java b/src/main/java/com/eactive/testmaster/common/exception/NotFoundException.java similarity index 73% rename from src/main/java/com/eactive/httpmockserver/common/exception/NotFoundException.java rename to src/main/java/com/eactive/testmaster/common/exception/NotFoundException.java index 595cbe7..b7c6a39 100644 --- a/src/main/java/com/eactive/httpmockserver/common/exception/NotFoundException.java +++ b/src/main/java/com/eactive/testmaster/common/exception/NotFoundException.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.common.exception; +package com.eactive.testmaster.common.exception; public class NotFoundException extends IllegalArgumentException { public NotFoundException(String message) { diff --git a/src/main/java/com/eactive/httpmockserver/common/exception/PortalErrorController.java b/src/main/java/com/eactive/testmaster/common/exception/PortalErrorController.java similarity index 95% rename from src/main/java/com/eactive/httpmockserver/common/exception/PortalErrorController.java rename to src/main/java/com/eactive/testmaster/common/exception/PortalErrorController.java index e69ff24..9ca8dcd 100644 --- a/src/main/java/com/eactive/httpmockserver/common/exception/PortalErrorController.java +++ b/src/main/java/com/eactive/testmaster/common/exception/PortalErrorController.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.common.exception; +package com.eactive.testmaster.common.exception; import org.springframework.boot.web.servlet.error.ErrorController; import org.springframework.stereotype.Controller; diff --git a/src/main/java/com/eactive/httpmockserver/common/exception/PortalGlobalExceptionHandler.java b/src/main/java/com/eactive/testmaster/common/exception/PortalGlobalExceptionHandler.java similarity index 95% rename from src/main/java/com/eactive/httpmockserver/common/exception/PortalGlobalExceptionHandler.java rename to src/main/java/com/eactive/testmaster/common/exception/PortalGlobalExceptionHandler.java index 68e1c2e..de795d4 100644 --- a/src/main/java/com/eactive/httpmockserver/common/exception/PortalGlobalExceptionHandler.java +++ b/src/main/java/com/eactive/testmaster/common/exception/PortalGlobalExceptionHandler.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.common.exception; +package com.eactive.testmaster.common.exception; import org.slf4j.Logger; diff --git a/src/main/java/com/eactive/httpmockserver/common/exception/ServerNotFoundException.java b/src/main/java/com/eactive/testmaster/common/exception/ServerNotFoundException.java similarity index 74% rename from src/main/java/com/eactive/httpmockserver/common/exception/ServerNotFoundException.java rename to src/main/java/com/eactive/testmaster/common/exception/ServerNotFoundException.java index 7d959ae..be3e548 100644 --- a/src/main/java/com/eactive/httpmockserver/common/exception/ServerNotFoundException.java +++ b/src/main/java/com/eactive/testmaster/common/exception/ServerNotFoundException.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.common.exception; +package com.eactive.testmaster.common.exception; public class ServerNotFoundException extends RuntimeException { public ServerNotFoundException(String message) { diff --git a/src/main/java/com/eactive/httpmockserver/common/exception/UserNotFoundException.java b/src/main/java/com/eactive/testmaster/common/exception/UserNotFoundException.java similarity index 73% rename from src/main/java/com/eactive/httpmockserver/common/exception/UserNotFoundException.java rename to src/main/java/com/eactive/testmaster/common/exception/UserNotFoundException.java index 042ae78..8e9f831 100644 --- a/src/main/java/com/eactive/httpmockserver/common/exception/UserNotFoundException.java +++ b/src/main/java/com/eactive/testmaster/common/exception/UserNotFoundException.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.common.exception; +package com.eactive.testmaster.common.exception; public class UserNotFoundException extends RuntimeException { public UserNotFoundException(String message) { diff --git a/src/main/java/com/eactive/httpmockserver/common/exception/UserNotLoginException.java b/src/main/java/com/eactive/testmaster/common/exception/UserNotLoginException.java similarity index 72% rename from src/main/java/com/eactive/httpmockserver/common/exception/UserNotLoginException.java rename to src/main/java/com/eactive/testmaster/common/exception/UserNotLoginException.java index 7eea9ed..118768f 100644 --- a/src/main/java/com/eactive/httpmockserver/common/exception/UserNotLoginException.java +++ b/src/main/java/com/eactive/testmaster/common/exception/UserNotLoginException.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.common.exception; +package com.eactive.testmaster.common.exception; public class UserNotLoginException extends RuntimeException { diff --git a/src/main/java/com/eactive/httpmockserver/common/exception/UserPasswordResetException.java b/src/main/java/com/eactive/testmaster/common/exception/UserPasswordResetException.java similarity index 74% rename from src/main/java/com/eactive/httpmockserver/common/exception/UserPasswordResetException.java rename to src/main/java/com/eactive/testmaster/common/exception/UserPasswordResetException.java index 6657df3..7cd3ea7 100644 --- a/src/main/java/com/eactive/httpmockserver/common/exception/UserPasswordResetException.java +++ b/src/main/java/com/eactive/testmaster/common/exception/UserPasswordResetException.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.common.exception; +package com.eactive.testmaster.common.exception; public class UserPasswordResetException extends RuntimeException { public UserPasswordResetException(String message) { diff --git a/src/main/java/com/eactive/httpmockserver/common/interceptor/AuthenticInterceptor.java b/src/main/java/com/eactive/testmaster/common/interceptor/AuthenticInterceptor.java similarity index 86% rename from src/main/java/com/eactive/httpmockserver/common/interceptor/AuthenticInterceptor.java rename to src/main/java/com/eactive/testmaster/common/interceptor/AuthenticInterceptor.java index 6d811d2..2c4bdff 100644 --- a/src/main/java/com/eactive/httpmockserver/common/interceptor/AuthenticInterceptor.java +++ b/src/main/java/com/eactive/testmaster/common/interceptor/AuthenticInterceptor.java @@ -1,10 +1,10 @@ -package com.eactive.httpmockserver.common.interceptor; +package com.eactive.testmaster.common.interceptor; -import com.eactive.httpmockserver.common.exception.UserNotLoginException; -import com.eactive.httpmockserver.common.util.SecurityUtil; -import com.eactive.httpmockserver.user.entity.AnonymousUser; -import com.eactive.httpmockserver.user.entity.User; +import com.eactive.testmaster.common.exception.UserNotLoginException; +import com.eactive.testmaster.common.util.SecurityUtil; +import com.eactive.testmaster.user.entity.AnonymousUser; +import com.eactive.testmaster.user.entity.User; import org.springframework.util.AntPathMatcher; import org.springframework.web.servlet.AsyncHandlerInterceptor; diff --git a/src/main/java/com/eactive/httpmockserver/common/mapper/CommonMapper.java b/src/main/java/com/eactive/testmaster/common/mapper/CommonMapper.java similarity index 95% rename from src/main/java/com/eactive/httpmockserver/common/mapper/CommonMapper.java rename to src/main/java/com/eactive/testmaster/common/mapper/CommonMapper.java index 13f5505..da8b8c9 100644 --- a/src/main/java/com/eactive/httpmockserver/common/mapper/CommonMapper.java +++ b/src/main/java/com/eactive/testmaster/common/mapper/CommonMapper.java @@ -1,6 +1,6 @@ -package com.eactive.httpmockserver.common.mapper; +package com.eactive.testmaster.common.mapper; -import com.eactive.httpmockserver.client.dto.ApiRequestKeyValueDTO; +import com.eactive.testmaster.client.dto.ApiRequestKeyValueDTO; import org.mapstruct.Mapper; import org.mapstruct.Named; import org.mapstruct.ReportingPolicy; diff --git a/src/main/java/com/eactive/httpmockserver/common/message/PortalReloadableResourceBundleMessageSource.java b/src/main/java/com/eactive/testmaster/common/message/PortalReloadableResourceBundleMessageSource.java similarity index 97% rename from src/main/java/com/eactive/httpmockserver/common/message/PortalReloadableResourceBundleMessageSource.java rename to src/main/java/com/eactive/testmaster/common/message/PortalReloadableResourceBundleMessageSource.java index 98bbe67..7faeae5 100644 --- a/src/main/java/com/eactive/httpmockserver/common/message/PortalReloadableResourceBundleMessageSource.java +++ b/src/main/java/com/eactive/testmaster/common/message/PortalReloadableResourceBundleMessageSource.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.common.message; +package com.eactive.testmaster.common.message; import org.apache.commons.lang3.StringUtils; import org.springframework.core.io.Resource; diff --git a/src/main/java/com/eactive/httpmockserver/common/search/BaseSearch.java b/src/main/java/com/eactive/testmaster/common/search/BaseSearch.java similarity index 98% rename from src/main/java/com/eactive/httpmockserver/common/search/BaseSearch.java rename to src/main/java/com/eactive/testmaster/common/search/BaseSearch.java index 4e08a09..fd3da81 100644 --- a/src/main/java/com/eactive/httpmockserver/common/search/BaseSearch.java +++ b/src/main/java/com/eactive/testmaster/common/search/BaseSearch.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.common.search; +package com.eactive.testmaster.common.search; import org.springframework.data.jpa.domain.Specification; diff --git a/src/main/java/com/eactive/httpmockserver/common/search/ColumnSearchModel.java b/src/main/java/com/eactive/testmaster/common/search/ColumnSearchModel.java similarity index 93% rename from src/main/java/com/eactive/httpmockserver/common/search/ColumnSearchModel.java rename to src/main/java/com/eactive/testmaster/common/search/ColumnSearchModel.java index 9d3498d..1e18ca6 100644 --- a/src/main/java/com/eactive/httpmockserver/common/search/ColumnSearchModel.java +++ b/src/main/java/com/eactive/testmaster/common/search/ColumnSearchModel.java @@ -1,6 +1,6 @@ -package com.eactive.httpmockserver.common.search; +package com.eactive.testmaster.common.search; -import com.eactive.httpmockserver.common.util.SpecificationUtil; +import com.eactive.testmaster.common.util.SpecificationUtil; import org.springframework.data.jpa.domain.Specification; import org.springframework.util.ObjectUtils; diff --git a/src/main/java/com/eactive/httpmockserver/common/search/SearchCondition.java b/src/main/java/com/eactive/testmaster/common/search/SearchCondition.java similarity index 60% rename from src/main/java/com/eactive/httpmockserver/common/search/SearchCondition.java rename to src/main/java/com/eactive/testmaster/common/search/SearchCondition.java index 35b171b..f92a760 100644 --- a/src/main/java/com/eactive/httpmockserver/common/search/SearchCondition.java +++ b/src/main/java/com/eactive/testmaster/common/search/SearchCondition.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.common.search; +package com.eactive.testmaster.common.search; public enum SearchCondition { EQUAL, diff --git a/src/main/java/com/eactive/httpmockserver/common/search/SearchModel.java b/src/main/java/com/eactive/testmaster/common/search/SearchModel.java similarity index 78% rename from src/main/java/com/eactive/httpmockserver/common/search/SearchModel.java rename to src/main/java/com/eactive/testmaster/common/search/SearchModel.java index b0bc1a5..86ad86d 100644 --- a/src/main/java/com/eactive/httpmockserver/common/search/SearchModel.java +++ b/src/main/java/com/eactive/testmaster/common/search/SearchModel.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.common.search; +package com.eactive.testmaster.common.search; import org.springframework.data.jpa.domain.Specification; diff --git a/src/main/java/com/eactive/httpmockserver/common/search/SpecificationSearchModel.java b/src/main/java/com/eactive/testmaster/common/search/SpecificationSearchModel.java similarity index 88% rename from src/main/java/com/eactive/httpmockserver/common/search/SpecificationSearchModel.java rename to src/main/java/com/eactive/testmaster/common/search/SpecificationSearchModel.java index a2a351a..9d5ceb6 100644 --- a/src/main/java/com/eactive/httpmockserver/common/search/SpecificationSearchModel.java +++ b/src/main/java/com/eactive/testmaster/common/search/SpecificationSearchModel.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.common.search; +package com.eactive.testmaster.common.search; import org.springframework.data.jpa.domain.Specification; diff --git a/src/main/java/com/eactive/httpmockserver/common/util/ApplicationContextUtil.java b/src/main/java/com/eactive/testmaster/common/util/ApplicationContextUtil.java similarity index 94% rename from src/main/java/com/eactive/httpmockserver/common/util/ApplicationContextUtil.java rename to src/main/java/com/eactive/testmaster/common/util/ApplicationContextUtil.java index a1dfc31..92cf7cd 100644 --- a/src/main/java/com/eactive/httpmockserver/common/util/ApplicationContextUtil.java +++ b/src/main/java/com/eactive/testmaster/common/util/ApplicationContextUtil.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.common.util; +package com.eactive.testmaster.common.util; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; diff --git a/src/main/java/com/eactive/httpmockserver/common/util/EncryptionUtil.java b/src/main/java/com/eactive/testmaster/common/util/EncryptionUtil.java similarity index 97% rename from src/main/java/com/eactive/httpmockserver/common/util/EncryptionUtil.java rename to src/main/java/com/eactive/testmaster/common/util/EncryptionUtil.java index 79b21a3..c9896fc 100644 --- a/src/main/java/com/eactive/httpmockserver/common/util/EncryptionUtil.java +++ b/src/main/java/com/eactive/testmaster/common/util/EncryptionUtil.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.common.util; +package com.eactive.testmaster.common.util; import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/eactive/httpmockserver/common/util/RandomUtil.java b/src/main/java/com/eactive/testmaster/common/util/RandomUtil.java similarity index 97% rename from src/main/java/com/eactive/httpmockserver/common/util/RandomUtil.java rename to src/main/java/com/eactive/testmaster/common/util/RandomUtil.java index 428c7d3..6f79c7d 100644 --- a/src/main/java/com/eactive/httpmockserver/common/util/RandomUtil.java +++ b/src/main/java/com/eactive/testmaster/common/util/RandomUtil.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.common.util; +package com.eactive.testmaster.common.util; import java.security.SecureRandom; diff --git a/src/main/java/com/eactive/httpmockserver/common/util/SecurityUtil.java b/src/main/java/com/eactive/testmaster/common/util/SecurityUtil.java similarity index 86% rename from src/main/java/com/eactive/httpmockserver/common/util/SecurityUtil.java rename to src/main/java/com/eactive/testmaster/common/util/SecurityUtil.java index 7672924..348a0e4 100644 --- a/src/main/java/com/eactive/httpmockserver/common/util/SecurityUtil.java +++ b/src/main/java/com/eactive/testmaster/common/util/SecurityUtil.java @@ -1,7 +1,7 @@ -package com.eactive.httpmockserver.common.util; +package com.eactive.testmaster.common.util; -import com.eactive.httpmockserver.user.entity.AnonymousUser; -import com.eactive.httpmockserver.user.entity.User; +import com.eactive.testmaster.user.entity.AnonymousUser; +import com.eactive.testmaster.user.entity.User; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/src/main/java/com/eactive/httpmockserver/common/util/SpecificationUtil.java b/src/main/java/com/eactive/testmaster/common/util/SpecificationUtil.java similarity index 98% rename from src/main/java/com/eactive/httpmockserver/common/util/SpecificationUtil.java rename to src/main/java/com/eactive/testmaster/common/util/SpecificationUtil.java index 759ec8b..eceac2a 100644 --- a/src/main/java/com/eactive/httpmockserver/common/util/SpecificationUtil.java +++ b/src/main/java/com/eactive/testmaster/common/util/SpecificationUtil.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.common.util; +package com.eactive.testmaster.common.util; import org.hibernate.query.criteria.internal.path.PluralAttributePath; import org.springframework.data.jpa.domain.Specification; diff --git a/src/main/java/com/eactive/httpmockserver/common/validator/PasswordMatch.java b/src/main/java/com/eactive/testmaster/common/validator/PasswordMatch.java similarity index 89% rename from src/main/java/com/eactive/httpmockserver/common/validator/PasswordMatch.java rename to src/main/java/com/eactive/testmaster/common/validator/PasswordMatch.java index 9caf12d..2648d28 100644 --- a/src/main/java/com/eactive/httpmockserver/common/validator/PasswordMatch.java +++ b/src/main/java/com/eactive/testmaster/common/validator/PasswordMatch.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.common.validator; +package com.eactive.testmaster.common.validator; import javax.validation.Constraint; import javax.validation.Payload; @@ -18,4 +18,4 @@ public @interface PasswordMatch { String input(); String confirm(); -} \ No newline at end of file +} diff --git a/src/main/java/com/eactive/httpmockserver/common/validator/PasswordMatchValidator.java b/src/main/java/com/eactive/testmaster/common/validator/PasswordMatchValidator.java similarity index 93% rename from src/main/java/com/eactive/httpmockserver/common/validator/PasswordMatchValidator.java rename to src/main/java/com/eactive/testmaster/common/validator/PasswordMatchValidator.java index 516065d..5e92349 100644 --- a/src/main/java/com/eactive/httpmockserver/common/validator/PasswordMatchValidator.java +++ b/src/main/java/com/eactive/testmaster/common/validator/PasswordMatchValidator.java @@ -1,6 +1,6 @@ -package com.eactive.httpmockserver.common.validator; +package com.eactive.testmaster.common.validator; -import com.eactive.httpmockserver.common.util.ApplicationContextUtil; +import com.eactive.testmaster.common.util.ApplicationContextUtil; import org.apache.commons.beanutils.PropertyUtils; import org.springframework.context.MessageSource; import org.springframework.context.i18n.LocaleContextHolder; diff --git a/src/main/java/com/eactive/httpmockserver/common/validator/UniqueId.java b/src/main/java/com/eactive/testmaster/common/validator/UniqueId.java similarity index 88% rename from src/main/java/com/eactive/httpmockserver/common/validator/UniqueId.java rename to src/main/java/com/eactive/testmaster/common/validator/UniqueId.java index 9d7d5e0..79f875e 100644 --- a/src/main/java/com/eactive/httpmockserver/common/validator/UniqueId.java +++ b/src/main/java/com/eactive/testmaster/common/validator/UniqueId.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.common.validator; +package com.eactive.testmaster.common.validator; import javax.validation.Constraint; import javax.validation.Payload; diff --git a/src/main/java/com/eactive/httpmockserver/common/validator/UniqueRoute.java b/src/main/java/com/eactive/testmaster/common/validator/UniqueRoute.java similarity index 89% rename from src/main/java/com/eactive/httpmockserver/common/validator/UniqueRoute.java rename to src/main/java/com/eactive/testmaster/common/validator/UniqueRoute.java index 0ef55a2..a0283de 100644 --- a/src/main/java/com/eactive/httpmockserver/common/validator/UniqueRoute.java +++ b/src/main/java/com/eactive/testmaster/common/validator/UniqueRoute.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.common.validator; +package com.eactive.testmaster.common.validator; import javax.validation.Constraint; import javax.validation.Payload; diff --git a/src/main/java/com/eactive/httpmockserver/common/validator/UniqueRouteValidator.java b/src/main/java/com/eactive/testmaster/common/validator/UniqueRouteValidator.java similarity index 77% rename from src/main/java/com/eactive/httpmockserver/common/validator/UniqueRouteValidator.java rename to src/main/java/com/eactive/testmaster/common/validator/UniqueRouteValidator.java index 4fb8215..b8ac8fb 100644 --- a/src/main/java/com/eactive/httpmockserver/common/validator/UniqueRouteValidator.java +++ b/src/main/java/com/eactive/testmaster/common/validator/UniqueRouteValidator.java @@ -1,12 +1,8 @@ -package com.eactive.httpmockserver.common.validator; +package com.eactive.testmaster.common.validator; -import com.eactive.httpmockserver.api.repository.MockRouteRepository; -import com.eactive.httpmockserver.common.exception.UserNotFoundException; -import com.eactive.httpmockserver.common.util.ApplicationContextUtil; -import com.eactive.httpmockserver.user.service.UserService; +import com.eactive.testmaster.api.repository.MockRouteRepository; +import com.eactive.testmaster.common.util.ApplicationContextUtil; 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; diff --git a/src/main/java/com/eactive/httpmockserver/common/validator/UniqueUserIdValidator.java b/src/main/java/com/eactive/testmaster/common/validator/UniqueUserIdValidator.java similarity index 68% rename from src/main/java/com/eactive/httpmockserver/common/validator/UniqueUserIdValidator.java rename to src/main/java/com/eactive/testmaster/common/validator/UniqueUserIdValidator.java index 176fc07..c76718d 100644 --- a/src/main/java/com/eactive/httpmockserver/common/validator/UniqueUserIdValidator.java +++ b/src/main/java/com/eactive/testmaster/common/validator/UniqueUserIdValidator.java @@ -1,8 +1,8 @@ -package com.eactive.httpmockserver.common.validator; +package com.eactive.testmaster.common.validator; -import com.eactive.httpmockserver.common.exception.UserNotFoundException; -import com.eactive.httpmockserver.common.util.ApplicationContextUtil; -import com.eactive.httpmockserver.user.service.UserService; +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/httpmockserver/config/AuditorAwareImpl.java b/src/main/java/com/eactive/testmaster/config/AuditorAwareImpl.java similarity index 73% rename from src/main/java/com/eactive/httpmockserver/config/AuditorAwareImpl.java rename to src/main/java/com/eactive/testmaster/config/AuditorAwareImpl.java index 3a51290..b44b317 100644 --- a/src/main/java/com/eactive/httpmockserver/config/AuditorAwareImpl.java +++ b/src/main/java/com/eactive/testmaster/config/AuditorAwareImpl.java @@ -1,6 +1,6 @@ -package com.eactive.httpmockserver.config; +package com.eactive.testmaster.config; -import com.eactive.httpmockserver.common.util.SecurityUtil; +import com.eactive.testmaster.common.util.SecurityUtil; import org.springframework.data.domain.AuditorAware; import java.util.Optional; @@ -12,4 +12,4 @@ public class AuditorAwareImpl implements AuditorAware { return Optional.ofNullable(SecurityUtil.getCurrentUserEsntlId()); } -} \ No newline at end of file +} diff --git a/src/main/java/com/eactive/httpmockserver/config/PortalAuthenticationFailureHandler.java b/src/main/java/com/eactive/testmaster/config/PortalAuthenticationFailureHandler.java similarity index 81% rename from src/main/java/com/eactive/httpmockserver/config/PortalAuthenticationFailureHandler.java rename to src/main/java/com/eactive/testmaster/config/PortalAuthenticationFailureHandler.java index 380cf79..8095988 100644 --- a/src/main/java/com/eactive/httpmockserver/config/PortalAuthenticationFailureHandler.java +++ b/src/main/java/com/eactive/testmaster/config/PortalAuthenticationFailureHandler.java @@ -1,12 +1,12 @@ -package com.eactive.httpmockserver.config; +package com.eactive.testmaster.config; -import com.eactive.httpmockserver.common.entity.EnabledStatus; -import com.eactive.httpmockserver.common.exception.UserNotFoundException; -import com.eactive.httpmockserver.login.controller.LoginController; -import com.eactive.httpmockserver.user.entity.StaffUser; -import com.eactive.httpmockserver.user.entity.User; -import com.eactive.httpmockserver.user.repository.StaffUserRepository; -import com.eactive.httpmockserver.user.service.UserService; +import com.eactive.testmaster.common.entity.EnabledStatus; +import com.eactive.testmaster.common.exception.UserNotFoundException; +import com.eactive.testmaster.login.controller.LoginController; +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 org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.core.AuthenticationException; diff --git a/src/main/java/com/eactive/httpmockserver/config/PortalAuthenticationManager.java b/src/main/java/com/eactive/testmaster/config/PortalAuthenticationManager.java similarity index 90% rename from src/main/java/com/eactive/httpmockserver/config/PortalAuthenticationManager.java rename to src/main/java/com/eactive/testmaster/config/PortalAuthenticationManager.java index f185e19..db4afe6 100644 --- a/src/main/java/com/eactive/httpmockserver/config/PortalAuthenticationManager.java +++ b/src/main/java/com/eactive/testmaster/config/PortalAuthenticationManager.java @@ -1,9 +1,9 @@ -package com.eactive.httpmockserver.config; +package com.eactive.testmaster.config; -import com.eactive.httpmockserver.common.util.EncryptionUtil; -import com.eactive.httpmockserver.user.entity.User; -import com.eactive.httpmockserver.user.service.UserService; +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.core.Authentication; diff --git a/src/main/java/com/eactive/httpmockserver/config/PortalAuthenticationSuccessHandler.java b/src/main/java/com/eactive/testmaster/config/PortalAuthenticationSuccessHandler.java similarity index 91% rename from src/main/java/com/eactive/httpmockserver/config/PortalAuthenticationSuccessHandler.java rename to src/main/java/com/eactive/testmaster/config/PortalAuthenticationSuccessHandler.java index 4d6df4c..b65b9cb 100644 --- a/src/main/java/com/eactive/httpmockserver/config/PortalAuthenticationSuccessHandler.java +++ b/src/main/java/com/eactive/testmaster/config/PortalAuthenticationSuccessHandler.java @@ -1,7 +1,7 @@ -package com.eactive.httpmockserver.config; +package com.eactive.testmaster.config; -import com.eactive.httpmockserver.user.entity.User; -import com.eactive.httpmockserver.user.service.UserService; +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.core.Authentication; import org.springframework.security.core.userdetails.UserDetails; diff --git a/src/main/java/com/eactive/httpmockserver/config/PortalConfigAppDatasource.java b/src/main/java/com/eactive/testmaster/config/PortalConfigAppDatasource.java similarity index 96% rename from src/main/java/com/eactive/httpmockserver/config/PortalConfigAppDatasource.java rename to src/main/java/com/eactive/testmaster/config/PortalConfigAppDatasource.java index d30cba7..d42f838 100644 --- a/src/main/java/com/eactive/httpmockserver/config/PortalConfigAppDatasource.java +++ b/src/main/java/com/eactive/testmaster/config/PortalConfigAppDatasource.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.config; +package com.eactive.testmaster.config; import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/com/eactive/httpmockserver/config/PortalConfigMessageSource.java b/src/main/java/com/eactive/testmaster/config/PortalConfigMessageSource.java similarity index 91% rename from src/main/java/com/eactive/httpmockserver/config/PortalConfigMessageSource.java rename to src/main/java/com/eactive/testmaster/config/PortalConfigMessageSource.java index 3e989a7..b68fdcf 100644 --- a/src/main/java/com/eactive/httpmockserver/config/PortalConfigMessageSource.java +++ b/src/main/java/com/eactive/testmaster/config/PortalConfigMessageSource.java @@ -1,6 +1,6 @@ -package com.eactive.httpmockserver.config; +package com.eactive.testmaster.config; -import com.eactive.httpmockserver.common.message.PortalReloadableResourceBundleMessageSource; +import com.eactive.testmaster.common.message.PortalReloadableResourceBundleMessageSource; import org.springframework.context.MessageSource; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/eactive/httpmockserver/config/PortalConfigSecurity.java b/src/main/java/com/eactive/testmaster/config/PortalConfigSecurity.java similarity index 98% rename from src/main/java/com/eactive/httpmockserver/config/PortalConfigSecurity.java rename to src/main/java/com/eactive/testmaster/config/PortalConfigSecurity.java index 48425c1..1d5bcb0 100644 --- a/src/main/java/com/eactive/httpmockserver/config/PortalConfigSecurity.java +++ b/src/main/java/com/eactive/testmaster/config/PortalConfigSecurity.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.config; +package com.eactive.testmaster.config; import com.navercorp.lucy.security.xss.servletfilter.XssEscapeServletFilter; diff --git a/src/main/java/com/eactive/httpmockserver/config/ServletConfig.java b/src/main/java/com/eactive/testmaster/config/ServletConfig.java similarity index 95% rename from src/main/java/com/eactive/httpmockserver/config/ServletConfig.java rename to src/main/java/com/eactive/testmaster/config/ServletConfig.java index 7ce0320..154c421 100644 --- a/src/main/java/com/eactive/httpmockserver/config/ServletConfig.java +++ b/src/main/java/com/eactive/testmaster/config/ServletConfig.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.config; +package com.eactive.testmaster.config; import org.apache.catalina.connector.Connector; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/eactive/httpmockserver/config/WebMvcConfig.java b/src/main/java/com/eactive/testmaster/config/WebMvcConfig.java similarity index 97% rename from src/main/java/com/eactive/httpmockserver/config/WebMvcConfig.java rename to src/main/java/com/eactive/testmaster/config/WebMvcConfig.java index 228d353..f633940 100644 --- a/src/main/java/com/eactive/httpmockserver/config/WebMvcConfig.java +++ b/src/main/java/com/eactive/testmaster/config/WebMvcConfig.java @@ -1,6 +1,6 @@ -package com.eactive.httpmockserver.config; +package com.eactive.testmaster.config; -import com.eactive.httpmockserver.common.interceptor.AuthenticInterceptor; +import com.eactive.testmaster.common.interceptor.AuthenticInterceptor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.Ordered; diff --git a/src/main/java/com/eactive/httpmockserver/home/HomeController.java b/src/main/java/com/eactive/testmaster/home/HomeController.java similarity index 86% rename from src/main/java/com/eactive/httpmockserver/home/HomeController.java rename to src/main/java/com/eactive/testmaster/home/HomeController.java index cb84b67..a71599b 100644 --- a/src/main/java/com/eactive/httpmockserver/home/HomeController.java +++ b/src/main/java/com/eactive/testmaster/home/HomeController.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.home; +package com.eactive.testmaster.home; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; @@ -10,4 +10,4 @@ public class HomeController { public String home() { return "redirect:/mgmt/routes/list_view.do"; } -} \ No newline at end of file +} diff --git a/src/main/java/com/eactive/httpmockserver/login/controller/LoginController.java b/src/main/java/com/eactive/testmaster/login/controller/LoginController.java similarity index 91% rename from src/main/java/com/eactive/httpmockserver/login/controller/LoginController.java rename to src/main/java/com/eactive/testmaster/login/controller/LoginController.java index 9d30e97..79f0bd6 100644 --- a/src/main/java/com/eactive/httpmockserver/login/controller/LoginController.java +++ b/src/main/java/com/eactive/testmaster/login/controller/LoginController.java @@ -1,6 +1,6 @@ -package com.eactive.httpmockserver.login.controller; +package com.eactive.testmaster.login.controller; -import com.eactive.httpmockserver.user.service.UserService; +import com.eactive.testmaster.user.service.UserService; import org.apache.commons.lang3.StringUtils; import org.springframework.http.ResponseEntity; import org.springframework.security.core.Authentication; @@ -9,10 +9,8 @@ import org.springframework.security.web.authentication.logout.SecurityContextLog import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/src/main/java/com/eactive/httpmockserver/login/dto/FindIdRequest.java b/src/main/java/com/eactive/testmaster/login/dto/FindIdRequest.java similarity index 88% rename from src/main/java/com/eactive/httpmockserver/login/dto/FindIdRequest.java rename to src/main/java/com/eactive/testmaster/login/dto/FindIdRequest.java index 20eeaab..3aace28 100644 --- a/src/main/java/com/eactive/httpmockserver/login/dto/FindIdRequest.java +++ b/src/main/java/com/eactive/testmaster/login/dto/FindIdRequest.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.login.dto; +package com.eactive.testmaster.login.dto; public class FindIdRequest { diff --git a/src/main/java/com/eactive/httpmockserver/login/dto/LoginRequestDTO.java b/src/main/java/com/eactive/testmaster/login/dto/LoginRequestDTO.java similarity index 88% rename from src/main/java/com/eactive/httpmockserver/login/dto/LoginRequestDTO.java rename to src/main/java/com/eactive/testmaster/login/dto/LoginRequestDTO.java index 85b8702..6b41d5f 100644 --- a/src/main/java/com/eactive/httpmockserver/login/dto/LoginRequestDTO.java +++ b/src/main/java/com/eactive/testmaster/login/dto/LoginRequestDTO.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.login.dto; +package com.eactive.testmaster.login.dto; public class LoginRequestDTO { diff --git a/src/main/java/com/eactive/httpmockserver/login/service/LoginService.java b/src/main/java/com/eactive/testmaster/login/service/LoginService.java similarity index 76% rename from src/main/java/com/eactive/httpmockserver/login/service/LoginService.java rename to src/main/java/com/eactive/testmaster/login/service/LoginService.java index 3d4b10d..905d9c8 100644 --- a/src/main/java/com/eactive/httpmockserver/login/service/LoginService.java +++ b/src/main/java/com/eactive/testmaster/login/service/LoginService.java @@ -1,6 +1,6 @@ -package com.eactive.httpmockserver.login.service; +package com.eactive.testmaster.login.service; -import com.eactive.httpmockserver.login.dto.LoginRequestDTO; +import com.eactive.testmaster.login.dto.LoginRequestDTO; /** * 로그인을 처리하는 비즈니스 인터페이스 클래스 diff --git a/src/main/java/com/eactive/httpmockserver/login/service/impl/LoginServiceImpl.java b/src/main/java/com/eactive/testmaster/login/service/impl/LoginServiceImpl.java similarity index 71% rename from src/main/java/com/eactive/httpmockserver/login/service/impl/LoginServiceImpl.java rename to src/main/java/com/eactive/testmaster/login/service/impl/LoginServiceImpl.java index 31c0e09..64837fa 100644 --- a/src/main/java/com/eactive/httpmockserver/login/service/impl/LoginServiceImpl.java +++ b/src/main/java/com/eactive/testmaster/login/service/impl/LoginServiceImpl.java @@ -1,10 +1,10 @@ -package com.eactive.httpmockserver.login.service.impl; +package com.eactive.testmaster.login.service.impl; -import com.eactive.httpmockserver.common.entity.EnabledStatus; -import com.eactive.httpmockserver.login.dto.LoginRequestDTO; -import com.eactive.httpmockserver.login.service.LoginService; -import com.eactive.httpmockserver.user.entity.User; -import com.eactive.httpmockserver.user.service.UserService; +import com.eactive.testmaster.common.entity.EnabledStatus; +import com.eactive.testmaster.login.dto.LoginRequestDTO; +import com.eactive.testmaster.login.service.LoginService; +import com.eactive.testmaster.user.entity.User; +import com.eactive.testmaster.user.service.UserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; diff --git a/src/main/java/com/eactive/httpmockserver/server/controller/ServerMgmtController.java b/src/main/java/com/eactive/testmaster/server/controller/ServerMgmtController.java similarity index 91% rename from src/main/java/com/eactive/httpmockserver/server/controller/ServerMgmtController.java rename to src/main/java/com/eactive/testmaster/server/controller/ServerMgmtController.java index be86df8..ffa914e 100644 --- a/src/main/java/com/eactive/httpmockserver/server/controller/ServerMgmtController.java +++ b/src/main/java/com/eactive/testmaster/server/controller/ServerMgmtController.java @@ -1,10 +1,10 @@ -package com.eactive.httpmockserver.server.controller; +package com.eactive.testmaster.server.controller; -import com.eactive.httpmockserver.server.dto.ServerDTO; -import com.eactive.httpmockserver.server.dto.ServerSearch; -import com.eactive.httpmockserver.server.entity.Server; -import com.eactive.httpmockserver.server.mapper.ServerMapper; -import com.eactive.httpmockserver.server.service.ServerMgmtService; +import com.eactive.testmaster.server.dto.ServerDTO; +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 org.apache.commons.lang3.StringUtils; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/com/eactive/httpmockserver/server/dto/ServerDTO.java b/src/main/java/com/eactive/testmaster/server/dto/ServerDTO.java similarity index 96% rename from src/main/java/com/eactive/httpmockserver/server/dto/ServerDTO.java rename to src/main/java/com/eactive/testmaster/server/dto/ServerDTO.java index 56da69e..ad8ffaf 100644 --- a/src/main/java/com/eactive/httpmockserver/server/dto/ServerDTO.java +++ b/src/main/java/com/eactive/testmaster/server/dto/ServerDTO.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.server.dto; +package com.eactive.testmaster.server.dto; import javax.validation.constraints.NotEmpty; diff --git a/src/main/java/com/eactive/httpmockserver/server/dto/ServerSearch.java b/src/main/java/com/eactive/testmaster/server/dto/ServerSearch.java similarity index 81% rename from src/main/java/com/eactive/httpmockserver/server/dto/ServerSearch.java rename to src/main/java/com/eactive/testmaster/server/dto/ServerSearch.java index 400692b..6b2709b 100644 --- a/src/main/java/com/eactive/httpmockserver/server/dto/ServerSearch.java +++ b/src/main/java/com/eactive/testmaster/server/dto/ServerSearch.java @@ -1,10 +1,10 @@ -package com.eactive.httpmockserver.server.dto; +package com.eactive.testmaster.server.dto; -import com.eactive.httpmockserver.common.search.BaseSearch; -import com.eactive.httpmockserver.common.search.ColumnSearchModel; -import com.eactive.httpmockserver.common.search.SearchCondition; -import com.eactive.httpmockserver.common.search.SearchModel; -import com.eactive.httpmockserver.server.entity.Server; +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 com.eactive.testmaster.server.entity.Server; import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; diff --git a/src/main/java/com/eactive/httpmockserver/server/entity/Server.java b/src/main/java/com/eactive/testmaster/server/entity/Server.java similarity index 96% rename from src/main/java/com/eactive/httpmockserver/server/entity/Server.java rename to src/main/java/com/eactive/testmaster/server/entity/Server.java index e2cc5db..e943e19 100644 --- a/src/main/java/com/eactive/httpmockserver/server/entity/Server.java +++ b/src/main/java/com/eactive/testmaster/server/entity/Server.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.server.entity; +package com.eactive.testmaster.server.entity; import javax.persistence.*; diff --git a/src/main/java/com/eactive/httpmockserver/server/entity/ServerRepository.java b/src/main/java/com/eactive/testmaster/server/entity/ServerRepository.java similarity index 86% rename from src/main/java/com/eactive/httpmockserver/server/entity/ServerRepository.java rename to src/main/java/com/eactive/testmaster/server/entity/ServerRepository.java index 96f4476..2268443 100644 --- a/src/main/java/com/eactive/httpmockserver/server/entity/ServerRepository.java +++ b/src/main/java/com/eactive/testmaster/server/entity/ServerRepository.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.server.entity; +package com.eactive.testmaster.server.entity; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; diff --git a/src/main/java/com/eactive/httpmockserver/server/mapper/ServerMapper.java b/src/main/java/com/eactive/testmaster/server/mapper/ServerMapper.java similarity index 84% rename from src/main/java/com/eactive/httpmockserver/server/mapper/ServerMapper.java rename to src/main/java/com/eactive/testmaster/server/mapper/ServerMapper.java index d9ce30e..193edc3 100644 --- a/src/main/java/com/eactive/httpmockserver/server/mapper/ServerMapper.java +++ b/src/main/java/com/eactive/testmaster/server/mapper/ServerMapper.java @@ -1,10 +1,10 @@ -package com.eactive.httpmockserver.server.mapper; +package com.eactive.testmaster.server.mapper; -import com.eactive.httpmockserver.common.exception.NotFoundException; -import com.eactive.httpmockserver.server.dto.ServerDTO; -import com.eactive.httpmockserver.server.entity.Server; -import com.eactive.httpmockserver.server.entity.ServerRepository; +import com.eactive.testmaster.common.exception.NotFoundException; +import com.eactive.testmaster.server.dto.ServerDTO; +import com.eactive.testmaster.server.entity.Server; +import com.eactive.testmaster.server.entity.ServerRepository; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/eactive/httpmockserver/server/service/ServerMgmtService.java b/src/main/java/com/eactive/testmaster/server/service/ServerMgmtService.java similarity index 85% rename from src/main/java/com/eactive/httpmockserver/server/service/ServerMgmtService.java rename to src/main/java/com/eactive/testmaster/server/service/ServerMgmtService.java index c6260e0..376a3bf 100644 --- a/src/main/java/com/eactive/httpmockserver/server/service/ServerMgmtService.java +++ b/src/main/java/com/eactive/testmaster/server/service/ServerMgmtService.java @@ -1,8 +1,8 @@ -package com.eactive.httpmockserver.server.service; +package com.eactive.testmaster.server.service; -import com.eactive.httpmockserver.common.exception.NotFoundException; -import com.eactive.httpmockserver.server.entity.Server; -import com.eactive.httpmockserver.server.entity.ServerRepository; +import com.eactive.testmaster.common.exception.NotFoundException; +import com.eactive.testmaster.server.entity.Server; +import com.eactive.testmaster.server.entity.ServerRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/com/eactive/httpmockserver/user/controller/AccountController.java b/src/main/java/com/eactive/testmaster/user/controller/AccountController.java similarity index 89% rename from src/main/java/com/eactive/httpmockserver/user/controller/AccountController.java rename to src/main/java/com/eactive/testmaster/user/controller/AccountController.java index a0ef558..0f3d822 100644 --- a/src/main/java/com/eactive/httpmockserver/user/controller/AccountController.java +++ b/src/main/java/com/eactive/testmaster/user/controller/AccountController.java @@ -1,8 +1,8 @@ -package com.eactive.httpmockserver.user.controller; +package com.eactive.testmaster.user.controller; -import com.eactive.httpmockserver.common.util.SecurityUtil; -import com.eactive.httpmockserver.user.dto.PasswordChangeRequestDTO; -import com.eactive.httpmockserver.user.service.UserService; +import com.eactive.testmaster.common.util.SecurityUtil; +import com.eactive.testmaster.user.dto.PasswordChangeRequestDTO; +import com.eactive.testmaster.user.service.UserService; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.ui.ModelMap; diff --git a/src/main/java/com/eactive/httpmockserver/user/controller/AdminRegisterController.java b/src/main/java/com/eactive/testmaster/user/controller/AdminRegisterController.java similarity index 84% rename from src/main/java/com/eactive/httpmockserver/user/controller/AdminRegisterController.java rename to src/main/java/com/eactive/testmaster/user/controller/AdminRegisterController.java index 4afeded..0e8cc25 100644 --- a/src/main/java/com/eactive/httpmockserver/user/controller/AdminRegisterController.java +++ b/src/main/java/com/eactive/testmaster/user/controller/AdminRegisterController.java @@ -1,10 +1,10 @@ -package com.eactive.httpmockserver.user.controller; +package com.eactive.testmaster.user.controller; -import com.eactive.httpmockserver.user.dto.UserRegisterDTO; -import com.eactive.httpmockserver.user.entity.StaffUser; -import com.eactive.httpmockserver.user.mapper.StaffUserMapper; -import com.eactive.httpmockserver.user.repository.StaffUserRepository; -import com.eactive.httpmockserver.user.service.StaffUserService; +import com.eactive.testmaster.user.dto.UserRegisterDTO; +import com.eactive.testmaster.user.entity.StaffUser; +import com.eactive.testmaster.user.mapper.StaffUserMapper; +import com.eactive.testmaster.user.repository.StaffUserRepository; +import com.eactive.testmaster.user.service.StaffUserService; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.validation.BindingResult; diff --git a/src/main/java/com/eactive/httpmockserver/user/controller/UserMgmtController.java b/src/main/java/com/eactive/testmaster/user/controller/UserMgmtController.java similarity index 88% rename from src/main/java/com/eactive/httpmockserver/user/controller/UserMgmtController.java rename to src/main/java/com/eactive/testmaster/user/controller/UserMgmtController.java index d753b5f..7e69d56 100644 --- a/src/main/java/com/eactive/httpmockserver/user/controller/UserMgmtController.java +++ b/src/main/java/com/eactive/testmaster/user/controller/UserMgmtController.java @@ -1,12 +1,12 @@ -package com.eactive.httpmockserver.user.controller; +package com.eactive.testmaster.user.controller; -import com.eactive.httpmockserver.common.util.SecurityUtil; -import com.eactive.httpmockserver.user.dto.UserRegisterDTO; -import com.eactive.httpmockserver.user.dto.UserSearch; -import com.eactive.httpmockserver.user.dto.UserUpdateDTO; -import com.eactive.httpmockserver.user.entity.StaffUser; -import com.eactive.httpmockserver.user.mapper.StaffUserMapper; -import com.eactive.httpmockserver.user.service.StaffUserService; +import com.eactive.testmaster.common.util.SecurityUtil; +import com.eactive.testmaster.user.dto.UserRegisterDTO; +import com.eactive.testmaster.user.dto.UserSearch; +import com.eactive.testmaster.user.dto.UserUpdateDTO; +import com.eactive.testmaster.user.entity.StaffUser; +import com.eactive.testmaster.user.mapper.StaffUserMapper; +import com.eactive.testmaster.user.service.StaffUserService; import org.apache.commons.lang3.StringUtils; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/com/eactive/httpmockserver/user/dto/PasswordChangeRequestDTO.java b/src/main/java/com/eactive/testmaster/user/dto/PasswordChangeRequestDTO.java similarity index 89% rename from src/main/java/com/eactive/httpmockserver/user/dto/PasswordChangeRequestDTO.java rename to src/main/java/com/eactive/testmaster/user/dto/PasswordChangeRequestDTO.java index 0da66dd..dd07ffc 100644 --- a/src/main/java/com/eactive/httpmockserver/user/dto/PasswordChangeRequestDTO.java +++ b/src/main/java/com/eactive/testmaster/user/dto/PasswordChangeRequestDTO.java @@ -1,6 +1,6 @@ -package com.eactive.httpmockserver.user.dto; +package com.eactive.testmaster.user.dto; -import com.eactive.httpmockserver.common.validator.PasswordMatch; +import com.eactive.testmaster.common.validator.PasswordMatch; import javax.validation.constraints.NotEmpty; diff --git a/src/main/java/com/eactive/httpmockserver/user/dto/UserRegisterDTO.java b/src/main/java/com/eactive/testmaster/user/dto/UserRegisterDTO.java similarity index 90% rename from src/main/java/com/eactive/httpmockserver/user/dto/UserRegisterDTO.java rename to src/main/java/com/eactive/testmaster/user/dto/UserRegisterDTO.java index d25db3c..34f8a0d 100644 --- a/src/main/java/com/eactive/httpmockserver/user/dto/UserRegisterDTO.java +++ b/src/main/java/com/eactive/testmaster/user/dto/UserRegisterDTO.java @@ -1,8 +1,8 @@ -package com.eactive.httpmockserver.user.dto; +package com.eactive.testmaster.user.dto; -import com.eactive.httpmockserver.common.validator.PasswordMatch; -import com.eactive.httpmockserver.common.validator.UniqueId; -import com.eactive.httpmockserver.user.entity.UserStatus; +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; diff --git a/src/main/java/com/eactive/httpmockserver/user/dto/UserSearch.java b/src/main/java/com/eactive/testmaster/user/dto/UserSearch.java similarity index 68% rename from src/main/java/com/eactive/httpmockserver/user/dto/UserSearch.java rename to src/main/java/com/eactive/testmaster/user/dto/UserSearch.java index d1bf3f4..9299be4 100644 --- a/src/main/java/com/eactive/httpmockserver/user/dto/UserSearch.java +++ b/src/main/java/com/eactive/testmaster/user/dto/UserSearch.java @@ -1,11 +1,11 @@ -package com.eactive.httpmockserver.user.dto; +package com.eactive.testmaster.user.dto; -import com.eactive.httpmockserver.common.search.BaseSearch; -import com.eactive.httpmockserver.common.search.ColumnSearchModel; -import com.eactive.httpmockserver.common.search.SearchCondition; -import com.eactive.httpmockserver.common.search.SearchModel; -import com.eactive.httpmockserver.user.entity.StaffUser; -import com.eactive.httpmockserver.user.entity.UserStatus; +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 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/httpmockserver/user/dto/UserUpdateDTO.java b/src/main/java/com/eactive/testmaster/user/dto/UserUpdateDTO.java similarity index 91% rename from src/main/java/com/eactive/httpmockserver/user/dto/UserUpdateDTO.java rename to src/main/java/com/eactive/testmaster/user/dto/UserUpdateDTO.java index 63574aa..5dfb738 100644 --- a/src/main/java/com/eactive/httpmockserver/user/dto/UserUpdateDTO.java +++ b/src/main/java/com/eactive/testmaster/user/dto/UserUpdateDTO.java @@ -1,7 +1,7 @@ -package com.eactive.httpmockserver.user.dto; +package com.eactive.testmaster.user.dto; -import com.eactive.httpmockserver.common.entity.EnabledStatus; -import com.eactive.httpmockserver.user.entity.UserStatus; +import com.eactive.testmaster.common.entity.EnabledStatus; +import com.eactive.testmaster.user.entity.UserStatus; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; diff --git a/src/main/java/com/eactive/httpmockserver/user/entity/AnonymousUser.java b/src/main/java/com/eactive/testmaster/user/entity/AnonymousUser.java similarity index 95% rename from src/main/java/com/eactive/httpmockserver/user/entity/AnonymousUser.java rename to src/main/java/com/eactive/testmaster/user/entity/AnonymousUser.java index 3f7d4fc..c524fa5 100644 --- a/src/main/java/com/eactive/httpmockserver/user/entity/AnonymousUser.java +++ b/src/main/java/com/eactive/testmaster/user/entity/AnonymousUser.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.user.entity; +package com.eactive.testmaster.user.entity; public class AnonymousUser extends User { private String userId; diff --git a/src/main/java/com/eactive/httpmockserver/user/entity/StaffUser.java b/src/main/java/com/eactive/testmaster/user/entity/StaffUser.java similarity index 98% rename from src/main/java/com/eactive/httpmockserver/user/entity/StaffUser.java rename to src/main/java/com/eactive/testmaster/user/entity/StaffUser.java index c67d3fe..9aff658 100644 --- a/src/main/java/com/eactive/httpmockserver/user/entity/StaffUser.java +++ b/src/main/java/com/eactive/testmaster/user/entity/StaffUser.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.user.entity; +package com.eactive.testmaster.user.entity; import javax.persistence.*; import java.util.Objects; diff --git a/src/main/java/com/eactive/httpmockserver/user/entity/User.java b/src/main/java/com/eactive/testmaster/user/entity/User.java similarity index 95% rename from src/main/java/com/eactive/httpmockserver/user/entity/User.java rename to src/main/java/com/eactive/testmaster/user/entity/User.java index e56bf14..bbc76a9 100644 --- a/src/main/java/com/eactive/httpmockserver/user/entity/User.java +++ b/src/main/java/com/eactive/testmaster/user/entity/User.java @@ -1,7 +1,7 @@ -package com.eactive.httpmockserver.user.entity; +package com.eactive.testmaster.user.entity; -import com.eactive.httpmockserver.common.entity.Auditable; -import com.eactive.httpmockserver.common.entity.EnabledStatus; +import com.eactive.testmaster.common.entity.Auditable; +import com.eactive.testmaster.common.entity.EnabledStatus; import org.hibernate.annotations.Type; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; diff --git a/src/main/java/com/eactive/httpmockserver/user/entity/UserGroup.java b/src/main/java/com/eactive/testmaster/user/entity/UserGroup.java similarity index 95% rename from src/main/java/com/eactive/httpmockserver/user/entity/UserGroup.java rename to src/main/java/com/eactive/testmaster/user/entity/UserGroup.java index 9941011..88fd474 100644 --- a/src/main/java/com/eactive/httpmockserver/user/entity/UserGroup.java +++ b/src/main/java/com/eactive/testmaster/user/entity/UserGroup.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.user.entity; +package com.eactive.testmaster.user.entity; import javax.persistence.*; import java.io.Serializable; diff --git a/src/main/java/com/eactive/httpmockserver/user/entity/UserStatus.java b/src/main/java/com/eactive/testmaster/user/entity/UserStatus.java similarity index 89% rename from src/main/java/com/eactive/httpmockserver/user/entity/UserStatus.java rename to src/main/java/com/eactive/testmaster/user/entity/UserStatus.java index b397fac..e5bf819 100644 --- a/src/main/java/com/eactive/httpmockserver/user/entity/UserStatus.java +++ b/src/main/java/com/eactive/testmaster/user/entity/UserStatus.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.user.entity; +package com.eactive.testmaster.user.entity; public enum UserStatus { WAITING("가입승인 대기"), diff --git a/src/main/java/com/eactive/httpmockserver/user/mapper/StaffUserMapper.java b/src/main/java/com/eactive/testmaster/user/mapper/StaffUserMapper.java similarity index 69% rename from src/main/java/com/eactive/httpmockserver/user/mapper/StaffUserMapper.java rename to src/main/java/com/eactive/testmaster/user/mapper/StaffUserMapper.java index 62c2ce8..c7c8b3d 100644 --- a/src/main/java/com/eactive/httpmockserver/user/mapper/StaffUserMapper.java +++ b/src/main/java/com/eactive/testmaster/user/mapper/StaffUserMapper.java @@ -1,11 +1,11 @@ -package com.eactive.httpmockserver.user.mapper; +package com.eactive.testmaster.user.mapper; -import com.eactive.httpmockserver.common.mapper.CommonMapper; -import com.eactive.httpmockserver.common.util.EncryptionUtil; -import com.eactive.httpmockserver.user.dto.UserRegisterDTO; -import com.eactive.httpmockserver.user.dto.UserUpdateDTO; -import com.eactive.httpmockserver.user.entity.StaffUser; +import com.eactive.testmaster.common.mapper.CommonMapper; +import com.eactive.testmaster.common.util.EncryptionUtil; +import com.eactive.testmaster.user.dto.UserRegisterDTO; +import com.eactive.testmaster.user.dto.UserUpdateDTO; +import com.eactive.testmaster.user.entity.StaffUser; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.ReportingPolicy; diff --git a/src/main/java/com/eactive/httpmockserver/user/repository/StaffUserRepository.java b/src/main/java/com/eactive/testmaster/user/repository/StaffUserRepository.java similarity index 78% rename from src/main/java/com/eactive/httpmockserver/user/repository/StaffUserRepository.java rename to src/main/java/com/eactive/testmaster/user/repository/StaffUserRepository.java index 71051ad..cd565dc 100644 --- a/src/main/java/com/eactive/httpmockserver/user/repository/StaffUserRepository.java +++ b/src/main/java/com/eactive/testmaster/user/repository/StaffUserRepository.java @@ -1,6 +1,6 @@ -package com.eactive.httpmockserver.user.repository; +package com.eactive.testmaster.user.repository; -import com.eactive.httpmockserver.user.entity.StaffUser; +import com.eactive.testmaster.user.entity.StaffUser; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/eactive/httpmockserver/user/service/StaffUserService.java b/src/main/java/com/eactive/testmaster/user/service/StaffUserService.java similarity index 82% rename from src/main/java/com/eactive/httpmockserver/user/service/StaffUserService.java rename to src/main/java/com/eactive/testmaster/user/service/StaffUserService.java index 3755d83..d3bdbff 100644 --- a/src/main/java/com/eactive/httpmockserver/user/service/StaffUserService.java +++ b/src/main/java/com/eactive/testmaster/user/service/StaffUserService.java @@ -1,10 +1,10 @@ -package com.eactive.httpmockserver.user.service; +package com.eactive.testmaster.user.service; -import com.eactive.httpmockserver.common.entity.EnabledStatus; -import com.eactive.httpmockserver.common.exception.UserNotFoundException; -import com.eactive.httpmockserver.user.entity.StaffUser; -import com.eactive.httpmockserver.user.entity.UserStatus; -import com.eactive.httpmockserver.user.repository.StaffUserRepository; +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 org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -14,7 +14,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.UUID; -import static com.eactive.httpmockserver.user.service.UserService.USER_NOT_FOUND_MESSAGE; +import static com.eactive.testmaster.user.service.UserService.USER_NOT_FOUND_MESSAGE; @Service @Transactional diff --git a/src/main/java/com/eactive/httpmockserver/user/service/UserService.java b/src/main/java/com/eactive/testmaster/user/service/UserService.java similarity index 86% rename from src/main/java/com/eactive/httpmockserver/user/service/UserService.java rename to src/main/java/com/eactive/testmaster/user/service/UserService.java index f77958d..4a0e180 100644 --- a/src/main/java/com/eactive/httpmockserver/user/service/UserService.java +++ b/src/main/java/com/eactive/testmaster/user/service/UserService.java @@ -1,11 +1,11 @@ -package com.eactive.httpmockserver.user.service; +package com.eactive.testmaster.user.service; -import com.eactive.httpmockserver.common.entity.EnabledStatus; -import com.eactive.httpmockserver.common.exception.UserNotFoundException; -import com.eactive.httpmockserver.common.util.EncryptionUtil; -import com.eactive.httpmockserver.user.entity.StaffUser; -import com.eactive.httpmockserver.user.entity.User; -import com.eactive.httpmockserver.user.repository.StaffUserRepository; +import com.eactive.testmaster.common.entity.EnabledStatus; +import com.eactive.testmaster.common.exception.UserNotFoundException; +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 org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; diff --git a/start.bat b/start.bat index 8f1513e..c28a176 100755 --- a/start.bat +++ b/start.bat @@ -1 +1 @@ -java -jar build/libs/HTTPSimulator.jar \ No newline at end of file +java -jar build/libs/elink-test-master.jar diff --git a/start.sh b/start.sh index e90658a..c28a176 100755 --- a/start.sh +++ b/start.sh @@ -1 +1 @@ -java -jar build/libs/apim-simulator.jar +java -jar build/libs/elink-test-master.jar