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

1. 将URL中的默认值使用三目运算符表示。 #4301

Merged
merged 1 commit into from
Jun 13, 2019
Merged

1. 将URL中的默认值使用三目运算符表示。 #4301

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
117 changes: 25 additions & 92 deletions dubbo-common/src/main/java/org/apache/dubbo/common/URL.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,26 +493,17 @@ public String getParameterAndDecoded(String key, String defaultValue) {

public String getParameter(String key) {
String value = parameters.get(key);
if (StringUtils.isEmpty(value)) {
value = parameters.get(DEFAULT_KEY_PREFIX + key);
}
return value;
return StringUtils.isEmpty(value) ? parameters.get(DEFAULT_KEY_PREFIX + key) : value;
}

public String getParameter(String key, String defaultValue) {
String value = getParameter(key);
if (StringUtils.isEmpty(value)) {
return defaultValue;
}
return value;
return StringUtils.isEmpty(value) ? defaultValue : value;
}

public String[] getParameter(String key, String[] defaultValue) {
String value = getParameter(key);
if (StringUtils.isEmpty(value)) {
return defaultValue;
}
return COMMA_SPLIT_PATTERN.split(value);
return StringUtils.isEmpty(value) ? defaultValue : COMMA_SPLIT_PATTERN.split(value);
}

public List<String> getParameter(String key, List<String> defaultValue) {
Expand All @@ -525,17 +516,13 @@ public List<String> getParameter(String key, List<String> defaultValue) {
}

private Map<String, Number> getNumbers() {
if (numbers == null) { // concurrent initialization is tolerant
numbers = new ConcurrentHashMap<>();
}
return numbers;
// concurrent initialization is tolerant
return numbers == null ? new ConcurrentHashMap<>() : numbers;
}

private Map<String, URL> getUrls() {
if (urls == null) { // concurrent initialization is tolerant
urls = new ConcurrentHashMap<>();
}
return urls;
// concurrent initialization is tolerant
return urls == null ? new ConcurrentHashMap<>() : urls;
}

public URL getUrlParameter(String key) {
Expand Down Expand Up @@ -641,81 +628,57 @@ public float getPositiveParameter(String key, float defaultValue) {
throw new IllegalArgumentException("defaultValue <= 0");
}
float value = getParameter(key, defaultValue);
if (value <= 0) {
return defaultValue;
}
return value;
return value <= 0 ? defaultValue : value;
}

public double getPositiveParameter(String key, double defaultValue) {
if (defaultValue <= 0) {
throw new IllegalArgumentException("defaultValue <= 0");
}
double value = getParameter(key, defaultValue);
if (value <= 0) {
return defaultValue;
}
return value;
return value <= 0 ? defaultValue : value;
}

public long getPositiveParameter(String key, long defaultValue) {
if (defaultValue <= 0) {
throw new IllegalArgumentException("defaultValue <= 0");
}
long value = getParameter(key, defaultValue);
if (value <= 0) {
return defaultValue;
}
return value;
return value <= 0 ? defaultValue : value;
}

public int getPositiveParameter(String key, int defaultValue) {
if (defaultValue <= 0) {
throw new IllegalArgumentException("defaultValue <= 0");
}
int value = getParameter(key, defaultValue);
if (value <= 0) {
return defaultValue;
}
return value;
return value <= 0 ? defaultValue : value;
}

public short getPositiveParameter(String key, short defaultValue) {
if (defaultValue <= 0) {
throw new IllegalArgumentException("defaultValue <= 0");
}
short value = getParameter(key, defaultValue);
if (value <= 0) {
return defaultValue;
}
return value;
return value <= 0 ? defaultValue : value;
}

public byte getPositiveParameter(String key, byte defaultValue) {
if (defaultValue <= 0) {
throw new IllegalArgumentException("defaultValue <= 0");
}
byte value = getParameter(key, defaultValue);
if (value <= 0) {
return defaultValue;
}
return value;
return value <= 0 ? defaultValue : value;
}

public char getParameter(String key, char defaultValue) {
String value = getParameter(key);
if (StringUtils.isEmpty(value)) {
return defaultValue;
}
return value.charAt(0);
return StringUtils.isEmpty(value) ? defaultValue : value.charAt(0);
}

public boolean getParameter(String key, boolean defaultValue) {
String value = getParameter(key);
if (StringUtils.isEmpty(value)) {
return defaultValue;
}
return Boolean.parseBoolean(value);
return StringUtils.isEmpty(value) ? defaultValue : Boolean.parseBoolean(value);
}

public boolean hasParameter(String key) {
Expand All @@ -733,18 +696,12 @@ public String getMethodParameterAndDecoded(String method, String key, String def

public String getMethodParameter(String method, String key) {
String value = parameters.get(method + "." + key);
if (StringUtils.isEmpty(value)) {
return getParameter(key);
}
return value;
return StringUtils.isEmpty(value) ? getParameter(key) : value;
}

public String getMethodParameter(String method, String key, String defaultValue) {
String value = getMethodParameter(method, key);
if (StringUtils.isEmpty(value)) {
return defaultValue;
}
return value;
return StringUtils.isEmpty(value) ? defaultValue : value;
}

public double getMethodParameter(String method, String key, double defaultValue) {
Expand Down Expand Up @@ -842,81 +799,57 @@ public double getMethodPositiveParameter(String method, String key, double defau
throw new IllegalArgumentException("defaultValue <= 0");
}
double value = getMethodParameter(method, key, defaultValue);
if (value <= 0) {
return defaultValue;
}
return value;
return value <= 0 ? defaultValue : value;
}

public float getMethodPositiveParameter(String method, String key, float defaultValue) {
if (defaultValue <= 0) {
throw new IllegalArgumentException("defaultValue <= 0");
}
float value = getMethodParameter(method, key, defaultValue);
if (value <= 0) {
return defaultValue;
}
return value;
return value <= 0 ? defaultValue : value;
}

public long getMethodPositiveParameter(String method, String key, long defaultValue) {
if (defaultValue <= 0) {
throw new IllegalArgumentException("defaultValue <= 0");
}
long value = getMethodParameter(method, key, defaultValue);
if (value <= 0) {
return defaultValue;
}
return value;
return value <= 0 ? defaultValue : value;
}

public int getMethodPositiveParameter(String method, String key, int defaultValue) {
if (defaultValue <= 0) {
throw new IllegalArgumentException("defaultValue <= 0");
}
int value = getMethodParameter(method, key, defaultValue);
if (value <= 0) {
return defaultValue;
}
return value;
return value <= 0 ? defaultValue : value;
}

public short getMethodPositiveParameter(String method, String key, short defaultValue) {
if (defaultValue <= 0) {
throw new IllegalArgumentException("defaultValue <= 0");
}
short value = getMethodParameter(method, key, defaultValue);
if (value <= 0) {
return defaultValue;
}
return value;
return value <= 0 ? defaultValue : value;
}

public byte getMethodPositiveParameter(String method, String key, byte defaultValue) {
if (defaultValue <= 0) {
throw new IllegalArgumentException("defaultValue <= 0");
}
byte value = getMethodParameter(method, key, defaultValue);
if (value <= 0) {
return defaultValue;
}
return value;
return value <= 0 ? defaultValue : value;
}

public char getMethodParameter(String method, String key, char defaultValue) {
String value = getMethodParameter(method, key);
if (StringUtils.isEmpty(value)) {
return defaultValue;
}
return value.charAt(0);
return StringUtils.isEmpty(value) ? defaultValue : value.charAt(0);
}

public boolean getMethodParameter(String method, String key, boolean defaultValue) {
String value = getMethodParameter(method, key);
if (StringUtils.isEmpty(value)) {
return defaultValue;
}
return Boolean.parseBoolean(value);
return StringUtils.isEmpty(value) ? defaultValue : Boolean.parseBoolean(value);
}

public boolean hasMethodParameter(String method, String key) {
Expand Down