API시나리오 단계별 실행

src/main/java/com/eactive/httpmockserver/client/controller/ApiClientController.java

@@ -3,24 +3,33 @@ 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.service.NettyApiClient;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.Validator;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.lang.reflect.InvocationTargetException;
 import java.util.concurrent.ExecutionException;
 
 @RestController
 public class ApiClientController {
 
     private final NettyApiClient nettyApiClient;
+    private final Validator validator;
 
-    public ApiClientController(NettyApiClient nettyApiClient) {
+    public ApiClientController(NettyApiClient nettyApiClient, Validator validator) {
         this.nettyApiClient = nettyApiClient;
+        this.validator = validator;
     }
 
     @PostMapping("/mgmt/api/test.do")
-    public ApiResponse handleApiRequest(@RequestBody ApiRequestDTO request) throws InterruptedException, ExecutionException, InvocationTargetException, IllegalAccessException, InstantiationException, NoSuchMethodException {
+    public ApiResponse handleApiRequest(@RequestBody ApiRequestDTO request, BindingResult bindingResult) throws InterruptedException, ExecutionException {
+
+        validator.validate(request, bindingResult);
+
+        if (bindingResult.hasErrors()) {
+            throw new IllegalArgumentException(bindingResult.getAllErrors().get(0).getDefaultMessage());
+        }
 
         return nettyApiClient.handleRequest(request).get();
     }

src/main/java/com/eactive/httpmockserver/client/controller/ApiScenarioMgmtController.java

@@ -45,7 +45,7 @@ public class ApiScenarioMgmtController {
     }
 
 
-    @PutMapping("/update.do")
+    @PostMapping("/update.do")
     public ResponseEntity<ApiScenarioDTO> updateScenario(@RequestBody ApiScenarioDTO apiScenarioDto) {
         ApiScenario updatedApiScenario = apiScenarioMapper.map(apiScenarioDto);
         ApiScenario updatedScenario = apiScenarioMgmtService.updateApiScenario(apiScenarioDto.getId(), updatedApiScenario);

src/main/java/com/eactive/httpmockserver/client/dto/ApiRequestDTO.java

@@ -1,5 +1,6 @@
 package com.eactive.httpmockserver.client.dto;
 
+import javax.validation.constraints.NotNull;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -12,6 +13,7 @@ public class ApiRequestDTO {
     private String path;
     private String method;
 
+    @NotNull(message = "서버를 선택해주세요.")
     private Long server;
 
     private List<ApiRequestKeyValueDTO> headers = new ArrayList<>();

src/main/java/com/eactive/httpmockserver/client/service/NettyApiClient.java

@@ -20,14 +20,12 @@ import io.netty.handler.ssl.SslContext;
 import io.netty.handler.ssl.SslContextBuilder;
 import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
 import io.netty.util.CharsetUtil;
-import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.net.ssl.SSLException;
 import java.lang.reflect.InvocationTargetException;
-import java.nio.file.Paths;
 import java.util.concurrent.CompletableFuture;
 
 @Service
@@ -36,7 +34,7 @@ public class NettyApiClient {
     @Autowired
     ServerRepository serverRepository;
 
-    public CompletableFuture<ApiResponse> handleRequest(ApiRequestDTO originalRequest) throws InterruptedException, InvocationTargetException, IllegalAccessException, InstantiationException, NoSuchMethodException {
+    public CompletableFuture<ApiResponse> handleRequest(ApiRequestDTO originalRequest) {
         ApiRequestDTO apiRequest = originalRequest;
         Server server = serverRepository.findById(apiRequest.getServer()).orElseThrow(() -> new ServerNotFoundException("Server not found"));
         String host = server.getHostname();
@@ -73,7 +71,7 @@ public class NettyApiClient {
                 content = Unpooled.EMPTY_BUFFER;
             }
 
-            String fullPath = server.getBasePath() +  apiRequest.getPath();
+            String fullPath = server.getBasePath() + apiRequest.getPath();
 
             HttpRequest request = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.valueOf(apiRequest.getMethod()), fullPath, content);
 

src/main/java/com/eactive/httpmockserver/config/WebMvcConfig.java

@@ -92,7 +92,6 @@ public class WebMvcConfig implements WebMvcConfigurer {
         registry.addResourceHandler("/img/**").addResourceLocations("/img/", "classpath:/static/img/").setCacheControl(CacheControl.maxAge(1, TimeUnit.DAYS)).resourceChain(true).addResolver(new PathResourceResolver());
         registry.addResourceHandler("/js/**").addResourceLocations("/js/", "classpath:/static/js/").setCacheControl(CacheControl.maxAge(1, TimeUnit.DAYS)).resourceChain(true).addResolver(new PathResourceResolver());
         registry.addResourceHandler("/plugins/**").addResourceLocations("/plugins/", "classpath:/static/plugins/").setCacheControl(CacheControl.maxAge(1, TimeUnit.DAYS)).resourceChain(true).addResolver(new PathResourceResolver());
-        registry.addResourceHandler("/min-maps/**").addResourceLocations("/min-maps/", "classpath:/static/plugins/").setCacheControl(CacheControl.maxAge(1, TimeUnit.DAYS)).resourceChain(true).addResolver(new PathResourceResolver());
         registry.addResourceHandler("/favicon.ico").addResourceLocations("/favicon.ico", "classpath:/static/favicon.ico").setCacheControl(CacheControl.maxAge(1, TimeUnit.DAYS)).resourceChain(true).addResolver(new PathResourceResolver());
     }
 }