[shardingsphere] branch master updated: Refactor NewResourceSwitchManager (#28123)

[sunnianjun]

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

sunnianjun 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 54840af5170 Refactor NewResourceSwitchManager (#28123)
54840af5170 is described below

commit 54840af51705c4463b1149bbca0180f452dd9f1d
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Wed Aug 16 19:53:28 2023 +0800

    Refactor NewResourceSwitchManager (#28123)
---
 .../mode/manager/switcher/NewResourceSwitchManager.java            | 7 +++----
 .../mode/manager/switcher/ResourceSwitchManager.java               | 6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git 
a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/switcher/NewResourceSwitchManager.java
 
b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/switcher/NewResourceSwitchManager.java
index a3016606851..84fff446e03 100644
--- 
a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/switcher/NewResourceSwitchManager.java
+++ 
b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/switcher/NewResourceSwitchManager.java
@@ -47,12 +47,11 @@ public final class NewResourceSwitchManager {
      * @return created switching resource
      */
     public SwitchingResource registerStorageUnit(final ResourceMetaData 
resourceMetaData, final Map<String, DataSourcePoolProperties> propsMap) {
-        Map<String, DataSourcePoolProperties> 
mergedDataSourcePoolPropertiesMap = new 
HashMap<>(resourceMetaData.getStorageUnitMetaData().getDataSourcePoolPropertiesMap());
-        mergedDataSourcePoolPropertiesMap.putAll(propsMap);
-        
resourceMetaData.getStorageUnitMetaData().getDataSourcePoolPropertiesMap().putAll(propsMap);
+        Map<String, DataSourcePoolProperties> mergedPropsMap = new 
HashMap<>(resourceMetaData.getStorageUnitMetaData().getDataSourcePoolPropertiesMap());
+        mergedPropsMap.putAll(propsMap);
         StorageResourceWithProperties toBeCreatedStorageResource = 
StorageResourceCreator.createStorageResourceWithoutDataSource(propsMap);
         return new SwitchingResource(resourceMetaData, 
getRegisterNewStorageResource(resourceMetaData, toBeCreatedStorageResource),
-                new StorageResource(Collections.emptyMap(), 
Collections.emptyMap()), mergedDataSourcePoolPropertiesMap);
+                new StorageResource(Collections.emptyMap(), 
Collections.emptyMap()), mergedPropsMap);
     }
     
     private StorageResource getRegisterNewStorageResource(final 
ResourceMetaData resourceMetaData, final StorageResourceWithProperties 
toBeCreatedStorageResource) {
diff --git 
a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/switcher/ResourceSwitchManager.java
 
b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/switcher/ResourceSwitchManager.java
index 759fc8e111c..2b50ebbcfbf 100644
--- 
a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/switcher/ResourceSwitchManager.java
+++ 
b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/switcher/ResourceSwitchManager.java
@@ -49,11 +49,11 @@ public final class ResourceSwitchManager {
      * @return created switching resource
      */
     public SwitchingResource create(final ResourceMetaData resourceMetaData, 
final Map<String, DataSourcePoolProperties> toBeChangedPropsMap) {
-        Map<String, DataSourcePoolProperties> 
mergedDataSourcePoolPropertiesMap = new 
HashMap<>(resourceMetaData.getStorageUnitMetaData().getDataSourcePoolPropertiesMap());
-        mergedDataSourcePoolPropertiesMap.putAll(toBeChangedPropsMap);
+        Map<String, DataSourcePoolProperties> mergedPropsMap = new 
HashMap<>(resourceMetaData.getStorageUnitMetaData().getDataSourcePoolPropertiesMap());
+        mergedPropsMap.putAll(toBeChangedPropsMap);
         StorageResourceWithProperties toBeChangedStorageResource = 
StorageResourceCreator.createStorageResourceWithoutDataSource(toBeChangedPropsMap);
         return new SwitchingResource(resourceMetaData, 
createNewStorageResource(resourceMetaData, toBeChangedStorageResource),
-                getStaleDataSources(resourceMetaData, 
toBeChangedStorageResource), mergedDataSourcePoolPropertiesMap);
+                getStaleDataSources(resourceMetaData, 
toBeChangedStorageResource), mergedPropsMap);
     }
     
     /**