This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 26e1828 Move DataSourcePoolCreatorUtil.getDataSourceMap() to
DataSourcePoolCreator (#14792)
26e1828 is described below
commit 26e1828b9dfa68466a09bb0f45bb93e8e9366691
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Jan 15 00:11:47 2022 +0800
Move DataSourcePoolCreatorUtil.getDataSourceMap() to DataSourcePoolCreator
(#14792)
* Move DataSourcePoolCreatorUtil.getDataSourceMap() to DataSourcePoolCreator
* Fix test cases
---
.../pool/creator/DataSourcePoolCreator.java | 13 ++++++++++
.../pool/creator/DataSourcePoolCreatorUtil.java | 10 +++-----
.../YamlDataSourceConfigurationSwapper.java | 4 +--
.../creator/DataSourcePoolCreatorUtilTest.java | 29 +--------------------
.../impl/DefaultDataSourcePoolCreatorTest.java | 30 +++++++++++++++++-----
.../jdbc/core/connection/ConnectionManager.java | 4 +--
.../core/connection/ConnectionManagerTest.java | 11 ++++----
.../mode/manager/ContextManager.java | 9 ++++---
.../proxy/initializer/BootstrapInitializer.java | 4 +--
9 files changed, 59 insertions(+), 55 deletions(-)
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/DataSourcePoolCreator.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/DataSourcePoolCreator.java
index 02e26b0..0c43fc8 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/DataSourcePoolCreator.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/DataSourcePoolCreator.java
@@ -25,7 +25,10 @@ import
org.apache.shardingsphere.infra.config.datasource.pool.metadata.DataSourc
import
org.apache.shardingsphere.infra.config.datasource.props.DataSourceProperties;
import javax.sql.DataSource;
+import java.util.LinkedHashMap;
+import java.util.Map;
import java.util.Map.Entry;
+import java.util.stream.Collectors;
/**
* Data source pool creator.
@@ -34,6 +37,16 @@ import java.util.Map.Entry;
public final class DataSourcePoolCreator {
/**
+ * Create data sources.
+ *
+ * @param dataSourcePropsMap data source properties map
+ * @return created data sources
+ */
+ public static Map<String, DataSource> create(final Map<String,
DataSourceProperties> dataSourcePropsMap) {
+ return
dataSourcePropsMap.entrySet().stream().collect(Collectors.toMap(Entry::getKey,
entry -> create(entry.getValue()), (a, b) -> b, LinkedHashMap::new));
+ }
+
+ /**
* Create data source.
*
* @param dataSourceProps data source properties
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/DataSourcePoolCreatorUtil.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/DataSourcePoolCreatorUtil.java
index d6d3d2d..7461fd4 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/DataSourcePoolCreatorUtil.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/DataSourcePoolCreatorUtil.java
@@ -37,22 +37,20 @@ public final class DataSourcePoolCreatorUtil {
/**
* Get data source map.
*
- * @param dataSourcePropsMap data source configuration map
+ * @param dataSourcePropsMap data source properties map
* @return data source map
*/
public static Map<String, DataSource> getDataSourceMap(final Map<String,
DataSourceProperties> dataSourcePropsMap) {
- return dataSourcePropsMap.entrySet().stream().collect(
- Collectors.toMap(Entry::getKey, entry ->
DataSourcePoolCreator.create(entry.getValue()), (oldValue, currentValue) ->
oldValue, LinkedHashMap::new));
+ return
dataSourcePropsMap.entrySet().stream().collect(Collectors.toMap(Entry::getKey,
entry -> DataSourcePoolCreator.create(entry.getValue()), (a, b) -> b,
LinkedHashMap::new));
}
/**
* Get data source configuration map.
*
* @param dataSourceMap data source map
- * @return data source configuration map
+ * @return data source properties map
*/
public static Map<String, DataSourceProperties>
getDataSourcePropertiesMap(final Map<String, DataSource> dataSourceMap) {
- return dataSourceMap.entrySet().stream().collect(
- Collectors.toMap(Entry::getKey, entry ->
DataSourcePropertiesCreator.create(entry.getValue()), (oldValue, currentValue)
-> oldValue, LinkedHashMap::new));
+ return
dataSourceMap.entrySet().stream().collect(Collectors.toMap(Entry::getKey, entry
-> DataSourcePropertiesCreator.create(entry.getValue()), (a, b) -> b,
LinkedHashMap::new));
}
}
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 1f85d30..9e8869f1 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
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.infra.yaml.config.swapper;
import com.google.common.base.Preconditions;
+import
org.apache.shardingsphere.infra.config.datasource.pool.creator.DataSourcePoolCreator;
import
org.apache.shardingsphere.infra.config.datasource.props.DataSourceProperties;
-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
DataSourcePoolCreatorUtil.getDataSourceMap(yamlDataSources.entrySet().stream().collect(Collectors.toMap(Entry::getKey,
entry -> swapToDataSourceProperties(entry.getValue()))));
+ return
DataSourcePoolCreator.create(yamlDataSources.entrySet().stream().collect(Collectors.toMap(Entry::getKey,
entry -> swapToDataSourceProperties(entry.getValue()))));
}
/**
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/DataSourcePoolCreatorUtilTest.java
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/DataSourcePoolCreatorUtilTest.java
index e41e1d4..7dcfd69 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/DataSourcePoolCreatorUtilTest.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/DataSourcePoolCreatorUtilTest.java
@@ -17,14 +17,11 @@
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.props.DataSourceProperties;
-import org.apache.shardingsphere.test.mock.MockedDataSource;
import org.junit.Test;
import javax.sql.DataSource;
-import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -35,15 +32,7 @@ import static org.junit.Assert.assertThat;
public final class DataSourcePoolCreatorUtilTest {
@Test
- public void assertGetDataSourceMap() {
- Map<String, DataSourceProperties> dataSourcePropsMap = new
HashMap<>(1, 1);
- dataSourcePropsMap.put("ds_0", createDataSourceProperties());
- Map<String, DataSource> actual =
DataSourcePoolCreatorUtil.getDataSourceMap(dataSourcePropsMap);
- assertThat(actual.size(), is(1));
- }
-
- @Test
- public void assertGetDataSourceConfigurationMap() {
+ public void assertGetDataSourcePropertiesMap() {
Map<String, DataSourceProperties> actual =
DataSourcePoolCreatorUtil.getDataSourcePropertiesMap(createDataSourceMap());
assertThat(actual.size(), is(2));
assertNotNull(actual.get("ds_0"));
@@ -65,20 +54,4 @@ public final class DataSourcePoolCreatorUtilTest {
result.setPassword("root");
return result;
}
-
- private DataSourceProperties createDataSourceProperties() {
- Map<String, Object> props = new HashMap<>(16, 1);
- props.put("driverClassName",
MockedDataSource.class.getCanonicalName());
- props.put("jdbcUrl", "jdbc:mock://127.0.0.1/foo_ds");
- props.put("username", "root");
- props.put("password", "root");
- props.put("loginTimeout", "5000");
- props.put("maximumPoolSize", "50");
- props.put("minimumIdle", "1");
- props.put("maxLifetime", "60000");
- props.put("test", "test");
- DataSourceProperties result = new
DataSourceProperties(HikariDataSource.class.getName());
- result.getProps().putAll(props);
- return result;
- }
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/datasource/pool/metadata/impl/DefaultDataSourcePoolCreatorTest.java
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/datasource/pool/metadata/impl/DefaultDataSourcePoolCreatorTest.java
index 3e7f24c..0a5362b 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/datasource/pool/metadata/impl/DefaultDataSourcePoolCreatorTest.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/datasource/pool/metadata/impl/DefaultDataSourcePoolCreatorTest.java
@@ -20,28 +20,46 @@ package
org.apache.shardingsphere.infra.config.datasource.pool.metadata.impl;
import org.apache.commons.dbcp2.BasicDataSource;
import
org.apache.shardingsphere.infra.config.datasource.pool.creator.DataSourcePoolCreator;
import
org.apache.shardingsphere.infra.config.datasource.props.DataSourceProperties;
+import org.apache.shardingsphere.test.mock.MockedDataSource;
import org.junit.Test;
+import javax.sql.DataSource;
+import java.util.HashMap;
+import java.util.Map;
+
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
public final class DefaultDataSourcePoolCreatorTest {
@Test
+ public void assertCreateMap() {
+ Map<String, DataSourceProperties> dataSourcePropsMap = new
HashMap<>(1, 1);
+ dataSourcePropsMap.put("foo_ds", createDataSourceProperties());
+ Map<String, DataSource> actual =
DataSourcePoolCreator.create(dataSourcePropsMap);
+ assertThat(actual.size(), is(1));
+ assertDataSource((BasicDataSource) actual.get("foo_ds"));
+ }
+
+ @Test
public void assertCreate() {
BasicDataSource actual = (BasicDataSource)
DataSourcePoolCreator.create(createDataSourceProperties());
- assertThat(actual.getDriverClassName(), is("org.h2.Driver"));
- assertThat(actual.getUrl(),
is("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL"));
- assertThat(actual.getUsername(), is("root"));
- assertThat(actual.getPassword(), is("root"));
+ assertThat(actual.getDriverClassName(),
is(MockedDataSource.class.getName()));
+ assertDataSource(actual);
}
private DataSourceProperties createDataSourceProperties() {
DataSourceProperties result = new
DataSourceProperties(BasicDataSource.class.getName());
- result.getProps().put("driverClassName", "org.h2.Driver");
- result.getProps().put("url",
"jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL");
+ result.getProps().put("driverClassName",
MockedDataSource.class.getName());
+ result.getProps().put("url", "jdbc:mock://127.0.0.1/foo_ds");
result.getProps().put("username", "root");
result.getProps().put("password", "root");
return result;
}
+
+ private void assertDataSource(final BasicDataSource actual) {
+ assertThat(actual.getUrl(), is("jdbc:mock://127.0.0.1/foo_ds"));
+ assertThat(actual.getUsername(), is("root"));
+ assertThat(actual.getPassword(), is("root"));
+ }
}
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManager.java
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManager.java
index 29ee9c2..732d748 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManager.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManager.java
@@ -25,8 +25,8 @@ import com.zaxxer.hikari.HikariDataSource;
import lombok.Getter;
import
org.apache.shardingsphere.driver.jdbc.adapter.executor.ForceExecuteTemplate;
import
org.apache.shardingsphere.driver.jdbc.adapter.invocation.MethodInvocationRecorder;
+import
org.apache.shardingsphere.infra.config.datasource.pool.creator.DataSourcePoolCreator;
import
org.apache.shardingsphere.infra.config.datasource.props.DataSourceProperties;
-import
org.apache.shardingsphere.infra.config.datasource.pool.creator.DataSourcePoolCreatorUtil;
import org.apache.shardingsphere.infra.database.metadata.DataSourceMetaData;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeRegistry;
import
org.apache.shardingsphere.infra.executor.sql.execute.engine.ConnectionMode;
@@ -97,7 +97,7 @@ public final class ConnectionManager implements
ExecutorJDBCManager, AutoCloseab
DataSourceProperties dataSourcePropsSample =
dataSourcePropsMap.values().iterator().next();
Collection<ShardingSphereUser> users =
metaDataPersistService.get().getGlobalRuleService().loadUsers();
Collection<ComputeNodeInstance> instances =
metaDataPersistService.get().getComputeNodePersistService().loadComputeNodeInstances(InstanceType.PROXY,
trafficRule.get().getLabels());
- return
DataSourcePoolCreatorUtil.getDataSourceMap(createDataSourcePropertiesMap(instances,
users, dataSourcePropsSample, schema));
+ return
DataSourcePoolCreator.create(createDataSourcePropertiesMap(instances, users,
dataSourcePropsSample, schema));
}
private Map<String, DataSourceProperties>
createDataSourcePropertiesMap(final Collection<ComputeNodeInstance> instances,
final Collection<ShardingSphereUser> users,
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManagerTest.java
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManagerTest.java
index 1641e00..ffa0871 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManagerTest.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManagerTest.java
@@ -19,8 +19,8 @@ package org.apache.shardingsphere.driver.jdbc.core.connection;
import com.google.common.collect.Sets;
import com.zaxxer.hikari.HikariDataSource;
+import
org.apache.shardingsphere.infra.config.datasource.pool.creator.DataSourcePoolCreator;
import
org.apache.shardingsphere.infra.config.datasource.props.DataSourceProperties;
-import
org.apache.shardingsphere.infra.config.datasource.pool.creator.DataSourcePoolCreatorUtil;
import org.apache.shardingsphere.infra.database.DefaultSchema;
import
org.apache.shardingsphere.infra.executor.sql.execute.engine.ConnectionMode;
import org.apache.shardingsphere.infra.instance.ComputeNodeInstance;
@@ -60,7 +60,7 @@ public final class ConnectionManagerTest {
private ConnectionManager connectionManager;
- private MockedStatic<DataSourcePoolCreatorUtil> dataSourcePoolCreatorUtil;
+ private MockedStatic<DataSourcePoolCreator> dataSourcePoolCreator;
@Before
public void setUp() throws SQLException {
@@ -69,9 +69,10 @@ public final class ConnectionManagerTest {
@After
public void cleanUp() {
- dataSourcePoolCreatorUtil.close();
+ dataSourcePoolCreator.close();
}
+ @SuppressWarnings({"unchecked", "rawtypes"})
private ContextManager mockContextManager() throws SQLException {
ContextManager result = mock(ContextManager.class, RETURNS_DEEP_STUBS);
Map<String, DataSource> dataSourceMap = mockDataSourceMap();
@@ -81,9 +82,9 @@ public final class ConnectionManagerTest {
when(result.getMetaDataContexts().getMetaDataPersistService()).thenReturn(Optional.of(metaDataPersistService));
when(result.getMetaDataContexts().getGlobalRuleMetaData().findSingleRule(TransactionRule.class)).thenReturn(Optional.empty());
when(result.getMetaDataContexts().getGlobalRuleMetaData().findSingleRule(TrafficRule.class)).thenReturn(Optional.of(trafficRule));
- dataSourcePoolCreatorUtil =
mockStatic(DataSourcePoolCreatorUtil.class);
+ dataSourcePoolCreator = mockStatic(DataSourcePoolCreator.class);
Map<String, DataSource> trafficDataSourceMap =
mockTrafficDataSourceMap();
-
when(DataSourcePoolCreatorUtil.getDataSourceMap(any())).thenReturn(trafficDataSourceMap);
+ when(DataSourcePoolCreator.create((Map)
any())).thenReturn(trafficDataSourceMap);
return result;
}
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 f3eb74e..29203d2 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
@@ -21,8 +21,9 @@ import com.google.common.collect.Maps;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
-import
org.apache.shardingsphere.infra.config.datasource.props.DataSourceProperties;
+import
org.apache.shardingsphere.infra.config.datasource.pool.creator.DataSourcePoolCreator;
import
org.apache.shardingsphere.infra.config.datasource.pool.creator.DataSourcePoolCreatorUtil;
+import
org.apache.shardingsphere.infra.config.datasource.props.DataSourceProperties;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import
org.apache.shardingsphere.infra.federation.optimizer.context.planner.OptimizerPlannerContextFactory;
@@ -408,7 +409,7 @@ public final class ContextManager implements AutoCloseable {
private MetaDataContexts
buildChangedMetaDataContextWithAddedDataSource(final ShardingSphereMetaData
originalMetaData,
final Map<String, DataSourceProperties> addedDataSourceProps) throws
SQLException {
Map<String, DataSource> dataSourceMap = new
HashMap<>(originalMetaData.getResource().getDataSources());
-
dataSourceMap.putAll(DataSourcePoolCreatorUtil.getDataSourceMap(addedDataSourceProps));
+
dataSourceMap.putAll(DataSourcePoolCreator.create(addedDataSourceProps));
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();
@@ -455,11 +456,11 @@ public final class ContextManager implements
AutoCloseable {
}
private Map<String, DataSource> getAddedDataSources(final
ShardingSphereMetaData originalMetaData, final Map<String,
DataSourceProperties> newDataSourcePropsMap) {
- return
DataSourcePoolCreatorUtil.getDataSourceMap(Maps.filterKeys(newDataSourcePropsMap,
each -> !originalMetaData.getResource().getDataSources().containsKey(each)));
+ return
DataSourcePoolCreator.create(Maps.filterKeys(newDataSourcePropsMap, each ->
!originalMetaData.getResource().getDataSources().containsKey(each)));
}
private Map<String, DataSource> buildChangedDataSources(final
ShardingSphereMetaData originalMetaData, final Map<String,
DataSourceProperties> newDataSourcePropsMap) {
- return
DataSourcePoolCreatorUtil.getDataSourceMap(getChangedDataSourceConfiguration(originalMetaData,
newDataSourcePropsMap));
+ return
DataSourcePoolCreator.create(getChangedDataSourceConfiguration(originalMetaData,
newDataSourcePropsMap));
}
private void renewTransactionContext(final String schemaName, final
ShardingSphereResource resource) {
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 373eca1..9c27c6a 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
@@ -26,7 +26,7 @@ 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.autogen.version.ShardingSphereVersion;
-import
org.apache.shardingsphere.infra.config.datasource.pool.creator.DataSourcePoolCreatorUtil;
+import
org.apache.shardingsphere.infra.config.datasource.pool.creator.DataSourcePoolCreator;
import org.apache.shardingsphere.infra.config.mode.ModeConfiguration;
import org.apache.shardingsphere.infra.instance.definition.InstanceDefinition;
import org.apache.shardingsphere.infra.instance.definition.InstanceType;
@@ -92,7 +92,7 @@ public final class BootstrapInitializer {
private Map<String, Map<String, DataSource>> getDataSourcesMap(final
Map<String, Map<String, ProxyResourceConfiguration>> resourceConfigMap) {
Map<String, Map<String, DataSource>> result = new
LinkedHashMap<>(resourceConfigMap.size(), 1);
for (Entry<String, Map<String, ProxyResourceConfiguration>> entry :
resourceConfigMap.entrySet()) {
- result.put(entry.getKey(),
DataSourcePoolCreatorUtil.getDataSourceMap(ProxyResourceConfigurationConverter.getDataSourceConfigurationMap(entry.getValue())));
+ result.put(entry.getKey(),
DataSourcePoolCreator.create(ProxyResourceConfigurationConverter.getDataSourceConfigurationMap(entry.getValue())));
}
return result;
}
