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

Merge pull request #843 from yidadi/master

Browse Source 
Optimizing and reusing code
This commit is contained in:
format 2019-08-15 11:37:32 +08:00 committed by GitHub
commit de902a3813
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosPropertySourceRepository.java
View File

@ -16,11 +16,11 @@
package com.alibaba.cloud.nacos; package com.alibaba.cloud.nacos;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import com.alibaba.cloud.nacos.client.NacosPropertySource; import com.alibaba.cloud.nacos.client.NacosPropertySource;
import com.google.common.collect.Lists;
/** /**
* @author xiaojing * @author xiaojing
@ -34,9 +34,7 @@ public class NacosPropertySourceRepository {
* @return all nacos properties from application context * @return all nacos properties from application context
*/ */
public static List<NacosPropertySource> getAll() { public static List<NacosPropertySource> getAll() {
List<NacosPropertySource> result = new ArrayList<>(); return Lists.newArrayList(NACOS_PROPERTY_SOURCE_REPOSITORY.values());
result.addAll(NACOS_PROPERTY_SOURCE_REPOSITORY.values());
return result;
} }
public static void collectNacosPropertySources( public static void collectNacosPropertySources(

29
spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/client/NacosPropertySourceBuilder.java
View File

@ -83,23 +83,24 @@ public class NacosPropertySourceBuilder {
String data = null; String data = null;
try { try {
data = configService.getConfig(dataId, group, timeout); data = configService.getConfig(dataId, group, timeout);
if (!StringUtils.isEmpty(data)) { if (StringUtils.isEmpty(data)) {
log.info(String.format("Loading nacos data, dataId: '%s', group: '%s'", return EMPTY_PROPERTIES;
dataId, group)); }
if (fileExtension.equalsIgnoreCase("properties")) { log.info(String.format("Loading nacos data, dataId: '%s', group: '%s'",
Properties properties = new Properties(); dataId, group));
properties.load(new StringReader(data)); if (fileExtension.equalsIgnoreCase("properties")) {
return properties; Properties properties = new Properties();
}
else if (fileExtension.equalsIgnoreCase("yaml")
|| fileExtension.equalsIgnoreCase("yml")) {
YamlPropertiesFactoryBean yamlFactory = new YamlPropertiesFactoryBean();
yamlFactory.setResources(new ByteArrayResource(data.getBytes()));
return yamlFactory.getObject();
}
properties.load(new StringReader(data));
return properties;
}
else if (fileExtension.equalsIgnoreCase("yaml")
|| fileExtension.equalsIgnoreCase("yml")) {
YamlPropertiesFactoryBean yamlFactory = new YamlPropertiesFactoryBean();
yamlFactory.setResources(new ByteArrayResource(data.getBytes()));
return yamlFactory.getObject();
} }
} }
catch (NacosException e) { catch (NacosException e) {

3
spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/ribbon/NacosServerList.java
View File

@ -22,6 +22,7 @@ import java.util.List;
import com.alibaba.cloud.nacos.NacosDiscoveryProperties; import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.alibaba.nacos.api.naming.pojo.Instance; import com.alibaba.nacos.api.naming.pojo.Instance;
import com.alibaba.nacos.client.naming.utils.CollectionUtils;
import com.netflix.client.config.IClientConfig; import com.netflix.client.config.IClientConfig;
import com.netflix.loadbalancer.AbstractServerList; import com.netflix.loadbalancer.AbstractServerList;
@ -64,7 +65,7 @@ public class NacosServerList extends AbstractServerList<NacosServer> {
private List<NacosServer> instancesToServerList(List<Instance> instances) { private List<NacosServer> instancesToServerList(List<Instance> instances) {
List<NacosServer> result = new ArrayList<>(); List<NacosServer> result = new ArrayList<>();
if (null == instances) { if (CollectionUtils.isEmpty(instances)) {
return result; return result;
} }
for (Instance instance : instances) { for (Instance instance : instances) {