(shardingsphere) branch master updated: Refactor AbstractStatementAdapter (#31930)

[zhangliang]

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 5618ee09ba8 Refactor AbstractStatementAdapter (#31930)
5618ee09ba8 is described below

commit 5618ee09ba8d1a20f775033c3231d25c7502f2a5
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sun Jun 30 16:44:40 2024 +0800

    Refactor AbstractStatementAdapter (#31930)
    
    * Refactor AbstractStatementAdapter
    
    * Refactor AbstractStatementAdapter
---
 .../jdbc/adapter/AbstractStatementAdapter.java     | 38 +++++++++-------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git 
a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractStatementAdapter.java
 
b/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractStatementAdapter.java
index 73ab6ff2046..256408cfeb7 100644
--- 
a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractStatementAdapter.java
+++ 
b/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractStatementAdapter.java
@@ -25,6 +25,7 @@ import 
org.apache.shardingsphere.driver.jdbc.core.statement.StatementManager;
 import 
org.apache.shardingsphere.infra.database.core.metadata.database.DialectDatabaseMetaData;
 import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
 import org.apache.shardingsphere.infra.database.core.type.DatabaseTypeRegistry;
+import 
org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
 import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
 
 import java.sql.SQLException;
@@ -48,10 +49,10 @@ public abstract class AbstractStatementAdapter extends 
WrapperAdapter implements
     
     private int fetchDirection;
     
-    private boolean closed;
-    
     private boolean closeOnCompletion;
     
+    private boolean closed;
+    
     protected final void handleExceptionInTransaction(final 
ShardingSphereConnection connection, final ShardingSphereMetaData metaData) {
         if 
(connection.getDatabaseConnectionManager().getConnectionContext().getTransactionContext().isInTransaction())
 {
             DatabaseType databaseType = 
metaData.getDatabase(connection.getCurrentDatabaseName()).getProtocolType();
@@ -179,41 +180,34 @@ public abstract class AbstractStatementAdapter extends 
WrapperAdapter implements
     }
     
     @Override
-    public final SQLWarning getWarnings() {
-        return null;
-    }
-    
-    @Override
-    public final void clearWarnings() {
+    public final boolean isCloseOnCompletion() {
+        return closeOnCompletion;
     }
     
     @Override
-    public void closeOnCompletion() {
+    public final void closeOnCompletion() {
         closeOnCompletion = true;
     }
     
     @Override
-    public boolean isCloseOnCompletion() {
-        return closeOnCompletion;
+    public final void setCursorName(final String name) throws SQLException {
+        ShardingSpherePreconditions.checkState(1 == 
getRoutedStatements().size(), () -> new 
SQLFeatureNotSupportedException("setCursorName"));
+        getRoutedStatements().iterator().next().setCursorName(name);
     }
     
+    @SuppressWarnings({"unchecked", "rawtypes"})
     @Override
-    public void setCursorName(final String name) throws SQLException {
-        if (isTransparent()) {
-            getRoutedStatements().iterator().next().setCursorName(name);
-        } else {
-            throw new SQLFeatureNotSupportedException("setCursorName");
-        }
+    public final void cancel() throws SQLException {
+        forceExecuteTemplate.execute((Collection) getRoutedStatements(), 
Statement::cancel);
     }
     
-    private boolean isTransparent() {
-        return 1 == getRoutedStatements().size();
+    @Override
+    public final SQLWarning getWarnings() {
+        return null;
     }
     
-    @SuppressWarnings({"unchecked", "rawtypes"})
     @Override
-    public final void cancel() throws SQLException {
-        forceExecuteTemplate.execute((Collection) getRoutedStatements(), 
Statement::cancel);
+    public final void clearWarnings() {
     }
     
     @SuppressWarnings({"unchecked", "rawtypes"})