为listener增加优先级机制

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

@@ -24,4 +24,9 @@ public class BasicListener implements Listener {
 
     @Autowired
     protected PluginEventWapper pluginEventWapper;
+
+    @Override
+    public int getOrder() {
+        return 0;
+    }
 }
\ No newline at end of file

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

@@ -9,6 +9,8 @@ package com.nepxion.discovery.plugin.framework.listener;
  * @version 1.0
  */
 
-public interface Listener {
+import org.springframework.core.Ordered;
+
+public interface Listener extends Ordered {
 
 }
\ No newline at end of file

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

@@ -11,20 +11,14 @@ package com.nepxion.discovery.plugin.framework.listener.discovery;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
-import org.springframework.core.Ordered;
 
 import com.nepxion.discovery.plugin.framework.listener.BasicListener;
 
-public abstract class AbstractDiscoveryListener extends BasicListener implements DiscoveryListener, Ordered {
+public abstract class AbstractDiscoveryListener extends BasicListener implements DiscoveryListener {
     @Autowired
     protected DiscoveryClient discoveryClient;
 
     public DiscoveryClient getDiscoveryClient() {
         return discoveryClient;
     }
-
-    @Override
-    public int getOrder() {
-        return 0;
-    }
 }
\ No newline at end of file

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

@@ -16,7 +16,6 @@ import java.util.Map;
 
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.core.Ordered;
 
 import com.nepxion.discovery.common.entity.DiscoveryEntity;
 import com.nepxion.discovery.common.entity.FilterType;
@@ -113,6 +112,6 @@ public class HostFilterDiscoveryListener extends AbstractDiscoveryListener {
     @Override
     public int getOrder() {
         // Highest priority
-        return Ordered.HIGHEST_PRECEDENCE;
+        return HIGHEST_PRECEDENCE;
     }
 }
\ No newline at end of file

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

@@ -18,7 +18,6 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.core.Ordered;
 
 import com.nepxion.discovery.common.constant.DiscoveryConstant;
 import com.nepxion.discovery.common.entity.DiscoveryEntity;
@@ -130,6 +129,6 @@ public class VersionFilterDiscoveryListener extends AbstractDiscoveryListener {
     @Override
     public int getOrder() {
         // After host filter
-        return Ordered.HIGHEST_PRECEDENCE + 1;
+        return HIGHEST_PRECEDENCE + 1;
     }
 }
\ No newline at end of file

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

@@ -9,13 +9,8 @@ package com.nepxion.discovery.plugin.framework.listener.loadbalance;
  * @version 1.0
  */
 
-import org.springframework.core.Ordered;
-
 import com.nepxion.discovery.plugin.framework.listener.BasicListener;
 
-public abstract class AbstractLoadBalanceListener extends BasicListener implements LoadBalanceListener, Ordered {
-    @Override
-    public int getOrder() {
-        return 0;
-    }
+public abstract class AbstractLoadBalanceListener extends BasicListener implements LoadBalanceListener {
+
 }
\ No newline at end of file

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

@@ -15,7 +15,6 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.core.Ordered;
 
 import com.nepxion.discovery.common.entity.DiscoveryEntity;
 import com.nepxion.discovery.common.entity.FilterType;
@@ -108,6 +107,6 @@ public class HostFilterLoadBalanceListener extends AbstractLoadBalanceListener {
     @Override
     public int getOrder() {
         // Highest priority
-        return Ordered.HIGHEST_PRECEDENCE;
+        return HIGHEST_PRECEDENCE;
     }
 }
\ No newline at end of file

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

@@ -17,7 +17,6 @@ import java.util.Map;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.core.Ordered;
 
 import com.nepxion.discovery.common.entity.DiscoveryEntity;
 import com.nepxion.discovery.common.entity.RuleEntity;
@@ -124,6 +123,6 @@ public class VersionFilterLoadBalanceListener extends AbstractLoadBalanceListene
     @Override
     public int getOrder() {
         // After host filter
-        return Ordered.HIGHEST_PRECEDENCE + 1;
+        return HIGHEST_PRECEDENCE + 1;
     }
 }
\ No newline at end of file

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

@@ -11,20 +11,14 @@ package com.nepxion.discovery.plugin.framework.listener.register;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.client.serviceregistry.ServiceRegistry;
-import org.springframework.core.Ordered;
 
 import com.nepxion.discovery.plugin.framework.listener.BasicListener;
 
-public abstract class AbstractRegisterListener extends BasicListener implements RegisterListener, Ordered {
+public abstract class AbstractRegisterListener extends BasicListener implements RegisterListener {
     @Autowired
     protected ServiceRegistry<?> serviceRegistry;
 
     public ServiceRegistry<?> getServiceRegistry() {
         return serviceRegistry;
     }
-
-    @Override
-    public int getOrder() {
-        return 0;
-    }
 }
\ No newline at end of file

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

@@ -13,7 +13,6 @@ import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.client.serviceregistry.Registration;
-import org.springframework.core.Ordered;
 
 import com.nepxion.discovery.common.constant.DiscoveryConstant;
 import com.nepxion.discovery.common.entity.CountFilterEntity;
@@ -100,6 +99,6 @@ public class CountFilterRegisterListener extends AbstractRegisterListener {
     @Override
     public int getOrder() {
         // Before host filter
-        return Ordered.LOWEST_PRECEDENCE - 1;
+        return LOWEST_PRECEDENCE - 1;
     }
 }
\ No newline at end of file

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

@@ -15,7 +15,6 @@ import java.util.Map;
 
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.cloud.client.serviceregistry.Registration;
-import org.springframework.core.Ordered;
 
 import com.nepxion.discovery.common.entity.FilterType;
 import com.nepxion.discovery.common.entity.HostFilterEntity;
@@ -127,6 +126,6 @@ public class HostFilterRegisterListener extends AbstractRegisterListener {
     @Override
     public int getOrder() {
         // Lowest priority
-        return Ordered.LOWEST_PRECEDENCE;
+        return LOWEST_PRECEDENCE;
     }
 }
\ No newline at end of file