再提交部分,优化掉抛异常为使用 assert 或者 exceptionUtils

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/Assert.java

@@ -55,6 +55,7 @@ public final class Assert {
 
     /**
      * 断言这个 object 为 null
+     * 不为 null 则抛异常
      *
      * @param object  对象
      * @param message 消息
@@ -65,6 +66,7 @@ public final class Assert {
 
     /**
      * 断言这个 object 不为 null
+     * 为 null 则抛异常
      *
      * @param object  对象
      * @param message 消息
@@ -74,7 +76,8 @@ public final class Assert {
     }
 
     /**
-     * 断言这个 collection 不为空
+     * 断言这个 collection 不为 empty
+     * 为 empty 则抛异常
      *
      * @param collection 集合
      * @param message    消息
@@ -84,7 +87,8 @@ public final class Assert {
     }
 
     /**
-     * 断言这个 map 不为空
+     * 断言这个 map 不为 empty
+     * 为 empty 则抛异常
      *
      * @param map     集合
      * @param message 消息
@@ -94,7 +98,8 @@ public final class Assert {
     }
 
     /**
-     * 断言数组不能为空
+     * 断言这个 数组 不为 empty
+     * 为 empty 则抛异常
      *
      * @param array   数组
      * @param message 消息

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/sql/SqlHelper.java

@@ -17,7 +17,6 @@ package com.baomidou.mybatisplus.core.toolkit.sql;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.*;
@@ -114,9 +113,7 @@ public class SqlHelper {
      */
     public static TableInfo table(Class<?> clazz) {
         TableInfo tableInfo = TableInfoHelper.getTableInfo(clazz);
-        if (null == tableInfo) {
-            throw new MybatisPlusException("Error: Cannot execute table Method, ClassGenricType not found .");
-        }
+        Assert.notNull(tableInfo, "Error: Cannot execute table Method, ClassGenricType not found .");
         return tableInfo;
     }
 

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/SqlExplainInterceptor.java

@@ -15,11 +15,12 @@
  */
 package com.baomidou.mybatisplus.extension.plugins;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.util.Properties;
-
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.core.toolkit.Assert;
+import com.baomidou.mybatisplus.core.toolkit.ExceptionUtils;
+import com.baomidou.mybatisplus.core.toolkit.GlobalConfigUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.toolkit.VersionUtils;
 import org.apache.ibatis.builder.StaticSqlSource;
 import org.apache.ibatis.executor.Executor;
 import org.apache.ibatis.logging.Log;
@@ -27,19 +28,14 @@ import org.apache.ibatis.logging.LogFactory;
 import org.apache.ibatis.mapping.BoundSql;
 import org.apache.ibatis.mapping.MappedStatement;
 import org.apache.ibatis.mapping.SqlCommandType;
-import org.apache.ibatis.plugin.Interceptor;
-import org.apache.ibatis.plugin.Intercepts;
-import org.apache.ibatis.plugin.Invocation;
-import org.apache.ibatis.plugin.Plugin;
-import org.apache.ibatis.plugin.Signature;
+import org.apache.ibatis.plugin.*;
 import org.apache.ibatis.scripting.defaults.DefaultParameterHandler;
 import org.apache.ibatis.session.Configuration;
 
-import com.baomidou.mybatisplus.annotation.DbType;
-import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
-import com.baomidou.mybatisplus.core.toolkit.GlobalConfigUtils;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.baomidou.mybatisplus.extension.toolkit.VersionUtils;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.Properties;
 
 /**
  * <p>
@@ -118,9 +114,8 @@ public class SqlExplainInterceptor implements Interceptor {
             try (ResultSet rs = stmt.executeQuery()) {
                 while (rs.next()) {
                     if (!"Using where".equals(rs.getString("Extra"))) {
-                        if (this.isStopProceed()) {
-                            throw new MybatisPlusException("Error: Full table operation is prohibited. SQL: " + boundSql.getSql());
-                        }
+                        Assert.isFalse(this.isStopProceed(),
+                            "Error: Full table operation is prohibited. SQL: " + boundSql.getSql());
                         break;
                     }
                 }
@@ -128,7 +123,7 @@ public class SqlExplainInterceptor implements Interceptor {
 
 
         } catch (Exception e) {
-            throw new MybatisPlusException(e);
+            throw ExceptionUtils.mpe(e);
         }
     }