[shardingsphere] branch master updated: Minor refactor (#10098)

[panjuan]

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

panjuan 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 aba826b  Minor refactor (#10098)
aba826b is described below

commit aba826b3dc49d0606619ebf35b75b0dc423c2785
Author: Haoran Meng <menghaora...@gmail.com>
AuthorDate: Thu Apr 15 18:46:03 2021 +0800

    Minor refactor (#10098)
---
 .../rdl/impl/AddResourceBackendHandler.java        | 28 +++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git 
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AddResourceBackendHandler.java
 
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AddResourceBackendHandler.java
index 894edd6..974af29 100644
--- 
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AddResourceBackendHandler.java
+++ 
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/AddResourceBackendHandler.java
@@ -59,23 +59,11 @@ public final class AddResourceBackendHandler extends 
SchemaRequiredBackendHandle
     
     @Override
     public ResponseHeader execute(final String schemaName, final 
AddResourceStatement sqlStatement) {
-        check(schemaName, sqlStatement);
-        Map<String, DataSourceConfiguration> dataSources = 
DataSourceParameterConverter.getDataSourceConfigurationMap(
-                
DataSourceParameterConverter.getDataSourceParameterMapFromYamlConfiguration(AddResourcesStatementConverter.convert(databaseType,
 sqlStatement)));
-        Collection<String> invalidDataSourceNames = new ArrayList<>();
-        for (Entry<String, DataSourceConfiguration> entry : 
dataSources.entrySet()) {
-            if (!dataSourceValidator.validate(entry.getValue())) {
-                invalidDataSourceNames.add(entry.getKey());
-            }
-        }
-        if (!invalidDataSourceNames.isEmpty()) {
-            throw new InvalidResourceException(invalidDataSourceNames);
-        }
-        post(schemaName, dataSources);
+        post(schemaName, check(schemaName, sqlStatement));
         return new UpdateResponseHeader(sqlStatement);
     }
     
-    private void check(final String schemaName, final AddResourceStatement 
sqlStatement) {
+    private Map<String, DataSourceConfiguration> check(final String 
schemaName, final AddResourceStatement sqlStatement) {
         List<String> dataSourceNames = new 
ArrayList<>(sqlStatement.getDataSources().size());
         Set<String> duplicateDataSourceNames = new HashSet<>();
         for (DataSourceSegment dataSourceSegment : 
sqlStatement.getDataSources()) {
@@ -89,6 +77,18 @@ public final class AddResourceBackendHandler extends 
SchemaRequiredBackendHandle
         if (!duplicateDataSourceNames.isEmpty()) {
             throw new DuplicateResourceException(duplicateDataSourceNames);
         }
+        Map<String, DataSourceConfiguration> result = 
DataSourceParameterConverter.getDataSourceConfigurationMap(
+                
DataSourceParameterConverter.getDataSourceParameterMapFromYamlConfiguration(AddResourcesStatementConverter.convert(databaseType,
 sqlStatement)));
+        Collection<String> invalidDataSourceNames = new ArrayList<>();
+        for (Entry<String, DataSourceConfiguration> entry : result.entrySet()) 
{
+            if (!dataSourceValidator.validate(entry.getValue())) {
+                invalidDataSourceNames.add(entry.getKey());
+            }
+        }
+        if (!invalidDataSourceNames.isEmpty()) {
+            throw new InvalidResourceException(invalidDataSourceNames);
+        }
+        return result;
     }
     
     private void post(final String schemaName, final Map<String, 
DataSourceConfiguration> dataSources) {