[shardingsphere] branch master updated: Fix sonar issue (#26422)

[zhaojinchao]

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

zhaojinchao 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 21517d961a0 Fix sonar issue (#26422)
21517d961a0 is described below

commit 21517d961a0ab121150a52d52e3e6390a57f9d53
Author: ChenJiaHao <pace2...@163.com>
AuthorDate: Mon Jun 19 00:48:01 2023 +0800

    Fix sonar issue (#26422)
---
 .../handler/update/AlterReadwriteSplittingRuleStatementUpdater.java  | 5 ++---
 .../handler/update/DropReadwriteSplittingRuleStatementUpdater.java   | 5 -----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git 
a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleStatementUpdater.java
 
b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleStatementUpdater.java
index c6c80219376..df8b16e1a4a 100644
--- 
a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleStatementUpdater.java
+++ 
b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleStatementUpdater.java
@@ -51,8 +51,7 @@ public final class 
AlterReadwriteSplittingRuleStatementUpdater implements RuleDe
     }
     
     @Override
-    public ReadwriteSplittingRuleConfiguration 
buildToBeDroppedRuleConfiguration(
-                                                                               
  final ReadwriteSplittingRuleConfiguration currentRuleConfig,
+    public ReadwriteSplittingRuleConfiguration 
buildToBeDroppedRuleConfiguration(final ReadwriteSplittingRuleConfiguration 
currentRuleConfig,
                                                                                
  final ReadwriteSplittingRuleConfiguration toBeAlteredRuleConfig) {
         Collection<ReadwriteSplittingDataSourceRuleConfiguration> dataSources 
= new LinkedList<>();
         Map<String, AlgorithmConfiguration> loadBalancers = new HashMap<>();
@@ -60,7 +59,7 @@ public final class 
AlterReadwriteSplittingRuleStatementUpdater implements RuleDe
         for (ReadwriteSplittingDataSourceRuleConfiguration each : 
currentRuleConfig.getDataSources()) {
             if (toBeAlteredDataSourceNames.contains(each.getName())) {
                 dataSources.add(each);
-                loadBalancers.put(each.getLoadBalancerName(), 
currentRuleConfig.getLoadBalancers().get(each));
+                loadBalancers.put(each.getLoadBalancerName(), 
currentRuleConfig.getLoadBalancers().get(each.getLoadBalancerName()));
             }
         }
         return new ReadwriteSplittingRuleConfiguration(dataSources, 
loadBalancers);
diff --git 
a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleStatementUpdater.java
 
b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleStatementUpdater.java
index f5c8c638fa6..c9245276362 100644
--- 
a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleStatementUpdater.java
+++ 
b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleStatementUpdater.java
@@ -138,11 +138,6 @@ public final class 
DropReadwriteSplittingRuleStatementUpdater implements RuleDef
                 
.filter(Objects::nonNull).noneMatch(toBeDroppedLoadBalancerName::equals);
     }
     
-    private boolean isLoadBalancerNotInUse(final 
ReadwriteSplittingRuleConfiguration currentRuleConfig, final String 
toBeDroppedLoadBalancerName, final Collection<String> dataSourceNames) {
-        return currentRuleConfig.getDataSources().stream().filter(each -> 
!dataSourceNames.contains(each.getName())).map(ReadwriteSplittingDataSourceRuleConfiguration::getLoadBalancerName)
-                
.filter(Objects::nonNull).noneMatch(toBeDroppedLoadBalancerName::equals);
-    }
-    
     @Override
     public boolean hasAnyOneToBeDropped(final 
DropReadwriteSplittingRuleStatement sqlStatement, final 
ReadwriteSplittingRuleConfiguration currentRuleConfig) {
         return null != currentRuleConfig && 
!getIdenticalData(currentRuleConfig.getDataSources().stream()