diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/Application.java b/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/Application.java
index e65a171a..b94cf48e 100644
--- a/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/Application.java
+++ b/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/Application.java
@@ -5,7 +5,7 @@ import java.io.StringReader;
import java.util.Properties;
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 org.springframework.beans.factory.annotation.Autowired;
@@ -39,14 +39,14 @@ class SampleRunner implements ApplicationRunner {
int userAge;
@Autowired
- private NacosConfigManager nacosConfigManager;
+ private NacosConfigProperties nacosConfigProperties;
@Override
public void run(ApplicationArguments args) throws Exception {
System.out.println(
String.format("Initial username=%s, userAge=%d", userName, userAge));
- nacosConfigManager.getConfigService().addListener(
+ nacosConfigProperties.configServiceInstance().addListener(
"nacos-config-example.properties", "DEFAULT_GROUP", new Listener() {
/**
diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigAutoConfiguration.java b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigAutoConfiguration.java
index 72271dd0..400ad2e0 100644
--- a/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigAutoConfiguration.java
+++ b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigAutoConfiguration.java
@@ -44,11 +44,6 @@ public class NacosConfigAutoConfiguration {
return new NacosConfigProperties();
}
- @Bean
- public NacosConfigManager nacosConfigManager() {
- return new NacosConfigManager();
- }
-
@Bean
public NacosRefreshProperties nacosRefreshProperties() {
return new NacosRefreshProperties();
@@ -61,10 +56,10 @@ public class NacosConfigAutoConfiguration {
@Bean
public NacosContextRefresher nacosContextRefresher(
- NacosConfigManager nacosConfigManager,
+ NacosConfigProperties configProperties,
NacosRefreshProperties nacosRefreshProperties,
NacosRefreshHistory refreshHistory) {
return new NacosContextRefresher(nacosRefreshProperties, refreshHistory,
- nacosConfigManager.getConfigService());
+ configProperties.configServiceInstance());
}
}
diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigBootstrapConfiguration.java b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigBootstrapConfiguration.java
index 980126a5..668e4b75 100644
--- a/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigBootstrapConfiguration.java
+++ b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigBootstrapConfiguration.java
@@ -36,17 +36,10 @@ public class NacosConfigBootstrapConfiguration {
return new NacosConfigProperties();
}
- @Bean
- @ConditionalOnMissingBean
- public NacosConfigManager nacosConfigManager() {
- return new NacosConfigManager();
- }
-
@Bean
public NacosPropertySourceLocator nacosPropertySourceLocator(
- NacosConfigManager nacosConfigManager,
NacosConfigProperties nacosConfigProperties) {
- return new NacosPropertySourceLocator(nacosConfigManager, nacosConfigProperties);
+ return new NacosPropertySourceLocator(nacosConfigProperties);
}
}
diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigManager.java b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigManager.java
deleted file mode 100644
index 99f0d173..00000000
--- a/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigManager.java
+++ /dev/null
@@ -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 liaochuntao
- */
-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;
- }
-
-}
diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigProperties.java b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigProperties.java
index 411fb146..20ac1728 100644
--- a/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigProperties.java
+++ b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigProperties.java
@@ -22,7 +22,10 @@ import java.util.Properties;
import javax.annotation.PostConstruct;
+import com.alibaba.nacos.api.NacosFactory;
import com.alibaba.nacos.api.config.ConfigService;
+import com.alibaba.nacos.api.exception.NacosException;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -190,7 +193,7 @@ public class NacosConfigProperties {
*/
private List extConfig;
- private ConfigService configService;
+ private static ConfigService configService;
// todo sts support
@@ -355,18 +358,22 @@ public class NacosConfigProperties {
}
/**
- * @see NacosConfigManager#getConfigService() .
* @return ConfigService
*/
- @Deprecated
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;
}
- public void initConfigService(ConfigService configService) {
- this.configService = configService;
- }
-
public Properties getConfigServiceProperties() {
Properties properties = new Properties();
properties.put(SERVER_ADDR, Objects.toString(this.serverAddr, ""));
diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/client/NacosPropertySourceLocator.java b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/client/NacosPropertySourceLocator.java
index ee6e3952..5e6bc6ae 100644
--- a/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/client/NacosPropertySourceLocator.java
+++ b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/client/NacosPropertySourceLocator.java
@@ -18,7 +18,6 @@ package com.alibaba.cloud.nacos.client;
import java.util.List;
-import com.alibaba.cloud.nacos.NacosConfigManager;
import com.alibaba.cloud.nacos.NacosConfigProperties;
import com.alibaba.cloud.nacos.NacosPropertySourceRepository;
import com.alibaba.cloud.nacos.parser.NacosDataParserHandler;
@@ -58,18 +57,14 @@ public class NacosPropertySourceLocator implements PropertySourceLocator {
private NacosConfigProperties nacosConfigProperties;
- private NacosConfigManager nacosConfigManager;
-
- public NacosPropertySourceLocator(NacosConfigManager nacosConfigManager,
- NacosConfigProperties nacosConfigProperties) {
- this.nacosConfigManager = nacosConfigManager;
+ public NacosPropertySourceLocator(NacosConfigProperties nacosConfigProperties) {
this.nacosConfigProperties = nacosConfigProperties;
}
@Override
public PropertySource> locate(Environment env) {
- ConfigService configService = nacosConfigManager.getConfigService();
+ ConfigService configService = nacosConfigProperties.configServiceInstance();
if (null == configService) {
log.warn("no instance of config service found, can't load config from nacos");
diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosConfigEndpointAutoConfiguration.java b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosConfigEndpointAutoConfiguration.java
index 24723f65..32d6ff6b 100644
--- a/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosConfigEndpointAutoConfiguration.java
+++ b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosConfigEndpointAutoConfiguration.java
@@ -16,7 +16,6 @@
package com.alibaba.cloud.nacos.endpoint;
-import com.alibaba.cloud.nacos.NacosConfigManager;
import com.alibaba.cloud.nacos.NacosConfigProperties;
import com.alibaba.cloud.nacos.refresh.NacosRefreshHistory;
@@ -38,9 +37,6 @@ public class NacosConfigEndpointAutoConfiguration {
@Autowired
private NacosConfigProperties nacosConfigProperties;
- @Autowired
- private NacosConfigManager nacosConfigManager;
-
@Autowired
private NacosRefreshHistory nacosRefreshHistory;
@@ -52,6 +48,7 @@ public class NacosConfigEndpointAutoConfiguration {
@Bean
public NacosConfigHealthIndicator nacosConfigHealthIndicator() {
- return new NacosConfigHealthIndicator(nacosConfigManager.getConfigService());
+ return new NacosConfigHealthIndicator(
+ nacosConfigProperties.configServiceInstance());
}
}
diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/parser/AbstractNacosDataParser.java b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/parser/AbstractNacosDataParser.java
index 626db91f..0e7bc3bc 100644
--- a/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/parser/AbstractNacosDataParser.java
+++ b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/parser/AbstractNacosDataParser.java
@@ -21,7 +21,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-import com.alibaba.nacos.client.utils.StringUtils;
+import org.springframework.util.StringUtils;
/**
* @author zkz
@@ -118,7 +118,7 @@ public abstract class AbstractNacosDataParser {
Properties properties = new Properties();
for (Map.Entry entry : map.entrySet()) {
String key = entry.getKey();
- if (StringUtils.isBlank(key)) {
+ if (StringUtils.isEmpty(key)) {
continue;
}
key = key.startsWith(DOT) ? key.replaceFirst("\\.", "") : key;
diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/parser/NacosDataJsonParser.java b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/parser/NacosDataJsonParser.java
index a4fbe327..c29369d0 100644
--- a/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/parser/NacosDataJsonParser.java
+++ b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/parser/NacosDataJsonParser.java
@@ -22,10 +22,11 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Properties;
-import com.alibaba.nacos.client.utils.StringUtils;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.util.StringUtils;
+
/**
* @author zkz
*/
diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/parser/NacosDataXmlParser.java b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/parser/NacosDataXmlParser.java
index 58773cac..dd9efebe 100644
--- a/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/parser/NacosDataXmlParser.java
+++ b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/parser/NacosDataXmlParser.java
@@ -25,14 +25,14 @@ import java.util.Properties;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
-import com.alibaba.nacos.client.utils.StringUtils;
-
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
+import org.springframework.util.StringUtils;
+
/**
* With relatively few usage scenarios, only simple parsing is performed to reduce jar
* dependencies.
diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosDiscoveryAutoConfiguration.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosDiscoveryAutoConfiguration.java
index f60feb5a..669a9225 100644
--- a/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosDiscoveryAutoConfiguration.java
+++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosDiscoveryAutoConfiguration.java
@@ -47,23 +47,16 @@ public class NacosDiscoveryAutoConfiguration {
@Bean
public NacosServiceRegistry nacosServiceRegistry(
- NacosNamingManager nacosNamingManager,
NacosDiscoveryProperties nacosDiscoveryProperties) {
- return new NacosServiceRegistry(nacosNamingManager, nacosDiscoveryProperties);
- }
-
- @Bean
- public NacosNamingManager nacosNamingManager() {
- return new NacosNamingManager();
+ return new NacosServiceRegistry(nacosDiscoveryProperties);
}
@Bean
@ConditionalOnBean(AutoServiceRegistrationProperties.class)
- public NacosRegistration nacosRegistration(NacosNamingManager nacosNamingManager,
+ public NacosRegistration nacosRegistration(
NacosDiscoveryProperties nacosDiscoveryProperties,
ApplicationContext context) {
- return new NacosRegistration(nacosNamingManager, nacosDiscoveryProperties,
- context);
+ return new NacosRegistration(nacosDiscoveryProperties, context);
}
@Bean
diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosDiscoveryProperties.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosDiscoveryProperties.java
index 39ff737c..54e1608f 100644
--- a/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosDiscoveryProperties.java
+++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosDiscoveryProperties.java
@@ -182,9 +182,9 @@ public class NacosDiscoveryProperties {
@Autowired
private Environment environment;
- private NamingService namingService;
+ private static NamingService namingService;
- private NamingMaintainService namingMaintainService;
+ private static NamingMaintainService namingMaintainService;
@PostConstruct
public void init() throws SocketException {
@@ -465,7 +465,6 @@ public class NacosDiscoveryProperties {
}
}
- @Deprecated
public NamingService namingServiceInstance() {
if (null != namingService) {
@@ -482,7 +481,6 @@ public class NacosDiscoveryProperties {
return namingService;
}
- @Deprecated
public NamingMaintainService namingMaintainServiceInstance() {
if (null != namingMaintainService) {
diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosNamingManager.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosNamingManager.java
deleted file mode 100644
index 85335c85..00000000
--- a/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosNamingManager.java
+++ /dev/null
@@ -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 liaochuntao
- */
-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;
- }
-}
diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosDiscoveryClient.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosDiscoveryClient.java
index 66ced0ad..f94d0472 100644
--- a/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosDiscoveryClient.java
+++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosDiscoveryClient.java
@@ -24,7 +24,6 @@ import java.util.List;
import java.util.Map;
import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
-import com.alibaba.cloud.nacos.NacosNamingManager;
import com.alibaba.cloud.nacos.NacosServiceInstance;
import com.alibaba.nacos.api.naming.pojo.Instance;
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);
public static final String DESCRIPTION = "Spring Cloud Nacos Discovery Client";
- private NacosNamingManager nacosNamingManager;
private NacosDiscoveryProperties discoveryProperties;
- public NacosDiscoveryClient(NacosNamingManager nacosNamingManager,
- NacosDiscoveryProperties discoveryProperties) {
- this.nacosNamingManager = nacosNamingManager;
+ public NacosDiscoveryClient(NacosDiscoveryProperties discoveryProperties) {
this.discoveryProperties = discoveryProperties;
}
@@ -98,7 +94,7 @@ public class NacosDiscoveryClient implements DiscoveryClient {
public List getInstances(String serviceId) {
try {
String group = discoveryProperties.getGroup();
- List instances = nacosNamingManager.getNamingService()
+ List instances = discoveryProperties.namingServiceInstance()
.selectInstances(serviceId, group, true);
return hostToServiceInstanceList(instances, serviceId);
}
@@ -150,7 +146,7 @@ public class NacosDiscoveryClient implements DiscoveryClient {
try {
String group = discoveryProperties.getGroup();
- ListView services = nacosNamingManager.getNamingService()
+ ListView services = discoveryProperties.namingServiceInstance()
.getServicesOfServer(1, Integer.MAX_VALUE, group);
return services.getData();
}
diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosDiscoveryClientAutoConfiguration.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosDiscoveryClientAutoConfiguration.java
index 261402a7..abcd947e 100644
--- a/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosDiscoveryClientAutoConfiguration.java
+++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosDiscoveryClientAutoConfiguration.java
@@ -18,7 +18,6 @@ package com.alibaba.cloud.nacos.discovery;
import com.alibaba.cloud.nacos.ConditionalOnNacosDiscoveryEnabled;
import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
-import com.alibaba.cloud.nacos.NacosNamingManager;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -45,9 +44,9 @@ public class NacosDiscoveryClientAutoConfiguration {
}
@Bean
- public DiscoveryClient nacosDiscoveryClient(NacosNamingManager nacosNamingManager,
+ public DiscoveryClient nacosDiscoveryClient(
NacosDiscoveryProperties discoveryProperties) {
- return new NacosDiscoveryClient(nacosNamingManager, discoveryProperties);
+ return new NacosDiscoveryClient(discoveryProperties);
}
@Bean
diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosDiscoveryEndpoint.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosDiscoveryEndpoint.java
index 805ebdc4..27bd8dba 100644
--- a/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosDiscoveryEndpoint.java
+++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosDiscoveryEndpoint.java
@@ -22,7 +22,6 @@ import java.util.List;
import java.util.Map;
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.pojo.ServiceInfo;
@@ -40,13 +39,10 @@ public class NacosDiscoveryEndpoint extends AbstractEndpoint