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 85deac049023607c3a3a069d7ef9595d7501410f
Merge: 443876c66b 15fc5b473b
Author: Xin Wang <xin.victorw...@gmail.com>
AuthorDate: Wed Feb 24 19:26:14 2021 +0800
Merge remote-tracking branch 'dubbo_rem/master'
.gitattributes | 4 +
.github/workflows/build-and-test.yml | 185 +++++++
.github/workflows/unit-test.yml | 67 ---
Jenkinsfile | 6 +-
NOTICE | 2 +-
README.md | 20 +-
dubbo-all/pom.xml | 14 +
dubbo-bom/pom.xml | 10 +
.../org/apache/dubbo/rpc/cluster/Directory.java | 2 +
.../rpc/cluster/directory/AbstractDirectory.java | 23 +-
.../rpc/cluster/directory/StaticDirectory.java | 2 +-
.../dubbo/rpc/cluster/router/tag/TagRouter.java | 3 -
.../cluster/support/BroadcastClusterInvoker.java | 61 ++-
.../migration/MigrationClusterComparator.java | 14 +-
.../support/migration/MigrationClusterInvoker.java | 54 ++
.../cluster/support/migration/MigrationRule.java | 90 ++++
.../cluster/support/migration/MigrationStep.java | 9 +-
.../support/registry/ZoneAwareClusterInvoker.java | 168 +++++-
.../cluster/support/wrapper/AbstractCluster.java | 2 +-
.../support/wrapper/MockClusterInvoker.java | 4 +-
.../loadbalance/RoundRobinLoadBalanceTest.java | 8 +-
.../support/migration/MigrationRuleTest.java | 14 +-
.../apache/dubbo/common/BaseServiceMetadata.java | 6 +-
.../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 | 23 +-
.../dubbo/common/bytecode/ClassGenerator.java | 4 +-
.../common/bytecode/CustomizedLoaderClassPath.java | 3 +-
.../dubbo/common/compiler/support/ClassUtils.java | 4 +-
.../common/config/CompositeConfiguration.java | 14 +-
.../dubbo/common/config/ConfigurationUtils.java | 12 +
.../apache/dubbo/common/config/Environment.java | 23 +-
.../config/configcenter/ConfigChangedEvent.java | 8 +-
.../dubbo/common/constants/RegistryConstants.java | 11 +-
.../dubbo/common/extension/ExtensionLoader.java | 36 +-
.../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 +-
.../common/threadpool/ThreadlessExecutor.java | 27 +-
.../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/LFUCache.java | 6 +-
.../org/apache/dubbo/common/utils/PojoUtils.java | 6 +-
.../apache/dubbo/common/utils/ReflectUtils.java | 8 +-
.../dubbo/config/AbstractInterfaceConfig.java | 88 +++-
.../dubbo/config/AbstractReferenceConfig.java | 22 -
.../org/apache/dubbo/config/ApplicationConfig.java | 12 +
.../apache/dubbo/config/ReferenceConfigBase.java | 38 +-
.../org/apache/dubbo/config/ServiceConfigBase.java | 64 +--
.../dubbo/common/BaseServiceMetadataTest.java | 65 +++
.../org/apache/dubbo/common/URLStrParserTest.java | 58 +-
.../file/FileSystemDynamicConfigurationTest.java | 3 +
.../common/extension/ExtensionLoaderTest.java | 2 +-
.../common/threadpool/ThreadlessExecutorTest.java | 58 ++
.../threadpool/manager/ExecutorRepositoryTest.java | 77 +++
.../support/AbortPolicyWithReportTest.java | 58 +-
.../dubbo/common/timer/HashedWheelTimerTest.java | 181 ++++++-
.../common/utils/CompatibleTypeUtilsTest.java | 4 +-
.../apache/dubbo/common/utils/DefaultPageTest.java | 9 +-
.../org/apache/dubbo/common/utils/LogTest.java | 55 +-
.../apache/dubbo/common/utils/MemberUtilsTest.java | 12 +
.../apache/dubbo/common/utils/MethodUtilsTest.java | 54 ++
.../apache/dubbo/common/utils/PojoUtilsTest.java | 5 +
.../dubbo/common/utils/ReflectUtilsTest.java | 34 +-
.../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 | 20 +-
.../bootstrap/DubboBootstrapStartStopListener.java | 18 +-
.../ConfigurableMetadataServiceExporter.java | 53 +-
.../dubbo/config/utils/ConfigValidationUtils.java | 6 +-
.../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 | 5 +-
.../dubbo/config/url/InvokerSideConfigUrlTest.java | 2 +-
.../org.apache.dubbo.registry.RegistryFactory | 1 +
.../annotation/ServiceClassPostProcessor.java | 5 -
.../context/DubboBootstrapApplicationListener.java | 1 +
...bboBootstrapStartStopListenerSpringAdapter.java | 48 ++
.../context/event/DubboBootstrapStatedEvent.java | 50 ++
.../context/event/DubboBootstrapStopedEvent.java | 50 ++
...onfig.bootstrap.DubboBootstrapStartStopListener | 1 +
.../MultipleServicesWithMethodConfigsTest.java | 8 +
.../consul/ConsulDynamicConfigurationTest.java | 246 ++++-----
.../zookeeper/ZookeeperDynamicConfiguration.java | 2 +-
.../dubbo-demo-xml/dubbo-demo-xml-consumer/pom.xml | 12 +
.../src/main/resources/spring/dubbo-consumer.xml | 78 +--
.../dubbo-demo-xml/dubbo-demo-xml-provider/pom.xml | 12 +
.../src/main/resources/spring/dubbo-provider.xml | 2 +-
dubbo-dependencies-bom/pom.xml | 4 +-
.../dubbo-dependencies-zookeeper/pom.xml | 4 +-
.../dubbo/cache/support/expiring/ExpiringMap.java | 12 +-
.../internal/org.apache.dubbo.cache.CacheFactory | 3 +-
.../support/expiring/ExpiringCacheFactoryTest.java | 31 +-
.../DynamicConfigurationServiceNameMapping.java | 2 +-
.../org/apache/dubbo/metadata/MetadataInfo.java | 2 +-
.../dubbo/metadata/rest/RestMethodMetadata.java | 8 +-
.../dubbo/metadata/rest/ServiceRestMetadata.java | 8 +-
.../{ => dubbo-metadata-report-failover}/pom.xml | 27 +-
.../metadata/store/failover/FailoverCondition.java | 105 ++--
.../store/failover/FailoverMetadataReport.java | 581 +++++++++++++++++++++
.../failover/FailoverMetadataReportFactory.java | 15 +-
.../store/failover/StrategyMetadataReport.java | 88 ++++
...che.dubbo.metadata.report.MetadataReportFactory | 1 +
.../store/failover/FailoverMetadataReportTest.java | 222 ++++++++
.../store/failover/MockAllFailoverCondition.java | 19 +-
.../store/failover/MockLocalFailoverCondition.java | 31 +-
.../store/failover/MockMetadataReport.java | 131 +++++
.../store/failover/MockMetadataReportFactory.java | 16 +-
...che.dubbo.metadata.report.MetadataReportFactory | 1 +
...dubbo.metadata.store.failover.FailoverCondition | 2 +
.../store/zookeeper/ZookeeperMetadataReport.java | 33 +-
dubbo-metadata/pom.xml | 1 +
.../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 +-
.../registry/client/AbstractServiceDiscovery.java | 1 +
.../registry/client/DefaultServiceInstance.java | 10 +-
.../dubbo/registry/client/InstanceAddressURL.java | 3 +
.../dubbo/registry/client/ServiceDiscovery.java | 9 +
.../registry/client/ServiceDiscoveryRegistry.java | 36 +-
.../client/ServiceDiscoveryRegistryDirectory.java | 36 +-
.../listener/ServiceInstancesChangedListener.java | 56 +-
.../registry/client/metadata/MetadataUtils.java | 8 +-
.../StandardMetadataServiceURLBuilder.java | 87 +--
.../store/InMemoryWritableMetadataService.java | 20 +-
.../metadata/store/RemoteMetadataServiceImpl.java | 4 +
.../DefaultMigrationAddressComparator.java | 74 +++
.../client/migration/InvokersChangedListener.java | 7 +-
.../migration/MigrationAddressComparator.java | 9 +-
.../client/migration/MigrationInvoker.java | 390 ++++++++++++++
.../client/migration/MigrationRuleHandler.java | 71 +++
.../client/migration/MigrationRuleListener.java | 112 ++++
.../ServiceDiscoveryMigrationInvoker.java | 61 +++
.../registry/integration/DynamicDirectory.java | 120 +++--
.../InterfaceCompatibleRegistryProtocol.java | 134 +----
.../integration/InvokersChangedListener.java | 5 +-
.../registry/integration/RegistryDirectory.java | 83 ++-
.../{client => integration}/RegistryProtocol.java | 65 ++-
.../integration/RegistryProtocolListener.java | 6 +-
...try.client.migration.MigrationAddressComparator | 1 +
...o.registry.integration.RegistryProtocolListener | 2 +-
.../dubbo/internal/org.apache.dubbo.rpc.Protocol | 2 +-
.../java/org/apache/dubbo/registry/ZKTools.java | 20 +-
.../registry/consul/ConsulServiceDiscovery.java | 34 +-
.../ConsulServiceDiscoveryFactory.java~HEAD} | 12 +-
...onsulServiceDiscoveryFactory.java~dubbo-master} | 12 +-
.../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 | 2 -
.../dubbo/registry/multiple/MultipleRegistry.java | 4 +-
.../multiple/MultipleRegistryServiceDiscovery.java | 177 +++++++
.../MultipleRegistryServiceDiscoveryFactory.java} | 10 +-
...g.apache.dubbo.registry.client.ServiceDiscovery | 1 +
...e.dubbo.registry.client.ServiceDiscoveryFactory | 1 +
.../apache/dubbo/registry/nacos/NacosRegistry.java | 8 +-
.../registry/nacos/NacosServiceDiscovery.java | 14 +-
.../sofa/SofaRegistryServiceDiscovery.java | 24 +-
...e.dubbo.registry.client.ServiceDiscoveryFactory | 1 +
.../zookeeper/ZookeeperServiceDiscovery.java | 67 ++-
.../ZookeeperServiceDiscoveryChangeWatcher.java | 18 +-
...e.dubbo.registry.client.ServiceDiscoveryFactory | 1 +
.../zookeeper/ZookeeperServiceDiscoveryTest.java | 2 +-
.../remoting/exchange/codec/ExchangeCodec.java | 86 +--
.../dubbo/remoting/telnet/support/TelnetUtils.java | 4 +-
.../telnet/support/command/LogTelnetHandler.java | 2 +-
.../support/command/StatusTelnetHandler.java | 4 +-
.../dubbo/remoting/transport/AbstractClient.java | 15 +-
.../dubbo/remoting/transport/CodecSupport.java | 69 +++
.../org/apache/dubbo/remoting/MockTransporter.java | 22 +-
.../apache/dubbo/remoting/TransportersTest.java | 46 ++
.../dubbo/remoting/exchange/ExchangersTest.java | 58 ++
.../dubbo/remoting/exchange/MockExchanger.java | 21 +-
.../dubbo/remoting/telnet/TelnetUtilsTest.java | 72 +++
.../telnet/support/ClearTelnetHandlerTest.java | 46 ++
.../telnet/support/ExitTelnetHandlerTest.java | 27 +-
.../telnet/support/HelpTelnetHandlerTest.java | 48 ++
.../telnet/support/StatusTelnetHandlerTest.java | 44 ++
.../dubbo/remoting/utils/PayloadDropperTest.java | 43 ++
.../apache/dubbo/remoting/utils/UrlUtilsTest.java | 40 ++
.../internal/org.apache.dubbo.remoting.Transporter | 1 +
.../org.apache.dubbo.remoting.exchange.Exchanger | 1 +
.../remoting/etcd/jetcd/JEtcdClientWrapper.java | 3 +-
.../transport/grizzly/GrizzlyCodecAdapter.java | 4 +-
.../remoting/transport/netty/ThreadNameTest.java | 2 +-
.../dubbo/remoting/zookeeper/ZookeeperClient.java | 2 +
.../zookeeper/curator/CuratorZookeeperClient.java | 3 +-
.../zookeeper/support/AbstractZookeeperClient.java | 2 +-
.../java/org/apache/dubbo/rpc/AppResponse.java | 15 +-
.../apache/dubbo/rpc/filter/AccessLogFilter.java | 17 +-
.../apache/dubbo/rpc/filter/GenericImplFilter.java | 2 +-
.../org/apache/dubbo/rpc/protocol/FilterNode.java | 117 +++++
.../dubbo/rpc/protocol/ProtocolFilterWrapper.java | 85 +--
.../dubbo/rpc/proxy/AbstractProxyFactory.java | 2 +-
.../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 +
.../rpc/protocol/dubbo/CallbackServiceCodec.java | 4 +-
.../dubbo/rpc/protocol/dubbo/DubboCodec.java | 21 +-
.../dubbo/rpc/protocol/dubbo/DubboProtocol.java | 4 +-
.../protocol/dubbo/DubboInvokerAvilableTest.java | 1 +
.../rpc/protocol/dubbo/DubboProtocolTest.java | 6 +-
.../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 +-
220 files changed, 5638 insertions(+), 1710 deletions(-)
