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 fd038fff4a4 Refactor MetaDataImportExecutor (#36118)
fd038fff4a4 is described below

commit fd038fff4a4bd14066f175a8781849cfe20d0d18
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Jul 30 02:24:17 2025 +0800

    Refactor MetaDataImportExecutor (#36118)
---
 .../proxy/backend/util/MetaDataImportExecutor.java             | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git 
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/MetaDataImportExecutor.java
 
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/MetaDataImportExecutor.java
index aa686482397..01954ab7b02 100644
--- 
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/MetaDataImportExecutor.java
+++ 
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/MetaDataImportExecutor.java
@@ -30,6 +30,7 @@ import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.stream.Collectors;
 
 /**
  * Metadata import executor.
@@ -45,7 +46,7 @@ public final class MetaDataImportExecutor {
     
     public MetaDataImportExecutor(final ContextManager contextManager) {
         this.contextManager = contextManager;
-        this.databaseConfigImportExecutor = new 
YamlDatabaseConfigurationImportExecutor(contextManager);
+        databaseConfigImportExecutor = new 
YamlDatabaseConfigurationImportExecutor(contextManager);
     }
     
     /**
@@ -80,11 +81,8 @@ public final class MetaDataImportExecutor {
     }
     
     private Map<String, YamlProxyDatabaseConfiguration> 
getYamlProxyDatabaseConfigurations(final ExportedMetaData exportedMetaData) {
-        Map<String, YamlProxyDatabaseConfiguration> result = new 
LinkedHashMap<>();
-        for (Entry<String, String> entry : 
exportedMetaData.getDatabases().entrySet()) {
-            result.put(entry.getKey(), YamlEngine.unmarshal(entry.getValue(), 
YamlProxyDatabaseConfiguration.class));
-        }
-        return result;
+        return exportedMetaData.getDatabases().entrySet().stream().collect(
+                Collectors.toMap(Entry::getKey, entry -> 
YamlEngine.unmarshal(entry.getValue(), YamlProxyDatabaseConfiguration.class), 
(oldValue, currentValue) -> oldValue, LinkedHashMap::new));
     }
     
     private YamlProxyServerConfiguration getYamlServerConfig(final 
ExportedMetaData exportedMetaData) {

Reply via email to