Merge pull request #843 from yidadi/master

Optimizing and reusing code

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

@@ -16,11 +16,11 @@
 
 package com.alibaba.cloud.nacos;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 
 import com.alibaba.cloud.nacos.client.NacosPropertySource;
+import com.google.common.collect.Lists;
 
 /**
  * @author xiaojing
@@ -34,9 +34,7 @@ public class NacosPropertySourceRepository {
 	 * @return all nacos properties from application context
 	 */
 	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(

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

@@ -83,23 +83,24 @@ public class NacosPropertySourceBuilder {
 		String data = null;
 		try {
 			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));
-					return properties;
-				}
-				else if (fileExtension.equalsIgnoreCase("yaml")
-						|| fileExtension.equalsIgnoreCase("yml")) {
-					YamlPropertiesFactoryBean yamlFactory = new YamlPropertiesFactoryBean();
-					yamlFactory.setResources(new ByteArrayResource(data.getBytes()));
-					return yamlFactory.getObject();
-				}
 
+			if (fileExtension.equalsIgnoreCase("properties")) {
+				Properties properties = new Properties();
+
+				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) {

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

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