rm not used

dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/impl/connector/AbstractDataBaseConfigChecker.java

@@ -39,4 +39,10 @@ public abstract class AbstractDataBaseConfigChecker implements ConnectorConfigCh
         connectorConfig.setTable(table);
     }
 
+    protected void modifySchema(DatabaseConfig connectorConfig, Map<String, String> params) {
+        String schema = params.get("schema");
+        Assert.hasText(schema, "Schema is empty.");
+        connectorConfig.setSchema(schema);
+    }
+
 }

dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/impl/connector/DqlSqlServerConfigChecker.java

@@ -1,9 +1,7 @@
 package org.dbsyncer.biz.checker.impl.connector;
 
 import org.dbsyncer.connector.config.DatabaseConfig;
-import org.dbsyncer.connector.config.SqlServerDatabaseConfig;
 import org.springframework.stereotype.Component;
-import org.springframework.util.Assert;
 
 import java.util.Map;
 
@@ -19,10 +17,6 @@ public class DqlSqlServerConfigChecker extends AbstractDataBaseConfigChecker {
     public void modify(DatabaseConfig connectorConfig, Map<String, String> params) {
         super.modify(connectorConfig, params);
         super.modifyDql(connectorConfig, params);
-        String schema = params.get("schema");
-        Assert.hasText(schema, "Schema is empty.");
-
-        SqlServerDatabaseConfig config = (SqlServerDatabaseConfig) connectorConfig;
-        config.setSchema(schema);
+        super.modifySchema(connectorConfig, params);
     }
 }

dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/impl/connector/PostgreSQLConfigChecker.java

@@ -1,9 +1,7 @@
 package org.dbsyncer.biz.checker.impl.connector;
 
 import org.dbsyncer.connector.config.DatabaseConfig;
-import org.dbsyncer.connector.config.PostgreSQLConfig;
 import org.springframework.stereotype.Component;
-import org.springframework.util.Assert;
 
 import java.util.Map;
 
@@ -17,10 +15,6 @@ public class PostgreSQLConfigChecker extends AbstractDataBaseConfigChecker {
     @Override
     public void modify(DatabaseConfig connectorConfig, Map<String, String> params) {
         super.modify(connectorConfig, params);
-        String schema = params.get("schema");
-        Assert.hasText(schema, "Schema is empty.");
-
-        PostgreSQLConfig config = (PostgreSQLConfig) connectorConfig;
-        config.setSchema(schema);
+        super.modifySchema(connectorConfig, params);
     }
 }

dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/impl/connector/SqlServerConfigChecker.java

@@ -1,9 +1,7 @@
 package org.dbsyncer.biz.checker.impl.connector;
 
 import org.dbsyncer.connector.config.DatabaseConfig;
-import org.dbsyncer.connector.config.SqlServerDatabaseConfig;
 import org.springframework.stereotype.Component;
-import org.springframework.util.Assert;
 
 import java.util.Map;
 
@@ -17,10 +15,6 @@ public class SqlServerConfigChecker extends AbstractDataBaseConfigChecker {
     @Override
     public void modify(DatabaseConfig connectorConfig, Map<String, String> params) {
         super.modify(connectorConfig, params);
-        String schema = params.get("schema");
-        Assert.hasText(schema, "Schema is empty.");
-
-        SqlServerDatabaseConfig config = (SqlServerDatabaseConfig) connectorConfig;
-        config.setSchema(schema);
+        super.modifySchema(connectorConfig, params);
     }
 }

dbsyncer-connector/src/main/java/org/dbsyncer/connector/config/DatabaseConfig.java

