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 be972f80035 Fix sonar issues (#37249)
be972f80035 is described below
commit be972f800350557ff6a7e90500226fd522eec202
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Dec 1 23:24:07 2025 +0800
Fix sonar issues (#37249)
---
.../core/metadata/data/revise/SchemaTableMetaDataAggregator.java | 7 +++++--
.../reviser/schema/BroadcastSchemaTableAggregationReviser.java | 2 +-
.../reviser/schema/ShardingSchemaTableAggregationReviser.java | 2 +-
.../org/apache/shardingsphere/infra/datanode/DataNodeTest.java | 6 ------
.../collector/postgresql/PostgreSQLStatisticsCollectorTest.java | 5 ++---
.../shardingsphere/ShardingSphereStatisticsCollectorTest.java | 5 ++---
6 files changed, 11 insertions(+), 16 deletions(-)
diff --git
a/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/metadata/data/revise/SchemaTableMetaDataAggregator.java
b/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/metadata/data/revise/SchemaTableMetaDataAggregator.java
index 11b2d8f092c..d036bc2eabc 100644
---
a/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/metadata/data/revise/SchemaTableMetaDataAggregator.java
+++
b/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/metadata/data/revise/SchemaTableMetaDataAggregator.java
@@ -17,6 +17,7 @@
package org.apache.shardingsphere.database.connector.core.metadata.data.revise;
+import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.database.connector.core.exception.RuleAndStorageMetaDataMismatchedException;
import
org.apache.shardingsphere.database.connector.core.metadata.data.model.TableMetaData;
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
@@ -30,16 +31,18 @@ import java.util.stream.Collectors;
/**
* Schema table meta data aggregator.
*/
+@RequiredArgsConstructor
public final class SchemaTableMetaDataAggregator {
+ private final boolean checkTableMetaDataEnabled;
+
/**
* Aggregate table meta data.
*
- * @param checkTableMetaDataEnabled check table meta data enabled
* @param tableMetaDataMap table meta data map
* @return table meta data
*/
- public Collection<TableMetaData> aggregate(final boolean
checkTableMetaDataEnabled, final Map<String, Collection<TableMetaData>>
tableMetaDataMap) {
+ public Collection<TableMetaData> aggregate(final Map<String,
Collection<TableMetaData>> tableMetaDataMap) {
Collection<TableMetaData> result = new LinkedList<>();
for (Entry<String, Collection<TableMetaData>> entry :
tableMetaDataMap.entrySet()) {
if (checkTableMetaDataEnabled) {
diff --git
a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/metadata/reviser/schema/BroadcastSchemaTableAggregationReviser.java
b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/metadata/reviser/schema/BroadcastSchemaTableAggregationReviser.java
index 33b4fe63be0..d71747d4cf3 100644
---
a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/metadata/reviser/schema/BroadcastSchemaTableAggregationReviser.java
+++
b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/metadata/reviser/schema/BroadcastSchemaTableAggregationReviser.java
@@ -47,6 +47,6 @@ public final class BroadcastSchemaTableAggregationReviser
implements SchemaTable
@Override
public Collection<TableMetaData> aggregate(final BroadcastRule rule) {
- return new
SchemaTableMetaDataAggregator().aggregate(checkTableMetaDataEnabled,
tableMetaDataMap);
+ return new
SchemaTableMetaDataAggregator(checkTableMetaDataEnabled).aggregate(tableMetaDataMap);
}
}
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/metadata/reviser/schema/ShardingSchemaTableAggregationReviser.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/metadata/reviser/schema/ShardingSchemaTableAggregationReviser.java
index cb2c2162685..a6d5476b2f9 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/metadata/reviser/schema/ShardingSchemaTableAggregationReviser.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/metadata/reviser/schema/ShardingSchemaTableAggregationReviser.java
@@ -45,6 +45,6 @@ public final class ShardingSchemaTableAggregationReviser
implements SchemaTableA
@Override
public Collection<TableMetaData> aggregate(final ShardingRule rule) {
- return new
SchemaTableMetaDataAggregator().aggregate(checkTableMetaDataEnabled,
tableMetaDataMap);
+ return new
SchemaTableMetaDataAggregator(checkTableMetaDataEnabled).aggregate(tableMetaDataMap);
}
}
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/datanode/DataNodeTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/datanode/DataNodeTest.java
index dfe4d3ff04c..71f614de1b6 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/datanode/DataNodeTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/datanode/DataNodeTest.java
@@ -257,12 +257,6 @@ class DataNodeTest {
assertThat(dataNode.format(databaseType), is("ds.tbl"));
}
- @Test
- void assertFormatWithoutSchemaType() {
- DataNode dataNode = new DataNode("ds", (String) null, "tbl");
-
assertThat(dataNode.format(TypedSPILoader.getService(DatabaseType.class,
"MySQL")), is("ds.tbl"));
- }
-
@Test
void assertFormatMethodWithTableNameLowercasing() {
DatabaseType databaseType =
TypedSPILoader.getService(DatabaseType.class, "PostgreSQL");
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/statistics/collector/postgresql/PostgreSQLStatisticsCollectorTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/statistics/collector/postgresql/PostgreSQLStatisticsCollectorTest.java
index a39a6cf7d4c..cce7d746f92 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/statistics/collector/postgresql/PostgreSQLStatisticsCollectorTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/statistics/collector/postgresql/PostgreSQLStatisticsCollectorTest.java
@@ -24,7 +24,6 @@ import
org.apache.shardingsphere.infra.metadata.statistics.collector.DialectData
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.junit.jupiter.api.Test;
-import java.sql.SQLException;
import java.util.Arrays;
import java.util.Collections;
@@ -39,12 +38,12 @@ class PostgreSQLStatisticsCollectorTest {
DialectDatabaseStatisticsCollector.class,
TypedSPILoader.getService(DatabaseType.class, "PostgreSQL"));
@Test
- void assertCollectRowColumnValuesWithExistingCollector() throws
SQLException {
+ void assertCollectRowColumnValuesWithExistingCollector() {
assertTrue(collector.collectRowColumnValues("foo_db", "pg_catalog",
"pg_class", mock(ShardingSphereMetaData.class,
RETURNS_DEEP_STUBS)).isPresent());
}
@Test
- void assertCollectRowColumnValuesWithNonExistingCollector() throws
SQLException {
+ void assertCollectRowColumnValuesWithNonExistingCollector() {
assertFalse(collector.collectRowColumnValues("foo_db",
"unknown_schema", "unknown_table", mock()).isPresent());
}
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/statistics/collector/shardingsphere/ShardingSphereStatisticsCollectorTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/statistics/collector/shardingsphere/ShardingSphereStatisticsCollectorTest.java
index 111f5241f77..3d6a6177642 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/statistics/collector/shardingsphere/ShardingSphereStatisticsCollectorTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/statistics/collector/shardingsphere/ShardingSphereStatisticsCollectorTest.java
@@ -24,7 +24,6 @@ import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.MockedStatic;
import org.mockito.junit.jupiter.MockitoExtension;
-import java.sql.SQLException;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
@@ -46,12 +45,12 @@ class ShardingSphereStatisticsCollectorTest {
private final DialectDatabaseStatisticsCollector collector = new
ShardingSphereStatisticsCollector();
@Test
- void assertCollectRowColumnValuesWithoutAvailableCollector() throws
SQLException {
+ void assertCollectRowColumnValuesWithoutAvailableCollector() {
assertFalse(collector.collectRowColumnValues("foo_db", "foo_schema",
"foo_tbl", mock()).isPresent());
}
@Test
- void assertCollectRowColumnValuesWithAvailableCollector() throws
SQLException {
+ void assertCollectRowColumnValuesWithAvailableCollector() {
ShardingSphereTableStatisticsCollector tableStatisticsCollector =
mock();
try (MockedStatic<TypedSPILoader> mockedLoader =
mockStatic(TypedSPILoader.class)) {
when(tableStatisticsCollector.collect(anyString(), anyString(),
anyString(),
any())).thenReturn(Collections.singleton(Collections.singletonMap("foo_db",
"foo_schema")));
