Merge pull request #229 from mercyblitz/master

1.0.0

Author: mercyblitz

nacos-spring-context/src/main/java/com/alibaba/nacos/spring/context/annotation/config/NacosValueAnnotationBeanPostProcessor.java

@@ -39,23 +39,25 @@
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.EnvironmentAware;
 import org.springframework.core.MethodParameter;
+import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.core.env.Environment;
 import org.springframework.util.ReflectionUtils;
 
 import com.alibaba.nacos.api.config.annotation.NacosValue;
 import com.alibaba.nacos.common.utils.MD5Utils;
 import com.alibaba.nacos.spring.context.event.config.NacosConfigReceivedEvent;
-import com.alibaba.spring.beans.factory.annotation.AnnotationInjectedBeanPostProcessor;
+import com.alibaba.spring.beans.factory.annotation.AbstractAnnotationBeanPostProcessor;
 
 /**
+ * Injected {@link NacosValue}
  * {@link org.springframework.beans.factory.config.BeanPostProcessor} implementation.
  *
  * @author <a href="mailto:[email protected]">hxy1991</a>
  * @see NacosValue
  * @since 0.1.0
  */
-public class NacosValueAnnotationBeanPostProcessor extends
-		AnnotationInjectedBeanPostProcessor<NacosValue> implements BeanFactoryAware,
+public class NacosValueAnnotationBeanPostProcessor
+		extends AbstractAnnotationBeanPostProcessor implements BeanFactoryAware,
 		EnvironmentAware, ApplicationListener<NacosConfigReceivedEvent> {
 
 	/**
@@ -80,11 +82,29 @@ public class NacosValueAnnotationBeanPostProcessor extends
 
 	private Environment environment;
 
+	public NacosValueAnnotationBeanPostProcessor() {
+		super(NacosValue.class);
+	}
+
+	@Override
+	public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
+		if (!(beanFactory instanceof ConfigurableListableBeanFactory)) {
+			throw new IllegalArgumentException(
+					"NacosValueAnnotationBeanPostProcessor requires a ConfigurableListableBeanFactory");
+		}
+		this.beanFactory = (ConfigurableListableBeanFactory) beanFactory;
+	}
+
+	@Override
+	public void setEnvironment(Environment environment) {
+		this.environment = environment;
+	}
+
 	@Override
-	protected Object doGetInjectedBean(NacosValue annotation, Object bean,
+	protected Object doGetInjectedBean(AnnotationAttributes attributes, Object bean,
 			String beanName, Class<?> injectedType,
-			InjectionMetadata.InjectedElement injectedElement) {
-		String annotationValue = annotation.value();
+			InjectionMetadata.InjectedElement injectedElement) throws Exception {
+		String annotationValue = attributes.getString("value");
 		String value = beanFactory.resolveEmbeddedValue(annotationValue);
 
 		Member member = injectedElement.getMember();
@@ -100,24 +120,10 @@ protected Object doGetInjectedBean(NacosValue annotation, Object bean,
 	}
 
 	@Override
-	protected String buildInjectedObjectCacheKey(NacosValue annotation, Object bean,
-			String beanName, Class<?> injectedType,
+	protected String buildInjectedObjectCacheKey(AnnotationAttributes attributes,
+			Object bean, String beanName, Class<?> injectedType,
 			InjectionMetadata.InjectedElement injectedElement) {
-		return bean.getClass().getName() + annotation;
-	}
-
-	@Override
-	public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
-		if (!(beanFactory instanceof ConfigurableListableBeanFactory)) {
-			throw new IllegalArgumentException(
-					"NacosValueAnnotationBeanPostProcessor requires a ConfigurableListableBeanFactory");
-		}
-		this.beanFactory = (ConfigurableListableBeanFactory) beanFactory;
-	}
-
-	@Override
-	public void setEnvironment(Environment environment) {
-		this.environment = environment;
+		return bean.getClass().getName() + attributes;
 	}
 
 	@Override

nacos-spring-context/src/main/java/com/alibaba/nacos/spring/context/event/config/EventPublishingConfigService.java

@@ -20,6 +20,7 @@
 import java.util.Properties;
 import java.util.concurrent.Executor;
 
+import org.springframework.beans.factory.DisposableBean;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.ConfigurableApplicationContext;
 
@@ -35,7 +36,8 @@
  * @author <a href="mailto:[email protected]">Mercy</a>
  * @since 0.1.0
  */
-public class EventPublishingConfigService implements ConfigService, NacosServiceMetaData {
+public class EventPublishingConfigService
+		implements ConfigService, NacosServiceMetaData, DisposableBean {
 
 	private final ConfigService configService;
 
@@ -144,4 +146,14 @@ private void publishEvent(NacosConfigEvent nacosConfigEvent) {
 	public Properties getProperties() {
 		return properties;
 	}
+
+	/**
+	 * Destroy lifecycle method to invoke {@link #shutDown()}
+	 * @throws Exception
+	 * @since 1.0.0
+	 */
+	@Override
+	public void destroy() throws Exception {
+		shutDown();
+	}
 }

nacos-spring-context/src/main/java/com/alibaba/nacos/spring/factory/DelegatingNamingService.java

@@ -20,6 +20,8 @@
 import java.util.List;
 import java.util.Properties;
 
+import org.springframework.beans.factory.DisposableBean;
+
 import com.alibaba.nacos.api.exception.NacosException;
 import com.alibaba.nacos.api.naming.NamingService;
 import com.alibaba.nacos.api.naming.listener.EventListener;
@@ -37,7 +39,8 @@
  * @see NacosServiceMetaData
  * @since 0.1.0
  */
-class DelegatingNamingService implements NamingService, NacosServiceMetaData {
+class DelegatingNamingService
+		implements NamingService, NacosServiceMetaData, DisposableBean {
 
 	private final NamingService delegate;
 
@@ -356,4 +359,14 @@ public void shutDown() throws NacosException {
 	public Properties getProperties() {
 		return properties;
 	}
+
+	/**
+	 * Destroy lifecycle method to invoke {@link #shutDown()}
+	 * @throws Exception
+	 * @since 1.0.0
+	 */
+	@Override
+	public void destroy() throws Exception {
+		shutDown();
+	}
 }