You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by he...@apache.org on 2022/08/25 12:32:27 UTC
[inlong] branch master updated: [INLONG-5705][Manager] Fix the deprecated dependency of PageInfo (#5704)
This is an automated email from the ASF dual-hosted git repository.
healchow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new defa542b6 [INLONG-5705][Manager] Fix the deprecated dependency of PageInfo (#5704)
defa542b6 is described below
commit defa542b63ebe318923fa8852315808b59cf24f7
Author: Yizhou Yang <32...@users.noreply.github.com>
AuthorDate: Thu Aug 25 20:32:21 2022 +0800
[INLONG-5705][Manager] Fix the deprecated dependency of PageInfo (#5704)
---
.../java/org/apache/inlong/manager/client/cli/ListCommand.java | 2 +-
.../java/org/apache/inlong/manager/client/cli/LogCommand.java | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/ListCommand.java b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/ListCommand.java
index c313746c7..5db28cb72 100644
--- a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/ListCommand.java
+++ b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/ListCommand.java
@@ -19,7 +19,6 @@ package org.apache.inlong.manager.client.cli;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
-import org.apache.inlong.manager.common.enums.SimpleGroupStatus;
import org.apache.inlong.manager.client.api.inner.client.InlongGroupClient;
import org.apache.inlong.manager.client.api.inner.client.InlongStreamClient;
import org.apache.inlong.manager.client.api.inner.client.StreamSinkClient;
@@ -30,6 +29,7 @@ import org.apache.inlong.manager.client.cli.pojo.SourceInfo;
import org.apache.inlong.manager.client.cli.pojo.StreamInfo;
import org.apache.inlong.manager.client.cli.util.ClientUtils;
import org.apache.inlong.manager.client.cli.util.PrintUtils;
+import org.apache.inlong.manager.common.enums.SimpleGroupStatus;
import org.apache.inlong.manager.pojo.common.PageResult;
import org.apache.inlong.manager.pojo.group.InlongGroupBriefInfo;
import org.apache.inlong.manager.pojo.group.InlongGroupPageRequest;
diff --git a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/LogCommand.java b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/LogCommand.java
index dd6a8c15a..6d4fc164c 100644
--- a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/LogCommand.java
+++ b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/LogCommand.java
@@ -19,12 +19,12 @@ package org.apache.inlong.manager.client.cli;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
-import com.github.pagehelper.PageInfo;
import org.apache.commons.lang3.StringUtils;
import org.apache.inlong.manager.client.api.inner.client.InlongGroupClient;
import org.apache.inlong.manager.client.cli.pojo.GroupInfo;
import org.apache.inlong.manager.client.cli.util.ClientUtils;
import org.apache.inlong.manager.client.cli.util.PrintUtils;
+import org.apache.inlong.manager.pojo.common.PageResult;
import org.apache.inlong.manager.pojo.group.InlongGroupBriefInfo;
import org.apache.inlong.manager.pojo.group.InlongGroupPageRequest;
@@ -73,12 +73,12 @@ public class LogCommand extends AbstractCommand {
InlongGroupClient groupClient = ClientUtils.clientFactory.getGroupClient();
InlongGroupPageRequest pageRequest = new InlongGroupPageRequest();
pageRequest.setKeyword(inputs[1]);
- PageInfo<InlongGroupBriefInfo> pageInfo = groupClient.listGroups(pageRequest);
- if (pageInfo.getSize() > MAX_LOG_SIZE) {
+ PageResult<InlongGroupBriefInfo> pageResult = groupClient.listGroups(pageRequest);
+ if (pageResult.getPageSize() > MAX_LOG_SIZE) {
System.err.println("the log is too large to print, please change the filter condition");
return;
}
- PrintUtils.print(pageInfo.getList(), GroupInfo.class);
+ PrintUtils.print(pageResult.getList(), GroupInfo.class);
} catch (Exception e) {
e.printStackTrace();
}