重构成Listener

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/decorator/DiscoveryClientDecorator.java

@@ -37,7 +37,7 @@ public class DiscoveryClientDecorator implements DiscoveryClient {
         Boolean discoveryControlEnabled = PluginContextAware.isDiscoveryControlEnabled(environment);
         if (discoveryControlEnabled) {
             DiscoveryListenerExecutor discoveryListenerExecutor = applicationContext.getBean(DiscoveryListenerExecutor.class);
-            discoveryListenerExecutor.fireGetInstances(serviceId, instances);
+            discoveryListenerExecutor.onGetInstances(serviceId, instances);
         }
 
         return instances;
@@ -50,7 +50,7 @@ public class DiscoveryClientDecorator implements DiscoveryClient {
         Boolean discoveryControlEnabled = PluginContextAware.isDiscoveryControlEnabled(environment);
         if (discoveryControlEnabled) {
             DiscoveryListenerExecutor discoveryListenerExecutor = applicationContext.getBean(DiscoveryListenerExecutor.class);
-            discoveryListenerExecutor.fireGetServices(services);
+            discoveryListenerExecutor.onGetServices(services);
         }
 
         return services;

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/decorator/EurekaServiceRegistryDecorator.java

@@ -34,7 +34,7 @@ public class EurekaServiceRegistryDecorator extends EurekaServiceRegistry {
         Boolean registerControlEnabled = PluginContextAware.isRegisterControlEnabled(environment);
         if (registerControlEnabled) {
             RegisterListenerExecutor registerListenerExecutor = applicationContext.getBean(RegisterListenerExecutor.class);
-            registerListenerExecutor.fireRegister(registration);
+            registerListenerExecutor.onRegister(registration);
         }
 
         serviceRegistry.register(registration);
@@ -45,7 +45,7 @@ public class EurekaServiceRegistryDecorator extends EurekaServiceRegistry {
         Boolean registerControlEnabled = PluginContextAware.isRegisterControlEnabled(environment);
         if (registerControlEnabled) {
             RegisterListenerExecutor registerListenerExecutor = applicationContext.getBean(RegisterListenerExecutor.class);
-            registerListenerExecutor.fireDeregister(registration);
+            registerListenerExecutor.onDeregister(registration);
         }
 
         serviceRegistry.deregister(registration);
@@ -56,7 +56,7 @@ public class EurekaServiceRegistryDecorator extends EurekaServiceRegistry {
         Boolean registerControlEnabled = PluginContextAware.isRegisterControlEnabled(environment);
         if (registerControlEnabled) {
             RegisterListenerExecutor registerListenerExecutor = applicationContext.getBean(RegisterListenerExecutor.class);
-            registerListenerExecutor.fireSetStatus(registration, status);
+            registerListenerExecutor.onSetStatus(registration, status);
         }
 
         serviceRegistry.setStatus(registration, status);
@@ -72,7 +72,7 @@ public class EurekaServiceRegistryDecorator extends EurekaServiceRegistry {
         Boolean registerControlEnabled = PluginContextAware.isRegisterControlEnabled(environment);
         if (registerControlEnabled) {
             RegisterListenerExecutor registerListenerExecutor = applicationContext.getBean(RegisterListenerExecutor.class);
-            registerListenerExecutor.fireClose();
+            registerListenerExecutor.onClose();
         }
 
         serviceRegistry.close();

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/listener/DiscoveryListener.java

@@ -14,7 +14,7 @@ import java.util.List;
 import org.springframework.cloud.client.ServiceInstance;
 
 public interface DiscoveryListener extends Listener {
-    void fireGetInstances(String serviceId, List<ServiceInstance> instances);
+    void onGetInstances(String serviceId, List<ServiceInstance> instances);
 
-    void fireGetServices(List<String> services);
+    void onGetServices(List<String> services);
 }
\ No newline at end of file

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/listener/DiscoveryListenerExecutor.java

@@ -32,16 +32,16 @@ public class DiscoveryListenerExecutor {
     @Autowired
     private ReentrantReadWriteLock reentrantReadWriteLock;
 
-    public void fireGetInstances(String serviceId, List<ServiceInstance> instances) {
+    public void onGetInstances(String serviceId, List<ServiceInstance> instances) {
         try {
             reentrantReadWriteLock.readLock().lock();
 
-            ipAddressFilterDiscoveryListener.fireGetInstances(serviceId, instances);
-            versionFilterDiscoveryListener.fireGetInstances(serviceId, instances);
+            ipAddressFilterDiscoveryListener.onGetInstances(serviceId, instances);
+            versionFilterDiscoveryListener.onGetInstances(serviceId, instances);
 
             for (DiscoveryListener discoveryListener : discoveryListenerList) {
                 if (discoveryListener != ipAddressFilterDiscoveryListener && discoveryListener != versionFilterDiscoveryListener) {
-                    discoveryListener.fireGetInstances(serviceId, instances);
+                    discoveryListener.onGetInstances(serviceId, instances);
                 }
             }
         } finally {
@@ -49,13 +49,13 @@ public class DiscoveryListenerExecutor {
         }
     }
 
-    public void fireGetServices(List<String> services) {
-        ipAddressFilterDiscoveryListener.fireGetServices(services);
-        versionFilterDiscoveryListener.fireGetServices(services);
+    public void onGetServices(List<String> services) {
+        ipAddressFilterDiscoveryListener.onGetServices(services);
+        versionFilterDiscoveryListener.onGetServices(services);
 
         for (DiscoveryListener discoveryListener : discoveryListenerList) {
             if (discoveryListener != ipAddressFilterDiscoveryListener && discoveryListener != versionFilterDiscoveryListener) {
-                discoveryListener.fireGetServices(services);
+                discoveryListener.onGetServices(services);
             }
         }
     }

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/listener/RegisterListener.java

@@ -12,11 +12,11 @@ package com.nepxion.discovery.plugin.framework.listener;
 import org.springframework.cloud.client.serviceregistry.Registration;
 
 public interface RegisterListener extends Listener {
-    void fireRegister(Registration registration);
+    void onRegister(Registration registration);
 
-    void fireDeregister(Registration registration);
+    void onDeregister(Registration registration);
 
-    void fireSetStatus(Registration registration, String status);
+    void onSetStatus(Registration registration, String status);
 
-    void fireClose();
+    void onClose();
 }
\ No newline at end of file

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/listener/RegisterListenerExecutor.java

@@ -28,49 +28,49 @@ public class RegisterListenerExecutor {
     @Autowired
     private ReentrantReadWriteLock reentrantReadWriteLock;
 
-    public void fireRegister(Registration registration) {
+    public void onRegister(Registration registration) {
         try {
             reentrantReadWriteLock.readLock().lock();
 
             for (RegisterListener registerListener : registerListenerList) {
                 if (registerListener != ipAddressFilterRegisterListener) {
-                    registerListener.fireRegister(registration);
+                    registerListener.onRegister(registration);
                 }
             }
 
-            ipAddressFilterRegisterListener.fireRegister(registration);
+            ipAddressFilterRegisterListener.onRegister(registration);
         } finally {
             reentrantReadWriteLock.readLock().unlock();
         }
     }
 
-    public void fireDeregister(Registration registration) {
+    public void onDeregister(Registration registration) {
         for (RegisterListener registerListener : registerListenerList) {
             if (registerListener != ipAddressFilterRegisterListener) {
-                registerListener.fireDeregister(registration);
+                registerListener.onDeregister(registration);
             }
         }
 
-        ipAddressFilterRegisterListener.fireDeregister(registration);
+        ipAddressFilterRegisterListener.onDeregister(registration);
     }
 
-    public void fireSetStatus(Registration registration, String status) {
+    public void onSetStatus(Registration registration, String status) {
         for (RegisterListener registerListener : registerListenerList) {
             if (registerListener != ipAddressFilterRegisterListener) {
-                registerListener.fireSetStatus(registration, status);
+                registerListener.onSetStatus(registration, status);
             }
         }
 
-        ipAddressFilterRegisterListener.fireSetStatus(registration, status);
+        ipAddressFilterRegisterListener.onSetStatus(registration, status);
     }
 
-    public void fireClose() {
+    public void onClose() {
         for (RegisterListener registerListener : registerListenerList) {
             if (registerListener != ipAddressFilterRegisterListener) {
-                registerListener.fireClose();
+                registerListener.onClose();
             }
         }
 
-        ipAddressFilterRegisterListener.fireClose();
+        ipAddressFilterRegisterListener.onClose();
     }
 }
\ No newline at end of file

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/listener/impl/IpAddressFilterDiscoveryListener.java

@@ -29,7 +29,7 @@ public class IpAddressFilterDiscoveryListener extends AbstractDiscoveryListener
     private RuleEntity ruleEntity;
 
     @Override
-    public void fireGetInstances(String serviceId, List<ServiceInstance> instances) {
+    public void onGetInstances(String serviceId, List<ServiceInstance> instances) {
         applyIpAddressFilter(serviceId, instances);
     }
 
@@ -101,7 +101,7 @@ public class IpAddressFilterDiscoveryListener extends AbstractDiscoveryListener
     }
 
     @Override
-    public void fireGetServices(List<String> services) {
+    public void onGetServices(List<String> services) {
 
     }
 }
\ No newline at end of file

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/listener/impl/IpAddressFilterRegisterListener.java

@@ -34,7 +34,7 @@ public class IpAddressFilterRegisterListener extends AbstractRegisterListener {
     private RuleEntity ruleEntity;
 
     @Override
-    public void fireRegister(Registration registration) {
+    public void onRegister(Registration registration) {
         String serviceId = registration.getServiceId();
         String ipAddress = null;
 
@@ -109,17 +109,17 @@ public class IpAddressFilterRegisterListener extends AbstractRegisterListener {
     }
 
     @Override
-    public void fireDeregister(Registration registration) {
+    public void onDeregister(Registration registration) {
 
     }
 
     @Override
-    public void fireSetStatus(Registration registration, String status) {
+    public void onSetStatus(Registration registration, String status) {
 
     }
 
     @Override
-    public void fireClose() {
+    public void onClose() {
 
     }
 }
\ No newline at end of file

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/listener/impl/VersionFilterDiscoveryListener.java

@@ -32,7 +32,7 @@ public class VersionFilterDiscoveryListener extends AbstractDiscoveryListener {
     private RuleEntity ruleEntity;
 
     @Override
-    public void fireGetInstances(String serviceId, List<ServiceInstance> instances) {
+    public void onGetInstances(String serviceId, List<ServiceInstance> instances) {
         String consumerServiceId = environment.getProperty(PluginConstant.SPRING_APPLICATION_NAME);
         String consumerServiceVersion = environment.getProperty(PluginConstant.EUREKA_METADATA_VERSION);
 
@@ -98,7 +98,7 @@ public class VersionFilterDiscoveryListener extends AbstractDiscoveryListener {
     }
 
     @Override
-    public void fireGetServices(List<String> services) {
+    public void onGetServices(List<String> services) {
 
     }
 }
\ No newline at end of file

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

@@ -17,12 +17,12 @@ import com.nepxion.discovery.plugin.framework.listener.AbstractDiscoveryListener
 
 public class MyDiscoveryListener extends AbstractDiscoveryListener {
     @Override
-    public void fireGetInstances(String serviceId, List<ServiceInstance> instances) {
+    public void onGetInstances(String serviceId, List<ServiceInstance> instances) {
         System.out.println("========== getInstances() 被触发：serviceId=" + serviceId + " instances=" + instances + " ==========");
     }
 
     @Override
-    public void fireGetServices(List<String> services) {
+    public void onGetServices(List<String> services) {
         System.out.println("========== getServices() 被触发：services=" + services + " ==========");
     }
 }
\ No newline at end of file

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

@@ -16,22 +16,22 @@ import com.nepxion.discovery.plugin.framework.listener.AbstractRegisterListener;
 public class MyRegisterListener extends AbstractRegisterListener {
 
     @Override
-    public void fireRegister(Registration registration) {
+    public void onRegister(Registration registration) {
         System.out.println("========== register() 被触发：serviceId=" + registration.getServiceId());
     }
 
     @Override
-    public void fireDeregister(Registration registration) {
+    public void onDeregister(Registration registration) {
         System.out.println("========== deregister() 被触发：serviceId=" + registration.getServiceId());
     }
 
     @Override
-    public void fireSetStatus(Registration registration, String status) {
+    public void onSetStatus(Registration registration, String status) {
         System.out.println("========== setStatus() 被触发：serviceId=" + registration.getServiceId() + " status=" + status);
     }
 
     @Override
-    public void fireClose() {
+    public void onClose() {
         System.out.println("========== close() 被触发 ==========");
     }
 }
\ No newline at end of file