重构类结构

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

@@ -29,7 +29,7 @@ import com.nepxion.discovery.plugin.configcenter.xml.Dom4JParser;
 import com.nepxion.discovery.plugin.framework.cache.RuleCache;
 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.CountFilterEntity;
 import com.nepxion.discovery.plugin.framework.entity.DiscoveryEntity;
 import com.nepxion.discovery.plugin.framework.entity.DiscoveryServiceEntity;
 import com.nepxion.discovery.plugin.framework.entity.FilterEntity;
@@ -119,7 +119,7 @@ public class ConfigParser extends Dom4JParser implements PluginConfigParser {
                 } else if (StringUtils.equals(childElement.getName(), ConfigConstant.WHITELIST_ELEMENT_NAME)) {
                     parseFilter(childElement, ConfigConstant.WHITELIST_ELEMENT_NAME, registerEntity);
                 } else if (StringUtils.equals(childElement.getName(), ConfigConstant.COUNT_ELEMENT_NAME)) {
-                    parseCount(childElement, registerEntity);
+                    parseCountFilter(childElement, registerEntity);
                 }
             }
         }
@@ -188,13 +188,13 @@ public class ConfigParser extends Dom4JParser implements PluginConfigParser {
     }
 
     @SuppressWarnings("rawtypes")
-    private void parseCount(Element element, RegisterEntity registerEntity) {
-        CountEntity countEntity = registerEntity.getCountEntity();
-        if (countEntity != null) {
+    private void parseCountFilter(Element element, RegisterEntity registerEntity) {
+        CountFilterEntity countFilterEntity = registerEntity.getCountFilterEntity();
+        if (countFilterEntity != null) {
             throw new PluginException("Allow only one element[" + ConfigConstant.COUNT_ELEMENT_NAME + "] to be configed");
         }
 
-        countEntity = new CountEntity();
+        countFilterEntity = new CountFilterEntity();
 
         Attribute globalFilterAttribute = element.attribute(ConfigConstant.FILTER_VALUE_ATTRIBUTE_NAME);
         if (globalFilterAttribute != null) {
@@ -206,11 +206,11 @@ public class ConfigParser extends Dom4JParser implements PluginConfigParser {
                 } catch (NumberFormatException e) {
                     throw new PluginException("Attribute[" + ConfigConstant.FILTER_VALUE_ATTRIBUTE_NAME + "] value in element[" + element.getName() + "] is invalid, must be int type", e);
                 }
-                countEntity.setFilterValue(globalValue);
+                countFilterEntity.setFilterValue(globalValue);
             }
         }
 
-        Map<String, Integer> filterMap = countEntity.getFilterMap();
+        Map<String, Integer> filterMap = countFilterEntity.getFilterMap();
         for (Iterator elementIterator = element.elementIterator(); elementIterator.hasNext();) {
             Object childElementObject = elementIterator.next();
             if (childElementObject instanceof Element) {
@@ -241,7 +241,7 @@ public class ConfigParser extends Dom4JParser implements PluginConfigParser {
             }
         }
 
-        registerEntity.setCountEntity(countEntity);
+        registerEntity.setCountFilterEntity(countFilterEntity);
     }
 
     @SuppressWarnings("rawtypes")

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/entity/CountEntity.java → discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/entity/CountFilterEntity.java

@@ -18,13 +18,13 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-public class CountEntity implements Serializable {
+public class CountFilterEntity implements Serializable {
     private static final long serialVersionUID = 3830016495318834467L;
 
     private Integer filterValue;
     private Map<String, Integer> filterMap = new LinkedHashMap<String, Integer>();
 
-    public CountEntity() {
+    public CountFilterEntity() {
 
     }
 

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

@@ -12,17 +12,17 @@ package com.nepxion.discovery.plugin.framework.entity;
 public class RegisterEntity extends FilterHolderEntity {
     private static final long serialVersionUID = -2097322826969006191L;
 
-    private CountEntity countEntity;
+    private CountFilterEntity countFilterEntity;
 
     public RegisterEntity() {
 
     }
 
-    public CountEntity getCountEntity() {
-        return countEntity;
+    public CountFilterEntity getCountFilterEntity() {
+        return countFilterEntity;
     }
 
-    public void setCountEntity(CountEntity countEntity) {
-        this.countEntity = countEntity;
+    public void setCountFilterEntity(CountFilterEntity countFilterEntity) {
+        this.countFilterEntity = countFilterEntity;
     }
 }
\ No newline at end of file

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

@@ -16,7 +16,7 @@ import org.springframework.cloud.client.serviceregistry.Registration;
 
 import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
 import com.nepxion.discovery.plugin.framework.decorator.DiscoveryClientDecorator;
-import com.nepxion.discovery.plugin.framework.entity.CountEntity;
+import com.nepxion.discovery.plugin.framework.entity.CountFilterEntity;
 import com.nepxion.discovery.plugin.framework.entity.RegisterEntity;
 import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
 import com.nepxion.discovery.plugin.framework.event.RegisterFailureEvent;
@@ -46,13 +46,13 @@ public class CountFilterRegisterListener extends AbstractRegisterListener {
             return;
         }
 
-        CountEntity countEntity = registerEntity.getCountEntity();
-        if (countEntity == null) {
+        CountFilterEntity countFilterEntity = registerEntity.getCountFilterEntity();
+        if (countFilterEntity == null) {
             return;
         }
 
-        Integer globalFilterValue = countEntity.getFilterValue();
-        Map<String, Integer> filterMap = countEntity.getFilterMap();
+        Integer globalFilterValue = countFilterEntity.getFilterValue();
+        Map<String, Integer> filterMap = countFilterEntity.getFilterMap();
         Integer filterValue = filterMap.get(serviceId);
 
         // 如果局部值存在，就取局部值，否则取全局值