lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2025-05-04 12:47:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly 2022-01-08 18:54:55 +08:00 committed by lsx0310
parent fd021c5f9c
commit 94a57408e9
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -6,8 +6,11 @@
# 5.7.20 (2022-01-08) # 5.7.20 (2022-01-08)
### 🐣新特性 ### 🐣新特性
* 【core 】 增加对null值友好的groupingBy操作的Collector实现，可指定map类型（pr#498@Gitee）
*
### 🐞Bug修复 ### 🐞Bug修复
* 【core 】 修复setter重载导致匹配错误（issue#2082@Github） * 【core 】 修复setter重载导致匹配错误（issue#2082@Github）
* 【core 】 修复RegexPool汉字匹配范围小问题（pr#2081@Github）
------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------
# 5.7.19 (2022-01-07) # 5.7.19 (2022-01-07)

9
hutool-core/src/main/java/cn/hutool/core/collection/CollStreamUtil.java
View File

@ -6,7 +6,14 @@ import cn.hutool.core.map.MapUtil;
import cn.hutool.core.stream.CollectorUtil; import cn.hutool.core.stream.CollectorUtil;
import cn.hutool.core.stream.StreamUtil; import cn.hutool.core.stream.StreamUtil;
import java.util.*; import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.function.BiFunction; import java.util.function.BiFunction;
import java.util.function.Function; import java.util.function.Function;
import java.util.stream.Collector; import java.util.stream.Collector;

9
hutool-core/src/main/java/cn/hutool/core/stream/CollectorUtil.java
View File

@ -1,8 +1,13 @@
package cn.hutool.core.stream; package cn.hutool.core.stream;
import cn.hutool.core.lang.Opt;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import java.util.*; import java.util.Collections;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.Map;
import java.util.StringJoiner;
import java.util.function.BiConsumer; import java.util.function.BiConsumer;
import java.util.function.BinaryOperator; import java.util.function.BinaryOperator;
import java.util.function.Function; import java.util.function.Function;
@ -84,7 +89,7 @@ public class CollectorUtil {
Supplier<A> downstreamSupplier = downstream.supplier(); Supplier<A> downstreamSupplier = downstream.supplier();
BiConsumer<A, ? super T> downstreamAccumulator = downstream.accumulator(); BiConsumer<A, ? super T> downstreamAccumulator = downstream.accumulator();
BiConsumer<Map<K, A>, T> accumulator = (m, t) -> { BiConsumer<Map<K, A>, T> accumulator = (m, t) -> {
K key = Optional.ofNullable(t).map(classifier).orElse(null); K key = Opt.ofNullable(t).map(classifier).orElse(null);
A container = m.computeIfAbsent(key, k -> downstreamSupplier.get()); A container = m.computeIfAbsent(key, k -> downstreamSupplier.get());
downstreamAccumulator.accept(container, t); downstreamAccumulator.accept(container, t);
}; };