From a5e1f2f3c68d04b206288d56d2c5923eb9c19ae4 Mon Sep 17 00:00:00 2001
From: Looly <loolly@gmail.com>
Date: Fri, 29 Jul 2022 21:51:12 +0800
Subject: [PATCH] =?UTF-8?q?NetUti=E7=B1=BB=E4=B8=ADipv6ToBitInteger?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=90=8D=E7=A7=B0=E5=BB=BA=E8=AE=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=88=90ipv6ToBigInteger?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  3 ++-
 .../cn/hutool/core/img/BackgroundRemoval.java |  7 +++----
 .../main/java/cn/hutool/core/net/NetUtil.java | 19 ++++++++++++++++---
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55d4d62a7..6b90424b7 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 
 -------------------------------------------------------------------------------------------------------------
 
-# 5.8.5.M1 (2022-07-22)
+# 5.8.5.M1 (2022-07-29)
 
 ### ❌不兼容特性
 * 【core   】     合成注解相关功能重构，增加@Link及其子注解（pr#702@Gitee）
@@ -29,6 +29,7 @@
 * 【json   】     JSONConfig增加允许重复key配置，解决不规整json序列化的问题（pr#720@Github）
 * 【core   】     完善了codec包下一些方法的入参空校验（pr#719@Gitee）
 * 【extra  】     完善QrCodeUtil对于DATA_MATRIX生成的形状随机不可指定的功能（pr#722@Gitee）
+* 【core   】     修改NetUtil.ipv6ToBigInteger，原方法标记为过期（pr#2485@Github）
 * 
 ### 🐞Bug修复
 * 【core   】     修复CollUtil里面关于可变参数传null造成的crash问题（pr#2428@Github）
diff --git a/hutool-core/src/main/java/cn/hutool/core/img/BackgroundRemoval.java b/hutool-core/src/main/java/cn/hutool/core/img/BackgroundRemoval.java
index a29dc645e..80a745df6 100755
--- a/hutool-core/src/main/java/cn/hutool/core/img/BackgroundRemoval.java
+++ b/hutool-core/src/main/java/cn/hutool/core/img/BackgroundRemoval.java
@@ -299,8 +299,7 @@ public class BackgroundRemoval {
 			}
 		}
 
-		int initialCapacity =  (int) ((float) list.size() / 0.75F + 1.0F);
-		Map<String, Integer> map = new HashMap<>(initialCapacity);
+		final Map<String, Integer> map = new HashMap<>(list.size(), 1);
 		for (String string : list) {
 			Integer integer = map.get(string);
 			if (integer == null) {
@@ -310,7 +309,7 @@ public class BackgroundRemoval {
 			}
 			map.put(string, integer);
 		}
-		String max = "";
+		String max = StrUtil.EMPTY;
 		long num = 0;
 		for (Map.Entry<String, Integer> entry : map.entrySet()) {
 			String key = entry.getKey();
@@ -327,7 +326,7 @@ public class BackgroundRemoval {
 			return ImgUtil.toHex(Integer.parseInt(strings[0]), Integer.parseInt(strings[1]),
 					Integer.parseInt(strings[2]));
 		}
-		return "";
+		return StrUtil.EMPTY;
 	}
 
 	// -------------------------------------------------------------------------- private
diff --git a/hutool-core/src/main/java/cn/hutool/core/net/NetUtil.java b/hutool-core/src/main/java/cn/hutool/core/net/NetUtil.java
index c05b64fbf..43dedc995 100755
--- a/hutool-core/src/main/java/cn/hutool/core/net/NetUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/net/NetUtil.java
@@ -86,13 +86,26 @@ public class NetUtil {
 	/**
 	 * 将IPv6地址字符串转为大整数
 	 *
-	 * @param IPv6Str 字符串
+	 * @param ipv6Str 字符串
+	 * @return 大整数, 如发生异常返回 null
+	 * @since 5.5.7
+	 * @deprecated 拼写错误，请使用{@link #ipv6ToBigInteger(String)}
+	 */
+	@Deprecated
+	public static BigInteger ipv6ToBitInteger(String ipv6Str) {
+		return ipv6ToBigInteger(ipv6Str);
+	}
+
+	/**
+	 * 将IPv6地址字符串转为大整数
+	 *
+	 * @param ipv6Str 字符串
 	 * @return 大整数, 如发生异常返回 null
 	 * @since 5.5.7
 	 */
-	public static BigInteger ipv6ToBigInteger(String IPv6Str) {
+	public static BigInteger ipv6ToBigInteger(String ipv6Str) {
 		try {
-			InetAddress address = InetAddress.getByName(IPv6Str);
+			InetAddress address = InetAddress.getByName(ipv6Str);
 			if (address instanceof Inet6Address) {
 				return new BigInteger(1, address.getAddress());
 			}