mirror of
https://gitee.com/dromara/hutool.git
synced 2025-04-05 17:37:59 +08:00
!1027 list 为空时,CollUtil.max 抛异常
Merge pull request !1027 from javalover123/v5-dev
This commit is contained in:
commit
11626bbcfc
@ -2884,7 +2884,7 @@ public class CollUtil {
|
||||
* @since 4.6.5
|
||||
*/
|
||||
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
|
||||
*/
|
||||
public static <T extends Comparable<? super T>> T min(Collection<T> coll) {
|
||||
return Collections.min(coll);
|
||||
return isEmpty(coll) ? null : Collections.min(coll);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -1066,4 +1066,22 @@ public class CollUtilTest {
|
||||
Assert.assertFalse(CollUtil.allMatch(list, i -> i == 1));
|
||||
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));
|
||||
}
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user