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

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
Download Patch File Download Diff File Expand all files Collapse all files

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();

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

@@ -194,14 +194,14 @@ public class Setting extends AbsSetting implements Map<String, String> {
public void autoLoad(boolean autoReload) {
autoLoad(autoReload, null);
}
/**
* 在配置文件变更时自动加载
*
*
* @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) {
@@ -489,12 +489,13 @@ public class Setting extends AbsSetting implements Map<String, String> {
this.groupedMap.putAll(group, m);
return this;
}
/**
* 添加一个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()) {