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/04/21 07:19:18 UTC
[incubator-inlong] branch master updated: [INLONG-3866][Manager] Rename the thirdparty package to resource (#3867)
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/incubator-inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 458b443e8 [INLONG-3866][Manager] Rename the thirdparty package to resource (#3867)
458b443e8 is described below
commit 458b443e8a3aaf9b1128fa7d3c37b96ed4b61218
Author: healchow <he...@gmail.com>
AuthorDate: Thu Apr 21 15:19:12 2022 +0800
[INLONG-3866][Manager] Rename the thirdparty package to resource (#3867)
---
.../service/core/impl/AuditServiceImpl.java | 2 +-
.../service/core/impl/HiveSourceServiceImpl.java | 14 ++++++-------
.../mq/CreatePulsarGroupForStreamTaskListener.java | 4 ++--
.../mq/CreatePulsarGroupTaskListener.java | 4 ++--
.../mq/CreatePulsarResourceTaskListener.java | 4 ++--
.../mq/CreatePulsarTopicForStreamTaskListener.java | 4 ++--
.../mq/CreateTubeGroupTaskListener.java | 2 +-
.../mq/CreateTubeTopicTaskListener.java | 2 +-
.../{thirdparty => }/mq/PulsarEventSelector.java | 2 +-
.../{thirdparty => }/mq/PulsarOptService.java | 2 +-
.../{thirdparty => }/mq/PulsarOptServiceImpl.java | 4 ++--
.../{thirdparty => }/mq/TubeEventSelector.java | 2 +-
.../{thirdparty => }/mq/TubeMqOptService.java | 2 +-
.../{thirdparty => }/mq/util/PulsarUtils.java | 2 +-
.../es}/ElasticsearchApi.java | 2 +-
.../es}/ElasticsearchConfig.java | 2 +-
.../hive/CreateHiveSinkForStreamListener.java | 2 +-
.../hive/CreateHiveSinkListener.java | 2 +-
.../hive/DefaultHiveTableOperator.java | 2 +-
.../hive/HiveSinkEventSelector.java | 2 +-
.../hive/IHiveTableOperator.java | 2 +-
.../hive/builder/HiveAddColumnSqlBuilder.java | 2 +-
.../hive/builder/HiveChangeColumnBuilder.java | 2 +-
.../hive/builder/HiveCreateDbSqlBuilder.java | 2 +-
.../hive/builder/HiveDropDbSqlBuilder.java | 2 +-
.../hive/builder/HiveDropTableSqlBuilder.java | 2 +-
.../hive/builder/HiveQueryTableSqlBuilder.java | 2 +-
.../hive/builder/HiveReplaceColumnSqlBuilder.java | 2 +-
.../hive/builder/HiveTableCreateSqlBuilder.java | 2 +-
.../hive/builder/SqlBuilder.java | 2 +-
.../service/sink/hive/HiveSinkOperation.java | 2 +-
.../sort/CreateSortConfigListener.java | 4 ++--
.../sort/PushSortConfigListener.java | 4 ++--
.../sort/ZkDisabledEventSelector.java | 2 +-
.../sort/ZkEnabledEventSelector.java | 2 +-
.../{thirdparty => }/sort/util/DataFlowUtils.java | 5 ++++-
.../{thirdparty => }/sort/util/FieldInfoUtils.java | 2 +-
.../sort/util/SerializationUtils.java | 2 +-
.../{thirdparty => }/sort/util/SinkInfoUtils.java | 2 +-
.../sort/util/SourceInfoUtils.java | 2 +-
.../service/transform/StreamTransformService.java | 19 +++++++++--------
.../transform/StreamTransformServiceImpl.java | 10 ++++-----
.../workflow/ServiceTaskListenerFactory.java | 24 +++++++++++-----------
.../ConsumptionCompleteProcessListener.java | 6 +++---
.../stream/CreateStreamWorkflowDefinition.java | 8 ++++----
.../{thirdparty => }/mq/util/PulsarUtilsTest.java | 2 +-
.../hive/HiveSinkEventSelectorTest.java | 2 +-
.../sort/DisableZkForSortTest.java | 2 +-
.../workflow/ServiceTaskListenerFactoryTest.java | 8 ++++----
.../service/workflow/WorkflowServiceImplTest.java | 12 +++++------
50 files changed, 102 insertions(+), 100 deletions(-)
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AuditServiceImpl.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AuditServiceImpl.java
index e226dae18..85d2e9f2b 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AuditServiceImpl.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AuditServiceImpl.java
@@ -33,7 +33,7 @@ import org.apache.inlong.manager.common.pojo.audit.AuditVO;
import org.apache.inlong.manager.common.util.Preconditions;
import org.apache.inlong.manager.dao.mapper.AuditEntityMapper;
import org.apache.inlong.manager.service.core.AuditService;
-import org.apache.inlong.manager.service.thirdparty.elasticsearch.ElasticsearchApi;
+import org.apache.inlong.manager.service.resource.es.ElasticsearchApi;
import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.index.query.BoolQueryBuilder;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/HiveSourceServiceImpl.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/HiveSourceServiceImpl.java
index 80094adff..f48377f30 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/HiveSourceServiceImpl.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/HiveSourceServiceImpl.java
@@ -31,13 +31,13 @@ import org.apache.inlong.manager.common.pojo.query.hive.HiveTableQueryBean;
import org.apache.inlong.manager.common.util.Preconditions;
import org.apache.inlong.manager.dao.HiveServerDao;
import org.apache.inlong.manager.service.core.DataSourceService;
-import org.apache.inlong.manager.service.thirdparty.hive.builder.HiveAddColumnSqlBuilder;
-import org.apache.inlong.manager.service.thirdparty.hive.builder.HiveChangeColumnBuilder;
-import org.apache.inlong.manager.service.thirdparty.hive.builder.HiveCreateDbSqlBuilder;
-import org.apache.inlong.manager.service.thirdparty.hive.builder.HiveDropDbSqlBuilder;
-import org.apache.inlong.manager.service.thirdparty.hive.builder.HiveDropTableSqlBuilder;
-import org.apache.inlong.manager.service.thirdparty.hive.builder.HiveQueryTableSqlBuilder;
-import org.apache.inlong.manager.service.thirdparty.hive.builder.HiveTableCreateSqlBuilder;
+import org.apache.inlong.manager.service.resource.hive.builder.HiveAddColumnSqlBuilder;
+import org.apache.inlong.manager.service.resource.hive.builder.HiveChangeColumnBuilder;
+import org.apache.inlong.manager.service.resource.hive.builder.HiveCreateDbSqlBuilder;
+import org.apache.inlong.manager.service.resource.hive.builder.HiveDropDbSqlBuilder;
+import org.apache.inlong.manager.service.resource.hive.builder.HiveDropTableSqlBuilder;
+import org.apache.inlong.manager.service.resource.hive.builder.HiveQueryTableSqlBuilder;
+import org.apache.inlong.manager.service.resource.hive.builder.HiveTableCreateSqlBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/mq/CreatePulsarGroupForStreamTaskListener.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/mq/CreatePulsarGroupForStreamTaskListener.java
similarity index 98%
rename from inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/mq/CreatePulsarGroupForStreamTaskListener.java
rename to inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/mq/CreatePulsarGroupForStreamTaskListener.java
index d4ec8fbc9..90e230023 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/mq/CreatePulsarGroupForStreamTaskListener.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/mq/CreatePulsarGroupForStreamTaskListener.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.service.thirdparty.mq;
+package org.apache.inlong.manager.service.mq;
import lombok.extern.slf4j.Slf4j;
import org.apache.inlong.common.pojo.dataproxy.PulsarClusterInfo;
@@ -31,7 +31,7 @@ import org.apache.inlong.manager.service.CommonOperateService;
import org.apache.inlong.manager.service.core.ConsumptionService;
import org.apache.inlong.manager.service.core.InlongGroupService;
import org.apache.inlong.manager.service.sink.StreamSinkService;
-import org.apache.inlong.manager.service.thirdparty.mq.util.PulsarUtils;
+import org.apache.inlong.manager.service.mq.util.PulsarUtils;
import org.apache.inlong.manager.workflow.WorkflowContext;
import org.apache.inlong.manager.workflow.event.ListenerResult;
import org.apache.inlong.manager.workflow.event.task.QueueOperateListener;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/mq/CreatePulsarGroupTaskListener.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/mq/CreatePulsarGroupTaskListener.java
similarity index 97%
rename from inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/mq/CreatePulsarGroupTaskListener.java
rename to inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/mq/CreatePulsarGroupTaskListener.java
index c22342d0f..87b67bbd2 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/mq/CreatePulsarGroupTaskListener.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/mq/CreatePulsarGroupTaskListener.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.service.thirdparty.mq;
+package org.apache.inlong.manager.service.mq;
import lombok.extern.slf4j.Slf4j;
import org.apache.inlong.common.pojo.dataproxy.PulsarClusterInfo;
@@ -29,7 +29,7 @@ import org.apache.inlong.manager.dao.mapper.InlongStreamEntityMapper;
import org.apache.inlong.manager.service.CommonOperateService;
import org.apache.inlong.manager.service.core.ConsumptionService;
import org.apache.inlong.manager.service.core.InlongGroupService;
-import org.apache.inlong.manager.service.thirdparty.mq.util.PulsarUtils;
+import org.apache.inlong.manager.service.mq.util.PulsarUtils;
import org.apache.inlong.manager.workflow.WorkflowContext;
import org.apache.inlong.manager.workflow.event.ListenerResult;
import org.apache.inlong.manager.workflow.event.task.QueueOperateListener;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/mq/CreatePulsarResourceTaskListener.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/mq/CreatePulsarResourceTaskListener.java
similarity index 98%
rename from inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/mq/CreatePulsarResourceTaskListener.java
rename to inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/mq/CreatePulsarResourceTaskListener.java
index b0b882714..e9181dd34 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/mq/CreatePulsarResourceTaskListener.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/mq/CreatePulsarResourceTaskListener.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.service.thirdparty.mq;
+package org.apache.inlong.manager.service.mq;
import lombok.extern.slf4j.Slf4j;
import org.apache.inlong.common.pojo.dataproxy.PulsarClusterInfo;
@@ -31,7 +31,7 @@ import org.apache.inlong.manager.dao.mapper.InlongGroupPulsarEntityMapper;
import org.apache.inlong.manager.dao.mapper.InlongStreamEntityMapper;
import org.apache.inlong.manager.service.CommonOperateService;
import org.apache.inlong.manager.service.core.InlongGroupService;
-import org.apache.inlong.manager.service.thirdparty.mq.util.PulsarUtils;
+import org.apache.inlong.manager.service.mq.util.PulsarUtils;
import org.apache.inlong.manager.workflow.WorkflowContext;
import org.apache.inlong.manager.workflow.event.ListenerResult;
import org.apache.inlong.manager.workflow.event.task.QueueOperateListener;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/mq/CreatePulsarTopicForStreamTaskListener.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/mq/CreatePulsarTopicForStreamTaskListener.java
similarity index 97%
rename from inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/mq/CreatePulsarTopicForStreamTaskListener.java
rename to inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/mq/CreatePulsarTopicForStreamTaskListener.java
index 2811b5feb..cd1797658 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/mq/CreatePulsarTopicForStreamTaskListener.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/mq/CreatePulsarTopicForStreamTaskListener.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.service.thirdparty.mq;
+package org.apache.inlong.manager.service.mq;
import lombok.extern.slf4j.Slf4j;
import org.apache.inlong.common.pojo.dataproxy.PulsarClusterInfo;
@@ -28,7 +28,7 @@ import org.apache.inlong.manager.dao.entity.InlongStreamEntity;
import org.apache.inlong.manager.dao.mapper.InlongStreamEntityMapper;
import org.apache.inlong.manager.service.CommonOperateService;
import org.apache.inlong.manager.service.core.InlongGroupService;
-import org.apache.inlong.manager.service.thirdparty.mq.util.PulsarUtils;
+import org.apache.inlong.manager.service.mq.util.PulsarUtils;
import org.apache.inlong.manager.workflow.WorkflowContext;
import org.apache.inlong.manager.workflow.event.ListenerResult;
import org.apache.inlong.manager.workflow.event.task.QueueOperateListener;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/mq/CreateTubeGroupTaskListener.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/mq/CreateTubeGroupTaskListener.java
similarity index 98%
rename from inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/mq/CreateTubeGroupTaskListener.java
rename to inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/mq/CreateTubeGroupTaskListener.java
index 6133d4f50..7861c8937 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/mq/CreateTubeGroupTaskListener.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/mq/CreateTubeGroupTaskListener.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.service.thirdparty.mq;
+package org.apache.inlong.manager.service.mq;
import lombok.extern.slf4j.Slf4j;
import org.apache.inlong.manager.common.beans.ReTryConfigBean;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/mq/CreateTubeTopicTaskListener.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/mq/CreateTubeTopicTaskListener.java
similarity index 98%
rename from inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/mq/CreateTubeTopicTaskListener.java
rename to inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/mq/CreateTubeTopicTaskListener.java
index 2af3f31fb..c7a796c1f 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/mq/CreateTubeTopicTaskListener.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/mq/CreateTubeTopicTaskListener.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.service.thirdparty.mq;
+package org.apache.inlong.manager.service.mq;
import lombok.extern.slf4j.Slf4j;
import org.apache.inlong.manager.common.exceptions.WorkflowListenerException;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/mq/PulsarEventSelector.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/mq/PulsarEventSelector.java
similarity index 97%
rename from inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/mq/PulsarEventSelector.java
rename to inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/mq/PulsarEventSelector.java
index c33301a67..bd294d946 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/mq/PulsarEventSelector.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/mq/PulsarEventSelector.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.service.thirdparty.mq;
+package org.apache.inlong.manager.service.mq;
import lombok.extern.slf4j.Slf4j;
import org.apache.inlong.manager.common.enums.MQType;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/mq/PulsarOptService.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/mq/PulsarOptService.java
similarity index 97%
rename from inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/mq/PulsarOptService.java
rename to inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/mq/PulsarOptService.java
index 83b8a0b39..c1b4eda9b 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/mq/PulsarOptService.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/mq/PulsarOptService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.service.thirdparty.mq;
+package org.apache.inlong.manager.service.mq;
import java.util.List;
import org.apache.inlong.manager.common.pojo.pulsar.PulsarTopicBean;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/mq/PulsarOptServiceImpl.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/mq/PulsarOptServiceImpl.java
similarity index 98%
rename from inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/mq/PulsarOptServiceImpl.java
rename to inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/mq/PulsarOptServiceImpl.java
index 8cdda6b7c..0827ac935 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/mq/PulsarOptServiceImpl.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/mq/PulsarOptServiceImpl.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.service.thirdparty.mq;
+package org.apache.inlong.manager.service.mq;
import com.google.common.collect.Sets;
import lombok.extern.slf4j.Slf4j;
@@ -25,7 +25,7 @@ import org.apache.inlong.manager.common.enums.Constant;
import org.apache.inlong.manager.common.pojo.pulsar.PulsarTopicBean;
import org.apache.inlong.manager.common.util.Preconditions;
import org.apache.inlong.manager.dao.entity.InlongGroupPulsarEntity;
-import org.apache.inlong.manager.service.thirdparty.mq.util.PulsarUtils;
+import org.apache.inlong.manager.service.mq.util.PulsarUtils;
import org.apache.pulsar.client.admin.Namespaces;
import org.apache.pulsar.client.admin.PulsarAdmin;
import org.apache.pulsar.client.admin.PulsarAdminException;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/mq/TubeEventSelector.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/mq/TubeEventSelector.java
similarity index 97%
rename from inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/mq/TubeEventSelector.java
rename to inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/mq/TubeEventSelector.java
index 0f35fffb5..884bbc2c8 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/mq/TubeEventSelector.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/mq/TubeEventSelector.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.service.thirdparty.mq;
+package org.apache.inlong.manager.service.mq;
import lombok.extern.slf4j.Slf4j;
import org.apache.inlong.manager.common.enums.MQType;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/mq/TubeMqOptService.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/mq/TubeMqOptService.java
similarity index 99%
rename from inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/mq/TubeMqOptService.java
rename to inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/mq/TubeMqOptService.java
index e800fa0a1..f16c117af 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/mq/TubeMqOptService.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/mq/TubeMqOptService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.service.thirdparty.mq;
+package org.apache.inlong.manager.service.mq;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/mq/util/PulsarUtils.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/mq/util/PulsarUtils.java
similarity index 98%
rename from inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/mq/util/PulsarUtils.java
rename to inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/mq/util/PulsarUtils.java
index 12ab78a7f..8bcd53fbe 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/mq/util/PulsarUtils.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/mq/util/PulsarUtils.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.service.thirdparty.mq.util;
+package org.apache.inlong.manager.service.mq.util;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/elasticsearch/ElasticsearchApi.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/es/ElasticsearchApi.java
similarity index 97%
rename from inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/elasticsearch/ElasticsearchApi.java
rename to inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/es/ElasticsearchApi.java
index acba295be..0b70423ec 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/elasticsearch/ElasticsearchApi.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/es/ElasticsearchApi.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.service.thirdparty.elasticsearch;
+package org.apache.inlong.manager.service.resource.es;
import java.io.IOException;
import org.elasticsearch.action.admin.indices.get.GetIndexRequest;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/elasticsearch/ElasticsearchConfig.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/es/ElasticsearchConfig.java
similarity index 98%
rename from inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/elasticsearch/ElasticsearchConfig.java
rename to inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/es/ElasticsearchConfig.java
index 49ff03e9e..733c69044 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/elasticsearch/ElasticsearchConfig.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/es/ElasticsearchConfig.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.service.thirdparty.elasticsearch;
+package org.apache.inlong.manager.service.resource.es;
import java.util.ArrayList;
import java.util.List;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/hive/CreateHiveSinkForStreamListener.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/hive/CreateHiveSinkForStreamListener.java
similarity index 97%
rename from inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/hive/CreateHiveSinkForStreamListener.java
rename to inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/hive/CreateHiveSinkForStreamListener.java
index b4d16b823..f64ae5213 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/hive/CreateHiveSinkForStreamListener.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/hive/CreateHiveSinkForStreamListener.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.service.thirdparty.hive;
+package org.apache.inlong.manager.service.resource.hive;
import java.util.List;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/hive/CreateHiveSinkListener.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/hive/CreateHiveSinkListener.java
similarity index 98%
rename from inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/hive/CreateHiveSinkListener.java
rename to inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/hive/CreateHiveSinkListener.java
index 9be1bc60c..5ccec43d4 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/hive/CreateHiveSinkListener.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/hive/CreateHiveSinkListener.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.service.thirdparty.hive;
+package org.apache.inlong.manager.service.resource.hive;
import lombok.extern.slf4j.Slf4j;
import org.apache.inlong.manager.common.pojo.sink.SinkForSortDTO;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/hive/DefaultHiveTableOperator.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/hive/DefaultHiveTableOperator.java
similarity index 99%
rename from inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/hive/DefaultHiveTableOperator.java
rename to inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/hive/DefaultHiveTableOperator.java
index 98dcd9df6..ed6b6391d 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/hive/DefaultHiveTableOperator.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/hive/DefaultHiveTableOperator.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.service.thirdparty.hive;
+package org.apache.inlong.manager.service.resource.hive;
import org.apache.commons.collections.CollectionUtils;
import org.apache.inlong.manager.common.enums.Constant;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/hive/HiveSinkEventSelector.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/hive/HiveSinkEventSelector.java
similarity index 98%
rename from inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/hive/HiveSinkEventSelector.java
rename to inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/hive/HiveSinkEventSelector.java
index 1e962e1e2..0b6bcaf89 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/hive/HiveSinkEventSelector.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/hive/HiveSinkEventSelector.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.service.thirdparty.hive;
+package org.apache.inlong.manager.service.resource.hive;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/hive/IHiveTableOperator.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/hive/IHiveTableOperator.java
similarity index 95%
rename from inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/hive/IHiveTableOperator.java
rename to inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/hive/IHiveTableOperator.java
index a9c04dec3..6b1471dd7 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/hive/IHiveTableOperator.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/hive/IHiveTableOperator.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.service.thirdparty.hive;
+package org.apache.inlong.manager.service.resource.hive;
import java.util.List;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/hive/builder/HiveAddColumnSqlBuilder.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/hive/builder/HiveAddColumnSqlBuilder.java
similarity index 97%
rename from inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/hive/builder/HiveAddColumnSqlBuilder.java
rename to inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/hive/builder/HiveAddColumnSqlBuilder.java
index 7c4a4c5fd..821f922d4 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/hive/builder/HiveAddColumnSqlBuilder.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/hive/builder/HiveAddColumnSqlBuilder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.service.thirdparty.hive.builder;
+package org.apache.inlong.manager.service.resource.hive.builder;
import java.util.ArrayList;
import java.util.List;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/hive/builder/HiveChangeColumnBuilder.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/hive/builder/HiveChangeColumnBuilder.java
similarity index 96%
rename from inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/hive/builder/HiveChangeColumnBuilder.java
rename to inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/hive/builder/HiveChangeColumnBuilder.java
index be57c9fe2..8908eab4d 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/hive/builder/HiveChangeColumnBuilder.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/hive/builder/HiveChangeColumnBuilder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.service.thirdparty.hive.builder;
+package org.apache.inlong.manager.service.resource.hive.builder;
import org.apache.commons.lang3.StringUtils;
import org.apache.inlong.manager.common.pojo.query.hive.HiveColumnQueryBean;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/hive/builder/HiveCreateDbSqlBuilder.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/hive/builder/HiveCreateDbSqlBuilder.java
similarity index 95%
rename from inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/hive/builder/HiveCreateDbSqlBuilder.java
rename to inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/hive/builder/HiveCreateDbSqlBuilder.java
index dfd21b21d..2b760ab21 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/hive/builder/HiveCreateDbSqlBuilder.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/hive/builder/HiveCreateDbSqlBuilder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.service.thirdparty.hive.builder;
+package org.apache.inlong.manager.service.resource.hive.builder;
import org.apache.inlong.manager.common.pojo.query.hive.HiveTableQueryBean;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/hive/builder/HiveDropDbSqlBuilder.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/hive/builder/HiveDropDbSqlBuilder.java
similarity index 95%
rename from inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/hive/builder/HiveDropDbSqlBuilder.java
rename to inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/hive/builder/HiveDropDbSqlBuilder.java
index 29f8285e9..8ec39d1de 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/hive/builder/HiveDropDbSqlBuilder.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/hive/builder/HiveDropDbSqlBuilder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.service.thirdparty.hive.builder;
+package org.apache.inlong.manager.service.resource.hive.builder;
import org.apache.inlong.manager.common.pojo.query.DatabaseQueryBean;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/hive/builder/HiveDropTableSqlBuilder.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/hive/builder/HiveDropTableSqlBuilder.java
similarity index 95%
rename from inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/hive/builder/HiveDropTableSqlBuilder.java
rename to inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/hive/builder/HiveDropTableSqlBuilder.java
index 88a4c5207..92979df74 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/hive/builder/HiveDropTableSqlBuilder.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/hive/builder/HiveDropTableSqlBuilder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.service.thirdparty.hive.builder;
+package org.apache.inlong.manager.service.resource.hive.builder;
import org.apache.inlong.manager.common.pojo.query.hive.HiveTableQueryBean;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/hive/builder/HiveQueryTableSqlBuilder.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/hive/builder/HiveQueryTableSqlBuilder.java
similarity index 95%
rename from inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/hive/builder/HiveQueryTableSqlBuilder.java
rename to inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/hive/builder/HiveQueryTableSqlBuilder.java
index 356ec3868..fc4c8c0ec 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/hive/builder/HiveQueryTableSqlBuilder.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/hive/builder/HiveQueryTableSqlBuilder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.service.thirdparty.hive.builder;
+package org.apache.inlong.manager.service.resource.hive.builder;
import org.apache.inlong.manager.common.pojo.query.hive.HiveTableQueryBean;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/hive/builder/HiveReplaceColumnSqlBuilder.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/hive/builder/HiveReplaceColumnSqlBuilder.java
similarity index 97%
rename from inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/hive/builder/HiveReplaceColumnSqlBuilder.java
rename to inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/hive/builder/HiveReplaceColumnSqlBuilder.java
index 97e1ddcac..717f9f128 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/hive/builder/HiveReplaceColumnSqlBuilder.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/hive/builder/HiveReplaceColumnSqlBuilder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.service.thirdparty.hive.builder;
+package org.apache.inlong.manager.service.resource.hive.builder;
import java.util.ArrayList;
import java.util.List;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/hive/builder/HiveTableCreateSqlBuilder.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/hive/builder/HiveTableCreateSqlBuilder.java
similarity index 98%
rename from inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/hive/builder/HiveTableCreateSqlBuilder.java
rename to inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/hive/builder/HiveTableCreateSqlBuilder.java
index bf7243c6d..b1a731d27 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/hive/builder/HiveTableCreateSqlBuilder.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/hive/builder/HiveTableCreateSqlBuilder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.service.thirdparty.hive.builder;
+package org.apache.inlong.manager.service.resource.hive.builder;
import java.util.ArrayList;
import java.util.List;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/hive/builder/SqlBuilder.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/hive/builder/SqlBuilder.java
similarity index 93%
rename from inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/hive/builder/SqlBuilder.java
rename to inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/hive/builder/SqlBuilder.java
index 3ab50f8d5..291566a11 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/hive/builder/SqlBuilder.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/hive/builder/SqlBuilder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.service.thirdparty.hive.builder;
+package org.apache.inlong.manager.service.resource.hive.builder;
public abstract class SqlBuilder<T> {
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/hive/HiveSinkOperation.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/hive/HiveSinkOperation.java
index c09ee5edf..4549226db 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/hive/HiveSinkOperation.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/hive/HiveSinkOperation.java
@@ -42,7 +42,7 @@ import org.apache.inlong.manager.dao.entity.StreamSinkFieldEntity;
import org.apache.inlong.manager.dao.mapper.StreamSinkEntityMapper;
import org.apache.inlong.manager.dao.mapper.StreamSinkFieldEntityMapper;
import org.apache.inlong.manager.service.sink.StreamSinkOperation;
-import org.apache.inlong.manager.service.thirdparty.sort.util.SinkInfoUtils;
+import org.apache.inlong.manager.service.sort.util.SinkInfoUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/sort/CreateSortConfigListener.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sort/CreateSortConfigListener.java
similarity index 97%
rename from inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/sort/CreateSortConfigListener.java
rename to inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sort/CreateSortConfigListener.java
index 5f03986b3..0e5a1edfc 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/sort/CreateSortConfigListener.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sort/CreateSortConfigListener.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.service.thirdparty.sort;
+package org.apache.inlong.manager.service.sort;
import com.google.common.collect.Lists;
import org.apache.commons.collections.CollectionUtils;
@@ -32,7 +32,7 @@ import org.apache.inlong.manager.common.pojo.workflow.form.UpdateGroupProcessFor
import org.apache.inlong.manager.common.pojo.workflow.form.UpdateGroupProcessForm.OperateType;
import org.apache.inlong.manager.common.settings.InlongGroupSettings;
import org.apache.inlong.manager.service.sink.StreamSinkService;
-import org.apache.inlong.manager.service.thirdparty.sort.util.DataFlowUtils;
+import org.apache.inlong.manager.service.sort.util.DataFlowUtils;
import org.apache.inlong.manager.workflow.WorkflowContext;
import org.apache.inlong.manager.workflow.event.ListenerResult;
import org.apache.inlong.manager.workflow.event.task.SortOperateListener;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/sort/PushSortConfigListener.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sort/PushSortConfigListener.java
similarity index 98%
rename from inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/sort/PushSortConfigListener.java
rename to inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sort/PushSortConfigListener.java
index 334427afc..bb82f2bb0 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/sort/PushSortConfigListener.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sort/PushSortConfigListener.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.service.thirdparty.sort;
+package org.apache.inlong.manager.service.sort;
import org.apache.commons.collections.CollectionUtils;
import org.apache.inlong.manager.common.beans.ClusterBean;
@@ -30,7 +30,7 @@ import org.apache.inlong.manager.dao.entity.StreamSinkFieldEntity;
import org.apache.inlong.manager.service.core.InlongGroupService;
import org.apache.inlong.manager.service.core.InlongStreamService;
import org.apache.inlong.manager.service.sink.StreamSinkService;
-import org.apache.inlong.manager.service.thirdparty.sort.util.DataFlowUtils;
+import org.apache.inlong.manager.service.sort.util.DataFlowUtils;
import org.apache.inlong.manager.workflow.WorkflowContext;
import org.apache.inlong.manager.workflow.event.ListenerResult;
import org.apache.inlong.manager.workflow.event.task.SortOperateListener;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/sort/ZkDisabledEventSelector.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sort/ZkDisabledEventSelector.java
similarity index 97%
rename from inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/sort/ZkDisabledEventSelector.java
rename to inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sort/ZkDisabledEventSelector.java
index ffc376ede..542ba2673 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/sort/ZkDisabledEventSelector.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sort/ZkDisabledEventSelector.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.service.thirdparty.sort;
+package org.apache.inlong.manager.service.sort;
import lombok.extern.slf4j.Slf4j;
import org.apache.inlong.manager.common.enums.MQType;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/sort/ZkEnabledEventSelector.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sort/ZkEnabledEventSelector.java
similarity index 97%
rename from inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/sort/ZkEnabledEventSelector.java
rename to inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sort/ZkEnabledEventSelector.java
index 057dfb83e..fa6d5b1b3 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/sort/ZkEnabledEventSelector.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sort/ZkEnabledEventSelector.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.service.thirdparty.sort;
+package org.apache.inlong.manager.service.sort;
import lombok.extern.slf4j.Slf4j;
import org.apache.inlong.manager.common.enums.MQType;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/sort/util/DataFlowUtils.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sort/util/DataFlowUtils.java
similarity index 98%
rename from inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/sort/util/DataFlowUtils.java
rename to inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sort/util/DataFlowUtils.java
index 9108afd43..61ec4617a 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/sort/util/DataFlowUtils.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sort/util/DataFlowUtils.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.service.thirdparty.sort.util;
+package org.apache.inlong.manager.service.sort.util;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.MapUtils;
@@ -45,6 +45,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+/**
+ * Util for build data flow info.
+ */
@Service
public class DataFlowUtils {
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/sort/util/FieldInfoUtils.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sort/util/FieldInfoUtils.java
similarity index 99%
rename from inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/sort/util/FieldInfoUtils.java
rename to inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sort/util/FieldInfoUtils.java
index bee5e92c0..37068228b 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/sort/util/FieldInfoUtils.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sort/util/FieldInfoUtils.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.service.thirdparty.sort.util;
+package org.apache.inlong.manager.service.sort.util;
import org.apache.commons.lang3.StringUtils;
import org.apache.inlong.manager.common.enums.FieldType;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/sort/util/SerializationUtils.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sort/util/SerializationUtils.java
similarity index 99%
rename from inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/sort/util/SerializationUtils.java
rename to inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sort/util/SerializationUtils.java
index e845c3c71..5f32707c3 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/sort/util/SerializationUtils.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sort/util/SerializationUtils.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.service.thirdparty.sort.util;
+package org.apache.inlong.manager.service.sort.util;
import org.apache.inlong.common.enums.DataTypeEnum;
import org.apache.inlong.manager.common.enums.SinkType;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/sort/util/SinkInfoUtils.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sort/util/SinkInfoUtils.java
similarity index 99%
rename from inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/sort/util/SinkInfoUtils.java
rename to inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sort/util/SinkInfoUtils.java
index 0a06f59f9..cf070ec43 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/sort/util/SinkInfoUtils.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sort/util/SinkInfoUtils.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.service.thirdparty.sort.util;
+package org.apache.inlong.manager.service.sort.util;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/sort/util/SourceInfoUtils.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sort/util/SourceInfoUtils.java
similarity index 98%
rename from inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/sort/util/SourceInfoUtils.java
rename to inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sort/util/SourceInfoUtils.java
index 06d11c1eb..833b21f48 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdparty/sort/util/SourceInfoUtils.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sort/util/SourceInfoUtils.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.service.thirdparty.sort.util;
+package org.apache.inlong.manager.service.sort.util;
import org.apache.commons.lang3.StringUtils;
import org.apache.inlong.common.pojo.dataproxy.PulsarClusterInfo;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/transform/StreamTransformService.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/transform/StreamTransformService.java
index 245bef130..d4949fbcd 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/transform/StreamTransformService.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/transform/StreamTransformService.java
@@ -30,8 +30,8 @@ public interface StreamTransformService {
/**
* Save the transform information.
*
- * @param transformRequest
- * @param operator
+ * @param transformRequest the transform request
+ * @param operator name of the operator
* @return transform id after saving
*/
Integer save(TransformRequest transformRequest, String operator);
@@ -39,17 +39,17 @@ public interface StreamTransformService {
/**
* Query transform information based on inlong group id and inlong stream id.
*
- * @param groupId
- * @param streamId
- * @return TransformResponse
+ * @param groupId the inlong group id
+ * @param streamId the inlong stream id
+ * @return the transform response
*/
List<TransformResponse> listTransform(String groupId, String streamId);
/**
* Modify data transform information.
*
- * @param transformRequest
- * @param operator
+ * @param transformRequest the transform request
+ * @param operator name of the operator
* @return Whether succeed
*/
boolean update(TransformRequest transformRequest, String operator);
@@ -57,8 +57,9 @@ public interface StreamTransformService {
/**
* Delete the stream transform by the given id.
*
- * @param id
- * @param operator
+ * @param groupId the inlong group id
+ * @param streamId the inlong stream id
+ * @param operator name of the operator
* @return Whether succeed
*/
boolean delete(String groupId, String streamId, String transformName, String operator);
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/transform/StreamTransformServiceImpl.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/transform/StreamTransformServiceImpl.java
index 8c1082e6a..9e8a47114 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/transform/StreamTransformServiceImpl.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/transform/StreamTransformServiceImpl.java
@@ -56,7 +56,7 @@ public class StreamTransformServiceImpl implements StreamTransformService {
log.info("begin to save transform info: {}", transformRequest);
this.checkParams(transformRequest);
- // Check if can be added
+ // Check whether the transform can be added
final String groupId = transformRequest.getInlongGroupId();
final String streamId = transformRequest.getInlongStreamId();
final String transformName = transformRequest.getTransformName();
@@ -88,11 +88,9 @@ public class StreamTransformServiceImpl implements StreamTransformService {
if (CollectionUtils.isEmpty(transformEntities)) {
return Collections.emptyList();
}
- List<TransformResponse> transformResponses = transformEntities.stream()
- .map(transformEntity -> CommonBeanUtils.copyProperties(transformEntity,
- TransformResponse::new))
+ return transformEntities.stream()
+ .map(entity -> CommonBeanUtils.copyProperties(entity, TransformResponse::new))
.collect(Collectors.toList());
- return transformResponses;
}
@Override
@@ -100,7 +98,7 @@ public class StreamTransformServiceImpl implements StreamTransformService {
public boolean update(TransformRequest transformRequest, String operator) {
log.info("begin to update transform info: {}", transformRequest);
this.checkParams(transformRequest);
- // Check if can be modified
+ // Check whether the transform can be modified
String groupId = transformRequest.getInlongGroupId();
commonOperateService.checkGroupStatus(groupId, operator);
Preconditions.checkNotNull(transformRequest.getId(), ErrorCodeEnum.ID_IS_EMPTY.getMessage());
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/ServiceTaskListenerFactory.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/ServiceTaskListenerFactory.java
index fe9ca4b70..2de2c87f0 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/ServiceTaskListenerFactory.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/ServiceTaskListenerFactory.java
@@ -26,18 +26,18 @@ import org.apache.inlong.manager.service.source.listener.SourceRestartEventSelec
import org.apache.inlong.manager.service.source.listener.SourceRestartListener;
import org.apache.inlong.manager.service.source.listener.SourceStopEventSelector;
import org.apache.inlong.manager.service.source.listener.SourceStopListener;
-import org.apache.inlong.manager.service.thirdparty.hive.HiveSinkEventSelector;
-import org.apache.inlong.manager.service.thirdparty.hive.CreateHiveSinkListener;
-import org.apache.inlong.manager.service.thirdparty.mq.CreatePulsarGroupTaskListener;
-import org.apache.inlong.manager.service.thirdparty.mq.CreatePulsarResourceTaskListener;
-import org.apache.inlong.manager.service.thirdparty.mq.CreateTubeGroupTaskListener;
-import org.apache.inlong.manager.service.thirdparty.mq.CreateTubeTopicTaskListener;
-import org.apache.inlong.manager.service.thirdparty.mq.PulsarEventSelector;
-import org.apache.inlong.manager.service.thirdparty.mq.TubeEventSelector;
-import org.apache.inlong.manager.service.thirdparty.sort.CreateSortConfigListener;
-import org.apache.inlong.manager.service.thirdparty.sort.PushSortConfigListener;
-import org.apache.inlong.manager.service.thirdparty.sort.ZkDisabledEventSelector;
-import org.apache.inlong.manager.service.thirdparty.sort.ZkEnabledEventSelector;
+import org.apache.inlong.manager.service.resource.hive.HiveSinkEventSelector;
+import org.apache.inlong.manager.service.resource.hive.CreateHiveSinkListener;
+import org.apache.inlong.manager.service.mq.CreatePulsarGroupTaskListener;
+import org.apache.inlong.manager.service.mq.CreatePulsarResourceTaskListener;
+import org.apache.inlong.manager.service.mq.CreateTubeGroupTaskListener;
+import org.apache.inlong.manager.service.mq.CreateTubeTopicTaskListener;
+import org.apache.inlong.manager.service.mq.PulsarEventSelector;
+import org.apache.inlong.manager.service.mq.TubeEventSelector;
+import org.apache.inlong.manager.service.sort.CreateSortConfigListener;
+import org.apache.inlong.manager.service.sort.PushSortConfigListener;
+import org.apache.inlong.manager.service.sort.ZkDisabledEventSelector;
+import org.apache.inlong.manager.service.sort.ZkEnabledEventSelector;
import org.apache.inlong.manager.workflow.WorkflowContext;
import org.apache.inlong.manager.workflow.definition.ServiceTaskListenerProvider;
import org.apache.inlong.manager.workflow.definition.ServiceTaskType;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/consumption/listener/ConsumptionCompleteProcessListener.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/consumption/listener/ConsumptionCompleteProcessListener.java
index d6d842d34..a2e05e487 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/consumption/listener/ConsumptionCompleteProcessListener.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/consumption/listener/ConsumptionCompleteProcessListener.java
@@ -32,9 +32,9 @@ import org.apache.inlong.manager.dao.entity.ConsumptionEntity;
import org.apache.inlong.manager.dao.mapper.ConsumptionEntityMapper;
import org.apache.inlong.manager.service.CommonOperateService;
import org.apache.inlong.manager.service.core.InlongGroupService;
-import org.apache.inlong.manager.service.thirdparty.mq.PulsarOptService;
-import org.apache.inlong.manager.service.thirdparty.mq.TubeMqOptService;
-import org.apache.inlong.manager.service.thirdparty.mq.util.PulsarUtils;
+import org.apache.inlong.manager.service.mq.PulsarOptService;
+import org.apache.inlong.manager.service.mq.TubeMqOptService;
+import org.apache.inlong.manager.service.mq.util.PulsarUtils;
import org.apache.inlong.manager.workflow.WorkflowContext;
import org.apache.inlong.manager.workflow.event.ListenerResult;
import org.apache.inlong.manager.workflow.event.process.ProcessEvent;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/stream/CreateStreamWorkflowDefinition.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/stream/CreateStreamWorkflowDefinition.java
index 5cb5b1888..1354d2001 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/stream/CreateStreamWorkflowDefinition.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/stream/CreateStreamWorkflowDefinition.java
@@ -23,10 +23,10 @@ import org.apache.inlong.manager.common.enums.MQType;
import org.apache.inlong.manager.common.enums.SinkType;
import org.apache.inlong.manager.common.pojo.workflow.form.GroupResourceProcessForm;
import org.apache.inlong.manager.service.sink.StreamSinkService;
-import org.apache.inlong.manager.service.thirdparty.hive.CreateHiveSinkForStreamListener;
-import org.apache.inlong.manager.service.thirdparty.mq.CreatePulsarGroupForStreamTaskListener;
-import org.apache.inlong.manager.service.thirdparty.mq.CreatePulsarTopicForStreamTaskListener;
-import org.apache.inlong.manager.service.thirdparty.sort.PushSortConfigListener;
+import org.apache.inlong.manager.service.resource.hive.CreateHiveSinkForStreamListener;
+import org.apache.inlong.manager.service.mq.CreatePulsarGroupForStreamTaskListener;
+import org.apache.inlong.manager.service.mq.CreatePulsarTopicForStreamTaskListener;
+import org.apache.inlong.manager.service.sort.PushSortConfigListener;
import org.apache.inlong.manager.service.workflow.ProcessName;
import org.apache.inlong.manager.service.workflow.WorkflowDefinition;
import org.apache.inlong.manager.service.workflow.group.listener.InitGroupListener;
diff --git a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/thirdparty/mq/util/PulsarUtilsTest.java b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/mq/util/PulsarUtilsTest.java
similarity index 98%
rename from inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/thirdparty/mq/util/PulsarUtilsTest.java
rename to inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/mq/util/PulsarUtilsTest.java
index e516e4c37..2a457f664 100644
--- a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/thirdparty/mq/util/PulsarUtilsTest.java
+++ b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/mq/util/PulsarUtilsTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.service.thirdparty.mq.util;
+package org.apache.inlong.manager.service.mq.util;
import com.google.common.collect.Lists;
import org.apache.inlong.manager.common.pojo.group.InlongGroupExtInfo;
diff --git a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/thirdparty/hive/HiveSinkEventSelectorTest.java b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/resource/hive/HiveSinkEventSelectorTest.java
similarity index 96%
rename from inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/thirdparty/hive/HiveSinkEventSelectorTest.java
rename to inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/resource/hive/HiveSinkEventSelectorTest.java
index a9ab05be7..6737aca3d 100644
--- a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/thirdparty/hive/HiveSinkEventSelectorTest.java
+++ b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/resource/hive/HiveSinkEventSelectorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.service.thirdparty.hive;
+package org.apache.inlong.manager.service.resource.hive;
import org.apache.inlong.manager.common.pojo.group.InlongGroupInfo;
import org.apache.inlong.manager.common.pojo.workflow.form.GroupResourceProcessForm;
diff --git a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/thirdparty/sort/DisableZkForSortTest.java b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/sort/DisableZkForSortTest.java
similarity index 99%
rename from inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/thirdparty/sort/DisableZkForSortTest.java
rename to inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/sort/DisableZkForSortTest.java
index 7c12bd39e..2043a4a0e 100644
--- a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/thirdparty/sort/DisableZkForSortTest.java
+++ b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/sort/DisableZkForSortTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.service.thirdparty.sort;
+package org.apache.inlong.manager.service.sort;
import com.google.common.collect.Lists;
import org.apache.inlong.manager.common.enums.GroupState;
diff --git a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/workflow/ServiceTaskListenerFactoryTest.java b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/workflow/ServiceTaskListenerFactoryTest.java
index 3c6454b7c..473d1663b 100644
--- a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/workflow/ServiceTaskListenerFactoryTest.java
+++ b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/workflow/ServiceTaskListenerFactoryTest.java
@@ -21,10 +21,10 @@ import org.apache.inlong.manager.common.enums.MQType;
import org.apache.inlong.manager.common.pojo.group.InlongGroupInfo;
import org.apache.inlong.manager.common.pojo.workflow.form.GroupResourceProcessForm;
import org.apache.inlong.manager.service.ServiceBaseTest;
-import org.apache.inlong.manager.service.thirdparty.mq.CreatePulsarGroupTaskListener;
-import org.apache.inlong.manager.service.thirdparty.mq.CreatePulsarResourceTaskListener;
-import org.apache.inlong.manager.service.thirdparty.mq.CreateTubeGroupTaskListener;
-import org.apache.inlong.manager.service.thirdparty.mq.CreateTubeTopicTaskListener;
+import org.apache.inlong.manager.service.mq.CreatePulsarGroupTaskListener;
+import org.apache.inlong.manager.service.mq.CreatePulsarResourceTaskListener;
+import org.apache.inlong.manager.service.mq.CreateTubeGroupTaskListener;
+import org.apache.inlong.manager.service.mq.CreateTubeTopicTaskListener;
import org.apache.inlong.manager.workflow.WorkflowContext;
import org.apache.inlong.manager.workflow.event.task.QueueOperateListener;
import org.junit.Assert;
diff --git a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/workflow/WorkflowServiceImplTest.java b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/workflow/WorkflowServiceImplTest.java
index d335ff7a6..5eaefe51c 100644
--- a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/workflow/WorkflowServiceImplTest.java
+++ b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/workflow/WorkflowServiceImplTest.java
@@ -44,12 +44,12 @@ import org.apache.inlong.manager.service.mocks.MockDeleteSortListener;
import org.apache.inlong.manager.service.mocks.MockPlugin;
import org.apache.inlong.manager.service.mocks.MockRestartSortListener;
import org.apache.inlong.manager.service.mocks.MockStopSortListener;
-import org.apache.inlong.manager.service.thirdparty.hive.CreateHiveSinkListener;
-import org.apache.inlong.manager.service.thirdparty.mq.CreatePulsarGroupTaskListener;
-import org.apache.inlong.manager.service.thirdparty.mq.CreatePulsarResourceTaskListener;
-import org.apache.inlong.manager.service.thirdparty.mq.CreateTubeGroupTaskListener;
-import org.apache.inlong.manager.service.thirdparty.mq.CreateTubeTopicTaskListener;
-import org.apache.inlong.manager.service.thirdparty.sort.PushSortConfigListener;
+import org.apache.inlong.manager.service.resource.hive.CreateHiveSinkListener;
+import org.apache.inlong.manager.service.mq.CreatePulsarGroupTaskListener;
+import org.apache.inlong.manager.service.mq.CreatePulsarResourceTaskListener;
+import org.apache.inlong.manager.service.mq.CreateTubeGroupTaskListener;
+import org.apache.inlong.manager.service.mq.CreateTubeTopicTaskListener;
+import org.apache.inlong.manager.service.sort.PushSortConfigListener;
import org.apache.inlong.manager.workflow.WorkflowContext;
import org.apache.inlong.manager.workflow.core.WorkflowEngine;
import org.apache.inlong.manager.workflow.definition.ServiceTask;