From 2d1ad4897dd8e7ef18c4fe52b8228df3539fa133 Mon Sep 17 00:00:00 2001
From: terrymanu <terrymanu@163.com>
Date: Wed, 4 May 2016 12:06:50 +0800
Subject: [PATCH] refactor

---
 .../jdbc/ShardingPreparedStatement.java         |  5 -----
 .../rdb/sharding/jdbc/ShardingStatement.java    |  5 -----
 .../jdbc/adapter/AbstractStatementAdapter.java  | 14 +++-----------
 .../jdbc/ShardingPreparedStatementTest.java     | 17 ++++++++++++++++-
 4 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/jdbc/ShardingPreparedStatement.java b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/jdbc/ShardingPreparedStatement.java
index d5b5968598..bb6db5c40c 100644
--- a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/jdbc/ShardingPreparedStatement.java
+++ b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/jdbc/ShardingPreparedStatement.java
@@ -152,11 +152,6 @@ public final class ShardingPreparedStatement extends AbstractPreparedStatementAd
         });
     }
     
-    @Override
-    public void clearRoutedStatements() throws SQLException {
-        getRoutedPreparedStatements().clear();
-    }
-    
     private void routeIfNeed() throws SQLException {
         if (!cachedRoutedPreparedStatements.isEmpty()) {
             return;
diff --git a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/jdbc/ShardingStatement.java b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/jdbc/ShardingStatement.java
index fb54eec2ad..2a0e693010 100644
--- a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/jdbc/ShardingStatement.java
+++ b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/jdbc/ShardingStatement.java
@@ -187,9 +187,4 @@ public class ShardingStatement extends AbstractStatementAdapter {
     public Collection<? extends Statement> getRoutedStatements() throws SQLException {
         return cachedRoutedStatements.values();
     }
-    
-    @Override
-    public void clearRoutedStatements() throws SQLException {
-        cachedRoutedStatements.clear();
-    }
 }
diff --git a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/jdbc/adapter/AbstractStatementAdapter.java b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/jdbc/adapter/AbstractStatementAdapter.java
index 5836286a2d..648746100a 100644
--- a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/jdbc/adapter/AbstractStatementAdapter.java
+++ b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/jdbc/adapter/AbstractStatementAdapter.java
@@ -17,15 +17,14 @@
 
 package com.dangdang.ddframe.rdb.sharding.jdbc.adapter;
 
+import com.dangdang.ddframe.rdb.sharding.jdbc.unsupported.AbstractUnsupportedOperationStatement;
+import lombok.RequiredArgsConstructor;
+
 import java.sql.SQLException;
 import java.sql.SQLWarning;
 import java.sql.Statement;
 import java.util.Collection;
 
-import com.dangdang.ddframe.rdb.sharding.jdbc.unsupported.AbstractUnsupportedOperationStatement;
-
-import lombok.RequiredArgsConstructor;
-
 /**
  * 静态语句对象适配类.
  * 
@@ -157,11 +156,4 @@ public abstract class AbstractStatementAdapter extends AbstractUnsupportedOperat
      * @throws SQLException
      */
     protected abstract Collection<? extends Statement> getRoutedStatements() throws SQLException;
-    
-    /**
-     *  清除路由的静态语句对象集合.
-     *
-     * @throws SQLException
-     */
-    public abstract void clearRoutedStatements() throws SQLException;
 }
diff --git a/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/jdbc/ShardingPreparedStatementTest.java b/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/jdbc/ShardingPreparedStatementTest.java
index cff2e57484..0c9636acf0 100644
--- a/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/jdbc/ShardingPreparedStatementTest.java
+++ b/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/jdbc/ShardingPreparedStatementTest.java
@@ -191,7 +191,7 @@ public final class ShardingPreparedStatementTest extends AbstractShardingDataBas
     }
     
     @Test
-    public void assertBatch() throws SQLException {
+    public void assertAddBatch() throws SQLException {
         String sql = "INSERT INTO `t_order`(`order_id`, `user_id`, `status`) VALUES (?,?,?)";
         try (
                 Connection connection = shardingDataSource.getConnection();
@@ -210,4 +210,19 @@ public final class ShardingPreparedStatementTest extends AbstractShardingDataBas
             }
         }
     }
+    
+    @Test(expected = IllegalStateException.class)
+    public void assertClearBatch() throws SQLException {
+        String sql = "INSERT INTO `t_order`(`order_id`, `user_id`, `status`) VALUES (?,?,?)";
+        try (
+                Connection connection = shardingDataSource.getConnection();
+                PreparedStatement preparedStatement = connection.prepareStatement(sql)) {
+            preparedStatement.setInt(1, 3101);
+            preparedStatement.setInt(2, 11);
+            preparedStatement.setString(3, "BATCH");
+            preparedStatement.addBatch();
+            preparedStatement.clearBatch();
+            preparedStatement.executeBatch();
+        }
+    }
 }
-- 
GitLab