This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 4a201a0079a Refactor ShardingSphereDriverUtils (#30269)
4a201a0079a is described below
commit 4a201a0079af5e9e989cd17ca4be9c217e21fec2
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Feb 24 15:07:21 2024 +0800
Refactor ShardingSphereDriverUtils (#30269)
---
.../agent/plugin/core/context/PluginContext.java | 2 +-
.../core/util/ShardingSphereDriverUtils.java | 30 +++++++++++-----------
.../impl/jdbc/JDBCMetaDataInfoExporter.java | 2 +-
.../core/exporter/impl/jdbc/JDBCStateExporter.java | 2 +-
4 files changed, 18 insertions(+), 18 deletions(-)
diff --git
a/agent/plugins/core/src/main/java/org/apache/shardingsphere/agent/plugin/core/context/PluginContext.java
b/agent/plugins/core/src/main/java/org/apache/shardingsphere/agent/plugin/core/context/PluginContext.java
index afc3a364399..672df186be8 100644
---
a/agent/plugins/core/src/main/java/org/apache/shardingsphere/agent/plugin/core/context/PluginContext.java
+++
b/agent/plugins/core/src/main/java/org/apache/shardingsphere/agent/plugin/core/context/PluginContext.java
@@ -73,7 +73,7 @@ public final class PluginContext {
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/agent/plugins/core/src/main/java/org/apache/shardingsphere/agent/plugin/core/util/ShardingSphereDriverUtils.java
b/agent/plugins/core/src/main/java/org/apache/shardingsphere/agent/plugin/core/util/ShardingSphereDriverUtils.java
index d1c90e39ad6..0c5377acf11 100644
---
a/agent/plugins/core/src/main/java/org/apache/shardingsphere/agent/plugin/core/util/ShardingSphereDriverUtils.java
+++
b/agent/plugins/core/src/main/java/org/apache/shardingsphere/agent/plugin/core/util/ShardingSphereDriverUtils.java
@@ -39,27 +39,27 @@ import java.util.Optional;
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/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/exporter/impl/jdbc/JDBCMetaDataInfoExporter.java
b/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/exporter/impl/jdbc/JDBCMetaDataInfoExporter.java
index 415bb1251a3..4d615de6774 100644
---
a/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/exporter/impl/jdbc/JDBCMetaDataInfoExporter.java
+++
b/agent/plugins/metrics/core/src/main/java/org/apache/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/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/exporter/impl/jdbc/JDBCStateExporter.java
b/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/exporter/impl/jdbc/JDBCStateExporter.java
index 6572582cfea..a573d8a0db7 100644
---
a/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/exporter/impl/jdbc/JDBCStateExporter.java
+++
b/agent/plugins/metrics/core/src/main/java/org/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();
}
