diff --git a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/AgentManager.java b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/AgentManager.java index 29c000dcc4..3c73f6696d 100755 --- a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/AgentManager.java +++ b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/AgentManager.java @@ -21,7 +21,7 @@ import org.apache.inlong.agent.conf.AgentConfiguration; import org.apache.inlong.agent.conf.ProfileFetcher; import org.apache.inlong.agent.constant.AgentConstants; -import org.apache.inlong.agent.core.task.file.TaskManager; +import org.apache.inlong.agent.core.task.TaskManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/HeartbeatManager.java b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/HeartbeatManager.java index 1e362bec0e..467ba2f1ee 100644 --- a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/HeartbeatManager.java +++ b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/HeartbeatManager.java @@ -19,8 +19,8 @@ import org.apache.inlong.agent.common.AbstractDaemon; import org.apache.inlong.agent.conf.AgentConfiguration; -import org.apache.inlong.agent.core.task.file.MemoryManager; -import org.apache.inlong.agent.core.task.file.TaskManager; +import org.apache.inlong.agent.core.task.MemoryManager; +import org.apache.inlong.agent.core.task.TaskManager; import org.apache.inlong.agent.utils.AgentUtils; import org.apache.inlong.agent.utils.HttpManager; import org.apache.inlong.agent.utils.ThreadUtils; diff --git a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/task/file/MemoryManager.java b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/task/MemoryManager.java similarity index 99% rename from inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/task/file/MemoryManager.java rename to inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/task/MemoryManager.java index a3bfc415e2..d785effdac 100644 --- a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/task/file/MemoryManager.java +++ b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/task/MemoryManager.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.inlong.agent.core.task.file; +package org.apache.inlong.agent.core.task; import org.apache.inlong.agent.conf.AgentConfiguration; import org.apache.inlong.agent.utils.AgentUtils; diff --git a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/task/file/TaskManager.java b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/task/TaskManager.java similarity index 99% rename from inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/task/file/TaskManager.java rename to inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/task/TaskManager.java index d4853085de..12fab4d8c9 100644 --- a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/task/file/TaskManager.java +++ b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/task/TaskManager.java @@ -15,15 +15,13 @@ * limitations under the License. */ -package org.apache.inlong.agent.core.task.file; +package org.apache.inlong.agent.core.task; import org.apache.inlong.agent.common.AbstractDaemon; import org.apache.inlong.agent.common.AgentThreadFactory; import org.apache.inlong.agent.conf.AgentConfiguration; import org.apache.inlong.agent.conf.TaskProfile; import org.apache.inlong.agent.constant.AgentConstants; -import org.apache.inlong.agent.core.task.OffsetManager; -import org.apache.inlong.agent.core.task.TaskAction; import org.apache.inlong.agent.db.Db; import org.apache.inlong.agent.db.RocksDbImp; import org.apache.inlong.agent.db.TaskProfileDb; diff --git a/inlong-agent/agent-core/src/test/java/org/apache/inlong/agent/core/instance/TestInstanceManager.java b/inlong-agent/agent-core/src/test/java/org/apache/inlong/agent/core/instance/TestInstanceManager.java index 8d267e71a1..7c21666a9e 100755 --- a/inlong-agent/agent-core/src/test/java/org/apache/inlong/agent/core/instance/TestInstanceManager.java +++ b/inlong-agent/agent-core/src/test/java/org/apache/inlong/agent/core/instance/TestInstanceManager.java @@ -21,7 +21,7 @@ import org.apache.inlong.agent.conf.TaskProfile; import org.apache.inlong.agent.constant.AgentConstants; import org.apache.inlong.agent.core.AgentBaseTestsHelper; -import org.apache.inlong.agent.core.task.file.TaskManager; +import org.apache.inlong.agent.core.task.TaskManager; import org.apache.inlong.agent.db.Db; import org.apache.inlong.agent.db.InstanceDb; import org.apache.inlong.agent.db.TaskProfileDb; diff --git a/inlong-agent/agent-core/src/test/java/org/apache/inlong/agent/core/task/MockTask.java b/inlong-agent/agent-core/src/test/java/org/apache/inlong/agent/core/task/MockTask.java index 88860c831d..03f2b3b8fa 100644 --- a/inlong-agent/agent-core/src/test/java/org/apache/inlong/agent/core/task/MockTask.java +++ b/inlong-agent/agent-core/src/test/java/org/apache/inlong/agent/core/task/MockTask.java @@ -18,7 +18,6 @@ package org.apache.inlong.agent.core.task; import org.apache.inlong.agent.conf.TaskProfile; -import org.apache.inlong.agent.core.task.file.TaskManager; import org.apache.inlong.agent.db.Db; import org.apache.inlong.agent.plugin.file.Task; diff --git a/inlong-agent/agent-core/src/test/java/org/apache/inlong/agent/core/task/TestMemoryManager.java b/inlong-agent/agent-core/src/test/java/org/apache/inlong/agent/core/task/TestMemoryManager.java index 9e0b8fe99e..e203e0d760 100644 --- a/inlong-agent/agent-core/src/test/java/org/apache/inlong/agent/core/task/TestMemoryManager.java +++ b/inlong-agent/agent-core/src/test/java/org/apache/inlong/agent/core/task/TestMemoryManager.java @@ -18,7 +18,6 @@ package org.apache.inlong.agent.core.task; import org.apache.inlong.agent.conf.AgentConfiguration; -import org.apache.inlong.agent.core.task.file.MemoryManager; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/inlong-agent/agent-core/src/test/java/org/apache/inlong/agent/core/task/TestTaskManager.java b/inlong-agent/agent-core/src/test/java/org/apache/inlong/agent/core/task/TestTaskManager.java index 08e87086e2..11cc413ed1 100755 --- a/inlong-agent/agent-core/src/test/java/org/apache/inlong/agent/core/task/TestTaskManager.java +++ b/inlong-agent/agent-core/src/test/java/org/apache/inlong/agent/core/task/TestTaskManager.java @@ -19,7 +19,6 @@ import org.apache.inlong.agent.conf.TaskProfile; import org.apache.inlong.agent.core.AgentBaseTestsHelper; -import org.apache.inlong.agent.core.task.file.TaskManager; import org.apache.inlong.agent.db.TaskProfileDb; import org.apache.inlong.common.enums.TaskStateEnum; diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/filecollect/ProxySink.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/filecollect/ProxySink.java index fea332c96d..825a2b7a11 100755 --- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/filecollect/ProxySink.java +++ b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/filecollect/ProxySink.java @@ -21,8 +21,8 @@ import org.apache.inlong.agent.conf.InstanceProfile; import org.apache.inlong.agent.conf.OffsetProfile; import org.apache.inlong.agent.constant.CommonConstants; +import org.apache.inlong.agent.core.task.MemoryManager; import org.apache.inlong.agent.core.task.OffsetManager; -import org.apache.inlong.agent.core.task.file.MemoryManager; import org.apache.inlong.agent.message.EndMessage; import org.apache.inlong.agent.message.filecollect.OffsetAckInfo; import org.apache.inlong.agent.message.filecollect.ProxyMessage; diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/LogFileSource.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/LogFileSource.java index 808edb7bde..c849f0754b 100755 --- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/LogFileSource.java +++ b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/LogFileSource.java @@ -24,8 +24,8 @@ import org.apache.inlong.agent.constant.CycleUnitType; import org.apache.inlong.agent.constant.DataCollectType; import org.apache.inlong.agent.constant.TaskConstants; +import org.apache.inlong.agent.core.task.MemoryManager; import org.apache.inlong.agent.core.task.OffsetManager; -import org.apache.inlong.agent.core.task.file.MemoryManager; import org.apache.inlong.agent.except.FileException; import org.apache.inlong.agent.message.DefaultMessage; import org.apache.inlong.agent.metrics.audit.AuditUtils; diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/task/filecollect/LogFileCollectTask.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/task/filecollect/LogFileCollectTask.java index 52eba9ea80..4457bbb2a4 100644 --- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/task/filecollect/LogFileCollectTask.java +++ b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/task/filecollect/LogFileCollectTask.java @@ -25,7 +25,7 @@ import org.apache.inlong.agent.core.instance.InstanceAction; import org.apache.inlong.agent.core.instance.InstanceManager; import org.apache.inlong.agent.core.task.TaskAction; -import org.apache.inlong.agent.core.task.file.TaskManager; +import org.apache.inlong.agent.core.task.TaskManager; import org.apache.inlong.agent.db.Db; import org.apache.inlong.agent.metrics.audit.AuditUtils; import org.apache.inlong.agent.plugin.file.Task; diff --git a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/sources/TestLogFileSource.java b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/sources/TestLogFileSource.java index 4a2303363f..fb404dea0a 100644 --- a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/sources/TestLogFileSource.java +++ b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/sources/TestLogFileSource.java @@ -22,9 +22,9 @@ import org.apache.inlong.agent.conf.TaskProfile; import org.apache.inlong.agent.constant.AgentConstants; import org.apache.inlong.agent.constant.TaskConstants; +import org.apache.inlong.agent.core.task.MemoryManager; import org.apache.inlong.agent.core.task.OffsetManager; -import org.apache.inlong.agent.core.task.file.MemoryManager; -import org.apache.inlong.agent.core.task.file.TaskManager; +import org.apache.inlong.agent.core.task.TaskManager; import org.apache.inlong.agent.db.Db; import org.apache.inlong.agent.plugin.AgentBaseTestsHelper; import org.apache.inlong.agent.plugin.Message; diff --git a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/task/TestLogfileCollectTask.java b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/task/TestLogfileCollectTask.java index 70e316519a..0874b7b95e 100644 --- a/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/task/TestLogfileCollectTask.java +++ b/inlong-agent/agent-plugins/src/test/java/org/apache/inlong/agent/plugin/task/TestLogfileCollectTask.java @@ -20,7 +20,7 @@ import org.apache.inlong.agent.common.AgentThreadFactory; import org.apache.inlong.agent.conf.TaskProfile; import org.apache.inlong.agent.constant.TaskConstants; -import org.apache.inlong.agent.core.task.file.TaskManager; +import org.apache.inlong.agent.core.task.TaskManager; import org.apache.inlong.agent.db.Db; import org.apache.inlong.agent.plugin.AgentBaseTestsHelper; import org.apache.inlong.agent.plugin.task.filecollect.LogFileCollectTask;