[shardingsphere] branch master updated: Refactor ResourceMetaData (#27993)

[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 cb75d36dde2 Refactor ResourceMetaData (#27993)
cb75d36dde2 is described below

commit cb75d36dde2706d7ecca18d7ac3e0f8eb441e58a
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Tue Aug 8 23:31:14 2023 +0800

    Refactor ResourceMetaData (#27993)
---
 .../metadata/database/resource/ResourceMetaData.java   | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git 
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/ResourceMetaData.java
 
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/ResourceMetaData.java
index 6ae10225510..42b762eb67a 100644
--- 
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/ResourceMetaData.java
+++ 
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/ResourceMetaData.java
@@ -70,6 +70,14 @@ public final class ResourceMetaData {
         this.dataSourcePropsMap = dataSourcePropsMap;
     }
     
+    private Map<String, DatabaseType> createStorageTypes(final Map<String, 
DataSource> dataSources, final Map<String, DataSource> enabledDataSources) {
+        Map<String, DatabaseType> result = new 
LinkedHashMap<>(dataSources.size(), 1F);
+        for (Entry<String, DataSource> entry : dataSources.entrySet()) {
+            result.put(entry.getKey(), 
DatabaseTypeEngine.getStorageType(enabledDataSources.containsKey(entry.getKey())
 ? Collections.singleton(entry.getValue()) : Collections.emptyList()));
+        }
+        return result;
+    }
+    
     /**
      * Get data sources.
      *
@@ -88,16 +96,6 @@ public final class ResourceMetaData {
         return storageUnitMetaData.getStorageTypes();
     }
     
-    private Map<String, DatabaseType> createStorageTypes(final Map<String, 
DataSource> dataSources, final Map<String, DataSource> enabledDataSources) {
-        Map<String, DatabaseType> result = new 
LinkedHashMap<>(dataSources.size(), 1F);
-        for (Entry<String, DataSource> entry : dataSources.entrySet()) {
-            DatabaseType storageType = 
enabledDataSources.containsKey(entry.getKey()) ? 
DatabaseTypeEngine.getStorageType(Collections.singletonList(entry.getValue()))
-                    : 
DatabaseTypeEngine.getStorageType(Collections.emptyList());
-            result.put(entry.getKey(), storageType);
-        }
-        return result;
-    }
-    
     /**
      * Get all instance data source names.
      *