[shardingsphere] branch master updated: Fix sonar issue on LockStatementAssert (#25969)

[zhaojinchao]

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

zhaojinchao 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 ab5cf66066f Fix sonar issue on LockStatementAssert (#25969)
ab5cf66066f is described below

commit ab5cf66066ffaf0c8efb19d17eeff9b4edd84774
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Wed May 31 22:40:28 2023 +0800

    Fix sonar issue on LockStatementAssert (#25969)
---
 .../statement/tcl/impl/LockStatementAssert.java    | 39 ++++++++++------------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git 
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/tcl/impl/LockStatementAssert.java
 
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/tcl/impl/LockStatementAssert.java
index a1e6ca36a0d..62f4c7621a8 100644
--- 
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/tcl/impl/LockStatementAssert.java
+++ 
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/tcl/impl/LockStatementAssert.java
@@ -27,6 +27,8 @@ import 
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAsse
 import 
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.table.TableAssert;
 import 
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.tcl.LockStatementTestCase;
 
+import java.util.Collection;
+
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -45,29 +47,22 @@ public final class LockStatementAssert {
      */
     public static void assertIs(final SQLCaseAssertContext assertContext, 
final LockStatement actual, final LockStatementTestCase expected) {
         if (actual instanceof MySQLLockStatement) {
-            MySQLLockStatement lockStatement = (MySQLLockStatement) actual;
-            if (null == expected.getTables() || 
expected.getTables().isEmpty()) {
-                assertTrue(lockStatement.getTables().isEmpty(), 
assertContext.getText("Actual lock statement should not exist."));
-            } else {
-                assertFalse(lockStatement.getTables().isEmpty(), 
assertContext.getText("Actual lock statement should exist."));
-                int count = 0;
-                for (SimpleTableSegment each : lockStatement.getTables()) {
-                    TableAssert.assertIs(assertContext, each, 
expected.getTables().get(count));
-                    count++;
-                }
-            }
+            assertIs(assertContext, ((MySQLLockStatement) actual).getTables(), 
expected);
         } else if (actual instanceof PostgreSQLLockStatement) {
-            PostgreSQLLockStatement lockStatement = (PostgreSQLLockStatement) 
actual;
-            if (null == expected.getTables() || 
expected.getTables().isEmpty()) {
-                assertTrue(lockStatement.getTables().isEmpty(), 
assertContext.getText("Actual lock statement should not exist."));
-            } else {
-                assertFalse(lockStatement.getTables().isEmpty(), 
assertContext.getText("Actual lock statement should exist."));
-                int count = 0;
-                for (SimpleTableSegment each : lockStatement.getTables()) {
-                    TableAssert.assertIs(assertContext, each, 
expected.getTables().get(count));
-                    count++;
-                }
-            }
+            assertIs(assertContext, ((PostgreSQLLockStatement) 
actual).getTables(), expected);
+        }
+    }
+    
+    private static void assertIs(final SQLCaseAssertContext assertContext, 
final Collection<SimpleTableSegment> actual, final LockStatementTestCase 
expected) {
+        if (null == expected.getTables() || expected.getTables().isEmpty()) {
+            assertTrue(actual.isEmpty(), assertContext.getText("Actual lock 
statement should not exist."));
+            return;
+        }
+        assertFalse(actual.isEmpty(), assertContext.getText("Actual lock 
statement should exist."));
+        int count = 0;
+        for (SimpleTableSegment each : actual) {
+            TableAssert.assertIs(assertContext, each, 
expected.getTables().get(count));
+            count++;
         }
     }
 }