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 5068fb124d34ad62c3cb60fbbb66d3c235c05ae1
Merge: f9c174cd17 51d5a88a06
Author: Xin Wang <xin.victorw...@gmail.com>
AuthorDate: Tue Mar 2 09:21:56 2021 +0800
Merge remote-tracking branch 'dubbo_rem/master'
.gitattributes | 4 +
README.md | 6 +-
dubbo-cluster/pom.xml | 6 +
.../rpc/cluster/directory/AbstractDirectory.java | 18 +-
.../rpc/cluster/directory/StaticDirectory.java | 2 +-
.../dubbo/rpc/cluster/router/tag/TagRouter.java | 3 -
.../cluster/support/BroadcastClusterInvoker.java | 61 ++-
.../support/registry/ZoneAwareClusterInvoker.java | 5 +-
.../support/wrapper/MockClusterInvoker.java | 4 +-
.../loadbalance/RoundRobinLoadBalanceTest.java | 8 +-
.../apache/dubbo/common/BaseServiceMetadata.java | 4 +-
.../java/org/apache/dubbo/common/Parameters.java | 3 +
.../src/main/java/org/apache/dubbo/common/URL.java | 5 +
.../java/org/apache/dubbo/common/URLStrParser.java | 21 +-
.../dubbo/common/bytecode/ClassGenerator.java | 4 +-
.../common/bytecode/CustomizedLoaderClassPath.java | 3 +-
.../dubbo/common/compiler/support/ClassUtils.java | 4 +-
.../config/configcenter/ConfigChangedEvent.java | 8 +-
.../common/config/configcenter/Constants.java | 1 +
.../configcenter/TreePathDynamicConfiguration.java | 2 +-
.../dubbo/common/constants/CommonConstants.java | 2 +
.../dubbo/common/constants/RegistryConstants.java | 2 +
.../dubbo/common/extension/ExtensionLoader.java | 36 +-
.../org/apache/dubbo/common/extension/Wrapper.java | 4 +
.../org/apache/dubbo/common/json/J2oVisitor.java | 8 +-
.../org/apache/dubbo/common/lang/Prioritized.java | 2 +-
.../dubbo/common/threadlocal/InternalRunnable.java | 53 +++
.../threadlocal/NamedInternalThreadFactory.java | 2 +-
.../manager/DefaultExecutorRepository.java | 51 ++-
.../threadpool/manager/ExecutorRepository.java | 4 +
.../threadpool/support/AbortPolicyWithReport.java | 23 +-
.../org/apache/dubbo/common/utils/ArrayUtils.java | 6 +-
.../apache/dubbo/common/utils/CollectionUtils.java | 4 +-
.../dubbo/common/utils/CompatibleTypeUtils.java | 452 +++++++++++----------
.../apache/dubbo/common/utils/ExecutorUtil.java | 8 +-
.../org/apache/dubbo/common/utils/PojoUtils.java | 6 +-
.../apache/dubbo/common/utils/ReflectUtils.java | 8 +-
.../dubbo/config/AbstractInterfaceConfig.java | 77 +++-
.../dubbo/config/AbstractReferenceConfig.java | 22 -
.../apache/dubbo/config/ReferenceConfigBase.java | 38 +-
.../org/apache/dubbo/config/ServiceConfigBase.java | 64 +--
.../config/context/ConfigConfigurationAdapter.java | 2 +-
.../dubbo/common/BaseServiceMetadataTest.java | 3 +-
.../file/FileSystemDynamicConfigurationTest.java | 5 +-
.../common/extension/ExtensionLoaderTest.java | 2 +-
.../dubbo/common/extension/wrapper/Demo.java} | 8 +-
.../common/extension/wrapper/WrapperTest.java | 34 +-
.../common/extension/wrapper/impl/DemoImpl.java | 13 +-
.../common/extension/wrapper/impl/DemoWrapper.java | 20 +-
.../extension/wrapper/impl/DemoWrapper2.java | 22 +-
.../threadpool/manager/ExecutorRepositoryTest.java | 2 -
.../support/AbortPolicyWithReportTest.java | 58 ++-
.../common/utils/CompatibleTypeUtilsTest.java | 4 +-
.../apache/dubbo/common/utils/PojoUtilsTest.java | 5 +
.../dubbo/common/utils/ReflectUtilsTest.java | 34 +-
.../org.apache.dubbo.common.extension.wrapper.Demo | 4 +
.../dubbo/rpc/protocol/dubbo/FutureAdapter.java | 10 +-
.../apache/dubbo/generic/GenericServiceTest.java | 24 ++
.../org/apache/dubbo/config/ReferenceConfig.java | 11 +-
.../org/apache/dubbo/config/ServiceConfig.java | 6 +-
.../dubbo/config/bootstrap/DubboBootstrap.java | 7 +-
.../internal/org.apache.dubbo.event.EventListener | 3 +-
...g.apache.dubbo.metadata.MetadataServiceExporter | 1 -
.../org/apache/dubbo/config/ServiceConfigTest.java | 1 +
.../dubbo/config/bootstrap/rest/UserService.java | 1 -
.../AbstractAnnotationConfigBeanBuilder.java | 9 +-
.../AnnotatedInterfaceConfigBeanBuilder.java | 9 +-
.../factory/annotation/ReferenceBeanBuilder.java | 3 +-
.../annotation/ServiceClassPostProcessor.java | 5 -
.../context/annotation/EnableDubboConfig.java | 5 +-
.../spring/extension/SpringExtensionFactory.java | 7 +-
.../dubbo/config/spring/util/DubboBeanUtils.java | 87 +++-
.../annotation/ReferenceBeanBuilderTest.java | 2 +-
.../support/apollo/ApolloDynamicConfiguration.java | 2 +-
.../support/etcd/EtcdDynamicConfiguration.java | 2 +-
.../main/resources/META-INF/assembly/bin/start.sh | 10 +-
.../dubbo-demo-service-consumer/pom.xml | 108 -----
.../dubbo/demo/consumer/ApplicationConsumer.java | 72 ----
.../consumer/RandomMigrationAddressComparator.java | 52 ---
.../dubbo/demo/consumer/TestFailoverCondition.java | 37 --
...dubbo.metadata.store.failover.FailoverCondition | 1 -
...er.support.migration.MigrationClusterComparator | 1 -
.../src/main/resources/dubbo.properties | 2 -
.../src/main/resources/log4j.properties | 7 -
.../resources/spring/dubbo-consumer-multiple.xml | 82 ----
.../spring/dubbo-consumer-sofaregistry.xml | 38 --
.../resources/spring/dubbo-consumer-zk-apollo.xml | 44 --
.../spring/dubbo-consumer-zk-sofaregistry.xml | 39 --
.../main/resources/spring/dubbo-consumer-zk.xml | 38 --
.../dubbo-demo-service-provider/pom.xml | 123 ------
.../dubbo/demo/provider/ApplicationProvider.java | 31 --
.../dubbo/demo/provider/DemoServiceImpl.java | 53 ---
.../provider/ServiceDemoMetadataParamsFilter.java | 34 --
.../dubbo/demo/provider/TestFailoverCondition.java | 37 --
.../org.apache.dubbo.metadata.MetadataParamsFilter | 1 -
...dubbo.metadata.store.failover.FailoverCondition | 1 -
.../src/main/resources/dubbo.properties | 1 -
.../src/main/resources/log4j.properties | 7 -
.../resources/spring/dubbo-provider-multiple.xml | 70 ----
.../spring/dubbo-provider-sofaregistry.xml | 41 --
.../resources/spring/dubbo-provider-zk-apollo.xml | 49 ---
.../spring/dubbo-provider-zk-sofaregistry.xml | 42 --
.../main/resources/spring/dubbo-provider-zk.xml | 47 ---
.../dubbo-demo-service-provider2/pom.xml | 115 ------
.../src/main/resources/dubbo.properties | 1 -
.../src/main/resources/log4j.properties | 7 -
.../main/resources/spring/dubbo-provider-zk.xml | 37 --
dubbo-demo/dubbo-demo-service/pom.xml | 69 ----
.../dubbo-demo-xml/dubbo-demo-xml-consumer/pom.xml | 5 +-
.../src/main/resources/spring/dubbo-consumer.xml | 6 +-
.../dubbo-demo-xml/dubbo-demo-xml-provider/pom.xml | 4 +
dubbo-demo/pom.xml | 1 -
dubbo-dependencies-bom/pom.xml | 4 +-
.../dubbo-dependencies-zookeeper/pom.xml | 2 +-
.../dubbo/cache/support/expiring/ExpiringMap.java | 12 +-
.../internal/org.apache.dubbo.cache.CacheFactory | 3 +-
.../support/expiring/ExpiringCacheFactoryTest.java | 31 +-
.../DynamicConfigurationServiceNameMapping.java | 2 +-
.../metadata/report/MetadataReportInstance.java | 3 +
.../dubbo/metadata/rest/RestMethodMetadata.java | 8 +-
.../dubbo/metadata/rest/ServiceRestMetadata.java | 8 +-
.../store/etcd/EtcdMetadataReportTest.java | 2 +
.../store/failover/FailoverMetadataReport.java | 2 +-
.../store/failover/StrategyMetadataReport.java | 6 +-
.../store/failover/FailoverMetadataReportTest.java | 3 +-
dubbo-metadata/pom.xml | 12 +-
.../dubbo/monitor/support/MonitorFilter.java | 6 +-
.../org/apache/dubbo/qos/command/impl/Ready.java | 2 +-
.../apache/dubbo/qos/legacy/ListTelnetHandler.java | 1 +
.../apache/dubbo/qos/legacy/LogTelnetHandler.java | 2 +-
.../qos/server/handler/QosProcessHandler.java | 1 +
.../qos/server/handler/TelnetIdleEventHandler.java | 41 ++
.../registry/client/AbstractServiceDiscovery.java | 1 +
.../registry/client/DefaultServiceInstance.java | 8 +-
.../listener/ServiceInstancesChangedListener.java | 8 +-
.../client/migration/MigrationInvoker.java | 8 +-
.../registry/integration/DynamicDirectory.java | 4 +-
.../registry/consul/ConsulServiceDiscovery.java | 33 +-
.../consul/ConsulServiceDiscoveryTest.java | 2 +
.../registry/dubbo/RegistryDirectoryTest.java | 11 +-
.../dubbo/registry/dubbo/RegistryProtocolTest.java | 18 +-
.../registry/dubbo/RegistryStatusCheckerTest.java | 4 +-
.../dubbo/registry/etcd/EtcdServiceDiscovery.java | 6 +-
.../dubbo/registry/multiple/MultipleRegistry.java | 4 +-
.../registry/nacos/NacosServiceDiscovery.java | 27 +-
.../zookeeper/ZookeeperServiceDiscovery.java | 15 +-
dubbo-registry/pom.xml | 14 +-
.../apache/dubbo/remoting/exchange/Request.java | 10 +
.../remoting/exchange/codec/ExchangeCodec.java | 28 +-
.../remoting/exchange/support/DefaultFuture.java | 2 +-
.../dubbo/remoting/telnet/support/TelnetUtils.java | 4 +-
.../telnet/support/command/LogTelnetHandler.java | 2 +-
.../dubbo/remoting/transport/AbstractClient.java | 15 +-
.../dubbo/remoting/transport/AbstractCodec.java | 20 +-
.../dubbo/remoting/transport/CodecSupport.java | 57 ++-
.../dubbo/remoting/codec/ExchangeCodecTest.java | 20 +-
.../remoting/etcd/jetcd/JEtcdClientWrapper.java | 3 +-
.../dubbo/remoting/etcd/jetcd/LeaseTest.java | 2 +
.../transport/grizzly/GrizzlyCodecAdapter.java | 4 +-
.../remoting/transport/netty/ThreadNameTest.java | 2 +-
.../zookeeper/curator/CuratorZookeeperClient.java | 3 +-
.../java/org/apache/dubbo/rpc/AppResponse.java | 31 +-
.../java/org/apache/dubbo/rpc/AsyncRpcResult.java | 6 +-
.../main/java/org/apache/dubbo/rpc/Constants.java | 4 +
.../apache/dubbo/rpc/filter/AccessLogFilter.java | 17 +-
.../apache/dubbo/rpc/filter/GenericImplFilter.java | 2 +-
.../apache/dubbo/rpc/protocol/AbstractInvoker.java | 10 +
.../org/apache/dubbo/rpc/protocol/FilterNode.java | 117 ++++++
.../dubbo/rpc/protocol/ProtocolFilterWrapper.java | 85 +---
.../dubbo/rpc/proxy/AbstractProxyFactory.java | 2 +-
.../dubbo/rpc/proxy/AbstractProxyInvoker.java | 4 +-
.../dubbo/rpc/proxy/InvokerInvocationHandler.java | 12 +
.../apache/dubbo/rpc/support/AccessLogData.java | 15 +
.../java/org/apache/dubbo/rpc/RpcContextTest.java | 1 +
.../dubbo/rpc/filter/AccessLogFilterTest.java | 2 +
.../protocol/dubbo/DecodeableRpcInvocation.java | 14 +-
.../rpc/protocol/dubbo/DecodeableRpcResult.java | 12 +
.../dubbo/rpc/protocol/dubbo/DubboCodec.java | 23 +-
.../rpc/protocol/dubbo/DubboCodecSupport.java | 53 +++
.../dubbo/rpc/protocol/dubbo/DubboInvoker.java | 3 +-
.../dubbo/rpc/protocol/dubbo/DubboProtocol.java | 4 +-
.../protocol/dubbo/DubboInvokerAvilableTest.java | 1 +
.../rpc/protocol/dubbo/DubboProtocolTest.java | 7 +-
.../dubbo/decode/DubboTelnetDecodeTest.java | 4 +-
.../rpc/protocol/nativethrift/DemoService.java | 4 -
.../dubbo/rpc/protocol/redis/RedisProtocol.java | 3 +-
.../src/test/java/$__ClassNameTestDubboStub.java | 2 +-
.../webservice/WebserviceProtocolTest.java | 2 +-
pom.xml | 2 +-
189 files changed, 1568 insertions(+), 2128 deletions(-)
