perf($ResponseBodyBean): delete function-duplicated method

johnnymillergh · May 8, 2020 · bf47226 · bf47226
1 parent e85bacf
commit bf47226
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 26 deletions.
diff --git a/api-portal/src/main/java/com/jmsoftware/apiportal/universal/controller/CommonController.java b/api-portal/src/main/java/com/jmsoftware/apiportal/universal/controller/CommonController.java
@@ -42,6 +42,6 @@ public ResponseBodyBean<String> validationTest(@RequestBody ValidationTestPayloa
     @GetMapping("/get-jwt")
     @ApiOperation(value = "/get-jwt", notes = "Get JWT")
     public ResponseBodyBean<String> getJwt(String username) {
-        return ResponseBodyBean.ofData(commonService.generateJwt(username));
+        return ResponseBodyBean.ofSuccess(commonService.generateJwt(username));
     }
 }
diff --git a/auth-center/src/main/java/com/jmsoftware/authcenter/AuthController.java b/auth-center/src/main/java/com/jmsoftware/authcenter/AuthController.java
@@ -25,6 +25,6 @@ public ResponseBodyBean<LoginResult> login(@Valid @RequestBody LoginPayload payl
         result.setUid("ijohnnymiller");
         result.setToken("Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9" +
                         ".eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG5ueSBNaWxsZXIiLCJpYXQiOjE1MTYyMzkwMjIsImlkIjoxMTEyfQ.wLZClT_dntoiB3-HYH1wWav0S_nBmHn7xunxaDjPM1Q");
-        return ResponseBodyBean.ofData(result);
+        return ResponseBodyBean.ofSuccess(result);
     }
 }
diff --git a/common/src/main/java/com/jmsoftware/common/bean/ResponseBodyBean.java b/common/src/main/java/com/jmsoftware/common/bean/ResponseBodyBean.java
@@ -138,47 +138,32 @@ public static <ResponseBodyDataType> ResponseBodyBean<ResponseBodyDataType> setR
     }
 
     /**
-     * Respond data and status is OK.
+     * Respond null data, and status is OK.
      *
      * @param <ResponseBodyDataType> the response body data type
-     * @param data                   data to be responded to client.
      * @return response body
      */
-    public static <ResponseBodyDataType> ResponseBodyBean<ResponseBodyDataType> ofData(@NonNull final ResponseBodyDataType data) {
+    public static <ResponseBodyDataType> ResponseBodyBean<ResponseBodyDataType> ofSuccess() {
         return ResponseBodyBean.<ResponseBodyDataType>builder()
                 .timestamp(new Date())
                 .status(HttpStatus.OK.getCode())
                 .message(HttpStatus.OK.getMessage())
-                .data(data)
                 .build();
     }
 
     /**
-     * Respond a message and status id OK.
-     *
-     * @param <ResponseBodyDataType> the response body data type
-     * @param message                message to be responded
-     * @return response body
-     */
-    public static <ResponseBodyDataType> ResponseBodyBean<ResponseBodyDataType> ofMessage(@NonNull final String message) {
-        return ResponseBodyBean.<ResponseBodyDataType>builder()
-                .timestamp(new Date())
-                .status(HttpStatus.OK.getCode())
-                .message(message)
-                .build();
-    }
-
-    /**
-     * Respond null data, and status is OK.
+     * Respond data and status is OK.
      *
      * @param <ResponseBodyDataType> the response body data type
+     * @param data                   data to be responded to client.
      * @return response body
      */
-    public static <ResponseBodyDataType> ResponseBodyBean<ResponseBodyDataType> ofSuccess() {
+    public static <ResponseBodyDataType> ResponseBodyBean<ResponseBodyDataType> ofSuccess(@NonNull final ResponseBodyDataType data) {
         return ResponseBodyBean.<ResponseBodyDataType>builder()
                 .timestamp(new Date())
                 .status(HttpStatus.OK.getCode())
                 .message(HttpStatus.OK.getMessage())
+                .data(data)
                 .build();
     }
 
@@ -231,7 +216,7 @@ public static <ResponseBodyDataType> ResponseBodyBean<ResponseBodyDataType> ofFa
      * @param data                   data to be responded
      * @return response body
      */
-    public static <ResponseBodyDataType> ResponseBodyBean<ResponseBodyDataType> ofFailure(@NonNull final Object data) {
+    public static <ResponseBodyDataType> ResponseBodyBean<ResponseBodyDataType> ofFailure(@NonNull final ResponseBodyDataType data) {
         throw new BusinessException(data);
     }
 

diff --git a/...-mis/src/main/java/com/jmsoftware/exercisemis/exercise/controller/ExerciseController.java b/...-mis/src/main/java/com/jmsoftware/exercisemis/exercise/controller/ExerciseController.java
@@ -33,14 +33,14 @@ public class ExerciseController {
     @GetMapping("/get-by-id")
     @ApiOperation(value = "/get-by-id", notes = "Retrieve exercise by id")
     public ResponseBodyBean<ExercisePo> selectOne(Long id) {
-        return ResponseBodyBean.ofData(exerciseService.queryById(id));
+        return ResponseBodyBean.ofSuccess(exerciseService.queryById(id));
     }
 
     @GetMapping("/get-page-list")
     @ApiOperation(value = "/get-page-list", notes = "Retrieve page list")
     public ResponseBodyBean<List<ExercisePo>> getPageList(@Valid GetPageListPayload payload) {
         var exercisePo = new ExercisePo();
         BeanUtil.copyProperties(payload, exercisePo);
-        return ResponseBodyBean.ofData(exerciseService.getPageList(exercisePo));
+        return ResponseBodyBean.ofSuccess(exerciseService.getPageList(exercisePo));
     }
 }