This is an automated email from the ASF dual-hosted git repository.
zhonghongsheng 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 791f780 Rename ResourceConfiguration to ProxyResourceConfiguration
(#14620)
791f780 is described below
commit 791f78039dd3f8fb2f2667e72b31175a48b8ca7d
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Jan 8 11:19:19 2022 +0800
Rename ResourceConfiguration to ProxyResourceConfiguration (#14620)
---
.../shardingsphere/proxy/config/ProxyConfiguration.java | 4 ++--
...eConfiguration.java => ProxyResourceConfiguration.java} | 4 ++--
...erter.java => ProxyResourceConfigurationConverter.java} | 14 +++++++-------
.../config/yaml/swapper/YamlProxyConfigurationSwapper.java | 10 +++++-----
.../proxy/initializer/BootstrapInitializer.java | 10 +++++-----
...a => ProxyProxyResourceConfigurationConverterTest.java} | 14 +++++++-------
.../yaml/swapper/YamlProxyConfigurationSwapperTest.java | 6 +++---
7 files changed, 31 insertions(+), 31 deletions(-)
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 550deb1..4f6954e 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.ResourceConfiguration;
+import
org.apache.shardingsphere.proxy.config.resource.ProxyResourceConfiguration;
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, ResourceConfiguration>>
schemaResources;
+ private final Map<String, Map<String, ProxyResourceConfiguration>>
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/ResourceConfiguration.java
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/resource/ProxyResourceConfiguration.java
similarity index 91%
rename from
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/resource/ResourceConfiguration.java
rename to
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/resource/ProxyResourceConfiguration.java
index 85b9f49..f06f8bd 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/resource/ResourceConfiguration.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/resource/ProxyResourceConfiguration.java
@@ -21,11 +21,11 @@ import lombok.Getter;
import lombok.RequiredArgsConstructor;
/**
- * Resource configuration.
+ * Resource configuration for ShardingSphere-Proxy.
*/
@RequiredArgsConstructor
@Getter
-public final class ResourceConfiguration {
+public final class ProxyResourceConfiguration {
private final ConnectionConfiguration connection;
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/resource/ResourceConfigurationConverter.java
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/resource/ProxyResourceConfigurationConverter.java
similarity index 86%
rename from
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/resource/ResourceConfigurationConverter.java
rename to
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/resource/ProxyResourceConfigurationConverter.java
index 52c071b..f83ceb2 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/resource/ResourceConfigurationConverter.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/resource/ProxyResourceConfigurationConverter.java
@@ -29,10 +29,10 @@ import java.util.Map.Entry;
import java.util.stream.Collectors;
/**
- * Resource configuration converter.
+ * ShardingSphere-Proxy resource configuration converter.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class ResourceConfigurationConverter {
+public final class ProxyResourceConfigurationConverter {
/**
* Get resource configuration map.
@@ -40,17 +40,17 @@ public final class ResourceConfigurationConverter {
* @param yamlResourceConfigMap yaml resource configuration map
* @return resource configuration map
*/
- public static Map<String, ResourceConfiguration>
getResourceConfigurationMap(final Map<String, YamlResourceConfiguration>
yamlResourceConfigMap) {
+ public static Map<String, ProxyResourceConfiguration>
getResourceConfigurationMap(final Map<String, YamlResourceConfiguration>
yamlResourceConfigMap) {
return yamlResourceConfigMap.entrySet().stream()
.collect(Collectors.toMap(Entry::getKey, entry ->
createResourceConfiguration(entry.getValue()), (oldValue, currentValue) ->
oldValue, LinkedHashMap::new));
}
- private static ResourceConfiguration createResourceConfiguration(final
YamlResourceConfiguration yamlConfig) {
+ private static ProxyResourceConfiguration
createResourceConfiguration(final YamlResourceConfiguration 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 ResourceConfiguration(connectionConfig, poolConfig);
+ return new ProxyResourceConfiguration(connectionConfig, poolConfig);
}
/**
@@ -59,12 +59,12 @@ public final class ResourceConfigurationConverter {
* @param resourceConfigMap resource configuration map
* @return data source configuration map
*/
- public static Map<String, DataSourceConfiguration>
getDataSourceConfigurationMap(final Map<String, ResourceConfiguration>
resourceConfigMap) {
+ public static Map<String, DataSourceConfiguration>
getDataSourceConfigurationMap(final Map<String, ProxyResourceConfiguration>
resourceConfigMap) {
return resourceConfigMap.entrySet().stream()
.collect(Collectors.toMap(Entry::getKey, entry ->
createDataSourceConfiguration(entry.getValue()), (oldValue, currentValue) ->
oldValue, LinkedHashMap::new));
}
- private static DataSourceConfiguration createDataSourceConfiguration(final
ResourceConfiguration resourceConfig) {
+ private static DataSourceConfiguration createDataSourceConfiguration(final
ProxyResourceConfiguration resourceConfig) {
DataSourceConfiguration result = new
DataSourceConfiguration(HikariDataSource.class.getName());
result.getProps().put("jdbcUrl",
resourceConfig.getConnection().getUrl());
result.getProps().put("username",
resourceConfig.getConnection().getUsername());
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 8d3a933..030baf6 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.ResourceConfiguration;
+import
org.apache.shardingsphere.proxy.config.resource.ProxyResourceConfiguration;
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.ResourceConfigurationConverter;
+import
org.apache.shardingsphere.proxy.config.resource.ProxyResourceConfigurationConverter;
import org.apache.shardingsphere.proxy.config.yaml.YamlProxyRuleConfiguration;
import java.util.Collection;
@@ -44,7 +44,7 @@ public final class YamlProxyConfigurationSwapper {
* @return proxy configuration
*/
public ProxyConfiguration swap(final YamlProxyConfiguration yamlConfig) {
- Map<String, Map<String, ResourceConfiguration>> schemaResourceConfigs
= getResourceConfigurationMap(yamlConfig.getRuleConfigurations());
+ Map<String, Map<String, ProxyResourceConfiguration>>
schemaResourceConfigs =
getResourceConfigurationMap(yamlConfig.getRuleConfigurations());
Map<String, Collection<RuleConfiguration>> schemaRules =
getRuleConfigurations(yamlConfig.getRuleConfigurations());
Collection<RuleConfiguration> globalRules = new
YamlRuleConfigurationSwapperEngine().swapToRuleConfigurations(yamlConfig.getServerConfiguration().getRules());
Properties props = yamlConfig.getServerConfiguration().getProps();
@@ -57,9 +57,9 @@ public final class YamlProxyConfigurationSwapper {
entry ->
swapperEngine.swapToRuleConfigurations(entry.getValue().getRules()), (oldValue,
currentValue) -> oldValue, LinkedHashMap::new));
}
- private Map<String, Map<String, ResourceConfiguration>>
getResourceConfigurationMap(final Map<String, YamlProxyRuleConfiguration>
yamlRuleConfigurations) {
+ private Map<String, Map<String, ProxyResourceConfiguration>>
getResourceConfigurationMap(final Map<String, YamlProxyRuleConfiguration>
yamlRuleConfigurations) {
return yamlRuleConfigurations.entrySet().stream().collect(
- Collectors.toMap(Entry::getKey, entry ->
ResourceConfigurationConverter.getResourceConfigurationMap(entry.getValue().getDataSources()),
+ Collectors.toMap(Entry::getKey, entry ->
ProxyResourceConfigurationConverter.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 586aafe..063dbd7 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.proxy.config.resource.ResourceConfiguration;
+import
org.apache.shardingsphere.proxy.config.resource.ProxyResourceConfiguration;
import
org.apache.shardingsphere.infra.config.datasource.pool.creator.DataSourcePoolCreatorUtil;
import org.apache.shardingsphere.infra.config.mode.ModeConfiguration;
import org.apache.shardingsphere.infra.instance.InstanceDefinition;
@@ -40,7 +40,7 @@ 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.ResourceConfigurationConverter;
+import
org.apache.shardingsphere.proxy.config.resource.ProxyResourceConfigurationConverter;
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, ResourceConfiguration>> resourceConfigMap) {
+ 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, ResourceConfiguration>> entry :
resourceConfigMap.entrySet()) {
- result.put(entry.getKey(),
DataSourcePoolCreatorUtil.getDataSourceMap(ResourceConfigurationConverter.getDataSourceConfigurationMap(entry.getValue())));
+ for (Entry<String, Map<String, ProxyResourceConfiguration>> entry :
resourceConfigMap.entrySet()) {
+ result.put(entry.getKey(),
DataSourcePoolCreatorUtil.getDataSourceMap(ProxyResourceConfigurationConverter.getDataSourceConfigurationMap(entry.getValue())));
}
return result;
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/config/resource/ResourceConfigurationConverterTest.java
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/config/resource/ProxyProxyResourceConfigurationConverterTest.java
similarity index 88%
rename from
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/config/resource/ResourceConfigurationConverterTest.java
rename to
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/config/resource/ProxyProxyResourceConfigurationConverterTest.java
index 0768500..8759db1 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/config/resource/ResourceConfigurationConverterTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/config/resource/ProxyProxyResourceConfigurationConverterTest.java
@@ -29,23 +29,23 @@ import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
-public final class ResourceConfigurationConverterTest {
+public final class ProxyProxyResourceConfigurationConverterTest {
@Test
public void assertGetDataSourceConfigurationMap() {
- Map<String, ResourceConfiguration> resourceConfigMap = new
HashMap<>(2, 1);
+ Map<String, ProxyResourceConfiguration> resourceConfigMap = new
HashMap<>(2, 1);
resourceConfigMap.put("ds_0", createResourceConfiguration());
resourceConfigMap.put("ds_1", createResourceConfiguration());
- Map<String, DataSourceConfiguration> actual =
ResourceConfigurationConverter.getDataSourceConfigurationMap(resourceConfigMap);
+ Map<String, DataSourceConfiguration> actual =
ProxyResourceConfigurationConverter.getDataSourceConfigurationMap(resourceConfigMap);
assertThat(actual.size(), is(2));
assertParameter(actual.get("ds_0"));
assertParameter(actual.get("ds_1"));
}
- private ResourceConfiguration createResourceConfiguration() {
+ private ProxyResourceConfiguration 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 ResourceConfiguration(connectionConfig, poolConfig);
+ return new ProxyResourceConfiguration(connectionConfig, poolConfig);
}
private void assertParameter(final DataSourceConfiguration actual) {
@@ -74,7 +74,7 @@ public final class ResourceConfigurationConverterTest {
Map<String, YamlResourceConfiguration> yamlResourceConfigs = new
HashMap<>(2, 1);
yamlResourceConfigs.put("ds_0", yamlResourceConfig0);
yamlResourceConfigs.put("ds_1", yamlResourceConfig1);
- Map<String, ResourceConfiguration> actualResourceConfig =
ResourceConfigurationConverter.getResourceConfigurationMap(yamlResourceConfigs);
+ Map<String, ProxyResourceConfiguration> actualResourceConfig =
ProxyResourceConfigurationConverter.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 +92,7 @@ public final class ResourceConfigurationConverterTest {
yamlResourceConfig.setMinPoolSize(1);
}
- private void assertResourceConfiguration(final ResourceConfiguration
resourceConfig) {
+ private void assertResourceConfiguration(final ProxyResourceConfiguration
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 1e39217..2e49056 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
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.proxy.config.yaml.swapper;
import org.apache.shardingsphere.authority.config.AuthorityRuleConfiguration;
import
org.apache.shardingsphere.authority.yaml.config.YamlAuthorityRuleConfiguration;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
-import org.apache.shardingsphere.proxy.config.resource.ResourceConfiguration;
+import
org.apache.shardingsphere.proxy.config.resource.ProxyResourceConfiguration;
import org.apache.shardingsphere.infra.metadata.user.Grantee;
import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUser;
import org.apache.shardingsphere.infra.metadata.user.ShardingSphereUsers;
@@ -64,11 +64,11 @@ public final class YamlProxyConfigurationSwapperTest {
}
private void assertSchemaDataSources(final ProxyConfiguration proxyConfig)
{
- Map<String, Map<String, ResourceConfiguration>> schemaResourceConfigs
= proxyConfig.getSchemaResources();
+ Map<String, Map<String, ProxyResourceConfiguration>>
schemaResourceConfigs = proxyConfig.getSchemaResources();
assertNotNull(schemaResourceConfigs);
assertThat(schemaResourceConfigs.size(), is(1));
assertTrue(schemaResourceConfigs.containsKey("yamlProxyRule1"));
- ResourceConfiguration resourceConfig =
schemaResourceConfigs.get("yamlProxyRule1").get("ds1");
+ ProxyResourceConfiguration resourceConfig =
schemaResourceConfigs.get("yamlProxyRule1").get("ds1");
assertNotNull(resourceConfig);
assertThat(resourceConfig.getConnection().getUrl(), is("url1"));
assertThat(resourceConfig.getConnection().getUsername(),
is("username1"));
