Support Nacos reactive service discovery

Support Nacos reactive discovery

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.nacos.api.naming.pojo.Instance;
-import com.alibaba.nacos.api.naming.pojo.ListView;
-import org.junit.Test;
+import com.alibaba.cloud.nacos.discovery.NacosServiceDiscovery;
+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 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<>();
-		map.put("test-key", "test-value");
-		map.put("secure", "true");
+		List<ServiceInstance> serviceInstances = client.getInstances("service-1");
 
-		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);
-
-		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");
+		assertThat(serviceInstances).isNotEmpty();
 
 	}
 
 	@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");
-		nacosServices.getData().add(serviceName + "2");
-		nacosServices.getData().add(serviceName + "3");
+		assertThat(services).contains("service-1").size().isEqualTo(1);
 
-		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,
-			NacosDiscoveryAutoConfiguration.class })
+			NacosDiscoveryClientConfiguration.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,
-			NacosDiscoveryAutoConfiguration.class })
+			NacosDiscoveryClientConfiguration.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,
-			NacosDiscoveryAutoConfiguration.class })
+			NacosDiscoveryClientConfiguration.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,
-			NacosDiscoveryAutoConfiguration.class })
+			NacosDiscoveryClientConfiguration.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,
-			NacosDiscoveryAutoConfiguration.class })
+			NacosDiscoveryClientConfiguration.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,
-			NacosDiscoveryAutoConfiguration.class })
+			NacosDiscoveryClientConfiguration.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,
-			NacosDiscoveryAutoConfiguration.class })
+			NacosDiscoveryClientConfiguration.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")