This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 989f12e Rename TypedDataSourceCreator to JDBCDataSourceCreator
(#14058)
989f12e is described below
commit 989f12e4b8ef843f2bcb3d1a1d54be6248639fc5
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Dec 12 11:20:12 2021 +0800
Rename TypedDataSourceCreator to JDBCDataSourceCreator (#14058)
---
.../datasource/JDBCParameterDecoratorHelper.java | 3 ++-
.../config/JDBCDataSourceConfiguration.java} | 22 ++++++++---------
.../JDBCDataSourceConfigurationWrapper.java} | 13 ++++++----
.../ShardingSphereJDBCDataSourceConfiguration.java | 5 ++--
.../impl}/StandardJDBCDataSourceConfiguration.java | 5 ++--
.../creator/JDBCDataSourceCreator.java} | 10 ++++----
.../impl/StandardJDBCDataSourceCreator.java} | 9 +++----
....datasource.jdbc.creator.JDBCDataSourceCreator} | 2 +-
...rdingSphereJDBCDataSourceConfigurationTest.java | 2 +-
.../StandardJDBCDataSourceConfigurationTest.java | 2 +-
...va => ShardingSphereJDBCDataSourceCreator.java} | 8 +++----
....datasource.jdbc.creator.JDBCDataSourceCreator} | 2 +-
.../core/datasource/DataSourceFactory.java | 4 ++--
.../core/datasource/DataSourceManager.java | 14 +++++------
.../core/ingest/config/DumperConfiguration.java | 4 ++--
.../ingest/dumper/AbstractInventoryDumper.java | 6 ++---
.../mysql/ingest/MySQLIncrementalDumper.java | 2 +-
.../mysql/ingest/MySQLIncrementalDumperTest.java | 2 +-
.../pipeline/mysql/ingest/MySQLJdbcDumperTest.java | 2 +-
.../opengauss/ingest/OpenGaussWalDumper.java | 2 +-
.../ingest/wal/OpenGaussLogicalReplication.java | 2 +-
.../postgresql/ingest/PostgreSQLWalDumper.java | 2 +-
.../postgresql/ingest/wal/LogicalReplication.java | 2 +-
.../ingest/PostgreSQLJdbcDumperTest.java | 2 +-
.../postgresql/ingest/PostgreSQLWalDumperTest.java | 2 +-
.../ingest/wal/LogicalReplicationTest.java | 2 +-
.../ingest/wal/WalEventConverterTest.java | 2 +-
.../migration/common/api/ScalingWorker.java | 2 +-
.../scaling/core/api/DataCalculateParameter.java | 4 ++--
.../impl/AbstractSingleTableDataCalculator.java | 4 ++--
.../scaling/core/api/impl/ScalingAPIImpl.java | 4 ++--
.../scaling/core/config/ImporterConfiguration.java | 4 ++--
.../scaling/core/config/RuleConfiguration.java | 18 +++++++-------
.../consistency/DataConsistencyCheckerImpl.java | 12 +++++-----
.../core/job/preparer/ScalingJobPreparer.java | 4 ++--
.../ShardingRuleJobConfigurationPreparer.java | 12 +++++-----
.../executor/importer/AbstractImporterTest.java | 4 ++--
.../job/check/DataConsistencyCheckerImplTest.java | 4 ++--
.../scaling/core/util/ResourceUtil.java | 4 ++--
.../component/MySQLDataSourcePreparerTest.java | 28 +++++++++++-----------
.../scaling/mysql/component/MySQLImporterTest.java | 4 ++--
.../checker/OpenGaussDataSourcePreparer.java | 2 +-
.../test/mysql/env/config/SourceConfiguration.java | 2 +-
.../test/mysql/env/config/TargetConfiguration.java | 7 ++----
44 files changed, 129 insertions(+), 123 deletions(-)
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/JDBCParameterDecoratorHelper.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/JDBCParameterDecoratorHelper.java
index 2725a0b..81cb19b 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/JDBCParameterDecoratorHelper.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/JDBCParameterDecoratorHelper.java
@@ -26,13 +26,14 @@ import java.util.Optional;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class JDBCParameterDecoratorHelper {
+
/**
* Decorate data source.
*
* @param dataSource data source to be decorated
* @return decorated data source
*/
- @SuppressWarnings("rawtypes")
+ @SuppressWarnings({"rawtypes", "unchecked"})
public static DataSource decorate(final DataSource dataSource) {
Optional<JDBCParameterDecorator> decorator =
ShardingSphereServiceLoader
.getSingletonServiceInstances(JDBCParameterDecorator.class)
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/typed/TypedDataSourceConfiguration.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/jdbc/config/JDBCDataSourceConfiguration.java
similarity index 75%
rename from
shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/typed/TypedDataSourceConfiguration.java
rename to
shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/jdbc/config/JDBCDataSourceConfiguration.java
index 1473dd1..17d3a98 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/typed/TypedDataSourceConfiguration.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/jdbc/config/JDBCDataSourceConfiguration.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.config.datasource.typed;
+package org.apache.shardingsphere.infra.config.datasource.jdbc.config;
import com.google.common.base.Preconditions;
-import
org.apache.shardingsphere.infra.config.datasource.typed.creator.TypedDataSourceCreator;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.creator.JDBCDataSourceCreator;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.spi.ShardingSphereServiceLoader;
import org.apache.shardingsphere.spi.typed.TypedSPIRegistry;
@@ -30,12 +30,12 @@ import java.util.Objects;
import java.util.Optional;
/**
- * Typed data source configuration.
+ * JDBC data source configuration.
*/
-public abstract class TypedDataSourceConfiguration {
+public abstract class JDBCDataSourceConfiguration {
static {
- ShardingSphereServiceLoader.register(TypedDataSourceCreator.class);
+ ShardingSphereServiceLoader.register(JDBCDataSourceCreator.class);
}
/**
@@ -86,7 +86,7 @@ public abstract class TypedDataSourceConfiguration {
if (null == obj || getClass() != obj.getClass()) {
return false;
}
- TypedDataSourceConfiguration that = (TypedDataSourceConfiguration) obj;
+ JDBCDataSourceConfiguration that = (JDBCDataSourceConfiguration) obj;
return Objects.equals(getType(), that.getType()) &&
Objects.equals(getParameter(), that.getParameter());
}
@@ -95,8 +95,8 @@ public abstract class TypedDataSourceConfiguration {
*
* @return typed data source configuration wrap
*/
- public TypedDataSourceConfigurationWrap wrap() {
- TypedDataSourceConfigurationWrap result = new
TypedDataSourceConfigurationWrap();
+ public JDBCDataSourceConfigurationWrapper wrap() {
+ JDBCDataSourceConfigurationWrapper result = new
JDBCDataSourceConfigurationWrapper();
result.setType(getType());
result.setParameter(getParameter());
return result;
@@ -110,8 +110,8 @@ public abstract class TypedDataSourceConfiguration {
*/
public DataSource toDataSource() throws SQLException {
String type = getType();
- Optional<TypedDataSourceCreator> creatorOptional =
TypedSPIRegistry.findRegisteredService(TypedDataSourceCreator.class, type,
null);
- Preconditions.checkArgument(creatorOptional.isPresent(), "Unsupported
data source type '%s'", type);
- return creatorOptional.get().createDataSource(getParameter(),
getDataSourceConfiguration());
+ Optional<JDBCDataSourceCreator> creator =
TypedSPIRegistry.findRegisteredService(JDBCDataSourceCreator.class, type, null);
+ Preconditions.checkArgument(creator.isPresent(), "Unsupported data
source type '%s'", type);
+ return creator.get().createDataSource(getParameter(),
getDataSourceConfiguration());
}
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/typed/TypedDataSourceConfigurationWrap.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/jdbc/config/JDBCDataSourceConfigurationWrapper.java
similarity index 77%
rename from
shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/typed/TypedDataSourceConfigurationWrap.java
rename to
shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/jdbc/config/JDBCDataSourceConfigurationWrapper.java
index 35dc3c7..d993852 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/typed/TypedDataSourceConfigurationWrap.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/jdbc/config/JDBCDataSourceConfigurationWrapper.java
@@ -15,19 +15,24 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.config.datasource.typed;
+package org.apache.shardingsphere.infra.config.datasource.jdbc.config;
import com.google.common.base.Preconditions;
import lombok.Getter;
import lombok.Setter;
import lombok.SneakyThrows;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.impl.ShardingSphereJDBCDataSourceConfiguration;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.impl.StandardJDBCDataSourceConfiguration;
import java.util.HashMap;
import java.util.Map;
+/**
+ * JDBC data source configuration wrapper.
+ */
@Getter
@Setter
-public final class TypedDataSourceConfigurationWrap {
+public final class JDBCDataSourceConfigurationWrapper {
private String type;
@@ -39,10 +44,10 @@ public final class TypedDataSourceConfigurationWrap {
* @return typed data source configuration
*/
@SneakyThrows(ReflectiveOperationException.class)
- public TypedDataSourceConfiguration unwrap() {
+ public JDBCDataSourceConfiguration unwrap() {
Map<String, Class<?>> classMap =
DataSourceConfigurationHolder.getInstances();
Preconditions.checkArgument(classMap.containsKey(type.toLowerCase()),
"Unsupported data source type '%s'", type);
- return (TypedDataSourceConfiguration)
classMap.get(type.toLowerCase()).getConstructor(String.class).newInstance(parameter);
+ return (JDBCDataSourceConfiguration)
classMap.get(type.toLowerCase()).getConstructor(String.class).newInstance(parameter);
}
private static class DataSourceConfigurationHolder {
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/typed/ShardingSphereJDBCDataSourceConfiguration.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/jdbc/config/impl/ShardingSphereJDBCDataSourceConfiguration.java
similarity index 95%
rename from
shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/typed/ShardingSphereJDBCDataSourceConfiguration.java
rename to
shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/jdbc/config/impl/ShardingSphereJDBCDataSourceConfiguration.java
index 54e2fb5..7e94395 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/typed/ShardingSphereJDBCDataSourceConfiguration.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/jdbc/config/impl/ShardingSphereJDBCDataSourceConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.config.datasource.typed;
+package org.apache.shardingsphere.infra.config.datasource.jdbc.config.impl;
import com.google.common.base.Preconditions;
import lombok.AllArgsConstructor;
@@ -24,6 +24,7 @@ import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import org.apache.shardingsphere.infra.config.datasource.JdbcUri;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.JDBCDataSourceConfiguration;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeRegistry;
import org.apache.shardingsphere.infra.yaml.config.pojo.YamlConfiguration;
@@ -41,7 +42,7 @@ import java.util.Map;
*/
@Getter
@EqualsAndHashCode(of = "parameter", callSuper = false)
-public final class ShardingSphereJDBCDataSourceConfiguration extends
TypedDataSourceConfiguration {
+public final class ShardingSphereJDBCDataSourceConfiguration extends
JDBCDataSourceConfiguration {
public static final String TYPE = "ShardingSphereJDBC";
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/typed/StandardJDBCDataSourceConfiguration.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/jdbc/config/impl/StandardJDBCDataSourceConfiguration.java
similarity index 94%
rename from
shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/typed/StandardJDBCDataSourceConfiguration.java
rename to
shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/jdbc/config/impl/StandardJDBCDataSourceConfiguration.java
index 6eed671..b3a4d0d 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/typed/StandardJDBCDataSourceConfiguration.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/jdbc/config/impl/StandardJDBCDataSourceConfiguration.java
@@ -15,13 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.config.datasource.typed;
+package org.apache.shardingsphere.infra.config.datasource.jdbc.config.impl;
import com.zaxxer.hikari.HikariConfig;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import
org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration;
import org.apache.shardingsphere.infra.config.datasource.JdbcUri;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.JDBCDataSourceConfiguration;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeRegistry;
import
org.apache.shardingsphere.infra.yaml.config.swapper.YamlDataSourceConfigurationSwapper;
@@ -34,7 +35,7 @@ import java.util.Map;
* Standard JDBC data source configuration.
*/
@EqualsAndHashCode(of = "parameter", callSuper = false)
-public final class StandardJDBCDataSourceConfiguration extends
TypedDataSourceConfiguration {
+public final class StandardJDBCDataSourceConfiguration extends
JDBCDataSourceConfiguration {
public static final String TYPE = "JDBC";
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/typed/creator/TypedDataSourceCreator.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/jdbc/creator/JDBCDataSourceCreator.java
similarity index 79%
rename from
shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/typed/creator/TypedDataSourceCreator.java
rename to
shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/jdbc/creator/JDBCDataSourceCreator.java
index 015c3b6..44ae70c 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/typed/creator/TypedDataSourceCreator.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/jdbc/creator/JDBCDataSourceCreator.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.config.datasource.typed.creator;
+package org.apache.shardingsphere.infra.config.datasource.jdbc.creator;
import org.apache.shardingsphere.spi.typed.TypedSPI;
@@ -23,15 +23,15 @@ import javax.sql.DataSource;
import java.sql.SQLException;
/**
- * Typed data source creator, SPI interface.
+ * JDBC data source creator.
*/
-public interface TypedDataSourceCreator extends TypedSPI {
+public interface JDBCDataSourceCreator extends TypedSPI {
/**
- * Create data source by data source configuration.
+ * Create data source.
*
* @param parameter data source configuration
- * @param dataSourceConfig configuration parsed from parameter
+ * @param dataSourceConfig data source configuration
* @return data source
* @throws SQLException if create data source failed
*/
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/typed/creator/StandardJDBCTypedDataSourceCreator.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/jdbc/creator/impl/StandardJDBCDataSourceCreator.java
similarity index 76%
rename from
shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/typed/creator/StandardJDBCTypedDataSourceCreator.java
rename to
shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/jdbc/creator/impl/StandardJDBCDataSourceCreator.java
index 04b45fa..4217591 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/typed/creator/StandardJDBCTypedDataSourceCreator.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/jdbc/creator/impl/StandardJDBCDataSourceCreator.java
@@ -15,18 +15,19 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.config.datasource.typed.creator;
+package org.apache.shardingsphere.infra.config.datasource.jdbc.creator.impl;
import
org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration;
import org.apache.shardingsphere.infra.config.datasource.DataSourceConverter;
-import
org.apache.shardingsphere.infra.config.datasource.typed.StandardJDBCDataSourceConfiguration;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.impl.StandardJDBCDataSourceConfiguration;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.creator.JDBCDataSourceCreator;
import javax.sql.DataSource;
/**
- * Standard JDBC typed data source creator.
+ * Standard JDBC data source creator.
*/
-public final class StandardJDBCTypedDataSourceCreator implements
TypedDataSourceCreator {
+public final class StandardJDBCDataSourceCreator implements
JDBCDataSourceCreator {
@Override
public DataSource createDataSource(final String parameter, final Object
dataSourceConfig) {
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.config.datasource.typed.creator.TypedDataSourceCreator
b/shardingsphere-infra/shardingsphere-infra-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.config.datasource.jdbc.creator.JDBCDataSourceCreator
similarity index 88%
rename from
shardingsphere-infra/shardingsphere-infra-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.config.datasource.typed.creator.TypedDataSourceCreator
rename to
shardingsphere-infra/shardingsphere-infra-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.config.datasource.jdbc.creator.JDBCDataSourceCreator
index a9aa71d..ae31bd0 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.config.datasource.typed.creator.TypedDataSourceCreator
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.config.datasource.jdbc.creator.JDBCDataSourceCreator
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.infra.config.datasource.typed.creator.StandardJDBCTypedDataSourceCreator
+org.apache.shardingsphere.infra.config.datasource.jdbc.creator.impl.StandardJDBCDataSourceCreator
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/datasource/typed/ShardingSphereJDBCDataSourceConfigurationTest.java
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/datasource/jdbc/config/impl/ShardingSphereJDBCDataSourceConfigurationTest.java
similarity index 97%
rename from
shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/datasource/typed/ShardingSphereJDBCDataSourceConfigurationTest.java
rename to
shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/datasource/jdbc/config/impl/ShardingSphereJDBCDataSourceConfigurationTest.java
index b4d5468..055432a 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/datasource/typed/ShardingSphereJDBCDataSourceConfigurationTest.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/datasource/jdbc/config/impl/ShardingSphereJDBCDataSourceConfigurationTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.config.datasource.typed;
+package org.apache.shardingsphere.infra.config.datasource.jdbc.config.impl;
import com.google.common.collect.ImmutableMap;
import
org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration;
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/datasource/typed/StandardJDBCDataSourceConfigurationTest.java
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/datasource/jdbc/config/impl/StandardJDBCDataSourceConfigurationTest.java
similarity index 97%
rename from
shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/datasource/typed/StandardJDBCDataSourceConfigurationTest.java
rename to
shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/datasource/jdbc/config/impl/StandardJDBCDataSourceConfigurationTest.java
index 223de05..6cda7e4 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/datasource/typed/StandardJDBCDataSourceConfigurationTest.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/datasource/jdbc/config/impl/StandardJDBCDataSourceConfigurationTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.config.datasource.typed;
+package org.apache.shardingsphere.infra.config.datasource.jdbc.config.impl;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableMap;
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/config/datasource/ShardingSphereJDBCTypedDataSourceCreator.java
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/config/datasource/ShardingSphereJDBCDataSourceCreator.java
similarity index 85%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/config/datasource/ShardingSphereJDBCTypedDataSourceCreator.java
rename to
shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/config/datasource/ShardingSphereJDBCDataSourceCreator.java
index e6cd46c..6ebe338 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/config/datasource/ShardingSphereJDBCTypedDataSourceCreator.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/config/datasource/ShardingSphereJDBCDataSourceCreator.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.driver.config.datasource;
import org.apache.shardingsphere.driver.api.ShardingSphereDataSourceFactory;
-import
org.apache.shardingsphere.infra.config.datasource.typed.ShardingSphereJDBCDataSourceConfiguration;
-import
org.apache.shardingsphere.infra.config.datasource.typed.creator.TypedDataSourceCreator;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.impl.ShardingSphereJDBCDataSourceConfiguration;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.creator.JDBCDataSourceCreator;
import org.apache.shardingsphere.infra.yaml.config.pojo.YamlRootConfiguration;
import
org.apache.shardingsphere.infra.yaml.config.swapper.YamlDataSourceConfigurationSwapper;
import
org.apache.shardingsphere.sharding.yaml.swapper.ShardingRuleConfigurationConverter;
@@ -29,9 +29,9 @@ import java.sql.SQLException;
import java.util.Collections;
/**
- * ShardingSphere JDBC typed data source creator.
+ * ShardingSphere JDBC data source creator.
*/
-public final class ShardingSphereJDBCTypedDataSourceCreator implements
TypedDataSourceCreator {
+public final class ShardingSphereJDBCDataSourceCreator implements
JDBCDataSourceCreator {
@Override
public DataSource createDataSource(final String parameter, final Object
dataSourceConfig) throws SQLException {
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.config.datasource.typed.creator.TypedDataSourceCreator
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.config.datasource.jdbc.creator.JDBCDataSourceCreator
similarity index 96%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.config.datasource.typed.creator.TypedDataSourceCreator
rename to
shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.config.datasource.jdbc.creator.JDBCDataSourceCreator
index 22ea9d9..7a1f0b0 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.config.datasource.typed.creator.TypedDataSourceCreator
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.config.datasource.jdbc.creator.JDBCDataSourceCreator
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.driver.config.datasource.ShardingSphereJDBCTypedDataSourceCreator
+org.apache.shardingsphere.driver.config.datasource.ShardingSphereJDBCDataSourceCreator
diff --git
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/DataSourceFactory.java
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/DataSourceFactory.java
index e31f125..1a71e68 100644
---
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/DataSourceFactory.java
+++
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/DataSourceFactory.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.data.pipeline.core.datasource;
import lombok.SneakyThrows;
-import
org.apache.shardingsphere.infra.config.datasource.typed.TypedDataSourceConfiguration;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.JDBCDataSourceConfiguration;
import java.sql.SQLException;
@@ -34,7 +34,7 @@ public final class DataSourceFactory {
* @return new data source wrapper
*/
@SneakyThrows(SQLException.class)
- public DataSourceWrapper newInstance(final TypedDataSourceConfiguration
dataSourceConfig) {
+ public DataSourceWrapper newInstance(final JDBCDataSourceConfiguration
dataSourceConfig) {
return new DataSourceWrapper(dataSourceConfig.toDataSource());
}
}
diff --git
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/DataSourceManager.java
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/DataSourceManager.java
index e01e2cc..a335e38 100644
---
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/DataSourceManager.java
+++
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/DataSourceManager.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.data.pipeline.core.datasource;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import
org.apache.shardingsphere.infra.config.datasource.typed.TypedDataSourceConfiguration;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.JDBCDataSourceConfiguration;
import java.sql.SQLException;
import java.util.Map;
@@ -36,18 +36,18 @@ public final class DataSourceManager implements
AutoCloseable {
private final DataSourceFactory dataSourceFactory = new
DataSourceFactory();
- private final Map<TypedDataSourceConfiguration, DataSourceWrapper>
cachedDataSources = new ConcurrentHashMap<>();
+ private final Map<JDBCDataSourceConfiguration, DataSourceWrapper>
cachedDataSources = new ConcurrentHashMap<>();
- private final Map<TypedDataSourceConfiguration, DataSourceWrapper>
sourceDataSources = new ConcurrentHashMap<>();
+ private final Map<JDBCDataSourceConfiguration, DataSourceWrapper>
sourceDataSources = new ConcurrentHashMap<>();
- private final Map<TypedDataSourceConfiguration, DataSourceWrapper>
targetDataSources = new ConcurrentHashMap<>();
+ private final Map<JDBCDataSourceConfiguration, DataSourceWrapper>
targetDataSources = new ConcurrentHashMap<>();
/**
* Create source data source.
*
* @param dataSourceConfig data source configuration
*/
- public void createSourceDataSource(final TypedDataSourceConfiguration
dataSourceConfig) {
+ public void createSourceDataSource(final JDBCDataSourceConfiguration
dataSourceConfig) {
DataSourceWrapper dataSource =
dataSourceFactory.newInstance(dataSourceConfig);
cachedDataSources.put(dataSourceConfig, dataSource);
sourceDataSources.put(dataSourceConfig, dataSource);
@@ -58,7 +58,7 @@ public final class DataSourceManager implements AutoCloseable
{
*
* @param dataSourceConfig data source configuration
*/
- public void createTargetDataSource(final TypedDataSourceConfiguration
dataSourceConfig) {
+ public void createTargetDataSource(final JDBCDataSourceConfiguration
dataSourceConfig) {
DataSourceWrapper dataSource =
dataSourceFactory.newInstance(dataSourceConfig);
cachedDataSources.put(dataSourceConfig, dataSource);
targetDataSources.put(dataSourceConfig, dataSource);
@@ -70,7 +70,7 @@ public final class DataSourceManager implements AutoCloseable
{
* @param dataSourceConfig data source configuration
* @return data source
*/
- public DataSourceWrapper getDataSource(final TypedDataSourceConfiguration
dataSourceConfig) {
+ public DataSourceWrapper getDataSource(final JDBCDataSourceConfiguration
dataSourceConfig) {
if (cachedDataSources.containsKey(dataSourceConfig)) {
return cachedDataSources.get(dataSourceConfig);
}
diff --git
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/config/DumperConfiguration.java
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/config/DumperConfiguration.java
index b0d86d7..a5d9213 100644
---
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/config/DumperConfiguration.java
+++
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/config/DumperConfiguration.java
@@ -21,7 +21,7 @@ import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import
org.apache.shardingsphere.data.pipeline.core.ingest.position.IngestPosition;
-import
org.apache.shardingsphere.infra.config.datasource.typed.TypedDataSourceConfiguration;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.JDBCDataSourceConfiguration;
import java.util.Map;
@@ -35,7 +35,7 @@ public class DumperConfiguration {
private String dataSourceName;
- private TypedDataSourceConfiguration dataSourceConfig;
+ private JDBCDataSourceConfiguration dataSourceConfig;
private IngestPosition<?> position;
diff --git
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/AbstractInventoryDumper.java
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/AbstractInventoryDumper.java
index 8244295..4d7cd9b 100644
---
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/AbstractInventoryDumper.java
+++
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/AbstractInventoryDumper.java
@@ -35,8 +35,8 @@ import
org.apache.shardingsphere.data.pipeline.core.ingest.record.Column;
import org.apache.shardingsphere.data.pipeline.core.ingest.record.DataRecord;
import
org.apache.shardingsphere.data.pipeline.core.ingest.record.FinishedRecord;
import org.apache.shardingsphere.data.pipeline.core.ingest.record.Record;
-import
org.apache.shardingsphere.infra.config.datasource.typed.StandardJDBCDataSourceConfiguration;
-import
org.apache.shardingsphere.infra.config.datasource.typed.TypedDataSourceConfiguration;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.impl.StandardJDBCDataSourceConfiguration;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.JDBCDataSourceConfiguration;
import org.apache.shardingsphere.infra.metadata.schema.model.TableMetaData;
import
org.apache.shardingsphere.schedule.core.executor.AbstractLifecycleExecutor;
@@ -72,7 +72,7 @@ public abstract class AbstractInventoryDumper extends
AbstractLifecycleExecutor
}
private TableMetaData createTableMetaData() {
- TypedDataSourceConfiguration dataSourceConfig =
inventoryDumperConfig.getDataSourceConfig();
+ JDBCDataSourceConfiguration dataSourceConfig =
inventoryDumperConfig.getDataSourceConfig();
MetaDataManager metaDataManager = new
MetaDataManager(dataSourceManager.getDataSource(dataSourceConfig));
return
metaDataManager.getTableMetaData(inventoryDumperConfig.getTableName(),
dataSourceConfig.getDatabaseType());
}
diff --git
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLIncrementalDumper.java
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLIncrementalDumper.java
index 22c74de..c974aaf 100644
---
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLIncrementalDumper.java
+++
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLIncrementalDumper.java
@@ -46,7 +46,7 @@ import
org.apache.shardingsphere.data.pipeline.mysql.ingest.column.metadata.MySQ
import
org.apache.shardingsphere.data.pipeline.mysql.ingest.column.metadata.MySQLColumnMetaDataLoader;
import
org.apache.shardingsphere.data.pipeline.mysql.ingest.column.value.ValueHandler;
import org.apache.shardingsphere.infra.config.datasource.JdbcUri;
-import
org.apache.shardingsphere.infra.config.datasource.typed.StandardJDBCDataSourceConfiguration;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.impl.StandardJDBCDataSourceConfiguration;
import
org.apache.shardingsphere.schedule.core.executor.AbstractLifecycleExecutor;
import org.apache.shardingsphere.spi.ShardingSphereServiceLoader;
diff --git
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLIncrementalDumperTest.java
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLIncrementalDumperTest.java
index 9952402..6b4d649 100644
---
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLIncrementalDumperTest.java
+++
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLIncrementalDumperTest.java
@@ -34,7 +34,7 @@ import
org.apache.shardingsphere.data.pipeline.mysql.ingest.binlog.event.Placeho
import
org.apache.shardingsphere.data.pipeline.mysql.ingest.binlog.event.UpdateRowsEvent;
import
org.apache.shardingsphere.data.pipeline.mysql.ingest.binlog.event.WriteRowsEvent;
import org.apache.shardingsphere.infra.config.datasource.JdbcUri;
-import
org.apache.shardingsphere.infra.config.datasource.typed.StandardJDBCDataSourceConfiguration;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.impl.StandardJDBCDataSourceConfiguration;
import org.junit.Before;
import org.junit.Test;
diff --git
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLJdbcDumperTest.java
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLJdbcDumperTest.java
index 80ea73c..d436fd4 100644
---
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLJdbcDumperTest.java
+++
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLJdbcDumperTest.java
@@ -21,7 +21,7 @@ import lombok.SneakyThrows;
import
org.apache.shardingsphere.data.pipeline.core.datasource.DataSourceManager;
import
org.apache.shardingsphere.data.pipeline.core.ingest.config.DumperConfiguration;
import
org.apache.shardingsphere.data.pipeline.core.ingest.config.InventoryDumperConfiguration;
-import
org.apache.shardingsphere.infra.config.datasource.typed.StandardJDBCDataSourceConfiguration;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.impl.StandardJDBCDataSourceConfiguration;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/OpenGaussWalDumper.java
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/OpenGaussWalDumper.java
index faad5fc..29fc6e6 100644
---
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/OpenGaussWalDumper.java
+++
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/OpenGaussWalDumper.java
@@ -38,7 +38,7 @@ import
org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.WalPosition
import
org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.decode.DecodingPlugin;
import
org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.event.AbstractWalEvent;
import
org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.event.PlaceholderEvent;
-import
org.apache.shardingsphere.infra.config.datasource.typed.StandardJDBCDataSourceConfiguration;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.impl.StandardJDBCDataSourceConfiguration;
import
org.apache.shardingsphere.schedule.core.executor.AbstractLifecycleExecutor;
import org.opengauss.jdbc.PgConnection;
import org.opengauss.replication.PGReplicationStream;
diff --git
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/wal/OpenGaussLogicalReplication.java
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/wal/OpenGaussLogicalReplication.java
index 96cf8a8..32ed5d3 100644
---
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/wal/OpenGaussLogicalReplication.java
+++
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/wal/OpenGaussLogicalReplication.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.data.pipeline.opengauss.ingest.wal;
import
org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.decode.BaseLogSequenceNumber;
-import
org.apache.shardingsphere.infra.config.datasource.typed.StandardJDBCDataSourceConfiguration;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.impl.StandardJDBCDataSourceConfiguration;
import org.opengauss.PGProperty;
import org.opengauss.jdbc.PgConnection;
import org.opengauss.replication.LogSequenceNumber;
diff --git
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLWalDumper.java
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLWalDumper.java
index 37a9744..d75ce03 100644
---
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLWalDumper.java
+++
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLWalDumper.java
@@ -35,7 +35,7 @@ import
org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.decode.Post
import
org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.decode.TestDecodingPlugin;
import
org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.event.AbstractWalEvent;
import
org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.event.PlaceholderEvent;
-import
org.apache.shardingsphere.infra.config.datasource.typed.StandardJDBCDataSourceConfiguration;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.impl.StandardJDBCDataSourceConfiguration;
import
org.apache.shardingsphere.schedule.core.executor.AbstractLifecycleExecutor;
import org.postgresql.jdbc.PgConnection;
import org.postgresql.replication.PGReplicationStream;
diff --git
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/LogicalReplication.java
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/LogicalReplication.java
index 9dfba20..69c6b9c 100644
---
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/LogicalReplication.java
+++
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/LogicalReplication.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal;
import
org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.decode.BaseLogSequenceNumber;
-import
org.apache.shardingsphere.infra.config.datasource.typed.StandardJDBCDataSourceConfiguration;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.impl.StandardJDBCDataSourceConfiguration;
import org.postgresql.PGConnection;
import org.postgresql.PGProperty;
import org.postgresql.replication.LogSequenceNumber;
diff --git
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLJdbcDumperTest.java
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLJdbcDumperTest.java
index f2294d8..b52496c 100644
---
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLJdbcDumperTest.java
+++
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLJdbcDumperTest.java
@@ -21,7 +21,7 @@ import lombok.SneakyThrows;
import
org.apache.shardingsphere.data.pipeline.core.datasource.DataSourceManager;
import
org.apache.shardingsphere.data.pipeline.core.ingest.config.DumperConfiguration;
import
org.apache.shardingsphere.data.pipeline.core.ingest.config.InventoryDumperConfiguration;
-import
org.apache.shardingsphere.infra.config.datasource.typed.StandardJDBCDataSourceConfiguration;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.impl.StandardJDBCDataSourceConfiguration;
import org.junit.Before;
import org.junit.Test;
diff --git
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLWalDumperTest.java
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLWalDumperTest.java
index ccf7886..0ec4c2a 100644
---
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLWalDumperTest.java
+++
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLWalDumperTest.java
@@ -24,7 +24,7 @@ import
org.apache.shardingsphere.data.pipeline.core.util.ReflectionUtil;
import
org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.LogicalReplication;
import
org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.WalPosition;
import
org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.decode.PostgreSQLLogSequenceNumber;
-import
org.apache.shardingsphere.infra.config.datasource.typed.StandardJDBCDataSourceConfiguration;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.impl.StandardJDBCDataSourceConfiguration;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/LogicalReplicationTest.java
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/LogicalReplicationTest.java
index c3b4f84..519ed50 100644
---
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/LogicalReplicationTest.java
+++
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/LogicalReplicationTest.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal;
import lombok.SneakyThrows;
import
org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.decode.BaseLogSequenceNumber;
import
org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.decode.PostgreSQLLogSequenceNumber;
-import
org.apache.shardingsphere.infra.config.datasource.typed.StandardJDBCDataSourceConfiguration;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.impl.StandardJDBCDataSourceConfiguration;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/WalEventConverterTest.java
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/WalEventConverterTest.java
index b3ba7f3..0508d43 100644
---
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/WalEventConverterTest.java
+++
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/WalEventConverterTest.java
@@ -29,7 +29,7 @@ import
org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.event.Delet
import
org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.event.PlaceholderEvent;
import
org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.event.UpdateRowEvent;
import
org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.event.WriteRowEvent;
-import
org.apache.shardingsphere.infra.config.datasource.typed.StandardJDBCDataSourceConfiguration;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.impl.StandardJDBCDataSourceConfiguration;
import org.junit.Before;
import org.junit.Test;
diff --git
a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/migration/common/api/ScalingWorker.java
b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/migration/common/api/ScalingWorker.java
index 692b5cb..dacc661 100644
---
a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/migration/common/api/ScalingWorker.java
+++
b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/migration/common/api/ScalingWorker.java
@@ -22,7 +22,7 @@ import com.google.common.eventbus.Subscribe;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.infra.config.datasource.JdbcUri;
-import
org.apache.shardingsphere.infra.config.datasource.typed.ShardingSphereJDBCDataSourceConfiguration;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.impl.ShardingSphereJDBCDataSourceConfiguration;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeRegistry;
import org.apache.shardingsphere.infra.database.type.dialect.MySQLDatabaseType;
diff --git
a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/DataCalculateParameter.java
b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/DataCalculateParameter.java
index d64a24f..2d6d99c 100644
---
a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/DataCalculateParameter.java
+++
b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/DataCalculateParameter.java
@@ -21,7 +21,7 @@ import lombok.Builder;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
-import
org.apache.shardingsphere.infra.config.datasource.typed.TypedDataSourceConfiguration;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.JDBCDataSourceConfiguration;
import java.util.Collection;
@@ -37,7 +37,7 @@ public final class DataCalculateParameter {
/**
* Data source configuration of source side or target side.
*/
- private TypedDataSourceConfiguration dataSourceConfig;
+ private JDBCDataSourceConfiguration dataSourceConfig;
private String logicTableName;
diff --git
a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/impl/AbstractSingleTableDataCalculator.java
b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/impl/AbstractSingleTableDataCalculator.java
index bd7ffd5..b33240f 100644
---
a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/impl/AbstractSingleTableDataCalculator.java
+++
b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/impl/AbstractSingleTableDataCalculator.java
@@ -22,7 +22,7 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import
org.apache.shardingsphere.data.pipeline.core.datasource.DataSourceFactory;
import
org.apache.shardingsphere.data.pipeline.core.datasource.DataSourceWrapper;
-import
org.apache.shardingsphere.infra.config.datasource.typed.TypedDataSourceConfiguration;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.JDBCDataSourceConfiguration;
import org.apache.shardingsphere.scaling.core.api.SingleTableDataCalculator;
/**
@@ -35,7 +35,7 @@ public abstract class AbstractSingleTableDataCalculator
implements SingleTableDa
private final DataSourceFactory dataSourceFactory = new
DataSourceFactory();
- protected final DataSourceWrapper getDataSource(final
TypedDataSourceConfiguration dataSourceConfig) {
+ protected final DataSourceWrapper getDataSource(final
JDBCDataSourceConfiguration dataSourceConfig) {
return dataSourceFactory.newInstance(dataSourceConfig);
}
}
diff --git
a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/impl/ScalingAPIImpl.java
b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/impl/ScalingAPIImpl.java
index 59613f1..cfefa63 100644
---
a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/impl/ScalingAPIImpl.java
+++
b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/api/impl/ScalingAPIImpl.java
@@ -24,7 +24,7 @@ import
org.apache.shardingsphere.elasticjob.lite.lifecycle.domain.JobBriefInfo;
import org.apache.shardingsphere.infra.config.TypedSPIConfiguration;
import
org.apache.shardingsphere.infra.config.algorithm.ShardingSphereAlgorithmConfiguration;
import
org.apache.shardingsphere.infra.config.algorithm.ShardingSphereAlgorithmFactory;
-import
org.apache.shardingsphere.infra.config.datasource.typed.TypedDataSourceConfigurationWrap;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.JDBCDataSourceConfigurationWrapper;
import org.apache.shardingsphere.infra.eventbus.ShardingSphereEventBus;
import org.apache.shardingsphere.infra.yaml.config.pojo.YamlRootConfiguration;
import org.apache.shardingsphere.infra.yaml.engine.YamlEngine;
@@ -260,7 +260,7 @@ public final class ScalingAPIImpl implements ScalingAPI {
JobConfiguration jobConfig = getJobConfig(jobId);
Optional<Collection<JobContext>> optionalJobContexts =
JobSchedulerCenter.getJobContexts(jobId);
optionalJobContexts.ifPresent(jobContexts -> jobContexts.forEach(each
-> each.setStatus(JobStatus.ALMOST_FINISHED)));
- TypedDataSourceConfigurationWrap targetConfig =
jobConfig.getRuleConfig().getTarget();
+ JDBCDataSourceConfigurationWrapper targetConfig =
jobConfig.getRuleConfig().getTarget();
YamlRootConfiguration yamlRootConfig =
YamlEngine.unmarshal(targetConfig.getParameter(), YamlRootConfiguration.class);
WorkflowConfiguration workflowConfig =
jobConfig.getHandleConfig().getWorkflowConfig();
String schemaName = workflowConfig.getSchemaName();
diff --git
a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/ImporterConfiguration.java
b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/ImporterConfiguration.java
index f208018..edf7073 100644
---
a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/ImporterConfiguration.java
+++
b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/ImporterConfiguration.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.scaling.core.config;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
-import
org.apache.shardingsphere.infra.config.datasource.typed.TypedDataSourceConfiguration;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.JDBCDataSourceConfiguration;
import java.util.Map;
import java.util.Set;
@@ -33,7 +33,7 @@ import java.util.Set;
@ToString(exclude = "dataSourceConfig")
public final class ImporterConfiguration {
- private TypedDataSourceConfiguration dataSourceConfig;
+ private JDBCDataSourceConfiguration dataSourceConfig;
private Map<String, Set<String>> shardingColumnsMap;
diff --git
a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/RuleConfiguration.java
b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/RuleConfiguration.java
index 0fee73a..b995692 100644
---
a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/RuleConfiguration.java
+++
b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/RuleConfiguration.java
@@ -21,7 +21,7 @@ import com.google.common.base.Preconditions;
import lombok.Getter;
import lombok.NonNull;
import lombok.Setter;
-import
org.apache.shardingsphere.infra.config.datasource.typed.TypedDataSourceConfigurationWrap;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.JDBCDataSourceConfigurationWrapper;
import java.util.Collections;
import java.util.List;
@@ -36,24 +36,24 @@ public final class RuleConfiguration {
@NonNull
private List<String> changedYamlRuleConfigClassNames =
Collections.emptyList();
- private TypedDataSourceConfigurationWrap source;
+ private JDBCDataSourceConfigurationWrapper source;
- private TypedDataSourceConfigurationWrap target;
+ private JDBCDataSourceConfigurationWrapper target;
/**
* Set source.
*
* @param source source configuration
*/
- public void setSource(final TypedDataSourceConfigurationWrap source) {
+ public void setSource(final JDBCDataSourceConfigurationWrapper source) {
checkParameters(source);
this.source = source;
}
- private void checkParameters(final TypedDataSourceConfigurationWrap wrap) {
- Preconditions.checkNotNull(wrap);
- Preconditions.checkNotNull(wrap.getType());
- Preconditions.checkNotNull(wrap.getParameter());
+ private void checkParameters(final JDBCDataSourceConfigurationWrapper
wrapper) {
+ Preconditions.checkNotNull(wrapper);
+ Preconditions.checkNotNull(wrapper.getType());
+ Preconditions.checkNotNull(wrapper.getParameter());
}
/**
@@ -61,7 +61,7 @@ public final class RuleConfiguration {
*
* @param target target configuration
*/
- public void setTarget(final TypedDataSourceConfigurationWrap target) {
+ public void setTarget(final JDBCDataSourceConfigurationWrapper target) {
checkParameters(target);
this.target = target;
}
diff --git
a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/check/consistency/DataConsistencyCheckerImpl.java
b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/check/consistency/DataConsistencyCheckerImpl.java
index d0c787f..98dbb22 100644
---
a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/check/consistency/DataConsistencyCheckerImpl.java
+++
b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/check/consistency/DataConsistencyCheckerImpl.java
@@ -22,7 +22,7 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import
org.apache.shardingsphere.data.pipeline.core.datasource.DataSourceFactory;
import
org.apache.shardingsphere.data.pipeline.core.datasource.DataSourceWrapper;
-import
org.apache.shardingsphere.infra.config.datasource.typed.TypedDataSourceConfiguration;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.JDBCDataSourceConfiguration;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import
org.apache.shardingsphere.infra.executor.kernel.thread.ExecutorThreadFactoryBuilder;
import org.apache.shardingsphere.scaling.core.api.DataCalculateParameter;
@@ -80,8 +80,8 @@ public final class DataConsistencyCheckerImpl implements
DataConsistencyChecker
}
private DataConsistencyCheckResult countCheck(final String table, final
ThreadPoolExecutor executor) {
- TypedDataSourceConfiguration sourceConfig =
jobContext.getJobConfig().getRuleConfig().getSource().unwrap();
- TypedDataSourceConfiguration targetConfig =
jobContext.getJobConfig().getRuleConfig().getTarget().unwrap();
+ JDBCDataSourceConfiguration sourceConfig =
jobContext.getJobConfig().getRuleConfig().getSource().unwrap();
+ JDBCDataSourceConfiguration targetConfig =
jobContext.getJobConfig().getRuleConfig().getTarget().unwrap();
try (DataSourceWrapper sourceDataSource =
dataSourceFactory.newInstance(sourceConfig);
DataSourceWrapper targetDataSource =
dataSourceFactory.newInstance(targetConfig)) {
Future<Long> sourceFuture = executor.submit(() ->
count(sourceDataSource, table, sourceConfig.getDatabaseType()));
@@ -108,9 +108,9 @@ public final class DataConsistencyCheckerImpl implements
DataConsistencyChecker
@Override
public Map<String, Boolean> dataCheck(final
ScalingDataConsistencyCheckAlgorithm checkAlgorithm) {
Collection<String> supportedDatabaseTypes =
checkAlgorithm.getSupportedDatabaseTypes();
- TypedDataSourceConfiguration sourceConfig =
jobContext.getJobConfig().getRuleConfig().getSource().unwrap();
+ JDBCDataSourceConfiguration sourceConfig =
jobContext.getJobConfig().getRuleConfig().getSource().unwrap();
checkDatabaseTypeSupportedOrNot(supportedDatabaseTypes,
sourceConfig.getDatabaseType().getName());
- TypedDataSourceConfiguration targetConfig =
jobContext.getJobConfig().getRuleConfig().getTarget().unwrap();
+ JDBCDataSourceConfiguration targetConfig =
jobContext.getJobConfig().getRuleConfig().getTarget().unwrap();
checkDatabaseTypeSupportedOrNot(supportedDatabaseTypes,
targetConfig.getDatabaseType().getName());
Collection<String> logicTableNames =
jobContext.getTaskConfigs().stream().flatMap(each ->
each.getDumperConfig().getTableNameMap().values().stream())
.distinct().collect(Collectors.toList());
@@ -153,7 +153,7 @@ public final class DataConsistencyCheckerImpl implements
DataConsistencyChecker
}
}
- private Map<String, Collection<String>> getTablesColumnNamesMap(final
TypedDataSourceConfiguration dataSourceConfig) {
+ private Map<String, Collection<String>> getTablesColumnNamesMap(final
JDBCDataSourceConfiguration dataSourceConfig) {
try (DataSourceWrapper dataSource =
dataSourceFactory.newInstance(dataSourceConfig);
Connection connection = dataSource.getConnection()) {
Map<String, Collection<String>> result = new LinkedHashMap<>();
diff --git
a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/preparer/ScalingJobPreparer.java
b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/preparer/ScalingJobPreparer.java
index 93684eb..c978606 100644
---
a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/preparer/ScalingJobPreparer.java
+++
b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/preparer/ScalingJobPreparer.java
@@ -21,7 +21,7 @@ import lombok.extern.slf4j.Slf4j;
import
org.apache.shardingsphere.data.pipeline.core.datasource.DataSourceManager;
import
org.apache.shardingsphere.data.pipeline.core.ingest.position.IngestPosition;
import
org.apache.shardingsphere.data.pipeline.core.ingest.position.PositionInitializer;
-import
org.apache.shardingsphere.infra.config.datasource.typed.TypedDataSourceConfiguration;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.JDBCDataSourceConfiguration;
import
org.apache.shardingsphere.scaling.core.common.exception.PrepareFailedException;
import org.apache.shardingsphere.scaling.core.config.JobConfiguration;
import org.apache.shardingsphere.scaling.core.config.TaskConfiguration;
@@ -82,7 +82,7 @@ public final class ScalingJobPreparer {
private void initDataSourceManager(final DataSourceManager
dataSourceManager, final List<TaskConfiguration> taskConfigs) {
for (TaskConfiguration taskConfig : taskConfigs) {
- TypedDataSourceConfiguration dataSourceConfig =
taskConfig.getDumperConfig().getDataSourceConfig();
+ JDBCDataSourceConfiguration dataSourceConfig =
taskConfig.getDumperConfig().getDataSourceConfig();
dataSourceManager.createSourceDataSource(dataSourceConfig);
}
dataSourceManager.createTargetDataSource(taskConfigs.iterator().next().getImporterConfig().getDataSourceConfig());
diff --git
a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/sharding/schedule/ShardingRuleJobConfigurationPreparer.java
b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/sharding/schedule/ShardingRuleJobConfigurationPreparer.java
index 90596a4..12f4d0f 100644
---
a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/sharding/schedule/ShardingRuleJobConfigurationPreparer.java
+++
b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/sharding/schedule/ShardingRuleJobConfigurationPreparer.java
@@ -24,9 +24,9 @@ import com.google.common.collect.Sets;
import lombok.extern.slf4j.Slf4j;
import
org.apache.shardingsphere.data.pipeline.core.ingest.config.DumperConfiguration;
import
org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration;
-import
org.apache.shardingsphere.infra.config.datasource.typed.ShardingSphereJDBCDataSourceConfiguration;
-import
org.apache.shardingsphere.infra.config.datasource.typed.StandardJDBCDataSourceConfiguration;
-import
org.apache.shardingsphere.infra.config.datasource.typed.TypedDataSourceConfiguration;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.impl.ShardingSphereJDBCDataSourceConfiguration;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.impl.StandardJDBCDataSourceConfiguration;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.JDBCDataSourceConfiguration;
import org.apache.shardingsphere.infra.datanode.DataNode;
import
org.apache.shardingsphere.infra.yaml.config.swapper.YamlDataSourceConfigurationSwapper;
import org.apache.shardingsphere.infra.yaml.engine.YamlEngine;
@@ -91,7 +91,7 @@ public final class ShardingRuleJobConfigurationPreparer
implements RuleJobConfig
* @return map(logic table name, DataNode of each logic table)
*/
private static Map<String, List<DataNode>>
getShouldScalingActualDataNodes(final RuleConfiguration ruleConfig) {
- TypedDataSourceConfiguration sourceConfig =
ruleConfig.getSource().unwrap();
+ JDBCDataSourceConfiguration sourceConfig =
ruleConfig.getSource().unwrap();
Preconditions.checkState(sourceConfig instanceof
ShardingSphereJDBCDataSourceConfiguration,
"Only ShardingSphereJdbc type of source
TypedDataSourceConfiguration is supported.");
ShardingSphereJDBCDataSourceConfiguration source =
(ShardingSphereJDBCDataSourceConfiguration) sourceConfig;
@@ -148,13 +148,13 @@ public final class ShardingRuleJobConfigurationPreparer
implements RuleJobConfig
}
private static ShardingSphereJDBCDataSourceConfiguration
getSourceConfiguration(final JobConfiguration jobConfig) {
- TypedDataSourceConfiguration result =
jobConfig.getRuleConfig().getSource().unwrap();
+ JDBCDataSourceConfiguration result =
jobConfig.getRuleConfig().getSource().unwrap();
Preconditions.checkArgument(result instanceof
ShardingSphereJDBCDataSourceConfiguration, "Only support ShardingSphere source
data source.");
return (ShardingSphereJDBCDataSourceConfiguration) result;
}
private static Optional<ShardingRuleConfiguration>
getTargetRuleConfiguration(final JobConfiguration jobConfig) {
- TypedDataSourceConfiguration dataSourceConfig =
jobConfig.getRuleConfig().getTarget().unwrap();
+ JDBCDataSourceConfiguration dataSourceConfig =
jobConfig.getRuleConfig().getTarget().unwrap();
if (dataSourceConfig instanceof
ShardingSphereJDBCDataSourceConfiguration) {
return Optional.of(
ShardingRuleConfigurationConverter.findAndConvertShardingRuleConfiguration(((ShardingSphereJDBCDataSourceConfiguration)
dataSourceConfig).getRootConfig().getRules()));
diff --git
a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/executor/importer/AbstractImporterTest.java
b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/executor/importer/AbstractImporterTest.java
index c22331b..ed562c5 100644
---
a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/executor/importer/AbstractImporterTest.java
+++
b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/executor/importer/AbstractImporterTest.java
@@ -25,7 +25,7 @@ import
org.apache.shardingsphere.data.pipeline.core.ingest.record.Column;
import org.apache.shardingsphere.data.pipeline.core.ingest.record.DataRecord;
import
org.apache.shardingsphere.data.pipeline.core.ingest.record.FinishedRecord;
import org.apache.shardingsphere.data.pipeline.core.ingest.record.Record;
-import
org.apache.shardingsphere.infra.config.datasource.typed.TypedDataSourceConfiguration;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.JDBCDataSourceConfiguration;
import org.apache.shardingsphere.scaling.core.common.record.RecordUtil;
import
org.apache.shardingsphere.scaling.core.common.sqlbuilder.ScalingSQLBuilder;
import org.apache.shardingsphere.scaling.core.config.ImporterConfiguration;
@@ -70,7 +70,7 @@ public final class AbstractImporterTest {
private ScalingSQLBuilder scalingSqlBuilder;
@Mock
- private TypedDataSourceConfiguration dataSourceConfig;
+ private JDBCDataSourceConfiguration dataSourceConfig;
@Mock
private Channel channel;
diff --git
a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/check/DataConsistencyCheckerImplTest.java
b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/check/DataConsistencyCheckerImplTest.java
index d89c9bd..7d8eb11 100644
---
a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/check/DataConsistencyCheckerImplTest.java
+++
b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/check/DataConsistencyCheckerImplTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.scaling.core.job.check;
import lombok.SneakyThrows;
import
org.apache.shardingsphere.data.pipeline.core.datasource.DataSourceManager;
-import
org.apache.shardingsphere.infra.config.datasource.typed.TypedDataSourceConfiguration;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.JDBCDataSourceConfiguration;
import
org.apache.shardingsphere.scaling.core.api.impl.ScalingFixtureDataConsistencyCheckAlgorithm;
import org.apache.shardingsphere.scaling.core.job.JobContext;
import
org.apache.shardingsphere.scaling.core.job.check.consistency.DataConsistencyCheckResult;
@@ -57,7 +57,7 @@ public final class DataConsistencyCheckerImplTest {
}
@SneakyThrows(SQLException.class)
- private void initTableData(final TypedDataSourceConfiguration
dataSourceConfig) {
+ private void initTableData(final JDBCDataSourceConfiguration
dataSourceConfig) {
DataSource dataSource = new
DataSourceManager().getDataSource(dataSourceConfig);
try (Connection connection = dataSource.getConnection();
Statement statement = connection.createStatement()) {
diff --git
a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/util/ResourceUtil.java
b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/util/ResourceUtil.java
index 2ec25d0..b9e8f27 100644
---
a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/util/ResourceUtil.java
+++
b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/util/ResourceUtil.java
@@ -20,8 +20,8 @@ package org.apache.shardingsphere.scaling.core.util;
import lombok.SneakyThrows;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
-import
org.apache.shardingsphere.infra.config.datasource.typed.ShardingSphereJDBCDataSourceConfiguration;
-import
org.apache.shardingsphere.infra.config.datasource.typed.StandardJDBCDataSourceConfiguration;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.impl.ShardingSphereJDBCDataSourceConfiguration;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.impl.StandardJDBCDataSourceConfiguration;
import org.apache.shardingsphere.scaling.core.config.HandleConfiguration;
import org.apache.shardingsphere.scaling.core.config.JobConfiguration;
import org.apache.shardingsphere.scaling.core.config.RuleConfiguration;
diff --git
a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/test/java/org/apache/shardingsphere/scaling/mysql/component/MySQLDataSourcePreparerTest.java
b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/test/java/org/apache/shardingsphere/scaling/mysql/component/MySQLDataSourcePreparerTest.java
index 40080e8..9656bc3 100644
---
a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/test/java/org/apache/shardingsphere/scaling/mysql/component/MySQLDataSourcePreparerTest.java
+++
b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/test/java/org/apache/shardingsphere/scaling/mysql/component/MySQLDataSourcePreparerTest.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.scaling.mysql.component;
-import
org.apache.shardingsphere.infra.config.datasource.typed.ShardingSphereJDBCDataSourceConfiguration;
-import
org.apache.shardingsphere.infra.config.datasource.typed.TypedDataSourceConfigurationWrap;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.impl.ShardingSphereJDBCDataSourceConfiguration;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.JDBCDataSourceConfigurationWrapper;
import
org.apache.shardingsphere.scaling.core.common.exception.PrepareFailedException;
import org.apache.shardingsphere.scaling.core.config.RuleConfiguration;
import org.apache.shardingsphere.scaling.core.config.internal.JobDataNodeLine;
@@ -44,19 +44,19 @@ public final class MySQLDataSourcePreparerTest {
private PrepareTargetTablesParameter prepareTargetTablesParameter;
@Mock
- private RuleConfiguration ruleConfiguration;
+ private RuleConfiguration ruleConfig;
@Mock
- private TypedDataSourceConfigurationWrap sourceDataSourceConfigurationWrap;
+ private JDBCDataSourceConfigurationWrapper
sourceDataSourceConfigurationWrapper;
@Mock
- private TypedDataSourceConfigurationWrap targetDataSourceConfigurationWrap;
+ private JDBCDataSourceConfigurationWrapper
targetDataSourceConfigurationWrapper;
@Mock
- private ShardingSphereJDBCDataSourceConfiguration
sourceScalingDataSourceConfiguration;
+ private ShardingSphereJDBCDataSourceConfiguration
sourceScalingDataSourceConfig;
@Mock
- private ShardingSphereJDBCDataSourceConfiguration
targetScalingDataSourceConfiguration;
+ private ShardingSphereJDBCDataSourceConfiguration
targetScalingDataSourceConfig;
@Mock(extraInterfaces = AutoCloseable.class)
private DataSource sourceDataSource;
@@ -66,14 +66,14 @@ public final class MySQLDataSourcePreparerTest {
@Before
public void setUp() throws SQLException {
-
when(prepareTargetTablesParameter.getRuleConfig()).thenReturn(ruleConfiguration);
+
when(prepareTargetTablesParameter.getRuleConfig()).thenReturn(ruleConfig);
when(prepareTargetTablesParameter.getTablesFirstDataNodes()).thenReturn(new
JobDataNodeLine(Collections.emptyList()));
-
when(ruleConfiguration.getSource()).thenReturn(sourceDataSourceConfigurationWrap);
-
when(sourceDataSourceConfigurationWrap.unwrap()).thenReturn(sourceScalingDataSourceConfiguration);
-
when(sourceScalingDataSourceConfiguration.toDataSource()).thenReturn(sourceDataSource);
-
when(ruleConfiguration.getTarget()).thenReturn(targetDataSourceConfigurationWrap);
-
when(targetDataSourceConfigurationWrap.unwrap()).thenReturn(targetScalingDataSourceConfiguration);
-
when(targetScalingDataSourceConfiguration.toDataSource()).thenReturn(targetDataSource);
+
when(ruleConfig.getSource()).thenReturn(sourceDataSourceConfigurationWrapper);
+
when(sourceDataSourceConfigurationWrapper.unwrap()).thenReturn(sourceScalingDataSourceConfig);
+
when(sourceScalingDataSourceConfig.toDataSource()).thenReturn(sourceDataSource);
+
when(ruleConfig.getTarget()).thenReturn(targetDataSourceConfigurationWrapper);
+
when(targetDataSourceConfigurationWrapper.unwrap()).thenReturn(targetScalingDataSourceConfig);
+
when(targetScalingDataSourceConfig.toDataSource()).thenReturn(targetDataSource);
}
@Test
diff --git
a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/test/java/org/apache/shardingsphere/scaling/mysql/component/MySQLImporterTest.java
b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/test/java/org/apache/shardingsphere/scaling/mysql/component/MySQLImporterTest.java
index df5114b..472379f 100644
---
a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/test/java/org/apache/shardingsphere/scaling/mysql/component/MySQLImporterTest.java
+++
b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/src/test/java/org/apache/shardingsphere/scaling/mysql/component/MySQLImporterTest.java
@@ -21,7 +21,7 @@ import
org.apache.shardingsphere.data.pipeline.core.datasource.DataSourceManager
import org.apache.shardingsphere.data.pipeline.core.ingest.record.Column;
import org.apache.shardingsphere.data.pipeline.core.ingest.record.DataRecord;
import
org.apache.shardingsphere.data.pipeline.mysql.ingest.binlog.BinlogPosition;
-import
org.apache.shardingsphere.infra.config.datasource.typed.TypedDataSourceConfiguration;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.JDBCDataSourceConfiguration;
import org.apache.shardingsphere.scaling.core.config.ImporterConfiguration;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -46,7 +46,7 @@ public final class MySQLImporterTest {
@Test
public void assertCreateSqlBuilder() {
-
when(importerConfig.getDataSourceConfig()).thenReturn(mock(TypedDataSourceConfiguration.class));
+
when(importerConfig.getDataSourceConfig()).thenReturn(mock(JDBCDataSourceConfiguration.class));
MySQLImporter mysqlImporter = new MySQLImporter(importerConfig,
dataSourceManager);
String insertSQL =
mysqlImporter.createSQLBuilder(Collections.emptyMap()).buildInsertSQL(mockDataRecord());
assertThat(insertSQL, is("INSERT INTO `t_order`(`id`,`name`)
VALUES(?,?) ON DUPLICATE KEY UPDATE `name`=VALUES(`name`)"));
diff --git
a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-opengauss/src/main/java/org/apache/shardingsphere/scaling/opengauss/component/checker/OpenGaussDataSourcePreparer.java
b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-opengauss/src/main/java/org/apache/shardingsphere/scaling/opengauss/component/checker/OpenGaussDataSourcePreparer.java
index 12d277c..1e2008b 100644
---
a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-opengauss/src/main/java/org/apache/shardingsphere/scaling/opengauss/component/checker/OpenGaussDataSourcePreparer.java
+++
b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-opengauss/src/main/java/org/apache/shardingsphere/scaling/opengauss/component/checker/OpenGaussDataSourcePreparer.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.scaling.opengauss.component.checker;
import lombok.extern.slf4j.Slf4j;
import
org.apache.shardingsphere.data.pipeline.core.datasource.DataSourceManager;
import
org.apache.shardingsphere.data.pipeline.core.datasource.DataSourceWrapper;
-import
org.apache.shardingsphere.infra.config.datasource.typed.ShardingSphereJDBCDataSourceConfiguration;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.impl.ShardingSphereJDBCDataSourceConfiguration;
import org.apache.shardingsphere.infra.datanode.DataNode;
import
org.apache.shardingsphere.migration.common.job.preparer.AbstractDataSourcePreparer;
import
org.apache.shardingsphere.scaling.core.common.exception.PrepareFailedException;
diff --git
a/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/config/SourceConfiguration.java
b/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/config/SourceConfiguration.java
index 63b0a01..c7b5bc3 100644
---
a/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/config/SourceConfiguration.java
+++
b/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/config/SourceConfiguration.java
@@ -25,7 +25,7 @@ import
org.apache.shardingsphere.infra.yaml.config.swapper.YamlDataSourceConfigu
import
org.apache.shardingsphere.infra.yaml.config.swapper.YamlRuleConfigurationSwapperEngine;
import org.apache.shardingsphere.infra.yaml.engine.YamlEngine;
import
org.apache.shardingsphere.integration.scaling.test.mysql.env.IntegrationTestEnvironment;
-import
org.apache.shardingsphere.infra.config.datasource.typed.ShardingSphereJDBCDataSourceConfiguration;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.impl.ShardingSphereJDBCDataSourceConfiguration;
import
org.apache.shardingsphere.sharding.yaml.config.YamlShardingRuleConfiguration;
import
org.apache.shardingsphere.sharding.yaml.config.rule.YamlTableRuleConfiguration;
diff --git
a/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/config/TargetConfiguration.java
b/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/config/TargetConfiguration.java
index 6acea41..fe02581 100644
---
a/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/config/TargetConfiguration.java
+++
b/shardingsphere-test/shardingsphere-integration-scaling-test/shardingsphere-integration-scaling-test-mysql/src/test/java/org/apache/shardingsphere/integration/scaling/test/mysql/env/config/TargetConfiguration.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.integration.scaling.test.mysql.env.config;
import com.zaxxer.hikari.HikariDataSource;
import
org.apache.shardingsphere.integration.scaling.test.mysql.env.IntegrationTestEnvironment;
-import
org.apache.shardingsphere.infra.config.datasource.typed.StandardJDBCDataSourceConfiguration;
+import
org.apache.shardingsphere.infra.config.datasource.jdbc.config.impl.StandardJDBCDataSourceConfiguration;
import javax.sql.DataSource;
import java.util.Properties;
@@ -52,10 +52,7 @@ public final class TargetConfiguration {
}
private static StandardJDBCDataSourceConfiguration getConfiguration(final
String host) {
- StandardJDBCDataSourceConfiguration configuration = new
StandardJDBCDataSourceConfiguration(
- String.format(TARGET_JDBC_URL, host),
- ENGINE_ENV_PROPS.getProperty("db.username"),
ENGINE_ENV_PROPS.getProperty("db.password"));
- return configuration;
+ return new
StandardJDBCDataSourceConfiguration(String.format(TARGET_JDBC_URL, host),
ENGINE_ENV_PROPS.getProperty("db.username"),
ENGINE_ENV_PROPS.getProperty("db.password"));
}
/**
