Support Nacos reactive service discovery

Support Nacos reactive discovery

spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceDiscoveryAutoConfiguration.java

@@ -83,7 +83,7 @@ import static com.alibaba.cloud.dubbo.autoconfigure.DubboServiceDiscoveryAutoCon
 import static com.alibaba.cloud.dubbo.autoconfigure.DubboServiceDiscoveryAutoConfiguration.NACOS_DISCOVERY_AUTO_CONFIGURATION_CLASS_NAME;
 import static com.alibaba.cloud.dubbo.autoconfigure.DubboServiceDiscoveryAutoConfiguration.ZOOKEEPER_DISCOVERY_AUTO_CONFIGURATION_CLASS_NAME;
 import static com.alibaba.cloud.dubbo.autoconfigure.DubboServiceRegistrationAutoConfiguration.EUREKA_CLIENT_AUTO_CONFIGURATION_CLASS_NAME;
-import static com.alibaba.cloud.nacos.discovery.NacosDiscoveryClient.hostToServiceInstanceList;
+import static com.alibaba.cloud.nacos.discovery.NacosServiceDiscovery.hostToServiceInstanceList;
 import static org.springframework.util.StringUtils.hasText;
 
 /**

spring-cloud-alibaba-nacos-discovery/pom.xml

@@ -81,6 +81,13 @@
             <artifactId>spring-boot-starter-web</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
+            <optional>true</optional>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -91,6 +98,11 @@
             <artifactId>spring-cloud-test-support</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+			<groupId>io.projectreactor</groupId>
+			<artifactId>reactor-test</artifactId>
+			<scope>test</scope>
+		</dependency>
     </dependencies>
 
     <build>

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

@@ -0,0 +1,55 @@
+/*
+ * Copyright 2013-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.alibaba.cloud.nacos.discovery;
+
+import com.alibaba.cloud.nacos.ConditionalOnNacosDiscoveryEnabled;
+import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
+import com.alibaba.cloud.nacos.NacosNamingManager;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.cloud.client.ConditionalOnDiscoveryEnabled;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author <a href="mailto:echooy.mxq@gmail.com">echooymxq</a>
+ **/
+@Configuration
+@ConditionalOnDiscoveryEnabled
+@ConditionalOnNacosDiscoveryEnabled
+public class NacosDiscoveryAutoConfiguration {
+
+	@Bean
+	public NacosNamingManager nacosNamingManager() {
+		return new NacosNamingManager();
+	}
+
+	@Bean
+	@ConditionalOnMissingBean
+	public NacosDiscoveryProperties nacosProperties() {
+		return new NacosDiscoveryProperties();
+	}
+
+	@Bean
+	@ConditionalOnMissingBean
+	public NacosServiceDiscovery nacosServiceDiscovery(
+			NacosNamingManager nacosNamingManager,
+			NacosDiscoveryProperties discoveryProperties) {
+		return new NacosServiceDiscovery(nacosNamingManager, discoveryProperties);
+	}
+
+}

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

@@ -16,17 +16,9 @@
 
 package com.alibaba.cloud.nacos.discovery;
 
