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 84d355f code rule (#3651)
84d355f is described below
commit 84d355fb1b553c7c5f01357069b13d434f60e53c
Author: Wang jie <[email protected]>
AuthorDate: Fri Apr 12 11:37:03 2019 +0800
code rule (#3651)
---
.../cluster/configurator/AbstractConfigurator.java | 1 -
.../main/java/com/alibaba/dubbo/rpc/Invoker.java | 1 +
.../dubbo/config/builders/AbstractBuilder.java | 8 ++-
.../config/builders/AbstractInterfaceBuilder.java | 81 ++++++++++++++++------
.../config/builders/AbstractMethodBuilder.java | 49 +++++++++----
.../config/builders/AbstractReferenceBuilder.java | 37 +++++++---
.../config/builders/AbstractServiceBuilder.java | 69 +++++++++++++-----
.../dubbo/config/builders/ApplicationBuilder.java | 4 +-
.../apache/dubbo/registry/etcd/EtcdRegistry.java | 1 +
.../dubbo/remoting/etcd/AbstractRetryPolicy.java | 1 +
.../dubbo/remoting/etcd/jetcd/JEtcdClient.java | 24 +++++--
.../remoting/etcd/jetcd/JEtcdClientWrapper.java | 21 ++++--
.../dubbo/remoting/etcd/jetcd/RetryLoops.java | 8 ++-
.../dubbo/remoting/etcd/option/OptionUtil.java | 4 +-
.../remoting/etcd/support/AbstractEtcdClient.java | 10 +++
15 files changed, 243 insertions(+), 76 deletions(-)
diff --git
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/AbstractConfigurator.java
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/AbstractConfigurator.java
index 0134173..5e53b1b 100644
---
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/AbstractConfigurator.java
+++
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/AbstractConfigurator.java
@@ -28,7 +28,6 @@ import java.util.Set;
/**
* AbstractOverrideConfigurator
- *
*/
public abstract class AbstractConfigurator implements Configurator {
diff --git a/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Invoker.java
b/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Invoker.java
index 8811f59..5ad026f 100644
--- a/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Invoker.java
+++ b/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Invoker.java
@@ -24,6 +24,7 @@ public interface Invoker<T> extends
org.apache.dubbo.rpc.Invoker<T> {
Result invoke(Invocation invocation) throws RpcException;
+ @Override
URL getUrl();
default org.apache.dubbo.rpc.Invoker<T> getOriginal() {
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/builders/AbstractBuilder.java
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/builders/AbstractBuilder.java
index 404483e..d1e33c6 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/builders/AbstractBuilder.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/builders/AbstractBuilder.java
@@ -63,7 +63,11 @@ public abstract class AbstractBuilder<T extends
AbstractConfig, B extends Abstra
}
protected void build(T instance) {
- if (!StringUtils.isEmpty(id)) instance.setId(id);
- if (!StringUtils.isEmpty(prefix)) instance.setPrefix(prefix);
+ if (!StringUtils.isEmpty(id)) {
+ instance.setId(id);
+ }
+ if (!StringUtils.isEmpty(prefix)) {
+ instance.setPrefix(prefix);
+ }
}
}
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/builders/AbstractInterfaceBuilder.java
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/builders/AbstractInterfaceBuilder.java
index af97b5b..e8272d0 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/builders/AbstractInterfaceBuilder.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/builders/AbstractInterfaceBuilder.java
@@ -267,28 +267,69 @@ public abstract class AbstractInterfaceBuilder<T extends
AbstractInterfaceConfig
return getThis();
}
+ @Override
public void build(T instance) {
super.build(instance);
- if (!StringUtils.isEmpty(local)) instance.setLocal(local);
- if (!StringUtils.isEmpty(stub)) instance.setStub(stub);
- if (monitor != null) instance.setMonitor(monitor);
- if (!StringUtils.isEmpty(proxy)) instance.setProxy(proxy);
- if (!StringUtils.isEmpty(cluster)) instance.setCluster(cluster);
- if (!StringUtils.isEmpty(filter)) instance.setFilter(filter);
- if (!StringUtils.isEmpty(listener)) instance.setListener(listener);
- if (!StringUtils.isEmpty(owner)) instance.setOwner(owner);
- if (connections != null) instance.setConnections(connections);
- if (!StringUtils.isEmpty(layer)) instance.setLayer(layer);
- if (application != null) instance.setApplication(application);
- if (module != null) instance.setModule(module);
- if (registries != null) instance.setRegistries(registries);
- if (!StringUtils.isEmpty(registryIds))
instance.setRegistryIds(registryIds);
- if (!StringUtils.isEmpty(onconnect)) instance.setOnconnect(onconnect);
- if (!StringUtils.isEmpty(ondisconnect))
instance.setOndisconnect(ondisconnect);
- if (metadataReportConfig != null)
instance.setMetadataReportConfig(metadataReportConfig);
- if (configCenter != null) instance.setConfigCenter(configCenter);
- if (callbacks != null) instance.setCallbacks(callbacks);
- if (!StringUtils.isEmpty(scope)) instance.setScope(scope);
+ if (!StringUtils.isEmpty(local)) {
+ instance.setLocal(local);
+ }
+ if (!StringUtils.isEmpty(stub)) {
+ instance.setStub(stub);
+ }
+ if (monitor != null) {
+ instance.setMonitor(monitor);
+ }
+ if (!StringUtils.isEmpty(proxy)) {
+ instance.setProxy(proxy);
+ }
+ if (!StringUtils.isEmpty(cluster)) {
+ instance.setCluster(cluster);
+ }
+ if (!StringUtils.isEmpty(filter)) {
+ instance.setFilter(filter);
+ }
+ if (!StringUtils.isEmpty(listener)) {
+ instance.setListener(listener);
+ }
+ if (!StringUtils.isEmpty(owner)) {
+ instance.setOwner(owner);
+ }
+ if (connections != null) {
+ instance.setConnections(connections);
+ }
+ if (!StringUtils.isEmpty(layer)) {
+ instance.setLayer(layer);
+ }
+ if (application != null) {
+ instance.setApplication(application);
+ }
+ if (module != null) {
+ instance.setModule(module);
+ }
+ if (registries != null) {
+ instance.setRegistries(registries);
+ }
+ if (!StringUtils.isEmpty(registryIds)) {
+ instance.setRegistryIds(registryIds);
+ }
+ if (!StringUtils.isEmpty(onconnect)) {
+ instance.setOnconnect(onconnect);
+ }
+ if (!StringUtils.isEmpty(ondisconnect)) {
+ instance.setOndisconnect(ondisconnect);
+ }
+ if (metadataReportConfig != null) {
+ instance.setMetadataReportConfig(metadataReportConfig);
+ }
+ if (configCenter != null) {
+ instance.setConfigCenter(configCenter);
+ }
+ if (callbacks != null) {
+ instance.setCallbacks(callbacks);
+ }
+ if (!StringUtils.isEmpty(scope)) {
+ instance.setScope(scope);
+ }
}
}
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/builders/AbstractMethodBuilder.java
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/builders/AbstractMethodBuilder.java
index bdd0933..2b24f87 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/builders/AbstractMethodBuilder.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/builders/AbstractMethodBuilder.java
@@ -168,21 +168,46 @@ public abstract class AbstractMethodBuilder<T extends
AbstractMethodConfig, B ex
return getThis();
}
+ @Override
@SuppressWarnings("unchecked")
public void build(T instance) {
super.build(instance);
- if (actives != null) instance.setActives(actives);
- if (async != null) instance.setAsync(async);
- if (!StringUtils.isEmpty(cache)) instance.setCache(cache);
- if (forks != null) instance.setForks(forks);
- if (!StringUtils.isEmpty(loadbalance))
instance.setLoadbalance(loadbalance);
- if (!StringUtils.isEmpty(merger)) instance.setMerger(merger);
- if(!StringUtils.isEmpty(mock)) instance.setMock(mock);
- if (retries != null) instance.setRetries(retries);
- if (sent != null) instance.setSent(sent);
- if (timeout != null) instance.setTimeout(timeout);
- if (!StringUtils.isEmpty(validation))
instance.setValidation(validation);
- if (parameters != null) instance.setParameters(parameters);
+ if (actives != null) {
+ instance.setActives(actives);
+ }
+ if (async != null) {
+ instance.setAsync(async);
+ }
+ if (!StringUtils.isEmpty(cache)) {
+ instance.setCache(cache);
+ }
+ if (forks != null) {
+ instance.setForks(forks);
+ }
+ if (!StringUtils.isEmpty(loadbalance)) {
+ instance.setLoadbalance(loadbalance);
+ }
+ if (!StringUtils.isEmpty(merger)) {
+ instance.setMerger(merger);
+ }
+ if(!StringUtils.isEmpty(mock)) {
+ instance.setMock(mock);
+ }
+ if (retries != null) {
+ instance.setRetries(retries);
+ }
+ if (sent != null) {
+ instance.setSent(sent);
+ }
+ if (timeout != null) {
+ instance.setTimeout(timeout);
+ }
+ if (!StringUtils.isEmpty(validation)) {
+ instance.setValidation(validation);
+ }
+ if (parameters != null) {
+ instance.setParameters(parameters);
+ }
}
}
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/builders/AbstractReferenceBuilder.java
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/builders/AbstractReferenceBuilder.java
index 7748317..dd84c93 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/builders/AbstractReferenceBuilder.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/builders/AbstractReferenceBuilder.java
@@ -126,17 +126,36 @@ public abstract class AbstractReferenceBuilder<T extends
AbstractReferenceConfig
return getThis();
}
+ @Override
public void build(T instance) {
super.build(instance);
- if (check != null) instance.setCheck(check);
- if (init != null) instance.setInit(init);
- if (!StringUtils.isEmpty(generic)) instance.setGeneric(generic);
- if (injvm != null) instance.setInjvm(injvm);
- if (lazy != null) instance.setLazy(lazy);
- if (!StringUtils.isEmpty(reconnect)) instance.setReconnect(reconnect);
- if (sticky != null) instance.setSticky(sticky);
- if (!StringUtils.isEmpty(version)) instance.setVersion(version);
- if (!StringUtils.isEmpty(group)) instance.setGroup(group);
+ if (check != null) {
+ instance.setCheck(check);
+ }
+ if (init != null) {
+ instance.setInit(init);
+ }
+ if (!StringUtils.isEmpty(generic)) {
+ instance.setGeneric(generic);
+ }
+ if (injvm != null) {
+ instance.setInjvm(injvm);
+ }
+ if (lazy != null) {
+ instance.setLazy(lazy);
+ }
+ if (!StringUtils.isEmpty(reconnect)) {
+ instance.setReconnect(reconnect);
+ }
+ if (sticky != null) {
+ instance.setSticky(sticky);
+ }
+ if (!StringUtils.isEmpty(version)) {
+ instance.setVersion(version);
+ }
+ if (!StringUtils.isEmpty(group)) {
+ instance.setGroup(group);
+ }
}
}
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/builders/AbstractServiceBuilder.java
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/builders/AbstractServiceBuilder.java
index fce7388..5b16602 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/builders/AbstractServiceBuilder.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/builders/AbstractServiceBuilder.java
@@ -222,25 +222,60 @@ public abstract class AbstractServiceBuilder<T extends
AbstractServiceConfig, B
return getThis();
}
+ @Override
public void build(T instance) {
super.build(instance);
- if (!StringUtils.isEmpty(version)) instance.setVersion(version);
- if (!StringUtils.isEmpty(group)) instance.setGroup(group);
- if (deprecated != null) instance.setDeprecated(deprecated);
- if (delay != null) instance.setDelay(delay);
- if (export != null) instance.setExport(export);
- if (weight != null) instance.setWeight(weight);
- if (!StringUtils.isEmpty(document)) instance.setDocument(document);
- if (dynamic != null) instance.setDynamic(dynamic);
- if (!StringUtils.isEmpty(token)) instance.setToken(token);
- if (!StringUtils.isEmpty(accesslog)) instance.setAccesslog(accesslog);
- if (protocols != null) instance.setProtocols(protocols);
- if (!StringUtils.isEmpty(protocolIds))
instance.setProtocolIds(protocolIds);
- if (tag != null) instance.setTag(tag);
- if (executes != null) instance.setExecutes(executes);
- if (register != null) instance.setRegister(register);
- if (warmup != null) instance.setWarmup(warmup);
- if (!StringUtils.isEmpty(serialization))
instance.setSerialization(serialization);
+ if (!StringUtils.isEmpty(version)) {
+ instance.setVersion(version);
+ }
+ if (!StringUtils.isEmpty(group)) {
+ instance.setGroup(group);
+ }
+ if (deprecated != null) {
+ instance.setDeprecated(deprecated);
+ }
+ if (delay != null) {
+ instance.setDelay(delay);
+ }
+ if (export != null) {
+ instance.setExport(export);
+ }
+ if (weight != null) {
+ instance.setWeight(weight);
+ }
+ if (!StringUtils.isEmpty(document)) {
+ instance.setDocument(document);
+ }
+ if (dynamic != null) {
+ instance.setDynamic(dynamic);
+ }
+ if (!StringUtils.isEmpty(token)) {
+ instance.setToken(token);
+ }
+ if (!StringUtils.isEmpty(accesslog)) {
+ instance.setAccesslog(accesslog);
+ }
+ if (protocols != null) {
+ instance.setProtocols(protocols);
+ }
+ if (!StringUtils.isEmpty(protocolIds)) {
+ instance.setProtocolIds(protocolIds);
+ }
+ if (tag != null) {
+ instance.setTag(tag);
+ }
+ if (executes != null) {
+ instance.setExecutes(executes);
+ }
+ if (register != null) {
+ instance.setRegister(register);
+ }
+ if (warmup != null) {
+ instance.setWarmup(warmup);
+ }
+ if (!StringUtils.isEmpty(serialization)) {
+ instance.setSerialization(serialization);
+ }
}
}
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/builders/ApplicationBuilder.java
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/builders/ApplicationBuilder.java
index b843a4d..8fc16ba 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/builders/ApplicationBuilder.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/builders/ApplicationBuilder.java
@@ -182,7 +182,9 @@ public class ApplicationBuilder extends
AbstractBuilder<ApplicationConfig, Appli
config.setQosPort(this.qosPort);
config.setQosAcceptForeignIp(this.qosAcceptForeignIp);
config.setParameters(this.parameters);
- if (!StringUtils.isEmpty(shutwait)) config.setShutwait(shutwait);
+ if (!StringUtils.isEmpty(shutwait)) {
+ config.setShutwait(shutwait);
+ }
return config;
}
diff --git
a/dubbo-registry/dubbo-registry-etcd3/src/main/java/org/apache/dubbo/registry/etcd/EtcdRegistry.java
b/dubbo-registry/dubbo-registry-etcd3/src/main/java/org/apache/dubbo/registry/etcd/EtcdRegistry.java
index 2e297fa..f0516c3 100644
---
a/dubbo-registry/dubbo-registry-etcd3/src/main/java/org/apache/dubbo/registry/etcd/EtcdRegistry.java
+++
b/dubbo-registry/dubbo-registry-etcd3/src/main/java/org/apache/dubbo/registry/etcd/EtcdRegistry.java
@@ -86,6 +86,7 @@ public class EtcdRegistry extends FailbackRegistry {
}
this.root = group;
etcdClient = etcdTransporter.connect(url);
+
etcdClient.addStateListener(state -> {
if (state == StateListener.CONNECTED) {
try {
diff --git
a/dubbo-remoting/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/AbstractRetryPolicy.java
b/dubbo-remoting/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/AbstractRetryPolicy.java
index f626202..b084ba3 100644
---
a/dubbo-remoting/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/AbstractRetryPolicy.java
+++
b/dubbo-remoting/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/AbstractRetryPolicy.java
@@ -24,6 +24,7 @@ public abstract class AbstractRetryPolicy implements
RetryPolicy {
this.maxRetried = maxRetried;
}
+ @Override
public boolean shouldRetry(int retried, long elapsed, boolean sleep) {
if (retried < maxRetried) {
try {
diff --git
a/dubbo-remoting/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/jetcd/JEtcdClient.java
b/dubbo-remoting/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/jetcd/JEtcdClient.java
index ff4c118..634a6ed 100644
---
a/dubbo-remoting/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/jetcd/JEtcdClient.java
+++
b/dubbo-remoting/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/jetcd/JEtcdClient.java
@@ -235,12 +235,16 @@ public class JEtcdClient extends
AbstractEtcdClient<JEtcdClient.EtcdWatcher> {
switch (event.getType()) {
case PUT: {
if (((service = find(event)) != null)
- && safeUpdate(service, true)) modified++;
+ && safeUpdate(service, true)) {
+ modified++;
+ }
break;
}
case DELETE: {
if (((service = find(event)) != null)
- && safeUpdate(service, false)) modified++;
+ && safeUpdate(service, false)) {
+ modified++;
+ }
break;
}
default:
@@ -331,7 +335,9 @@ public class JEtcdClient extends
AbstractEtcdClient<JEtcdClient.EtcdWatcher> {
int len = path.length(), index = len, count = 0;
if (key.length() >= index) {
for (; (index = key.indexOf(Constants.PATH_SEPARATOR, index))
!= -1; ++index) {
- if (count++ > 1) break;
+ if (count++ > 1) {
+ break;
+ }
}
}
@@ -349,15 +355,21 @@ public class JEtcdClient extends
AbstractEtcdClient<JEtcdClient.EtcdWatcher> {
}
private List<String> filterChildren(List<String> children) {
- if (children == null) return Collections.emptyList();
- if (children.size() <= 0) return children;
+ if (children == null) {
+ return Collections.emptyList();
+ }
+ if (children.size() <= 0) {
+ return children;
+ }
final int len = path.length();
return children.stream().parallel()
.filter(child -> {
int index = len, count = 0;
if (child.length() > len) {
for (; (index =
child.indexOf(Constants.PATH_SEPARATOR, index)) != -1; ++index) {
- if (count++ > 1) break;
+ if (count++ > 1) {
+ break;
+ }
}
}
return count == 1;
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 21dd40e..c27fb56 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
@@ -121,6 +121,7 @@ public class JEtcdClientWrapper {
this.failed = new IllegalStateException("Etcd3 registry is not
connected yet, url:" + url);
int retryPeriod =
url.getParameter(Constants.REGISTRY_RETRY_PERIOD_KEY,
Constants.DEFAULT_REGISTRY_RETRY_PERIOD);
+
this.retryFuture = retryExecutor.scheduleWithFixedDelay(() -> {
try {
retry();
@@ -414,7 +415,9 @@ public class JEtcdClientWrapper {
/**
* The client is processing reconnection
*/
- if (cancelKeepAlive) return;
+ if (cancelKeepAlive) {
+ return;
+ }
cancelKeepAlive();
@@ -427,7 +430,9 @@ public class JEtcdClientWrapper {
* The client is processing reconnection,
* cancel remaining service registration
*/
- if (cancelKeepAlive) return;
+ if (cancelKeepAlive) {
+ return;
+ }
createEphemeral(path);
failedRegistered.remove(path);
@@ -574,7 +579,9 @@ public class JEtcdClientWrapper {
logger.warn(t.getMessage(), t);
}
- if (getClient() != null) getClient().close();
+ if (getClient() != null) {
+ getClient().close();
+ }
}
/**
@@ -655,7 +662,9 @@ public class JEtcdClientWrapper {
Set<String> failed = new HashSet<String>(failedRegistered);
if (!failed.isEmpty()) {
- if (cancelKeepAlive) return;
+ if (cancelKeepAlive) {
+ return;
+ }
if (logger.isWarnEnabled()) {
logger.warn("Retry failed register(keep alive) for path '"
+ failed
@@ -668,7 +677,9 @@ public class JEtcdClientWrapper {
/**
* Is it currently reconnecting ?
*/
- if (cancelKeepAlive) return;
+ if (cancelKeepAlive) {
+ return;
+ }
createEphemeral(path);
failedRegistered.remove(path);
diff --git
a/dubbo-remoting/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/jetcd/RetryLoops.java
b/dubbo-remoting/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/jetcd/RetryLoops.java
index cf8617c..0441e44 100644
---
a/dubbo-remoting/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/jetcd/RetryLoops.java
+++
b/dubbo-remoting/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/jetcd/RetryLoops.java
@@ -64,7 +64,9 @@ public class RetryLoops {
public void fireException(Exception e, RetryPolicy retryPolicy) throws
Exception {
- if (e instanceof InterruptedException)
Thread.currentThread().interrupt();
+ if (e instanceof InterruptedException) {
+ Thread.currentThread().interrupt();
+ }
boolean rethrow = true;
if (isRetryException(e)
@@ -79,7 +81,9 @@ public class RetryLoops {
private boolean isRetryException(Throwable e) {
Status status = Status.fromThrowable(e);
- if (OptionUtil.isRecoverable(status)) return true;
+ if (OptionUtil.isRecoverable(status)) {
+ return true;
+ }
return false;
}
diff --git
a/dubbo-remoting/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/option/OptionUtil.java
b/dubbo-remoting/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/option/OptionUtil.java
index 609f289..5cb13fc 100644
---
a/dubbo-remoting/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/option/OptionUtil.java
+++
b/dubbo-remoting/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/option/OptionUtil.java
@@ -60,7 +60,9 @@ public class OptionUtil {
}
public static boolean isProtocolError(Throwable e) {
- if (e == null) return false;
+ if (e == null) {
+ return false;
+ }
Throwable cause = e.getCause();
while (cause != null) {
if (cause instanceof Http2Exception) {
diff --git
a/dubbo-remoting/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/support/AbstractEtcdClient.java
b/dubbo-remoting/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/support/AbstractEtcdClient.java
index 5fecd14..bf639ab 100644
---
a/dubbo-remoting/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/support/AbstractEtcdClient.java
+++
b/dubbo-remoting/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/support/AbstractEtcdClient.java
@@ -68,26 +68,31 @@ public abstract class AbstractEtcdClient<WatcherListener>
implements EtcdClient
this.url = url;
}
+ @Override
public URL getUrl() {
return url;
}
+ @Override
public void create(String path) {
String fixedPath = fixNamespace(path);
createParentIfAbsent(fixedPath);
doCreatePersistent(fixedPath);
}
+ @Override
public long createEphemeral(String path) {
String fixedPath = fixNamespace(path);
createParentIfAbsent(fixedPath);
return doCreateEphemeral(path);
}
+ @Override
public void addStateListener(StateListener listener) {
stateListeners.add(listener);
}
+ @Override
public void removeStateListener(StateListener listener) {
stateListeners.remove(listener);
}
@@ -96,6 +101,7 @@ public abstract class AbstractEtcdClient<WatcherListener>
implements EtcdClient
return stateListeners;
}
+ @Override
public List<String> addChildListener(String path, final ChildListener
listener) {
ConcurrentMap<ChildListener, WatcherListener> listeners =
childListeners.get(path);
if (listeners == null) {
@@ -110,6 +116,7 @@ public abstract class AbstractEtcdClient<WatcherListener>
implements EtcdClient
return addChildWatcherListener(path, targetListener);
}
+ @Override
public WatcherListener getChildListener(String path, ChildListener
listener) {
ConcurrentMap<ChildListener, WatcherListener> listeners =
childListeners.get(path);
if (listeners == null) {
@@ -123,6 +130,7 @@ public abstract class AbstractEtcdClient<WatcherListener>
implements EtcdClient
return targetListener;
}
+ @Override
public void removeChildListener(String path, ChildListener listener) {
ConcurrentMap<ChildListener, WatcherListener> listeners =
childListeners.get(path);
if (listeners != null) {
@@ -163,6 +171,7 @@ public abstract class AbstractEtcdClient<WatcherListener>
implements EtcdClient
}
}
+ @Override
public void close() {
if (closed) {
return;
@@ -181,6 +190,7 @@ public abstract class AbstractEtcdClient<WatcherListener>
implements EtcdClient
public abstract long doCreateEphemeral(String path);
+ @Override
public abstract void delete(String path);
public abstract boolean checkExists(String path);
