移除不需要的东东

build.gradle

@@ -17,7 +17,6 @@ ext {
 			"velocity":"org.apache.velocity:velocity-engine-core:2.0",
 			"slf4j-api":"org.slf4j:slf4j-api:1.7.25",
 			"junit":"junit:junit:4.12",
-            "assertj":"org.assertj:assertj-core:3.9.0",
             "mockito":"org.mockito:mockito-core:2.13.0",
 			"commons-dbcp2":"org.apache.commons:commons-dbcp2:2.1.1",
 			"mybatis-ehcache":"org.mybatis.caches:mybatis-ehcache:1.1.0",

mybatis-plus-core/build.gradle

@@ -27,5 +27,4 @@ dependencies {
 	testCompile rootProject.ext.dependencies["druid"]
 	testCompile rootProject.ext.dependencies["fastjson"]
 	testCompile rootProject.ext.dependencies["tomcatjdbc"]
-	testCompile rootProject.ext.dependencies["assertj"]
 }

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/shards/RWDataSourceProxy.java

@@ -1,372 +0,0 @@
-/**
- * Copyright (c) 2011-2020, hubin (jobob@qq.com).
- * <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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.
- */
-package com.baomidou.mybatisplus.shards;
-
-import java.io.PrintWriter;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.sql.Connection;
-import java.sql.SQLException;
-
-import javax.sql.DataSource;
-
-import org.apache.ibatis.logging.Log;
-import org.apache.ibatis.logging.LogFactory;
-
-import com.baomidou.mybatisplus.MybatisConfiguration;
-
-/**
- * <p>
- * DB Master/Slave(Write/Read) DataSource Proxy.
- * You can route database connection to master or slave with this datasource proxy.
- * <p/>
- * This is copy &amp; modify of Spring framework's LayzyConnectionDataSourceProxy class.
- * <p/>
- * This DataSource's connection can not be reused with different readOnly attributes.
- * </p>
- *
- * @author hubin
- * @since 2018-01-23
- */
-public class RWDataSourceProxy implements DataSource {
-
-    private static final Log log = LogFactory.getLog(MybatisConfiguration.class);
-
-    private DataSource writeDataSource;
-    private DataSource readDataSource;
-    private Boolean defaultAutoCommit;
-    private Integer defaultTransactionIsolation;
-
-    /**
-     * Default constructor.
-     * After setting {@link #writeDataSource} and {@link #readDataSource},
-     * You must call {@link #init()} to initialize the configuration.
-     */
-    public RWDataSourceProxy() {
-        // to do nothing
-    }
-
-    public RWDataSourceProxy(DataSource writeDataSource, DataSource readDataSource) {
-        this.writeDataSource = writeDataSource;
-        this.readDataSource = readDataSource;
-        init();
-    }
-
-    public void init() {
-        // Determine default auto-commit and transaction isolation
-        // via a Connection from the target DataSource, if possible.
-        if (this.defaultAutoCommit == null || this.defaultTransactionIsolation == null) {
-            try {
-                Connection con = getWriteDataSource().getConnection();
-                try {
-                    checkDefaultConnectionProperties(con);
-                } finally {
-                    con.close();
-                }
-            } catch (SQLException ex) {
-                log.error("Could not retrieve default auto-commit and transaction isolation settings", ex);
-            }
-        }
-    }
-
-    public DataSource setWriteDataSource(DataSource writeDataSource) {
-        return this.writeDataSource = writeDataSource;
-    }
-
-    public DataSource getWriteDataSource() {
-        return this.writeDataSource;
-    }
-
-    public DataSource setReadDataSource(DataSource readDataSource) {
-        return this.readDataSource = readDataSource;
-    }
-
-    public DataSource getReadDataSource() {
-        return this.readDataSource;
-    }
-
-    @Override
-    public PrintWriter getLogWriter() throws SQLException {
-        return getWriteDataSource().getLogWriter();
-    }
-
-    @Override
-    public void setLogWriter(PrintWriter out) throws SQLException {
-        getWriteDataSource().setLogWriter(out);
-        getReadDataSource().setLogWriter(out);
-    }
-
-    @Override
-    public int getLoginTimeout() throws SQLException {
-        return getWriteDataSource().getLoginTimeout();
-    }
-
-    @Override
-    public void setLoginTimeout(int seconds) throws SQLException {
-        getWriteDataSource().setLoginTimeout(seconds);
-        getReadDataSource().setLoginTimeout(seconds);
-    }
-
-    /**
-     * Implementation of JDBC 4.0's Wrapper interface
-     */
-    @Override
-    @SuppressWarnings("unchecked")
-    public <T> T unwrap(Class<T> iface) throws SQLException {
-        if (iface.isInstance(this)) {
-            return (T) this;
-        }
-        return getWriteDataSource().unwrap(iface);
-    }
-
-    @Override
-    public boolean isWrapperFor(Class<?> iface) throws SQLException {
-        return (iface.isInstance(this) || getWriteDataSource().isWrapperFor(iface));
-    }
-
-    /**
-     * Implementation of JDBC 4.1's getParentLogger method
-     */
-    @Override
-    public java.util.logging.Logger getParentLogger() {
-        return java.util.logging.Logger.getLogger(java.util.logging.Logger.GLOBAL_LOGGER_NAME);
-    }
-
-    public void setDefaultAutoCommit(boolean defaultAutoCommit) {
-        this.defaultAutoCommit = defaultAutoCommit;
-    }
-
-    public void setDefaultTransactionIsolation(int defaultTransactionIsolation) {
-        this.defaultTransactionIsolation = defaultTransactionIsolation;
-    }
-
-    /**
-     * Check the default connection properties (auto-commit, transaction isolation),
-     * keeping them to be able to expose them correctly without fetching an actual
-     * JDBC Connection from the target DataSource.
-     * <p>This will be invoked once on startup, but also for each retrieval of a
-     * target Connection. If the check failed on startup (because the database was
-     * down), we'll lazily retrieve those settings.
-     *
-     * @param con the Connection to use for checking
-     * @throws SQLException if thrown by Connection methods
-     */
-    protected synchronized void checkDefaultConnectionProperties(Connection con) throws SQLException {
-        if (this.defaultAutoCommit == null) {
-            this.defaultAutoCommit = con.getAutoCommit();
-        }
-        if (this.defaultTransactionIsolation == null) {
-            this.defaultTransactionIsolation = con.getTransactionIsolation();
-        }
-    }
-
-    /**
-     * Expose the default auto-commit value.
-     */
-    public Boolean defaultAutoCommit() {
-        return this.defaultAutoCommit;
-    }
-
-    /**
-     * Expose the default transaction isolation value.
-     */
-    public Integer defaultTransactionIsolation() {
-        return this.defaultTransactionIsolation;
-    }
-
-    @Override
-    public Connection getConnection() throws SQLException {
-        return (Connection) Proxy.newProxyInstance(ReplicationConnectionProxy.class.getClassLoader(),
-            new Class<?>[]{ReplicationConnectionProxy.class}, new JdbcConnectionInvocationHandler());
-    }
-
-    @Override
-    public Connection getConnection(String username, String password) throws SQLException {
-        return (Connection) Proxy.newProxyInstance(ReplicationConnectionProxy.class.getClassLoader(),
-            new Class<?>[]{ReplicationConnectionProxy.class}, new JdbcConnectionInvocationHandler(username, password));
-    }
-
-    private static interface ReplicationConnectionProxy extends Connection {
-
-        Connection gettargetConnection();
-    }
-
-    /**
-     * Invocation handler that defers fetching an actual JDBC Connection
-     * until first creation of a Statement.
-     */
-    private class JdbcConnectionInvocationHandler implements InvocationHandler {
-
-        private String username;
-
-        private String password;
-
-        private Boolean readOnly = Boolean.FALSE;
-
-        private Integer transactionIsolation;
-
-        private Boolean autoCommit;
-
-        private boolean closed = false;
-
-        private Connection targetConnection;
-
-        public JdbcConnectionInvocationHandler() {
-            this.autoCommit = defaultAutoCommit();
-            this.transactionIsolation = defaultTransactionIsolation();
-        }
-
-        public JdbcConnectionInvocationHandler(String username, String password) {
-            this();
-            this.username = username;
-            this.password = password;
-        }
-
-        @Override
-        public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-            // Invocation on ReplicationConnectionProxy interface coming in...
-            if (method.getName().equals("equals")) {
-                // We must avoid fetching a target Connection for "equals".
-                // Only consider equal when proxies are identical.
-                return (proxy == args[0]);
-            } else if (method.getName().equals("hashCode")) {
-                // We must avoid fetching a target Connection for "hashCode",
-                // and we must return the same hash code even when the target
-                // Connection has been fetched: use hashCode of Connection proxy.
-                return System.identityHashCode(proxy);
-            } else if (method.getName().equals("unwrap")) {
-                if (((Class<?>) args[0]).isInstance(proxy)) {
-                    return proxy;
-                }
-            } else if (method.getName().equals("isWrapperFor")) {
-                if (((Class<?>) args[0]).isInstance(proxy)) {
-                    return true;
-                }
-            } else if (method.getName().equals("gettargetConnection")) {
-                // Handle gettargetConnection method: return underlying connection.
-                return getTargetConnection(method);
-            }
-            if (!hasTargetConnection()) {
-                // No physical target Connection kept yet ->
-                // resolve transaction demarcation methods without fetching
-                // a physical JDBC Connection until absolutely necessary.
-                if (method.getName().equals("toString")) {
-                    return "Lazy Connection proxy for target write DataSource  [" + getWriteDataSource() + "] and target read DataSource [" + getReadDataSource() + "]";
-                } else if (method.getName().equals("isReadOnly")) {
-                    return this.readOnly;
-                } else if (method.getName().equals("setReadOnly")) {
-                    this.readOnly = (Boolean) args[0];
-                    return null;
-                } else if (method.getName().equals("getTransactionIsolation")) {
-                    if (this.transactionIsolation != null) {
-                        return this.transactionIsolation;
-                    }
-                    // Else fetch actual Connection and check there,
-                    // because we didn't have a default specified.
-                } else if (method.getName().equals("setTransactionIsolation")) {
-                    this.transactionIsolation = (Integer) args[0];
-                    return null;
-                } else if (method.getName().equals("getAutoCommit")) {
-                    if (this.autoCommit != null) {
-                        return this.autoCommit;
-                    }
-                    // Else fetch actual Connection and check there,
-                    // because we didn't have a default specified.
-                } else if (method.getName().equals("setAutoCommit")) {
-                    this.autoCommit = (Boolean) args[0];
-                    return null;
-                } else if (method.getName().equals("commit")) {
-                    // Ignore: no statements created yet.
-                    return null;
-                } else if (method.getName().equals("rollback")) {
-                    // Ignore: no statements created yet.
-                    return null;
-                } else if (method.getName().equals("getWarnings")) {
-                    return null;
-                } else if (method.getName().equals("clearWarnings")) {
-                    return null;
-                } else if (method.getName().equals("close")) {
-                    // Ignore: no target connection yet.
-                    this.closed = true;
-                    return null;
-                } else if (method.getName().equals("isClosed")) {
-                    return this.closed;
-                } else if (this.closed) {
-                    // Connection proxy closed, without ever having fetched a
-                    // physical JDBC Connection: throw corresponding SQLException.
-                    throw new SQLException("Illegal operation: connection is closed");
-                }
-            }
-            // Target Connection already fetched,
-            // or target Connection necessary for current operation ->
-            // invoke method on target connection.
-            try {
-                return method.invoke(getTargetConnection(method), args);
-            } catch (InvocationTargetException ex) {
-                throw ex.getTargetException();
-            }
-        }
-
-        /**
-         * Return whether the proxy currently holds a target Connection.
-         */
-        private boolean hasTargetConnection() {
-            return (this.targetConnection != null);
-        }
-
-        /**
-         * Return the target Connection, fetching it and initializing it if necessary.
-         */
-        private Connection getTargetConnection(Method operation) throws SQLException {
-            if (this.targetConnection == null) {
-                log.debug("Connecting to database for operation" + operation.getName());
-
-                log.debug("current readOnly : " + readOnly);
-                DataSource targetDataSource = Boolean.TRUE.equals(readOnly) ? getReadDataSource() : getWriteDataSource();
-
-                // Fetch physical Connection from DataSource.
-                this.targetConnection = (this.username != null) ?
-                    targetDataSource.getConnection(this.username, this.password) :
-                    targetDataSource.getConnection();
-
-                // If we still lack default connection properties, check them now.
-                checkDefaultConnectionProperties(this.targetConnection);
-
-                // Apply kept transaction settings, if any.
-                if (this.readOnly) {
-                    try {
-                        this.targetConnection.setReadOnly(this.readOnly);
-                    } catch (Exception ex) {
-                        // "read-only not supported" -> ignore, it's just a hint anyway
-                        log.error("Could not set JDBC Connection read-only", ex);
-                    }
-                }
-                if (this.transactionIsolation != null &&
-                    !this.transactionIsolation.equals(defaultTransactionIsolation())) {
-                    this.targetConnection.setTransactionIsolation(this.transactionIsolation);
-                }
-                if (this.autoCommit != null && this.autoCommit != this.targetConnection.getAutoCommit()) {
-                    this.targetConnection.setAutoCommit(this.autoCommit);
-                }
-            } else {
-                log.debug("Using existing database connection for operation " + operation.getName());
-            }
-            return this.targetConnection;
-        }
-    }
-}

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/shards/package-info.java

