refactor: 优化 SimpleRes 工具类

Author: cadecode

simple-common/src/main/java/top/cadecode/common/exception/SimpleExceptionHandler.java

@@ -31,7 +31,7 @@ public class SimpleExceptionHandler extends DefaultErrorAttributes {
      */
     @ExceptionHandler(SimpleException.class)
     @ResponseBody
-    public SimpleRes<?> handleSimpleException(SimpleException e, HttpServletRequest request) {
+    public SimpleRes<Object> handleSimpleException(SimpleException e, HttpServletRequest request) {
         log.error("SimpleException Handler =>", e);
         return SimpleRes.of(e.getResCode())
                 .errorMsg(e.getMessage())
@@ -43,7 +43,7 @@ public SimpleRes<?> handleSimpleException(SimpleException e, HttpServletRequest
      */
     @ExceptionHandler(Exception.class)
     @ResponseBody
-    public SimpleRes<?> handleOtherException(Exception e, HttpServletRequest request) {
+    public SimpleRes<Object> handleOtherException(Exception e, HttpServletRequest request) {
         // 获取请求路径
         String requestURI = request.getRequestURI();
         log.error("Exception Handler =>", e);

simple-common/src/main/java/top/cadecode/common/response/SimpleRes.java

@@ -20,25 +20,21 @@ public class SimpleRes<T> {
     private Integer code;
     private String reason;
     private String path;
+
+    // 设置为 null 时不序列化
     @JsonInclude(Include.NON_NULL)
     private T data;
     @JsonInclude(Include.NON_NULL)
     private String errorMsg;
 
     /**
-     * 返回成功的响应
+     * 根据 data 返回成功的响应
      *
      * @param data
      * @return SimpleRes
      */
     public static <T> SimpleRes<T> ok(T data) {
-        SimpleRes<T> res = new SimpleRes<>();
-        ResCode success = ResCode.SUCCESS;
-        res.setCode(success.getCode());
-        res.setReason(success.getReason());
-        res.setData(data);
-        return res;
-
+        return SimpleRes.of(ResCode.SUCCESS, data);
     }
 
     /**
@@ -47,35 +43,40 @@ public static <T> SimpleRes<T> ok(T data) {
      * @param resCode
      * @return SimpleRes
      */
-    public static SimpleRes<?> of(ResCode resCode) {
-        SimpleRes<?> res = new SimpleRes<>();
+    public static SimpleRes<Object> of(ResCode resCode) {
+        SimpleRes<Object> res = new SimpleRes<>();
         res.setCode(resCode.getCode());
         res.setReason(resCode.getReason());
         return res;
     }
 
     /**
-     * 设置 path
+     * 根据 ResCode 和 data 返回响应
      *
-     * @param path
+     * @param resCode
+     * @param data
      * @return SimpleRes
      */
-    public SimpleRes<T> path(String path) {
-        this.setPath(path);
-        return this;
+    public static <T> SimpleRes<T> of(ResCode resCode, T data) {
+        SimpleRes<T> res = new SimpleRes<>();
+        res.setCode(resCode.getCode());
+        res.setReason(resCode.getReason());
+        res.setData(data);
+        return res;
     }
 
     /**
-     * 设置 data
+     * 设置 path
      *
-     * @param data
+     * @param path
      * @return SimpleRes
      */
-    public SimpleRes<T> data(T data) {
-        this.setData(data);
+    public SimpleRes<T> path(String path) {
+        this.setPath(path);
         return this;
     }
 
+
     /**
      * 设置 data
      *

simple-common/src/test/java/top/cadecode/common/response/SimpleResTest.java

@@ -21,7 +21,7 @@ public void ok() {
     }
 
     @Test
-    public void fail() {
+    public void of() {
         String failJson = JsonUtil.objToStr(SimpleRes.of(ResCode.UNKNOWN),
                 true);
         log.info("failJson: {}", failJson);