[shardingsphere] branch master updated: Move Map.Entry from codes into import list (#26627)

[duanzhengqiang]

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 349ad25a7f2 Move Map.Entry from codes into import list (#26627)
349ad25a7f2 is described below

commit 349ad25a7f2ec90681074c7044c7e05db86a527b
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Tue Jun 27 18:50:13 2023 +0800

    Move Map.Entry from codes into import list (#26627)
---
 .../mode/manager/cluster/ClusterModeContextManager.java               | 3 ++-
 .../coordinator/subscriber/ConfigurationChangedSubscriber.java        | 2 +-
 .../mode/manager/standalone/StandaloneModeContextManager.java         | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git 
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterModeContextManager.java
 
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterModeContextManager.java
index e0d8e5a8cd7..abfee78155e 100644
--- 
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterModeContextManager.java
+++ 
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterModeContextManager.java
@@ -31,6 +31,7 @@ import 
org.apache.shardingsphere.mode.manager.ContextManagerAware;
 
 import java.util.Collection;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.stream.Collectors;
 
@@ -103,7 +104,7 @@ public final class ClusterModeContextManager implements 
ModeContextManager, Cont
     }
     
     private Map<String, DataSourceProperties> 
getToBeReversedDataSourcePropsMap(final Map<String, DataSourceProperties> 
dataSourcePropsMap, final Collection<String> toBeDroppedResourceNames) {
-        return dataSourcePropsMap.entrySet().stream().filter(entry -> 
!toBeDroppedResourceNames.contains(entry.getKey())).collect(Collectors.toMap(Map.Entry::getKey,
 Map.Entry::getValue));
+        return dataSourcePropsMap.entrySet().stream().filter(entry -> 
!toBeDroppedResourceNames.contains(entry.getKey())).collect(Collectors.toMap(Entry::getKey,
 Entry::getValue));
     }
     
     @Override
diff --git 
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ConfigurationChangedSubscriber.java
 
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ConfigurationChangedSubscriber.java
index acd50bd9f7f..00adbadc0fb 100644
--- 
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ConfigurationChangedSubscriber.java
+++ 
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ConfigurationChangedSubscriber.java
@@ -124,6 +124,6 @@ public final class ConfigurationChangedSubscriber {
     
     private Map<String, StorageNodeDataSource> getDisabledDataSources() {
         return 
registryCenter.getStorageNodeStatusService().loadStorageNodes().entrySet()
-                .stream().filter(entry -> DataSourceState.DISABLED == 
entry.getValue().getStatus()).collect(Collectors.toMap(Map.Entry::getKey, 
Map.Entry::getValue));
+                .stream().filter(entry -> DataSourceState.DISABLED == 
entry.getValue().getStatus()).collect(Collectors.toMap(Entry::getKey, 
Entry::getValue));
     }
 }
diff --git 
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneModeContextManager.java
 
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneModeContextManager.java
index 51c7ef73935..c7e45d16d84 100644
--- 
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneModeContextManager.java
+++ 
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneModeContextManager.java
@@ -252,11 +252,11 @@ public final class StandaloneModeContextManager 
implements ModeContextManager, C
     }
     
     private Map<String, DataSourceProperties> 
getToBeDeletedDataSourcePropsMap(final Map<String, DataSourceProperties> 
dataSourcePropsMap, final Collection<String> toBeDroppedResourceNames) {
-        return dataSourcePropsMap.entrySet().stream().filter(entry -> 
toBeDroppedResourceNames.contains(entry.getKey())).collect(Collectors.toMap(Map.Entry::getKey,
 Map.Entry::getValue));
+        return dataSourcePropsMap.entrySet().stream().filter(entry -> 
toBeDroppedResourceNames.contains(entry.getKey())).collect(Collectors.toMap(Entry::getKey,
 Entry::getValue));
     }
     
     private Map<String, DataSourceProperties> 
getToBeReversedDataSourcePropsMap(final Map<String, DataSourceProperties> 
dataSourcePropsMap, final Collection<String> toBeDroppedResourceNames) {
-        return dataSourcePropsMap.entrySet().stream().filter(entry -> 
!toBeDroppedResourceNames.contains(entry.getKey())).collect(Collectors.toMap(Map.Entry::getKey,
 Map.Entry::getValue));
+        return dataSourcePropsMap.entrySet().stream().filter(entry -> 
!toBeDroppedResourceNames.contains(entry.getKey())).collect(Collectors.toMap(Entry::getKey,
 Entry::getValue));
     }
     
     @Override