调整NacosServerListProcessor

Author: saleson

pom.xml

@@ -173,7 +173,7 @@
                 <groupId>cn.springcloud.gray</groupId>
                 <artifactId>spring-cloud-gray-plugin-ribbon-nacos-discovery</artifactId>
                 <version>${project.version}</version>
-            </dependency>w1`
+            </dependency>
 
             <dependency>
                 <groupId>cn.springcloud.gray</groupId>

spring-cloud-gray-plugins/spring-cloud-gray-plugin-ribbon-nacos-discovery/src/main/java/cn/springcloud/gray/client/plugin/ribbon/nacos/NacosServerListProcessor.java

@@ -8,6 +8,8 @@
 import com.alibaba.nacos.api.naming.NamingService;
 import com.alibaba.nacos.api.naming.pojo.Instance;
 import com.netflix.loadbalancer.Server;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.ListUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -29,8 +31,12 @@ public NacosServerListProcessor(GrayHoldoutServerProperties grayHoldoutServerPro
     @Override
     protected List<Server> getServers(String serviceId, List<Server> servers) {
         List<InstanceStatus> statusList = getHoldoutInstanceStatus(serviceId);
-        return getInstances(serviceId).stream().filter(instance -> statusList.contains(getInstanceStatus(instance)))
+        List<Server> holdoutServers = getInstances(serviceId).stream().filter(instance -> statusList.contains(getInstanceStatus(instance)))
                 .map(NacosServer::new).collect(Collectors.toList());
+        if(CollectionUtils.isEmpty(holdoutServers)){
+            return servers;
+        }
+        return ListUtils.union(servers, holdoutServers);
     }
 
 

spring-cloud-gray-plugins/spring-cloud-gray-plugin-ribbon-nacos-discovery/src/main/java/cn/springcloud/gray/client/plugin/ribbon/nacos/configuration/GrayClientRibbonNacosAutoConfiguration.java

@@ -21,11 +21,12 @@
 public class GrayClientRibbonNacosAutoConfiguration {
 
 
-    @Bean
-    public ServerListProcessor<Server> serverListProcessor(
-            GrayHoldoutServerProperties grayHoldoutServerProperties, NacosDiscoveryProperties discoveryProperties){
-        return new NacosServerListProcessor(grayHoldoutServerProperties, discoveryProperties.namingServiceInstance());
-    }
+//    @Bean
+//    @ConditionalOnProperty(value = "gray.holdout-server.enabled")
+//    public ServerListProcessor<Server> serverListProcessor(
+//            GrayHoldoutServerProperties grayHoldoutServerProperties, NacosDiscoveryProperties discoveryProperties){
+//        return new NacosServerListProcessor(grayHoldoutServerProperties, discoveryProperties.namingServiceInstance());
+//    }
 
 
     @Bean