ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-04-03 16:24:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复ObjectUtil.defaultIfXXX中NPE问题

Browse Source
This commit is contained in:
Looly 2022-09-13 23:04:32 +08:00
parent a4a0633ed9
commit 5bd118c636
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -9,6 +9,7 @@
* 【core 】 BooleanUtil的andOfWrap和orOfWrap()忽略null（issue#2599@Github）
* 【jwt 】 优化JWT自动识别header中的算法，并可自定义header中key的顺序（issue#I5QRUO@Gitee）
### 🐞Bug修复
* 【core 】 修复ObjectUtil.defaultIfXXX中NPE问题（pr#2603@Github）
-------------------------------------------------------------------------------------------------------------

9
hutool-core/src/test/java/cn/hutool/core/util/ObjectUtilTest.java
View File

@ -68,10 +68,10 @@ public class ObjectUtilTest {
final String nullValue = null;
final String dateStr = "2020-10-23 15:12:30";
Instant result1 = ObjectUtil.defaultIfNull(dateStr,
() -> DateUtil.parse(dateStr, DatePattern.NORM_DATETIME_PATTERN).toInstant(), Instant.now());
(source) -> DateUtil.parse(source, DatePattern.NORM_DATETIME_PATTERN).toInstant(), Instant.now());
Assert.assertNotNull(result1);
Instant result2 = ObjectUtil.defaultIfNull(nullValue,
() -> DateUtil.parse(nullValue, DatePattern.NORM_DATETIME_PATTERN).toInstant(), Instant.now());
(source) -> DateUtil.parse(source, DatePattern.NORM_DATETIME_PATTERN).toInstant(), Instant.now());
Assert.assertNotNull(result2);
Obj obj = new Obj();
@ -88,10 +88,10 @@ public class ObjectUtilTest {
final String emptyValue = "";
final String dateStr = "2020-10-23 15:12:30";
Instant result1 = ObjectUtil.defaultIfEmpty(emptyValue,
() -> DateUtil.parse(emptyValue, DatePattern.NORM_DATETIME_PATTERN).toInstant(), Instant.now());
(source) -> DateUtil.parse(source, DatePattern.NORM_DATETIME_PATTERN).toInstant(), Instant.now());
Assert.assertNotNull(result1);
Instant result2 = ObjectUtil.defaultIfEmpty(dateStr,
() -> DateUtil.parse(dateStr, DatePattern.NORM_DATETIME_PATTERN).toInstant(), Instant.now());
(source) -> DateUtil.parse(source, DatePattern.NORM_DATETIME_PATTERN).toInstant(), Instant.now());
Assert.assertNotNull(result2);
}
@ -102,6 +102,7 @@ public class ObjectUtilTest {
Assert.assertTrue(basicType);
}
@SuppressWarnings("ConstantConditions")
@Test
public void isNotNullTest() {
String a = null;