up

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

@@ -10,7 +10,7 @@ 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.extractor.Puller;
 import org.dbsyncer.manager.template.impl.OperationTemplate;
 import org.dbsyncer.parser.Parser;
 import org.dbsyncer.parser.enums.ConvertEnum;
@@ -51,11 +51,11 @@ public class ManagerFactory implements Manager, ApplicationContextAware, Applica
     @Autowired
     private OperationTemplate operationTemplate;
 
-    private Map<String, Extractor> map;
+    private Map<String, Puller> map;
 
     @Override
     public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        map = applicationContext.getBeansOfType(Extractor.class);
+        map = applicationContext.getBeansOfType(Puller.class);
     }
 
     @Override
@@ -227,23 +227,23 @@ public class ManagerFactory implements Manager, ApplicationContextAware, Applica
 
     @Override
     public void start(Mapping mapping) {
-        Extractor extractor = getExtractor(mapping);
+        Puller puller = getPuller(mapping);
 
         // 标记运行中
         changeMetaState(mapping.getMetaId(), MetaEnum.RUNNING);
 
-        extractor.asyncStart(mapping);
+        puller.asyncStart(mapping);
     }
 
     @Override
     public void close(Mapping mapping) {
-        Extractor extractor = getExtractor(mapping);
+        Puller puller = getPuller(mapping);
 
         // 标记停止中
         String metaId = mapping.getMetaId();
         changeMetaState(metaId, MetaEnum.STOPPING);
 
-        extractor.close(metaId);
+        puller.close(metaId);
     }
 
     @Override
@@ -263,16 +263,16 @@ public class ManagerFactory implements Manager, ApplicationContextAware, Applica
         changeMetaState(event.getId(), MetaEnum.READY);
     }
 
-    private Extractor getExtractor(Mapping mapping) {
+    private Puller getPuller(Mapping mapping) {
         Assert.notNull(mapping, "驱动不能为空");
         String model = mapping.getModel();
         String metaId = mapping.getMetaId();
         Assert.hasText(model, "同步方式不能为空");
         Assert.hasText(metaId, "任务ID不能为空");
 
-        Extractor extractor = map.get(model.concat("Extractor"));
-        Assert.notNull(extractor, String.format("未知的同步方式: %s", model));
-        return extractor;
+        Puller puller = map.get(model.concat("Puller"));
+        Assert.notNull(puller, String.format("未知的同步方式: %s", model));
+        return puller;
     }
 
 }

dbsyncer-manager/src/main/java/org/dbsyncer/manager/extractor/AbstractExtractor.java → dbsyncer-manager/src/main/java/org/dbsyncer/manager/extractor/AbstractPuller.java

@@ -1,20 +1,20 @@
-package org.dbsyncer.manager.extractor;
-
-import org.dbsyncer.common.event.ClosedEvent;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-
-public abstract class AbstractExtractor implements Extractor {
-
-    private final Logger logger = LoggerFactory.getLogger(getClass());
-
-    @Autowired
-    private ApplicationContext applicationContext;
-
-    protected void publishClosedEvent(String metaId) {
-        applicationContext.publishEvent(new ClosedEvent(applicationContext, metaId));
-    }
-
+package org.dbsyncer.manager.extractor;
+
+import org.dbsyncer.common.event.ClosedEvent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+
+public abstract class AbstractPuller implements Puller {
+
+    private final Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private ApplicationContext applicationContext;
+
+    protected void publishClosedEvent(String metaId) {
+        applicationContext.publishEvent(new ClosedEvent(applicationContext, metaId));
+    }
+
 }

dbsyncer-manager/src/main/java/org/dbsyncer/manager/extractor/Extractor.java → dbsyncer-manager/src/main/java/org/dbsyncer/manager/extractor/Puller.java

@@ -3,7 +3,7 @@ package org.dbsyncer.manager.extractor;
 import org.dbsyncer.parser.model.Mapping;
 import org.springframework.scheduling.annotation.Async;
 
-public interface Extractor {
+public interface Puller {
 
     @Async("taskExecutor")
     void asyncStart(Mapping mapping);

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

@@ -3,7 +3,7 @@ package org.dbsyncer.manager.extractor.impl;
 import org.dbsyncer.common.event.FullRefreshEvent;
 import org.dbsyncer.common.model.Task;
 import org.dbsyncer.manager.Manager;
-import org.dbsyncer.manager.extractor.AbstractExtractor;
+import org.dbsyncer.manager.extractor.AbstractPuller;
 import org.dbsyncer.parser.Parser;
 import org.dbsyncer.parser.model.Mapping;
 import org.dbsyncer.parser.model.Meta;
@@ -27,7 +27,7 @@ import java.util.concurrent.ConcurrentHashMap;
  * @date 2020/04/26 15:28
  */
 @Component
-public class FullExtractor extends AbstractExtractor implements ApplicationListener<FullRefreshEvent> {
+public class FullPuller extends AbstractPuller implements ApplicationListener<FullRefreshEvent> {
 
     private final Logger logger = LoggerFactory.getLogger(getClass());
 

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

@@ -4,9 +4,9 @@ import org.dbsyncer.common.event.IncrementRefreshEvent;
 import org.dbsyncer.common.model.Task;
 import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.listener.Listener;
+import org.dbsyncer.manager.extractor.AbstractPuller;
 import org.dbsyncer.parser.model.ListenerConfig;
 import org.dbsyncer.manager.Manager;
-import org.dbsyncer.manager.extractor.AbstractExtractor;
 import org.dbsyncer.manager.extractor.Increment;
 import org.dbsyncer.parser.model.Connector;
 import org.dbsyncer.parser.model.Mapping;
@@ -32,7 +32,7 @@ import java.util.concurrent.ConcurrentHashMap;
  * @date 2020/04/26 15:28
  */
 @Component
-public class IncrementExtractor extends AbstractExtractor implements ApplicationContextAware, ApplicationListener<IncrementRefreshEvent> {
+public class IncrementPuller extends AbstractPuller implements ApplicationContextAware, ApplicationListener<IncrementRefreshEvent> {
 
     private final Logger logger = LoggerFactory.getLogger(getClass());
 

dbsyncer-parser/src/main/java/org/dbsyncer/parser/model/ListenerConfig.java

@@ -1,6 +1,8 @@
 package org.dbsyncer.parser.model;
 
 
+import org.dbsyncer.parser.enums.ListenerEnum;
+
 /**
  * @author AE86
  * @version 1.0.0