仍有两个测试过不了

1. NacosConfigurationXmlJsonTest#contextLoads
2. NacosConfigurationNoSuffixTest#contextLoads
Merge branch 'master' into finchley

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

@@ -20,6 +20,12 @@
             <optional>true</optional>
         </dependency>
 
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-alibaba-commons</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-actuator-autoconfigure</artifactId>
@@ -39,11 +45,9 @@
         </dependency>
 
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-autoconfigure</artifactId>
-            <optional>true</optional>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
@@ -66,6 +70,12 @@
             <artifactId>spring-context-support</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
+            <optional>true</optional>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-commons</artifactId>
@@ -93,13 +103,6 @@
             <optional>true</optional>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/ConditionalOnNacosDiscoveryEnabled.java

@@ -25,7 +25,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.TYPE, ElementType.METHOD })
-@ConditionalOnProperty(value = "spring.cloud.nacos.discovery.enabled", matchIfMissing = true)
+@ConditionalOnProperty(value = "spring.cloud.nacos.discovery.enabled",
+		matchIfMissing = true)
 public @interface ConditionalOnNacosDiscoveryEnabled {
 
 }

spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosDiscoveryProperties.java

@@ -181,17 +181,17 @@ public class NacosDiscoveryProperties {
 	private String secretKey;
 
 	/**
-	 * Heart beat interval. Time unit: second.
+	 * Heart beat interval. Time unit: millisecond.
 	 */
 	private Integer heartBeatInterval;
 
 	/**
-	 * Heart beat timeout. Time unit: second.
+	 * Heart beat timeout. Time unit: millisecond.
 	 */
 	private Integer heartBeatTimeout;
 
 	/**
-	 * Ip delete timeout. Time unit: second.
+	 * Ip delete timeout. Time unit: millisecond.
 	 */
 	private Integer ipDeleteTimeout;
 

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

@@ -32,11 +32,13 @@ import org.springframework.cloud.client.discovery.DiscoveryClient;
  */
 public class NacosDiscoveryClient implements DiscoveryClient {
 
+	private static final Logger log = LoggerFactory.getLogger(NacosDiscoveryClient.class);
+
 	/**
 	 * Nacos Discovery Client Description.
 	 */
 	public static final String DESCRIPTION = "Spring Cloud Nacos Discovery Client";
-	private static final Logger log = LoggerFactory.getLogger(NacosDiscoveryClient.class);
+
 	private NacosServiceDiscovery serviceDiscovery;
 
 	public NacosDiscoveryClient(NacosServiceDiscovery nacosServiceDiscovery) {

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

@@ -31,7 +31,7 @@ import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryClientAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.TaskScheduler;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
 
 /**
  * @author xiaojing
@@ -39,7 +39,6 @@ import org.springframework.scheduling.TaskScheduler;
  */
 @Configuration
 @ConditionalOnDiscoveryEnabled
-// @ConditionalOnBlockingDiscoveryEnabled
 @ConditionalOnProperty(value = "spring.cloud.discovery.blocking.enabled", matchIfMissing = true)
 @ConditionalOnNacosDiscoveryEnabled
 @AutoConfigureBefore({ SimpleDiscoveryClientAutoConfiguration.class,
@@ -58,7 +57,7 @@ public class NacosDiscoveryClientConfiguration {
 	@ConditionalOnProperty(value = "spring.cloud.nacos.discovery.watch.enabled", matchIfMissing = true)
 	public NacosWatch nacosWatch(NacosServiceManager nacosServiceManager,
 			NacosDiscoveryProperties nacosDiscoveryProperties,
-			ObjectProvider<TaskScheduler> taskExecutorObjectProvider) {
+			ObjectProvider<ThreadPoolTaskScheduler> taskExecutorObjectProvider) {
 		return new NacosWatch(nacosServiceManager, nacosDiscoveryProperties,
 				taskExecutorObjectProvider);
 	}

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

@@ -46,6 +46,31 @@ public class NacosServiceDiscovery {
 		this.nacosServiceManager = nacosServiceManager;
 	}
 
+	/**
+	 * 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 = namingService().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 = namingService().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());
@@ -86,31 +111,6 @@ public class NacosServiceDiscovery {
 		return nacosServiceInstance;
 	}
 
-	/**
-	 * 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 = namingService().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 = namingService().getServicesOfServer(1,
-				Integer.MAX_VALUE, group);
-		return services.getData();
-	}
-
 	private NamingService namingService() {
 		return nacosServiceManager
 				.getNamingService(discoveryProperties.getNacosProperties());

spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosWatch.java

@@ -27,7 +27,6 @@ import java.util.concurrent.atomic.AtomicLong;
 
 import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
 import com.alibaba.cloud.nacos.NacosServiceManager;
-import com.alibaba.nacos.api.exception.NacosException;
 import com.alibaba.nacos.api.naming.NamingService;
 import com.alibaba.nacos.api.naming.listener.Event;
 import com.alibaba.nacos.api.naming.listener.EventListener;
@@ -41,7 +40,6 @@ import org.springframework.cloud.client.discovery.event.HeartbeatEvent;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.ApplicationEventPublisherAware;
 import org.springframework.context.SmartLifecycle;
-import org.springframework.scheduling.TaskScheduler;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
 
 /**
@@ -51,18 +49,26 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
 public class NacosWatch implements ApplicationEventPublisherAware, SmartLifecycle {
 
 	private static final Logger log = LoggerFactory.getLogger(NacosWatch.class);
-	private final AtomicBoolean running = new AtomicBoolean(false);
-	private final AtomicLong nacosWatchIndex = new AtomicLong(0);
-	private final NacosDiscoveryProperties properties;
-	private final TaskScheduler taskScheduler;
+
 	private Map<String, EventListener> listenerMap = new ConcurrentHashMap<>(16);
+
+	private final AtomicBoolean running = new AtomicBoolean(false);
+
+	private final AtomicLong nacosWatchIndex = new AtomicLong(0);
+
 	private ApplicationEventPublisher publisher;
+
 	private ScheduledFuture<?> watchFuture;
+
 	private NacosServiceManager nacosServiceManager;
 
+	private final NacosDiscoveryProperties properties;
+
+	private final ThreadPoolTaskScheduler taskScheduler;
+
 	public NacosWatch(NacosServiceManager nacosServiceManager,
 			NacosDiscoveryProperties properties,
-			ObjectProvider<TaskScheduler> taskScheduler) {
+			ObjectProvider<ThreadPoolTaskScheduler> taskScheduler) {
 		this.nacosServiceManager = nacosServiceManager;
 		this.properties = properties;
 		this.taskScheduler = taskScheduler.getIfAvailable(NacosWatch::getTaskScheduler);
@@ -148,7 +154,7 @@ public class NacosWatch implements ApplicationEventPublisherAware, SmartLifecycl
 			if (this.watchFuture != null) {
 				// shutdown current user-thread,
 				// then the other daemon-threads will terminate automatic.
-				((ThreadPoolTaskScheduler) this.taskScheduler).shutdown();
+				this.taskScheduler.shutdown();
 				this.watchFuture.cancel(true);
 			}
 
@@ -159,7 +165,7 @@ public class NacosWatch implements ApplicationEventPublisherAware, SmartLifecycl
 				namingService.unsubscribe(properties.getService(), properties.getGroup(),
 						Arrays.asList(properties.getClusterName()), eventListener);
 			}
-			catch (NacosException e) {
+			catch (Exception e) {
 				log.error("namingService unsubscribe failed, properties:{}", properties,
 						e);
 			}

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

@@ -16,6 +16,7 @@
 
 package com.alibaba.cloud.nacos.discovery.configclient;
 
+import com.alibaba.cloud.nacos.NacosServiceAutoConfiguration;
 import com.alibaba.cloud.nacos.discovery.NacosDiscoveryAutoConfiguration;
 import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientConfiguration;
 
@@ -31,10 +32,11 @@ import org.springframework.context.annotation.Configuration;
  * @author JevonYang
  */
 @ConditionalOnClass(ConfigServicePropertySourceLocator.class)
-@ConditionalOnProperty(value = "spring.cloud.config.discovery.enabled", matchIfMissing = false)
+@ConditionalOnProperty(value = "spring.cloud.config.discovery.enabled",
+		matchIfMissing = false)
 @Configuration
 @ImportAutoConfiguration({ NacosDiscoveryAutoConfiguration.class,
-		NacosDiscoveryClientConfiguration.class })
+		NacosServiceAutoConfiguration.class, NacosDiscoveryClientConfiguration.class})
 public class NacosDiscoveryClientConfigServiceBootstrapConfiguration {
 
 }

spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosDiscoveryEndpoint.java

@@ -36,7 +36,7 @@ import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
  *
  * @author xiaojing
  */
-@Endpoint(id = "nacos-discovery")
+@Endpoint(id = "nacosdiscovery")
 public class NacosDiscoveryEndpoint {
 
 	private static final Logger log = LoggerFactory

spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/registry/NacosRegistration.java

@@ -72,16 +72,6 @@ public class NacosRegistration implements Registration, ServiceInstance {
 		this.context = context;
 	}
 
-	private static void customize(
-			List<NacosRegistrationCustomizer> registrationCustomizers,
-			NacosRegistration registration) {
-		if (registrationCustomizers != null) {
-			for (NacosRegistrationCustomizer customizer : registrationCustomizers) {
-				customizer.customize(registration);
-			}
-		}
-	}
-
 	@PostConstruct
 	public void init() {
 
@@ -122,6 +112,16 @@ public class NacosRegistration implements Registration, ServiceInstance {
 		customize(registrationCustomizers, this);
 	}
 
+	private static void customize(
+			List<NacosRegistrationCustomizer> registrationCustomizers,
+			NacosRegistration registration) {
+		if (registrationCustomizers != null) {
+			for (NacosRegistrationCustomizer customizer : registrationCustomizers) {
+				customizer.customize(registration);
+			}
+		}
+	}
+
 	@Override
 	public String getServiceId() {
 		return nacosDiscoveryProperties.getService();

spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/registry/NacosServiceRegistry.java

@@ -41,6 +41,10 @@ import static org.springframework.util.ReflectionUtils.rethrowRuntimeException;
  */
 public class NacosServiceRegistry implements ServiceRegistry<Registration> {
 
+	private static final String STATUS_UP = "UP";
+
+	private static final String STATUS_DOWN = "DOWN";
+
 	private static final Logger log = LoggerFactory.getLogger(NacosServiceRegistry.class);
 
 	private final NacosDiscoveryProperties nacosDiscoveryProperties;
@@ -119,7 +123,8 @@ public class NacosServiceRegistry implements ServiceRegistry<Registration> {
 	@Override
 	public void setStatus(Registration registration, String status) {
 
-		if (!status.equalsIgnoreCase("UP") && !status.equalsIgnoreCase("DOWN")) {
+		if (!STATUS_UP.equalsIgnoreCase(status)
+				&& !STATUS_DOWN.equalsIgnoreCase(status)) {
 			log.warn("can't support status {},please choose UP or DOWN", status);
 			return;
 		}
@@ -128,7 +133,7 @@ public class NacosServiceRegistry implements ServiceRegistry<Registration> {
 
 		Instance instance = getNacosInstanceFromRegistration(registration);
 
-		if (status.equalsIgnoreCase("DOWN")) {
+		if (STATUS_DOWN.equalsIgnoreCase(status)) {
 			instance.setEnabled(false);
 		}
 		else {
@@ -137,8 +142,8 @@ public class NacosServiceRegistry implements ServiceRegistry<Registration> {
 
 		try {
 			Properties nacosProperties = nacosDiscoveryProperties.getNacosProperties();
-			nacosServiceManager.getNamingMaintainService(nacosProperties)
-					.updateInstance(serviceId, instance);
+			nacosServiceManager.getNamingMaintainService(nacosProperties).updateInstance(
+					serviceId, nacosDiscoveryProperties.getGroup(), instance);
 		}
 		catch (Exception e) {
 			throw new RuntimeException("update nacos instance status fail", e);

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

@@ -41,7 +41,8 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 @EnableConfigurationProperties
 @ConditionalOnNacosDiscoveryEnabled
-@ConditionalOnProperty(value = "spring.cloud.service-registry.auto-registration.enabled", matchIfMissing = true)
+@ConditionalOnProperty(value = "spring.cloud.service-registry.auto-registration.enabled",
+		matchIfMissing = true)
 @AutoConfigureAfter({ AutoServiceRegistrationConfiguration.class,
 		AutoServiceRegistrationAutoConfiguration.class,
 		NacosDiscoveryAutoConfiguration.class })

spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/ribbon/NacosRule.java

@@ -20,6 +20,7 @@ import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
+import com.alibaba.cloud.commons.lang.StringUtils;
 import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
 import com.alibaba.cloud.nacos.NacosServiceManager;
 import com.alibaba.nacos.api.naming.NamingService;
@@ -28,7 +29,6 @@ import com.netflix.client.config.IClientConfig;
 import com.netflix.loadbalancer.AbstractLoadBalancerRule;
 import com.netflix.loadbalancer.DynamicServerListLoadBalancer;
 import com.netflix.loadbalancer.Server;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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

@@ -4,6 +4,8 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   com.alibaba.cloud.nacos.endpoint.NacosDiscoveryEndpointAutoConfiguration,\
   com.alibaba.cloud.nacos.registry.NacosServiceRegistryAutoConfiguration,\
   com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientConfiguration,\
+  com.alibaba.cloud.nacos.discovery.configclient.NacosConfigServerAutoConfiguration,\
+  com.alibaba.cloud.nacos.NacosServiceAutoConfiguration
   com.alibaba.cloud.nacos.NacosServiceAutoConfiguration,\
   com.alibaba.cloud.nacos.discovery.configclient.NacosConfigServerAutoConfiguration
 org.springframework.cloud.bootstrap.BootstrapConfiguration=\

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

@@ -37,8 +37,10 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
  *
  */
 @RunWith(SpringRunner.class)
-@SpringBootTest(classes = NacosDiscoveryPropertiesServerAddressTopLevelTests.TestConfig.class, properties = {
-		"spring.cloud.nacos.server-addr=123.123.123.123:8848" }, webEnvironment = RANDOM_PORT)
+@SpringBootTest(
+		classes = NacosDiscoveryPropertiesServerAddressTopLevelTests.TestConfig.class,
+		properties = { "spring.cloud.nacos.server-addr=123.123.123.123:8848" },
+		webEnvironment = RANDOM_PORT)
 
 public class NacosDiscoveryPropertiesServerAddressTopLevelTests {
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2018 the original author or authors.
+ * Copyright (C) 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.alibaba.cloud.nacos.registry;
+package org.springframework.cloud.alibaba.nacos.registry;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
@@ -26,6 +26,10 @@ import java.util.Properties;
 
 import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
 import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientConfiguration;
+import com.alibaba.cloud.nacos.registry.MockNamingService;
+import com.alibaba.cloud.nacos.registry.NacosAutoServiceRegistration;
+import com.alibaba.cloud.nacos.registry.NacosRegistration;
+import com.alibaba.cloud.nacos.registry.NacosServiceRegistryAutoConfiguration;
 import com.alibaba.nacos.api.NacosFactory;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -56,11 +60,25 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 @PowerMockIgnore("javax.management.*")
 @PowerMockRunnerDelegate(SpringRunner.class)
 @PrepareForTest({ NacosFactory.class })
-@SpringBootTest(classes = NacosAutoServiceRegistrationIpNetworkInterfaceTests.TestConfig.class, properties = {
-		"spring.application.name=myTestService1",
-		"spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848" }, webEnvironment = RANDOM_PORT)
+@SpringBootTest(
+		classes = NacosAutoServiceRegistrationIpNetworkInterfaceTests.TestConfig.class,
+		properties = { "spring.application.name=myTestService1",
+				"spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848" },
+		webEnvironment = RANDOM_PORT)
 public class NacosAutoServiceRegistrationIpNetworkInterfaceTests {
 
+	@Autowired
+	private NacosRegistration registration;
+
+	@Autowired
+	private NacosAutoServiceRegistration nacosAutoServiceRegistration;
+
+	@Autowired
+	private NacosDiscoveryProperties properties;
+
+	@Autowired
+	private InetUtils inetUtils;
+
 	static {
 		try {
 			Method method = PowerMockito.method(NacosFactory.class, "createNamingService",
@@ -78,15 +96,6 @@ public class NacosAutoServiceRegistrationIpNetworkInterfaceTests {
 		}
 	}
 
-	@Autowired
-	private NacosRegistration registration;
-	@Autowired
-	private NacosAutoServiceRegistration nacosAutoServiceRegistration;
-	@Autowired
-	private NacosDiscoveryProperties properties;
-	@Autowired
-	private InetUtils inetUtils;
-
 	@Test
 	public void contextLoads() throws Exception {
 		assertThat(registration).isNotNull();
@@ -94,6 +103,7 @@ public class NacosAutoServiceRegistrationIpNetworkInterfaceTests {
 		assertThat(nacosAutoServiceRegistration).isNotNull();
 
 		checkoutNacosDiscoveryServiceIP();
+
 	}
 
 	private void checkoutNacosDiscoveryServiceIP() {

spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/registry/NacosRegistrationCustomizerTest.java

@@ -0,0 +1,104 @@
+/*
+ * 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.registry;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.util.Map;
+import java.util.Properties;
+
+import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientConfiguration;
+import com.alibaba.nacos.api.NacosFactory;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.api.support.MethodProxy;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+import org.powermock.modules.junit4.PowerMockRunnerDelegate;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
+
+/**
+ * @author L.cm
+ */
+@RunWith(PowerMockRunner.class)
+@PowerMockIgnore("javax.management.*")
+@PowerMockRunnerDelegate(SpringRunner.class)
+@PrepareForTest({ NacosFactory.class })
+@SpringBootTest(classes = NacosRegistrationCustomizerTest.TestConfig.class,
+		properties = { "spring.application.name=myTestService1",
+				"spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848" },
+		webEnvironment = RANDOM_PORT)
+public class NacosRegistrationCustomizerTest {
+
+	@Autowired
+	private NacosAutoServiceRegistration nacosAutoServiceRegistration;
+
+	static {
+		try {
+			Method method = PowerMockito.method(NacosFactory.class, "createNamingService",
+					Properties.class);
+			MethodProxy.proxy(method, new InvocationHandler() {
+				@Override
+				public Object invoke(Object proxy, Method method, Object[] args)
+						throws Throwable {
+					return new MockNamingService();
+				}
+			});
+		}
+		catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	@Test
+	public void contextLoads() throws Exception {
+		NacosRegistration registration = nacosAutoServiceRegistration.getRegistration();
+		Map<String, String> metadata = registration.getMetadata();
+		Assert.assertEquals("test1", metadata.get("test1"));
+	}
+
+	@Configuration
+	@EnableAutoConfiguration
+	@ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class,
+			NacosDiscoveryClientConfiguration.class,
+			NacosServiceRegistryAutoConfiguration.class })
+	public static class TestConfig {
+
+		@Bean
+		public NacosRegistrationCustomizer nacosRegistrationCustomizer() {
+			return registration -> {
+				Map<String, String> metadata = registration.getMetadata();
+				metadata.put("test1", "test1");
+			};
+		}
+
+	}
+
+}

spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/ribbon/NacosRibbonClientPropertyOverrideTests.java

@@ -39,14 +39,14 @@ import org.springframework.test.context.junit4.SpringRunner;
  * @author liujunjie
  */
 @RunWith(SpringRunner.class)
-@SpringBootTest(classes = NacosRibbonClientPropertyOverrideTests.TestConfiguration.class, properties = {
-		"spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848",
-		"spring.cloud.nacos.discovery.port=18080",
-		"spring.cloud.nacos.discovery.service=remoteApp",
-		"localApp.ribbon.NIWSServerListClassName="
-				+ "com.netflix.loadbalancer.ConfigurationBasedServerList",
-		"localApp.ribbon.listOfServers=127.0.0.1:19090",
-		"localApp.ribbon.ServerListRefreshInterval=15000" })
+@SpringBootTest(classes = NacosRibbonClientPropertyOverrideTests.TestConfiguration.class,
+		properties = { "spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848",
+				"spring.cloud.nacos.discovery.port=18080",
+				"spring.cloud.nacos.discovery.service=remoteApp",
+				"localApp.ribbon.NIWSServerListClassName="
+						+ "com.netflix.loadbalancer.ConfigurationBasedServerList",
+				"localApp.ribbon.listOfServers=127.0.0.1:19090",
+				"localApp.ribbon.ServerListRefreshInterval=15000" })
 public class NacosRibbonClientPropertyOverrideTests {
 
 	@Autowired