You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by cr...@apache.org on 2019/04/26 09:50:19 UTC
[incubator-dubbo] branch master updated: fix typo in dubbo (#3937)
This is an automated email from the ASF dual-hosted git repository.
crazyhzm 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 efa8332 fix typo in dubbo (#3937)
efa8332 is described below
commit efa83324ddd86080422eeb91b907b121dd11a347
Author: myPrecious <Mo...@users.noreply.github.com>
AuthorDate: Fri Apr 26 17:50:11 2019 +0800
fix typo in dubbo (#3937)
---
.../loadbalance/LeastActiveLoadBalance.java | 4 +-
.../loadbalance/LeastActiveBalanceTest.java | 2 +-
.../support/FailfastClusterInvokerTest.java | 4 +-
.../extension/AdaptiveClassCodeGenerator.java | 4 +-
.../common/beanutil/JavaBeanSerializeUtilTest.java | 18 ++++----
.../apache/dubbo/config/AbstractConfigTest.java | 2 +-
.../registry/support/AbstractRegistryTest.java | 52 +++++++++++-----------
.../dubbo/remoting/transport/AbstractClient.java | 2 +-
.../remoting/etcd/support/AbstractEtcdClient.java | 6 +--
.../dubbo/rpc/protocol/AbstractProtocol.java | 2 +-
10 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/LeastActiveLoadBalance.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/LeastActiveLoadBalance.java
index 7841958..0706053 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/LeastActiveLoadBalance.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/LeastActiveLoadBalance.java
@@ -71,7 +71,7 @@ public class LeastActiveLoadBalance extends AbstractLoadBalance {
leastActive = active;
// Reset the number of least active invokers
leastCount = 1;
- // Put the first least active invoker first in leastIndexs
+ // Put the first least active invoker first in leastIndexes
leastIndexes[0] = i;
// Reset totalWeight
totalWeight = afterWarmup;
@@ -81,7 +81,7 @@ public class LeastActiveLoadBalance extends AbstractLoadBalance {
sameWeight = true;
// If current invoker's active value equals with leaseActive, then accumulating.
} else if (active == leastActive) {
- // Record the index of the least active invoker in leastIndexs order
+ // Record the index of the least active invoker in leastIndexes order
leastIndexes[leastCount++] = i;
// Accumulate the total weight of the least active invoker
totalWeight += afterWarmup;
diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/LeastActiveBalanceTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/LeastActiveBalanceTest.java
index 00b5c14..89dc66b 100644
--- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/LeastActiveBalanceTest.java
+++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/LeastActiveBalanceTest.java
@@ -35,7 +35,7 @@ public class LeastActiveBalanceTest extends LoadBalanceBaseTest {
Long count = entry.getValue().get();
// System.out.println(count);
Assertions.assertTrue(
- Math.abs(count - runs / (0f + invokers.size())) < runs / (0f + invokers.size()), "abs diff shoud < avg");
+ Math.abs(count - runs / (0f + invokers.size())) < runs / (0f + invokers.size()), "abs diff should < avg");
}
}
diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/FailfastClusterInvokerTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/FailfastClusterInvokerTest.java
index d8dd653..9b6d2e8 100644
--- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/FailfastClusterInvokerTest.java
+++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/FailfastClusterInvokerTest.java
@@ -80,7 +80,7 @@ public class FailfastClusterInvokerTest {
}
@Test
- public void testInvokeExceptoin() {
+ public void testInvokeException() {
Assertions.assertThrows(RpcException.class, () -> {
resetInvoker1ToException();
FailfastClusterInvoker<FailfastClusterInvokerTest> invoker = new FailfastClusterInvoker<FailfastClusterInvokerTest>(dic);
@@ -90,7 +90,7 @@ public class FailfastClusterInvokerTest {
}
@Test()
- public void testInvokeNoExceptoin() {
+ public void testInvokeNoException() {
resetInvoker1ToNoException();
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/extension/AdaptiveClassCodeGenerator.java b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/AdaptiveClassCodeGenerator.java
index fcce47f..50bf950 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/extension/AdaptiveClassCodeGenerator.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/AdaptiveClassCodeGenerator.java
@@ -224,7 +224,7 @@ public class AdaptiveClassCodeGenerator {
code.append(generateExtensionAssignment());
// return statement
- code.append(generateReturnAndInovation(method));
+ code.append(generateReturnAndInvocation(method));
}
return code.toString();
@@ -292,7 +292,7 @@ public class AdaptiveClassCodeGenerator {
/**
* generate method invocation statement and return it if necessary
*/
- private String generateReturnAndInovation(Method method) {
+ private String generateReturnAndInvocation(Method method) {
String returnStatement = method.getReturnType().equals(void.class) ? "" : "return ";
String args = Arrays.stream(method.getParameters()).map(Parameter::getName).collect(Collectors.joining(", "));
diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/beanutil/JavaBeanSerializeUtilTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/beanutil/JavaBeanSerializeUtilTest.java
index 5c72a14..4b3654a 100644
--- a/dubbo-common/src/test/java/org/apache/dubbo/common/beanutil/JavaBeanSerializeUtilTest.java
+++ b/dubbo-common/src/test/java/org/apache/dubbo/common/beanutil/JavaBeanSerializeUtilTest.java
@@ -441,20 +441,20 @@ public class JavaBeanSerializeUtilTest {
assertEqualsPrimitive(person.getInfoProfile().isMale(), infoProfile.getProperty("male"));
}
- static void assertEqualsPhone(Phone excpected, Object obj) {
+ static void assertEqualsPhone(Phone expected, Object obj) {
JavaBeanDescriptor descriptor = (JavaBeanDescriptor) obj;
Assertions.assertTrue(descriptor.isBeanType());
- if (excpected.getArea() != null) {
- assertEqualsPrimitive(excpected.getArea(), descriptor.getProperty("area"));
+ if (expected.getArea() != null) {
+ assertEqualsPrimitive(expected.getArea(), descriptor.getProperty("area"));
}
- if (excpected.getCountry() != null) {
- assertEqualsPrimitive(excpected.getCountry(), descriptor.getProperty("country"));
+ if (expected.getCountry() != null) {
+ assertEqualsPrimitive(expected.getCountry(), descriptor.getProperty("country"));
}
- if (excpected.getExtensionNumber() != null) {
- assertEqualsPrimitive(excpected.getExtensionNumber(), descriptor.getProperty("extensionNumber"));
+ if (expected.getExtensionNumber() != null) {
+ assertEqualsPrimitive(expected.getExtensionNumber(), descriptor.getProperty("extensionNumber"));
}
- if (excpected.getNumber() != null) {
- assertEqualsPrimitive(excpected.getNumber(), descriptor.getProperty("number"));
+ if (expected.getNumber() != null) {
+ assertEqualsPrimitive(expected.getNumber(), descriptor.getProperty("number"));
}
}
diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractConfigTest.java
index 2d40cc3..10cac65 100644
--- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractConfigTest.java
+++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractConfigTest.java
@@ -306,7 +306,7 @@ public class AbstractConfigTest {
System.setProperty("dubbo.override.address", "system://127.0.0.1:2181");
System.setProperty("dubbo.override.protocol", "system");
- // this will not override, use 'key' instread, @Parameter(key="key1", useKeyAsProperty=false)
+ // this will not override, use 'key' instead, @Parameter(key="key1", useKeyAsProperty=false)
System.setProperty("dubbo.override.key1", "system");
System.setProperty("dubbo.override.key2", "system");
diff --git a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/support/AbstractRegistryTest.java b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/support/AbstractRegistryTest.java
index 23364d0..8c959eb 100644
--- a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/support/AbstractRegistryTest.java
+++ b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/support/AbstractRegistryTest.java
@@ -312,20 +312,20 @@ public class AbstractRegistryTest {
@Test
public void testNotify() throws Exception {
final AtomicReference<Boolean> notified = new AtomicReference<Boolean>(false);
- NotifyListener listner1 = urls -> notified.set(Boolean.TRUE);
+ NotifyListener listener1 = urls -> notified.set(Boolean.TRUE);
URL url1 = new URL("dubbo", "192.168.0.1", 2200, parametersConsumer);
- abstractRegistry.subscribe(url1, listner1);
- NotifyListener listner2 = urls -> notified.set(Boolean.TRUE);
+ abstractRegistry.subscribe(url1, listener1);
+ NotifyListener listener2 = urls -> notified.set(Boolean.TRUE);
URL url2 = new URL("dubbo", "192.168.0.2", 2201, parametersConsumer);
- abstractRegistry.subscribe(url2, listner2);
- NotifyListener listner3 = urls -> notified.set(Boolean.TRUE);
+ abstractRegistry.subscribe(url2, listener2);
+ NotifyListener listener3 = urls -> notified.set(Boolean.TRUE);
URL url3 = new URL("dubbo", "192.168.0.3", 2202, parametersConsumer);
- abstractRegistry.subscribe(url3, listner3);
+ abstractRegistry.subscribe(url3, listener3);
List<URL> urls = new ArrayList<>();
urls.add(url1);
urls.add(url2);
urls.add(url3);
- abstractRegistry.notify(url1, listner1, urls);
+ abstractRegistry.notify(url1, listener1, urls);
Map<URL, Map<String, List<URL>>> map = abstractRegistry.getNotified();
MatcherAssert.assertThat(true, Matchers.equalTo(map.containsKey(url1)));
MatcherAssert.assertThat(false, Matchers.equalTo(map.containsKey(url2)));
@@ -338,15 +338,15 @@ public class AbstractRegistryTest {
@Test
public void testNotifyList() throws Exception {
final AtomicReference<Boolean> notified = new AtomicReference<Boolean>(false);
- NotifyListener listner1 = urls -> notified.set(Boolean.TRUE);
+ NotifyListener listener1 = urls -> notified.set(Boolean.TRUE);
URL url1 = new URL("dubbo", "192.168.0.1", 2200, parametersConsumer);
- abstractRegistry.subscribe(url1, listner1);
- NotifyListener listner2 = urls -> notified.set(Boolean.TRUE);
+ abstractRegistry.subscribe(url1, listener1);
+ NotifyListener listener2 = urls -> notified.set(Boolean.TRUE);
URL url2 = new URL("dubbo", "192.168.0.2", 2201, parametersConsumer);
- abstractRegistry.subscribe(url2, listner2);
- NotifyListener listner3 = urls -> notified.set(Boolean.TRUE);
+ abstractRegistry.subscribe(url2, listener2);
+ NotifyListener listener3 = urls -> notified.set(Boolean.TRUE);
URL url3 = new URL("dubbo", "192.168.0.3", 2202, parametersConsumer);
- abstractRegistry.subscribe(url3, listner3);
+ abstractRegistry.subscribe(url3, listener3);
List<URL> urls = new ArrayList<>();
urls.add(url1);
urls.add(url2);
@@ -362,20 +362,20 @@ public class AbstractRegistryTest {
public void testNotifyIfURLNull() throws Exception {
Assertions.assertThrows(IllegalArgumentException.class, () -> {
final AtomicReference<Boolean> notified = new AtomicReference<Boolean>(false);
- NotifyListener listner1 = urls -> notified.set(Boolean.TRUE);
+ NotifyListener listener1 = urls -> notified.set(Boolean.TRUE);
URL url1 = new URL("dubbo", "192.168.0.1", 2200, parametersConsumer);
- abstractRegistry.subscribe(url1, listner1);
- NotifyListener listner2 = urls -> notified.set(Boolean.TRUE);
+ abstractRegistry.subscribe(url1, listener1);
+ NotifyListener listener2 = urls -> notified.set(Boolean.TRUE);
URL url2 = new URL("dubbo", "192.168.0.2", 2201, parametersConsumer);
- abstractRegistry.subscribe(url2, listner2);
- NotifyListener listner3 = urls -> notified.set(Boolean.TRUE);
+ abstractRegistry.subscribe(url2, listener2);
+ NotifyListener listener3 = urls -> notified.set(Boolean.TRUE);
URL url3 = new URL("dubbo", "192.168.0.3", 2202, parametersConsumer);
- abstractRegistry.subscribe(url3, listner3);
+ abstractRegistry.subscribe(url3, listener3);
List<URL> urls = new ArrayList<>();
urls.add(url1);
urls.add(url2);
urls.add(url3);
- abstractRegistry.notify(null, listner1, urls);
+ abstractRegistry.notify(null, listener1, urls);
Assertions.fail("notify url == null");
});
}
@@ -384,15 +384,15 @@ public class AbstractRegistryTest {
public void testNotifyIfNotifyNull() {
Assertions.assertThrows(IllegalArgumentException.class, () -> {
final AtomicReference<Boolean> notified = new AtomicReference<Boolean>(false);
- NotifyListener listner1 = urls -> notified.set(Boolean.TRUE);
+ NotifyListener listener1 = urls -> notified.set(Boolean.TRUE);
URL url1 = new URL("dubbo", "192.168.0.1", 2200, parametersConsumer);
- abstractRegistry.subscribe(url1, listner1);
- NotifyListener listner2 = urls -> notified.set(Boolean.TRUE);
+ abstractRegistry.subscribe(url1, listener1);
+ NotifyListener listener2 = urls -> notified.set(Boolean.TRUE);
URL url2 = new URL("dubbo", "192.168.0.2", 2201, parametersConsumer);
- abstractRegistry.subscribe(url2, listner2);
- NotifyListener listner3 = urls -> notified.set(Boolean.TRUE);
+ abstractRegistry.subscribe(url2, listener2);
+ NotifyListener listener3 = urls -> notified.set(Boolean.TRUE);
URL url3 = new URL("dubbo", "192.168.0.3", 2202, parametersConsumer);
- abstractRegistry.subscribe(url3, listner3);
+ abstractRegistry.subscribe(url3, listener3);
List<URL> urls = new ArrayList<>();
urls.add(url1);
urls.add(url2);
diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/AbstractClient.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/AbstractClient.java
index 2afdc4d..dd02651 100644
--- a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/AbstractClient.java
+++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/AbstractClient.java
@@ -192,7 +192,7 @@ public abstract class AbstractClient extends AbstractEndpoint implements Client
} else {
if (logger.isInfoEnabled()) {
- logger.info("Successed connect to server " + getRemoteAddress() + " from " + getClass().getSimpleName() + " "
+ logger.info("Succeed connect to server " + getRemoteAddress() + " from " + getClass().getSimpleName() + " "
+ NetUtils.getLocalHost() + " using dubbo version " + Version.getVersion()
+ ", channel is " + this.getChannel());
}
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 bf639ab..0a6d26f 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
@@ -58,7 +58,7 @@ public abstract class AbstractEtcdClient<WatcherListener> implements EtcdClient
private final Set<StateListener> stateListeners = new ConcurrentHashSet<>();
private final ConcurrentMap<String, ConcurrentMap<ChildListener, WatcherListener>> childListeners = new ConcurrentHashMap<>();
- private final List<String> categroies = Arrays.asList(Constants.PROVIDERS_CATEGORY
+ private final List<String> categories = Arrays.asList(Constants.PROVIDERS_CATEGORY
, Constants.CONSUMERS_CATEGORY
, Constants.ROUTERS_CATEGORY
, Constants.CONFIGURATORS_CATEGORY);
@@ -158,11 +158,11 @@ public abstract class AbstractEtcdClient<WatcherListener> implements EtcdClient
int i = fixedPath.lastIndexOf('/');
if (i > 0) {
String parentPath = fixedPath.substring(0, i);
- if (categroies.stream().anyMatch(c -> fixedPath.endsWith(c))) {
+ if (categories.stream().anyMatch(c -> fixedPath.endsWith(c))) {
if (!checkExists(parentPath)) {
this.doCreatePersistent(parentPath);
}
- } else if (categroies.stream().anyMatch(c -> parentPath.endsWith(c))) {
+ } else if (categories.stream().anyMatch(c -> parentPath.endsWith(c))) {
String grandfather = parentPath.substring(0, parentPath.lastIndexOf('/'));
if (!checkExists(grandfather)) {
this.doCreatePersistent(grandfather);
diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/AbstractProtocol.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/AbstractProtocol.java
index 86ef44c..814e918 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/AbstractProtocol.java
+++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/AbstractProtocol.java
@@ -40,7 +40,7 @@ public abstract class AbstractProtocol implements Protocol {
protected final Map<String, Exporter<?>> exporterMap = new ConcurrentHashMap<String, Exporter<?>>();
- //TODO SOFEREFENCE
+ //TODO SoftReference
protected final Set<Invoker<?>> invokers = new ConcurrentHashSet<Invoker<?>>();
protected static String serviceKey(URL url) {