This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch fix-3.0-spring-boot-metadata-service in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit b2737542620a279cee521c196b201c16d76baf88 Merge: dd1a1824a7 feb1792b63 Author: ken.lj <[email protected]> AuthorDate: Mon Mar 28 17:35:54 2022 +0800 Merge branch '3.0' of https://github.com/apache/dubbo into 3.0 .../apache/dubbo/gen/dubbo/Dubbo3Generator.java | 2 +- .../src/main/resources/DubboStub3Single.mustache | 78 ++++++++++++++++++++++ .../apache/dubbo/rpc/cluster/ClusterInvoker.java | 2 +- .../config/model/ConditionRouterRule.java | 3 - .../router/file/FileStateRouterFactory.java | 3 +- .../dubbo/rpc/cluster/router/tag/model/Tag.java | 3 - .../cluster/support/AvailableClusterInvoker.java | 2 +- .../cluster/support/BroadcastClusterInvoker.java | 11 ++- .../support/registry/ZoneAwareClusterInvoker.java | 2 +- .../support/wrapper/MockClusterInvoker.java | 10 +-- .../absent/AbsentConfiguratorTest.java | 8 +-- .../configurator/parser/ConfigParserTest.java | 14 ++-- ...uterTest.java => ConditionStateRouterTest.java} | 2 +- .../virtualservice/match/DubboMethodMatchTest.java | 3 - .../rpc/cluster/router/tag/TagStateRouterTest.java | 2 - .../support/wrapper/MockClusterInvokerTest.java | 6 +- .../apache/dubbo/common/BaseServiceMetadata.java | 4 +- .../apache/dubbo/common/config/Environment.java | 2 +- .../dubbo/common/config/ModuleEnvironment.java | 7 +- .../dubbo/common/extension/ExtensionDirector.java | 2 + .../org/apache/dubbo/rpc/model/ConsumerModel.java | 2 +- .../org/apache/dubbo/rpc/model/ModuleModel.java | 5 ++ .../org/apache/dubbo/rpc/model/ProviderModel.java | 3 +- .../apache/dubbo/rpc/model/ServiceMetadata.java | 3 +- .../ReferenceAnnotationBeanPostProcessor.java | 6 +- .../annotation/ServiceAnnotationPostProcessor.java | 2 +- ...onfigDefaultPropertyValueBeanPostProcessor.java | 2 +- .../context/DubboConfigApplicationListener.java | 2 +- .../spring/context/DubboSpringInitializer.java | 2 +- .../spring/reference/ReferenceBeanSupport.java | 2 +- .../config/spring/util/DubboAnnotationUtils.java | 5 +- .../dubbo/config/spring/util/DubboBeanUtils.java | 2 +- .../annotation/MethodConfigCallbackTest.java | 4 +- .../annotation/ServiceBeanNameBuilderTest.java | 3 - .../dubbo/metadata/AbstractServiceNameMapping.java | 1 + .../registry/client/AbstractServiceDiscovery.java | 3 + .../client/ServiceDiscoveryRegistryTest.java | 1 - .../dubbo/rpc/protocol/dubbo/DubboProtocol.java | 24 ++++++- 38 files changed, 168 insertions(+), 70 deletions(-)
