This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 540fcc03ca1 Rename xxUtil to xxUtils (#28277)
540fcc03ca1 is described below
commit 540fcc03ca1c91de47f4550a6b8e31a8887c1e71
Author: yx9o <[email protected]>
AuthorDate: Mon Aug 28 10:18:15 2023 +0800
Rename xxUtil to xxUtils (#28277)
---
.../core/util/{SQLStatementUtil.java => SQLStatementUtils.java} | 4 ++--
.../{ShardingSphereDriverUtil.java => ShardingSphereDriverUtils.java} | 4 ++--
.../agent/plugin/metrics/core/advice/SQLParseCountAdvice.java | 4 ++--
.../agent/plugin/metrics/core/advice/SQLRouteCountAdvice.java | 4 ++--
.../metrics/core/exporter/impl/jdbc/JDBCMetaDataInfoExporter.java | 4 ++--
.../plugin/metrics/core/exporter/impl/jdbc/JDBCStateExporter.java | 4 ++--
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git
a/agent/plugins/core/src/main/java/org/apache/shardingsphere/agent/plugin/core/util/SQLStatementUtil.java
b/agent/plugins/core/src/main/java/org/apache/shardingsphere/agent/plugin/core/util/SQLStatementUtils.java
similarity index 98%
rename from
agent/plugins/core/src/main/java/org/apache/shardingsphere/agent/plugin/core/util/SQLStatementUtil.java
rename to
agent/plugins/core/src/main/java/org/apache/shardingsphere/agent/plugin/core/util/SQLStatementUtils.java
index fc0d417d70d..5f943f67bbf 100644
---
a/agent/plugins/core/src/main/java/org/apache/shardingsphere/agent/plugin/core/util/SQLStatementUtil.java
+++
b/agent/plugins/core/src/main/java/org/apache/shardingsphere/agent/plugin/core/util/SQLStatementUtils.java
@@ -37,10 +37,10 @@ import
org.apache.shardingsphere.sql.parser.sql.common.statement.dml.UpdateState
import
org.apache.shardingsphere.sql.parser.sql.common.statement.tcl.TCLStatement;
/**
- * SQL statement util.
+ * SQL statement utils.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class SQLStatementUtil {
+public final class SQLStatementUtils {
/**
* Get SQL type.
diff --git
a/agent/plugins/core/src/main/java/org/apache/shardingsphere/agent/plugin/core/util/ShardingSphereDriverUtil.java
b/agent/plugins/core/src/main/java/org/apache/shardingsphere/agent/plugin/core/util/ShardingSphereDriverUtils.java
similarity index 95%
rename from
agent/plugins/core/src/main/java/org/apache/shardingsphere/agent/plugin/core/util/ShardingSphereDriverUtil.java
rename to
agent/plugins/core/src/main/java/org/apache/shardingsphere/agent/plugin/core/util/ShardingSphereDriverUtils.java
index d3832bdb48b..2be08e87a01 100644
---
a/agent/plugins/core/src/main/java/org/apache/shardingsphere/agent/plugin/core/util/ShardingSphereDriverUtil.java
+++
b/agent/plugins/core/src/main/java/org/apache/shardingsphere/agent/plugin/core/util/ShardingSphereDriverUtils.java
@@ -27,10 +27,10 @@ import java.util.Enumeration;
import java.util.Optional;
/**
- * ShardingSphere driver util.
+ * ShardingSphere driver utils.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class ShardingSphereDriverUtil {
+public final class ShardingSphereDriverUtils {
/**
* Get sharding sphere driver.
diff --git
a/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLParseCountAdvice.java
b/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLParseCountAdvice.java
index dfd92600a8e..554c9463ecd 100644
---
a/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLParseCountAdvice.java
+++
b/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLParseCountAdvice.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.agent.plugin.metrics.core.advice;
import org.apache.shardingsphere.agent.api.advice.TargetAdviceObject;
import org.apache.shardingsphere.agent.api.advice.type.InstanceMethodAdvice;
-import org.apache.shardingsphere.agent.plugin.core.util.SQLStatementUtil;
+import org.apache.shardingsphere.agent.plugin.core.util.SQLStatementUtils;
import
org.apache.shardingsphere.agent.plugin.metrics.core.collector.MetricsCollectorRegistry;
import
org.apache.shardingsphere.agent.plugin.metrics.core.collector.type.CounterMetricsCollector;
import
org.apache.shardingsphere.agent.plugin.metrics.core.config.MetricCollectorType;
@@ -44,6 +44,6 @@ public final class SQLParseCountAdvice implements
InstanceMethodAdvice {
}
private Optional<String> getSQLType(final SQLStatement sqlStatement) {
- return Optional.of(SQLStatementUtil.getType(sqlStatement).name());
+ return Optional.of(SQLStatementUtils.getType(sqlStatement).name());
}
}
diff --git
a/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLRouteCountAdvice.java
b/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLRouteCountAdvice.java
index 3d483c83ca6..885d015aa8c 100644
---
a/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLRouteCountAdvice.java
+++
b/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLRouteCountAdvice.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.agent.plugin.metrics.core.advice;
import org.apache.shardingsphere.agent.api.advice.TargetAdviceObject;
import org.apache.shardingsphere.agent.api.advice.type.InstanceMethodAdvice;
-import org.apache.shardingsphere.agent.plugin.core.util.SQLStatementUtil;
+import org.apache.shardingsphere.agent.plugin.core.util.SQLStatementUtils;
import
org.apache.shardingsphere.agent.plugin.metrics.core.collector.MetricsCollectorRegistry;
import
org.apache.shardingsphere.agent.plugin.metrics.core.collector.type.CounterMetricsCollector;
import
org.apache.shardingsphere.agent.plugin.metrics.core.config.MetricCollectorType;
@@ -47,6 +47,6 @@ public final class SQLRouteCountAdvice implements
InstanceMethodAdvice {
}
private Optional<String> getSQLType(final SQLStatement sqlStatement) {
- return Optional.of(SQLStatementUtil.getType(sqlStatement).name());
+ return Optional.of(SQLStatementUtils.getType(sqlStatement).name());
}
}
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 957ed707294..ed249b6955f 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
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.agent.plugin.metrics.core.exporter.impl.jdbc;
import org.apache.shardingsphere.agent.plugin.core.util.AgentReflectionUtils;
-import
org.apache.shardingsphere.agent.plugin.core.util.ShardingSphereDriverUtil;
+import
org.apache.shardingsphere.agent.plugin.core.util.ShardingSphereDriverUtils;
import
org.apache.shardingsphere.agent.plugin.metrics.core.collector.MetricsCollectorRegistry;
import
org.apache.shardingsphere.agent.plugin.metrics.core.collector.type.GaugeMetricFamilyMetricsCollector;
import
org.apache.shardingsphere.agent.plugin.metrics.core.config.MetricCollectorType;
@@ -47,7 +47,7 @@ public final class JDBCMetaDataInfoExporter implements
MetricsExporter {
@Override
public Optional<GaugeMetricFamilyMetricsCollector> export(final String
pluginType) {
- Optional<ShardingSphereDriver> driver =
ShardingSphereDriverUtil.getShardingSphereDriver();
+ Optional<ShardingSphereDriver> driver =
ShardingSphereDriverUtils.getShardingSphereDriver();
if (!driver.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 1314796bb56..16c5866d7c4 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
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.agent.plugin.metrics.core.exporter.impl.jdbc;
import org.apache.shardingsphere.agent.plugin.core.util.AgentReflectionUtils;
-import
org.apache.shardingsphere.agent.plugin.core.util.ShardingSphereDriverUtil;
+import
org.apache.shardingsphere.agent.plugin.core.util.ShardingSphereDriverUtils;
import
org.apache.shardingsphere.agent.plugin.metrics.core.collector.MetricsCollectorRegistry;
import
org.apache.shardingsphere.agent.plugin.metrics.core.collector.type.GaugeMetricFamilyMetricsCollector;
import
org.apache.shardingsphere.agent.plugin.metrics.core.config.MetricCollectorType;
@@ -44,7 +44,7 @@ public final class JDBCStateExporter implements
MetricsExporter {
@Override
public Optional<GaugeMetricFamilyMetricsCollector> export(final String
pluginType) {
- Optional<ShardingSphereDriver> driver =
ShardingSphereDriverUtil.getShardingSphereDriver();
+ Optional<ShardingSphereDriver> driver =
ShardingSphereDriverUtils.getShardingSphereDriver();
if (!driver.isPresent()) {
return Optional.empty();
}
