You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by je...@apache.org on 2018/09/03 08:53:12 UTC
[incubator-dubbo] branch master updated: Minor code refactoring
(#2428)
This is an automated email from the ASF dual-hosted git repository.
jerrick 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 7f926d9 Minor code refactoring (#2428)
7f926d9 is described below
commit 7f926d9991ba69dba25b56925e4cc5ffcdf50afa
Author: Huxing Zhang <hu...@gmail.com>
AuthorDate: Mon Sep 3 16:52:51 2018 +0800
Minor code refactoring (#2428)
* Polish. No functional change.
* Remove unnecessary null check.
* Use standard Integer.compareTo().
* Remove unecessary null check.
* Remove unnecessary unboxing.
* Code simplification.
* Remove unnecessary codes.
* Fix typo.
* Wrap the text.
* Fix typo.
* Make the variables private.
* Code simplification.
---
.../cluster/configurator/AbstractConfigurator.java | 5 ++---
.../cluster/support/AbstractClusterInvoker.java | 5 ++---
.../cluster/support/FailbackClusterInvoker.java | 5 ++---
.../cluster/support/FailfastClusterInvoker.java | 8 +++++++-
.../cluster/support/FailoverClusterInvoker.java | 4 ++--
.../rpc/cluster/support/ForkingClusterInvoker.java | 7 ++++---
.../cluster/support/ForkingClusterInvokerTest.java | 22 +++++++++-------------
.../org/apache/dubbo/config/ReferenceConfig.java | 8 +++-----
8 files changed, 31 insertions(+), 33 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 bf8ba2a..1fdaec4 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
@@ -47,8 +47,7 @@ public abstract class AbstractConfigurator implements Configurator {
@Override
public URL configure(URL url) {
- if (configuratorUrl == null || configuratorUrl.getHost() == null
- || url == null || url.getHost() == null) {
+ if (configuratorUrl.getHost() == null || url == null || url.getHost() == null) {
return url;
}
// If override url has port, means it is a provider address. We want to control a specific provider with this override url, it may take effect on the specific provider instance or on consumers holding this provider instance.
@@ -115,7 +114,7 @@ public abstract class AbstractConfigurator implements Configurator {
if (ipCompare == 0) {//host is the same, sort by priority
int i = getUrl().getParameter(Constants.PRIORITY_KEY, 0),
j = o.getUrl().getParameter(Constants.PRIORITY_KEY, 0);
- return i < j ? -1 : (i == j ? 0 : 1);
+ return Integer.compare(i, j);
} else {
return ipCompare;
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/AbstractClusterInvoker.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/AbstractClusterInvoker.java
index 090f286..51fe092 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/AbstractClusterInvoker.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/AbstractClusterInvoker.java
@@ -98,7 +98,7 @@ public abstract class AbstractClusterInvoker<T> implements Invoker<T> {
* a) Firstly, select an invoker using loadbalance. If this invoker is in previously selected list, or,
* if this invoker is unavailable, then continue step b (reselect), otherwise return the first selected invoker</br>
* <p>
- * b) Reslection, the validation rule for reselection: selected > available. This rule guarantees that
+ * b) Reselection, the validation rule for reselection: selected > available. This rule guarantees that
* the selected invoker has the minimum chance to be one in the previously selected list, and also
* guarantees this invoker is available.
*
@@ -268,8 +268,7 @@ public abstract class AbstractClusterInvoker<T> implements Invoker<T> {
LoadBalance loadbalance) throws RpcException;
protected List<Invoker<T>> list(Invocation invocation) throws RpcException {
- List<Invoker<T>> invokers = directory.list(invocation);
- return invokers;
+ return directory.list(invocation);
}
/**
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailbackClusterInvoker.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailbackClusterInvoker.java
index 55a4180..64d4b24 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailbackClusterInvoker.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailbackClusterInvoker.java
@@ -58,7 +58,7 @@ public class FailbackClusterInvoker<T> extends AbstractClusterInvoker<T> {
private final ScheduledExecutorService scheduledExecutorService = Executors.newScheduledThreadPool(2,
new NamedInternalThreadFactory("failback-cluster-timer", true));
- private final ConcurrentMap<Invocation, AbstractClusterInvoker<?>> failed = new ConcurrentHashMap<Invocation, AbstractClusterInvoker<?>>();
+ private final ConcurrentMap<Invocation, AbstractClusterInvoker<?>> failed = new ConcurrentHashMap<>();
private volatile ScheduledFuture<?> retryFuture;
public FailbackClusterInvoker(Directory<T> directory) {
@@ -91,8 +91,7 @@ public class FailbackClusterInvoker<T> extends AbstractClusterInvoker<T> {
if (failed.size() == 0) {
return;
}
- for (Map.Entry<Invocation, AbstractClusterInvoker<?>> entry : new HashMap<Invocation, AbstractClusterInvoker<?>>(
- failed).entrySet()) {
+ for (Map.Entry<Invocation, AbstractClusterInvoker<?>> entry : new HashMap<>(failed).entrySet()) {
Invocation invocation = entry.getKey();
Invoker<?> invoker = entry.getValue();
try {
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailfastClusterInvoker.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailfastClusterInvoker.java
index 4122e8c..a04bba0 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailfastClusterInvoker.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailfastClusterInvoker.java
@@ -50,7 +50,13 @@ public class FailfastClusterInvoker<T> extends AbstractClusterInvoker<T> {
if (e instanceof RpcException && ((RpcException) e).isBiz()) { // biz exception.
throw (RpcException) e;
}
- throw new RpcException(e instanceof RpcException ? ((RpcException) e).getCode() : 0, "Failfast invoke providers " + invoker.getUrl() + " " + loadbalance.getClass().getSimpleName() + " select from all providers " + invokers + " for service " + getInterface().getName() + " method " + invocation.getMethodName() + " on consumer " + NetUtils.getLocalHost() + " use dubbo version " + Version.getVersion() + ", but no luck to perform the invocation. Last error is: " + e.getMessage(), [...]
+ throw new RpcException(e instanceof RpcException ? ((RpcException) e).getCode() : 0,
+ "Failfast invoke providers " + invoker.getUrl() + " " + loadbalance.getClass().getSimpleName()
+ + " select from all providers " + invokers + " for service " + getInterface().getName()
+ + " method " + invocation.getMethodName() + " on consumer " + NetUtils.getLocalHost()
+ + " use dubbo version " + Version.getVersion()
+ + ", but no luck to perform the invocation. Last error is: " + e.getMessage(),
+ e.getCause() != null ? e.getCause() : e);
}
}
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailoverClusterInvoker.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailoverClusterInvoker.java
index b3aa310..25d4704 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailoverClusterInvoker.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailoverClusterInvoker.java
@@ -101,14 +101,14 @@ public class FailoverClusterInvoker<T> extends AbstractClusterInvoker<T> {
providers.add(invoker.getUrl().getAddress());
}
}
- throw new RpcException(le != null ? le.getCode() : 0, "Failed to invoke the method "
+ throw new RpcException(le.getCode(), "Failed to invoke the method "
+ methodName + " in the service " + getInterface().getName()
+ ". Tried " + len + " times of the providers " + providers
+ " (" + providers.size() + "/" + copyinvokers.size()
+ ") from the registry " + directory.getUrl().getAddress()
+ " on the consumer " + NetUtils.getLocalHost() + " using the dubbo version "
+ Version.getVersion() + ". Last error is: "
- + (le != null ? le.getMessage() : ""), le != null && le.getCause() != null ? le.getCause() : le);
+ + le.getMessage(), le.getCause() != null ? le.getCause() : le);
}
}
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/ForkingClusterInvoker.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/ForkingClusterInvoker.java
index 28b4471..184a7b6 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/ForkingClusterInvoker.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/ForkingClusterInvoker.java
@@ -64,18 +64,19 @@ public class ForkingClusterInvoker<T> extends AbstractClusterInvoker<T> {
if (forks <= 0 || forks >= invokers.size()) {
selected = invokers;
} else {
- selected = new ArrayList<Invoker<T>>();
+ selected = new ArrayList<>();
for (int i = 0; i < forks; i++) {
// TODO. Add some comment here, refer chinese version for more details.
Invoker<T> invoker = select(loadbalance, invocation, invokers, selected);
- if (!selected.contains(invoker)) {//Avoid add the same invoker several times.
+ if (!selected.contains(invoker)) {
+ //Avoid add the same invoker several times.
selected.add(invoker);
}
}
}
RpcContext.getContext().setInvokers((List) selected);
final AtomicInteger count = new AtomicInteger();
- final BlockingQueue<Object> ref = new LinkedBlockingQueue<Object>();
+ final BlockingQueue<Object> ref = new LinkedBlockingQueue<>();
for (final Invoker<T> invoker : selected) {
executor.execute(new Runnable() {
@Override
diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/ForkingClusterInvokerTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/ForkingClusterInvokerTest.java
index b39a7ba..5b44c83 100644
--- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/ForkingClusterInvokerTest.java
+++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/ForkingClusterInvokerTest.java
@@ -43,18 +43,14 @@ import static org.mockito.Mockito.mock;
@SuppressWarnings("unchecked")
public class ForkingClusterInvokerTest {
- List<Invoker<ForkingClusterInvokerTest>> invokers = new ArrayList<Invoker<ForkingClusterInvokerTest>>();
- URL url = URL.valueOf("test://test:11/test?forks=2");
- Invoker<ForkingClusterInvokerTest> invoker1 = mock(Invoker.class);
- Invoker<ForkingClusterInvokerTest> invoker2 = mock(Invoker.class);
- Invoker<ForkingClusterInvokerTest> invoker3 = mock(Invoker.class);
- RpcInvocation invocation = new RpcInvocation();
- Directory<ForkingClusterInvokerTest> dic;
- Result result = new RpcResult();
-
- /**
- * @throws java.lang.Exception
- */
+ private List<Invoker<ForkingClusterInvokerTest>> invokers = new ArrayList<Invoker<ForkingClusterInvokerTest>>();
+ private URL url = URL.valueOf("test://test:11/test?forks=2");
+ private Invoker<ForkingClusterInvokerTest> invoker1 = mock(Invoker.class);
+ private Invoker<ForkingClusterInvokerTest> invoker2 = mock(Invoker.class);
+ private Invoker<ForkingClusterInvokerTest> invoker3 = mock(Invoker.class);
+ private RpcInvocation invocation = new RpcInvocation();
+ private Directory<ForkingClusterInvokerTest> dic;
+ private Result result = new RpcResult();
@Before
public void setUp() throws Exception {
@@ -139,7 +135,7 @@ public class ForkingClusterInvokerTest {
invoker.invoke(invocation);
Assert.fail();
} catch (RpcException expected) {
- Assert.assertTrue("Successed to forking invoke provider !", expected.getMessage().contains("Failed to forking invoke provider"));
+ Assert.assertTrue("Succeeded to forking invoke provider !", expected.getMessage().contains("Failed to forking invoke provider"));
assertFalse(expected.getCause() instanceof RpcException);
}
Map<String, String> afterInvoke = RpcContext.getContext().getAttachments();
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
index 7901c78..1a82c6a 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
@@ -345,14 +345,12 @@ public class ReferenceConfig<T> extends AbstractReferenceConfig {
if (isInjvm() == null) {
if (url != null && url.length() > 0) { // if a url is specified, don't do local reference
isJvmRefer = false;
- } else if (InjvmProtocol.getInjvmProtocol().isInjvmRefer(tmpUrl)) {
- // by default, reference local service if there is
- isJvmRefer = true;
} else {
- isJvmRefer = false;
+ // by default, reference local service if there is
+ isJvmRefer = InjvmProtocol.getInjvmProtocol().isInjvmRefer(tmpUrl);
}
} else {
- isJvmRefer = isInjvm().booleanValue();
+ isJvmRefer = isInjvm();
}
if (isJvmRefer) {