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 f27bae549e8 Fix sonar issues (#35028)
f27bae549e8 is described below
commit f27bae549e863d283ce4b353487b34a9441bf8fe
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Mar 18 17:43:48 2025 +0800
Fix sonar issues (#35028)
* Refactor StandalonePersistServiceFacade and ClusterPersistServiceFacade
* Fix sonar issues
---
.../dml/expression/type/OuterJoinExpressionBinderTest.java | 2 +-
.../service/ClusterMetaDataManagerPersistServiceTest.java | 10 +---------
.../service/StandaloneMetaDataManagerPersistServiceTest.java | 8 ++++----
3 files changed, 6 insertions(+), 14 deletions(-)
diff --git
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/engine/segment/dml/expression/type/OuterJoinExpressionBinderTest.java
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/engine/segment/dml/expression/type/OuterJoinExpressionBinderTest.java
index bf13805a2b7..a64f85d187d 100644
---
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/engine/segment/dml/expression/type/OuterJoinExpressionBinderTest.java
+++
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/engine/segment/dml/expression/type/OuterJoinExpressionBinderTest.java
@@ -44,7 +44,7 @@ import static org.mockito.Mockito.mock;
class OuterJoinExpressionBinderTest {
@Test
- public void assertBindOuterJoinExpression() {
+ void assertBindOuterJoinExpression() {
Multimap<CaseInsensitiveString, TableSegmentBinderContext>
tableBinderContexts = LinkedHashMultimap.create();
ColumnSegment boundOrderIdColumn = new ColumnSegment(0, 0, new
IdentifierValue("order_id"));
TableSegmentBoundInfo tableBoundInfo = new TableSegmentBoundInfo(new
IdentifierValue("t_order"), new IdentifierValue("order_id"));
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistServiceTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistServiceTest.java
index e98c8b175ae..44a2c4d329b 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistServiceTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistServiceTest.java
@@ -102,15 +102,7 @@ class ClusterMetaDataManagerPersistServiceTest {
}
@Test
- void assertRenameNotEmptySchemaName() {
- ShardingSphereSchema schema = mock(ShardingSphereSchema.class);
-
when(metaDataContextManager.getMetaDataContexts().getMetaData().getDatabase("foo_db").getSchema("foo_schema")).thenReturn(schema);
- metaDataManagerPersistService.renameSchema(new
ShardingSphereDatabase("foo_db", mock(), mock(), mock(),
Collections.emptyList()), "foo_schema", "bar_schema");
-
verify(metaDataPersistFacade.getDatabaseMetaDataFacade()).renameSchema(any(),
any(), eq("foo_schema"), eq("bar_schema"));
- }
-
- @Test
- void assertRenameEmptySchemaName() {
+ void assertRenameSchema() {
ShardingSphereSchema schema = mock(ShardingSphereSchema.class);
when(metaDataContextManager.getMetaDataContexts().getMetaData().getDatabase("foo_db").getSchema("foo_schema")).thenReturn(schema);
metaDataManagerPersistService.renameSchema(new
ShardingSphereDatabase("foo_db", mock(), mock(), mock(),
Collections.emptyList()), "foo_schema", "bar_schema");
diff --git
a/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistServiceTest.java
b/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistServiceTest.java
index 9a5e1d1d6d7..e8916834a97 100644
---
a/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistServiceTest.java
+++
b/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistServiceTest.java
@@ -157,7 +157,7 @@ class StandaloneMetaDataManagerPersistServiceTest {
}
@Test
- void assertAlterNullRuleConfiguration() throws SQLException {
+ void assertAlterNullRuleConfiguration() {
metaDataManagerPersistService.alterRuleConfiguration(new
ShardingSphereDatabase("foo_db", mock(), mock(), mock(),
Collections.emptyList()), null);
verify(metaDataPersistFacade, times(0)).getVersionService();
}
@@ -180,7 +180,7 @@ class StandaloneMetaDataManagerPersistServiceTest {
}
@Test
- void assertRemoveNullRuleConfigurationItem() throws SQLException {
+ void assertRemoveNullRuleConfigurationItem() {
metaDataManagerPersistService.removeRuleConfigurationItem(new
ShardingSphereDatabase("foo_db", mock(), mock(), mock(),
Collections.emptyList()), null);
verify(metaDataPersistFacade, times(0)).getVersionService();
}
@@ -224,14 +224,14 @@ class StandaloneMetaDataManagerPersistServiceTest {
}
@Test
- void assertCreateTable() throws SQLException {
+ void assertCreateTable() {
ShardingSphereTable table = new ShardingSphereTable("foo_tbl",
Collections.emptyList(), Collections.emptyList(), Collections.emptyList(),
TableType.TABLE);
metaDataManagerPersistService.createTable(new
ShardingSphereDatabase("foo_db", mock(), mock(), mock(),
Collections.emptyList()), "foo_schema", table);
verify(metaDataPersistFacade.getDatabaseMetaDataFacade().getTable()).persist("foo_db",
"foo_schema", Collections.singleton(table));
}
@Test
- void assertDropTables() throws SQLException {
+ void assertDropTables() {
metaDataManagerPersistService.dropTables(new ShardingSphereDatabase(
"foo_db", mock(), mock(), mock(), Collections.emptyList()),
"foo_schema", Collections.singleton("foo_tbl"));
verify(metaDataPersistFacade.getDatabaseMetaDataFacade().getTable()).drop("foo_db",
"foo_schema", "foo_tbl");
