[Optimize] 调整Task代码结构为Connector功能做准备

km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/bean/entity/EntityIdInterface.java

@@ -3,7 +3,7 @@ package com.xiaojukeji.know.streaming.km.common.bean.entity;
 /**
  * @author didi
  */
-public interface EntifyIdInterface {
+public interface EntityIdInterface {
     /**
      * 获取id
      * @return

km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/bean/entity/cluster/ClusterPhy.java

@@ -1,6 +1,6 @@
 package com.xiaojukeji.know.streaming.km.common.bean.entity.cluster;
 
-import com.xiaojukeji.know.streaming.km.common.bean.entity.EntifyIdInterface;
+import com.xiaojukeji.know.streaming.km.common.bean.entity.EntityIdInterface;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -10,7 +10,7 @@ import java.util.Date;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class ClusterPhy implements Comparable<ClusterPhy>, EntifyIdInterface {
+public class ClusterPhy implements Comparable<ClusterPhy>, EntityIdInterface {
     /**
      * 主键
      */

km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/AbstractDispatchTask.java

@@ -7,7 +7,7 @@ import com.didiglobal.logi.job.core.job.Job;
 import com.didiglobal.logi.job.core.job.JobContext;
 import com.didiglobal.logi.log.ILog;
 import com.didiglobal.logi.log.LogFactory;
-import com.xiaojukeji.know.streaming.km.common.bean.entity.EntifyIdInterface;
+import com.xiaojukeji.know.streaming.km.common.bean.entity.EntityIdInterface;
 import com.xiaojukeji.know.streaming.km.common.exception.AdminTaskCodeException;
 import com.xiaojukeji.know.streaming.km.common.utils.ValidateUtils;
 
@@ -16,7 +16,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-public abstract class AbstractDispatchTask<E extends Comparable & EntifyIdInterface> implements Job {
+public abstract class AbstractDispatchTask<E extends Comparable & EntityIdInterface> implements Job {
     private static final ILog LOGGER = LogFactory.getLog(AbstractDispatchTask.class);
 
     /**

km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/AbstractAsyncCommonDispatchTask.java

@@ -1,4 +1,4 @@
-package com.xiaojukeji.know.streaming.km.task;
+package com.xiaojukeji.know.streaming.km.task.kafka;
 
 import com.didiglobal.logi.job.common.TaskResult;
 import com.didiglobal.logi.log.ILog;

km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/AbstractClusterPhyDispatchTask.java

@@ -1,10 +1,11 @@
-package com.xiaojukeji.know.streaming.km.task;
+package com.xiaojukeji.know.streaming.km.task.kafka;
 
 import com.didiglobal.logi.job.common.TaskResult;
 import com.didiglobal.logi.log.ILog;
 import com.didiglobal.logi.log.LogFactory;
 import com.xiaojukeji.know.streaming.km.common.bean.entity.cluster.ClusterPhy;
 import com.xiaojukeji.know.streaming.km.core.service.cluster.ClusterPhyService;
+import com.xiaojukeji.know.streaming.km.task.AbstractDispatchTask;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.List;

km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/client/CheckJmxClientTask.java

@@ -1,4 +1,4 @@
-package com.xiaojukeji.know.streaming.km.task.client;
+package com.xiaojukeji.know.streaming.km.task.kafka.client;
 
 import com.didiglobal.logi.job.annotation.Task;
 import com.didiglobal.logi.job.common.TaskResult;

km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/health/AbstractHealthCheckTask.java

@@ -1,4 +1,4 @@
-package com.xiaojukeji.know.streaming.km.task.health;
+package com.xiaojukeji.know.streaming.km.task.kafka.health;
 
 import com.didiglobal.logi.job.common.TaskResult;
 import com.didiglobal.logi.log.ILog;
@@ -12,7 +12,7 @@ import com.xiaojukeji.know.streaming.km.common.enums.health.HealthCheckDimension
 import com.xiaojukeji.know.streaming.km.common.utils.ValidateUtils;
 import com.xiaojukeji.know.streaming.km.core.service.health.checker.AbstractHealthCheckService;
 import com.xiaojukeji.know.streaming.km.core.service.health.checkresult.HealthCheckResultService;
-import com.xiaojukeji.know.streaming.km.task.metrics.AbstractAsyncMetricsDispatchTask;
+import com.xiaojukeji.know.streaming.km.task.kafka.metrics.AbstractAsyncMetricsDispatchTask;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.ArrayList;

km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/health/BrokerHealthCheckTask.java

@@ -1,4 +1,4 @@
-package com.xiaojukeji.know.streaming.km.task.health;
+package com.xiaojukeji.know.streaming.km.task.kafka.health;
 
 import com.didiglobal.logi.job.annotation.Task;
 import com.didiglobal.logi.job.core.consensual.ConsensualEnum;

km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/health/ClusterHealthCheckTask.java

@@ -1,4 +1,4 @@
-package com.xiaojukeji.know.streaming.km.task.health;
+package com.xiaojukeji.know.streaming.km.task.kafka.health;
 
 import com.didiglobal.logi.job.annotation.Task;
 import com.didiglobal.logi.job.core.consensual.ConsensualEnum;

km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/health/GroupHealthCheckTask.java

@@ -1,4 +1,4 @@
-package com.xiaojukeji.know.streaming.km.task.health;
+package com.xiaojukeji.know.streaming.km.task.kafka.health;
 
 import com.didiglobal.logi.job.annotation.Task;
 import com.didiglobal.logi.job.core.consensual.ConsensualEnum;

km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/health/TopicHealthCheckTask.java

@@ -1,4 +1,4 @@
-package com.xiaojukeji.know.streaming.km.task.health;
+package com.xiaojukeji.know.streaming.km.task.kafka.health;
 
 import com.didiglobal.logi.job.annotation.Task;
 import com.didiglobal.logi.job.core.consensual.ConsensualEnum;

km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/health/ZookeeperHealthCheckTask.java

@@ -1,4 +1,4 @@
-package com.xiaojukeji.know.streaming.km.task.health;
+package com.xiaojukeji.know.streaming.km.task.kafka.health;
 
 import com.didiglobal.logi.job.annotation.Task;
 import com.didiglobal.logi.job.core.consensual.ConsensualEnum;

km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/job/CommunityReassignJobTask.java

@@ -1,4 +1,4 @@
-package com.xiaojukeji.know.streaming.km.task.job;
+package com.xiaojukeji.know.streaming.km.task.kafka.job;
 
 import com.didiglobal.logi.job.annotation.Task;
 import com.didiglobal.logi.job.common.TaskResult;
@@ -8,7 +8,7 @@ import com.didiglobal.logi.log.LogFactory;
 import com.xiaojukeji.know.streaming.km.common.bean.entity.cluster.ClusterPhy;
 import com.xiaojukeji.know.streaming.km.common.bean.entity.result.Result;
 import com.xiaojukeji.know.streaming.km.core.service.reassign.ReassignJobService;
-import com.xiaojukeji.know.streaming.km.task.AbstractAsyncCommonDispatchTask;
+import com.xiaojukeji.know.streaming.km.task.kafka.AbstractAsyncCommonDispatchTask;
 import org.springframework.beans.factory.annotation.Autowired;
 
 @Task(name = "CommunityReassignJobTask",

km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/job/KMJobTask.java

@@ -1,11 +1,11 @@
-package com.xiaojukeji.know.streaming.km.task.job;
+package com.xiaojukeji.know.streaming.km.task.kafka.job;
 
 import com.didiglobal.logi.job.annotation.Task;
 import com.didiglobal.logi.job.common.TaskResult;
 import com.didiglobal.logi.job.core.consensual.ConsensualEnum;
 import com.xiaojukeji.know.streaming.km.common.bean.entity.cluster.ClusterPhy;
 import com.xiaojukeji.know.streaming.km.core.service.job.JobService;
-import com.xiaojukeji.know.streaming.km.task.AbstractAsyncCommonDispatchTask;
+import com.xiaojukeji.know.streaming.km.task.kafka.AbstractAsyncCommonDispatchTask;
 import org.springframework.beans.factory.annotation.Autowired;
 
 @Task(name = "kmJobTask",

km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/metadata/AbstractAsyncMetadataDispatchTask.java

@@ -1,10 +1,10 @@
-package com.xiaojukeji.know.streaming.km.task.metadata;
+package com.xiaojukeji.know.streaming.km.task.kafka.metadata;
 
 import com.didiglobal.logi.job.common.TaskResult;
 import com.didiglobal.logi.log.ILog;
 import com.didiglobal.logi.log.LogFactory;
 import com.xiaojukeji.know.streaming.km.common.bean.entity.cluster.ClusterPhy;
-import com.xiaojukeji.know.streaming.km.task.AbstractClusterPhyDispatchTask;
+import com.xiaojukeji.know.streaming.km.task.kafka.AbstractClusterPhyDispatchTask;
 import com.xiaojukeji.know.streaming.km.task.service.TaskThreadPoolService;
 import org.springframework.beans.factory.annotation.Autowired;
 

km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/metadata/SyncBrokerConfigDiffTask.java

@@ -1,4 +1,4 @@
-package com.xiaojukeji.know.streaming.km.task.metadata;
+package com.xiaojukeji.know.streaming.km.task.kafka.metadata;
 
 import com.didiglobal.logi.job.annotation.Task;
 import com.didiglobal.logi.job.common.TaskResult;

km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/metadata/SyncBrokerTask.java

@@ -1,4 +1,4 @@
-package com.xiaojukeji.know.streaming.km.task.metadata;
+package com.xiaojukeji.know.streaming.km.task.kafka.metadata;
 
 import com.didiglobal.logi.job.annotation.Task;
 import com.didiglobal.logi.job.common.TaskResult;

km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/metadata/SyncControllerTask.java

@@ -1,4 +1,4 @@
-package com.xiaojukeji.know.streaming.km.task.metadata;
+package com.xiaojukeji.know.streaming.km.task.kafka.metadata;
 
 import com.didiglobal.logi.job.annotation.Task;
 import com.didiglobal.logi.job.common.TaskResult;

km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/metadata/SyncKafkaAclTask.java

@@ -1,4 +1,4 @@
-package com.xiaojukeji.know.streaming.km.task.metadata;
+package com.xiaojukeji.know.streaming.km.task.kafka.metadata;
 
 import com.didiglobal.logi.job.annotation.Task;
 import com.didiglobal.logi.job.common.TaskResult;

km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/metadata/SyncKafkaGroupTask.java

@@ -1,4 +1,4 @@
-package com.xiaojukeji.know.streaming.km.task.metadata;
+package com.xiaojukeji.know.streaming.km.task.kafka.metadata;
 
 import com.didiglobal.logi.job.annotation.Task;
 import com.didiglobal.logi.job.common.TaskResult;

km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/metadata/SyncKafkaUserTask.java

@@ -1,4 +1,4 @@
-package com.xiaojukeji.know.streaming.km.task.metadata;
+package com.xiaojukeji.know.streaming.km.task.kafka.metadata;
 
 import com.didiglobal.logi.job.annotation.Task;
 import com.didiglobal.logi.job.common.TaskResult;

km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/metadata/SyncPartitionTask.java

@@ -1,4 +1,4 @@
-package com.xiaojukeji.know.streaming.km.task.metadata;
+package com.xiaojukeji.know.streaming.km.task.kafka.metadata;
 
 import com.didiglobal.logi.job.annotation.Task;
 import com.didiglobal.logi.job.common.TaskResult;

km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/metadata/SyncTopicConfigTask.java

@@ -1,4 +1,4 @@
-package com.xiaojukeji.know.streaming.km.task.metadata;
+package com.xiaojukeji.know.streaming.km.task.kafka.metadata;
 
 import com.didiglobal.logi.job.annotation.Task;
 import com.didiglobal.logi.job.common.TaskResult;

km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/metadata/SyncTopicTask.java

@@ -1,4 +1,4 @@
-package com.xiaojukeji.know.streaming.km.task.metadata;
+package com.xiaojukeji.know.streaming.km.task.kafka.metadata;
 
 import com.didiglobal.logi.job.annotation.Task;
 import com.didiglobal.logi.job.common.TaskResult;

km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/metadata/SyncZookeeperTask.java

@@ -1,4 +1,4 @@
-package com.xiaojukeji.know.streaming.km.task.metadata;
+package com.xiaojukeji.know.streaming.km.task.kafka.metadata;
 
 import com.didiglobal.logi.job.annotation.Task;
 import com.didiglobal.logi.job.common.TaskResult;

km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/metrics/AbstractAsyncMetricsDispatchTask.java

@@ -1,10 +1,10 @@
-package com.xiaojukeji.know.streaming.km.task.metrics;
+package com.xiaojukeji.know.streaming.km.task.kafka.metrics;
 
 import com.didiglobal.logi.job.common.TaskResult;
 import com.didiglobal.logi.log.ILog;
 import com.didiglobal.logi.log.LogFactory;
 import com.xiaojukeji.know.streaming.km.common.bean.entity.cluster.ClusterPhy;
-import com.xiaojukeji.know.streaming.km.task.AbstractClusterPhyDispatchTask;
+import com.xiaojukeji.know.streaming.km.task.kafka.AbstractClusterPhyDispatchTask;
 import com.xiaojukeji.know.streaming.km.task.service.TaskThreadPoolService;
 import org.springframework.beans.factory.annotation.Autowired;
 

km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/metrics/BrokerMetricCollectorTask.java

@@ -1,4 +1,4 @@
-package com.xiaojukeji.know.streaming.km.task.metrics;
+package com.xiaojukeji.know.streaming.km.task.kafka.metrics;
 
 import com.didiglobal.logi.job.annotation.Task;
 import com.didiglobal.logi.job.common.TaskResult;

km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/metrics/ClusterMetricCollectorTask.java

@@ -1,4 +1,4 @@
-package com.xiaojukeji.know.streaming.km.task.metrics;
+package com.xiaojukeji.know.streaming.km.task.kafka.metrics;
 
 import com.didiglobal.logi.job.annotation.Task;
 import com.didiglobal.logi.job.common.TaskResult;

km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/metrics/GroupMetricCollectorTask.java

@@ -1,4 +1,4 @@
-package com.xiaojukeji.know.streaming.km.task.metrics;
+package com.xiaojukeji.know.streaming.km.task.kafka.metrics;
 
 import com.didiglobal.logi.job.annotation.Task;
 import com.didiglobal.logi.job.common.TaskResult;

km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/metrics/PartitionMetricCollectorTask.java

@@ -1,4 +1,4 @@
-package com.xiaojukeji.know.streaming.km.task.metrics;
+package com.xiaojukeji.know.streaming.km.task.kafka.metrics;
 
 import com.didiglobal.logi.job.annotation.Task;
 import com.didiglobal.logi.job.common.TaskResult;

km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/metrics/ReplicaMetricCollectorTask.java

@@ -1,4 +1,4 @@
-//package com.xiaojukeji.know.streaming.km.task.metrics;
+//package com.xiaojukeji.know.streaming.km.task.kafka.metrics;
 //
 //import com.didiglobal.logi.job.annotation.Task;
 //import com.didiglobal.logi.job.common.TaskResult;

km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/metrics/TopicMetricCollectorTask.java

@@ -1,4 +1,4 @@
-package com.xiaojukeji.know.streaming.km.task.metrics;
+package com.xiaojukeji.know.streaming.km.task.kafka.metrics;
 
 import com.didiglobal.logi.job.annotation.Task;
 import com.didiglobal.logi.job.common.TaskResult;

km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/kafka/metrics/ZookeeperMetricCollectorTask.java

@@ -1,4 +1,4 @@
-package com.xiaojukeji.know.streaming.km.task.metrics;
+package com.xiaojukeji.know.streaming.km.task.kafka.metrics;
 
 import com.didiglobal.logi.job.annotation.Task;
 import com.didiglobal.logi.job.common.TaskResult;

km-task/src/main/java/com/xiaojukeji/know/streaming/km/task/service/listener/TaskClusterAddedListener.java

@@ -8,8 +8,8 @@ import com.xiaojukeji.know.streaming.km.common.component.SpringTool;
 import com.xiaojukeji.know.streaming.km.common.utils.BackoffUtils;
 import com.xiaojukeji.know.streaming.km.common.utils.FutureUtil;
 import com.xiaojukeji.know.streaming.km.persistence.cache.LoadedClusterPhyCache;
-import com.xiaojukeji.know.streaming.km.task.metadata.AbstractAsyncMetadataDispatchTask;
-import com.xiaojukeji.know.streaming.km.task.metrics.AbstractAsyncMetricsDispatchTask;
+import com.xiaojukeji.know.streaming.km.task.kafka.metadata.AbstractAsyncMetadataDispatchTask;
+import com.xiaojukeji.know.streaming.km.task.kafka.metrics.AbstractAsyncMetricsDispatchTask;
 import org.springframework.context.ApplicationListener;
 import org.springframework.stereotype.Service;