polish #761 update pkg name & maven coordinate for Greenwich

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

@@ -0,0 +1,112 @@
+/*
+ * 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.
+ * 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 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.client.ServiceInstance;
+import org.springframework.cloud.client.discovery.DiscoveryClient;
+
+import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
+import com.alibaba.cloud.nacos.NacosServiceInstance;
+import com.alibaba.nacos.api.naming.pojo.Instance;
+import com.alibaba.nacos.api.naming.pojo.ListView;
+
+/**
+ * @author xiaojing
+ * @author renhaojun
+ */
+public class NacosDiscoveryClient implements DiscoveryClient {
+
+	private static final Logger log = LoggerFactory.getLogger(NacosDiscoveryClient.class);
+	public static final String DESCRIPTION = "Spring Cloud Nacos Discovery Client";
+
+	private NacosDiscoveryProperties discoveryProperties;
+
+	public NacosDiscoveryClient(NacosDiscoveryProperties discoveryProperties) {
+		this.discoveryProperties = discoveryProperties;
+	}
+
+	@Override
+	public String description() {
+		return DESCRIPTION;
+	}
+
+	@Override
+	public List<ServiceInstance> getInstances(String serviceId) {
+		try {
+			List<Instance> instances = discoveryProperties.namingServiceInstance()
+					.selectInstances(serviceId, true);
+			return hostToServiceInstanceList(instances, serviceId);
+		}
+		catch (Exception e) {
+			throw new RuntimeException(
+					"Can not get hosts from nacos server. serviceId: " + serviceId, e);
+		}
+	}
+
+	private static ServiceInstance hostToServiceInstance(Instance instance,
+			String serviceId) {
+		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;
+	}
+
+	private static List<ServiceInstance> hostToServiceInstanceList(
+			List<Instance> instances, String serviceId) {
+		List<ServiceInstance> result = new ArrayList<>(instances.size());
+		for (Instance instance : instances) {
+			result.add(hostToServiceInstance(instance, serviceId));
+		}
+		return result;
+	}
+
+	@Override
+	public List<String> getServices() {
+
+		try {
+			ListView<String> services = discoveryProperties.namingServiceInstance()
+					.getServicesOfServer(1, Integer.MAX_VALUE);
+			return services.getData();
+		}
+		catch (Exception e) {
+			log.error("get service name from nacos server fail,", e);
+			return Collections.emptyList();
+		}
+	}
+}

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

@@ -0,0 +1,58 @@
+/*
+ * 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.
+ * 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 com.alibaba.cloud.nacos.discovery;
+
+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.discovery.DiscoveryClient;
+import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryClientAutoConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.alibaba.cloud.nacos.ConditionalOnNacosDiscoveryEnabled;
+import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
+
+/**
+ * @author xiaojing
+ */
+@Configuration
+@ConditionalOnNacosDiscoveryEnabled
+@AutoConfigureBefore({ SimpleDiscoveryClientAutoConfiguration.class,
+		CommonsClientAutoConfiguration.class })
+public class NacosDiscoveryClientAutoConfiguration {
+
+	@Bean
+	@ConditionalOnMissingBean
+	public NacosDiscoveryProperties nacosProperties() {
+		return new NacosDiscoveryProperties();
+	}
+
+	@Bean
+	public DiscoveryClient nacosDiscoveryClient(
+			NacosDiscoveryProperties discoveryProperties) {
+		return new NacosDiscoveryClient(discoveryProperties);
+	}
+
+	@Bean
+	@ConditionalOnMissingBean
+	@ConditionalOnProperty(value = "spring.cloud.nacos.discovery.watch.enabled", matchIfMissing = true)
+	public NacosWatch nacosWatch(NacosDiscoveryProperties nacosDiscoveryProperties) {
+		return new NacosWatch(nacosDiscoveryProperties);
+	}
+}

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

@@ -0,0 +1,124 @@
+/*
+ * 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 com.alibaba.cloud.nacos.discovery;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+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;
+
+import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
+import com.alibaba.nacos.api.naming.listener.EventListener;
+
+/**
+ * @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() {
+
+		// nacos doesn't support watch now , publish an event every 30 seconds.
+		this.publisher.publishEvent(
+				new HeartbeatEvent(this, nacosWatchIndex.getAndIncrement()));
+
+	}
+}

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

@@ -0,0 +1,58 @@
+/*
+ * 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.
+ * 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 com.alibaba.cloud.nacos.discovery.configclient;
+
+import javax.annotation.PostConstruct;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.cloud.config.server.config.ConfigServerProperties;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.util.StringUtils;
+
+import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
+
+/**
+ * Extra configuration for config server if it happens to be registered with Nacos.
+ *
+ * @author JevonYang
+ */
+@Configuration
+@EnableConfigurationProperties
+@ConditionalOnClass({ NacosDiscoveryProperties.class, ConfigServerProperties.class })
+public class NacosConfigServerAutoConfiguration {
+
+	@Autowired(required = false)
+	private NacosDiscoveryProperties properties;
+
+	@Autowired(required = false)
+	private ConfigServerProperties server;
+
+	@PostConstruct
+	public void init() {
+		if (this.properties == null || this.server == null) {
+			return;
+		}
+		String prefix = this.server.getPrefix();
+		if (StringUtils.hasText(prefix) && !StringUtils
+				.hasText(this.properties.getMetadata().get("configPath"))) {
+			this.properties.getMetadata().put("configPath", prefix);
+		}
+	}
+
+}

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

@@ -0,0 +1,40 @@
+/*
+ * 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.
+ * 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 com.alibaba.cloud.nacos.discovery.configclient;
+
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.cloud.config.client.ConfigServicePropertySourceLocator;
+import org.springframework.context.annotation.Configuration;
+
+import com.alibaba.cloud.nacos.NacosDiscoveryAutoConfiguration;
+import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
+
+/**
+ * Helper for config client that wants to lookup the config server via discovery.
+ *
+ * @author JevonYang
+ */
+@ConditionalOnClass(ConfigServicePropertySourceLocator.class)
+@ConditionalOnProperty(value = "spring.cloud.config.discovery.enabled", matchIfMissing = false)
+@Configuration
+@ImportAutoConfiguration({ NacosDiscoveryClientAutoConfiguration.class,
+		NacosDiscoveryAutoConfiguration.class })
+public class NacosDiscoveryClientConfigServiceBootstrapConfiguration {
+
+}