Merge remote-tracking branch 'origin/3.0' into 3.0

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

@@ -41,9 +41,9 @@ import org.apache.ibatis.type.TypeHandlerRegistry;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.GlobalConfigUtils;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.baomidou.mybatisplus.core.toolkit.MapUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.TableInfoHelper;
 
@@ -261,7 +261,7 @@ public class MybatisDefaultParameterHandler extends DefaultParameterHandler {
                     } else {
                         MetaObject metaObject = configuration.newMetaObject(parameterObject);
                         value = metaObject.getValue(propertyName);
-                        if (value == null && MapUtils.isNotEmpty(additionalParameters)) {
+                        if (value == null && CollectionUtils.isNotEmpty(additionalParameters)) {
                             // issue #138
                             value = additionalParameters.get(propertyName);
                         }

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/AbstractLambdaWrapper.java

@@ -20,8 +20,8 @@ import java.util.Map;
 import java.util.Optional;
 
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.LambdaUtils;
-import com.baomidou.mybatisplus.core.toolkit.MapUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.support.Property;
 import com.baomidou.mybatisplus.core.toolkit.support.SerializedLambda;
@@ -50,7 +50,7 @@ public abstract class AbstractLambdaWrapper<T, This extends AbstractLambdaWrappe
         if (!initColumnMap) {
             String entityClassName = lambda.getImplClass().replace("/", ".");
             columnMap = LambdaUtils.getColumnMap(entityClassName);
-            if (MapUtils.isEmpty(columnMap)) {
+            if (CollectionUtils.isEmpty(columnMap)) {
                 throw new MybatisPlusException("该模式不能应用于非 baseMapper 的泛型 entity 之外的 entity!");
             }
             initColumnMap = true;

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

@@ -16,6 +16,7 @@
 package com.baomidou.mybatisplus.core.toolkit;
 
 import java.util.Collection;
+import java.util.Map;
 
 /**
  * <p>
@@ -32,7 +33,7 @@ public class CollectionUtils {
      * 校验集合是否为空
      * </p>
      *
-     * @param coll
+     * @param coll 入参
      * @return boolean
      */
     public static boolean isEmpty(Collection<?> coll) {
@@ -44,11 +45,30 @@ public class CollectionUtils {
      * 校验集合是否不为空
      * </p>
      *
-     * @param coll
+     * @param coll 入参
      * @return boolean
      */
     public static boolean isNotEmpty(Collection<?> coll) {
         return !isEmpty(coll);
     }
 
+    /**
+     * 判断Map是否为空
+     *
+     * @param map 入参
+     * @return boolean
+     */
+    public static boolean isEmpty(Map<?, ?> map) {
+        return (map == null || map.isEmpty());
+    }
+
+    /**
+     * 判断Map是否不为空
+     *
+     * @param map 入参
+     * @return boolean
+     */
+    public static boolean isNotEmpty(Map<?, ?> map) {
+        return !isEmpty(map);
+    }
 }

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

@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * 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.core.toolkit;
-
-import java.util.Map;
-
-/**
- * MapUtils
- *
- * @author Caratacus
- * @since 2016/11/16
- */
-public class MapUtils {
-
-    /**
-     * 判断Map是否为空
-     *
-     * @param map
-     * @return
-     */
-    public static boolean isEmpty(Map<?, ?> map) {
-        return (map == null || map.isEmpty());
-    }
-
-    /**
-     * 判断Map是否不为空
-     *
-     * @param map
-     * @return
-     */
-    public static boolean isNotEmpty(Map<?, ?> map) {
-        return !isEmpty(map);
-    }
-
-}

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

@@ -15,16 +15,26 @@
  */
 package com.baomidou.mybatisplus.core.toolkit;
 
-import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
-import org.apache.ibatis.logging.Log;
-import org.apache.ibatis.logging.LogFactory;
-
-import java.lang.reflect.*;
-import java.util.*;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.apache.ibatis.logging.Log;
+import org.apache.ibatis.logging.LogFactory;
+
+import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
+
 /**
  * <p>
  * 反射工具类
@@ -64,7 +74,7 @@ public class ReflectionKit {
     public static Object getMethodValue(Class<?> cls, Object entity, String str) {
         Map<String, Field> fieldMaps = getFieldMap(cls);
         try {
-            if (MapUtils.isEmpty(fieldMaps)) {
+            if (CollectionUtils.isEmpty(fieldMaps)) {
                 throw new MybatisPlusException(
                     String.format("Error: NoSuchField in %s for %s.  Cause:", cls.getSimpleName(), str));
             }