study/Spring-Cloud-Alibaba
1
0
Fork 0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00
Code Issues Releases Wiki Activity

Polish alibaba/spring-cloud-alibaba#1739 : Sync the Nacos Config from master

Browse Source
This commit is contained in:
mercyblitz 2020-09-17 18:38:44 +08:00
parent 2b739a68e1
commit 03f0a44037
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigProperties.java
View File

@ -22,7 +22,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.Properties; import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -485,8 +484,7 @@ public class NacosConfigProperties {
List<Config> result = new ArrayList<>(); List<Config> result = new ArrayList<>();
configList.stream() configList.stream()
.collect(Collectors.groupingBy(cfg -> (cfg.getGroup() + cfg.getDataId()), .collect(Collectors.groupingBy(cfg -> (cfg.getGroup() + cfg.getDataId()),
() -> new ConcurrentHashMap<>(new LinkedHashMap<>()), LinkedHashMap::new, Collectors.toList()))
Collectors.toList()))
.forEach((key, list) -> { .forEach((key, list) -> {
list.stream() list.stream()
.reduce((a, b) -> new Config(a.getDataId(), a.getGroup(), .reduce((a, b) -> new Config(a.getDataId(), a.getGroup(),

4
spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/parser/NacosDataPropertiesParser.java
View File

@ -55,7 +55,9 @@ public class NacosDataPropertiesParser extends AbstractNacosDataParser {
log.warn("the config data is invalid {}", dataLine); log.warn("the config data is invalid {}", dataLine);
continue; continue;
} }
result.put(dataLine.substring(0, index), dataLine.substring(index + 1)); String key = dataLine.substring(0, index);
String value = dataLine.substring(index + 1);
result.put(key.trim(), value.trim());
} }
} }
return result; return result;