@@ -26,49 +26,47 @@ public class DatabaseConfig extends ConnectorConfig {
     // 通过SQL获取表信息
     private String sql;
 
+    // 构架名
+    private String schema;
+
     public String getDriverClassName() {
         return driverClassName;
     }
 
-    public DatabaseConfig setDriverClassName(String driverClassName) {
+    public void setDriverClassName(String driverClassName) {
         this.driverClassName = driverClassName;
-        return this;
     }
 
     public String getUrl() {
         return url;
     }
 
-    public DatabaseConfig setUrl(String url) {
+    public void setUrl(String url) {
         this.url = url;
-        return this;
     }
 
     public String getUsername() {
         return username;
     }
 
-    public DatabaseConfig setUsername(String username) {
+    public void setUsername(String username) {
         this.username = username;
-        return this;
     }
 
     public String getPassword() {
         return password;
     }
 
-    public DatabaseConfig setPassword(String password) {
+    public void setPassword(String password) {
         this.password = password;
-        return this;
     }
 
     public String getTable() {
         return table;
     }
 
-    public DatabaseConfig setTable(String table) {
+    public void setTable(String table) {
         this.table = table;
-        return this;
     }
 
     public String getSql() {
@@ -79,4 +77,11 @@ public class DatabaseConfig extends ConnectorConfig {
         this.sql = sql;
     }
 
+    public String getSchema() {
+        return schema;
+    }
+
+    public void setSchema(String schema) {
+        this.schema = schema;
+    }
 }

dbsyncer-connector/src/main/java/org/dbsyncer/connector/config/PostgreSQLConfig.java

@@ -1,22 +0,0 @@
-package org.dbsyncer.connector.config;
-
-/**
- * PostgreSQL连接配置
- *
- * @author AE86
- * @version 1.0.0
- * @date 2022/4/5 23:57
- */
-public class PostgreSQLConfig extends DatabaseConfig {
-
-    // 构架名
-    private String schema;
-
-    public String getSchema() {
-        return schema;
-    }
-
-    public void setSchema(String schema) {
-        this.schema = schema;
-    }
-}

dbsyncer-connector/src/main/java/org/dbsyncer/connector/config/SqlServerDatabaseConfig.java

@@ -1,22 +0,0 @@
-package org.dbsyncer.connector.config;
-
-/**
- * SqlServer连接配置
- *
- * @author AE86
- * @version 1.0.0
- * @date 2022/1/10 23:57
- */
-public class SqlServerDatabaseConfig extends DatabaseConfig {
-
-    // 构架名
-    private String schema;
-
-    public String getSchema() {
-        return schema;
-    }
-
-    public void setSchema(String schema) {
-        this.schema = schema;
-    }
-}

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

@@ -26,12 +26,12 @@ import java.sql.*;
 import java.util.*;
 import java.util.stream.Collectors;
 
-public abstract class AbstractDatabaseConnector<Config> extends AbstractConnector
+public abstract class AbstractDatabaseConnector extends AbstractConnector
         implements Connector<DatabaseConnectorMapper, DatabaseConfig>, Database {
 
     private final Logger logger = LoggerFactory.getLogger(getClass());
 
-    protected abstract String getTableSql(Config config);
+    protected abstract String getTableSql(DatabaseConfig config);
 
     @Override
     public ConnectorMapper connect(DatabaseConfig config) {
@@ -61,7 +61,7 @@ public abstract class AbstractDatabaseConnector<Config> extends AbstractConnecto
 
     @Override
     public List<Table> getTable(DatabaseConnectorMapper connectorMapper) {
-        String sql = getTableSql((Config) connectorMapper.getConfig());
+        String sql = getTableSql(connectorMapper.getConfig());
         List<String> tableNames = connectorMapper.execute(databaseTemplate -> databaseTemplate.queryForList(sql, String.class));
         if (!CollectionUtils.isEmpty(tableNames)) {
             return tableNames.stream().map(name -> new Table(name)).collect(Collectors.toList());

dbsyncer-connector/src/main/java/org/dbsyncer/connector/enums/ConnectorEnum.java

@@ -3,7 +3,9 @@ package org.dbsyncer.connector.enums;
 import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.connector.Connector;
 import org.dbsyncer.connector.ConnectorException;
-import org.dbsyncer.connector.config.*;
+import org.dbsyncer.connector.config.DatabaseConfig;
+import org.dbsyncer.connector.config.ESConfig;
+import org.dbsyncer.connector.config.KafkaConfig;
 import org.dbsyncer.connector.es.ESConnector;
 import org.dbsyncer.connector.kafka.KafkaConnector;
 import org.dbsyncer.connector.mysql.MysqlConnector;
@@ -34,11 +36,11 @@ public enum ConnectorEnum {
     /**
      * SqlServer 连接器
      */
-    SQL_SERVER("SqlServer", new SqlServerConnector(), SqlServerDatabaseConfig.class),
+    SQL_SERVER("SqlServer", new SqlServerConnector(), DatabaseConfig.class),
     /**
      * PostgreSQL 连接器
      */
-    PostgreSQL("PostgreSQL", new PostgreSQLConnector(), PostgreSQLConfig.class),
+    PostgreSQL("PostgreSQL", new PostgreSQLConnector(), DatabaseConfig.class),
     /**
      * Elasticsearch 连接器
      */
@@ -58,7 +60,7 @@ public enum ConnectorEnum {
     /**
      * DqlSqlServer 连接器
      */
-    DQL_SQL_SERVER("DqlSqlServer", new DQLSqlServerConnector(), SqlServerDatabaseConfig.class);
+    DQL_SQL_SERVER("DqlSqlServer", new DQLSqlServerConnector(), DatabaseConfig.class);
 
     // 连接器名称
     private String type;

dbsyncer-connector/src/main/java/org/dbsyncer/connector/mysql/MysqlConnector.java

@@ -5,7 +5,7 @@ import org.dbsyncer.connector.config.PageSqlConfig;
 import org.dbsyncer.connector.constant.DatabaseConstant;
 import org.dbsyncer.connector.database.AbstractDatabaseConnector;
 
-public final class MysqlConnector extends AbstractDatabaseConnector<DatabaseConfig> {
+public final class MysqlConnector extends AbstractDatabaseConnector {
 
     @Override
     protected String getTableSql(DatabaseConfig config) {

dbsyncer-connector/src/main/java/org/dbsyncer/connector/oracle/OracleConnector.java

@@ -13,7 +13,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-public final class OracleConnector extends AbstractDatabaseConnector<DatabaseConfig> {
+public final class OracleConnector extends AbstractDatabaseConnector {
 
     @Override
     protected String getTableSql(DatabaseConfig config) {

dbsyncer-connector/src/main/java/org/dbsyncer/connector/postgresql/PostgreSQLConnector.java

@@ -1,8 +1,8 @@
 package org.dbsyncer.connector.postgresql;
 
 import org.dbsyncer.common.util.CollectionUtils;
+import org.dbsyncer.connector.config.DatabaseConfig;
 import org.dbsyncer.connector.config.PageSqlConfig;
-import org.dbsyncer.connector.config.PostgreSQLConfig;
 import org.dbsyncer.connector.config.Table;
 import org.dbsyncer.connector.constant.DatabaseConstant;
 import org.dbsyncer.connector.database.AbstractDatabaseConnector;
@@ -12,17 +12,17 @@ import org.dbsyncer.connector.enums.TableTypeEnum;
 import java.util.LinkedList;
 import java.util.List;
 
-public final class PostgreSQLConnector extends AbstractDatabaseConnector<PostgreSQLConfig> {
+public final class PostgreSQLConnector extends AbstractDatabaseConnector {
 
     @Override
-    protected String getTableSql(PostgreSQLConfig config) {
+    protected String getTableSql(DatabaseConfig config) {
         return String.format("SELECT TABLENAME FROM PG_TABLES WHERE SCHEMANAME ='%s'", config.getSchema());
     }
 
     @Override
     public List<Table> getTable(DatabaseConnectorMapper connectorMapper) {
         List<Table> list = new LinkedList<>();
-        PostgreSQLConfig config = (PostgreSQLConfig) connectorMapper.getConfig();
+        DatabaseConfig config = connectorMapper.getConfig();
         List<String> tableNames = connectorMapper.execute(databaseTemplate -> databaseTemplate.queryForList(getTableSql(config), String.class));
         if (!CollectionUtils.isEmpty(tableNames)) {
             tableNames.forEach(name -> list.add(new Table(name, TableTypeEnum.TABLE.getCode())));
@@ -49,7 +49,7 @@ public final class PostgreSQLConnector extends AbstractDatabaseConnector<Postgre
         return "\"";
     }
 
-    private String getTableViewSql(PostgreSQLConfig config) {
+    private String getTableViewSql(DatabaseConfig config) {
         return String.format("SELECT VIEWNAME FROM PG_VIEWS WHERE SCHEMANAME ='%s'", config.getSchema());
     }
 }

dbsyncer-connector/src/main/java/org/dbsyncer/connector/sql/DQLMysqlConnector.java

@@ -8,7 +8,7 @@ import org.dbsyncer.connector.database.DatabaseConnectorMapper;
 import java.util.List;
 import java.util.Map;
 
-public final class DQLMysqlConnector extends AbstractDatabaseConnector<DatabaseConfig> {
+public final class DQLMysqlConnector extends AbstractDatabaseConnector {
 
     @Override
     protected String getTableSql(DatabaseConfig config) {

dbsyncer-connector/src/main/java/org/dbsyncer/connector/sql/DQLOracleConnector.java

@@ -8,7 +8,7 @@ import org.dbsyncer.connector.database.DatabaseConnectorMapper;
 import java.util.List;
 import java.util.Map;
 
-public final class DQLOracleConnector extends AbstractDatabaseConnector<DatabaseConfig> {
+public final class DQLOracleConnector extends AbstractDatabaseConnector {
 
     @Override
     protected String getTableSql(DatabaseConfig config) {

dbsyncer-connector/src/main/java/org/dbsyncer/connector/sql/DQLSqlServerConnector.java

@@ -14,7 +14,7 @@ import org.slf4j.LoggerFactory;
 import java.util.List;
 import java.util.Map;
 
-public final class DQLSqlServerConnector extends AbstractDatabaseConnector<SqlServerDatabaseConfig> {
+public final class DQLSqlServerConnector extends AbstractDatabaseConnector {
 
     private final Logger logger = LoggerFactory.getLogger(getClass());
 
@@ -29,7 +29,7 @@ public final class DQLSqlServerConnector extends AbstractDatabaseConnector<SqlSe
     }
 
     @Override
-    protected String getTableSql(SqlServerDatabaseConfig config) {
+    protected String getTableSql(DatabaseConfig config) {
         return String.format("SELECT NAME FROM SYS.TABLES WHERE SCHEMA_ID = SCHEMA_ID('%s')", config.getSchema());
     }
 

dbsyncer-connector/src/main/java/org/dbsyncer/connector/sqlserver/SqlServerConnector.java

@@ -3,7 +3,10 @@ package org.dbsyncer.connector.sqlserver;
 import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.connector.ConnectorException;
 import org.dbsyncer.connector.ConnectorMapper;
-import org.dbsyncer.connector.config.*;
+import org.dbsyncer.connector.config.CommandConfig;
+import org.dbsyncer.connector.config.DatabaseConfig;
+import org.dbsyncer.connector.config.PageSqlConfig;
+import org.dbsyncer.connector.config.Table;
 import org.dbsyncer.connector.constant.ConnectorConstant;
 import org.dbsyncer.connector.constant.DatabaseConstant;
 import org.dbsyncer.connector.database.AbstractDatabaseConnector;
@@ -13,7 +16,7 @@ import org.slf4j.LoggerFactory;
 import java.util.HashMap;
 import java.util.Map;
 
-public final class SqlServerConnector extends AbstractDatabaseConnector<SqlServerDatabaseConfig> {
+public final class SqlServerConnector extends AbstractDatabaseConnector {
 
     private final Logger logger = LoggerFactory.getLogger(getClass());
 
@@ -28,7 +31,7 @@ public final class SqlServerConnector extends AbstractDatabaseConnector<SqlServe
     }
 
     @Override
-    protected String getTableSql(SqlServerDatabaseConfig config) {
+    protected String getTableSql(DatabaseConfig config) {
         return String.format("SELECT NAME FROM SYS.TABLES WHERE SCHEMA_ID = SCHEMA_ID('%s') AND IS_MS_SHIPPED = 0", config.getSchema());
     }
 
@@ -63,7 +66,7 @@ public final class SqlServerConnector extends AbstractDatabaseConnector<SqlServe
         if (StringUtil.isNotBlank(queryFilterSql)) {
             queryCount.append("SELECT COUNT(*) FROM ").append(table.getName()).append(queryFilterSql);
         } else {
-            SqlServerDatabaseConfig cfg = (SqlServerDatabaseConfig) commandConfig.getConnectorConfig();
+            DatabaseConfig cfg = (DatabaseConfig) commandConfig.getConnectorConfig();
             // 从存储过程查询（定时更新总数，可能存在误差）
             queryCount.append("SELECT ROWS FROM SYSINDEXES WHERE ID = OBJECT_ID('").append(cfg.getSchema()).append(".").append(table.getName()).append(
                     "') AND INDID IN (0, 1)");

dbsyncer-listener/src/main/java/org/dbsyncer/listener/sqlserver/SqlServerExtractor.java

@@ -5,7 +5,6 @@ import org.dbsyncer.common.event.RowChangedEvent;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.common.util.RandomUtil;
 import org.dbsyncer.connector.config.DatabaseConfig;
-import org.dbsyncer.connector.config.SqlServerDatabaseConfig;
 import org.dbsyncer.connector.constant.ConnectorConstant;
 import org.dbsyncer.connector.database.DatabaseConnectorMapper;
 import org.dbsyncer.listener.AbstractExtractor;
@@ -121,7 +120,7 @@ public class SqlServerExtractor extends AbstractExtractor {
     }
 
     private void connect() {
-        SqlServerDatabaseConfig cfg = (SqlServerDatabaseConfig) connectorConfig;
+        DatabaseConfig cfg = (DatabaseConfig) connectorConfig;
         if (connectorFactory.isAlive(cfg)) {
             connectorMapper = (DatabaseConnectorMapper) connectorFactory.connect(cfg);
             serverName = cfg.getUrl();

dbsyncer-web/src/main/resources/public/mapping/editTable.html

@@ -9,7 +9,8 @@
             <label class="col-sm-3 control-label text-right">数据源表</label>
             <div class="col-sm-9">
                 <select id="sourceTable" class="form-control select-control-table" multiple="multiple">
-                    <option th:each="t,s:${mapping?.sourceConnector?.table}" th:value="${t?.name}" th:text="${t?.name}" />
+                    <option th:each="t,s:${mapping?.sourceConnector?.table}" th:text="${t?.name} + ' ('+${t?.type}+')'"
+                            th:value="${t?.name}"/>
                 </select>
             </div>
         </div>
@@ -23,7 +24,8 @@
                 <label class="col-sm-3 control-label text-right">目标源表</label>
                 <div class="col-sm-9">
                     <select id="targetTable" class="form-control select-control-table" multiple="multiple">
-                        <option th:each="t,s:${mapping?.targetConnector?.table}" th:value="${t?.name}" th:text="${t?.name}" />
+                        <option th:each="t,s:${mapping?.targetConnector?.table}"
+                                th:text="${t?.name} + ' ('+${t?.type}+')'" th:value="${t?.name}"/>
                     </select>
                 </div>
             </div>