[INLONG-2193] optimize inlong manager structure (#2195)

apache · Jan 20, 2022 · 75a21cd · 75a21cd
1 parent 013b31e
commit 75a21cd
Show file tree

Hide file tree

Showing 168 changed files with 1,873 additions and 644 deletions.
diff --git a/...manager/workflow/dao/EventLogStorage.java → ...g/manager/common/dao/EventLogStorage.java b/...manager/workflow/dao/EventLogStorage.java → ...g/manager/common/dao/EventLogStorage.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.inlong.manager.workflow.dao;
+package org.apache.inlong.manager.common.dao;
 
-import org.apache.inlong.manager.workflow.model.instance.EventLog;
-import org.apache.inlong.manager.workflow.model.view.EventLogQuery;
+import org.apache.inlong.manager.common.model.instance.EventLog;
+import org.apache.inlong.manager.common.model.view.EventLogQuery;
 
 import java.util.List;
 

diff --git a/.../workflow/dao/ProcessInstanceStorage.java → ...er/common/dao/ProcessInstanceStorage.java b/.../workflow/dao/ProcessInstanceStorage.java → ...er/common/dao/ProcessInstanceStorage.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.inlong.manager.workflow.dao;
+package org.apache.inlong.manager.common.dao;
 
-import org.apache.inlong.manager.workflow.model.instance.ProcessInstance;
-import org.apache.inlong.manager.workflow.model.view.CountByKey;
-import org.apache.inlong.manager.workflow.model.view.ProcessQuery;
-import org.apache.inlong.manager.workflow.model.view.ProcessSummaryQuery;
+import org.apache.inlong.manager.common.model.instance.ProcessInstance;
+import org.apache.inlong.manager.common.model.view.CountByKey;
+import org.apache.inlong.manager.common.model.view.ProcessQuery;
+import org.apache.inlong.manager.common.model.view.ProcessSummaryQuery;
 
 import java.util.List;
 

diff --git a/...ger/workflow/dao/TaskInstanceStorage.java → ...nager/common/dao/TaskInstanceStorage.java b/...ger/workflow/dao/TaskInstanceStorage.java → ...nager/common/dao/TaskInstanceStorage.java
@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-package org.apache.inlong.manager.workflow.dao;
+package org.apache.inlong.manager.common.dao;
 
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
-import org.apache.inlong.manager.workflow.model.TaskState;
-import org.apache.inlong.manager.workflow.model.instance.TaskInstance;
-import org.apache.inlong.manager.workflow.model.view.CountByKey;
-import org.apache.inlong.manager.workflow.model.view.TaskQuery;
-import org.apache.inlong.manager.workflow.model.view.TaskSummaryQuery;
+import org.apache.inlong.manager.common.model.TaskState;
+import org.apache.inlong.manager.common.model.instance.TaskInstance;
+import org.apache.inlong.manager.common.model.view.CountByKey;
+import org.apache.inlong.manager.common.model.view.TaskQuery;
+import org.apache.inlong.manager.common.model.view.TaskSummaryQuery;
 
 /**
  * Task instance

diff --git a/...er/workflow/core/event/EventListener.java → ...g/manager/common/event/EventListener.java b/...er/workflow/core/event/EventListener.java → ...g/manager/common/event/EventListener.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.inlong.manager.workflow.core.event;
+package org.apache.inlong.manager.common.event;
 
-import org.apache.inlong.manager.workflow.exception.WorkflowListenerException;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
+import org.apache.inlong.manager.common.exceptions.WorkflowListenerException;
+import org.apache.inlong.manager.common.model.WorkflowContext;
 
 /**
  * Process event listener

diff --git a/...flow/core/event/EventListenerManager.java → ...er/common/event/EventListenerManager.java b/...flow/core/event/EventListenerManager.java → ...er/common/event/EventListenerManager.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.inlong.manager.workflow.core.event;
+package org.apache.inlong.manager.common.event;
 
-import org.apache.inlong.manager.workflow.dao.EventLogStorage;
+import org.apache.inlong.manager.common.dao.EventLogStorage;
 
 import java.util.List;
 

diff --git a/...low/core/event/EventListenerNotifier.java → ...r/common/event/EventListenerNotifier.java b/...low/core/event/EventListenerNotifier.java → ...r/common/event/EventListenerNotifier.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.inlong.manager.workflow.core.event;
+package org.apache.inlong.manager.common.event;
 
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
+import org.apache.inlong.manager.common.model.WorkflowContext;
 
 /**
  * Process event listener notifier

diff --git a/...low/core/event/EventListenerRegister.java → ...r/common/event/EventListenerRegister.java b/...low/core/event/EventListenerRegister.java → ...r/common/event/EventListenerRegister.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.inlong.manager.workflow.core.event;
+package org.apache.inlong.manager.common.event;
 
 /**
  * Event listener register

diff --git a/...r/workflow/core/event/ListenerResult.java → .../manager/common/event/ListenerResult.java b/...r/workflow/core/event/ListenerResult.java → .../manager/common/event/ListenerResult.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.inlong.manager.workflow.core.event;
+package org.apache.inlong.manager.common.event;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

diff --git a/...flow/core/event/LogableEventListener.java → ...er/common/event/LogableEventListener.java b/...flow/core/event/LogableEventListener.java → ...er/common/event/LogableEventListener.java
@@ -15,20 +15,20 @@
  * limitations under the License.
  */
 
-package org.apache.inlong.manager.workflow.core.event;
+package org.apache.inlong.manager.common.event;
 
 import java.util.Date;
 import java.util.Optional;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.inlong.manager.common.util.JsonUtils;
 import org.apache.inlong.manager.common.util.NetworkUtils;
-import org.apache.inlong.manager.workflow.dao.EventLogStorage;
-import org.apache.inlong.manager.workflow.exception.WorkflowListenerException;
-import org.apache.inlong.manager.workflow.model.EventState;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
-import org.apache.inlong.manager.workflow.model.definition.Element;
-import org.apache.inlong.manager.workflow.model.instance.EventLog;
-import org.apache.inlong.manager.workflow.model.instance.ProcessInstance;
+import org.apache.inlong.manager.common.dao.EventLogStorage;
+import org.apache.inlong.manager.common.exceptions.WorkflowListenerException;
+import org.apache.inlong.manager.common.model.EventState;
+import org.apache.inlong.manager.common.model.WorkflowContext;
+import org.apache.inlong.manager.common.model.definition.Element;
+import org.apache.inlong.manager.common.model.instance.EventLog;
+import org.apache.inlong.manager.common.model.instance.ProcessInstance;
 
 /**
  * Event listener with logging function

diff --git a/...er/workflow/core/event/WorkflowEvent.java → ...g/manager/common/event/WorkflowEvent.java b/...er/workflow/core/event/WorkflowEvent.java → ...g/manager/common/event/WorkflowEvent.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.inlong.manager.workflow.core.event;
+package org.apache.inlong.manager.common.event;
 
 /**
  * Workflow event

diff --git a/.../process/LogableProcessEventListener.java → .../process/LogableProcessEventListener.java b/.../process/LogableProcessEventListener.java → .../process/LogableProcessEventListener.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.inlong.manager.workflow.core.event.process;
+package org.apache.inlong.manager.common.event.process;
 
-import org.apache.inlong.manager.workflow.core.event.LogableEventListener;
-import org.apache.inlong.manager.workflow.dao.EventLogStorage;
+import org.apache.inlong.manager.common.event.LogableEventListener;
+import org.apache.inlong.manager.common.dao.EventLogStorage;
 
 /**
  * Listener of logable process event

diff --git a/...flow/core/event/process/ProcessEvent.java → ...er/common/event/process/ProcessEvent.java b/...flow/core/event/process/ProcessEvent.java → ...er/common/event/process/ProcessEvent.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.inlong.manager.workflow.core.event.process;
+package org.apache.inlong.manager.common.event.process;
 
-import org.apache.inlong.manager.workflow.core.event.WorkflowEvent;
+import org.apache.inlong.manager.common.event.WorkflowEvent;
 
 /**
  * Process event type

diff --git a/...e/event/process/ProcessEventListener.java → ...n/event/process/ProcessEventListener.java b/...e/event/process/ProcessEventListener.java → ...n/event/process/ProcessEventListener.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.inlong.manager.workflow.core.event.process;
+package org.apache.inlong.manager.common.event.process;
 
 import com.google.common.collect.Lists;
 
-import org.apache.inlong.manager.workflow.core.event.EventListener;
+import org.apache.inlong.manager.common.event.EventListener;
 
 import java.util.List;
 

diff --git a/.../process/ProcessEventListenerManager.java → .../process/ProcessEventListenerManager.java b/.../process/ProcessEventListenerManager.java → .../process/ProcessEventListenerManager.java
@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-package org.apache.inlong.manager.workflow.core.event.process;
+package org.apache.inlong.manager.common.event.process;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
-import org.apache.inlong.manager.workflow.core.WorkflowDataAccessor;
-import org.apache.inlong.manager.workflow.core.event.EventListenerManager;
-import org.apache.inlong.manager.workflow.dao.EventLogStorage;
-import org.apache.inlong.manager.workflow.exception.WorkflowListenerException;
+import org.apache.inlong.manager.common.workflow.WorkflowDataAccessor;
+import org.apache.inlong.manager.common.event.EventListenerManager;
+import org.apache.inlong.manager.common.dao.EventLogStorage;
+import org.apache.inlong.manager.common.exceptions.WorkflowListenerException;
 
 import java.util.List;
 import java.util.Map;

diff --git a/...process/ProcessEventListenerRegister.java → ...process/ProcessEventListenerRegister.java b/...process/ProcessEventListenerRegister.java → ...process/ProcessEventListenerRegister.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.inlong.manager.workflow.core.event.process;
+package org.apache.inlong.manager.common.event.process;
 
-import org.apache.inlong.manager.workflow.core.QueryService;
-import org.apache.inlong.manager.workflow.core.event.EventListenerManager;
-import org.apache.inlong.manager.workflow.core.event.EventListenerRegister;
-import org.apache.inlong.manager.workflow.model.WorkflowConfig;
+import org.apache.inlong.manager.common.workflow.QueryService;
+import org.apache.inlong.manager.common.event.EventListenerManager;
+import org.apache.inlong.manager.common.event.EventListenerRegister;
+import org.apache.inlong.manager.common.model.WorkflowConfig;
 
 /**
  * Register of process event listener

diff --git a/...e/event/process/ProcessEventNotifier.java → ...n/event/process/ProcessEventNotifier.java b/...e/event/process/ProcessEventNotifier.java → ...n/event/process/ProcessEventNotifier.java
@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-package org.apache.inlong.manager.workflow.core.event.process;
+package org.apache.inlong.manager.common.event.process;
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
-import org.apache.inlong.manager.workflow.core.event.EventListenerManager;
-import org.apache.inlong.manager.workflow.core.event.EventListenerNotifier;
-import org.apache.inlong.manager.workflow.core.event.LogableEventListener;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
-import org.apache.inlong.manager.workflow.model.definition.Process;
+import org.apache.inlong.manager.common.event.EventListenerManager;
+import org.apache.inlong.manager.common.event.EventListenerNotifier;
+import org.apache.inlong.manager.common.event.LogableEventListener;
+import org.apache.inlong.manager.common.model.WorkflowContext;
+import org.apache.inlong.manager.common.model.definition.Process;
 
 import java.util.Optional;
 import java.util.concurrent.ExecutorService;

diff --git a/.../event/task/LogableTaskEventListener.java → .../event/task/LogableTaskEventListener.java b/.../event/task/LogableTaskEventListener.java → .../event/task/LogableTaskEventListener.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.inlong.manager.workflow.core.event.task;
+package org.apache.inlong.manager.common.event.task;
 
-import org.apache.inlong.manager.workflow.core.event.LogableEventListener;
-import org.apache.inlong.manager.workflow.dao.EventLogStorage;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
-import org.apache.inlong.manager.workflow.model.instance.EventLog;
-import org.apache.inlong.manager.workflow.model.instance.TaskInstance;
+import org.apache.inlong.manager.common.event.LogableEventListener;
+import org.apache.inlong.manager.common.dao.EventLogStorage;
+import org.apache.inlong.manager.common.model.WorkflowContext;
+import org.apache.inlong.manager.common.model.instance.EventLog;
+import org.apache.inlong.manager.common.model.instance.TaskInstance;
 
 /**
  * Listener of logable task event

diff --git a/...r/workflow/core/event/task/TaskEvent.java → .../manager/common/event/task/TaskEvent.java b/...r/workflow/core/event/task/TaskEvent.java → .../manager/common/event/task/TaskEvent.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.inlong.manager.workflow.core.event.task;
+package org.apache.inlong.manager.common.event.task;
 
-import org.apache.inlong.manager.workflow.core.event.WorkflowEvent;
+import org.apache.inlong.manager.common.event.WorkflowEvent;
 
 /**
  * Task event

diff --git a/...ow/core/event/task/TaskEventListener.java → .../common/event/task/TaskEventListener.java b/...ow/core/event/task/TaskEventListener.java → .../common/event/task/TaskEventListener.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.inlong.manager.workflow.core.event.task;
+package org.apache.inlong.manager.common.event.task;
 
 import com.google.common.collect.Lists;
 
-import org.apache.inlong.manager.workflow.core.event.EventListener;
+import org.apache.inlong.manager.common.event.EventListener;
 
 import java.util.List;
 

diff --git a/.../event/task/TaskEventListenerManager.java → .../event/task/TaskEventListenerManager.java b/.../event/task/TaskEventListenerManager.java → .../event/task/TaskEventListenerManager.java
@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-package org.apache.inlong.manager.workflow.core.event.task;
+package org.apache.inlong.manager.common.event.task;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
-import org.apache.inlong.manager.workflow.core.WorkflowDataAccessor;
-import org.apache.inlong.manager.workflow.core.event.EventListenerManager;
-import org.apache.inlong.manager.workflow.dao.EventLogStorage;
-import org.apache.inlong.manager.workflow.exception.WorkflowListenerException;
+import org.apache.inlong.manager.common.workflow.WorkflowDataAccessor;
+import org.apache.inlong.manager.common.event.EventListenerManager;
+import org.apache.inlong.manager.common.dao.EventLogStorage;
+import org.apache.inlong.manager.common.exceptions.WorkflowListenerException;
 
 import java.util.List;
 import java.util.Map;

diff --git a/...event/task/TaskEventListenerRegister.java → ...event/task/TaskEventListenerRegister.java b/...event/task/TaskEventListenerRegister.java → ...event/task/TaskEventListenerRegister.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.inlong.manager.workflow.core.event.task;
+package org.apache.inlong.manager.common.event.task;
 
-import org.apache.inlong.manager.workflow.core.QueryService;
-import org.apache.inlong.manager.workflow.core.event.EventListenerManager;
-import org.apache.inlong.manager.workflow.core.event.EventListenerRegister;
-import org.apache.inlong.manager.workflow.model.WorkflowConfig;
+import org.apache.inlong.manager.common.workflow.QueryService;
+import org.apache.inlong.manager.common.event.EventListenerManager;
+import org.apache.inlong.manager.common.event.EventListenerRegister;
+import org.apache.inlong.manager.common.model.WorkflowConfig;
 
 /**
  * Register task event listener

diff --git a/...ow/core/event/task/TaskEventNotifier.java → .../common/event/task/TaskEventNotifier.java b/...ow/core/event/task/TaskEventNotifier.java → .../common/event/task/TaskEventNotifier.java
@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-package org.apache.inlong.manager.workflow.core.event.task;
+package org.apache.inlong.manager.common.event.task;
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
-import org.apache.inlong.manager.workflow.core.event.EventListenerManager;
-import org.apache.inlong.manager.workflow.core.event.EventListenerNotifier;
-import org.apache.inlong.manager.workflow.core.event.LogableEventListener;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
-import org.apache.inlong.manager.workflow.model.definition.Task;
+import org.apache.inlong.manager.common.event.EventListenerManager;
+import org.apache.inlong.manager.common.event.EventListenerNotifier;
+import org.apache.inlong.manager.common.event.LogableEventListener;
+import org.apache.inlong.manager.common.model.WorkflowContext;
+import org.apache.inlong.manager.common.model.definition.Task;
 
 import java.util.Optional;
 import java.util.concurrent.ExecutorService;

diff --git a/...orkflow/exception/FormParseException.java → ...common/exceptions/FormParseException.java b/...orkflow/exception/FormParseException.java → ...common/exceptions/FormParseException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.inlong.manager.workflow.exception;
+package org.apache.inlong.manager.common.exceptions;
 
 /**
  * Process form parsing exception

diff --git a/...flow/exception/FormValidateException.java → ...mon/exceptions/FormValidateException.java b/...flow/exception/FormValidateException.java → ...mon/exceptions/FormValidateException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.inlong.manager.workflow.exception;
+package org.apache.inlong.manager.common.exceptions;
 
 /**
  * Form validation exception

diff --git a/...workflow/exception/WorkflowException.java → .../common/exceptions/WorkflowException.java b/...workflow/exception/WorkflowException.java → .../common/exceptions/WorkflowException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.inlong.manager.workflow.exception;
+package org.apache.inlong.manager.common.exceptions;
 
 /**
  * Workflow exception

diff --git a/.../exception/WorkflowListenerException.java → ...exceptions/WorkflowListenerException.java b/.../exception/WorkflowListenerException.java → ...exceptions/WorkflowListenerException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.inlong.manager.workflow.exception;
+package org.apache.inlong.manager.common.exceptions;
 
 /**
  * Workflow event listener exception