抽象ConfigContextClosedHandler

discovery-plugin-config-center-starter-nacos/src/main/java/com/nepxion/discovery/plugin/configcenter/nacos/configuration/NacosConfigAutoConfiguration.java

@@ -14,7 +14,6 @@ import org.springframework.context.annotation.Configuration;
 
 import com.nepxion.discovery.plugin.configcenter.adapter.ConfigAdapter;
 import com.nepxion.discovery.plugin.configcenter.nacos.adapter.NacosConfigAdapter;
-import com.nepxion.discovery.plugin.configcenter.nacos.context.NacosConfigContextClosedHandler;
 
 @Configuration
 public class NacosConfigAutoConfiguration {
@@ -22,9 +21,4 @@ public class NacosConfigAutoConfiguration {
     public ConfigAdapter configAdapter() {
         return new NacosConfigAdapter();
     }
-
-    @Bean
-    public NacosConfigContextClosedHandler configContextClosedHandler() {
-        return new NacosConfigContextClosedHandler();
-    }
 }
\ No newline at end of file

discovery-plugin-config-center-starter-redis/src/main/java/com/nepxion/discovery/plugin/configcenter/redis/configuration/RedisConfigAutoConfiguration.java

@@ -21,7 +21,6 @@ import org.springframework.data.redis.listener.adapter.MessageListenerAdapter;
 
 import com.nepxion.discovery.plugin.configcenter.adapter.ConfigAdapter;
 import com.nepxion.discovery.plugin.configcenter.redis.adapter.RedisConfigAdapter;
-import com.nepxion.discovery.plugin.configcenter.redis.context.RedisConfigContextClosedHandler;
 import com.nepxion.discovery.plugin.framework.adapter.PluginAdapter;
 import com.nepxion.discovery.plugin.framework.context.PluginContextAware;
 
@@ -77,9 +76,4 @@ public class RedisConfigAutoConfiguration {
     public ConfigAdapter configAdapter() {
         return new RedisConfigAdapter();
     }
-
-    @Bean
-    public RedisConfigContextClosedHandler configContextClosedHandler() {
-        return new RedisConfigContextClosedHandler();
-    }
 }
\ No newline at end of file

discovery-plugin-config-center-starter-redis/src/main/java/com/nepxion/discovery/plugin/configcenter/redis/context/RedisConfigContextClosedHandler.java

-package com.nepxion.discovery.plugin.configcenter.redis.context;
-
-/**
- * <p>Title: Nepxion Discovery</p>
- * <p>Description: Nepxion Discovery</p>
- * <p>Copyright: Copyright (c) 2017-2050</p>
- * <p>Company: Nepxion</p>
- * @author Haojun Ren
- * @version 1.0
- */
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationListener;
-import org.springframework.context.event.ContextClosedEvent;
-
-import com.nepxion.discovery.plugin.configcenter.redis.adapter.RedisConfigAdapter;
-
-public class RedisConfigContextClosedHandler implements ApplicationListener<ContextClosedEvent> {
-    @Autowired
-    private RedisConfigAdapter redisConfigAdapter;
-
-    @Override
-    public void onApplicationEvent(ContextClosedEvent event) {
-        redisConfigAdapter.close();
-    }
-}
\ No newline at end of file

discovery-plugin-config-center/src/main/java/com/nepxion/discovery/plugin/configcenter/configuration/ConfigAutoConfiguration.java

@@ -16,6 +16,7 @@ import org.springframework.context.annotation.Configuration;
 
 import com.nepxion.discovery.common.constant.DiscoveryConstant;
 import com.nepxion.discovery.common.exception.DiscoveryException;
+import com.nepxion.discovery.plugin.configcenter.context.ConfigContextClosedHandler;
 import com.nepxion.discovery.plugin.configcenter.initializer.ConfigInitializer;
 import com.nepxion.discovery.plugin.configcenter.loader.LocalConfigLoader;
 import com.nepxion.discovery.plugin.configcenter.parser.json.JsonConfigParser;
@@ -54,4 +55,9 @@ public class ConfigAutoConfiguration {
     public ConfigInitializer configInitializer() {
         return new ConfigInitializer();
     }
+
+    @Bean
+    public ConfigContextClosedHandler configContextClosedHandler() {
+        return new ConfigContextClosedHandler();
+    }
 }
\ No newline at end of file

discovery-plugin-config-center-starter-nacos/src/main/java/com/nepxion/discovery/plugin/configcenter/nacos/context/NacosConfigContextClosedHandler.java → discovery-plugin-config-center/src/main/java/com/nepxion/discovery/plugin/configcenter/context/ConfigContextClosedHandler.java

-package com.nepxion.discovery.plugin.configcenter.nacos.context;
+package com.nepxion.discovery.plugin.configcenter.context;
 
 /**
  * <p>Title: Nepxion Discovery</p>
@@ -13,14 +13,16 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextClosedEvent;
 
-import com.nepxion.discovery.plugin.configcenter.nacos.adapter.NacosConfigAdapter;
+import com.nepxion.discovery.plugin.configcenter.loader.RemoteConfigLoader;
 
-public class NacosConfigContextClosedHandler implements ApplicationListener<ContextClosedEvent> {
-    @Autowired
-    private NacosConfigAdapter nacosConfigAdapter;
+public class ConfigContextClosedHandler implements ApplicationListener<ContextClosedEvent> {
+    @Autowired(required = false)
+    private RemoteConfigLoader remoteConfigLoader;
 
     @Override
     public void onApplicationEvent(ContextClosedEvent event) {
-        nacosConfigAdapter.close();
+        if (remoteConfigLoader != null) {
+            remoteConfigLoader.close();
+        }
     }
 }
\ No newline at end of file