ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

:trollface: Apply all suggestions from code review

Browse Source
This commit is contained in:
VampireAchao 2022-11-27 22:36:17 +08:00
parent 24c066db43
commit bd9439922e
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hutool-core/src/main/java/cn/hutool/core/tree/BeanTree.java
View File

@ -1,6 +1,5 @@
package cn.hutool.core.tree; package cn.hutool.core.tree;
import cn.hutool.core.exceptions.UtilException;
import cn.hutool.core.lang.Opt; import cn.hutool.core.lang.Opt;
import cn.hutool.core.lang.func.*; import cn.hutool.core.lang.func.*;
import cn.hutool.core.stream.EasyStream; import cn.hutool.core.stream.EasyStream;
@ -67,12 +66,9 @@ public class BeanTree<T, R extends Comparable<R>> {
final SerFunction<T, List<T>> childrenGetter, final SerFunction<T, List<T>> childrenGetter,
final SerBiConsumer<T, List<T>> childrenSetter) { final SerBiConsumer<T, List<T>> childrenSetter) {
this.idGetter = Objects.requireNonNull(idGetter, "idGetter must not be null"); this.idGetter = Objects.requireNonNull(idGetter, "idGetter must not be null");
this.pidGetter = pidGetter; this.pidGetter = Objects.requireNonNull(pidGetter, "pidGetter must not be null");
this.pidValue = pidValue; this.pidValue = pidValue;
this.parentPredicate = parentPredicate; this.parentPredicate = parentPredicate;
if (Objects.isNull(pidGetter) && Objects.isNull(parentPredicate)) {
throw new UtilException("pidGetter and parentPredicate can not be null at the same time");
}
this.childrenGetter = Objects.requireNonNull(childrenGetter, "childrenGetter must not be null"); this.childrenGetter = Objects.requireNonNull(childrenGetter, "childrenGetter must not be null");
this.childrenSetter = Objects.requireNonNull(childrenSetter, "childrenSetter must not be null"); this.childrenSetter = Objects.requireNonNull(childrenSetter, "childrenSetter must not be null");
} }
@ -114,7 +110,7 @@ public class BeanTree<T, R extends Comparable<R>> {
final SerPredicate<T> parentPredicate, final SerPredicate<T> parentPredicate,
final SerFunction<T, List<T>> childrenGetter, final SerFunction<T, List<T>> childrenGetter,
final SerBiConsumer<T, List<T>> childrenSetter) { final SerBiConsumer<T, List<T>> childrenSetter) {
return new BeanTree<>(idGetter, pidGetter, null, parentPredicate, childrenGetter, childrenSetter); return new BeanTree<>(idGetter, pidGetter, null, Objects.requireNonNull(parentPredicate, "parentPredicate must not be null"), childrenGetter, childrenSetter);
} }
/** /**