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

fix：修复CollUtil里面关于可变参数传null造成的crash问题

Browse Source
This commit is contained in:
刘超 2022-07-04 22:23:03 +08:00
parent adf23e1cf7
commit 39869d3c67
2 changed files with 62 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java
View File

@ -108,6 +108,9 @@ public class CollUtil {
* @return 并集的集合，返回 {@link ArrayList} * @return 并集的集合，返回 {@link ArrayList}
*/ */
public static <T> Collection<T> union(Collection<T> coll1, Collection<T> coll2) { public static <T> Collection<T> union(Collection<T> coll1, Collection<T> coll2) {
if (isEmpty(coll1) && isEmpty(coll2)) {
return new ArrayList<>();
}
if (isEmpty(coll1)) { if (isEmpty(coll1)) {
return new ArrayList<>(coll2); return new ArrayList<>(coll2);
} else if (isEmpty(coll2)) { } else if (isEmpty(coll2)) {
@ -145,6 +148,9 @@ public class CollUtil {
public static <T> Collection<T> union(Collection<T> coll1, Collection<T> coll2, Collection<T>... otherColls) { public static <T> Collection<T> union(Collection<T> coll1, Collection<T> coll2, Collection<T>... otherColls) {
Collection<T> union = union(coll1, coll2); Collection<T> union = union(coll1, coll2);
for (Collection<T> coll : otherColls) { for (Collection<T> coll : otherColls) {
if (isEmpty(coll)) {
continue;
}
union = union(union, coll); union = union(union, coll);
} }
return union; return union;
@ -177,6 +183,9 @@ public class CollUtil {
if (ArrayUtil.isNotEmpty(otherColls)) { if (ArrayUtil.isNotEmpty(otherColls)) {
for (Collection<T> otherColl : otherColls) { for (Collection<T> otherColl : otherColls) {
if (isEmpty(otherColl)) {
continue;
}
result.addAll(otherColl); result.addAll(otherColl);
} }
} }
@ -211,6 +220,9 @@ public class CollUtil {
if (ArrayUtil.isNotEmpty(otherColls)) { if (ArrayUtil.isNotEmpty(otherColls)) {
for (Collection<T> otherColl : otherColls) { for (Collection<T> otherColl : otherColls) {
if (isEmpty(otherColl)) {
continue;
}
result.addAll(otherColl); result.addAll(otherColl);
} }
} }

65
hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java
View File

@ -10,21 +10,7 @@ import lombok.Data;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
import java.util.ArrayList; import java.util.*;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.SortedSet;
/** /**
* 集合工具类单元测试 * 集合工具类单元测试
@ -908,6 +894,55 @@ public class CollUtilTest {
Assert.assertEquals("bb", distinct.get(1).getName()); Assert.assertEquals("bb", distinct.get(1).getName());
} }
@Test
public void unionNullTest() {
List<String> list1 = new ArrayList<>();
List<String> list2 = null;
List<String> list3 = null;
Collection<String> union = CollUtil.union(list1, list2, list3);
Assert.assertNotNull(union);
}
@Test
public void unionDistinctNullTest() {
List<String> list1 = new ArrayList<>();
List<String> list2 = null;
List<String> list3 = null;
Set<String> set = CollUtil.unionDistinct(list1, list2, list3);
Assert.assertNotNull(set);
}
@Test
public void unionAllNullTest() {
List<String> list1 = new ArrayList<>();
List<String> list2 = null;
List<String> list3 = null;
List<String> list = CollUtil.unionAll(list1, list2, list3);
Assert.assertNotNull(list);
}
@Test
public void intersectionNullTest() {
List<String> list1 = new ArrayList<>();
list1.add("aa");
List<String> list2 = new ArrayList<>();
list2.add("aa");
List<String> list3 = null;
Collection<String> collection = CollUtil.intersection(list1, list2, list3);
Assert.assertNotNull(collection);
}
@Test
public void intersectionDistinctNullTest() {
List<String> list1 = new ArrayList<>();
list1.add("aa");
List<String> list2 = null;
// list2.add("aa");
List<String> list3 = null;
Collection<String> collection = CollUtil.intersectionDistinct(list1, list2, list3);
Assert.assertNotNull(collection);
}
@Data @Data
@AllArgsConstructor @AllArgsConstructor
static class Person { static class Person {