mv package

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

@@ -1,7 +1,5 @@
 package org.dbsyncer.common.event;
 
-import org.dbsyncer.common.spi.Extractor;
-
 import java.util.Map;
 
 /**
@@ -40,6 +38,4 @@ public interface Watcher {
      * @return
      */
     long getMetaUpdateTime();
-
-    default void setExtractor(Extractor extractor){}
 }

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

@@ -5,7 +5,6 @@ import org.dbsyncer.common.event.ChangedOffset;
 import org.dbsyncer.common.event.Watcher;
 import org.dbsyncer.common.model.AbstractConnectorConfig;
 import org.dbsyncer.common.scheduled.ScheduledTaskService;
-import org.dbsyncer.common.spi.Extractor;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.connector.ConnectorFactory;
 import org.dbsyncer.connector.constant.ConnectorConstant;
@@ -43,7 +42,6 @@ public abstract class AbstractExtractor implements Extractor {
     @Override
     public void register(Watcher watcher) {
         this.watcher = watcher;
-        watcher.setExtractor(this);
     }
 
     @Override

dbsyncer-common/src/main/java/org/dbsyncer/common/spi/Extractor.java → dbsyncer-listener/src/main/java/org/dbsyncer/listener/Extractor.java

@@ -1,4 +1,4 @@
-package org.dbsyncer.common.spi;
+package org.dbsyncer.listener;
 
 import org.dbsyncer.common.event.ChangedEvent;
 import org.dbsyncer.common.event.ChangedOffset;

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

@@ -9,11 +9,11 @@ import org.dbsyncer.common.event.Watcher;
 import org.dbsyncer.common.model.AbstractConnectorConfig;
 import org.dbsyncer.common.scheduled.ScheduledTaskJob;
 import org.dbsyncer.common.scheduled.ScheduledTaskService;
-import org.dbsyncer.common.spi.Extractor;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.connector.ConnectorFactory;
 import org.dbsyncer.connector.model.Table;
 import org.dbsyncer.listener.AbstractExtractor;
+import org.dbsyncer.listener.Extractor;
 import org.dbsyncer.listener.Listener;
 import org.dbsyncer.listener.config.ListenerConfig;
 import org.dbsyncer.listener.enums.ListenerTypeEnum;
@@ -221,8 +221,8 @@ public class IncrementPuller extends AbstractPuller implements ApplicationListen
     }
 
     final class QuartzConsumer extends AbstractConsumer<PageChangedEvent> {
-
         private List<FieldPicker> tablePicker = new LinkedList<>();
+
         public QuartzConsumer(Meta meta, Mapping mapping, List<TableGroup> tableGroups) {
             this.meta = meta;
             tableGroups.forEach(t -> tablePicker.add(new FieldPicker(PickerUtil.mergeTableGroupConfig(mapping, t))));
@@ -240,7 +240,6 @@ public class IncrementPuller extends AbstractPuller implements ApplicationListen
     }
 
     final class LogConsumer extends AbstractConsumer<RowChangedEvent> {
-        private Extractor extractor;
         private Map<String, List<FieldPicker>> tablePicker = new LinkedHashMap<>();
 
         public LogConsumer(Meta meta, Mapping mapping, List<TableGroup> tableGroups) {
@@ -270,10 +269,6 @@ public class IncrementPuller extends AbstractPuller implements ApplicationListen
                 });
             }
         }
-
-        public void setExtractor(Extractor extractor) {
-            this.extractor = extractor;
-        }
     }
 
 }