This is an automated email from the ASF dual-hosted git repository. benjobs pushed a commit to branch restresp in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
commit 8196be058ebf3575bcbe6107636c2913f01ed789 Author: benjobs <[email protected]> AuthorDate: Fri Sep 15 09:04:46 2023 +0800 [Improve] RestResponse fail method improvement --- .../apache/streampark/console/base/domain/RestResponse.java | 4 +++- .../console/base/handler/GlobalExceptionHandler.java | 10 +++++----- .../console/core/service/impl/ProjectServiceImpl.java | 2 +- .../streampark/console/system/controller/UserController.java | 4 ++-- .../console/system/service/impl/AccessTokenServiceImpl.java | 6 +++--- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/RestResponse.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/RestResponse.java index b5f047394..9b1186a05 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/RestResponse.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/RestResponse.java @@ -19,6 +19,7 @@ package org.apache.streampark.console.base.domain; import javax.validation.constraints.NotNull; +import java.util.Formatter; import java.util.HashMap; public class RestResponse extends HashMap<String, Object> { @@ -47,7 +48,8 @@ public class RestResponse extends HashMap<String, Object> { return resp; } - public static RestResponse fail(String message, Long code) { + public static RestResponse fail(Long code, String format, Object... args) { + String message = new Formatter().format(format, args).toString(); RestResponse resp = new RestResponse(); resp.put(STATUS_KEY, STATUS_FAIL); resp.put(MESSAGE_KEY, message); diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/handler/GlobalExceptionHandler.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/handler/GlobalExceptionHandler.java index e4a57cfa0..8e059790c 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/handler/GlobalExceptionHandler.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/handler/GlobalExceptionHandler.java @@ -52,7 +52,7 @@ public class GlobalExceptionHandler { @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR) public RestResponse handleException(Exception e) { log.info("Internal server error：", e); - return RestResponse.fail("internal server error: " + e.getMessage(), ResponseCode.CODE_FAIL); + return RestResponse.fail(ResponseCode.CODE_FAIL, "internal server error: %s", e.getMessage()); } @ExceptionHandler(value = HttpRequestMethodNotSupportedException.class) @@ -60,14 +60,14 @@ public class GlobalExceptionHandler { public RestResponse handleException(HttpRequestMethodNotSupportedException e) { log.info("not supported request method，exception：{}", e.getMessage()); return RestResponse.fail( - "not supported request method，exception：" + e.getMessage(), ResponseCode.CODE_FAIL); + ResponseCode.CODE_FAIL, "not supported request method，exception：%s", e.getMessage()); } @ExceptionHandler(value = AbstractApiException.class) @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR) public RestResponse handleException(AbstractApiException e) { log.info("api exception：{}", e.getMessage()); - return RestResponse.fail(e.getMessage(), e.getResponseCode()); + return RestResponse.fail(e.getResponseCode(), e.getMessage()); } /** @@ -85,7 +85,7 @@ public class GlobalExceptionHandler { message.append(error.getField()).append(error.getDefaultMessage()).append(StringPool.COMMA); } message = new StringBuilder(message.substring(0, message.length() - 1)); - return RestResponse.fail(message.toString(), ResponseCode.CODE_FAIL); + return RestResponse.fail(ResponseCode.CODE_FAIL, message.toString()); } /** @@ -106,7 +106,7 @@ public class GlobalExceptionHandler { message.append(pathArr[1]).append(violation.getMessage()).append(StringPool.COMMA); } message = new StringBuilder(message.substring(0, message.length() - 1)); - return RestResponse.fail(message.toString(), ResponseCode.CODE_FAIL); + return RestResponse.fail(ResponseCode.CODE_FAIL, message.toString()); } @ExceptionHandler(value = UnauthorizedException.class) diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java index 2904ed177..c14b66b5e 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java @@ -377,7 +377,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> String error = String.format("Read build log file(fileName=%s) caused an exception: ", logFile); log.error(error, e); - return RestResponse.fail(error + e.getMessage(), ResponseCode.CODE_FAIL); + return RestResponse.fail(ResponseCode.CODE_FAIL, error + e.getMessage()); } } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java index c299cd947..b0e3aa26b 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java @@ -133,7 +133,7 @@ public class UserController { public RestResponse initTeam(Long teamId, Long userId) { Team team = teamService.getById(teamId); if (team == null) { - return RestResponse.fail("teamId is invalid", ResponseCode.CODE_FAIL_ALERT); + return RestResponse.fail(ResponseCode.CODE_FAIL_ALERT, "teamId is invalid"); } userService.setLastTeam(teamId, userId); return RestResponse.success(); @@ -144,7 +144,7 @@ public class UserController { public RestResponse setTeam(Long teamId) { Team team = teamService.getById(teamId); if (team == null) { - return RestResponse.fail("TeamId is invalid, set team failed.", ResponseCode.CODE_FAIL_ALERT); + return RestResponse.fail(ResponseCode.CODE_FAIL_ALERT, "TeamId is invalid, set team failed."); } User user = commonService.getCurrentUser(); ApiAlertException.throwIfNull(user, "Current login user is null, set team failed."); diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/AccessTokenServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/AccessTokenServiceImpl.java index fb20100e1..eb9d7ffa8 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/AccessTokenServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/AccessTokenServiceImpl.java @@ -105,13 +105,13 @@ public class AccessTokenServiceImpl extends ServiceImpl<AccessTokenMapper, Acces public RestResponse toggleToken(Long tokenId) { AccessToken tokenInfo = baseMapper.getById(tokenId); if (Objects.isNull(tokenInfo)) { - return RestResponse.fail("accessToken could not be found!", ResponseCode.CODE_FAIL_ALERT); + return RestResponse.fail(ResponseCode.CODE_FAIL_ALERT, "accessToken could not be found!"); } if (User.STATUS_LOCK.equals(tokenInfo.getUserStatus())) { return RestResponse.fail( - "user status is locked, could not operate this accessToken!", - ResponseCode.CODE_FAIL_ALERT); + ResponseCode.CODE_FAIL_ALERT, + "user status is locked, could not operate this accessToken!"); } Integer status =
