不仅支持ipAddress过滤，也支持hostName过滤

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

@@ -34,7 +34,7 @@ import com.nepxion.discovery.plugin.framework.entity.DiscoveryEntity;
 import com.nepxion.discovery.plugin.framework.entity.DiscoveryServiceEntity;
 import com.nepxion.discovery.plugin.framework.entity.FilterHolderEntity;
 import com.nepxion.discovery.plugin.framework.entity.FilterType;
-import com.nepxion.discovery.plugin.framework.entity.IpAddressFilterEntity;
+import com.nepxion.discovery.plugin.framework.entity.HostFilterEntity;
 import com.nepxion.discovery.plugin.framework.entity.RegisterEntity;
 import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
 import com.nepxion.discovery.plugin.framework.entity.VersionFilterEntity;
@@ -115,9 +115,9 @@ public class ConfigParser extends Dom4JParser implements PluginConfigParser {
                 Element childElement = (Element) childElementObject;
 
                 if (StringUtils.equals(childElement.getName(), ConfigConstant.BLACKLIST_ELEMENT_NAME)) {
-                    parseIpAddressFilter(childElement, ConfigConstant.BLACKLIST_ELEMENT_NAME, registerEntity);
+                    parseHostFilter(childElement, ConfigConstant.BLACKLIST_ELEMENT_NAME, registerEntity);
                 } else if (StringUtils.equals(childElement.getName(), ConfigConstant.WHITELIST_ELEMENT_NAME)) {
-                    parseIpAddressFilter(childElement, ConfigConstant.WHITELIST_ELEMENT_NAME, registerEntity);
+                    parseHostFilter(childElement, ConfigConstant.WHITELIST_ELEMENT_NAME, registerEntity);
                 } else if (StringUtils.equals(childElement.getName(), ConfigConstant.COUNT_ELEMENT_NAME)) {
                     parseCountFilter(childElement, registerEntity);
                 }
@@ -133,9 +133,9 @@ public class ConfigParser extends Dom4JParser implements PluginConfigParser {
                 Element childElement = (Element) childElementObject;
 
                 if (StringUtils.equals(childElement.getName(), ConfigConstant.BLACKLIST_ELEMENT_NAME)) {
-                    parseIpAddressFilter(childElement, ConfigConstant.BLACKLIST_ELEMENT_NAME, discoveryEntity);
+                    parseHostFilter(childElement, ConfigConstant.BLACKLIST_ELEMENT_NAME, discoveryEntity);
                 } else if (StringUtils.equals(childElement.getName(), ConfigConstant.WHITELIST_ELEMENT_NAME)) {
-                    parseIpAddressFilter(childElement, ConfigConstant.WHITELIST_ELEMENT_NAME, discoveryEntity);
+                    parseHostFilter(childElement, ConfigConstant.WHITELIST_ELEMENT_NAME, discoveryEntity);
                 } else if (StringUtils.equals(childElement.getName(), ConfigConstant.VERSION_ELEMENT_NAME)) {
                     parseVersionFilter(childElement, discoveryEntity);
                 }
@@ -144,23 +144,23 @@ public class ConfigParser extends Dom4JParser implements PluginConfigParser {
     }
 
     @SuppressWarnings("rawtypes")
-    private void parseIpAddressFilter(Element element, String filterTypeValue, FilterHolderEntity filterHolderEntity) {
-        IpAddressFilterEntity ipAddressFilterEntity = filterHolderEntity.getIpAddressFilterEntity();
-        if (ipAddressFilterEntity != null) {
+    private void parseHostFilter(Element element, String filterTypeValue, FilterHolderEntity filterHolderEntity) {
+        HostFilterEntity hostFilterEntity = filterHolderEntity.getHostFilterEntity();
+        if (hostFilterEntity != null) {
             throw new PluginException("Allow only one filter element to be configed, [" + ConfigConstant.BLACKLIST_ELEMENT_NAME + "] or [" + ConfigConstant.WHITELIST_ELEMENT_NAME + "]");
         }
 
-        ipAddressFilterEntity = new IpAddressFilterEntity();
-        ipAddressFilterEntity.setFilterType(FilterType.fromString(filterTypeValue));
+        hostFilterEntity = new HostFilterEntity();
+        hostFilterEntity.setFilterType(FilterType.fromString(filterTypeValue));
 
         Attribute globalFilterAttribute = element.attribute(ConfigConstant.FILTER_VALUE_ATTRIBUTE_NAME);
         if (globalFilterAttribute != null) {
             String globalFilterValue = globalFilterAttribute.getData().toString().trim();
             List<String> globalFilterValueList = parseList(globalFilterValue);
-            ipAddressFilterEntity.setFilterValueList(globalFilterValueList);
+            hostFilterEntity.setFilterValueList(globalFilterValueList);
         }
 
-        Map<String, List<String>> filterMap = ipAddressFilterEntity.getFilterMap();
+        Map<String, List<String>> filterMap = hostFilterEntity.getFilterMap();
         for (Iterator elementIterator = element.elementIterator(); elementIterator.hasNext();) {
             Object childElementObject = elementIterator.next();
             if (childElementObject instanceof Element) {
@@ -184,7 +184,7 @@ public class ConfigParser extends Dom4JParser implements PluginConfigParser {
             }
         }
 
-        filterHolderEntity.setIpAddressFilterEntity(ipAddressFilterEntity);
+        filterHolderEntity.setHostFilterEntity(hostFilterEntity);
     }
 
     @SuppressWarnings("rawtypes")

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

@@ -20,13 +20,13 @@ 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;
-import com.nepxion.discovery.plugin.framework.listener.discovery.IpAddressFilterDiscoveryListener;
+import com.nepxion.discovery.plugin.framework.listener.discovery.HostFilterDiscoveryListener;
 import com.nepxion.discovery.plugin.framework.listener.discovery.VersionFilterDiscoveryListener;
-import com.nepxion.discovery.plugin.framework.listener.loadbalance.IpAddressFilterLoadBalanceListener;
+import com.nepxion.discovery.plugin.framework.listener.loadbalance.HostFilterLoadBalanceListener;
 import com.nepxion.discovery.plugin.framework.listener.loadbalance.LoadBalanceListenerExecutor;
 import com.nepxion.discovery.plugin.framework.listener.loadbalance.VersionFilterLoadBalanceListener;
 import com.nepxion.discovery.plugin.framework.listener.register.CountFilterRegisterListener;
-import com.nepxion.discovery.plugin.framework.listener.register.IpAddressFilterRegisterListener;
+import com.nepxion.discovery.plugin.framework.listener.register.HostFilterRegisterListener;
 import com.nepxion.discovery.plugin.framework.listener.register.RegisterListenerExecutor;
 
 @Configuration
@@ -82,8 +82,8 @@ public class PluginAutoConfiguration {
     }
 
     @Bean
-    public IpAddressFilterRegisterListener ipAddressFilterRegisterListener() {
-        return new IpAddressFilterRegisterListener();
+    public HostFilterRegisterListener hostFilterRegisterListener() {
+        return new HostFilterRegisterListener();
     }
 
     @Bean
@@ -92,8 +92,8 @@ public class PluginAutoConfiguration {
     }
 
     @Bean
-    public IpAddressFilterDiscoveryListener ipAddressFilterDiscoveryListener() {
-        return new IpAddressFilterDiscoveryListener();
+    public HostFilterDiscoveryListener hostFilterDiscoveryListener() {
+        return new HostFilterDiscoveryListener();
     }
 
     @Bean
@@ -102,8 +102,8 @@ public class PluginAutoConfiguration {
     }
 
     @Bean
-    public IpAddressFilterLoadBalanceListener ipAddressFilterLoadBalanceListener() {
-        return new IpAddressFilterLoadBalanceListener();
+    public HostFilterLoadBalanceListener hostFilterLoadBalanceListener() {
+        return new HostFilterLoadBalanceListener();
     }
 
     @Bean

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/entity/FilterHolderEntity.java

@@ -19,18 +19,18 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 public class FilterHolderEntity implements Serializable {
     private static final long serialVersionUID = 8767022123685151416L;
 
-    private IpAddressFilterEntity ipAddressFilterEntity;
+    private HostFilterEntity hostFilterEntity;
 
     public FilterHolderEntity() {
 
     }
 
-    public IpAddressFilterEntity getIpAddressFilterEntity() {
-        return ipAddressFilterEntity;
+    public HostFilterEntity getHostFilterEntity() {
+        return hostFilterEntity;
     }
 
-    public void setIpAddressFilterEntity(IpAddressFilterEntity ipAddressFilterEntity) {
-        this.ipAddressFilterEntity = ipAddressFilterEntity;
+    public void setHostFilterEntity(HostFilterEntity hostFilterEntity) {
+        this.hostFilterEntity = hostFilterEntity;
     }
 
     @Override

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/entity/IpAddressFilterEntity.java → discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/entity/HostFilterEntity.java

@@ -19,14 +19,14 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-public class IpAddressFilterEntity implements Serializable {
+public class HostFilterEntity implements Serializable {
     private static final long serialVersionUID = 3830016495318834467L;
 
     private FilterType filterType;
     private List<String> filterValueList;
     private Map<String, List<String>> filterMap = new LinkedHashMap<String, List<String>>();
 
-    public IpAddressFilterEntity() {
+    public HostFilterEntity() {
 
     }
 

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

@@ -18,14 +18,14 @@ public class RegisterFailureEvent implements Serializable {
     private String eventDescription;
 
     private String serviceId;
-    private String ipAddress;
+    private String host;
     private int port;
 
-    public RegisterFailureEvent(String eventType, String eventDescription, String serviceId, String ipAddress, int port) {
+    public RegisterFailureEvent(String eventType, String eventDescription, String serviceId, String host, int port) {
         this.eventType = eventType;
         this.eventDescription = eventDescription;
         this.serviceId = serviceId;
-        this.ipAddress = ipAddress;
+        this.host = host;
         this.port = port;
     }
 
@@ -41,8 +41,8 @@ public class RegisterFailureEvent implements Serializable {
         return serviceId;
     }
 
-    public String getIpAddress() {
-        return ipAddress;
+    public String getHost() {
+        return host;
     }
 
     public int getPort() {

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

@@ -17,7 +17,7 @@ import org.springframework.cloud.client.ServiceInstance;
 // 因为内置监听触发的时候，需要优先过滤，所以顺序执行
 public class DiscoveryListenerExecutor {
     @Autowired
-    private IpAddressFilterDiscoveryListener ipAddressFilterDiscoveryListener;
+    private HostFilterDiscoveryListener hostFilterDiscoveryListener;
 
     @Autowired
     private VersionFilterDiscoveryListener versionFilterDiscoveryListener;
@@ -26,22 +26,22 @@ public class DiscoveryListenerExecutor {
     private List<DiscoveryListener> discoveryListenerList;
 
     public void onGetInstances(String serviceId, List<ServiceInstance> instances) {
-        ipAddressFilterDiscoveryListener.onGetInstances(serviceId, instances);
+        hostFilterDiscoveryListener.onGetInstances(serviceId, instances);
         versionFilterDiscoveryListener.onGetInstances(serviceId, instances);
 
         for (DiscoveryListener discoveryListener : discoveryListenerList) {
-            if (discoveryListener != ipAddressFilterDiscoveryListener && discoveryListener != versionFilterDiscoveryListener) {
+            if (discoveryListener != hostFilterDiscoveryListener && discoveryListener != versionFilterDiscoveryListener) {
                 discoveryListener.onGetInstances(serviceId, instances);
             }
         }
     }
 
     public void onGetServices(List<String> services) {
-        ipAddressFilterDiscoveryListener.onGetServices(services);
+        hostFilterDiscoveryListener.onGetServices(services);
         versionFilterDiscoveryListener.onGetServices(services);
 
         for (DiscoveryListener discoveryListener : discoveryListenerList) {
-            if (discoveryListener != ipAddressFilterDiscoveryListener && discoveryListener != versionFilterDiscoveryListener) {
+            if (discoveryListener != hostFilterDiscoveryListener && discoveryListener != versionFilterDiscoveryListener) {
                 discoveryListener.onGetServices(services);
             }
         }

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

@@ -20,16 +20,16 @@ import org.springframework.cloud.client.ServiceInstance;
 import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
 import com.nepxion.discovery.plugin.framework.entity.DiscoveryEntity;
 import com.nepxion.discovery.plugin.framework.entity.FilterType;
-import com.nepxion.discovery.plugin.framework.entity.IpAddressFilterEntity;
+import com.nepxion.discovery.plugin.framework.entity.HostFilterEntity;
 import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
 
-public class IpAddressFilterDiscoveryListener extends AbstractDiscoveryListener {
+public class HostFilterDiscoveryListener extends AbstractDiscoveryListener {
     @Override
     public void onGetInstances(String serviceId, List<ServiceInstance> instances) {
-        applyIpAddressFilter(serviceId, instances);
+        applyHostFilter(serviceId, instances);
     }
 
-    private void applyIpAddressFilter(String providerServiceId, List<ServiceInstance> instances) {
+    private void applyHostFilter(String providerServiceId, List<ServiceInstance> instances) {
         RuleEntity ruleEntity = ruleCache.get(PluginConstant.RULE);
         if (ruleEntity == null) {
             return;
@@ -40,15 +40,15 @@ public class IpAddressFilterDiscoveryListener extends AbstractDiscoveryListener
             return;
         }
 
-        IpAddressFilterEntity ipAddressFilterEntity = discoveryEntity.getIpAddressFilterEntity();
-        if (ipAddressFilterEntity == null) {
+        HostFilterEntity hostFilterEntity = discoveryEntity.getHostFilterEntity();
+        if (hostFilterEntity == null) {
             return;
         }
 
-        FilterType filterType = ipAddressFilterEntity.getFilterType();
+        FilterType filterType = hostFilterEntity.getFilterType();
 
-        List<String> globalFilterValueList = ipAddressFilterEntity.getFilterValueList();
-        Map<String, List<String>> filterMap = ipAddressFilterEntity.getFilterMap();
+        List<String> globalFilterValueList = hostFilterEntity.getFilterValueList();
+        Map<String, List<String>> filterMap = hostFilterEntity.getFilterMap();
         List<String> filterValueList = filterMap.get(providerServiceId);
 
         List<String> allFilterValueList = new ArrayList<String>();
@@ -79,9 +79,9 @@ public class IpAddressFilterDiscoveryListener extends AbstractDiscoveryListener
         }
     }
 
-    private boolean validateBlacklist(List<String> allFilterValueList, String ipAddress) {
+    private boolean validateBlacklist(List<String> allFilterValueList, String host) {
         for (String filterValue : allFilterValueList) {
-            if (ipAddress.startsWith(filterValue)) {
+            if (host.startsWith(filterValue)) {
                 return true;
             }
         }
@@ -89,10 +89,10 @@ public class IpAddressFilterDiscoveryListener extends AbstractDiscoveryListener
         return false;
     }
 
-    private boolean validateWhitelist(List<String> allFilterValueList, String ipAddress) {
+    private boolean validateWhitelist(List<String> allFilterValueList, String host) {
         boolean matched = true;
         for (String filterValue : allFilterValueList) {
-            if (ipAddress.startsWith(filterValue)) {
+            if (host.startsWith(filterValue)) {
                 matched = false;
                 break;
             }

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

@@ -19,17 +19,17 @@ import org.apache.commons.collections4.CollectionUtils;
 import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
 import com.nepxion.discovery.plugin.framework.entity.DiscoveryEntity;
 import com.nepxion.discovery.plugin.framework.entity.FilterType;
-import com.nepxion.discovery.plugin.framework.entity.IpAddressFilterEntity;
+import com.nepxion.discovery.plugin.framework.entity.HostFilterEntity;
 import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
 import com.netflix.loadbalancer.Server;
 
-public class IpAddressFilterLoadBalanceListener extends AbstractLoadBalanceListener {
+public class HostFilterLoadBalanceListener extends AbstractLoadBalanceListener {
     @Override
     public void onGetServers(String serviceId, List<? extends Server> servers) {
-        applyIpAddressFilter(serviceId, servers);
+        applyHostFilter(serviceId, servers);
     }
 
-    private void applyIpAddressFilter(String providerServiceId, List<? extends Server> servers) {
+    private void applyHostFilter(String providerServiceId, List<? extends Server> servers) {
         RuleEntity ruleEntity = ruleCache.get(PluginConstant.RULE);
         if (ruleEntity == null) {
             return;
@@ -40,15 +40,15 @@ public class IpAddressFilterLoadBalanceListener extends AbstractLoadBalanceListe
             return;
         }
 
-        IpAddressFilterEntity ipAddressFilterEntity = discoveryEntity.getIpAddressFilterEntity();
-        if (ipAddressFilterEntity == null) {
+        HostFilterEntity hostFilterEntity = discoveryEntity.getHostFilterEntity();
+        if (hostFilterEntity == null) {
             return;
         }
 
-        FilterType filterType = ipAddressFilterEntity.getFilterType();
+        FilterType filterType = hostFilterEntity.getFilterType();
 
-        List<String> globalFilterValueList = ipAddressFilterEntity.getFilterValueList();
-        Map<String, List<String>> filterMap = ipAddressFilterEntity.getFilterMap();
+        List<String> globalFilterValueList = hostFilterEntity.getFilterValueList();
+        Map<String, List<String>> filterMap = hostFilterEntity.getFilterMap();
         List<String> filterValueList = filterMap.get(providerServiceId);
 
         List<String> allFilterValueList = new ArrayList<String>();
@@ -79,9 +79,9 @@ public class IpAddressFilterLoadBalanceListener extends AbstractLoadBalanceListe
         }
     }
 
-    private boolean validateBlacklist(List<String> allFilterValueList, String ipAddress) {
+    private boolean validateBlacklist(List<String> allFilterValueList, String host) {
         for (String filterValue : allFilterValueList) {
-            if (ipAddress.startsWith(filterValue)) {
+            if (host.startsWith(filterValue)) {
                 return true;
             }
         }
@@ -89,10 +89,10 @@ public class IpAddressFilterLoadBalanceListener extends AbstractLoadBalanceListe
         return false;
     }
 
-    private boolean validateWhitelist(List<String> allFilterValueList, String ipAddress) {
+    private boolean validateWhitelist(List<String> allFilterValueList, String host) {
         boolean matched = true;
         for (String filterValue : allFilterValueList) {
-            if (ipAddress.startsWith(filterValue)) {
+            if (host.startsWith(filterValue)) {
                 matched = false;
                 break;
             }

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

@@ -19,7 +19,7 @@ import com.netflix.loadbalancer.ZoneAwareLoadBalancer;
 // 因为内置监听触发的时候，需要优先过滤，所以顺序执行
 public class LoadBalanceListenerExecutor {
     @Autowired
-    private IpAddressFilterLoadBalanceListener ipAddressFilterLoadBalanceListener;
+    private HostFilterLoadBalanceListener hostFilterLoadBalanceListener;
 
     @Autowired
     private VersionFilterLoadBalanceListener versionFilterLoadBalanceListener;
@@ -27,7 +27,7 @@ public class LoadBalanceListenerExecutor {
     private ZoneAwareLoadBalancer<?> loadBalancer;
 
     public void onGetServers(String serviceId, List<? extends Server> servers) {
-        ipAddressFilterLoadBalanceListener.onGetServers(serviceId, servers);
+        hostFilterLoadBalanceListener.onGetServers(serviceId, servers);
         versionFilterLoadBalanceListener.onGetServers(serviceId, servers);
     }
 

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

@@ -29,13 +29,13 @@ public class CountFilterRegisterListener extends AbstractRegisterListener {
     @Override
     public void onRegister(Registration registration) {
         String serviceId = registration.getServiceId();
-        String ipAddress = pluginAdapter.getHost(registration);
+        String host = pluginAdapter.getHost(registration);
         int port = pluginAdapter.getPort(registration);
 
-        applyCountFilter(serviceId, ipAddress, port);
+        applyCountFilter(serviceId, host, port);
     }
 
-    private void applyCountFilter(String serviceId, String ipAddress, int port) {
+    private void applyCountFilter(String serviceId, String host, int port) {
         RuleEntity ruleEntity = ruleCache.get(PluginConstant.RULE);
         if (ruleEntity == null) {
             return;
@@ -69,16 +69,16 @@ public class CountFilterRegisterListener extends AbstractRegisterListener {
 
         int count = discoveryClient.getRealInstances(serviceId).size();
         if (count >= maxCount) {
-            onRegisterFailure(maxCount, serviceId, ipAddress, port);
+            onRegisterFailure(maxCount, serviceId, host, port);
         }
     }
 
-    private void onRegisterFailure(int maxCount, String serviceId, String ipAddress, int port) {
-        String description = ipAddress + " isn't allowed to register to Register server, reach max limited count=" + maxCount;
+    private void onRegisterFailure(int maxCount, String serviceId, String host, int port) {
+        String description = host + " isn't allowed to register to Register server, reach max limited count=" + maxCount;
 
         Boolean registerFailureEventEnabled = pluginContextAware.getEnvironment().getProperty(PluginConstant.SPRING_APPLICATION_REGISTER_FAILURE_EVENT_ENABLED, Boolean.class, Boolean.FALSE);
         if (registerFailureEventEnabled) {
-            pluginPublisher.asyncPublish(new RegisterFailureEvent(PluginConstant.REACH_MAX_LIMITED_COUNT, description, serviceId, ipAddress, port));
+            pluginPublisher.asyncPublish(new RegisterFailureEvent(PluginConstant.REACH_MAX_LIMITED_COUNT, description, serviceId, host, port));
         }
 
         throw new PluginException(description);

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

@@ -18,23 +18,23 @@ import org.springframework.cloud.client.serviceregistry.Registration;
 
 import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
 import com.nepxion.discovery.plugin.framework.entity.FilterType;
-import com.nepxion.discovery.plugin.framework.entity.IpAddressFilterEntity;
+import com.nepxion.discovery.plugin.framework.entity.HostFilterEntity;
 import com.nepxion.discovery.plugin.framework.entity.RegisterEntity;
 import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
 import com.nepxion.discovery.plugin.framework.event.RegisterFailureEvent;
 import com.nepxion.discovery.plugin.framework.exception.PluginException;
 
-public class IpAddressFilterRegisterListener extends AbstractRegisterListener {
+public class HostFilterRegisterListener extends AbstractRegisterListener {
     @Override
     public void onRegister(Registration registration) {
         String serviceId = registration.getServiceId();
-        String ipAddress = pluginAdapter.getHost(registration);
+        String host = pluginAdapter.getHost(registration);
         int port = pluginAdapter.getPort(registration);
 
-        applyIpAddressFilter(serviceId, ipAddress, port);
+        applyHostFilter(serviceId, host, port);
     }
 
-    private void applyIpAddressFilter(String serviceId, String ipAddress, int port) {
+    private void applyHostFilter(String serviceId, String host, int port) {
         RuleEntity ruleEntity = ruleCache.get(PluginConstant.RULE);
         if (ruleEntity == null) {
             return;
@@ -45,15 +45,15 @@ public class IpAddressFilterRegisterListener extends AbstractRegisterListener {
             return;
         }
 
-        IpAddressFilterEntity ipAddressFilterEntity = registerEntity.getIpAddressFilterEntity();
-        if (ipAddressFilterEntity == null) {
+        HostFilterEntity hostFilterEntity = registerEntity.getHostFilterEntity();
+        if (hostFilterEntity == null) {
             return;
         }
 
-        FilterType filterType = ipAddressFilterEntity.getFilterType();
+        FilterType filterType = hostFilterEntity.getFilterType();
 
-        List<String> globalFilterValueList = ipAddressFilterEntity.getFilterValueList();
-        Map<String, List<String>> filterMap = ipAddressFilterEntity.getFilterMap();
+        List<String> globalFilterValueList = hostFilterEntity.getFilterValueList();
+        Map<String, List<String>> filterMap = hostFilterEntity.getFilterMap();
         List<String> filterValueList = filterMap.get(serviceId);
 
         List<String> allFilterValueList = new ArrayList<String>();
@@ -67,42 +67,42 @@ public class IpAddressFilterRegisterListener extends AbstractRegisterListener {
 
         switch (filterType) {
             case BLACKLIST:
-                validateBlacklist(filterType, allFilterValueList, serviceId, ipAddress, port);
+                validateBlacklist(filterType, allFilterValueList, serviceId, host, port);
                 break;
             case WHITELIST:
-                validateWhitelist(filterType, allFilterValueList, serviceId, ipAddress, port);
+                validateWhitelist(filterType, allFilterValueList, serviceId, host, port);
                 break;
         }
     }
 
-    private void validateBlacklist(FilterType filterType, List<String> allFilterValueList, String serviceId, String ipAddress, int port) {
+    private void validateBlacklist(FilterType filterType, List<String> allFilterValueList, String serviceId, String host, int port) {
         for (String filterValue : allFilterValueList) {
-            if (ipAddress.startsWith(filterValue)) {
-                onRegisterFailure(filterType, allFilterValueList, serviceId, ipAddress, port);
+            if (host.startsWith(filterValue)) {
+                onRegisterFailure(filterType, allFilterValueList, serviceId, host, port);
             }
         }
     }
 
-    private void validateWhitelist(FilterType filterType, List<String> allFilterValueList, String serviceId, String ipAddress, int port) {
+    private void validateWhitelist(FilterType filterType, List<String> allFilterValueList, String serviceId, String host, int port) {
         boolean matched = true;
         for (String filterValue : allFilterValueList) {
-            if (ipAddress.startsWith(filterValue)) {
+            if (host.startsWith(filterValue)) {
                 matched = false;
                 break;
             }
         }
 
         if (matched) {
-            onRegisterFailure(filterType, allFilterValueList, serviceId, ipAddress, port);
+            onRegisterFailure(filterType, allFilterValueList, serviceId, host, port);
         }
     }
 
-    private void onRegisterFailure(FilterType filterType, List<String> allFilterValueList, String serviceId, String ipAddress, int port) {
-        String description = ipAddress + " isn't allowed to register to Register server, not match IP address " + filterType + "=" + allFilterValueList;
+    private void onRegisterFailure(FilterType filterType, List<String> allFilterValueList, String serviceId, String host, int port) {
+        String description = host + " isn't allowed to register to Register server, not match host " + filterType + "=" + allFilterValueList;
 
         Boolean registerFailureEventEnabled = pluginContextAware.getEnvironment().getProperty(PluginConstant.SPRING_APPLICATION_REGISTER_FAILURE_EVENT_ENABLED, Boolean.class, Boolean.FALSE);
         if (registerFailureEventEnabled) {
-            pluginPublisher.asyncPublish(new RegisterFailureEvent(filterType.toString(), description, serviceId, ipAddress, port));
+            pluginPublisher.asyncPublish(new RegisterFailureEvent(filterType.toString(), description, serviceId, host, port));
         }
 
         throw new PluginException(description);

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

@@ -20,52 +20,52 @@ public class RegisterListenerExecutor {
     private CountFilterRegisterListener countFilterRegisterListener;
 
     @Autowired
-    private IpAddressFilterRegisterListener ipAddressFilterRegisterListener;
+    private HostFilterRegisterListener hostFilterRegisterListener;
 
     @Autowired
     private List<RegisterListener> registerListenerList;
 
     public void onRegister(Registration registration) {
         for (RegisterListener registerListener : registerListenerList) {
-            if (registerListener != countFilterRegisterListener && registerListener != ipAddressFilterRegisterListener) {
+            if (registerListener != countFilterRegisterListener && registerListener != hostFilterRegisterListener) {
                 registerListener.onRegister(registration);
             }
         }
 
         countFilterRegisterListener.onRegister(registration);
-        ipAddressFilterRegisterListener.onRegister(registration);
+        hostFilterRegisterListener.onRegister(registration);
     }
 
     public void onDeregister(Registration registration) {
         for (RegisterListener registerListener : registerListenerList) {
-            if (registerListener != countFilterRegisterListener && registerListener != ipAddressFilterRegisterListener) {
+            if (registerListener != countFilterRegisterListener && registerListener != hostFilterRegisterListener) {
                 registerListener.onDeregister(registration);
             }
         }
 
         countFilterRegisterListener.onDeregister(registration);
-        ipAddressFilterRegisterListener.onDeregister(registration);
+        hostFilterRegisterListener.onDeregister(registration);
     }
 
     public void onSetStatus(Registration registration, String status) {
         for (RegisterListener registerListener : registerListenerList) {
-            if (registerListener != countFilterRegisterListener && registerListener != ipAddressFilterRegisterListener) {
+            if (registerListener != countFilterRegisterListener && registerListener != hostFilterRegisterListener) {
                 registerListener.onSetStatus(registration, status);
             }
         }
 
         countFilterRegisterListener.onSetStatus(registration, status);
-        ipAddressFilterRegisterListener.onSetStatus(registration, status);
+        hostFilterRegisterListener.onSetStatus(registration, status);
     }
 
     public void onClose() {
         for (RegisterListener registerListener : registerListenerList) {
-            if (registerListener != countFilterRegisterListener && registerListener != ipAddressFilterRegisterListener) {
+            if (registerListener != countFilterRegisterListener && registerListener != hostFilterRegisterListener) {
                 registerListener.onClose();
             }
         }
 
         countFilterRegisterListener.onClose();
-        ipAddressFilterRegisterListener.onClose();
+        hostFilterRegisterListener.onClose();
     }
 }
\ No newline at end of file

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

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