Merge remote-tracking branch 'upstream/master'

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

@@ -24,6 +24,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
 import org.springframework.boot.autoconfigure.condition.ConditionalOnNotWebApplication;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.cloud.alibaba.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
 import org.springframework.cloud.alibaba.nacos.registry.NacosAutoServiceRegistration;
 import org.springframework.cloud.alibaba.nacos.registry.NacosRegistration;
 import org.springframework.cloud.alibaba.nacos.registry.NacosServiceRegistry;

spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryProperties.java

@@ -64,6 +64,11 @@ public class NacosDiscoveryProperties {
 	 */
 	private String namespace;
 
+	/**
+	 * watch delay,duration to pull new service from nacos server.
+	 */
+	private long watchDelay = 5000;
+
 	/**
 	 * nacos naming log file name
 	 */
@@ -322,16 +327,25 @@ public class NacosDiscoveryProperties {
 		this.namingLoadCacheAtStart = namingLoadCacheAtStart;
 	}
 
+	public long getWatchDelay() {
+		return watchDelay;
+	}
+
+	public void setWatchDelay(long watchDelay) {
+		this.watchDelay = watchDelay;
+	}
+
 	@Override
 	public String toString() {
 		return "NacosDiscoveryProperties{" + "serverAddr='" + serverAddr + '\''
 				+ ", endpoint='" + endpoint + '\'' + ", namespace='" + namespace + '\''
-				+ ", logName='" + logName + '\'' + ", service='" + service + '\''
+				+ ", watchDelay=" + watchDelay + ", logName='" + logName + '\''
-				+ ", weight=" + weight + ", clusterName='" + clusterName + '\''
+				+ ", service='" + service + '\'' + ", weight=" + weight
-				+ ", metadata=" + metadata + ", registerEnabled=" + registerEnabled
+				+ ", clusterName='" + clusterName + '\'' + ", namingLoadCacheAtStart='"
-				+ ", ip='" + ip + '\'' + ", networkInterface='" + networkInterface + '\''
+				+ namingLoadCacheAtStart + '\'' + ", metadata=" + metadata
-				+ ", port=" + port + ", secure=" + secure + ", accessKey='" + accessKey
+				+ ", registerEnabled=" + registerEnabled + ", ip='" + ip + '\''
-				+ ", namingLoadCacheAtStart=" + namingLoadCacheAtStart + '\''
+				+ ", networkInterface='" + networkInterface + '\'' + ", port=" + port
+				+ ", secure=" + secure + ", accessKey='" + accessKey + '\''
 				+ ", secretKey='" + secretKey + '\'' + '}';
 	}
 

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

@@ -14,20 +14,18 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.nacos;
+package org.springframework.cloud.alibaba.nacos.discovery;
 
 import com.alibaba.nacos.api.naming.pojo.Instance;
 import com.alibaba.nacos.api.naming.pojo.ListView;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
+import org.springframework.cloud.alibaba.nacos.NacosServiceInstance;
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * @author xiaojing

spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/discovery/NacosDiscoveryClientAutoConfiguration.java

@@ -14,11 +14,18 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.nacos;
+package org.springframework.cloud.alibaba.nacos.discovery;
 
+import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.cloud.alibaba.nacos.ConditionalOnNacosDiscoveryEnabled;
+import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
+import org.springframework.cloud.alibaba.nacos.discovery.NacosDiscoveryClient;
+import org.springframework.cloud.alibaba.nacos.discovery.NacosWatch;
+import org.springframework.cloud.client.CommonsClientAutoConfiguration;
 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;
 
@@ -26,9 +33,10 @@ import org.springframework.context.annotation.Configuration;
  * @author xiaojing
  */
 @Configuration
-@ConditionalOnMissingBean(DiscoveryClient.class)
 @ConditionalOnNacosDiscoveryEnabled
 @EnableConfigurationProperties
+@AutoConfigureBefore({ SimpleDiscoveryClientAutoConfiguration.class,
+		CommonsClientAutoConfiguration.class })
 public class NacosDiscoveryClientAutoConfiguration {
 
 	@Bean
@@ -37,4 +45,9 @@ public class NacosDiscoveryClientAutoConfiguration {
 		return new NacosDiscoveryClient(discoveryProperties);
 	}
 
+	@Bean
+	@ConditionalOnMissingBean
+	public NacosWatch nacosWatch(NacosDiscoveryProperties nacosDiscoveryProperties) {
+		return new NacosWatch(nacosDiscoveryProperties);
+	}
 }

spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/discovery/NacosWatch.java

@@ -0,0 +1,174 @@
+/*
+ * Copyright (C) 2019 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
+ *
+ *      http://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 org.springframework.cloud.alibaba.nacos.discovery;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
+
+import com.alibaba.nacos.api.naming.NamingService;
+import com.alibaba.nacos.api.naming.listener.EventListener;
+import com.alibaba.nacos.api.naming.pojo.ListView;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
+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;
+
+/**
+ * @author xiaojing
+ */
+public class NacosWatch implements ApplicationEventPublisherAware, SmartLifecycle {
+
+	private static final Logger log = LoggerFactory.getLogger(NacosWatch.class);
+
+	private final NacosDiscoveryProperties properties;
+
+	private final TaskScheduler taskScheduler;
+
+	private final AtomicLong nacosWatchIndex = new AtomicLong(0);
+
+	private final AtomicBoolean running = new AtomicBoolean(false);
+
+	private ApplicationEventPublisher publisher;
+
+	private ScheduledFuture<?> watchFuture;
+
+	private Set<String> cacheServices = new HashSet<>();
+
+	private HashMap<String, EventListener> subscribeListeners = new HashMap<>();
+
+	public NacosWatch(NacosDiscoveryProperties properties) {
+		this(properties, getTaskScheduler());
+	}
+
+	public NacosWatch(NacosDiscoveryProperties properties, TaskScheduler taskScheduler) {
+		this.properties = properties;
+		this.taskScheduler = taskScheduler;
+	}
+
+	private static ThreadPoolTaskScheduler getTaskScheduler() {
+		ThreadPoolTaskScheduler taskScheduler = new ThreadPoolTaskScheduler();
+		taskScheduler.initialize();
+		return taskScheduler;
+	}
+
+	@Override
+	public void setApplicationEventPublisher(ApplicationEventPublisher publisher) {
+		this.publisher = publisher;
+	}
+
+	@Override
+	public boolean isAutoStartup() {
+		return true;
+	}
+
+	@Override
+	public void stop(Runnable callback) {
+		this.stop();
+		callback.run();
+	}
+
+	@Override
+	public void start() {
+		if (this.running.compareAndSet(false, true)) {
+			this.watchFuture = this.taskScheduler.scheduleWithFixedDelay(
+					this::nacosServicesWatch, this.properties.getWatchDelay());
+		}
+	}
+
+	@Override
+	public void stop() {
+		if (this.running.compareAndSet(true, false) && this.watchFuture != null) {
+			this.watchFuture.cancel(true);
+		}
+	}
+
+	@Override
+	public boolean isRunning() {
+		return false;
+	}
+
+	@Override
+	public int getPhase() {
+		return 0;
+	}
+
+	public void nacosServicesWatch() {
+		try {
+
+			boolean changed = false;
+			NamingService namingService = properties.namingServiceInstance();
+
+			ListView<String> listView = properties.namingServiceInstance()
+					.getServicesOfServer(1, Integer.MAX_VALUE);
+
+			List<String> serviceList = listView.getData();
+
+			// if there are new services found, publish event
+			Set<String> currentServices = new HashSet<>(serviceList);
+			currentServices.removeAll(cacheServices);
+			if (currentServices.size() > 0) {
+				changed = true;
+			}
+
+			// if some services disappear, publish event
+			if (cacheServices.removeAll(new HashSet<>(serviceList))
+					&& cacheServices.size() > 0) {
+				changed = true;
+
+				for (String serviceName : cacheServices) {
+					namingService.unsubscribe(serviceName,
+							subscribeListeners.get(serviceName));
+					subscribeListeners.remove(serviceName);
+				}
+			}
+
+			cacheServices = new HashSet<>(serviceList);
+
+			// subscribe services's node change, publish event if nodes changed
+			for (String serviceName : cacheServices) {
+				if (!subscribeListeners.containsKey(serviceName)) {
+					EventListener eventListener = event -> NacosWatch.this.publisher
+							.publishEvent(new HeartbeatEvent(NacosWatch.this,
+									nacosWatchIndex.getAndIncrement()));
+					subscribeListeners.put(serviceName, eventListener);
+					namingService.subscribe(serviceName, eventListener);
+
+				}
+			}
+
+			if (changed) {
+				this.publisher.publishEvent(
+						new HeartbeatEvent(this, nacosWatchIndex.getAndIncrement()));
+			}
+
+		}
+		catch (Exception e) {
+			log.error("Error watching Nacos Service change", e);
+		}
+	}
+}

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

@@ -2,4 +2,4 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   org.springframework.cloud.alibaba.nacos.NacosDiscoveryAutoConfiguration,\
   org.springframework.cloud.alibaba.nacos.ribbon.RibbonNacosAutoConfiguration,\
   org.springframework.cloud.alibaba.nacos.endpoint.NacosDiscoveryEndpointAutoConfiguration,\
-  org.springframework.cloud.alibaba.nacos.NacosDiscoveryClientAutoConfiguration
+  org.springframework.cloud.alibaba.nacos.discovery.NacosDiscoveryClientAutoConfiguration

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

@@ -26,6 +26,7 @@ import com.alibaba.nacos.api.naming.pojo.Instance;
 import com.alibaba.nacos.api.naming.pojo.ListView;
 
 import org.junit.Test;
+import org.springframework.cloud.alibaba.nacos.discovery.NacosDiscoveryClient;
 import org.springframework.cloud.client.ServiceInstance;
 
 import static org.assertj.core.api.Assertions.assertThat;

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

@@ -32,7 +32,7 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.alibaba.nacos.NacosDiscoveryAutoConfiguration;
-import org.springframework.cloud.alibaba.nacos.NacosDiscoveryClientAutoConfiguration;
+import org.springframework.cloud.alibaba.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
 import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
 import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
 import org.springframework.cloud.commons.util.InetUtils;

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

@@ -28,7 +28,7 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.alibaba.nacos.NacosDiscoveryAutoConfiguration;
-import org.springframework.cloud.alibaba.nacos.NacosDiscoveryClientAutoConfiguration;
+import org.springframework.cloud.alibaba.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
 import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
 import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
 import org.springframework.context.annotation.Configuration;

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

@@ -29,7 +29,7 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.alibaba.nacos.NacosDiscoveryAutoConfiguration;
-import org.springframework.cloud.alibaba.nacos.NacosDiscoveryClientAutoConfiguration;
+import org.springframework.cloud.alibaba.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
 import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
 import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
 import org.springframework.context.annotation.Configuration;

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

@@ -28,7 +28,7 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.alibaba.nacos.NacosDiscoveryAutoConfiguration;
-import org.springframework.cloud.alibaba.nacos.NacosDiscoveryClientAutoConfiguration;
+import org.springframework.cloud.alibaba.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
 import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
 import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
 import org.springframework.context.annotation.Configuration;

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

@@ -26,7 +26,7 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.cloud.alibaba.nacos.NacosDiscoveryAutoConfiguration;
-import org.springframework.cloud.alibaba.nacos.NacosDiscoveryClientAutoConfiguration;
+import org.springframework.cloud.alibaba.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
 import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
 import org.springframework.cloud.alibaba.nacos.endpoint.NacosDiscoveryEndpoint;
 import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
@@ -185,8 +185,8 @@ public class NacosAutoServiceRegistrationTests {
 				properties);
 		Map<String, Object> map = nacosDiscoveryEndpoint.nacosDiscovery();
 		assertEquals(map.get("NacosDiscoveryProperties"), properties);
-		assertEquals(map.get("subscribe"),
+		assertEquals(map.get("subscribe").toString(),
-				properties.namingServiceInstance().getSubscribeServices());
+				properties.namingServiceInstance().getSubscribeServices().toString());
 	}
 
 	@Configuration

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

@@ -6,7 +6,7 @@ import org.junit.Test;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
-import org.springframework.cloud.alibaba.nacos.NacosDiscoveryClientAutoConfiguration;
+import org.springframework.cloud.alibaba.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.context.annotation.Bean;