update

dbsyncer-common/src/main/java/org/dbsyncer/common/event/RefreshEvent.java

@@ -1,6 +1,6 @@
 package org.dbsyncer.common.event;
 
-import org.dbsyncer.common.task.Task;
+import org.dbsyncer.common.model.Task;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.event.ApplicationContextEvent;
 

dbsyncer-common/src/main/java/org/dbsyncer/common/task/Result.java → dbsyncer-common/src/main/java/org/dbsyncer/common/model/Result.java

@@ -1,54 +1,54 @@
-package org.dbsyncer.common.task;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Queue;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.atomic.AtomicLong;
-
-public class Result {
-
-    // 读取数据
-    private List<Map<String, Object>> data;
-
-    // 错误数据
-    private Queue<Map<String, Object>> failData;
-
-    // 错误数
-    private AtomicLong fail;
-
-    // 错误日志
-    private StringBuffer error;
-
-    public Result() {
-        init();
-    }
-
-    public Result(List<Map<String, Object>> data) {
-        init();
-        this.data = data;
-    }
-
-    private void init(){
-        this.failData = new ConcurrentLinkedQueue<>();
-        this.fail = new AtomicLong(0);
-        this.error = new StringBuffer();
-    }
-
-    public List<Map<String, Object>> getData() {
-        return data;
-    }
-
-    public Queue<Map<String, Object>> getFailData() {
-        return failData;
-    }
-
-    public AtomicLong getFail() {
-        return fail;
-    }
-
-    public StringBuffer getError() {
-        return error;
-    }
-
+package org.dbsyncer.common.model;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.atomic.AtomicLong;
+
+public class Result {
+
+    // 读取数据
+    private List<Map<String, Object>> data;
+
+    // 错误数据
+    private Queue<Map<String, Object>> failData;
+
+    // 错误数
+    private AtomicLong fail;
+
+    // 错误日志
+    private StringBuffer error;
+
+    public Result() {
+        init();
+    }
+
+    public Result(List<Map<String, Object>> data) {
+        init();
+        this.data = data;
+    }
+
+    private void init(){
+        this.failData = new ConcurrentLinkedQueue<>();
+        this.fail = new AtomicLong(0);
+        this.error = new StringBuffer();
+    }
+
+    public List<Map<String, Object>> getData() {
+        return data;
+    }
+
+    public Queue<Map<String, Object>> getFailData() {
+        return failData;
+    }
+
+    public AtomicLong getFail() {
+        return fail;
+    }
+
+    public StringBuffer getError() {
+        return error;
+    }
+
 }

dbsyncer-common/src/main/java/org/dbsyncer/common/task/Task.java → dbsyncer-common/src/main/java/org/dbsyncer/common/model/Task.java

@@ -1,61 +1,61 @@
-package org.dbsyncer.common.task;
-
-public class Task {
-
-    private String id;
-
-    private StateEnum state;
-
-    private long beginTime;
-
-    private long endTime;
-
-    public Task(String id) {
-        this.id = id;
-        this.state = StateEnum.RUNNING;
-    }
-
-    public void stop() {
-        this.state = StateEnum.STOP;
-    }
-
-    public boolean isRunning() {
-        return StateEnum.RUNNING == state;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public long getBeginTime() {
-        return beginTime;
-    }
-
-    public void setBeginTime(long beginTime) {
-        this.beginTime = beginTime;
-    }
-
-    public long getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(long endTime) {
-        this.endTime = endTime;
-    }
-
-    public enum StateEnum{
-        /**
-         * 运行
-         */
-        RUNNING,
-        /**
-         * 停止
-         */
-        STOP;
-    }
-
+package org.dbsyncer.common.model;
+
+public class Task {
+
+    private String id;
+
+    private StateEnum state;
+
+    private long beginTime;
+
+    private long endTime;
+
+    public Task(String id) {
+        this.id = id;
+        this.state = StateEnum.RUNNING;
+    }
+
+    public void stop() {
+        this.state = StateEnum.STOP;
+    }
+
+    public boolean isRunning() {
+        return StateEnum.RUNNING == state;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public long getBeginTime() {
+        return beginTime;
+    }
+
+    public void setBeginTime(long beginTime) {
+        this.beginTime = beginTime;
+    }
+
+    public long getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(long endTime) {
+        this.endTime = endTime;
+    }
+
+    public enum StateEnum{
+        /**
+         * 运行
+         */
+        RUNNING,
+        /**
+         * 停止
+         */
+        STOP;
+    }
+
 }

dbsyncer-connector/src/main/java/org/dbsyncer/connector/Connector.java

@@ -1,6 +1,6 @@
 package org.dbsyncer.connector;
 
-import org.dbsyncer.common.task.Result;
+import org.dbsyncer.common.model.Result;
 import org.dbsyncer.connector.config.CommandConfig;
 import org.dbsyncer.connector.config.ConnectorConfig;
 import org.dbsyncer.connector.config.Field;

dbsyncer-connector/src/main/java/org/dbsyncer/connector/ConnectorFactory.java

@@ -1,6 +1,6 @@
 package org.dbsyncer.connector;
 
-import org.dbsyncer.common.task.Result;
+import org.dbsyncer.common.model.Result;
 import org.dbsyncer.connector.config.CommandConfig;
 import org.dbsyncer.connector.config.ConnectorConfig;
 import org.dbsyncer.connector.config.Field;

dbsyncer-connector/src/main/java/org/dbsyncer/connector/database/AbstractDatabaseConnector.java

@@ -1,7 +1,7 @@
 package org.dbsyncer.connector.database;
 
 import org.apache.commons.lang.StringUtils;
-import org.dbsyncer.common.task.Result;
+import org.dbsyncer.common.model.Result;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.connector.ConnectorException;
 import org.dbsyncer.connector.config.*;
@@ -14,12 +14,10 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.core.BatchPreparedStatementSetter;
 import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowCountCallbackHandler;
 import org.springframework.util.Assert;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
-import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.*;
 import java.util.stream.Collectors;

dbsyncer-connector/src/main/java/org/dbsyncer/connector/ldap/LdapConnector.java

@@ -1,7 +1,7 @@
 package org.dbsyncer.connector.ldap;
 
 import org.apache.commons.lang.StringUtils;
-import org.dbsyncer.common.task.Result;
+import org.dbsyncer.common.model.Result;
 import org.dbsyncer.connector.config.*;
 import org.dbsyncer.connector.constant.ConnectorConstant;
 import org.dbsyncer.connector.util.LdapUtil;

dbsyncer-connector/src/main/java/org/dbsyncer/connector/redis/RedisConnector.java

@@ -1,7 +1,7 @@
 package org.dbsyncer.connector.redis;
 
 import org.apache.commons.lang.StringUtils;
-import org.dbsyncer.common.task.Result;
+import org.dbsyncer.common.model.Result;
 import org.dbsyncer.connector.config.*;
 import org.dbsyncer.connector.util.RedisUtil;
 import org.slf4j.Logger;

dbsyncer-listener/src/main/java/org/dbsyncer/listener/Listener.java

@@ -1,4 +0,0 @@
-package org.dbsyncer.listener;
-
-public interface Listener {
-}

dbsyncer-listener/src/main/java/org/dbsyncer/listener/ListenerFactory.java

@@ -1,28 +1,15 @@
 package org.dbsyncer.listener;
 
 
-import org.dbsyncer.common.task.Task;
+import org.dbsyncer.common.model.Task;
 import org.dbsyncer.connector.config.ConnectorConfig;
 import org.dbsyncer.listener.config.ListenerConfig;
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
 import org.springframework.stereotype.Component;
 
-import java.util.Map;
-
 @Component
-public class ListenerFactory implements ApplicationContextAware {
-
-    private Map<String, Listener> pull;
-
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        pull = applicationContext.getBeansOfType(Listener.class);
-    }
-
-    public void execute(Task task, ListenerConfig listenerConfig, ConnectorConfig connector) {
-
+public class ListenerFactory {
 
+    public void execute(Task task, ListenerConfig listenerConfig, ConnectorConfig connectorConfig) {
+        // extract
     }
 }

dbsyncer-listener/src/main/java/org/dbsyncer/listener/Meta.java

@@ -1,7 +0,0 @@
-package org.dbsyncer.listener;
-
-import java.io.Serializable;
-
-public interface Meta extends Serializable {
-
-}

dbsyncer-listener/src/main/java/org/dbsyncer/listener/mysql/MysqlMeta.java

@@ -1,63 +0,0 @@
-package org.dbsyncer.listener.mysql;
-
-import org.dbsyncer.listener.Meta;
-
-/**
- * binlog 读取增量数据元信息配置
- *
- * @author AE86
- * @version 1.0.0
- * @date 2018年8月2日 上午11:20:06
- */
-public class MysqlMeta implements Meta {
-
-    private static final long serialVersionUID = 7255240901494804338L;
-
-    /**
-     * binlog 文件名称
-     */
-    private String binlogFileName;
-
-    /**
-     * binlog 最新位置
-     */
-    private Long binlogPosition;
-
-    /**
-     * 监听的机器
-     */
-    private int master;
-
-    public String getBinlogFileName() {
-        return binlogFileName;
-    }
-
-    public MysqlMeta setBinlogFileName(String binlogFileName) {
-        this.binlogFileName = binlogFileName;
-        return this;
-    }
-
-    public Long getBinlogPosition() {
-        return binlogPosition;
-    }
-
-    public MysqlMeta setBinlogPosition(Long binlogPosition) {
-        this.binlogPosition = binlogPosition;
-        return this;
-    }
-
-    public int getMaster() {
-        return master;
-    }
-
-    public MysqlMeta setMaster(int master) {
-        this.master = master;
-        return this;
-    }
-
-    @Override
-    public String toString() {
-        return new StringBuilder().append("Meta [binlogFileName=").append(binlogFileName).append(", binlogPosition=").append(binlogPosition).append(", master=").append(master).append("]").toString();
-    }
-
-}

dbsyncer-manager/src/main/java/org/dbsyncer/manager/ManagerFactory.java

@@ -6,14 +6,12 @@ import org.dbsyncer.connector.config.MetaInfo;
 import org.dbsyncer.connector.enums.ConnectorEnum;
 import org.dbsyncer.connector.enums.FilterEnum;
 import org.dbsyncer.connector.enums.OperationEnum;
-import org.dbsyncer.listener.Listener;
 import org.dbsyncer.manager.config.OperationConfig;
 import org.dbsyncer.manager.config.QueryConfig;
 import org.dbsyncer.manager.enums.GroupStrategyEnum;
 import org.dbsyncer.manager.enums.HandlerEnum;
 import org.dbsyncer.manager.extractor.Extractor;
 import org.dbsyncer.manager.template.impl.OperationTemplate;
-import org.dbsyncer.manager.template.impl.PreloadTemplate;
 import org.dbsyncer.parser.Parser;
 import org.dbsyncer.parser.enums.ConvertEnum;
 import org.dbsyncer.parser.enums.MetaEnum;
@@ -50,15 +48,6 @@ public class ManagerFactory implements Manager, ApplicationContextAware, Applica
     @Autowired
     private PluginFactory pluginFactory;
 
-    @Autowired
-    private Listener listener;
-
-    @Autowired
-    private TaskExecutor executor;
-
-    @Autowired
-    private PreloadTemplate preloadTemplate;
-
     @Autowired
     private OperationTemplate operationTemplate;
 
@@ -258,10 +247,10 @@ public class ManagerFactory implements Manager, ApplicationContextAware, Applica
     }
 
     @Override
-    public void changeMetaState(String metaId, MetaEnum metaEnum){
+    public void changeMetaState(String metaId, MetaEnum metaEnum) {
         Meta meta = getMeta(metaId);
         int code = metaEnum.getCode();
-        if(meta.getState() != code){
+        if (meta.getState() != code) {
             meta.setState(code);
             meta.setUpdateTime(System.currentTimeMillis());
             editMeta(meta);

dbsyncer-manager/src/main/java/org/dbsyncer/manager/extractor/impl/FullExtractor.java

@@ -1,7 +1,7 @@
 package org.dbsyncer.manager.extractor.impl;
 
 import org.dbsyncer.common.event.RefreshEvent;
-import org.dbsyncer.common.task.Task;
+import org.dbsyncer.common.model.Task;
 import org.dbsyncer.manager.Manager;
 import org.dbsyncer.manager.extractor.AbstractExtractor;
 import org.dbsyncer.parser.Parser;

dbsyncer-manager/src/main/java/org/dbsyncer/manager/extractor/impl/IncrementExtractor.java

@@ -1,7 +1,6 @@
 package org.dbsyncer.manager.extractor.impl;
 
-import org.dbsyncer.common.task.Task;
-import org.dbsyncer.connector.config.ConnectorConfig;
+import org.dbsyncer.common.model.Task;
 import org.dbsyncer.listener.ListenerFactory;
 import org.dbsyncer.listener.config.ListenerConfig;
 import org.dbsyncer.manager.Manager;
@@ -10,10 +9,7 @@ import org.dbsyncer.parser.model.Connector;
 import org.dbsyncer.parser.model.Mapping;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
 import org.springframework.stereotype.Component;
 import org.springframework.util.Assert;
 

dbsyncer-listener/src/main/java/org/dbsyncer/listener/AbstractListener.java → dbsyncer-manager/src/main/java/org/dbsyncer/manager/extractor/increment/AbstractListener.java

@@ -1,4 +1,4 @@
-package org.dbsyncer.listener;
+package org.dbsyncer.manager.extractor.increment;
 
 
 public abstract class AbstractListener implements Listener {

dbsyncer-manager/src/main/java/org/dbsyncer/manager/extractor/increment/Listener.java

@@ -0,0 +1,4 @@
+package org.dbsyncer.manager.extractor.increment;
+
+public interface Listener {
+}

dbsyncer-listener/src/main/java/org/dbsyncer/listener/LogListener.java → dbsyncer-manager/src/main/java/org/dbsyncer/manager/extractor/increment/LogListener.java

@@ -1,4 +1,4 @@
-package org.dbsyncer.listener;
+package org.dbsyncer.manager.extractor.increment;
 
 import org.springframework.stereotype.Component;
 

dbsyncer-listener/src/main/java/org/dbsyncer/listener/TimingListener.java → dbsyncer-manager/src/main/java/org/dbsyncer/manager/extractor/increment/TimingListener.java

@@ -1,4 +1,4 @@
-package org.dbsyncer.listener;
+package org.dbsyncer.manager.extractor.increment;
 
 import org.springframework.stereotype.Component;
 

dbsyncer-parser/src/main/java/org/dbsyncer/parser/Parser.java

@@ -1,6 +1,6 @@
 package org.dbsyncer.parser;
 
-import org.dbsyncer.common.task.Task;
+import org.dbsyncer.common.model.Task;
 import org.dbsyncer.connector.config.ConnectorConfig;
 import org.dbsyncer.connector.config.MetaInfo;
 import org.dbsyncer.connector.enums.ConnectorEnum;

dbsyncer-parser/src/main/java/org/dbsyncer/parser/ParserFactory.java

@@ -2,8 +2,8 @@ package org.dbsyncer.parser;
 
 import org.dbsyncer.cache.CacheService;
 import org.dbsyncer.common.event.RefreshEvent;
-import org.dbsyncer.common.task.Result;
-import org.dbsyncer.common.task.Task;
+import org.dbsyncer.common.model.Result;
+import org.dbsyncer.common.model.Task;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.common.util.JsonUtil;
 import org.dbsyncer.connector.ConnectorFactory;