Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

unit test for AbstractConfigTest #1716

Merged
merged 11 commits into from
May 3, 2018
Merged

unit test for AbstractConfigTest #1716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
705f4c0
unit test for AbstractConfigTest, finish appendProperties, appendPara…
beiwei30 Apr 28, 2018
c5813db
add apache license header
beiwei30 Apr 28, 2018
0f62d2b
finish unit test for AbstractConfig
beiwei30 Apr 30, 2018
6569053
fix typo
beiwei30 Apr 30, 2018
9913b08
remote null check so that we can clear properties with null, particul…
beiwei30 May 2, 2018
ad78dc3
unit test for AbstractInterfaceConfigTest
beiwei30 May 2, 2018
587a242
unit test for AbstractInterfaceConfigTest: fix test failures, and add…
beiwei30 May 2, 2018
77c15a7
unit test for AbstractInterfaceConfig: add test for checkStubAndMock
beiwei30 May 2, 2018
d91b124
fix typo: local should be stub
beiwei30 May 2, 2018
396a209
finish unit test for AbstractInterfaceConfig
beiwei30 May 2, 2018
bc4c79d
add apache license header
beiwei30 May 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/ConfigUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,7 @@ public static Properties getProperties() {
}

public static void setProperties(Properties properties) {
if (properties != null) {
PROPERTIES = properties;
}
PROPERTIES = properties;
}

public static void addProperties(Properties properties) {
Expand Down
8 changes: 4 additions & 4 deletions dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/AbstractConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,11 +214,11 @@ && isPrimitive(method.getReturnType())) {
str = URL.encode(str);
}
if (parameter != null && parameter.append()) {
String pre = (String) parameters.get(Constants.DEFAULT_KEY + "." + key);
String pre = parameters.get(Constants.DEFAULT_KEY + "." + key);
if (pre != null && pre.length() > 0) {
str = pre + "," + str;
}
pre = (String) parameters.get(key);
pre = parameters.get(key);
if (pre != null && pre.length() > 0) {
str = pre + "," + str;
}
Expand Down Expand Up @@ -387,7 +387,6 @@ protected static void checkParameterName(Map<String, String> parameters) {
return;
}
for (Map.Entry<String, String> entry : parameters.entrySet()) {
//change by tony.chenl parameter value maybe has colon.for example napoli address
checkNameHasSymbol(entry.getKey(), entry.getValue());
}
}
Expand All @@ -402,7 +401,8 @@ protected static void checkProperty(String property, String value, int maxlength
if (pattern != null) {
Matcher matcher = pattern.matcher(value);
if (!matcher.matches()) {
throw new IllegalStateException("Invalid " + property + "=\"" + value + "\" contain illegal charactor, only digit, letter, '-', '_' and '.' is legal.");
throw new IllegalStateException("Invalid " + property + "=\"" + value + "\" contains illegal " +
"character, only digit, letter, '-', '_' or '.' is legal.");
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...nfig/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/AbstractInterfaceConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ public String getStub() {
}

public void setStub(Boolean stub) {
if (local == null) {
if (stub == null) {
setStub((String) null);
} else {
setStub(String.valueOf(stub));
Expand Down
Loading