From 6c997c1959e60659319238230a45e1f9989f371c Mon Sep 17 00:00:00 2001
From: liaozan <378024053@qq.com>
Date: Mon, 4 Sep 2023 21:03:13 +0800
Subject: [PATCH] Polish

---
 .../com/schbrain/common/util/StreamUtils.java    | 16 ++++------------
 .../autoconfigure/mybatis/util/LambdaUtils.java  |  3 +--
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/commons/common-util/src/main/java/com/schbrain/common/util/StreamUtils.java b/commons/common-util/src/main/java/com/schbrain/common/util/StreamUtils.java
index 533f038..d645e47 100644
--- a/commons/common-util/src/main/java/com/schbrain/common/util/StreamUtils.java
+++ b/commons/common-util/src/main/java/com/schbrain/common/util/StreamUtils.java
@@ -29,28 +29,20 @@ public class StreamUtils {
         return filterToList(data, predicate, Function.identity());
     }
 
-    public static <T, V> List<V> filterToList(Iterable<T> data, Function<T, V> mapper, Predicate<V> predicate) {
-        return filter(data, mapper, predicate, Function.identity(), Collectors.toList());
-    }
-
     public static <T, V> List<V> filterToList(Iterable<T> data, Predicate<T> predicate, Function<T, V> mapper) {
-        return filter(data, Function.identity(), predicate, mapper, Collectors.toList());
+        return filter(data, predicate, mapper, Collectors.toList());
     }
 
     public static <T> Set<T> filterToSet(Iterable<T> data, Predicate<T> predicate) {
         return filterToSet(data, predicate, Function.identity());
     }
 
-    public static <T, V> Set<V> filterToSet(Iterable<T> data, Function<T, V> mapper, Predicate<V> predicate) {
-        return filter(data, mapper, predicate, Function.identity(), Collectors.toSet());
-    }
-
     public static <T, V> Set<V> filterToSet(Iterable<T> data, Predicate<T> predicate, Function<T, V> mapper) {
-        return filter(data, Function.identity(), predicate, mapper, Collectors.toSet());
+        return filter(data, predicate, mapper, Collectors.toSet());
     }
 
-    public static <T, E, V, R> R filter(Iterable<T> data, Function<T, E> keyMapper, Predicate<E> predicate, Function<E, V> valueMapper, Collector<V, ?, R> collector) {
-        return from(data).map(keyMapper).filter(predicate).map(valueMapper).collect(collector);
+    public static <T, E, V, R> R filter(Iterable<T> data, Predicate<T> predicate, Function<T, V> valueMapper, Collector<V, ?, R> collector) {
+        return from(data).filter(predicate).map(valueMapper).collect(collector);
     }
 
     public static <T, E> List<E> toList(Iterable<T> data, Function<T, E> keyMapper) {
diff --git a/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/util/LambdaUtils.java b/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/util/LambdaUtils.java
index bc325c5..5b66c88 100644
--- a/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/util/LambdaUtils.java
+++ b/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/util/LambdaUtils.java
@@ -10,8 +10,7 @@ import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 public class LambdaUtils {
 
     public static <T> String getColumnName(SFunction<T, ?> column) {
-        LambdaQueryWrapperExt<T> query = new LambdaQueryWrapperExt<>();
-        return query.columnToString(column);
+        return new LambdaQueryWrapperExt<T>().columnToString(column);
     }
 
     /**
-- 
GitLab