remove ShardingTransactionHandlerAdapter

sharding-jdbc/sharding-jdbc-core/src/test/java/io/shardingsphere/shardingjdbc/jdbc/core/fixed/FixedBaseShardingTransactionHandler.java

@@ -20,9 +20,11 @@ package io.shardingsphere.shardingjdbc.jdbc.core.fixed;
 import io.shardingsphere.core.constant.DatabaseType;
 import io.shardingsphere.transaction.api.TransactionType;
 import io.shardingsphere.transaction.core.TransactionOperationType;
-import io.shardingsphere.transaction.core.handler.ShardingTransactionHandlerAdapter;
+import io.shardingsphere.transaction.spi.ShardingTransactionHandler;
 
 import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.SQLException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -31,7 +33,7 @@ import java.util.Map;
  *
  * @author zhaojun
  */
-public final class FixedBaseShardingTransactionHandler extends ShardingTransactionHandlerAdapter {
+public final class FixedBaseShardingTransactionHandler implements ShardingTransactionHandler {
     
     private static final Map<String, TransactionOperationType> INVOKES = new HashMap<>();
     
@@ -44,6 +46,11 @@ public final class FixedBaseShardingTransactionHandler extends ShardingTransacti
         return INVOKES;
     }
     
+    @Override
+    public TransactionType getTransactionType() {
+        return TransactionType.BASE;
+    }
+    
     @Override
     public void begin() {
         INVOKES.put("begin", TransactionOperationType.BEGIN);
@@ -68,7 +75,7 @@ public final class FixedBaseShardingTransactionHandler extends ShardingTransacti
     }
     
     @Override
-    public TransactionType getTransactionType() {
-        return TransactionType.BASE;
+    public Connection createConnection(final String dataSourceName, final DataSource dataSource) throws SQLException {
+        return dataSource.getConnection();
     }
 }

sharding-jdbc/sharding-jdbc-core/src/test/java/io/shardingsphere/shardingjdbc/jdbc/core/fixed/FixedXAShardingTransactionHandler.java

@@ -20,9 +20,11 @@ package io.shardingsphere.shardingjdbc.jdbc.core.fixed;
 import io.shardingsphere.core.constant.DatabaseType;
 import io.shardingsphere.transaction.api.TransactionType;
 import io.shardingsphere.transaction.core.TransactionOperationType;
-import io.shardingsphere.transaction.core.handler.ShardingTransactionHandlerAdapter;
+import io.shardingsphere.transaction.spi.ShardingTransactionHandler;
 
 import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.SQLException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -31,7 +33,7 @@ import java.util.Map;
  *
  * @author zhaojun
  */
-public final class FixedXAShardingTransactionHandler extends ShardingTransactionHandlerAdapter {
+public final class FixedXAShardingTransactionHandler implements ShardingTransactionHandler {
     
     private static final Map<String, TransactionOperationType> INVOKES = new HashMap<>();
     
@@ -44,6 +46,11 @@ public final class FixedXAShardingTransactionHandler extends ShardingTransaction
         return INVOKES;
     }
     
+    @Override
+    public TransactionType getTransactionType() {
+        return TransactionType.XA;
+    }
+    
     @Override
     public void begin() {
         INVOKES.put("begin", TransactionOperationType.BEGIN);
@@ -68,7 +75,7 @@ public final class FixedXAShardingTransactionHandler extends ShardingTransaction
     }
     
     @Override
-    public TransactionType getTransactionType() {
-        return TransactionType.XA;
+    public Connection createConnection(final String dataSourceName, final DataSource dataSource) throws SQLException {
+        return dataSource.getConnection();
     }
 }

sharding-proxy/src/test/java/io/shardingsphere/shardingproxy/transport/mysql/packet/command/query/text/query/FixedXAShardingTransactionHandler.java

@@ -20,9 +20,11 @@ package io.shardingsphere.shardingproxy.transport.mysql.packet.command.query.tex
 import io.shardingsphere.core.constant.DatabaseType;
 import io.shardingsphere.transaction.api.TransactionType;
 import io.shardingsphere.transaction.core.TransactionOperationType;
-import io.shardingsphere.transaction.core.handler.ShardingTransactionHandlerAdapter;
+import io.shardingsphere.transaction.spi.ShardingTransactionHandler;
 
 import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.SQLException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -31,7 +33,7 @@ import java.util.Map;
  *
  * @author zhaojun
  */
-public final class FixedXAShardingTransactionHandler extends ShardingTransactionHandlerAdapter {
+public final class FixedXAShardingTransactionHandler implements ShardingTransactionHandler {
     
     private static final Map<String, TransactionOperationType> INVOKES = new HashMap<>();
     
@@ -39,6 +41,11 @@ public final class FixedXAShardingTransactionHandler extends ShardingTransaction
         return INVOKES;
     }
     
+    @Override
+    public TransactionType getTransactionType() {
+        return TransactionType.XA;
+    }
+    
     @Override
     public void begin() {
         INVOKES.put("begin", TransactionOperationType.BEGIN);
@@ -63,7 +70,7 @@ public final class FixedXAShardingTransactionHandler extends ShardingTransaction
     }
     
     @Override
-    public TransactionType getTransactionType() {
-        return TransactionType.XA;
+    public Connection createConnection(final String dataSourceName, final DataSource dataSource) throws SQLException {
+        return dataSource.getConnection();
     }
 }

sharding-transaction/sharding-transaction-2pc/sharding-transaction-2pc-xa/src/main/java/io/shardingsphere/transaction/xa/handler/XAShardingTransactionHandler.java

@@ -21,7 +21,7 @@ import com.atomikos.jdbc.AtomikosDataSourceBean;
 import io.shardingsphere.core.constant.DatabaseType;
 import io.shardingsphere.core.exception.ShardingException;
 import io.shardingsphere.transaction.api.TransactionType;
-import io.shardingsphere.transaction.core.handler.ShardingTransactionHandlerAdapter;
+import io.shardingsphere.transaction.spi.ShardingTransactionHandler;
 import io.shardingsphere.transaction.spi.xa.XATransactionManager;
 import io.shardingsphere.transaction.xa.jta.connection.ShardingXAConnection;
 import io.shardingsphere.transaction.xa.jta.datasource.ShardingXADataSource;
@@ -45,7 +45,7 @@ import java.util.Map.Entry;
  * @author zhaojun
  */
 @Slf4j
-public final class XAShardingTransactionHandler extends ShardingTransactionHandlerAdapter {
+public final class XAShardingTransactionHandler implements ShardingTransactionHandler {
     
     private final Map<String, ShardingXADataSource> cachedShardingXADataSourceMap = new HashMap<>();
     

sharding-transaction/sharding-transaction-core/src/main/java/io/shardingsphere/transaction/core/handler/ShardingTransactionHandlerAdapter.java

-/*
- * Copyright 2016-2018 shardingsphere.io.
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * </p>
- */
-
-package io.shardingsphere.transaction.core.handler;
-
-import io.shardingsphere.transaction.spi.ShardingTransactionHandler;
-
-import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.SQLException;
-
-/**
- * Abstract class for sharding transaction handler.
- *
- * @author zhaojun
- *
- */
-public abstract class ShardingTransactionHandlerAdapter implements ShardingTransactionHandler {
-    
-    @Override
-    public Connection createConnection(final String dataSourceName, final DataSource dataSource) throws SQLException {
-        return dataSource.getConnection();
-    }
-}