fix type

smartxworks · Jan 3, 2023 · a83b96b · a83b96b
1 parent 6e41846
commit a83b96b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -60,7 +60,7 @@ UserApi userApi = new UserApi(client);
 LoginInput loginInput = new LoginInput()
     .username("root")
     .password("!QAZ2wsx").source(UserSource.LOCAL);
-WithTaskTokenString token = userApi.login(loginInput);
+WithTaskLoginResponse token = userApi.login(loginInput);
 ((ApiKeyAuth) client.getAuthentication("Authorization")).setApiKey(token.getData().getToken());
 ```
 

diff --git a/RELEASE NOTE.md b/RELEASE NOTE.md
@@ -9,6 +9,7 @@ v2.5.0 release
 - feature: ClusterApi: [getMetaLeader]: 增加了获取集群 meta leader 的 api
 - optimize: 增加 header 定义，可以从返回值中获取对应的 x-tower-request-id
 - optimize: [NestedHost]: 嵌套的主机类型额外返回 management_ip
+- optimize: UserApi: [login] 返回值重命名为 WithTaskLoginResponse
 
 ## release 日期 2022-11-18
 

diff --git a/src/main/java/com/smartx/tower/ClientUtil.java b/src/main/java/com/smartx/tower/ClientUtil.java
@@ -4,7 +4,7 @@
 import com.smartx.tower.auth.ApiKeyAuth;
 import com.smartx.tower.model.LoginInput;
 import com.smartx.tower.model.UserSource;
-import com.smartx.tower.model.WithTaskTokenString;
+import com.smartx.tower.model.WithTaskLoginResponse;
 
 public class ClientUtil {
 
@@ -14,7 +14,7 @@ public static void login(String username, String password, ApiClient client) thr
 
   public static void login(String username, String password, boolean useLDAP, ApiClient client) throws ApiException {
     UserApi userApi = new UserApi(client);
-    WithTaskTokenString response = userApi.login(
+    WithTaskLoginResponse response = userApi.login(
         new LoginInput()
             .username(username)
             .password(password)

diff --git a/src/test/java/com/smartx/tower/integration/ITClientFactory.java b/src/test/java/com/smartx/tower/integration/ITClientFactory.java
@@ -20,7 +20,7 @@ private void getToken() throws ApiException {
     try {
       LoginInput loginInput = new LoginInput().password(config.password).username(config.username)
           .source(UserSource.fromValue(config.usersource));
-      com.smartx.tower.model.WithTaskTokenString tokenString = userApi.login(loginInput);
+      com.smartx.tower.model.WithTaskLoginResponse tokenString = userApi.login(loginInput);
       token = tokenString.getData().getToken();
     } catch (ApiException e) {
       throw e;

diff --git a/src/test/java/com/smartx/tower/integration/ITUser.java b/src/test/java/com/smartx/tower/integration/ITUser.java
@@ -104,7 +104,7 @@ public void login(String payload) {
       // parse params from json payload
       LoginInput params = gson.fromJson(payload, new TypeToken<LoginInput>() {}.getType());
       // do some modify to params(optional)
-      WithTaskTokenString result = api.login(params);
+      WithTaskLoginResponse result = api.login(params);
       assertThat(result).as("check result of login").isNotNull();
     } catch (ApiException e) {
       LOGGER.error(e.getResponseBody());