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.git

commit f63a8bb665fba108ffe32bdbaa24cf6571b1bdc1
Merge: 155cf61226 b5c81d8558
Author: Xin Wang <xin.victorw...@gmail.com>
AuthorDate: Sat Mar 20 13:51:55 2021 +0800

    Merge remote-tracking branch 'dubbo_rem/master'

 .travis.yml                                        | 22 ------
 Jenkinsfile                                        | 30 ++++----
 README.md                                          |  2 +-
 .../java/org/apache/dubbo/rpc/cluster/Cluster.java |  6 +-
 .../dubbo/rpc/cluster/router/tag/TagRouter.java    | 14 +---
 .../cluster/support/MergeableClusterInvoker.java   |  8 +--
 .../loadbalance/RoundRobinLoadBalanceTest.java     |  3 +-
 .../src/main/java/org/apache/dubbo/common/URL.java | 21 ++++--
 .../common/beanutil/JavaBeanSerializeUtil.java     |  4 +-
 .../org/apache/dubbo/common/bytecode/Proxy.java    | 53 +++++++++++---
 .../dubbo/common/constants/CommonConstants.java    |  5 ++
 .../org/apache/dubbo/common/json/J2oVisitor.java   |  5 +-
 .../common/threadlocal/InternalThreadLocal.java    |  2 +-
 .../apache/dubbo/common/utils/CollectionUtils.java | 39 +++++-----
 .../org/apache/dubbo/common/utils/FieldUtils.java  | 14 ++--
 .../org/apache/dubbo/common/utils/IOUtils.java     | 38 ++++++++++
 .../org/apache/dubbo/common/utils/LFUCache.java    | 15 ++--
 .../org/apache/dubbo/common/utils/MethodUtils.java |  7 +-
 .../org/apache/dubbo/common/utils/NetUtils.java    |  6 +-
 .../org/apache/dubbo/common/utils/PojoUtils.java   | 13 ++--
 .../apache/dubbo/common/utils/ReflectUtils.java    | 84 ++++++++++++++++++----
 .../org/apache/dubbo/common/utils/UrlUtils.java    | 18 +----
 .../apache/dubbo/config/ConfigCenterConfig.java    |  2 +-
 .../java/org/apache/dubbo/config/SslConfig.java    | 28 ++++----
 .../org/apache/dubbo/rpc/model/ProviderModel.java  |  3 +-
 .../apache/dubbo/rpc/model/ServiceDescriptor.java  |  3 +-
 .../common/PojoUtilsForNonPublicStaticTest.java    | 35 ++++-----
 .../test/java/org/apache/dubbo/common/URLTest.java | 82 +++++++++++++++++++++
 .../dubbo/common/bytecode/ClassGeneratorTest.java  |  8 ++-
 .../config/EnvironmentConfigurationTest.java       | 12 ++--
 .../configcenter/ConfigChangedEventTest.java       | 30 ++++----
 .../support/AbortPolicyWithReportTest.java         |  7 +-
 .../support/cached/CachedThreadPoolTest.java       | 13 ++--
 .../support/eager/EagerThreadPoolExecutorTest.java | 17 ++---
 .../support/eager/EagerThreadPoolTest.java         | 13 ++--
 .../dubbo/common/utils/CollectionUtilsTest.java    |  2 +-
 .../apache/dubbo/common/utils/ConfigUtilsTest.java |  2 +-
 .../apache/dubbo/common/utils/LFUCacheTest.java    | 21 ++++--
 .../dubbo/common/utils/ReflectUtilsTest.java       | 37 +++++++---
 .../org/apache/dubbo/echo/EchoServiceTest.java     |  2 +-
 .../org/apache/dubbo/config/ServiceConfig.java     |  1 +
 .../dubbo/config/bootstrap/DubboBootstrap.java     | 36 +++++-----
 .../apache/dubbo/config/AbstractConfigTest.java    |  7 +-
 .../dubbo/config/mock/MockServiceDiscovery.java    | 19 ++---
 .../config/spring/status/SpringStatusChecker.java  |  5 +-
 .../dubbo/config/spring/SimpleRegistryService.java |  5 +-
 .../spring/registry/MockRegistryFactory.java       |  8 +--
 .../spring/registry/MockServiceDiscovery.java      | 19 ++---
 .../support/nacos/NacosDynamicConfiguration.java   |  3 +-
 .../metadata/test/JTestMetadataReport4Test.java    |  5 --
 .../store/consul/ConsulMetadataReport.java         |  3 -
 .../metadata/store/etcd/EtcdMetadataReport.java    |  4 --
 .../store/failover/FailoverMetadataReportTest.java |  5 +-
 .../metadata/store/nacos/NacosMetadataReport.java  |  6 +-
 .../metadata/store/redis/RedisMetadataReport.java  |  3 -
 .../store/zookeeper/ZookeeperMetadataReport.java   |  4 --
 .../org/apache/dubbo/qos/command/impl/Ready.java   | 67 ++++++++++++++++-
 .../registry/client/AbstractServiceDiscovery.java  | 23 +++++-
 .../client/DefaultRegistryClusterIdentifier.java   |  3 +-
 .../client/FileSystemServiceDiscovery.java         | 15 ++--
 .../dubbo/registry/client/ServiceDiscovery.java    | 12 ++--
 .../registry/client/ServiceDiscoveryRegistry.java  |  8 +--
 .../event/listener/LoggingEventListener.java       |  4 +-
 .../metadata/MetadataServiceNameMapping.java       |  5 +-
 .../metadata/ServiceInstanceMetadataUtils.java     |  4 ++
 .../registry/client/InMemoryServiceDiscovery.java  | 14 +---
 .../registry/consul/ConsulServiceDiscovery.java    |  4 +-
 .../apache/dubbo/registry/dubbo/DubboRegistry.java |  4 --
 .../registry/dubbo/RegistryDirectoryTest.java      |  3 +-
 .../registry/dubbo/SimpleRegistryService.java      |  5 +-
 .../apache/dubbo/registry/etcd/EtcdRegistry.java   |  4 --
 .../dubbo/registry/etcd/EtcdServiceDiscovery.java  |  6 +-
 .../registry/eureka/EurekaServiceDiscovery.java    |  4 +-
 .../registry/multicast/MulticastRegistry.java      |  5 --
 .../multicast/MulticastServiceDiscovery.java       | 18 ++---
 .../multiple/MultipleRegistryServiceDiscovery.java | 26 +++----
 .../apache/dubbo/registry/nacos/NacosRegistry.java |  4 --
 .../registry/nacos/NacosServiceDiscovery.java      |  6 +-
 .../apache/dubbo/registry/redis/RedisRegistry.java |  4 --
 .../apache/dubbo/registry/sofa/SofaRegistry.java   | 18 ++---
 .../sofa/SofaRegistryServiceDiscovery.java         | 43 ++++++-----
 .../registry/zookeeper/ZookeeperRegistry.java      |  4 --
 .../zookeeper/ZookeeperServiceDiscovery.java       | 15 ++--
 .../support/header/HeaderExchangeChannel.java      | 10 ++-
 .../handler/WrappedChannelHandlerTest.java         |  5 +-
 .../remoting/etcd/jetcd/JEtcdClientWrapper.java    |  9 +--
 .../dubbo/remoting/etcd/jetcd/JEtcdClientTest.java |  5 +-
 .../remoting/transport/netty4/NettyServer.java     |  5 ++
 .../zookeeper/curator/CuratorZookeeperClient.java  |  9 ++-
 .../java/org/apache/dubbo/rpc/AppResponse.java     |  1 +
 .../apache/dubbo/rpc/filter/GenericImplFilter.java |  4 +-
 .../dubbo/rpc/proxy/AbstractProxyFactory.java      |  3 +-
 .../dubbo/rpc/proxy/InvokerInvocationHandler.java  |  3 +-
 .../dubbo/rpc/filter/AccessLogFilterTest.java      |  5 +-
 .../rpc/protocol/dubbo/DecodeableRpcResult.java    |  2 +-
 .../rpc/protocol/dubbo/filter/FutureFilter.java    | 13 ++--
 .../protocol/dubbo/DubboInvokerAvilableTest.java   |  3 +-
 .../dubbo/ReferenceCountExchangeClientTest.java    |  5 +-
 .../dubbo/rpc/protocol/grpc/GrpcProtocol.java      |  4 --
 .../dubbo/rpc/protocol/injvm/InjvmInvoker.java     |  7 ++
 .../rpc/protocol/injvm/InjvmProtocolTest.java      | 11 +++
 .../dubbo/rpc/protocol/thrift/ThriftCodec.java     |  3 +-
 .../protocol/thrift/ServiceMethodNotFoundTest.java |  5 +-
 .../serialize/hessian2/Hessian2ObjectInput.java    | 10 ++-
 .../serialize/hessian2/Hessian2ObjectOutput.java   | 10 ++-
 .../common/serialize/kryo/CompatibleKryo.java      |  4 +-
 .../serialize/kryo/utils/ReflectionUtils.java      | 33 ---------
 pom.xml                                            | 40 +++++------
 108 files changed, 789 insertions(+), 607 deletions(-)

Reply via email to