1
0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00

sync & commit in edgware

This commit is contained in:
fangjian0423 2019-11-11 14:22:01 +08:00
parent 2325455aa1
commit caa27b3f1c
27 changed files with 73 additions and 244 deletions

View File

@ -5,7 +5,7 @@ import java.io.StringReader;
import java.util.Properties; import java.util.Properties;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import com.alibaba.cloud.nacos.NacosConfigManager; import com.alibaba.cloud.nacos.NacosConfigProperties;
import com.alibaba.nacos.api.config.listener.Listener; import com.alibaba.nacos.api.config.listener.Listener;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -39,14 +39,14 @@ class SampleRunner implements ApplicationRunner {
int userAge; int userAge;
@Autowired @Autowired
private NacosConfigManager nacosConfigManager; private NacosConfigProperties nacosConfigProperties;
@Override @Override
public void run(ApplicationArguments args) throws Exception { public void run(ApplicationArguments args) throws Exception {
System.out.println( System.out.println(
String.format("Initial username=%s, userAge=%d", userName, userAge)); String.format("Initial username=%s, userAge=%d", userName, userAge));
nacosConfigManager.getConfigService().addListener( nacosConfigProperties.configServiceInstance().addListener(
"nacos-config-example.properties", "DEFAULT_GROUP", new Listener() { "nacos-config-example.properties", "DEFAULT_GROUP", new Listener() {
/** /**

View File

@ -44,11 +44,6 @@ public class NacosConfigAutoConfiguration {
return new NacosConfigProperties(); return new NacosConfigProperties();
} }
@Bean
public NacosConfigManager nacosConfigManager() {
return new NacosConfigManager();
}
@Bean @Bean
public NacosRefreshProperties nacosRefreshProperties() { public NacosRefreshProperties nacosRefreshProperties() {
return new NacosRefreshProperties(); return new NacosRefreshProperties();
@ -61,10 +56,10 @@ public class NacosConfigAutoConfiguration {
@Bean @Bean
public NacosContextRefresher nacosContextRefresher( public NacosContextRefresher nacosContextRefresher(
NacosConfigManager nacosConfigManager, NacosConfigProperties configProperties,
NacosRefreshProperties nacosRefreshProperties, NacosRefreshProperties nacosRefreshProperties,
NacosRefreshHistory refreshHistory) { NacosRefreshHistory refreshHistory) {
return new NacosContextRefresher(nacosRefreshProperties, refreshHistory, return new NacosContextRefresher(nacosRefreshProperties, refreshHistory,
nacosConfigManager.getConfigService()); configProperties.configServiceInstance());
} }
} }

View File

@ -36,17 +36,10 @@ public class NacosConfigBootstrapConfiguration {
return new NacosConfigProperties(); return new NacosConfigProperties();
} }
@Bean
@ConditionalOnMissingBean
public NacosConfigManager nacosConfigManager() {
return new NacosConfigManager();
}
@Bean @Bean
public NacosPropertySourceLocator nacosPropertySourceLocator( public NacosPropertySourceLocator nacosPropertySourceLocator(
NacosConfigManager nacosConfigManager,
NacosConfigProperties nacosConfigProperties) { NacosConfigProperties nacosConfigProperties) {
return new NacosPropertySourceLocator(nacosConfigManager, nacosConfigProperties); return new NacosPropertySourceLocator(nacosConfigProperties);
} }
} }

View File

@ -1,51 +0,0 @@
/*
* 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;
import com.alibaba.cloud.nacos.diagnostics.analyzer.NacosConnectionFailureException;
import com.alibaba.nacos.api.NacosFactory;
import com.alibaba.nacos.api.config.ConfigService;
import com.alibaba.nacos.api.exception.NacosException;
import org.springframework.beans.factory.annotation.Autowired;
/**
* @author <a href="mailto:liaochunyhm@live.com">liaochuntao</a>
*/
public class NacosConfigManager {
private static ConfigService service = null;
@Autowired
private NacosConfigProperties properties;
public ConfigService getConfigService() {
if (service == null) {
try {
service = NacosFactory
.createConfigService(properties.getConfigServiceProperties());
properties.initConfigService(service);
}
catch (NacosException e) {
throw new NacosConnectionFailureException(properties.getServerAddr(),
e.getMessage(), e);
}
}
return service;
}
}

View File

@ -22,7 +22,10 @@ import java.util.Properties;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import com.alibaba.nacos.api.NacosFactory;
import com.alibaba.nacos.api.config.ConfigService; import com.alibaba.nacos.api.config.ConfigService;
import com.alibaba.nacos.api.exception.NacosException;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -190,7 +193,7 @@ public class NacosConfigProperties {
*/ */
private List<Config> extConfig; private List<Config> extConfig;
private ConfigService configService; private static ConfigService configService;
// todo sts support // todo sts support
@ -355,18 +358,22 @@ public class NacosConfigProperties {
} }
/** /**
* @see NacosConfigManager#getConfigService() .
* @return ConfigService * @return ConfigService
*/ */
@Deprecated
public ConfigService configServiceInstance() { public ConfigService configServiceInstance() {
if (null == configService) {
try {
configService = NacosFactory
.createConfigService(getConfigServiceProperties());
}
catch (NacosException e) {
log.error("create naming service error!properties={},e=,", this, e);
return null;
}
}
return configService; return configService;
} }
public void initConfigService(ConfigService configService) {
this.configService = configService;
}
public Properties getConfigServiceProperties() { public Properties getConfigServiceProperties() {
Properties properties = new Properties(); Properties properties = new Properties();
properties.put(SERVER_ADDR, Objects.toString(this.serverAddr, "")); properties.put(SERVER_ADDR, Objects.toString(this.serverAddr, ""));

View File

@ -18,7 +18,6 @@ package com.alibaba.cloud.nacos.client;
import java.util.List; import java.util.List;
import com.alibaba.cloud.nacos.NacosConfigManager;
import com.alibaba.cloud.nacos.NacosConfigProperties; import com.alibaba.cloud.nacos.NacosConfigProperties;
import com.alibaba.cloud.nacos.NacosPropertySourceRepository; import com.alibaba.cloud.nacos.NacosPropertySourceRepository;
import com.alibaba.cloud.nacos.parser.NacosDataParserHandler; import com.alibaba.cloud.nacos.parser.NacosDataParserHandler;
@ -58,18 +57,14 @@ public class NacosPropertySourceLocator implements PropertySourceLocator {
private NacosConfigProperties nacosConfigProperties; private NacosConfigProperties nacosConfigProperties;
private NacosConfigManager nacosConfigManager; public NacosPropertySourceLocator(NacosConfigProperties nacosConfigProperties) {
public NacosPropertySourceLocator(NacosConfigManager nacosConfigManager,
NacosConfigProperties nacosConfigProperties) {
this.nacosConfigManager = nacosConfigManager;
this.nacosConfigProperties = nacosConfigProperties; this.nacosConfigProperties = nacosConfigProperties;
} }
@Override @Override
public PropertySource<?> locate(Environment env) { public PropertySource<?> locate(Environment env) {
ConfigService configService = nacosConfigManager.getConfigService(); ConfigService configService = nacosConfigProperties.configServiceInstance();
if (null == configService) { if (null == configService) {
log.warn("no instance of config service found, can't load config from nacos"); log.warn("no instance of config service found, can't load config from nacos");

View File

@ -16,7 +16,6 @@
package com.alibaba.cloud.nacos.endpoint; package com.alibaba.cloud.nacos.endpoint;
import com.alibaba.cloud.nacos.NacosConfigManager;
import com.alibaba.cloud.nacos.NacosConfigProperties; import com.alibaba.cloud.nacos.NacosConfigProperties;
import com.alibaba.cloud.nacos.refresh.NacosRefreshHistory; import com.alibaba.cloud.nacos.refresh.NacosRefreshHistory;
@ -38,9 +37,6 @@ public class NacosConfigEndpointAutoConfiguration {
@Autowired @Autowired
private NacosConfigProperties nacosConfigProperties; private NacosConfigProperties nacosConfigProperties;
@Autowired
private NacosConfigManager nacosConfigManager;
@Autowired @Autowired
private NacosRefreshHistory nacosRefreshHistory; private NacosRefreshHistory nacosRefreshHistory;
@ -52,6 +48,7 @@ public class NacosConfigEndpointAutoConfiguration {
@Bean @Bean
public NacosConfigHealthIndicator nacosConfigHealthIndicator() { public NacosConfigHealthIndicator nacosConfigHealthIndicator() {
return new NacosConfigHealthIndicator(nacosConfigManager.getConfigService()); return new NacosConfigHealthIndicator(
nacosConfigProperties.configServiceInstance());
} }
} }

View File

@ -21,7 +21,7 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Properties; import java.util.Properties;
import com.alibaba.nacos.client.utils.StringUtils; import org.springframework.util.StringUtils;
/** /**
* @author zkz * @author zkz
@ -118,7 +118,7 @@ public abstract class AbstractNacosDataParser {
Properties properties = new Properties(); Properties properties = new Properties();
for (Map.Entry<String, String> entry : map.entrySet()) { for (Map.Entry<String, String> entry : map.entrySet()) {
String key = entry.getKey(); String key = entry.getKey();
if (StringUtils.isBlank(key)) { if (StringUtils.isEmpty(key)) {
continue; continue;
} }
key = key.startsWith(DOT) ? key.replaceFirst("\\.", "") : key; key = key.startsWith(DOT) ? key.replaceFirst("\\.", "") : key;

View File

@ -22,10 +22,11 @@ import java.util.Iterator;
import java.util.Map; import java.util.Map;
import java.util.Properties; import java.util.Properties;
import com.alibaba.nacos.client.utils.StringUtils;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.util.StringUtils;
/** /**
* @author zkz * @author zkz
*/ */

View File

@ -25,14 +25,14 @@ import java.util.Properties;
import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.DocumentBuilderFactory;
import com.alibaba.nacos.client.utils.StringUtils;
import org.w3c.dom.Document; import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap; import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node; import org.w3c.dom.Node;
import org.w3c.dom.NodeList; import org.w3c.dom.NodeList;
import org.xml.sax.InputSource; import org.xml.sax.InputSource;
import org.springframework.util.StringUtils;
/** /**
* With relatively few usage scenarios, only simple parsing is performed to reduce jar * With relatively few usage scenarios, only simple parsing is performed to reduce jar
* dependencies. * dependencies.

View File

@ -47,23 +47,16 @@ public class NacosDiscoveryAutoConfiguration {
@Bean @Bean
public NacosServiceRegistry nacosServiceRegistry( public NacosServiceRegistry nacosServiceRegistry(
NacosNamingManager nacosNamingManager,
NacosDiscoveryProperties nacosDiscoveryProperties) { NacosDiscoveryProperties nacosDiscoveryProperties) {
return new NacosServiceRegistry(nacosNamingManager, nacosDiscoveryProperties); return new NacosServiceRegistry(nacosDiscoveryProperties);
}
@Bean
public NacosNamingManager nacosNamingManager() {
return new NacosNamingManager();
} }
@Bean @Bean
@ConditionalOnBean(AutoServiceRegistrationProperties.class) @ConditionalOnBean(AutoServiceRegistrationProperties.class)
public NacosRegistration nacosRegistration(NacosNamingManager nacosNamingManager, public NacosRegistration nacosRegistration(
NacosDiscoveryProperties nacosDiscoveryProperties, NacosDiscoveryProperties nacosDiscoveryProperties,
ApplicationContext context) { ApplicationContext context) {
return new NacosRegistration(nacosNamingManager, nacosDiscoveryProperties, return new NacosRegistration(nacosDiscoveryProperties, context);
context);
} }
@Bean @Bean

View File

@ -182,9 +182,9 @@ public class NacosDiscoveryProperties {
@Autowired @Autowired
private Environment environment; private Environment environment;
private NamingService namingService; private static NamingService namingService;
private NamingMaintainService namingMaintainService; private static NamingMaintainService namingMaintainService;
@PostConstruct @PostConstruct
public void init() throws SocketException { public void init() throws SocketException {
@ -465,7 +465,6 @@ public class NacosDiscoveryProperties {
} }
} }
@Deprecated
public NamingService namingServiceInstance() { public NamingService namingServiceInstance() {
if (null != namingService) { if (null != namingService) {
@ -482,7 +481,6 @@ public class NacosDiscoveryProperties {
return namingService; return namingService;
} }
@Deprecated
public NamingMaintainService namingMaintainServiceInstance() { public NamingMaintainService namingMaintainServiceInstance() {
if (null != namingMaintainService) { if (null != namingMaintainService) {

View File

@ -1,49 +0,0 @@
/*
* 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;
import com.alibaba.nacos.api.naming.NamingMaintainService;
import com.alibaba.nacos.api.naming.NamingService;
import org.springframework.beans.factory.annotation.Autowired;
/**
* @author <a href="mailto:liaochunyhm@live.com">liaochuntao</a>
*/
public class NacosNamingManager {
private static NamingService namingService = null;
private static NamingMaintainService namingMaintainService = null;
@Autowired
private NacosDiscoveryProperties discoveryProperties;
public NamingService getNamingService() {
if (namingService == null) {
namingService = discoveryProperties.namingServiceInstance();
}
return namingService;
}
public NamingMaintainService getNamingMaintainService() {
if (namingMaintainService == null) {
namingMaintainService = discoveryProperties.namingMaintainServiceInstance();
}
return namingMaintainService;
}
}

View File

@ -24,7 +24,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import com.alibaba.cloud.nacos.NacosDiscoveryProperties; import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.alibaba.cloud.nacos.NacosNamingManager;
import com.alibaba.cloud.nacos.NacosServiceInstance; import com.alibaba.cloud.nacos.NacosServiceInstance;
import com.alibaba.nacos.api.naming.pojo.Instance; import com.alibaba.nacos.api.naming.pojo.Instance;
import com.alibaba.nacos.api.naming.pojo.ListView; import com.alibaba.nacos.api.naming.pojo.ListView;
@ -45,12 +44,9 @@ public class NacosDiscoveryClient implements DiscoveryClient {
private static final Logger log = LoggerFactory.getLogger(NacosDiscoveryClient.class); private static final Logger log = LoggerFactory.getLogger(NacosDiscoveryClient.class);
public static final String DESCRIPTION = "Spring Cloud Nacos Discovery Client"; public static final String DESCRIPTION = "Spring Cloud Nacos Discovery Client";
private NacosNamingManager nacosNamingManager;
private NacosDiscoveryProperties discoveryProperties; private NacosDiscoveryProperties discoveryProperties;
public NacosDiscoveryClient(NacosNamingManager nacosNamingManager, public NacosDiscoveryClient(NacosDiscoveryProperties discoveryProperties) {
NacosDiscoveryProperties discoveryProperties) {
this.nacosNamingManager = nacosNamingManager;
this.discoveryProperties = discoveryProperties; this.discoveryProperties = discoveryProperties;
} }
@ -98,7 +94,7 @@ public class NacosDiscoveryClient implements DiscoveryClient {
public List<ServiceInstance> getInstances(String serviceId) { public List<ServiceInstance> getInstances(String serviceId) {
try { try {
String group = discoveryProperties.getGroup(); String group = discoveryProperties.getGroup();
List<Instance> instances = nacosNamingManager.getNamingService() List<Instance> instances = discoveryProperties.namingServiceInstance()
.selectInstances(serviceId, group, true); .selectInstances(serviceId, group, true);
return hostToServiceInstanceList(instances, serviceId); return hostToServiceInstanceList(instances, serviceId);
} }
@ -150,7 +146,7 @@ public class NacosDiscoveryClient implements DiscoveryClient {
try { try {
String group = discoveryProperties.getGroup(); String group = discoveryProperties.getGroup();
ListView<String> services = nacosNamingManager.getNamingService() ListView<String> services = discoveryProperties.namingServiceInstance()
.getServicesOfServer(1, Integer.MAX_VALUE, group); .getServicesOfServer(1, Integer.MAX_VALUE, group);
return services.getData(); return services.getData();
} }

View File

@ -18,7 +18,6 @@ package com.alibaba.cloud.nacos.discovery;
import com.alibaba.cloud.nacos.ConditionalOnNacosDiscoveryEnabled; import com.alibaba.cloud.nacos.ConditionalOnNacosDiscoveryEnabled;
import com.alibaba.cloud.nacos.NacosDiscoveryProperties; import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.alibaba.cloud.nacos.NacosNamingManager;
import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.AutoConfigureBefore;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@ -45,9 +44,9 @@ public class NacosDiscoveryClientAutoConfiguration {
} }
@Bean @Bean
public DiscoveryClient nacosDiscoveryClient(NacosNamingManager nacosNamingManager, public DiscoveryClient nacosDiscoveryClient(
NacosDiscoveryProperties discoveryProperties) { NacosDiscoveryProperties discoveryProperties) {
return new NacosDiscoveryClient(nacosNamingManager, discoveryProperties); return new NacosDiscoveryClient(discoveryProperties);
} }
@Bean @Bean

View File

@ -22,7 +22,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import com.alibaba.cloud.nacos.NacosDiscoveryProperties; import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.alibaba.cloud.nacos.NacosNamingManager;
import com.alibaba.nacos.api.naming.NamingService; import com.alibaba.nacos.api.naming.NamingService;
import com.alibaba.nacos.api.naming.pojo.ServiceInfo; import com.alibaba.nacos.api.naming.pojo.ServiceInfo;
@ -40,13 +39,10 @@ public class NacosDiscoveryEndpoint extends AbstractEndpoint<Map<String, Object>
private static final Logger log = LoggerFactory private static final Logger log = LoggerFactory
.getLogger(NacosDiscoveryEndpoint.class); .getLogger(NacosDiscoveryEndpoint.class);
private NacosNamingManager nacosNamingManager;
private NacosDiscoveryProperties nacosDiscoveryProperties; private NacosDiscoveryProperties nacosDiscoveryProperties;
public NacosDiscoveryEndpoint(NacosNamingManager nacosNamingManager, public NacosDiscoveryEndpoint(NacosDiscoveryProperties nacosDiscoveryProperties) {
NacosDiscoveryProperties nacosDiscoveryProperties) {
super("nacos_discovery", false); super("nacos_discovery", false);
this.nacosNamingManager = nacosNamingManager;
this.nacosDiscoveryProperties = nacosDiscoveryProperties; this.nacosDiscoveryProperties = nacosDiscoveryProperties;
} }
@ -58,7 +54,7 @@ public class NacosDiscoveryEndpoint extends AbstractEndpoint<Map<String, Object>
Map<String, Object> result = new HashMap<>(); Map<String, Object> result = new HashMap<>();
result.put("NacosDiscoveryProperties", nacosDiscoveryProperties); result.put("NacosDiscoveryProperties", nacosDiscoveryProperties);
NamingService namingService = nacosNamingManager.getNamingService(); NamingService namingService = nacosDiscoveryProperties.namingServiceInstance();
List<ServiceInfo> subscribe = Collections.emptyList(); List<ServiceInfo> subscribe = Collections.emptyList();
try { try {

View File

@ -18,7 +18,6 @@ package com.alibaba.cloud.nacos.endpoint;
import com.alibaba.cloud.nacos.ConditionalOnNacosDiscoveryEnabled; import com.alibaba.cloud.nacos.ConditionalOnNacosDiscoveryEnabled;
import com.alibaba.cloud.nacos.NacosDiscoveryProperties; import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.alibaba.cloud.nacos.NacosNamingManager;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@ -36,9 +35,8 @@ public class NacosDiscoveryEndpointAutoConfiguration {
@Bean @Bean
@ConditionalOnMissingBean @ConditionalOnMissingBean
public NacosDiscoveryEndpoint nacosDiscoveryEndpoint( public NacosDiscoveryEndpoint nacosDiscoveryEndpoint(
NacosNamingManager nacosNamingManager,
NacosDiscoveryProperties nacosDiscoveryProperties) { NacosDiscoveryProperties nacosDiscoveryProperties) {
return new NacosDiscoveryEndpoint(nacosNamingManager, nacosDiscoveryProperties); return new NacosDiscoveryEndpoint(nacosDiscoveryProperties);
} }
} }

View File

@ -22,7 +22,6 @@ import java.util.Map;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import com.alibaba.cloud.nacos.NacosDiscoveryProperties; import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.alibaba.cloud.nacos.NacosNamingManager;
import com.alibaba.nacos.api.naming.NamingService; import com.alibaba.nacos.api.naming.NamingService;
import com.alibaba.nacos.api.naming.PreservedMetadataKeys; import com.alibaba.nacos.api.naming.PreservedMetadataKeys;
@ -43,15 +42,12 @@ public class NacosRegistration implements Registration, ServiceInstance {
public static final String MANAGEMENT_CONTEXT_PATH = "management.context-path"; public static final String MANAGEMENT_CONTEXT_PATH = "management.context-path";
public static final String MANAGEMENT_ADDRESS = "management.address"; public static final String MANAGEMENT_ADDRESS = "management.address";
private NacosNamingManager nacosNamingManager;
private NacosDiscoveryProperties nacosDiscoveryProperties; private NacosDiscoveryProperties nacosDiscoveryProperties;
private ApplicationContext context; private ApplicationContext context;
public NacosRegistration(NacosNamingManager nacosNamingManager, public NacosRegistration(NacosDiscoveryProperties nacosDiscoveryProperties,
NacosDiscoveryProperties nacosDiscoveryProperties,
ApplicationContext context) { ApplicationContext context) {
this.nacosNamingManager = nacosNamingManager;
this.nacosDiscoveryProperties = nacosDiscoveryProperties; this.nacosDiscoveryProperties = nacosDiscoveryProperties;
this.context = context; this.context = context;
} }
@ -138,7 +134,7 @@ public class NacosRegistration implements Registration, ServiceInstance {
} }
public NamingService getNacosNamingService() { public NamingService getNacosNamingService() {
return nacosNamingManager.getNamingService(); return nacosDiscoveryProperties.namingServiceInstance();
} }
@Override @Override

View File

@ -19,7 +19,6 @@ package com.alibaba.cloud.nacos.registry;
import java.util.List; import java.util.List;
import com.alibaba.cloud.nacos.NacosDiscoveryProperties; import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.alibaba.cloud.nacos.NacosNamingManager;
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;
@ -38,16 +37,13 @@ public class NacosServiceRegistry implements ServiceRegistry<Registration> {
private static final Logger log = LoggerFactory.getLogger(NacosServiceRegistry.class); private static final Logger log = LoggerFactory.getLogger(NacosServiceRegistry.class);
private final NacosNamingManager nacosNamingManager;
private final NacosDiscoveryProperties nacosDiscoveryProperties; private final NacosDiscoveryProperties nacosDiscoveryProperties;
private final NamingService namingService; private final NamingService namingService;
public NacosServiceRegistry(NacosNamingManager nacosNamingManager, public NacosServiceRegistry(NacosDiscoveryProperties nacosDiscoveryProperties) {
NacosDiscoveryProperties nacosDiscoveryProperties) {
this.nacosNamingManager = nacosNamingManager;
this.nacosDiscoveryProperties = nacosDiscoveryProperties; this.nacosDiscoveryProperties = nacosDiscoveryProperties;
this.namingService = nacosNamingManager.getNamingService(); this.namingService = nacosDiscoveryProperties.namingServiceInstance();
} }
@Override @Override
@ -84,7 +80,6 @@ public class NacosServiceRegistry implements ServiceRegistry<Registration> {
return; return;
} }
NamingService namingService = nacosNamingManager.getNamingService();
String serviceId = registration.getServiceId(); String serviceId = registration.getServiceId();
String group = nacosDiscoveryProperties.getGroup(); String group = nacosDiscoveryProperties.getGroup();
@ -125,8 +120,8 @@ public class NacosServiceRegistry implements ServiceRegistry<Registration> {
} }
try { try {
nacosNamingManager.getNamingMaintainService().updateInstance(serviceId, nacosDiscoveryProperties.namingMaintainServiceInstance()
instance); .updateInstance(serviceId, instance);
} }
catch (Exception e) { catch (Exception e) {
throw new RuntimeException("update nacos instance status fail", e); throw new RuntimeException("update nacos instance status fail", e);
@ -139,7 +134,7 @@ public class NacosServiceRegistry implements ServiceRegistry<Registration> {
String serviceName = registration.getServiceId(); String serviceName = registration.getServiceId();
try { try {
List<Instance> instances = nacosNamingManager.getNamingService() List<Instance> instances = nacosDiscoveryProperties.namingServiceInstance()
.getAllInstances(serviceName); .getAllInstances(serviceName);
for (Instance instance : instances) { for (Instance instance : instances) {
if (instance.getIp().equalsIgnoreCase(nacosDiscoveryProperties.getIp()) if (instance.getIp().equalsIgnoreCase(nacosDiscoveryProperties.getIp())

View File

@ -17,7 +17,6 @@
package com.alibaba.cloud.nacos.ribbon; package com.alibaba.cloud.nacos.ribbon;
import com.alibaba.cloud.nacos.NacosDiscoveryProperties; import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.alibaba.cloud.nacos.NacosNamingManager;
import com.netflix.client.config.IClientConfig; import com.netflix.client.config.IClientConfig;
import com.netflix.loadbalancer.ServerList; import com.netflix.loadbalancer.ServerList;
@ -37,10 +36,8 @@ public class NacosRibbonClientConfiguration {
@Bean @Bean
@ConditionalOnMissingBean @ConditionalOnMissingBean
public ServerList<?> ribbonServerList(IClientConfig config, public ServerList<?> ribbonServerList(IClientConfig config,
NacosNamingManager nacosNamingManager,
NacosDiscoveryProperties nacosDiscoveryProperties) { NacosDiscoveryProperties nacosDiscoveryProperties) {
NacosServerList serverList = new NacosServerList(nacosNamingManager, NacosServerList serverList = new NacosServerList(nacosDiscoveryProperties);
nacosDiscoveryProperties);
serverList.initWithNiwsConfig(config); serverList.initWithNiwsConfig(config);
return serverList; return serverList;
} }

View File

@ -21,7 +21,6 @@ import java.util.List;
import java.util.Objects; import java.util.Objects;
import com.alibaba.cloud.nacos.NacosDiscoveryProperties; import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.alibaba.cloud.nacos.NacosNamingManager;
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;
@ -48,9 +47,6 @@ public class NacosRule extends AbstractLoadBalancerRule {
@Autowired @Autowired
private NacosDiscoveryProperties nacosDiscoveryProperties; private NacosDiscoveryProperties nacosDiscoveryProperties;
@Autowired
private NacosNamingManager nacosNamingManager;
@Override @Override
public Server choose(Object key) { public Server choose(Object key) {
try { try {
@ -58,7 +54,8 @@ public class NacosRule extends AbstractLoadBalancerRule {
DynamicServerListLoadBalancer loadBalancer = (DynamicServerListLoadBalancer) getLoadBalancer(); DynamicServerListLoadBalancer loadBalancer = (DynamicServerListLoadBalancer) getLoadBalancer();
String name = loadBalancer.getName(); String name = loadBalancer.getName();
NamingService namingService = this.nacosNamingManager.getNamingService(); NamingService namingService = this.nacosDiscoveryProperties
.namingServiceInstance();
List<Instance> instances = namingService.selectInstances(name, true); List<Instance> instances = namingService.selectInstances(name, true);
if (CollectionUtils.isEmpty(instances)) { if (CollectionUtils.isEmpty(instances)) {
LOGGER.warn("no instance in service {}", name); LOGGER.warn("no instance in service {}", name);

View File

@ -20,7 +20,6 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.alibaba.cloud.nacos.NacosDiscoveryProperties; import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.alibaba.cloud.nacos.NacosNamingManager;
import com.alibaba.nacos.api.naming.pojo.Instance; import com.alibaba.nacos.api.naming.pojo.Instance;
import com.netflix.client.config.IClientConfig; import com.netflix.client.config.IClientConfig;
@ -32,14 +31,11 @@ import com.netflix.loadbalancer.AbstractServerList;
*/ */
public class NacosServerList extends AbstractServerList<NacosServer> { public class NacosServerList extends AbstractServerList<NacosServer> {
private NacosNamingManager nacosNamingManager;
private NacosDiscoveryProperties discoveryProperties; private NacosDiscoveryProperties discoveryProperties;
private String serviceId; private String serviceId;
public NacosServerList(NacosNamingManager nacosNamingManager, public NacosServerList(NacosDiscoveryProperties discoveryProperties) {
NacosDiscoveryProperties discoveryProperties) {
this.nacosNamingManager = nacosNamingManager;
this.discoveryProperties = discoveryProperties; this.discoveryProperties = discoveryProperties;
} }
@ -56,7 +52,7 @@ public class NacosServerList extends AbstractServerList<NacosServer> {
private List<NacosServer> getServers() { private List<NacosServer> getServers() {
try { try {
String group = discoveryProperties.getGroup(); String group = discoveryProperties.getGroup();
List<Instance> instances = nacosNamingManager.getNamingService() List<Instance> instances = discoveryProperties.namingServiceInstance()
.selectInstances(serviceId, group, true); .selectInstances(serviceId, group, true);
return instancesToServerList(instances); return instancesToServerList(instances);
} }

View File

@ -58,17 +58,16 @@ public class NacosDiscoveryClientTests {
NacosDiscoveryProperties nacosDiscoveryProperties = mock( NacosDiscoveryProperties nacosDiscoveryProperties = mock(
NacosDiscoveryProperties.class); NacosDiscoveryProperties.class);
NacosNamingManager nacosNamingManager = mock(NacosNamingManager.class);
NamingService namingService = mock(NamingService.class); NamingService namingService = mock(NamingService.class);
when(nacosNamingManager.getNamingService()).thenReturn(namingService); when(nacosDiscoveryProperties.namingServiceInstance()).thenReturn(namingService);
when(nacosDiscoveryProperties.getGroup()).thenReturn("DEFAULT"); when(nacosDiscoveryProperties.getGroup()).thenReturn("DEFAULT");
when(namingService.selectInstances(eq(serviceName), eq("DEFAULT"), eq(true))) when(namingService.selectInstances(eq(serviceName), eq("DEFAULT"), eq(true)))
.thenReturn(instances); .thenReturn(instances);
NacosDiscoveryClient discoveryClient = new NacosDiscoveryClient( NacosDiscoveryClient discoveryClient = new NacosDiscoveryClient(
nacosNamingManager, nacosDiscoveryProperties); nacosDiscoveryProperties);
List<ServiceInstance> serviceInstances = discoveryClient List<ServiceInstance> serviceInstances = discoveryClient
.getInstances(serviceName); .getInstances(serviceName);
@ -100,14 +99,12 @@ public class NacosDiscoveryClientTests {
NacosDiscoveryProperties nacosDiscoveryProperties = mock( NacosDiscoveryProperties nacosDiscoveryProperties = mock(
NacosDiscoveryProperties.class); NacosDiscoveryProperties.class);
NacosNamingManager nacosNamingManager = mock(NacosNamingManager.class);
NamingService namingService = mock(NamingService.class); NamingService namingService = mock(NamingService.class);
NacosDiscoveryClient discoveryClient = new NacosDiscoveryClient( NacosDiscoveryClient discoveryClient = new NacosDiscoveryClient(
nacosNamingManager, nacosDiscoveryProperties); nacosDiscoveryProperties);
when(nacosNamingManager.getNamingService()).thenReturn(namingService); when(nacosDiscoveryProperties.namingServiceInstance()).thenReturn(namingService);
when(nacosDiscoveryProperties.getGroup()).thenReturn("DEFAULT"); when(nacosDiscoveryProperties.getGroup()).thenReturn("DEFAULT");
when(namingService.getServicesOfServer(eq(1), eq(Integer.MAX_VALUE), when(namingService.getServicesOfServer(eq(1), eq(Integer.MAX_VALUE),
eq("DEFAULT"))).thenReturn(nacosServices); eq("DEFAULT"))).thenReturn(nacosServices);

View File

@ -20,7 +20,6 @@ import java.util.Map;
import com.alibaba.cloud.nacos.NacosDiscoveryAutoConfiguration; import com.alibaba.cloud.nacos.NacosDiscoveryAutoConfiguration;
import com.alibaba.cloud.nacos.NacosDiscoveryProperties; import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.alibaba.cloud.nacos.NacosNamingManager;
import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration; import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
import com.alibaba.cloud.nacos.endpoint.NacosDiscoveryEndpoint; import com.alibaba.cloud.nacos.endpoint.NacosDiscoveryEndpoint;
@ -76,9 +75,6 @@ public class NacosAutoServiceRegistrationTests {
@Autowired @Autowired
private NacosDiscoveryProperties properties; private NacosDiscoveryProperties properties;
@Autowired
private NacosNamingManager nacosNamingManager;
@Autowired @Autowired
private InetUtils inetUtils; private InetUtils inetUtils;
@ -209,11 +205,11 @@ public class NacosAutoServiceRegistrationTests {
private void checkoutEndpoint() throws Exception { private void checkoutEndpoint() throws Exception {
NacosDiscoveryEndpoint nacosDiscoveryEndpoint = new NacosDiscoveryEndpoint( NacosDiscoveryEndpoint nacosDiscoveryEndpoint = new NacosDiscoveryEndpoint(
nacosNamingManager, properties); properties);
Map<String, Object> map = nacosDiscoveryEndpoint.invoke(); Map<String, Object> map = nacosDiscoveryEndpoint.invoke();
assertEquals(map.get("NacosDiscoveryProperties"), properties); assertEquals(map.get("NacosDiscoveryProperties"), properties);
assertEquals(map.get("subscribe").toString(), assertEquals(map.get("subscribe").toString(),
nacosNamingManager.getNamingService().getSubscribeServices().toString()); properties.namingServiceInstance().getSubscribeServices().toString());
} }
@Configuration @Configuration

View File

@ -22,7 +22,6 @@ import java.util.LinkedList;
import java.util.List; import java.util.List;
import com.alibaba.cloud.nacos.NacosDiscoveryProperties; import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.alibaba.cloud.nacos.NacosNamingManager;
import com.alibaba.cloud.nacos.test.NacosMockTest; import com.alibaba.cloud.nacos.test.NacosMockTest;
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;
@ -47,16 +46,14 @@ public class NacosServerListTests {
public void testEmptyInstancesReturnsEmptyList() throws Exception { public void testEmptyInstancesReturnsEmptyList() throws Exception {
NacosDiscoveryProperties nacosDiscoveryProperties = mock( NacosDiscoveryProperties nacosDiscoveryProperties = mock(
NacosDiscoveryProperties.class); NacosDiscoveryProperties.class);
NacosNamingManager nacosNamingManager = mock(NacosNamingManager.class);
NamingService namingService = mock(NamingService.class); NamingService namingService = mock(NamingService.class);
when(nacosNamingManager.getNamingService()).thenReturn(namingService); when(nacosDiscoveryProperties.namingServiceInstance()).thenReturn(namingService);
when(namingService.selectInstances(anyString(), eq("DEFAULT"), eq(true))) when(namingService.selectInstances(anyString(), eq("DEFAULT"), eq(true)))
.thenReturn(null); .thenReturn(null);
NacosServerList serverList = new NacosServerList(nacosNamingManager, NacosServerList serverList = new NacosServerList(nacosDiscoveryProperties);
nacosDiscoveryProperties);
List<NacosServer> servers = serverList.getInitialListOfServers(); List<NacosServer> servers = serverList.getInitialListOfServers();
assertThat(servers).isEmpty(); assertThat(servers).isEmpty();
} }
@ -71,11 +68,10 @@ public class NacosServerListTests {
NacosDiscoveryProperties nacosDiscoveryProperties = mock( NacosDiscoveryProperties nacosDiscoveryProperties = mock(
NacosDiscoveryProperties.class); NacosDiscoveryProperties.class);
NacosNamingManager nacosNamingManager = mock(NacosNamingManager.class);
NamingService namingService = mock(NamingService.class); NamingService namingService = mock(NamingService.class);
when(nacosNamingManager.getNamingService()).thenReturn(namingService); when(nacosDiscoveryProperties.namingServiceInstance()).thenReturn(namingService);
when(nacosDiscoveryProperties.getGroup()).thenReturn("DEFAULT"); when(nacosDiscoveryProperties.getGroup()).thenReturn("DEFAULT");
when(nacosDiscoveryProperties.getGroup()).thenReturn("DEFAULT"); when(nacosDiscoveryProperties.getGroup()).thenReturn("DEFAULT");
when(namingService.selectInstances(eq("test-service"), eq("DEFAULT"), eq(true))) when(namingService.selectInstances(eq("test-service"), eq("DEFAULT"), eq(true)))
@ -83,8 +79,7 @@ public class NacosServerListTests {
IClientConfig clientConfig = mock(IClientConfig.class); IClientConfig clientConfig = mock(IClientConfig.class);
when(clientConfig.getClientName()).thenReturn("test-service"); when(clientConfig.getClientName()).thenReturn("test-service");
NacosServerList serverList = new NacosServerList(nacosNamingManager, NacosServerList serverList = new NacosServerList(nacosDiscoveryProperties);
nacosDiscoveryProperties);
serverList.initWithNiwsConfig(clientConfig); serverList.initWithNiwsConfig(clientConfig);
List<NacosServer> servers = serverList.getInitialListOfServers(); List<NacosServer> servers = serverList.getInitialListOfServers();
assertThat(servers).hasSize(1); assertThat(servers).hasSize(1);
@ -107,11 +102,10 @@ public class NacosServerListTests {
NacosDiscoveryProperties nacosDiscoveryProperties = mock( NacosDiscoveryProperties nacosDiscoveryProperties = mock(
NacosDiscoveryProperties.class); NacosDiscoveryProperties.class);
NacosNamingManager nacosNamingManager = mock(NacosNamingManager.class);
NamingService namingService = mock(NamingService.class); NamingService namingService = mock(NamingService.class);
when(nacosNamingManager.getNamingService()).thenReturn(namingService); when(nacosDiscoveryProperties.namingServiceInstance()).thenReturn(namingService);
when(nacosDiscoveryProperties.getGroup()).thenReturn("DEFAULT"); when(nacosDiscoveryProperties.getGroup()).thenReturn("DEFAULT");
List<Instance> returnInstances = new LinkedList<>(); List<Instance> returnInstances = new LinkedList<>();
@ -127,8 +121,7 @@ public class NacosServerListTests {
IClientConfig clientConfig = mock(IClientConfig.class); IClientConfig clientConfig = mock(IClientConfig.class);
when(clientConfig.getClientName()).thenReturn("test-service"); when(clientConfig.getClientName()).thenReturn("test-service");
NacosServerList serverList = new NacosServerList(nacosNamingManager, NacosServerList serverList = new NacosServerList(nacosDiscoveryProperties);
nacosDiscoveryProperties);
serverList.initWithNiwsConfig(clientConfig); serverList.initWithNiwsConfig(clientConfig);
List<NacosServer> servers = serverList.getInitialListOfServers(); List<NacosServer> servers = serverList.getInitialListOfServers();
assertThat(servers).hasSize(1); assertThat(servers).hasSize(1);
@ -156,12 +149,10 @@ public class NacosServerListTests {
NacosDiscoveryProperties nacosDiscoveryProperties = mock( NacosDiscoveryProperties nacosDiscoveryProperties = mock(
NacosDiscoveryProperties.class); NacosDiscoveryProperties.class);
NacosNamingManager nacosNamingManager = mock(NacosNamingManager.class);
NamingService namingService = mock(NamingService.class); NamingService namingService = mock(NamingService.class);
when(nacosNamingManager.getNamingService()).thenReturn(namingService); when(nacosDiscoveryProperties.namingServiceInstance()).thenReturn(namingService);
when(nacosDiscoveryProperties.getGroup()).thenReturn("DEFAULT"); when(nacosDiscoveryProperties.getGroup()).thenReturn("DEFAULT");
List<Instance> returnInstances = new LinkedList<>(); List<Instance> returnInstances = new LinkedList<>();
for (Instance instance : instances) { for (Instance instance : instances) {
@ -172,11 +163,9 @@ public class NacosServerListTests {
when(namingService.selectInstances(eq("test-service"), eq("DEFAULT"), eq(true))) when(namingService.selectInstances(eq("test-service"), eq("DEFAULT"), eq(true)))
.thenReturn(returnInstances); .thenReturn(returnInstances);
IClientConfig clientConfig = mock(IClientConfig.class); IClientConfig clientConfig = mock(IClientConfig.class);
when(clientConfig.getClientName()).thenReturn("test-service"); when(clientConfig.getClientName()).thenReturn("test-service");
NacosServerList serverList = new NacosServerList(nacosNamingManager, NacosServerList serverList = new NacosServerList(nacosDiscoveryProperties);
nacosDiscoveryProperties);
serverList.initWithNiwsConfig(clientConfig); serverList.initWithNiwsConfig(clientConfig);
List<NacosServer> servers = serverList.getUpdatedListOfServers(); List<NacosServer> servers = serverList.getUpdatedListOfServers();

View File

@ -16,12 +16,14 @@
package com.alibaba.cloud.seata.web; package com.alibaba.cloud.seata.web;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
/** /**
* @author xiaojing * @author xiaojing
*/ */
@ConditionalOnWebApplication
public class SeataHandlerInterceptorConfiguration extends WebMvcConfigurerAdapter { public class SeataHandlerInterceptorConfiguration extends WebMvcConfigurerAdapter {
@Override @Override

View File

@ -16,26 +16,22 @@
package com.alibaba.cloud.stream.binder.rocketmq.properties; package com.alibaba.cloud.stream.binder.rocketmq.properties;
import javax.validation.constraints.Pattern;
import com.alibaba.cloud.stream.binder.rocketmq.RocketMQBinderConstants; import com.alibaba.cloud.stream.binder.rocketmq.RocketMQBinderConstants;
import org.apache.rocketmq.common.MixAll; import org.apache.rocketmq.common.MixAll;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.validation.annotation.Validated;
/** /**
* @author Timur Valiev * @author Timur Valiev
* @author <a href="mailto:fangjian0423@gmail.com">Jim</a> * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
*/ */
@ConfigurationProperties(prefix = "spring.cloud.stream.rocketmq.binder") @ConfigurationProperties(prefix = "spring.cloud.stream.rocketmq.binder")
@Validated
public class RocketMQBinderConfigurationProperties { public class RocketMQBinderConfigurationProperties {
/** /**
* The name server for rocketMQ, formats: `host:port;host:port`. * The name server for rocketMQ, formats: `host:port;host:port`.
*/ */
@Pattern(regexp = "^[\\d.:;]+$", message = "nameServer needs to match expression \"host:port;host:port\"")
private String nameServer = RocketMQBinderConstants.DEFAULT_NAME_SERVER; private String nameServer = RocketMQBinderConstants.DEFAULT_NAME_SERVER;
/** /**