refactor

apache · May 4, 2016 · 2d1ad48 · 2d1ad48
1 parent 36d8bce
commit 2d1ad48
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 22 deletions.
diff --git a/...-core/src/main/java/com/dangdang/ddframe/rdb/sharding/jdbc/ShardingPreparedStatement.java b/...-core/src/main/java/com/dangdang/ddframe/rdb/sharding/jdbc/ShardingPreparedStatement.java
@@ -152,11 +152,6 @@ public Statement apply(final PreparedStatementExecutorWrapper input) {
         });
     }
 
-    @Override
-    public void clearRoutedStatements() throws SQLException {
-        getRoutedPreparedStatements().clear();
-    }
-
     private void routeIfNeed() throws SQLException {
         if (!cachedRoutedPreparedStatements.isEmpty()) {
             return;

diff --git a/...ing-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/jdbc/ShardingStatement.java b/...ing-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/jdbc/ShardingStatement.java
@@ -187,9 +187,4 @@ public ResultSet getResultSet() throws SQLException {
     public Collection<? extends Statement> getRoutedStatements() throws SQLException {
         return cachedRoutedStatements.values();
     }
-
-    @Override
-    public void clearRoutedStatements() throws SQLException {
-        cachedRoutedStatements.clear();
-    }
 }
diff --git a/...rc/main/java/com/dangdang/ddframe/rdb/sharding/jdbc/adapter/AbstractStatementAdapter.java b/...rc/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 final boolean getMoreResults(final int current) throws SQLException {
      * @throws SQLException
      */
     protected abstract Collection<? extends Statement> getRoutedStatements() throws SQLException;
-
-    /**
-     *  清除路由的静态语句对象集合.
-     *
-     * @throws SQLException
-     */
-    public abstract void clearRoutedStatements() throws SQLException;
 }
diff --git a/...e/src/test/java/com/dangdang/ddframe/rdb/sharding/jdbc/ShardingPreparedStatementTest.java b/...e/src/test/java/com/dangdang/ddframe/rdb/sharding/jdbc/ShardingPreparedStatementTest.java
@@ -191,7 +191,7 @@ public void assertExecuteQueryWithColumnNames() throws SQLException {
     }
 
     @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 void assertBatch() throws SQLException {
             }
         }
     }
+
+    @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();
+        }
+    }
 }