Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
discovery
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
谢捷峰
discovery
Commits
552c8c13
Commit
552c8c13
authored
Sep 15, 2018
by
Nepxion
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
重构类结构
parent
6e5d46e3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
7 deletions
+8
-7
discovery-common/src/main/java/com/nepxion/discovery/common/util/StringUtil.java
+1
-1
discovery-plugin-config-center/src/main/java/com/nepxion/discovery/plugin/configcenter/parser/xml/XmlConfigParser.java
+7
-6
No files found.
discovery-common/src/main/java/com/nepxion/discovery/common/util/StringUtil.java
View file @
552c8c13
...
...
@@ -15,7 +15,7 @@ import java.util.List;
import
org.apache.commons.lang3.StringUtils
;
public
class
StringUtil
{
public
static
List
<
String
>
split
(
String
value
,
String
separate
)
{
public
static
List
<
String
>
split
ToList
(
String
value
,
String
separate
)
{
if
(
StringUtils
.
isEmpty
(
value
))
{
return
null
;
}
...
...
discovery-plugin-config-center/src/main/java/com/nepxion/discovery/plugin/configcenter/parser/xml/XmlConfigParser.java
View file @
552c8c13
...
...
@@ -22,6 +22,7 @@ import org.dom4j.Element;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
com.nepxion.discovery.common.constant.DiscoveryConstant
;
import
com.nepxion.discovery.common.entity.CountFilterEntity
;
import
com.nepxion.discovery.common.entity.CustomizationEntity
;
import
com.nepxion.discovery.common.entity.DiscoveryEntity
;
...
...
@@ -201,7 +202,7 @@ public class XmlConfigParser implements PluginConfigParser {
Attribute
globalFilterAttribute
=
element
.
attribute
(
ConfigConstant
.
FILTER_VALUE_ATTRIBUTE_NAME
);
if
(
globalFilterAttribute
!=
null
)
{
String
globalFilterValue
=
globalFilterAttribute
.
getData
().
toString
().
trim
();
List
<
String
>
globalFilterValueList
=
StringUtil
.
split
(
globalFilterValue
,
Config
Constant
.
SEPARATE
);
List
<
String
>
globalFilterValueList
=
StringUtil
.
split
ToList
(
globalFilterValue
,
Discovery
Constant
.
SEPARATE
);
hostFilterEntity
.
setFilterValueList
(
globalFilterValueList
);
}
...
...
@@ -222,7 +223,7 @@ public class XmlConfigParser implements PluginConfigParser {
List
<
String
>
filterValueList
=
null
;
if
(
filterValueAttribute
!=
null
)
{
String
filterValue
=
filterValueAttribute
.
getData
().
toString
().
trim
();
filterValueList
=
StringUtil
.
split
(
filterValue
,
Config
Constant
.
SEPARATE
);
filterValueList
=
StringUtil
.
split
ToList
(
filterValue
,
Discovery
Constant
.
SEPARATE
);
}
filterMap
.
put
(
serviceName
,
filterValueList
);
}
...
...
@@ -324,14 +325,14 @@ public class XmlConfigParser implements PluginConfigParser {
Attribute
consumerVersionValueAttribute
=
childElement
.
attribute
(
ConfigConstant
.
CONSUMER_VERSION_VALUE_ATTRIBUTE_NAME
);
if
(
consumerVersionValueAttribute
!=
null
)
{
String
consumerVersionValue
=
consumerVersionValueAttribute
.
getData
().
toString
().
trim
();
List
<
String
>
consumerVersionValueList
=
StringUtil
.
split
(
consumerVersionValue
,
Config
Constant
.
SEPARATE
);
List
<
String
>
consumerVersionValueList
=
StringUtil
.
split
ToList
(
consumerVersionValue
,
Discovery
Constant
.
SEPARATE
);
versionEntity
.
setConsumerVersionValueList
(
consumerVersionValueList
);
}
Attribute
providerVersionValueAttribute
=
childElement
.
attribute
(
ConfigConstant
.
PROVIDER_VERSION_VALUE_ATTRIBUTE_NAME
);
if
(
providerVersionValueAttribute
!=
null
)
{
String
providerVersionValue
=
providerVersionValueAttribute
.
getData
().
toString
().
trim
();
List
<
String
>
providerVersionValueList
=
StringUtil
.
split
(
providerVersionValue
,
Config
Constant
.
SEPARATE
);
List
<
String
>
providerVersionValueList
=
StringUtil
.
split
ToList
(
providerVersionValue
,
Discovery
Constant
.
SEPARATE
);
versionEntity
.
setProviderVersionValueList
(
providerVersionValueList
);
}
...
...
@@ -389,7 +390,7 @@ public class XmlConfigParser implements PluginConfigParser {
}
String
providerWeightValue
=
providerWeightValueAttribute
.
getData
().
toString
().
trim
();
Map
<
String
,
Integer
>
weightMap
=
new
LinkedHashMap
<
String
,
Integer
>();
List
<
String
>
providerWeightValueList
=
StringUtil
.
split
(
providerWeightValue
,
Config
Constant
.
SEPARATE
);
List
<
String
>
providerWeightValueList
=
StringUtil
.
split
ToList
(
providerWeightValue
,
Discovery
Constant
.
SEPARATE
);
for
(
String
value
:
providerWeightValueList
)
{
String
[]
valueArray
=
StringUtils
.
split
(
value
,
ConfigConstant
.
SEPARATE
);
String
version
=
valueArray
[
0
].
trim
();
...
...
@@ -423,7 +424,7 @@ public class XmlConfigParser implements PluginConfigParser {
}
String
providerWeightValue
=
providerWeightValueAttribute
.
getData
().
toString
().
trim
();
Map
<
String
,
Integer
>
weightMap
=
new
LinkedHashMap
<
String
,
Integer
>();
List
<
String
>
providerWeightValueList
=
StringUtil
.
split
(
providerWeightValue
,
Config
Constant
.
SEPARATE
);
List
<
String
>
providerWeightValueList
=
StringUtil
.
split
ToList
(
providerWeightValue
,
Discovery
Constant
.
SEPARATE
);
for
(
String
value
:
providerWeightValueList
)
{
String
[]
valueArray
=
StringUtils
.
split
(
value
,
ConfigConstant
.
SEPARATE
);
String
region
=
valueArray
[
0
].
trim
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment