浏览代码

move event

AE86 1 年之前
父节点
当前提交
f3df2e433c
共有 42 个文件被更改,包括 316 次插入315 次删除
  1. 1 1
      dbsyncer-biz/src/main/java/org/dbsyncer/biz/impl/DataSyncServiceImpl.java
  2. 1 1
      dbsyncer-biz/src/main/java/org/dbsyncer/biz/impl/MonitorServiceImpl.java
  3. 1 2
      dbsyncer-listener/src/main/java/org/dbsyncer/listener/AbstractDatabaseExtractor.java
  4. 1 3
      dbsyncer-listener/src/main/java/org/dbsyncer/listener/AbstractExtractor.java
  5. 46 44
      dbsyncer-listener/src/main/java/org/dbsyncer/listener/ChangedEvent.java
  6. 1 3
      dbsyncer-listener/src/main/java/org/dbsyncer/listener/Extractor.java
  7. 1 1
      dbsyncer-listener/src/main/java/org/dbsyncer/listener/Watcher.java
  8. 75 72
      dbsyncer-listener/src/main/java/org/dbsyncer/listener/event/CommonChangedEvent.java
  9. 1 1
      dbsyncer-listener/src/main/java/org/dbsyncer/listener/event/DDLChangedEvent.java
  10. 33 33
      dbsyncer-listener/src/main/java/org/dbsyncer/listener/event/RowChangedEvent.java
  11. 1 1
      dbsyncer-listener/src/main/java/org/dbsyncer/listener/event/ScanChangedEvent.java
  12. 2 2
      dbsyncer-listener/src/main/java/org/dbsyncer/listener/file/FileExtractor.java
  13. 58 58
      dbsyncer-listener/src/main/java/org/dbsyncer/listener/model/ChangedOffset.java
  14. 1 1
      dbsyncer-listener/src/main/java/org/dbsyncer/listener/mysql/DqlMySQLExtractor.java
  15. 3 3
      dbsyncer-listener/src/main/java/org/dbsyncer/listener/mysql/MySQLExtractor.java
  16. 1 1
      dbsyncer-listener/src/main/java/org/dbsyncer/listener/oracle/DqlOracleExtractor.java
  17. 1 1
      dbsyncer-listener/src/main/java/org/dbsyncer/listener/oracle/dcn/DBChangeNotification.java
  18. 1 1
      dbsyncer-listener/src/main/java/org/dbsyncer/listener/oracle/dcn/RowEventListener.java
  19. 1 1
      dbsyncer-listener/src/main/java/org/dbsyncer/listener/postgresql/DqlPostgreSQLExtractor.java
  20. 1 1
      dbsyncer-listener/src/main/java/org/dbsyncer/listener/postgresql/MessageDecoder.java
  21. 2 2
      dbsyncer-listener/src/main/java/org/dbsyncer/listener/postgresql/PostgreSQLExtractor.java
  22. 1 1
      dbsyncer-listener/src/main/java/org/dbsyncer/listener/postgresql/decoder/PgOutputMessageDecoder.java
  23. 1 1
      dbsyncer-listener/src/main/java/org/dbsyncer/listener/postgresql/decoder/TestDecodingMessageDecoder.java
  24. 1 1
      dbsyncer-listener/src/main/java/org/dbsyncer/listener/quartz/AbstractQuartzExtractor.java
  25. 1 1
      dbsyncer-listener/src/main/java/org/dbsyncer/listener/sqlserver/DqlSqlServerExtractor.java
  26. 2 2
      dbsyncer-listener/src/main/java/org/dbsyncer/listener/sqlserver/SqlServerExtractor.java
  27. 1 1
      dbsyncer-manager/src/main/java/org/dbsyncer/manager/event/ClosedEvent.java
  28. 23 23
      dbsyncer-manager/src/main/java/org/dbsyncer/manager/event/PreloadCompletedEvent.java
  29. 1 1
      dbsyncer-manager/src/main/java/org/dbsyncer/manager/listener/ClosedTaskListener.java
  30. 1 1
      dbsyncer-manager/src/main/java/org/dbsyncer/manager/puller/AbstractPuller.java
  31. 2 2
      dbsyncer-manager/src/main/java/org/dbsyncer/manager/puller/IncrementPuller.java
  32. 1 1
      dbsyncer-manager/src/main/java/org/dbsyncer/manager/template/PreloadTemplate.java
  33. 1 1
      dbsyncer-parser/src/main/java/org/dbsyncer/parser/ParserComponent.java
  34. 3 3
      dbsyncer-parser/src/main/java/org/dbsyncer/parser/consumer/AbstractConsumer.java
  35. 3 3
      dbsyncer-parser/src/main/java/org/dbsyncer/parser/consumer/impl/LogConsumer.java
  36. 1 1
      dbsyncer-parser/src/main/java/org/dbsyncer/parser/consumer/impl/QuartzConsumer.java
  37. 33 32
      dbsyncer-parser/src/main/java/org/dbsyncer/parser/event/RefreshOffsetEvent.java
  38. 1 1
      dbsyncer-parser/src/main/java/org/dbsyncer/parser/flush/impl/BufferActuatorRouter.java
  39. 1 1
      dbsyncer-parser/src/main/java/org/dbsyncer/parser/flush/impl/GeneralBufferActuator.java
  40. 1 1
      dbsyncer-parser/src/main/java/org/dbsyncer/parser/impl/ParserComponentImpl.java
  41. 3 3
      dbsyncer-parser/src/main/java/org/dbsyncer/parser/model/WriterRequest.java
  42. 1 1
      dbsyncer-parser/src/main/java/org/dbsyncer/parser/model/WriterResponse.java

