From 5e73333682bf358c36c0b49a2dd6860436cf2ec1 Mon Sep 17 00:00:00 2001
From: Suomm <1474983351@qq.com>
Date: Wed, 26 Jul 2023 17:26:37 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=B0=86=20assertAreNotNull=20?=
 =?UTF-8?q?=E4=BB=8E=20FlexExceptions=20=E7=A7=BB=E5=8A=A8=E5=88=B0=20Flex?=
 =?UTF-8?q?Assert=20=E4=B8=AD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatisflex/core/exception/FlexAssert.java   | 16 +++++++++++++++-
 .../core/provider/EntitySqlProvider.java         |  3 +--
 .../core/provider/RowSqlProvider.java            |  3 +--
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/exception/FlexAssert.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/exception/FlexAssert.java
index 4e313807..a329919a 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/exception/FlexAssert.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/exception/FlexAssert.java
@@ -82,4 +82,18 @@ public final class FlexAssert {
         }
     }
 
-}
\ No newline at end of file
+    /**
+     * 断言传入的数组内容不能为 null 或者 空
+     */
+    public static <T> void assertAreNotNull(T[] elements, String msg, Object params) {
+        if (elements == null || elements.length == 0) {
+            throw FlexExceptions.wrap(msg, params);
+        }
+        for (T element : elements) {
+            if (element == null) {
+                throw FlexExceptions.wrap(msg, params);
+            }
+        }
+    }
+
+}
diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/provider/EntitySqlProvider.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/provider/EntitySqlProvider.java
index fb8dc5a9..4661d83f 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/provider/EntitySqlProvider.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/provider/EntitySqlProvider.java
@@ -18,7 +18,6 @@ package com.mybatisflex.core.provider;
 import com.mybatisflex.core.FlexConsts;
 import com.mybatisflex.core.dialect.DialectFactory;
 import com.mybatisflex.core.exception.FlexAssert;
-import com.mybatisflex.core.exception.FlexExceptions;
 import com.mybatisflex.core.query.CPI;
 import com.mybatisflex.core.query.QueryTable;
 import com.mybatisflex.core.query.QueryWrapper;
@@ -240,7 +239,7 @@ public class EntitySqlProvider {
         Object[] primaryValues = tableInfo.buildPkSqlArgs(entity);
         Object[] tenantIdArgs = tableInfo.buildTenantIdArgs();
 
-        FlexExceptions.assertAreNotNull(primaryValues, "The value of primary key must not be null, entity[%s]", entity);
+        FlexAssert.assertAreNotNull(primaryValues, "The value of primary key must not be null, entity[%s]", entity);
 
         ProviderUtil.setSqlArgs(params, ArrayUtil.concat(updateValues, primaryValues, tenantIdArgs));
 
diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/provider/RowSqlProvider.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/provider/RowSqlProvider.java
index 5f036516..21d7dba6 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/provider/RowSqlProvider.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/provider/RowSqlProvider.java
@@ -18,7 +18,6 @@ package com.mybatisflex.core.provider;
 import com.mybatisflex.core.FlexConsts;
 import com.mybatisflex.core.dialect.DialectFactory;
 import com.mybatisflex.core.exception.FlexAssert;
-import com.mybatisflex.core.exception.FlexExceptions;
 import com.mybatisflex.core.query.CPI;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.mybatisflex.core.row.Row;
@@ -247,7 +246,7 @@ public class RowSqlProvider {
         Object[] primaryValues = tableInfo.buildPkSqlArgs(entity);
         Object[] tenantIdArgs = tableInfo.buildTenantIdArgs();
 
-        FlexExceptions.assertAreNotNull(primaryValues, "The value of primary key must not be null, entity[%s]", entity);
+        FlexAssert.assertAreNotNull(primaryValues, "The value of primary key must not be null, entity[%s]", entity);
 
         ProviderUtil.setSqlArgs(params, ArrayUtil.concat(updateValues, primaryValues, tenantIdArgs));