[inlong] branch master updated: [INLONG-5337][Manager] Add Agent cluster info and operator (#5338)

[he...@apache.org]

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 e0bd5235c [INLONG-5337][Manager] Add Agent cluster info and operator (#5338)
e0bd5235c is described below

commit e0bd5235c57c29210e786a38862db9aa91e328b5
Author: kipshi <48...@users.noreply.github.com>
AuthorDate: Fri Aug 5 10:18:44 2022 +0800

    [INLONG-5337][Manager] Add Agent cluster info and operator (#5338)
---
 .../inlong/manager/common/enums/ClusterType.java       |  3 +--
 .../manager/pojo/cluster/agent/AgentClusterInfo.java   | 18 ++++++++++++++++--
 .../pojo/cluster/agent/AgentClusterRequest.java        |  6 +++---
 .../manager/service/cluster/AgentClusterOperator.java  | 17 +++++++++--------
 4 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/ClusterType.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/ClusterType.java
index 5d22886ab..8862bad9f 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/ClusterType.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/ClusterType.java
@@ -22,9 +22,8 @@ package org.apache.inlong.manager.common.enums;
  */
 public class ClusterType {
 
-    public static final String TUBEMQ = "TUBEMQ";
     public static final String AGENT = "AGENT";
-    public static final String SDK = "SDK";
+    public static final String TUBEMQ = "TUBEMQ";
     public static final String PULSAR = "PULSAR";
     public static final String DATAPROXY = "DATAPROXY";
 }
diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/agent/AgentClusterInfo.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/agent/AgentClusterInfo.java
index 5f06da1ac..b23a3b8c0 100644
--- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/agent/AgentClusterInfo.java
+++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/agent/AgentClusterInfo.java
@@ -17,11 +17,24 @@
 
 package org.apache.inlong.manager.pojo.cluster.agent;
 
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.apache.inlong.manager.common.enums.ClusterType;
+import org.apache.inlong.manager.common.util.CommonBeanUtils;
+import org.apache.inlong.manager.common.util.JsonTypeDefine;
 import org.apache.inlong.manager.pojo.cluster.ClusterInfo;
 import org.apache.inlong.manager.pojo.cluster.ClusterRequest;
-import org.apache.inlong.manager.common.util.CommonBeanUtils;
 
+/**
+ * Agent cluster info
+ */
+@Data
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+@JsonTypeDefine(value = ClusterType.AGENT)
+@ApiModel("Inlong cluster info for Agent")
 public class AgentClusterInfo extends ClusterInfo {
 
     public AgentClusterInfo() {
@@ -32,4 +45,5 @@ public class AgentClusterInfo extends ClusterInfo {
     public ClusterRequest genRequest() {
         return CommonBeanUtils.copyProperties(this, AgentClusterRequest::new);
     }
-}
\ No newline at end of file
+
+}
diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/agent/AgentClusterRequest.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/agent/AgentClusterRequest.java
index 251da1f5b..70163259f 100644
--- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/agent/AgentClusterRequest.java
+++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/agent/AgentClusterRequest.java
@@ -22,17 +22,17 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import org.apache.inlong.manager.common.enums.ClusterType;
-import org.apache.inlong.manager.pojo.cluster.ClusterRequest;
 import org.apache.inlong.manager.common.util.JsonTypeDefine;
+import org.apache.inlong.manager.pojo.cluster.ClusterRequest;
 
 /**
- * Inlong cluster request for agent
+ * Inlong cluster request for Agent
  */
 @Data
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 @JsonTypeDefine(value = ClusterType.AGENT)
-@ApiModel("Inlong cluster request for DataProxy")
+@ApiModel("Inlong cluster request for Agent")
 public class AgentClusterRequest extends ClusterRequest {
 
     public AgentClusterRequest() {
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cluster/AgentClusterOperator.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cluster/AgentClusterOperator.java
index 5203f4589..ce04d2d65 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cluster/AgentClusterOperator.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cluster/AgentClusterOperator.java
@@ -21,25 +21,20 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.inlong.manager.common.enums.ClusterType;
 import org.apache.inlong.manager.common.enums.ErrorCodeEnum;
 import org.apache.inlong.manager.common.exceptions.BusinessException;
+import org.apache.inlong.manager.common.util.CommonBeanUtils;
+import org.apache.inlong.manager.dao.entity.InlongClusterEntity;
 import org.apache.inlong.manager.pojo.cluster.ClusterInfo;
 import org.apache.inlong.manager.pojo.cluster.ClusterRequest;
 import org.apache.inlong.manager.pojo.cluster.agent.AgentClusterInfo;
-import org.apache.inlong.manager.common.util.CommonBeanUtils;
-import org.apache.inlong.manager.dao.entity.InlongClusterEntity;
 import org.springframework.stereotype.Service;
 
 /**
  * Agent cluster operator.
  */
-@Service
 @Slf4j
+@Service
 public class AgentClusterOperator extends AbstractClusterOperator {
 
-    @Override
-    protected void setTargetEntity(ClusterRequest request, InlongClusterEntity targetEntity) {
-        log.info("do nothing for agent cluster in set target entity");
-    }
-
     @Override
     public Boolean accept(String clusterType) {
         return getClusterType().equals(clusterType);
@@ -50,6 +45,11 @@ public class AgentClusterOperator extends AbstractClusterOperator {
         return ClusterType.AGENT;
     }
 
+    @Override
+    protected void setTargetEntity(ClusterRequest request, InlongClusterEntity targetEntity) {
+        log.info("do nothing for agent cluster in set target entity");
+    }
+
     @Override
     public ClusterInfo getFromEntity(InlongClusterEntity entity) {
         if (entity == null) {
@@ -57,4 +57,5 @@ public class AgentClusterOperator extends AbstractClusterOperator {
         }
         return CommonBeanUtils.copyProperties(entity, AgentClusterInfo::new);
     }
+
 }