Refactor ShardingSphereDriverUtils (#30269)

apache · Feb 24, 2024 · 4a201a0 · 4a201a0
1 parent e122a38
commit 4a201a0
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/...core/src/main/java/org/apache/shardingsphere/agent/plugin/core/context/PluginContext.java b/...core/src/main/java/org/apache/shardingsphere/agent/plugin/core/context/PluginContext.java
@@ -73,7 +73,7 @@ public Optional<ContextManager> getContextManager() {
         if (isEnhancedForProxy) {
             return Optional.ofNullable(ProxyContext.getInstance().getContextManager());
         }
-        Optional<Map<String, ShardingSphereDataSource>> dataSourceMap = ShardingSphereDriverUtils.getShardingSphereDataSources();
+        Optional<Map<String, ShardingSphereDataSource>> dataSourceMap = ShardingSphereDriverUtils.findShardingSphereDataSources();
         if (dataSourceMap.isPresent() && !dataSourceMap.get().isEmpty()) {
             return Optional.ofNullable(AgentReflectionUtils.getFieldValue(dataSourceMap.get().values().iterator().next(), "contextManager"));
         }

diff --git a/...main/java/org/apache/shardingsphere/agent/plugin/core/util/ShardingSphereDriverUtils.java b/...main/java/org/apache/shardingsphere/agent/plugin/core/util/ShardingSphereDriverUtils.java
@@ -39,27 +39,27 @@
 public final class ShardingSphereDriverUtils {
 
     /**
-     * Get ShardingSphere data sources.
+     * Find ShardingSphere data sources.
      *
-     * @return got data source
+     * @return found data source
      */
-    public static Optional<Map<String, ShardingSphereDataSource>> getShardingSphereDataSources() {
-        Optional<ShardingSphereDriver> driver = getShardingSphereDriver();
-        if (driver.isPresent()) {
-            DriverDataSourceCache dataSourceCache = AgentReflectionUtils.getFieldValue(driver.get(), "dataSourceCache");
-            Map<String, DataSource> dataSourceMap = AgentReflectionUtils.getFieldValue(dataSourceCache, "dataSourceMap");
-            Map<String, ShardingSphereDataSource> result = new LinkedHashMap<>();
-            for (Entry<String, DataSource> entry : dataSourceMap.entrySet()) {
-                if (entry.getValue() instanceof ShardingSphereDataSource) {
-                    result.put(entry.getKey(), (ShardingSphereDataSource) entry.getValue());
-                }
+    public static Optional<Map<String, ShardingSphereDataSource>> findShardingSphereDataSources() {
+        Optional<ShardingSphereDriver> driver = findShardingSphereDriver();
+        if (!driver.isPresent()) {
+            return Optional.empty();
+        }
+        DriverDataSourceCache dataSourceCache = AgentReflectionUtils.getFieldValue(driver.get(), "dataSourceCache");
+        Map<String, DataSource> dataSourceMap = AgentReflectionUtils.getFieldValue(dataSourceCache, "dataSourceMap");
+        Map<String, ShardingSphereDataSource> result = new LinkedHashMap<>();
+        for (Entry<String, DataSource> entry : dataSourceMap.entrySet()) {
+            if (entry.getValue() instanceof ShardingSphereDataSource) {
+                result.put(entry.getKey(), (ShardingSphereDataSource) entry.getValue());
             }
-            return Optional.of(result);
         }
-        return Optional.empty();
+        return Optional.of(result);
     }
 
-    private static Optional<ShardingSphereDriver> getShardingSphereDriver() {
+    private static Optional<ShardingSphereDriver> findShardingSphereDriver() {
         Enumeration<Driver> driverEnumeration = DriverManager.getDrivers();
         while (driverEnumeration.hasMoreElements()) {
             Driver driver = driverEnumeration.nextElement();

diff --git a/...shardingsphere/agent/plugin/metrics/core/exporter/impl/jdbc/JDBCMetaDataInfoExporter.java b/...shardingsphere/agent/plugin/metrics/core/exporter/impl/jdbc/JDBCMetaDataInfoExporter.java
@@ -44,7 +44,7 @@ public final class JDBCMetaDataInfoExporter implements MetricsExporter {
 
     @Override
     public Optional<GaugeMetricFamilyMetricsCollector> export(final String pluginType) {
-        Optional<Map<String, ShardingSphereDataSource>> dataSourceMap = ShardingSphereDriverUtils.getShardingSphereDataSources();
+        Optional<Map<String, ShardingSphereDataSource>> dataSourceMap = ShardingSphereDriverUtils.findShardingSphereDataSources();
         if (!dataSourceMap.isPresent()) {
             return Optional.empty();
         }

diff --git a/...apache/shardingsphere/agent/plugin/metrics/core/exporter/impl/jdbc/JDBCStateExporter.java b/...apache/shardingsphere/agent/plugin/metrics/core/exporter/impl/jdbc/JDBCStateExporter.java
@@ -41,7 +41,7 @@ public final class JDBCStateExporter implements MetricsExporter {
 
     @Override
     public Optional<GaugeMetricFamilyMetricsCollector> export(final String pluginType) {
-        Optional<Map<String, ShardingSphereDataSource>> dataSourceMap = ShardingSphereDriverUtils.getShardingSphereDataSources();
+        Optional<Map<String, ShardingSphereDataSource>> dataSourceMap = ShardingSphereDriverUtils.findShardingSphereDataSources();
         if (!dataSourceMap.isPresent()) {
             return Optional.empty();
         }