zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly
2023-04-23 22:40:36 +08:00
parent e483ed9938
commit 06e091fc4a
130 changed files with 575 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hutool-setting/src/main/java/org/dromara/hutool/setting/Setting.java
View File

@@ -25,7 +25,7 @@ import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.func.LambdaUtil;
import org.dromara.hutool.core.func.SerSupplier;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.core.util.CharUtil;
import org.dromara.hutool.core.text.CharUtil;
import org.dromara.hutool.core.util.CharsetUtil;
import org.dromara.hutool.log.StaticLog;
import org.dromara.hutool.setting.props.Props;

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

@@ -20,7 +20,7 @@ import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.regex.ReUtil;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.core.text.split.SplitUtil;
import org.dromara.hutool.core.util.CharUtil;
import org.dromara.hutool.core.text.CharUtil;
import org.dromara.hutool.core.util.CharsetUtil;
import org.dromara.hutool.core.util.SystemUtil;
import org.dromara.hutool.log.Log;

3
hutool-setting/src/main/java/org/dromara/hutool/setting/toml/TomlReader.java
View File

@@ -65,8 +65,9 @@ public class TomlReader {
public Map<String, Object> read() {
final Map<String, Object> map = nextTableContent();
if (!hasNext() && pos > 0 && data.charAt(pos - 1) == '[')
if (!hasNext() && pos > 0 && data.charAt(pos - 1) == '['){
throw new SettingException("Invalid table declaration at line " + line + ": it never ends");
}
while (hasNext()) {
char c = nextUseful(true);

2
hutool-setting/src/main/java/org/dromara/hutool/setting/toml/TomlWriter.java
View File

@@ -14,7 +14,7 @@ package org.dromara.hutool.setting.toml;
import org.dromara.hutool.core.array.ArrayUtil;
import org.dromara.hutool.core.io.IORuntimeException;
import org.dromara.hutool.core.util.CharUtil;
import org.dromara.hutool.core.text.CharUtil;
import org.dromara.hutool.setting.SettingException;
import java.io.IOException;

22
hutool-setting/src/test/java/org/dromara/hutool/setting/PropsUtilTest.java
View File

@@ -1,22 +0,0 @@
package org.dromara.hutool.setting;
import org.dromara.hutool.setting.props.PropsUtil;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import java.util.Objects;
public class PropsUtilTest {
@Test
public void getTest() {
final String driver = PropsUtil.get("test").getStr("driver");
Assertions.assertEquals("com.mysql.jdbc.Driver", driver);
}
@Test
public void getFirstFoundTest() {
final String driver = Objects.requireNonNull(PropsUtil.getFirstFound("test2", "test")).getStr("driver");
Assertions.assertEquals("com.mysql.jdbc.Driver", driver);
}
}

17
hutool-setting/src/test/java/org/dromara/hutool/setting/PropsTest.java → hutool-setting/src/test/java/org/dromara/hutool/setting/props/PropsTest.java
View File

@@ -1,8 +1,19 @@
package org.dromara.hutool.setting;
/*
* 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.props;
import org.dromara.hutool.core.date.DateUtil;
import org.dromara.hutool.setting.props.Props;
import lombok.Data;
import org.dromara.hutool.core.date.DateUtil;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

34
hutool-setting/src/test/java/org/dromara/hutool/setting/props/PropsUtilTest.java Normal file
View File

@@ -0,0 +1,34 @@
/*
* 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.props;
import org.dromara.hutool.setting.props.PropsUtil;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import java.util.Objects;
public class PropsUtilTest {
@Test
public void getTest() {
final String driver = PropsUtil.get("test").getStr("driver");
Assertions.assertEquals("com.mysql.jdbc.Driver", driver);
}
@Test
public void getFirstFoundTest() {
final String driver = Objects.requireNonNull(PropsUtil.getFirstFound("test2", "test")).getStr("driver");
Assertions.assertEquals("com.mysql.jdbc.Driver", driver);
}
}

14
hutool-setting/src/test/java/org/dromara/hutool/setting/Issue3008Test.java → hutool-setting/src/test/java/org/dromara/hutool/setting/toml/Issue3008Test.java
View File

@@ -1,4 +1,16 @@
package org.dromara.hutool.setting;
/*
* 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.toml;
import org.dromara.hutool.core.array.ArrayUtil;
import org.dromara.hutool.setting.props.Props;