🎨 공통응답형식 ReturnValueHandler에서 처리로 변경

kids-ground · May 13, 2024 · 0d70855 · 0d70855
1 parent b563039
commit 0d70855
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 13 deletions.
diff --git a/.../src/main/kotlin/com/adevspoon/api/config/controller/advice/SuccessResponseBodyAdvisor.kt b/.../src/main/kotlin/com/adevspoon/api/config/controller/advice/SuccessResponseBodyAdvisor.kt
@@ -28,12 +28,15 @@ class SuccessResponseBodyAdvisor: ResponseBodyAdvice<Any> {
         request: ServerHttpRequest,
         response: ServerHttpResponse
     ): Any? {
-        val servletResponse = (response as ServletServerHttpResponse).servletResponse
-        val status = servletResponse.status
-        val resolve = HttpStatus.resolve(status) ?: return body
-
-        return if (resolve.is2xxSuccessful) {
-            SuccessResponse(data = body)
-        } else body
+        return body
+//
+//
+//        val servletResponse = (response as ServletServerHttpResponse).servletResponse
+//        val status = servletResponse.status
+//        val resolve = HttpStatus.resolve(status) ?: return body
+//
+//        return if (resolve.is2xxSuccessful) {
+//            SuccessResponse(data = body)
+//        } else body
     }
 }
diff --git a/...otlin/com/adevspoon/api/config/controller/handler/StringResponseBodyReturnValueHandler.kt b/...otlin/com/adevspoon/api/config/controller/handler/StringResponseBodyReturnValueHandler.kt
@@ -13,8 +13,7 @@ class StringResponseBodyReturnValueHandler(
 ): HandlerMethodReturnValueHandler {
 
     override fun supportsReturnType(returnType: MethodParameter): Boolean {
-        return returnType.parameterType == String::class.java &&
-                (
+        return (
                     AnnotatedElementUtils.hasAnnotation(
                         returnType.containingClass,
                         ResponseBody::class.java
@@ -28,10 +27,15 @@ class StringResponseBodyReturnValueHandler(
         mavContainer: ModelAndViewContainer,
         webRequest: NativeWebRequest
     ) {
-        val realReturnValue = SuccessResponse(
-            message = returnValue as String,
-            data = SuccessResponse(message = returnValue, data = null)
-        )
+        val realReturnValue = if (returnValue is String)
+            SuccessResponse(
+                message = returnValue,
+                data = SuccessResponse(message = returnValue, data = null)
+            )
+        else
+            SuccessResponse(data = returnValue)
+
+        // returnType도 바꾸기
         delegate.handleReturnValue(realReturnValue, returnType, mavContainer, webRequest)
     }
 }