You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by me...@apache.org on 2022/01/23 15:03:14 UTC
[shardingsphere] branch master updated: Rename ProxyResourceConfiguration to DataSourceConfiguration and move to infra module (#15011)
This is an automated email from the ASF dual-hosted git repository.
menghaoran 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 795e72c Rename ProxyResourceConfiguration to DataSourceConfiguration and move to infra module (#15011)
795e72c is described below
commit 795e72cc6d4b8f54da35c23953bc50fb1beb4cdd
Author: Liang Zhang <te...@163.com>
AuthorDate: Sun Jan 23 23:02:08 2022 +0800
Rename ProxyResourceConfiguration to DataSourceConfiguration and move to infra module (#15011)
---
.../config}/ConnectionConfiguration.java | 2 +-
.../datasource/config/DataSourceConfiguration.java | 6 +--
.../datasource/config}/PoolConfiguration.java | 2 +-
.../proxy/config/ProxyConfiguration.java | 4 +-
... => ProxyDataSourceConfigurationConverter.java} | 45 ++++++++++++----------
.../swapper/YamlProxyConfigurationSwapper.java | 12 +++---
.../proxy/initializer/BootstrapInitializer.java | 12 +++---
...ProxyDataSourceConfigurationConverterTest.java} | 19 +++++----
.../swapper/YamlProxyConfigurationSwapperTest.java | 31 ++++++++-------
9 files changed, 69 insertions(+), 64 deletions(-)
diff --git a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/resource/ConnectionConfiguration.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/datasource/config/ConnectionConfiguration.java
similarity index 94%
rename from shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/resource/ConnectionConfiguration.java
rename to shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/datasource/config/ConnectionConfiguration.java
index 7e1e663..55815a8 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/resource/ConnectionConfiguration.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/datasource/config/ConnectionConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.config.resource;
+package org.apache.shardingsphere.infra.datasource.config;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/resource/ProxyResourceConfiguration.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/datasource/config/DataSourceConfiguration.java
similarity index 86%
rename from shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/resource/ProxyResourceConfiguration.java
rename to shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/datasource/config/DataSourceConfiguration.java
index f06f8bd..dc1774e 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/resource/ProxyResourceConfiguration.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/datasource/config/DataSourceConfiguration.java
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.config.resource;
+package org.apache.shardingsphere.infra.datasource.config;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
/**
- * Resource configuration for ShardingSphere-Proxy.
+ * Data source configuration.
*/
@RequiredArgsConstructor
@Getter
-public final class ProxyResourceConfiguration {
+public final class DataSourceConfiguration {
private final ConnectionConfiguration connection;
diff --git a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/resource/PoolConfiguration.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/datasource/config/PoolConfiguration.java
similarity index 95%
rename from shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/resource/PoolConfiguration.java
rename to shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/datasource/config/PoolConfiguration.java
index a72eead..1016433 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/resource/PoolConfiguration.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/datasource/config/PoolConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.config.resource;
+package org.apache.shardingsphere.infra.datasource.config;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/ProxyConfiguration.java b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/ProxyConfiguration.java
index 4f6954e..13a06d6 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/ProxyConfiguration.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/ProxyConfiguration.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.proxy.config;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
-import org.apache.shardingsphere.proxy.config.resource.ProxyResourceConfiguration;
+import org.apache.shardingsphere.infra.datasource.config.DataSourceConfiguration;
import java.util.Collection;
import java.util.Map;
@@ -33,7 +33,7 @@ import java.util.Properties;
@Getter
public final class ProxyConfiguration {
- private final Map<String, Map<String, ProxyResourceConfiguration>> schemaResources;
+ private final Map<String, Map<String, DataSourceConfiguration>> schemaResources;
private final Map<String, Collection<RuleConfiguration>> schemaRules;
diff --git a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/resource/ProxyResourceConfigurationConverter.java b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/ProxyDataSourceConfigurationConverter.java
similarity index 56%
rename from shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/resource/ProxyResourceConfigurationConverter.java
rename to shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/ProxyDataSourceConfigurationConverter.java
index d136801..31fba7a 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/resource/ProxyResourceConfigurationConverter.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/ProxyDataSourceConfigurationConverter.java
@@ -15,11 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.config.resource;
+package org.apache.shardingsphere.proxy.config;
import com.zaxxer.hikari.HikariDataSource;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
+import org.apache.shardingsphere.infra.datasource.config.ConnectionConfiguration;
+import org.apache.shardingsphere.infra.datasource.config.DataSourceConfiguration;
+import org.apache.shardingsphere.infra.datasource.config.PoolConfiguration;
import org.apache.shardingsphere.infra.datasource.props.DataSourceProperties;
import org.apache.shardingsphere.proxy.config.yaml.YamlProxyResourceConfiguration;
@@ -29,10 +32,10 @@ import java.util.Map.Entry;
import java.util.stream.Collectors;
/**
- * ShardingSphere-Proxy resource configuration converter.
+ * ShardingSphere-Proxy data source configuration converter.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class ProxyResourceConfigurationConverter {
+public final class ProxyDataSourceConfigurationConverter {
/**
* Get resource configuration map.
@@ -40,44 +43,44 @@ public final class ProxyResourceConfigurationConverter {
* @param yamlResourceConfigMap yaml resource configuration map
* @return resource configuration map
*/
- public static Map<String, ProxyResourceConfiguration> getResourceConfigurationMap(final Map<String, YamlProxyResourceConfiguration> yamlResourceConfigMap) {
+ public static Map<String, DataSourceConfiguration> getResourceConfigurationMap(final Map<String, YamlProxyResourceConfiguration> yamlResourceConfigMap) {
return yamlResourceConfigMap.entrySet().stream()
.collect(Collectors.toMap(Entry::getKey, entry -> createResourceConfiguration(entry.getValue()), (oldValue, currentValue) -> oldValue, LinkedHashMap::new));
}
- private static ProxyResourceConfiguration createResourceConfiguration(final YamlProxyResourceConfiguration yamlConfig) {
+ private static DataSourceConfiguration createResourceConfiguration(final YamlProxyResourceConfiguration yamlConfig) {
ConnectionConfiguration connectionConfig = new ConnectionConfiguration(yamlConfig.getUrl(), yamlConfig.getUsername(), yamlConfig.getPassword());
PoolConfiguration poolConfig = new PoolConfiguration(yamlConfig.getConnectionTimeoutMilliseconds(), yamlConfig.getIdleTimeoutMilliseconds(),
yamlConfig.getMaxLifetimeMilliseconds(), yamlConfig.getMaxPoolSize(), yamlConfig.getMinPoolSize(), yamlConfig.getReadOnly(),
yamlConfig.getCustomPoolProps());
- return new ProxyResourceConfiguration(connectionConfig, poolConfig);
+ return new DataSourceConfiguration(connectionConfig, poolConfig);
}
/**
* Get data source configuration map.
*
- * @param resourceConfigMap resource configuration map
+ * @param dataSourceConfigMap data source configuration map
* @return data source properties map
*/
- public static Map<String, DataSourceProperties> getDataSourceConfigurationMap(final Map<String, ProxyResourceConfiguration> resourceConfigMap) {
- return resourceConfigMap.entrySet().stream().collect(Collectors.toMap(Entry::getKey,
+ public static Map<String, DataSourceProperties> getDataSourceConfigurationMap(final Map<String, DataSourceConfiguration> dataSourceConfigMap) {
+ return dataSourceConfigMap.entrySet().stream().collect(Collectors.toMap(Entry::getKey,
entry -> new DataSourceProperties(HikariDataSource.class.getName(), createProperties(entry.getValue())), (oldValue, currentValue) -> oldValue, LinkedHashMap::new));
}
@SuppressWarnings({"unchecked", "rawtypes"})
- private static Map<String, Object> createProperties(final ProxyResourceConfiguration resourceConfig) {
+ private static Map<String, Object> createProperties(final DataSourceConfiguration dataSourceConfig) {
Map<String, Object> result = new LinkedHashMap<>();
- result.put("jdbcUrl", resourceConfig.getConnection().getUrl());
- result.put("username", resourceConfig.getConnection().getUsername());
- result.put("password", resourceConfig.getConnection().getPassword());
- result.put("connectionTimeout", resourceConfig.getPool().getConnectionTimeoutMilliseconds());
- result.put("idleTimeout", resourceConfig.getPool().getIdleTimeoutMilliseconds());
- result.put("maxLifetime", resourceConfig.getPool().getMaxLifetimeMilliseconds());
- result.put("maximumPoolSize", resourceConfig.getPool().getMaxPoolSize());
- result.put("minimumIdle", resourceConfig.getPool().getMinPoolSize());
- result.put("readOnly", resourceConfig.getPool().getReadOnly());
- if (null != resourceConfig.getPool().getCustomProperties()) {
- result.putAll((Map) resourceConfig.getPool().getCustomProperties());
+ result.put("jdbcUrl", dataSourceConfig.getConnection().getUrl());
+ result.put("username", dataSourceConfig.getConnection().getUsername());
+ result.put("password", dataSourceConfig.getConnection().getPassword());
+ result.put("connectionTimeout", dataSourceConfig.getPool().getConnectionTimeoutMilliseconds());
+ result.put("idleTimeout", dataSourceConfig.getPool().getIdleTimeoutMilliseconds());
+ result.put("maxLifetime", dataSourceConfig.getPool().getMaxLifetimeMilliseconds());
+ result.put("maximumPoolSize", dataSourceConfig.getPool().getMaxPoolSize());
+ result.put("minimumIdle", dataSourceConfig.getPool().getMinPoolSize());
+ result.put("readOnly", dataSourceConfig.getPool().getReadOnly());
+ if (null != dataSourceConfig.getPool().getCustomProperties()) {
+ result.putAll((Map) dataSourceConfig.getPool().getCustomProperties());
}
return result;
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/yaml/swapper/YamlProxyConfigurationSwapper.java b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/yaml/swapper/YamlProxyConfigurationSwapper.java
index 2172963..8aab18e 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/yaml/swapper/YamlProxyConfigurationSwapper.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/yaml/swapper/YamlProxyConfigurationSwapper.java
@@ -18,11 +18,11 @@
package org.apache.shardingsphere.proxy.config.yaml.swapper;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
-import org.apache.shardingsphere.proxy.config.resource.ProxyResourceConfiguration;
+import org.apache.shardingsphere.infra.datasource.config.DataSourceConfiguration;
import org.apache.shardingsphere.infra.yaml.config.swapper.YamlRuleConfigurationSwapperEngine;
import org.apache.shardingsphere.proxy.config.ProxyConfiguration;
import org.apache.shardingsphere.proxy.config.YamlProxyConfiguration;
-import org.apache.shardingsphere.proxy.config.resource.ProxyResourceConfigurationConverter;
+import org.apache.shardingsphere.proxy.config.ProxyDataSourceConfigurationConverter;
import org.apache.shardingsphere.proxy.config.yaml.YamlProxySchemaConfiguration;
import java.util.Collection;
@@ -44,11 +44,11 @@ public final class YamlProxyConfigurationSwapper {
* @return proxy configuration
*/
public ProxyConfiguration swap(final YamlProxyConfiguration yamlConfig) {
- Map<String, Map<String, ProxyResourceConfiguration>> schemaResourceConfigs = getResourceConfigurationMap(yamlConfig.getSchemaConfigurations());
+ Map<String, Map<String, DataSourceConfiguration>> schemaDataSourceConfigs = getDataSourceConfigurationMap(yamlConfig.getSchemaConfigurations());
Map<String, Collection<RuleConfiguration>> schemaConfigs = getSchemaConfigurations(yamlConfig.getSchemaConfigurations());
Collection<RuleConfiguration> globalRules = new YamlRuleConfigurationSwapperEngine().swapToRuleConfigurations(yamlConfig.getServerConfiguration().getRules());
Properties props = yamlConfig.getServerConfiguration().getProps();
- return new ProxyConfiguration(schemaResourceConfigs, schemaConfigs, globalRules, props, yamlConfig.getServerConfiguration().getLabels());
+ return new ProxyConfiguration(schemaDataSourceConfigs, schemaConfigs, globalRules, props, yamlConfig.getServerConfiguration().getLabels());
}
private Map<String, Collection<RuleConfiguration>> getSchemaConfigurations(final Map<String, YamlProxySchemaConfiguration> yamlSchemaConfigs) {
@@ -57,9 +57,9 @@ public final class YamlProxyConfigurationSwapper {
entry -> swapperEngine.swapToRuleConfigurations(entry.getValue().getRules()), (oldValue, currentValue) -> oldValue, LinkedHashMap::new));
}
- private Map<String, Map<String, ProxyResourceConfiguration>> getResourceConfigurationMap(final Map<String, YamlProxySchemaConfiguration> yamlSchemaConfigs) {
+ private Map<String, Map<String, DataSourceConfiguration>> getDataSourceConfigurationMap(final Map<String, YamlProxySchemaConfiguration> yamlSchemaConfigs) {
return yamlSchemaConfigs.entrySet().stream().collect(
- Collectors.toMap(Entry::getKey, entry -> ProxyResourceConfigurationConverter.getResourceConfigurationMap(entry.getValue().getDataSources()),
+ Collectors.toMap(Entry::getKey, entry -> ProxyDataSourceConfigurationConverter.getResourceConfigurationMap(entry.getValue().getDataSources()),
(oldValue, currentValue) -> oldValue, LinkedHashMap::new));
}
}
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 0963b11..b54854c 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
@@ -39,8 +39,8 @@ import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.config.ProxyConfiguration;
import org.apache.shardingsphere.proxy.config.YamlProxyConfiguration;
-import org.apache.shardingsphere.proxy.config.resource.ProxyResourceConfiguration;
-import org.apache.shardingsphere.proxy.config.resource.ProxyResourceConfigurationConverter;
+import org.apache.shardingsphere.infra.datasource.config.DataSourceConfiguration;
+import org.apache.shardingsphere.proxy.config.ProxyDataSourceConfigurationConverter;
import org.apache.shardingsphere.proxy.config.yaml.swapper.YamlProxyConfigurationSwapper;
import org.apache.shardingsphere.proxy.database.DatabaseServerInfo;
@@ -89,10 +89,10 @@ public final class BootstrapInitializer {
}
// TODO add ResourceConfiguration param to ContextManagerBuilder to avoid re-build data source
- 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(), DataSourcePoolCreator.create(ProxyResourceConfigurationConverter.getDataSourceConfigurationMap(entry.getValue())));
+ private Map<String, Map<String, DataSource>> getDataSourcesMap(final Map<String, Map<String, DataSourceConfiguration>> dataSourceConfigMap) {
+ Map<String, Map<String, DataSource>> result = new LinkedHashMap<>(dataSourceConfigMap.size(), 1);
+ for (Entry<String, Map<String, DataSourceConfiguration>> entry : dataSourceConfigMap.entrySet()) {
+ result.put(entry.getKey(), DataSourcePoolCreator.create(ProxyDataSourceConfigurationConverter.getDataSourceConfigurationMap(entry.getValue())));
}
return result;
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/config/resource/ProxyProxyResourceConfigurationConverterTest.java b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/config/ProxyDataSourceConfigurationConverterTest.java
similarity index 84%
rename from shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/config/resource/ProxyProxyResourceConfigurationConverterTest.java
rename to shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/config/ProxyDataSourceConfigurationConverterTest.java
index 578b85a..c07b096 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/config/resource/ProxyProxyResourceConfigurationConverterTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/config/ProxyDataSourceConfigurationConverterTest.java
@@ -15,8 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.config.resource;
+package org.apache.shardingsphere.proxy.config;
+import org.apache.shardingsphere.infra.datasource.config.ConnectionConfiguration;
+import org.apache.shardingsphere.infra.datasource.config.DataSourceConfiguration;
+import org.apache.shardingsphere.infra.datasource.config.PoolConfiguration;
import org.apache.shardingsphere.infra.datasource.props.DataSourceProperties;
import org.apache.shardingsphere.proxy.config.yaml.YamlProxyResourceConfiguration;
import org.junit.Test;
@@ -29,23 +32,23 @@ import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
-public final class ProxyProxyResourceConfigurationConverterTest {
+public final class ProxyDataSourceConfigurationConverterTest {
@Test
public void assertGetDataSourceConfigurationMap() {
- Map<String, ProxyResourceConfiguration> resourceConfigMap = new HashMap<>(2, 1);
+ Map<String, DataSourceConfiguration> resourceConfigMap = new HashMap<>(2, 1);
resourceConfigMap.put("ds_0", createResourceConfiguration());
resourceConfigMap.put("ds_1", createResourceConfiguration());
- Map<String, DataSourceProperties> actual = ProxyResourceConfigurationConverter.getDataSourceConfigurationMap(resourceConfigMap);
+ Map<String, DataSourceProperties> actual = ProxyDataSourceConfigurationConverter.getDataSourceConfigurationMap(resourceConfigMap);
assertThat(actual.size(), is(2));
assertParameter(actual.get("ds_0"));
assertParameter(actual.get("ds_1"));
}
- private ProxyResourceConfiguration createResourceConfiguration() {
+ private DataSourceConfiguration createResourceConfiguration() {
ConnectionConfiguration connectionConfig = new ConnectionConfiguration("jdbc:mysql://localhost:3306/demo_ds", "root", "root");
PoolConfiguration poolConfig = new PoolConfiguration(null, null, null, null, null, null, null);
- return new ProxyResourceConfiguration(connectionConfig, poolConfig);
+ return new DataSourceConfiguration(connectionConfig, poolConfig);
}
private void assertParameter(final DataSourceProperties actual) {
@@ -74,7 +77,7 @@ public final class ProxyProxyResourceConfigurationConverterTest {
Map<String, YamlProxyResourceConfiguration> yamlResourceConfigs = new HashMap<>(2, 1);
yamlResourceConfigs.put("ds_0", yamlResourceConfig0);
yamlResourceConfigs.put("ds_1", yamlResourceConfig1);
- Map<String, ProxyResourceConfiguration> actualResourceConfig = ProxyResourceConfigurationConverter.getResourceConfigurationMap(yamlResourceConfigs);
+ Map<String, DataSourceConfiguration> actualResourceConfig = ProxyDataSourceConfigurationConverter.getResourceConfigurationMap(yamlResourceConfigs);
assertThat(actualResourceConfig.size(), is(2));
assertThat(actualResourceConfig.get("ds_0").getConnection().getUrl(), is("jdbc:mysql://localhost:3306/ds_0"));
assertThat(actualResourceConfig.get("ds_1").getConnection().getUrl(), is("jdbc:mysql://localhost:3306/ds_1"));
@@ -92,7 +95,7 @@ public final class ProxyProxyResourceConfigurationConverterTest {
yamlResourceConfig.setMinPoolSize(1);
}
- private void assertResourceConfiguration(final ProxyResourceConfiguration resourceConfig) {
+ private void assertResourceConfiguration(final DataSourceConfiguration resourceConfig) {
assertThat(resourceConfig.getConnection().getUsername(), is("root"));
assertThat(resourceConfig.getConnection().getPassword(), is("root"));
assertThat(resourceConfig.getPool().getConnectionTimeoutMilliseconds(), is(30 * 1000L));
diff --git a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/config/yaml/swapper/YamlProxyConfigurationSwapperTest.java b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/config/yaml/swapper/YamlProxyConfigurationSwapperTest.java
index 215972d..d10e448 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/config/yaml/swapper/YamlProxyConfigurationSwapperTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/config/yaml/swapper/YamlProxyConfigurationSwapperTest.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUsers;
import org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlShardingSphereAlgorithmConfiguration;
import org.apache.shardingsphere.proxy.config.ProxyConfiguration;
import org.apache.shardingsphere.proxy.config.YamlProxyConfiguration;
-import org.apache.shardingsphere.proxy.config.resource.ProxyResourceConfiguration;
+import org.apache.shardingsphere.infra.datasource.config.DataSourceConfiguration;
import org.apache.shardingsphere.proxy.config.yaml.YamlProxyResourceConfiguration;
import org.apache.shardingsphere.proxy.config.yaml.YamlProxySchemaConfiguration;
import org.apache.shardingsphere.proxy.config.yaml.YamlProxyServerConfiguration;
@@ -62,21 +62,20 @@ public final class YamlProxyConfigurationSwapperTest {
}
private void assertSchemaDataSources(final ProxyConfiguration proxyConfig) {
- Map<String, Map<String, ProxyResourceConfiguration>> schemaResourceConfigs = proxyConfig.getSchemaResources();
- assertNotNull(schemaResourceConfigs);
- assertThat(schemaResourceConfigs.size(), is(1));
- assertTrue(schemaResourceConfigs.containsKey("yamlProxyRule1"));
- ProxyResourceConfiguration resourceConfig = schemaResourceConfigs.get("yamlProxyRule1").get("ds1");
- assertNotNull(resourceConfig);
- assertThat(resourceConfig.getConnection().getUrl(), is("url1"));
- assertThat(resourceConfig.getConnection().getUsername(), is("username1"));
- assertThat(resourceConfig.getConnection().getPassword(), is("password1"));
- assertThat(resourceConfig.getPool().getConnectionTimeoutMilliseconds(), is(1L));
- assertThat(resourceConfig.getPool().getIdleTimeoutMilliseconds(), is(2L));
- assertThat(resourceConfig.getPool().getMaxLifetimeMilliseconds(), is(3L));
- assertThat(resourceConfig.getPool().getMaxPoolSize(), is(4));
- assertThat(resourceConfig.getPool().getMinPoolSize(), is(5));
- assertTrue(resourceConfig.getPool().getReadOnly());
+ Map<String, Map<String, DataSourceConfiguration>> schemaDataSourceConfigs = proxyConfig.getSchemaResources();
+ assertNotNull(schemaDataSourceConfigs);
+ assertThat(schemaDataSourceConfigs.size(), is(1));
+ assertTrue(schemaDataSourceConfigs.containsKey("yamlProxyRule1"));
+ DataSourceConfiguration dataSourceConfig = schemaDataSourceConfigs.get("yamlProxyRule1").get("ds1");
+ assertThat(dataSourceConfig.getConnection().getUrl(), is("url1"));
+ assertThat(dataSourceConfig.getConnection().getUsername(), is("username1"));
+ assertThat(dataSourceConfig.getConnection().getPassword(), is("password1"));
+ assertThat(dataSourceConfig.getPool().getConnectionTimeoutMilliseconds(), is(1L));
+ assertThat(dataSourceConfig.getPool().getIdleTimeoutMilliseconds(), is(2L));
+ assertThat(dataSourceConfig.getPool().getMaxLifetimeMilliseconds(), is(3L));
+ assertThat(dataSourceConfig.getPool().getMaxPoolSize(), is(4));
+ assertThat(dataSourceConfig.getPool().getMinPoolSize(), is(5));
+ assertTrue(dataSourceConfig.getPool().getReadOnly());
}
private void assertSchemaRules(final ProxyConfiguration proxyConfig) {