AE86 5 年之前
父节点
当前提交
22da9a7402

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

@@ -2,7 +2,7 @@ package org.dbsyncer.connector;
 
 import org.dbsyncer.connector.config.ConnectorConfig;
 import org.dbsyncer.connector.config.MetaInfo;
-import org.dbsyncer.connector.template.CommandTemplate;
+import org.dbsyncer.connector.config.CommandConfig;
 
 import java.util.List;
 import java.util.Map;
@@ -44,17 +44,17 @@ public interface Connector {
     /**
      * 获取数据源同步参数
      *
-     * @param commandTemplate
+     * @param commandConfig
      * @return
      */
-    Map<String, String> getSourceCommand(CommandTemplate commandTemplate);
+    Map<String, String> getSourceCommand(CommandConfig commandConfig);
 
     /**
      * 获取目标源同步参数
      *
-     * @param commandTemplate
+     * @param commandConfig
      * @return
      */
-    Map<String, String> getTargetCommand(CommandTemplate commandTemplate);
+    Map<String, String> getTargetCommand(CommandConfig commandConfig);
 
 }

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

@@ -3,7 +3,7 @@ package org.dbsyncer.connector;
 import org.dbsyncer.connector.config.ConnectorConfig;
 import org.dbsyncer.connector.config.MetaInfo;
 import org.dbsyncer.connector.enums.ConnectorEnum;
-import org.dbsyncer.connector.template.CommandTemplate;
+import org.dbsyncer.connector.config.CommandConfig;
 import org.springframework.util.Assert;
 
 import java.util.HashMap;
