fix(nacos): fix issue #859

spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/Application.java

@@ -90,11 +90,8 @@ class SampleController {
 	@Value("${user.age:25}")
 	Integer age;
 
-	private final NacosConfigManager nacosConfigManager;
+	@Autowired
-
+	private NacosConfigManager nacosConfigManager;
-	public SampleController(NacosConfigManager nacosConfigManager) {
-		this.nacosConfigManager = nacosConfigManager;
-	}
 
 	@RequestMapping("/user")
 	public String simple() {

spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigManager.java

@@ -17,52 +17,25 @@
 package com.alibaba.cloud.nacos;
 
 import com.alibaba.nacos.api.config.ConfigService;
-import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
+
-import org.springframework.context.ApplicationContextAware;
+import java.util.Objects;
 
 /**
  * @author <a href="mailto:liaochunyhm@live.com">liaochuntao</a>
  */
-public class NacosConfigManager implements ApplicationContextAware {
+public class NacosConfigManager {
-
-	public ConfigService getConfigService() {
-		return ServiceHolder.getInstance().getService();
-	}
-
-	@Override
-	public void setApplicationContext(ApplicationContext applicationContext)
-			throws BeansException {
-		NacosConfigProperties properties = applicationContext
-				.getBean(NacosConfigProperties.class);
-		ServiceHolder holder = ServiceHolder.getInstance();
-		if (!holder.alreadyInit) {
-			ServiceHolder.getInstance().setService(properties.configServiceInstance());
-		}
-	}
-
-	static class ServiceHolder {
-		private ConfigService service = null;
 
-		private boolean alreadyInit = false;
+	@Autowired
+	private NacosConfigProperties properties;
 
-		private static final ServiceHolder holder = new ServiceHolder();
+	private static ConfigService service = null;
 
-		ServiceHolder() {
+	public ConfigService getConfigService() {
-		}
+		if (Objects.isNull(service)) {
-
+			service = properties.configServiceInstance();
-		static ServiceHolder getInstance() {
-			return holder;
-		}
-
-		void setService(ConfigService service) {
-			alreadyInit = true;
-			this.service = service;
-		}
-
-		ConfigService getService() {
-			return service;
 		}
+		return service;
 	}
 
 }

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

@@ -18,68 +18,33 @@ package com.alibaba.cloud.nacos;
 
 import com.alibaba.nacos.api.naming.NamingMaintainService;
 import com.alibaba.nacos.api.naming.NamingService;
-import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
+
-import org.springframework.context.ApplicationContextAware;
+import java.util.Objects;
 
 /**
  * @author <a href="mailto:liaochunyhm@live.com">liaochuntao</a>
  */
-public class NacosNamingManager implements ApplicationContextAware {
+public class NacosNamingManager {
 
-	public NamingService getNamingService() {
+	private static NamingService namingService = null;
-		return ServiceHolder.getInstance().getNamingService();
+	private static NamingMaintainService namingMaintainService = null;
-	}
 
-	public NamingMaintainService getNamingMaintainService() {
+	@Autowired
-		return ServiceHolder.getInstance().getNamingMaintainService();
+	private NacosDiscoveryProperties discoveryProperties;
-	}
 
-	@Override
+	public NamingService getNamingService() {
-	public void setApplicationContext(ApplicationContext applicationContext)
+		if (Objects.isNull(namingService)) {
-			throws BeansException {
+			namingService = discoveryProperties.namingServiceInstance();
-		NacosDiscoveryProperties properties = applicationContext
-				.getBean(NacosDiscoveryProperties.class);
-		ServiceHolder holder = ServiceHolder.getInstance();
-		if (!holder.alreadyInit[0]) {
-			holder.setNamingService(properties.namingServiceInstance());
-		}
-		if (!holder.alreadyInit[1]) {
-			holder.setNamingMaintainService(properties.namingMaintainServiceInstance());
 		}
+		return namingService;
 	}
 
-	static class ServiceHolder {
+	public NamingMaintainService getNamingMaintainService() {
-		private NamingService namingService = null;
+		if (Objects.isNull(namingMaintainService)) {
-		private NamingMaintainService namingMaintainService = null;
+			namingMaintainService = discoveryProperties.namingMaintainServiceInstance();
-
-		final boolean[] alreadyInit = new boolean[2];
-
-		private static final ServiceHolder HOLDER = new ServiceHolder();
-
-		ServiceHolder() {
-		}
-
-		static ServiceHolder getInstance() {
-			return HOLDER;
-		}
-
-		public NamingService getNamingService() {
-			return namingService;
-		}
-
-		void setNamingService(NamingService namingService) {
-			alreadyInit[0] = true;
-			this.namingService = namingService;
-		}
-
-		NamingMaintainService getNamingMaintainService() {
-			return namingMaintainService;
-		}
-
-		void setNamingMaintainService(NamingMaintainService namingMaintainService) {
-			alreadyInit[1] = true;
-			this.namingMaintainService = namingMaintainService;
 		}
+		return namingMaintainService;
 	}
+
 }