Browse Source

1.修改Convert.toLocalDateTime(Object, LocalDatetime)方法的参数及返回值类型;2.新增一个Convert.toLocalDateTime(Object)方法;

lifw 6 years ago
parent
commit
20ffe321f1

+ 15 - 3
hutool-core/src/main/java/cn/hutool/core/convert/Convert.java

@@ -468,10 +468,10 @@ public class Convert {
 	 * @return 结果
 	 * @since 5.0.7
 	 */
-	public static Date toLocalDateTime(Object value, Date defaultValue) {
+	public static LocalDateTime toLocalDateTime(Object value, LocalDateTime defaultValue) {
 		return convertQuietly(LocalDateTime.class, value, defaultValue);
 	}
-
+	
 	/**
 	 * Instant<br>
 	 * 如果给定的值为空,或者转换失败,返回默认值<br>
@@ -498,7 +498,19 @@ public class Convert {
 	public static Date toDate(Object value) {
 		return toDate(value, null);
 	}
-
+	
+	/**
+	 * 转换为LocalDateTime<br>
+	 * 如果给定的值为空,或者转换失败,返回<code>null</code><br>
+	 * 转换失败不会报错
+	 * 
+	 * @param value 被转换的值
+	 * @return 结果
+	 */
+	public static LocalDateTime toLocalDateTime(Object value) {
+		return toLocalDateTime(value, null);
+	}
+	
 	/**
 	 * 转换为Enum对象<br>
 	 * 如果给定的值为空,或者转换失败,返回默认值<br>

+ 22 - 4
hutool-core/src/test/java/cn/hutool/core/convert/DateConvertTest.java

@@ -1,13 +1,15 @@
 package cn.hutool.core.convert;
 
-import cn.hutool.core.date.DateUtil;
-import org.junit.Assert;
-import org.junit.Test;
-
+import java.sql.Timestamp;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Date;
 
+import org.junit.Assert;
+import org.junit.Test;
+
+import cn.hutool.core.date.DateUtil;
+
 public class DateConvertTest {
 
 	@Test
@@ -51,4 +53,20 @@ public class DateConvertTest {
 		java.sql.Date value2 = Convert.convert(java.sql.Date.class, timeLong);
 		Assert.assertEquals(timeLong, value2.getTime());
 	}
+	
+	@Test
+	public void toLocalDateTimeTest() {
+		Date src = new Date();
+		
+		LocalDateTime ldt = Convert.toLocalDateTime(src);
+		Assert.assertEquals(ldt, DateUtil.toLocalDateTime(src));
+		
+		Timestamp ts = Timestamp.from(src.toInstant());
+		ldt = Convert.toLocalDateTime(ts);
+		Assert.assertEquals(ldt, DateUtil.toLocalDateTime(src));
+		
+		String str = "2020-12-12 12:12:12.0";
+		ldt = Convert.toLocalDateTime(str);
+		Assert.assertEquals(ldt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.S")), str);
+	}
 }