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

format code

Browse Source
This commit is contained in:
flystar32 2019-02-20 15:35:44 +08:00
parent 95060a19b1
commit d7665170ec
7 changed files with 133 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,7 @@ import org.springframework.cloud.alibaba.nacos.discovery.NacosDiscoveryClientAut
import org.springframework.cloud.alibaba.nacos.registry.NacosAutoServiceRegistration; import org.springframework.cloud.alibaba.nacos.registry.NacosAutoServiceRegistration;
import org.springframework.cloud.alibaba.nacos.registry.NacosRegistration; import org.springframework.cloud.alibaba.nacos.registry.NacosRegistration;
import org.springframework.cloud.alibaba.nacos.registry.NacosServiceRegistry; import org.springframework.cloud.alibaba.nacos.registry.NacosServiceRegistry;
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationAutoConfiguration; import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationProperties; import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationProperties;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
@ -43,7 +43,7 @@ import org.springframework.context.annotation.Configuration;
@ConditionalOnNacosDiscoveryEnabled @ConditionalOnNacosDiscoveryEnabled
@ConditionalOnProperty(value = "spring.cloud.service-registry.auto-registration.enabled", matchIfMissing = true) @ConditionalOnProperty(value = "spring.cloud.service-registry.auto-registration.enabled", matchIfMissing = true)
@AutoConfigureBefore(NacosDiscoveryClientAutoConfiguration.class) @AutoConfigureBefore(NacosDiscoveryClientAutoConfiguration.class)
@AutoConfigureAfter(AutoServiceRegistrationAutoConfiguration.class) @AutoConfigureAfter(AutoServiceRegistrationConfiguration.class)
public class NacosDiscoveryAutoConfiguration { public class NacosDiscoveryAutoConfiguration {
@Bean @Bean

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

@ -154,8 +154,8 @@ public class NacosDiscoveryProperties {
} }
serverAddr = Objects.toString(serverAddr, ""); serverAddr = Objects.toString(serverAddr, "");
if(serverAddr.lastIndexOf("/") != -1) { if (serverAddr.lastIndexOf("/") != -1) {
serverAddr.substring(0,serverAddr.length()-1); serverAddr.substring(0, serverAddr.length() - 1);
} }
endpoint = Objects.toString(endpoint, ""); endpoint = Objects.toString(endpoint, "");
namespace = Objects.toString(namespace, ""); namespace = Objects.toString(namespace, "");
@ -397,13 +397,14 @@ public class NacosDiscoveryProperties {
properties.put(CLUSTER_NAME, clusterName); properties.put(CLUSTER_NAME, clusterName);
properties.put(NAMING_LOAD_CACHE_AT_START, namingLoadCacheAtStart); properties.put(NAMING_LOAD_CACHE_AT_START, namingLoadCacheAtStart);
try { try {
namingService = NacosFactory.createNamingService(properties); namingService = NacosFactory.createNamingService(properties);
} catch (Exception e) { }
catch (Exception e) {
LOGGER.error("create naming service error!properties={},e=,", this, e); LOGGER.error("create naming service error!properties={},e=,", this, e);
return null; return null;
} }
return namingService; return namingService;
} }
} }

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

@ -21,8 +21,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.cloud.alibaba.nacos.ConditionalOnNacosDiscoveryEnabled; import org.springframework.cloud.alibaba.nacos.ConditionalOnNacosDiscoveryEnabled;
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties; 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.CommonsClientAutoConfiguration;
import org.springframework.cloud.client.discovery.DiscoveryClient; import org.springframework.cloud.client.discovery.DiscoveryClient;
import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryClientAutoConfiguration; import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryClientAutoConfiguration;

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

