From 15d53726f7a05d7c1eec5d04ef10a9ac13deb1aa Mon Sep 17 00:00:00 2001
From: Looly <loolly@aliyun.com>
Date: Tue, 27 Jun 2023 10:17:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dutf8-bom=E7=9A=84setting?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=AF=BB=E5=8F=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  3 ++-
 .../java/cn/hutool/setting/SettingLoader.java |  8 +++---
 .../cn/hutool/setting/IssueI7G34ETest.java    | 27 +++++++++++++++++++
 .../src/test/resources/test_with_bom.setting  |  3 +++
 4 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100755 hutool-setting/src/test/java/cn/hutool/setting/IssueI7G34ETest.java
 create mode 100755 hutool-setting/src/test/resources/test_with_bom.setting

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8bb12d47f..981ec83b9 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 # 🚀Changelog
 
 -------------------------------------------------------------------------------------------------------------
-# 5.8.21(2023-06-26)
+# 5.8.21(2023-06-27)
 
 ### 🐣新特性
 * 【core  】      list 为空时，CollUtil.max等返回null而非异常（pr#1027@Gitee）
@@ -11,6 +11,7 @@
 ### 🐞Bug修复
 * 【core  】      修复MapUtil工具使用filter方法构造传入参数结果问题（issue#3162@Github）
 * 【core  】      修复序列化和反序列化Class问题（issue#I7FQ29@Gitee）
+* 【setting】     修复utf8-bom的setting文件读取问题（issue#I7G34E@Gitee）
 
 -------------------------------------------------------------------------------------------------------------
 # 5.8.20(2023-06-16)
diff --git a/hutool-setting/src/main/java/cn/hutool/setting/SettingLoader.java b/hutool-setting/src/main/java/cn/hutool/setting/SettingLoader.java
index 81e349c2a..61307eaa8 100755
--- a/hutool-setting/src/main/java/cn/hutool/setting/SettingLoader.java
+++ b/hutool-setting/src/main/java/cn/hutool/setting/SettingLoader.java
@@ -113,7 +113,7 @@ public class SettingLoader {
 				if (line == null) {
 					break;
 				}
-				line = line.trim();
+				line = StrUtil.trim(line);
 				// 跳过注释行和空行
 				if (StrUtil.isBlank(line) || StrUtil.startWith(line, COMMENT_FLAG_PRE)) {
 					continue;
@@ -121,7 +121,7 @@ public class SettingLoader {
 
 				// 记录分组名
 				if (StrUtil.isSurround(line, CharUtil.BRACKET_START, CharUtil.BRACKET_END)) {
-					group = line.substring(1, line.length() - 1).trim();
+					group = StrUtil.trim(line.substring(1, line.length() - 1));
 					continue;
 				}
 
@@ -131,12 +131,12 @@ public class SettingLoader {
 					continue;
 				}
 
-				String value = keyValue[1].trim();
+				String value = StrUtil.trim(keyValue[1]);
 				// 替换值中的所有变量变量（变量必须是此行之前定义的变量，否则无法找到）
 				if (this.isUseVariable) {
 					value = replaceVar(group, value);
 				}
-				this.groupedMap.put(group, keyValue[0].trim(), value);
+				this.groupedMap.put(group, StrUtil.trim(keyValue[0]), value);
 			}
 		} finally {
 			IoUtil.close(reader);
diff --git a/hutool-setting/src/test/java/cn/hutool/setting/IssueI7G34ETest.java b/hutool-setting/src/test/java/cn/hutool/setting/IssueI7G34ETest.java
new file mode 100755
index 000000000..a6024fbd7
--- /dev/null
+++ b/hutool-setting/src/test/java/cn/hutool/setting/IssueI7G34ETest.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2023 looly(loolly@aliyun.com)
+ * Hutool is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ *          http://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+ * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ */
+
+package cn.hutool.setting;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class IssueI7G34ETest {
+
+	@Test
+	public void readWithBomTest() {
+		final Setting setting = new Setting("test_with_bom.setting");
+		final String s = setting.get("line1", "key1");
+
+		Assert.assertEquals("value1", s);
+	}
+}
diff --git a/hutool-setting/src/test/resources/test_with_bom.setting b/hutool-setting/src/test/resources/test_with_bom.setting
new file mode 100755
index 000000000..32e92aa16
--- /dev/null
+++ b/hutool-setting/src/test/resources/test_with_bom.setting
@@ -0,0 +1,3 @@
+[line1]
+key1 = value1
+key2 = value2