ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

!1027 list 为空时，CollUtil.max 抛异常

Browse Source 
Merge pull request !1027 from javalover123/v5-dev
This commit is contained in:
Looly 2023-06-24 11:30:36 +00:00 committed by Gitee
commit 11626bbcfc
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2884,7 +2884,7 @@ public class CollUtil {
* @since 4.6.5 * @since 4.6.5
*/ */
public static <T extends Comparable<? super T>> T max(Collection<T> coll) { public static <T extends Comparable<? super T>> T max(Collection<T> coll) {
return Collections.max(coll); return isEmpty(coll) ? null : Collections.max(coll);
} }
/** /**
@ -2897,7 +2897,7 @@ public class CollUtil {
* @since 4.6.5 * @since 4.6.5
*/ */
public static <T extends Comparable<? super T>> T min(Collection<T> coll) { public static <T extends Comparable<? super T>> T min(Collection<T> coll) {
return Collections.min(coll); return isEmpty(coll) ? null : Collections.min(coll);
} }
/** /**

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

@ -1066,4 +1066,22 @@ public class CollUtilTest {
Assert.assertFalse(CollUtil.allMatch(list, i -> i == 1)); Assert.assertFalse(CollUtil.allMatch(list, i -> i == 1));
Assert.assertTrue(CollUtil.allMatch(list, i -> i <= 6)); Assert.assertTrue(CollUtil.allMatch(list, i -> i <= 6));
} }
@Test
public void maxTest() {
List<Integer> list = Arrays.asList(1, 2, 3, 4, 5, 6);
Assert.assertEquals((Integer) 6, CollUtil.max(list));
}
@Test
public void maxEmptyTest() {
final List<? extends Comparable> emptyList = Collections.emptyList();
Assert.assertNull(CollUtil.max(emptyList));
}
@Test
public void minNullTest() {
Assert.assertNull(CollUtil.max(null));
}
} }