[dubbo] branch 2.6.x updated: fix default setting (#4955)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 2.6.x in repository https://gitbox.apache.org/repos/asf/dubbo.git The following commit(s) were added to refs/heads/2.6.x by this push: new 116c9c3 fix default setting (#4955) 116c9c3 is described below commit 116c9c33ebc7702825f66cc4a012d5da73c1d57b Author: bruce <841326...@qq.com> AuthorDate: Tue Sep 10 11:45:49 2019 +0800 fix default setting (#4955) * Add pull request coverage check and set threshold as 0.1% (#1678) * Optimize_hessian_desr_performance (#1705) * We need to change the version to SNAPSHOT to satisfy release:prepare * upgrade to 2.6.2-SNAPSHOT * fixes #1089, make ExecutionDispatcher meet dubbo-user-book (#1449) * fixes #1089, make ExecutionDispatcher meets dubbo-user-book * remove heartbeat condition * enhance comments, javadoc and logging message for (#1722) ExecutionChannelHandler * Merge pull request #1716, unit test for AbstractConfigTest. * add test for serialization api & fastjson & fst module (#1718) * Merge pull request #1717, NettyHelper in netty extension populated Logger "InternalLogger" in netty. * [Dubbo-1687]Enhance test coverage for dubbo filter (#1715) * use three different kinds of cache factory to increase test coverages * add unit test cases for dubbo-filter module * add copyright and made small refactor * make sure Jcache will exceed expired period * optimize unit test for serialization hession2/jdk/kryo (#1726) * fix * imports issue (#1721) * #1731: checkMultiExtension in com.alibaba.dubbo.config.AbstractInterfaceConfig should be in setter instead of getter (#1732) * unit test for dubbo-config-api (#1733) * finish unit test for AbstractMethodConfig * finish unit test for AbstractReferenceConfig * move to right package * finish unit test for AbstractReferenceConfig * finish unit test for AbstractMethodConfig * finish unit test for AbstractReferenceConfig * move to right package * finish unit test for AbstractReferenceConfig * unit test for AbstractServiceConfig, also fix logic issue in setListener/getListener * Fix isShutdown() always return true (#1426) * Bump version to 2.6.2-SNAPSHOT. * Fix #934 #1756 use loadBalance policy to choose invoke when providers less 2 (#1759) * fix #934 use loadBalance policy to choose invoke when providers less than 2 * fix #1756, clear mock invocation after invoking * Remove unnecessary null check. * Remove redundant final modifier. * Remove unnecessary null check. * Remove redundant array creation. * Remove unnecessary null check. * Remove unnecessary null check and fix typo. * Config api unit test (#1758) * unit test for ApplicationConfig * fix typo * unit test for ArgumentConfig * unit test for ConsumerConfig * unit test for MethodConfig * unit test for ModuleConfig * unit test for MonitorConfig * unit test for ProtocolConfig * unit test for ApplicationConfig * fix typo * unit test for ArgumentConfig * unit test for ConsumerConfig * unit test for MethodConfig * unit test for ModuleConfig * unit test for MonitorConfig * unit test for ProtocolConfig * unit test for ProviderConfig * make test stable * enable tcp no delay for netty 3 server (#1746) (cherry picked from commit 430fb4c) * Change parent pom back to oss in this version * Add binary release module 'distribution' * Bump version to 2.6.2 for release * Merge pull request #1616, fix hessian1 serialized short, byte is converted to int. * Polish distribution pom * unit test for RegistryConfigTest (#1775) * Fix hessian-lite spelling mistake (#1779) * Remove unecessary cast. * Remove unnecessary null check. (#1764) * Such logic already exists in findAnnotationName (#1750) * Remove unnecessary null check. * Ignore testStatusChecker since it is unstable and consider removing it later. * unit test for ServiceConfig (#1780) * unit test for RegistryConfigTest * unit test for ServiceConfig * ignore com.alibaba.dubbo.config.ServiceConfigTest.testUnexport to make unit test stable * Merge pull request #1761, add Locale serialize & deserialize support. Fixed #906 * Upgrade tomcat version to 8.5.31. (#1781) * add test for monitor module (#1741) * [Dubbo-1687]Add unit tests for dubbo-filter-validation module (#1736) * Add unit
[dubbo] branch master updated: Change main method under dubbo-remoting-api to standard unit test (#5026)
This is an automated email from the ASF dual-hosted git repository.
hyunkun 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 9275b9d Change main method under dubbo-remoting-api to standard unit
test (#5026)
9275b9d is described below
commit 9275b9d5154b75c3a52f7fbb14f9290ef24bde2f
Author: xiaomoran <54576528+xiaomo...@users.noreply.github.com>
AuthorDate: Tue Sep 10 10:46:29 2019 +0800
Change main method under dubbo-remoting-api to standard unit test (#5026)
* change main method under dubbo-remoting-api to standard test
* add timeout
* remove unnecessary loops
---
.../transport/mina/ClientToServerTest.java | 3 +-
.../transport/netty/ClientToServerTest.java| 3 +-
.../transport/netty4/ClientReconnectTest.java | 2 +-
.../transport/netty4/ClientToServerTest.java | 3 +-
.../remoting/transport/netty4}/DemoService.java| 2 +-
.../transport/netty4}/DemoServiceImpl.java | 2 +-
.../remoting/transport/netty4}/MockResult.java | 2 +-
.../transport/netty4/ReplierDispatcherTest.java} | 117 -
.../remoting/transport/netty4}/RpcMessage.java | 2 +-
.../transport/netty4}/RpcMessageHandler.java | 3 +-
10 files changed, 81 insertions(+), 58 deletions(-)
diff --git
a/dubbo-remoting/dubbo-remoting-mina/src/test/java/org/apache/remoting/transport/mina/ClientToServerTest.java
b/dubbo-remoting/dubbo-remoting-mina/src/test/java/org/apache/remoting/transport/mina/ClientToServerTest.java
index 6414434..25d8618 100644
---
a/dubbo-remoting/dubbo-remoting-mina/src/test/java/org/apache/remoting/transport/mina/ClientToServerTest.java
+++
b/dubbo-remoting/dubbo-remoting-mina/src/test/java/org/apache/remoting/transport/mina/ClientToServerTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.remoting.transport.mina;
+import org.apache.dubbo.common.utils.NetUtils;
import org.apache.dubbo.remoting.RemotingException;
import org.apache.dubbo.remoting.exchange.ExchangeChannel;
import org.apache.dubbo.remoting.exchange.ExchangeServer;
@@ -47,7 +48,7 @@ public abstract class ClientToServerTest {
@BeforeEach
protected void setUp() throws Exception {
-int port = (int) (1000 * Math.random() + 1);
+int port = NetUtils.getAvailablePort();
server = newServer(port, handler);
client = newClient(port);
}
diff --git
a/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/ClientToServerTest.java
b/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/ClientToServerTest.java
index 267f569..d89227f 100644
---
a/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/ClientToServerTest.java
+++
b/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/ClientToServerTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.dubbo.remoting.transport.netty;
+import org.apache.dubbo.common.utils.NetUtils;
import org.apache.dubbo.remoting.RemotingException;
import org.apache.dubbo.remoting.exchange.ExchangeChannel;
import org.apache.dubbo.remoting.exchange.ExchangeServer;
@@ -46,7 +47,7 @@ public abstract class ClientToServerTest {
@BeforeEach
protected void setUp() throws Exception {
-int port = (int) (1000 * Math.random() + 1);
+int port = NetUtils.getAvailablePort();
server = newServer(port, handler);
client = newClient(port);
}
diff --git
a/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/ClientReconnectTest.java
b/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/ClientReconnectTest.java
index 9a2065a..844950c 100644
---
a/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/ClientReconnectTest.java
+++
b/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/ClientReconnectTest.java
@@ -50,7 +50,7 @@ public class ClientReconnectTest {
Assertions.assertFalse(client.isConnected());
Server server = startServer(port);
for (int i = 0; i < 100 && !client.isConnected(); i++) {
-Thread.sleep(10);
+Thread.sleep(20);
}
Assertions.assertTrue(client.isConnected());
client.close(2000);
diff --git
a/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/ClientToServerTest.java
b/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/ClientToServerTest.java
index 9b8db00..1015a53 100644
---
[dubbo-go] branch develop updated (bb1216a -> 359bdab)
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 bb1216a Merge pull request #190 from divebomb/develop new 0893d83 Fix:failoverbug and reties change to string type new 6dbad29 Fix:failoverbug and reties change to string type new d1ea35d Mod:retries in config/testdata new a9770f7 Mod:format import new ead43d6 Add: add error log new 359bdab Merge pull request #195 from hxmhlt/fix_failoverbug_and_reties_0 The 861 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 | 6 ++ cluster/cluster_impl/failback_cluster_invoker.go | 12 cluster/cluster_impl/failover_cluster_invoker.go | 18 ++ cluster/cluster_impl/failover_cluster_test.go| 8 common/constant/default.go | 16 +--- config/base_config_test.go | 20 ++-- config/method_config.go | 2 +- config/reference_config.go | 6 +++--- config/reference_config_test.go | 6 +++--- config/service_config.go | 6 +++--- config/service_config_test.go| 6 +++--- config/testdata/consumer_config.yml | 2 +- .../testdata/consumer_config_with_configcenter.yml | 2 +- .../profiles/dev/client.yml | 2 +- .../profiles/release/client.yml | 2 +- .../profiles/test/client.yml | 2 +- .../profiles/dev/server.yml | 2 +- .../profiles/release/server.yml | 2 +- .../profiles/test/server.yml | 2 +- examples/consul/go-client/config/client.yml | 2 +- examples/consul/go-server/config/server.yml | 2 +- .../general/dubbo/go-client/profiles/dev/client.yml | 6 +++--- .../dubbo/go-client/profiles/release/client.yml | 6 +++--- .../general/dubbo/go-client/profiles/test/client.yml | 6 +++--- .../general/dubbo/go-server/profiles/dev/server.yml | 6 +++--- .../dubbo/go-server/profiles/release/server.yml | 6 +++--- .../general/dubbo/go-server/profiles/test/server.yml | 6 +++--- .../jsonrpc/go-client/profiles/dev/client.yml| 6 +++--- .../jsonrpc/go-server/profiles/dev/server.yml| 6 +++--- .../dubbo/go-client/profiles/dev/client.yml | 2 +- .../dubbo/go-server/profiles/dev/server.yml | 2 +- .../with-hystrix-go-client/profiles/dev/client.yml | 2 +- 32 files changed, 101 insertions(+), 79 deletions(-)
[dubbo-go-hessian2] branch master updated (1ed0a12 -> 80cbb25)
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-hessian2.git. from 1ed0a12 Merge pull request #128 from fangyincheng/pojo new 4b0c242 Fix: dubbo version new cfbb8e8 Mod: comment new 80cbb25 Merge pull request #130 from fangyincheng/master The 404 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: request.go | 10 +- response.go | 7 ++- 2 files changed, 7 insertions(+), 10 deletions(-)
[dubbo] branch 2.6.x updated: upgrade fastjson to 1.2.60 (#5038)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch 2.6.x in repository https://gitbox.apache.org/repos/asf/dubbo.git The following commit(s) were added to refs/heads/2.6.x by this push: new 5d6baa5 upgrade fastjson to 1.2.60 (#5038) 5d6baa5 is described below commit 5d6baa548997bb2eb98169d160c5d94e61b3cf85 Author: 祁晓波 AuthorDate: Mon Sep 9 20:35:31 2019 +0800 upgrade fastjson to 1.2.60 (#5038) --- dependencies-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml index 141ac5b..bc3476d 100644 --- a/dependencies-bom/pom.xml +++ b/dependencies-bom/pom.xml @@ -94,7 +94,7 @@ 1.1.7 2.1.4 4.5.3 -1.2.58 +1.2.60 3.4.9 0.2 2.12.0
[dubbo] branch master updated: Avoid resize in ClassUtils.java (#5009)
This is an automated email from the ASF dual-hosted git repository.
hyunkun 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 8b1f60a Avoid resize in ClassUtils.java (#5009)
8b1f60a is described below
commit 8b1f60adcc5bc5b17b371bb8f83757637408ef49
Author: fanghuabing
AuthorDate: Mon Sep 9 19:19:18 2019 +0800
Avoid resize in ClassUtils.java (#5009)
---
.../src/main/java/org/apache/dubbo/common/utils/ClassUtils.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/ClassUtils.java
b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/ClassUtils.java
index 10b6b9a..ec5b766 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/ClassUtils.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/ClassUtils.java
@@ -37,12 +37,12 @@ public class ClassUtils {
* Map with primitive type name as key and corresponding primitive type as
* value, for example: "int" -> "int.class".
*/
-private static final Map> PRIMITIVE_TYPE_NAME_MAP = new
HashMap>(16);
+private static final Map> PRIMITIVE_TYPE_NAME_MAP = new
HashMap>(32);
/**
* Map with primitive wrapper type as key and corresponding primitive type
* as value, for example: Integer.class -> int.class.
*/
-private static final Map, Class> PRIMITIVE_WRAPPER_TYPE_MAP =
new HashMap, Class>(8);
+private static final Map, Class> PRIMITIVE_WRAPPER_TYPE_MAP =
new HashMap, Class>(16);
private static final char PACKAGE_SEPARATOR_CHAR = '.';
@@ -56,7 +56,7 @@ public class ClassUtils {
PRIMITIVE_WRAPPER_TYPE_MAP.put(Long.class, long.class);
PRIMITIVE_WRAPPER_TYPE_MAP.put(Short.class, short.class);
-Set> primitiveTypeNames = new HashSet<>(16);
+Set> primitiveTypeNames = new HashSet<>(32);
primitiveTypeNames.addAll(PRIMITIVE_WRAPPER_TYPE_MAP.values());
primitiveTypeNames.addAll(Arrays
.asList(boolean[].class, byte[].class, char[].class,
double[].class,
[dubbo] branch master updated: to meet new onResponse signature: return directly
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 4619aab to meet new onResponse signature: return directly
4619aab is described below
commit 4619aab86910c40d3192fef655972ef40858d136
Author: ken.lj
AuthorDate: Mon Sep 9 14:47:42 2019 +0800
to meet new onResponse signature: return directly
---
.../src/main/java/org/apache/dubbo/rpc/filter/GenericFilter.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/GenericFilter.java
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/GenericFilter.java
index 226b74e..c2d13d6 100644
---
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/GenericFilter.java
+++
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/GenericFilter.java
@@ -192,7 +192,7 @@ public class GenericFilter extends ListenableFilter {
"] serialize result failed.", e);
}
} else if(ProtocolUtils.isGenericReturnRawResult(generic)) {
-return result;
+return;
} else {
appResponse.setValue(PojoUtils.generalize(appResponse.getValue()));
}
[dubbo-spring-boot-project] branch master updated: Update README (#587)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-spring-boot-project.git
The following commit(s) were added to refs/heads/master by this push:
new efebd42 Update README (#587)
efebd42 is described below
commit efebd4225ebe2b2dac4d3996203a5683fb749e86
Author: echooymxq
AuthorDate: Mon Sep 9 14:27:23 2019 +0800
Update README (#587)
* Update README
* Fix the issues of test cases
---
README.md | 2 +-
README_CN.md| 2 +-
.../autoconfigure/DubboEndpointAnnotationAutoConfigurationTest.java | 2 +-
.../boot/actuate/autoconfigure/DubboEndpointAutoConfigurationTest.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index 0e7ca06..2c88912 100644
--- a/README.md
+++ b/README.md
@@ -220,7 +220,7 @@ Having trouble with Dubbo Spring Boot? We’d like to help!
## Building from Source
-If you want to try out thr latest features of Dubbo Spring Boot, it can be
easily built with the [maven wrapper](https://github.com/takari/maven-wrapper).
Your JDK is 1.8 or above.
+If you want to try out the latest features of Dubbo Spring Boot, it can be
easily built with the [maven wrapper](https://github.com/takari/maven-wrapper).
Your JDK is 1.8 or above.
```
$ ./mvnw clean install
diff --git a/README_CN.md b/README_CN.md
index f33380e..824b972 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -36,7 +36,7 @@
import
-
+
org.apache.dubbo
dubbo-dependencies-bom
diff --git
a/dubbo-spring-boot-actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAnnotationAutoConfigurationTest.java
b/dubbo-spring-boot-actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAnnotationAutoConfigurationTest.java
index 954ad7a..1ccb08e 100644
---
a/dubbo-spring-boot-actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAnnotationAutoConfigurationTest.java
+++
b/dubbo-spring-boot-actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAnnotationAutoConfigurationTest.java
@@ -160,7 +160,7 @@ public class DubboEndpointAnnotationAutoConfigurationTest {
Assert.assertEquals(1, services.size());
-Map demoServiceMeta =
services.get("providers:my-protocol:org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboEndpointAnnotationAutoConfigurationTest$DemoService:1.0.0");
+Map demoServiceMeta =
services.get("ServiceBean:org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboEndpointAnnotationAutoConfigurationTest$DemoService:1.0.0");
Assert.assertEquals("1.0.0", demoServiceMeta.get("version"));
diff --git
a/dubbo-spring-boot-compatible/actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAutoConfigurationTest.java
b/dubbo-spring-boot-compatible/actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAutoConfigurationTest.java
index 3227723..f67c925 100644
---
a/dubbo-spring-boot-compatible/actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAutoConfigurationTest.java
+++
b/dubbo-spring-boot-compatible/actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAutoConfigurationTest.java
@@ -164,7 +164,7 @@ public class DubboEndpointAutoConfigurationTest {
Assert.assertEquals(1, services.size());
-Map demoServiceMeta =
services.get("providers:my-protocol:org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboEndpointAutoConfigurationTest$DemoService:1.0.0");
+Map demoServiceMeta =
services.get("ServiceBean:org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboEndpointAutoConfigurationTest$DemoService:1.0.0");
Assert.assertEquals("1.0.0", demoServiceMeta.get("version"));
[dubbo-spring-boot-project] branch master updated: update readme (#594)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-spring-boot-project.git
The following commit(s) were added to refs/heads/master by this push:
new 538ed2a update readme (#594)
538ed2a is described below
commit 538ed2a6442d72727f52702ea8da2b87280e7546
Author: lousaibiao
AuthorDate: Mon Sep 9 14:26:15 2019 +0800
update readme (#594)
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 6796a55..0e7ca06 100644
--- a/README.md
+++ b/README.md
@@ -201,7 +201,7 @@ public interface DemoService {
name: dubbo-auto-configure-consumer-sample
```
-If `DubboProviderDemo` works well, please mark sure `DubboProviderDemo` is
started.
+If `DubboProviderDemo` doesn't work well, please make sure `DubboProviderDemo`
is started.
More details, please refer to [Samples](dubbo-spring-boot-samples).
