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

fix bug

Browse Source
This commit is contained in:
Looly
2022-05-20 11:59:21 +08:00
parent 738ebe5a08
commit 117e24cd51
4 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hutool-core/src/main/java/cn/hutool/core/convert/AbstractConverter.java
View File

@@ -1,9 +1,9 @@
package cn.hutool.core.convert; package cn.hutool.core.convert;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.CharUtil;
import cn.hutool.core.reflect.ClassUtil; import cn.hutool.core.reflect.ClassUtil;
import cn.hutool.core.text.StrUtil; import cn.hutool.core.text.StrUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.CharUtil;
import java.io.Serializable; import java.io.Serializable;
import java.util.Map; import java.util.Map;

1
hutool-core/src/main/java/cn/hutool/core/convert/ConverterRegistry.java
View File

@@ -258,6 +258,7 @@ public class ConverterRegistry implements Serializable {
return converter.convert(value, defaultValue); return converter.convert(value, defaultValue);
} }
Class<T> rowType = (Class<T>) TypeUtil.getClass(type); Class<T> rowType = (Class<T>) TypeUtil.getClass(type);
if (null == rowType) { if (null == rowType) {
if (null != defaultValue) { if (null != defaultValue) {

8
hutool-core/src/main/java/cn/hutool/core/convert/impl/TemporalAccessorConverter.java
View File

@@ -3,8 +3,8 @@ package cn.hutool.core.convert.impl;
import cn.hutool.core.convert.AbstractConverter; import cn.hutool.core.convert.AbstractConverter;
import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.text.StrUtil; import cn.hutool.core.text.StrUtil;
import cn.hutool.core.util.ObjUtil;
import java.time.Instant; import java.time.Instant;
import java.time.LocalDate; import java.time.LocalDate;
@@ -84,6 +84,12 @@ public class TemporalAccessorConverter extends AbstractConverter<TemporalAccesso
this.format = format; this.format = format;
} }
@SuppressWarnings("unchecked")
@Override
public Class<TemporalAccessor> getTargetType() {
return (Class<TemporalAccessor>) this.targetType;
}
@Override @Override
protected TemporalAccessor convertInternal(final Object value) { protected TemporalAccessor convertInternal(final Object value) {
if (value instanceof Long) { if (value instanceof Long) {

9
hutool-core/src/test/java/cn/hutool/core/convert/ConvertTest.java
View File

@@ -15,6 +15,8 @@ import org.junit.Test;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Date; import java.util.Date;
@@ -383,4 +385,11 @@ public class ConvertTest {
final float b = Convert.toFloat(a); final float b = Convert.toFloat(a);
Assert.assertEquals(a, b, 5); Assert.assertEquals(a, b, 5);
} }
@Test
public void localDateTimeToLocalDateTest(){
final LocalDateTime localDateTime = LocalDateTime.now();
final LocalDate convert = Convert.convert(LocalDate.class, localDateTime);
Assert.assertEquals(localDateTime.toLocalDate(), convert);
}
} }