inner exception message를 데이터로 이동

Author: zkdlu

src/main/java/com/zkdlu/apiresponsespringbootstarter/core/advice/ExceptionAdvice.java

@@ -19,23 +19,23 @@ public ExceptionAdvice(ResponseProperties responseProperties) {
 
     @ExceptionHandler(RuntimeException.class)
     public Object handle(Exception e) {
-        return getResult(getExceptionProperties(e, ExceptionProperties.UNHANDLED));
+        return getResult(e, getExceptionProperties(e, ExceptionProperties.UNHANDLED));
     }
 
 
     @ExceptionHandler(NoHandlerFoundException.class)
     public Object handleNoHandlerFoundException(Exception e) {
-        return getResult(getExceptionProperties(e, ExceptionProperties.NOT_FOUND));
+        return getResult(e, getExceptionProperties(e, ExceptionProperties.NOT_FOUND));
     }
 
     @ExceptionHandler(HttpRequestMethodNotSupportedException.class)
     public Object handleNotSupportedMethodException(Exception e) {
-        return getResult(getExceptionProperties(e, ExceptionProperties.METHOD_NOT_ALLOWED));
+        return getResult(e, getExceptionProperties(e, ExceptionProperties.METHOD_NOT_ALLOWED));
     }
 
     @ExceptionHandler(MissingServletRequestParameterException.class)
     public Object handleMissingRequestParameterException(Exception e) {
-        return getResult(getExceptionProperties(e, ExceptionProperties.BAD_REQUEST));
+        return getResult(e, getExceptionProperties(e, ExceptionProperties.BAD_REQUEST));
     }
 
     private ExceptionProperties getExceptionProperties(Exception e, ExceptionProperties unhandled) {
@@ -45,15 +45,16 @@ private ExceptionProperties getExceptionProperties(Exception e, ExceptionPropert
                 .findFirst()
                 .orElse(unhandled);
 
-        exceptionModel.setMsg(exceptionModel.getMsg() + ": " + e.getMessage());
+        exceptionModel.setMsg(exceptionModel.getMsg());
         return exceptionModel;
     }
 
-    private SingleResult<Object> getResult(ExceptionProperties exceptionModel) {
+    private SingleResult<Object> getResult(Exception e, ExceptionProperties exceptionModel) {
         SingleResult<Object> result = new SingleResult<>();
         result.setSuccess(false);
         result.setCode(exceptionModel.getCode());
         result.setMsg(exceptionModel.getMsg());
+        result.setData(e.getMessage());
         return result;
     }
 }

src/test/java/com/zkdlu/apiresponsespringbootstarter/HandlerTest.java

@@ -67,8 +67,8 @@ void setUp() {
                 .andExpect(status().isBadRequest())
                 .andExpect(jsonPath("$.success", equalTo(false)))
                 .andExpect(jsonPath("$.code", equalTo(400)))
-                .andExpect(jsonPath("$.msg", equalTo("Custom Message: 메시지")))
-                .andExpect(jsonPath("$.data", equalTo(null)))
+                .andExpect(jsonPath("$.msg", equalTo("Custom Message")))
+                .andExpect(jsonPath("$.data", equalTo("메시지")))
         ;
     }
 
@@ -79,8 +79,8 @@ void setUp() {
                 .andExpect(status().isNotFound())
                 .andExpect(jsonPath("$.success", equalTo(false)))
                 .andExpect(jsonPath("$.code", equalTo(404)))
-                .andExpect(jsonPath("$.msg", equalTo("Not Found: No handler found for GET /asdf")))
-                .andExpect(jsonPath("$.data", equalTo(null)))
+                .andExpect(jsonPath("$.msg", equalTo("Not Found")))
+                .andExpect(jsonPath("$.data", equalTo("No handler found for GET /asdf")))
         ;
     }
 
@@ -91,8 +91,8 @@ void setUp() {
                 .andExpect(status().isBadRequest())
                 .andExpect(jsonPath("$.success", equalTo(false)))
                 .andExpect(jsonPath("$.code", equalTo(400)))
-                .andExpect(jsonPath("$.msg", equalTo("Bad Request: Required String parameter 'param' is not present")))
-                .andExpect(jsonPath("$.data", equalTo(null)))
+                .andExpect(jsonPath("$.msg", equalTo("Bad Request")))
+                .andExpect(jsonPath("$.data", equalTo("Required String parameter 'param' is not present")))
         ;
     }
 
@@ -103,8 +103,8 @@ void setUp() {
                 .andExpect(status().isMethodNotAllowed())
                 .andExpect(jsonPath("$.success", equalTo(false)))
                 .andExpect(jsonPath("$.code", equalTo(405)))
-                .andExpect(jsonPath("$.msg", equalTo("Method Not Allowed: Request method 'POST' not supported")))
-                .andExpect(jsonPath("$.data", equalTo(null)))
+                .andExpect(jsonPath("$.msg", equalTo("Method Not Allowed")))
+                .andExpect(jsonPath("$.data", equalTo("Request method 'POST' not supported")))
         ;
     }
 
@@ -124,8 +124,8 @@ void setUp() {
                 .andExpect(status().isInternalServerError())
                 .andExpect(jsonPath("$.success", equalTo(false)))
                 .andExpect(jsonPath("$.code", equalTo(4000)))
-                .andExpect(jsonPath("$.msg", equalTo("지원하지 않는 상태코드: 메시지")))
-                .andExpect(jsonPath("$.data", equalTo(null)))
+                .andExpect(jsonPath("$.msg", equalTo("지원하지 않는 상태코드")))
+                .andExpect(jsonPath("$.data", equalTo("메시지")))
         ;
     }
 
@@ -145,8 +145,8 @@ void setUp() {
                 .andExpect(status().isNotImplemented())
                 .andExpect(jsonPath("$.success", equalTo(false)))
                 .andExpect(jsonPath("$.code", equalTo(501)))
-                .andExpect(jsonPath("$.msg", equalTo("Unhandled Exception: " + "메시지")))
-                .andExpect(jsonPath("$.data", equalTo(null)))
+                .andExpect(jsonPath("$.msg", equalTo("Unhandled Exception")))
+                .andExpect(jsonPath("$.data", equalTo("메시지")))
         ;
     }