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 291c506 Rename DatabaseEnvironment to DataSourceEnvironment (#9318)
291c506 is described below
commit 291c5065bb64c88613f6aa8875919c5f58678cf5
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Feb 4 16:10:37 2021 +0800
Rename DatabaseEnvironment to DataSourceEnvironment (#9318)
---
.../test/integration/engine/it/dql/BaseDQLIT.java | 2 +-
.../engine/junit/ITRunnerScheduler.java | 2 +-
.../engine/param/ParameterizedArrayFactory.java | 4 +-
.../env/IntegrationTestEnvironment.java | 46 +++++++++++-----------
.../env/database/DatabaseEnvironmentManager.java | 2 +-
...Environment.java => DataSourceEnvironment.java} | 4 +-
.../builder/ActualDataSourceBuilder.java | 28 ++++++-------
.../datasource/builder/ProxyDataSourceBuilder.java | 18 ++++-----
8 files changed, 53 insertions(+), 53 deletions(-)
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/BaseDQLIT.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/BaseDQLIT.java
index a55daa8..6375b8a 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/BaseDQLIT.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/BaseDQLIT.java
@@ -55,7 +55,7 @@ public abstract class BaseDQLIT extends SingleIT {
@BeforeClass
public static void fillData() throws IOException, JAXBException,
SQLException, ParseException {
- for (DatabaseType each :
IntegrationTestEnvironment.getInstance().getDatabaseEnvironments().keySet()) {
+ for (DatabaseType each :
IntegrationTestEnvironment.getInstance().getDataSourceEnvironments().keySet()) {
fillData(each);
}
}
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/junit/ITRunnerScheduler.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/junit/ITRunnerScheduler.java
index c407eef..4a73c26 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/junit/ITRunnerScheduler.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/junit/ITRunnerScheduler.java
@@ -48,7 +48,7 @@ public final class ITRunnerScheduler implements
RunnerScheduler {
public ITRunnerScheduler() {
IntegrationTestEnvironment itEnv =
IntegrationTestEnvironment.getInstance();
- addExecutors(itEnv.getAdapters(), itEnv.getScenarios(),
itEnv.getDatabaseEnvironments().keySet());
+ addExecutors(itEnv.getAdapters(), itEnv.getScenarios(),
itEnv.getDataSourceEnvironments().keySet());
addExecutor(DEFAULT_EXECUTOR_KEY);
}
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/param/ParameterizedArrayFactory.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/param/ParameterizedArrayFactory.java
index 9bcd2d5..7a1dc89 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/param/ParameterizedArrayFactory.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/param/ParameterizedArrayFactory.java
@@ -66,7 +66,7 @@ public final class ParameterizedArrayFactory {
private static Collection<ParameterizedArray>
getAssertionParameterizedArray(final IntegrationTestCaseContext
testCaseContext) {
Collection<ParameterizedArray> result = new LinkedList<>();
for (DatabaseType each :
getDatabaseTypes(testCaseContext.getTestCase().getDbTypes())) {
- if
(IntegrationTestEnvironment.getInstance().getDatabaseEnvironments().containsKey(each))
{
+ if
(IntegrationTestEnvironment.getInstance().getDataSourceEnvironments().containsKey(each))
{
result.addAll(getAssertionParameterizedArray(testCaseContext,
each));
}
}
@@ -122,7 +122,7 @@ public final class ParameterizedArrayFactory {
private static Collection<ParameterizedArray>
getCaseParameterizedArray(final IntegrationTestCaseContext testCaseContext) {
Collection<ParameterizedArray> result = new LinkedList<>();
for (DatabaseType each :
getDatabaseTypes(testCaseContext.getTestCase().getDbTypes())) {
- if
(IntegrationTestEnvironment.getInstance().getDatabaseEnvironments().containsKey(each))
{
+ if
(IntegrationTestEnvironment.getInstance().getDataSourceEnvironments().containsKey(each))
{
result.addAll(getCaseParameterizedArray(testCaseContext,
each));
}
}
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/IntegrationTestEnvironment.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/IntegrationTestEnvironment.java
index 7d87554..538f30c 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/IntegrationTestEnvironment.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/IntegrationTestEnvironment.java
@@ -25,7 +25,7 @@ import
org.apache.shardingsphere.infra.database.type.dialect.H2DatabaseType;
import org.apache.shardingsphere.infra.database.type.dialect.MySQLDatabaseType;
import
org.apache.shardingsphere.test.integration.env.database.DatabaseEnvironmentManager;
import
org.apache.shardingsphere.test.integration.env.database.EmbeddedDatabaseDistributionProperties;
-import
org.apache.shardingsphere.test.integration.env.datasource.DatabaseEnvironment;
+import
org.apache.shardingsphere.test.integration.env.datasource.DataSourceEnvironment;
import
org.apache.shardingsphere.test.integration.env.props.DatabaseScenarioProperties;
import
org.apache.shardingsphere.test.integration.env.props.EnvironmentProperties;
@@ -58,9 +58,9 @@ public final class IntegrationTestEnvironment {
private final Collection<String> scenarios;
- private final Map<DatabaseType, Map<String, DatabaseEnvironment>>
databaseEnvironments;
+ private final Map<DatabaseType, Map<String, DataSourceEnvironment>>
dataSourceEnvironments;
- private final Map<String, DatabaseEnvironment> proxyEnvironments;
+ private final Map<String, DataSourceEnvironment> proxyEnvironments;
private IntegrationTestEnvironment() {
Properties engineEnvProps =
EnvironmentProperties.loadProperties("env/engine-env.properties");
@@ -69,7 +69,7 @@ public final class IntegrationTestEnvironment {
runAdditionalTestCases =
Boolean.parseBoolean(engineEnvProps.getProperty("it.run.additional.cases"));
scenarios = getScenarios(engineEnvProps);
Map<String, DatabaseScenarioProperties> databaseProps =
getDatabaseScenarioProperties();
- databaseEnvironments =
createDatabaseEnvironments(getDatabaseTypes(engineEnvProps), databaseProps);
+ dataSourceEnvironments =
createDataSourceEnvironments(getDatabaseTypes(engineEnvProps), databaseProps);
if (EnvironmentType.EMBEDDED == envType) {
createEmbeddedDatabases(new
EmbeddedDatabaseDistributionProperties(EnvironmentProperties.loadProperties("env/embedded-databases.properties")));
}
@@ -80,7 +80,7 @@ public final class IntegrationTestEnvironment {
}
}
}
-
+
private EnvironmentType getEnvironmentType(final Properties
engineEnvProps) {
try {
return
EnvironmentType.valueOf(engineEnvProps.getProperty("it.env.type"));
@@ -88,7 +88,7 @@ public final class IntegrationTestEnvironment {
return EnvironmentType.EMBEDDED;
}
}
-
+
private Collection<String> getScenarios(final Properties engineEnvProps) {
Collection<String> result =
Splitter.on(",").trimResults().splitToList(engineEnvProps.getProperty("it.scenarios"));
for (String each : result) {
@@ -109,50 +109,50 @@ public final class IntegrationTestEnvironment {
return Arrays.stream(engineEnvProps.getProperty("it.databases",
"H2").split(",")).map(each ->
DatabaseTypeRegistry.getActualDatabaseType(each.trim())).collect(Collectors.toList());
}
- private Map<DatabaseType, Map<String, DatabaseEnvironment>>
createDatabaseEnvironments(final Collection<DatabaseType> databaseTypes, final
Map<String, DatabaseScenarioProperties> databaseProps) {
- Map<DatabaseType, Map<String, DatabaseEnvironment>> result = new
LinkedHashMap<>(databaseTypes.size(), 1);
+ private Map<DatabaseType, Map<String, DataSourceEnvironment>>
createDataSourceEnvironments(final Collection<DatabaseType> databaseTypes,
final Map<String, DatabaseScenarioProperties> databaseProps) {
+ Map<DatabaseType, Map<String, DataSourceEnvironment>> result = new
LinkedHashMap<>(databaseTypes.size(), 1);
for (DatabaseType each : databaseTypes) {
- Map<String, DatabaseEnvironment> databaseEnvironments = new
LinkedHashMap<>(scenarios.size(), 1);
+ Map<String, DataSourceEnvironment> dataSourceEnvs = new
LinkedHashMap<>(scenarios.size(), 1);
for (String scenario : scenarios) {
- databaseEnvironments.put(scenario,
createDatabaseEnvironment(each, databaseProps.get(scenario)));
- result.put(each, databaseEnvironments);
+ dataSourceEnvs.put(scenario, createDataSourceEnvironment(each,
databaseProps.get(scenario)));
+ result.put(each, dataSourceEnvs);
}
}
return result;
}
- private DatabaseEnvironment createDatabaseEnvironment(final DatabaseType
databaseType, final DatabaseScenarioProperties databaseProps) {
+ private DataSourceEnvironment createDataSourceEnvironment(final
DatabaseType databaseType, final DatabaseScenarioProperties databaseProps) {
if (databaseType instanceof H2DatabaseType) {
- return new DatabaseEnvironment(databaseType, "", 0, "sa", "");
+ return new DataSourceEnvironment(databaseType, "", 0, "sa", "");
}
- return new DatabaseEnvironment(databaseType,
databaseProps.getDatabaseHost(databaseType),
+ return new DataSourceEnvironment(databaseType,
databaseProps.getDatabaseHost(databaseType),
databaseProps.getDatabasePort(databaseType),
databaseProps.getDatabaseUsername(databaseType),
databaseProps.getDatabasePassword(databaseType));
}
private void createEmbeddedDatabases(final
EmbeddedDatabaseDistributionProperties embeddedDatabaseProps) {
- for (Entry<DatabaseType, Map<String, DatabaseEnvironment>> entry :
databaseEnvironments.entrySet()) {
+ for (Entry<DatabaseType, Map<String, DataSourceEnvironment>> entry :
dataSourceEnvironments.entrySet()) {
createEmbeddedDatabases(entry.getKey(), entry.getValue(),
embeddedDatabaseProps);
}
}
private void createEmbeddedDatabases(final DatabaseType databaseType,
- final Map<String,
DatabaseEnvironment> databaseEnvs, final EmbeddedDatabaseDistributionProperties
embeddedDatabaseProps) {
- for (Entry<String, DatabaseEnvironment> entry :
databaseEnvs.entrySet()) {
+ final Map<String,
DataSourceEnvironment> dataSourceEnvs, final
EmbeddedDatabaseDistributionProperties embeddedDatabaseProps) {
+ for (Entry<String, DataSourceEnvironment> entry :
dataSourceEnvs.entrySet()) {
DatabaseEnvironmentManager.createEmbeddedDatabaseResource(databaseType,
entry.getKey(), embeddedDatabaseProps, entry.getValue().getPort());
}
}
- private Map<String, DatabaseEnvironment> createProxyEnvironments(final
Map<String, DatabaseScenarioProperties> databaseProps) {
- Map<String, DatabaseEnvironment> result = new
HashMap<>(scenarios.size(), 1);
+ private Map<String, DataSourceEnvironment> createProxyEnvironments(final
Map<String, DatabaseScenarioProperties> databaseProps) {
+ Map<String, DataSourceEnvironment> result = new
HashMap<>(scenarios.size(), 1);
for (String each : scenarios) {
result.put(each, createProxyEnvironment(databaseProps.get(each)));
}
return result;
}
- private DatabaseEnvironment createProxyEnvironment(final
DatabaseScenarioProperties databaseProps) {
+ private DataSourceEnvironment createProxyEnvironment(final
DatabaseScenarioProperties databaseProps) {
// TODO hard code for MySQL, should configurable
- return new DatabaseEnvironment(
+ return new DataSourceEnvironment(
new MySQLDatabaseType(), databaseProps.getProxyHost(),
databaseProps.getProxyPort(), databaseProps.getProxyUsername(),
databaseProps.getProxyPassword());
}
@@ -169,8 +169,8 @@ public final class IntegrationTestEnvironment {
@SuppressWarnings("CallToDriverManagerGetConnection")
private boolean isProxyReady(final String scenario) {
- DatabaseEnvironment dbEnv = proxyEnvironments.get(scenario);
- try (Connection connection =
DriverManager.getConnection(dbEnv.getURL(scenario), dbEnv.getUsername(),
dbEnv.getPassword());
+ DataSourceEnvironment dataSourceEnv = proxyEnvironments.get(scenario);
+ try (Connection connection =
DriverManager.getConnection(dataSourceEnv.getURL(scenario),
dataSourceEnv.getUsername(), dataSourceEnv.getPassword());
Statement statement = connection.createStatement()) {
statement.execute("SELECT 1");
} catch (final SQLException ignore) {
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/database/DatabaseEnvironmentManager.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/database/DatabaseEnvironmentManager.java
index 1a00a33..c57cdea 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/database/DatabaseEnvironmentManager.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/database/DatabaseEnvironmentManager.java
@@ -84,7 +84,7 @@ public final class DatabaseEnvironmentManager {
}
private static void executeInitSQLs(final String scenario) throws
IOException, JAXBException, SQLException {
- for (DatabaseType each :
IntegrationTestEnvironment.getInstance().getDatabaseEnvironments().keySet()) {
+ for (DatabaseType each :
IntegrationTestEnvironment.getInstance().getDataSourceEnvironments().keySet()) {
if (each instanceof H2DatabaseType) {
executeInitSQLForSchemaNotSupportedDatabase(scenario, each);
continue;
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/datasource/DatabaseEnvironment.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/datasource/DataSourceEnvironment.java
similarity index 98%
rename from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/datasource/DatabaseEnvironment.java
rename to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/datasource/DataSourceEnvironment.java
index ec327f9..e7fce12 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/datasource/DatabaseEnvironment.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/datasource/DataSourceEnvironment.java
@@ -22,11 +22,11 @@ import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
/**
- * Database environment.
+ * Data source environment.
*/
@RequiredArgsConstructor
@Getter
-public final class DatabaseEnvironment {
+public final class DataSourceEnvironment {
private final DatabaseType databaseType;
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/datasource/builder/ActualDataSourceBuilder.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/datasource/builder/ActualDataSourceBuilder.java
index 8b1e6df..ba5fa55 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/datasource/builder/ActualDataSourceBuilder.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/datasource/builder/ActualDataSourceBuilder.java
@@ -24,7 +24,7 @@ import lombok.NoArgsConstructor;
import org.apache.commons.dbcp2.BasicDataSource;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import
org.apache.shardingsphere.test.integration.env.IntegrationTestEnvironment;
-import
org.apache.shardingsphere.test.integration.env.datasource.DatabaseEnvironment;
+import
org.apache.shardingsphere.test.integration.env.datasource.DataSourceEnvironment;
import
org.apache.shardingsphere.test.integration.env.database.DatabaseEnvironmentManager;
import javax.sql.DataSource;
@@ -83,34 +83,34 @@ public final class ActualDataSourceBuilder {
}
private static DataSource createDataSource(final String name, final String
scenario, final DatabaseType databaseType) {
- DatabaseEnvironment databaseEnvironment =
IntegrationTestEnvironment.getInstance().getDatabaseEnvironments().get(databaseType).get(scenario);
+ DataSourceEnvironment dataSourceEnv =
IntegrationTestEnvironment.getInstance().getDataSourceEnvironments().get(databaseType).get(scenario);
switch (DATA_SOURCE_POOL_TYPE) {
case DBCP:
- return createDBCP(name, databaseType, databaseEnvironment);
+ return createDBCP(name, databaseType, dataSourceEnv);
case HikariCP:
- return createHikariCP(name, databaseType, databaseEnvironment);
+ return createHikariCP(name, databaseType, dataSourceEnv);
default:
throw new
UnsupportedOperationException(DATA_SOURCE_POOL_TYPE.name());
}
}
- private static DataSource createDBCP(final String dataSourceName, final
DatabaseType databaseType, final DatabaseEnvironment databaseEnvironment) {
+ private static DataSource createDBCP(final String dataSourceName, final
DatabaseType databaseType, final DataSourceEnvironment dataSourceEnv) {
BasicDataSource result = new BasicDataSource();
- result.setDriverClassName(databaseEnvironment.getDriverClassName());
- result.setUrl(null == dataSourceName ? databaseEnvironment.getURL() :
databaseEnvironment.getURL(dataSourceName));
- result.setUsername(databaseEnvironment.getUsername());
- result.setPassword(databaseEnvironment.getPassword());
+ result.setDriverClassName(dataSourceEnv.getDriverClassName());
+ result.setUrl(null == dataSourceName ? dataSourceEnv.getURL() :
dataSourceEnv.getURL(dataSourceName));
+ result.setUsername(dataSourceEnv.getUsername());
+ result.setPassword(dataSourceEnv.getPassword());
result.setMaxTotal(2);
getConnectionInitSQL(dataSourceName, databaseType).ifPresent(optional
-> result.setConnectionInitSqls(Collections.singleton(optional)));
return result;
}
- private static DataSource createHikariCP(final String dataSourceName,
final DatabaseType databaseType, final DatabaseEnvironment databaseEnvironment)
{
+ private static DataSource createHikariCP(final String dataSourceName,
final DatabaseType databaseType, final DataSourceEnvironment dataSourceEnv) {
HikariConfig result = new HikariConfig();
- result.setDriverClassName(databaseEnvironment.getDriverClassName());
- result.setJdbcUrl(null == dataSourceName ?
databaseEnvironment.getURL() : databaseEnvironment.getURL(dataSourceName));
- result.setUsername(databaseEnvironment.getUsername());
- result.setPassword(databaseEnvironment.getPassword());
+ result.setDriverClassName(dataSourceEnv.getDriverClassName());
+ result.setJdbcUrl(null == dataSourceName ? dataSourceEnv.getURL() :
dataSourceEnv.getURL(dataSourceName));
+ result.setUsername(dataSourceEnv.getUsername());
+ result.setPassword(dataSourceEnv.getPassword());
result.setMaximumPoolSize(2);
result.setTransactionIsolation("TRANSACTION_READ_COMMITTED");
getConnectionInitSQL(dataSourceName,
databaseType).ifPresent(result::setConnectionInitSql);
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/datasource/builder/ProxyDataSourceBuilder.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/datasource/builder/ProxyDataSourceBuilder.java
index 5024a19..1fc7d2e 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/datasource/builder/ProxyDataSourceBuilder.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/datasource/builder/ProxyDataSourceBuilder.java
@@ -22,7 +22,7 @@ import com.zaxxer.hikari.HikariDataSource;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
-import
org.apache.shardingsphere.test.integration.env.datasource.DatabaseEnvironment;
+import
org.apache.shardingsphere.test.integration.env.datasource.DataSourceEnvironment;
import javax.sql.DataSource;
import java.util.HashMap;
@@ -41,25 +41,25 @@ public final class ProxyDataSourceBuilder {
*
* @param name data source name
* @param databaseType database type
- * @param databaseEnvironment database environment
+ * @param dataSourceEnv data source environment
* @return proxy data source
*/
- public static DataSource build(final String name, final DatabaseType
databaseType, final DatabaseEnvironment databaseEnvironment) {
+ public static DataSource build(final String name, final DatabaseType
databaseType, final DataSourceEnvironment dataSourceEnv) {
DataSourceCacheKey cacheKey = new DataSourceCacheKey(name, name,
databaseType);
if (CACHE.containsKey(cacheKey)) {
return CACHE.get(cacheKey);
}
- DataSource result = createHikariCP(name, databaseEnvironment);
+ DataSource result = createHikariCP(name, dataSourceEnv);
CACHE.put(cacheKey, result);
return result;
}
- private static DataSource createHikariCP(final String dataSourceName,
final DatabaseEnvironment databaseEnvironment) {
+ private static DataSource createHikariCP(final String dataSourceName,
final DataSourceEnvironment dataSourceEnv) {
HikariConfig result = new HikariConfig();
- result.setDriverClassName(databaseEnvironment.getDriverClassName());
- result.setJdbcUrl(databaseEnvironment.getURL(dataSourceName));
- result.setUsername(databaseEnvironment.getUsername());
- result.setPassword(databaseEnvironment.getPassword());
+ result.setDriverClassName(dataSourceEnv.getDriverClassName());
+ result.setJdbcUrl(dataSourceEnv.getURL(dataSourceName));
+ result.setUsername(dataSourceEnv.getUsername());
+ result.setPassword(dataSourceEnv.getPassword());
result.setMaximumPoolSize(2);
result.setTransactionIsolation("TRANSACTION_READ_COMMITTED");
return new HikariDataSource(result);