@@ -57,16 +57,16 @@ public class ConnectorFactory {
     /**
      * 获取连接器同步参数
      *
-     * @param sourceCommandTemplate
-     * @param targetCommandTemplate
+     * @param sourceCommandConfig
+     * @param targetCommandConfig
      * @return
      */
-    public Map<String, String> getCommand(CommandTemplate sourceCommandTemplate, CommandTemplate targetCommandTemplate) {
-        String sType = sourceCommandTemplate.getType();
-        String tType = targetCommandTemplate.getType();
+    public Map<String, String> getCommand(CommandConfig sourceCommandConfig, CommandConfig targetCommandConfig) {
+        String sType = sourceCommandConfig.getType();
+        String tType = targetCommandConfig.getType();
         Map<String, String> map = new HashMap<>();
-        Map<String, String> sCmd = getConnector(sType).getSourceCommand(sourceCommandTemplate);
-        Map<String, String> tCmd = getConnector(tType).getTargetCommand(targetCommandTemplate);
+        Map<String, String> sCmd = getConnector(sType).getSourceCommand(sourceCommandConfig);
+        Map<String, String> tCmd = getConnector(tType).getTargetCommand(targetCommandConfig);
         map.putAll(sCmd);
         map.putAll(tCmd);
         return map;

+ 4 - 7
dbsyncer-connector/src/main/java/org/dbsyncer/connector/template/CommandTemplate.java → dbsyncer-connector/src/main/java/org/dbsyncer/connector/config/CommandConfig.java

@@ -1,7 +1,4 @@
-package org.dbsyncer.connector.template;
-
-import org.dbsyncer.connector.config.Filter;
-import org.dbsyncer.connector.config.Table;
+package org.dbsyncer.connector.config;
 
 import java.util.List;
 
@@ -12,7 +9,7 @@ import java.util.List;
  * @version 1.0.0
  * @date 2019/9/16 23:59
  */
-public class CommandTemplate {
+public class CommandConfig {
 
     private String type;
 
@@ -20,12 +17,12 @@ public class CommandTemplate {
 
     private List<Filter> filter;
 
-    public CommandTemplate(String type, Table table) {
+    public CommandConfig(String type, Table table) {
         this.type = type;
         this.table = table;
     }
 
-    public CommandTemplate(String type, Table table, List<Filter> filter) {
+    public CommandConfig(String type, Table table, List<Filter> filter) {
         this.type = type;
         this.table = table;
         this.filter = filter;

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

@@ -7,7 +7,7 @@ import org.dbsyncer.connector.config.*;
 import org.dbsyncer.connector.enums.OperationEnum;
 import org.dbsyncer.connector.enums.SetterEnum;
 import org.dbsyncer.connector.enums.SqlBuilderEnum;
-import org.dbsyncer.connector.template.CommandTemplate;
+import org.dbsyncer.connector.config.CommandConfig;
 import org.dbsyncer.connector.util.DatabaseUtil;
 import org.dbsyncer.connector.util.JDBCUtil;
 import org.slf4j.Logger;
@@ -85,13 +85,13 @@ public abstract class AbstractDatabaseConnector implements Database {
     }
 
     @Override
-    public Map<String, String> getSourceCommand(CommandTemplate commandTemplate) {
+    public Map<String, String> getSourceCommand(CommandConfig commandConfig) {
         // 获取过滤SQL
-        List<Filter> filter = commandTemplate.getFilter();
+        List<Filter> filter = commandConfig.getFilter();
         String queryFilterSql = getQueryFilterSql(filter);
 
         // 获取查询SQL
-        Table table = commandTemplate.getTable();
+        Table table = commandConfig.getTable();
         String type = SqlBuilderEnum.QUERY.getName();
         String querySql = getQuerySql(type, table, queryFilterSql);
         Map<String, String> map = new HashMap<>();
@@ -100,10 +100,10 @@ public abstract class AbstractDatabaseConnector implements Database {
     }
 
     @Override
-    public Map<String, String> getTargetCommand(CommandTemplate commandTemplate) {
+    public Map<String, String> getTargetCommand(CommandConfig commandConfig) {
         // 获取增删改SQL
         Map<String, String> map = new HashMap<>();
-        Table table = commandTemplate.getTable();
+        Table table = commandConfig.getTable();
 
         String insert = SqlBuilderEnum.INSERT.getName();
         map.put(insert, getQuerySql(insert, table, null));

+ 3 - 3
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.connector.template.CommandTemplate;
+import org.dbsyncer.connector.config.CommandConfig;
 import org.dbsyncer.connector.config.ConnectorConfig;
 import org.dbsyncer.connector.config.LdapConfig;
 import org.dbsyncer.connector.config.MetaInfo;
@@ -45,12 +45,12 @@ public final class LdapConnector implements Ldap {
 	}
 
 	@Override
-	public Map<String, String> getSourceCommand(CommandTemplate commandTemplate) {
+	public Map<String, String> getSourceCommand(CommandConfig commandConfig) {
 		return null;
 	}
 
 	@Override
-	public Map<String, String> getTargetCommand(CommandTemplate commandTemplate) {
+	public Map<String, String> getTargetCommand(CommandConfig commandConfig) {
 		return null;
 	}
 

+ 3 - 3
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.connector.template.CommandTemplate;
+import org.dbsyncer.connector.config.CommandConfig;
 import org.dbsyncer.connector.config.ConnectorConfig;
 import org.dbsyncer.connector.config.MetaInfo;
 import org.dbsyncer.connector.config.RedisConfig;
@@ -50,12 +50,12 @@ public final class RedisConnector implements Redis {
     }
 
     @Override
-    public Map<String, String> getSourceCommand(CommandTemplate commandTemplate) {
+    public Map<String, String> getSourceCommand(CommandConfig commandConfig) {
         return null;
     }
 
     @Override
-    public Map<String, String> getTargetCommand(CommandTemplate commandTemplate) {
+    public Map<String, String> getTargetCommand(CommandConfig commandConfig) {
         return null;
     }
 

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

@@ -10,7 +10,7 @@ import org.dbsyncer.connector.config.Table;
 import org.dbsyncer.connector.enums.ConnectorEnum;
 import org.dbsyncer.connector.enums.FilterEnum;
 import org.dbsyncer.connector.enums.OperationEnum;
-import org.dbsyncer.connector.template.CommandTemplate;
+import org.dbsyncer.connector.config.CommandConfig;
 import org.dbsyncer.parser.enums.ConvertEnum;
 import org.dbsyncer.parser.model.Connector;
 import org.dbsyncer.parser.model.FieldMapping;
@@ -82,10 +82,10 @@ public class ParserFactory implements Parser {
             sTable.getColumn().add(m.getSource());
             tTable.getColumn().add(m.getTarget());
         });
-        final CommandTemplate sourceCmdTemplate = new CommandTemplate(sType, sTable, tableGroup.getFilter());
-        final CommandTemplate targetCmdTemplate = new CommandTemplate(tType, tTable);
+        final CommandConfig sourceConfig = new CommandConfig(sType, sTable, tableGroup.getFilter());
+        final CommandConfig targetConfig = new CommandConfig(tType, tTable);
         // 获取连接器同步参数
-        Map<String, String> command = connectorFactory.getCommand(sourceCmdTemplate, targetCmdTemplate);
+        Map<String, String> command = connectorFactory.getCommand(sourceConfig, targetConfig);
         return command;
     }