zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

将defaultIfNull检验参数类型改为泛型，并补充重载方法

Browse Source
This commit is contained in:
huangchengxing
2022-08-30 16:45:17 +08:00
parent f4fc7793eb
commit 9077297966
2 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
hutool-core/src/test/java/cn/hutool/core/util/ObjUtilTest.java
View File

@@ -1,18 +1,16 @@
package cn.hutool.core.util;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.exceptions.CloneRuntimeException;
import org.junit.Assert;
import org.junit.Test;
import java.math.BigDecimal;
import java.time.Instant;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import java.util.function.Function;
public class ObjUtilTest {
@@ -99,15 +97,20 @@ public class ObjUtilTest {
@Test
public void defaultIfNullTest() {
final String dateStr = "2020-10-23 15:12:30";
final Instant result1 = ObjUtil.defaultIfNull(dateStr,
(v) -> DateUtil.parse(v.toString(), DatePattern.NORM_DATETIME_PATTERN).toInstant(), Instant::now);
Assert.assertNotNull(result1);
final Object val1 = new Object();
final Object val2 = new Object();
final String nullValue = null;
final Instant result2 = ObjUtil.defaultIfNull(nullValue,
(v) -> DateUtil.parse(v.toString(), DatePattern.NORM_DATETIME_PATTERN).toInstant(), Instant::now);
Assert.assertNotNull(result2);
Assert.assertSame(val1, ObjUtil.defaultIfNull(val1, () -> val2));
Assert.assertSame(val2, ObjUtil.defaultIfNull(null, () -> val2));
Assert.assertSame(val1, ObjUtil.defaultIfNull(val1, val2));
Assert.assertSame(val2, ObjUtil.defaultIfNull(null, val2));
Assert.assertSame(val1, ObjUtil.defaultIfNull(val1, Function.identity(), () -> val2));
Assert.assertSame(val2, ObjUtil.defaultIfNull(null, Function.identity(), () -> val2));
Assert.assertSame(val1, ObjUtil.defaultIfNull(val1, Function.identity(), val2));
Assert.assertSame(val2, ObjUtil.defaultIfNull(null, Function.identity(), val2));
}
@Test