test master 변경
This commit is contained in:
+1
-1
@@ -6,4 +6,4 @@ COPY build/libs/*.jar /app/app.jar
|
|||||||
|
|
||||||
ENV JAVA_OPTS=""
|
ENV JAVA_OPTS=""
|
||||||
|
|
||||||
ENTRYPOINT java -jar ${JAVA_OPTS} app.jar
|
ENTRYPOINT java -jar ${JAVA_OPTS} app.jar
|
||||||
|
|||||||
+2
-2
@@ -46,7 +46,7 @@ dependencies {
|
|||||||
|
|
||||||
// implementation 'io.springfox:springfox-boot-starter:3.0.0'
|
// implementation 'io.springfox:springfox-boot-starter:3.0.0'
|
||||||
implementation 'org.apache.httpcomponents:httpclient:4.5.14'
|
implementation 'org.apache.httpcomponents:httpclient:4.5.14'
|
||||||
|
|
||||||
|
|
||||||
implementation 'org.apache.commons:commons-lang3:3.12.0'
|
implementation 'org.apache.commons:commons-lang3:3.12.0'
|
||||||
implementation 'commons-io:commons-io:2.11.0'
|
implementation 'commons-io:commons-io:2.11.0'
|
||||||
@@ -61,7 +61,7 @@ dependencies {
|
|||||||
}
|
}
|
||||||
|
|
||||||
bootJar {
|
bootJar {
|
||||||
archiveFileName = "apim-simulator.jar"
|
archiveFileName = "elink-test-master.jar"
|
||||||
}
|
}
|
||||||
|
|
||||||
test {
|
test {
|
||||||
|
|||||||
+1
-1
@@ -1,3 +1,3 @@
|
|||||||
./gradlew bootJar
|
./gradlew bootJar
|
||||||
docker build -t simulator .
|
docker build -t test-master .
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -1 +1 @@
|
|||||||
rootProject.name = 'simulator-v2'
|
rootProject.name = 'elink-test-master'
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
sed -i '' "s/\/\/ id \"org\.sonarqube/ id \"org\.sonarqube/g" ./build.gradle
|
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
|
sed -i '' "s/ id \"org\.sonarqube/\/\/ id \"org\.sonarqube/g" ./build.gradle
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.eactive.httpmockserver;
|
package com.eactive.testmaster;
|
||||||
|
|
||||||
import org.springframework.boot.SpringApplication;
|
import org.springframework.boot.SpringApplication;
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||||
+4
-4
@@ -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.testmaster.api.dto.MockRequest;
|
||||||
import com.eactive.httpmockserver.api.entity.MockCondition;
|
import com.eactive.testmaster.api.entity.MockCondition;
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
@@ -11,4 +11,4 @@ public interface ConditionMatcher {
|
|||||||
String getType();
|
String getType();
|
||||||
|
|
||||||
String getDisplayName();
|
String getDisplayName();
|
||||||
}
|
}
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.eactive.httpmockserver.api.condition;
|
package com.eactive.testmaster.api.condition;
|
||||||
|
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
+3
-3
@@ -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.testmaster.api.dto.MockRequest;
|
||||||
import com.eactive.httpmockserver.api.entity.MockCondition;
|
import com.eactive.testmaster.api.entity.MockCondition;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
+3
-3
@@ -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.testmaster.api.dto.MockRequest;
|
||||||
import com.eactive.httpmockserver.api.entity.MockCondition;
|
import com.eactive.testmaster.api.entity.MockCondition;
|
||||||
import com.jayway.jsonpath.JsonPath;
|
import com.jayway.jsonpath.JsonPath;
|
||||||
import com.jayway.jsonpath.PathNotFoundException;
|
import com.jayway.jsonpath.PathNotFoundException;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
+3
-3
@@ -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.testmaster.api.dto.MockRequest;
|
||||||
import com.eactive.httpmockserver.api.entity.MockCondition;
|
import com.eactive.testmaster.api.entity.MockCondition;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
+3
-3
@@ -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.testmaster.api.dto.MockRequest;
|
||||||
import com.eactive.httpmockserver.api.entity.MockCondition;
|
import com.eactive.testmaster.api.entity.MockCondition;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
+8
-8
@@ -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.testmaster.api.condition.ConditionMatcher;
|
||||||
import com.eactive.httpmockserver.api.condition.ConditionMatcherService;
|
import com.eactive.testmaster.api.condition.ConditionMatcherService;
|
||||||
import com.eactive.httpmockserver.api.dto.MockRequest;
|
import com.eactive.testmaster.api.dto.MockRequest;
|
||||||
import com.eactive.httpmockserver.api.entity.MockCondition;
|
import com.eactive.testmaster.api.entity.MockCondition;
|
||||||
import com.eactive.httpmockserver.api.entity.MockResponse;
|
import com.eactive.testmaster.api.entity.MockResponse;
|
||||||
import com.eactive.httpmockserver.api.entity.MockRoute;
|
import com.eactive.testmaster.api.entity.MockRoute;
|
||||||
import com.eactive.httpmockserver.api.service.MockRouteService;
|
import com.eactive.testmaster.api.service.MockRouteService;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.http.HttpHeaders;
|
import org.springframework.http.HttpHeaders;
|
||||||
+3
-3
@@ -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.testmaster.api.entity.MockRoute;
|
||||||
import com.eactive.httpmockserver.api.service.MockRouteService;
|
import com.eactive.testmaster.api.service.MockRouteService;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
+8
-8
@@ -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.testmaster.api.dto.MockResponseDTO;
|
||||||
import com.eactive.httpmockserver.api.dto.MockRouteRegisterDTO;
|
import com.eactive.testmaster.api.dto.MockRouteRegisterDTO;
|
||||||
import com.eactive.httpmockserver.api.dto.MockRouteSearch;
|
import com.eactive.testmaster.api.dto.MockRouteSearch;
|
||||||
import com.eactive.httpmockserver.api.dto.MockRouteUpdateDTO;
|
import com.eactive.testmaster.api.dto.MockRouteUpdateDTO;
|
||||||
import com.eactive.httpmockserver.api.entity.MockRoute;
|
import com.eactive.testmaster.api.entity.MockRoute;
|
||||||
import com.eactive.httpmockserver.api.mapper.MockRouteMapper;
|
import com.eactive.testmaster.api.mapper.MockRouteMapper;
|
||||||
import com.eactive.httpmockserver.api.service.MockRouteService;
|
import com.eactive.testmaster.api.service.MockRouteService;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.data.domain.Page;
|
import org.springframework.data.domain.Page;
|
||||||
import org.springframework.data.domain.Pageable;
|
import org.springframework.data.domain.Pageable;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.eactive.httpmockserver.api.dto;
|
package com.eactive.testmaster.api.dto;
|
||||||
|
|
||||||
public class MockConditionDTO {
|
public class MockConditionDTO {
|
||||||
private String type;
|
private String type;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.eactive.httpmockserver.api.dto;
|
package com.eactive.testmaster.api.dto;
|
||||||
|
|
||||||
public class MockHeaderDTO {
|
public class MockHeaderDTO {
|
||||||
|
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.eactive.httpmockserver.api.dto;
|
package com.eactive.testmaster.api.dto;
|
||||||
|
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.eactive.httpmockserver.api.dto;
|
package com.eactive.testmaster.api.dto;
|
||||||
|
|
||||||
import javax.validation.constraints.Min;
|
import javax.validation.constraints.Min;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
+2
-2
@@ -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.NotEmpty;
|
||||||
import javax.validation.constraints.Size;
|
import javax.validation.constraints.Size;
|
||||||
+6
-6
@@ -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.testmaster.api.entity.MockRoute;
|
||||||
import com.eactive.httpmockserver.common.search.BaseSearch;
|
import com.eactive.testmaster.common.search.BaseSearch;
|
||||||
import com.eactive.httpmockserver.common.search.ColumnSearchModel;
|
import com.eactive.testmaster.common.search.ColumnSearchModel;
|
||||||
import com.eactive.httpmockserver.common.search.SearchCondition;
|
import com.eactive.testmaster.common.search.SearchCondition;
|
||||||
import com.eactive.httpmockserver.common.search.SearchModel;
|
import com.eactive.testmaster.common.search.SearchModel;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
+1
-3
@@ -1,6 +1,4 @@
|
|||||||
package com.eactive.httpmockserver.api.dto;
|
package com.eactive.testmaster.api.dto;
|
||||||
|
|
||||||
import com.eactive.httpmockserver.common.validator.UniqueRoute;
|
|
||||||
|
|
||||||
import javax.validation.constraints.NotEmpty;
|
import javax.validation.constraints.NotEmpty;
|
||||||
import javax.validation.constraints.Size;
|
import javax.validation.constraints.Size;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.eactive.httpmockserver.api.entity;
|
package com.eactive.testmaster.api.entity;
|
||||||
|
|
||||||
|
|
||||||
import javax.persistence.*;
|
import javax.persistence.*;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.eactive.httpmockserver.api.entity;
|
package com.eactive.testmaster.api.entity;
|
||||||
|
|
||||||
import javax.persistence.*;
|
import javax.persistence.*;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.eactive.httpmockserver.api.entity;
|
package com.eactive.testmaster.api.entity;
|
||||||
|
|
||||||
import javax.persistence.*;
|
import javax.persistence.*;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
+8
-8
@@ -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.testmaster.api.dto.MockHeaderDTO;
|
||||||
import com.eactive.httpmockserver.api.dto.MockResponseDTO;
|
import com.eactive.testmaster.api.dto.MockResponseDTO;
|
||||||
import com.eactive.httpmockserver.api.dto.MockRouteRegisterDTO;
|
import com.eactive.testmaster.api.dto.MockRouteRegisterDTO;
|
||||||
import com.eactive.httpmockserver.api.dto.MockRouteUpdateDTO;
|
import com.eactive.testmaster.api.dto.MockRouteUpdateDTO;
|
||||||
import com.eactive.httpmockserver.api.entity.MockResponse;
|
import com.eactive.testmaster.api.entity.MockResponse;
|
||||||
import com.eactive.httpmockserver.api.entity.MockRoute;
|
import com.eactive.testmaster.api.entity.MockRoute;
|
||||||
import com.eactive.httpmockserver.common.mapper.CommonMapper;
|
import com.eactive.testmaster.common.mapper.CommonMapper;
|
||||||
import org.mapstruct.Mapper;
|
import org.mapstruct.Mapper;
|
||||||
import org.mapstruct.Mapping;
|
import org.mapstruct.Mapping;
|
||||||
import org.mapstruct.Named;
|
import org.mapstruct.Named;
|
||||||
+2
-2
@@ -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.JpaRepository;
|
||||||
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
||||||
|
|
||||||
+6
-6
@@ -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.testmaster.api.entity.MockCondition;
|
||||||
import com.eactive.httpmockserver.api.entity.MockResponse;
|
import com.eactive.testmaster.api.entity.MockResponse;
|
||||||
import com.eactive.httpmockserver.api.entity.MockRoute;
|
import com.eactive.testmaster.api.entity.MockRoute;
|
||||||
import com.eactive.httpmockserver.api.repository.MockRouteRepository;
|
import com.eactive.testmaster.api.repository.MockRouteRepository;
|
||||||
import com.eactive.httpmockserver.common.exception.NotFoundException;
|
import com.eactive.testmaster.common.exception.NotFoundException;
|
||||||
import org.apache.commons.beanutils.BeanUtils;
|
import org.apache.commons.beanutils.BeanUtils;
|
||||||
import org.hibernate.Hibernate;
|
import org.hibernate.Hibernate;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
+4
-4
@@ -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.testmaster.client.dto.ApiRequestDTO;
|
||||||
import com.eactive.httpmockserver.client.dto.ApiResponse;
|
import com.eactive.testmaster.client.dto.ApiResponse;
|
||||||
import com.eactive.httpmockserver.client.service.NettyApiClient;
|
import com.eactive.testmaster.client.service.NettyApiClient;
|
||||||
import org.springframework.validation.BindingResult;
|
import org.springframework.validation.BindingResult;
|
||||||
import org.springframework.validation.Validator;
|
import org.springframework.validation.Validator;
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
+3
-3
@@ -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.testmaster.server.entity.Server;
|
||||||
import com.eactive.httpmockserver.server.entity.ServerRepository;
|
import com.eactive.testmaster.server.entity.ServerRepository;
|
||||||
import org.springframework.stereotype.Controller;
|
import org.springframework.stereotype.Controller;
|
||||||
import org.springframework.ui.ModelMap;
|
import org.springframework.ui.ModelMap;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
+10
-10
@@ -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.testmaster.client.dto.ApiCollectionDTO;
|
||||||
import com.eactive.httpmockserver.client.dto.ApiRequestDTO;
|
import com.eactive.testmaster.client.dto.ApiRequestDTO;
|
||||||
import com.eactive.httpmockserver.client.entity.ApiCollection;
|
import com.eactive.testmaster.client.entity.ApiCollection;
|
||||||
import com.eactive.httpmockserver.client.entity.ApiRequestInfo;
|
import com.eactive.testmaster.client.entity.ApiRequestInfo;
|
||||||
import com.eactive.httpmockserver.client.mapper.ApiRequestMapper;
|
import com.eactive.testmaster.client.mapper.ApiRequestMapper;
|
||||||
import com.eactive.httpmockserver.client.service.ApiRequestMgmtService;
|
import com.eactive.testmaster.client.service.ApiRequestMgmtService;
|
||||||
import com.eactive.httpmockserver.common.util.SecurityUtil;
|
import com.eactive.testmaster.common.util.SecurityUtil;
|
||||||
import com.eactive.httpmockserver.user.entity.StaffUser;
|
import com.eactive.testmaster.user.entity.StaffUser;
|
||||||
import com.eactive.httpmockserver.user.service.UserService;
|
import com.eactive.testmaster.user.service.UserService;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
+8
-8
@@ -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.testmaster.client.dto.ApiScenarioDTO;
|
||||||
import com.eactive.httpmockserver.client.entity.ApiScenario;
|
import com.eactive.testmaster.client.entity.ApiScenario;
|
||||||
import com.eactive.httpmockserver.client.mapper.ApiScenarioMapper;
|
import com.eactive.testmaster.client.mapper.ApiScenarioMapper;
|
||||||
import com.eactive.httpmockserver.client.service.ApiScenarioMgmtService;
|
import com.eactive.testmaster.client.service.ApiScenarioMgmtService;
|
||||||
import com.eactive.httpmockserver.common.util.SecurityUtil;
|
import com.eactive.testmaster.common.util.SecurityUtil;
|
||||||
import com.eactive.httpmockserver.user.entity.StaffUser;
|
import com.eactive.testmaster.user.entity.StaffUser;
|
||||||
import com.eactive.httpmockserver.user.service.UserService;
|
import com.eactive.testmaster.user.service.UserService;
|
||||||
import org.springframework.http.HttpStatus;
|
import org.springframework.http.HttpStatus;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.eactive.httpmockserver.client.dto;
|
package com.eactive.testmaster.client.dto;
|
||||||
|
|
||||||
import javax.validation.constraints.NotEmpty;
|
import javax.validation.constraints.NotEmpty;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.eactive.httpmockserver.client.dto;
|
package com.eactive.testmaster.client.dto;
|
||||||
|
|
||||||
import javax.validation.constraints.NotNull;
|
import javax.validation.constraints.NotNull;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.eactive.httpmockserver.client.dto;
|
package com.eactive.testmaster.client.dto;
|
||||||
|
|
||||||
public class ApiRequestKeyValueDTO {
|
public class ApiRequestKeyValueDTO {
|
||||||
|
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.eactive.httpmockserver.client.dto;
|
package com.eactive.testmaster.client.dto;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.eactive.httpmockserver.client.dto;
|
package com.eactive.testmaster.client.dto;
|
||||||
|
|
||||||
public class ApiScenarioDTO {
|
public class ApiScenarioDTO {
|
||||||
|
|
||||||
+2
-2
@@ -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 javax.persistence.*;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
+3
-3
@@ -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.testmaster.server.entity.Server;
|
||||||
import com.eactive.httpmockserver.user.entity.StaffUser;
|
import com.eactive.testmaster.user.entity.StaffUser;
|
||||||
import org.hibernate.annotations.Type;
|
import org.hibernate.annotations.Type;
|
||||||
|
|
||||||
import javax.persistence.*;
|
import javax.persistence.*;
|
||||||
+3
-3
@@ -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.testmaster.server.entity.Server;
|
||||||
import com.eactive.httpmockserver.user.entity.StaffUser;
|
import com.eactive.testmaster.user.entity.StaffUser;
|
||||||
|
|
||||||
import javax.persistence.*;
|
import javax.persistence.*;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
+2
-2
@@ -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 javax.persistence.*;
|
||||||
|
|
||||||
+7
-7
@@ -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.testmaster.client.dto.ApiCollectionDTO;
|
||||||
import com.eactive.httpmockserver.client.dto.ApiRequestDTO;
|
import com.eactive.testmaster.client.dto.ApiRequestDTO;
|
||||||
import com.eactive.httpmockserver.client.entity.ApiCollection;
|
import com.eactive.testmaster.client.entity.ApiCollection;
|
||||||
import com.eactive.httpmockserver.client.entity.ApiRequestInfo;
|
import com.eactive.testmaster.client.entity.ApiRequestInfo;
|
||||||
import com.eactive.httpmockserver.common.mapper.CommonMapper;
|
import com.eactive.testmaster.common.mapper.CommonMapper;
|
||||||
import com.eactive.httpmockserver.server.mapper.ServerMapper;
|
import com.eactive.testmaster.server.mapper.ServerMapper;
|
||||||
import org.mapstruct.Mapper;
|
import org.mapstruct.Mapper;
|
||||||
import org.mapstruct.ReportingPolicy;
|
import org.mapstruct.ReportingPolicy;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
+3
-3
@@ -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.testmaster.client.dto.ApiScenarioDTO;
|
||||||
import com.eactive.httpmockserver.client.entity.ApiScenario;
|
import com.eactive.testmaster.client.entity.ApiScenario;
|
||||||
import org.mapstruct.Mapper;
|
import org.mapstruct.Mapper;
|
||||||
import org.mapstruct.ReportingPolicy;
|
import org.mapstruct.ReportingPolicy;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
+3
-3
@@ -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.testmaster.client.entity.ApiCollection;
|
||||||
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.JpaRepository;
|
||||||
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
||||||
|
|
||||||
+2
-2
@@ -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.JpaRepository;
|
||||||
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
||||||
|
|
||||||
+3
-3
@@ -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.testmaster.client.entity.ApiScenario;
|
||||||
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.JpaRepository;
|
||||||
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
||||||
|
|
||||||
+7
-7
@@ -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.testmaster.client.entity.ApiCollection;
|
||||||
import com.eactive.httpmockserver.client.entity.ApiRequestInfo;
|
import com.eactive.testmaster.client.entity.ApiRequestInfo;
|
||||||
import com.eactive.httpmockserver.client.repository.ApiCollectionRepository;
|
import com.eactive.testmaster.client.repository.ApiCollectionRepository;
|
||||||
import com.eactive.httpmockserver.client.repository.ApiRequestRepository;
|
import com.eactive.testmaster.client.repository.ApiRequestRepository;
|
||||||
import com.eactive.httpmockserver.common.exception.NotFoundException;
|
import com.eactive.testmaster.common.exception.NotFoundException;
|
||||||
import com.eactive.httpmockserver.user.entity.StaffUser;
|
import com.eactive.testmaster.user.entity.StaffUser;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.thymeleaf.util.StringUtils;
|
import org.thymeleaf.util.StringUtils;
|
||||||
+2
-2
@@ -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.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.boot.context.event.ApplicationReadyEvent;
|
import org.springframework.boot.context.event.ApplicationReadyEvent;
|
||||||
import org.springframework.context.ApplicationContext;
|
import org.springframework.context.ApplicationContext;
|
||||||
+3
-3
@@ -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.testmaster.client.entity.ApiScenario;
|
||||||
import com.eactive.httpmockserver.client.repository.ApiScenarioRepository;
|
import com.eactive.testmaster.client.repository.ApiScenarioRepository;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
+3
-3
@@ -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.testmaster.client.dto.ApiRequestKeyValueDTO;
|
||||||
import com.eactive.httpmockserver.client.dto.ApiResponse;
|
import com.eactive.testmaster.client.dto.ApiResponse;
|
||||||
import io.netty.channel.ChannelHandlerContext;
|
import io.netty.channel.ChannelHandlerContext;
|
||||||
import io.netty.channel.SimpleChannelInboundHandler;
|
import io.netty.channel.SimpleChannelInboundHandler;
|
||||||
import io.netty.handler.codec.http.FullHttpResponse;
|
import io.netty.handler.codec.http.FullHttpResponse;
|
||||||
+7
-8
@@ -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.testmaster.client.dto.ApiRequestDTO;
|
||||||
import com.eactive.httpmockserver.client.dto.ApiRequestKeyValueDTO;
|
import com.eactive.testmaster.client.dto.ApiRequestKeyValueDTO;
|
||||||
import com.eactive.httpmockserver.client.dto.ApiResponse;
|
import com.eactive.testmaster.client.dto.ApiResponse;
|
||||||
import com.eactive.httpmockserver.common.exception.ServerNotFoundException;
|
import com.eactive.testmaster.common.exception.ServerNotFoundException;
|
||||||
import com.eactive.httpmockserver.server.entity.Server;
|
import com.eactive.testmaster.server.entity.Server;
|
||||||
import com.eactive.httpmockserver.server.entity.ServerRepository;
|
import com.eactive.testmaster.server.entity.ServerRepository;
|
||||||
import io.netty.bootstrap.Bootstrap;
|
import io.netty.bootstrap.Bootstrap;
|
||||||
import io.netty.buffer.ByteBuf;
|
import io.netty.buffer.ByteBuf;
|
||||||
import io.netty.buffer.Unpooled;
|
import io.netty.buffer.Unpooled;
|
||||||
@@ -25,7 +25,6 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import javax.net.ssl.SSLException;
|
import javax.net.ssl.SSLException;
|
||||||
import java.lang.reflect.InvocationTargetException;
|
|
||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.eactive.httpmockserver.common.entity;
|
package com.eactive.testmaster.common.entity;
|
||||||
|
|
||||||
import org.hibernate.annotations.Type;
|
import org.hibernate.annotations.Type;
|
||||||
import org.springframework.data.annotation.CreatedBy;
|
import org.springframework.data.annotation.CreatedBy;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.eactive.httpmockserver.common.entity;
|
package com.eactive.testmaster.common.entity;
|
||||||
|
|
||||||
public enum EnabledStatus {
|
public enum EnabledStatus {
|
||||||
Y("사용"),
|
Y("사용"),
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.eactive.httpmockserver.common.exception;
|
package com.eactive.testmaster.common.exception;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
+1
-1
@@ -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.core.annotation.Order;
|
||||||
import org.springframework.http.HttpStatus;
|
import org.springframework.http.HttpStatus;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.eactive.httpmockserver.common.exception;
|
package com.eactive.testmaster.common.exception;
|
||||||
|
|
||||||
public class NotFoundException extends IllegalArgumentException {
|
public class NotFoundException extends IllegalArgumentException {
|
||||||
public NotFoundException(String message) {
|
public NotFoundException(String message) {
|
||||||
+1
-1
@@ -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.boot.web.servlet.error.ErrorController;
|
||||||
import org.springframework.stereotype.Controller;
|
import org.springframework.stereotype.Controller;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.eactive.httpmockserver.common.exception;
|
package com.eactive.testmaster.common.exception;
|
||||||
|
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.eactive.httpmockserver.common.exception;
|
package com.eactive.testmaster.common.exception;
|
||||||
|
|
||||||
public class ServerNotFoundException extends RuntimeException {
|
public class ServerNotFoundException extends RuntimeException {
|
||||||
public ServerNotFoundException(String message) {
|
public ServerNotFoundException(String message) {
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.eactive.httpmockserver.common.exception;
|
package com.eactive.testmaster.common.exception;
|
||||||
|
|
||||||
public class UserNotFoundException extends RuntimeException {
|
public class UserNotFoundException extends RuntimeException {
|
||||||
public UserNotFoundException(String message) {
|
public UserNotFoundException(String message) {
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.eactive.httpmockserver.common.exception;
|
package com.eactive.testmaster.common.exception;
|
||||||
|
|
||||||
public class UserNotLoginException extends RuntimeException {
|
public class UserNotLoginException extends RuntimeException {
|
||||||
|
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.eactive.httpmockserver.common.exception;
|
package com.eactive.testmaster.common.exception;
|
||||||
|
|
||||||
public class UserPasswordResetException extends RuntimeException {
|
public class UserPasswordResetException extends RuntimeException {
|
||||||
public UserPasswordResetException(String message) {
|
public UserPasswordResetException(String message) {
|
||||||
+5
-5
@@ -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.testmaster.common.exception.UserNotLoginException;
|
||||||
import com.eactive.httpmockserver.common.util.SecurityUtil;
|
import com.eactive.testmaster.common.util.SecurityUtil;
|
||||||
import com.eactive.httpmockserver.user.entity.AnonymousUser;
|
import com.eactive.testmaster.user.entity.AnonymousUser;
|
||||||
import com.eactive.httpmockserver.user.entity.User;
|
import com.eactive.testmaster.user.entity.User;
|
||||||
import org.springframework.util.AntPathMatcher;
|
import org.springframework.util.AntPathMatcher;
|
||||||
import org.springframework.web.servlet.AsyncHandlerInterceptor;
|
import org.springframework.web.servlet.AsyncHandlerInterceptor;
|
||||||
|
|
||||||
+2
-2
@@ -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.Mapper;
|
||||||
import org.mapstruct.Named;
|
import org.mapstruct.Named;
|
||||||
import org.mapstruct.ReportingPolicy;
|
import org.mapstruct.ReportingPolicy;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.eactive.httpmockserver.common.message;
|
package com.eactive.testmaster.common.message;
|
||||||
|
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.core.io.Resource;
|
import org.springframework.core.io.Resource;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.eactive.httpmockserver.common.search;
|
package com.eactive.testmaster.common.search;
|
||||||
|
|
||||||
import org.springframework.data.jpa.domain.Specification;
|
import org.springframework.data.jpa.domain.Specification;
|
||||||
|
|
||||||
+2
-2
@@ -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.data.jpa.domain.Specification;
|
||||||
import org.springframework.util.ObjectUtils;
|
import org.springframework.util.ObjectUtils;
|
||||||
|
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.eactive.httpmockserver.common.search;
|
package com.eactive.testmaster.common.search;
|
||||||
|
|
||||||
public enum SearchCondition {
|
public enum SearchCondition {
|
||||||
EQUAL,
|
EQUAL,
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.eactive.httpmockserver.common.search;
|
package com.eactive.testmaster.common.search;
|
||||||
|
|
||||||
import org.springframework.data.jpa.domain.Specification;
|
import org.springframework.data.jpa.domain.Specification;
|
||||||
|
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.eactive.httpmockserver.common.search;
|
package com.eactive.testmaster.common.search;
|
||||||
|
|
||||||
import org.springframework.data.jpa.domain.Specification;
|
import org.springframework.data.jpa.domain.Specification;
|
||||||
|
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.eactive.httpmockserver.common.util;
|
package com.eactive.testmaster.common.util;
|
||||||
|
|
||||||
import org.springframework.beans.BeansException;
|
import org.springframework.beans.BeansException;
|
||||||
import org.springframework.context.ApplicationContext;
|
import org.springframework.context.ApplicationContext;
|
||||||
+1
-1
@@ -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.codec.binary.Base64;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.eactive.httpmockserver.common.util;
|
package com.eactive.testmaster.common.util;
|
||||||
|
|
||||||
import java.security.SecureRandom;
|
import java.security.SecureRandom;
|
||||||
|
|
||||||
+3
-3
@@ -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.testmaster.user.entity.AnonymousUser;
|
||||||
import com.eactive.httpmockserver.user.entity.User;
|
import com.eactive.testmaster.user.entity.User;
|
||||||
import org.springframework.security.core.Authentication;
|
import org.springframework.security.core.Authentication;
|
||||||
import org.springframework.security.core.context.SecurityContextHolder;
|
import org.springframework.security.core.context.SecurityContextHolder;
|
||||||
|
|
||||||
+1
-1
@@ -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.hibernate.query.criteria.internal.path.PluralAttributePath;
|
||||||
import org.springframework.data.jpa.domain.Specification;
|
import org.springframework.data.jpa.domain.Specification;
|
||||||
+2
-2
@@ -1,4 +1,4 @@
|
|||||||
package com.eactive.httpmockserver.common.validator;
|
package com.eactive.testmaster.common.validator;
|
||||||
|
|
||||||
import javax.validation.Constraint;
|
import javax.validation.Constraint;
|
||||||
import javax.validation.Payload;
|
import javax.validation.Payload;
|
||||||
@@ -18,4 +18,4 @@ public @interface PasswordMatch {
|
|||||||
String input();
|
String input();
|
||||||
|
|
||||||
String confirm();
|
String confirm();
|
||||||
}
|
}
|
||||||
+2
-2
@@ -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.apache.commons.beanutils.PropertyUtils;
|
||||||
import org.springframework.context.MessageSource;
|
import org.springframework.context.MessageSource;
|
||||||
import org.springframework.context.i18n.LocaleContextHolder;
|
import org.springframework.context.i18n.LocaleContextHolder;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.eactive.httpmockserver.common.validator;
|
package com.eactive.testmaster.common.validator;
|
||||||
|
|
||||||
import javax.validation.Constraint;
|
import javax.validation.Constraint;
|
||||||
import javax.validation.Payload;
|
import javax.validation.Payload;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.eactive.httpmockserver.common.validator;
|
package com.eactive.testmaster.common.validator;
|
||||||
|
|
||||||
import javax.validation.Constraint;
|
import javax.validation.Constraint;
|
||||||
import javax.validation.Payload;
|
import javax.validation.Payload;
|
||||||
+3
-7
@@ -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.testmaster.api.repository.MockRouteRepository;
|
||||||
import com.eactive.httpmockserver.common.exception.UserNotFoundException;
|
import com.eactive.testmaster.common.util.ApplicationContextUtil;
|
||||||
import com.eactive.httpmockserver.common.util.ApplicationContextUtil;
|
|
||||||
import com.eactive.httpmockserver.user.service.UserService;
|
|
||||||
import org.apache.commons.beanutils.PropertyUtils;
|
import org.apache.commons.beanutils.PropertyUtils;
|
||||||
import org.springframework.context.MessageSource;
|
|
||||||
import org.springframework.context.i18n.LocaleContextHolder;
|
|
||||||
|
|
||||||
import javax.validation.ConstraintValidator;
|
import javax.validation.ConstraintValidator;
|
||||||
import javax.validation.ConstraintValidatorContext;
|
import javax.validation.ConstraintValidatorContext;
|
||||||
+4
-4
@@ -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.testmaster.common.exception.UserNotFoundException;
|
||||||
import com.eactive.httpmockserver.common.util.ApplicationContextUtil;
|
import com.eactive.testmaster.common.util.ApplicationContextUtil;
|
||||||
import com.eactive.httpmockserver.user.service.UserService;
|
import com.eactive.testmaster.user.service.UserService;
|
||||||
|
|
||||||
import javax.validation.ConstraintValidator;
|
import javax.validation.ConstraintValidator;
|
||||||
import javax.validation.ConstraintValidatorContext;
|
import javax.validation.ConstraintValidatorContext;
|
||||||
+3
-3
@@ -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 org.springframework.data.domain.AuditorAware;
|
||||||
|
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
@@ -12,4 +12,4 @@ public class AuditorAwareImpl implements AuditorAware<String> {
|
|||||||
return Optional.ofNullable(SecurityUtil.getCurrentUserEsntlId());
|
return Optional.ofNullable(SecurityUtil.getCurrentUserEsntlId());
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
+8
-8
@@ -1,12 +1,12 @@
|
|||||||
package com.eactive.httpmockserver.config;
|
package com.eactive.testmaster.config;
|
||||||
|
|
||||||
import com.eactive.httpmockserver.common.entity.EnabledStatus;
|
import com.eactive.testmaster.common.entity.EnabledStatus;
|
||||||
import com.eactive.httpmockserver.common.exception.UserNotFoundException;
|
import com.eactive.testmaster.common.exception.UserNotFoundException;
|
||||||
import com.eactive.httpmockserver.login.controller.LoginController;
|
import com.eactive.testmaster.login.controller.LoginController;
|
||||||
import com.eactive.httpmockserver.user.entity.StaffUser;
|
import com.eactive.testmaster.user.entity.StaffUser;
|
||||||
import com.eactive.httpmockserver.user.entity.User;
|
import com.eactive.testmaster.user.entity.User;
|
||||||
import com.eactive.httpmockserver.user.repository.StaffUserRepository;
|
import com.eactive.testmaster.user.repository.StaffUserRepository;
|
||||||
import com.eactive.httpmockserver.user.service.UserService;
|
import com.eactive.testmaster.user.service.UserService;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.security.core.AuthenticationException;
|
import org.springframework.security.core.AuthenticationException;
|
||||||
+4
-4
@@ -1,9 +1,9 @@
|
|||||||
package com.eactive.httpmockserver.config;
|
package com.eactive.testmaster.config;
|
||||||
|
|
||||||
|
|
||||||
import com.eactive.httpmockserver.common.util.EncryptionUtil;
|
import com.eactive.testmaster.common.util.EncryptionUtil;
|
||||||
import com.eactive.httpmockserver.user.entity.User;
|
import com.eactive.testmaster.user.entity.User;
|
||||||
import com.eactive.httpmockserver.user.service.UserService;
|
import com.eactive.testmaster.user.service.UserService;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.security.authentication.*;
|
import org.springframework.security.authentication.*;
|
||||||
import org.springframework.security.core.Authentication;
|
import org.springframework.security.core.Authentication;
|
||||||
+3
-3
@@ -1,7 +1,7 @@
|
|||||||
package com.eactive.httpmockserver.config;
|
package com.eactive.testmaster.config;
|
||||||
|
|
||||||
import com.eactive.httpmockserver.user.entity.User;
|
import com.eactive.testmaster.user.entity.User;
|
||||||
import com.eactive.httpmockserver.user.service.UserService;
|
import com.eactive.testmaster.user.service.UserService;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.security.core.Authentication;
|
import org.springframework.security.core.Authentication;
|
||||||
import org.springframework.security.core.userdetails.UserDetails;
|
import org.springframework.security.core.userdetails.UserDetails;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.eactive.httpmockserver.config;
|
package com.eactive.testmaster.config;
|
||||||
|
|
||||||
import org.springframework.boot.autoconfigure.domain.EntityScan;
|
import org.springframework.boot.autoconfigure.domain.EntityScan;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
+2
-2
@@ -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.MessageSource;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.eactive.httpmockserver.config;
|
package com.eactive.testmaster.config;
|
||||||
|
|
||||||
|
|
||||||
import com.navercorp.lucy.security.xss.servletfilter.XssEscapeServletFilter;
|
import com.navercorp.lucy.security.xss.servletfilter.XssEscapeServletFilter;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.eactive.httpmockserver.config;
|
package com.eactive.testmaster.config;
|
||||||
|
|
||||||
import org.apache.catalina.connector.Connector;
|
import org.apache.catalina.connector.Connector;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
+2
-2
@@ -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.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
import org.springframework.core.Ordered;
|
import org.springframework.core.Ordered;
|
||||||
+2
-2
@@ -1,4 +1,4 @@
|
|||||||
package com.eactive.httpmockserver.home;
|
package com.eactive.testmaster.home;
|
||||||
|
|
||||||
import org.springframework.stereotype.Controller;
|
import org.springframework.stereotype.Controller;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
@@ -10,4 +10,4 @@ public class HomeController {
|
|||||||
public String home() {
|
public String home() {
|
||||||
return "redirect:/mgmt/routes/list_view.do";
|
return "redirect:/mgmt/routes/list_view.do";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+2
-4
@@ -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.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.security.core.Authentication;
|
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.stereotype.Controller;
|
||||||
import org.springframework.ui.ModelMap;
|
import org.springframework.ui.ModelMap;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
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.RequestParam;
|
||||||
import org.springframework.web.bind.annotation.ResponseBody;
|
import org.springframework.web.bind.annotation.ResponseBody;
|
||||||
import org.springframework.web.servlet.ModelAndView;
|
|
||||||
|
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.eactive.httpmockserver.login.dto;
|
package com.eactive.testmaster.login.dto;
|
||||||
|
|
||||||
public class FindIdRequest {
|
public class FindIdRequest {
|
||||||
|
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.eactive.httpmockserver.login.dto;
|
package com.eactive.testmaster.login.dto;
|
||||||
|
|
||||||
public class LoginRequestDTO {
|
public class LoginRequestDTO {
|
||||||
|
|
||||||
+2
-2
@@ -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;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 로그인을 처리하는 비즈니스 인터페이스 클래스
|
* 로그인을 처리하는 비즈니스 인터페이스 클래스
|
||||||
+6
-6
@@ -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.testmaster.common.entity.EnabledStatus;
|
||||||
import com.eactive.httpmockserver.login.dto.LoginRequestDTO;
|
import com.eactive.testmaster.login.dto.LoginRequestDTO;
|
||||||
import com.eactive.httpmockserver.login.service.LoginService;
|
import com.eactive.testmaster.login.service.LoginService;
|
||||||
import com.eactive.httpmockserver.user.entity.User;
|
import com.eactive.testmaster.user.entity.User;
|
||||||
import com.eactive.httpmockserver.user.service.UserService;
|
import com.eactive.testmaster.user.service.UserService;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Propagation;
|
import org.springframework.transaction.annotation.Propagation;
|
||||||
+6
-6
@@ -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.testmaster.server.dto.ServerDTO;
|
||||||
import com.eactive.httpmockserver.server.dto.ServerSearch;
|
import com.eactive.testmaster.server.dto.ServerSearch;
|
||||||
import com.eactive.httpmockserver.server.entity.Server;
|
import com.eactive.testmaster.server.entity.Server;
|
||||||
import com.eactive.httpmockserver.server.mapper.ServerMapper;
|
import com.eactive.testmaster.server.mapper.ServerMapper;
|
||||||
import com.eactive.httpmockserver.server.service.ServerMgmtService;
|
import com.eactive.testmaster.server.service.ServerMgmtService;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.data.domain.Page;
|
import org.springframework.data.domain.Page;
|
||||||
import org.springframework.data.domain.Pageable;
|
import org.springframework.data.domain.Pageable;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.eactive.httpmockserver.server.dto;
|
package com.eactive.testmaster.server.dto;
|
||||||
|
|
||||||
import javax.validation.constraints.NotEmpty;
|
import javax.validation.constraints.NotEmpty;
|
||||||
|
|
||||||
+6
-6
@@ -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.testmaster.common.search.BaseSearch;
|
||||||
import com.eactive.httpmockserver.common.search.ColumnSearchModel;
|
import com.eactive.testmaster.common.search.ColumnSearchModel;
|
||||||
import com.eactive.httpmockserver.common.search.SearchCondition;
|
import com.eactive.testmaster.common.search.SearchCondition;
|
||||||
import com.eactive.httpmockserver.common.search.SearchModel;
|
import com.eactive.testmaster.common.search.SearchModel;
|
||||||
import com.eactive.httpmockserver.server.entity.Server;
|
import com.eactive.testmaster.server.entity.Server;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.eactive.httpmockserver.server.entity;
|
package com.eactive.testmaster.server.entity;
|
||||||
|
|
||||||
import javax.persistence.*;
|
import javax.persistence.*;
|
||||||
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user