opt code for mvc origin_response config

XiaoMi · Feb 26, 2024 · f9f0d9a · f9f0d9a
1 parent 5213bee
commit f9f0d9a
Showing 1 changed file with 8 additions and 18 deletions.
diff --git a/jcommon/docean/src/main/java/com/xiaomi/youpin/docean/Mvc.java b/jcommon/docean/src/main/java/com/xiaomi/youpin/docean/Mvc.java
@@ -210,24 +210,14 @@ public void callMethod(MvcContext context, MvcRequest request, MvcResponse respo
                 return;
             }
             // get whether the configuration returns an unwrapped value
-            if (this.mvcConfig.isResponseOriginalValue()) {
-                if (data instanceof String) {
-                    response.writeAndFlush(context, (String) data);
-                } else {
-                    response.writeAndFlush(context, gson.toJson(data));
-                }
-            } else if (StringUtils.isNotBlank(this.mvcConfig.getResponseOriginalPath())) {
-                boolean needOriginalValue = Arrays.stream(mvcConfig.getResponseOriginalPath().split(",")).anyMatch(i -> i.equals(method.getPath()));
-                if (needOriginalValue) {
-                    if (data instanceof String) {
-                        response.writeAndFlush(context, (String) data);
-                    } else {
-                        response.writeAndFlush(context, gson.toJson(data));
-                    }
-                } else {
-                    result.setData(data);
-                    response.writeAndFlush(context, gson.toJson(result));
-                }
+            boolean needOriginalValue = this.mvcConfig.isResponseOriginalValue();
+            if (!needOriginalValue && StringUtils.isNotBlank(this.mvcConfig.getResponseOriginalPath())) {
+                needOriginalValue = Arrays.stream(mvcConfig.getResponseOriginalPath().split(","))
+                        .anyMatch(i -> i.equals(method.getPath()));
+            }
+            if (needOriginalValue) {
+                String responseData = data instanceof String ? (String) data : gson.toJson(data);
+                response.writeAndFlush(context, responseData);
             } else {
                 result.setData(data);
                 response.writeAndFlush(context, gson.toJson(result));