You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2024/04/25 23:59:48 UTC

(shardingsphere) branch master updated: Rename dataSourceRuleGroupConfig to dataSourceGroupRuleConfig (#31018)

This is an automated email from the ASF dual-hosted git repository.

duanzhengqiang 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 d2ed7b4b42e Rename dataSourceRuleGroupConfig to dataSourceGroupRuleConfig (#31018)
d2ed7b4b42e is described below

commit d2ed7b4b42eb0ece79aa611b34aaf6d61f525faa
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Fri Apr 26 07:59:41 2024 +0800

    Rename dataSourceRuleGroupConfig to dataSourceGroupRuleConfig (#31018)
---
 ...YamlReadwriteSplittingDataNodeRuleConfigurationSwapper.java | 10 +++++-----
 .../handler/update/DropReadwriteSplittingRuleExecutor.java     |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/YamlReadwriteSplittingDataNodeRuleConfigurationSwapper.java b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/YamlReadwriteSplittingDataNodeRuleConfigurationSwapper.java
index e4e0110cd30..6fd477d106f 100644
--- a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/YamlReadwriteSplittingDataNodeRuleConfigurationSwapper.java
+++ b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/YamlReadwriteSplittingDataNodeRuleConfigurationSwapper.java
@@ -64,12 +64,12 @@ public final class YamlReadwriteSplittingDataNodeRuleConfigurationSwapper implem
         return result;
     }
     
-    private YamlReadwriteSplittingDataSourceGroupRuleConfiguration swapToYamlConfiguration(final ReadwriteSplittingDataSourceGroupRuleConfiguration dataSourceRuleGroupConfig) {
+    private YamlReadwriteSplittingDataSourceGroupRuleConfiguration swapToYamlConfiguration(final ReadwriteSplittingDataSourceGroupRuleConfiguration dataSourceGroupRuleConfig) {
         YamlReadwriteSplittingDataSourceGroupRuleConfiguration result = new YamlReadwriteSplittingDataSourceGroupRuleConfiguration();
-        result.setWriteDataSourceName(dataSourceRuleGroupConfig.getWriteDataSourceName());
-        result.setReadDataSourceNames(dataSourceRuleGroupConfig.getReadDataSourceNames());
-        result.setTransactionalReadQueryStrategy(dataSourceRuleGroupConfig.getTransactionalReadQueryStrategy().name());
-        result.setLoadBalancerName(dataSourceRuleGroupConfig.getLoadBalancerName());
+        result.setWriteDataSourceName(dataSourceGroupRuleConfig.getWriteDataSourceName());
+        result.setReadDataSourceNames(dataSourceGroupRuleConfig.getReadDataSourceNames());
+        result.setTransactionalReadQueryStrategy(dataSourceGroupRuleConfig.getTransactionalReadQueryStrategy().name());
+        result.setLoadBalancerName(dataSourceGroupRuleConfig.getLoadBalancerName());
         return result;
     }
     
diff --git a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleExecutor.java b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleExecutor.java
index c8f87c767c1..d3bcd7dc68f 100644
--- a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleExecutor.java
+++ b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleExecutor.java
@@ -116,9 +116,9 @@ public final class DropReadwriteSplittingRuleExecutor implements DatabaseRuleDro
     }
     
     private void dropRule(final String ruleName) {
-        Optional<ReadwriteSplittingDataSourceGroupRuleConfiguration> dataSourceRuleGroupConfig = rule.getConfiguration().getDataSourceGroups().stream()
+        Optional<ReadwriteSplittingDataSourceGroupRuleConfiguration> dataSourceGroupRuleConfig = rule.getConfiguration().getDataSourceGroups().stream()
                 .filter(each -> ruleName.equals(each.getName())).findAny();
-        dataSourceRuleGroupConfig.ifPresent(optional -> rule.getConfiguration().getDataSourceGroups().remove(optional));
+        dataSourceGroupRuleConfig.ifPresent(optional -> rule.getConfiguration().getDataSourceGroups().remove(optional));
     }
     
     private Collection<String> findUnusedLoadBalancers() {