You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2023/03/25 16:42:50 UTC
[shardingsphere] branch master updated: Rename xxUtil to xxUtils (#24826)
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 78207aae6c2 Rename xxUtil to xxUtils (#24826)
78207aae6c2 is described below
commit 78207aae6c2d20a392be007a13dc535e5b0d956b
Author: yx9o <ya...@163.com>
AuthorDate: Sun Mar 26 00:42:42 2023 +0800
Rename xxUtil to xxUtils (#24826)
---
.../protocol/PostgreSQLBinaryTimestampUtils.java | 3 +
.../bind/protocol/PostgreSQLTextTimeUtils.java | 2 +-
.../protocol/PostgreSQLTextTimestampUtils.java | 2 +-
.../datanode/DatabaseDiscoveryDataNodeBuilder.java | 4 +-
.../TelephoneRandomReplaceAlgorithmTest.java | 4 +-
.../ReadwriteSplittingDataNodeBuilder.java | 4 +-
.../shadow/datanode/ShadowDataNodeBuilder.java | 4 +-
.../dal/show/ShowCreateTableMergedResult.java | 6 +-
.../merge/dal/show/ShowIndexMergedResult.java | 4 +-
.../sharding/rewrite/token/pojo/IndexToken.java | 4 +-
.../ShardingTableBroadcastRoutingEngine.java | 4 +-
.../shardingsphere/sharding/rule/TableRule.java | 6 +-
.../decider/engine/SQLFederationDeciderEngine.java | 4 +-
.../statement/ddl/CreateIndexStatementContext.java | 4 +-
.../{DataNodeUtil.java => DataNodeUtils.java} | 4 +-
.../metadata/DataSourcePoolMetaDataReflection.java | 6 +-
.../shardingsphere/infra/hint/SQLHintUtils.java | 2 +-
.../metadata/jdbc/JDBCInstanceMetaData.java | 2 +-
.../metadata/proxy/ProxyInstanceMetaData.java | 2 +-
.../infra/instance/{utils => util}/IpUtils.java | 4 +-
... => ShardingSphereTableDataCollectorUtils.java} | 4 +-
.../collector/tables/PgClassTableCollector.java | 4 +-
.../tables/PgNamespaceTableCollector.java | 4 +-
.../schema/builder/GenericSchemaBuilder.java | 4 +-
...exMetaDataUtil.java => IndexMetaDataUtils.java} | 2 +-
...aMetaDataUtil.java => SchemaMetaDataUtils.java} | 2 +-
...ystemSchemaUtil.java => SystemSchemaUtils.java} | 2 +-
...ataNodeUtilTest.java => DataNodeUtilsTest.java} | 8 +-
.../infra/fixture/DataNodeBuilderFixture.java | 4 +-
.../infra/instance/util/IpUtilsTest.java | 1 -
...taUtilTest.java => IndexMetaDataUtilsTest.java} | 16 +-
...aUtilTest.java => SchemaMetaDataUtilsTest.java} | 8 +-
...emaUtilTest.java => SystemSchemaUtilsTest.java} | 20 +--
.../index/CreateIndexStatementSchemaRefresher.java | 4 +-
.../index/DropIndexStatementSchemaRefresher.java | 4 +-
.../{ResultSetUtil.java => ResultSetUtils.java} | 5 +-
.../driver/jdbc/type/util/ResultSetUtilTest.java | 186 ---------------------
.../driver/jdbc/type/util/ResultSetUtilsTest.java | 186 +++++++++++++++++++++
.../{ReflectionUtil.java => ReflectionUtils.java} | 4 +-
...ctionUtilTest.java => ReflectionUtilsTest.java} | 14 +-
.../core/resultset/DatabaseMetaDataResultSet.java | 30 ++--
.../core/resultset/ShardingSphereResultSet.java | 42 ++---
...Util.java => ShardingSphereResultSetUtils.java} | 4 +-
.../statement/ShardingSpherePreparedStatement.java | 6 +-
....java => ShardingSphereResultSetUtilsTest.java} | 6 +-
.../pipeline/cdc/core/ack/CDCAckHolderTest.java | 6 +-
.../consistency/DataConsistencyCheckUtils.java | 2 +-
.../data/pipeline/core/job/PipelineJobIdUtils.java | 2 +-
.../metadata/generator/PipelineDDLGenerator.java | 6 +-
.../core/prepare/PipelineJobPreparerUtils.java | 2 +-
.../ingest/wal/decode/OpenGaussTimestampUtils.java | 2 +-
.../ingest/wal/decode/BaseTimestampUtils.java | 2 +-
.../wal/decode/PostgreSQLTimestampUtils.java | 2 +-
.../single/decider/SingleSQLFederationDecider.java | 4 +-
.../constraint/SingleConstraintReviser.java | 4 +-
.../metadata/reviser/index/SingleIndexReviser.java | 4 +-
.../single/route/SingleSQLRouter.java | 4 +-
.../advanced/resultset/SQLFederationResultSet.java | 36 ++--
.../transaction/util/AutoCommitUtils.java | 2 +-
.../xa/jta/datasource/XATransactionDataSource.java | 4 +-
.../transaction/xa/fixture/DataSourceUtils.java | 2 +-
.../NarayanaXATransactionManagerProvider.java | 16 +-
.../service/ComputeNodeStatusServiceTest.java | 2 +-
.../repository/cluster/nacos/NacosRepository.java | 2 +-
.../proxy/backend/connector/DatabaseConnector.java | 4 +-
.../backend/connector/DatabaseConnectorTest.java | 6 +-
.../DefaultDatabaseMetaDataExecutorTest.java | 4 +-
67 files changed, 382 insertions(+), 381 deletions(-)
diff --git a/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLBinaryTimestampUtils.java b/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLBinaryTimestampUtils.java
index 947381d5903..414f016d631 100644
--- a/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLBinaryTimestampUtils.java
+++ b/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLBinaryTimestampUtils.java
@@ -24,6 +24,9 @@ import java.sql.Timestamp;
import java.util.TimeZone;
import java.util.concurrent.TimeUnit;
+/**
+ * Binary timestamp utility class of PostgreSQL.
+ */
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class PostgreSQLBinaryTimestampUtils {
diff --git a/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLTextTimeUtils.java b/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLTextTimeUtils.java
index ed19f2ad901..3e78f248a97 100644
--- a/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLTextTimeUtils.java
+++ b/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLTextTimeUtils.java
@@ -24,7 +24,7 @@ import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
/**
- * Utils for PostgreSQL time.
+ * Text time utility class of PostgreSQL.
*/
public final class PostgreSQLTextTimeUtils {
diff --git a/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLTextTimestampUtils.java b/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLTextTimestampUtils.java
index ceaeb428a28..a5e81137202 100644
--- a/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLTextTimestampUtils.java
+++ b/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLTextTimestampUtils.java
@@ -29,7 +29,7 @@ import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
/**
- * Utils for PostgreSQL timestamp.
+ * Text timestamp utility class of PostgreSQL.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class PostgreSQLTextTimestampUtils {
diff --git a/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/datanode/DatabaseDiscoveryDataNodeBuilder.java b/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/datanode/DatabaseDiscoveryDataNodeBuilder.java
index f430b3c8b95..b3130a3d4dd 100644
--- a/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/datanode/DatabaseDiscoveryDataNodeBuilder.java
+++ b/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/datanode/DatabaseDiscoveryDataNodeBuilder.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.dbdiscovery.constant.DatabaseDiscoveryOrder;
import org.apache.shardingsphere.dbdiscovery.rule.DatabaseDiscoveryRule;
import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.infra.datanode.DataNodeBuilder;
-import org.apache.shardingsphere.infra.datanode.DataNodeUtil;
+import org.apache.shardingsphere.infra.datanode.DataNodeUtils;
import java.util.Collection;
import java.util.LinkedList;
@@ -35,7 +35,7 @@ public final class DatabaseDiscoveryDataNodeBuilder implements DataNodeBuilder<D
public Collection<DataNode> build(final Collection<DataNode> dataNodes, final DatabaseDiscoveryRule rule) {
Collection<DataNode> result = new LinkedList<>();
for (DataNode each : dataNodes) {
- result.addAll(DataNodeUtil.buildDataNode(each, rule.getDataSourceMapper()));
+ result.addAll(DataNodeUtils.buildDataNode(each, rule.getDataSourceMapper()));
}
return result;
}
diff --git a/features/mask/core/src/test/java/org/apache/shardingsphere/mask/algorithm/replace/TelephoneRandomReplaceAlgorithmTest.java b/features/mask/core/src/test/java/org/apache/shardingsphere/mask/algorithm/replace/TelephoneRandomReplaceAlgorithmTest.java
index c2f2deb13ba..62be4eb06bc 100644
--- a/features/mask/core/src/test/java/org/apache/shardingsphere/mask/algorithm/replace/TelephoneRandomReplaceAlgorithmTest.java
+++ b/features/mask/core/src/test/java/org/apache/shardingsphere/mask/algorithm/replace/TelephoneRandomReplaceAlgorithmTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.mask.algorithm.replace;
-import org.apache.shardingsphere.infra.util.reflection.ReflectionUtil;
+import org.apache.shardingsphere.infra.util.reflection.ReflectionUtils;
import org.apache.shardingsphere.mask.exception.algorithm.MaskAlgorithmInitializationException;
import org.apache.shardingsphere.test.util.PropertiesBuilder;
import org.apache.shardingsphere.test.util.PropertiesBuilder.Property;
@@ -52,7 +52,7 @@ class TelephoneRandomReplaceAlgorithmTest {
@Test
void assertInitWithEmptyProps() {
maskAlgorithm.init(new Properties());
- Optional<Object> actual = ReflectionUtil.getFieldValue(maskAlgorithm, "networkNumbers");
+ Optional<Object> actual = ReflectionUtils.getFieldValue(maskAlgorithm, "networkNumbers");
assertTrue(actual.isPresent());
assertThat(actual.get(), is(DEFAULT_NETWORK_NUMBERS));
}
diff --git a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/datanode/ReadwriteSplittingDataNodeBuilder.java b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/datanode/ReadwriteSplittingDataNodeBuilder.java
index d21974bf7b8..e5821eee824 100644
--- a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/datanode/ReadwriteSplittingDataNodeBuilder.java
+++ b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/datanode/ReadwriteSplittingDataNodeBuilder.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.readwritesplitting.datanode;
import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.infra.datanode.DataNodeBuilder;
-import org.apache.shardingsphere.infra.datanode.DataNodeUtil;
+import org.apache.shardingsphere.infra.datanode.DataNodeUtils;
import org.apache.shardingsphere.readwritesplitting.constant.ReadwriteSplittingOrder;
import org.apache.shardingsphere.readwritesplitting.rule.ReadwriteSplittingRule;
@@ -35,7 +35,7 @@ public final class ReadwriteSplittingDataNodeBuilder implements DataNodeBuilder<
public Collection<DataNode> build(final Collection<DataNode> dataNodes, final ReadwriteSplittingRule rule) {
Collection<DataNode> result = new LinkedList<>();
for (DataNode each : dataNodes) {
- result.addAll(DataNodeUtil.buildDataNode(each, rule.getDataSourceMapper()));
+ result.addAll(DataNodeUtils.buildDataNode(each, rule.getDataSourceMapper()));
}
return result;
}
diff --git a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/datanode/ShadowDataNodeBuilder.java b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/datanode/ShadowDataNodeBuilder.java
index 632148471be..fb1fbec8ae8 100644
--- a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/datanode/ShadowDataNodeBuilder.java
+++ b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/datanode/ShadowDataNodeBuilder.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.shadow.datanode;
import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.infra.datanode.DataNodeBuilder;
-import org.apache.shardingsphere.infra.datanode.DataNodeUtil;
+import org.apache.shardingsphere.infra.datanode.DataNodeUtils;
import org.apache.shardingsphere.shadow.constant.ShadowOrder;
import org.apache.shardingsphere.shadow.rule.ShadowRule;
@@ -35,7 +35,7 @@ public final class ShadowDataNodeBuilder implements DataNodeBuilder<ShadowRule>
public Collection<DataNode> build(final Collection<DataNode> dataNodes, final ShadowRule rule) {
Collection<DataNode> result = new LinkedList<>();
for (DataNode each : dataNodes) {
- result.addAll(DataNodeUtil.buildDataNode(each, rule.getDataSourceMapper()));
+ result.addAll(DataNodeUtils.buildDataNode(each, rule.getDataSourceMapper()));
}
return result;
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowCreateTableMergedResult.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowCreateTableMergedResult.java
index f93505a962f..1b066114dcc 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowCreateTableMergedResult.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowCreateTableMergedResult.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.infra.merge.result.impl.memory.MemoryQueryResul
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereConstraint;
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereTable;
-import org.apache.shardingsphere.infra.metadata.database.schema.util.IndexMetaDataUtil;
+import org.apache.shardingsphere.infra.metadata.database.schema.util.IndexMetaDataUtils;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import org.apache.shardingsphere.sharding.rule.TableRule;
@@ -48,11 +48,11 @@ public final class ShowCreateTableMergedResult extends LogicTablesMergedResult {
final ShardingSphereTable table, final ShardingRule shardingRule) {
memoryResultSetRow.setCell(2, memoryResultSetRow.getCell(2).toString().replaceFirst(actualTableName, logicTableName));
for (String each : table.getIndexes().keySet()) {
- String actualIndexName = IndexMetaDataUtil.getActualIndexName(each, actualTableName);
+ String actualIndexName = IndexMetaDataUtils.getActualIndexName(each, actualTableName);
memoryResultSetRow.setCell(2, memoryResultSetRow.getCell(2).toString().replace(actualIndexName, each));
}
for (Entry<String, ShardingSphereConstraint> entry : table.getConstrains().entrySet()) {
- String actualIndexName = IndexMetaDataUtil.getActualIndexName(entry.getKey(), actualTableName);
+ String actualIndexName = IndexMetaDataUtils.getActualIndexName(entry.getKey(), actualTableName);
memoryResultSetRow.setCell(2, memoryResultSetRow.getCell(2).toString().replace(actualIndexName, entry.getKey()));
Optional<TableRule> tableRule = shardingRule.findTableRule(entry.getValue().getReferencedTableName());
if (!tableRule.isPresent()) {
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowIndexMergedResult.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowIndexMergedResult.java
index 0b67135f159..1adc7cedf10 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowIndexMergedResult.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowIndexMergedResult.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.infra.executor.sql.execute.result.query.QueryRe
import org.apache.shardingsphere.infra.merge.result.impl.memory.MemoryMergedResult;
import org.apache.shardingsphere.infra.merge.result.impl.memory.MemoryQueryResultRow;
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
-import org.apache.shardingsphere.infra.metadata.database.schema.util.IndexMetaDataUtil;
+import org.apache.shardingsphere.infra.metadata.database.schema.util.IndexMetaDataUtils;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import org.apache.shardingsphere.sharding.rule.TableRule;
@@ -52,7 +52,7 @@ public final class ShowIndexMergedResult extends MemoryMergedResult<ShardingRule
String actualIndexName = memoryResultSetRow.getCell(3).toString();
Optional<TableRule> tableRule = shardingRule.findTableRuleByActualTable(actualTableName);
tableRule.ifPresent(optional -> memoryResultSetRow.setCell(1, optional.getLogicTable()));
- memoryResultSetRow.setCell(3, IndexMetaDataUtil.getLogicIndexName(actualIndexName, actualTableName));
+ memoryResultSetRow.setCell(3, IndexMetaDataUtils.getLogicIndexName(actualIndexName, actualTableName));
result.add(memoryResultSetRow);
}
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/IndexToken.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/IndexToken.java
index f62f92e402e..e18880695a9 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/IndexToken.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/IndexToken.java
@@ -21,7 +21,7 @@ import lombok.Getter;
import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
import org.apache.shardingsphere.infra.binder.statement.ddl.CreateIndexStatementContext;
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
-import org.apache.shardingsphere.infra.metadata.database.schema.util.IndexMetaDataUtil;
+import org.apache.shardingsphere.infra.metadata.database.schema.util.IndexMetaDataUtils;
import org.apache.shardingsphere.infra.rewrite.sql.token.pojo.RouteUnitAware;
import org.apache.shardingsphere.infra.rewrite.sql.token.pojo.SQLToken;
import org.apache.shardingsphere.infra.rewrite.sql.token.pojo.Substitutable;
@@ -72,7 +72,7 @@ public final class IndexToken extends SQLToken implements Substitutable, RouteUn
Map<String, String> logicAndActualTables = TokenUtils.getLogicAndActualTables(routeUnit, sqlStatementContext, shardingRule);
String actualTableName = findLogicTableNameFromMetaData(identifier.getValue()).map(logicAndActualTables::get)
.orElseGet(() -> logicAndActualTables.values().stream().findFirst().orElse(null));
- return IndexMetaDataUtil.getActualIndexName(identifier.getValue(), actualTableName);
+ return IndexMetaDataUtils.getActualIndexName(identifier.getValue(), actualTableName);
}
private Optional<String> findLogicTableNameFromMetaData(final String logicIndexName) {
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingTableBroadcastRoutingEngine.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingTableBroadcastRoutingEngine.java
index 19763a5bac0..e3051cb9998 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingTableBroadcastRoutingEngine.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingTableBroadcastRoutingEngine.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.schema.QualifiedTable;
-import org.apache.shardingsphere.infra.metadata.database.schema.util.IndexMetaDataUtil;
+import org.apache.shardingsphere.infra.metadata.database.schema.util.IndexMetaDataUtils;
import org.apache.shardingsphere.infra.route.context.RouteContext;
import org.apache.shardingsphere.infra.route.context.RouteMapper;
import org.apache.shardingsphere.infra.route.context.RouteUnit;
@@ -115,7 +115,7 @@ public final class ShardingTableBroadcastRoutingEngine implements ShardingRouteE
private Collection<String> getTableNames(final ShardingSphereDatabase database, final DatabaseType databaseType, final Collection<IndexSegment> indexes) {
Collection<String> result = new LinkedList<>();
- for (QualifiedTable each : IndexMetaDataUtil.getTableNames(database, databaseType, indexes)) {
+ for (QualifiedTable each : IndexMetaDataUtils.getTableNames(database, databaseType, indexes)) {
result.add(each.getTableName());
}
return result;
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/TableRule.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/TableRule.java
index 2af3b721b40..cad887647c9 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/TableRule.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/TableRule.java
@@ -23,7 +23,7 @@ import lombok.Getter;
import lombok.ToString;
import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.infra.datanode.DataNodeInfo;
-import org.apache.shardingsphere.infra.datanode.DataNodeUtil;
+import org.apache.shardingsphere.infra.datanode.DataNodeUtils;
import org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.infra.util.expr.InlineExpressionParser;
import org.apache.shardingsphere.sharding.api.config.rule.ShardingAutoTableRuleConfiguration;
@@ -159,7 +159,7 @@ public final class TableRule {
}
List<String> dataSources = Strings.isNullOrEmpty(tableRuleConfig.getActualDataSources()) ? new LinkedList<>(dataSourceNames)
: new InlineExpressionParser(tableRuleConfig.getActualDataSources()).splitAndEvaluate();
- return DataNodeUtil.getFormatDataNodes(shardingAlgorithm.getAutoTablesAmount(), logicTable, dataSources);
+ return DataNodeUtils.getFormatDataNodes(shardingAlgorithm.getAutoTablesAmount(), logicTable, dataSources);
}
private Set<String> getActualTables() {
@@ -211,7 +211,7 @@ public final class TableRule {
* @return data node groups, key is data source name, values are data nodes belong to this data source
*/
public Map<String, List<DataNode>> getDataNodeGroups() {
- return DataNodeUtil.getDataNodeGroups(actualDataNodes);
+ return DataNodeUtils.getDataNodeGroups(actualDataNodes);
}
/**
diff --git a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/decider/engine/SQLFederationDeciderEngine.java b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/decider/engine/SQLFederationDeciderEngine.java
index 28325561d99..f9bea48a68c 100644
--- a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/decider/engine/SQLFederationDeciderEngine.java
+++ b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/decider/engine/SQLFederationDeciderEngine.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
-import org.apache.shardingsphere.infra.metadata.database.schema.util.SystemSchemaUtil;
+import org.apache.shardingsphere.infra.metadata.database.schema.util.SystemSchemaUtils;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.infra.util.spi.type.ordered.OrderedSPILoader;
@@ -80,6 +80,6 @@ public final class SQLFederationDeciderEngine {
private boolean isSelectStatementContainsSystemSchema(final SQLStatementContext<?> sqlStatementContext, final ShardingSphereDatabase database) {
return sqlStatementContext instanceof SelectStatementContext
- && SystemSchemaUtil.containsSystemSchema(sqlStatementContext.getDatabaseType(), sqlStatementContext.getTablesContext().getSchemaNames(), database);
+ && SystemSchemaUtils.containsSystemSchema(sqlStatementContext.getDatabaseType(), sqlStatementContext.getTablesContext().getSchemaNames(), database);
}
}
diff --git a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/ddl/CreateIndexStatementContext.java b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/ddl/CreateIndexStatementContext.java
index 88299f383ac..2a3242cbeef 100644
--- a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/ddl/CreateIndexStatementContext.java
+++ b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/ddl/CreateIndexStatementContext.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.infra.binder.segment.table.TablesContext;
import org.apache.shardingsphere.infra.binder.statement.CommonSQLStatementContext;
import org.apache.shardingsphere.infra.binder.type.IndexAvailable;
import org.apache.shardingsphere.infra.binder.type.TableAvailable;
-import org.apache.shardingsphere.infra.metadata.database.schema.util.IndexMetaDataUtil;
+import org.apache.shardingsphere.infra.metadata.database.schema.util.IndexMetaDataUtils;
import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.index.IndexNameSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.index.IndexSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.column.ColumnSegment;
@@ -59,7 +59,7 @@ public final class CreateIndexStatementContext extends CommonSQLStatementContext
public Collection<IndexSegment> getIndexes() {
if (null == getSqlStatement().getIndex()) {
return CreateIndexStatementHandler.getGeneratedIndexStartIndex(getSqlStatement()).map(each -> Collections.singletonList(new IndexSegment(each, each,
- new IndexNameSegment(each, each, new IdentifierValue(IndexMetaDataUtil.getGeneratedLogicIndexName(getSqlStatement().getColumns())))))).orElseGet(Collections::emptyList);
+ new IndexNameSegment(each, each, new IdentifierValue(IndexMetaDataUtils.getGeneratedLogicIndexName(getSqlStatement().getColumns())))))).orElseGet(Collections::emptyList);
}
return Collections.singletonList(getSqlStatement().getIndex());
}
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/datanode/DataNodeUtil.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/datanode/DataNodeUtils.java
similarity index 98%
rename from infra/common/src/main/java/org/apache/shardingsphere/infra/datanode/DataNodeUtil.java
rename to infra/common/src/main/java/org/apache/shardingsphere/infra/datanode/DataNodeUtils.java
index 860b65378c9..fa521f2141f 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/datanode/DataNodeUtil.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/datanode/DataNodeUtils.java
@@ -30,10 +30,10 @@ import java.util.List;
import java.util.Map;
/**
- * Data node utility.
+ * Data node utility class.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class DataNodeUtil {
+public final class DataNodeUtils {
/**
* Get data node groups.
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/datasource/pool/metadata/DataSourcePoolMetaDataReflection.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/datasource/pool/metadata/DataSourcePoolMetaDataReflection.java
index e7ee302ef60..007864fd696 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/datasource/pool/metadata/DataSourcePoolMetaDataReflection.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/datasource/pool/metadata/DataSourcePoolMetaDataReflection.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.datasource.pool.metadata;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.infra.util.reflection.ReflectionUtil;
+import org.apache.shardingsphere.infra.util.reflection.ReflectionUtils;
import javax.sql.DataSource;
import java.util.Optional;
@@ -40,7 +40,7 @@ public final class DataSourcePoolMetaDataReflection {
* @return JDBC URL
*/
public Optional<String> getJdbcUrl() {
- return ReflectionUtil.getFieldValue(targetDataSource, dataSourcePoolFieldMetaData.getJdbcUrlFieldName());
+ return ReflectionUtils.getFieldValue(targetDataSource, dataSourcePoolFieldMetaData.getJdbcUrlFieldName());
}
/**
@@ -49,6 +49,6 @@ public final class DataSourcePoolMetaDataReflection {
* @return JDBC connection properties
*/
public Optional<Properties> getJdbcConnectionProperties() {
- return ReflectionUtil.getFieldValue(targetDataSource, dataSourcePoolFieldMetaData.getJdbcUrlPropertiesFieldName());
+ return ReflectionUtils.getFieldValue(targetDataSource, dataSourcePoolFieldMetaData.getJdbcUrlPropertiesFieldName());
}
}
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/hint/SQLHintUtils.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/hint/SQLHintUtils.java
index 249205fd2a7..4743634de0e 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/hint/SQLHintUtils.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/hint/SQLHintUtils.java
@@ -31,7 +31,7 @@ import java.util.Objects;
import java.util.Properties;
/**
- * SQL hint utils.
+ * SQL hint utility class.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class SQLHintUtils {
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/metadata/jdbc/JDBCInstanceMetaData.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/metadata/jdbc/JDBCInstanceMetaData.java
index f58a273d830..b1bd16a0d28 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/metadata/jdbc/JDBCInstanceMetaData.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/metadata/jdbc/JDBCInstanceMetaData.java
@@ -21,7 +21,7 @@ import lombok.Getter;
import org.apache.shardingsphere.infra.autogen.version.ShardingSphereVersion;
import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData;
import org.apache.shardingsphere.infra.instance.metadata.InstanceType;
-import org.apache.shardingsphere.infra.instance.utils.IpUtils;
+import org.apache.shardingsphere.infra.instance.util.IpUtils;
/**
* JDBC instance meta data.
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/metadata/proxy/ProxyInstanceMetaData.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/metadata/proxy/ProxyInstanceMetaData.java
index 8b8902eebba..607d0824e53 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/metadata/proxy/ProxyInstanceMetaData.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/metadata/proxy/ProxyInstanceMetaData.java
@@ -22,7 +22,7 @@ import lombok.Getter;
import org.apache.shardingsphere.infra.autogen.version.ShardingSphereVersion;
import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData;
import org.apache.shardingsphere.infra.instance.metadata.InstanceType;
-import org.apache.shardingsphere.infra.instance.utils.IpUtils;
+import org.apache.shardingsphere.infra.instance.util.IpUtils;
/**
* Proxy instance meta data.
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/utils/IpUtils.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/util/IpUtils.java
similarity index 97%
rename from infra/common/src/main/java/org/apache/shardingsphere/infra/instance/utils/IpUtils.java
rename to infra/common/src/main/java/org/apache/shardingsphere/infra/instance/util/IpUtils.java
index 7cccd5d7386..1f3da6d06bb 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/utils/IpUtils.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/util/IpUtils.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.instance.utils;
+package org.apache.shardingsphere.infra.instance.util;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
@@ -26,7 +26,7 @@ import java.net.SocketException;
import java.util.Enumeration;
/**
- * IP utilities.
+ * IP utility class.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class IpUtils {
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/data/collector/ShardingSphereTableDataCollectorUtil.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/data/collector/ShardingSphereTableDataCollectorUtils.java
similarity index 98%
rename from infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/data/collector/ShardingSphereTableDataCollectorUtil.java
rename to infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/data/collector/ShardingSphereTableDataCollectorUtils.java
index 6df5c3dae17..8036efef812 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/data/collector/ShardingSphereTableDataCollectorUtil.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/data/collector/ShardingSphereTableDataCollectorUtils.java
@@ -34,9 +34,9 @@ import java.util.LinkedList;
import java.util.List;
/**
- * Table data collector util.
+ * Table data collector utility class.
*/
-public final class ShardingSphereTableDataCollectorUtil {
+public final class ShardingSphereTableDataCollectorUtils {
/**
* Collect row data.
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/data/collector/tables/PgClassTableCollector.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/data/collector/tables/PgClassTableCollector.java
index e3c004a83d7..1927e26b7e9 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/data/collector/tables/PgClassTableCollector.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/data/collector/tables/PgClassTableCollector.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.infra.metadata.data.collector.tables;
import org.apache.shardingsphere.infra.metadata.data.ShardingSphereRowData;
import org.apache.shardingsphere.infra.metadata.data.ShardingSphereTableData;
import org.apache.shardingsphere.infra.metadata.data.collector.ShardingSphereDataCollector;
-import org.apache.shardingsphere.infra.metadata.data.collector.ShardingSphereTableDataCollectorUtil;
+import org.apache.shardingsphere.infra.metadata.data.collector.ShardingSphereTableDataCollectorUtils;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereTable;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
@@ -51,7 +51,7 @@ public final class PgClassTableCollector implements ShardingSphereDataCollector
@Override
public Optional<ShardingSphereTableData> collect(final String databaseName, final ShardingSphereTable table,
final Map<String, ShardingSphereDatabase> shardingSphereDatabases) throws SQLException {
- Collection<ShardingSphereRowData> rows = ShardingSphereTableDataCollectorUtil.collectRowData(shardingSphereDatabases.get(databaseName),
+ Collection<ShardingSphereRowData> rows = ShardingSphereTableDataCollectorUtils.collectRowData(shardingSphereDatabases.get(databaseName),
SELECT_SQL, table, Arrays.stream(COLUMN_NAMES.split(",")).map(String::trim).collect(Collectors.toList()));
Collection<ShardingSphereRowData> rowData = decorateTableName(rows, table, shardingSphereDatabases.get(databaseName).getRuleMetaData().getRules());
ShardingSphereTableData result = new ShardingSphereTableData(PG_CLASS);
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/data/collector/tables/PgNamespaceTableCollector.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/data/collector/tables/PgNamespaceTableCollector.java
index 07f5ce22acc..cdf01a97e6c 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/data/collector/tables/PgNamespaceTableCollector.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/data/collector/tables/PgNamespaceTableCollector.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.infra.metadata.data.collector.tables;
import org.apache.shardingsphere.infra.metadata.data.ShardingSphereRowData;
import org.apache.shardingsphere.infra.metadata.data.ShardingSphereTableData;
import org.apache.shardingsphere.infra.metadata.data.collector.ShardingSphereDataCollector;
-import org.apache.shardingsphere.infra.metadata.data.collector.ShardingSphereTableDataCollectorUtil;
+import org.apache.shardingsphere.infra.metadata.data.collector.ShardingSphereTableDataCollectorUtils;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereTable;
@@ -45,7 +45,7 @@ public final class PgNamespaceTableCollector implements ShardingSphereDataCollec
@Override
public Optional<ShardingSphereTableData> collect(final String databaseName, final ShardingSphereTable table,
final Map<String, ShardingSphereDatabase> shardingSphereDatabases) throws SQLException {
- Collection<ShardingSphereRowData> rows = ShardingSphereTableDataCollectorUtil.collectRowData(shardingSphereDatabases.get(databaseName),
+ Collection<ShardingSphereRowData> rows = ShardingSphereTableDataCollectorUtils.collectRowData(shardingSphereDatabases.get(databaseName),
SELECT_SQL, table, Arrays.stream(COLUMN_NAMES.split(",")).map(String::trim).collect(Collectors.toList()));
ShardingSphereTableData result = new ShardingSphereTableData(PG_NAMESPACE);
result.getRows().addAll(rows);
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/GenericSchemaBuilder.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/GenericSchemaBuilder.java
index 7de6616ecb0..564b9fe02c0 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/GenericSchemaBuilder.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/GenericSchemaBuilder.java
@@ -33,7 +33,7 @@ import org.apache.shardingsphere.infra.metadata.database.schema.loader.model.Con
import org.apache.shardingsphere.infra.metadata.database.schema.loader.model.IndexMetaData;
import org.apache.shardingsphere.infra.metadata.database.schema.loader.model.SchemaMetaData;
import org.apache.shardingsphere.infra.metadata.database.schema.loader.model.TableMetaData;
-import org.apache.shardingsphere.infra.metadata.database.schema.util.SchemaMetaDataUtil;
+import org.apache.shardingsphere.infra.metadata.database.schema.util.SchemaMetaDataUtils;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.infra.rule.identifier.type.TableContainedRule;
@@ -95,7 +95,7 @@ public final class GenericSchemaBuilder {
private static Map<String, SchemaMetaData> loadSchemas(final Collection<String> tableNames, final GenericSchemaBuilderMaterial material) throws SQLException {
boolean checkMetaDataEnable = material.getProps().getValue(ConfigurationPropertyKey.CHECK_TABLE_META_DATA_ENABLED);
- Collection<SchemaMetaDataLoaderMaterial> schemaMetaDataLoaderMaterials = SchemaMetaDataUtil.getSchemaMetaDataLoaderMaterials(tableNames, material, checkMetaDataEnable);
+ Collection<SchemaMetaDataLoaderMaterial> schemaMetaDataLoaderMaterials = SchemaMetaDataUtils.getSchemaMetaDataLoaderMaterials(tableNames, material, checkMetaDataEnable);
if (schemaMetaDataLoaderMaterials.isEmpty()) {
return Collections.emptyMap();
}
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/util/IndexMetaDataUtil.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/util/IndexMetaDataUtils.java
similarity index 99%
rename from infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/util/IndexMetaDataUtil.java
rename to infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/util/IndexMetaDataUtils.java
index fff5bf1e4d5..bd26197ceab 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/util/IndexMetaDataUtil.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/util/IndexMetaDataUtils.java
@@ -36,7 +36,7 @@ import java.util.Optional;
* Index meta data utility class.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public class IndexMetaDataUtil {
+public final class IndexMetaDataUtils {
private static final String UNDERLINE = "_";
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SchemaMetaDataUtil.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SchemaMetaDataUtils.java
similarity index 99%
rename from infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SchemaMetaDataUtil.java
rename to infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SchemaMetaDataUtils.java
index 63462e3507d..91972e99a67 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SchemaMetaDataUtil.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SchemaMetaDataUtils.java
@@ -40,7 +40,7 @@ import java.util.stream.Collectors;
* Schema meta data utility class.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public class SchemaMetaDataUtil {
+public final class SchemaMetaDataUtils {
/**
* Get schema meta data loader materials.
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SystemSchemaUtil.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SystemSchemaUtils.java
similarity index 98%
rename from infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SystemSchemaUtil.java
rename to infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SystemSchemaUtils.java
index 85a56554a83..6cfaabb8ae0 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SystemSchemaUtil.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SystemSchemaUtils.java
@@ -30,7 +30,7 @@ import java.util.Collection;
* System schema utility class.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public class SystemSchemaUtil {
+public final class SystemSchemaUtils {
/**
* Judge whether SQL statement contains system schema or not.
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/datanode/DataNodeUtilTest.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/datanode/DataNodeUtilsTest.java
similarity index 90%
rename from infra/common/src/test/java/org/apache/shardingsphere/infra/datanode/DataNodeUtilTest.java
rename to infra/common/src/test/java/org/apache/shardingsphere/infra/datanode/DataNodeUtilsTest.java
index 71477739685..e0522dbc50a 100644
--- a/infra/common/src/test/java/org/apache/shardingsphere/infra/datanode/DataNodeUtilTest.java
+++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/datanode/DataNodeUtilsTest.java
@@ -33,7 +33,7 @@ import java.util.Map;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class DataNodeUtilTest {
+class DataNodeUtilsTest {
@Test
void assertGetDataNodeGroups() {
@@ -42,7 +42,7 @@ class DataNodeUtilTest {
expected.put("ds_1", Arrays.asList(new DataNode("ds_1.tbl_0"), new DataNode("ds_1.tbl_1")));
List<DataNode> dataNodes = new LinkedList<>();
expected.values().forEach(dataNodes::addAll);
- Map<String, List<DataNode>> actual = DataNodeUtil.getDataNodeGroups(dataNodes);
+ Map<String, List<DataNode>> actual = DataNodeUtils.getDataNodeGroups(dataNodes);
assertThat(actual, is(expected));
}
@@ -51,7 +51,7 @@ class DataNodeUtilTest {
DataNode dataNode = new DataNode("readwrite_ds.t_order");
Map<String, Collection<DataSourceRoleInfo>> dataSourceMapper = Collections.singletonMap("readwrite_ds",
Arrays.asList(new DataSourceRoleInfo("ds_0", DataSourceRole.PRIMARY), new DataSourceRoleInfo("shadow_ds_0", DataSourceRole.MEMBER)));
- Collection<DataNode> dataNodes = DataNodeUtil.buildDataNode(dataNode, dataSourceMapper);
+ Collection<DataNode> dataNodes = DataNodeUtils.buildDataNode(dataNode, dataSourceMapper);
assertThat(dataNodes.size(), is(2));
Iterator<DataNode> iterator = dataNodes.iterator();
assertThat(iterator.next().getDataSourceName(), is("ds_0"));
@@ -63,7 +63,7 @@ class DataNodeUtilTest {
DataNode dataNode = new DataNode("read_ds.t_order");
Map<String, Collection<DataSourceRoleInfo>> dataSourceMapper = Collections.singletonMap("readwrite_ds",
Arrays.asList(new DataSourceRoleInfo("ds_0", DataSourceRole.PRIMARY), new DataSourceRoleInfo("shadow_ds_0", DataSourceRole.MEMBER)));
- Collection<DataNode> dataNodes = DataNodeUtil.buildDataNode(dataNode, dataSourceMapper);
+ Collection<DataNode> dataNodes = DataNodeUtils.buildDataNode(dataNode, dataSourceMapper);
assertThat(dataNodes.size(), is(1));
assertThat(dataNodes.iterator().next().getDataSourceName(), is("read_ds"));
}
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/fixture/DataNodeBuilderFixture.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/fixture/DataNodeBuilderFixture.java
index 61a43d3ff74..e74abb3daf4 100644
--- a/infra/common/src/test/java/org/apache/shardingsphere/infra/fixture/DataNodeBuilderFixture.java
+++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/fixture/DataNodeBuilderFixture.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.infra.fixture;
import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.infra.datanode.DataNodeBuilder;
-import org.apache.shardingsphere.infra.datanode.DataNodeUtil;
+import org.apache.shardingsphere.infra.datanode.DataNodeUtils;
import java.util.Collection;
import java.util.LinkedList;
@@ -30,7 +30,7 @@ public final class DataNodeBuilderFixture implements DataNodeBuilder<FixtureRule
public Collection<DataNode> build(final Collection<DataNode> dataNodes, final FixtureRule rule) {
Collection<DataNode> result = new LinkedList<>();
for (DataNode each : dataNodes) {
- result.addAll(DataNodeUtil.buildDataNode(each, rule.getDataSourceMapper()));
+ result.addAll(DataNodeUtils.buildDataNode(each, rule.getDataSourceMapper()));
}
return result;
}
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/instance/util/IpUtilsTest.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/instance/util/IpUtilsTest.java
index f368e56a399..e665e4e084e 100644
--- a/infra/common/src/test/java/org/apache/shardingsphere/infra/instance/util/IpUtilsTest.java
+++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/instance/util/IpUtilsTest.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.infra.instance.util;
-import org.apache.shardingsphere.infra.instance.utils.IpUtils;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/IndexMetaDataUtilTest.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/IndexMetaDataUtilsTest.java
similarity index 82%
rename from infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/IndexMetaDataUtilTest.java
rename to infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/IndexMetaDataUtilsTest.java
index b13459c1666..96684ed0528 100644
--- a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/IndexMetaDataUtilTest.java
+++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/IndexMetaDataUtilsTest.java
@@ -42,7 +42,7 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.Mockito.mock;
-class IndexMetaDataUtilTest {
+class IndexMetaDataUtilsTest {
private static final String TABLE_NAME = "t_order";
@@ -50,40 +50,40 @@ class IndexMetaDataUtilTest {
@Test
void assertGetLogicIndexNameWithIndexNameSuffix() {
- assertThat(IndexMetaDataUtil.getLogicIndexName("order_index_t_order", "t_order"), is("order_index"));
+ assertThat(IndexMetaDataUtils.getLogicIndexName("order_index_t_order", "t_order"), is("order_index"));
}
@Test
void assertGetLogicIndexNameWithMultiIndexNameSuffix() {
- assertThat(IndexMetaDataUtil.getLogicIndexName("order_t_order_index_t_order", "t_order"), is("order_t_order_index"));
+ assertThat(IndexMetaDataUtils.getLogicIndexName("order_t_order_index_t_order", "t_order"), is("order_t_order_index"));
}
@Test
void assertGetLogicIndexNameWithoutIndexNameSuffix() {
- assertThat(IndexMetaDataUtil.getLogicIndexName("order_index", "t_order"), is("order_index"));
+ assertThat(IndexMetaDataUtils.getLogicIndexName("order_index", "t_order"), is("order_index"));
}
@Test
void assertGetActualIndexNameWithActualTableName() {
- assertThat(IndexMetaDataUtil.getActualIndexName("order_index", "t_order"), is("order_index_t_order"));
+ assertThat(IndexMetaDataUtils.getActualIndexName("order_index", "t_order"), is("order_index_t_order"));
}
@Test
void assertGetActualIndexNameWithoutActualTableName() {
- assertThat(IndexMetaDataUtil.getActualIndexName("order_index", null), is("order_index"));
+ assertThat(IndexMetaDataUtils.getActualIndexName("order_index", null), is("order_index"));
}
@Test
void assertGetGeneratedLogicIndexName() {
ColumnSegment userIdColumnSegment = new ColumnSegment(0, 0, new IdentifierValue("user_id"));
ColumnSegment userNameColumnSegment = new ColumnSegment(0, 0, new IdentifierValue("user_name"));
- assertThat(IndexMetaDataUtil.getGeneratedLogicIndexName(Arrays.asList(userIdColumnSegment, userNameColumnSegment)), is("user_id_user_name_idx"));
+ assertThat(IndexMetaDataUtils.getGeneratedLogicIndexName(Arrays.asList(userIdColumnSegment, userNameColumnSegment)), is("user_id_user_name_idx"));
}
@Test
void assertGetTableNames() {
IndexSegment indexSegment = new IndexSegment(0, 0, new IndexNameSegment(0, 0, new IdentifierValue(INDEX_NAME)));
- Collection<QualifiedTable> actual = IndexMetaDataUtil.getTableNames(buildDatabase(), new MySQLDatabaseType(), Collections.singleton(indexSegment));
+ Collection<QualifiedTable> actual = IndexMetaDataUtils.getTableNames(buildDatabase(), new MySQLDatabaseType(), Collections.singleton(indexSegment));
assertThat(actual.size(), is(1));
assertThat(actual.iterator().next().getSchemaName(), is(DefaultDatabase.LOGIC_NAME));
assertThat(actual.iterator().next().getTableName(), is(TABLE_NAME));
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SchemaMetaDataUtilTest.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SchemaMetaDataUtilsTest.java
similarity index 94%
rename from infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SchemaMetaDataUtilTest.java
rename to infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SchemaMetaDataUtilsTest.java
index 93dd7334b81..8b862313397 100644
--- a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SchemaMetaDataUtilTest.java
+++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SchemaMetaDataUtilsTest.java
@@ -41,7 +41,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-class SchemaMetaDataUtilTest {
+class SchemaMetaDataUtilsTest {
@Test
void assertGetSchemaMetaDataLoaderMaterialsWhenConfigCheckMetaDataEnable() {
@@ -49,7 +49,7 @@ class SchemaMetaDataUtilTest {
when(dataNodeContainedRule.getDataNodesByTableName("t_order")).thenReturn(mockShardingDataNodes());
GenericSchemaBuilderMaterial material = new GenericSchemaBuilderMaterial(mock(DatabaseType.class), Collections.emptyMap(), mockDataSourceMap(),
Arrays.asList(dataNodeContainedRule, mock(DataSourceContainedRule.class)), mock(ConfigurationProperties.class), "sharding_db");
- Collection<SchemaMetaDataLoaderMaterial> actual = SchemaMetaDataUtil.getSchemaMetaDataLoaderMaterials(Collections.singleton("t_order"), material, true);
+ Collection<SchemaMetaDataLoaderMaterial> actual = SchemaMetaDataUtils.getSchemaMetaDataLoaderMaterials(Collections.singleton("t_order"), material, true);
assertThat(actual.size(), is(2));
Iterator<SchemaMetaDataLoaderMaterial> iterator = actual.iterator();
SchemaMetaDataLoaderMaterial firstMaterial = iterator.next();
@@ -66,7 +66,7 @@ class SchemaMetaDataUtilTest {
when(dataNodeContainedRule.getDataNodesByTableName("t_order")).thenReturn(mockShardingDataNodes());
GenericSchemaBuilderMaterial material = new GenericSchemaBuilderMaterial(mock(DatabaseType.class), Collections.emptyMap(), mockDataSourceMap(),
Arrays.asList(dataNodeContainedRule, mock(DataSourceContainedRule.class)), mock(ConfigurationProperties.class), "sharding_db");
- Collection<SchemaMetaDataLoaderMaterial> actual = SchemaMetaDataUtil.getSchemaMetaDataLoaderMaterials(Collections.singleton("t_order"), material, false);
+ Collection<SchemaMetaDataLoaderMaterial> actual = SchemaMetaDataUtils.getSchemaMetaDataLoaderMaterials(Collections.singleton("t_order"), material, false);
assertThat(actual.size(), is(1));
Iterator<SchemaMetaDataLoaderMaterial> iterator = actual.iterator();
SchemaMetaDataLoaderMaterial firstMaterial = iterator.next();
@@ -80,7 +80,7 @@ class SchemaMetaDataUtilTest {
when(dataNodeContainedRule.getDataNodesByTableName("t_single")).thenReturn(mockSingleTableDataNodes());
GenericSchemaBuilderMaterial material = new GenericSchemaBuilderMaterial(mock(DatabaseType.class), Collections.emptyMap(), mockDataSourceMap(),
Arrays.asList(dataNodeContainedRule, mock(DataSourceContainedRule.class)), mock(ConfigurationProperties.class), "public");
- Collection<SchemaMetaDataLoaderMaterial> actual = SchemaMetaDataUtil.getSchemaMetaDataLoaderMaterials(Collections.singleton("t_single"), material, false);
+ Collection<SchemaMetaDataLoaderMaterial> actual = SchemaMetaDataUtils.getSchemaMetaDataLoaderMaterials(Collections.singleton("t_single"), material, false);
assertThat(actual.size(), is(1));
Iterator<SchemaMetaDataLoaderMaterial> iterator = actual.iterator();
SchemaMetaDataLoaderMaterial firstMaterial = iterator.next();
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SystemSchemaUtilTest.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SystemSchemaUtilsTest.java
similarity index 71%
rename from infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SystemSchemaUtilTest.java
rename to infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SystemSchemaUtilsTest.java
index de6d22af0b6..21ca225004c 100644
--- a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SystemSchemaUtilTest.java
+++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SystemSchemaUtilsTest.java
@@ -31,36 +31,36 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-class SystemSchemaUtilTest {
+class SystemSchemaUtilsTest {
@Test
void assertContainsSystemSchemaForPostgreSQL() {
ShardingSphereDatabase informationSchemaDatabase = mockShardingSphereDatabase("information_schema", false);
- assertTrue(SystemSchemaUtil.containsSystemSchema(new PostgreSQLDatabaseType(), Arrays.asList("information_schema", "pg_catalog"), informationSchemaDatabase));
+ assertTrue(SystemSchemaUtils.containsSystemSchema(new PostgreSQLDatabaseType(), Arrays.asList("information_schema", "pg_catalog"), informationSchemaDatabase));
ShardingSphereDatabase shardingSchemaDatabase = mockShardingSphereDatabase("sharding_db", false);
- assertFalse(SystemSchemaUtil.containsSystemSchema(new PostgreSQLDatabaseType(), Collections.singletonList("sharding_db"), shardingSchemaDatabase));
+ assertFalse(SystemSchemaUtils.containsSystemSchema(new PostgreSQLDatabaseType(), Collections.singletonList("sharding_db"), shardingSchemaDatabase));
ShardingSphereDatabase customizedInformationSchemaDatabase = mockShardingSphereDatabase("information_schema", true);
- assertTrue(SystemSchemaUtil.containsSystemSchema(new PostgreSQLDatabaseType(), Arrays.asList("information_schema", "pg_catalog"), customizedInformationSchemaDatabase));
+ assertTrue(SystemSchemaUtils.containsSystemSchema(new PostgreSQLDatabaseType(), Arrays.asList("information_schema", "pg_catalog"), customizedInformationSchemaDatabase));
}
@Test
void assertContainsSystemSchemaForOpenGaussSQL() {
ShardingSphereDatabase informationSchemaDatabase = mockShardingSphereDatabase("information_schema", false);
- assertTrue(SystemSchemaUtil.containsSystemSchema(new OpenGaussDatabaseType(), Arrays.asList("information_schema", "pg_catalog"), informationSchemaDatabase));
+ assertTrue(SystemSchemaUtils.containsSystemSchema(new OpenGaussDatabaseType(), Arrays.asList("information_schema", "pg_catalog"), informationSchemaDatabase));
ShardingSphereDatabase shardingSchemaDatabase = mockShardingSphereDatabase("sharding_db", false);
- assertFalse(SystemSchemaUtil.containsSystemSchema(new OpenGaussDatabaseType(), Collections.singletonList("sharding_db"), shardingSchemaDatabase));
+ assertFalse(SystemSchemaUtils.containsSystemSchema(new OpenGaussDatabaseType(), Collections.singletonList("sharding_db"), shardingSchemaDatabase));
ShardingSphereDatabase customizedInformationSchemaDatabase = mockShardingSphereDatabase("information_schema", true);
- assertTrue(SystemSchemaUtil.containsSystemSchema(new OpenGaussDatabaseType(), Arrays.asList("information_schema", "pg_catalog"), customizedInformationSchemaDatabase));
+ assertTrue(SystemSchemaUtils.containsSystemSchema(new OpenGaussDatabaseType(), Arrays.asList("information_schema", "pg_catalog"), customizedInformationSchemaDatabase));
}
@Test
void assertContainsSystemSchemaForMySQL() {
ShardingSphereDatabase informationSchemaDatabase = mockShardingSphereDatabase("information_schema", false);
- assertTrue(SystemSchemaUtil.containsSystemSchema(new MySQLDatabaseType(), Arrays.asList("information_schema", "mysql"), informationSchemaDatabase));
+ assertTrue(SystemSchemaUtils.containsSystemSchema(new MySQLDatabaseType(), Arrays.asList("information_schema", "mysql"), informationSchemaDatabase));
ShardingSphereDatabase shardingSchemaDatabase = mockShardingSphereDatabase("sharding_db", false);
- assertFalse(SystemSchemaUtil.containsSystemSchema(new MySQLDatabaseType(), Collections.singletonList("sharding_db"), shardingSchemaDatabase));
+ assertFalse(SystemSchemaUtils.containsSystemSchema(new MySQLDatabaseType(), Collections.singletonList("sharding_db"), shardingSchemaDatabase));
ShardingSphereDatabase customizedInformationSchemaDatabase = mockShardingSphereDatabase("information_schema", true);
- assertFalse(SystemSchemaUtil.containsSystemSchema(new MySQLDatabaseType(), Arrays.asList("information_schema", "mysql"), customizedInformationSchemaDatabase));
+ assertFalse(SystemSchemaUtils.containsSystemSchema(new MySQLDatabaseType(), Arrays.asList("information_schema", "mysql"), customizedInformationSchemaDatabase));
}
private ShardingSphereDatabase mockShardingSphereDatabase(final String databaseName, final boolean isComplete) {
diff --git a/infra/context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/index/CreateIndexStatementSchemaRefresher.java b/infra/context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/index/CreateIndexStatementSchemaRefresher.java
index 3faa071be4a..d15956d212c 100644
--- a/infra/context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/index/CreateIndexStatementSchemaRefresher.java
+++ b/infra/context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/index/CreateIndexStatementSchemaRefresher.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereIndex;
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereTable;
import org.apache.shardingsphere.infra.metadata.database.schema.pojo.AlterSchemaMetaDataPOJO;
-import org.apache.shardingsphere.infra.metadata.database.schema.util.IndexMetaDataUtil;
+import org.apache.shardingsphere.infra.metadata.database.schema.util.IndexMetaDataUtils;
import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.CreateIndexStatement;
import java.util.Collection;
@@ -40,7 +40,7 @@ public final class CreateIndexStatementSchemaRefresher implements MetaDataRefres
public void refresh(final ModeContextManager modeContextManager, final ShardingSphereDatabase database, final Collection<String> logicDataSourceNames,
final String schemaName, final CreateIndexStatement sqlStatement, final ConfigurationProperties props) {
String indexName = null != sqlStatement.getIndex() ? sqlStatement.getIndex().getIndexName().getIdentifier().getValue()
- : IndexMetaDataUtil.getGeneratedLogicIndexName(sqlStatement.getColumns());
+ : IndexMetaDataUtils.getGeneratedLogicIndexName(sqlStatement.getColumns());
if (Strings.isNullOrEmpty(indexName)) {
return;
}
diff --git a/infra/context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/index/DropIndexStatementSchemaRefresher.java b/infra/context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/index/DropIndexStatementSchemaRefresher.java
index 51a752f6b60..99586280dbd 100644
--- a/infra/context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/index/DropIndexStatementSchemaRefresher.java
+++ b/infra/context/src/main/java/org/apache/shardingsphere/infra/context/refresher/type/index/DropIndexStatementSchemaRefresher.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.schema.QualifiedTable;
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereTable;
import org.apache.shardingsphere.infra.metadata.database.schema.pojo.AlterSchemaMetaDataPOJO;
-import org.apache.shardingsphere.infra.metadata.database.schema.util.IndexMetaDataUtil;
+import org.apache.shardingsphere.infra.metadata.database.schema.util.IndexMetaDataUtils;
import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.index.IndexSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.table.SimpleTableSegment;
import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.DropIndexStatement;
@@ -62,7 +62,7 @@ public final class DropIndexStatementSchemaRefresher implements MetaDataRefreshe
if (simpleTableSegment.isPresent()) {
return Optional.of(simpleTableSegment.get().getTableName().getIdentifier().getValue());
}
- Collection<QualifiedTable> tableNames = IndexMetaDataUtil.getTableNames(database, database.getProtocolType(), indexSegments);
+ Collection<QualifiedTable> tableNames = IndexMetaDataUtils.getTableNames(database, database.getProtocolType(), indexSegments);
return tableNames.isEmpty() ? Optional.empty() : Optional.of(tableNames.iterator().next().getTableName());
}
diff --git a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/impl/driver/jdbc/type/util/ResultSetUtil.java b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/impl/driver/jdbc/type/util/ResultSetUtils.java
similarity index 99%
rename from infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/impl/driver/jdbc/type/util/ResultSetUtil.java
rename to infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/impl/driver/jdbc/type/util/ResultSetUtils.java
index 1895f263c25..9148e3318d9 100644
--- a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/impl/driver/jdbc/type/util/ResultSetUtil.java
+++ b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/impl/driver/jdbc/type/util/ResultSetUtils.java
@@ -41,10 +41,10 @@ import java.time.ZoneId;
import java.util.Date;
/**
- * ResultSet utility.
+ * Result set utility class.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class ResultSetUtil {
+public final class ResultSetUtils {
/**
* Convert value via expected class type.
@@ -267,5 +267,4 @@ public final class ResultSetUtil {
private static Boolean longToBoolean(final long longVal) {
return -1 == longVal || longVal > 0;
}
-
}
diff --git a/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/impl/driver/jdbc/type/util/ResultSetUtilTest.java b/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/impl/driver/jdbc/type/util/ResultSetUtilTest.java
deleted file mode 100644
index 9ec14701e7e..00000000000
--- a/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/impl/driver/jdbc/type/util/ResultSetUtilTest.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.infra.executor.sql.execute.result.query.impl.driver.jdbc.type.util;
-
-import com.google.common.primitives.Ints;
-import com.google.common.primitives.Longs;
-import com.google.common.primitives.Shorts;
-import lombok.SneakyThrows;
-import org.apache.shardingsphere.infra.executor.exception.UnsupportedDataTypeConversionException;
-import org.junit.jupiter.api.Test;
-
-import java.math.BigDecimal;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.sql.SQLException;
-import java.sql.Time;
-import java.sql.Timestamp;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.Month;
-import java.util.Date;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-class ResultSetUtilTest {
-
- @Test
- void assertConvertValue() throws SQLException {
- Object object = new Object();
- assertThat(ResultSetUtil.convertValue(object, String.class), is(object.toString()));
- }
-
- @Test
- void assertConvertLocalDateTimeValue() throws SQLException {
- LocalDateTime localDateTime = LocalDateTime.of(2021, Month.DECEMBER, 23, 19, 30);
- assertThat(ResultSetUtil.convertValue(localDateTime, Timestamp.class), is(Timestamp.valueOf(localDateTime)));
- }
-
- @Test
- void assertConvertTimestampValue() throws SQLException {
- LocalDateTime localDateTime = LocalDateTime.of(2021, Month.DECEMBER, 23, 19, 30);
- Timestamp timestamp = Timestamp.valueOf(localDateTime);
- assertThat(ResultSetUtil.convertValue(timestamp, LocalDateTime.class), is(localDateTime));
- assertThat(ResultSetUtil.convertValue(timestamp, LocalDate.class), is(LocalDate.of(2021, Month.DECEMBER, 23)));
- assertThat(ResultSetUtil.convertValue(timestamp, LocalTime.class), is(LocalTime.of(19, 30)));
- }
-
- @Test
- void assertConvertBooleanValue() throws SQLException {
- assertFalse((boolean) ResultSetUtil.convertValue("-2", boolean.class));
- assertTrue((boolean) ResultSetUtil.convertValue("1", boolean.class));
- }
-
- @Test
- void assertConvertNumberValueSuccess() throws SQLException {
- assertThat(ResultSetUtil.convertValue("1", String.class), is("1"));
- assertTrue((boolean) ResultSetUtil.convertValue(1, boolean.class));
- assertThat(ResultSetUtil.convertValue((byte) 1, byte.class), is((byte) 1));
- assertThat(ResultSetUtil.convertValue((short) 1, short.class), is((short) 1));
- assertThat(ResultSetUtil.convertValue(new BigDecimal("1"), int.class), is(1));
- assertThat(ResultSetUtil.convertValue(new BigDecimal("1"), long.class), is(1L));
- assertThat(ResultSetUtil.convertValue(new BigDecimal("1"), double.class), is(1.0d));
- assertThat(ResultSetUtil.convertValue(new BigDecimal("1"), float.class), is(1.0f));
- assertThat(ResultSetUtil.convertValue(new BigDecimal("1"), BigDecimal.class), is(new BigDecimal("1")));
- assertThat(ResultSetUtil.convertValue((short) 1, BigDecimal.class), is(new BigDecimal("1")));
- assertThat(ResultSetUtil.convertValue(new Date(0L), Date.class), is(new Date(0L)));
- assertThat(ResultSetUtil.convertValue((short) 1, Object.class), is(Short.valueOf("1")));
- assertThat(ResultSetUtil.convertValue((short) 1, String.class), is("1"));
- assertThat(ResultSetUtil.convertValue(1, Byte.class), is(Byte.valueOf("1")));
- assertThat(ResultSetUtil.convertValue(1, Short.class), is(Short.valueOf("1")));
- assertThat(ResultSetUtil.convertValue(1, Long.class), is(Long.valueOf("1")));
- assertThat(ResultSetUtil.convertValue(1, Double.class), is(Double.valueOf("1")));
- assertThat(ResultSetUtil.convertValue(1, Float.class), is(Float.valueOf("1")));
- }
-
- @Test
- void assertConvertNumberValueError() {
- assertThrows(UnsupportedDataTypeConversionException.class, () -> ResultSetUtil.convertValue(1, Date.class));
- }
-
- @Test
- void assertConvertNullValue() throws SQLException {
- assertFalse((boolean) ResultSetUtil.convertValue(null, boolean.class));
- assertThat(ResultSetUtil.convertValue(null, byte.class), is((byte) 0));
- assertThat(ResultSetUtil.convertValue(null, short.class), is((short) 0));
- assertThat(ResultSetUtil.convertValue(null, int.class), is(0));
- assertThat(ResultSetUtil.convertValue(null, long.class), is(0L));
- assertThat(ResultSetUtil.convertValue(null, double.class), is(0.0D));
- assertThat(ResultSetUtil.convertValue(null, float.class), is(0.0F));
- assertThat(ResultSetUtil.convertValue(null, String.class), is((Object) null));
- assertThat(ResultSetUtil.convertValue(null, Object.class), is((Object) null));
- assertThat(ResultSetUtil.convertValue(null, BigDecimal.class), is((Object) null));
- assertThat(ResultSetUtil.convertValue(null, Date.class), is((Object) null));
- }
-
- @Test
- void assertConvertNullType() {
- assertThrows(SQLException.class, () -> ResultSetUtil.convertValue(null, null));
- }
-
- @Test
- void assertConvertDateValueSuccess() throws SQLException {
- Date now = new Date();
- assertThat(ResultSetUtil.convertValue(now, Date.class), is(now));
- assertThat(ResultSetUtil.convertValue(now, java.sql.Date.class), is(now));
- assertThat(ResultSetUtil.convertValue(now, Time.class), is(now));
- assertThat(ResultSetUtil.convertValue(now, Timestamp.class), is(new Timestamp(now.getTime())));
- assertThat(ResultSetUtil.convertValue(now, String.class), is(now.toString()));
- }
-
- @Test
- void assertConvertByteArrayValueSuccess() throws SQLException {
- byte[] bytesValue = {};
- assertThat(ResultSetUtil.convertValue(bytesValue, byte.class), is(bytesValue));
- assertThat(ResultSetUtil.convertValue(new byte[]{1}, byte.class), is((byte) 1));
- assertThat(ResultSetUtil.convertValue(Shorts.toByteArray((short) 1), short.class), is((short) 1));
- assertThat(ResultSetUtil.convertValue(Ints.toByteArray(1), int.class), is(1));
- assertThat(ResultSetUtil.convertValue(Longs.toByteArray(1L), long.class), is(1L));
- assertThat(ResultSetUtil.convertValue(Longs.toByteArray(1L), double.class), is(1.0d));
- assertThat(ResultSetUtil.convertValue(Longs.toByteArray(1L), float.class), is(1.0f));
- assertThat(ResultSetUtil.convertValue(Longs.toByteArray(1L), BigDecimal.class), is(new BigDecimal("1")));
- }
-
- @SneakyThrows(MalformedURLException.class)
- @Test
- void assertConvertURLValue() throws SQLException {
- String urlString = "https://shardingsphere.apache.org/";
- URL url = (URL) ResultSetUtil.convertValue(urlString, URL.class);
- assertThat(url, is(new URL(urlString)));
- }
-
- @Test
- void assertConvertURLValueError() {
- String urlString = "no-exist:shardingsphere.apache.org/";
- assertThrows(UnsupportedDataTypeConversionException.class, () -> ResultSetUtil.convertValue(urlString, URL.class));
- }
-
- @Test
- void assertConvertBigDecimalValue() {
- BigDecimal bigDecimal = (BigDecimal) ResultSetUtil.convertBigDecimalValue("12", false, 0);
- assertThat(bigDecimal, is(BigDecimal.valueOf(12)));
- }
-
- @Test
- void assertConvertBigDecimalValueNull() {
- BigDecimal bigDecimal = (BigDecimal) ResultSetUtil.convertBigDecimalValue(null, false, 0);
- assertNull(bigDecimal);
- }
-
- @Test
- void assertConvertBigDecimalValueWithScale() {
- BigDecimal bigDecimal = (BigDecimal) ResultSetUtil.convertBigDecimalValue("12.243", true, 2);
- assertThat(bigDecimal, is(BigDecimal.valueOf(12.24)));
- }
-
- @Test
- void assertConvertBigDecimalValueError() {
- assertThrows(UnsupportedDataTypeConversionException.class, () -> ResultSetUtil.convertBigDecimalValue(new Date(), true, 2));
- }
-
- @Test
- void assertConvertDateValueError() {
- assertThrows(UnsupportedDataTypeConversionException.class, () -> ResultSetUtil.convertValue(new Date(), int.class));
- }
-}
diff --git a/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/impl/driver/jdbc/type/util/ResultSetUtilsTest.java b/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/impl/driver/jdbc/type/util/ResultSetUtilsTest.java
new file mode 100644
index 00000000000..3fbe2cf51e6
--- /dev/null
+++ b/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/impl/driver/jdbc/type/util/ResultSetUtilsTest.java
@@ -0,0 +1,186 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.shardingsphere.infra.executor.sql.execute.result.query.impl.driver.jdbc.type.util;
+
+import com.google.common.primitives.Ints;
+import com.google.common.primitives.Longs;
+import com.google.common.primitives.Shorts;
+import lombok.SneakyThrows;
+import org.apache.shardingsphere.infra.executor.exception.UnsupportedDataTypeConversionException;
+import org.junit.jupiter.api.Test;
+
+import java.math.BigDecimal;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.sql.SQLException;
+import java.sql.Time;
+import java.sql.Timestamp;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.Month;
+import java.util.Date;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class ResultSetUtilsTest {
+
+ @Test
+ void assertConvertValue() throws SQLException {
+ Object object = new Object();
+ assertThat(ResultSetUtils.convertValue(object, String.class), is(object.toString()));
+ }
+
+ @Test
+ void assertConvertLocalDateTimeValue() throws SQLException {
+ LocalDateTime localDateTime = LocalDateTime.of(2021, Month.DECEMBER, 23, 19, 30);
+ assertThat(ResultSetUtils.convertValue(localDateTime, Timestamp.class), is(Timestamp.valueOf(localDateTime)));
+ }
+
+ @Test
+ void assertConvertTimestampValue() throws SQLException {
+ LocalDateTime localDateTime = LocalDateTime.of(2021, Month.DECEMBER, 23, 19, 30);
+ Timestamp timestamp = Timestamp.valueOf(localDateTime);
+ assertThat(ResultSetUtils.convertValue(timestamp, LocalDateTime.class), is(localDateTime));
+ assertThat(ResultSetUtils.convertValue(timestamp, LocalDate.class), is(LocalDate.of(2021, Month.DECEMBER, 23)));
+ assertThat(ResultSetUtils.convertValue(timestamp, LocalTime.class), is(LocalTime.of(19, 30)));
+ }
+
+ @Test
+ void assertConvertBooleanValue() throws SQLException {
+ assertFalse((boolean) ResultSetUtils.convertValue("-2", boolean.class));
+ assertTrue((boolean) ResultSetUtils.convertValue("1", boolean.class));
+ }
+
+ @Test
+ void assertConvertNumberValueSuccess() throws SQLException {
+ assertThat(ResultSetUtils.convertValue("1", String.class), is("1"));
+ assertTrue((boolean) ResultSetUtils.convertValue(1, boolean.class));
+ assertThat(ResultSetUtils.convertValue((byte) 1, byte.class), is((byte) 1));
+ assertThat(ResultSetUtils.convertValue((short) 1, short.class), is((short) 1));
+ assertThat(ResultSetUtils.convertValue(new BigDecimal("1"), int.class), is(1));
+ assertThat(ResultSetUtils.convertValue(new BigDecimal("1"), long.class), is(1L));
+ assertThat(ResultSetUtils.convertValue(new BigDecimal("1"), double.class), is(1.0d));
+ assertThat(ResultSetUtils.convertValue(new BigDecimal("1"), float.class), is(1.0f));
+ assertThat(ResultSetUtils.convertValue(new BigDecimal("1"), BigDecimal.class), is(new BigDecimal("1")));
+ assertThat(ResultSetUtils.convertValue((short) 1, BigDecimal.class), is(new BigDecimal("1")));
+ assertThat(ResultSetUtils.convertValue(new Date(0L), Date.class), is(new Date(0L)));
+ assertThat(ResultSetUtils.convertValue((short) 1, Object.class), is(Short.valueOf("1")));
+ assertThat(ResultSetUtils.convertValue((short) 1, String.class), is("1"));
+ assertThat(ResultSetUtils.convertValue(1, Byte.class), is(Byte.valueOf("1")));
+ assertThat(ResultSetUtils.convertValue(1, Short.class), is(Short.valueOf("1")));
+ assertThat(ResultSetUtils.convertValue(1, Long.class), is(Long.valueOf("1")));
+ assertThat(ResultSetUtils.convertValue(1, Double.class), is(Double.valueOf("1")));
+ assertThat(ResultSetUtils.convertValue(1, Float.class), is(Float.valueOf("1")));
+ }
+
+ @Test
+ void assertConvertNumberValueError() {
+ assertThrows(UnsupportedDataTypeConversionException.class, () -> ResultSetUtils.convertValue(1, Date.class));
+ }
+
+ @Test
+ void assertConvertNullValue() throws SQLException {
+ assertFalse((boolean) ResultSetUtils.convertValue(null, boolean.class));
+ assertThat(ResultSetUtils.convertValue(null, byte.class), is((byte) 0));
+ assertThat(ResultSetUtils.convertValue(null, short.class), is((short) 0));
+ assertThat(ResultSetUtils.convertValue(null, int.class), is(0));
+ assertThat(ResultSetUtils.convertValue(null, long.class), is(0L));
+ assertThat(ResultSetUtils.convertValue(null, double.class), is(0.0D));
+ assertThat(ResultSetUtils.convertValue(null, float.class), is(0.0F));
+ assertThat(ResultSetUtils.convertValue(null, String.class), is((Object) null));
+ assertThat(ResultSetUtils.convertValue(null, Object.class), is((Object) null));
+ assertThat(ResultSetUtils.convertValue(null, BigDecimal.class), is((Object) null));
+ assertThat(ResultSetUtils.convertValue(null, Date.class), is((Object) null));
+ }
+
+ @Test
+ void assertConvertNullType() {
+ assertThrows(SQLException.class, () -> ResultSetUtils.convertValue(null, null));
+ }
+
+ @Test
+ void assertConvertDateValueSuccess() throws SQLException {
+ Date now = new Date();
+ assertThat(ResultSetUtils.convertValue(now, Date.class), is(now));
+ assertThat(ResultSetUtils.convertValue(now, java.sql.Date.class), is(now));
+ assertThat(ResultSetUtils.convertValue(now, Time.class), is(now));
+ assertThat(ResultSetUtils.convertValue(now, Timestamp.class), is(new Timestamp(now.getTime())));
+ assertThat(ResultSetUtils.convertValue(now, String.class), is(now.toString()));
+ }
+
+ @Test
+ void assertConvertByteArrayValueSuccess() throws SQLException {
+ byte[] bytesValue = {};
+ assertThat(ResultSetUtils.convertValue(bytesValue, byte.class), is(bytesValue));
+ assertThat(ResultSetUtils.convertValue(new byte[]{1}, byte.class), is((byte) 1));
+ assertThat(ResultSetUtils.convertValue(Shorts.toByteArray((short) 1), short.class), is((short) 1));
+ assertThat(ResultSetUtils.convertValue(Ints.toByteArray(1), int.class), is(1));
+ assertThat(ResultSetUtils.convertValue(Longs.toByteArray(1L), long.class), is(1L));
+ assertThat(ResultSetUtils.convertValue(Longs.toByteArray(1L), double.class), is(1.0d));
+ assertThat(ResultSetUtils.convertValue(Longs.toByteArray(1L), float.class), is(1.0f));
+ assertThat(ResultSetUtils.convertValue(Longs.toByteArray(1L), BigDecimal.class), is(new BigDecimal("1")));
+ }
+
+ @SneakyThrows(MalformedURLException.class)
+ @Test
+ void assertConvertURLValue() throws SQLException {
+ String urlString = "https://shardingsphere.apache.org/";
+ URL url = (URL) ResultSetUtils.convertValue(urlString, URL.class);
+ assertThat(url, is(new URL(urlString)));
+ }
+
+ @Test
+ void assertConvertURLValueError() {
+ String urlString = "no-exist:shardingsphere.apache.org/";
+ assertThrows(UnsupportedDataTypeConversionException.class, () -> ResultSetUtils.convertValue(urlString, URL.class));
+ }
+
+ @Test
+ void assertConvertBigDecimalValue() {
+ BigDecimal bigDecimal = (BigDecimal) ResultSetUtils.convertBigDecimalValue("12", false, 0);
+ assertThat(bigDecimal, is(BigDecimal.valueOf(12)));
+ }
+
+ @Test
+ void assertConvertBigDecimalValueNull() {
+ BigDecimal bigDecimal = (BigDecimal) ResultSetUtils.convertBigDecimalValue(null, false, 0);
+ assertNull(bigDecimal);
+ }
+
+ @Test
+ void assertConvertBigDecimalValueWithScale() {
+ BigDecimal bigDecimal = (BigDecimal) ResultSetUtils.convertBigDecimalValue("12.243", true, 2);
+ assertThat(bigDecimal, is(BigDecimal.valueOf(12.24)));
+ }
+
+ @Test
+ void assertConvertBigDecimalValueError() {
+ assertThrows(UnsupportedDataTypeConversionException.class, () -> ResultSetUtils.convertBigDecimalValue(new Date(), true, 2));
+ }
+
+ @Test
+ void assertConvertDateValueError() {
+ assertThrows(UnsupportedDataTypeConversionException.class, () -> ResultSetUtils.convertValue(new Date(), int.class));
+ }
+}
diff --git a/infra/util/src/main/java/org/apache/shardingsphere/infra/util/reflection/ReflectionUtil.java b/infra/util/src/main/java/org/apache/shardingsphere/infra/util/reflection/ReflectionUtils.java
similarity index 98%
rename from infra/util/src/main/java/org/apache/shardingsphere/infra/util/reflection/ReflectionUtil.java
rename to infra/util/src/main/java/org/apache/shardingsphere/infra/util/reflection/ReflectionUtils.java
index 36270b33f6e..de338d0bc5b 100644
--- a/infra/util/src/main/java/org/apache/shardingsphere/infra/util/reflection/ReflectionUtil.java
+++ b/infra/util/src/main/java/org/apache/shardingsphere/infra/util/reflection/ReflectionUtils.java
@@ -26,10 +26,10 @@ import java.lang.reflect.Method;
import java.util.Optional;
/**
- * Reflection utility.
+ * Reflection utility class.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class ReflectionUtil {
+public final class ReflectionUtils {
/**
* Get field value.
diff --git a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/reflection/ReflectionUtilTest.java b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/reflection/ReflectionUtilsTest.java
similarity index 66%
rename from infra/util/src/test/java/org/apache/shardingsphere/infra/util/reflection/ReflectionUtilTest.java
rename to infra/util/src/test/java/org/apache/shardingsphere/infra/util/reflection/ReflectionUtilsTest.java
index 9a92aaf4d46..9c4a131ffb2 100644
--- a/infra/util/src/test/java/org/apache/shardingsphere/infra/util/reflection/ReflectionUtilTest.java
+++ b/infra/util/src/test/java/org/apache/shardingsphere/infra/util/reflection/ReflectionUtilsTest.java
@@ -24,28 +24,28 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertFalse;
-class ReflectionUtilTest {
+class ReflectionUtilsTest {
@Test
void assertGetStaticFieldValue() {
- assertThat(ReflectionUtil.getStaticFieldValue(ReflectionFixture.class, "staticValue"), is("static_value"));
+ assertThat(ReflectionUtils.getStaticFieldValue(ReflectionFixture.class, "staticValue"), is("static_value"));
}
@Test
void assertSetStaticFieldValue() {
- ReflectionUtil.setStaticFieldValue(ReflectionFixture.class, "staticValue", "other_value");
+ ReflectionUtils.setStaticFieldValue(ReflectionFixture.class, "staticValue", "other_value");
assertThat(ReflectionFixture.getStaticValue(), is("other_value"));
- ReflectionUtil.setStaticFieldValue(ReflectionFixture.class, "staticValue", "static_value");
+ ReflectionUtils.setStaticFieldValue(ReflectionFixture.class, "staticValue", "static_value");
}
@Test
void assertGetFieldValue() {
- assertThat(ReflectionUtil.getFieldValue(new ReflectionFixture(), "instanceValue").orElse(""), is("instance_value"));
- assertFalse(ReflectionUtil.getFieldValue(new ReflectionFixture(), "not_existed_field").isPresent());
+ assertThat(ReflectionUtils.getFieldValue(new ReflectionFixture(), "instanceValue").orElse(""), is("instance_value"));
+ assertFalse(ReflectionUtils.getFieldValue(new ReflectionFixture(), "not_existed_field").isPresent());
}
@Test
void assertInvokeMethod() throws NoSuchMethodException {
- assertThat(ReflectionUtil.invokeMethod(ReflectionFixture.class.getDeclaredMethod("getInstanceValue"), new ReflectionFixture()), is("instance_value"));
+ assertThat(ReflectionUtils.invokeMethod(ReflectionFixture.class.getDeclaredMethod("getInstanceValue"), new ReflectionFixture()), is("instance_value"));
}
}
diff --git a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/DatabaseMetaDataResultSet.java b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/DatabaseMetaDataResultSet.java
index cb2844f6a85..f01706dcff8 100644
--- a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/DatabaseMetaDataResultSet.java
+++ b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/DatabaseMetaDataResultSet.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.driver.jdbc.exception.syntax.ColumnIndexOutOfRa
import org.apache.shardingsphere.driver.jdbc.exception.syntax.ColumnLabelNotFoundException;
import org.apache.shardingsphere.driver.jdbc.exception.connection.ResultSetClosedException;
import org.apache.shardingsphere.driver.jdbc.unsupported.AbstractUnsupportedDatabaseMetaDataResultSet;
-import org.apache.shardingsphere.infra.executor.sql.execute.result.query.impl.driver.jdbc.type.util.ResultSetUtil;
+import org.apache.shardingsphere.infra.executor.sql.execute.result.query.impl.driver.jdbc.type.util.ResultSetUtils;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.infra.rule.identifier.type.DataNodeContainedRule;
@@ -168,7 +168,7 @@ public final class DatabaseMetaDataResultSet extends AbstractUnsupportedDatabase
private BigDecimal getBigDecimal(final int columnIndex, final boolean needScale, final int scale) throws SQLException {
checkClosed();
checkColumnIndex(columnIndex);
- return (BigDecimal) ResultSetUtil.convertBigDecimalValue(currentDatabaseMetaDataObject.getObject(columnIndex), needScale, scale);
+ return (BigDecimal) ResultSetUtils.convertBigDecimalValue(currentDatabaseMetaDataObject.getObject(columnIndex), needScale, scale);
}
@Override
@@ -185,7 +185,7 @@ public final class DatabaseMetaDataResultSet extends AbstractUnsupportedDatabase
public String getString(final int columnIndex) throws SQLException {
checkClosed();
checkColumnIndex(columnIndex);
- return (String) ResultSetUtil.convertValue(currentDatabaseMetaDataObject.getObject(columnIndex), String.class);
+ return (String) ResultSetUtils.convertValue(currentDatabaseMetaDataObject.getObject(columnIndex), String.class);
}
@Override
@@ -207,7 +207,7 @@ public final class DatabaseMetaDataResultSet extends AbstractUnsupportedDatabase
public boolean getBoolean(final int columnIndex) throws SQLException {
checkClosed();
checkColumnIndex(columnIndex);
- return (boolean) ResultSetUtil.convertValue(currentDatabaseMetaDataObject.getObject(columnIndex), boolean.class);
+ return (boolean) ResultSetUtils.convertValue(currentDatabaseMetaDataObject.getObject(columnIndex), boolean.class);
}
@Override
@@ -219,7 +219,7 @@ public final class DatabaseMetaDataResultSet extends AbstractUnsupportedDatabase
public byte getByte(final int columnIndex) throws SQLException {
checkClosed();
checkColumnIndex(columnIndex);
- return (byte) ResultSetUtil.convertValue(currentDatabaseMetaDataObject.getObject(columnIndex), byte.class);
+ return (byte) ResultSetUtils.convertValue(currentDatabaseMetaDataObject.getObject(columnIndex), byte.class);
}
@Override
@@ -231,7 +231,7 @@ public final class DatabaseMetaDataResultSet extends AbstractUnsupportedDatabase
public short getShort(final int columnIndex) throws SQLException {
checkClosed();
checkColumnIndex(columnIndex);
- return (short) ResultSetUtil.convertValue(currentDatabaseMetaDataObject.getObject(columnIndex), short.class);
+ return (short) ResultSetUtils.convertValue(currentDatabaseMetaDataObject.getObject(columnIndex), short.class);
}
@Override
@@ -243,7 +243,7 @@ public final class DatabaseMetaDataResultSet extends AbstractUnsupportedDatabase
public int getInt(final int columnIndex) throws SQLException {
checkClosed();
checkColumnIndex(columnIndex);
- return (int) ResultSetUtil.convertValue(currentDatabaseMetaDataObject.getObject(columnIndex), int.class);
+ return (int) ResultSetUtils.convertValue(currentDatabaseMetaDataObject.getObject(columnIndex), int.class);
}
@Override
@@ -255,7 +255,7 @@ public final class DatabaseMetaDataResultSet extends AbstractUnsupportedDatabase
public long getLong(final int columnIndex) throws SQLException {
checkClosed();
checkColumnIndex(columnIndex);
- return (long) ResultSetUtil.convertValue(currentDatabaseMetaDataObject.getObject(columnIndex), long.class);
+ return (long) ResultSetUtils.convertValue(currentDatabaseMetaDataObject.getObject(columnIndex), long.class);
}
@Override
@@ -267,7 +267,7 @@ public final class DatabaseMetaDataResultSet extends AbstractUnsupportedDatabase
public float getFloat(final int columnIndex) throws SQLException {
checkClosed();
checkColumnIndex(columnIndex);
- return (float) ResultSetUtil.convertValue(currentDatabaseMetaDataObject.getObject(columnIndex), float.class);
+ return (float) ResultSetUtils.convertValue(currentDatabaseMetaDataObject.getObject(columnIndex), float.class);
}
@Override
@@ -279,7 +279,7 @@ public final class DatabaseMetaDataResultSet extends AbstractUnsupportedDatabase
public double getDouble(final int columnIndex) throws SQLException {
checkClosed();
checkColumnIndex(columnIndex);
- return (double) ResultSetUtil.convertValue(currentDatabaseMetaDataObject.getObject(columnIndex), double.class);
+ return (double) ResultSetUtils.convertValue(currentDatabaseMetaDataObject.getObject(columnIndex), double.class);
}
@Override
@@ -291,7 +291,7 @@ public final class DatabaseMetaDataResultSet extends AbstractUnsupportedDatabase
public byte[] getBytes(final int columnIndex) throws SQLException {
checkClosed();
checkColumnIndex(columnIndex);
- return (byte[]) ResultSetUtil.convertValue(currentDatabaseMetaDataObject.getObject(columnIndex), byte[].class);
+ return (byte[]) ResultSetUtils.convertValue(currentDatabaseMetaDataObject.getObject(columnIndex), byte[].class);
}
@Override
@@ -303,7 +303,7 @@ public final class DatabaseMetaDataResultSet extends AbstractUnsupportedDatabase
public Date getDate(final int columnIndex) throws SQLException {
checkClosed();
checkColumnIndex(columnIndex);
- return (Date) ResultSetUtil.convertValue(currentDatabaseMetaDataObject.getObject(columnIndex), Date.class);
+ return (Date) ResultSetUtils.convertValue(currentDatabaseMetaDataObject.getObject(columnIndex), Date.class);
}
@Override
@@ -315,7 +315,7 @@ public final class DatabaseMetaDataResultSet extends AbstractUnsupportedDatabase
public Time getTime(final int columnIndex) throws SQLException {
checkClosed();
checkColumnIndex(columnIndex);
- return (Time) ResultSetUtil.convertValue(currentDatabaseMetaDataObject.getObject(columnIndex), Time.class);
+ return (Time) ResultSetUtils.convertValue(currentDatabaseMetaDataObject.getObject(columnIndex), Time.class);
}
@Override
@@ -327,7 +327,7 @@ public final class DatabaseMetaDataResultSet extends AbstractUnsupportedDatabase
public Timestamp getTimestamp(final int columnIndex) throws SQLException {
checkClosed();
checkColumnIndex(columnIndex);
- return (Timestamp) ResultSetUtil.convertValue(currentDatabaseMetaDataObject.getObject(columnIndex), Timestamp.class);
+ return (Timestamp) ResultSetUtils.convertValue(currentDatabaseMetaDataObject.getObject(columnIndex), Timestamp.class);
}
@Override
@@ -339,7 +339,7 @@ public final class DatabaseMetaDataResultSet extends AbstractUnsupportedDatabase
public URL getURL(final int columnIndex) throws SQLException {
checkClosed();
checkColumnIndex(columnIndex);
- return (URL) ResultSetUtil.convertValue(currentDatabaseMetaDataObject.getObject(columnIndex), URL.class);
+ return (URL) ResultSetUtils.convertValue(currentDatabaseMetaDataObject.getObject(columnIndex), URL.class);
}
@Override
diff --git a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSet.java b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSet.java
index 67f8dedf346..6d93ec9babd 100644
--- a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSet.java
+++ b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSet.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.driver.jdbc.core.resultset;
import org.apache.shardingsphere.driver.jdbc.adapter.AbstractResultSetAdapter;
import org.apache.shardingsphere.infra.executor.sql.context.ExecutionContext;
-import org.apache.shardingsphere.infra.executor.sql.execute.result.query.impl.driver.jdbc.type.util.ResultSetUtil;
+import org.apache.shardingsphere.infra.executor.sql.execute.result.query.impl.driver.jdbc.type.util.ResultSetUtils;
import org.apache.shardingsphere.infra.merge.result.MergedResult;
import org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
@@ -66,7 +66,7 @@ public final class ShardingSphereResultSet extends AbstractResultSetAdapter {
final ExecutionContext executionContext) throws SQLException {
super(resultSets, statement, transparentStatement, executionContext);
this.mergeResultSet = mergeResultSet;
- columnLabelAndIndexMap = ShardingSphereResultSetUtil.createColumnLabelAndIndexMap(executionContext.getSqlStatementContext(), resultSets.get(0).getMetaData());
+ columnLabelAndIndexMap = ShardingSphereResultSetUtils.createColumnLabelAndIndexMap(executionContext.getSqlStatementContext(), resultSets.get(0).getMetaData());
}
public ShardingSphereResultSet(final List<ResultSet> resultSets, final MergedResult mergeResultSet, final Statement statement, final boolean transparentStatement,
@@ -88,7 +88,7 @@ public final class ShardingSphereResultSet extends AbstractResultSetAdapter {
@Override
public boolean getBoolean(final int columnIndex) throws SQLException {
- return (boolean) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, boolean.class), boolean.class);
+ return (boolean) ResultSetUtils.convertValue(mergeResultSet.getValue(columnIndex, boolean.class), boolean.class);
}
@Override
@@ -98,7 +98,7 @@ public final class ShardingSphereResultSet extends AbstractResultSetAdapter {
@Override
public byte getByte(final int columnIndex) throws SQLException {
- return (byte) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, byte.class), byte.class);
+ return (byte) ResultSetUtils.convertValue(mergeResultSet.getValue(columnIndex, byte.class), byte.class);
}
@Override
@@ -108,7 +108,7 @@ public final class ShardingSphereResultSet extends AbstractResultSetAdapter {
@Override
public short getShort(final int columnIndex) throws SQLException {
- return (short) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, short.class), short.class);
+ return (short) ResultSetUtils.convertValue(mergeResultSet.getValue(columnIndex, short.class), short.class);
}
@Override
@@ -118,7 +118,7 @@ public final class ShardingSphereResultSet extends AbstractResultSetAdapter {
@Override
public int getInt(final int columnIndex) throws SQLException {
- return (int) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, int.class), int.class);
+ return (int) ResultSetUtils.convertValue(mergeResultSet.getValue(columnIndex, int.class), int.class);
}
@Override
@@ -128,7 +128,7 @@ public final class ShardingSphereResultSet extends AbstractResultSetAdapter {
@Override
public long getLong(final int columnIndex) throws SQLException {
- return (long) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, long.class), long.class);
+ return (long) ResultSetUtils.convertValue(mergeResultSet.getValue(columnIndex, long.class), long.class);
}
@Override
@@ -138,7 +138,7 @@ public final class ShardingSphereResultSet extends AbstractResultSetAdapter {
@Override
public float getFloat(final int columnIndex) throws SQLException {
- return (float) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, float.class), float.class);
+ return (float) ResultSetUtils.convertValue(mergeResultSet.getValue(columnIndex, float.class), float.class);
}
@Override
@@ -148,7 +148,7 @@ public final class ShardingSphereResultSet extends AbstractResultSetAdapter {
@Override
public double getDouble(final int columnIndex) throws SQLException {
- return (double) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, double.class), double.class);
+ return (double) ResultSetUtils.convertValue(mergeResultSet.getValue(columnIndex, double.class), double.class);
}
@Override
@@ -158,7 +158,7 @@ public final class ShardingSphereResultSet extends AbstractResultSetAdapter {
@Override
public String getString(final int columnIndex) throws SQLException {
- return (String) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, String.class), String.class);
+ return (String) ResultSetUtils.convertValue(mergeResultSet.getValue(columnIndex, String.class), String.class);
}
@Override
@@ -178,7 +178,7 @@ public final class ShardingSphereResultSet extends AbstractResultSetAdapter {
@Override
public BigDecimal getBigDecimal(final int columnIndex) throws SQLException {
- return (BigDecimal) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, BigDecimal.class), BigDecimal.class);
+ return (BigDecimal) ResultSetUtils.convertValue(mergeResultSet.getValue(columnIndex, BigDecimal.class), BigDecimal.class);
}
@Override
@@ -188,7 +188,7 @@ public final class ShardingSphereResultSet extends AbstractResultSetAdapter {
@Override
public BigDecimal getBigDecimal(final int columnIndex, final int scale) throws SQLException {
- return (BigDecimal) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, BigDecimal.class), BigDecimal.class);
+ return (BigDecimal) ResultSetUtils.convertValue(mergeResultSet.getValue(columnIndex, BigDecimal.class), BigDecimal.class);
}
@Override
@@ -198,7 +198,7 @@ public final class ShardingSphereResultSet extends AbstractResultSetAdapter {
@Override
public byte[] getBytes(final int columnIndex) throws SQLException {
- return (byte[]) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, byte[].class), byte[].class);
+ return (byte[]) ResultSetUtils.convertValue(mergeResultSet.getValue(columnIndex, byte[].class), byte[].class);
}
@Override
@@ -208,7 +208,7 @@ public final class ShardingSphereResultSet extends AbstractResultSetAdapter {
@Override
public Date getDate(final int columnIndex) throws SQLException {
- return (Date) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, Date.class), Date.class);
+ return (Date) ResultSetUtils.convertValue(mergeResultSet.getValue(columnIndex, Date.class), Date.class);
}
@Override
@@ -218,7 +218,7 @@ public final class ShardingSphereResultSet extends AbstractResultSetAdapter {
@Override
public Date getDate(final int columnIndex, final Calendar cal) throws SQLException {
- return (Date) ResultSetUtil.convertValue(mergeResultSet.getCalendarValue(columnIndex, Date.class, cal), Date.class);
+ return (Date) ResultSetUtils.convertValue(mergeResultSet.getCalendarValue(columnIndex, Date.class, cal), Date.class);
}
@Override
@@ -228,7 +228,7 @@ public final class ShardingSphereResultSet extends AbstractResultSetAdapter {
@Override
public Time getTime(final int columnIndex) throws SQLException {
- return (Time) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, Time.class), Time.class);
+ return (Time) ResultSetUtils.convertValue(mergeResultSet.getValue(columnIndex, Time.class), Time.class);
}
@Override
@@ -238,7 +238,7 @@ public final class ShardingSphereResultSet extends AbstractResultSetAdapter {
@Override
public Time getTime(final int columnIndex, final Calendar cal) throws SQLException {
- return (Time) ResultSetUtil.convertValue(mergeResultSet.getCalendarValue(columnIndex, Time.class, cal), Time.class);
+ return (Time) ResultSetUtils.convertValue(mergeResultSet.getCalendarValue(columnIndex, Time.class, cal), Time.class);
}
@Override
@@ -248,7 +248,7 @@ public final class ShardingSphereResultSet extends AbstractResultSetAdapter {
@Override
public Timestamp getTimestamp(final int columnIndex) throws SQLException {
- return (Timestamp) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, Timestamp.class), Timestamp.class);
+ return (Timestamp) ResultSetUtils.convertValue(mergeResultSet.getValue(columnIndex, Timestamp.class), Timestamp.class);
}
@Override
@@ -258,7 +258,7 @@ public final class ShardingSphereResultSet extends AbstractResultSetAdapter {
@Override
public Timestamp getTimestamp(final int columnIndex, final Calendar cal) throws SQLException {
- return (Timestamp) ResultSetUtil.convertValue(mergeResultSet.getCalendarValue(columnIndex, Timestamp.class, cal), Timestamp.class);
+ return (Timestamp) ResultSetUtils.convertValue(mergeResultSet.getCalendarValue(columnIndex, Timestamp.class, cal), Timestamp.class);
}
@Override
@@ -379,9 +379,9 @@ public final class ShardingSphereResultSet extends AbstractResultSetAdapter {
return (T) getClob(columnIndex);
}
if (LocalDateTime.class.equals(type) || LocalDate.class.equals(type) || LocalTime.class.equals(type) || OffsetDateTime.class.equals(type)) {
- return (T) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, Timestamp.class), type);
+ return (T) ResultSetUtils.convertValue(mergeResultSet.getValue(columnIndex, Timestamp.class), type);
}
- return (T) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, type), type);
+ return (T) ResultSetUtils.convertValue(mergeResultSet.getValue(columnIndex, type), type);
}
@Override
diff --git a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSetUtil.java b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSetUtils.java
similarity index 97%
rename from jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSetUtil.java
rename to jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSetUtils.java
index 514281a8332..4df932460c5 100644
--- a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSetUtil.java
+++ b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSetUtils.java
@@ -31,10 +31,10 @@ import java.util.List;
import java.util.Map;
/**
- * Util for {@link ShardingSphereResultSet}.
+ * Utility class for {@link ShardingSphereResultSet}.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class ShardingSphereResultSetUtil {
+public final class ShardingSphereResultSetUtils {
/**
* Create column label and index map.
diff --git a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
index 170212fa6ff..ab92ccbcd69 100644
--- a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
+++ b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
@@ -29,7 +29,7 @@ import org.apache.shardingsphere.driver.jdbc.adapter.AbstractPreparedStatementAd
import org.apache.shardingsphere.driver.jdbc.core.connection.ShardingSphereConnection;
import org.apache.shardingsphere.driver.jdbc.core.resultset.GeneratedKeysResultSet;
import org.apache.shardingsphere.driver.jdbc.core.resultset.ShardingSphereResultSet;
-import org.apache.shardingsphere.driver.jdbc.core.resultset.ShardingSphereResultSetUtil;
+import org.apache.shardingsphere.driver.jdbc.core.resultset.ShardingSphereResultSetUtils;
import org.apache.shardingsphere.driver.jdbc.core.statement.metadata.ShardingSphereParameterMetaData;
import org.apache.shardingsphere.driver.jdbc.exception.syntax.EmptySQLException;
import org.apache.shardingsphere.infra.binder.QueryContext;
@@ -270,7 +270,7 @@ public final class ShardingSpherePreparedStatement extends AbstractPreparedState
MergedResult mergedResult = mergeQuery(queryResults);
List<ResultSet> resultSets = getResultSets();
Map<String, Integer> columnLabelAndIndexMap = null != this.columnLabelAndIndexMap ? this.columnLabelAndIndexMap
- : (this.columnLabelAndIndexMap = ShardingSphereResultSetUtil.createColumnLabelAndIndexMap(sqlStatementContext, resultSets.get(0).getMetaData()));
+ : (this.columnLabelAndIndexMap = ShardingSphereResultSetUtils.createColumnLabelAndIndexMap(sqlStatementContext, resultSets.get(0).getMetaData()));
result = new ShardingSphereResultSet(resultSets, mergedResult, this, transparentStatement, executionContext, columnLabelAndIndexMap);
// CHECKSTYLE:OFF
} catch (final Exception ex) {
@@ -551,7 +551,7 @@ public final class ShardingSpherePreparedStatement extends AbstractPreparedState
}
MergedResult mergedResult = mergeQuery(getQueryResults(resultSets));
Map<String, Integer> columnLabelAndIndexMap = null != this.columnLabelAndIndexMap ? this.columnLabelAndIndexMap
- : (this.columnLabelAndIndexMap = ShardingSphereResultSetUtil.createColumnLabelAndIndexMap(sqlStatementContext, resultSets.get(0).getMetaData()));
+ : (this.columnLabelAndIndexMap = ShardingSphereResultSetUtils.createColumnLabelAndIndexMap(sqlStatementContext, resultSets.get(0).getMetaData()));
currentResultSet = new ShardingSphereResultSet(resultSets, mergedResult, this, transparentStatement, executionContext, columnLabelAndIndexMap);
}
return currentResultSet;
diff --git a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSetUtilTest.java b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSetUtilsTest.java
similarity index 94%
rename from jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSetUtilTest.java
rename to jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSetUtilsTest.java
index 4888a1b03bf..48589237eed 100644
--- a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSetUtilTest.java
+++ b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSetUtilsTest.java
@@ -36,7 +36,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-class ShardingSphereResultSetUtilTest {
+class ShardingSphereResultSetUtilsTest {
@Test
void assertCreateColumnLabelAndIndexMapWithSelectWithoutExpandProjections() throws SQLException {
@@ -45,7 +45,7 @@ class ShardingSphereResultSetUtilTest {
ResultSetMetaData resultSetMetaData = mock(ResultSetMetaData.class);
when(resultSetMetaData.getColumnCount()).thenReturn(1);
when(resultSetMetaData.getColumnLabel(1)).thenReturn("label");
- Map<String, Integer> actual = ShardingSphereResultSetUtil.createColumnLabelAndIndexMap(selectStatementContext, resultSetMetaData);
+ Map<String, Integer> actual = ShardingSphereResultSetUtils.createColumnLabelAndIndexMap(selectStatementContext, resultSetMetaData);
assertThat(actual, is(Collections.singletonMap("label", 1)));
}
@@ -59,7 +59,7 @@ class ShardingSphereResultSetUtilTest {
Map<String, Integer> expected = new HashMap<>(2, 1);
expected.put("col1", 1);
expected.put("col2", 2);
- Map<String, Integer> actual = ShardingSphereResultSetUtil.createColumnLabelAndIndexMap(selectStatementContext, null);
+ Map<String, Integer> actual = ShardingSphereResultSetUtils.createColumnLabelAndIndexMap(selectStatementContext, null);
assertThat(actual, is(expected));
}
}
diff --git a/kernel/data-pipeline/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/core/ack/CDCAckHolderTest.java b/kernel/data-pipeline/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/core/ack/CDCAckHolderTest.java
index d075b206fc5..ffc722d6ad2 100644
--- a/kernel/data-pipeline/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/core/ack/CDCAckHolderTest.java
+++ b/kernel/data-pipeline/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/core/ack/CDCAckHolderTest.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.data.pipeline.cdc.core.ack;
import org.apache.shardingsphere.data.pipeline.api.ingest.position.FinishedPosition;
import org.apache.shardingsphere.data.pipeline.api.ingest.record.FinishedRecord;
import org.apache.shardingsphere.data.pipeline.cdc.core.importer.SocketSinkImporter;
-import org.apache.shardingsphere.infra.util.reflection.ReflectionUtil;
+import org.apache.shardingsphere.infra.util.reflection.ReflectionUtils;
import org.junit.jupiter.api.Test;
import java.util.HashMap;
@@ -40,7 +40,7 @@ class CDCAckHolderTest {
final Map<SocketSinkImporter, CDCAckPosition> importerDataRecordMap = new HashMap<>();
SocketSinkImporter socketSinkImporter = mock(SocketSinkImporter.class);
importerDataRecordMap.put(socketSinkImporter, new CDCAckPosition(new FinishedRecord(new FinishedPosition()), 0));
- Optional<Map<String, Map<SocketSinkImporter, CDCAckPosition>>> ackIdPositionMap = ReflectionUtil.getFieldValue(cdcAckHolder, "ackIdPositionMap");
+ Optional<Map<String, Map<SocketSinkImporter, CDCAckPosition>>> ackIdPositionMap = ReflectionUtils.getFieldValue(cdcAckHolder, "ackIdPositionMap");
assertTrue(ackIdPositionMap.isPresent());
assertTrue(ackIdPositionMap.get().isEmpty());
String ackId = cdcAckHolder.bindAckIdWithPosition(importerDataRecordMap);
@@ -57,7 +57,7 @@ class CDCAckHolderTest {
importerDataRecordMap.put(socketSinkImporter, new CDCAckPosition(new FinishedRecord(new FinishedPosition()), System.currentTimeMillis() - 60 * 1000 * 10));
cdcAckHolder.bindAckIdWithPosition(importerDataRecordMap);
cdcAckHolder.cleanUp(socketSinkImporter);
- Optional<Map<String, Map<SocketSinkImporter, CDCAckPosition>>> ackIdPositionMap = ReflectionUtil.getFieldValue(cdcAckHolder, "ackIdPositionMap");
+ Optional<Map<String, Map<SocketSinkImporter, CDCAckPosition>>> ackIdPositionMap = ReflectionUtils.getFieldValue(cdcAckHolder, "ackIdPositionMap");
assertTrue(ackIdPositionMap.isPresent());
assertTrue(ackIdPositionMap.get().isEmpty());
}
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/DataConsistencyCheckUtils.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/DataConsistencyCheckUtils.java
index a4c703989c6..de8aad97870 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/DataConsistencyCheckUtils.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/DataConsistencyCheckUtils.java
@@ -24,7 +24,7 @@ import java.math.BigDecimal;
import java.math.RoundingMode;
/**
- * Data consistency check utils.
+ * Data consistency check utility class.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class DataConsistencyCheckUtils {
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/PipelineJobIdUtils.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/PipelineJobIdUtils.java
index 5b6ddcc0a80..e82549caec3 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/PipelineJobIdUtils.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/PipelineJobIdUtils.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.data.pipeline.spi.job.JobType;
import org.apache.shardingsphere.data.pipeline.spi.job.JobTypeFactory;
/**
- * Pipeline job id utils.
+ * Pipeline job id utility class.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class PipelineJobIdUtils {
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/generator/PipelineDDLGenerator.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/generator/PipelineDDLGenerator.java
index a193adde098..7c1a2204a36 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/generator/PipelineDDLGenerator.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/generator/PipelineDDLGenerator.java
@@ -31,7 +31,7 @@ import org.apache.shardingsphere.infra.binder.type.ConstraintAvailable;
import org.apache.shardingsphere.infra.binder.type.IndexAvailable;
import org.apache.shardingsphere.infra.binder.type.TableAvailable;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
-import org.apache.shardingsphere.infra.metadata.database.schema.util.IndexMetaDataUtil;
+import org.apache.shardingsphere.infra.metadata.database.schema.util.IndexMetaDataUtils;
import org.apache.shardingsphere.infra.parser.SQLParserEngine;
import org.apache.shardingsphere.sql.parser.sql.common.segment.SQLSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.constraint.ConstraintSegment;
@@ -136,13 +136,13 @@ public final class PipelineDDLGenerator {
if (!tableNameSegment.getIdentifier().getValue().equals(targetTableName)) {
if (sqlStatementContext instanceof IndexAvailable) {
for (IndexSegment each : ((IndexAvailable) sqlStatementContext).getIndexes()) {
- String logicIndexName = IndexMetaDataUtil.getLogicIndexName(each.getIndexName().getIdentifier().getValue(), tableNameSegment.getIdentifier().getValue());
+ String logicIndexName = IndexMetaDataUtils.getLogicIndexName(each.getIndexName().getIdentifier().getValue(), tableNameSegment.getIdentifier().getValue());
replaceMap.put(each.getIndexName(), logicIndexName);
}
}
if (sqlStatementContext instanceof ConstraintAvailable) {
for (ConstraintSegment each : ((ConstraintAvailable) sqlStatementContext).getConstraints()) {
- String logicConstraint = IndexMetaDataUtil.getLogicIndexName(each.getIdentifier().getValue(), tableNameSegment.getIdentifier().getValue());
+ String logicConstraint = IndexMetaDataUtils.getLogicIndexName(each.getIdentifier().getValue(), tableNameSegment.getIdentifier().getValue());
replaceMap.put(each, logicConstraint);
}
}
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/PipelineJobPreparerUtils.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/PipelineJobPreparerUtils.java
index 0c32d15ccda..0ce58b42331 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/PipelineJobPreparerUtils.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/PipelineJobPreparerUtils.java
@@ -52,7 +52,7 @@ import java.util.Collection;
import java.util.Optional;
/**
- * Pipeline job preparer utils.
+ * Pipeline job preparer utility class.
*/
@Slf4j
public final class PipelineJobPreparerUtils {
diff --git a/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/wal/decode/OpenGaussTimestampUtils.java b/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/wal/decode/OpenGaussTimestampUtils.java
index 03810f93b00..520c7756112 100644
--- a/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/wal/decode/OpenGaussTimestampUtils.java
+++ b/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/wal/decode/OpenGaussTimestampUtils.java
@@ -27,7 +27,7 @@ import java.sql.Timestamp;
import java.util.Calendar;
/**
- * Timestamp utils of openGauss.
+ * Timestamp utility class of openGauss.
*/
@RequiredArgsConstructor
public final class OpenGaussTimestampUtils implements BaseTimestampUtils {
diff --git a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/decode/BaseTimestampUtils.java b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/decode/BaseTimestampUtils.java
index 66bb880e1df..881aa49be8f 100644
--- a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/decode/BaseTimestampUtils.java
+++ b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/decode/BaseTimestampUtils.java
@@ -23,7 +23,7 @@ import java.sql.Timestamp;
import java.util.Calendar;
/**
- * logical replication decoding plugin interface.
+ * Logical replication decoding plugin interface.
*/
public interface BaseTimestampUtils {
diff --git a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/decode/PostgreSQLTimestampUtils.java b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/decode/PostgreSQLTimestampUtils.java
index 2ec643a21ac..f7e112634c2 100644
--- a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/decode/PostgreSQLTimestampUtils.java
+++ b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/decode/PostgreSQLTimestampUtils.java
@@ -26,7 +26,7 @@ import java.sql.Timestamp;
import java.util.Calendar;
/**
- * PostgreSQL sequence.
+ * Timestamp utility class of PostgreSQL.
*/
@AllArgsConstructor
public final class PostgreSQLTimestampUtils implements BaseTimestampUtils {
diff --git a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/decider/SingleSQLFederationDecider.java b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/decider/SingleSQLFederationDecider.java
index 80ad6c3b3e3..1556958fcc8 100644
--- a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/decider/SingleSQLFederationDecider.java
+++ b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/decider/SingleSQLFederationDecider.java
@@ -30,7 +30,7 @@ import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.infra.metadata.database.schema.QualifiedTable;
-import org.apache.shardingsphere.infra.metadata.database.schema.util.IndexMetaDataUtil;
+import org.apache.shardingsphere.infra.metadata.database.schema.util.IndexMetaDataUtils;
import org.apache.shardingsphere.single.constant.SingleOrder;
import org.apache.shardingsphere.single.rule.SingleRule;
import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.table.SimpleTableSegment;
@@ -88,7 +88,7 @@ public final class SingleSQLFederationDecider implements SQLFederationDecider<Si
DatabaseType databaseType = sqlStatementContext.getDatabaseType();
Collection<QualifiedTable> result = getQualifiedTables(database, databaseType, sqlStatementContext.getTablesContext().getTables());
if (result.isEmpty() && sqlStatementContext instanceof IndexAvailable) {
- result = IndexMetaDataUtil.getTableNames(database, databaseType, ((IndexAvailable) sqlStatementContext).getIndexes());
+ result = IndexMetaDataUtils.getTableNames(database, databaseType, ((IndexAvailable) sqlStatementContext).getIndexes());
}
return rule.getSingleTableNames(result);
}
diff --git a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/metadata/reviser/constraint/SingleConstraintReviser.java b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/metadata/reviser/constraint/SingleConstraintReviser.java
index 7e52a57ab24..0dea9c999e5 100644
--- a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/metadata/reviser/constraint/SingleConstraintReviser.java
+++ b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/metadata/reviser/constraint/SingleConstraintReviser.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.single.metadata.reviser.constraint;
import org.apache.shardingsphere.infra.metadata.database.schema.reviser.constraint.ConstraintReviser;
import org.apache.shardingsphere.infra.metadata.database.schema.loader.model.ConstraintMetaData;
-import org.apache.shardingsphere.infra.metadata.database.schema.util.IndexMetaDataUtil;
+import org.apache.shardingsphere.infra.metadata.database.schema.util.IndexMetaDataUtils;
import org.apache.shardingsphere.single.rule.SingleRule;
import java.util.Optional;
@@ -31,6 +31,6 @@ public final class SingleConstraintReviser implements ConstraintReviser<SingleRu
@Override
public Optional<ConstraintMetaData> revise(final String tableName, final ConstraintMetaData originalMetaData, final SingleRule rule) {
- return Optional.of(new ConstraintMetaData(IndexMetaDataUtil.getLogicIndexName(originalMetaData.getName(), tableName), originalMetaData.getReferencedTableName()));
+ return Optional.of(new ConstraintMetaData(IndexMetaDataUtils.getLogicIndexName(originalMetaData.getName(), tableName), originalMetaData.getReferencedTableName()));
}
}
diff --git a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/metadata/reviser/index/SingleIndexReviser.java b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/metadata/reviser/index/SingleIndexReviser.java
index 48fbcb0cf62..5a7d1c2d2c6 100644
--- a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/metadata/reviser/index/SingleIndexReviser.java
+++ b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/metadata/reviser/index/SingleIndexReviser.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.single.metadata.reviser.index;
import org.apache.shardingsphere.infra.metadata.database.schema.reviser.index.IndexReviser;
import org.apache.shardingsphere.infra.metadata.database.schema.loader.model.IndexMetaData;
-import org.apache.shardingsphere.infra.metadata.database.schema.util.IndexMetaDataUtil;
+import org.apache.shardingsphere.infra.metadata.database.schema.util.IndexMetaDataUtils;
import org.apache.shardingsphere.single.rule.SingleRule;
import java.util.Optional;
@@ -31,6 +31,6 @@ public final class SingleIndexReviser implements IndexReviser<SingleRule> {
@Override
public Optional<IndexMetaData> revise(final String tableName, final IndexMetaData originalMetaData, final SingleRule singleRule) {
- return Optional.of(new IndexMetaData(IndexMetaDataUtil.getLogicIndexName(originalMetaData.getName(), tableName)));
+ return Optional.of(new IndexMetaData(IndexMetaDataUtils.getLogicIndexName(originalMetaData.getName(), tableName)));
}
}
diff --git a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/route/SingleSQLRouter.java b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/route/SingleSQLRouter.java
index b9b9f3de821..c2b61c5ef38 100644
--- a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/route/SingleSQLRouter.java
+++ b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/route/SingleSQLRouter.java
@@ -30,7 +30,7 @@ import org.apache.shardingsphere.infra.database.type.DatabaseTypeEngine;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
import org.apache.shardingsphere.infra.metadata.database.schema.QualifiedTable;
-import org.apache.shardingsphere.infra.metadata.database.schema.util.IndexMetaDataUtil;
+import org.apache.shardingsphere.infra.metadata.database.schema.util.IndexMetaDataUtils;
import org.apache.shardingsphere.infra.route.SQLRouter;
import org.apache.shardingsphere.infra.route.context.RouteContext;
import org.apache.shardingsphere.infra.route.context.RouteMapper;
@@ -97,7 +97,7 @@ public final class SingleSQLRouter implements SQLRouter<SingleRule> {
DatabaseType databaseType = sqlStatementContext.getDatabaseType();
Collection<QualifiedTable> result = getQualifiedTables(database, databaseType, sqlStatementContext.getTablesContext().getTables());
if (result.isEmpty() && sqlStatementContext instanceof IndexAvailable) {
- result = IndexMetaDataUtil.getTableNames(database, databaseType, ((IndexAvailable) sqlStatementContext).getIndexes());
+ result = IndexMetaDataUtils.getTableNames(database, databaseType, ((IndexAvailable) sqlStatementContext).getIndexes());
}
return routeContext.getRouteUnits().isEmpty() && sqlStatementContext.getSqlStatement() instanceof CreateTableStatement ? result : rule.getSingleTableNames(result);
}
diff --git a/kernel/sql-federation/executor/advanced/src/main/java/org/apache/shardingsphere/sqlfederation/advanced/resultset/SQLFederationResultSet.java b/kernel/sql-federation/executor/advanced/src/main/java/org/apache/shardingsphere/sqlfederation/advanced/resultset/SQLFederationResultSet.java
index 3c09ed1f4b6..ee47fa6e3da 100644
--- a/kernel/sql-federation/executor/advanced/src/main/java/org/apache/shardingsphere/sqlfederation/advanced/resultset/SQLFederationResultSet.java
+++ b/kernel/sql-federation/executor/advanced/src/main/java/org/apache/shardingsphere/sqlfederation/advanced/resultset/SQLFederationResultSet.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.infra.binder.statement.dml.SelectStatementConte
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.infra.database.type.dialect.OpenGaussDatabaseType;
import org.apache.shardingsphere.infra.database.type.dialect.PostgreSQLDatabaseType;
-import org.apache.shardingsphere.infra.executor.sql.execute.result.query.impl.driver.jdbc.type.util.ResultSetUtil;
+import org.apache.shardingsphere.infra.executor.sql.execute.result.query.impl.driver.jdbc.type.util.ResultSetUtils;
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
import org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
@@ -123,7 +123,7 @@ public final class SQLFederationResultSet extends AbstractUnsupportedOperationRe
@Override
public String getString(final int columnIndex) throws SQLException {
- return (String) ResultSetUtil.convertValue(getValue(columnIndex, String.class), String.class);
+ return (String) ResultSetUtils.convertValue(getValue(columnIndex, String.class), String.class);
}
@Override
@@ -133,7 +133,7 @@ public final class SQLFederationResultSet extends AbstractUnsupportedOperationRe
@Override
public boolean getBoolean(final int columnIndex) throws SQLException {
- return (boolean) ResultSetUtil.convertValue(getValue(columnIndex, boolean.class), boolean.class);
+ return (boolean) ResultSetUtils.convertValue(getValue(columnIndex, boolean.class), boolean.class);
}
@Override
@@ -143,7 +143,7 @@ public final class SQLFederationResultSet extends AbstractUnsupportedOperationRe
@Override
public byte getByte(final int columnIndex) throws SQLException {
- return (byte) ResultSetUtil.convertValue(getValue(columnIndex, byte.class), byte.class);
+ return (byte) ResultSetUtils.convertValue(getValue(columnIndex, byte.class), byte.class);
}
@Override
@@ -153,7 +153,7 @@ public final class SQLFederationResultSet extends AbstractUnsupportedOperationRe
@Override
public short getShort(final int columnIndex) throws SQLException {
- return (short) ResultSetUtil.convertValue(getValue(columnIndex, short.class), short.class);
+ return (short) ResultSetUtils.convertValue(getValue(columnIndex, short.class), short.class);
}
@Override
@@ -163,7 +163,7 @@ public final class SQLFederationResultSet extends AbstractUnsupportedOperationRe
@Override
public int getInt(final int columnIndex) throws SQLException {
- return (int) ResultSetUtil.convertValue(getValue(columnIndex, int.class), int.class);
+ return (int) ResultSetUtils.convertValue(getValue(columnIndex, int.class), int.class);
}
@Override
@@ -173,7 +173,7 @@ public final class SQLFederationResultSet extends AbstractUnsupportedOperationRe
@Override
public long getLong(final int columnIndex) throws SQLException {
- return (long) ResultSetUtil.convertValue(getValue(columnIndex, long.class), long.class);
+ return (long) ResultSetUtils.convertValue(getValue(columnIndex, long.class), long.class);
}
@Override
@@ -183,7 +183,7 @@ public final class SQLFederationResultSet extends AbstractUnsupportedOperationRe
@Override
public float getFloat(final int columnIndex) throws SQLException {
- return (float) ResultSetUtil.convertValue(getValue(columnIndex, float.class), float.class);
+ return (float) ResultSetUtils.convertValue(getValue(columnIndex, float.class), float.class);
}
@Override
@@ -193,7 +193,7 @@ public final class SQLFederationResultSet extends AbstractUnsupportedOperationRe
@Override
public double getDouble(final int columnIndex) throws SQLException {
- return (double) ResultSetUtil.convertValue(getValue(columnIndex, double.class), double.class);
+ return (double) ResultSetUtils.convertValue(getValue(columnIndex, double.class), double.class);
}
@Override
@@ -203,7 +203,7 @@ public final class SQLFederationResultSet extends AbstractUnsupportedOperationRe
@Override
public BigDecimal getBigDecimal(final int columnIndex, final int scale) throws SQLException {
- return (BigDecimal) ResultSetUtil.convertValue(getValue(columnIndex, BigDecimal.class), BigDecimal.class);
+ return (BigDecimal) ResultSetUtils.convertValue(getValue(columnIndex, BigDecimal.class), BigDecimal.class);
}
@Override
@@ -213,7 +213,7 @@ public final class SQLFederationResultSet extends AbstractUnsupportedOperationRe
@Override
public BigDecimal getBigDecimal(final int columnIndex) throws SQLException {
- return (BigDecimal) ResultSetUtil.convertValue(getValue(columnIndex, BigDecimal.class), BigDecimal.class);
+ return (BigDecimal) ResultSetUtils.convertValue(getValue(columnIndex, BigDecimal.class), BigDecimal.class);
}
@Override
@@ -223,7 +223,7 @@ public final class SQLFederationResultSet extends AbstractUnsupportedOperationRe
@Override
public byte[] getBytes(final int columnIndex) throws SQLException {
- return (byte[]) ResultSetUtil.convertValue(getValue(columnIndex, byte[].class), byte[].class);
+ return (byte[]) ResultSetUtils.convertValue(getValue(columnIndex, byte[].class), byte[].class);
}
@Override
@@ -233,7 +233,7 @@ public final class SQLFederationResultSet extends AbstractUnsupportedOperationRe
@Override
public Date getDate(final int columnIndex) throws SQLException {
- return (Date) ResultSetUtil.convertValue(getValue(columnIndex, Date.class), Date.class);
+ return (Date) ResultSetUtils.convertValue(getValue(columnIndex, Date.class), Date.class);
}
@Override
@@ -243,7 +243,7 @@ public final class SQLFederationResultSet extends AbstractUnsupportedOperationRe
@Override
public Date getDate(final int columnIndex, final Calendar cal) throws SQLException {
- return (Date) ResultSetUtil.convertValue(getCalendarValue(columnIndex), Date.class);
+ return (Date) ResultSetUtils.convertValue(getCalendarValue(columnIndex), Date.class);
}
@Override
@@ -253,7 +253,7 @@ public final class SQLFederationResultSet extends AbstractUnsupportedOperationRe
@Override
public Time getTime(final int columnIndex) throws SQLException {
- return (Time) ResultSetUtil.convertValue(getValue(columnIndex, Time.class), Time.class);
+ return (Time) ResultSetUtils.convertValue(getValue(columnIndex, Time.class), Time.class);
}
@Override
@@ -263,7 +263,7 @@ public final class SQLFederationResultSet extends AbstractUnsupportedOperationRe
@Override
public Time getTime(final int columnIndex, final Calendar cal) throws SQLException {
- return (Time) ResultSetUtil.convertValue(getCalendarValue(columnIndex), Time.class);
+ return (Time) ResultSetUtils.convertValue(getCalendarValue(columnIndex), Time.class);
}
@Override
@@ -273,7 +273,7 @@ public final class SQLFederationResultSet extends AbstractUnsupportedOperationRe
@Override
public Timestamp getTimestamp(final int columnIndex) throws SQLException {
- return (Timestamp) ResultSetUtil.convertValue(getValue(columnIndex, Timestamp.class), Timestamp.class);
+ return (Timestamp) ResultSetUtils.convertValue(getValue(columnIndex, Timestamp.class), Timestamp.class);
}
@Override
@@ -283,7 +283,7 @@ public final class SQLFederationResultSet extends AbstractUnsupportedOperationRe
@Override
public Timestamp getTimestamp(final int columnIndex, final Calendar cal) throws SQLException {
- return (Timestamp) ResultSetUtil.convertValue(getCalendarValue(columnIndex), Timestamp.class);
+ return (Timestamp) ResultSetUtils.convertValue(getCalendarValue(columnIndex), Timestamp.class);
}
@Override
diff --git a/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/util/AutoCommitUtils.java b/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/util/AutoCommitUtils.java
index f9701fd3e08..02d008eb4c1 100644
--- a/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/util/AutoCommitUtils.java
+++ b/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/util/AutoCommitUtils.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.sql.parser.sql.common.statement.dml.DMLStatemen
import org.apache.shardingsphere.sql.parser.sql.common.statement.dml.SelectStatement;
/**
- * Auto commit utils.
+ * Auto commit utility class.
*/
public final class AutoCommitUtils {
diff --git a/kernel/transaction/type/xa/core/src/main/java/org/apache/shardingsphere/transaction/xa/jta/datasource/XATransactionDataSource.java b/kernel/transaction/type/xa/core/src/main/java/org/apache/shardingsphere/transaction/xa/jta/datasource/XATransactionDataSource.java
index 763336c2f71..becae73e49a 100644
--- a/kernel/transaction/type/xa/core/src/main/java/org/apache/shardingsphere/transaction/xa/jta/datasource/XATransactionDataSource.java
+++ b/kernel/transaction/type/xa/core/src/main/java/org/apache/shardingsphere/transaction/xa/jta/datasource/XATransactionDataSource.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.transaction.xa.jta.datasource;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
-import org.apache.shardingsphere.infra.util.reflection.ReflectionUtil;
+import org.apache.shardingsphere.infra.util.reflection.ReflectionUtils;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.transaction.xa.jta.connection.XAConnectionWrapper;
import org.apache.shardingsphere.transaction.xa.jta.datasource.properties.XADataSourceDefinition;
@@ -116,7 +116,7 @@ public final class XATransactionDataSource implements AutoCloseable {
private void close(final DataSource dataSource) {
try {
- ReflectionUtil.invokeMethod(dataSource.getClass().getDeclaredMethod("close"), dataSource);
+ ReflectionUtils.invokeMethod(dataSource.getClass().getDeclaredMethod("close"), dataSource);
} catch (final ReflectiveOperationException ignored) {
}
}
diff --git a/kernel/transaction/type/xa/core/src/test/java/org/apache/shardingsphere/transaction/xa/fixture/DataSourceUtils.java b/kernel/transaction/type/xa/core/src/test/java/org/apache/shardingsphere/transaction/xa/fixture/DataSourceUtils.java
index 6d0c5175f71..f31eaf197cf 100644
--- a/kernel/transaction/type/xa/core/src/test/java/org/apache/shardingsphere/transaction/xa/fixture/DataSourceUtils.java
+++ b/kernel/transaction/type/xa/core/src/test/java/org/apache/shardingsphere/transaction/xa/fixture/DataSourceUtils.java
@@ -30,7 +30,7 @@ import org.apache.shardingsphere.transaction.xa.jta.datasource.swapper.DataSourc
import javax.sql.DataSource;
/**
- * Data source utility.
+ * Data source utility class.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class DataSourceUtils {
diff --git a/kernel/transaction/type/xa/provider/narayana/src/main/java/org/apache/shardingsphere/transaction/xa/narayana/manager/NarayanaXATransactionManagerProvider.java b/kernel/transaction/type/xa/provider/narayana/src/main/java/org/apache/shardingsphere/transaction/xa/narayana/manager/NarayanaXATransactionManagerProvider.java
index e78f72b8f22..dfbf233b80d 100644
--- a/kernel/transaction/type/xa/provider/narayana/src/main/java/org/apache/shardingsphere/transaction/xa/narayana/manager/NarayanaXATransactionManagerProvider.java
+++ b/kernel/transaction/type/xa/provider/narayana/src/main/java/org/apache/shardingsphere/transaction/xa/narayana/manager/NarayanaXATransactionManagerProvider.java
@@ -27,7 +27,7 @@ import com.arjuna.common.internal.util.propertyservice.BeanPopulator;
import com.arjuna.common.util.propertyservice.PropertiesFactory;
import lombok.Getter;
import lombok.SneakyThrows;
-import org.apache.shardingsphere.infra.util.reflection.ReflectionUtil;
+import org.apache.shardingsphere.infra.util.reflection.ReflectionUtils;
import org.apache.shardingsphere.transaction.xa.spi.SingleXAResource;
import org.apache.shardingsphere.transaction.xa.spi.XATransactionManagerProvider;
@@ -92,25 +92,25 @@ public final class NarayanaXATransactionManagerProvider implements XATransaction
}
private void cleanPropertiesFactory() {
- ReflectionUtil.setStaticFieldValue(PropertiesFactory.class, "delegatePropertiesFactory", null);
+ ReflectionUtils.setStaticFieldValue(PropertiesFactory.class, "delegatePropertiesFactory", null);
}
private void cleanBeanInstances() {
- ReflectionUtil.<ConcurrentMap<String, Object>>getStaticFieldValue(BeanPopulator.class, "beanInstances").clear();
+ ReflectionUtils.<ConcurrentMap<String, Object>>getStaticFieldValue(BeanPopulator.class, "beanInstances").clear();
}
private void cleanAtomicActionRecovery() {
- ReflectionUtil.setStaticFieldValue(AtomicActionRecoveryModule.class, "_recoveryStore", null);
+ ReflectionUtils.setStaticFieldValue(AtomicActionRecoveryModule.class, "_recoveryStore", null);
}
private void cleanXARecoveryModule() {
- ReflectionUtil.setStaticFieldValue(XARecoveryModule.class, "registeredXARecoveryModule", null);
+ ReflectionUtils.setStaticFieldValue(XARecoveryModule.class, "registeredXARecoveryModule", null);
}
private void cleanStoreManager() {
- ReflectionUtil.setStaticFieldValue(StoreManager.class, "actionStore", null);
- ReflectionUtil.setStaticFieldValue(StoreManager.class, "stateStore", null);
- ReflectionUtil.setStaticFieldValue(StoreManager.class, "communicationStore", null);
+ ReflectionUtils.setStaticFieldValue(StoreManager.class, "actionStore", null);
+ ReflectionUtils.setStaticFieldValue(StoreManager.class, "stateStore", null);
+ ReflectionUtils.setStaticFieldValue(StoreManager.class, "communicationStore", null);
}
@Override
diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/compute/service/ComputeNodeStatusServiceTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/compute/service/ComputeNodeStatusServiceTest.java
index 485cd72d95b..32f98de4c14 100644
--- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/compute/service/ComputeNodeStatusServiceTest.java
+++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/status/compute/service/ComputeNodeStatusServiceTest.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.infra.instance.ComputeNodeInstance;
import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData;
import org.apache.shardingsphere.infra.instance.metadata.InstanceType;
import org.apache.shardingsphere.infra.instance.metadata.proxy.ProxyInstanceMetaData;
-import org.apache.shardingsphere.infra.instance.utils.IpUtils;
+import org.apache.shardingsphere.infra.instance.util.IpUtils;
import org.apache.shardingsphere.infra.state.instance.InstanceStateContext;
import org.apache.shardingsphere.infra.state.instance.InstanceState;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
diff --git a/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepository.java b/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepository.java
index d5cb75682eb..9b8974a04ea 100644
--- a/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepository.java
+++ b/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepository.java
@@ -27,7 +27,7 @@ import com.alibaba.nacos.common.utils.StringUtils;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import lombok.SneakyThrows;
-import org.apache.shardingsphere.infra.instance.utils.IpUtils;
+import org.apache.shardingsphere.infra.instance.util.IpUtils;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryConfiguration;
import org.apache.shardingsphere.mode.repository.cluster.exception.ClusterPersistRepositoryException;
diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/DatabaseConnector.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/DatabaseConnector.java
index 21255f5999d..01fa803bea7 100644
--- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/DatabaseConnector.java
+++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/DatabaseConnector.java
@@ -48,7 +48,7 @@ import org.apache.shardingsphere.infra.executor.sql.prepare.driver.jdbc.Statemen
import org.apache.shardingsphere.infra.merge.MergeEngine;
import org.apache.shardingsphere.infra.merge.result.MergedResult;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
-import org.apache.shardingsphere.infra.metadata.database.schema.util.SystemSchemaUtil;
+import org.apache.shardingsphere.infra.metadata.database.schema.util.SystemSchemaUtils;
import org.apache.shardingsphere.infra.rule.identifier.type.ColumnContainedRule;
import org.apache.shardingsphere.infra.rule.identifier.type.DataNodeContainedRule;
import org.apache.shardingsphere.infra.rule.identifier.type.MutableDataNodeRule;
@@ -139,7 +139,7 @@ public final class DatabaseConnector implements DatabaseBackendHandler {
private void failedIfBackendNotReady(final ConnectionSession connectionSession, final SQLStatementContext<?> sqlStatementContext) {
ShardingSphereDatabase database = ProxyContext.getInstance().getDatabase(connectionSession.getDatabaseName());
- boolean isSystemSchema = SystemSchemaUtil.containsSystemSchema(sqlStatementContext.getDatabaseType(), sqlStatementContext.getTablesContext().getSchemaNames(), database);
+ boolean isSystemSchema = SystemSchemaUtils.containsSystemSchema(sqlStatementContext.getDatabaseType(), sqlStatementContext.getTablesContext().getSchemaNames(), database);
ShardingSpherePreconditions.checkState(isSystemSchema || database.containsDataSource(), () -> new StorageUnitNotExistedException(connectionSession.getDatabaseName()));
if (!isSystemSchema && !database.isComplete()) {
throw new RuleNotExistedException(connectionSession.getDatabaseName());
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/DatabaseConnectorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/DatabaseConnectorTest.java
index fe175eb278b..e4a7a113117 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/DatabaseConnectorTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/DatabaseConnectorTest.java
@@ -38,7 +38,7 @@ import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSp
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereIndex;
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereTable;
-import org.apache.shardingsphere.infra.metadata.database.schema.util.SystemSchemaUtil;
+import org.apache.shardingsphere.infra.metadata.database.schema.util.SystemSchemaUtils;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.metadata.persist.MetaDataPersistService;
@@ -93,7 +93,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@ExtendWith(AutoMockExtension.class)
-@StaticMockSettings({ProxyContext.class, SystemSchemaUtil.class})
+@StaticMockSettings({ProxyContext.class, SystemSchemaUtils.class})
class DatabaseConnectorTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -141,7 +141,7 @@ class DatabaseConnectorTest {
DatabaseConnectorFactory.getInstance().newInstance(new QueryContext(sqlStatementContext, "schemaName", Collections.emptyList()), backendConnection, true);
when(backendConnection.getConnectionSession().getStatementManager()).thenReturn(new JDBCBackendStatement());
SQLFederationExecutor federationExecutor = mock(SQLFederationExecutor.class);
- when(SystemSchemaUtil.containsSystemSchema(any(DatabaseType.class), any(), any(ShardingSphereDatabase.class))).thenReturn(true);
+ when(SystemSchemaUtils.containsSystemSchema(any(DatabaseType.class), any(), any(ShardingSphereDatabase.class))).thenReturn(true);
try (MockedStatic<TypedSPILoader> typedSPILoader = mockStatic(TypedSPILoader.class)) {
when(federationExecutor.executeQuery(any(DriverExecutionPrepareEngine.class), any(ProxyJDBCExecutorCallback.class), any(SQLFederationExecutorContext.class))).thenReturn(resultSet);
when(resultSet.getMetaData().getColumnCount()).thenReturn(1);
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/DefaultDatabaseMetaDataExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/DefaultDatabaseMetaDataExecutorTest.java
index 8136c7b5e1d..1f64d21b392 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/DefaultDatabaseMetaDataExecutorTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/executor/DefaultDatabaseMetaDataExecutorTest.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.resource.ShardingSphereResourceMetaData;
import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
-import org.apache.shardingsphere.infra.metadata.database.schema.util.SystemSchemaUtil;
+import org.apache.shardingsphere.infra.metadata.database.schema.util.SystemSchemaUtils;
import org.apache.shardingsphere.infra.metadata.user.Grantee;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
@@ -60,7 +60,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@ExtendWith(AutoMockExtension.class)
-@StaticMockSettings({ProxyContext.class, SystemSchemaUtil.class})
+@StaticMockSettings({ProxyContext.class, SystemSchemaUtils.class})
class DefaultDatabaseMetaDataExecutorTest {
private final Grantee grantee = new Grantee("root", "127.0.0.1");