From 00b632df9962db7fd660cc10b420bb50d51943cd Mon Sep 17 00:00:00 2001 From: Looly Date: Fri, 28 Feb 2020 14:28:58 +0800 Subject: [PATCH] add method for DateUtil --- CHANGELOG.md | 2 ++ .../java/cn/hutool/core/convert/Convert.java | 24 +++++++++---------- .../java/cn/hutool/core/date/DateUtil.java | 3 +-- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f86ddd411..5858d651d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,9 +8,11 @@ ### 新特性 * 【poi 】 Excel合并单元格读取同一个值,不再为空 * 【core 】 增加EscapeUtil.escapeAll(issue#758@Github) +* 【core 】 增加formatLocalDateTime和parseLocalDateTime方法(pr#97@Gitee) ### Bug修复 * 【core 】 修复EscapeUtil.escape转义错误(issue#758@Github) +* 【core 】 修复Convert.toLocalDateTime(Object value, Date defaultValue)返回结果不是LocalDateTime类型的问题(pr#97@Gitee) ------------------------------------------------------------------------------------------------------------- diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/Convert.java b/hutool-core/src/main/java/cn/hutool/core/convert/Convert.java index 86f39143f..5981608d2 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/Convert.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/Convert.java @@ -471,6 +471,18 @@ public class Convert { public static LocalDateTime toLocalDateTime(Object value, LocalDateTime defaultValue) { return convertQuietly(LocalDateTime.class, value, defaultValue); } + + /** + * 转换为LocalDateTime
+ * 如果给定的值为空,或者转换失败,返回null
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @return 结果 + */ + public static LocalDateTime toLocalDateTime(Object value) { + return toLocalDateTime(value, null); + } /** * Instant
@@ -499,18 +511,6 @@ public class Convert { return toDate(value, null); } - /** - * 转换为LocalDateTime
- * 如果给定的值为空,或者转换失败,返回null
- * 转换失败不会报错 - * - * @param value 被转换的值 - * @return 结果 - */ - public static LocalDateTime toLocalDateTime(Object value) { - return toLocalDateTime(value, null); - } - /** * 转换为Enum对象
* 如果给定的值为空,或者转换失败,返回默认值
diff --git a/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java b/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java index 188c9db8a..f5f9794a2 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java @@ -714,8 +714,7 @@ public class DateUtil { public static LocalDateTime parseLocalDateTime(CharSequence dateStr, String format) { dateStr = normalize(dateStr); DateTimeFormatter df = DateTimeFormatter.ofPattern(format); - LocalDateTime ldt = LocalDateTime.parse(dateStr,df); - return ldt; + return LocalDateTime.parse(dateStr,df); } /**