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

修复CollectorUtil.reduceListMap与collectors.groupby一起使用时出现与预期不符问题

Browse Source
This commit is contained in:
Looly 2023-11-12 16:46:10 +08:00
parent da1e857c07
commit 7a4cac2963
2 changed files with 50 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -334,8 +334,13 @@ public class CollectorUtil {
value.forEach((k, v) -> result.computeIfAbsent(k, i -> new ArrayList<>()).add(v)); value.forEach((k, v) -> result.computeIfAbsent(k, i -> new ArrayList<>()).add(v));
return result; return result;
}, (l, r) -> { }, (l, r) -> {
r.forEach((k, v) -> l.computeIfAbsent(k, i -> new ArrayList<>()).addAll(v)); final R resultMap = mapSupplier.get();
return l; resultMap.putAll(l);
r.forEach((k, v) -> {
final List<V> list = resultMap.computeIfAbsent(k, i -> new ArrayList<>());
list.addAll(v);
});
return resultMap;
} }
); );
} }

21
hutool-core/src/test/java/org/dromara/hutool/core/stream/CollectorUtilTest.java
View File

@ -12,6 +12,7 @@
package org.dromara.hutool.core.stream; package org.dromara.hutool.core.stream;
import org.dromara.hutool.core.collection.ListUtil;
import org.dromara.hutool.core.map.MapUtil; import org.dromara.hutool.core.map.MapUtil;
import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@ -44,6 +45,22 @@ public class CollectorUtilTest {
Assertions.assertEquals(MapUtil.builder("苏格拉底", Arrays.asList(1, 2)) Assertions.assertEquals(MapUtil.builder("苏格拉底", Arrays.asList(1, 2))
.put("特拉叙马霍斯", Arrays.asList(3, 1, 2)).build(), .put("特拉叙马霍斯", Arrays.asList(3, 1, 2)).build(),
nameScoresMap); nameScoresMap);
final List<Map<String, String>> data = ListUtil.of(
MapUtil.builder("name", "sam").put("count", "80").map(),
MapUtil.builder("name", "sam").put("count", "81").map(),
MapUtil.builder("name", "sam").put("count", "82").map(),
MapUtil.builder("name", "jack").put("count", "80").map(),
MapUtil.builder("name", "jack").put("count", "90").map()
);
final Map<String, Map<String, List<String>>> nameMap = data.stream()
.collect(Collectors.groupingBy(e -> e.get("name"), CollectorUtil.reduceListMap()));
Assertions.assertEquals(MapUtil.builder("jack", MapUtil.builder("name", Arrays.asList("jack", "jack"))
.put("count", Arrays.asList("80", "90")).build())
.put("sam", MapUtil.builder("name", Arrays.asList("sam", "sam", "sam"))
.put("count", Arrays.asList("80", "81", "82")).build())
.build(), nameMap);
} }
@Test @Test
@ -93,7 +110,7 @@ public class CollectorUtilTest {
@Test @Test
public void testGroupingByAfterValueMapped() { public void testGroupingByAfterValueMapped() {
List<Integer> list = Arrays.asList(1, 1, 2, 2, 3, 4); final List<Integer> list = Arrays.asList(1, 1, 2, 2, 3, 4);
Map<Boolean, Set<String>> map = list.stream() Map<Boolean, Set<String>> map = list.stream()
.collect(CollectorUtil.groupingBy(t -> (t & 1) == 0, String::valueOf, LinkedHashSet::new, LinkedHashMap::new)); .collect(CollectorUtil.groupingBy(t -> (t & 1) == 0, String::valueOf, LinkedHashSet::new, LinkedHashMap::new));
@ -107,7 +124,7 @@ public class CollectorUtilTest {
Assertions.assertEquals(new LinkedHashSet<>(Arrays.asList("2", "4")), map.get(Boolean.TRUE)); Assertions.assertEquals(new LinkedHashSet<>(Arrays.asList("2", "4")), map.get(Boolean.TRUE));
Assertions.assertEquals(new LinkedHashSet<>(Arrays.asList("1", "3")), map.get(Boolean.FALSE)); Assertions.assertEquals(new LinkedHashSet<>(Arrays.asList("1", "3")), map.get(Boolean.FALSE));
Map<Boolean, List<String>> map2 = list.stream() final Map<Boolean, List<String>> map2 = list.stream()
.collect(CollectorUtil.groupingBy(t -> (t & 1) == 0, String::valueOf)); .collect(CollectorUtil.groupingBy(t -> (t & 1) == 0, String::valueOf));
Assertions.assertEquals(Arrays.asList("2", "2", "4"), map2.get(Boolean.TRUE)); Assertions.assertEquals(Arrays.asList("2", "2", "4"), map2.get(Boolean.TRUE));
Assertions.assertEquals(Arrays.asList("1", "1", "3"), map2.get(Boolean.FALSE)); Assertions.assertEquals(Arrays.asList("1", "1", "3"), map2.get(Boolean.FALSE));