+ 1 - 1
dbsyncer-biz/src/main/java/org/dbsyncer/biz/impl/DataSyncServiceImpl.java

@@ -4,7 +4,7 @@ import com.google.protobuf.InvalidProtocolBufferException;
 import org.dbsyncer.biz.DataSyncService;
 import org.dbsyncer.biz.vo.BinlogColumnVo;
 import org.dbsyncer.biz.vo.MessageVo;
-import org.dbsyncer.common.event.RowChangedEvent;
+import org.dbsyncer.listener.event.RowChangedEvent;
 import org.dbsyncer.common.model.Paging;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.common.util.DateFormatUtil;

+ 1 - 1
dbsyncer-biz/src/main/java/org/dbsyncer/biz/impl/MonitorServiceImpl.java

@@ -15,7 +15,7 @@ import org.dbsyncer.biz.vo.DataVo;
 import org.dbsyncer.biz.vo.LogVo;
 import org.dbsyncer.biz.vo.MetaVo;
 import org.dbsyncer.biz.vo.MetricResponseVo;
-import org.dbsyncer.common.event.PreloadCompletedEvent;
+import org.dbsyncer.manager.event.PreloadCompletedEvent;
 import org.dbsyncer.common.model.Paging;
 import org.dbsyncer.common.scheduled.ScheduledTaskJob;
 import org.dbsyncer.common.scheduled.ScheduledTaskService;

+ 1 - 2
dbsyncer-listener/src/main/java/org/dbsyncer/listener/AbstractDatabaseExtractor.java

@@ -1,7 +1,6 @@
 package org.dbsyncer.listener;
 
-import org.dbsyncer.common.event.ChangedEvent;
-import org.dbsyncer.common.event.RowChangedEvent;
+import org.dbsyncer.listener.event.RowChangedEvent;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.connector.constant.ConnectorConstant;

+ 1 - 3
dbsyncer-listener/src/main/java/org/dbsyncer/listener/AbstractExtractor.java

@@ -1,8 +1,6 @@
 package org.dbsyncer.listener;
 
-import org.dbsyncer.common.event.ChangedEvent;
-import org.dbsyncer.common.event.ChangedOffset;
-import org.dbsyncer.common.event.Watcher;
+import org.dbsyncer.listener.model.ChangedOffset;
 import org.dbsyncer.common.model.AbstractConnectorConfig;
 import org.dbsyncer.common.scheduled.ScheduledTaskService;
 import org.dbsyncer.common.util.CollectionUtils;

+ 46 - 44
dbsyncer-common/src/main/java/org/dbsyncer/common/event/ChangedEvent.java → dbsyncer-listener/src/main/java/org/dbsyncer/listener/ChangedEvent.java

