This is an automated email from the ASF dual-hosted git repository.
jinyleechina pushed a commit to branch 2.0.2-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/2.0.2-prepare by this push:
new 60001f8 [Cherry-pick-2.0.2][Feature-7418][dolphinscheduler-api]
Return domain object after UpdateXxx success (#7421)
60001f8 is described below
commit 60001f807e011c1d9a35d28ee6182494c1c0a832
Author: ouyangyewei <[email protected]>
AuthorDate: Wed Dec 15 13:49:57 2021 +0800
[Cherry-pick-2.0.2][Feature-7418][dolphinscheduler-api] Return domain
object after UpdateXxx success (#7421)
* to feature 7418
* trigger e2e test
Co-authored-by: ouyangyewei <[email protected]>
---
.../apache/dolphinscheduler/api/controller/AccessTokenController.java | 2 +-
.../org/apache/dolphinscheduler/api/service/AccessTokenService.java | 2 +-
.../dolphinscheduler/api/service/impl/AccessTokenServiceImpl.java | 3 ++-
.../dolphinscheduler/api/controller/AccessTokenControllerTest.java | 1 +
.../apache/dolphinscheduler/api/service/AccessTokenServiceTest.java | 2 ++
5 files changed, 7 insertions(+), 3 deletions(-)
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/AccessTokenController.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/AccessTokenController.java
index e724b09..e412406 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/AccessTokenController.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/AccessTokenController.java
@@ -194,7 +194,7 @@ public class AccessTokenController extends BaseController {
* @param userId token for user
* @param expireTime token expire time
* @param token token string (if it is absent, it will be automatically
generated)
- * @return update result code
+ * @return updated access token entity
*/
@ApiOperation(value = "updateToken", notes = "UPDATE_TOKEN_NOTES")
@ApiImplicitParams({
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/AccessTokenService.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/AccessTokenService.java
index 81fb5e8..99ac4c9 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/AccessTokenService.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/AccessTokenService.java
@@ -83,7 +83,7 @@ public interface AccessTokenService {
* @param userId token for user
* @param expireTime token expire time
* @param token token string (if it is absent, it will be automatically
generated)
- * @return update result code
+ * @return updated access token entity
*/
Map<String, Object> updateToken(User loginUser, int id, int userId, String
expireTime, String token);
}
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AccessTokenServiceImpl.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AccessTokenServiceImpl.java
index 04572ff..9fd9bbf 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AccessTokenServiceImpl.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AccessTokenServiceImpl.java
@@ -208,7 +208,7 @@ public class AccessTokenServiceImpl extends BaseServiceImpl
implements AccessTok
* @param userId token for user
* @param expireTime token expire time
* @param token token string (if it is absent, it will be automatically
generated)
- * @return update result code
+ * @return updated access token entity
*/
@Override
public Map<String, Object> updateToken(User loginUser, int id, int userId,
String expireTime, String token) {
@@ -241,6 +241,7 @@ public class AccessTokenServiceImpl extends BaseServiceImpl
implements AccessTok
accessTokenMapper.updateById(accessToken);
+ result.put(Constants.DATA_LIST, accessToken);
putMsg(result, Status.SUCCESS);
return result;
}
diff --git
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/AccessTokenControllerTest.java
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/AccessTokenControllerTest.java
index 1891f57..1426c19 100644
---
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/AccessTokenControllerTest.java
+++
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/AccessTokenControllerTest.java
@@ -195,6 +195,7 @@ public class AccessTokenControllerTest extends
AbstractControllerTest {
Result result =
JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(),
Result.class);
Assert.assertEquals(Status.SUCCESS.getCode(),
result.getCode().intValue());
+ Assert.assertNotNull(result.getData());
logger.info(mvcResult.getResponse().getContentAsString());
}
}
diff --git
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/AccessTokenServiceTest.java
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/AccessTokenServiceTest.java
index 009fb9a..a9276a5 100644
---
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/AccessTokenServiceTest.java
+++
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/AccessTokenServiceTest.java
@@ -152,11 +152,13 @@ public class AccessTokenServiceTest {
Map<String, Object> result =
accessTokenService.updateToken(getLoginUser(),
1,Integer.MAX_VALUE,getDate(),"token");
logger.info(result.toString());
Assert.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
+ Assert.assertNotNull(result.get(Constants.DATA_LIST));
// Token is absent
result = accessTokenService.updateToken(getLoginUser(), 1,
Integer.MAX_VALUE,getDate(),null);
logger.info(result.toString());
Assert.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
+ Assert.assertNotNull(result.get(Constants.DATA_LIST));
// ACCESS_TOKEN_NOT_EXIST
result = accessTokenService.updateToken(getLoginUser(),
2,Integer.MAX_VALUE,getDate(),"token");
