From 1e7af4d7fc37dc43017234d84a203dbc10685271 Mon Sep 17 00:00:00 2001 From: achao Date: Wed, 10 Nov 2021 20:29:41 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"HashMap=E5=BA=94=E6=8C=87=E5=AE=9A?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E9=95=BF=E5=BA=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 4f04bd121a4f769f28728ccbc4d41e0c742a82cc. --- .../hutool/core/collection/CollStreamUtil.java | 2 +- .../java/cn/hutool/core/util/NumberUtil.java | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/CollStreamUtil.java b/hutool-core/src/main/java/cn/hutool/core/collection/CollStreamUtil.java index 53243cb71..b418ddcc1 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/CollStreamUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/CollStreamUtil.java @@ -179,7 +179,7 @@ public class CollStreamUtil { Set key = new HashSet<>(); key.addAll(map1.keySet()); key.addAll(map2.keySet()); - Map map = MapUtil.newHashMap(key.size()); + Map map = new HashMap<>(); for (K t : key) { X x = map1.get(t); Y y = map2.get(t); diff --git a/hutool-core/src/main/java/cn/hutool/core/util/NumberUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/NumberUtil.java index bedca46f8..08f30132a 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/NumberUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/NumberUtil.java @@ -7,12 +7,12 @@ import cn.hutool.core.math.Calculator; import java.math.BigDecimal; import java.math.BigInteger; import java.math.RoundingMode; -import java.security.SecureRandom; import java.text.DecimalFormat; import java.text.NumberFormat; import java.text.ParseException; import java.util.Collection; import java.util.HashSet; +import java.util.Random; import java.util.Set; /** @@ -1362,8 +1362,8 @@ public class NumberUtil { throw new UtilException("Size is larger than range between begin and end!"); } - SecureRandom ran = new SecureRandom(); - Set set = new HashSet<>(Math.max((int) (size / .75f) + 1, 16)); + Random ran = new Random(); + Set set = new HashSet<>(); while (set.size() < size) { set.add(begin + ran.nextInt(end - begin)); } @@ -2159,14 +2159,14 @@ public class NumberUtil { * @since 4.0.9 */ public static BigDecimal toBigDecimal(String numberStr) { - if (StrUtil.isBlank(numberStr)) { + if(StrUtil.isBlank(numberStr)){ return BigDecimal.ZERO; } try { // 支持类似于 1,234.55 格式的数字 final Number number = parseNumber(numberStr); - if (number instanceof BigDecimal) { + if(number instanceof BigDecimal){ return (BigDecimal) number; } else { return new BigDecimal(number.toString()); @@ -2512,7 +2512,7 @@ public class NumberUtil { public static Number parseNumber(String numberStr) throws NumberFormatException { try { final NumberFormat format = NumberFormat.getInstance(); - if (format instanceof DecimalFormat) { + if(format instanceof DecimalFormat){ // issue#1818@Github // 当字符串数字超出double的长度时,会导致截断,此处使用BigDecimal接收 ((DecimalFormat) format).setParseBigDecimal(true); @@ -2699,9 +2699,9 @@ public class NumberUtil { * @since 5.7.8 */ public static double toDouble(Number value) { - if (value instanceof Float) { + if(value instanceof Float){ return Double.parseDouble(value.toString()); - } else { + }else{ return value.doubleValue(); } }