重构EventBus逻辑

discovery-plugin-admin-center/src/main/java/com/nepxion/discovery/plugin/admincenter/endpoint/ConfigEndpoint.java

@@ -32,6 +32,7 @@ import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
 import com.nepxion.discovery.plugin.framework.context.PluginContextAware;
 import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
 import com.nepxion.discovery.plugin.framework.event.PluginPublisher;
+import com.nepxion.discovery.plugin.framework.event.RuleChangedEvent;
 
 // 用法参照ServiceRegistryEndpoint和ServiceRegistryAutoConfiguration
 @ManagedResource(description = "Config Endpoint")
@@ -59,7 +60,7 @@ public class ConfigEndpoint implements MvcEndpoint {
 
         try {
             InputStream inputStream = IOUtils.toInputStream(config, PluginConstant.ENCODING_UTF_8);
-            pluginPublisher.asyncPublish(inputStream);
+            pluginPublisher.asyncPublish(new RuleChangedEvent(inputStream));
         } catch (IOException e) {
             LOG.error("Publish config failed", e);
 

discovery-plugin-admin-center/src/main/java/com/nepxion/discovery/plugin/admincenter/endpoint/VersionEndpoint.java

@@ -28,6 +28,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.nepxion.discovery.plugin.framework.adapter.PluginAdapter;
 import com.nepxion.discovery.plugin.framework.context.PluginContextAware;
+import com.nepxion.discovery.plugin.framework.event.PluginPublisher;
+import com.nepxion.discovery.plugin.framework.event.VersionChangedEvent;
 
 @ManagedResource(description = "Version Endpoint")
 public class VersionEndpoint implements MvcEndpoint {
@@ -37,6 +39,9 @@ public class VersionEndpoint implements MvcEndpoint {
     @Autowired
     private PluginAdapter pluginAdapter;
 
+    @Autowired
+    private PluginPublisher pluginPublisher;
+
     // 设置服务的动态版本
     @RequestMapping(path = "send", method = RequestMethod.POST)
     @ResponseBody
@@ -49,6 +54,8 @@ public class VersionEndpoint implements MvcEndpoint {
 
         pluginAdapter.setDynamicVersion(version);
 
+        pluginPublisher.asyncPublish(new VersionChangedEvent());
+
         return ResponseEntity.ok().body("OK");
     }
 
@@ -64,6 +71,8 @@ public class VersionEndpoint implements MvcEndpoint {
 
         pluginAdapter.clearDynamicVersion();
 
+        pluginPublisher.asyncPublish(new VersionChangedEvent());
+
         return ResponseEntity.ok().body("OK");
     }
 

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

@@ -9,18 +9,17 @@ package com.nepxion.discovery.plugin.configcenter;
  * @version 1.0
  */
 
-import java.io.InputStream;
-
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.nepxion.discovery.plugin.configcenter.loader.AbstractConfigLoader;
 import com.nepxion.discovery.plugin.framework.event.PluginPublisher;
+import com.nepxion.discovery.plugin.framework.event.RuleChangedEvent;
 
 public abstract class ConfigAdapter extends AbstractConfigLoader {
     @Autowired
     private PluginPublisher pluginPublisher;
 
-    public void publish(InputStream inputStream) {
-        pluginPublisher.asyncPublish(inputStream);
+    public void publish(RuleChangedEvent ruleChangedEvent) {
+        pluginPublisher.asyncPublish(ruleChangedEvent);
     }
 }
\ No newline at end of file

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

@@ -27,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import com.nepxion.discovery.plugin.configcenter.constant.ConfigConstant;
 import com.nepxion.discovery.plugin.configcenter.xml.Dom4JParser;
+import com.nepxion.discovery.plugin.framework.config.PluginConfigParser;
 import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
 import com.nepxion.discovery.plugin.framework.entity.CountEntity;
 import com.nepxion.discovery.plugin.framework.entity.DiscoveryEntity;
@@ -39,7 +40,7 @@ import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
 import com.nepxion.discovery.plugin.framework.entity.VersionEntity;
 import com.nepxion.discovery.plugin.framework.exception.PluginException;
 
-public class ConfigParser extends Dom4JParser {
+public class ConfigParser extends Dom4JParser implements PluginConfigParser {
     private static final Logger LOG = LoggerFactory.getLogger(ConfigParser.class);
 
     @Autowired

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

@@ -14,7 +14,6 @@ import org.springframework.context.annotation.Configuration;
 
 import com.nepxion.discovery.plugin.configcenter.ConfigInitializer;
 import com.nepxion.discovery.plugin.configcenter.ConfigParser;
-import com.nepxion.discovery.plugin.configcenter.ConfigSubscriber;
 
 @Configuration
 public class ConfigAutoConfiguration {
@@ -27,9 +26,4 @@ public class ConfigAutoConfiguration {
     public ConfigParser configParser() {
         return new ConfigParser();
     }
-
-    @Bean
-    public ConfigSubscriber configSubscriber() {
-        return new ConfigSubscriber();
-    }
 }
\ No newline at end of file

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/config/PluginConfigParser.java

+package com.nepxion.discovery.plugin.framework.config;
+
+/**
+ * <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 java.io.InputStream;
+
+public interface PluginConfigParser {
+    void parse(InputStream inputStream);
+}
\ No newline at end of file

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/configuration/PluginAutoConfiguration.java

@@ -19,6 +19,7 @@ import com.nepxion.discovery.plugin.framework.context.PluginContainerInitialized
 import com.nepxion.discovery.plugin.framework.context.PluginContextAware;
 import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
 import com.nepxion.discovery.plugin.framework.event.PluginPublisher;
+import com.nepxion.discovery.plugin.framework.event.PluginSubscriber;
 import com.nepxion.discovery.plugin.framework.listener.discovery.DiscoveryListenerExecutor;
 import com.nepxion.discovery.plugin.framework.listener.discovery.IpAddressFilterDiscoveryListener;
 import com.nepxion.discovery.plugin.framework.listener.discovery.VersionFilterDiscoveryListener;
@@ -47,6 +48,11 @@ public class PluginAutoConfiguration {
     }
 
     @Bean
+    public PluginSubscriber pluginSubscriber() {
+        return new PluginSubscriber();
+    }
+
+    @Bean
     public PluginCache pluginCache() {
         return new PluginCache();
     }

discovery-plugin-config-center/src/main/java/com/nepxion/discovery/plugin/configcenter/ConfigSubscriber.java → discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/event/PluginSubscriber.java

-package com.nepxion.discovery.plugin.configcenter;
+package com.nepxion.discovery.plugin.framework.event;
 
 /**
  * <p>Title: Nepxion Discovery</p>
@@ -16,21 +16,26 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.google.common.eventbus.Subscribe;
+import com.nepxion.discovery.plugin.framework.config.PluginConfigParser;
 import com.nepxion.discovery.plugin.framework.context.PluginContextAware;
 import com.nepxion.eventbus.annotation.EventBus;
+import com.netflix.loadbalancer.ServerList;
 
 @EventBus
-public class ConfigSubscriber {
-    private static final Logger LOG = LoggerFactory.getLogger(ConfigSubscriber.class);
+public class PluginSubscriber {
+    private static final Logger LOG = LoggerFactory.getLogger(PluginSubscriber.class);
 
     @Autowired
     private PluginContextAware pluginContextAware;
 
     @Autowired
-    private ConfigParser configParser;
+    private PluginConfigParser pluninConfigParser;
+
+    @Autowired(required = false)
+    private ServerList<?> ribbonServerList;
 
     @Subscribe
-    public void subscribe(InputStream inputStream) {
+    public void subscribeRuleChanged(RuleChangedEvent ruleChangedEvent) {
         Boolean discoveryControlEnabled = pluginContextAware.isDiscoveryControlEnabled();
         Boolean remoteConfigEnabled = pluginContextAware.isRemoteConfigEnabled();
 
@@ -48,6 +53,26 @@ public class ConfigSubscriber {
 
         LOG.info("********** Remote config change has been subscribed **********");
 
-        configParser.parse(inputStream);
+        InputStream inputStream = ruleChangedEvent.getInputStream();
+        pluninConfigParser.parse(inputStream);
+        
+        subscribeVersionChanged(null);
+    }
+
+    @Subscribe
+    public void subscribeVersionChanged(VersionChangedEvent versionChangedEvent) {
+        Boolean discoveryControlEnabled = pluginContextAware.isDiscoveryControlEnabled();
+        if (!discoveryControlEnabled) {
+            LOG.info("********** Discovery control is disabled, ignore to subscribe **********");
+
+            return;
+        }
+
+        if (ribbonServerList == null) {
+            return;
+        }
+
+        // 当版本更新后，强制刷新Ribbon缓存
+        ribbonServerList.getUpdatedListOfServers();
     }
 }
\ No newline at end of file

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/event/RuleChangedEvent.java

+package com.nepxion.discovery.plugin.framework.event;
+
+/**
+ * <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 java.io.InputStream;
+import java.io.Serializable;
+
+public class RuleChangedEvent implements Serializable {
+    private static final long serialVersionUID = 2315578803987663866L;
+
+    private InputStream inputStream;
+
+    public RuleChangedEvent(InputStream inputStream) {
+        this.inputStream = inputStream;
+    }
+
+    public InputStream getInputStream() {
+        return inputStream;
+    }
+}
\ No newline at end of file

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/event/VersionChangedEvent.java

+package com.nepxion.discovery.plugin.framework.event;
+
+/**
+ * <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 java.io.Serializable;
+
+public class VersionChangedEvent implements Serializable {
+    private static final long serialVersionUID = 5079797986381461496L;
+
+    public VersionChangedEvent() {
+
+    }
+}
\ No newline at end of file

discovery-springcloud-example/src/main/java/com/nepxion/discovery/plugin/example/adapter/DiscoveryConfigAdapter.java

@@ -48,7 +48,7 @@ public class DiscoveryConfigAdapter extends ConfigAdapter {
     public void publish() {
         try {
             InputStream inputStream = FileUtils.openInputStream(new File("src/main/resources/rule.xml"));
-            publish(inputStream);
+            publish(new RuleChangedEvent(inputStream));
         } catch (IOException e) {
             e.printStackTrace();
         }