重构类结构

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

@@ -37,7 +37,7 @@ import com.nepxion.discovery.plugin.framework.entity.FilterType;
 import com.nepxion.discovery.plugin.framework.entity.IpAddressFilterEntity;
 import com.nepxion.discovery.plugin.framework.entity.RegisterEntity;
 import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
-import com.nepxion.discovery.plugin.framework.entity.VersionEntity;
+import com.nepxion.discovery.plugin.framework.entity.VersionFilterEntity;
 import com.nepxion.discovery.plugin.framework.exception.PluginException;
 
 public class ConfigParser extends Dom4JParser implements PluginConfigParser {
@@ -137,7 +137,7 @@ public class ConfigParser extends Dom4JParser implements PluginConfigParser {
                 } else if (StringUtils.equals(childElement.getName(), ConfigConstant.WHITELIST_ELEMENT_NAME)) {
                     parseIpAddressFilter(childElement, ConfigConstant.WHITELIST_ELEMENT_NAME, discoveryEntity);
                 } else if (StringUtils.equals(childElement.getName(), ConfigConstant.VERSION_ELEMENT_NAME)) {
-                    parseVersion(childElement, discoveryEntity);
+                    parseVersionFilter(childElement, discoveryEntity);
                 }
             }
         }
@@ -245,15 +245,15 @@ public class ConfigParser extends Dom4JParser implements PluginConfigParser {
     }
 
     @SuppressWarnings("rawtypes")
-    private void parseVersion(Element element, DiscoveryEntity discoveryEntity) {
-        VersionEntity versionEntity = discoveryEntity.getVersionEntity();
-        if (versionEntity != null) {
+    private void parseVersionFilter(Element element, DiscoveryEntity discoveryEntity) {
+        VersionFilterEntity versionFilterEntity = discoveryEntity.getVersionFilterEntity();
+        if (versionFilterEntity != null) {
             throw new PluginException("Allow only one element[" + ConfigConstant.VERSION_ELEMENT_NAME + "] to be configed");
         }
 
-        versionEntity = new VersionEntity();
+        versionFilterEntity = new VersionFilterEntity();
 
-        Map<String, List<DiscoveryServiceEntity>> serviceEntityMap = versionEntity.getServiceEntityMap();
+        Map<String, List<DiscoveryServiceEntity>> serviceEntityMap = versionFilterEntity.getServiceEntityMap();
         for (Iterator elementIterator = element.elementIterator(); elementIterator.hasNext();) {
             Object childElementObject = elementIterator.next();
             if (childElementObject instanceof Element) {
@@ -301,7 +301,7 @@ public class ConfigParser extends Dom4JParser implements PluginConfigParser {
             }
         }
 
-        discoveryEntity.setVersionEntity(versionEntity);
+        discoveryEntity.setVersionFilterEntity(versionFilterEntity);
     }
 
     private List<String> parseList(String value) {

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

@@ -12,17 +12,17 @@ package com.nepxion.discovery.plugin.framework.entity;
 public class DiscoveryEntity extends FilterHolderEntity {
     private static final long serialVersionUID = -7417362859952278987L;
 
-    private VersionEntity versionEntity;
+    private VersionFilterEntity versionFilterEntity;
 
     public DiscoveryEntity() {
 
     }
 
-    public VersionEntity getVersionEntity() {
-        return versionEntity;
+    public VersionFilterEntity getVersionFilterEntity() {
+        return versionFilterEntity;
     }
 
-    public void setVersionEntity(VersionEntity versionEntity) {
-        this.versionEntity = versionEntity;
+    public void setVersionFilterEntity(VersionFilterEntity versionFilterEntity) {
+        this.versionFilterEntity = versionFilterEntity;
     }
 }
\ No newline at end of file

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/entity/VersionEntity.java → discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/entity/VersionFilterEntity.java

@@ -19,12 +19,12 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-public class VersionEntity implements Serializable {
+public class VersionFilterEntity implements Serializable {
     private static final long serialVersionUID = -6147106004826964165L;
     
     private Map<String, List<DiscoveryServiceEntity>> serviceEntityMap = new LinkedHashMap<String, List<DiscoveryServiceEntity>>();
 
-    public VersionEntity() {
+    public VersionFilterEntity() {
 
     }
 

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

@@ -23,7 +23,7 @@ import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
 import com.nepxion.discovery.plugin.framework.entity.DiscoveryEntity;
 import com.nepxion.discovery.plugin.framework.entity.DiscoveryServiceEntity;
 import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
-import com.nepxion.discovery.plugin.framework.entity.VersionEntity;
+import com.nepxion.discovery.plugin.framework.entity.VersionFilterEntity;
 
 public class VersionFilterDiscoveryListener extends AbstractDiscoveryListener {
     @Override
@@ -50,12 +50,12 @@ public class VersionFilterDiscoveryListener extends AbstractDiscoveryListener {
             return;
         }
 
-        VersionEntity versionEntity = discoveryEntity.getVersionEntity();
-        if (versionEntity == null) {
+        VersionFilterEntity versionFilterEntity = discoveryEntity.getVersionFilterEntity();
+        if (versionFilterEntity == null) {
             return;
         }
 
-        Map<String, List<DiscoveryServiceEntity>> serviceEntityMap = versionEntity.getServiceEntityMap();
+        Map<String, List<DiscoveryServiceEntity>> serviceEntityMap = versionFilterEntity.getServiceEntityMap();
         if (MapUtils.isEmpty(serviceEntityMap)) {
             return;
         }

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

@@ -22,7 +22,7 @@ import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
 import com.nepxion.discovery.plugin.framework.entity.DiscoveryEntity;
 import com.nepxion.discovery.plugin.framework.entity.DiscoveryServiceEntity;
 import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
-import com.nepxion.discovery.plugin.framework.entity.VersionEntity;
+import com.nepxion.discovery.plugin.framework.entity.VersionFilterEntity;
 import com.netflix.loadbalancer.Server;
 
 public class VersionFilterLoadBalanceListener extends AbstractLoadBalanceListener {
@@ -50,12 +50,12 @@ public class VersionFilterLoadBalanceListener extends AbstractLoadBalanceListene
             return;
         }
 
-        VersionEntity versionEntity = discoveryEntity.getVersionEntity();
-        if (versionEntity == null) {
+        VersionFilterEntity versionFilterEntity = discoveryEntity.getVersionFilterEntity();
+        if (versionFilterEntity == null) {
             return;
         }
 
-        Map<String, List<DiscoveryServiceEntity>> serviceEntityMap = versionEntity.getServiceEntityMap();
+        Map<String, List<DiscoveryServiceEntity>> serviceEntityMap = versionFilterEntity.getServiceEntityMap();
         if (MapUtils.isEmpty(serviceEntityMap)) {
             return;
         }