2.0.0项目初始化

datax-common/datax-common-database/src/main/java/cn/datax/common/database/QueryFactory.java

-package cn.datax.common.database;
-
-import cn.datax.common.database.constants.DbType;
-import cn.datax.common.database.query.QueryRegistry;
-
-public class QueryFactory {
-
-    private static final QueryRegistry QUERY_REGISTRY = new QueryRegistry();
-
-    public static DbQuery getQuery(DbType dbType) {
-        return QUERY_REGISTRY.getQuery(dbType);
-    }
-}

datax-common/datax-common-database/src/main/java/cn/datax/common/database/datasource/AbstractDataSourceFactory.java

@@ -4,7 +4,7 @@ import cn.datax.common.database.*;
 import cn.datax.common.database.constants.DbQueryProperty;
 import cn.datax.common.database.constants.DbType;
 import cn.datax.common.database.exception.DataQueryException;
-import cn.datax.common.database.query.AbstractDbQuery;
+import cn.datax.common.database.query.DbQueryTemplate;
 import com.zaxxer.hikari.HikariDataSource;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.util.StringUtils;
@@ -24,10 +24,10 @@ public abstract class AbstractDataSourceFactory implements DataSourceFactory {
 
     public DbQuery createDbQueryTemplate(DataSource dataSource, DbType dbType) {
         DbDialect dbDialect = DialectFactory.getDialect(dbType);
-        AbstractDbQuery dbQuery = (AbstractDbQuery) QueryFactory.getQuery(dbType);
-        if(dbQuery == null){
+        if(dbDialect == null){
             throw new DataQueryException("该数据库类型正在开发中");
         }
+        DbQueryTemplate dbQuery = new DbQueryTemplate();
         dbQuery.setDataSource(dataSource);
         dbQuery.setJdbcTemplate(new JdbcTemplate(dataSource));
         dbQuery.setDbDialect(dbDialect);

datax-common/datax-common-database/src/main/java/cn/datax/common/database/query/AbstractDbQuery.java → datax-common/datax-common-database/src/main/java/cn/datax/common/database/query/DbQueryTemplate.java

@@ -17,7 +17,7 @@ import java.util.List;
 import java.util.Map;
 
 @Setter
-public abstract class AbstractDbQuery implements DbQuery {
+public class DbQueryTemplate implements DbQuery {
 
     protected DataSource dataSource;
 

datax-common/datax-common-database/src/main/java/cn/datax/common/database/query/MariaDBQuery.java

-package cn.datax.common.database.query;
-
-public class MariaDBQuery extends AbstractDbQuery {
-}

datax-common/datax-common-database/src/main/java/cn/datax/common/database/query/MySqlQuery.java

-package cn.datax.common.database.query;
-
-public class MySqlQuery extends AbstractDbQuery {
-}

datax-common/datax-common-database/src/main/java/cn/datax/common/database/query/Oracle12cQuery.java

-package cn.datax.common.database.query;
-
-public class Oracle12cQuery extends AbstractDbQuery {
-}

datax-common/datax-common-database/src/main/java/cn/datax/common/database/query/OracleQuery.java

-package cn.datax.common.database.query;
-
-public class OracleQuery extends AbstractDbQuery {
-}

datax-common/datax-common-database/src/main/java/cn/datax/common/database/query/PostgreQuery.java

-package cn.datax.common.database.query;
-
-public class PostgreQuery extends AbstractDbQuery {
-}

datax-common/datax-common-database/src/main/java/cn/datax/common/database/query/QueryRegistry.java

-package cn.datax.common.database.query;
-
-import cn.datax.common.database.DbQuery;
-import cn.datax.common.database.constants.DbType;
-
-import java.util.EnumMap;
-import java.util.Map;
-
-public class QueryRegistry {
-
-    private final Map<DbType, DbQuery> query_enum_map = new EnumMap<>(DbType.class);
-
-    public QueryRegistry() {
-        query_enum_map.put(DbType.MARIADB, new MariaDBQuery());
-        query_enum_map.put(DbType.MYSQL, new MySqlQuery());
-        query_enum_map.put(DbType.ORACLE_12C, new Oracle12cQuery());
-        query_enum_map.put(DbType.ORACLE, new OracleQuery());
-        query_enum_map.put(DbType.POSTGRE_SQL, new PostgreQuery());
-        query_enum_map.put(DbType.SQL_SERVER2008, new SQLServer2008Query());
-        query_enum_map.put(DbType.SQL_SERVER, new SQLServerQuery());
-        query_enum_map.put(DbType.OTHER, new UnknownQuery());
-    }
-
-    public DbQuery getQuery(DbType dbType) {
-        return query_enum_map.get(dbType);
-    }
-}

datax-common/datax-common-database/src/main/java/cn/datax/common/database/query/SQLServer2008Query.java

-package cn.datax.common.database.query;
-
-public class SQLServer2008Query extends AbstractDbQuery {
-}

datax-common/datax-common-database/src/main/java/cn/datax/common/database/query/SQLServerQuery.java

-package cn.datax.common.database.query;
-
-public class SQLServerQuery extends AbstractDbQuery {
-}

datax-common/datax-common-database/src/main/java/cn/datax/common/database/query/UnknownQuery.java

-package cn.datax.common.database.query;
-
-public class UnknownQuery extends AbstractDbQuery {
-}