[dubbo] branch 2.7.3-release updated: Remove unused imports (#4443)

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

liujun pushed a commit to branch 2.7.3-release
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/2.7.3-release by this push:
 new a229d87  Remove unused imports (#4443)
a229d87 is described below

commit a229d87b9df989038cab060871cdbc8de92d3f78
Author: ken.lj 
AuthorDate: Tue Jul 2 13:06:43 2019 +0800

Remove unused imports (#4443)
---
 .../main/java/org/apache/dubbo/rpc/protocol/AsyncToSyncInvoker.java| 3 ---
 1 file changed, 3 deletions(-)

diff --git 
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/AsyncToSyncInvoker.java
 
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/AsyncToSyncInvoker.java
index 0d3af4d..0b28532 100644
--- 
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/AsyncToSyncInvoker.java
+++ 
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/AsyncToSyncInvoker.java
@@ -29,9 +29,6 @@ import org.apache.dubbo.rpc.RpcInvocation;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
-import static 
org.apache.dubbo.common.constants.CommonConstants.DEFAULT_TIMEOUT;
-import static org.apache.dubbo.common.constants.CommonConstants.TIMEOUT_KEY;
-
 /**
  * This class will work as a wrapper wrapping outside of each protocol invoker.
  *



[dubbo] branch master updated: remove tomcat-embed-logging-juli (#4430)

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

liujun 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 e5fe041  remove tomcat-embed-logging-juli  (#4430)
e5fe041 is described below

commit e5fe041812285869d5ab73516dd424338473bcf2
Author: cvictory 
AuthorDate: Tue Jul 2 11:09:01 2019 +0800

remove tomcat-embed-logging-juli  (#4430)

fixes #4400
---
 dubbo-dependencies-bom/pom.xml | 5 -
 1 file changed, 5 deletions(-)

diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index 20c17b6..62944fe 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -401,11 +401,6 @@
 ${tomcat_embed_version}
 
 
-org.apache.tomcat.embed
-tomcat-embed-logging-juli
-${tomcat_embed_version}
-
-
 io.etcd
 jetcd-core
 ${jetcd_version}



[dubbo] branch 2.7.3-release updated: support method sync timeout (#4436)

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

liujun pushed a commit to branch 2.7.3-release
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/2.7.3-release by this push:
 new cfba520  support method sync timeout (#4436)
cfba520 is described below

commit cfba520104517b1570bce131808f3977b17326dc
Author: Haiyang 
AuthorDate: Tue Jul 2 11:02:52 2019 +0800

support method sync timeout (#4436)

fixes #4435
---
 .../main/java/org/apache/dubbo/rpc/protocol/AsyncToSyncInvoker.java  | 5 +++--
 .../main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboInvoker.java  | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git 
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/AsyncToSyncInvoker.java
 
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/AsyncToSyncInvoker.java
index 93fb5d8..0d3af4d 100644
--- 
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/AsyncToSyncInvoker.java
+++ 
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/AsyncToSyncInvoker.java
@@ -34,6 +34,7 @@ import static 
org.apache.dubbo.common.constants.CommonConstants.TIMEOUT_KEY;
 
 /**
  * This class will work as a wrapper wrapping outside of each protocol invoker.
+ *
  * @param 
  */
 public class AsyncToSyncInvoker implements Invoker {
@@ -54,8 +55,8 @@ public class AsyncToSyncInvoker implements Invoker {
 Result asyncResult = invoker.invoke(invocation);
 
 try {
-if (InvokeMode.SYNC == 
((RpcInvocation)invocation).getInvokeMode()) {
-asyncResult.get(getUrl().getParameter(TIMEOUT_KEY, 
DEFAULT_TIMEOUT), TimeUnit.MILLISECONDS);
+if (InvokeMode.SYNC == ((RpcInvocation) 
invocation).getInvokeMode()) {
+asyncResult.get(Integer.MAX_VALUE, TimeUnit.MILLISECONDS);
 }
 } catch (InterruptedException e) {
 throw new RpcException("Interrupted unexpectedly while waiting for 
remoting result to return!  method: " + invocation.getMethodName() + ", 
provider: " + getUrl() + ", cause: " + e.getMessage(), e);
diff --git 
a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboInvoker.java
 
b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboInvoker.java
index ece7149..3fed73f 100644
--- 
a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboInvoker.java
+++ 
b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboInvoker.java
@@ -87,7 +87,7 @@ public class DubboInvoker extends AbstractInvoker {
 }
 try {
 boolean isOneway = RpcUtils.isOneway(getUrl(), invocation);
-int timeout = getUrl().getMethodParameter(methodName, TIMEOUT_KEY, 
DEFAULT_TIMEOUT);
+int timeout = getUrl().getMethodPositiveParameter(methodName, 
TIMEOUT_KEY, DEFAULT_TIMEOUT);
 if (isOneway) {
 boolean isSent = getUrl().getMethodParameter(methodName, 
Constants.SENT_KEY, false);
 currentClient.send(inv, isSent);



[dubbo] branch 2.7.3-release updated: DubboComponentScan cannot backward support for alibaba @Service and @Reference. (#4415)

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

liujun pushed a commit to branch 2.7.3-release
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/2.7.3-release by this push:
 new 60ca9f4   DubboComponentScan cannot backward support for alibaba 
@Service and @Reference. (#4415)
60ca9f4 is described below

commit 60ca9f4826ebb84ff41737c2ba2b60484eedc0f9
Author: Mercy Ma 
AuthorDate: Tue Jul 2 10:17:12 2019 +0800

 DubboComponentScan cannot backward support for alibaba @Service and 
@Reference. (#4415)

fixes #4330, #4409
---
 .../org/apache/dubbo/common/utils/PojoUtils.java   |   2 +-
 .../apache/dubbo/common/utils/PojoUtilsTest.java   |  19 +
 .../spring/context/annotation/EnableDubbo.java |  12 +-
 ...atibleReferenceAnnotationBeanPostProcessor.java | 508 
 .../annotation/CompatibleReferenceBeanBuilder.java | 167 ---
 ...mpatibleServiceAnnotationBeanPostProcessor.java | 525 -
 .../annotation/CompatibleDubboComponentScan.java   |  66 ---
 .../CompatibleDubboComponentScanRegistrar.java | 110 -
 .../CompatibleAnnotationBeanDefinitionParser.java  |  93 
 .../AbstractAnnotationConfigBeanBuilder.java   |   3 +
 .../AnnotatedInterfaceConfigBeanBuilder.java   | 215 +
 .../AnnotationInjectedBeanPostProcessor.java   | 128 ++---
 .../AnnotationPropertyValuesAdapter.java   |  39 +-
 .../ReferenceAnnotationBeanPostProcessor.java  |  32 +-
 .../factory/annotation/ReferenceBeanBuilder.java   |  84 ++--
 .../ServiceAnnotationBeanPostProcessor.java|   6 +-
 .../factory/annotation/ServiceBeanNameBuilder.java |   5 +-
 .../util/AnnotatedBeanDefinitionRegistryUtils.java |  62 ++-
 .../dubbo/config/spring/util/AnnotationUtils.java  | 135 --
 .../dubbo/config/spring/util/BeanFactoryUtils.java |   6 +
 .../merged/MergedReference.java}   |  35 +-
 .../merged/MergedService.java} |  33 +-
 .../factory/annotation/MergedAnnotationTest.java   |  76 +++
 .../ReferenceAnnotationBeanPostProcessorTest.java  |   2 +-
 .../annotation/provider/DefaultHelloService.java   |   4 +-
 .../AnnotatedBeanDefinitionRegistryUtilsTest.java  |  74 +++
 26 files changed, 749 insertions(+), 1692 deletions(-)

diff --git 
a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/PojoUtils.java 
b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/PojoUtils.java
index 3bab261..52204ac 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/PojoUtils.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/PojoUtils.java
@@ -366,7 +366,7 @@ public class PojoUtils {
 history.put(pojo, dest);
 for (Object obj : src) {
 Type keyType = getGenericClassByIndex(genericType, 0);
-Class keyClazz = obj.getClass();
+Class keyClazz = obj == null ? null : obj.getClass();
 if (keyType instanceof Class) {
 keyClazz = (Class) keyType;
 }
diff --git 
a/dubbo-common/src/test/java/org/apache/dubbo/common/utils/PojoUtilsTest.java 
b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/PojoUtilsTest.java
index 3595efb..f0ab173 100644
--- 
a/dubbo-common/src/test/java/org/apache/dubbo/common/utils/PojoUtilsTest.java
+++ 
b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/PojoUtilsTest.java
@@ -37,6 +37,7 @@ import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.UUID;
 
@@ -682,6 +683,24 @@ public class PojoUtilsTest {
 assertEquals(dateTimeStr, new 
SimpleDateFormat(dateFormat[0]).format(timestamp));
 }
 
+@Test
+public void testRealizeCollectionWithNullElement() {
+LinkedList listStr = new LinkedList<>();
+listStr.add("arrayValue");
+listStr.add(null);
+HashSet setStr = new HashSet<>();
+setStr.add("setValue");
+setStr.add(null);
+
+Object listResult = PojoUtils.realize(listStr, LinkedList.class);
+assertEquals(LinkedList.class, listResult.getClass());
+assertEquals(listResult, listStr);
+
+Object setResult = PojoUtils.realize(setStr, HashSet.class);
+assertEquals(HashSet.class, setResult.getClass());
+assertEquals(setResult, setStr);
+}
+
 public enum Day {
 SUNDAY, MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY, SATURDAY
 }
diff --git 
a/dubbo-compatible/src/main/java/com/alibaba/dubbo/config/spring/context/annotation/EnableDubbo.java
 
b/dubbo-compatible/src/main/java/com/alibaba/dubbo/config/spring/context/annotation/EnableDubbo.java
index 1310d1a..d5227ed 100644
--- 
a/dubbo-compatible/src/main/java/com/alibaba/dubbo/config/spring/context/annotation/EnableDubbo.java
+++ 

[dubbo-go] branch develop updated (fccd093 -> 7c61bd0)

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

alexstocks pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git.


from fccd093  Mod: delete wrong sentences
 add 11e6ea8  Mod: update feature list
 add 41fa6f5  Fix:fix a bug about register after group feature commit
 add 78837c5  Mod:comment to delete
 add 3f03efe  Merge pull request #114 from hxmhlt/master
 add 06bdc30  Add:registries config option in referenceConfig & 
serviceConfig
 add f23f541  Add:registries config option in referenceConfig & 
serviceConfig
 add d2165a9  Mod:change registries in reference & service to registry
 add 75436f9  Mod:change registries in reference & service to registry
 add e788a2d  Mod:add how to use registry config in example
 add 113b4ae  Add: add a comment in registry_config
 add b1720e7  Merge pull request #113 from hxmhlt/config_center
 add 7e2e3ae  Add routing-related features
 add 660fec5  Add routing-related features and add some test case for 
condition router
 add 500cd76  fix some bug and add some test case for condition router
 add c881bb5  add some log and add a function for URL
 add eebcfda  change RouterFactory method name
 add 4c53617  Add routing-related features
 add 56c3f90  Add routing-related features and add some test case for 
condition router
 add 129b342  fix some bug and add some test case for condition router
 add 9b1eeab  add some log and add a function for URL
 add d205f73  change RouterFactory method name
 add 84ce094  Merge branch 'master' into feature/routing_rule
 add 265fb16  Merge remote-tracking branch 'origin/feature/routing_rule' 
into feature/routing_rule
 add 18895ef  fix some bug
 add 6ced447  del unuseless file
 add 7bfe706  del unuseless files
 add 90d2caf  remove LocalIP method
 add 495d1e0  add test case for url method
 add 4d9058a  del useless code and blank line
 add 79f8809  add hashset test case
 add 72d6cf8  add licenses
 add 5d4e68b  fix
 add 1d98b43  fix
 add 209fcf3  fix
 add 0ea1e3a  fix
 add bc26904  change hashset package
 add 590b4a5  fix
 add b8503d8  fix
 add 2e76bd9  fix
 add 6e6f13b  fix
 add d6ecdb6  Merge pull request #100 from aliiohs/feature/routing_rule
 add 7c61bd0  Merge branch 'master' of https://github.com/apache/dubbo-go

No new revisions were added by this update.

Summary of changes:
 .gitignore |   2 +-
 README.md  |  24 +-
 README_CN.md   |  24 +-
 cluster/router.go  |   2 +-
 cluster/router/condition_router.go | 325 +++
 cluster/router/condition_router_test.go| 348 +
 .../router_factory.go} |  21 +-
 common/constant/default.go |   1 +
 common/constant/key.go |   3 +
 common/extension/router_factory.go |  21 ++
 common/url.go  |  80 +
 common/url_test.go |  49 +++
 config/config_loader_test.go   |  27 ++
 config/reference_config.go |  34 +-
 config/reference_config_test.go|   1 +
 config/registry_config.go  |  45 ++-
 config/service_config.go   |  24 +-
 config/service_config_test.go  |   2 +-
 config/testdata/consumer_config.yml|   7 +-
 .../testdata/consumer_config_with_configcenter.yml |   1 +
 config/testdata/provider_config.yml|   5 +-
 examples/dubbo/go-client/profiles/dev/client.yml   |   2 +
 .../dubbo/go-client/profiles/release/client.yml|   2 +
 examples/dubbo/go-client/profiles/test/client.yml  |   2 +
 examples/dubbo/go-server/app/app   | Bin 0 -> 12412300 bytes
 examples/dubbo/go-server/profiles/dev/server.yml   |   2 +
 .../dubbo/go-server/profiles/release/server.yml|   2 +
 examples/dubbo/go-server/profiles/test/server.yml  |   2 +
 examples/jsonrpc/go-client/profiles/dev/client.yml |   2 +
 .../jsonrpc/go-client/profiles/release/client.yml  |   2 +
 .../jsonrpc/go-client/profiles/test/client.yml |   2 +
 examples/jsonrpc/go-server/profiles/dev/server.yml |   4 +-
 .../jsonrpc/go-server/profiles/release/server.yml  |   5 +-
 .../jsonrpc/go-server/profiles/test/server.yml |   4 +-
 go.sum |   1 +
 gostd/container/hashset.go |  87 ++
 gostd/container/hashset_test.go| 243 ++
 protocol/invocation/rpcinvocation.go   |  28 ++
 registry/zookeeper/registry.go |   8 +-
 39 files changed, 1350 insertions(+), 94 

[dubbo-go] branch master updated: Mod: update feature list

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 11e6ea8  Mod: update feature list
 new 7c61bd0  Merge branch 'master' of https://github.com/apache/dubbo-go
11e6ea8 is described below

commit 11e6ea83f78b45c835c0a3c9729d8ec28a677a9a
Author: AlexStocks 
AuthorDate: Mon Jul 1 20:51:59 2019 +0800

Mod: update feature list
---
 README.md| 24 ++--
 README_CN.md | 24 ++--
 2 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index 633fa6f..1e97873 100644
--- a/README.md
+++ b/README.md
@@ -26,26 +26,30 @@ If you wanna know more about dubbo-go, please visit this 
reference [Project Arch
 
 Finished List:
 
-- Role: Consumer(√), Provider(√)
-- Transport: HTTP(√), TCP(√)
-- Codec: JsonRPC v2(√), Hessian v2(√)
-- Registry: ZooKeeper(√)
-- Cluster Strategy: Failover(√)
-- Load Balance: Random(√), RoundRobin(√), LeastActive(√)
-- Filter: Echo Health Check(√)
+- Role: Consumer, Provider
+- Transport: HTTP, TCP
+- Codec: JsonRPC v2, Hessian v2
+- Registry: ZooKeeper
+- Routing: Rule(dubbo v2.6.x)
+- Configure Center: Zookeeper
+- Cluster Strategy: Failover
+- Load Balance: Random, RoundRobin, LeastActive
+- Filter: Echo Health Check
 
 Working List:
 
 - Cluster Strategy: Failfast/Failsafe/Failback/Forking
 - Load Balance: ConsistentHash
 - Filter: 
TokenFilter/AccessLogFilter/CountFilter/ActiveLimitFilter/ExecuteLimitFilter/GenericFilter/TpsLimitFilter
-- Registry: etcd/k8s/consul
-- Routing Rule (dubbo v2.6.x)
+- Registry: etcd/k8s/consul/nacos
+- Configure Center: apollo
 - Dynamic Configuration Center & Metadata Center (dubbo v2.7.x)
-- Metrics (dubbo v2.7.x)
+- Metrics: Promethus(dubbo v2.7.x)
 
 Todo List:
 
+- Registry: kubernetes
+- Routing: istio
 - tracing (dubbo ecosystem)
 
 You can know more about dubbo-go by its 
[roadmap](https://github.com/apache/dubbo-go/wiki/Roadmap).
diff --git a/README_CN.md b/README_CN.md
index 997b14f..eece857 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -26,26 +26,30 @@ Apache License, Version 2.0
 
 实现列表:
 
-- Role: Consumer(√), Provider(√)
-- Transport: HTTP(√), TCP(√)
-- Codec: JsonRPC v2(√), Hessian v2(√)
-- Registry: ZooKeeper(√)
-- Cluster Strategy: Failover(√)
-- Load Balance: Random(√), RoundRobin(√), LeastActive(√)
-- Filter: Echo Health Check(√)
+- Role: Consumer, Provider
+- Transport: HTTP, TCP
+- Codec: JsonRPC v2, Hessian v2
+- Registry: ZooKeeper
+- Routing: Rule(dubbo v2.6.x)
+- Configure Center: Zookeeper
+- Cluster Strategy: Failover
+- Load Balance: Random, RoundRobin, LeastActive
+- Filter: Echo Health Check
 
 开发中列表:
 
 - Cluster Strategy: Failfast/Failsafe/Failback/Forking
 - Load Balance: ConsistentHash
 - Filter: 
TokenFilter/AccessLogFilter/CountFilter/ActiveLimitFilter/ExecuteLimitFilter/GenericFilter/TpsLimitFilter
-- Registry: etcd/k8s/consul
-- Routing Rule (dubbo v2.6.x)
-- Metrics (dubbo v2.7.x)
+- Registry: etcd/k8s/consul/nacos
+- Configure Center: apollo
 - Dynamic Configuration Center & Metadata Center (dubbo v2.7.x)
+- Metrics: Promethus(dubbo v2.7.x)
 
 任务列表:
 
+- Registry: kubernetes
+- Routing: istio
 - tracing (dubbo ecosystem)
 
 你可以通过访问 [roadmap](https://github.com/apache/dubbo-go/wiki/Roadmap) 知道更多关于 
dubbo-go 的信息



[dubbo] branch 2.7.3-release updated: disable oraclejdk 11 task & fix ProtobufTypeBuilderTest (#4434)

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

liujun pushed a commit to branch 2.7.3-release
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/2.7.3-release by this push:
 new d66a2fa  disable oraclejdk 11 task & fix ProtobufTypeBuilderTest 
(#4434)
d66a2fa is described below

commit d66a2fa83270a8404df2e1ffbeb6e4799d697c49
Author: cvictory 
AuthorDate: Mon Jul 1 19:23:22 2019 +0800

disable oraclejdk 11 task & fix ProtobufTypeBuilderTest (#4434)
---
 .travis.yml|1 -
 .../protobuf}/ProtobufTypeBuilderTest.java |   12 +-
 .../definition/protobuf/model/GooglePB.java| 3431 
 .../protobuf/model/ServiceInterface.java   |   21 +
 4 files changed, 3459 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e3821cb..18b9257 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,6 @@ sudo: false # faster builds
 
 jdk:
   - openjdk11
-  - oraclejdk11
   - openjdk8
   - oraclejdk8
 
diff --git 
a/dubbo-serialization/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/protobuf/support/ProtobufTypeBuilderTest.java
 
b/dubbo-metadata-report/dubbo-metadata-definition-protobuf/src/test/java/org/apache/dubbo/metadata/definition/protobuf/ProtobufTypeBuilderTest.java
similarity index 90%
rename from 
dubbo-serialization/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/protobuf/support/ProtobufTypeBuilderTest.java
rename to 
dubbo-metadata-report/dubbo-metadata-definition-protobuf/src/test/java/org/apache/dubbo/metadata/definition/protobuf/ProtobufTypeBuilderTest.java
index 0d59c08..3cdd79b 100644
--- 
a/dubbo-serialization/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/protobuf/support/ProtobufTypeBuilderTest.java
+++ 
b/dubbo-metadata-report/dubbo-metadata-definition-protobuf/src/test/java/org/apache/dubbo/metadata/definition/protobuf/ProtobufTypeBuilderTest.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.dubbo.common.serialize.protobuf.support;
+package org.apache.dubbo.metadata.definition.protobuf;
 
-import 
org.apache.dubbo.common.serialize.protobuf.support.model.ServiceInterface;
 import org.apache.dubbo.metadata.definition.ServiceDefinitionBuilder;
 import org.apache.dubbo.metadata.definition.model.FullServiceDefinition;
 import org.apache.dubbo.metadata.definition.model.MethodDefinition;
 import org.apache.dubbo.metadata.definition.model.TypeDefinition;
+import org.apache.dubbo.metadata.definition.protobuf.model.ServiceInterface;
 
 import org.junit.jupiter.api.Test;
 
@@ -30,7 +30,9 @@ import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-
+/**
+ * 2019-07-01
+ */
 public class ProtobufTypeBuilderTest {
 @Test
 public void testProtobufBuilder() {
@@ -62,8 +64,8 @@ public class ProtobufTypeBuilderTest {
 assertThat(propertiesMap.containsKey("msg"), is(true));
 assertThat(propertiesMap.get("msg").getType(), 
equalTo("com.google.protobuf.ByteString"));
 assertThat(propertiesMap.containsKey("phone"), is(true));
-assertThat(propertiesMap.get("phone").getType(), 
equalTo("java.util.List"));
+assertThat(propertiesMap.get("phone").getType(), 
equalTo("java.util.List"));
 assertThat(propertiesMap.containsKey("doubleMap"), is(true));
-assertThat(propertiesMap.get("doubleMap").getType(), 
equalTo("java.util.Map"));
+assertThat(propertiesMap.get("doubleMap").getType(), 
equalTo("java.util.Map"));
 }
 }
diff --git 
a/dubbo-metadata-report/dubbo-metadata-definition-protobuf/src/test/java/org/apache/dubbo/metadata/definition/protobuf/model/GooglePB.java
 
b/dubbo-metadata-report/dubbo-metadata-definition-protobuf/src/test/java/org/apache/dubbo/metadata/definition/protobuf/model/GooglePB.java
new file mode 100644
index 000..d662339
--- /dev/null
+++ 
b/dubbo-metadata-report/dubbo-metadata-definition-protobuf/src/test/java/org/apache/dubbo/metadata/definition/protobuf/model/GooglePB.java
@@ -0,0 +1,3431 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either 

[dubbo-go] branch master updated (b1720e7 -> d6ecdb6)

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

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


from b1720e7  Merge pull request #113 from hxmhlt/config_center
 new 7e2e3ae  Add routing-related features
 new 660fec5  Add routing-related features and add some test case for 
condition router
 new 500cd76  fix some bug and add some test case for condition router
 new c881bb5  add some log and add a function for URL
 new eebcfda  change RouterFactory method name
 new 4c53617  Add routing-related features
 new 56c3f90  Add routing-related features and add some test case for 
condition router
 new 129b342  fix some bug and add some test case for condition router
 new 9b1eeab  add some log and add a function for URL
 new d205f73  change RouterFactory method name
 new 84ce094  Merge branch 'master' into feature/routing_rule
 new 265fb16  Merge remote-tracking branch 'origin/feature/routing_rule' 
into feature/routing_rule
 new 18895ef  fix some bug
 new 6ced447  del unuseless file
 new 7bfe706  del unuseless files
 new 90d2caf  remove LocalIP method
 new 495d1e0  add test case for url method
 new 4d9058a  del useless code and blank line
 new 79f8809  add hashset test case
 new 72d6cf8  add licenses
 new 5d4e68b  fix
 new 1d98b43  fix
 new 209fcf3  fix
 new 0ea1e3a  fix
 new bc26904  change hashset package
 new 590b4a5  fix
 new b8503d8  fix
 new 2e76bd9  fix
 new 6e6f13b  fix
 new d6ecdb6  Merge pull request #100 from aliiohs/feature/routing_rule

The 463 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitignore |   2 +-
 cluster/router.go  |   2 +-
 cluster/router/condition_router.go | 325 +++
 cluster/router/condition_router_test.go| 348 +
 .../router_factory.go} |  21 +-
 common/constant/default.go |   1 +
 common/constant/key.go |   3 +
 common/extension/router_factory.go |  21 ++
 common/url.go  |  80 +
 common/url_test.go |  49 +++
 examples/dubbo/go-server/app/app   | Bin 0 -> 12412300 bytes
 go.sum |   1 +
 gostd/container/hashset.go |  87 ++
 gostd/container/hashset_test.go| 243 ++
 protocol/invocation/rpcinvocation.go   |  28 ++
 15 files changed, 1197 insertions(+), 14 deletions(-)
 create mode 100644 cluster/router/condition_router.go
 create mode 100644 cluster/router/condition_router_test.go
 copy cluster/{cluster_impl/failover_cluster.go => router/router_factory.go} 
(71%)
 create mode 100644 common/extension/router_factory.go
 create mode 100755 examples/dubbo/go-server/app/app
 create mode 100644 gostd/container/hashset.go
 create mode 100644 gostd/container/hashset_test.go



[dubbo-go] branch master updated (3f03efe -> b1720e7)

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

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


from 3f03efe  Merge pull request #114 from hxmhlt/master
 new 06bdc30  Add:registries config option in referenceConfig & 
serviceConfig
 new f23f541  Add:registries config option in referenceConfig & 
serviceConfig
 new d2165a9  Mod:change registries in reference & service to registry
 new 75436f9  Mod:change registries in reference & service to registry
 new e788a2d  Mod:add how to use registry config in example
 new 113b4ae  Add: add a comment in registry_config
 new b1720e7  Merge pull request #113 from hxmhlt/config_center

The 433 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 config/config_loader_test.go   | 27 +
 config/reference_config.go | 34 
 config/reference_config_test.go|  1 +
 config/registry_config.go  | 45 --
 config/service_config.go   | 24 ++--
 config/service_config_test.go  |  2 +-
 config/testdata/consumer_config.yml|  7 ++--
 .../testdata/consumer_config_with_configcenter.yml |  1 +
 config/testdata/provider_config.yml|  5 ++-
 examples/dubbo/go-client/profiles/dev/client.yml   |  2 +
 .../dubbo/go-client/profiles/release/client.yml|  2 +
 examples/dubbo/go-client/profiles/test/client.yml  |  2 +
 examples/dubbo/go-server/profiles/dev/server.yml   |  2 +
 .../dubbo/go-server/profiles/release/server.yml|  2 +
 examples/dubbo/go-server/profiles/test/server.yml  |  2 +
 examples/jsonrpc/go-client/profiles/dev/client.yml |  2 +
 .../jsonrpc/go-client/profiles/release/client.yml  |  2 +
 .../jsonrpc/go-client/profiles/test/client.yml |  2 +
 examples/jsonrpc/go-server/profiles/dev/server.yml |  4 +-
 .../jsonrpc/go-server/profiles/release/server.yml  |  5 ++-
 .../jsonrpc/go-server/profiles/test/server.yml |  4 +-
 21 files changed, 124 insertions(+), 53 deletions(-)



[dubbo-go] branch master updated (fccd093 -> 3f03efe)

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

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


from fccd093  Mod: delete wrong sentences
 new 41fa6f5  Fix:fix a bug about register after group feature commit
 new 78837c5  Mod:comment to delete
 new 3f03efe  Merge pull request #114 from hxmhlt/master

The 426 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 registry/zookeeper/registry.go | 8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)



[dubbo-hessian-lite] branch master updated: Update README.md

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

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


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

commit dc654950fc6402f5464991cee49a1bf9c82ea100
Author: Xin Wang 
AuthorDate: Mon Jul 1 14:26:05 2019 +0800

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

diff --git a/README.md b/README.md
index 5b9c40b..4743bcf 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ## Hessian Lite(Alibaba embed version)
 
-[![Build 
Status](https://travis-ci.org/dubbo/hessian-lite.svg?branch=master)](https://travis-ci.org/dubbo/hessian-lite)
+[![Build 
Status](https://travis-ci.org/dubbo/hessian-lite.svg?branch=master)](https://travis-ci.org/apache/dubbo-hessian-lite)
 
[![codecov](https://codecov.io/gh/dubbo/hessian-lite/branch/master/graph/badge.svg)](https://codecov.io/gh/dubbo/hessian-lite)
 
[![Gitter](https://badges.gitter.im/alibaba/dubbo.svg)](https://gitter.im/alibaba/dubbo?utm_source=badge_medium=badge_campaign=pr-badge)
 ![license](https://img.shields.io/github/license/alibaba/dubbo.svg)