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 7d95d1a82fae6eb902e47fd2454bff36f5bcad0d Merge: e17b477 99c4166 Author: ken.lj <[email protected]> AuthorDate: Tue Aug 4 14:51:50 2020 +0800 Merge branch '3.0' of https://github.com/apache/dubbo into 3.0 .../apache/dubbo/rpc/cluster/ClusterInvoker.java | 2 + .../org/apache/dubbo/rpc/cluster/Directory.java | 2 + .../rpc/cluster/directory/AbstractDirectory.java | 1 + .../cluster/support/AbstractClusterInvoker.java | 5 + .../support/wrapper/MockClusterInvoker.java | 5 + .../dubbo/common/constants/RegistryConstants.java | 10 + .../org/apache/dubbo/config/ApplicationConfig.java | 8 +- .../org/apache/dubbo/rpc/model/ConsumerModel.java | 6 + .../dubbo/config/utils/ConfigValidationUtils.java | 30 +- .../apache/dubbo/demo/consumer/Application.java | 19 + .../src/main/resources/spring/dubbo-consumer.xml | 7 +- .../dubbo/demo/provider/GreetingServiceImpl.java | 29 +- .../src/main/resources/spring/dubbo-provider.xml | 7 +- .../DynamicConfigurationServiceNameMapping.java | 2 +- .../apache/dubbo/metadata/MappingChangedEvent.java | 9 + .../org/apache/dubbo/metadata/MetadataInfo.java | 35 +- .../apache/dubbo/metadata/ServiceNameMapping.java | 3 +- .../metadata/report/MetadataReportInstance.java | 10 + .../org.apache.dubbo.metadata.ServiceNameMapping | 3 +- ...che.dubbo.metadata.report.MetadataReportFactory | 1 - .../apache/dubbo/metadata/MetadataInfoTest.java | 2 +- .../client/DefaultRegistryClusterIdentifier.java | 9 +- .../registry/client/DefaultServiceInstance.java | 1 + .../dubbo/registry/client/InstanceAddressURL.java | 18 +- .../registry/client/RegistryClusterIdentifier.java | 7 +- .../{integration => client}/RegistryProtocol.java | 1655 ++++++++++---------- .../registry/client/ServiceDiscoveryRegistry.java | 26 +- .../client/ServiceDiscoveryRegistryDirectory.java | 53 +- .../client/ServiceDiscoveryRegistryProtocol.java | 51 - .../ServiceDiscoveryRegistryProtocolListener.java | 1 - .../client/ServiceInstanceMetadataCustomizer.java | 73 - .../listener/ServiceInstancesChangedListener.java | 30 +- .../metadata/MetadataServiceNameMapping.java | 51 +- ...MetadataServiceURLParamsMetadataCustomizer.java | 31 +- .../registry/client/metadata/MetadataUtils.java | 2 + .../ServiceInstanceMetadataCustomizer.java | 88 ++ .../metadata/ServiceInstanceMetadataUtils.java | 9 +- .../StandardMetadataServiceURLBuilder.java | 5 +- .../store/InMemoryWritableMetadataService.java | 20 +- .../metadata/store/RemoteMetadataServiceImpl.java | 18 +- .../registry/integration/DynamicDirectory.java | 2 +- .../InterfaceCompatibleRegistryProtocol.java | 177 +++ .../registry/integration/RegistryDirectory.java | 2 +- .../integration/RegistryInvokerWrapper.java | 79 - .../integration/RegistryProtocolListener.java | 1 + .../org.apache.dubbo.metadata.ServiceNameMapping | 1 + ...dubbo.registry.client.ServiceInstanceCustomizer | 1 + .../dubbo/internal/org.apache.dubbo.rpc.Protocol | 4 +- 48 files changed, 1426 insertions(+), 1185 deletions(-)
