[dubbo] branch master updated: remove unnecessary space (#5890)

2020-03-19 Thread kexianjun 
This is an automated email from the ASF dual-hosted git repository.

kexianjun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/master by this push:
 new 84bc261  remove unnecessary space (#5890)
84bc261 is described below

commit 84bc2616a5c6be6542ab5bb564c51f876d24bdb1
Author: kexianjun 
AuthorDate: Thu Mar 19 21:46:00 2020 +0800

remove unnecessary space (#5890)
---
 .../main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
 
b/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
index 46eca04..82b5636 100644
--- 
a/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
+++ 
b/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
@@ -249,8 +249,8 @@ public abstract class AbstractInterfaceConfig extends 
AbstractMethodConfig {
 
 public void verifyStubAndLocal(String className, String label, Class 
interfaceClass){
if (ConfigUtils.isNotEmpty(className)) {
-Class localClass = ConfigUtils.isDefault(className) ?
-ReflectUtils.forName(interfaceClass.getName() + label) 
:   ReflectUtils.forName(className);
+Class localClass = ConfigUtils.isDefault(className) ?
+ReflectUtils.forName(interfaceClass.getName() + label) : 
ReflectUtils.forName(className);
 verify(interfaceClass, localClass);
 }
 }

[dubbo-admin] branch develop updated: fix-523 (#524)

2019-10-10 Thread kexianjun 
This is an automated email from the ASF dual-hosted git repository.

kexianjun pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/dubbo-admin.git


The following commit(s) were added to refs/heads/develop by this push:
 new b976ba2  fix-523 (#524)
b976ba2 is described below

commit b976ba23bc4fd878b3bd340a64caf09b64bcb046
Author: kexianjun 
AuthorDate: Fri Oct 11 09:36:42 2019 +0800

fix-523 (#524)
---
 dubbo-admin-ui/src/components/test/TestMethod.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dubbo-admin-ui/src/components/test/TestMethod.vue 
b/dubbo-admin-ui/src/components/test/TestMethod.vue
index 2881dd2..8f6efa7 100644
--- a/dubbo-admin-ui/src/components/test/TestMethod.vue
+++ b/dubbo-admin-ui/src/components/test/TestMethod.vue
@@ -58,7 +58,7 @@
 name: 'TestMethod',
 components: {
   JsonEditor,
-  Breadcrumb,
+  Breadcrumb
 },
 data () {
   return {

[dubbo-website] branch master updated: 中文语法错误 (#491)

2019-10-08 Thread kexianjun 
This is an automated email from the ASF dual-hosted git repository.

kexianjun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-website.git


The following commit(s) were added to refs/heads/master by this push:
 new 1b2a533  中文语法错误 (#491)
1b2a533 is described below

commit 1b2a533395846b22596db1779f2fff0f42bd8804
Author: zhenxianyimeng <1920405...@qq.com>
AuthorDate: Wed Oct 9 08:59:23 2019 +0800

中文语法错误 (#491)
---
 blog/zh-cn/first-dubbo-filter.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blog/zh-cn/first-dubbo-filter.md b/blog/zh-cn/first-dubbo-filter.md
index 9f0830f..8667eb1 100644
--- a/blog/zh-cn/first-dubbo-filter.md
+++ b/blog/zh-cn/first-dubbo-filter.md
@@ -4,7 +4,7 @@
 
在Dubbo的整体设计中，Filter是一个很重要的概念，包括Dubbo本身的大多数功能，都是基于此扩展点实现的，在每次的调用过程中，Filter的拦截都会被执行。
 
  Dubbo Filter的加载机制
-Dubbo中已经实现的Filter大概有二十几个，它们的入口都是ProtocolFilterWrapper，ProtocolFilterWrapper对Protocol做了Wrapper，会在加载扩展的时候被加载进来，下面我们来看下然后我们看一下这个Filter链是如何构造的。
+Dubbo中已经实现的Filter大概有二十几个，它们的入口都是ProtocolFilterWrapper，ProtocolFilterWrapper对Protocol做了Wrapper，会在加载扩展的时候被加载进来，下面我们来看下这个Filter链是如何构造的。
 
 ```java
 //ProtocolFilterWrapper.java

[dubbo-website] branch master updated: Fix typo (#445)

2019-08-12 Thread kexianjun 
This is an automated email from the ASF dual-hosted git repository.

kexianjun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-website.git


The following commit(s) were added to refs/heads/master by this push:
 new aecd573  Fix typo (#445)
aecd573 is described below

commit aecd573c3e020d5a4377f1ae4ca7b2bbe09bf08f
Author: Like 
AuthorDate: Tue Aug 13 09:16:59 2019 +0800

Fix typo (#445)

LGTM
---
 docs/en-us/dev/SPI.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en-us/dev/SPI.md b/docs/en-us/dev/SPI.md
index 0213237..4581c88 100644
--- a/docs/en-us/dev/SPI.md
+++ b/docs/en-us/dev/SPI.md
@@ -18,7 +18,7 @@ In the jar file containing extension class [^1], places a 
config file `META-INF/
 
 ### Example:
 
-To extend Dubbo Protocol, placee a text file in the extension jar file: 
`META-INF/dubbo/org.apache.dubbo.rpc.Protocol`, content:
+To extend Dubbo Protocol, place a text file in the extension jar file: 
`META-INF/dubbo/org.apache.dubbo.rpc.Protocol`, content:
 
 ```properties
 xxx=com.alibaba.xxx.XxxProtocol

[dubbo] branch master updated: [dubbo-4712] add Thread ContextClassLoader (#4767)

2019-08-09 Thread kexianjun 
This is an automated email from the ASF dual-hosted git repository.

kexianjun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/master by this push:
 new 165d975   [dubbo-4712] add Thread ContextClassLoader (#4767)
165d975 is described below

commit 165d975dec620516768832e883b99bd3ce87d17a
Author: windWheel <1817802...@qq.com>
AuthorDate: Sat Aug 10 13:19:11 2019 +0800

 [dubbo-4712] add Thread ContextClassLoader (#4767)


fix #4712
---
 .../org/apache/dubbo/metadata/integration/MetadataReportService.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/integration/MetadataReportService.java
 
b/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/integration/MetadataReportService.java
index 06d39b6..5ceb5c5 100644
--- 
a/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/integration/MetadataReportService.java
+++ 
b/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/integration/MetadataReportService.java
@@ -94,7 +94,8 @@ public class MetadataReportService {
 try {
 String interfaceName = providerUrl.getParameter(INTERFACE_KEY);
 if (StringUtils.isNotEmpty(interfaceName)) {
-Class interfaceClass = Class.forName(interfaceName);
+ClassLoader classLoader = null == 
Thread.currentThread().getContextClassLoader() ? 
this.getClass().getClassLoader() : 
Thread.currentThread().getContextClassLoader();
+Class interfaceClass = Class.forName(interfaceName, true, 
classLoader);
 FullServiceDefinition fullServiceDefinition = 
ServiceDefinitionBuilder.buildFullDefinition(interfaceClass, 
providerUrl.getParameters());
 metadataReport.storeProviderMetadata(new 
MetadataIdentifier(providerUrl.getServiceInterface(),
 providerUrl.getParameter(VERSION_KEY), 
providerUrl.getParameter(GROUP_KEY),

[dubbo-website] branch master updated: fix typos and make some changes on readme (#404)

2019-06-16 Thread kexianjun 
This is an automated email from the ASF dual-hosted git repository.

kexianjun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-website.git


The following commit(s) were added to refs/heads/master by this push:
 new bb39ed8  fix typos and make some changes on readme (#404)
bb39ed8 is described below

commit bb39ed8fe318a4495931a7ef4297ef63af317b0c
Author: Xiaojie Li 
AuthorDate: Sun Jun 16 17:00:26 2019 +0800

fix typos and make some changes on readme (#404)
---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 0538aad..375b684 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Dubbo Official WebSite
+# Dubbo Official Website
 
 This project keeps all sources used for building up dubbo official website 
which's served at http://dubbo.io or http://dubbo.apache.org.
 
@@ -24,7 +24,7 @@ If you have higher version of node installed, you may 
consider `nvm` to allow di
 3. Run `nvm use v8.16.0` to switch the working environment to node v8
 4. Run `npm install docsite -g`
 
-then you are all set to run and build the website. Follow the build 
instruction above for the details.
+Then you are all set to run and build the website. Follow the build 
instruction above for the details.
 
 ## How to send a PR
 
@@ -32,7 +32,7 @@ then you are all set to run and build the website. Follow the 
build instruction
 2. Just push your changed files, such as:
 * `*.md`
* blog.js or docs.js or site.js
-3. Send a PR to asf-site branch.
+3. Send a PR to **master** branch.
 
 ## SEO

[dubbo] branch master updated: fix org.apache.dubbo.common.URL#toMap change password key, from USERNAME_KEY to PASSWORD_KEY (#4267)

2019-06-07 Thread kexianjun 
This is an automated email from the ASF dual-hosted git repository.

kexianjun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/master by this push:
 new 3acf5b8  fix org.apache.dubbo.common.URL#toMap change password key, 
from USERNAME_KEY to PASSWORD_KEY (#4267)
3acf5b8 is described below

commit 3acf5b8af129f58b31bcdae876ce4c73f520e161
Author: zhangjianwei 
AuthorDate: Sat Jun 8 09:36:40 2019 +0800

fix org.apache.dubbo.common.URL#toMap change password key, from 
USERNAME_KEY to PASSWORD_KEY (#4267)

LGTM
---
 dubbo-common/src/main/java/org/apache/dubbo/common/URL.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/URL.java 
b/dubbo-common/src/main/java/org/apache/dubbo/common/URL.java
index 106bebc..2935387 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/URL.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/URL.java
@@ -1168,7 +1168,7 @@ class URL implements Serializable {
 map.put(USERNAME_KEY, username);
 }
 if (password != null) {
-map.put(USERNAME_KEY, password);
+map.put(PASSWORD_KEY, password);
 }
 if (host != null) {
 map.put(HOST_KEY, host);

[dubbo-website] branch asf-site updated: fix wrong word (#396)

2019-06-03 Thread kexianjun 
This is an automated email from the ASF dual-hosted git repository.

kexianjun pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/dubbo-website.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new ae41535  fix wrong word (#396)
ae41535 is described below

commit ae415353bd8163336a45a5f87ac39aacbaef9161
Author: aworker 
AuthorDate: Tue Jun 4 09:09:00 2019 +0800

fix wrong word (#396)

LGTM, and thanks for your contribution
---
 docs/zh-cn/user/references/metadata/introduction.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/zh-cn/user/references/metadata/introduction.md 
b/docs/zh-cn/user/references/metadata/introduction.md
index 2835006..c2fe6f9 100644
--- a/docs/zh-cn/user/references/metadata/introduction.md
+++ b/docs/zh-cn/user/references/metadata/introduction.md
@@ -11,7 +11,7 @@ dubbo consumer中的配置项也有[20+个配置项](http://dubbo.apache.org/en-
 
需要将注册中心原来的数据信息和元数据信息保存到独立的key-value的存储中，这个key-value可以是DB，redis或者其他持久化存储。核心代码中支持了zookeeper，redis(推荐)的默认支持。
 
 
provider存储内容的格式，参见：org.apache.dubbo.metadata.definition.model.FullServiceDefinition。是该类型gson化之后的存储。
-Consumer存储内容，为Map格式。从Consumer端注册到注册中心的URL中的获取参数信息。即通过URL.getParameterMap()获取到的Map，进行gson话之后进行存储。
+Consumer存储内容，为Map格式。从Consumer端注册到注册中心的URL中的获取参数信息。即通过URL.getParameterMap()获取到的Map，进行gson化之后进行存储。
 
 详细的内容，可以参考下面的sample输出。

[dubbo] branch master updated: change logger name (#4150)

2019-05-26 Thread kexianjun 
This is an automated email from the ASF dual-hosted git repository.

kexianjun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/master by this push:
 new 9168543  change logger name (#4150)
9168543 is described below

commit 9168543d855f287720fcd257f68ee0acccb95170
Author: wavesZh <30332053+wave...@users.noreply.github.com>
AuthorDate: Sun May 26 20:29:31 2019 +0800

change logger name (#4150)
---
 .../org/apache/dubbo/remoting/transport/netty4/NettyClientHandler.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyClientHandler.java
 
b/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyClientHandler.java
index c707708..8827a0b 100644
--- 
a/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyClientHandler.java
+++ 
b/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyClientHandler.java
@@ -35,7 +35,7 @@ import io.netty.handler.timeout.IdleStateEvent;
  */
 @io.netty.channel.ChannelHandler.Sharable
 public class NettyClientHandler extends ChannelDuplexHandler {
-private static final Logger logger = 
LoggerFactory.getLogger(NettyClient.class);
+private static final Logger logger = 
LoggerFactory.getLogger(NettyClientHandler.class);
 
 private final URL url;

[incubator-dubbo-website] branch asf-site updated: Fix typo in stickiness.md (#361)

2019-04-28 Thread kexianjun 
This is an automated email from the ASF dual-hosted git repository.

kexianjun pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new 956be97  Fix typo in stickiness.md (#361)
956be97 is described below

commit 956be974b7efccab2fd4f6dc86b21f0503e6b8bc
Author: Yuhao Bi 
AuthorDate: Mon Apr 29 08:49:44 2019 +0800

Fix typo in stickiness.md (#361)
---
 docs/zh-cn/user/demos/stickiness.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/zh-cn/user/demos/stickiness.md 
b/docs/zh-cn/user/demos/stickiness.md
index 9eef8f2..300a965 100644
--- a/docs/zh-cn/user/demos/stickiness.md
+++ b/docs/zh-cn/user/demos/stickiness.md
@@ -8,7 +8,7 @@
 
 ```
 
-Dubbo 支持方法级别的粘滞连接，如果你想进行更细力度的控制，还可以这样配置。
+Dubbo 支持方法级别的粘滞连接，如果你想进行更细粒度的控制，还可以这样配置。
 
 ```xml

[incubator-dubbo-website] branch asf-site updated: correct description about install (#359)

2019-04-23 Thread kexianjun 
This is an automated email from the ASF dual-hosted git repository.

kexianjun pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new dc96723  correct description about install (#359)
dc96723 is described below

commit dc96723546e1752b8a64e46484d4e103306c0342
Author: Jlcao 
AuthorDate: Tue Apr 23 17:52:15 2019 +0800

correct description about install (#359)
---
 docs/en-us/admin/introduction.md | 2 +-
 docs/zh-cn/admin/introduction.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en-us/admin/introduction.md b/docs/en-us/admin/introduction.md
index 52fe844..ac73e34 100644
--- a/docs/en-us/admin/introduction.md
+++ b/docs/en-us/admin/introduction.md
@@ -8,7 +8,7 @@ Now version 0.1 has been released, frontend uses Vue and 
Vuetify as javascript f
 git clone https://github.com/apache/incubator-dubbo-admin.git
 cd incubator-dubbo-admin
 mvn clean package
-cd dubbo-distribution/target
+cd dubbo-admin-distribution/target
 java -jar dubbo-admin-0.1.jar
 ```
 * visit  
diff --git a/docs/zh-cn/admin/introduction.md b/docs/zh-cn/admin/introduction.md
index 5652508..9580714 100644
--- a/docs/zh-cn/admin/introduction.md
+++ b/docs/zh-cn/admin/introduction.md
@@ -8,7 +8,7 @@
 git clone https://github.com/apache/incubator-dubbo-admin.git
 cd incubator-dubbo-admin
 mvn clean package
-cd dubbo-distribution/target
+cd dubbo-admin-distribution/target
 java -jar dubbo-admin-0.1.jar
 ```
 * 访问

[incubator-dubbo] branch master updated: Fix typo (#3839)

2019-04-09 Thread kexianjun 
This is an automated email from the ASF dual-hosted git repository.

kexianjun 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 2d2be07  Fix typo (#3839)
2d2be07 is described below

commit 2d2be07a711a4f96b6e45e464886b276b3c49556
Author: www 
AuthorDate: Tue Apr 9 23:31:43 2019 +0800

Fix typo (#3839)
---
 dubbo-common/src/main/java/org/apache/dubbo/common/extension/SPI.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/dubbo-common/src/main/java/org/apache/dubbo/common/extension/SPI.java 
b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/SPI.java
index 21eec72..94e6a96 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/extension/SPI.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/SPI.java
@@ -27,7 +27,7 @@ import java.lang.annotation.Target;
  * Marker for extension interface
  * 
  * Changes on extension configuration file 
- * Use Protocol as an example, its configuration file 
'META-INF/dubbo/com.xxx.Protocol' is changes from: 
+ * Use Protocol as an example, its configuration file 
'META-INF/dubbo/com.xxx.Protocol' is changed from: 
  * 
  * com.foo.XxxProtocol
  * com.foo.YyyProtocol

[incubator-dubbo] branch 2.6.x updated: fix fastjson serialize type (#3767)

2019-03-29 Thread kexianjun 
This is an automated email from the ASF dual-hosted git repository.

kexianjun pushed a commit to branch 2.6.x
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git


The following commit(s) were added to refs/heads/2.6.x by this push:
 new 5672e52  fix fastjson serialize type (#3767)
5672e52 is described below

commit 5672e52b125df72a45569b637aa4a14547c65391
Author: cyejing 
AuthorDate: Fri Mar 29 14:37:45 2019 +0800

fix fastjson serialize type (#3767)
---
 .../serialize/fastjson/FastJsonObjectInput.java|  5 +-
 .../fastjson/FastJsonObjectInputTest.java  | 61 +++---
 .../serialize/fastjson/model/Organization.java | 30 +++
 3 files changed, 85 insertions(+), 11 deletions(-)

diff --git 
a/dubbo-serialization/dubbo-serialization-fastjson/src/main/java/com/alibaba/dubbo/common/serialize/fastjson/FastJsonObjectInput.java
 
b/dubbo-serialization/dubbo-serialization-fastjson/src/main/java/com/alibaba/dubbo/common/serialize/fastjson/FastJsonObjectInput.java
index 3ef50ce..efe45d7 100644
--- 
a/dubbo-serialization/dubbo-serialization-fastjson/src/main/java/com/alibaba/dubbo/common/serialize/fastjson/FastJsonObjectInput.java
+++ 
b/dubbo-serialization/dubbo-serialization-fastjson/src/main/java/com/alibaba/dubbo/common/serialize/fastjson/FastJsonObjectInput.java
@@ -17,7 +17,6 @@
 package com.alibaba.dubbo.common.serialize.fastjson;
 
 import com.alibaba.dubbo.common.serialize.ObjectInput;
-import com.alibaba.dubbo.common.utils.PojoUtils;
 import com.alibaba.fastjson.JSON;
 
 import java.io.BufferedReader;
@@ -99,8 +98,8 @@ public class FastJsonObjectInput implements ObjectInput {
 @Override
 @SuppressWarnings("unchecked")
 public  T readObject(Class cls, Type type) throws IOException, 
ClassNotFoundException {
-Object value = readObject(cls);
-return (T) PojoUtils.realize(value, cls, type);
+String json = readLine();
+return (T) JSON.parseObject(json, type);
 }
 
 private String readLine() throws IOException, EOFException {
diff --git 
a/dubbo-serialization/dubbo-serialization-fastjson/src/test/java/com/alibaba/dubbo/common/serialize/fastjson/FastJsonObjectInputTest.java
 
b/dubbo-serialization/dubbo-serialization-fastjson/src/test/java/com/alibaba/dubbo/common/serialize/fastjson/FastJsonObjectInputTest.java
index 06e6bc6..95e7417 100644
--- 
a/dubbo-serialization/dubbo-serialization-fastjson/src/test/java/com/alibaba/dubbo/common/serialize/fastjson/FastJsonObjectInputTest.java
+++ 
b/dubbo-serialization/dubbo-serialization-fastjson/src/test/java/com/alibaba/dubbo/common/serialize/fastjson/FastJsonObjectInputTest.java
@@ -16,19 +16,25 @@
  */
 package com.alibaba.dubbo.common.serialize.fastjson;
 
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+import com.alibaba.dubbo.common.serialize.fastjson.model.Organization;
 import com.alibaba.dubbo.common.serialize.fastjson.model.Person;
 import com.alibaba.fastjson.JSONObject;
-import org.junit.Test;
-
 import java.io.ByteArrayInputStream;
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.StringReader;
-
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
+import java.lang.reflect.Method;
+import java.lang.reflect.Type;
+import java.util.List;
+import javax.lang.model.util.Types;
+import org.junit.Test;
 
 public class FastJsonObjectInputTest {
 private FastJsonObjectInput fastJsonObjectInput;
@@ -144,4 +150,43 @@ public class FastJsonObjectInputTest {
 assertThat(readObject.getString("name"), is("John"));
 assertThat(readObject.getInteger("age"), is(30));
 }
-}
\ No newline at end of file
+
+@Test
+public void testReadObjectWithTowType() throws Exception {
+fastJsonObjectInput = new FastJsonObjectInput(new 
StringReader("[{\"name\":\"John\",\"age\":30},{\"name\":\"Born\",\"age\":24}]"));
+
+Method methodReturnType = getClass().getMethod("towLayer");
+Type type = methodReturnType.getGenericReturnType();
+List o = fastJsonObjectInput.readObject(List.class, type);
+
+assertTrue(o instanceof List);
+assertTrue(o.get(0) instanceof Person);
+
+assertThat(o.size(), is(2));
+assertThat(o.get(1).getName(), is("Born"));
+}
+
+@Test
+public void testReadObjectWithThreeType() throws Exception {
+fastJsonObjectInput = new FastJsonObjectInput(new 
StringReader("{\"data\":[{\"name\":\"John\",\"age\&quo

[incubator-dubbo] branch master updated: Create constants for 'hash.names' and 'hash.arguments' (#3744) (#3758)

2019-03-27 Thread kexianjun 
This is an automated email from the ASF dual-hosted git repository.

kexianjun 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 fca31c4  Create constants for 'hash.names' and 'hash.arguments' 
(#3744) (#3758)
fca31c4 is described below

commit fca31c45f47da0dbc1cf0a85ad5d87b2384a5c36
Author: Daniela Marques de Morais 
AuthorDate: Wed Mar 27 22:22:20 2019 -0300

Create constants for 'hash.names' and 'hash.arguments' (#3744) (#3758)
---
 .../rpc/cluster/loadbalance/ConsistentHashLoadBalance.java |  7 +--
 .../src/main/java/org/apache/dubbo/common/Constants.java   | 10 ++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git 
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/ConsistentHashLoadBalance.java
 
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/ConsistentHashLoadBalance.java
index 83d6f8c..03c0dc9 100644
--- 
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/ConsistentHashLoadBalance.java
+++ 
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/ConsistentHashLoadBalance.java
@@ -31,6 +31,9 @@ import java.util.TreeMap;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
+import static org.apache.dubbo.common.Constants.HASH_ARGUMENTS;
+import static org.apache.dubbo.common.Constants.HASH_NODES;
+
 /**
  * ConsistentHashLoadBalance
  */
@@ -67,8 +70,8 @@ public class ConsistentHashLoadBalance extends 
AbstractLoadBalance {
 this.virtualInvokers = new TreeMap>();
 this.identityHashCode = identityHashCode;
 URL url = invokers.get(0).getUrl();
-this.replicaNumber = url.getMethodParameter(methodName, 
"hash.nodes", 160);
-String[] index = 
Constants.COMMA_SPLIT_PATTERN.split(url.getMethodParameter(methodName, 
"hash.arguments", "0"));
+this.replicaNumber = url.getMethodParameter(methodName, 
HASH_NODES, 160);
+String[] index = 
Constants.COMMA_SPLIT_PATTERN.split(url.getMethodParameter(methodName, 
HASH_ARGUMENTS, "0"));
 argumentIndex = new int[index.length];
 for (int i = 0; i < index.length; i++) {
 argumentIndex[i] = Integer.parseInt(index[i]);
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/Constants.java 
b/dubbo-common/src/main/java/org/apache/dubbo/common/Constants.java
index 28bc2e0..3f48821 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/Constants.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/Constants.java
@@ -793,6 +793,16 @@ public class Constants {
 public static final String TELNET = "telnet";
 
 /**
+ * Hash nodes name
+ */
+public static final String HASH_NODES = "hash.nodes";
+
+/**
+ * Hash arguments name
+ */
+public static final String HASH_ARGUMENTS = "hash.arguments";
+
+/**
  * Application name;
  */
 public static final String NAME = "name";

[incubator-dubbo-admin] branch develop updated: Fix bug when testing no-arg method. resolve #347 (#348)

2019-03-27 Thread kexianjun 
This is an automated email from the ASF dual-hosted git repository.

kexianjun pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-admin.git


The following commit(s) were added to refs/heads/develop by this push:
 new 74a9c57  Fix bug when testing no-arg method. resolve #347 (#348)
74a9c57 is described below

commit 74a9c5726469dd3a253be16109cd2ddb3a58a982
Author: kezhenxu94 
AuthorDate: Wed Mar 27 14:45:42 2019 +0800

Fix bug when testing no-arg method. resolve #347 (#348)

LGTM
---
 dubbo-admin-ui/src/components/test/TestMethod.vue | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dubbo-admin-ui/src/components/test/TestMethod.vue 
b/dubbo-admin-ui/src/components/test/TestMethod.vue
index b307ecb..c5da6aa 100644
--- a/dubbo-admin-ui/src/components/test/TestMethod.vue
+++ b/dubbo-admin-ui/src/components/test/TestMethod.vue
@@ -128,7 +128,11 @@
   if (method) {
 const [methodName, parametersTypes] = method.split('~')
 this.method.name = methodName
-this.method.parameterTypes = parametersTypes.split(';')
+if (parametersTypes) {
+  this.method.parameterTypes = parametersTypes.split(';')
+} else { // if parametersTypes === "",  "".split(";") will produce 
[""], which is wrong
+  this.method.parameterTypes = []
+}
   }
 
   let url = '/test/method?' + 'application=' + this.application +

[incubator-dubbo] branch master updated: Fixes #3625 (#3730)

2019-03-25 Thread kexianjun 
This is an automated email from the ASF dual-hosted git repository.

kexianjun 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 ad72159  Fixes #3625 (#3730)
ad72159 is described below

commit ad72159b0e3ff641e3a08754297c81278b94d94e
Author: John-Smile 
AuthorDate: Tue Mar 26 09:09:11 2019 +0800

Fixes #3625 (#3730)

use constant to replace magic number
---
 .../apache/dubbo/configcenter/support/zookeeper/CacheListener.java| 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/zookeeper/CacheListener.java
 
b/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/zookeeper/CacheListener.java
index 4f6c638..3eaa96b 100644
--- 
a/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/zookeeper/CacheListener.java
+++ 
b/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/zookeeper/CacheListener.java
@@ -35,6 +35,8 @@ import java.util.concurrent.CountDownLatch;
  */
 
 public class CacheListener implements DataListener {
+private static final int MIN_PATH_DEPTH = 5;
+
 private Map> keyListeners = new 
ConcurrentHashMap<>();
 private CountDownLatch initializedLatch;
 private String rootPath;
@@ -89,7 +91,7 @@ public class CacheListener implements DataListener {
 // TODO We limit the notification of config changes to a specific path 
level, for example
 //  /dubbo/config/service/configurators, other config changes not in 
this level will not get notified,
 //  say /dubbo/config/dubbo.properties
-if (path.split("/").length >= 5) {
+if (path.split("/").length >= MIN_PATH_DEPTH) {
 String key = pathToKey(path);
 ConfigChangeType changeType;
 switch (eventType) {

[incubator-dubbo-website] branch asf-site updated: Fix something error with local stub introduction (#343)

2019-03-25 Thread kexianjun 
This is an automated email from the ASF dual-hosted git repository.

kexianjun pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new 6006c6e   Fix something error with local stub introduction (#343)
6006c6e is described below

commit 6006c6e42c565a3784d7dce7abbf5d41271c1a0b
Author: Jlcao 
AuthorDate: Mon Mar 25 15:35:35 2019 +0800

 Fix something error with local stub introduction (#343)
---
 docs/en-us/user/demos/local-stub.md | 2 +-
 docs/zh-cn/user/demos/local-stub.md | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/en-us/user/demos/local-stub.md 
b/docs/en-us/user/demos/local-stub.md
index 4abdedb..cd6a7c3 100644
--- a/docs/en-us/user/demos/local-stub.md
+++ b/docs/en-us/user/demos/local-stub.md
@@ -27,7 +27,7 @@ public class BarServiceStub implements BarService {
 private final BarService barService;
 
 // The real remote proxy object is passed in through the constructor
-public (BarService barService) {
+public BarServiceStub(BarService barService){
 this.barService = barService;
 }
 
diff --git a/docs/zh-cn/user/demos/local-stub.md 
b/docs/zh-cn/user/demos/local-stub.md
index 3b5c702..0244f5a 100644
--- a/docs/zh-cn/user/demos/local-stub.md
+++ b/docs/zh-cn/user/demos/local-stub.md
@@ -20,11 +20,11 @@
 
 ```java
 package com.foo;
-public class BarServiceStub implements BarService { 
+public class BarServiceStub implements BarService {
 private final BarService barService;
 
 // 构造函数传入真正的远程代理对象
-public (BarService barService) {
+public BarServiceStub(BarService barService){
 this.barService = barService;
 }

[incubator-dubbo-website] branch asf-site updated: Fix spelling mistakes (#341)

2019-03-24 Thread kexianjun 
This is an automated email from the ASF dual-hosted git repository.

kexianjun pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new f3df88f  Fix spelling mistakes (#341)
f3df88f is described below

commit f3df88f13831c8c3307d3f7ed3fe693ff2bbfd60
Author: Jlcao 
AuthorDate: Mon Mar 25 12:27:18 2019 +0800

Fix spelling mistakes (#341)

Fix spelling mistakes.
---
 docs/zh-cn/user/configuration/configuration-load-process.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/zh-cn/user/configuration/configuration-load-process.md 
b/docs/zh-cn/user/configuration/configuration-load-process.md
index 70645e6..dbdb278 100644
--- a/docs/zh-cn/user/configuration/configuration-load-process.md
+++ b/docs/zh-cn/user/configuration/configuration-load-process.md
@@ -54,7 +54,7 @@ dubbo.protocol.port=-1
 
 ```properties
 dubbo.service.org.apache.dubbo.samples.api.DemoService.timeout=5000
-dubbo.reference.org.apache.dubbo.samples.api.DemoService.tineout=6000
+dubbo.reference.org.apache.dubbo.samples.api.DemoService.timeout=6000
 dubbo.reference.org.apache.dubbo.samples.api.DemoService.sayHello.timeout=7000
 ```

[incubator-dubbo] branch master updated (affc976 -> b2bfbc7)

2019-03-16 Thread kexianjun 
This is an automated email from the ASF dual-hosted git repository.

kexianjun pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git.


omit affc976  fix-3678

This update removed existing revisions from the reference, leaving the
reference pointing at a previous point in the repository history.

 * -- * -- N   refs/heads/master (b2bfbc7)
\
 O -- O -- O   (affc976)

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 .../org/apache/dubbo/remoting/exchange/support/DefaultFuture.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

[incubator-dubbo-spring-boot-project] branch master updated: Update README.md (#445)

2019-02-15 Thread kexianjun 
This is an automated email from the ASF dual-hosted git repository.

kexianjun pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git


The following commit(s) were added to refs/heads/master by this push:
 new e452ef7  Update README.md (#445)
e452ef7 is described below

commit e452ef7aa1230e204fa5016cba296276130d711e
Author: 一凡 
AuthorDate: Fri Feb 15 17:02:55 2019 +0800

Update README.md (#445)
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 60cfbb8..770ad6c 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ You can introduce the latest `dubbo-spring-boot-starter` to 
your project by addi
 import
 
 
-
+
 
 org.apache.dubbo
 dubbo-dependencies-bom

[incubator-dubbo] branch master updated: extract 2 methods: (#3453)

2019-02-11 Thread kexianjun 
This is an automated email from the ASF dual-hosted git repository.

kexianjun 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 36c75d7  extract 2 methods: (#3453)
36c75d7 is described below

commit 36c75d7ce4895ec0aa856ae6ddaeda7de9b3a402
Author: wanghb 
AuthorDate: Tue Feb 12 15:52:38 2019 +0800

extract 2 methods: (#3453)

isSetter: test if a method is a setter
getSetterProperty: get property for setter, for instance setVersion
return "version"
---
 .../dubbo/common/extension/ExtensionLoader.java| 30 +++---
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git 
a/dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionLoader.java
 
b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionLoader.java
index 1b36047..36c7707 100644
--- 
a/dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionLoader.java
+++ 
b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionLoader.java
@@ -544,9 +544,7 @@ public class ExtensionLoader {
 try {
 if (objectFactory != null) {
 for (Method method : instance.getClass().getMethods()) {
-if (method.getName().startsWith("set")
-&& method.getParameterTypes().length == 1
-&& Modifier.isPublic(method.getModifiers())) {
+if (isSetter(method)) {
 /**
  * Check {@link DisableInject} to see if we need auto 
injection for this property
  */
@@ -558,7 +556,7 @@ public class ExtensionLoader {
 continue;
 }
 try {
-String property = method.getName().length() > 3 ? 
method.getName().substring(3, 4).toLowerCase() + method.getName().substring(4) 
: "";
+String property = getSetterProperty(method);
 Object object = objectFactory.getExtension(pt, 
property);
 if (object != null) {
 method.invoke(instance, object);
@@ -576,6 +574,30 @@ public class ExtensionLoader {
 return instance;
 }
 
+/**
+ * get properties name for setter, for instance: setVersion, return 
"version"
+ * 
+ * return "", if setter name with length less than 3
+ */
+private String getSetterProperty(Method method) {
+return method.getName().length() > 3 ? method.getName().substring(3, 
4).toLowerCase() + method.getName().substring(4) : "";
+}
+
+/**
+ * return true if and only if:
+ * 
+ * 1, public
+ * 
+ * 2, name starts with "set"
+ * 
+ * 3, only has one parameter
+ */
+private boolean isSetter(Method method) {
+return method.getName().startsWith("set")
+&& method.getParameterTypes().length == 1
+&& Modifier.isPublic(method.getModifiers());
+}
+
 private Class getExtensionClass(String name) {
 if (type == null) {
 throw new IllegalArgumentException("Extension type == null");

[incubator-dubbo] branch master updated: update dubbo samples' link (#3413)

2019-01-31 Thread kexianjun 
This is an automated email from the ASF dual-hosted git repository.

kexianjun 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 99771a4  update dubbo samples' link (#3413)
99771a4 is described below

commit 99771a4ffee6b470d1baca912b87dbe4b75edb55
Author: Song Kun 
AuthorDate: Fri Feb 1 09:01:50 2019 +0800

update dubbo samples' link (#3413)
---
 README.md | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index efbe080..e89ffa4 100644
--- a/README.md
+++ b/README.md
@@ -29,14 +29,14 @@ We are now collecting dubbo user info in order to help us 
to improve Dubbo bette
 
 ## Getting started
 
-The following code snippet comes from [Dubbo 
Samples](https://github.com/dubbo/dubbo-samples/tree/master/dubbo-samples-api). 
You may clone the sample project and step into `dubbo-samples-api` sub 
directory before read on.
+The following code snippet comes from [Dubbo 
Samples](https://github.com/apache/incubator-dubbo-samples/tree/master/dubbo-samples-api).
 You may clone the sample project and step into `dubbo-samples-api` sub 
directory before read on.
 
 ```bash
-# git clone https://github.com/dubbo/dubbo-samples.git
-# cd dubbo-samples/dubbo-samples-api
+# git clone https://github.com/apache/incubator-dubbo-samples.git
+# cd incubator-dubbo-samples/dubbo-samples-api
 ```
 
-There's a 
[README](https://github.com/dubbo/dubbo-samples/blob/master/dubbo-samples-api/README.md)
 file under `dubbo-samples-api` directory. Read it and try this sample out by 
following the instructions.
+There's a 
[README](https://github.com/apache/incubator-dubbo-samples/tree/master/dubbo-samples-api/README.md)
 file under `dubbo-samples-api` directory. Read it and try this sample out by 
following the instructions.
 
 ### Maven dependency
 
@@ -80,7 +80,7 @@ public interface GreetingService {
 }
 ```
 
-*See 
[api/GreetingService.java](https://github.com/dubbo/dubbo-samples/blob/master/dubbo-samples-api/src/main/java/org/apache/dubbo/samples/api/GreetingsService.java)
 on GitHub.*
+*See 
[api/GreetingService.java](https://github.com/apache/incubator-dubbo-samples/blob/master/dubbo-samples-api/src/main/java/org/apache/dubbo/samples/api/GreetingsService.java)
 on GitHub.*
 
 ### Implement service interface for the provider
 
@@ -96,7 +96,7 @@ public class GreetingServiceImpl implements GreetingService {
 }
 ```
 
-*See 
[provider/GreetingServiceImpl.java](https://github.com/dubbo/dubbo-samples/blob/master/dubbo-samples-api/src/main/java/org/apache/dubbo/samples/provider/GreetingsServiceImpl.java)
 on GitHub.*
+*See 
[provider/GreetingServiceImpl.java](https://github.com/apache/incubator-dubbo-samples/blob/master/dubbo-samples-api/src/main/java/org/apache/dubbo/samples/provider/GreetingsServiceImpl.java)
 on GitHub.*
 
 ### Start service provider
 
@@ -124,7 +124,7 @@ public class Application {
 }
 ```
 
-*See 
[provider/Application.java](https://github.com/dubbo/dubbo-samples/blob/master/dubbo-samples-api/src/main/java/org/apache/dubbo/samples/provider/Application.java)
 on GitHub.*
+*See 
[provider/Application.java](https://github.com/apache/incubator-dubbo-samples/blob/master/dubbo-samples-api/src/main/java/org/apache/dubbo/samples/provider/Application.java)
 on GitHub.*
 
 ### Build and run the provider
 
@@ -164,7 +164,7 @@ public class Application {
 
 The consumer will print out `Hello world` on the screen.
 
-*See 
[consumer/Application.java](https://github.com/dubbo/dubbo-samples/blob/master/dubbo-samples-api/src/main/java/org/apache/dubbo/samples/consumer/Application.java)
 on GitHub.*
+*See 
[consumer/Application.java](https://github.com/apache/incubator-dubbo-samples/blob/master/dubbo-samples-api/src/main/java/org/apache/dubbo/samples/consumer/Application.java)
 on GitHub.*
 
 ### Next steps
 
@@ -210,11 +210,11 @@ Please follow the 
[template](https://github.com/apache/incubator-dubbo/issues/ne
 
 Please report security vulnerability to 
[us](secur...@dubbo.incubator.apache.org) privately.
 
-## Dubbo eco system
+## Dubbo ecosystem
 
 * [Dubbo Ecosystem Entry](https://github.com/dubbo) - A GitHub group `dubbo` 
to gather all Dubbo relevant projects not appropriate in 
[apache](https://github.com/apache) group yet
 * [Dubbo Website](https://github.com/apache/incubator-dubbo-website) - Apache 
Dubbo (incubating) official website
-* [Dubbo Samples](https://github.com/dubbo/dubbo-samples) - samples for Apache 
Dubbo (incubating)
+* [Dubbo Samples](https://github.com/apache/incubator-dubbo-samples) - samples 
for Apache Dubbo (incubating)
 * [Dubbo Spring 
Boot](https://github.com/apache/incubator-dubbo-spring-boot-project) - Spring 
Boot Project for Dubbo
 * [Dubbo OPS](https://github.com/apache/incubator-dubbo-ops) - The reference 
implementation for Dubbo admin

[incubator-dubbo] branch master updated: correct typos, eg: occured -> occurred (#3380)

2019-01-28 Thread kexianjun 
This is an automated email from the ASF dual-hosted git repository.

kexianjun 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 47abf6c  correct typos,eg: occured -> occurred (#3380)
47abf6c is described below

commit 47abf6c8a95feac962d4591f15158b0573decc70
Author: FrankBian 
AuthorDate: Tue Jan 29 15:32:31 2019 +0800

correct typos,eg: occured -> occurred (#3380)

LGTM
---
 .../java/org/apache/dubbo/common/extension/ExtensionLoader.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionLoader.java
 
b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionLoader.java
index 380dbbf..aa32b8f 100644
--- 
a/dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionLoader.java
+++ 
b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionLoader.java
@@ -643,7 +643,7 @@ public class ExtensionLoader {
 }
 }
 } catch (Throwable t) {
-logger.error("Exception occured when loading extension class 
(interface: " +
+logger.error("Exception occurred when loading extension class 
(interface: " +
 type + ", description file: " + fileName + ").", t);
 }
 }
@@ -680,14 +680,14 @@ public class ExtensionLoader {
 reader.close();
 }
 } catch (Throwable t) {
-logger.error("Exception occured when loading extension class 
(interface: " +
+logger.error("Exception occurred when loading extension class 
(interface: " +
 type + ", class file: " + resourceURL + ") in " + 
resourceURL, t);
 }
 }
 
 private void loadClass(Map> extensionClasses, 
java.net.URL resourceURL, Class clazz, String name) throws 
NoSuchMethodException {
 if (!type.isAssignableFrom(clazz)) {
-throw new IllegalStateException("Error occured when loading 
extension class (interface: " +
+throw new IllegalStateException("Error occurred when loading 
extension class (interface: " +
 type + ", class line: " + clazz.getName() + "), class "
 + clazz.getName() + " is not subtype of interface.");
 }

[incubator-dubbo-website] branch asf-site updated: fix consumer address Key (#270)

2019-01-28 Thread kexianjun 
This is an automated email from the ASF dual-hosted git repository.

kexianjun pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new 3c6da6f  fix consumer address Key (#270)
3c6da6f is described below

commit 3c6da6fdc90206e88e4dad17ae78fccd89f87988
Author: mimihom 
AuthorDate: Tue Jan 29 11:35:52 2019 +0800

fix consumer address Key (#270)
---
 docs/en-us/user/references/registry/redis.md | 2 +-
 docs/zh-cn/user/references/registry/redis.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en-us/user/references/registry/redis.md 
b/docs/en-us/user/references/registry/redis.md
index b905735..5d7959b 100644
--- a/docs/en-us/user/references/registry/redis.md
+++ b/docs/en-us/user/references/registry/redis.md
@@ -21,7 +21,7 @@ Procedure:
 0. When service provider boots up, it adds its address under 
`Key:/dubbo/com.foo.BarService/providers`.
 1. Then service provider sends `register` event to 
`Channel:/dubbo/com.foo.BarService/providers`
 2. When service consumer boots up, it subscribe events `register` and 
`unregister` from `Channel:/dubbo/com.foo.BarService/providers`
-3. Then service consumer add its address under 
`Key:/dubbo/com.foo.BarService/providers`
+3. Then service consumer add its address under 
`Key:/dubbo/com.foo.BarService/consumers`
 4. When service consumer receives events `register` and `unregister`, it will 
fetch provider's addresses from `Key:/dubbo/com.foo.BarService/providers`
 5. When monitor center boots up, it subscribes events `register`, 
`unregister`, `subscribe`, and `unsubsribe`.
 6. After monitor center receives `register` and `unregister`, it fetches 
provider's addresses from `Key:/dubbo/com.foo.BarService/providers`
diff --git a/docs/zh-cn/user/references/registry/redis.md 
b/docs/zh-cn/user/references/registry/redis.md
index 6c49750..0debdd1 100644
--- a/docs/zh-cn/user/references/registry/redis.md
+++ b/docs/zh-cn/user/references/registry/redis.md
@@ -21,7 +21,7 @@
 0. 服务提供方启动时，向 `Key:/dubbo/com.foo.BarService/providers` 下，添加当前提供者的地址
 1. 并向 `Channel:/dubbo/com.foo.BarService/providers` 发送 `register` 事件
 2. 服务消费方启动时，从 `Channel:/dubbo/com.foo.BarService/providers` 订阅 `register` 和 
`unregister` 事件
-3. 并向 `Key:/dubbo/com.foo.BarService/providers` 下，添加当前消费者的地址
+3. 并向 `Key:/dubbo/com.foo.BarService/consumers` 下，添加当前消费者的地址
 4. 服务消费方收到 `register` 和 `unregister` 事件后，从 
`Key:/dubbo/com.foo.BarService/providers` 下获取提供者地址列表
 5. 服务监控中心启动时，从 `Channel:/dubbo/*` 订阅 `register` 和 `unregister`，以及 `subscribe` 
和`unsubsribe `事件
 6. 服务监控中心收到 `register` 和 `unregister` 事件后，从 
`Key:/dubbo/com.foo.BarService/providers` 下获取提供者地址列表