You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by do...@apache.org on 2022/10/20 01:59:24 UTC
[inlong] branch master updated: [INLONG-6222][Manager] Fix parse source status failure in Command tools (#6223)
This is an automated email from the ASF dual-hosted git repository.
dockerzhang 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 4dee52031 [INLONG-6222][Manager] Fix parse source status failure in Command tools (#6223)
4dee52031 is described below
commit 4dee520314187b158190677152453c09d91467a4
Author: haifxu <xh...@gmail.com>
AuthorDate: Thu Oct 20 09:59:18 2022 +0800
[INLONG-6222][Manager] Fix parse source status failure in Command tools (#6223)
---
.../apache/inlong/manager/client/cli/pojo/GroupInfo.java | 3 ++-
.../org/apache/inlong/manager/client/cli/pojo/SinkInfo.java | 3 ++-
.../apache/inlong/manager/client/cli/pojo/SourceInfo.java | 3 ++-
.../apache/inlong/manager/client/cli/pojo/StreamInfo.java | 3 ++-
.../apache/inlong/manager/client/cli/util/ParseStatus.java | 2 +-
.../apache/inlong/manager/client/cli/util/PrintUtils.java | 13 ++++++++++---
6 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/GroupInfo.java b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/GroupInfo.java
index a85322955..f39ad3c0b 100644
--- a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/GroupInfo.java
+++ b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/GroupInfo.java
@@ -20,6 +20,7 @@ package org.apache.inlong.manager.client.cli.pojo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.apache.inlong.manager.client.cli.util.ParseStatus;
+import org.apache.inlong.manager.common.enums.SimpleGroupStatus;
import java.util.Date;
@@ -33,7 +34,7 @@ public class GroupInfo {
private String inlongGroupId;
private String name;
- @ParseStatus
+ @ParseStatus(clazz = SimpleGroupStatus.class)
private String status;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date modifyTime;
diff --git a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/SinkInfo.java b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/SinkInfo.java
index a714eefc2..5e3e5cf72 100644
--- a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/SinkInfo.java
+++ b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/SinkInfo.java
@@ -20,6 +20,7 @@ package org.apache.inlong.manager.client.cli.pojo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.apache.inlong.manager.client.cli.util.ParseStatus;
+import org.apache.inlong.manager.common.enums.SimpleGroupStatus;
import java.util.Date;
@@ -35,7 +36,7 @@ public class SinkInfo {
private String sinkType;
private String sinkName;
- @ParseStatus
+ @ParseStatus(clazz = SimpleGroupStatus.class)
private String status;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date modifyTime;
diff --git a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/SourceInfo.java b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/SourceInfo.java
index 131bc95d3..36b109a1f 100644
--- a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/SourceInfo.java
+++ b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/SourceInfo.java
@@ -20,6 +20,7 @@ package org.apache.inlong.manager.client.cli.pojo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.apache.inlong.manager.client.cli.util.ParseStatus;
+import org.apache.inlong.manager.common.enums.SimpleSourceStatus;
import java.util.Date;
@@ -36,7 +37,7 @@ public class SourceInfo {
private String sourceName;
private String serializationType;
- @ParseStatus
+ @ParseStatus(clazz = SimpleSourceStatus.class)
private String status;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date modifyTime;
diff --git a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/StreamInfo.java b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/StreamInfo.java
index 4c9292d0b..2f472e8d3 100644
--- a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/StreamInfo.java
+++ b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/pojo/StreamInfo.java
@@ -20,6 +20,7 @@ package org.apache.inlong.manager.client.cli.pojo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.apache.inlong.manager.client.cli.util.ParseStatus;
+import org.apache.inlong.manager.common.enums.SimpleGroupStatus;
import java.util.Date;
@@ -36,7 +37,7 @@ public class StreamInfo {
private String dataEncoding;
private String dataSeparator;
- @ParseStatus
+ @ParseStatus(clazz = SimpleGroupStatus.class)
private String status;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date modifyTime;
diff --git a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/util/ParseStatus.java b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/util/ParseStatus.java
index d553c14a8..733a06cdb 100644
--- a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/util/ParseStatus.java
+++ b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/util/ParseStatus.java
@@ -29,5 +29,5 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD)
public @interface ParseStatus {
-
+ Class<?> clazz();
}
diff --git a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/util/PrintUtils.java b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/util/PrintUtils.java
index 3a67c8c6d..2d313251b 100644
--- a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/util/PrintUtils.java
+++ b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/util/PrintUtils.java
@@ -19,6 +19,7 @@ package org.apache.inlong.manager.client.cli.util;
import org.apache.commons.lang3.StringUtils;
import org.apache.inlong.manager.common.enums.SimpleGroupStatus;
+import org.apache.inlong.manager.common.enums.SimpleSourceStatus;
import org.apache.inlong.manager.common.util.JsonUtils;
import java.lang.reflect.Field;
@@ -178,9 +179,15 @@ public class PrintUtils {
field.setAccessible(true);
if (field.isAnnotationPresent(ParseStatus.class)) {
try {
- int status = Integer.parseInt(field.get(target).toString());
- SimpleGroupStatus groupStatus = SimpleGroupStatus.parseStatusByCode(status);
- field.set(target, String.format("%s (%d)", groupStatus, status));
+ int code = Integer.parseInt(field.get(target).toString());
+ String name = "";
+ Class<?> clazz = field.getAnnotation(ParseStatus.class).clazz();
+ if (SimpleGroupStatus.class.equals(clazz)) {
+ name = SimpleGroupStatus.parseStatusByCode(code).toString();
+ } else if (SimpleSourceStatus.class.equals(clazz)) {
+ name = SimpleSourceStatus.parseByStatus(code).toString();
+ }
+ field.set(target, String.format("%s (%d)", name, code));
} catch (IllegalAccessException e) {
throw new RuntimeException(e);
}