This is an automated email from the ASF dual-hosted git repository.
huxing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new a1e5c8e optimize some code style (#4006)
a1e5c8e is described below
commit a1e5c8e76d30e1a8ed7e43c87a94077d0b87c9a8
Author: jimin <[email protected]>
AuthorDate: Sun May 12 10:35:27 2019 +0800
optimize some code style (#4006)
* optimize constant naming style
* optimize some code style
Signed-off-by: jimin.jm <[email protected]>
---
.../src/main/java/org/apache/dubbo/common/utils/NetUtils.java | 10 +++++-----
.../apache/dubbo/metadata/support/AbstractMetadataReport.java | 4 ++--
.../java/org/apache/dubbo/monitor/dubbo/MetricsFilter.java | 3 ++-
.../src/main/java/org/apache/dubbo/qos/command/impl/Ls.java | 4 ++--
.../apache/dubbo/registry/integration/RegistryProtocol.java | 10 +++++-----
.../org/apache/dubbo/registry/nacos/NacosRegistryFactory.java | 1 +
.../apache/dubbo/remoting/etcd/jetcd/JEtcdClientWrapper.java | 4 +++-
.../java/org/apache/dubbo/rpc/filter/ActiveLimitFilter.java | 6 +++---
.../dubbo/common/serialize/gson/GsonJsonObjectInput.java | 4 +++-
9 files changed, 26 insertions(+), 20 deletions(-)
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/NetUtils.java
b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/NetUtils.java
index e5b85ec..828a97e 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/NetUtils.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/NetUtils.java
@@ -428,7 +428,7 @@ public class NetUtils {
host = inetAddress.getHostAddress();
- String[] ip_address = host.split(splitCharacter);
+ String[] ipAddress = host.split(splitCharacter);
if (pattern.equals(host)) {
return true;
}
@@ -442,7 +442,7 @@ public class NetUtils {
}
}
for (int i = 0; i < mask.length; i++) {
- if (mask[i].equals("*") || mask[i].equals(ip_address[i])) {
+ if (mask[i].equals("*") || mask[i].equals(ipAddress[i])) {
continue;
} else if (mask[i].contains("-")) {
String[] rangeNumStrs = mask[i].split("-");
@@ -451,13 +451,13 @@ public class NetUtils {
}
Integer min = getNumOfIpSegment(rangeNumStrs[0], isIpv4);
Integer max = getNumOfIpSegment(rangeNumStrs[1], isIpv4);
- Integer ip = getNumOfIpSegment(ip_address[i], isIpv4);
+ Integer ip = getNumOfIpSegment(ipAddress[i], isIpv4);
if (ip < min || ip > max) {
return false;
}
- } else if ("0".equals(ip_address[i]) && ("0".equals(mask[i]) ||
"00".equals(mask[i]) || "000".equals(mask[i]) || "0000".equals(mask[i]))) {
+ } else if ("0".equals(ipAddress[i]) && ("0".equals(mask[i]) ||
"00".equals(mask[i]) || "000".equals(mask[i]) || "0000".equals(mask[i]))) {
continue;
- } else if (!mask[i].equals(ip_address[i])) {
+ } else if (!mask[i].equals(ipAddress[i])) {
return false;
}
}
diff --git
a/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/support/AbstractMetadataReport.java
b/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/support/AbstractMetadataReport.java
index 16daa2e..49b4b8f 100644
---
a/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/support/AbstractMetadataReport.java
+++
b/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/support/AbstractMetadataReport.java
@@ -74,7 +74,7 @@ public abstract class AbstractMetadataReport implements
MetadataReport {
boolean syncReport;
// Local disk cache file
File file;
- private AtomicBoolean INIT = new AtomicBoolean(false);
+ private AtomicBoolean initialized = new AtomicBoolean(false);
public MetadataReportRetry metadataReportRetry;
public AbstractMetadataReport(URL reportServerURL) {
@@ -90,7 +90,7 @@ public abstract class AbstractMetadataReport implements
MetadataReport {
}
}
// if this file exist, firstly delete it.
- if (!INIT.getAndSet(true) && file.exists()) {
+ if (!initialized.getAndSet(true) && file.exists()) {
file.delete();
}
}
diff --git
a/dubbo-monitor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/MetricsFilter.java
b/dubbo-monitor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/MetricsFilter.java
index a05c510..52bec17 100644
---
a/dubbo-monitor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/MetricsFilter.java
+++
b/dubbo-monitor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/MetricsFilter.java
@@ -186,8 +186,9 @@ public class MetricsFilter implements Filter {
}
private MetricObject value2MetricObject(String metric, Integer value,
MetricLevel level) {
- if (metric == null || value == null || level == null)
+ if (metric == null || value == null || level == null) {
return null;
+ }
return new MetricObject
.Builder(metric)
diff --git
a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Ls.java
b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Ls.java
index 4777727..469a40a 100644
---
a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Ls.java
+++
b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Ls.java
@@ -45,7 +45,7 @@ public class Ls implements BaseCommand {
public String listProvider() {
StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append("As Provider side:" + System.lineSeparator());
- Collection<ProviderModel> ProviderModelList =
ApplicationModel.allProviderModels();
+ Collection<ProviderModel> providerModelList =
ApplicationModel.allProviderModels();
TTable tTable = new TTable(new TTable.ColumnDefine[]{
new TTable.ColumnDefine(TTable.Align.MIDDLE),
@@ -56,7 +56,7 @@ public class Ls implements BaseCommand {
tTable.addRow("Provider Service Name", "PUB");
//Content
- for (ProviderModel providerModel : ProviderModelList) {
+ for (ProviderModel providerModel : providerModelList) {
tTable.addRow(providerModel.getServiceName(),
isRegistered(providerModel.getServiceName()) ? "Y" : "N");
}
stringBuilder.append(tTable.rendering());
diff --git
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java
index b1b3393..c70be0b 100644
---
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java
+++
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java
@@ -295,18 +295,18 @@ public class RegistryProtocol implements Protocol {
MONITOR_KEY, BIND_IP_KEY, BIND_PORT_KEY, QOS_ENABLE,
QOS_PORT, ACCEPT_FOREIGN_IP, VALIDATION_KEY,
INTERFACES);
} else {
- String extra_keys = registryUrl.getParameter(EXTRA_KEYS_KEY, "");
+ String extraKeys = registryUrl.getParameter(EXTRA_KEYS_KEY, "");
// if path is not the same as interface name then we should keep
INTERFACE_KEY,
// otherwise, the registry structure of zookeeper would be
'/dubbo/path/providers',
// but what we expect is '/dubbo/interface/providers'
if
(!providerUrl.getPath().equals(providerUrl.getParameter(Constants.INTERFACE_KEY)))
{
- if (StringUtils.isNotEmpty(extra_keys)) {
- extra_keys += ",";
+ if (StringUtils.isNotEmpty(extraKeys)) {
+ extraKeys += ",";
}
- extra_keys += Constants.INTERFACE_KEY;
+ extraKeys += Constants.INTERFACE_KEY;
}
String[] paramsToRegistry =
getParamsToRegistry(DEFAULT_REGISTER_PROVIDER_KEYS
- , Constants.COMMA_SPLIT_PATTERN.split(extra_keys));
+ , Constants.COMMA_SPLIT_PATTERN.split(extraKeys));
return URL.valueOf(providerUrl, paramsToRegistry,
providerUrl.getParameter(METHODS_KEY, (String[]) null));
}
diff --git
a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistryFactory.java
b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistryFactory.java
index d0e508d..2b66fb1 100644
---
a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistryFactory.java
+++
b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistryFactory.java
@@ -48,6 +48,7 @@ public class NacosRegistryFactory extends
AbstractRegistryFactory {
private final Logger logger = LoggerFactory.getLogger(getClass());
+ @Override
protected Registry createRegistry(URL url) {
return new NacosRegistry(url, buildNamingService(url));
}
diff --git
a/dubbo-remoting/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/jetcd/JEtcdClientWrapper.java
b/dubbo-remoting/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/jetcd/JEtcdClientWrapper.java
index c27fb56..01bf17d 100644
---
a/dubbo-remoting/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/jetcd/JEtcdClientWrapper.java
+++
b/dubbo-remoting/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/jetcd/JEtcdClientWrapper.java
@@ -186,7 +186,9 @@ public class JEtcdClientWrapper {
int index = len, count = 0;
if (key.length() > len) {
for (; (index =
key.indexOf(Constants.PATH_SEPARATOR, index)) != -1; ++index) {
- if (count++ > 1) break;
+ if (count++ > 1) {
+ break;
+ }
}
}
return count == 1;
diff --git
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ActiveLimitFilter.java
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ActiveLimitFilter.java
index 1c2f69f..926fd01 100644
---
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ActiveLimitFilter.java
+++
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ActiveLimitFilter.java
@@ -47,12 +47,12 @@ public class ActiveLimitFilter implements Filter {
String methodName = invocation.getMethodName();
int max = invoker.getUrl().getMethodParameter(methodName,
Constants.ACTIVES_KEY, 0);
RpcStatus count = RpcStatus.getStatus(invoker.getUrl(),
invocation.getMethodName());
- if (!count.beginCount(url, methodName, max)) {
+ if (!RpcStatus.beginCount(url, methodName, max)) {
long timeout =
invoker.getUrl().getMethodParameter(invocation.getMethodName(),
Constants.TIMEOUT_KEY, 0);
long start = System.currentTimeMillis();
long remain = timeout;
synchronized (count) {
- while (!count.beginCount(url, methodName, max)) {
+ while (!RpcStatus.beginCount(url, methodName, max)) {
try {
count.wait(remain);
} catch (InterruptedException e) {
@@ -79,7 +79,7 @@ public class ActiveLimitFilter implements Filter {
isSuccess = false;
throw t;
} finally {
- count.endCount(url, methodName, System.currentTimeMillis() -
begin, isSuccess);
+ RpcStatus.endCount(url, methodName, System.currentTimeMillis() -
begin, isSuccess);
if (max > 0) {
synchronized (count) {
count.notifyAll();
diff --git
a/dubbo-serialization/dubbo-serialization-gson/src/main/java/org/apache/dubbo/common/serialize/gson/GsonJsonObjectInput.java
b/dubbo-serialization/dubbo-serialization-gson/src/main/java/org/apache/dubbo/common/serialize/gson/GsonJsonObjectInput.java
index 94014f2..056d719 100644
---
a/dubbo-serialization/dubbo-serialization-gson/src/main/java/org/apache/dubbo/common/serialize/gson/GsonJsonObjectInput.java
+++
b/dubbo-serialization/dubbo-serialization-gson/src/main/java/org/apache/dubbo/common/serialize/gson/GsonJsonObjectInput.java
@@ -107,7 +107,9 @@ public class GsonJsonObjectInput implements ObjectInput {
private String readLine() throws IOException {
String line = reader.readLine();
- if (line == null || line.trim().length() == 0) throw new
EOFException();
+ if (line == null || line.trim().length() == 0) {
+ throw new EOFException();
+ }
return line;
}
