jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-23 23:09:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix 修复 StreamUtils 返回不可变类型报错问题

Browse Source
This commit is contained in:
秋辞未寒
2025-09-02 15:57:42 +08:00
parent 5a43212ccc
commit 3a11f18656
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StreamUtils.java
View File

@ -1,6 +1,7 @@
package org.dromara.common.core.utils;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.map.MapUtil;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
@ -148,7 +149,7 @@ public class StreamUtils {
*/
public static <V, K> Map<K, V> toIdentityMap(Collection<V> collection, Function<V, K> key) {
if (CollUtil.isEmpty(collection)) {
return Collections.emptyMap();
return MapUtil.newHashMap();
}
return collection.stream()
.filter(Objects::nonNull)
@ -169,7 +170,7 @@ public class StreamUtils {
*/
public static <E, K, V> Map<K, V> toMap(Collection<E> collection, Function<E, K> key, Function<E, V> value) {
if (CollUtil.isEmpty(collection)) {
return Collections.emptyMap();
return MapUtil.newHashMap();
}
return collection.stream()
.filter(Objects::nonNull)
@ -187,7 +188,7 @@ public class StreamUtils {
*/
public static <K, E, V> Map<K, V> toMap(Map<K, E> map, BiFunction<K, E, V> take) {
if (CollUtil.isEmpty(map)) {
return Collections.emptyMap();
return MapUtil.newHashMap();
}
return toMap(map.entrySet(), Map.Entry::getKey, entry -> take.apply(entry.getKey(), entry.getValue()));
}
@ -204,7 +205,7 @@ public class StreamUtils {
*/
public static <E, K> Map<K, List<E>> groupByKey(Collection<E> collection, Function<E, K> key) {
if (CollUtil.isEmpty(collection)) {
return Collections.emptyMap();
return MapUtil.newHashMap();
}
return collection.stream()
.filter(Objects::nonNull)
@ -225,7 +226,7 @@ public class StreamUtils {
*/
public static <E, K, U> Map<K, Map<U, List<E>>> groupBy2Key(Collection<E> collection, Function<E, K> key1, Function<E, U> key2) {
if (CollUtil.isEmpty(collection)) {
return Collections.emptyMap();
return MapUtil.newHashMap();
}
return collection.stream()
.filter(Objects::nonNull)
@ -246,7 +247,7 @@ public class StreamUtils {
*/
public static <E, T, U> Map<T, Map<U, E>> group2Map(Collection<E> collection, Function<E, T> key1, Function<E, U> key2) {
if (CollUtil.isEmpty(collection)) {
return Collections.emptyMap();
return MapUtil.newHashMap();
}
return collection.stream()
.filter(Objects::nonNull)
@ -286,7 +287,7 @@ public class StreamUtils {
*/
public static <E, T> Set<T> toSet(Collection<E> collection, Function<E, T> function) {
if (CollUtil.isEmpty(collection)) {
return Collections.emptySet();
return CollUtil.newHashSet();
}
return collection.stream()
.map(function)
@ -310,7 +311,7 @@ public class StreamUtils {
public static <K, X, Y, V> Map<K, V> merge(Map<K, X> map1, Map<K, Y> map2, BiFunction<X, Y, V> merge) {
if (CollUtil.isEmpty(map1) && CollUtil.isEmpty(map2)) {
// 如果两个 map 都为空，则直接返回空的 map
return Collections.emptyMap();
return MapUtil.newHashMap();
} else if (CollUtil.isEmpty(map1)) {
// 如果 map1 为空，则直接处理返回 map2
return toMap(map2.entrySet(), Map.Entry::getKey, entry -> merge.apply(null, entry.getValue()));