@@ -1,4 +0,0 @@
-/**
- * 分表分库,主从库读写分离等相关类
- */
-package com.baomidou.mybatisplus.shards;

mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/h2/shards/RWTest.java

@@ -1,91 +0,0 @@
-package com.baomidou.mybatisplus.test.h2.shards;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-
-import javax.sql.DataSource;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
-import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
-
-import com.baomidou.mybatisplus.shards.RWDataSourceProxy;
-
-
-/**
- * <p>
- * 主从读写分离测试
- * </p>
- *
- * @author hubin
- * @since 2018-01-23
- */
-public class RWTest {
-
-    private static DataSource replicationDataSource;
-
-
-    @BeforeClass
-    public static void setUpClass() throws Exception {
-        DataSource writeDataSource = new EmbeddedDatabaseBuilder()
-            .setName("writeDb")
-            .setType(EmbeddedDatabaseType.H2)
-            .setScriptEncoding("UTF-8")
-            .addScript("classpath:/h2/rw_write.sql").build();
-
-        DataSource readDataSource = new EmbeddedDatabaseBuilder()
-            .setName("readDb")
-            .setType(EmbeddedDatabaseType.H2)
-            .setScriptEncoding("UTF-8")
-            .addScript("classpath:/h2/rw_read.sql").build();
-        replicationDataSource = new RWDataSourceProxy(writeDataSource, readDataSource);
-    }
-
-    public String queryName(Connection connection, Integer id) throws Exception {
-        PreparedStatement statement = connection.prepareStatement("select * from user where id = ?");
-        statement.setInt(1, id);
-        ResultSet resultSet = statement.executeQuery();
-        resultSet.next();
-        String name = resultSet.getString("name");
-        resultSet.close();
-        statement.close();
-        return name;
-    }
-
-    @Test
-    public void fromRead() throws Exception {
-        Connection connection = replicationDataSource.getConnection();
-        connection.setReadOnly(true);
-
-        String name = queryName(connection, 1);
-        assertThat(name).isEqualTo("read_1");
-        connection.close();
-    }
-
-    @Test
-    public void fromWrite() throws Exception {
-        Connection connection = replicationDataSource.getConnection();
-        connection.setReadOnly(false);
-
-        String name = queryName(connection, 3);
-        assertThat(name).isEqualTo("write_3");
-        connection.close();
-    }
-
-    @Test
-    public void read_write_switch_fail() throws Exception {
-        Connection connection = replicationDataSource.getConnection();
-        connection.setReadOnly(false);
-        String readOnlyFalseName = queryName(connection, 1);
-        assertThat(readOnlyFalseName).isEqualTo("write_1");
-
-        connection.setReadOnly(true);
-        String readOnlyTrueName = queryName(connection, 2);
-        assertThat(readOnlyTrueName).as("If connection reused, readOnly configuration follows the first setReadOnly value.").isEqualTo("write_2");
-        connection.close();
-    }
-}

mybatis-plus-core/src/test/resources/h2/rw_read.sql

@@ -1,7 +0,0 @@
-CREATE TABLE user (
-  id INTEGER AUTO_INCREMENT,
-  name varchar(25) NOT NULL,
-  PRIMARY KEY(id)
-);
-
-insert into user (name) values ('read_1'), ('read_2'), ('read_3');

mybatis-plus-core/src/test/resources/h2/rw_write.sql

@@ -1,7 +0,0 @@
-CREATE TABLE user (
-  id INTEGER AUTO_INCREMENT,
-  name varchar(25) NOT NULL,
-  PRIMARY KEY(id)
-);
-
-insert into user (name) values ('write_1'), ('write_2'), ('write_3');