From 2d4fa5370b289830a25d74a4027d2c1c01928ab1 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 11:54:07 +0900 Subject: [PATCH] =?UTF-8?q?controller=20annotation=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../httpmockserver/api/controller/MockApiController.java | 7 ++----- .../common/exception/PortalGlobalExceptionHandler.java | 5 +++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/eactive/httpmockserver/api/controller/MockApiController.java b/src/main/java/com/eactive/httpmockserver/api/controller/MockApiController.java index c6cb39e..d22205f 100644 --- a/src/main/java/com/eactive/httpmockserver/api/controller/MockApiController.java +++ b/src/main/java/com/eactive/httpmockserver/api/controller/MockApiController.java @@ -5,25 +5,22 @@ import com.eactive.httpmockserver.api.entity.MockCondition; import com.eactive.httpmockserver.api.entity.MockResponse; import com.eactive.httpmockserver.api.entity.MockRoute; import com.eactive.httpmockserver.api.repository.MockRouteRepository; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; import com.jayway.jsonpath.JsonPath; import com.jayway.jsonpath.PathNotFoundException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Controller; import org.springframework.util.AntPathMatcher; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -@Controller +@RestController public class MockApiController { @Autowired diff --git a/src/main/java/com/eactive/httpmockserver/common/exception/PortalGlobalExceptionHandler.java b/src/main/java/com/eactive/httpmockserver/common/exception/PortalGlobalExceptionHandler.java index 32f8745..8edbe70 100644 --- a/src/main/java/com/eactive/httpmockserver/common/exception/PortalGlobalExceptionHandler.java +++ b/src/main/java/com/eactive/httpmockserver/common/exception/PortalGlobalExceptionHandler.java @@ -3,13 +3,14 @@ package com.eactive.httpmockserver.common.exception; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; -@ControllerAdvice +@ControllerAdvice(annotations = Controller.class) public class PortalGlobalExceptionHandler { private final Logger log = LoggerFactory.getLogger(getClass()); @@ -18,7 +19,7 @@ public class PortalGlobalExceptionHandler { public ModelAndView handleIllegalArgumentException(HttpServletRequest request, NotFoundException ex) { log.error(ex.getMessage()); ModelAndView modelAndView = new ModelAndView(); - modelAndView.setViewName("common/error/notFoundError"); + modelAndView.setViewName("error"); modelAndView.addObject("exception", ex); return modelAndView; }