lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2025-04-05 17:37:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

add date to long support for Convert

Browse Source
This commit is contained in:
Looly 2020-05-17 19:19:24 +08:00
parent 13594ae4d1
commit 200dc6c5ea
4 changed files with 50 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -3,9 +3,10 @@
-------------------------------------------------------------------------------------------------------------
## 5.3.6 (2020-05-14)
## 5.3.6 (2020-05-17)
### 新特性
* 【core 】 NumberConverter Long类型增加日期转换（pr#872@Github）
### Bug修复

48
hutool-core/src/main/java/cn/hutool/core/convert/impl/NumberConverter.java
View File

@ -21,7 +21,9 @@ import java.util.concurrent.atomic.AtomicLong;
* <li><code>java.lang.Byte</code></li>
* <li><code>java.lang.Short</code></li>
* <li><code>java.lang.Integer</code></li>
* <li><code>java.util.concurrent.atomic.AtomicInteger</code></li>
* <li><code>java.lang.Long</code></li>
* <li><code>java.util.concurrent.atomic.AtomicLong</code></li>
* <li><code>java.lang.Float</code></li>
* <li><code>java.lang.Double</code></li>
* <li><code>java.math.BigDecimal</code></li>
@ -51,7 +53,10 @@ public class NumberConverter extends AbstractConverter<Number> {
@Override
protected Number convertInternal(Object value) {
final Class<?> targetType = this.targetType;
return convertInternal(value, this.targetType);
}
private Number convertInternal(Object value, Class<?> targetType) {
if (Byte.class == targetType) {
if (value instanceof Number) {
return ((Number) value).byteValue();
@ -60,7 +65,7 @@ public class NumberConverter extends AbstractConverter<Number> {
}
final String valueStr = convertToStr(value);
return StrUtil.isBlank(valueStr) ? null : Byte.valueOf(valueStr);
} else if (Short.class == targetType) {
if (value instanceof Number) {
return ((Number) value).shortValue();
@ -78,20 +83,15 @@ public class NumberConverter extends AbstractConverter<Number> {
}
final String valueStr = convertToStr(value);
return StrUtil.isBlank(valueStr) ? null : NumberUtil.parseInt(valueStr);
} else if (AtomicInteger.class == targetType) {
final AtomicInteger intValue = new AtomicInteger();
if (value instanceof Number) {
intValue.set(((Number) value).intValue());
} else if(value instanceof Boolean) {
intValue.set(BooleanUtil.toInt((Boolean) value));
final Number number = convertInternal(value, Integer.class);
if(null != number){
final AtomicInteger intValue = new AtomicInteger();
intValue.set(number.intValue());
return intValue;
}
final String valueStr = convertToStr(value);
if (StrUtil.isBlank(valueStr)) {
return null;
}
intValue.set(NumberUtil.parseInt(valueStr));
return intValue;
return null;
} else if (Long.class == targetType) {
if (value instanceof Number) {
return ((Number) value).longValue();
@ -108,19 +108,13 @@ public class NumberConverter extends AbstractConverter<Number> {
return StrUtil.isBlank(valueStr) ? null : NumberUtil.parseLong(valueStr);
} else if (AtomicLong.class == targetType) {
final AtomicLong longValue = new AtomicLong();
if (value instanceof Number) {
longValue.set(((Number) value).longValue());
} else if(value instanceof Boolean) {
longValue.set(BooleanUtil.toLong((Boolean) value));
final Number number = convertInternal(value, Long.class);
if(null != number){
final AtomicLong longValue = new AtomicLong();
longValue.set(number.longValue());
return longValue;
}
final String valueStr = convertToStr(value);
if (StrUtil.isBlank(valueStr)) {
return null;
}
longValue.set(NumberUtil.parseLong(valueStr));
return longValue;
return null;
} else if (Float.class == targetType) {
if (value instanceof Number) {
return ((Number) value).floatValue();
@ -144,7 +138,7 @@ public class NumberConverter extends AbstractConverter<Number> {
} else if (BigInteger.class == targetType) {
return toBigInteger(value);
}else if(Number.class == targetType){
if (value instanceof Number) {
return (Number)value;

26
hutool-core/src/test/java/cn/hutool/core/convert/ConvertToNumberTest.java Normal file
View File

@ -0,0 +1,26 @@
package cn.hutool.core.convert;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import org.junit.Assert;
import org.junit.Test;
import java.util.concurrent.atomic.AtomicLong;
public class ConvertToNumberTest {
@Test
public void dateToLongTest(){
final DateTime date = DateUtil.parse("2020-05-17 12:32:00");
final Long dateLong = Convert.toLong(date);
assert date != null;
Assert.assertEquals(date.getTime(), dateLong.longValue());
}
@Test
public void dateToAtomicLongTest(){
final DateTime date = DateUtil.parse("2020-05-17 12:32:00");
final AtomicLong dateLong = Convert.convert(AtomicLong.class, date);
assert date != null;
Assert.assertEquals(date.getTime(), dateLong.longValue());
}
}

2
hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/PinyinFactory.java
View File

@ -47,6 +47,6 @@ public class PinyinFactory {
return engine;
}
throw new TemplateException("No template found ! Please add one of pinyin jar to your project !");
throw new TemplateException("No pinyin jar found ! Please add one of it to your project !");
}
}