-import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
-import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
-import com.alibaba.cloud.nacos.NacosNamingManager;
-import com.alibaba.cloud.nacos.NacosServiceInstance;
-import com.alibaba.nacos.api.naming.pojo.Instance;
-import com.alibaba.nacos.api.naming.pojo.ListView;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -36,6 +28,7 @@ import org.springframework.cloud.client.discovery.DiscoveryClient;
 /**
  * @author xiaojing
  * @author renhaojun
+ * @author echooymxq
  */
 public class NacosDiscoveryClient implements DiscoveryClient {
 
@@ -46,14 +39,10 @@ public class NacosDiscoveryClient implements DiscoveryClient {
 	 */
 	public static final String DESCRIPTION = "Spring Cloud Nacos Discovery Client";
 
-	private NacosNamingManager nacosNamingManager;
+	private NacosServiceDiscovery serviceDiscovery;
 
-	private NacosDiscoveryProperties discoveryProperties;
+	public NacosDiscoveryClient(NacosServiceDiscovery nacosServiceDiscovery) {
-
+		this.serviceDiscovery = nacosServiceDiscovery;
-	public NacosDiscoveryClient(NacosNamingManager nacosNamingManager,
-			NacosDiscoveryProperties discoveryProperties) {
-		this.nacosNamingManager = nacosNamingManager;
-		this.discoveryProperties = discoveryProperties;
 	}
 
 	@Override
@@ -64,10 +53,7 @@ public class NacosDiscoveryClient implements DiscoveryClient {
 	@Override
 	public List<ServiceInstance> getInstances(String serviceId) {
 		try {
-			String group = discoveryProperties.getGroup();
+			return serviceDiscovery.getInstances(serviceId);
-			List<Instance> instances = nacosNamingManager.getNamingService()
-					.selectInstances(serviceId, group, true);
-			return hostToServiceInstanceList(instances, serviceId);
 		}
 		catch (Exception e) {
 			throw new RuntimeException(
@@ -75,51 +61,10 @@ public class NacosDiscoveryClient implements DiscoveryClient {
 		}
 	}
 
-	public static ServiceInstance hostToServiceInstance(Instance instance,
-			String serviceId) {
-		if (instance == null || !instance.isEnabled() || !instance.isHealthy()) {
-			return null;
-		}
-		NacosServiceInstance nacosServiceInstance = new NacosServiceInstance();
-		nacosServiceInstance.setHost(instance.getIp());
-		nacosServiceInstance.setPort(instance.getPort());
-		nacosServiceInstance.setServiceId(serviceId);
-
-		Map<String, String> metadata = new HashMap<>();
-		metadata.put("nacos.instanceId", instance.getInstanceId());
-		metadata.put("nacos.weight", instance.getWeight() + "");
-		metadata.put("nacos.healthy", instance.isHealthy() + "");
-		metadata.put("nacos.cluster", instance.getClusterName() + "");
-		metadata.putAll(instance.getMetadata());
-		nacosServiceInstance.setMetadata(metadata);
-
-		if (metadata.containsKey("secure")) {
-			boolean secure = Boolean.parseBoolean(metadata.get("secure"));
-			nacosServiceInstance.setSecure(secure);
-		}
-		return nacosServiceInstance;
-	}
-
-	public static List<ServiceInstance> hostToServiceInstanceList(
-			List<Instance> instances, String serviceId) {
-		List<ServiceInstance> result = new ArrayList<>(instances.size());
-		for (Instance instance : instances) {
-			ServiceInstance serviceInstance = hostToServiceInstance(instance, serviceId);
-			if (serviceInstance != null) {
-				result.add(serviceInstance);
-			}
-		}
-		return result;
-	}
-
 	@Override
 	public List<String> getServices() {
-
 		try {
-			String group = discoveryProperties.getGroup();
+			return serviceDiscovery.getServices();
-			ListView<String> services = nacosNamingManager.getNamingService()
-					.getServicesOfServer(1, Integer.MAX_VALUE, group);
-			return services.getData();
 		}
 		catch (Exception e) {
 			log.error("get service name from nacos server fail,", e);

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

@@ -18,12 +18,14 @@ package com.alibaba.cloud.nacos.discovery;
 
 import com.alibaba.cloud.nacos.ConditionalOnNacosDiscoveryEnabled;
 import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
-import com.alibaba.cloud.nacos.NacosNamingManager;
 
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.cloud.client.CommonsClientAutoConfiguration;
+import org.springframework.cloud.client.ConditionalOnBlockingDiscoveryEnabled;
+import org.springframework.cloud.client.ConditionalOnDiscoveryEnabled;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryClientAutoConfiguration;
 import org.springframework.context.annotation.Bean;
@@ -31,23 +33,21 @@ import org.springframework.context.annotation.Configuration;
 
 /**
  * @author xiaojing
+ * @author echooymxq
  */
 @Configuration
+@ConditionalOnDiscoveryEnabled
+@ConditionalOnBlockingDiscoveryEnabled
 @ConditionalOnNacosDiscoveryEnabled
 @AutoConfigureBefore({ SimpleDiscoveryClientAutoConfiguration.class,
 		CommonsClientAutoConfiguration.class })
-public class NacosDiscoveryClientAutoConfiguration {
+@AutoConfigureAfter(NacosDiscoveryAutoConfiguration.class)
+public class NacosDiscoveryClientConfiguration {
 
 	@Bean
-	@ConditionalOnMissingBean
+	public DiscoveryClient nacosDiscoveryClient(
-	public NacosDiscoveryProperties nacosProperties() {
+			NacosServiceDiscovery nacosServiceDiscovery) {
-		return new NacosDiscoveryProperties();
+		return new NacosDiscoveryClient(nacosServiceDiscovery);
-	}
-
-	@Bean
-	public DiscoveryClient nacosDiscoveryClient(NacosNamingManager nacosNamingManager,
-			NacosDiscoveryProperties discoveryProperties) {
-		return new NacosDiscoveryClient(nacosNamingManager, discoveryProperties);
 	}
 
 	@Bean

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

@@ -0,0 +1,110 @@
+/*
+ * Copyright 2013-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.alibaba.cloud.nacos.discovery;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
+import com.alibaba.cloud.nacos.NacosNamingManager;
+import com.alibaba.cloud.nacos.NacosServiceInstance;
+import com.alibaba.nacos.api.exception.NacosException;
+import com.alibaba.nacos.api.naming.pojo.Instance;
+import com.alibaba.nacos.api.naming.pojo.ListView;
+
+import org.springframework.cloud.client.ServiceInstance;
+
+/**
+ * @author <a href="mailto:echooy.mxq@gmail.com">echooymxq</a>
+ **/
+public class NacosServiceDiscovery {
+
+	private NacosNamingManager nacosNamingManager;
+
+	private NacosDiscoveryProperties discoveryProperties;
+
+	public NacosServiceDiscovery(NacosNamingManager nacosNamingManager,
+			NacosDiscoveryProperties discoveryProperties) {
+		this.nacosNamingManager = nacosNamingManager;
+		this.discoveryProperties = discoveryProperties;
+	}
+
+	/**
+	 * Return all instances for the given service.
+	 * @param serviceId id of service
+	 * @return list of instances
+	 * @throws NacosException nacosException
+	 */
+	public List<ServiceInstance> getInstances(String serviceId) throws NacosException {
+		String group = discoveryProperties.getGroup();
+		List<Instance> instances = nacosNamingManager.getNamingService()
+				.selectInstances(serviceId, group, true);
+		return hostToServiceInstanceList(instances, serviceId);
+	}
+
+	/**
+	 * Return the names of all services.
+	 * @return list of service names
+	 * @throws NacosException nacosException
+	 */
+	public List<String> getServices() throws NacosException {
+		String group = discoveryProperties.getGroup();
+		ListView<String> services = nacosNamingManager.getNamingService()
+				.getServicesOfServer(1, Integer.MAX_VALUE, group);
+		return services.getData();
+	}
+
+	public static List<ServiceInstance> hostToServiceInstanceList(
+			List<Instance> instances, String serviceId) {
+		List<ServiceInstance> result = new ArrayList<>(instances.size());
+		for (Instance instance : instances) {
+			ServiceInstance serviceInstance = hostToServiceInstance(instance, serviceId);
+			if (serviceInstance != null) {
+				result.add(serviceInstance);
+			}
+		}
+		return result;
+	}
+
+	public static ServiceInstance hostToServiceInstance(Instance instance,
+			String serviceId) {
+		if (instance == null || !instance.isEnabled() || !instance.isHealthy()) {
+			return null;
+		}
+		NacosServiceInstance nacosServiceInstance = new NacosServiceInstance();
+		nacosServiceInstance.setHost(instance.getIp());
+		nacosServiceInstance.setPort(instance.getPort());
+		nacosServiceInstance.setServiceId(serviceId);
+
+		Map<String, String> metadata = new HashMap<>();
+		metadata.put("nacos.instanceId", instance.getInstanceId());
+		metadata.put("nacos.weight", instance.getWeight() + "");
+		metadata.put("nacos.healthy", instance.isHealthy() + "");
+		metadata.put("nacos.cluster", instance.getClusterName() + "");
+		metadata.putAll(instance.getMetadata());
+		nacosServiceInstance.setMetadata(metadata);
+
+		if (metadata.containsKey("secure")) {
+			boolean secure = Boolean.parseBoolean(metadata.get("secure"));
+			nacosServiceInstance.setSecure(secure);
+		}
+		return nacosServiceInstance;
+	}
+
+}

spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/configclient/NacosDiscoveryClientConfigServiceBootstrapConfiguration.java

@@ -16,8 +16,9 @@
 
 package com.alibaba.cloud.nacos.discovery.configclient;
 
-import com.alibaba.cloud.nacos.NacosDiscoveryAutoConfiguration;
+import com.alibaba.cloud.nacos.discovery.NacosDiscoveryAutoConfiguration;
-import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
+import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientConfiguration;
+import com.alibaba.cloud.nacos.discovery.reactive.NacosReactiveDiscoveryClientConfiguration;
 
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -34,8 +35,9 @@ import org.springframework.context.annotation.Configuration;
 @ConditionalOnProperty(value = "spring.cloud.config.discovery.enabled",
 		matchIfMissing = false)
 @Configuration
-@ImportAutoConfiguration({ NacosDiscoveryClientAutoConfiguration.class,
+@ImportAutoConfiguration({ NacosDiscoveryAutoConfiguration.class,
-		NacosDiscoveryAutoConfiguration.class })
+		NacosDiscoveryClientConfiguration.class,
+		NacosReactiveDiscoveryClientConfiguration.class })
 public class NacosDiscoveryClientConfigServiceBootstrapConfiguration {
 
 }

spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/reactive/NacosReactiveDiscoveryClient.java

@@ -0,0 +1,82 @@
+/*
+ * Copyright 2013-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.alibaba.cloud.nacos.discovery.reactive;
+
+import java.util.function.Function;
+
+import com.alibaba.cloud.nacos.discovery.NacosServiceDiscovery;
+import com.alibaba.nacos.api.exception.NacosException;
+import org.reactivestreams.Publisher;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import org.springframework.cloud.client.ServiceInstance;
+import org.springframework.cloud.client.discovery.ReactiveDiscoveryClient;
+
+/**
+ * @author <a href="mailto:echooy.mxq@gmail.com">echooymxq</a>
+ **/
+public class NacosReactiveDiscoveryClient implements ReactiveDiscoveryClient {
+
+	private static final Logger log = LoggerFactory
+			.getLogger(NacosReactiveDiscoveryClient.class);
+
+	private NacosServiceDiscovery serviceDiscovery;
+
+	public NacosReactiveDiscoveryClient(NacosServiceDiscovery nacosServiceDiscovery) {
+		this.serviceDiscovery = nacosServiceDiscovery;
+	}
+
+	@Override
+	public String description() {
+		return "Spring Cloud Nacos Reactive Discovery Client";
+	}
+
+	@Override
+	public Flux<ServiceInstance> getInstances(String serviceId) {
+
+		return Mono.justOrEmpty(serviceId).flatMapMany(loadInstancesFromNacos());
+	}
+
+	private Function<String, Publisher<ServiceInstance>> loadInstancesFromNacos() {
+		return serviceId -> {
+			try {
+				return Flux.fromIterable(serviceDiscovery.getInstances(serviceId));
+			}
+			catch (NacosException e) {
+				log.error("get service instance[{}] from nacos error!", serviceId, e);
+				return Flux.empty();
+			}
+		};
+	}
+
+	@Override
+	public Flux<String> getServices() {
+		return Flux.defer(() -> {
+			try {
+				return Flux.fromIterable(serviceDiscovery.getServices());
+			}
+			catch (Exception e) {
+				log.error("get services from nacos server fail,", e);
+				return Flux.empty();
+			}
+		});
+	}
+
+}

spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/reactive/NacosReactiveDiscoveryClientConfiguration.java

@@ -0,0 +1,52 @@
+/*
+ * Copyright 2013-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.alibaba.cloud.nacos.discovery.reactive;
+
+import com.alibaba.cloud.nacos.ConditionalOnNacosDiscoveryEnabled;
+import com.alibaba.cloud.nacos.discovery.NacosDiscoveryAutoConfiguration;
+import com.alibaba.cloud.nacos.discovery.NacosServiceDiscovery;
+
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.cloud.client.ConditionalOnDiscoveryEnabled;
+import org.springframework.cloud.client.ConditionalOnReactiveDiscoveryEnabled;
+import org.springframework.cloud.client.ReactiveCommonsClientAutoConfiguration;
+import org.springframework.cloud.client.discovery.composite.reactive.ReactiveCompositeDiscoveryClientAutoConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author <a href="mailto:echooy.mxq@gmail.com">echooymxq</a>
+ **/
+@Configuration
+@ConditionalOnDiscoveryEnabled
+@ConditionalOnReactiveDiscoveryEnabled
+@ConditionalOnNacosDiscoveryEnabled
+@AutoConfigureAfter({ NacosDiscoveryAutoConfiguration.class,
+		ReactiveCompositeDiscoveryClientAutoConfiguration.class })
+@AutoConfigureBefore({ ReactiveCommonsClientAutoConfiguration.class })
+public class NacosReactiveDiscoveryClientConfiguration {
+
+	@Bean
+	@ConditionalOnMissingBean
+	public NacosReactiveDiscoveryClient nacosReactiveDiscoveryClient(
+			NacosServiceDiscovery nacosServiceDiscovery) {
+		return new NacosReactiveDiscoveryClient(nacosServiceDiscovery);
+	}
+
+}

spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/registry/NacosServiceRegistryAutoConfiguration.java

@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-package com.alibaba.cloud.nacos;
+package com.alibaba.cloud.nacos.registry;
 
-import com.alibaba.cloud.nacos.registry.NacosAutoServiceRegistration;
+import com.alibaba.cloud.nacos.ConditionalOnNacosDiscoveryEnabled;
-import com.alibaba.cloud.nacos.registry.NacosRegistration;
+import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
-import com.alibaba.cloud.nacos.registry.NacosServiceRegistry;
+import com.alibaba.cloud.nacos.NacosNamingManager;
+import com.alibaba.cloud.nacos.discovery.NacosDiscoveryAutoConfiguration;
 
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -41,8 +42,9 @@ import org.springframework.context.annotation.Configuration;
 @ConditionalOnProperty(value = "spring.cloud.service-registry.auto-registration.enabled",
 		matchIfMissing = true)
 @AutoConfigureAfter({ AutoServiceRegistrationConfiguration.class,
-		AutoServiceRegistrationAutoConfiguration.class })
+		AutoServiceRegistrationAutoConfiguration.class,
-public class NacosDiscoveryAutoConfiguration {
+		NacosDiscoveryAutoConfiguration.class })
+public class NacosServiceRegistryAutoConfiguration {
 
 	@Bean
 	public NacosServiceRegistry nacosServiceRegistry(
@@ -51,11 +53,6 @@ public class NacosDiscoveryAutoConfiguration {
 		return new NacosServiceRegistry(nacosNamingManager, nacosDiscoveryProperties);
 	}
 
-	@Bean
-	public NacosNamingManager nacosNamingManager() {
-		return new NacosNamingManager();
-	}
-
 	@Bean
 	@ConditionalOnBean(AutoServiceRegistrationProperties.class)
 	public NacosRegistration nacosRegistration(NacosNamingManager nacosNamingManager,

spring-cloud-alibaba-nacos-discovery/src/main/resources/META-INF/spring.factories

@@ -1,8 +1,10 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-  com.alibaba.cloud.nacos.NacosDiscoveryAutoConfiguration,\
+  com.alibaba.cloud.nacos.discovery.NacosDiscoveryAutoConfiguration,\
   com.alibaba.cloud.nacos.ribbon.RibbonNacosAutoConfiguration,\
   com.alibaba.cloud.nacos.endpoint.NacosDiscoveryEndpointAutoConfiguration,\
-  com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration,\
+  com.alibaba.cloud.nacos.registry.NacosServiceRegistryAutoConfiguration,\
+  com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientConfiguration,\
+  com.alibaba.cloud.nacos.discovery.reactive.NacosReactiveDiscoveryClientConfiguration,\
   com.alibaba.cloud.nacos.discovery.configclient.NacosConfigServerAutoConfiguration
 org.springframework.cloud.bootstrap.BootstrapConfiguration=\
   com.alibaba.cloud.nacos.discovery.configclient.NacosDiscoveryClientConfigServiceBootstrapConfiguration

spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/NacosDiscoveryClientTests.java

@@ -16,119 +16,59 @@
 
 package com.alibaba.cloud.nacos;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedList;
 import java.util.List;
 
 import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClient;
-import com.alibaba.nacos.api.naming.NamingService;
+import com.alibaba.cloud.nacos.discovery.NacosServiceDiscovery;
-import com.alibaba.nacos.api.naming.pojo.Instance;
+import org.junit.jupiter.api.Test;
-import com.alibaba.nacos.api.naming.pojo.ListView;
+import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.Test;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import org.springframework.cloud.client.ServiceInstance;
 
-import static com.alibaba.cloud.nacos.test.NacosMockTest.serviceInstance;
+import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 /**
  * @author xiaojing
+ * @author echooymxq
  */
+@ExtendWith(MockitoExtension.class)
 public class NacosDiscoveryClientTests {
 
-	private String host = "123.123.123.123";
+	@Mock
+	private NacosServiceDiscovery serviceDiscovery;
 
-	private int port = 8888;
+	@Mock
+	private NacosServiceInstance serviceInstance;
 
-	private String serviceName = "test-service";
+	@InjectMocks
+	private NacosDiscoveryClient client;
 
 	@Test
-	public void testGetServers() throws Exception {
+	public void testGetInstances() throws Exception {
 
-		ArrayList<Instance> instances = new ArrayList<>();
+		when(serviceDiscovery.getInstances("service-1"))
+				.thenReturn(singletonList(serviceInstance));
 
-		HashMap<String, String> map = new HashMap<>();
+		List<ServiceInstance> serviceInstances = client.getInstances("service-1");
-		map.put("test-key", "test-value");
-		map.put("secure", "true");
 
-		instances.add(serviceInstance(serviceName, true, host, port, map));
+		assertThat(serviceInstances).isNotEmpty();
-
-		NacosDiscoveryProperties nacosDiscoveryProperties = mock(
-				NacosDiscoveryProperties.class);
-		NacosNamingManager nacosNamingManager = mock(NacosNamingManager.class);
-
-		NamingService namingService = mock(NamingService.class);
-
-		when(nacosNamingManager.getNamingService()).thenReturn(namingService);
-		when(nacosDiscoveryProperties.getGroup()).thenReturn("DEFAULT");
-		when(namingService.selectInstances(eq(serviceName), eq("DEFAULT"), eq(true)))
-				.thenReturn(instances);
-
-		NacosDiscoveryClient discoveryClient = new NacosDiscoveryClient(
-				nacosNamingManager, nacosDiscoveryProperties);
-
-		List<ServiceInstance> serviceInstances = discoveryClient
-				.getInstances(serviceName);
-
-		assertThat(serviceInstances.size()).isEqualTo(1);
-
-		ServiceInstance serviceInstance = serviceInstances.get(0);
-
-		assertThat(serviceInstance.getServiceId()).isEqualTo(serviceName);
-		assertThat(serviceInstance.getHost()).isEqualTo(host);
-		assertThat(serviceInstance.getPort()).isEqualTo(port);
-		assertThat(serviceInstance.isSecure()).isEqualTo(true);
-		assertThat(serviceInstance.getUri().toString())
-				.isEqualTo(getUri(serviceInstance));
-		assertThat(serviceInstance.getMetadata().get("test-key")).isEqualTo("test-value");
 
 	}
 
 	@Test
-	public void testGetAllService() throws Exception {
+	public void testGetServices() throws Exception {
 
-		ListView<String> nacosServices = new ListView<>();
+		when(serviceDiscovery.getServices()).thenReturn(singletonList("service-1"));
 
-		nacosServices.setData(new LinkedList<>());
+		List<String> services = client.getServices();
 
-		nacosServices.getData().add(serviceName + "1");
+		assertThat(services).contains("service-1").size().isEqualTo(1);
-		nacosServices.getData().add(serviceName + "2");
-		nacosServices.getData().add(serviceName + "3");
 
-		NacosDiscoveryProperties nacosDiscoveryProperties = mock(
-				NacosDiscoveryProperties.class);
-		NacosNamingManager nacosNamingManager = mock(NacosNamingManager.class);
-
-		NamingService namingService = mock(NamingService.class);
-
-		NacosDiscoveryClient discoveryClient = new NacosDiscoveryClient(
-				nacosNamingManager, nacosDiscoveryProperties);
-
-		when(nacosNamingManager.getNamingService()).thenReturn(namingService);
-		when(nacosDiscoveryProperties.getGroup()).thenReturn("DEFAULT");
-		when(namingService.getServicesOfServer(eq(1), eq(Integer.MAX_VALUE),
-				eq("DEFAULT"))).thenReturn(nacosServices);
-
-		List<String> services = discoveryClient.getServices();
-
-		assertThat(services.size()).isEqualTo(3);
-		assertThat(services.contains(serviceName + "1"));
-		assertThat(services.contains(serviceName + "2"));
-		assertThat(services.contains(serviceName + "3"));
-
-	}
-
-	private String getUri(ServiceInstance instance) {
-
-		if (instance.isSecure()) {
-			return "https://" + host + ":" + port;
-		}
-
-		return "http://" + host + ":" + port;
 	}
 
 }

spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/NacosDiscoveryPropertiesServerAddressBothLevelTests.java

@@ -16,7 +16,8 @@
 
 package com.alibaba.cloud.nacos;
 
-import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
+import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientConfiguration;
+import com.alibaba.cloud.nacos.registry.NacosServiceRegistryAutoConfiguration;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -53,8 +54,8 @@ public class NacosDiscoveryPropertiesServerAddressBothLevelTests {
 	@Configuration
 	@EnableAutoConfiguration
 	@ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class,
-			NacosDiscoveryClientAutoConfiguration.class,
+			NacosDiscoveryClientConfiguration.class,
-			NacosDiscoveryAutoConfiguration.class })
+			NacosServiceRegistryAutoConfiguration.class })
 	public static class TestConfig {
 
 	}

spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/NacosDiscoveryPropertiesServerAddressTopLevelTests.java

@@ -16,7 +16,8 @@
 
 package com.alibaba.cloud.nacos;
 
-import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
+import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientConfiguration;
+import com.alibaba.cloud.nacos.registry.NacosServiceRegistryAutoConfiguration;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -54,8 +55,8 @@ public class NacosDiscoveryPropertiesServerAddressTopLevelTests {
 	@Configuration
 	@EnableAutoConfiguration
 	@ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class,
-			NacosDiscoveryClientAutoConfiguration.class,
+			NacosDiscoveryClientConfiguration.class,
-			NacosDiscoveryAutoConfiguration.class })
+			NacosServiceRegistryAutoConfiguration.class })
 	public static class TestConfig {
 
 	}

spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/discovery/NacosDiscoveryAutoConfigurationTests.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2013-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.alibaba.cloud.nacos.discovery;
+
+import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
+import com.alibaba.cloud.nacos.NacosNamingManager;
+import org.junit.jupiter.api.Test;
+
+import org.springframework.boot.autoconfigure.AutoConfigurations;
+import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.cloud.commons.util.UtilAutoConfiguration;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author <a href="mailto:echooy.mxq@gmail.com">echooymxq</a>
+ **/
+public class NacosDiscoveryAutoConfigurationTests {
+
+	private ApplicationContextRunner contextRunner = new ApplicationContextRunner()
+			.withConfiguration(AutoConfigurations.of(UtilAutoConfiguration.class,
+					NacosDiscoveryAutoConfiguration.class));
+
+	@Test
+	public void testDefaultInitialization() {
+		contextRunner.run(context -> {
+			assertThat(context).hasSingleBean(NacosDiscoveryProperties.class);
+			assertThat(context).hasSingleBean(NacosNamingManager.class);
+			assertThat(context).hasSingleBean(NacosServiceDiscovery.class);
+		});
+	}
+
+}

spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/discovery/NacosDiscoveryClientConfigurationTest.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright 2013-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.alibaba.cloud.nacos.discovery;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.boot.autoconfigure.AutoConfigurations;
+import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.cloud.client.discovery.DiscoveryClient;
+import org.springframework.cloud.commons.util.UtilAutoConfiguration;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author <a href="mailto:echooy.mxq@gmail.com">echooymxq</a>
+ **/
+public class NacosDiscoveryClientConfigurationTest {
+
+	private ApplicationContextRunner contextRunner = new ApplicationContextRunner()
+			.withConfiguration(AutoConfigurations.of(UtilAutoConfiguration.class,
+					NacosDiscoveryAutoConfiguration.class,
+					NacosDiscoveryClientConfiguration.class));
+
+	@Test
+	public void testDefaultInitialization() {
+		contextRunner.run(context -> {
+			assertThat(context).hasSingleBean(DiscoveryClient.class);
+			assertThat(context).hasSingleBean(NacosWatch.class);
+		});
+	}
+
+	@Test
+	public void testDiscoveryBlockingDisabled() {
+		contextRunner.withPropertyValues("spring.cloud.discovery.blocking.enabled=false")
+				.run(context -> {
+					assertThat(context).doesNotHaveBean(DiscoveryClient.class);
+					assertThat(context).doesNotHaveBean(NacosWatch.class);
+				});
+	}
+
+}

spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/discovery/NacosServiceDiscoveryTest.java

@@ -0,0 +1,135 @@
+/*
+ * Copyright 2013-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.alibaba.cloud.nacos.discovery;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+
+import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
+import com.alibaba.cloud.nacos.NacosNamingManager;
+import com.alibaba.nacos.api.exception.NacosException;
+import com.alibaba.nacos.api.naming.NamingService;
+import com.alibaba.nacos.api.naming.pojo.Instance;
+import com.alibaba.nacos.api.naming.pojo.ListView;
+import org.junit.jupiter.api.Test;
+
+import org.springframework.cloud.client.ServiceInstance;
+
+import static com.alibaba.cloud.nacos.test.NacosMockTest.serviceInstance;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+/**
+ * @author xiaojing
+ * @author echooymxq
+ **/
+public class NacosServiceDiscoveryTest {
+
+	private String host = "123.123.123.123";
+
+	private int port = 8888;
+
+	private String serviceName = "test-service";
+
+	@Test
+	public void testGetInstances() throws NacosException {
+		ArrayList<Instance> instances = new ArrayList<>();
+
+		HashMap<String, String> map = new HashMap<>();
+		map.put("test-key", "test-value");
+		map.put("secure", "true");
+
+		instances.add(serviceInstance(serviceName, true, host, port, map));
+
+		NacosDiscoveryProperties nacosDiscoveryProperties = mock(
+				NacosDiscoveryProperties.class);
+
+		NacosNamingManager nacosNamingManager = mock(NacosNamingManager.class);
+
+		NamingService namingService = mock(NamingService.class);
+
+		when(nacosNamingManager.getNamingService()).thenReturn(namingService);
+		when(nacosDiscoveryProperties.getGroup()).thenReturn("DEFAULT");
+		when(namingService.selectInstances(eq(serviceName), eq("DEFAULT"), eq(true)))
+				.thenReturn(instances);
+
+		NacosServiceDiscovery serviceDiscovery = new NacosServiceDiscovery(
+				nacosNamingManager, nacosDiscoveryProperties);
+
+		List<ServiceInstance> serviceInstances = serviceDiscovery
+				.getInstances(serviceName);
+
+		assertThat(serviceInstances.size()).isEqualTo(1);
+
+		ServiceInstance serviceInstance = serviceInstances.get(0);
+
+		assertThat(serviceInstance.getServiceId()).isEqualTo(serviceName);
+		assertThat(serviceInstance.getHost()).isEqualTo(host);
+		assertThat(serviceInstance.getPort()).isEqualTo(port);
+		assertThat(serviceInstance.isSecure()).isEqualTo(true);
+		assertThat(serviceInstance.getUri().toString())
+				.isEqualTo(getUri(serviceInstance));
+		assertThat(serviceInstance.getMetadata().get("test-key")).isEqualTo("test-value");
+	}
+
+	@Test
+	public void testGetServices() throws NacosException {
+		ListView<String> nacosServices = new ListView<>();
+
+		nacosServices.setData(new LinkedList<>());
+
+		nacosServices.getData().add(serviceName + "1");
+		nacosServices.getData().add(serviceName + "2");
+		nacosServices.getData().add(serviceName + "3");
+
+		NacosDiscoveryProperties nacosDiscoveryProperties = mock(
+				NacosDiscoveryProperties.class);
+
+		NacosNamingManager nacosNamingManager = mock(NacosNamingManager.class);
+
+		NamingService namingService = mock(NamingService.class);
+
+		when(nacosNamingManager.getNamingService()).thenReturn(namingService);
+		when(nacosDiscoveryProperties.getGroup()).thenReturn("DEFAULT");
+		when(namingService.getServicesOfServer(eq(1), eq(Integer.MAX_VALUE),
+				eq("DEFAULT"))).thenReturn(nacosServices);
+
+		NacosServiceDiscovery serviceDiscovery = new NacosServiceDiscovery(
+				nacosNamingManager, nacosDiscoveryProperties);
+
+		List<String> services = serviceDiscovery.getServices();
+
+		assertThat(services.size()).isEqualTo(3);
+		assertThat(services.contains(serviceName + "1"));
+		assertThat(services.contains(serviceName + "2"));
+		assertThat(services.contains(serviceName + "3"));
+	}
+
+	private String getUri(ServiceInstance instance) {
+
+		if (instance.isSecure()) {
+			return "https://" + host + ":" + port;
+		}
+
+		return "http://" + host + ":" + port;
+	}
+
+}

spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/discovery/reactive/NacosReactiveDiscoveryClientConfigurationTests.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright 2013-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.alibaba.cloud.nacos.discovery.reactive;
+
+import com.alibaba.cloud.nacos.discovery.NacosDiscoveryAutoConfiguration;
+import org.junit.jupiter.api.Test;
+
+import org.springframework.boot.autoconfigure.AutoConfigurations;
+import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.cloud.client.discovery.ReactiveDiscoveryClient;
+import org.springframework.cloud.commons.util.UtilAutoConfiguration;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author <a href="mailto:echooy.mxq@gmail.com">echooymxq</a>
+ **/
+public class NacosReactiveDiscoveryClientConfigurationTests {
+
+	private ApplicationContextRunner contextRunner = new ApplicationContextRunner()
+			.withConfiguration(AutoConfigurations.of(UtilAutoConfiguration.class,
+					NacosDiscoveryAutoConfiguration.class,
+					NacosReactiveDiscoveryClientConfiguration.class));
+
+	@Test
+	public void testDefaultInitialization() {
+		contextRunner.run(context -> assertThat(context)
+				.hasSingleBean(ReactiveDiscoveryClient.class));
+	}
+
+}

spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/discovery/reactive/NacosReactiveDiscoveryClientTests.java

@@ -0,0 +1,74 @@
+/*
+ * Copyright 2013-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.alibaba.cloud.nacos.discovery.reactive;
+
+import java.util.Arrays;
+
+import com.alibaba.cloud.nacos.discovery.NacosServiceDiscovery;
+import com.alibaba.nacos.api.exception.NacosException;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import reactor.core.publisher.Flux;
+import reactor.test.StepVerifier;
+
+import org.springframework.cloud.client.ServiceInstance;
+
+import static java.util.Collections.singletonList;
+import static org.mockito.Mockito.when;
+
+/**
+ * @author <a href="mailto:echooy.mxq@gmail.com">echooymxq</a>
+ **/
+@ExtendWith(MockitoExtension.class)
+class NacosReactiveDiscoveryClientTests {
+
+	@Mock
+	private NacosServiceDiscovery serviceDiscovery;
+
+	@Mock
+	private ServiceInstance serviceInstance;
+
+	@InjectMocks
+	private NacosReactiveDiscoveryClient client;
+
+	@Test
+	void testGetInstances() throws NacosException {
+
+		when(serviceDiscovery.getInstances("reactive-service"))
+				.thenReturn(singletonList(serviceInstance));
+
+		Flux<ServiceInstance> instances = this.client.getInstances("reactive-service");
+
+		StepVerifier.create(instances).expectNextCount(1).expectComplete().verify();
+	}
+
+	@Test
+	void testGetServices() throws NacosException {
+
+		when(serviceDiscovery.getServices())
+				.thenReturn(Arrays.asList("reactive-service1", "reactive-service2"));
+
+		Flux<String> services = this.client.getServices();
+
+		StepVerifier.create(services).expectNext("reactive-service1", "reactive-service2")
+				.expectComplete().verify();
+	}
+
+}

spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationIpNetworkInterfaceTests.java

@@ -21,9 +21,8 @@ import java.net.InetAddress;
 import java.net.NetworkInterface;
 import java.util.Enumeration;
 
-import com.alibaba.cloud.nacos.NacosDiscoveryAutoConfiguration;
 import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
-import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
+import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientConfiguration;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -104,8 +103,8 @@ public class NacosAutoServiceRegistrationIpNetworkInterfaceTests {
 	@Configuration
 	@EnableAutoConfiguration
 	@ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class,
-			NacosDiscoveryClientAutoConfiguration.class,
+			NacosDiscoveryClientConfiguration.class,
-			NacosDiscoveryAutoConfiguration.class })
+			NacosServiceRegistryAutoConfiguration.class })
 	public static class TestConfig {
 
 		static boolean hasValidNetworkInterface = false;

spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationIpTests.java

@@ -16,9 +16,8 @@
 
 package com.alibaba.cloud.nacos.registry;
 
-import com.alibaba.cloud.nacos.NacosDiscoveryAutoConfiguration;
 import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
-import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
+import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientConfiguration;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -70,8 +69,8 @@ public class NacosAutoServiceRegistrationIpTests {
 	@Configuration
 	@EnableAutoConfiguration
 	@ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class,
-			NacosDiscoveryClientAutoConfiguration.class,
+			NacosDiscoveryClientConfiguration.class,
-			NacosDiscoveryAutoConfiguration.class })
+			NacosServiceRegistryAutoConfiguration.class })
 	public static class TestConfig {
 
 	}

spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationManagementPortTests.java

@@ -16,9 +16,8 @@
 
 package com.alibaba.cloud.nacos.registry;
 
-import com.alibaba.cloud.nacos.NacosDiscoveryAutoConfiguration;
 import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
-import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
+import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientConfiguration;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -77,8 +76,8 @@ public class NacosAutoServiceRegistrationManagementPortTests {
 	@Configuration
 	@EnableAutoConfiguration
 	@ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class,
-			NacosDiscoveryClientAutoConfiguration.class,
+			NacosDiscoveryClientConfiguration.class,
-			NacosDiscoveryAutoConfiguration.class })
+			NacosServiceRegistryAutoConfiguration.class })
 	public static class TestConfig {
 
 	}

spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationPortTests.java

@@ -16,9 +16,8 @@
 
 package com.alibaba.cloud.nacos.registry;
 
-import com.alibaba.cloud.nacos.NacosDiscoveryAutoConfiguration;
 import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
-import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
+import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientConfiguration;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -70,8 +69,8 @@ public class NacosAutoServiceRegistrationPortTests {
 	@Configuration
 	@EnableAutoConfiguration
 	@ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class,
-			NacosDiscoveryClientAutoConfiguration.class,
+			NacosDiscoveryClientConfiguration.class,
-			NacosDiscoveryAutoConfiguration.class })
+			NacosServiceRegistryAutoConfiguration.class })
 	public static class TestConfig {
 
 	}

spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationTests.java

@@ -18,10 +18,9 @@ package com.alibaba.cloud.nacos.registry;
 
 import java.util.Map;
 
-import com.alibaba.cloud.nacos.NacosDiscoveryAutoConfiguration;
 import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
 import com.alibaba.cloud.nacos.NacosNamingManager;
-import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
+import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientConfiguration;
 import com.alibaba.cloud.nacos.endpoint.NacosDiscoveryEndpoint;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -194,8 +193,8 @@ public class NacosAutoServiceRegistrationTests {
 	@Configuration
 	@EnableAutoConfiguration
 	@ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class,
-			NacosDiscoveryClientAutoConfiguration.class,
+			NacosDiscoveryClientConfiguration.class,
-			NacosDiscoveryAutoConfiguration.class })
+			NacosServiceRegistryAutoConfiguration.class })
 	public static class TestConfig {
 
 	}

spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/ribbon/NacosRibbonClientConfigurationTests.java

@@ -16,7 +16,7 @@
 
 package com.alibaba.cloud.nacos.ribbon;
 
-import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
+import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientConfiguration;
 import com.netflix.client.config.DefaultClientConfigImpl;
 import com.netflix.client.config.IClientConfig;
 import org.junit.Test;
@@ -40,7 +40,7 @@ public class NacosRibbonClientConfigurationTests {
 	private WebApplicationContextRunner contextRunner = new WebApplicationContextRunner()
 			.withConfiguration(AutoConfigurations.of(NacosRibbonTestConfiguration.class,
 					NacosRibbonClientConfiguration.class,
-					NacosDiscoveryClientAutoConfiguration.class,
+					NacosDiscoveryClientConfiguration.class,
 					RibbonNacosAutoConfiguration.class))
 			.withPropertyValues("spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848")
 			.withPropertyValues("spring.cloud.nacos.discovery.port=18080")

spring-cloud-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/nacos/SidecarNacosAutoConfiguration.java

@@ -17,7 +17,7 @@
 package com.alibaba.cloud.sidecar.nacos;
 
 import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
-import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
+import com.alibaba.cloud.nacos.discovery.NacosDiscoveryAutoConfiguration;
 import com.alibaba.cloud.sidecar.SidecarAutoConfiguration;
 import com.alibaba.cloud.sidecar.SidecarDiscoveryClient;
 import com.alibaba.cloud.sidecar.SidecarProperties;
@@ -32,7 +32,7 @@ import org.springframework.context.annotation.Configuration;
  * @author www.itmuch.com
  */
 @Configuration
-@AutoConfigureBefore({ NacosDiscoveryClientAutoConfiguration.class,
+@AutoConfigureBefore({ NacosDiscoveryAutoConfiguration.class,
 		SidecarAutoConfiguration.class })
 @ConditionalOnClass(NacosDiscoveryProperties.class)
 public class SidecarNacosAutoConfiguration {