Skip to content

Commit 504b9e1

Browse files
committed
Fix a bug that had misread monitoring preset name and filePath map information
1 parent a0f7d14 commit 504b9e1

File tree

1 file changed

+16
-10
lines changed

1 file changed

+16
-10
lines changed

src/main/java/root/core/service/implement/FilePropertyService.java

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@
22

33
import java.util.ArrayList;
44
import java.util.Arrays;
5+
import java.util.HashMap;
56
import java.util.List;
67
import java.util.Map;
7-
import java.util.Spliterator;
8-
import java.util.Spliterators;
98
import java.util.regex.Matcher;
109
import java.util.regex.Pattern;
1110
import java.util.stream.Collectors;
12-
import java.util.stream.StreamSupport;
1311

12+
import org.apache.commons.configuration2.PropertiesConfiguration;
1413
import org.apache.commons.lang3.StringUtils;
1514

1615
import root.core.domain.JdbcConnectionInfo;
@@ -126,13 +125,20 @@ private List<MonitoringYN> getMonitoringYNList(List<String> aliasList, List<Moni
126125

127126
@Override
128127
public Map<String, String> getMonitoringPresetMap() {
129-
return StreamSupport
130-
.stream(Spliterators.spliteratorUnknownSize(propRepo.getConfiguration("connInfoConfig").getKeys(),
131-
Spliterator.ORDERED), false)
132-
.filter(key -> key.matches(MONITORING_PRESET_KEY)).collect(Collectors.toUnmodifiableMap(key -> {
133-
Matcher m = MONITORING_PRESET_KEY_PATTERN.matcher(key);
134-
return m.matches() ? m.group(1) : "";
135-
}, key -> propRepo.getMonitoringConfigResource(key)));
128+
Map<String, String> result = new HashMap<>();
129+
130+
PropertiesConfiguration config = propRepo.getConfiguration("connInfoConfig");
131+
132+
config.getKeys().forEachRemaining(key -> {
133+
if (key.matches(MONITORING_PRESET_KEY)) {
134+
Matcher m = MONITORING_PRESET_KEY_PATTERN.matcher(key);
135+
if (m.matches()) {
136+
String presetName = m.group(1);
137+
result.put(presetName, config.getString(key));
138+
}
139+
}
140+
});
141+
return result;
136142
}
137143

138144
@Override

0 commit comments

Comments
 (0)