封装事件总线

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

@@ -37,7 +37,7 @@ import com.nepxion.discovery.plugin.framework.cache.RuleCache;
 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.PluginEventWapper;
 import com.nepxion.discovery.plugin.framework.event.RuleChangedEvent;
 
 @RestController
@@ -51,7 +51,7 @@ public class ConfigEndpoint implements MvcEndpoint {
     private PluginContextAware pluginContextAware;
 
     @Autowired
-    private PluginPublisher pluginPublisher;
+    private PluginEventWapper pluginEventWapper;
 
     @Autowired
     private RuleCache ruleCache;
@@ -68,7 +68,7 @@ public class ConfigEndpoint implements MvcEndpoint {
 
         try {
             InputStream inputStream = IOUtils.toInputStream(config, PluginConstant.ENCODING_UTF_8);
-            pluginPublisher.asyncPublish(new RuleChangedEvent(inputStream));
+            pluginEventWapper.fireRuleChanged(new RuleChangedEvent(inputStream), true);
         } catch (IOException e) {
             LOG.error("Publish config failed", e);
 

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

@@ -33,7 +33,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 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.PluginEventWapper;
 import com.nepxion.discovery.plugin.framework.event.VersionChangedEvent;
 
 @RestController
@@ -47,7 +47,7 @@ public class VersionEndpoint implements MvcEndpoint {
     private PluginAdapter pluginAdapter;
 
     @Autowired
-    private PluginPublisher pluginPublisher;
+    private PluginEventWapper pluginEventWapper;
 
     @RequestMapping(path = "/version/send", method = RequestMethod.POST)
     @ApiOperation(value = "设置服务的动态版本", notes = "", response = ResponseEntity.class, httpMethod = "POST")
@@ -61,7 +61,7 @@ public class VersionEndpoint implements MvcEndpoint {
 
         pluginAdapter.setDynamicVersion(version);
 
-        pluginPublisher.asyncPublish(new VersionChangedEvent());
+        pluginEventWapper.fireVersionChanged(new VersionChangedEvent(), true);
 
         return ResponseEntity.ok().body("OK");
     }
@@ -78,7 +78,7 @@ public class VersionEndpoint implements MvcEndpoint {
 
         pluginAdapter.clearDynamicVersion();
 
-        pluginPublisher.asyncPublish(new VersionChangedEvent());
+        pluginEventWapper.fireVersionChanged(new VersionChangedEvent(), true);
 
         return ResponseEntity.ok().body("OK");
     }

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

@@ -12,14 +12,14 @@ package com.nepxion.discovery.plugin.configcenter;
 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.PluginEventWapper;
 import com.nepxion.discovery.plugin.framework.event.RuleChangedEvent;
 
 public abstract class ConfigAdapter extends AbstractConfigLoader {
     @Autowired
-    private PluginPublisher pluginPublisher;
+    private PluginEventWapper pluginEventWapper;
 
-    public void publish(RuleChangedEvent ruleChangedEvent) {
-        pluginPublisher.asyncPublish(ruleChangedEvent);
+    public void fireRuleChanged(RuleChangedEvent ruleChangedEvent, boolean async) {
+        pluginEventWapper.fireRuleChanged(ruleChangedEvent, async);
     }
 }
\ No newline at end of file

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

@@ -16,6 +16,7 @@ import com.nepxion.discovery.plugin.framework.cache.PluginCache;
 import com.nepxion.discovery.plugin.framework.cache.RuleCache;
 import com.nepxion.discovery.plugin.framework.context.PluginContainerInitializedHandler;
 import com.nepxion.discovery.plugin.framework.context.PluginContextAware;
+import com.nepxion.discovery.plugin.framework.event.PluginEventWapper;
 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;
@@ -51,6 +52,11 @@ public class PluginAutoConfiguration {
     }
 
     @Bean
+    public PluginEventWapper pluginEventWapper() {
+        return new PluginEventWapper();
+    }
+
+    @Bean
     public PluginCache pluginCache() {
         return new PluginCache();
     }

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/event/PluginEventWapper.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 org.springframework.beans.factory.annotation.Autowired;
+
+public class PluginEventWapper {
+    @Autowired
+    private PluginPublisher pluginPublisher;
+
+    @Autowired
+    private PluginSubscriber pluginSubscriber;
+
+    public void fireRuleChanged(RuleChangedEvent ruleChangedEvent, boolean async) {
+        if (async) {
+            pluginPublisher.asyncPublish(ruleChangedEvent);
+        } else {
+            pluginSubscriber.onRuleChanged(ruleChangedEvent);
+        }
+    }
+
+    public void fireVersionChanged(VersionChangedEvent versionChangedEvent, boolean async) {
+        if (async) {
+            pluginPublisher.asyncPublish(versionChangedEvent);
+        } else {
+            pluginSubscriber.onVersionChanged(versionChangedEvent);
+        }
+    }
+}
\ No newline at end of file

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

@@ -36,7 +36,7 @@ public class PluginSubscriber {
     private LoadBalanceListenerExecutor loadBalanceListenerExecutor;
 
     @Subscribe
-    public void subscribeRuleChanged(RuleChangedEvent ruleChangedEvent) {
+    public void onRuleChanged(RuleChangedEvent ruleChangedEvent) {
         Boolean discoveryControlEnabled = pluginContextAware.isDiscoveryControlEnabled();
         Boolean remoteConfigEnabled = pluginContextAware.isRemoteConfigEnabled();
 
@@ -57,11 +57,11 @@ public class PluginSubscriber {
         InputStream inputStream = ruleChangedEvent.getInputStream();
         pluninConfigParser.parse(inputStream);
 
-        subscribeVersionChanged(null);
+        onVersionChanged(null);
     }
 
     @Subscribe
-    public void subscribeVersionChanged(VersionChangedEvent versionChangedEvent) {
+    public void onVersionChanged(VersionChangedEvent versionChangedEvent) {
         Boolean discoveryControlEnabled = pluginContextAware.isDiscoveryControlEnabled();
         if (!discoveryControlEnabled) {
             LOG.info("********** Discovery control is disabled, ignore to subscribe **********");

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(new RuleChangedEvent(inputStream));
+            fireRuleChanged(new RuleChangedEvent(inputStream), true);
         } catch (IOException e) {
             e.printStackTrace();
         }

discovery-springcloud-example/src/main/java/com/nepxion/discovery/plugin/example/extension/MySubscriber.java

@@ -16,7 +16,7 @@ import com.nepxion.eventbus.annotation.EventBus;
 @EventBus
 public class MySubscriber {
     @Subscribe
-    public void subscribeRegisterFailure(RegisterFailureEvent registerFailureEvent) {
+    public void onRegisterFailure(RegisterFailureEvent registerFailureEvent) {
         System.out.println("========== 注册失败：eventType=" + registerFailureEvent.getEventType() + ", eventDescription=" + registerFailureEvent.getEventDescription() + ", serviceId=" + registerFailureEvent.getServiceId() + ", ipAddress=" + registerFailureEvent.getIpAddress() + ", port=" + registerFailureEvent.getPort());
     }
 }
\ No newline at end of file