This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch 3.0-to-master in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit e550cd3505065b8015a97c28061188c567b0445c Merge: 4b3a794 80b22d6 Author: ken.lj <[email protected]> AuthorDate: Mon Jul 20 11:03:27 2020 +0800 Merge branch '3.0' of https://github.com/apache/dubbo into 3.0 dubbo-all/pom.xml | 4 + .../rpc/cluster/directory/AbstractDirectory.java | 14 +- .../org.apache.dubbo.rpc.cluster.RouterFactory | 1 + .../src/main/java/org/apache/dubbo/common/URL.java | 60 +++-- .../dubbo/common/config/ConfigurationUtils.java | 2 +- .../dubbo/common/constants/CommonConstants.java | 6 + .../manager/DefaultExecutorRepository.java | 8 +- .../dubbo/config/AbstractInterfaceConfig.java | 2 + .../apache/dubbo/config/MetadataReportConfig.java | 13 ++ .../org/apache/dubbo/config/RegistryConfig.java | 5 + .../apache/dubbo/config/context/ConfigManager.java | 8 + .../org/apache/dubbo/config/ReferenceConfig.java | 23 +- .../org/apache/dubbo/config/ServiceConfig.java | 19 +- .../dubbo/config/bootstrap/DubboBootstrap.java | 69 +++++- .../event/listener/ServiceNameMappingListener.java | 55 ----- .../src/main/resources/META-INF/compat/dubbo.xsd | 5 + .../src/main/resources/META-INF/dubbo.xsd | 5 + .../apache/dubbo/demo/consumer/Application.java | 7 +- .../src/main/resources/spring/dubbo-consumer.xml | 12 +- .../src/main/resources/spring/dubbo-provider.xml | 11 +- .../metadata/DefaultMetadataParamsFilter.java | 49 ++++ .../DynamicConfigurationServiceNameMapping.java | 33 +-- .../dubbo/metadata/MappingChangedEvent.java} | 28 ++- .../org/apache/dubbo/metadata/MappingListener.java | 8 +- .../org/apache/dubbo/metadata/MetadataInfo.java | 149 ++++++++++-- .../dubbo/metadata/MetadataParamsFilter.java | 11 +- .../org/apache/dubbo/metadata/MetadataService.java | 5 + .../dubbo/metadata/MetadataServiceNameMapping.java | 76 +++++++ .../org/apache/dubbo/metadata/MetadataUtil.java | 49 ---- .../apache/dubbo/metadata/RevisionResolver.java | 59 +++++ .../apache/dubbo/metadata/ServiceNameMapping.java | 33 ++- .../dubbo/metadata/WritableMetadataService.java | 19 +- .../dubbo/metadata/report/MetadataReport.java | 41 +++- .../metadata/report/MetadataReportInstance.java | 28 ++- .../store/BaseWritableMetadataService.java | 73 ------ .../store/RemoteWritableMetadataService.java | 233 ------------------- .../RemoteWritableMetadataServiceDelegate.java | 100 -------- .../org.apache.dubbo.metadata.ServiceNameMapping | 3 +- ...g.apache.dubbo.metadata.WritableMetadataService | 2 - .../org/apache/dubbo/metadata/DemoService.java | 22 +- ...DynamicConfigurationServiceNameMappingTest.java | 90 -------- .../InMemoryWritableMetadataServiceTest.java | 149 ------------ .../apache/dubbo/metadata/MetadataInfoTest.java | 27 +-- .../store/InMemoryWritableMetadataServiceTest.java | 111 --------- .../store/RemoteWritableMeatadataServiceTest.java | 190 ---------------- .../RemoteWritableMetadataServiceDelegateTest.java | 216 ------------------ .../org/apache/dubbo/registry/NotifyListener.java | 2 - .../client/DefaultRegistryClusterIdentifier.java | 28 +-- .../registry/client/DefaultServiceInstance.java | 26 ++- .../client/EventPublishingServiceDiscovery.java | 5 + .../client/FileSystemServiceDiscovery.java | 5 + .../dubbo/registry/client/InstanceAddressURL.java | 100 +++++--- .../registry/client/RegistryClusterIdentifier.java | 27 ++- .../dubbo/registry/client/ServiceDiscovery.java | 6 + .../registry/client/ServiceDiscoveryRegistry.java | 183 ++++++++------- .../client/ServiceDiscoveryRegistryDirectory.java | 253 +++++++++++++++++++++ .../client/ServiceDiscoveryRegistryProtocol.java | 6 +- .../ServiceDiscoveryRegistryProtocolListener.java | 29 +-- .../dubbo/registry/client/ServiceInstance.java | 8 +- .../registry/client/ServiceInstanceCustomizer.java | 3 - .../CustomizableServiceInstanceListener.java | 42 ---- .../listener/ServiceInstancesChangedListener.java | 190 ++++++++++------ ...ExportedServicesRevisionMetadataCustomizer.java | 56 ----- ...MetadataServiceURLParamsMetadataCustomizer.java | 8 +- .../registry/client/metadata/MetadataUtils.java | 99 ++++++++ .../metadata/ProtocolPortsMetadataCustomizer.java | 7 +- .../metadata/RefreshServiceMetadataCustomizer.java | 47 ---- .../metadata/ServiceInstanceMetadataUtils.java | 7 + ...bscribedServicesRevisionMetadataCustomizer.java | 57 ----- .../client/metadata/URLRevisionResolver.java | 111 --------- .../proxy/BaseMetadataServiceProxyFactory.java | 38 ---- .../proxy/DefaultMetadataServiceProxyFactory.java | 85 ------- .../proxy/MetadataServiceProxyFactory.java | 57 ----- .../metadata/proxy/RemoteMetadataServiceProxy.java | 95 -------- .../store/InMemoryWritableMetadataService.java | 48 +++- .../metadata/store/RemoteMetadataServiceImpl.java | 137 +++++++++++ .../registry/integration/DynamicDirectory.java | 243 ++++++++++++++++++++ .../registry/integration/RegistryDirectory.java | 177 +++----------- .../integration/RegistryInvokerWrapper.java | 6 +- .../registry/integration/RegistryProtocol.java | 11 +- .../internal/org.apache.dubbo.event.EventListener | 1 - ...g.apache.dubbo.metadata.WritableMetadataService | 1 + ...dubbo.registry.client.RegistryClusterIdentifier | 1 + ...ient.metadata.proxy.MetadataServiceProxyFactory | 2 - ...o.registry.integration.RegistryProtocolListener | 1 + .../event/listener/LoggingEventListenerTest.java | 5 +- .../ServiceInstancesChangedListenerTest.java | 27 --- .../client/metadata/URLRevisionResolverTest.java | 47 ---- .../registry/consul/ConsulServiceDiscovery.java | 7 +- .../consul/ConsulServiceDiscoveryFactory.java | 17 +- ...g.apache.dubbo.registry.client.ServiceDiscovery | 1 - ...e.dubbo.registry.client.ServiceDiscoveryFactory | 1 + .../registry/dubbo/RegistryDirectoryTest.java | 2 +- .../dubbo/registry/etcd/EtcdServiceDiscovery.java | 2 +- .../registry/nacos/NacosServiceDiscovery.java | 13 +- .../nacos/NacosServiceDiscoveryFactory.java} | 17 +- ...e.dubbo.registry.client.ServiceDiscoveryFactory | 1 + .../zookeeper/ZookeeperServiceDiscovery.java | 27 +-- .../ZookeeperServiceDiscoveryChangeWatcher.java | 8 +- .../ZookeeperServiceDiscoveryFactory.java | 16 +- dubbo-registry/pom.xml | 18 +- .../main/java/org/apache/dubbo/rpc/RpcContext.java | 79 +++++++ .../dubbo/rpc/proxy/InvokerInvocationHandler.java | 5 +- 103 files changed, 2047 insertions(+), 2587 deletions(-)
