lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2025-05-04 04:37:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

add method

Browse Source
This commit is contained in:
Looly 2020-03-16 20:33:27 +08:00
parent a39a3bb841
commit f4cdfeed1d
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -6,6 +6,7 @@
## 5.2.4
### 新特性
* 【setting】 Setting中增加addSetting和autoLoad重载（issue#104@Gitee）
### Bug修复

2
hutool-setting/src/main/java/cn/hutool/setting/GroupedMap.java
View File

@ -226,6 +226,7 @@ public class GroupedMap extends LinkedHashMap<String, LinkedHashMap<String, Stri
return this;
}
@SuppressWarnings("NullableProblems")
@Override
public Set<String> keySet() {
readLock.lock();
@ -276,6 +277,7 @@ public class GroupedMap extends LinkedHashMap<String, LinkedHashMap<String, Stri
return Collections.emptyList();
}
@SuppressWarnings("NullableProblems")
@Override
public Set<java.util.Map.Entry<String, LinkedHashMap<String, String>>> entrySet() {
readLock.lock();

5
hutool-setting/src/main/java/cn/hutool/setting/Setting.java
View File

@ -201,7 +201,7 @@ public class Setting extends AbsSetting implements Map<String, String> {
* @param callback 加载完成回调
* @param autoReload 是否自动加载
*/
public void autoLoad(boolean autoReload,Consumer<Boolean> callback) {
public void autoLoad(boolean autoReload, Consumer<Boolean> callback) {
if (autoReload) {
Assert.notNull(this.settingUrl, "Setting URL is null !");
if (null != this.watchMonitor) {
@ -493,8 +493,9 @@ public class Setting extends AbsSetting implements Map<String, String> {
/**
* 添加一个Stting到主配置中
*
* @param setting
* @param setting Setting配置
* @return this
* @since 5.2.4
*/
public Setting addSetting(Setting setting) {
for (Entry<String, LinkedHashMap<String, String>> e : setting.getGroupedMap().entrySet()) {