This is an automated email from the ASF dual-hosted git repository.
panjuan 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 cba00f0 Rename DataSourceConverter to DataSourcePoolCreatorUtil
(#14474)
cba00f0 is described below
commit cba00f05dba4658c133a7ebea53bfaf3f29ccb8f
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Jan 1 17:58:26 2022 +0800
Rename DataSourceConverter to DataSourcePoolCreatorUtil (#14474)
---
.../datasource/DataSourceConfigurationValidator.java | 3 ++-
.../creator/DataSourcePoolCreatorUtil.java} | 6 +++---
.../swapper/YamlDataSourceConfigurationSwapper.java | 5 +++--
.../infra/config/DataSourceConfigurationTest.java | 8 ++++----
.../pool/creator/DataSourcePoolCreatorUtilTest.java} | 15 +++++++--------
.../creator/impl/StandardPipelineDataSourceCreator.java | 4 ++--
.../traffic/executor/jdbc/JDBCTrafficExecutor.java | 4 ++--
.../shardingsphere/mode/manager/ContextManager.java | 10 +++++-----
.../mode/metadata/persist/MetaDataPersistServiceTest.java | 4 ++--
.../impl/DataSourceMetaDataPersistServiceTest.java | 8 ++++----
.../manager/cluster/ClusterContextManagerBuilder.java | 12 ++++++------
.../coordinator/ClusterContextManagerCoordinatorTest.java | 14 +++++++-------
.../standalone/StandaloneContextManagerBuilder.java | 12 ++++++------
.../distsql/rql/resource/DataSourceQueryResultSet.java | 4 ++--
.../proxy/initializer/BootstrapInitializer.java | 4 ++--
15 files changed, 57 insertions(+), 56 deletions(-)
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/DataSourceConfigurationValidator.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/DataSourceConfigurationValidator.java
index c453fcb..6e01636 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/DataSourceConfigurationValidator.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/DataSourceConfigurationValidator.java
@@ -17,6 +17,7 @@
package org.apache.shardingsphere.infra.config.datasource;
+import
org.apache.shardingsphere.infra.config.datasource.pool.creator.DataSourcePoolCreatorUtil;
import
org.apache.shardingsphere.infra.config.datasource.pool.destroyer.DataSourcePoolDestroyerFactory;
import
org.apache.shardingsphere.infra.distsql.exception.resource.InvalidResourcesException;
@@ -55,7 +56,7 @@ public final class DataSourceConfigurationValidator {
private void validate(final String dataSourceConfigName, final
DataSourceConfiguration dataSourceConfig) throws
InvalidDataSourceConfigurationException {
DataSource dataSource = null;
try {
- dataSource = DataSourceConverter.getDataSource(dataSourceConfig);
+ dataSource =
DataSourcePoolCreatorUtil.getDataSource(dataSourceConfig);
// CHECKSTYLE:OFF
} catch (final Exception ex) {
// CHECKSTYLE:ON
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/DataSourceConverter.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/DataSourcePoolCreatorUtil.java
similarity index 93%
rename from
shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/DataSourceConverter.java
rename to
shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/DataSourcePoolCreatorUtil.java
index 4969a78..f9db1e5 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/DataSourceConverter.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/DataSourcePoolCreatorUtil.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.config.datasource;
+package org.apache.shardingsphere.infra.config.datasource.pool.creator;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import
org.apache.shardingsphere.infra.config.datasource.pool.creator.DataSourcePoolCreator;
+import
org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration;
import javax.sql.DataSource;
import java.util.LinkedHashMap;
@@ -31,7 +31,7 @@ import java.util.stream.Collectors;
* Data source converter.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class DataSourceConverter {
+public final class DataSourcePoolCreatorUtil {
/**
* Get data source.
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/swapper/YamlDataSourceConfigurationSwapper.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/swapper/YamlDataSourceConfigurationSwapper.java
index 0795829..08417a0 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/swapper/YamlDataSourceConfigurationSwapper.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/config/swapper/YamlDataSourceConfigurationSwapper.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.infra.yaml.config.swapper;
import com.google.common.base.Preconditions;
import
org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration;
-import org.apache.shardingsphere.infra.config.datasource.DataSourceConverter;
+import
org.apache.shardingsphere.infra.config.datasource.pool.creator.DataSourcePoolCreatorUtil;
import org.apache.shardingsphere.infra.yaml.config.pojo.YamlRootConfiguration;
import javax.sql.DataSource;
@@ -43,7 +43,7 @@ public final class YamlDataSourceConfigurationSwapper {
* @return data sources
*/
public Map<String, DataSource> swapToDataSources(final Map<String,
Map<String, Object>> yamlDataSources) {
- return
DataSourceConverter.getDataSourceMap(yamlDataSources.entrySet().stream().collect(Collectors.toMap(Entry::getKey,
entry -> swapToDataSourceConfiguration(entry.getValue()))));
+ return
DataSourcePoolCreatorUtil.getDataSourceMap(yamlDataSources.entrySet().stream().collect(Collectors.toMap(Entry::getKey,
entry -> swapToDataSourceConfiguration(entry.getValue()))));
}
/**
@@ -65,6 +65,7 @@ public final class YamlDataSourceConfigurationSwapper {
* @param yamlConfig YAML configurations
* @return data source configuration
*/
+ @SuppressWarnings("rawtypes")
public DataSourceConfiguration swapToDataSourceConfiguration(final
Map<String, Object> yamlConfig) {
Preconditions.checkState(yamlConfig.containsKey(DATA_SOURCE_CLASS_NAME_KEY),
"%s can not be null.", DATA_SOURCE_CLASS_NAME_KEY);
Map<String, Object> newDataSourceMap = new HashMap<>(yamlConfig);
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/DataSourceConfigurationTest.java
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/DataSourceConfigurationTest.java
index f6e82d5..a47ba71 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/DataSourceConfigurationTest.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/DataSourceConfigurationTest.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.infra.config;
import com.zaxxer.hikari.HikariDataSource;
import org.apache.commons.dbcp2.BasicDataSource;
import
org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration;
-import org.apache.shardingsphere.infra.config.datasource.DataSourceConverter;
+import
org.apache.shardingsphere.infra.config.datasource.pool.creator.DataSourcePoolCreatorUtil;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
@@ -53,7 +53,7 @@ public final class DataSourceConfigurationTest {
actualDataSource.setJdbcUrl("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL");
actualDataSource.setUsername("root");
actualDataSource.setPassword("root");
- DataSourceConfiguration actual =
DataSourceConverter.getDataSourceConfiguration(actualDataSource);
+ DataSourceConfiguration actual =
DataSourcePoolCreatorUtil.getDataSourceConfiguration(actualDataSource);
actual.addPropertySynonym("url", "jdbcUrl");
actual.addPropertySynonym("user", "username");
assertThat(actual.getDataSourceClassName(),
is(HikariDataSource.class.getName()));
@@ -132,7 +132,7 @@ public final class DataSourceConfigurationTest {
actualDataSource.setUsername("root");
actualDataSource.setPassword("root");
actualDataSource.setConnectionInitSqls(Arrays.asList("set names
utf8mb4;", "set names utf8;"));
- DataSourceConfiguration actual =
DataSourceConverter.getDataSourceConfiguration(actualDataSource);
+ DataSourceConfiguration actual =
DataSourcePoolCreatorUtil.getDataSourceConfiguration(actualDataSource);
assertThat(actual.getDataSourceClassName(),
is(BasicDataSource.class.getName()));
assertThat(actual.getProps().get("driverClassName").toString(),
is("org.h2.Driver"));
assertThat(actual.getProps().get("url").toString(),
is("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL"));
@@ -160,7 +160,7 @@ public final class DataSourceConfigurationTest {
DataSourceConfiguration dataSourceConfig = new
DataSourceConfiguration(HikariDataSource.class.getName());
dataSourceConfig.getProps().putAll(props);
dataSourceConfig.getProps().putAll(new HashMap(customPoolProps));
- HikariDataSource actual = (HikariDataSource)
DataSourceConverter.getDataSource(dataSourceConfig);
+ HikariDataSource actual = (HikariDataSource)
DataSourcePoolCreatorUtil.getDataSource(dataSourceConfig);
assertThat(actual.getDriverClassName(), is("org.h2.Driver"));
assertThat(actual.getJdbcUrl(),
is("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL"));
assertThat(actual.getUsername(), is("root"));
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/DataSourceConverterTest.java
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/DataSourcePoolCreatorUtilTest.java
similarity index 89%
rename from
shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/DataSourceConverterTest.java
rename to
shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/DataSourcePoolCreatorUtilTest.java
index b49dd61..5e94502 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/DataSourceConverterTest.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/DataSourcePoolCreatorUtilTest.java
@@ -15,12 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.config;
+package org.apache.shardingsphere.infra.config.datasource.pool.creator;
import com.zaxxer.hikari.HikariDataSource;
import org.apache.commons.dbcp2.BasicDataSource;
import
org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration;
-import org.apache.shardingsphere.infra.config.datasource.DataSourceConverter;
import org.junit.Test;
import javax.sql.DataSource;
@@ -34,19 +33,19 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
-public final class DataSourceConverterTest {
+public final class DataSourcePoolCreatorUtilTest {
@Test
public void assertGetDataSourceMap() {
Map<String, DataSourceConfiguration> dataSourceConfigurationMap = new
HashMap<>(1, 1);
dataSourceConfigurationMap.put("ds_0",
createDataSourceConfiguration());
- Map<String, DataSource> actual =
DataSourceConverter.getDataSourceMap(dataSourceConfigurationMap);
+ Map<String, DataSource> actual =
DataSourcePoolCreatorUtil.getDataSourceMap(dataSourceConfigurationMap);
assertThat(actual.size(), is(1));
}
@Test
public void assertGetDataSourceConfigurationMap() {
- Map<String, DataSourceConfiguration> actual =
DataSourceConverter.getDataSourceConfigurationMap(createDataSourceMap());
+ Map<String, DataSourceConfiguration> actual =
DataSourcePoolCreatorUtil.getDataSourceConfigurationMap(createDataSourceMap());
assertThat(actual.size(), is(2));
assertNotNull(actual.get("ds_0"));
assertNotNull(actual.get("ds_1"));
@@ -60,7 +59,7 @@ public final class DataSourceConverterTest {
actualDataSource.setUsername("root");
actualDataSource.setPassword("root");
actualDataSource.setLoginTimeout(1);
- DataSourceConfiguration actual =
DataSourceConverter.getDataSourceConfiguration(actualDataSource);
+ DataSourceConfiguration actual =
DataSourcePoolCreatorUtil.getDataSourceConfiguration(actualDataSource);
assertThat(actual.getDataSourceClassName(),
is(HikariDataSource.class.getName()));
assertThat(actual.getProps().get("driverClassName").toString(),
is("org.h2.Driver"));
assertThat(actual.getProps().get("jdbcUrl").toString(),
is("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL"));
@@ -71,7 +70,7 @@ public final class DataSourceConverterTest {
@Test
public void assertGetDataSource() {
- HikariDataSource actual = (HikariDataSource)
DataSourceConverter.getDataSource(createDataSourceConfiguration());
+ HikariDataSource actual = (HikariDataSource)
DataSourcePoolCreatorUtil.getDataSource(createDataSourceConfiguration());
assertThat(actual.getDriverClassName(), is("org.h2.Driver"));
assertThat(actual.getJdbcUrl(),
is("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL"));
assertThat(actual.getUsername(), is("root"));
@@ -91,7 +90,7 @@ public final class DataSourceConverterTest {
props.put("loginTimeout", "5000");
DataSourceConfiguration dataSourceConfig = new
DataSourceConfiguration(HikariDataSource.class.getName());
dataSourceConfig.getProps().putAll(props);
- HikariDataSource actual = (HikariDataSource)
DataSourceConverter.getDataSource(dataSourceConfig);
+ HikariDataSource actual = (HikariDataSource)
DataSourcePoolCreatorUtil.getDataSource(dataSourceConfig);
assertThat(actual.getDriverClassName(), is("org.h2.Driver"));
assertThat(actual.getJdbcUrl(),
is("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL"));
assertThat(actual.getUsername(), is("root"));
diff --git
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/creator/impl/StandardPipelineDataSourceCreator.java
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/creator/impl/StandardPipelineDataSourceCreator.java
index 89421b3..b452585 100644
---
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/creator/impl/StandardPipelineDataSourceCreator.java
+++
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/creator/impl/StandardPipelineDataSourceCreator.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.data.pipeline.core.datasource.creator.impl;
import
org.apache.shardingsphere.data.pipeline.api.datasource.config.impl.StandardPipelineDataSourceConfiguration;
import
org.apache.shardingsphere.data.pipeline.core.datasource.creator.PipelineDataSourceCreator;
import
org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration;
-import org.apache.shardingsphere.infra.config.datasource.DataSourceConverter;
+import
org.apache.shardingsphere.infra.config.datasource.pool.creator.DataSourcePoolCreatorUtil;
import javax.sql.DataSource;
@@ -31,7 +31,7 @@ public final class StandardPipelineDataSourceCreator
implements PipelineDataSour
@Override
public DataSource createPipelineDataSource(final Object
pipelineDataSourceConfig) {
- return DataSourceConverter.getDataSource((DataSourceConfiguration)
pipelineDataSourceConfig);
+ return
DataSourcePoolCreatorUtil.getDataSource((DataSourceConfiguration)
pipelineDataSourceConfig);
}
@Override
diff --git
a/shardingsphere-kernel/shardingsphere-traffic/shardingsphere-traffic-core/src/main/java/org/apache/shardingsphere/traffic/executor/jdbc/JDBCTrafficExecutor.java
b/shardingsphere-kernel/shardingsphere-traffic/shardingsphere-traffic-core/src/main/java/org/apache/shardingsphere/traffic/executor/jdbc/JDBCTrafficExecutor.java
index 9a3d9b8..da32581 100644
---
a/shardingsphere-kernel/shardingsphere-traffic/shardingsphere-traffic-core/src/main/java/org/apache/shardingsphere/traffic/executor/jdbc/JDBCTrafficExecutor.java
+++
b/shardingsphere-kernel/shardingsphere-traffic/shardingsphere-traffic-core/src/main/java/org/apache/shardingsphere/traffic/executor/jdbc/JDBCTrafficExecutor.java
@@ -21,7 +21,7 @@ import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.binder.LogicSQL;
import
org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration;
import
org.apache.shardingsphere.infra.config.datasource.DataSourceConfigurationValidator;
-import org.apache.shardingsphere.infra.config.datasource.DataSourceConverter;
+import
org.apache.shardingsphere.infra.config.datasource.pool.creator.DataSourcePoolCreatorUtil;
import org.apache.shardingsphere.traffic.executor.TrafficExecutor;
import javax.sql.DataSource;
@@ -49,7 +49,7 @@ public final class JDBCTrafficExecutor implements
TrafficExecutor {
@Override
public ResultSet executeQuery(final LogicSQL logicSQL, final
DataSourceConfiguration dataSourceConfig) throws SQLException {
dataSourceConfigValidator.validate(createDataSourceConfigs(dataSourceConfig));
- DataSource dataSource =
DataSourceConverter.getDataSource(dataSourceConfig);
+ DataSource dataSource =
DataSourcePoolCreatorUtil.getDataSource(dataSourceConfig);
Connection connection = dataSource.getConnection();
PreparedStatement statement =
connection.prepareStatement(logicSQL.getSql());
this.statement = statement;
diff --git
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
index e19b106..7cc0276 100644
---
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
+++
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
@@ -22,7 +22,7 @@ import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
import
org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration;
-import org.apache.shardingsphere.infra.config.datasource.DataSourceConverter;
+import
org.apache.shardingsphere.infra.config.datasource.pool.creator.DataSourcePoolCreatorUtil;
import
org.apache.shardingsphere.infra.config.properties.ConfigurationProperties;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import
org.apache.shardingsphere.infra.federation.optimizer.context.planner.OptimizerPlannerContextFactory;
@@ -377,7 +377,7 @@ public final class ContextManager implements AutoCloseable {
}
private boolean isModifiedDataSource(final Map<String, DataSource>
originalDataSources, final String dataSourceName, final DataSourceConfiguration
dataSourceConfiguration) {
- DataSourceConfiguration dataSourceConfig =
DataSourceConverter.getDataSourceConfigurationMap(originalDataSources).get(dataSourceName);
+ DataSourceConfiguration dataSourceConfig =
DataSourcePoolCreatorUtil.getDataSourceConfigurationMap(originalDataSources).get(dataSourceName);
return null != dataSourceConfig &&
!dataSourceConfiguration.equals(dataSourceConfig);
}
@@ -411,7 +411,7 @@ public final class ContextManager implements AutoCloseable {
private MetaDataContexts
buildChangedMetaDataContextWithAddedDataSource(final ShardingSphereMetaData
originalMetaData,
final Map<String, DataSourceConfiguration> addedDataSourceConfigs) throws
SQLException {
Map<String, DataSource> dataSourceMap = new
HashMap<>(originalMetaData.getResource().getDataSources());
-
dataSourceMap.putAll(DataSourceConverter.getDataSourceMap(addedDataSourceConfigs));
+
dataSourceMap.putAll(DataSourcePoolCreatorUtil.getDataSourceMap(addedDataSourceConfigs));
Map<String, Map<String, DataSource>> dataSourcesMap =
Collections.singletonMap(originalMetaData.getName(), dataSourceMap);
Map<String, Collection<RuleConfiguration>> schemaRuleConfigs =
Collections.singletonMap(originalMetaData.getName(),
originalMetaData.getRuleMetaData().getConfigurations());
Properties props = metaDataContexts.getProps().getProps();
@@ -458,11 +458,11 @@ public final class ContextManager implements
AutoCloseable {
}
private Map<String, DataSource> getAddedDataSources(final
ShardingSphereMetaData originalMetaData, final Map<String,
DataSourceConfiguration> newDataSourceConfigs) {
- return
DataSourceConverter.getDataSourceMap(Maps.filterKeys(newDataSourceConfigs, each
-> !originalMetaData.getResource().getDataSources().containsKey(each)));
+ return
DataSourcePoolCreatorUtil.getDataSourceMap(Maps.filterKeys(newDataSourceConfigs,
each -> !originalMetaData.getResource().getDataSources().containsKey(each)));
}
private Map<String, DataSource> buildChangedDataSources(final
ShardingSphereMetaData originalMetaData, final Map<String,
DataSourceConfiguration> newDataSourceConfigs) {
- return
DataSourceConverter.getDataSourceMap(getChangedDataSourceConfiguration(originalMetaData,
newDataSourceConfigs));
+ return
DataSourcePoolCreatorUtil.getDataSourceMap(getChangedDataSourceConfiguration(originalMetaData,
newDataSourceConfigs));
}
private void renewTransactionContext(final String schemaName, final
ShardingSphereResource resource) {
diff --git
a/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistServiceTest.java
b/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistServiceTest.java
index 1e7f7f2..979e95a 100644
---
a/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistServiceTest.java
+++
b/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistServiceTest.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.mode.metadata.persist;
import lombok.SneakyThrows;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
import
org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration;
-import org.apache.shardingsphere.infra.config.datasource.DataSourceConverter;
+import
org.apache.shardingsphere.infra.config.datasource.pool.creator.DataSourcePoolCreatorUtil;
import
org.apache.shardingsphere.infra.config.properties.ConfigurationPropertyKey;
import org.apache.shardingsphere.mode.persist.PersistRepository;
import
org.apache.shardingsphere.mode.metadata.persist.service.impl.DataSourcePersistService;
@@ -103,7 +103,7 @@ public final class MetaDataPersistServiceTest {
private Map<String, DataSourceConfiguration>
createDataSourceConfigurations() {
return
createDataSourceMap().entrySet().stream().collect(Collectors.toMap(Entry::getKey,
entry ->
-
DataSourceConverter.getDataSourceConfiguration(entry.getValue()), (oldValue,
currentValue) -> oldValue, LinkedHashMap::new));
+
DataSourcePoolCreatorUtil.getDataSourceConfiguration(entry.getValue()),
(oldValue, currentValue) -> oldValue, LinkedHashMap::new));
}
private Map<String, DataSource> createDataSourceMap() {
diff --git
a/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/impl/DataSourceMetaDataPersistServiceTest.java
b/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/impl/DataSourceMetaDataPersistServiceTest.java
index c66122d..e333694 100644
---
a/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/impl/DataSourceMetaDataPersistServiceTest.java
+++
b/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/impl/DataSourceMetaDataPersistServiceTest.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.mode.metadata.persist.service.impl;
import lombok.SneakyThrows;
import org.apache.commons.lang3.StringUtils;
import
org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration;
-import org.apache.shardingsphere.infra.config.datasource.DataSourceConverter;
+import
org.apache.shardingsphere.infra.config.datasource.pool.creator.DataSourcePoolCreatorUtil;
import org.apache.shardingsphere.mode.persist.PersistRepository;
import org.apache.shardingsphere.test.mock.MockedDataSource;
import org.junit.Test;
@@ -55,8 +55,8 @@ public final class DataSourceMetaDataPersistServiceTest {
when(repository.get("/metadata/foo_db/dataSources")).thenReturn(readDataSourceYaml("yaml/persist/data-source.yaml"));
Map<String, DataSourceConfiguration> actual = new
DataSourcePersistService(repository).load("foo_db");
assertThat(actual.size(), is(2));
- assertDataSourceConfiguration(actual.get("ds_0"),
DataSourceConverter.getDataSourceConfiguration(createDataSource("ds_0")));
- assertDataSourceConfiguration(actual.get("ds_1"),
DataSourceConverter.getDataSourceConfiguration(createDataSource("ds_1")));
+ assertDataSourceConfiguration(actual.get("ds_0"),
DataSourcePoolCreatorUtil.getDataSourceConfiguration(createDataSource("ds_0")));
+ assertDataSourceConfiguration(actual.get("ds_1"),
DataSourcePoolCreatorUtil.getDataSourceConfiguration(createDataSource("ds_1")));
}
@SneakyThrows({IOException.class, URISyntaxException.class})
@@ -82,7 +82,7 @@ public final class DataSourceMetaDataPersistServiceTest {
@Test
public void assertAppend() {
- new DataSourcePersistService(repository).append("foo_db",
Collections.singletonMap("foo_ds",
DataSourceConverter.getDataSourceConfiguration(createDataSource("foo_ds"))));
+ new DataSourcePersistService(repository).append("foo_db",
Collections.singletonMap("foo_ds",
DataSourcePoolCreatorUtil.getDataSourceConfiguration(createDataSource("foo_ds"))));
String expected =
readDataSourceYaml("yaml/persist/data-source-foo.yaml");
verify(repository).persist("/metadata/foo_db/dataSources", expected);
}
diff --git
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
index 34fbb5e..ab190e2 100644
---
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
+++
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
@@ -21,7 +21,7 @@ import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
import
org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration;
-import org.apache.shardingsphere.infra.config.datasource.DataSourceConverter;
+import
org.apache.shardingsphere.infra.config.datasource.pool.creator.DataSourcePoolCreatorUtil;
import org.apache.shardingsphere.infra.config.mode.ModeConfiguration;
import org.apache.shardingsphere.infra.metadata.schema.QualifiedSchema;
import org.apache.shardingsphere.infra.metadata.schema.ShardingSphereSchema;
@@ -48,8 +48,8 @@ import
org.apache.shardingsphere.transaction.context.TransactionContextsBuilder;
import javax.sql.DataSource;
import java.sql.SQLException;
-import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -95,7 +95,7 @@ public final class ClusterContextManagerBuilder implements
ContextManagerBuilder
ModeScheduleContextFactory.getInstance().init(modeConfig);
metaDataPersistService = new MetaDataPersistService(repository);
persistConfigurations(metaDataPersistService, dataSourcesMap,
schemaRuleConfigs, globalRuleConfigs, props, isOverwrite);
- Collection<String> schemaNames = Strings.isNullOrEmpty(schemaName) ?
metaDataPersistService.getSchemaMetaDataService().loadAllNames() :
Arrays.asList(schemaName);
+ Collection<String> schemaNames = Strings.isNullOrEmpty(schemaName) ?
metaDataPersistService.getSchemaMetaDataService().loadAllNames() :
Collections.singletonList(schemaName);
Map<String, Map<String, DataSource>> clusterDataSources =
loadDataSourcesMap(metaDataPersistService, dataSourcesMap, schemaNames);
Map<String, Collection<RuleConfiguration>> clusterSchemaRuleConfigs =
loadSchemaRules(metaDataPersistService, schemaNames);
Properties clusterProps =
metaDataPersistService.getPropsService().load();
@@ -144,7 +144,7 @@ public final class ClusterContextManagerBuilder implements
ContextManagerBuilder
private Map<String, Map<String, DataSourceConfiguration>>
getDataSourceConfigurations(final Map<String, Map<String, DataSource>>
dataSourcesMap) {
Map<String, Map<String, DataSourceConfiguration>> result = new
LinkedHashMap<>(dataSourcesMap.size(), 1);
for (Entry<String, Map<String, DataSource>> entry :
dataSourcesMap.entrySet()) {
- result.put(entry.getKey(),
DataSourceConverter.getDataSourceConfigurationMap(entry.getValue()));
+ result.put(entry.getKey(),
DataSourcePoolCreatorUtil.getDataSourceConfigurationMap(entry.getValue()));
}
return result;
}
@@ -193,7 +193,7 @@ public final class ClusterContextManagerBuilder implements
ContextManagerBuilder
private Map<String, DataSourceConfiguration>
getChangedDataSourcesConfigurations(final Map<String, DataSource>
dataSourceMap,
final Map<String, DataSourceConfiguration>
loadedDataSourceConfigurationMap) {
- Map<String, DataSourceConfiguration> dataSourceConfigurationMap =
DataSourceConverter.getDataSourceConfigurationMap(dataSourceMap);
+ Map<String, DataSourceConfiguration> dataSourceConfigurationMap =
DataSourcePoolCreatorUtil.getDataSourceConfigurationMap(dataSourceMap);
return
loadedDataSourceConfigurationMap.entrySet().stream().filter(entry ->
!dataSourceConfigurationMap.containsKey(entry.getKey())
||
!dataSourceConfigurationMap.get(entry.getKey()).equals(entry.getValue())).collect(Collectors.toMap(Entry::getKey,
Entry::getValue));
}
@@ -206,7 +206,7 @@ public final class ClusterContextManagerBuilder implements
ContextManagerBuilder
private Map<String, Map<String, DataSource>> getChangedDataSources(final
Map<String, Map<String, DataSourceConfiguration>>
changedDataSourceConfigurations) {
Map<String, Map<String, DataSource>> result = new
LinkedHashMap<>(changedDataSourceConfigurations.size(), 1);
for (Entry<String, Map<String, DataSourceConfiguration>> entry :
changedDataSourceConfigurations.entrySet()) {
- result.put(entry.getKey(),
DataSourceConverter.getDataSourceMap(entry.getValue()));
+ result.put(entry.getKey(),
DataSourcePoolCreatorUtil.getDataSourceMap(entry.getValue()));
}
return result;
}
diff --git
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinatorTest.java
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinatorTest.java
index 5fec6be..80404a4 100644
---
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinatorTest.java
+++
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinatorTest.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.authority.rule.AuthorityRule;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
import
org.apache.shardingsphere.infra.config.algorithm.ShardingSphereAlgorithmConfiguration;
import
org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration;
-import org.apache.shardingsphere.infra.config.datasource.DataSourceConverter;
+import
org.apache.shardingsphere.infra.config.datasource.pool.creator.DataSourcePoolCreatorUtil;
import org.apache.shardingsphere.infra.config.mode.ModeConfiguration;
import
org.apache.shardingsphere.infra.config.mode.PersistRepositoryConfiguration;
import
org.apache.shardingsphere.infra.config.properties.ConfigurationProperties;
@@ -129,9 +129,9 @@ public final class ClusterContextManagerCoordinatorTest {
private Map<String, DataSourceConfiguration> getDataSourceConfigurations()
{
MockedDataSource dataSource = new MockedDataSource();
Map<String, DataSourceConfiguration> result = new LinkedHashMap<>(3,
1);
- result.put("primary_ds",
DataSourceConverter.getDataSourceConfiguration(dataSource));
- result.put("ds_0",
DataSourceConverter.getDataSourceConfiguration(dataSource));
- result.put("ds_1",
DataSourceConverter.getDataSourceConfiguration(dataSource));
+ result.put("primary_ds",
DataSourcePoolCreatorUtil.getDataSourceConfiguration(dataSource));
+ result.put("ds_0",
DataSourcePoolCreatorUtil.getDataSourceConfiguration(dataSource));
+ result.put("ds_1",
DataSourcePoolCreatorUtil.getDataSourceConfiguration(dataSource));
return result;
}
@@ -184,9 +184,9 @@ public final class ClusterContextManagerCoordinatorTest {
private Map<String, DataSourceConfiguration>
getChangedDataSourceConfigurations() {
MockedDataSource dataSource = new MockedDataSource();
Map<String, DataSourceConfiguration> result = new LinkedHashMap<>(3,
1);
- result.put("primary_ds",
DataSourceConverter.getDataSourceConfiguration(dataSource));
- result.put("ds_1",
DataSourceConverter.getDataSourceConfiguration(dataSource));
- result.put("ds_2",
DataSourceConverter.getDataSourceConfiguration(dataSource));
+ result.put("primary_ds",
DataSourcePoolCreatorUtil.getDataSourceConfiguration(dataSource));
+ result.put("ds_1",
DataSourcePoolCreatorUtil.getDataSourceConfiguration(dataSource));
+ result.put("ds_2",
DataSourcePoolCreatorUtil.getDataSourceConfiguration(dataSource));
return result;
}
diff --git
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java
index 778a49b..6a0fd90 100644
---
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java
+++
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.mode.manager.standalone;
import com.google.common.base.Strings;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
import
org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration;
-import org.apache.shardingsphere.infra.config.datasource.DataSourceConverter;
+import
org.apache.shardingsphere.infra.config.datasource.pool.creator.DataSourcePoolCreatorUtil;
import org.apache.shardingsphere.infra.config.mode.ModeConfiguration;
import
org.apache.shardingsphere.infra.config.mode.PersistRepositoryConfiguration;
import org.apache.shardingsphere.infra.metadata.schema.ShardingSphereSchema;
@@ -42,8 +42,8 @@ import
org.apache.shardingsphere.transaction.context.TransactionContextsBuilder;
import javax.sql.DataSource;
import java.sql.SQLException;
-import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -68,7 +68,7 @@ public final class StandaloneContextManagerBuilder implements
ContextManagerBuil
StandalonePersistRepository repository =
TypedSPIRegistry.getRegisteredService(StandalonePersistRepository.class,
repositoryConfig.getType(), repositoryConfig.getProps());
MetaDataPersistService metaDataPersistService = new
MetaDataPersistService(repository);
persistConfigurations(metaDataPersistService, dataSourcesMap,
schemaRuleConfigs, globalRuleConfigs, props, isOverwrite);
- Collection<String> schemaNames = Strings.isNullOrEmpty(schemaName) ?
metaDataPersistService.getSchemaMetaDataService().loadAllNames() :
Arrays.asList(schemaName);
+ Collection<String> schemaNames = Strings.isNullOrEmpty(schemaName) ?
metaDataPersistService.getSchemaMetaDataService().loadAllNames() :
Collections.singletonList(schemaName);
Map<String, Map<String, DataSource>> standaloneDataSources =
loadDataSourcesMap(metaDataPersistService, dataSourcesMap, schemaNames);
Map<String, Collection<RuleConfiguration>> standaloneSchemaRules =
loadSchemaRules(metaDataPersistService, schemaNames);
Properties standaloneProps =
metaDataPersistService.getPropsService().load();
@@ -106,7 +106,7 @@ public final class StandaloneContextManagerBuilder
implements ContextManagerBuil
private Map<String, Map<String, DataSourceConfiguration>>
getDataSourceConfigurations(final Map<String, Map<String, DataSource>>
dataSourcesMap) {
Map<String, Map<String, DataSourceConfiguration>> result = new
LinkedHashMap<>(dataSourcesMap.size(), 1);
for (Entry<String, Map<String, DataSource>> entry :
dataSourcesMap.entrySet()) {
- result.put(entry.getKey(),
DataSourceConverter.getDataSourceConfigurationMap(entry.getValue()));
+ result.put(entry.getKey(),
DataSourcePoolCreatorUtil.getDataSourceConfigurationMap(entry.getValue()));
}
return result;
}
@@ -155,7 +155,7 @@ public final class StandaloneContextManagerBuilder
implements ContextManagerBuil
private Map<String, DataSourceConfiguration>
getChangedDataSourcesConfigurations(final Map<String, DataSource> dataSourceMap,
final Map<String, DataSourceConfiguration>
loadedDataSourceConfigurationMap) {
- Map<String, DataSourceConfiguration> dataSourceConfigurationMap =
DataSourceConverter.getDataSourceConfigurationMap(dataSourceMap);
+ Map<String, DataSourceConfiguration> dataSourceConfigurationMap =
DataSourcePoolCreatorUtil.getDataSourceConfigurationMap(dataSourceMap);
return
loadedDataSourceConfigurationMap.entrySet().stream().filter(entry ->
!dataSourceConfigurationMap.containsKey(entry.getKey())
||
!dataSourceConfigurationMap.get(entry.getKey()).equals(entry.getValue())).collect(Collectors.toMap(Entry::getKey,
Entry::getValue));
}
@@ -163,7 +163,7 @@ public final class StandaloneContextManagerBuilder
implements ContextManagerBuil
private Map<String, Map<String, DataSource>> getChangedDataSources(final
Map<String, Map<String, DataSourceConfiguration>>
changedDataSourceConfigurations) {
Map<String, Map<String, DataSource>> result = new
LinkedHashMap<>(changedDataSourceConfigurations.size(), 1);
for (Entry<String, Map<String, DataSourceConfiguration>> entry :
changedDataSourceConfigurations.entrySet()) {
- result.put(entry.getKey(),
DataSourceConverter.getDataSourceMap(entry.getValue()));
+ result.put(entry.getKey(),
DataSourcePoolCreatorUtil.getDataSourceMap(entry.getValue()));
}
return result;
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/resource/DataSourceQueryResultSet.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/resource/DataSourceQueryResultSet.java
index d19b947..a861004 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/resource/DataSourceQueryResultSet.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rql/resource/DataSourceQueryResultSet.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.proxy.backend.text.distsql.rql.resource;
import com.google.gson.Gson;
import
org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowResourcesStatement;
import
org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration;
-import org.apache.shardingsphere.infra.config.datasource.DataSourceConverter;
+import
org.apache.shardingsphere.infra.config.datasource.pool.creator.DataSourcePoolCreatorUtil;
import org.apache.shardingsphere.infra.config.datasource.DataSourceParameter;
import org.apache.shardingsphere.infra.database.metadata.DataSourceMetaData;
import org.apache.shardingsphere.infra.distsql.query.DistSQLResultSet;
@@ -54,7 +54,7 @@ public final class DataSourceQueryResultSet implements
DistSQLResultSet {
Optional<MetaDataPersistService> persistService =
ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaDataPersistService();
Map<String, DataSourceConfiguration> dataSourceConfigs =
persistService.isPresent()
?
persistService.get().getDataSourceService().load(metaData.getName())
- :
DataSourceConverter.getDataSourceConfigurationMap(metaData.getResource().getDataSources());
+ :
DataSourcePoolCreatorUtil.getDataSourceConfigurationMap(metaData.getResource().getDataSources());
dataSourceParameterMap =
DataSourceQueryResultSetConverter.covert(dataSourceConfigs);
dataSourceNames = dataSourceParameterMap.keySet().iterator();
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/BootstrapInitializer.java
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/BootstrapInitializer.java
index b5f017e..2f718a0 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/BootstrapInitializer.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/BootstrapInitializer.java
@@ -25,7 +25,7 @@ import
org.apache.shardingsphere.data.pipeline.scenario.rulealtered.RuleAlteredJ
import org.apache.shardingsphere.db.protocol.CommonConstants;
import org.apache.shardingsphere.db.protocol.mysql.constant.MySQLServerInfo;
import
org.apache.shardingsphere.db.protocol.postgresql.constant.PostgreSQLServerInfo;
-import org.apache.shardingsphere.infra.config.datasource.DataSourceConverter;
+import
org.apache.shardingsphere.infra.config.datasource.pool.creator.DataSourcePoolCreatorUtil;
import org.apache.shardingsphere.infra.config.datasource.DataSourceParameter;
import org.apache.shardingsphere.infra.config.mode.ModeConfiguration;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
@@ -83,7 +83,7 @@ public final class BootstrapInitializer {
private Map<String, Map<String, DataSource>> getDataSourcesMap(final
Map<String, Map<String, DataSourceParameter>> dataSourceParametersMap) {
Map<String, Map<String, DataSource>> result = new
LinkedHashMap<>(dataSourceParametersMap.size(), 1);
for (Entry<String, Map<String, DataSourceParameter>> entry :
dataSourceParametersMap.entrySet()) {
- result.put(entry.getKey(),
DataSourceConverter.getDataSourceMap(DataSourceParameterConverter.getDataSourceConfigurationMap(entry.getValue())));
+ result.put(entry.getKey(),
DataSourcePoolCreatorUtil.getDataSourceMap(DataSourceParameterConverter.getDataSourceConfigurationMap(entry.getValue())));
}
return result;
}