@ -30,75 +30,74 @@ import org.springframework.util.StringUtils;
* @author <a href="mailto:mercyblitz@gmail.com">Mercy</a> * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
*/ */
public class NacosAutoServiceRegistration public class NacosAutoServiceRegistration
extends AbstractAutoServiceRegistration<Registration> { extends AbstractAutoServiceRegistration<Registration> {
private static final Logger LOGGER = LoggerFactory private static final Logger LOGGER = LoggerFactory
.getLogger(NacosAutoServiceRegistration.class); .getLogger(NacosAutoServiceRegistration.class);
private NacosRegistration registration; private NacosRegistration registration;
public NacosAutoServiceRegistration( public NacosAutoServiceRegistration(ServiceRegistry<Registration> serviceRegistry,
ServiceRegistry<Registration> serviceRegistry, AutoServiceRegistrationProperties autoServiceRegistrationProperties,
AutoServiceRegistrationProperties autoServiceRegistrationProperties, NacosRegistration registration) {
NacosRegistration registration) { super(serviceRegistry, autoServiceRegistrationProperties);
super(serviceRegistry, autoServiceRegistrationProperties); this.registration = registration;
this.registration = registration; }
}
@Deprecated @Deprecated
public void setPort(int port) { public void setPort(int port) {
getPort().set(port); getPort().set(port);
} }
@Override @Override
protected NacosRegistration getRegistration() { protected NacosRegistration getRegistration() {
if (this.registration.getPort() < 0 && this.getPort().get() > 0) { if (this.registration.getPort() < 0 && this.getPort().get() > 0) {
this.registration.setPort(this.getPort().get()); this.registration.setPort(this.getPort().get());
} }
Assert.isTrue(this.registration.getPort() > 0, "service.port has not been set"); Assert.isTrue(this.registration.getPort() > 0, "service.port has not been set");
return this.registration; return this.registration;
} }
@Override @Override
protected NacosRegistration getManagementRegistration() { protected NacosRegistration getManagementRegistration() {
return null; return null;
} }
@Override @Override
protected void register() { protected void register() {
if (!this.registration.getNacosDiscoveryProperties().isRegisterEnabled()) { if (!this.registration.getNacosDiscoveryProperties().isRegisterEnabled()) {
LOGGER.debug("Registration disabled."); LOGGER.debug("Registration disabled.");
return; return;
} }
if (this.registration.getPort() < 0) { if (this.registration.getPort() < 0) {
this.registration.setPort(getPort().get()); this.registration.setPort(getPort().get());
} }
super.register(); super.register();
} }
@Override @Override
protected void registerManagement() { protected void registerManagement() {
if (!this.registration.getNacosDiscoveryProperties().isRegisterEnabled()) { if (!this.registration.getNacosDiscoveryProperties().isRegisterEnabled()) {
return; return;
} }
super.registerManagement(); super.registerManagement();
} }
@Override @Override
protected Object getConfiguration() { protected Object getConfiguration() {
return this.registration.getNacosDiscoveryProperties(); return this.registration.getNacosDiscoveryProperties();
} }
@Override @Override
protected boolean isEnabled() { protected boolean isEnabled() {
return this.registration.getNacosDiscoveryProperties().isRegisterEnabled(); return this.registration.getNacosDiscoveryProperties().isRegisterEnabled();
} }
@Override @Override
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
protected String getAppName() { protected String getAppName() {
String appName = registration.getNacosDiscoveryProperties().getService(); String appName = registration.getNacosDiscoveryProperties().getService();
return StringUtils.isEmpty(appName) ? super.getAppName() : appName; return StringUtils.isEmpty(appName) ? super.getAppName() : appName;
} }
} }

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

