AE86 4 anni fa
parent
commit
e67221dbf9

+ 3 - 10
dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/impl/connector/ConnectorChecker.java

@@ -14,10 +14,7 @@ import org.dbsyncer.parser.model.Connector;
 import org.dbsyncer.storage.constant.ConfigConstant;
 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;
 
@@ -30,7 +27,7 @@ import java.util.Map;
  * @date 2020/1/8 15:17
  */
 @Component
-public class ConnectorChecker extends AbstractChecker implements ApplicationContextAware {
+public class ConnectorChecker extends AbstractChecker {
 
     private final Logger logger = LoggerFactory.getLogger(getClass());
 
@@ -40,13 +37,9 @@ public class ConnectorChecker extends AbstractChecker implements ApplicationCont
     @Autowired
     private LogService logService;
 
+    @Autowired
     private Map<String, ConnectorConfigChecker> map;
 
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        map = applicationContext.getBeansOfType(ConnectorConfigChecker.class);
-    }
-
     @Override
     public ConfigModel checkAddConfigModel(Map<String, String> params) {
         logger.info("params:{}", params);
@@ -115,7 +108,7 @@ public class ConnectorChecker extends AbstractChecker implements ApplicationCont
     private void setTable(Connector connector) {
         // 获取表信息
         boolean alive = manager.alive(connector.getConfig());
-        if(!alive){
+        if (!alive) {
             logService.log(LogType.ConnectorLog.FAILED);
         }
         Assert.isTrue(alive, "无法连接.");

+ 3 - 10
dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/impl/mapping/LogConfigChecker.java

@@ -4,15 +4,12 @@ import org.dbsyncer.biz.checker.MappingConfigChecker;
 import org.dbsyncer.biz.checker.MappingLogConfigChecker;
 import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.connector.config.ConnectorConfig;
+import org.dbsyncer.listener.config.ListenerConfig;
 import org.dbsyncer.listener.enums.ListenerTypeEnum;
 import org.dbsyncer.manager.Manager;
 import org.dbsyncer.parser.model.Connector;
-import org.dbsyncer.listener.config.ListenerConfig;
 import org.dbsyncer.parser.model.Mapping;
-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;
 
@@ -26,18 +23,14 @@ import java.util.Map;
  * @date 2020/1/8 15:17
  */
 @Component
-public class LogConfigChecker implements MappingConfigChecker, ApplicationContextAware {
+public class LogConfigChecker implements MappingConfigChecker {
 
     @Autowired
     private Manager manager;
 
+    @Autowired
     private Map<String, MappingLogConfigChecker> map;
 
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        map = applicationContext.getBeansOfType(MappingLogConfigChecker.class);
-    }
-
     @Override
     public void modify(Mapping mapping, Map<String, String> params) {
         String connectorId = mapping.getSourceConnectorId();

+ 2 - 9
dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/impl/mapping/MappingChecker.java

@@ -18,10 +18,7 @@ import org.dbsyncer.parser.model.TableGroup;
 import org.dbsyncer.storage.constant.ConfigConstant;
 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;
 
@@ -36,7 +33,7 @@ import java.util.concurrent.atomic.AtomicLong;
  * @date 2020/1/8 15:17
  */
 @Component
-public class MappingChecker extends AbstractChecker implements ApplicationContextAware {
+public class MappingChecker extends AbstractChecker {
 
     private final Logger logger = LoggerFactory.getLogger(getClass());
 
@@ -46,13 +43,9 @@ public class MappingChecker extends AbstractChecker implements ApplicationContex
     @Autowired
     private TableGroupChecker tableGroupChecker;
 
+    @Autowired
     private Map<String, MappingConfigChecker> map;
 
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        map = applicationContext.getBeansOfType(MappingConfigChecker.class);
-    }
-
     @Override
     public ConfigModel checkAddConfigModel(Map<String, String> params) {
         logger.info("params:{}", params);

+ 2 - 6
dbsyncer-manager/src/main/java/org/dbsyncer/manager/ManagerFactory.java

@@ -45,7 +45,7 @@ import java.util.Map;
  * @date 2019/9/16 23:59
  */
 @Component
-public class ManagerFactory implements Manager, ApplicationContextAware, ApplicationListener<ClosedEvent> {
+public class ManagerFactory implements Manager, ApplicationListener<ClosedEvent> {
 
     private final Logger logger = LoggerFactory.getLogger(getClass());
 
@@ -61,13 +61,9 @@ public class ManagerFactory implements Manager, ApplicationContextAware, Applica
     @Autowired
     private DataTemplate dataTemplate;
 
+    @Autowired
     private Map<String, Puller> map;
 
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        map = applicationContext.getBeansOfType(Puller.class);
-    }
-
     @Override
     public boolean alive(ConnectorConfig config) {
         return parser.alive(config);

+ 4 - 10
dbsyncer-storage/src/main/java/org/dbsyncer/storage/AbstractStorageService.java

@@ -6,10 +6,8 @@ import org.dbsyncer.storage.query.Query;
 import org.dbsyncer.storage.strategy.Strategy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.DisposableBean;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.Assert;
 
 import java.io.File;
@@ -22,10 +20,11 @@ import java.util.Map;
  * @version 1.0.0
  * @date 2019/11/16 1:28
  */
-public abstract class AbstractStorageService implements StorageService, ApplicationContextAware, DisposableBean {
+public abstract class AbstractStorageService implements StorageService, DisposableBean {
 
     private final Logger logger = LoggerFactory.getLogger(getClass());
 
+    @Autowired
     private Map<String, Strategy> map;
 
     public abstract Paging select(Query query) throws IOException;
@@ -54,11 +53,6 @@ public abstract class AbstractStorageService implements StorageService, Applicat
      */
     public abstract void insertData(StorageEnum type, String collection, List<Map> list) throws IOException;
 
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        map = applicationContext.getBeansOfType(Strategy.class);
-    }
-
     @Override
     public Paging query(Query query) {
         try {
@@ -158,7 +152,7 @@ public abstract class AbstractStorageService implements StorageService, Applicat
         }
     }
 
-    protected String getSeparator(){
+    protected String getSeparator() {
         return File.separator;
     }