This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev by this push:
new 2565cddb3 [Optimization] optimization RestResponse (#2921)
2565cddb3 is described below
commit 2565cddb3880d0e60e3f6e65ab64fa44fdee3b8e
Author: VampireAchao <[email protected]>
AuthorDate: Sun Aug 6 19:41:24 2023 +0800
[Optimization] optimization RestResponse (#2921)
---
.../console/base/domain/RestResponse.java | 29 ++++++++++++++--------
.../system/controller/PassportController.java | 2 +-
.../service/impl/AccessTokenServiceImpl.java | 2 +-
.../system/service/impl/UserServiceImpl.java | 8 +++---
.../core/service/AccessTokenServiceTest.java | 6 ++---
.../console/core/service/UserServiceTest.java | 13 +++++++---
6 files changed, 38 insertions(+), 22 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 e5a2610e3..b5f047394 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
@@ -17,49 +17,56 @@
package org.apache.streampark.console.base.domain;
+import javax.validation.constraints.NotNull;
+
import java.util.HashMap;
public class RestResponse extends HashMap<String, Object> {
public static final String STATUS_SUCCESS = "success";
public static final String STATUS_FAIL = "error";
+ public static final String STATUS_KEY = "status";
+ public static final String CODE_KEY = "code";
+ public static final String MESSAGE_KEY = "message";
+ public static final String DATA_KEY = "data";
private static final long serialVersionUID = 1L;
public static RestResponse success(Object data) {
RestResponse resp = new RestResponse();
- resp.put("status", STATUS_SUCCESS);
- resp.put("code", ResponseCode.CODE_SUCCESS);
- resp.put("data", data);
+ resp.put(STATUS_KEY, STATUS_SUCCESS);
+ resp.put(CODE_KEY, ResponseCode.CODE_SUCCESS);
+ resp.put(DATA_KEY, data);
return resp;
}
public static RestResponse success() {
RestResponse resp = new RestResponse();
- resp.put("status", STATUS_SUCCESS);
- resp.put("code", ResponseCode.CODE_SUCCESS);
+ resp.put(STATUS_KEY, STATUS_SUCCESS);
+ resp.put(CODE_KEY, ResponseCode.CODE_SUCCESS);
return resp;
}
public static RestResponse fail(String message, Long code) {
RestResponse resp = new RestResponse();
- resp.put("status", STATUS_FAIL);
- resp.put("message", message);
- resp.put("code", code);
- resp.put("data", null);
+ resp.put(STATUS_KEY, STATUS_FAIL);
+ resp.put(MESSAGE_KEY, message);
+ resp.put(CODE_KEY, code);
+ resp.put(DATA_KEY, null);
return resp;
}
public RestResponse message(String message) {
- this.put("message", message);
+ this.put(MESSAGE_KEY, message);
return this;
}
public RestResponse data(Object data) {
- this.put("data", data);
+ this.put(DATA_KEY, data);
return this;
}
+ @NotNull
@Override
public RestResponse put(String key, Object value) {
super.put(key, value);
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/PassportController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/PassportController.java
index 92558aefc..2850f3a39 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/PassportController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/PassportController.java
@@ -80,7 +80,7 @@ public class PassportController {
throws Exception {
if (StringUtils.isEmpty(username)) {
- return RestResponse.success().put("code", 0);
+ return RestResponse.success().put(RestResponse.CODE_KEY, 0);
}
User user = authenticator.authenticate(username, password, loginType);
return userService.getLoginUserInfo(user);
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 19fa3a1d5..fb20100e1 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
@@ -59,7 +59,7 @@ public class AccessTokenServiceImpl extends
ServiceImpl<AccessTokenMapper, Acces
public RestResponse generateToken(Long userId, String expireTime, String
description) {
User user = userService.getById(userId);
if (Objects.isNull(user)) {
- return RestResponse.success().put("code", 0).message("user not
available");
+ return RestResponse.success().put(RestResponse.CODE_KEY,
0).message("user not available");
}
if (StringUtils.isEmpty(expireTime)) {
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java
index cba5f6c16..514dbc946 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java
@@ -282,18 +282,20 @@ public class UserServiceImpl extends
ServiceImpl<UserMapper, User> implements Us
@Override
public RestResponse getLoginUserInfo(User user) {
if (user == null) {
- return RestResponse.success().put("code", 0);
+ return RestResponse.success().put(RestResponse.CODE_KEY, 0);
}
if (User.STATUS_LOCK.equals(user.getStatus())) {
- return RestResponse.success().put("code", 1);
+ return RestResponse.success().put(RestResponse.CODE_KEY, 1);
}
// set team
fillInTeam(user);
// no team.
if (user.getLastTeamId() == null) {
- return RestResponse.success().data(user.getUserId()).put("code",
ResponseCode.CODE_FORBIDDEN);
+ return RestResponse.success()
+ .data(user.getUserId())
+ .put(RestResponse.CODE_KEY, ResponseCode.CODE_FORBIDDEN);
}
updateLoginTime(user.getUsername());
diff --git
a/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/AccessTokenServiceTest.java
b/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/AccessTokenServiceTest.java
index 70b8768d0..f97823ce5 100644
---
a/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/AccessTokenServiceTest.java
+++
b/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/AccessTokenServiceTest.java
@@ -45,10 +45,10 @@ public class AccessTokenServiceTest extends SpringTestBase {
String expireTime = "9999-01-01 00:00:00";
RestResponse restResponse = accessTokenService.generateToken(mockUserId,
expireTime, "");
Assertions.assertNotNull(restResponse);
- Assertions.assertInstanceOf(AccessToken.class, restResponse.get("data"));
+ Assertions.assertInstanceOf(AccessToken.class,
restResponse.get(RestResponse.DATA_KEY));
// verify
- AccessToken accessToken = (AccessToken) restResponse.get("data");
+ AccessToken accessToken = (AccessToken)
restResponse.get(RestResponse.DATA_KEY);
LOG.info(accessToken.getToken());
JWTToken jwtToken = new
JWTToken(WebUtils.decryptToken(accessToken.getToken()));
LOG.info(jwtToken.getToken());
@@ -73,7 +73,7 @@ public class AccessTokenServiceTest extends SpringTestBase {
Long tokenId = accessToken.getId();
RestResponse toggleTokenResp = accessTokenService.toggleToken(tokenId);
Assertions.assertNotNull(toggleTokenResp);
- Assertions.assertTrue((Boolean) toggleTokenResp.get("data"));
+ Assertions.assertTrue((Boolean)
toggleTokenResp.get(RestResponse.DATA_KEY));
// get
AccessToken afterToggle = accessTokenService.getByUserId(mockUserId);
diff --git
a/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/UserServiceTest.java
b/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/UserServiceTest.java
index 9a2a15686..b3157193e 100644
---
a/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/UserServiceTest.java
+++
b/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/UserServiceTest.java
@@ -18,6 +18,7 @@
package org.apache.streampark.console.core.service;
import org.apache.streampark.console.SpringTestBase;
+import org.apache.streampark.console.base.domain.RestResponse;
import org.apache.streampark.console.core.entity.Application;
import org.apache.streampark.console.core.entity.Resource;
import org.apache.streampark.console.core.enums.EngineType;
@@ -54,13 +55,17 @@ class UserServiceTest extends SpringTestBase {
user.setStatus(User.STATUS_LOCK);
Map<String, Object> data =
(Map<String, Object>)
- userService.updateUser(user).getOrDefault("data",
Collections.emptyMap());
+ userService
+ .updateUser(user)
+ .getOrDefault(RestResponse.DATA_KEY, Collections.emptyMap());
Assertions.assertNotEquals(true, data.get("needTransferResource"));
// unlock user
user.setStatus(User.STATUS_VALID);
Map<String, Object> data1 =
(Map<String, Object>)
- userService.updateUser(user).getOrDefault("data",
Collections.emptyMap());
+ userService
+ .updateUser(user)
+ .getOrDefault(RestResponse.DATA_KEY, Collections.emptyMap());
Assertions.assertNotEquals(true, data1.get("needTransferResource"));
Resource resource = new Resource();
@@ -74,7 +79,9 @@ class UserServiceTest extends SpringTestBase {
user.setStatus(User.STATUS_LOCK);
Map<String, Object> data2 =
(Map<String, Object>)
- userService.updateUser(user).getOrDefault("data",
Collections.emptyMap());
+ userService
+ .updateUser(user)
+ .getOrDefault(RestResponse.DATA_KEY, Collections.emptyMap());
Assertions.assertEquals(true, data2.get("needTransferResource"));
}
