ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

add null check

Browse Source
This commit is contained in:
Looly 2022-05-27 18:03:50 +08:00
parent 400c74e82a
commit 705f65a207
2 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hutool-core/src/main/java/cn/hutool/core/math/NumberUtil.java
View File

@ -35,7 +35,7 @@ import java.util.Set;
* <ul> * <ul>
* <li><a href="https://github.com/venusdrogon/feilong-core/wiki/one-jdk7-bug-thinking">one-jdk7-bug-thinking</a></li> * <li><a href="https://github.com/venusdrogon/feilong-core/wiki/one-jdk7-bug-thinking">one-jdk7-bug-thinking</a></li>
* </ul> * </ul>
* * <p>
* TODO 需整理精简方法，去掉无用的重载方法。 * TODO 需整理精简方法，去掉无用的重载方法。
* *
* @author Looly * @author Looly
@ -723,7 +723,7 @@ public class NumberUtil {
if (v1 instanceof BigDecimal && v2 instanceof BigDecimal) { if (v1 instanceof BigDecimal && v2 instanceof BigDecimal) {
return div((BigDecimal) v1, (BigDecimal) v2, scale, roundingMode); return div((BigDecimal) v1, (BigDecimal) v2, scale, roundingMode);
} }
return div(StrUtil.toStringOrNull(v1),StrUtil.toStringOrNull(v2), scale, roundingMode); return div(StrUtil.toStringOrNull(v1), StrUtil.toStringOrNull(v2), scale, roundingMode);
} }
/** /**
@ -1242,11 +1242,13 @@ public class NumberUtil {
* @return 是否为整数 * @return 是否为整数
*/ */
public static boolean isInteger(final String s) { public static boolean isInteger(final String s) {
if(StrUtil.isNotBlank(s)) {
try { try {
Integer.parseInt(s); Integer.parseInt(s);
} catch (final NumberFormatException e) { } catch (final NumberFormatException e) {
return false; return false;
} }
}
return true; return true;
} }
@ -1259,11 +1261,13 @@ public class NumberUtil {
* @since 4.0.0 * @since 4.0.0
*/ */
public static boolean isLong(final String s) { public static boolean isLong(final String s) {
if (StrUtil.isNotBlank(s)) {
try { try {
Long.parseLong(s); Long.parseLong(s);
} catch (final NumberFormatException e) { } catch (final NumberFormatException e) {
return false; return false;
} }
}
return true; return true;
} }
@ -1274,12 +1278,14 @@ public class NumberUtil {
* @return 是否为{@link Double}类型 * @return 是否为{@link Double}类型
*/ */
public static boolean isDouble(final String s) { public static boolean isDouble(final String s) {
if (StrUtil.isNotBlank(s)) {
try { try {
Double.parseDouble(s); Double.parseDouble(s);
return s.contains("."); return s.contains(".");
} catch (final NumberFormatException ignore) { } catch (final NumberFormatException ignore) {
// ignore // ignore
} }
}
return false; return false;
} }
@ -2454,7 +2460,7 @@ public class NumberUtil {
return 0L; return 0L;
} }
if(StrUtil.startWithIgnoreCase(number, "0x")){ if (StrUtil.startWithIgnoreCase(number, "0x")) {
// 0x04表示16进制数 // 0x04表示16进制数
return Long.parseLong(number.substring(2), 16); return Long.parseLong(number.substring(2), 16);
} }
@ -2528,7 +2534,7 @@ public class NumberUtil {
* @since 4.1.15 * @since 4.1.15
*/ */
public static Number parseNumber(final String numberStr) throws NumberFormatException { public static Number parseNumber(final String numberStr) throws NumberFormatException {
if(StrUtil.startWithIgnoreCase(numberStr, "0x")){ if (StrUtil.startWithIgnoreCase(numberStr, "0x")) {
// 0x04表示16进制数 // 0x04表示16进制数
return Long.parseLong(numberStr.substring(2), 16); return Long.parseLong(numberStr.substring(2), 16);
} }

10
hutool-core/src/test/java/cn/hutool/core/util/NumberUtilTest.java
View File

@ -450,7 +450,15 @@ public class NumberUtilTest {
@Test @Test
public void divIntegerTest(){ public void divIntegerTest(){
System.out.println(NumberUtil.div(100101300, (Number) 100)); final BigDecimal div = NumberUtil.div(100101300, (Number) 100);
Assert.assertEquals(1001013, div.intValue());
}
@Test
public void isDoubleTest(){
Assert.assertFalse(NumberUtil.isDouble(null));
Assert.assertFalse(NumberUtil.isDouble(""));
Assert.assertFalse(NumberUtil.isDouble(" "));
} }
} }