Skip to content

[INLONG-5936][Manager] Fix return type of cluster API #5937

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
healchow merged 1 commit into from
Sep 20, 2022
Merged

[INLONG-5936][Manager] Fix return type of cluster API #5937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...nager/manager-client/src/main/java/org/apache/inlong/manager/client/api/InlongClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ static InlongClient create(String serviceUrl, ClientConfiguration configuration)
* @param request query conditions
* @return cluster list
*/
ClusterInfo list(ClusterPageRequest request);
PageResult<ClusterInfo> list(ClusterPageRequest request);

/**
* Update cluster information.
Expand Down
2 changes: 1 addition & 1 deletion ...ager-client/src/main/java/org/apache/inlong/manager/client/api/impl/InlongClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ public ClusterInfo get(Integer id) {
}

@Override
public ClusterInfo list(ClusterPageRequest request) {
public PageResult<ClusterInfo> list(ClusterPageRequest request) {
return clusterClient.list(request);
}

Expand Down
8 changes: 4 additions & 4 deletions .../src/main/java/org/apache/inlong/manager/client/api/inner/client/InlongClusterClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,10 @@ public ClusterInfo get(Integer id) {
* @param request query conditions
* @return cluster list
*/
public ClusterInfo list(ClusterPageRequest request) {
Response<ClusterInfo> clusterInfoResponse = ClientUtils.executeHttpCall(inlongClusterApi.list(request));
ClientUtils.assertRespSuccess(clusterInfoResponse);
return clusterInfoResponse.getData();
public PageResult<ClusterInfo> list(ClusterPageRequest request) {
Response<PageResult<ClusterInfo>> response = ClientUtils.executeHttpCall(inlongClusterApi.list(request));
ClientUtils.assertRespSuccess(response);
return response.getData();
}

/**
Expand Down
2 changes: 1 addition & 1 deletion ...r-client/src/main/java/org/apache/inlong/manager/client/api/service/InlongClusterApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public interface InlongClusterApi {
Call<Response<ClusterInfo>> get(@Path("id") Integer id);

@POST("cluster/list")
Call<Response<ClusterInfo>> list(@Body ClusterPageRequest request);
Call<Response<PageResult<ClusterInfo>>> list(@Body ClusterPageRequest request);

@POST("cluster/update")
Call<Response<Boolean>> update(@Body ClusterRequest request);
Expand Down