Skip to content

D
discovery
Commit 2234bba7 by Nepxion
Options

重构类结构

parent 15323efd
Showing with 38 additions and 38 deletions
discovery-plugin-config-center/src/main/java/com/nepxion/discovery/plugin/configcenter/ConfigParser.java
......@@ -32,9 +32,9 @@ import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
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;
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.RegisterEntity;
import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
import com.nepxion.discovery.plugin.framework.entity.VersionEntity;
......@@ -115,9 +115,9 @@ public class ConfigParser extends Dom4JParser implements PluginConfigParser {
Element childElement = (Element) childElementObject;
if (StringUtils.equals(childElement.getName(), ConfigConstant.BLACKLIST_ELEMENT_NAME)) {
parseFilter(childElement, ConfigConstant.BLACKLIST_ELEMENT_NAME, registerEntity);
parseIpAddressFilter(childElement, ConfigConstant.BLACKLIST_ELEMENT_NAME, registerEntity);
} else if (StringUtils.equals(childElement.getName(), ConfigConstant.WHITELIST_ELEMENT_NAME)) {
parseFilter(childElement, ConfigConstant.WHITELIST_ELEMENT_NAME, registerEntity);
parseIpAddressFilter(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)) {
parseFilter(childElement, ConfigConstant.BLACKLIST_ELEMENT_NAME, discoveryEntity);
parseIpAddressFilter(childElement, ConfigConstant.BLACKLIST_ELEMENT_NAME, discoveryEntity);
} else if (StringUtils.equals(childElement.getName(), ConfigConstant.WHITELIST_ELEMENT_NAME)) {
parseFilter(childElement, ConfigConstant.WHITELIST_ELEMENT_NAME, discoveryEntity);
parseIpAddressFilter(childElement, ConfigConstant.WHITELIST_ELEMENT_NAME, discoveryEntity);
} else if (StringUtils.equals(childElement.getName(), ConfigConstant.VERSION_ELEMENT_NAME)) {
parseVersion(childElement, discoveryEntity);
}
......@@ -144,23 +144,23 @@ public class ConfigParser extends Dom4JParser implements PluginConfigParser {
}
@SuppressWarnings("rawtypes")
private void parseFilter(Element element, String filterTypeValue, FilterHolderEntity filterHolderEntity) {
FilterEntity filterEntity = filterHolderEntity.getFilterEntity();
if (filterEntity != null) {
private void parseIpAddressFilter(Element element, String filterTypeValue, FilterHolderEntity filterHolderEntity) {
IpAddressFilterEntity ipAddressFilterEntity = filterHolderEntity.getIpAddressFilterEntity();
if (ipAddressFilterEntity != null) {
throw new PluginException("Allow only one filter element to be configed, [" + ConfigConstant.BLACKLIST_ELEMENT_NAME + "] or [" + ConfigConstant.WHITELIST_ELEMENT_NAME + "]");
}
filterEntity = new FilterEntity();
filterEntity.setFilterType(FilterType.fromString(filterTypeValue));
ipAddressFilterEntity = new IpAddressFilterEntity();
ipAddressFilterEntity.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);
filterEntity.setFilterValueList(globalFilterValueList);
ipAddressFilterEntity.setFilterValueList(globalFilterValueList);
}
Map<String, List<String>> filterMap = filterEntity.getFilterMap();
Map<String, List<String>> filterMap = ipAddressFilterEntity.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.setFilterEntity(filterEntity);
filterHolderEntity.setIpAddressFilterEntity(ipAddressFilterEntity);
}
@SuppressWarnings("rawtypes")
......
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 FilterEntity filterEntity;
private IpAddressFilterEntity ipAddressFilterEntity;
public FilterHolderEntity() {
}
public FilterEntity getFilterEntity() {
return filterEntity;
public IpAddressFilterEntity getIpAddressFilterEntity() {
return ipAddressFilterEntity;
}
public void setFilterEntity(FilterEntity filterEntity) {
this.filterEntity = filterEntity;
public void setIpAddressFilterEntity(IpAddressFilterEntity ipAddressFilterEntity) {
this.ipAddressFilterEntity = ipAddressFilterEntity;
}
@Override
......
discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/entity/FilterEntity.java → discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/entity/IpAddressFilterEntity.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 FilterEntity implements Serializable {
public class IpAddressFilterEntity 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 FilterEntity() {
public IpAddressFilterEntity() {
}
......
discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/listener/discovery/IpAddressFilterDiscoveryListener.java
......@@ -19,8 +19,8 @@ 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.FilterEntity;
import com.nepxion.discovery.plugin.framework.entity.FilterType;
import com.nepxion.discovery.plugin.framework.entity.IpAddressFilterEntity;
import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
public class IpAddressFilterDiscoveryListener extends AbstractDiscoveryListener {
......@@ -40,15 +40,15 @@ public class IpAddressFilterDiscoveryListener extends AbstractDiscoveryListener
return;
}
FilterEntity filterEntity = discoveryEntity.getFilterEntity();
if (filterEntity == null) {
IpAddressFilterEntity ipAddressFilterEntity = discoveryEntity.getIpAddressFilterEntity();
if (ipAddressFilterEntity == null) {
return;
}
FilterType filterType = filterEntity.getFilterType();
FilterType filterType = ipAddressFilterEntity.getFilterType();
List<String> globalFilterValueList = filterEntity.getFilterValueList();
Map<String, List<String>> filterMap = filterEntity.getFilterMap();
List<String> globalFilterValueList = ipAddressFilterEntity.getFilterValueList();
Map<String, List<String>> filterMap = ipAddressFilterEntity.getFilterMap();
List<String> filterValueList = filterMap.get(providerServiceId);
List<String> allFilterValueList = new ArrayList<String>();
......
discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/listener/loadbalance/IpAddressFilterLoadBalanceListener.java
......@@ -18,8 +18,8 @@ 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.FilterEntity;
import com.nepxion.discovery.plugin.framework.entity.FilterType;
import com.nepxion.discovery.plugin.framework.entity.IpAddressFilterEntity;
import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
import com.netflix.loadbalancer.Server;
......@@ -40,15 +40,15 @@ public class IpAddressFilterLoadBalanceListener extends AbstractLoadBalanceListe
return;
}
FilterEntity filterEntity = discoveryEntity.getFilterEntity();
if (filterEntity == null) {
IpAddressFilterEntity ipAddressFilterEntity = discoveryEntity.getIpAddressFilterEntity();
if (ipAddressFilterEntity == null) {
return;
}
FilterType filterType = filterEntity.getFilterType();
FilterType filterType = ipAddressFilterEntity.getFilterType();
List<String> globalFilterValueList = filterEntity.getFilterValueList();
Map<String, List<String>> filterMap = filterEntity.getFilterMap();
List<String> globalFilterValueList = ipAddressFilterEntity.getFilterValueList();
Map<String, List<String>> filterMap = ipAddressFilterEntity.getFilterMap();
List<String> filterValueList = filterMap.get(providerServiceId);
List<String> allFilterValueList = new ArrayList<String>();
......
discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/listener/register/IpAddressFilterRegisterListener.java
......@@ -17,8 +17,8 @@ import org.apache.commons.collections4.CollectionUtils;
import org.springframework.cloud.client.serviceregistry.Registration;
import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
import com.nepxion.discovery.plugin.framework.entity.FilterEntity;
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.event.RegisterFailureEvent;
......@@ -45,15 +45,15 @@ public class IpAddressFilterRegisterListener extends AbstractRegisterListener {
return;
}
FilterEntity filterEntity = registerEntity.getFilterEntity();
if (filterEntity == null) {
IpAddressFilterEntity ipAddressFilterEntity = registerEntity.getIpAddressFilterEntity();
if (ipAddressFilterEntity == null) {
return;
}
FilterType filterType = filterEntity.getFilterType();
FilterType filterType = ipAddressFilterEntity.getFilterType();
List<String> globalFilterValueList = filterEntity.getFilterValueList();
Map<String, List<String>> filterMap = filterEntity.getFilterMap();
List<String> globalFilterValueList = ipAddressFilterEntity.getFilterValueList();
Map<String, List<String>> filterMap = ipAddressFilterEntity.getFilterMap();
List<String> filterValueList = filterMap.get(serviceId);
List<String> allFilterValueList = new ArrayList<String>();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment