You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2019/08/20 04:28:44 UTC
[dubbo] 02/03: Merge branch 'master' into deserialization-security
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch deserialization-security
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 82c42eecd7da2f7d0f9bb34a89e8b980b8105dd8
Merge: 59d3fc5 06f7190
Author: ken.lj <ke...@gmail.com>
AuthorDate: Tue Aug 20 12:27:20 2019 +0800
Merge branch 'master' into deserialization-security
# Conflicts:
# dubbo-rpc/dubbo-rpc-http/src/main/java/org/apache/dubbo/rpc/protocol/http/HttpProtocol.java
.mvn/wrapper/maven-wrapper.properties | 2 +-
.travis.yml | 2 +-
dubbo-all/pom.xml | 8 +-
dubbo-bom/pom.xml | 4 +-
.../org/apache/dubbo/rpc/cluster/Constants.java | 2 -
.../cluster/loadbalance/AbstractLoadBalance.java | 22 +-
.../dubbo/rpc/cluster/router/MockInvoker.java | 1 +
.../support/AbstractClusterInvokerTest.java | 1 +
.../dubbo/common/beanutil/JavaBeanDescriptor.java | 20 +-
.../common/beanutil/JavaBeanSerializeUtil.java | 41 +--
.../dubbo/common/constants/CommonConstants.java | 2 +
.../dubbo/common/extension/ExtensionLoader.java | 2 -
.../common/beanutil/JavaBeanSerializeUtilTest.java | 53 ++-
.../dubbo/config/AbstractInterfaceConfig.java | 3 +-
.../org/apache/dubbo/config/mock/MockProtocol.java | 1 +
.../spring/schema/DubboBeanDefinitionParser.java | 211 +++++------
.../spring/status/DataSourceStatusChecker.java | 17 +-
.../config/spring/status/SpringStatusChecker.java | 2 +-
.../dubbo-demo-api/dubbo-demo-api-consumer/pom.xml | 8 +
.../dubbo-demo-api/dubbo-demo-api-provider/pom.xml | 8 +
.../dubbo/monitor/support/MonitorFilterTest.java | 1 +
.../dubbo/monitor/dubbo/DubboMonitorTest.java | 1 +
.../dubbo/monitor/dubbo/MetricsFilterTest.java | 1 +
.../org/apache/dubbo/rpc/support/MyInvoker.java | 1 +
.../dubbo/rpc/support/RuntimeExceptionInvoker.java | 1 +
.../dubbo/status/ThreadPoolStatusChecker.java | 10 +-
.../protocol/dubbo/telnet/ChangeTelnetHandler.java | 6 +-
.../protocol/dubbo/telnet/CountTelnetHandler.java | 4 +-
.../protocol/dubbo/telnet/InvokeTelnetHandler.java | 2 +-
.../protocol/dubbo/telnet/LogTelnetHandler.java | 12 +-
.../protocol/dubbo/telnet/PortTelnetHandler.java | 6 +-
.../pom.xml | 30 +-
.../rpc/protocol/http/HttpRemoteInvocation.java | 2 +-
.../protocol/httpinvoker/HttpInvokerProtocol.java} | 15 +-
.../httpinvoker}/HttpRemoteInvocation.java | 2 +-
.../dubbo/internal/org.apache.dubbo.rpc.Protocol | 1 +
.../httpinvoker/HttpInvokerProtocolTest.java} | 22 +-
.../rpc/protocol/httpinvoker}/HttpService.java | 2 +-
.../rpc/protocol/httpinvoker}/HttpServiceImpl.java | 2 +-
dubbo-rpc/dubbo-rpc-http/pom.xml | 28 +-
.../dubbo/rpc/protocol/http/HttpProtocol.java | 387 +++++++++------------
.../dubbo/internal/org.apache.dubbo.rpc.Protocol | 2 +-
.../dubbo/rpc/protocol/http/HttpProtocolTest.java | 272 ++++-----------
.../dubbo/rpc/protocol/http}/JsonRpcService.java | 2 +-
.../rpc/protocol/http}/JsonRpcServiceImpl.java | 2 +-
.../rpc/protocol/jsonrpc/JsonRpcProtocol.java | 163 ---------
.../dubbo/internal/com.alibaba.dubbo.rpc.Protocol | 1 -
.../rpc/protocol/jsonrpc/JsonRpcProtocolTest.java | 69 ----
dubbo-rpc/pom.xml | 4 +-
49 files changed, 541 insertions(+), 920 deletions(-)