From a631f7e9159607685cb95babe34b9f45597ad90e Mon Sep 17 00:00:00 2001 From: emptypoint <1215582715@qq.com> Date: Sun, 27 Nov 2022 13:09:22 +0000 Subject: [PATCH 1/3] Update hutool-core/src/main/java/cn/hutool/core/tree/BeanTree.java --- hutool-core/src/main/java/cn/hutool/core/tree/BeanTree.java | 1 + 1 file changed, 1 insertion(+) diff --git a/hutool-core/src/main/java/cn/hutool/core/tree/BeanTree.java b/hutool-core/src/main/java/cn/hutool/core/tree/BeanTree.java index 60eaf9aa0..1e1346a75 100644 --- a/hutool-core/src/main/java/cn/hutool/core/tree/BeanTree.java +++ b/hutool-core/src/main/java/cn/hutool/core/tree/BeanTree.java @@ -146,6 +146,7 @@ public class BeanTree> { /** * 将树扁平化为集合，相当于将树里的所有节点都放到一个集合里 + *

本方法会主动将节点的子集合字段置为null

* * @param tree 树 * @return 集合 From d5879a0abd80caf6efffe9dd286d3f4ece2da476 Mon Sep 17 00:00:00 2001 From: emptypoint <1215582715@qq.com> Date: Sun, 27 Nov 2022 14:31:00 +0000 Subject: [PATCH 2/3] Update hutool-core/src/main/java/cn/hutool/core/tree/BeanTree.java --- hutool-core/src/main/java/cn/hutool/core/tree/BeanTree.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/tree/BeanTree.java b/hutool-core/src/main/java/cn/hutool/core/tree/BeanTree.java index 1e1346a75..64905eb4c 100644 --- a/hutool-core/src/main/java/cn/hutool/core/tree/BeanTree.java +++ b/hutool-core/src/main/java/cn/hutool/core/tree/BeanTree.java @@ -126,8 +126,7 @@ public class BeanTree> { public List toTree(final List list) { if (Objects.isNull(parentPredicate)) { final Map> pIdValuesMap = EasyStream.of(list) - .peek(e -> Objects.requireNonNull(idGetter.apply(e), - () -> StrUtil.format("primary key {} must not null", LambdaUtil.getFieldName(idGetter)) + .peek(e -> Objects.requireNonNull(idGetter.apply(e), "The id of tree node must not be null") )).group(pidGetter); final List parents = pIdValuesMap.getOrDefault(pidValue, new ArrayList<>()); findChildren(list, pIdValuesMap); From 0660c75057bc461478a3fc7479d9346ff4ac21e3 Mon Sep 17 00:00:00 2001 From: emptypoint <1215582715@qq.com> Date: Sun, 27 Nov 2022 14:31:11 +0000 Subject: [PATCH 3/3] Update hutool-core/src/main/java/cn/hutool/core/tree/BeanTree.java --- hutool-core/src/main/java/cn/hutool/core/tree/BeanTree.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/tree/BeanTree.java b/hutool-core/src/main/java/cn/hutool/core/tree/BeanTree.java index 64905eb4c..df703bb4e 100644 --- a/hutool-core/src/main/java/cn/hutool/core/tree/BeanTree.java +++ b/hutool-core/src/main/java/cn/hutool/core/tree/BeanTree.java @@ -132,7 +132,7 @@ public class BeanTree> { findChildren(list, pIdValuesMap); return parents; } - final List parents = new ArrayList<>(list.size()); + final List parents = new ArrayList<>(); final Map> pIdValuesMap = EasyStream.of(list).peek(e -> { if (parentPredicate.test(e)) { parents.add(e);