This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 0082ae14f48 Rename configurations to configs for variable name (#29962)
0082ae14f48 is described below
commit 0082ae14f485b73a1e041b28f01173dc34d070c1
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Feb 2 14:01:17 2024 +0800
Rename configurations to configs for variable name (#29962)
---
.../shadow/checker/ShadowRuleConfigurationChecker.java | 4 ++--
.../backend/config/yaml/swapper/YamlProxyConfigurationSwapper.java | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git
a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/checker/ShadowRuleConfigurationChecker.java
b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/checker/ShadowRuleConfigurationChecker.java
index 87bb6e41ba7..39a7bb70bf8 100644
---
a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/checker/ShadowRuleConfigurationChecker.java
+++
b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/checker/ShadowRuleConfigurationChecker.java
@@ -105,9 +105,9 @@ public final class ShadowRuleConfigurationChecker
implements RuleConfigurationCh
.forEach((key, value) ->
ShardingSpherePreconditions.checkState(!value.getShadowAlgorithmNames().isEmpty(),
() -> new MissingRequiredShadowAlgorithmException("Shadow", databaseName)));
}
- private Map<String, ShadowDataSourceConfiguration>
initShadowDataSources(final Collection<ShadowDataSourceConfiguration>
dataSourceConfigurations) {
+ private Map<String, ShadowDataSourceConfiguration>
initShadowDataSources(final Collection<ShadowDataSourceConfiguration>
dataSourceConfigs) {
Map<String, ShadowDataSourceConfiguration> result = new
LinkedHashMap<>();
- for (ShadowDataSourceConfiguration each : dataSourceConfigurations) {
+ for (ShadowDataSourceConfiguration each : dataSourceConfigs) {
result.put(each.getName(), each);
}
return result;
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/config/yaml/swapper/YamlProxyConfigurationSwapper.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/config/yaml/swapper/YamlProxyConfigurationSwapper.java
index 6db4eab90dc..8fd6efdf7ab 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/config/yaml/swapper/YamlProxyConfigurationSwapper.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/config/yaml/swapper/YamlProxyConfigurationSwapper.java
@@ -73,9 +73,9 @@ public final class YamlProxyConfigurationSwapper {
return DataSourcePoolCreator.create(propsMap, true);
}
- private Map<String, DatabaseConfiguration>
swapDatabaseConfigurations(final Map<String, YamlProxyDatabaseConfiguration>
databaseConfigurations) {
- Map<String, DatabaseConfiguration> result = new
LinkedHashMap<>(databaseConfigurations.size(), 1F);
- for (Entry<String, YamlProxyDatabaseConfiguration> entry :
databaseConfigurations.entrySet()) {
+ private Map<String, DatabaseConfiguration>
swapDatabaseConfigurations(final Map<String, YamlProxyDatabaseConfiguration>
databaseConfigs) {
+ Map<String, DatabaseConfiguration> result = new
LinkedHashMap<>(databaseConfigs.size(), 1F);
+ for (Entry<String, YamlProxyDatabaseConfiguration> entry :
databaseConfigs.entrySet()) {
Map<String, DataSourceConfiguration> databaseDataSourceConfigs =
swapDataSourceConfigurations(entry.getValue().getDataSources());
Collection<RuleConfiguration> databaseRuleConfigs =
ruleConfigSwapperEngine.swapToRuleConfigurations(entry.getValue().getRules());
result.put(entry.getKey(), new
DataSourceGeneratedDatabaseConfiguration(databaseDataSourceConfigs,
databaseRuleConfigs));