@ -18,7 +18,6 @@ package org.springframework.cloud.alibaba.nacos.registry;
import com.alibaba.nacos.api.naming.NamingService; import com.alibaba.nacos.api.naming.NamingService;
import com.alibaba.nacos.api.naming.pojo.Instance; import com.alibaba.nacos.api.naming.pojo.Instance;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties; import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
@ -32,83 +31,84 @@ import org.springframework.util.StringUtils;
*/ */
public class NacosServiceRegistry implements ServiceRegistry<Registration> { public class NacosServiceRegistry implements ServiceRegistry<Registration> {
private static Logger logger = LoggerFactory.getLogger(NacosServiceRegistry.class); private static Logger logger = LoggerFactory.getLogger(NacosServiceRegistry.class);
private final NacosDiscoveryProperties nacosDiscoveryProperties; private final NacosDiscoveryProperties nacosDiscoveryProperties;
private final NamingService namingService; private final NamingService namingService;
public NacosServiceRegistry(NacosDiscoveryProperties nacosDiscoveryProperties) { public NacosServiceRegistry(NacosDiscoveryProperties nacosDiscoveryProperties) {
this.nacosDiscoveryProperties = nacosDiscoveryProperties; this.nacosDiscoveryProperties = nacosDiscoveryProperties;
this.namingService = nacosDiscoveryProperties.namingServiceInstance(); this.namingService = nacosDiscoveryProperties.namingServiceInstance();
} }
@Override
public void register(Registration registration) {
@Override if (StringUtils.isEmpty(registration.getServiceId())) {
public void register(Registration registration) { logger.info("No service to register for nacos client...");
return;
}
if (StringUtils.isEmpty(registration.getServiceId())) { String serviceId = registration.getServiceId();
logger.info("No service to register for nacos client...");
return;
}
String serviceId = registration.getServiceId(); Instance instance = new Instance();
instance.setIp(registration.getHost());
instance.setPort(registration.getPort());
instance.setWeight(nacosDiscoveryProperties.getWeight());
instance.setClusterName(nacosDiscoveryProperties.getClusterName());
instance.setMetadata(registration.getMetadata());
Instance instance = new Instance(); try {
instance.setIp(registration.getHost()); namingService.registerInstance(serviceId, instance);
instance.setPort(registration.getPort()); logger.info("nacos registry, {} {}:{} register finished", serviceId,
instance.setWeight(nacosDiscoveryProperties.getWeight()); instance.getIp(), instance.getPort());
instance.setClusterName(nacosDiscoveryProperties.getClusterName()); }
instance.setMetadata(registration.getMetadata()); catch (Exception e) {
logger.error("nacos registry, {} register failed...{},", serviceId,
registration.toString(), e);
}
}
try { @Override
namingService.registerInstance(serviceId, instance); public void deregister(Registration registration) {
logger.info("nacos registry, {} {}:{} register finished", serviceId,
instance.getIp(), instance.getPort());
} catch (Exception e) {
logger.error("nacos registry, {} register failed...{},", serviceId,
registration.toString(), e);
}
}
@Override logger.info("De-registering from Nacos Server now...");
public void deregister(Registration registration) {
logger.info("De-registering from Nacos Server now..."); if (StringUtils.isEmpty(registration.getServiceId())) {
logger.info("No dom to de-register for nacos client...");
return;
}
if (StringUtils.isEmpty(registration.getServiceId())) { NamingService namingService = nacosDiscoveryProperties.namingServiceInstance();
logger.info("No dom to de-register for nacos client..."); String serviceId = registration.getServiceId();
return;
}
NamingService namingService = nacosDiscoveryProperties.namingServiceInstance(); try {
String serviceId = registration.getServiceId(); namingService.deregisterInstance(serviceId, registration.getHost(),
registration.getPort(), nacosDiscoveryProperties.getClusterName());
}
catch (Exception e) {
logger.error("ERR_NACOS_DEREGISTER, de-register failed...{},",
registration.toString(), e);
}
try { logger.info("De-registration finished.");
namingService.deregisterInstance(serviceId, registration.getHost(), }
registration.getPort(), nacosDiscoveryProperties.getClusterName());
} catch (Exception e) {
logger.error("ERR_NACOS_DEREGISTER, de-register failed...{},",
registration.toString(), e);
}
logger.info("De-registration finished."); @Override
} public void close() {
@Override }
public void close() {
} @Override
public void setStatus(Registration registration, String status) {
// nacos doesn't support set status of a particular registration.
}
@Override @Override
public void setStatus(Registration registration, String status) { public <T> T getStatus(Registration registration) {
// nacos doesn't support set status of a particular registration. // nacos doesn't support query status of a particular registration.
} return null;
}
@Override
public <T> T getStatus(Registration registration) {
// nacos doesn't support query status of a particular registration.
return null;
}
} }

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

@ -23,6 +23,7 @@ import java.util.Map;
/** /**
* @author xiaojing * @author xiaojing
* @author pbting
*/ */
public class NacosServer extends Server { public class NacosServer extends Server {

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

@ -62,7 +62,10 @@ public class NacosServerList extends AbstractServerList<NacosServer> {
} }
private List<NacosServer> instancesToServerList(List<Instance> instances) { private List<NacosServer> instancesToServerList(List<Instance> instances) {
List<NacosServer> result = new ArrayList<>(instances.size()); List<NacosServer> result = new ArrayList<>();
if (null == instances) {
return result;
}
for (Instance instance : instances) { for (Instance instance : instances) {
result.add(new NacosServer(instance)); result.add(new NacosServer(instance));
} }