Commit 552c8c13 by Nepxion

重构类结构

parent 6e5d46e3
...@@ -15,7 +15,7 @@ import java.util.List; ...@@ -15,7 +15,7 @@ import java.util.List;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
public class StringUtil { public class StringUtil {
public static List<String> split(String value, String separate) { public static List<String> splitToList(String value, String separate) {
if (StringUtils.isEmpty(value)) { if (StringUtils.isEmpty(value)) {
return null; return null;
} }
......
...@@ -22,6 +22,7 @@ import org.dom4j.Element; ...@@ -22,6 +22,7 @@ import org.dom4j.Element;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import com.nepxion.discovery.common.constant.DiscoveryConstant;
import com.nepxion.discovery.common.entity.CountFilterEntity; import com.nepxion.discovery.common.entity.CountFilterEntity;
import com.nepxion.discovery.common.entity.CustomizationEntity; import com.nepxion.discovery.common.entity.CustomizationEntity;
import com.nepxion.discovery.common.entity.DiscoveryEntity; import com.nepxion.discovery.common.entity.DiscoveryEntity;
...@@ -201,7 +202,7 @@ public class XmlConfigParser implements PluginConfigParser { ...@@ -201,7 +202,7 @@ public class XmlConfigParser implements PluginConfigParser {
Attribute globalFilterAttribute = element.attribute(ConfigConstant.FILTER_VALUE_ATTRIBUTE_NAME); Attribute globalFilterAttribute = element.attribute(ConfigConstant.FILTER_VALUE_ATTRIBUTE_NAME);
if (globalFilterAttribute != null) { if (globalFilterAttribute != null) {
String globalFilterValue = globalFilterAttribute.getData().toString().trim(); String globalFilterValue = globalFilterAttribute.getData().toString().trim();
List<String> globalFilterValueList = StringUtil.split(globalFilterValue, ConfigConstant.SEPARATE); List<String> globalFilterValueList = StringUtil.splitToList(globalFilterValue, DiscoveryConstant.SEPARATE);
hostFilterEntity.setFilterValueList(globalFilterValueList); hostFilterEntity.setFilterValueList(globalFilterValueList);
} }
...@@ -222,7 +223,7 @@ public class XmlConfigParser implements PluginConfigParser { ...@@ -222,7 +223,7 @@ public class XmlConfigParser implements PluginConfigParser {
List<String> filterValueList = null; List<String> filterValueList = null;
if (filterValueAttribute != null) { if (filterValueAttribute != null) {
String filterValue = filterValueAttribute.getData().toString().trim(); String filterValue = filterValueAttribute.getData().toString().trim();
filterValueList = StringUtil.split(filterValue, ConfigConstant.SEPARATE); filterValueList = StringUtil.splitToList(filterValue, DiscoveryConstant.SEPARATE);
} }
filterMap.put(serviceName, filterValueList); filterMap.put(serviceName, filterValueList);
} }
...@@ -324,14 +325,14 @@ public class XmlConfigParser implements PluginConfigParser { ...@@ -324,14 +325,14 @@ public class XmlConfigParser implements PluginConfigParser {
Attribute consumerVersionValueAttribute = childElement.attribute(ConfigConstant.CONSUMER_VERSION_VALUE_ATTRIBUTE_NAME); Attribute consumerVersionValueAttribute = childElement.attribute(ConfigConstant.CONSUMER_VERSION_VALUE_ATTRIBUTE_NAME);
if (consumerVersionValueAttribute != null) { if (consumerVersionValueAttribute != null) {
String consumerVersionValue = consumerVersionValueAttribute.getData().toString().trim(); String consumerVersionValue = consumerVersionValueAttribute.getData().toString().trim();
List<String> consumerVersionValueList = StringUtil.split(consumerVersionValue, ConfigConstant.SEPARATE); List<String> consumerVersionValueList = StringUtil.splitToList(consumerVersionValue, DiscoveryConstant.SEPARATE);
versionEntity.setConsumerVersionValueList(consumerVersionValueList); versionEntity.setConsumerVersionValueList(consumerVersionValueList);
} }
Attribute providerVersionValueAttribute = childElement.attribute(ConfigConstant.PROVIDER_VERSION_VALUE_ATTRIBUTE_NAME); Attribute providerVersionValueAttribute = childElement.attribute(ConfigConstant.PROVIDER_VERSION_VALUE_ATTRIBUTE_NAME);
if (providerVersionValueAttribute != null) { if (providerVersionValueAttribute != null) {
String providerVersionValue = providerVersionValueAttribute.getData().toString().trim(); String providerVersionValue = providerVersionValueAttribute.getData().toString().trim();
List<String> providerVersionValueList = StringUtil.split(providerVersionValue, ConfigConstant.SEPARATE); List<String> providerVersionValueList = StringUtil.splitToList(providerVersionValue, DiscoveryConstant.SEPARATE);
versionEntity.setProviderVersionValueList(providerVersionValueList); versionEntity.setProviderVersionValueList(providerVersionValueList);
} }
...@@ -389,7 +390,7 @@ public class XmlConfigParser implements PluginConfigParser { ...@@ -389,7 +390,7 @@ public class XmlConfigParser implements PluginConfigParser {
} }
String providerWeightValue = providerWeightValueAttribute.getData().toString().trim(); String providerWeightValue = providerWeightValueAttribute.getData().toString().trim();
Map<String, Integer> weightMap = new LinkedHashMap<String, Integer>(); Map<String, Integer> weightMap = new LinkedHashMap<String, Integer>();
List<String> providerWeightValueList = StringUtil.split(providerWeightValue, ConfigConstant.SEPARATE); List<String> providerWeightValueList = StringUtil.splitToList(providerWeightValue, DiscoveryConstant.SEPARATE);
for (String value : providerWeightValueList) { for (String value : providerWeightValueList) {
String[] valueArray = StringUtils.split(value, ConfigConstant.SEPARATE); String[] valueArray = StringUtils.split(value, ConfigConstant.SEPARATE);
String version = valueArray[0].trim(); String version = valueArray[0].trim();
...@@ -423,7 +424,7 @@ public class XmlConfigParser implements PluginConfigParser { ...@@ -423,7 +424,7 @@ public class XmlConfigParser implements PluginConfigParser {
} }
String providerWeightValue = providerWeightValueAttribute.getData().toString().trim(); String providerWeightValue = providerWeightValueAttribute.getData().toString().trim();
Map<String, Integer> weightMap = new LinkedHashMap<String, Integer>(); Map<String, Integer> weightMap = new LinkedHashMap<String, Integer>();
List<String> providerWeightValueList = StringUtil.split(providerWeightValue, ConfigConstant.SEPARATE); List<String> providerWeightValueList = StringUtil.splitToList(providerWeightValue, DiscoveryConstant.SEPARATE);
for (String value : providerWeightValueList) { for (String value : providerWeightValueList) {
String[] valueArray = StringUtils.split(value, ConfigConstant.SEPARATE); String[] valueArray = StringUtils.split(value, ConfigConstant.SEPARATE);
String region = valueArray[0].trim(); String region = valueArray[0].trim();
......
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