ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-04-19 03:01:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v6-dev' into refactor-stream

Browse Source 
# Conflicts:
#	hutool-core/src/main/java/cn/hutool/core/stream/EasyStream.java
This commit is contained in:
huangchengxing 2022-09-07 09:33:09 +08:00
commit 89c3f3c4bc
2 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hutool-core/src/main/java/cn/hutool/core/map/MapUtil.java
View File

@ -1258,13 +1258,7 @@ public class MapUtil extends MapGetUtil {
final Map<K, List<V>> map = new HashMap<>();
for (final Map.Entry<K, V> pair : entries) {
final List<V> values;
if (map.containsKey(pair.getKey())) {
values = map.get(pair.getKey());
} else {
values = ListUtil.of();
map.put(pair.getKey(), values);
}
final List<V> values = map.computeIfAbsent(pair.getKey(), k -> new ArrayList<>());
values.add(pair.getValue());
}
return map;

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

@ -150,6 +150,34 @@ public class CollectorUtil {
return groupingBy(classifier, Collectors.toList());
}
/**
* 对null友好的 toMap 操作的 {@link Collector}实现，默认使用HashMap
*
* @param keyMapper 指定map中的key
* @param valueMapper 指定map中的value
* @param <T> 实体类型
* @param <K> map中key的类型
* @param <U> map中value的类型
* @return 对null友好的 toMap 操作的 {@link Collector}实现
*/
public static <T, K, U> Collector<T, ?, Map<K, U>> toMap(final Function<? super T, ? extends K> keyMapper,
final Function<? super T, ? extends U> valueMapper) {
return toMap(keyMapper, valueMapper, (l, r) -> r);
}
/**
* 对null友好的 toMap 操作的 {@link Collector}实现，默认使用HashMap
*
* @param keyMapper 指定map中的key
* @param <T> 实体类型
* @param <K> map中key的类型
* @return 对null友好的 toMap 操作的 {@link Collector}实现
*/
public static <T, K> Collector<T, ?, Map<K, T>> toMap(final Function<? super T, ? extends K> keyMapper) {
return toMap(keyMapper, Function.identity());
}
/**
* 对null友好的 toMap 操作的 {@link Collector}实现，默认使用HashMap
*
@ -162,8 +190,8 @@ public class CollectorUtil {
* @return 对null友好的 toMap 操作的 {@link Collector}实现
*/
public static <T, K, U> Collector<T, ?, Map<K, U>> toMap(final Function<? super T, ? extends K> keyMapper,
final Function<? super T, ? extends U> valueMapper,
final BinaryOperator<U> mergeFunction) {
final Function<? super T, ? extends U> valueMapper,
final BinaryOperator<U> mergeFunction) {
return toMap(keyMapper, valueMapper, mergeFunction, HashMap::new);
}