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

fix code

Browse Source
This commit is contained in:
Looly 2023-06-27 10:11:26 +08:00
parent 16fc04d955
commit c3380f7aee
3 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hutool-setting/src/main/java/org/dromara/hutool/setting/SettingLoader.java
View File

@ -125,7 +125,7 @@ public class SettingLoader {
if (line == null) { if (line == null) {
break; break;
} }
line = line.trim(); line = StrUtil.trim(line);
// 跳过注释行和空行 // 跳过注释行和空行
if (StrUtil.isBlank(line) || StrUtil.startWith(line, COMMENT_FLAG_PRE)) { if (StrUtil.isBlank(line) || StrUtil.startWith(line, COMMENT_FLAG_PRE)) {
continue; continue;
@ -133,7 +133,7 @@ public class SettingLoader {
// 记录分组名 // 记录分组名
if (StrUtil.isWrap(line, CharUtil.BRACKET_START, CharUtil.BRACKET_END)) { if (StrUtil.isWrap(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; continue;
} }
@ -149,7 +149,7 @@ public class SettingLoader {
if (this.isUseVariable) { if (this.isUseVariable) {
value = replaceVar(group, value); value = replaceVar(group, value);
} }
this.groupedMap.put(group, keyValue[0].trim(), value); this.groupedMap.put(group, StrUtil.trim(keyValue[0]), value);
} }
} finally { } finally {
IoUtil.closeQuietly(reader); IoUtil.closeQuietly(reader);

28
hutool-setting/src/test/java/org/dromara/hutool/setting/IssueI7G34ETest.java Executable file
View File

@ -0,0 +1,28 @@
/*
* 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 org.dromara.hutool.setting;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
public class IssueI7G34ETest {
@SuppressWarnings("MismatchedQueryAndUpdateOfCollection")
@Test
void readWithBomTest() {
final Setting setting = new Setting("test_with_bom.setting");
final String s = setting.getStrByGroup("key1", "line1");
Assertions.assertEquals("value1", s);
}
}

3
hutool-setting/src/test/resources/test_with_bom.setting Executable file
View File

@ -0,0 +1,3 @@
[line1]
key1 = value1
key2 = value2