This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch 3.3 in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit fd14e7b76f0cdc8cebf7db686a07a3b27a95fadd Merge: 642f741dba 2cb12ff9a6 Author: Albumen Kevin <[email protected]> AuthorDate: Mon Jun 12 20:52:32 2023 +0800 Merge branch 'apache-3.2' into apache-3.3 # Conflicts: # dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestProtocol.java # dubbo-test/dubbo-test-modules/src/test/java/org/apache/dubbo/dependency/FileTest.java .artifacts | 4 + .../cluster/configurator/AbstractConfigurator.java | 2 +- .../configurator/parser/model/ConditionMatch.java | 18 +++- .../configurator/parser/model/ParamMatch.java | 4 +- .../condition/config/ListenableStateRouter.java | 4 +- .../rpc/cluster/router/tag/TagStateRouter.java | 4 +- .../rpc/cluster/router/tag/model/ParamMatch.java | 2 +- .../support/wrapper/ScopeClusterInvoker.java | 36 +++++-- .../configurator/parser/ConfigParserTest.java | 18 ++-- .../support/wrapper/ScopeClusterInvokerTest.java | 3 +- .../common/threadpool/ThreadlessExecutor.java | 8 +- .../java/org/apache/dubbo/config/ModuleConfig.java | 13 +++ .../common/threadpool/ThreadlessExecutorTest.java | 13 ++- .../alibaba/dubbo/container/page/PageServlet.java | 2 +- .../main/java/com/alibaba/dubbo/rpc/Invoker.java | 16 +++ .../org/apache/dubbo/config/ReferenceConfig.java | 4 + .../config/deploy/DefaultApplicationDeployer.java | 6 ++ .../dubbo/config/deploy/DefaultModuleDeployer.java | 5 +- .../context/DubboSpringInitCustomizerHolder.java | 2 +- .../src/main/resources/META-INF/dubbo.xsd | 5 + .../support/nacos/NacosDynamicConfiguration.java | 17 +-- .../dubbo/demo/rest/api/JaxRsRestDemoService.java | 2 +- dubbo-dependencies-bom/pom.xml | 2 +- dubbo-distribution/dubbo-bom/pom.xml | 20 ++++ .../dubbo/metadata/AbstractServiceNameMapping.java | 26 ++--- .../apache/dubbo/metadata/rest/PathMatcher.java | 73 +++++++++++-- .../dubbo/metadata/rest/ServiceRestMetadata.java | 1 + .../org/apache/dubbo/metadata/PathMatcherTest.java | 35 +++++++ .../registry/client/ServiceDiscoveryRegistry.java | 4 +- .../registry/integration/RegistryDirectory.java | 12 +++ .../registry/nacos/NacosConnectionManager.java | 6 +- .../java/org/apache/dubbo/remoting/Constants.java | 2 + .../remoting/exchange/support/DefaultFuture.java | 33 ++++-- .../support/header/HeaderExchangeChannel.java | 10 +- .../support/header/HeaderExchangeHandler.java | 10 +- .../exchange/support/DefaultFutureTest.java | 4 +- .../java/org/apache/dubbo/rpc/AsyncRpcResult.java | 16 ++- .../dubbo/rpc/protocol/AbstractProtocol.java | 3 +- .../dubbo/rpc/protocol/AbstractProxyProtocol.java | 87 ++++++++++------ .../rpc/protocol/rest/PathAndInvokerMapper.java | 26 ++--- .../dubbo/rpc/protocol/rest/RestProtocol.java | 1 - .../rpc/protocol/rest/RestRPCInvocationUtil.java | 109 +++++++++++++++++-- .../rpc/protocol/rest/constans/RestConstant.java | 5 + .../protocol/rest/handler/NettyHttpHandler.java | 14 ++- .../rpc/protocol/rest/JaxrsRestProtocolTest.java | 23 +++++ .../protocol/rest/rest/TestGetInvokerService.java | 30 ++---- .../rest/rest/TestGetInvokerServiceImpl.java | 57 ++++++++++ .../dubbo-nacos-spring-boot-starter/pom.xml | 44 ++++++++ .../pom.xml | 115 +++++++++++++++++++++ .../dubbo-zookeeper-spring-boot-starter/pom.xml | 48 +++++++++ .../observability}/autoconfigure/pom.xml | 0 .../DubboMicrometerTracingAutoConfiguration.java | 0 .../DubboObservationAutoConfiguration.java | 0 .../autoconfigure/ObservabilityUtils.java | 0 .../autoconfigure/ObservationHandlerGrouping.java | 0 .../ObservationRegistryPostProcessor.java | 0 .../ConditionalOnDubboTracingEnable.java | 0 .../brave/BraveAutoConfiguration.java | 0 .../exporter/otlp/OtlpAutoConfiguration.java | 0 .../autoconfigure/exporter/zipkin/HttpSender.java | 0 .../exporter/zipkin/ZipkinAutoConfiguration.java | 0 .../exporter/zipkin/ZipkinConfigurations.java | 0 .../exporter/zipkin/ZipkinRestTemplateSender.java | 0 .../exporter/zipkin/ZipkinWebClientSender.java | 0 .../ZipkinRestTemplateBuilderCustomizer.java | 0 .../ZipkinWebClientBuilderCustomizer.java | 0 .../otel/OpenTelemetryAutoConfiguration.java | 0 .../src/main/resources/META-INF/spring.factories | 0 ...rk.boot.autoconfigure.AutoConfiguration.imports | 0 ...bboMicrometerTracingAutoConfigurationTests.java | 0 .../pom.xml | 0 .../pom.xml | 0 .../pom.xml | 0 .../pom.xml | 0 .../observability}/pom.xml | 4 +- .../dubbo-spring-boot-starters/pom.xml | 41 ++++++++ dubbo-spring-boot/pom.xml | 4 +- dubbo-test/dubbo-dependencies-all/pom.xml | 15 +++ .../java/org/apache/dubbo/dependency/FileTest.java | 2 +- pom.xml | 2 +- 80 files changed, 901 insertions(+), 171 deletions(-) diff --cc dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestProtocol.java index 8344a7ca17,f42a2e7266..8ef0acad5b --- a/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestProtocol.java +++ b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestProtocol.java @@@ -32,10 -30,7 +32,9 @@@ import org.apache.dubbo.rpc.protocol.Ab import org.apache.dubbo.rpc.protocol.AbstractProtocol; import org.apache.dubbo.rpc.protocol.rest.annotation.consumer.HttpConnectionPreBuildIntercept; import org.apache.dubbo.rpc.protocol.rest.annotation.metadata.MetadataResolver; +import org.apache.dubbo.rpc.protocol.rest.deploy.ServiceDeployer; +import org.apache.dubbo.rpc.protocol.rest.deploy.ServiceDeployerManager; - import java.util.Map; import java.util.Objects; import java.util.Set; diff --cc dubbo-test/dubbo-test-modules/src/test/java/org/apache/dubbo/dependency/FileTest.java index e69e3b98ea,a9182429f5..0d2aabbfd3 --- a/dubbo-test/dubbo-test-modules/src/test/java/org/apache/dubbo/dependency/FileTest.java +++ b/dubbo-test/dubbo-test-modules/src/test/java/org/apache/dubbo/dependency/FileTest.java @@@ -63,9 -61,7 +63,9 @@@ class FileTest ignoredModulesInDubboAll.add(Pattern.compile("dubbo-distribution")); ignoredModulesInDubboAll.add(Pattern.compile("dubbo-metadata-processor")); ignoredModulesInDubboAll.add(Pattern.compile("dubbo-native.*")); + ignoredModulesInDubboAll.add(Pattern.compile("dubbo-config-spring6.*")); - ignoredModulesInDubboAll.add(Pattern.compile("dubbo-spring-boot.*")); + ignoredModulesInDubboAll.add(Pattern.compile(".*spring-boot.*")); + ignoredModulesInDubboAll.add(Pattern.compile("dubbo-annotation-processor.*")); ignoredModulesInDubboAll.add(Pattern.compile("dubbo-maven-plugin")); }