@@ -1,45 +1,47 @@
-/**
- * DBSyncer Copyright 2019-2024 All Rights Reserved.
- */
-package org.dbsyncer.common.event;
-
-import java.util.Map;
-
-/**
- * 变更事件
- *
- * @version 1.0.0
- * @Author AE86
- * @Date 2023-08-20 20:00
- */
-public interface ChangedEvent {
-
-    /**
-     * 获取变更表名称
-     *
-     * @return
-     */
-    String getSourceTableName();
-
-    /**
-     * 获取变更事件
-     *
-     * @return
-     */
-    String getEvent();
-
-    /**
-     * 获取变更行数据
-     *
-     * @return
-     */
-    Map<String, Object> getChangedRow();
-
-    /**
-     * 获取增量偏移量
-     *
-     * @return
-     */
-    ChangedOffset getChangedOffset();
-
+/**
+ * DBSyncer Copyright 2019-2024 All Rights Reserved.
+ */
+package org.dbsyncer.listener;
+
+import org.dbsyncer.listener.model.ChangedOffset;
+
+import java.util.Map;
+
+/**
+ * 变更事件
+ *
+ * @version 1.0.0
+ * @Author AE86
+ * @Date 2023-08-20 20:00
+ */
+public interface ChangedEvent {
+
+    /**
+     * 获取变更表名称
+     *
+     * @return
+     */
+    String getSourceTableName();
+
+    /**
+     * 获取变更事件
+     *
+     * @return
+     */
+    String getEvent();
+
+    /**
+     * 获取变更行数据
+     *
+     * @return
+     */
+    Map<String, Object> getChangedRow();
+
+    /**
+     * 获取增量偏移量
+     *
+     * @return
+     */
+    ChangedOffset getChangedOffset();
+
 }

+ 1 - 3
dbsyncer-listener/src/main/java/org/dbsyncer/listener/Extractor.java

@@ -1,8 +1,6 @@
 package org.dbsyncer.listener;
 
-import org.dbsyncer.common.event.ChangedEvent;
-import org.dbsyncer.common.event.ChangedOffset;
-import org.dbsyncer.common.event.Watcher;
+import org.dbsyncer.listener.model.ChangedOffset;
 
 public interface Extractor {
 

+ 1 - 1
dbsyncer-common/src/main/java/org/dbsyncer/common/event/Watcher.java → dbsyncer-listener/src/main/java/org/dbsyncer/listener/Watcher.java

@@ -1,4 +1,4 @@
-package org.dbsyncer.common.event;
+package org.dbsyncer.listener;
 
 import java.util.Map;
 

+ 75 - 72
dbsyncer-common/src/main/java/org/dbsyncer/common/event/CommonChangedEvent.java → dbsyncer-listener/src/main/java/org/dbsyncer/listener/event/CommonChangedEvent.java

@@ -1,73 +1,76 @@
-/**
- * DBSyncer Copyright 2019-2024 All Rights Reserved.
- */
-package org.dbsyncer.common.event;
-
-import java.util.Map;
-
-/**
- * 通用变更事件
- *
- * @version 1.0.0
- * @Author AE86
- * @Date 2023-08-20 20:00
- */
-public class CommonChangedEvent implements ChangedEvent {
-
-    /**
-     * 变更表名称
-     */
-    private String sourceTableName;
-    /**
-     * 变更事件
-     */
-    private String event;
-    /**
-     * 变更行数据
-     */
-    private Map<String, Object> changedRow;
-    /**
-     * 增量偏移量
-     */
-    private ChangedOffset changedOffset = new ChangedOffset();
-
-    @Override
-    public String getSourceTableName() {
-        return sourceTableName;
-    }
-
-    public void setSourceTableName(String sourceTableName) {
-        this.sourceTableName = sourceTableName;
-    }
-
-    @Override
-    public String getEvent() {
-        return event;
-    }
-
-    public void setEvent(String event) {
-        this.event = event;
-    }
-
-    @Override
-    public Map<String, Object> getChangedRow() {
-        return changedRow;
-    }
-
-    public void setChangedRow(Map<String, Object> changedRow) {
-        this.changedRow = changedRow;
-    }
-
-    @Override
-    public ChangedOffset getChangedOffset() {
-        return changedOffset;
-    }
-
-    public void setNextFileName(String nextFileName) {
-        changedOffset.setNextFileName(nextFileName);
-    }
-
-    public void setPosition(Object position) {
-        changedOffset.setPosition(position);
-    }
+/**
+ * DBSyncer Copyright 2019-2024 All Rights Reserved.
+ */
+package org.dbsyncer.listener.event;
+
+import org.dbsyncer.listener.ChangedEvent;
+import org.dbsyncer.listener.model.ChangedOffset;
+
+import java.util.Map;
+
+/**
+ * 通用变更事件
+ *
+ * @version 1.0.0
+ * @Author AE86
+ * @Date 2023-08-20 20:00
+ */
+public class CommonChangedEvent implements ChangedEvent {
+
+    /**
+     * 变更表名称
+     */
+    private String sourceTableName;
+    /**
+     * 变更事件
+     */
+    private String event;
+    /**
+     * 变更行数据
+     */
+    private Map<String, Object> changedRow;
+    /**
+     * 增量偏移量
+     */
+    private ChangedOffset changedOffset = new ChangedOffset();
+
+    @Override
+    public String getSourceTableName() {
+        return sourceTableName;
+    }
+
+    public void setSourceTableName(String sourceTableName) {
+        this.sourceTableName = sourceTableName;
+    }
+
+    @Override
+    public String getEvent() {
+        return event;
+    }
+
+    public void setEvent(String event) {
+        this.event = event;
+    }
+
+    @Override
+    public Map<String, Object> getChangedRow() {
+        return changedRow;
+    }
+
+    public void setChangedRow(Map<String, Object> changedRow) {
+        this.changedRow = changedRow;
+    }
+
+    @Override
+    public ChangedOffset getChangedOffset() {
+        return changedOffset;
+    }
+
+    public void setNextFileName(String nextFileName) {
+        changedOffset.setNextFileName(nextFileName);
+    }
+
+    public void setPosition(Object position) {
+        changedOffset.setPosition(position);
+    }
 }

+ 1 - 1
dbsyncer-common/src/main/java/org/dbsyncer/common/event/DDLChangedEvent.java → dbsyncer-listener/src/main/java/org/dbsyncer/listener/event/DDLChangedEvent.java

@@ -1,4 +1,4 @@
-package org.dbsyncer.common.event;
+package org.dbsyncer.listener.event;
 
 /**
  * DDL变更事件

+ 33 - 33
dbsyncer-common/src/main/java/org/dbsyncer/common/event/RowChangedEvent.java → dbsyncer-listener/src/main/java/org/dbsyncer/listener/event/RowChangedEvent.java

@@ -1,34 +1,34 @@
-/**
- * DBSyncer Copyright 2019-2024 All Rights Reserved.
- */
-package org.dbsyncer.common.event;
-
-import java.util.List;
-
-/**
- * 监听行变更事件
- *
- * @version 1.0.0
- * @Author AE86
- * @Date 2020-06-15 20:00
- */
-public final class RowChangedEvent extends CommonChangedEvent {
-    private List<Object> dataList;
-
-    public RowChangedEvent(String sourceTableName, String event, List<Object> data) {
-        this(sourceTableName, event, data, null, null);
-    }
-
-    public RowChangedEvent(String sourceTableName, String event, List<Object> data, String nextFileName, Object position) {
-        setSourceTableName(sourceTableName);
-        setEvent(event);
-        setNextFileName(nextFileName);
-        setPosition(position);
-        this.dataList = data;
-    }
-
-    public List<Object> getDataList() {
-        return dataList;
-    }
-
+/**
+ * DBSyncer Copyright 2019-2024 All Rights Reserved.
+ */
+package org.dbsyncer.listener.event;
+
+import java.util.List;
+
+/**
+ * 监听行变更事件
+ *
+ * @version 1.0.0
+ * @Author AE86
+ * @Date 2020-06-15 20:00
+ */
+public final class RowChangedEvent extends CommonChangedEvent {
+    private List<Object> dataList;
+
+    public RowChangedEvent(String sourceTableName, String event, List<Object> data) {
+        this(sourceTableName, event, data, null, null);
+    }
+
+    public RowChangedEvent(String sourceTableName, String event, List<Object> data, String nextFileName, Object position) {
+        setSourceTableName(sourceTableName);
+        setEvent(event);
+        setNextFileName(nextFileName);
+        setPosition(position);
+        this.dataList = data;
+    }
+
+    public List<Object> getDataList() {
+        return dataList;
+    }
+
 }

+ 1 - 1
dbsyncer-common/src/main/java/org/dbsyncer/common/event/ScanChangedEvent.java → dbsyncer-listener/src/main/java/org/dbsyncer/listener/event/ScanChangedEvent.java

@@ -1,7 +1,7 @@
 /**
  * DBSyncer Copyright 2019-2024 All Rights Reserved.
  */
-package org.dbsyncer.common.event;
+package org.dbsyncer.listener.event;
 
 import java.util.Map;
 

+ 2 - 2
dbsyncer-listener/src/main/java/org/dbsyncer/listener/file/FileExtractor.java

@@ -1,8 +1,8 @@
 package org.dbsyncer.listener.file;
 
 import org.apache.commons.io.IOUtils;
-import org.dbsyncer.common.event.ChangedOffset;
-import org.dbsyncer.common.event.RowChangedEvent;
+import org.dbsyncer.listener.model.ChangedOffset;
+import org.dbsyncer.listener.event.RowChangedEvent;
 import org.dbsyncer.common.file.BufferedRandomAccessFile;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.common.util.NumberUtil;

+ 58 - 58
dbsyncer-common/src/main/java/org/dbsyncer/common/event/ChangedOffset.java → dbsyncer-listener/src/main/java/org/dbsyncer/listener/model/ChangedOffset.java

@@ -1,59 +1,59 @@
-package org.dbsyncer.common.event;
-
-/**
- * 增量偏移量
- *
- * @version 1.0.0
- * @Author AE86
- * @Date 2023-08-23 20:00
- */
-public final class ChangedOffset {
-    /**
-     * 驱动ID
-     */
-    private String metaId;
-    /**
-     * 增量文件名称
-     */
-    private String nextFileName;
-    /**
-     * 增量偏移量
-     */
-    private Object position;
-    /**
-     * 是否触发刷新增量点事件
-     */
-    private boolean refreshOffset;
-
-    public String getMetaId() {
-        return metaId;
-    }
-
-    public void setMetaId(String metaId) {
-        this.metaId = metaId;
-    }
-
-    public String getNextFileName() {
-        return nextFileName;
-    }
-
-    public void setNextFileName(String nextFileName) {
-        this.nextFileName = nextFileName;
-    }
-
-    public Object getPosition() {
-        return position;
-    }
-
-    public void setPosition(Object position) {
-        this.position = position;
-    }
-
-    public boolean isRefreshOffset() {
-        return refreshOffset;
-    }
-
-    public void setRefreshOffset(boolean refreshOffset) {
-        this.refreshOffset = refreshOffset;
-    }
+package org.dbsyncer.listener.model;
+
+/**
+ * 增量偏移量
+ *
+ * @version 1.0.0
+ * @Author AE86
+ * @Date 2023-08-23 20:00
+ */
+public final class ChangedOffset {
+    /**
+     * 驱动ID
+     */
+    private String metaId;
+    /**
+     * 增量文件名称
+     */
+    private String nextFileName;
+    /**
+     * 增量偏移量
+     */
+    private Object position;
+    /**
+     * 是否触发刷新增量点事件
+     */
+    private boolean refreshOffset;
+
+    public String getMetaId() {
+        return metaId;
+    }
+
+    public void setMetaId(String metaId) {
+        this.metaId = metaId;
+    }
+
+    public String getNextFileName() {
+        return nextFileName;
+    }
+
+    public void setNextFileName(String nextFileName) {
+        this.nextFileName = nextFileName;
+    }
+
+    public Object getPosition() {
+        return position;
+    }
+
+    public void setPosition(Object position) {
+        this.position = position;
+    }
+
+    public boolean isRefreshOffset() {
+        return refreshOffset;
+    }
+
+    public void setRefreshOffset(boolean refreshOffset) {
+        this.refreshOffset = refreshOffset;
+    }
 }

+ 1 - 1
dbsyncer-listener/src/main/java/org/dbsyncer/listener/mysql/DqlMySQLExtractor.java

@@ -1,6 +1,6 @@
 package org.dbsyncer.listener.mysql;
 
-import org.dbsyncer.common.event.ChangedEvent;
+import org.dbsyncer.listener.ChangedEvent;
 
 /**
  * @author AE86

+ 3 - 3
dbsyncer-listener/src/main/java/org/dbsyncer/listener/mysql/MySQLExtractor.java

@@ -14,9 +14,9 @@ import com.github.shyiko.mysql.binlog.network.ServerException;
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.parser.CCJSqlParserUtil;
 import net.sf.jsqlparser.statement.alter.Alter;
-import org.dbsyncer.common.event.ChangedOffset;
-import org.dbsyncer.common.event.DDLChangedEvent;
-import org.dbsyncer.common.event.RowChangedEvent;
+import org.dbsyncer.listener.model.ChangedOffset;
+import org.dbsyncer.listener.event.DDLChangedEvent;
+import org.dbsyncer.listener.event.RowChangedEvent;
 import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.connector.config.DatabaseConfig;
 import org.dbsyncer.connector.constant.ConnectorConstant;

+ 1 - 1
dbsyncer-listener/src/main/java/org/dbsyncer/listener/oracle/DqlOracleExtractor.java

@@ -1,6 +1,6 @@
 package org.dbsyncer.listener.oracle;
 
-import org.dbsyncer.common.event.ChangedEvent;
+import org.dbsyncer.listener.ChangedEvent;
 import org.dbsyncer.connector.model.Field;
 
 import java.util.List;

+ 1 - 1
dbsyncer-listener/src/main/java/org/dbsyncer/listener/oracle/dcn/DBChangeNotification.java

@@ -11,7 +11,7 @@ import oracle.jdbc.dcn.DatabaseChangeRegistration;
 import oracle.jdbc.dcn.RowChangeDescription;
 import oracle.jdbc.dcn.TableChangeDescription;
 import oracle.jdbc.driver.OracleConnection;
-import org.dbsyncer.common.event.RowChangedEvent;
+import org.dbsyncer.listener.event.RowChangedEvent;
 import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.connector.constant.ConnectorConstant;
 import org.dbsyncer.listener.ListenerException;

+ 1 - 1
dbsyncer-listener/src/main/java/org/dbsyncer/listener/oracle/dcn/RowEventListener.java

@@ -3,7 +3,7 @@
  */
 package org.dbsyncer.listener.oracle.dcn;
 
-import org.dbsyncer.common.event.RowChangedEvent;
+import org.dbsyncer.listener.event.RowChangedEvent;
 
 /**
  * 行变更监听器

+ 1 - 1
dbsyncer-listener/src/main/java/org/dbsyncer/listener/postgresql/DqlPostgreSQLExtractor.java

@@ -1,6 +1,6 @@
 package org.dbsyncer.listener.postgresql;
 
-import org.dbsyncer.common.event.ChangedEvent;
+import org.dbsyncer.listener.ChangedEvent;
 
 /**
  * @author AE86

+ 1 - 1
dbsyncer-listener/src/main/java/org/dbsyncer/listener/postgresql/MessageDecoder.java

@@ -1,6 +1,6 @@
 package org.dbsyncer.listener.postgresql;
 
-import org.dbsyncer.common.event.RowChangedEvent;
+import org.dbsyncer.listener.event.RowChangedEvent;
 import org.dbsyncer.connector.ConnectorFactory;
 import org.dbsyncer.connector.config.DatabaseConfig;
 import org.dbsyncer.connector.database.DatabaseConnectorMapper;

+ 2 - 2
dbsyncer-listener/src/main/java/org/dbsyncer/listener/postgresql/PostgreSQLExtractor.java

@@ -1,7 +1,7 @@
 package org.dbsyncer.listener.postgresql;
 
-import org.dbsyncer.common.event.ChangedOffset;
-import org.dbsyncer.common.event.RowChangedEvent;
+import org.dbsyncer.listener.model.ChangedOffset;
+import org.dbsyncer.listener.event.RowChangedEvent;
 import org.dbsyncer.common.util.BooleanUtil;
 import org.dbsyncer.connector.config.DatabaseConfig;
 import org.dbsyncer.connector.database.DatabaseConnectorMapper;

+ 1 - 1
dbsyncer-listener/src/main/java/org/dbsyncer/listener/postgresql/decoder/PgOutputMessageDecoder.java

@@ -1,6 +1,6 @@
 package org.dbsyncer.listener.postgresql.decoder;
 
-import org.dbsyncer.common.event.RowChangedEvent;
+import org.dbsyncer.listener.event.RowChangedEvent;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.connector.ConnectorFactory;
 import org.dbsyncer.connector.database.DatabaseConnectorMapper;

+ 1 - 1
dbsyncer-listener/src/main/java/org/dbsyncer/listener/postgresql/decoder/TestDecodingMessageDecoder.java

@@ -1,7 +1,7 @@
 package org.dbsyncer.listener.postgresql.decoder;
 
 import org.dbsyncer.common.column.Lexer;
-import org.dbsyncer.common.event.RowChangedEvent;
+import org.dbsyncer.listener.event.RowChangedEvent;
 import org.dbsyncer.connector.constant.ConnectorConstant;
 import org.dbsyncer.listener.postgresql.AbstractMessageDecoder;
 import org.dbsyncer.listener.postgresql.enums.MessageDecoderEnum;

+ 1 - 1
dbsyncer-listener/src/main/java/org/dbsyncer/listener/quartz/AbstractQuartzExtractor.java

@@ -1,6 +1,6 @@
 package org.dbsyncer.listener.quartz;
 
-import org.dbsyncer.common.event.ScanChangedEvent;
+import org.dbsyncer.listener.event.ScanChangedEvent;
 import org.dbsyncer.common.model.Result;
 import org.dbsyncer.common.scheduled.ScheduledTaskJob;
 import org.dbsyncer.common.spi.ConnectorMapper;

+ 1 - 1
dbsyncer-listener/src/main/java/org/dbsyncer/listener/sqlserver/DqlSqlServerExtractor.java

@@ -1,6 +1,6 @@
 package org.dbsyncer.listener.sqlserver;
 
-import org.dbsyncer.common.event.ChangedEvent;
+import org.dbsyncer.listener.ChangedEvent;
 
 /**
  * @author AE86

+ 2 - 2
dbsyncer-listener/src/main/java/org/dbsyncer/listener/sqlserver/SqlServerExtractor.java

@@ -1,8 +1,8 @@
 package org.dbsyncer.listener.sqlserver;
 
 import com.microsoft.sqlserver.jdbc.SQLServerException;
-import org.dbsyncer.common.event.ChangedOffset;
-import org.dbsyncer.common.event.RowChangedEvent;
+import org.dbsyncer.listener.model.ChangedOffset;
+import org.dbsyncer.listener.event.RowChangedEvent;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.connector.config.DatabaseConfig;
 import org.dbsyncer.connector.constant.ConnectorConstant;

+ 1 - 1
dbsyncer-common/src/main/java/org/dbsyncer/common/event/ClosedEvent.java → dbsyncer-manager/src/main/java/org/dbsyncer/manager/event/ClosedEvent.java

@@ -1,4 +1,4 @@
-package org.dbsyncer.common.event;
+package org.dbsyncer.manager.event;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.event.ApplicationContextEvent;

+ 23 - 23
dbsyncer-common/src/main/java/org/dbsyncer/common/event/PreloadCompletedEvent.java → dbsyncer-manager/src/main/java/org/dbsyncer/manager/event/PreloadCompletedEvent.java

@@ -1,24 +1,24 @@
-package org.dbsyncer.common.event;
-
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.event.ApplicationContextEvent;
-
-/**
- * 预加载完成事件
- *
- * @version 1.0.0
- * @Author AE86
- * @Date 2020-08-26 22:45
- */
-public final class PreloadCompletedEvent extends ApplicationContextEvent {
-
-    /**
-     * Create a new ContextStartedEvent.
-     *
-     * @param source the {@code ApplicationContext} that the event is raised for (must not be {@code null})
-     */
-    public PreloadCompletedEvent(ApplicationContext source) {
-        super(source);
-    }
-
+package org.dbsyncer.manager.event;
+
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.event.ApplicationContextEvent;
+
+/**
+ * 预加载完成事件
+ *
+ * @version 1.0.0
+ * @Author AE86
+ * @Date 2020-08-26 22:45
+ */
+public final class PreloadCompletedEvent extends ApplicationContextEvent {
+
+    /**
+     * Create a new ContextStartedEvent.
+     *
+     * @param source the {@code ApplicationContext} that the event is raised for (must not be {@code null})
+     */
+    public PreloadCompletedEvent(ApplicationContext source) {
+        super(source);
+    }
+
 }

+ 1 - 1
dbsyncer-manager/src/main/java/org/dbsyncer/manager/listener/ClosedTaskListener.java

@@ -3,7 +3,7 @@
  */
 package org.dbsyncer.manager.listener;
 
-import org.dbsyncer.common.event.ClosedEvent;
+import org.dbsyncer.manager.event.ClosedEvent;
 import org.dbsyncer.manager.ManagerFactory;
 import org.dbsyncer.parser.enums.MetaEnum;
 import org.springframework.context.ApplicationListener;

+ 1 - 1
dbsyncer-manager/src/main/java/org/dbsyncer/manager/puller/AbstractPuller.java

@@ -1,6 +1,6 @@
 package org.dbsyncer.manager.puller;
 
-import org.dbsyncer.common.event.ClosedEvent;
+import org.dbsyncer.manager.event.ClosedEvent;
 import org.dbsyncer.manager.Puller;
 import org.springframework.context.ApplicationContext;
 

+ 2 - 2
dbsyncer-manager/src/main/java/org/dbsyncer/manager/puller/IncrementPuller.java

@@ -1,7 +1,7 @@
 package org.dbsyncer.manager.puller;
 
-import org.dbsyncer.common.event.ChangedOffset;
-import org.dbsyncer.common.event.RefreshOffsetEvent;
+import org.dbsyncer.listener.model.ChangedOffset;
+import org.dbsyncer.parser.event.RefreshOffsetEvent;
 import org.dbsyncer.common.model.AbstractConnectorConfig;
 import org.dbsyncer.common.scheduled.ScheduledTaskJob;
 import org.dbsyncer.common.scheduled.ScheduledTaskService;

+ 1 - 1
dbsyncer-manager/src/main/java/org/dbsyncer/manager/template/PreloadTemplate.java

@@ -1,6 +1,6 @@
 package org.dbsyncer.manager.template;
 
-import org.dbsyncer.common.event.PreloadCompletedEvent;
+import org.dbsyncer.manager.event.PreloadCompletedEvent;
 import org.dbsyncer.common.model.Paging;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.common.util.JsonUtil;

+ 1 - 1
dbsyncer-parser/src/main/java/org/dbsyncer/parser/ParserComponent.java

@@ -1,6 +1,6 @@
 package org.dbsyncer.parser;
 
-import org.dbsyncer.common.event.ChangedEvent;
+import org.dbsyncer.listener.ChangedEvent;
 import org.dbsyncer.common.model.Result;
 import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.common.spi.ConvertContext;

+ 3 - 3
dbsyncer-parser/src/main/java/org/dbsyncer/parser/consumer/AbstractConsumer.java

@@ -3,9 +3,9 @@
  */
 package org.dbsyncer.parser.consumer;
 
-import org.dbsyncer.common.event.ChangedEvent;
-import org.dbsyncer.common.event.DDLChangedEvent;
-import org.dbsyncer.common.event.Watcher;
+import org.dbsyncer.listener.ChangedEvent;
+import org.dbsyncer.listener.event.DDLChangedEvent;
+import org.dbsyncer.listener.Watcher;
 import org.dbsyncer.parser.ProfileComponent;
 import org.dbsyncer.parser.flush.impl.BufferActuatorRouter;
 import org.dbsyncer.parser.LogService;

+ 3 - 3
dbsyncer-parser/src/main/java/org/dbsyncer/parser/consumer/impl/LogConsumer.java

@@ -3,9 +3,9 @@
  */
 package org.dbsyncer.parser.consumer.impl;
 
-import org.dbsyncer.common.event.CommonChangedEvent;
-import org.dbsyncer.common.event.DDLChangedEvent;
-import org.dbsyncer.common.event.RowChangedEvent;
+import org.dbsyncer.listener.event.CommonChangedEvent;
+import org.dbsyncer.listener.event.DDLChangedEvent;
+import org.dbsyncer.listener.event.RowChangedEvent;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.connector.model.Table;
 import org.dbsyncer.parser.consumer.AbstractConsumer;

+ 1 - 1
dbsyncer-parser/src/main/java/org/dbsyncer/parser/consumer/impl/QuartzConsumer.java

@@ -3,7 +3,7 @@
  */
 package org.dbsyncer.parser.consumer.impl;
 
-import org.dbsyncer.common.event.ScanChangedEvent;
+import org.dbsyncer.listener.event.ScanChangedEvent;
 import org.dbsyncer.parser.consumer.AbstractConsumer;
 import org.dbsyncer.parser.model.FieldPicker;
 import org.dbsyncer.parser.model.TableGroup;

+ 33 - 32
dbsyncer-common/src/main/java/org/dbsyncer/common/event/RefreshOffsetEvent.java → dbsyncer-parser/src/main/java/org/dbsyncer/parser/event/RefreshOffsetEvent.java

@@ -1,33 +1,34 @@
-package org.dbsyncer.common.event;
-
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.event.ApplicationContextEvent;
-
-import java.util.List;
-
-/**
- * 刷新偏移量事件
- *
- * @version 1.0.0
- * @Author AE86
- * @Date 2023-08-23 22:45
- */
-public final class RefreshOffsetEvent extends ApplicationContextEvent {
-
-    private List<ChangedOffset> offsetList;
-
-    /**
-     * Create a new ContextStartedEvent.
-     *
-     * @param source the {@code ApplicationContext} that the event is raised for
-     *               (must not be {@code null})
-     */
-    public RefreshOffsetEvent(ApplicationContext source, List<ChangedOffset> offsetList) {
-        super(source);
-        this.offsetList = offsetList;
-    }
-
-    public List<ChangedOffset> getOffsetList() {
-        return offsetList;
-    }
+package org.dbsyncer.parser.event;
+
+import org.dbsyncer.listener.model.ChangedOffset;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.event.ApplicationContextEvent;
+
+import java.util.List;
+
+/**
+ * 刷新偏移量事件
+ *
+ * @version 1.0.0
+ * @Author AE86
+ * @Date 2023-08-23 22:45
+ */
+public final class RefreshOffsetEvent extends ApplicationContextEvent {
+
+    private List<ChangedOffset> offsetList;
+
+    /**
+     * Create a new ContextStartedEvent.
+     *
+     * @param source the {@code ApplicationContext} that the event is raised for
+     *               (must not be {@code null})
+     */
+    public RefreshOffsetEvent(ApplicationContext source, List<ChangedOffset> offsetList) {
+        super(source);
+        this.offsetList = offsetList;
+    }
+
+    public List<ChangedOffset> getOffsetList() {
+        return offsetList;
+    }
 }

+ 1 - 1
dbsyncer-parser/src/main/java/org/dbsyncer/parser/flush/impl/BufferActuatorRouter.java

@@ -4,7 +4,7 @@
 package org.dbsyncer.parser.flush.impl;
 
 import org.dbsyncer.common.config.TableGroupBufferConfig;
-import org.dbsyncer.common.event.ChangedEvent;
+import org.dbsyncer.listener.ChangedEvent;
 import org.dbsyncer.parser.flush.BufferActuator;
 import org.dbsyncer.parser.model.WriterRequest;
 import org.slf4j.Logger;

+ 1 - 1
dbsyncer-parser/src/main/java/org/dbsyncer/parser/flush/impl/GeneralBufferActuator.java

@@ -2,7 +2,7 @@ package org.dbsyncer.parser.flush.impl;
 
 import org.dbsyncer.parser.CacheService;
 import org.dbsyncer.common.config.GeneralBufferConfig;
-import org.dbsyncer.common.event.RefreshOffsetEvent;
+import org.dbsyncer.parser.event.RefreshOffsetEvent;
 import org.dbsyncer.common.model.AbstractConnectorConfig;
 import org.dbsyncer.common.model.IncrementConvertContext;
 import org.dbsyncer.common.model.Result;

+ 1 - 1
dbsyncer-parser/src/main/java/org/dbsyncer/parser/impl/ParserComponentImpl.java

@@ -1,6 +1,6 @@
 package org.dbsyncer.parser.impl;
 
-import org.dbsyncer.common.event.ChangedEvent;
+import org.dbsyncer.listener.ChangedEvent;
 import org.dbsyncer.common.model.AbstractConnectorConfig;
 import org.dbsyncer.common.model.FullConvertContext;
 import org.dbsyncer.common.model.Result;

+ 3 - 3
dbsyncer-parser/src/main/java/org/dbsyncer/parser/model/WriterRequest.java

@@ -1,8 +1,8 @@
 package org.dbsyncer.parser.model;
 
-import org.dbsyncer.common.event.ChangedEvent;
-import org.dbsyncer.common.event.ChangedOffset;
-import org.dbsyncer.common.event.DDLChangedEvent;
+import org.dbsyncer.listener.ChangedEvent;
+import org.dbsyncer.listener.model.ChangedOffset;
+import org.dbsyncer.listener.event.DDLChangedEvent;
 import org.dbsyncer.parser.flush.BufferRequest;
 
 import java.util.Map;

+ 1 - 1
dbsyncer-parser/src/main/java/org/dbsyncer/parser/model/WriterResponse.java

@@ -1,6 +1,6 @@
 package org.dbsyncer.parser.model;
 
-import org.dbsyncer.common.event.ChangedOffset;
+import org.dbsyncer.listener.model.ChangedOffset;
 import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.parser.flush.BufferResponse;