(shardingsphere) branch master updated: Fix sonar issues (#33592)

[yx9o]

This is an automated email from the ASF dual-hosted git repository.

yx9o 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 2f8aebbf960 Fix sonar issues (#33592)
2f8aebbf960 is described below

commit 2f8aebbf960cdb92a345b59d0b5afcea3a47d638
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Fri Nov 8 14:22:49 2024 +0800

    Fix sonar issues (#33592)
---
 .../shardingsphere/shadow/config/ShadowRuleConfigurationTest.java   | 6 +++---
 .../service/metadata/table/TableMetaDataPersistServiceTest.java     | 4 +---
 .../service/metadata/table/ViewMetaDataPersistServiceTest.java      | 4 +---
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git 
a/features/shadow/api/src/test/java/org/apache/shardingsphere/shadow/config/ShadowRuleConfigurationTest.java
 
b/features/shadow/api/src/test/java/org/apache/shardingsphere/shadow/config/ShadowRuleConfigurationTest.java
index 2798f8fc6fe..8327e0f2b40 100644
--- 
a/features/shadow/api/src/test/java/org/apache/shardingsphere/shadow/config/ShadowRuleConfigurationTest.java
+++ 
b/features/shadow/api/src/test/java/org/apache/shardingsphere/shadow/config/ShadowRuleConfigurationTest.java
@@ -30,21 +30,21 @@ import static org.mockito.Mockito.mock;
 class ShadowRuleConfigurationTest {
     
     @Test
-    public void assertIsEmptyDataSources() {
+    void assertIsEmptyDataSources() {
         ShadowRuleConfiguration actual = new ShadowRuleConfiguration();
         actual.setTables(Collections.singletonMap("foo_tbl", 
mock(ShadowTableConfiguration.class)));
         assertTrue(actual.isEmpty());
     }
     
     @Test
-    public void assertIsEmptyTables() {
+    void assertIsEmptyTables() {
         ShadowRuleConfiguration actual = new ShadowRuleConfiguration();
         
actual.setDataSources(Collections.singleton(mock(ShadowDataSourceConfiguration.class)));
         assertTrue(actual.isEmpty());
     }
     
     @Test
-    public void assertIsNotEmpty() {
+    void assertIsNotEmpty() {
         ShadowRuleConfiguration actual = new ShadowRuleConfiguration();
         
actual.setDataSources(Collections.singleton(mock(ShadowDataSourceConfiguration.class)));
         actual.setTables(Collections.singletonMap("foo_tbl", 
mock(ShadowTableConfiguration.class)));
diff --git 
a/kernel/metadata/core/src/test/java/org/apache/shardingsphere/metadata/persist/service/metadata/table/TableMetaDataPersistServiceTest.java
 
b/kernel/metadata/core/src/test/java/org/apache/shardingsphere/metadata/persist/service/metadata/table/TableMetaDataPersistServiceTest.java
index e1263c5a3b5..fc7d6d95806 100644
--- 
a/kernel/metadata/core/src/test/java/org/apache/shardingsphere/metadata/persist/service/metadata/table/TableMetaDataPersistServiceTest.java
+++ 
b/kernel/metadata/core/src/test/java/org/apache/shardingsphere/metadata/persist/service/metadata/table/TableMetaDataPersistServiceTest.java
@@ -31,9 +31,7 @@ import java.util.Map;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -75,7 +73,7 @@ class TableMetaDataPersistServiceTest {
         
when(repository.query("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl/active_version")).thenReturn("10");
         persistService.persist("foo_db", "foo_schema", 
Collections.singletonMap("foo_tbl", mock(ShardingSphereTable.class)));
         
verify(repository).persist("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl/versions/11",
 "{}" + System.lineSeparator());
-        verify(repository, 
times(1)).persist(eq("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl/active_version"),
 eq("11"));
+        
verify(repository).persist("/metadata/foo_db/schemas/foo_schema/tables/foo_tbl/active_version",
 "11");
     }
     
     @Test
diff --git 
a/kernel/metadata/core/src/test/java/org/apache/shardingsphere/metadata/persist/service/metadata/table/ViewMetaDataPersistServiceTest.java
 
b/kernel/metadata/core/src/test/java/org/apache/shardingsphere/metadata/persist/service/metadata/table/ViewMetaDataPersistServiceTest.java
index 140253fd72e..2d597508fac 100644
--- 
a/kernel/metadata/core/src/test/java/org/apache/shardingsphere/metadata/persist/service/metadata/table/ViewMetaDataPersistServiceTest.java
+++ 
b/kernel/metadata/core/src/test/java/org/apache/shardingsphere/metadata/persist/service/metadata/table/ViewMetaDataPersistServiceTest.java
@@ -31,9 +31,7 @@ import java.util.Map;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -75,7 +73,7 @@ class ViewMetaDataPersistServiceTest {
         
when(repository.query("/metadata/foo_db/schemas/foo_schema/views/foo_view/active_version")).thenReturn("10");
         persistService.persist("foo_db", "foo_schema", 
Collections.singletonMap("foo_view", mock(ShardingSphereView.class)));
         
verify(repository).persist("/metadata/foo_db/schemas/foo_schema/views/foo_view/versions/11",
 "{}" + System.lineSeparator());
-        verify(repository, 
times(1)).persist(eq("/metadata/foo_db/schemas/foo_schema/views/foo_view/active_version"),
 eq("11"));
+        
verify(repository).persist("/metadata/foo_db/schemas/foo_schema/views/foo_view/active_version",
 "11");
     }
     
     @Test