From 169ba6448cd0f6bf4e01db907d2151a0ea53d59b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=ED=98=84=EC=84=B1=ED=95=84?= Date: Mon, 27 Mar 2023 16:38:22 +0900 Subject: [PATCH] =?UTF-8?q?package=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 0 .../httpmockserver/EchoServiceController.java | 42 ---------------- ...on.java => HttpMockServerApplication.java} | 4 +- .../httpmockserver/PostConstructBean.java | 5 +- .../{ => api/controller}/ApiController.java | 32 ++++++------- .../controller}/ApiManageController.java | 14 +++--- .../controller}/ApiManageRestController.java | 42 +++++++--------- .../api/controller/EchoServiceController.java | 36 ++++++++++++++ .../HttpRequestInfoController.java | 48 ++++++++----------- .../httpmockserver/{ => api/dao}/ApiDao.java | 7 +-- .../{ => api/dao}/ApiServiceKeyDao.java | 3 +- .../{ => api/dao}/HttpRequestInfoDao.java | 3 +- .../{ => api/entity}/ApiInfo.java | 15 ++---- .../{ => api/entity}/ApiServiceKey.java | 13 ++--- .../{ => api/entity}/HttpRequestInfo.java | 14 ++---- .../{ => api/service}/ApiService.java | 9 ++-- .../service}/ApiServiceKeyService.java | 9 ++-- .../service}/HttpRequestInfoService.java | 9 ++-- .../service/impl}/ApiServiceImpl.java | 15 +++--- .../impl}/ApiServiceKeyServiceImpl.java | 13 +++-- .../impl}/HttpRequestInfoServiceImpl.java | 13 +++-- .../httpmockserver/script/ScriptLoader.java | 10 ++-- .../{ => controller}/ScriptController.java | 13 ++--- .../script/{ => dao}/ScriptInfoDao.java | 4 +- .../script/{ => entity}/ScriptInfo.java | 2 +- .../{ => service}/ScriptInfoService.java | 3 +- .../{ => service}/ScriptInfoServiceImpl.java | 4 +- .../socket/BytesMessageSpec.java | 19 ++------ .../socket/BytesMessageSpecService.java | 6 +-- .../socket/BytesMessageSpecServiceImpl.java | 8 ++-- .../socket/EchoReplaceString.java | 9 +--- .../socket/EchoSocketServer.java | 19 +++----- .../socket/EchoSocketServerHandler.java | 15 +++--- .../socket/LengthHeaderFrameDecoder.java | 13 +++-- .../socket/SocketServerManageController.java | 25 ++++------ 35 files changed, 217 insertions(+), 279 deletions(-) create mode 100644 gradle.properties delete mode 100644 src/main/java/com/eactive/httpmockserver/EchoServiceController.java rename src/main/java/com/eactive/httpmockserver/{HttpmockserverApplication.java => HttpMockServerApplication.java} (68%) rename src/main/java/com/eactive/httpmockserver/{ => api/controller}/ApiController.java (96%) rename src/main/java/com/eactive/httpmockserver/{ => api/controller}/ApiManageController.java (91%) rename src/main/java/com/eactive/httpmockserver/{ => api/controller}/ApiManageRestController.java (90%) create mode 100644 src/main/java/com/eactive/httpmockserver/api/controller/EchoServiceController.java rename src/main/java/com/eactive/httpmockserver/{ => api/controller}/HttpRequestInfoController.java (93%) rename src/main/java/com/eactive/httpmockserver/{ => api/dao}/ApiDao.java (94%) rename src/main/java/com/eactive/httpmockserver/{ => api/dao}/ApiServiceKeyDao.java (70%) rename src/main/java/com/eactive/httpmockserver/{ => api/dao}/HttpRequestInfoDao.java (66%) rename src/main/java/com/eactive/httpmockserver/{ => api/entity}/ApiInfo.java (92%) rename src/main/java/com/eactive/httpmockserver/{ => api/entity}/ApiServiceKey.java (80%) rename src/main/java/com/eactive/httpmockserver/{ => api/entity}/HttpRequestInfo.java (89%) rename src/main/java/com/eactive/httpmockserver/{ => api/service}/ApiService.java (88%) rename src/main/java/com/eactive/httpmockserver/{ => api/service}/ApiServiceKeyService.java (86%) rename src/main/java/com/eactive/httpmockserver/{ => api/service}/HttpRequestInfoService.java (85%) rename src/main/java/com/eactive/httpmockserver/{ => api/service/impl}/ApiServiceImpl.java (91%) rename src/main/java/com/eactive/httpmockserver/{ => api/service/impl}/ApiServiceKeyServiceImpl.java (89%) rename src/main/java/com/eactive/httpmockserver/{ => api/service/impl}/HttpRequestInfoServiceImpl.java (90%) rename src/main/java/com/eactive/httpmockserver/script/{ => controller}/ScriptController.java (93%) rename src/main/java/com/eactive/httpmockserver/script/{ => dao}/ScriptInfoDao.java (81%) rename src/main/java/com/eactive/httpmockserver/script/{ => entity}/ScriptInfo.java (96%) rename src/main/java/com/eactive/httpmockserver/script/{ => service}/ScriptInfoService.java (86%) rename src/main/java/com/eactive/httpmockserver/script/{ => service}/ScriptInfoServiceImpl.java (93%) diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/eactive/httpmockserver/EchoServiceController.java b/src/main/java/com/eactive/httpmockserver/EchoServiceController.java deleted file mode 100644 index 2f11cf0..0000000 --- a/src/main/java/com/eactive/httpmockserver/EchoServiceController.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.eactive.httpmockserver; - -import org.apache.commons.io.IOUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.http.HttpStatus; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletRequest; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -@RestController -@RequestMapping("/echo") -public class EchoServiceController { - - Logger logger = LoggerFactory.getLogger(EchoServiceController.class); - - public static int count=0; - public static Object mon=new Object(); - - public static Map responseMap = new ConcurrentHashMap(); - - @PostMapping - @ResponseStatus(value = HttpStatus.OK) - public byte[] service(HttpServletRequest requestEntity) throws FileNotFoundException, IOException{ - String readString = null; - byte[] readByte = null; - try { - readByte = IOUtils.toByteArray(requestEntity.getInputStream()); - readString = new String(readByte); - } catch (IOException e) { - e.printStackTrace(); - } - logger.debug("echo \n"+readString); - - return readByte; - } -} diff --git a/src/main/java/com/eactive/httpmockserver/HttpmockserverApplication.java b/src/main/java/com/eactive/httpmockserver/HttpMockServerApplication.java similarity index 68% rename from src/main/java/com/eactive/httpmockserver/HttpmockserverApplication.java rename to src/main/java/com/eactive/httpmockserver/HttpMockServerApplication.java index b4581cb..9eec51e 100644 --- a/src/main/java/com/eactive/httpmockserver/HttpmockserverApplication.java +++ b/src/main/java/com/eactive/httpmockserver/HttpMockServerApplication.java @@ -4,10 +4,10 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication -public class HttpmockserverApplication { +public class HttpMockServerApplication { public static void main(String[] args) { - SpringApplication.run(HttpmockserverApplication.class, args); + SpringApplication.run(HttpMockServerApplication.class, args); } } diff --git a/src/main/java/com/eactive/httpmockserver/PostConstructBean.java b/src/main/java/com/eactive/httpmockserver/PostConstructBean.java index 6d1c525..3518d37 100644 --- a/src/main/java/com/eactive/httpmockserver/PostConstructBean.java +++ b/src/main/java/com/eactive/httpmockserver/PostConstructBean.java @@ -1,8 +1,7 @@ package com.eactive.httpmockserver; -import com.eactive.httpmockserver.script.ScriptInfoService; +import com.eactive.httpmockserver.script.service.ScriptInfoService; import com.eactive.httpmockserver.script.ScriptLoader; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -10,8 +9,6 @@ import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; import java.net.URISyntaxException; -import java.net.URL; -import java.nio.file.Paths; @Component public class PostConstructBean { diff --git a/src/main/java/com/eactive/httpmockserver/ApiController.java b/src/main/java/com/eactive/httpmockserver/api/controller/ApiController.java similarity index 96% rename from src/main/java/com/eactive/httpmockserver/ApiController.java rename to src/main/java/com/eactive/httpmockserver/api/controller/ApiController.java index 8507233..7824265 100644 --- a/src/main/java/com/eactive/httpmockserver/ApiController.java +++ b/src/main/java/com/eactive/httpmockserver/api/controller/ApiController.java @@ -1,30 +1,28 @@ -package com.eactive.httpmockserver; - -import java.util.Map; -import java.util.Map.Entry; -import java.util.Random; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +package com.eactive.httpmockserver.api.controller; +import com.eactive.httpmockserver.api.entity.ApiInfo; +import com.eactive.httpmockserver.api.entity.ApiServiceKey; +import com.eactive.httpmockserver.script.Script; +import com.eactive.httpmockserver.script.ScriptLoader; +import com.eactive.httpmockserver.api.service.ApiService; +import com.eactive.httpmockserver.api.service.ApiServiceKeyService; +import com.jayway.jsonpath.DocumentContext; +import com.jayway.jsonpath.JsonPath; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpEntity; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; +import org.springframework.http.*; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.server.ResponseStatusException; -import com.eactive.httpmockserver.script.Script; -import com.eactive.httpmockserver.script.ScriptLoader; -import com.jayway.jsonpath.DocumentContext; -import com.jayway.jsonpath.JsonPath; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Random; @Controller public class ApiController { diff --git a/src/main/java/com/eactive/httpmockserver/ApiManageController.java b/src/main/java/com/eactive/httpmockserver/api/controller/ApiManageController.java similarity index 91% rename from src/main/java/com/eactive/httpmockserver/ApiManageController.java rename to src/main/java/com/eactive/httpmockserver/api/controller/ApiManageController.java index 4044e13..230d39b 100644 --- a/src/main/java/com/eactive/httpmockserver/ApiManageController.java +++ b/src/main/java/com/eactive/httpmockserver/api/controller/ApiManageController.java @@ -1,9 +1,10 @@ -package com.eactive.httpmockserver; - -import java.util.Optional; - -import javax.validation.Valid; +package com.eactive.httpmockserver.api.controller; +import com.eactive.httpmockserver.api.entity.ApiInfo; +import com.eactive.httpmockserver.api.entity.ApiServiceKey; +import com.eactive.httpmockserver.script.service.ScriptInfoService; +import com.eactive.httpmockserver.api.service.ApiService; +import com.eactive.httpmockserver.api.service.ApiServiceKeyService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpMethod; @@ -16,7 +17,8 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; -import com.eactive.httpmockserver.script.ScriptInfoService; +import javax.validation.Valid; +import java.util.Optional; @Controller public class ApiManageController { diff --git a/src/main/java/com/eactive/httpmockserver/ApiManageRestController.java b/src/main/java/com/eactive/httpmockserver/api/controller/ApiManageRestController.java similarity index 90% rename from src/main/java/com/eactive/httpmockserver/ApiManageRestController.java rename to src/main/java/com/eactive/httpmockserver/api/controller/ApiManageRestController.java index f120a4d..c202d09 100644 --- a/src/main/java/com/eactive/httpmockserver/ApiManageRestController.java +++ b/src/main/java/com/eactive/httpmockserver/api/controller/ApiManageRestController.java @@ -1,31 +1,25 @@ -package com.eactive.httpmockserver; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Example; -import org.springframework.data.domain.ExampleMatcher; -import org.springframework.data.domain.ExampleMatcher.GenericPropertyMatcher; -import org.springframework.data.domain.PageRequest; -import org.springframework.data.domain.Pageable; -import org.springframework.data.domain.Sort; -import org.springframework.data.domain.Sort.Direction; -import org.springframework.data.domain.Sort.Order; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.server.ResponseStatusException; +package com.eactive.httpmockserver.api.controller; import com.eactive.httpmockserver.datatables.Column; import com.eactive.httpmockserver.datatables.DataTablesRequest; import com.eactive.httpmockserver.datatables.DataTablesResponse; +import com.eactive.httpmockserver.api.entity.ApiInfo; +import com.eactive.httpmockserver.api.entity.ApiServiceKey; +import com.eactive.httpmockserver.api.service.ApiService; +import com.eactive.httpmockserver.api.service.ApiServiceKeyService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.*; +import org.springframework.data.domain.ExampleMatcher.GenericPropertyMatcher; +import org.springframework.data.domain.Sort.Direction; +import org.springframework.data.domain.Sort.Order; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.server.ResponseStatusException; + +import java.util.ArrayList; +import java.util.List; @RestController @RequestMapping("/manage") diff --git a/src/main/java/com/eactive/httpmockserver/api/controller/EchoServiceController.java b/src/main/java/com/eactive/httpmockserver/api/controller/EchoServiceController.java new file mode 100644 index 0000000..8abb5e6 --- /dev/null +++ b/src/main/java/com/eactive/httpmockserver/api/controller/EchoServiceController.java @@ -0,0 +1,36 @@ +package com.eactive.httpmockserver.api.controller; + +import org.apache.commons.io.IOUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; +import java.io.IOException; + +@RestController +@RequestMapping("/echo") +public class EchoServiceController { + + Logger logger = LoggerFactory.getLogger(EchoServiceController.class); + + @PostMapping + @ResponseStatus(value = HttpStatus.OK) + public byte[] service(HttpServletRequest requestEntity) throws IOException { + String readString = null; + byte[] readByte = null; + try { + readByte = IOUtils.toByteArray(requestEntity.getInputStream()); + readString = new String(readByte); + } catch (IOException e) { + e.printStackTrace(); + } + logger.debug("echo \n{}", readString); + + return readByte; + } +} diff --git a/src/main/java/com/eactive/httpmockserver/HttpRequestInfoController.java b/src/main/java/com/eactive/httpmockserver/api/controller/HttpRequestInfoController.java similarity index 93% rename from src/main/java/com/eactive/httpmockserver/HttpRequestInfoController.java rename to src/main/java/com/eactive/httpmockserver/api/controller/HttpRequestInfoController.java index f23d68e..f07b067 100644 --- a/src/main/java/com/eactive/httpmockserver/HttpRequestInfoController.java +++ b/src/main/java/com/eactive/httpmockserver/api/controller/HttpRequestInfoController.java @@ -1,30 +1,16 @@ -package com.eactive.httpmockserver; - -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; -import java.nio.charset.StandardCharsets; -import java.security.KeyManagementException; -import java.security.KeyStoreException; -import java.security.NoSuchAlgorithmException; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; - -import javax.validation.Valid; +package com.eactive.httpmockserver.api.controller; +import com.eactive.httpmockserver.HttpResponseInfo; +import com.eactive.httpmockserver.datatables.DataTablesRequest; +import com.eactive.httpmockserver.datatables.DataTablesResponse; +import com.eactive.httpmockserver.api.entity.HttpRequestInfo; +import com.eactive.httpmockserver.api.service.HttpRequestInfoService; import org.apache.commons.lang3.StringUtils; import org.apache.http.Header; import org.apache.http.HttpEntity; import org.apache.http.NameValuePair; import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpDelete; -import org.apache.http.client.methods.HttpEntityEnclosingRequestBase; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpPut; -import org.apache.http.client.methods.HttpRequestBase; +import org.apache.http.client.methods.*; import org.apache.http.client.utils.URIBuilder; import org.apache.http.conn.ssl.NoopHostnameVerifier; import org.apache.http.conn.ssl.SSLConnectionSocketFactory; @@ -48,15 +34,19 @@ import org.springframework.http.MediaType; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; -import com.eactive.httpmockserver.datatables.DataTablesRequest; -import com.eactive.httpmockserver.datatables.DataTablesResponse; +import javax.validation.Valid; +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.nio.charset.StandardCharsets; +import java.security.KeyManagementException; +import java.security.KeyStoreException; +import java.security.NoSuchAlgorithmException; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; @Controller public class HttpRequestInfoController { diff --git a/src/main/java/com/eactive/httpmockserver/ApiDao.java b/src/main/java/com/eactive/httpmockserver/api/dao/ApiDao.java similarity index 94% rename from src/main/java/com/eactive/httpmockserver/ApiDao.java rename to src/main/java/com/eactive/httpmockserver/api/dao/ApiDao.java index 9879b9e..79c90dd 100644 --- a/src/main/java/com/eactive/httpmockserver/ApiDao.java +++ b/src/main/java/com/eactive/httpmockserver/api/dao/ApiDao.java @@ -1,7 +1,6 @@ -package com.eactive.httpmockserver; - -import java.util.List; +package com.eactive.httpmockserver.api.dao; +import com.eactive.httpmockserver.api.entity.ApiInfo; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; @@ -9,6 +8,8 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import java.util.List; + @Repository public interface ApiDao extends JpaRepository { ApiInfo findByUrlAndServiceValue(String url, String serviceValue); diff --git a/src/main/java/com/eactive/httpmockserver/ApiServiceKeyDao.java b/src/main/java/com/eactive/httpmockserver/api/dao/ApiServiceKeyDao.java similarity index 70% rename from src/main/java/com/eactive/httpmockserver/ApiServiceKeyDao.java rename to src/main/java/com/eactive/httpmockserver/api/dao/ApiServiceKeyDao.java index 56b78bb..0c77c1f 100644 --- a/src/main/java/com/eactive/httpmockserver/ApiServiceKeyDao.java +++ b/src/main/java/com/eactive/httpmockserver/api/dao/ApiServiceKeyDao.java @@ -1,5 +1,6 @@ -package com.eactive.httpmockserver; +package com.eactive.httpmockserver.api.dao; +import com.eactive.httpmockserver.api.entity.ApiServiceKey; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/eactive/httpmockserver/HttpRequestInfoDao.java b/src/main/java/com/eactive/httpmockserver/api/dao/HttpRequestInfoDao.java similarity index 66% rename from src/main/java/com/eactive/httpmockserver/HttpRequestInfoDao.java rename to src/main/java/com/eactive/httpmockserver/api/dao/HttpRequestInfoDao.java index c7af1fc..15679e2 100644 --- a/src/main/java/com/eactive/httpmockserver/HttpRequestInfoDao.java +++ b/src/main/java/com/eactive/httpmockserver/api/dao/HttpRequestInfoDao.java @@ -1,5 +1,6 @@ -package com.eactive.httpmockserver; +package com.eactive.httpmockserver.api.dao; +import com.eactive.httpmockserver.api.entity.HttpRequestInfo; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/eactive/httpmockserver/ApiInfo.java b/src/main/java/com/eactive/httpmockserver/api/entity/ApiInfo.java similarity index 92% rename from src/main/java/com/eactive/httpmockserver/ApiInfo.java rename to src/main/java/com/eactive/httpmockserver/api/entity/ApiInfo.java index 0d5ffd2..97a5470 100644 --- a/src/main/java/com/eactive/httpmockserver/ApiInfo.java +++ b/src/main/java/com/eactive/httpmockserver/api/entity/ApiInfo.java @@ -1,19 +1,10 @@ -package com.eactive.httpmockserver; +package com.eactive.httpmockserver.api.entity; -import java.io.Serializable; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.Lob; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import javax.persistence.*; import javax.validation.constraints.Digits; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Positive; +import java.io.Serializable; @SuppressWarnings("serial") @Entity diff --git a/src/main/java/com/eactive/httpmockserver/ApiServiceKey.java b/src/main/java/com/eactive/httpmockserver/api/entity/ApiServiceKey.java similarity index 80% rename from src/main/java/com/eactive/httpmockserver/ApiServiceKey.java rename to src/main/java/com/eactive/httpmockserver/api/entity/ApiServiceKey.java index 501c644..a95da34 100644 --- a/src/main/java/com/eactive/httpmockserver/ApiServiceKey.java +++ b/src/main/java/com/eactive/httpmockserver/api/entity/ApiServiceKey.java @@ -1,15 +1,8 @@ -package com.eactive.httpmockserver; +package com.eactive.httpmockserver.api.entity; -import java.io.Serializable; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import javax.persistence.*; import javax.validation.constraints.NotBlank; +import java.io.Serializable; @SuppressWarnings("serial") @Entity diff --git a/src/main/java/com/eactive/httpmockserver/HttpRequestInfo.java b/src/main/java/com/eactive/httpmockserver/api/entity/HttpRequestInfo.java similarity index 89% rename from src/main/java/com/eactive/httpmockserver/HttpRequestInfo.java rename to src/main/java/com/eactive/httpmockserver/api/entity/HttpRequestInfo.java index 1308551..2cec89c 100644 --- a/src/main/java/com/eactive/httpmockserver/HttpRequestInfo.java +++ b/src/main/java/com/eactive/httpmockserver/api/entity/HttpRequestInfo.java @@ -1,16 +1,8 @@ -package com.eactive.httpmockserver; +package com.eactive.httpmockserver.api.entity; -import java.io.Serializable; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.Lob; -import javax.persistence.Table; +import javax.persistence.*; import javax.validation.constraints.NotBlank; +import java.io.Serializable; @SuppressWarnings("serial") @Entity diff --git a/src/main/java/com/eactive/httpmockserver/ApiService.java b/src/main/java/com/eactive/httpmockserver/api/service/ApiService.java similarity index 88% rename from src/main/java/com/eactive/httpmockserver/ApiService.java rename to src/main/java/com/eactive/httpmockserver/api/service/ApiService.java index c465b80..3ca014b 100644 --- a/src/main/java/com/eactive/httpmockserver/ApiService.java +++ b/src/main/java/com/eactive/httpmockserver/api/service/ApiService.java @@ -1,11 +1,12 @@ -package com.eactive.httpmockserver; +package com.eactive.httpmockserver.api.service; + +import com.eactive.httpmockserver.api.entity.ApiInfo; +import org.springframework.data.domain.Example; +import org.springframework.data.domain.Pageable; import java.util.List; import java.util.Optional; -import org.springframework.data.domain.Example; -import org.springframework.data.domain.Pageable; - public interface ApiService { public Optional findById(Long id); diff --git a/src/main/java/com/eactive/httpmockserver/ApiServiceKeyService.java b/src/main/java/com/eactive/httpmockserver/api/service/ApiServiceKeyService.java similarity index 86% rename from src/main/java/com/eactive/httpmockserver/ApiServiceKeyService.java rename to src/main/java/com/eactive/httpmockserver/api/service/ApiServiceKeyService.java index 0898aaf..1aac597 100644 --- a/src/main/java/com/eactive/httpmockserver/ApiServiceKeyService.java +++ b/src/main/java/com/eactive/httpmockserver/api/service/ApiServiceKeyService.java @@ -1,11 +1,12 @@ -package com.eactive.httpmockserver; +package com.eactive.httpmockserver.api.service; + +import com.eactive.httpmockserver.api.entity.ApiServiceKey; +import org.springframework.data.domain.Example; +import org.springframework.data.domain.Pageable; import java.util.List; import java.util.Optional; -import org.springframework.data.domain.Example; -import org.springframework.data.domain.Pageable; - public interface ApiServiceKeyService { public ApiServiceKey save(ApiServiceKey apiServiceKey); diff --git a/src/main/java/com/eactive/httpmockserver/HttpRequestInfoService.java b/src/main/java/com/eactive/httpmockserver/api/service/HttpRequestInfoService.java similarity index 85% rename from src/main/java/com/eactive/httpmockserver/HttpRequestInfoService.java rename to src/main/java/com/eactive/httpmockserver/api/service/HttpRequestInfoService.java index bccd5bd..a698e28 100644 --- a/src/main/java/com/eactive/httpmockserver/HttpRequestInfoService.java +++ b/src/main/java/com/eactive/httpmockserver/api/service/HttpRequestInfoService.java @@ -1,11 +1,12 @@ -package com.eactive.httpmockserver; +package com.eactive.httpmockserver.api.service; + +import com.eactive.httpmockserver.api.entity.HttpRequestInfo; +import org.springframework.data.domain.Example; +import org.springframework.data.domain.Pageable; import java.util.List; import java.util.Optional; -import org.springframework.data.domain.Example; -import org.springframework.data.domain.Pageable; - public interface HttpRequestInfoService { public Optional findById(Long id); diff --git a/src/main/java/com/eactive/httpmockserver/ApiServiceImpl.java b/src/main/java/com/eactive/httpmockserver/api/service/impl/ApiServiceImpl.java similarity index 91% rename from src/main/java/com/eactive/httpmockserver/ApiServiceImpl.java rename to src/main/java/com/eactive/httpmockserver/api/service/impl/ApiServiceImpl.java index 28c0885..cc349a6 100644 --- a/src/main/java/com/eactive/httpmockserver/ApiServiceImpl.java +++ b/src/main/java/com/eactive/httpmockserver/api/service/impl/ApiServiceImpl.java @@ -1,9 +1,8 @@ -package com.eactive.httpmockserver; - -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; +package com.eactive.httpmockserver.api.service.impl; +import com.eactive.httpmockserver.api.dao.ApiDao; +import com.eactive.httpmockserver.api.entity.ApiInfo; +import com.eactive.httpmockserver.api.service.ApiService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Example; import org.springframework.data.domain.Page; @@ -12,6 +11,10 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + @Service @Transactional(propagation = Propagation.SUPPORTS) public class ApiServiceImpl implements ApiService { @@ -34,7 +37,7 @@ public class ApiServiceImpl implements ApiService { if (pagedResult.hasContent()) { return pagedResult.getContent(); } else { - return new ArrayList(); + return new ArrayList<>(); } } diff --git a/src/main/java/com/eactive/httpmockserver/ApiServiceKeyServiceImpl.java b/src/main/java/com/eactive/httpmockserver/api/service/impl/ApiServiceKeyServiceImpl.java similarity index 89% rename from src/main/java/com/eactive/httpmockserver/ApiServiceKeyServiceImpl.java rename to src/main/java/com/eactive/httpmockserver/api/service/impl/ApiServiceKeyServiceImpl.java index b90ceda..5533977 100644 --- a/src/main/java/com/eactive/httpmockserver/ApiServiceKeyServiceImpl.java +++ b/src/main/java/com/eactive/httpmockserver/api/service/impl/ApiServiceKeyServiceImpl.java @@ -1,9 +1,8 @@ -package com.eactive.httpmockserver; - -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; +package com.eactive.httpmockserver.api.service.impl; +import com.eactive.httpmockserver.api.dao.ApiServiceKeyDao; +import com.eactive.httpmockserver.api.entity.ApiServiceKey; +import com.eactive.httpmockserver.api.service.ApiServiceKeyService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Example; import org.springframework.data.domain.Page; @@ -12,6 +11,10 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + @Service @Transactional(propagation = Propagation.SUPPORTS) public class ApiServiceKeyServiceImpl implements ApiServiceKeyService { diff --git a/src/main/java/com/eactive/httpmockserver/HttpRequestInfoServiceImpl.java b/src/main/java/com/eactive/httpmockserver/api/service/impl/HttpRequestInfoServiceImpl.java similarity index 90% rename from src/main/java/com/eactive/httpmockserver/HttpRequestInfoServiceImpl.java rename to src/main/java/com/eactive/httpmockserver/api/service/impl/HttpRequestInfoServiceImpl.java index f5b637f..124b462 100644 --- a/src/main/java/com/eactive/httpmockserver/HttpRequestInfoServiceImpl.java +++ b/src/main/java/com/eactive/httpmockserver/api/service/impl/HttpRequestInfoServiceImpl.java @@ -1,9 +1,8 @@ -package com.eactive.httpmockserver; - -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; +package com.eactive.httpmockserver.api.service.impl; +import com.eactive.httpmockserver.api.dao.HttpRequestInfoDao; +import com.eactive.httpmockserver.api.entity.HttpRequestInfo; +import com.eactive.httpmockserver.api.service.HttpRequestInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Example; import org.springframework.data.domain.Page; @@ -12,6 +11,10 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + @Service @Transactional(propagation = Propagation.SUPPORTS) public class HttpRequestInfoServiceImpl implements HttpRequestInfoService { diff --git a/src/main/java/com/eactive/httpmockserver/script/ScriptLoader.java b/src/main/java/com/eactive/httpmockserver/script/ScriptLoader.java index 18e8fc5..82bd670 100644 --- a/src/main/java/com/eactive/httpmockserver/script/ScriptLoader.java +++ b/src/main/java/com/eactive/httpmockserver/script/ScriptLoader.java @@ -1,5 +1,7 @@ package com.eactive.httpmockserver.script; +import com.eactive.httpmockserver.script.entity.ScriptInfo; +import com.eactive.httpmockserver.script.service.ScriptInfoService; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.SystemUtils; import org.mdkt.compiler.InMemoryJavaCompiler; @@ -17,10 +19,10 @@ import java.util.Map; public class ScriptLoader{ String path = ScriptLoader.class.getProtectionDomain().getCodeSource().getLocation().getPath(); - public static String DYNAMIC_BASE_PACKAGE = "com.eactive.httpmockserver.script.dynamic"; - public static String DYNAMIC_BASE_PATH = DYNAMIC_BASE_PACKAGE.replaceAll("[.]","/"); - public static String JAR_PREFIX = SystemUtils.IS_OS_WINDOWS ? "jar:file:/" : "jar:file:"; - public static String CLASS_PATH_SEPARATOR = System.getProperty("path.separator"); + public static final String DYNAMIC_BASE_PACKAGE = "com.eactive.httpmockserver.script.dynamic"; + public static final String DYNAMIC_BASE_PATH = DYNAMIC_BASE_PACKAGE.replaceAll("[.]","/"); + public static final String JAR_PREFIX = SystemUtils.IS_OS_WINDOWS ? "jar:file:/" : "jar:file:"; + public static final String CLASS_PATH_SEPARATOR = System.getProperty("path.separator"); private static final ScriptLoader instance = new ScriptLoader(); diff --git a/src/main/java/com/eactive/httpmockserver/script/ScriptController.java b/src/main/java/com/eactive/httpmockserver/script/controller/ScriptController.java similarity index 93% rename from src/main/java/com/eactive/httpmockserver/script/ScriptController.java rename to src/main/java/com/eactive/httpmockserver/script/controller/ScriptController.java index 9cb8036..13a97bf 100644 --- a/src/main/java/com/eactive/httpmockserver/script/ScriptController.java +++ b/src/main/java/com/eactive/httpmockserver/script/controller/ScriptController.java @@ -1,8 +1,11 @@ -package com.eactive.httpmockserver.script; +package com.eactive.httpmockserver.script.controller; -import com.eactive.httpmockserver.ApiManageRestController; +import com.eactive.httpmockserver.api.controller.ApiManageRestController; import com.eactive.httpmockserver.datatables.DataTablesRequest; import com.eactive.httpmockserver.datatables.DataTablesResponse; +import com.eactive.httpmockserver.script.ScriptLoader; +import com.eactive.httpmockserver.script.entity.ScriptInfo; +import com.eactive.httpmockserver.script.service.ScriptInfoService; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; @@ -17,15 +20,9 @@ import org.springframework.ui.Model; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; -import javax.tools.JavaCompiler; -import javax.tools.ToolProvider; import javax.validation.Valid; -import java.io.File; -import java.io.FileWriter; import java.io.IOException; import java.io.InputStream; -import java.net.URL; -import java.net.URLClassLoader; import java.util.Optional; @Controller diff --git a/src/main/java/com/eactive/httpmockserver/script/ScriptInfoDao.java b/src/main/java/com/eactive/httpmockserver/script/dao/ScriptInfoDao.java similarity index 81% rename from src/main/java/com/eactive/httpmockserver/script/ScriptInfoDao.java rename to src/main/java/com/eactive/httpmockserver/script/dao/ScriptInfoDao.java index 378f009..777c5c2 100644 --- a/src/main/java/com/eactive/httpmockserver/script/ScriptInfoDao.java +++ b/src/main/java/com/eactive/httpmockserver/script/dao/ScriptInfoDao.java @@ -1,6 +1,6 @@ -package com.eactive.httpmockserver.script; +package com.eactive.httpmockserver.script.dao; -import com.eactive.httpmockserver.socket.BytesMessageSpec; +import com.eactive.httpmockserver.script.entity.ScriptInfo; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/com/eactive/httpmockserver/script/ScriptInfo.java b/src/main/java/com/eactive/httpmockserver/script/entity/ScriptInfo.java similarity index 96% rename from src/main/java/com/eactive/httpmockserver/script/ScriptInfo.java rename to src/main/java/com/eactive/httpmockserver/script/entity/ScriptInfo.java index c5c78c0..2e4471b 100644 --- a/src/main/java/com/eactive/httpmockserver/script/ScriptInfo.java +++ b/src/main/java/com/eactive/httpmockserver/script/entity/ScriptInfo.java @@ -1,4 +1,4 @@ -package com.eactive.httpmockserver.script; +package com.eactive.httpmockserver.script.entity; import javax.persistence.*; import javax.validation.constraints.NotBlank; diff --git a/src/main/java/com/eactive/httpmockserver/script/ScriptInfoService.java b/src/main/java/com/eactive/httpmockserver/script/service/ScriptInfoService.java similarity index 86% rename from src/main/java/com/eactive/httpmockserver/script/ScriptInfoService.java rename to src/main/java/com/eactive/httpmockserver/script/service/ScriptInfoService.java index 389d741..767d996 100644 --- a/src/main/java/com/eactive/httpmockserver/script/ScriptInfoService.java +++ b/src/main/java/com/eactive/httpmockserver/script/service/ScriptInfoService.java @@ -1,5 +1,6 @@ -package com.eactive.httpmockserver.script; +package com.eactive.httpmockserver.script.service; +import com.eactive.httpmockserver.script.entity.ScriptInfo; import org.springframework.data.domain.Example; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/com/eactive/httpmockserver/script/ScriptInfoServiceImpl.java b/src/main/java/com/eactive/httpmockserver/script/service/ScriptInfoServiceImpl.java similarity index 93% rename from src/main/java/com/eactive/httpmockserver/script/ScriptInfoServiceImpl.java rename to src/main/java/com/eactive/httpmockserver/script/service/ScriptInfoServiceImpl.java index d4ad2ba..fff7510 100644 --- a/src/main/java/com/eactive/httpmockserver/script/ScriptInfoServiceImpl.java +++ b/src/main/java/com/eactive/httpmockserver/script/service/ScriptInfoServiceImpl.java @@ -1,5 +1,7 @@ -package com.eactive.httpmockserver.script; +package com.eactive.httpmockserver.script.service; +import com.eactive.httpmockserver.script.dao.ScriptInfoDao; +import com.eactive.httpmockserver.script.entity.ScriptInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Example; import org.springframework.data.domain.Page; diff --git a/src/main/java/com/eactive/httpmockserver/socket/BytesMessageSpec.java b/src/main/java/com/eactive/httpmockserver/socket/BytesMessageSpec.java index 3f26491..2131c68 100644 --- a/src/main/java/com/eactive/httpmockserver/socket/BytesMessageSpec.java +++ b/src/main/java/com/eactive/httpmockserver/socket/BytesMessageSpec.java @@ -1,25 +1,14 @@ package com.eactive.httpmockserver.socket; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Lob; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; +import javax.persistence.*; import javax.validation.Valid; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Positive; import javax.validation.constraints.PositiveOrZero; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; @SuppressWarnings("serial") @Entity diff --git a/src/main/java/com/eactive/httpmockserver/socket/BytesMessageSpecService.java b/src/main/java/com/eactive/httpmockserver/socket/BytesMessageSpecService.java index 1552261..93345e6 100644 --- a/src/main/java/com/eactive/httpmockserver/socket/BytesMessageSpecService.java +++ b/src/main/java/com/eactive/httpmockserver/socket/BytesMessageSpecService.java @@ -1,11 +1,11 @@ package com.eactive.httpmockserver.socket; -import java.util.List; -import java.util.Optional; - import org.springframework.data.domain.Example; import org.springframework.data.domain.Pageable; +import java.util.List; +import java.util.Optional; + public interface BytesMessageSpecService { public BytesMessageSpec findActiveBytesMessageSpec(); diff --git a/src/main/java/com/eactive/httpmockserver/socket/BytesMessageSpecServiceImpl.java b/src/main/java/com/eactive/httpmockserver/socket/BytesMessageSpecServiceImpl.java index 0467064..cf6a868 100644 --- a/src/main/java/com/eactive/httpmockserver/socket/BytesMessageSpecServiceImpl.java +++ b/src/main/java/com/eactive/httpmockserver/socket/BytesMessageSpecServiceImpl.java @@ -1,9 +1,5 @@ package com.eactive.httpmockserver.socket; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Example; import org.springframework.data.domain.Page; @@ -12,6 +8,10 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + @Service @Transactional(propagation = Propagation.SUPPORTS) public class BytesMessageSpecServiceImpl implements BytesMessageSpecService { diff --git a/src/main/java/com/eactive/httpmockserver/socket/EchoReplaceString.java b/src/main/java/com/eactive/httpmockserver/socket/EchoReplaceString.java index 4715c0f..e37c172 100644 --- a/src/main/java/com/eactive/httpmockserver/socket/EchoReplaceString.java +++ b/src/main/java/com/eactive/httpmockserver/socket/EchoReplaceString.java @@ -1,15 +1,10 @@ package com.eactive.httpmockserver.socket; -import java.io.Serializable; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import javax.persistence.*; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.PositiveOrZero; +import java.io.Serializable; @SuppressWarnings("serial") @Entity diff --git a/src/main/java/com/eactive/httpmockserver/socket/EchoSocketServer.java b/src/main/java/com/eactive/httpmockserver/socket/EchoSocketServer.java index b4f6406..3707da1 100644 --- a/src/main/java/com/eactive/httpmockserver/socket/EchoSocketServer.java +++ b/src/main/java/com/eactive/httpmockserver/socket/EchoSocketServer.java @@ -1,21 +1,16 @@ package com.eactive.httpmockserver.socket; -import javax.annotation.PreDestroy; -import javax.persistence.NoResultException; - +import io.netty.bootstrap.ServerBootstrap; +import io.netty.channel.*; +import io.netty.channel.nio.NioEventLoopGroup; +import io.netty.channel.socket.SocketChannel; +import io.netty.channel.socket.nio.NioServerSocketChannel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; -import io.netty.bootstrap.ServerBootstrap; -import io.netty.channel.ChannelFuture; -import io.netty.channel.ChannelInitializer; -import io.netty.channel.ChannelOption; -import io.netty.channel.ChannelPipeline; -import io.netty.channel.EventLoopGroup; -import io.netty.channel.nio.NioEventLoopGroup; -import io.netty.channel.socket.SocketChannel; -import io.netty.channel.socket.nio.NioServerSocketChannel; +import javax.annotation.PreDestroy; +import javax.persistence.NoResultException; @Component public class EchoSocketServer { diff --git a/src/main/java/com/eactive/httpmockserver/socket/EchoSocketServerHandler.java b/src/main/java/com/eactive/httpmockserver/socket/EchoSocketServerHandler.java index 8dc8540..8617092 100644 --- a/src/main/java/com/eactive/httpmockserver/socket/EchoSocketServerHandler.java +++ b/src/main/java/com/eactive/httpmockserver/socket/EchoSocketServerHandler.java @@ -1,19 +1,18 @@ package com.eactive.httpmockserver.socket; -import java.io.UnsupportedEncodingException; - -import org.apache.commons.lang3.BooleanUtils; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufUtil; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelHandler.Sharable; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; +import org.apache.commons.lang3.BooleanUtils; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import java.io.UnsupportedEncodingException; @Component @Sharable diff --git a/src/main/java/com/eactive/httpmockserver/socket/LengthHeaderFrameDecoder.java b/src/main/java/com/eactive/httpmockserver/socket/LengthHeaderFrameDecoder.java index e6afdd3..0cc29d9 100644 --- a/src/main/java/com/eactive/httpmockserver/socket/LengthHeaderFrameDecoder.java +++ b/src/main/java/com/eactive/httpmockserver/socket/LengthHeaderFrameDecoder.java @@ -1,16 +1,15 @@ package com.eactive.httpmockserver.socket; -import java.util.List; - -import org.apache.commons.lang3.BooleanUtils; -import org.apache.commons.lang3.math.NumberUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufUtil; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.ReplayingDecoder; +import org.apache.commons.lang3.BooleanUtils; +import org.apache.commons.lang3.math.NumberUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.List; public class LengthHeaderFrameDecoder extends ReplayingDecoder { private final Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/src/main/java/com/eactive/httpmockserver/socket/SocketServerManageController.java b/src/main/java/com/eactive/httpmockserver/socket/SocketServerManageController.java index cdb06b7..5a15cc5 100644 --- a/src/main/java/com/eactive/httpmockserver/socket/SocketServerManageController.java +++ b/src/main/java/com/eactive/httpmockserver/socket/SocketServerManageController.java @@ -1,12 +1,8 @@ package com.eactive.httpmockserver.socket; -import java.util.Optional; - -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.persistence.NoResultException; -import javax.validation.Valid; - +import com.eactive.httpmockserver.api.controller.ApiManageRestController; +import com.eactive.httpmockserver.datatables.DataTablesRequest; +import com.eactive.httpmockserver.datatables.DataTablesResponse; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -19,16 +15,13 @@ import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; -import com.eactive.httpmockserver.ApiManageRestController; -import com.eactive.httpmockserver.datatables.DataTablesRequest; -import com.eactive.httpmockserver.datatables.DataTablesResponse; +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; +import javax.persistence.NoResultException; +import javax.validation.Valid; +import java.util.Optional; @Controller public class SocketServerManageController {