只差 cto 的那个类没优化抛异常的过程了

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/metadata/TableInfo.java

@@ -19,7 +19,7 @@ import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.core.config.GlobalConfig;
-import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
+import com.baomidou.mybatisplus.core.toolkit.Assert;
 import com.baomidou.mybatisplus.core.toolkit.ExceptionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import lombok.Data;
@@ -138,9 +138,7 @@ public class TableInfo {
     }
 
     public void setConfigMark(Configuration configuration) {
-        if (configuration == null) {
-            throw new MybatisPlusException("Error: You need Initialize MybatisConfiguration !");
-        }
+        Assert.notNull(configuration, "Error: You need Initialize MybatisConfiguration !");
         this.configMark = configuration.toString();
     }
 

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

@@ -75,7 +75,6 @@ public final class ClassUtils {
      *
      * @param object 对象
      * @return 返回对象的 user class
-     * @throws com.baomidou.mybatisplus.core.exceptions.MybatisPlusException 传入对象为 null 是抛出异常
      */
     public static Class<?> getUserClass(Object object) {
         Assert.notNull(object, "Error: Instance must not be null");

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

@@ -15,9 +15,9 @@
  */
 package com.baomidou.mybatisplus.core.toolkit;
 
-import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
 import com.baomidou.mybatisplus.core.toolkit.sql.StringEscape;
 
+import java.nio.charset.StandardCharsets;
 import java.sql.Blob;
 import java.util.*;
 import java.util.regex.Pattern;
@@ -34,11 +34,6 @@ import static java.util.stream.Collectors.joining;
  */
 public class StringUtils {
 
-    /**
-     * UTF-8 编码格式
-     */
-    public static final String UTF8 = "UTF-8";
-
     /**
      * 空字符
      */
@@ -74,9 +69,9 @@ public class StringUtils {
         if (null != blob) {
             try {
                 byte[] returnValue = blob.getBytes(1, (int) blob.length());
-                return new String(returnValue, UTF8);
+                return new String(returnValue, StandardCharsets.UTF_8);
             } catch (Exception e) {
-                throw new MybatisPlusException("Blob Convert To String Error!");
+                throw ExceptionUtils.mpe("Blob Convert To String Error!");
             }
         }
         return null;

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

@@ -16,7 +16,7 @@
 package com.baomidou.mybatisplus.core.toolkit.sql;
 
 import com.baomidou.mybatisplus.core.enums.SqlLike;
-import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
+import com.baomidou.mybatisplus.core.toolkit.Assert;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 
 /**
@@ -85,9 +85,7 @@ public class SqlUtils {
      * @return this
      */
     public static String stripSqlInjection(String sql) {
-        if (null == sql) {
-            throw new MybatisPlusException("strip sql is null.");
-        }
+        Assert.notNull(sql, "strip sql is null.");
         return sql.replaceAll("('.+--)|(--)|(\\|)|(%7C)", StringPool.EMPTY);
     }
 }

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

@@ -15,12 +15,10 @@
  */
 package com.baomidou.mybatisplus.extension.plugins.tenant;
 
-import java.util.List;
-
-import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
 import com.baomidou.mybatisplus.core.parser.AbstractJsqlParser;
+import com.baomidou.mybatisplus.core.toolkit.Assert;
+import com.baomidou.mybatisplus.core.toolkit.ExceptionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
-
 import net.sf.jsqlparser.expression.BinaryExpression;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.operators.conditional.AndExpression;
@@ -32,19 +30,11 @@ import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.delete.Delete;
 import net.sf.jsqlparser.statement.insert.Insert;
-import net.sf.jsqlparser.statement.select.FromItem;
-import net.sf.jsqlparser.statement.select.Join;
-import net.sf.jsqlparser.statement.select.LateralSubSelect;
-import net.sf.jsqlparser.statement.select.PlainSelect;
-import net.sf.jsqlparser.statement.select.SelectBody;
-import net.sf.jsqlparser.statement.select.SelectExpressionItem;
-import net.sf.jsqlparser.statement.select.SetOperationList;
-import net.sf.jsqlparser.statement.select.SubJoin;
-import net.sf.jsqlparser.statement.select.SubSelect;
-import net.sf.jsqlparser.statement.select.ValuesList;
-import net.sf.jsqlparser.statement.select.WithItem;
+import net.sf.jsqlparser.statement.select.*;
 import net.sf.jsqlparser.statement.update.Update;
 
+import java.util.List;
+
 /**
  * <p>
  * 租户 SQL 解析器（ TenantId 行级 ）
@@ -100,7 +90,7 @@ public class TenantSqlParser extends AbstractJsqlParser {
                 ((ExpressionList) insert.getItemsList()).getExpressions().add(tenantHandler.getTenantId());
             }
         } else {
-            throw new MybatisPlusException("Failed to process multiple-table update, please exclude the tableName or statementId");
+            throw ExceptionUtils.mpe("Failed to process multiple-table update, please exclude the tableName or statementId");
         }
     }
 
@@ -112,9 +102,8 @@ public class TenantSqlParser extends AbstractJsqlParser {
     @Override
     public void processUpdate(Update update) {
         List<Table> tableList = update.getTables();
-        if (null == tableList || tableList.size() >= 2) {
-            throw new MybatisPlusException("Failed to process multiple-table update, please exclude the statementId");
-        }
+        Assert.isTrue(null != tableList && tableList.size() < 2,
+            "Failed to process multiple-table update, please exclude the statementId");
         Table table = tableList.get(0);
         if (this.tenantHandler.doTableFilter(table.getName())) {
             // 过滤退出执行

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/toolkit/VersionUtils.java

@@ -1,6 +1,6 @@
 package com.baomidou.mybatisplus.extension.toolkit;
 
-import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
+import com.baomidou.mybatisplus.core.toolkit.Assert;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 
 /**
@@ -21,9 +21,8 @@ public class VersionUtils {
      * @return
      */
     public static int compareVersion(String version1, String version2) {
-        if (StringUtils.isEmpty(version1) || StringUtils.isEmpty(version2)) {
-            throw new MybatisPlusException("Error: CompareVersion Error: Illegal Argument !");
-        }
+        Assert.isTrue(!StringUtils.isEmpty(version1) && !StringUtils.isEmpty(version2),
+            "Error: CompareVersion Error: Illegal Argument !");
         // 切割点 "."；
         String[] versionArray1 = version1.split("\\.");
         String[] versionArray2 = version2.split("\\.");