study/Spring-Cloud-Alibaba
1
0
Fork 0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00
Code Issues Releases Wiki Activity

update pom.xml, and format code

Browse Source
This commit is contained in:
flystar32 2018-09-19 12:15:39 +08:00
parent 024a0cca7c
commit 4ae2983c7a
6 changed files with 38 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
spring-cloud-alibaba-nacos-discovery/pom.xml
View File

@ -21,12 +21,12 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-context</artifactId> <artifactId>spring-cloud-commons</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-commons</artifactId> <artifactId>spring-cloud-context</artifactId>
</dependency> </dependency>
<dependency> <dependency>
@ -57,12 +57,7 @@
<scope>provided</scope> <scope>provided</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure</artifactId> <artifactId>spring-boot-autoconfigure</artifactId>

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

@ -34,7 +34,8 @@ import com.alibaba.nacos.api.naming.pojo.ListView;
*/ */
public class NacosDiscoveryClient implements DiscoveryClient { public class NacosDiscoveryClient implements DiscoveryClient {
private static final Logger LOGGER = LoggerFactory.getLogger(NacosDiscoveryClient.class); private static final Logger LOGGER = LoggerFactory
.getLogger(NacosDiscoveryClient.class);
public static final String DESCRIPTION = "Spring Cloud Nacos Discovery Client"; public static final String DESCRIPTION = "Spring Cloud Nacos Discovery Client";
@Autowired @Autowired
@ -49,7 +50,7 @@ public class NacosDiscoveryClient implements DiscoveryClient {
public List<ServiceInstance> getInstances(String serviceId) { public List<ServiceInstance> getInstances(String serviceId) {
try { try {
NamingService namingService = nacosRegistration.getNacosNamingService(); NamingService namingService = nacosRegistration.getNacosNamingService();
List<Instance> instances = namingService.selectInstances(serviceId,true); List<Instance> instances = namingService.selectInstances(serviceId, true);
return hostToServiceInstanceList(instances, serviceId); return hostToServiceInstanceList(instances, serviceId);
} }
catch (Exception e) { catch (Exception e) {
@ -58,25 +59,26 @@ public class NacosDiscoveryClient implements DiscoveryClient {
} }
} }
private static ServiceInstance hostToServiceInstance(Instance instance, String serviceId) { private static ServiceInstance hostToServiceInstance(Instance instance,
String serviceId) {
NacosServiceInstance nacosServiceInstance = new NacosServiceInstance(); NacosServiceInstance nacosServiceInstance = new NacosServiceInstance();
nacosServiceInstance.setHost(instance.getIp()); nacosServiceInstance.setHost(instance.getIp());
nacosServiceInstance.setPort(instance.getPort()); nacosServiceInstance.setPort(instance.getPort());
nacosServiceInstance.setServiceId(serviceId); nacosServiceInstance.setServiceId(serviceId);
Map<String, String> metadata = new HashMap<String, String>(); Map<String, String> metadata = new HashMap<String, String>();
metadata.put("instanceId", instance.getInstanceId()); metadata.put("instanceId", instance.getInstanceId());
metadata.put("weight", instance.getWeight()+""); metadata.put("weight", instance.getWeight() + "");
metadata.put("healthy", instance.isHealthy()+""); metadata.put("healthy", instance.isHealthy() + "");
metadata.put("cluster", instance.getCluster()+""); metadata.put("cluster", instance.getCluster() + "");
metadata.putAll(instance.getMetadata()); metadata.putAll(instance.getMetadata());
nacosServiceInstance.setMetadata(metadata); nacosServiceInstance.setMetadata(metadata);
return nacosServiceInstance; return nacosServiceInstance;
} }
private static List<ServiceInstance> hostToServiceInstanceList(List<Instance> instances, private static List<ServiceInstance> hostToServiceInstanceList(
String serviceId) { List<Instance> instances, String serviceId) {
List<ServiceInstance> result = new ArrayList<ServiceInstance>(instances.size()); List<ServiceInstance> result = new ArrayList<ServiceInstance>(instances.size());
for (Instance instance: instances) { for (Instance instance : instances) {
result.add(hostToServiceInstance(instance, serviceId)); result.add(hostToServiceInstance(instance, serviceId));
} }
return result; return result;
@ -87,9 +89,11 @@ public class NacosDiscoveryClient implements DiscoveryClient {
try { try {
NamingService namingService = nacosRegistration.getNacosNamingService(); NamingService namingService = nacosRegistration.getNacosNamingService();
ListView<String> services = namingService.getServicesOfServer(1, Integer.MAX_VALUE); ListView<String> services = namingService.getServicesOfServer(1,
Integer.MAX_VALUE);
return services.getData(); return services.getData();
}catch( Exception e){ }
catch (Exception e) {
LOGGER.error("get service name from nacos server fail,", e); LOGGER.error("get service name from nacos server fail,", e);
return Collections.emptyList(); return Collections.emptyList();
} }

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

@ -16,7 +16,6 @@
package org.springframework.cloud.alibaba.nacos; package org.springframework.cloud.alibaba.nacos;
import com.fasterxml.jackson.annotation.JsonIgnore;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
@ -123,7 +122,6 @@ public class NacosDiscoveryProperties {
private String secretKey; private String secretKey;
@Autowired @Autowired
@JsonIgnore
private InetUtils inetUtils; private InetUtils inetUtils;
@PostConstruct @PostConstruct
@ -190,10 +188,6 @@ public class NacosDiscoveryProperties {
this.logName = logName; this.logName = logName;
} }
public InetUtils getInetUtils() {
return inetUtils;
}
public void setInetUtils(InetUtils inetUtils) { public void setInetUtils(InetUtils inetUtils) {
this.inetUtils = inetUtils; this.inetUtils = inetUtils;
} }

13
spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/registry/NacosAutoServiceRegistration.java
View File

@ -16,7 +16,6 @@
package org.springframework.cloud.alibaba.nacos.registry; package org.springframework.cloud.alibaba.nacos.registry;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -29,14 +28,16 @@ import org.springframework.util.StringUtils;
/** /**
* @author xiaojing * @author xiaojing
*/ */
public class NacosAutoServiceRegistration extends AbstractAutoServiceRegistration<NacosRegistration> { public class NacosAutoServiceRegistration
private static final Logger LOGGER = LoggerFactory.getLogger(NacosAutoServiceRegistration.class); extends AbstractAutoServiceRegistration<NacosRegistration> {
private static final Logger LOGGER = LoggerFactory
.getLogger(NacosAutoServiceRegistration.class);
@Autowired @Autowired
private NacosRegistration registration; private NacosRegistration registration;
public NacosAutoServiceRegistration(
public NacosAutoServiceRegistration(ServiceRegistry<NacosRegistration> serviceRegistry, ServiceRegistry<NacosRegistration> serviceRegistry,
AutoServiceRegistrationProperties autoServiceRegistrationProperties, AutoServiceRegistrationProperties autoServiceRegistrationProperties,
NacosRegistration registration) { NacosRegistration registration) {
super(serviceRegistry, autoServiceRegistrationProperties); super(serviceRegistry, autoServiceRegistrationProperties);
@ -83,7 +84,6 @@ public class NacosAutoServiceRegistration extends AbstractAutoServiceRegistratio
} }
@Override @Override
protected Object getConfiguration() { protected Object getConfiguration() {
return this.registration.getNacosDiscoveryProperties(); return this.registration.getNacosDiscoveryProperties();
@ -102,4 +102,3 @@ public class NacosAutoServiceRegistration extends AbstractAutoServiceRegistratio
} }
} }

17
spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/registry/NacosRegistration.java
View File

@ -34,6 +34,7 @@ import com.alibaba.nacos.api.naming.NamingService;
import com.alibaba.nacos.client.naming.utils.UtilAndComs; import com.alibaba.nacos.client.naming.utils.UtilAndComs;
import static com.alibaba.nacos.api.PropertyKeyConst.*; import static com.alibaba.nacos.api.PropertyKeyConst.*;
/** /**
* @author xiaojing * @author xiaojing
*/ */
@ -54,11 +55,12 @@ public class NacosRegistration implements Registration, ServiceInstance {
Properties properties = new Properties(); Properties properties = new Properties();
properties.put(SERVER_ADDR, nacosDiscoveryProperties.getServerAddr()); properties.put(SERVER_ADDR, nacosDiscoveryProperties.getServerAddr());
properties.put(NAMESPACE, nacosDiscoveryProperties.getNamespace()); properties.put(NAMESPACE, nacosDiscoveryProperties.getNamespace());
properties.put(UtilAndComs.NACOS_NAMING_LOG_NAME, nacosDiscoveryProperties.getLogName()); properties.put(UtilAndComs.NACOS_NAMING_LOG_NAME,
nacosDiscoveryProperties.getLogName());
properties.put(ENDPOINT, nacosDiscoveryProperties.getEndpoint()); properties.put(ENDPOINT, nacosDiscoveryProperties.getEndpoint());
properties.put(ACCESS_KEY,nacosDiscoveryProperties.getAccessKey()); properties.put(ACCESS_KEY, nacosDiscoveryProperties.getAccessKey());
properties.put(SECRET_KEY,nacosDiscoveryProperties.getSecretKey()); properties.put(SECRET_KEY, nacosDiscoveryProperties.getSecretKey());
properties.put(CLUSTER_NAME,nacosDiscoveryProperties.getClusterName()); properties.put(CLUSTER_NAME, nacosDiscoveryProperties.getClusterName());
try { try {
nacosNamingService = NacosFactory.createNamingService(properties); nacosNamingService = NacosFactory.createNamingService(properties);
} }
@ -134,9 +136,8 @@ public class NacosRegistration implements Registration, ServiceInstance {
@Override @Override
public String toString() { public String toString() {
return "NacosRegistration{" + return "NacosRegistration{" + "nacosDiscoveryProperties="
"nacosDiscoveryProperties=" + nacosDiscoveryProperties + + nacosDiscoveryProperties + ", nacosNamingService=" + nacosNamingService
", nacosNamingService=" + nacosNamingService + + '}';
'}';
} }
} }

2
spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServer.java
View File

@ -31,7 +31,7 @@ public class NacosServer extends Server {
private final Instance instance; private final Instance instance;
private final Map<String, String> metadata; private final Map<String, String> metadata;
public NacosServer(Instance instance) { public NacosServer(final Instance instance) {
super(instance.getIp(), instance.getPort()); super(instance.getIp(), instance.getPort());
this.instance = instance; this.instance = instance;
this.metaInfo = new MetaInfo() { this.metaInfo = new MetaInfo() {