[shardingsphere] branch master updated: Refactor java doc of GlobalDataSourceRegistry (#27562)

[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 0063493f9e4 Refactor java doc of GlobalDataSourceRegistry (#27562)
0063493f9e4 is described below

commit 0063493f9e4ab6170cd42174207d1112561dfba1
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sat Jul 29 23:49:31 2023 +0800

    Refactor java doc of GlobalDataSourceRegistry (#27562)
---
 .../infra/datasource/pool/creator/DataSourcePoolCreator.java        | 4 ++--
 .../infra/database/core/GlobalDataSourceRegistry.java               | 6 +++---
 .../backend/connector/jdbc/datasource/JDBCBackendDataSource.java    | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git 
a/infra/common/src/main/java/org/apache/shardingsphere/infra/datasource/pool/creator/DataSourcePoolCreator.java
 
b/infra/common/src/main/java/org/apache/shardingsphere/infra/datasource/pool/creator/DataSourcePoolCreator.java
index e6a7eee6965..120b149c8cc 100644
--- 
a/infra/common/src/main/java/org/apache/shardingsphere/infra/datasource/pool/creator/DataSourcePoolCreator.java
+++ 
b/infra/common/src/main/java/org/apache/shardingsphere/infra/datasource/pool/creator/DataSourcePoolCreator.java
@@ -221,8 +221,8 @@ public final class DataSourcePoolCreator {
      */
     public static DataSource create(final String dataSourceName, final 
DataSourceProperties dataSourceProps, final boolean cacheEnabled) {
         DataSource result = create(dataSourceProps);
-        if (cacheEnabled && 
!GlobalDataSourceRegistry.getInstance().getCachedDataSourceDataSources().containsKey(dataSourceName))
 {
-            
GlobalDataSourceRegistry.getInstance().getCachedDataSourceDataSources().put(dataSourceName,
 result);
+        if (cacheEnabled && 
!GlobalDataSourceRegistry.getInstance().getCachedDataSources().containsKey(dataSourceName))
 {
+            
GlobalDataSourceRegistry.getInstance().getCachedDataSources().put(dataSourceName,
 result);
         }
         return result;
     }
diff --git 
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/GlobalDataSourceRegistry.java
 
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/GlobalDataSourceRegistry.java
index a64594781a2..6a2f50d12fb 100644
--- 
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/GlobalDataSourceRegistry.java
+++ 
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/GlobalDataSourceRegistry.java
@@ -34,14 +34,14 @@ public final class GlobalDataSourceRegistry {
     
     private static final GlobalDataSourceRegistry INSTANCE = new 
GlobalDataSourceRegistry();
     
-    private final Map<String, DataSource> cachedDataSourceDataSources = new 
ConcurrentHashMap<>();
+    private final Map<String, DataSource> cachedDataSources = new 
ConcurrentHashMap<>();
     
     private final Map<String, String> cachedDatabaseTables = new 
ConcurrentHashMap<>();
     
     /**
-     * Get global data source.
+     * Get instance of global data source registry.
      *
-     * @return instance of ShardingSphere global data source.
+     * @return got instance
      */
     public static GlobalDataSourceRegistry getInstance() {
         return INSTANCE;
diff --git 
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/datasource/JDBCBackendDataSource.java
 
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/datasource/JDBCBackendDataSource.java
index ef4f34bbd3f..a2f562af3ca 100644
--- 
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/datasource/JDBCBackendDataSource.java
+++ 
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/datasource/JDBCBackendDataSource.java
@@ -71,8 +71,8 @@ public final class JDBCBackendDataSource implements 
BackendDataSource {
         DataSource dataSource = 
ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabase(databaseName).getResourceMetaData().getDataSources().get(dataSourceName);
         if (dataSourceName.contains(".")) {
             String dataSourceStr = dataSourceName.split("\\.")[0];
-            if 
(GlobalDataSourceRegistry.getInstance().getCachedDataSourceDataSources().containsKey(dataSourceStr))
 {
-                dataSource = 
GlobalDataSourceRegistry.getInstance().getCachedDataSourceDataSources().get(dataSourceStr);
+            if 
(GlobalDataSourceRegistry.getInstance().getCachedDataSources().containsKey(dataSourceStr))
 {
+                dataSource = 
GlobalDataSourceRegistry.getInstance().getCachedDataSources().get(dataSourceStr);
             }
         }
         Preconditions.checkNotNull(dataSource, "Can not get connection from 
datasource %s.", dataSourceName);