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 e17b4771ee4f77b71ad5d883b87557863ef2f474 Merge: a385d42 a27494f Author: ken.lj <[email protected]> AuthorDate: Fri Jul 24 14:34:40 2020 +0800 Merge branch '3.0' of https://github.com/apache/dubbo into 3.0 .gitignore | 3 + README.md | 8 +- dubbo-all/pom.xml | 8 + .../java/org/apache/dubbo/rpc/cluster/Cluster.java | 15 +- .../cluster/{Cluster.java => ClusterInvoker.java} | 84 +- .../org/apache/dubbo/rpc/cluster/Configurator.java | 5 +- .../cluster/configurator/parser/ConfigParser.java | 26 + .../router/condition/config/ListenableRouter.java | 2 +- .../cluster/router/mock/MockInvokersSelector.java | 2 +- .../dubbo/rpc/cluster/router/tag/TagRouter.java | 12 + .../cluster/support/AbstractClusterInvoker.java | 3 +- .../support/registry/ZoneAwareClusterInvoker.java | 32 +- .../support/wrapper/MockClusterInvoker.java | 8 +- .../configurator/parser/ConfigParserTest.java | 16 + .../support/AbstractClusterInvokerTest.java | 2 +- .../src/main/java/org/apache/dubbo/common/URL.java | 60 +- .../configcenter/AbstractDynamicConfiguration.java | 103 +- .../AbstractDynamicConfigurationFactory.java | 2 +- .../config/configcenter/DynamicConfiguration.java | 10 + .../configcenter/TreePathDynamicConfiguration.java | 186 ++ .../file/FileSystemDynamicConfiguration.java | 150 +- .../dubbo/common/constants/CommonConstants.java | 41 +- .../dubbo/common/constants/RegistryConstants.java | 2 + .../org/apache/dubbo/common/convert/Converter.java | 17 + .../convert/multiple/MultiValueConverter.java | 28 + .../dubbo/common/extension/ExtensionLoader.java | 2069 ++++++++++---------- .../org/apache/dubbo/common/extension/Wrapper.java | 17 +- .../extension/support/ActivateComparator.java | 4 +- ...ivateComparator.java => WrapperComparator.java} | 232 +-- .../org/apache/dubbo/common/utils/ArrayUtils.java | 22 + .../org/apache/dubbo/common/utils/PathUtils.java | 7 +- .../org/apache/dubbo/common/utils/PojoUtils.java | 56 +- .../utils/StringConstantFieldValuePredicate.java | 67 + .../org/apache/dubbo/common/utils/StringUtils.java | 57 +- .../apache/dubbo/config/MetadataReportConfig.java | 4 +- .../java/org/apache/dubbo/config/MethodConfig.java | 7 +- .../apache/dubbo/config/ReferenceConfigBase.java | 7 +- .../org/apache/dubbo/config/RegistryConfig.java | 37 +- .../org/apache/dubbo/config/ServiceConfigBase.java | 25 +- .../dubbo/config/annotation/DubboReference.java | 9 + .../apache/dubbo/config/context/ConfigManager.java | 13 +- .../java/org/apache/dubbo/event/EventListener.java | 2 +- .../org/apache/dubbo/rpc/model/ConsumerModel.java | 7 +- .../test/java/org/apache/dubbo/common/URLTest.java | 1777 ++++++++--------- .../AbstractDynamicConfigurationTest.java | 60 +- .../file/FileSystemDynamicConfigurationTest.java | 45 +- .../common/constants/CommonConstantsTest.java | 41 + .../convert/ConverterTest.java} | 39 +- .../convert/StringToBooleanConverterTest.java | 5 +- .../convert/StringToCharArrayConverterTest.java | 5 +- .../convert/StringToCharacterConverterTest.java | 5 +- .../convert/StringToDoubleConverterTest.java | 5 +- .../convert/StringToFloatConverterTest.java | 5 +- .../convert/StringToIntegerConverterTest.java | 5 +- .../convert/StringToLongConverterTest.java | 5 +- .../convert/StringToOptionalConverterTest.java | 5 +- .../convert/StringToShortConverterTest.java | 5 +- .../convert/StringToStringConverterTest.java | 5 +- .../convert/multiple/MultiValueConverterTest.java | 72 + .../multiple/StringToArrayConverterTest.java | 4 +- .../StringToBlockingDequeConverterTest.java | 4 +- .../StringToBlockingQueueConverterTest.java | 4 +- .../multiple/StringToCollectionConverterTest.java | 5 +- .../multiple/StringToDequeConverterTest.java | 4 +- .../multiple/StringToListConverterTest.java | 4 +- .../StringToNavigableSetConverterTest.java | 6 +- .../multiple/StringToQueueConverterTest.java | 3 +- .../convert/multiple/StringToSetConverterTest.java | 3 +- .../multiple/StringToSortedSetConverterTest.java | 6 +- .../StringToTransferQueueConverterTest.java | 6 +- .../apache/dubbo/common/utils/PojoUtilsTest.java | 36 + .../StringConstantFieldValuePredicateTest.java} | 44 +- .../apache/dubbo/common/utils/StringUtilsTest.java | 73 +- .../dubbo/config/context/ConfigManagerTest.java | 7 +- .../org/apache/dubbo/event/EchoEventListener2.java | 2 +- .../dubbo/common/extension/ExtensionFactory.java | 3 + .../java/com/alibaba/dubbo/rpc/Invocation.java | 5 + .../java/com/alibaba/dubbo/rpc/RpcInvocation.java | 5 + .../java/org/apache/dubbo/cache/CacheTest.java | 5 + .../java/org/apache/dubbo/config/ConfigTest.java | 4 +- .../apache/dubbo/config/ReferenceConfigTest.java | 4 +- .../org/apache/dubbo/filter/LegacyInvocation.java | 5 + .../org/apache/dubbo/service/MockInvocation.java | 5 + dubbo-config/dubbo-config-api/pom.xml | 31 + .../org/apache/dubbo/config/ReferenceConfig.java | 83 +- .../org/apache/dubbo/config/ServiceConfig.java | 2 +- .../dubbo/config/bootstrap/DubboBootstrap.java | 223 ++- .../bootstrap/builders/ReferenceBuilder.java | 22 + .../config/bootstrap/builders/RegistryBuilder.java | 12 +- .../config/bootstrap/builders/ServiceBuilder.java | 18 +- .../dubbo/config/utils/ConfigValidationUtils.java | 14 +- ...g.apache.dubbo.metadata.MetadataServiceExporter | 3 + .../apache/dubbo/config/ReferenceConfigTest.java | 5 +- .../org/apache/dubbo/config/ServiceConfigTest.java | 30 +- ...va => ConsulDubboServiceConsumerBootstrap.java} | 10 +- ...va => ConsulDubboServiceProviderBootstrap.java} | 10 +- .../NacosDubboServiceConsumerBootstrap.java | 21 +- .../NacosDubboServiceProviderBootstrap.java | 18 +- .../ZookeeperDubboServiceConsumerBootstrap.java | 13 +- .../ZookeeperDubboServiceProviderBootstrap.java | 9 +- .../bootstrap/builders/ReferenceBuilderTest.java | 15 +- .../bootstrap/builders/RegistryBuilderTest.java | 2 +- .../bootstrap/builders/ServiceBuilderTest.java | 32 +- .../PublishingServiceDefinitionListenerTest.java | 94 + .../config/url/ExporterSideConfigUrlTest.java | 5 +- .../metadata/MetadataServiceExporterTest.java | 38 +- dubbo-config/dubbo-config-spring/pom.xml | 21 + .../apache/dubbo/config/spring/ServiceBean.java | 6 +- .../ReferenceAnnotationBeanPostProcessor.java | 92 +- .../annotation/ServiceClassPostProcessor.java | 4 +- .../spring/context/annotation/EnableDubbo.java | 2 +- .../context/annotation/EnableDubboConfig.java | 2 +- .../spring/extension/SpringExtensionFactory.java | 2 +- .../schema/AnnotationBeanDefinitionParser.java | 10 +- .../spring/schema/DubboBeanDefinitionParser.java | 45 +- .../spring/schema/DubboNamespaceHandler.java | 25 +- .../src/main/resources/META-INF/dubbo.xsd | 17 +- .../ReferenceAnnotationBeanPostProcessorTest.java | 13 + .../annotation/ReferenceBeanBuilderTest.java | 29 +- .../ServiceAnnotationBeanPostProcessorTest.java | 13 + .../annotation/ServiceClassPostProcessorTest.java | 13 + .../MultipleServicesWithMethodConfigsTest.java} | 30 +- .../DubboComponentScanRegistrarTest.java | 4 +- .../spring/context/annotation/EnableDubboTest.java | 4 +- .../consumer/test/TestConsumerConfiguration.java | 5 +- .../properties/DefaultDubboConfigBinderTest.java | 13 + .../dubbo/config/spring/issues/Issue6252Test.java | 50 + .../ZookeeperDubboSpringConsumerBootstrap.java | 53 + .../ZookeeperDubboSpringConsumerXmlBootstrap.java | 39 +- .../ZookeeperDubboSpringProviderBootstrap.java | 60 + .../spring/schema/DubboNamespaceHandlerTest.java | 4 +- .../config/spring/schema/GenericServiceTest.java | 13 + .../src/test/resources/META-INF/config.properties | 2 + .../resources/META-INF/issue-6252-test.properties | 15 + .../zookeeper-dubbb-consumer.properties | 14 + .../zookeeper-dubbb-provider.properties | 10 + .../zookeeper-dubbo-consumer.xml | 34 + .../spring/multiple-services-with-methods.xml | 45 + .../consul/ConsulDynamicConfiguration.java | 123 +- .../consul/ConsulDynamicConfigurationTest.java | 20 +- .../support/nacos/NacosDynamicConfiguration.java | 64 +- .../zookeeper/ZookeeperDynamicConfiguration.java | 68 +- .../ZookeeperDynamicConfigurationTest.java | 4 +- .../demo/consumer/comp/DemoServiceComponent.java | 4 +- .../dubbo/demo/provider/DemoServiceImpl.java | 4 +- dubbo-dependencies-bom/pom.xml | 10 +- .../dubbo-dependencies-zookeeper/pom.xml | 2 +- .../validation/support/jvalidation/JValidator.java | 6 +- .../metadata/DefaultMetadataParamsFilter.java | 8 +- .../org/apache/dubbo/metadata/MetadataInfo.java | 6 +- .../dubbo/metadata/MetadataParamsFilter.java | 15 +- .../org/apache/dubbo/metadata/MetadataService.java | 7 +- .../dubbo/metadata/MetadataServiceExporter.java | 41 +- .../apache/dubbo/metadata/MetadataServiceType.java | 72 + .../metadata/definition/TypeDefinitionBuilder.java | 10 +- .../metadata/definition/builder/TypeBuilder.java | 3 +- .../BaseApplicationMetadataIdentifier.java | 9 +- .../identifier/BaseServiceMetadataIdentifier.java | 2 +- .../metadata/report/identifier/KeyTypeEnum.java | 40 +- .../AbstractAbstractWritableMetadataService.java | 100 + .../org.apache.dubbo.metadata.MetadataParamsFilter | 1 + ...che.dubbo.metadata.report.MetadataReportFactory | 1 + .../dubbo/metadata/MetadataServiceTypeTest.java | 40 +- .../dubbo/metadata/ServiceNameMappingTest.java | 125 ++ .../metadata/definition/Test3TypeBuilder.java} | 30 +- .../metadata/definition/TestTypeBuilder.java} | 30 +- .../definition/TypeDefinitionBuilderTest.java | 21 +- .../report/identifier/KeyTypeEnumTest.java} | 20 +- .../support/AbstractMetadataReportFactoryTest.java | 265 +-- .../report/support/AbstractMetadataReportTest.java | 149 +- ...e.dubbo.metadata.definition.builder.TypeBuilder | 2 + .../META-INF/dubbo/service-name-mapping.properties | 3 + .../dubbo-metadata-report-consul/pom.xml | 8 +- .../store/consul/ConsulMetadataReport.java | 4 + .../store/consul/ConsulMetadataReportFactory.java | 13 +- dubbo-metadata/dubbo-metadata-report-nacos/pom.xml | 9 +- .../metadata/store/nacos/NacosMetadataReport.java | 131 +- .../store/nacos/NacosMetadataReportFactory.java | 13 +- .../store/nacos/NacosMetadataReportTest.java | 247 --- .../dubbo-metadata-report-zookeeper/pom.xml | 2 +- .../zookeeper/ZookeeperMetadataReportTest.java | 553 +++--- dubbo-metadata/pom.xml | 12 +- .../dubbo/qos/legacy/InvokerTelnetHandlerTest.java | 14 + .../dubbo/qos/legacy/service/DemoService.java | 2 + .../dubbo/qos/legacy/service/DemoServiceImpl.java | 5 + .../registry/client/ServiceDiscoveryRegistry.java | 4 +- .../dubbo/registry/client/ServiceInstance.java | 22 + .../metadata/ServiceInstanceMetadataUtils.java | 4 +- .../StandardMetadataServiceURLBuilder.java | 1 + .../registry/integration/RegistryDirectory.java | 4 +- .../integration/RegistryInvokerWrapper.java | 18 +- .../registry/integration/RegistryProtocol.java | 22 +- ...dubbo.registry.client.ServiceInstanceCustomizer | 3 +- .../client/DefaultServiceInstanceTest.java | 9 + ...ient.metadata.proxy.MetadataServiceProxyFactory | 2 + .../dubbo/registry/consul/ConsulParameter.java | 87 + .../dubbo/registry/consul/ConsulRegistry.java | 32 +- .../registry/consul/ConsulServiceDiscovery.java | 89 +- .../consul/ConsulServiceDiscoveryTest.java | 16 +- .../registry/dubbo/RegistryDirectoryTest.java | 2 +- .../dubbo/registry/dubbo/RegistryProtocolTest.java | 5 +- .../registry/eureka/EurekaServiceDiscovery.java | 5 +- .../nacos/util/NacosNamingServiceUtils.java | 48 +- .../remoting/http/tomcat/TomcatHttpServer.java | 10 +- .../remoting/transport/netty4/NettyServer.java | 6 +- .../org/apache/dubbo/rpc/AttachmentsAdapter.java | 48 +- .../main/java/org/apache/dubbo/rpc/Constants.java | 1 + .../org/apache/dubbo/rpc/filter/ContextFilter.java | 4 +- .../apache/dubbo/rpc/filter/GenericImplFilter.java | 3 +- .../dubbo/rpc/protocol/ProtocolFilterWrapper.java | 2 + .../rpc/protocol/ProtocolListenerWrapper.java | 2 + .../org/apache/dubbo/rpc/support/MockInvoker.java | 24 +- .../org/apache/dubbo/rpc/support/RpcUtils.java | 16 +- .../dubbo/internal/org.apache.dubbo.rpc.Filter | 3 +- .../java/org/apache/dubbo/rpc/RpcContextTest.java | 3 +- .../rpc/protocol/dubbo/CallbackServiceCodec.java | 3 + .../protocol/dubbo/DecodeableRpcInvocation.java | 2 +- .../dubbo/rpc/protocol/dubbo/DubboInvoker.java | 6 +- .../rpc/protocol/dubbo/ArgumentCallbackTest.java | 22 + .../protocol/webservice/WebServiceProtocol.java | 9 +- .../dubbo/internal/org.apache.dubbo.rpc.Protocol | 2 +- .../webservice/WebserviceProtocolTest.java | 90 + .../serialize/hessian2/Hessian2ObjectInput.java | 3 +- .../serialize/hessian2/Hessian2ObjectOutput.java | 3 +- .../hessian2/Hessian2SerializerFactory.java | 6 +- .../AbstractHessian2FactoryInitializer.java} | 21 +- .../DefaultHessian2FactoryInitializer.java} | 17 +- .../hessian2/dubbo/Hessian2FactoryInitializer.java | 43 + .../dubbo/WhitelistHessian2FactoryInitializer.java | 50 + ...alize.hessian2.dubbo.Hessian2FactoryInitializer | 2 + pom.xml | 2 +- 231 files changed, 6276 insertions(+), 4015 deletions(-)
