From a49a0139783efbe2bfcb9b5ee7c734be4cc97186 Mon Sep 17 00:00:00 2001
From: VampireAchao <achao1441470436@gmail.com>
Date: Sun, 18 Sep 2022 18:00:15 +0800
Subject: [PATCH] =?UTF-8?q?:trollface:=20=E4=BC=98=E5=8C=96EasyStream?=
 =?UTF-8?q?=E4=B8=ADtoTree=E5=AF=B9predicate=E7=9A=84=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/hutool/core/stream/EasyStream.java    | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/hutool-core/src/main/java/cn/hutool/core/stream/EasyStream.java b/hutool-core/src/main/java/cn/hutool/core/stream/EasyStream.java
index 90de48122..dd60d5e13 100644
--- a/hutool-core/src/main/java/cn/hutool/core/stream/EasyStream.java
+++ b/hutool-core/src/main/java/cn/hutool/core/stream/EasyStream.java
@@ -1,6 +1,7 @@
 package cn.hutool.core.stream;
 
 import cn.hutool.core.lang.Opt;
+import cn.hutool.core.lang.func.SerFunction;
 import cn.hutool.core.lang.mutable.MutableObj;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjUtil;
@@ -307,17 +308,13 @@ public class EasyStream<T> extends AbstractEnhancedWrappedStream<T, EasyStream<T
 	 */
 
 	public <R extends Comparable<R>> List<T> toTree(
-		final Function<T, R> idGetter,
-		final Function<T, R> pIdGetter,
-		final BiConsumer<T, List<T>> childrenSetter,
-		final Predicate<T> parentPredicate) {
+			final Function<T, R> idGetter,
+			final Function<T, R> pIdGetter,
+			final BiConsumer<T, List<T>> childrenSetter,
+			final SerFunction<T, Boolean> parentPredicate) {
 		Objects.requireNonNull(parentPredicate);
 		final List<T> list = toList();
-		final List<T> parents = EasyStream.of(list).filter(e ->
-						// 此处是为了适配 parentPredicate.test空指针 情况
-						// 因为Predicate.test的返回值是boolean，所以如果 e -> null 这种返回null的情况，会直接抛出NPE
-						Opt.ofTry(() -> parentPredicate.test(e)).filter(Boolean::booleanValue).isPresent())
-				.toList();
+		final List<T> parents = EasyStream.of(list).filter(e -> Boolean.TRUE.equals(parentPredicate.apply(e))).toList();
 		return getChildrenFromMapByPidAndSet(idGetter, childrenSetter, EasyStream.of(list).group(pIdGetter), parents);
 	}