From 41d405ace496d6a579eb053d75d0a3f636bc5b60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=ED=98=84=EC=84=B1=ED=95=84?= Date: Tue, 16 May 2023 21:37:32 +0900 Subject: [PATCH] =?UTF-8?q?package=20=EC=9D=B4=EB=8F=99=20=EB=B0=98?= =?UTF-8?q?=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApiClientController.java | 4 +- .../client/entity/ApiRequestInfo.java | 1 + .../client/mapper/ServerMapper.java | 38 +++++++++++++++++-- .../client/repository/ServerRepository.java | 2 +- .../client/service/NettyApiClient.java | 2 +- 5 files changed, 39 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/eactive/httpmockserver/client/controller/ApiClientController.java b/src/main/java/com/eactive/httpmockserver/client/controller/ApiClientController.java index 52660b0..28cabc0 100644 --- a/src/main/java/com/eactive/httpmockserver/client/controller/ApiClientController.java +++ b/src/main/java/com/eactive/httpmockserver/client/controller/ApiClientController.java @@ -2,7 +2,7 @@ package com.eactive.httpmockserver.client.controller; import com.eactive.httpmockserver.client.dto.ApiRequestDTO; import com.eactive.httpmockserver.client.dto.ApiResponse; -import com.eactive.httpmockserver.client.entity.Server; +import com.eactive.httpmockserver.server.entity.Server; import com.eactive.httpmockserver.client.repository.ServerRepository; import com.eactive.httpmockserver.client.service.NettyApiClient; import org.springframework.beans.factory.annotation.Autowired; @@ -41,7 +41,7 @@ public class ApiClientController { List servers = serverRepository.findAll(); model.addAttribute("servers", servers); - return "page/apiTester"; + return "page/tester/apiTester"; } } diff --git a/src/main/java/com/eactive/httpmockserver/client/entity/ApiRequestInfo.java b/src/main/java/com/eactive/httpmockserver/client/entity/ApiRequestInfo.java index f0e4ba2..7bfcdf3 100644 --- a/src/main/java/com/eactive/httpmockserver/client/entity/ApiRequestInfo.java +++ b/src/main/java/com/eactive/httpmockserver/client/entity/ApiRequestInfo.java @@ -1,5 +1,6 @@ package com.eactive.httpmockserver.client.entity; +import com.eactive.httpmockserver.server.entity.Server; import com.eactive.httpmockserver.user.entity.StaffUser; import javax.persistence.*; diff --git a/src/main/java/com/eactive/httpmockserver/client/mapper/ServerMapper.java b/src/main/java/com/eactive/httpmockserver/client/mapper/ServerMapper.java index 42fb8db..ca81751 100644 --- a/src/main/java/com/eactive/httpmockserver/client/mapper/ServerMapper.java +++ b/src/main/java/com/eactive/httpmockserver/client/mapper/ServerMapper.java @@ -1,9 +1,10 @@ package com.eactive.httpmockserver.client.mapper; -import com.eactive.httpmockserver.client.entity.Server; import com.eactive.httpmockserver.client.repository.ServerRepository; import com.eactive.httpmockserver.common.exception.NotFoundException; +import com.eactive.httpmockserver.server.dto.ServerDTO; +import com.eactive.httpmockserver.server.entity.Server; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; import org.springframework.beans.factory.annotation.Autowired; @@ -17,14 +18,43 @@ public class ServerMapper { @Autowired ServerRepository serverRepository; - Server map(Long id) { - if (id == null) return null; + Server mapById(Long id) { + if (id == null || id == 0) return null; return serverRepository.findById(id).orElseThrow(() -> new NotFoundException("Server[" + id + "] not found")); } - Long map(Server server) { + Long mapById(Server server) { if (server == null) return null; return server.getId(); } + public ServerDTO map(Server server) { + if (server == null) return null; + ServerDTO dto = new ServerDTO(); + + dto.setId(server.getId()); + dto.setName(server.getName()); + dto.setHostname(server.getHostname()); + dto.setPort(server.getPort()); + dto.setScheme(server.getScheme()); + dto.setBasePath(server.getBasePath()); + + return dto; + } + + + public Server map(ServerDTO dto) { + if (dto == null) return null; + + Server server = new Server(); + + server.setId(dto.getId()); + server.setName(dto.getName()); + server.setHostname(dto.getHostname()); + server.setPort(dto.getPort()); + server.setScheme(dto.getScheme()); + server.setBasePath(dto.getBasePath()); + + return server; + } } diff --git a/src/main/java/com/eactive/httpmockserver/client/repository/ServerRepository.java b/src/main/java/com/eactive/httpmockserver/client/repository/ServerRepository.java index 0c836f5..35d28ac 100644 --- a/src/main/java/com/eactive/httpmockserver/client/repository/ServerRepository.java +++ b/src/main/java/com/eactive/httpmockserver/client/repository/ServerRepository.java @@ -1,6 +1,6 @@ package com.eactive.httpmockserver.client.repository; -import com.eactive.httpmockserver.client.entity.Server; +import com.eactive.httpmockserver.server.entity.Server; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; diff --git a/src/main/java/com/eactive/httpmockserver/client/service/NettyApiClient.java b/src/main/java/com/eactive/httpmockserver/client/service/NettyApiClient.java index 507ee31..77cd188 100644 --- a/src/main/java/com/eactive/httpmockserver/client/service/NettyApiClient.java +++ b/src/main/java/com/eactive/httpmockserver/client/service/NettyApiClient.java @@ -3,7 +3,7 @@ package com.eactive.httpmockserver.client.service; import com.eactive.httpmockserver.client.dto.ApiRequestKeyValueDTO; import com.eactive.httpmockserver.client.dto.ApiRequestDTO; import com.eactive.httpmockserver.client.dto.ApiResponse; -import com.eactive.httpmockserver.client.entity.Server; +import com.eactive.httpmockserver.server.entity.Server; import com.eactive.httpmockserver.client.repository.ServerRepository; import io.netty.bootstrap.Bootstrap; import io.netty.buffer.ByteBuf;