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 533f0389ad71bd5b5162ddedda0a0da947f062cb..d645e475ef9e67a4402e2ff791e749e901f4220d 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 List filterToList(Iterable data, Function mapper, Predicate predicate) { - return filter(data, mapper, predicate, Function.identity(), Collectors.toList()); - } - public static List filterToList(Iterable data, Predicate predicate, Function mapper) { - return filter(data, Function.identity(), predicate, mapper, Collectors.toList()); + return filter(data, predicate, mapper, Collectors.toList()); } public static Set filterToSet(Iterable data, Predicate predicate) { return filterToSet(data, predicate, Function.identity()); } - public static Set filterToSet(Iterable data, Function mapper, Predicate predicate) { - return filter(data, mapper, predicate, Function.identity(), Collectors.toSet()); - } - public static Set filterToSet(Iterable data, Predicate predicate, Function mapper) { - return filter(data, Function.identity(), predicate, mapper, Collectors.toSet()); + return filter(data, predicate, mapper, Collectors.toSet()); } - public static R filter(Iterable data, Function keyMapper, Predicate predicate, Function valueMapper, Collector collector) { - return from(data).map(keyMapper).filter(predicate).map(valueMapper).collect(collector); + public static R filter(Iterable data, Predicate predicate, Function valueMapper, Collector collector) { + return from(data).filter(predicate).map(valueMapper).collect(collector); } public static List toList(Iterable data, Function 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 bc325c5408837197980c0c3b31ce1ae40f041740..5b66c88bbb655ee0390012f2f8818c83c88c4f14 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 String getColumnName(SFunction column) { - LambdaQueryWrapperExt query = new LambdaQueryWrapperExt<>(); - return query.columnToString(column); + return new LambdaQueryWrapperExt().columnToString(column); } /**