移除多此一举的改动

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

@@ -19,8 +19,8 @@ import com.baomidou.mybatisplus.core.toolkit.Assert;
 import com.baomidou.mybatisplus.core.toolkit.ExceptionUtils;
 import com.baomidou.mybatisplus.core.toolkit.LambdaUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.baomidou.mybatisplus.core.toolkit.support.lambda.SFunction;
-import com.baomidou.mybatisplus.core.toolkit.support.lambda.SerializedLambda;
+import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
+import com.baomidou.mybatisplus.core.toolkit.support.SerializedLambda;
 
 import java.util.Map;
 import java.util.Optional;

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

@@ -20,7 +20,7 @@ import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
 import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
 import com.baomidou.mybatisplus.core.toolkit.ArrayUtils;
 import com.baomidou.mybatisplus.core.toolkit.TableInfoHelper;
-import com.baomidou.mybatisplus.core.toolkit.support.lambda.SFunction;
+import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;

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

@@ -20,7 +20,7 @@ import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.sql.SqlUtils;
-import com.baomidou.mybatisplus.core.toolkit.support.lambda.SFunction;
+import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -17,8 +17,8 @@
 package com.baomidou.mybatisplus.core.toolkit;
 
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
-import com.baomidou.mybatisplus.core.toolkit.support.lambda.SFunction;
-import com.baomidou.mybatisplus.core.toolkit.support.lambda.SerializedLambda;
+import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
+import com.baomidou.mybatisplus.core.toolkit.support.SerializedLambda;
 
 import java.lang.ref.WeakReference;
 import java.util.HashMap;

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/support/lambda/SFunction.java → mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/support/SFunction.java

@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.baomidou.mybatisplus.core.toolkit.support.lambda;
+package com.baomidou.mybatisplus.core.toolkit.support;
 
-import java.util.function.Function;
+import java.io.Serializable;
 
 /**
  * 支持序列化的 Function
@@ -24,5 +24,14 @@ import java.util.function.Function;
  * @author miemie
  * @since 2018-05-12
  */
-public interface SFunction<T, R> extends SerializableLambda, Function<T, R> {
+@FunctionalInterface
+public interface SFunction<T, R> extends Serializable {
+
+    /**
+     * Applies this function to the given argument.
+     *
+     * @param t the function argument
+     * @return the function result
+     */
+    R apply(T t);
 }

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/support/lambda/SerializedLambda.java → mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/support/SerializedLambda.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.baomidou.mybatisplus.core.toolkit.support.lambda;
+package com.baomidou.mybatisplus.core.toolkit.support;
 
 import com.baomidou.mybatisplus.core.toolkit.ClassUtils;
 import com.baomidou.mybatisplus.core.toolkit.ExceptionUtils;
@@ -53,7 +53,7 @@ public class SerializedLambda implements Serializable {
      * @param lambda lambda对象
      * @return 返回解析后的 SerializedLambda
      */
-    public static SerializedLambda resolve(SerializableLambda lambda) {
+    public static SerializedLambda resolve(SFunction lambda) {
         if (!lambda.getClass().isSynthetic()) {
             throw ExceptionUtils.mpe("该方法仅能传入 lambda 表达式产生的合成类");
         }

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/support/lambda/SerializableLambda.java

@@ -1,13 +0,0 @@
-package com.baomidou.mybatisplus.core.toolkit.support.lambda;
-
-import java.io.Serializable;
-
-/**
- * 一个序列化标志接口，起着接口占位符的作用，主要用于传递可序列化的 lambda 表达式
- * 实现该接口可用于快速的实现 lambda 序列化
- *
- * @author HCL
- * Create at 2018/10/17
- */
-public interface SerializableLambda extends Serializable {
-}

mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/core/toolkit/LambdaUtilsTest.java

@@ -1,7 +1,7 @@
 package com.baomidou.mybatisplus.core.toolkit;
 
-import com.baomidou.mybatisplus.core.toolkit.support.lambda.SFunction;
-import com.baomidou.mybatisplus.core.toolkit.support.lambda.SerializedLambda;
+import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
+import com.baomidou.mybatisplus.core.toolkit.support.SerializedLambda;
 import lombok.Getter;
 import org.junit.Assert;
 import org.junit.Test;