From 83097d89588441b3958cc2661e9680fc02ca7522 Mon Sep 17 00:00:00 2001
From: liaozan <378024053@qq.com>
Date: Tue, 30 May 2023 02:09:34 +0800
Subject: [PATCH] Rename method arguments

---
 .../com/schbrain/common/util/StreamUtils.java | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 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 ca50849..7562273 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
@@ -44,8 +44,27 @@ public class StreamUtils {
         return toSet(data, mapper, false);
     }
 
-    public static <T, E> Set<E> toSet(Iterable<T> data, Function<T, E> mapper, boolean ignoreNull) {
-        return extract(data, mapper, ignoreNull, false, Collectors.toSet());
+    public static <T, E> Set<E> toSet(Iterable<T> data, Function<T, E> mapper, boolean discardNull) {
+        return extract(data, mapper, discardNull, false, Collectors.toSet());
+    }
+
+    public static <T, E, R> R extract(Iterable<T> data, Function<T, E> mapper, boolean distinct, boolean discardNull, Collector<E, ?, R> collector) {
+        Predicate<E> predicate = null;
+        if (discardNull) {
+            predicate = Objects::nonNull;
+        }
+        return extract(data, mapper, predicate, distinct, collector);
+    }
+
+    public static <T, E, R> R extract(Iterable<T> data, Function<T, E> mapper, Predicate<E> predicate, boolean distinct, Collector<E, ?, R> collector) {
+        Stream<E> stream = from(data).map(mapper);
+        if (distinct) {
+            stream = stream.distinct();
+        }
+        if (predicate != null) {
+            stream = stream.filter(predicate);
+        }
+        return stream.collect(collector);
     }
 
     public static <K, T> Map<K, T> toMap(Iterable<T> data, Function<T, K> keyMapper) {
@@ -128,25 +147,6 @@ public class StreamUtils {
         return from(data).map(toStringFunction).collect(joining(delimiter, prefix, suffix));
     }
 
-    public static <T, E, R> R extract(Iterable<T> data, Function<T, E> mapper, boolean distinct, boolean discardNull, Collector<E, ?, R> collector) {
-        Predicate<E> predicate = null;
-        if (discardNull) {
-            predicate = Objects::nonNull;
-        }
-        return extract(data, mapper, predicate, distinct, collector);
-    }
-
-    public static <T, E, R> R extract(Iterable<T> data, Function<T, E> mapper, Predicate<E> predicate, boolean distinct, Collector<E, ?, R> collector) {
-        Stream<E> stream = from(data).map(mapper);
-        if (distinct) {
-            stream = stream.distinct();
-        }
-        if (predicate != null) {
-            stream = stream.filter(predicate);
-        }
-        return stream.collect(collector);
-    }
-
     public static <T> Stream<T> from(Iterable<T> iterable) {
         return from(iterable, false);
     }
-- 
GitLab