Merge branch 'apache:master' into master

songxiaosheng · Dec 18, 2023 · f7ee168 · f7ee168
2 parents 20c8061 + 44265c4
commit f7ee168
Show file tree

Hide file tree

Showing 147 changed files with 8,399 additions and 443 deletions.
diff --git a/.asf.yaml b/.asf.yaml
@@ -26,3 +26,10 @@ github:
   features:
     # Enable issue management
     issues: true
+    enabled_merge_buttons:
+        # enable squash button:
+        squash: true
+        # enable merge button:
+        merge: false
+        # disable rebase button:
+        rebase: false
diff --git a/README.md b/README.md
@@ -3,6 +3,17 @@
 [![codecov](https://codecov.io/gh/apache/dubbo-spi-extensions/branch/master/graph/badge.svg)](https://codecov.io/gh/apache/dubbo-spi-extensions)
 [![Maven Central](https://img.shields.io/maven-central/v/org.apache.dubbo/dubbo-spi-extensions.svg)](https://search.maven.org/search?q=g:org.apache.dubbo%20AND%20a:dubbo-spi-extensions)
 [![GitHub release](https://img.shields.io/github/release/apache/dubbo-spi-extensions.svg)]
+
+The purpose of dubbo-spi-extensions is to provide open, community-driven, reusable components to build microservice programs with different needs. These components extend the core of the Apache Dubbo project, but they are separated and decoupled.
+
+Developers can flexibly choose the required extension dependencies to develop microservice programs based on their needs. The available extensions are as follows:Developers can flexibly choose the required extension dependencies to develop microservice programs based on their needs. 
+
+For version release notes, please refer to the documentation:
+- [Release](https://cn.dubbo.apache.org/zh-cn/download/spi-extensions/)
+- [Reference](https://cn.dubbo.apache.org/zh-cn/overview/mannual/java-sdk/reference-manual/spi/overview/)
+
+The available extensions are as follows:
+
 - [dubbo-api-docs](dubbo-api-docs)
   - [dubbo-api-docs-annotations](dubbo-api-docs/dubbo-api-docs-annotations)
   - [dubbo-api-docs-core](dubbo-api-docs/dubbo-api-docs-core)
@@ -32,6 +43,7 @@
   - [dubbo-gateway-common](dubbo-gateway-extensions/dubbo-gateway-common)
   - [dubbo-gateway-consumer](dubbo-gateway-extensions/dubbo-gateway-consumer)
   - [dubbo-gateway-provider](dubbo-gateway-extensions/dubbo-gateway-provider)
+- [dubbo-kubernetes](dubbo-kubernetes)
 - [dubbo-metadata-report-extensions](dubbo-metadata-report-extensions)
   - [dubbo-metadata-report-consul](dubbo-metadata-report-extensions/dubbo-metadata-report-consul)
   - [dubbo-metadata-report-etcd](dubbo-metadata-report-extensions/dubbo-metadata-report-etcd)
@@ -66,7 +78,9 @@
   - [dubbo-serialization-avro](dubbo-serialization-extensions/dubbo-serialization-avro)
   - [dubbo-serialization-fastjson](dubbo-serialization-extensions/dubbo-serialization-fastjson)
   - [dubbo-serialization-fst](dubbo-serialization-extensions/dubbo-serialization-fst)
+  - [dubbo-serialization-fury](dubbo-serialization-extensions/dubbo-serialization-fury)
   - [dubbo-serialization-gson](dubbo-serialization-extensions/dubbo-serialization-gson)
+  - [dubbo-serialization-jackson](dubbo-serialization-extensions/dubbo-serialization-jackson)
   - [dubbo-serialization-kryo](dubbo-serialization-extensions/dubbo-serialization-kryo)
   - [dubbo-serialization-msgpack](dubbo-serialization-extensions/dubbo-serialization-msgpack)
   - [dubbo-serialization-native-hession](dubbo-serialization-extensions/dubbo-serialization-native-hession)
@@ -75,3 +89,16 @@
   - [dubbo-serialization-test](dubbo-serialization-extensions/dubbo-serialization-test)
 - [dubbo-tag-extensions](dubbo-tag-extensions)
   - [dubbo-tag-subnets](dubbo-tag-extensions/dubbo-tag-subnets)
+- [dubbo-xds](dubbo-xds)
+
+## Contribution
+
+
+Thanks to everyone who has contributed!
+
+
+<a href="https://github.com/apache/dubbo-spi-extensions/graphs/contributors">
+  <img src="https://contributors-img.web.app/image?repo=apache/dubbo-spi-extensions" />
+</a>
+
+
diff --git a/README_CN.md b/README_CN.md
diff --git a/dobbo-doc-auto-gen/src/main/java/org/apache/dubbo/doc/DocAutoGen.java b/dobbo-doc-auto-gen/src/main/java/org/apache/dubbo/doc/DocAutoGen.java
@@ -28,12 +28,44 @@ public static void main(String[] args) throws IOException {
         int level = 0;
         String parentPath = "";
         System.setOut(new PrintStream(filePath + "/" + "README.md"));
-        System.out.println("# dubbo-spi-extensions");
-        System.out.println("[![Build Status](https://travis-ci.org/apache/dubbo-spi-extensions.svg?branch=master)](https://travis-ci.org/apache/dubbo-spi-extensions)\n" +
+        String title = "# dubbo-spi-extensions";
+        System.out.println(title);
+        String x = "[![Build Status](https://travis-ci.org/apache/dubbo-spi-extensions.svg?branch=master)](https://travis-ci.org/apache/dubbo-spi-extensions)\n" +
             "[![codecov](https://codecov.io/gh/apache/dubbo-spi-extensions/branch/master/graph/badge.svg)](https://codecov.io/gh/apache/dubbo-spi-extensions)\n" +
             "[![Maven Central](https://img.shields.io/maven-central/v/org.apache.dubbo/dubbo-spi-extensions.svg)](https://search.maven.org/search?q=g:org.apache.dubbo%20AND%20a:dubbo-spi-extensions)\n" +
-            "[![GitHub release](https://img.shields.io/github/release/apache/dubbo-spi-extensions.svg)]");
+            "[![GitHub release](https://img.shields.io/github/release/apache/dubbo-spi-extensions.svg)]";
+        System.out.println(x);
+        System.out.println();
+        String description = "The purpose of dubbo-spi-extensions is to provide open, community-driven, reusable components to build microservice programs with different needs. These components extend the core of the Apache Dubbo project, but they are separated and decoupled.";
+        System.out.println(description);
+
+        System.out.println();
+        String usage = "Developers can flexibly choose the required extension dependencies to develop microservice programs based on their needs. The available extensions are as follows:Developers can flexibly choose the required extension dependencies to develop microservice programs based on their needs. ";
+        System.out.println(usage);
+        System.out.println();
+        System.out.println("For version release notes, please refer to the documentation:");
+        System.out.println("- [Release](https://cn.dubbo.apache.org/zh-cn/download/spi-extensions/)");
+        System.out.println("- [Reference](https://cn.dubbo.apache.org/zh-cn/overview/mannual/java-sdk/reference-manual/spi/overview/)");
+        System.out.println();
+
+        String asFollow = "The available extensions are as follows:";
+        System.out.println(asFollow);
+        System.out.println();
+
         visitFile(file, parentPath, level);
+        System.out.println();
+        String contributorTitle = "## Contribution\n";
+        String thanks = "Thanks to everyone who has contributed!\n";
+        String contributorImg =
+            "<a href=\"https://github.com/apache/dubbo-spi-extensions/graphs/contributors\">\n" +
+                "  <img src=\"https://contributors-img.web.app/image?repo=apache/dubbo-spi-extensions\" />\n" +
+                "</a>\n" ;
+        System.out.println(contributorTitle);
+        System.out.println();
+        System.out.println(thanks);
+        System.out.println();
+        System.out.println(contributorImg);
+        System.out.println();
     }
 
     private static void visitFile(File file, String parentPath, int level) {
@@ -58,7 +90,7 @@ private static void visitFile(File file, String parentPath, int level) {
                 }
 
                 String currentPath = level == 0 ? name : parentPath + "/" + name;
-                System.out.println(blank + "- [" + name + "]" + "(" +  currentPath+ ")");
+                System.out.println(blank + "- [" + name + "]" + "(" + currentPath + ")");
                 visitFile(f, currentPath, level + 1);
             }
         }

diff --git a/dubbo-api-docs/README.md b/dubbo-api-docs/README.md
@@ -9,7 +9,7 @@ Adding some annotations can generate a swagger like document without turning a n
 ## Involving repositorys
 
 * [dubbo-spi-extensions](https://github.com/apache/dubbo-spi-extensions)
-  [\branch: 2.7.x\dubbo-api-docs](https://github.com/apache/dubbo-spi-extensions/tree/2.7.x/dubbo-api-docs):
+  [\branch: 3.2.0\dubbo-api-docs](https://github.com/apache/dubbo-spi-extensions/tree/3.2.0/dubbo-api-docs):
   Dubbo-Api-Docs related annotation ,annotation parsing
 * [dubbo-admin](https://github.com/KeRan213539/dubbo-admin): Dubbo-Api-Docs document display, test function
 
@@ -25,7 +25,7 @@ Adding some annotations can generate a swagger like document without turning a n
         * Of course, Dubbo API Docs consumed a little CPU resources when the project starting and used a little memory
           for caching. In the future, it will consider putting the contents of the cache into the metadata center
 
-### Current Version: 2.7.8.3
+### Current Version: 3.2.0
 
 ```
 <dependency>

diff --git a/dubbo-api-docs/README_ch.md b/dubbo-api-docs/README_ch.md
@@ -9,7 +9,7 @@ dubbo 接口文档、测试工具,根据注解生成文档,并提供测试功能
 ## 相关项目
 
 * [dubbo-spi-extensions](https://github.com/apache/dubbo-spi-extensions)
-  [\分支: 2.7.x\dubbo-api-docs](https://github.com/apache/dubbo-spi-extensions/tree/2.7.x/dubbo-api-docs):
+  [\分支: 3.2.0\dubbo-api-docs](https://github.com/apache/dubbo-spi-extensions/tree/3.2.0/dubbo-api-docs):
   Dubbo-Api-Docs 相关注解,解析注解
 * [dubbo-admin](https://github.com/KeRan213539/dubbo-admin): Dubbo-Api-Docs 文档展示,测试功能
 
@@ -22,7 +22,7 @@ dubbo 接口文档、测试工具,根据注解生成文档,并提供测试功能
         * 为避免增加生产环境中的资源占用, 建议单独创建一个配制类用于启用Dubbo Api Docs, 并配合 @Profile("dev") 注解使用
         * 当然, Dubbo Api Docs 仅在项目启动时多消耗了点CPU资源, 并使用了一点点内存用于缓存, 将来会考虑将缓存中的内容放到元数据中心.
 
-### 当前版本: 2.7.8.3
+### 当前版本: 3.2.0
 
 ```
 <dependency>

diff --git a/dubbo-api-docs/dubbo-api-docs-annotations/pom.xml b/dubbo-api-docs/dubbo-api-docs-annotations/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.dubbo.extensions</groupId>
         <artifactId>dubbo-api-docs</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/dubbo-api-docs/dubbo-api-docs-core/pom.xml b/dubbo-api-docs/dubbo-api-docs-core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.dubbo.extensions</groupId>
         <artifactId>dubbo-api-docs</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/...-docs-core/src/main/java/org/apache/dubbo/apidocs/core/DubboApiDocsAnnotationScanner.java b/...-docs-core/src/main/java/org/apache/dubbo/apidocs/core/DubboApiDocsAnnotationScanner.java
@@ -40,6 +40,7 @@
 
 import com.alibaba.fastjson.JSON;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.dubbo.rpc.model.FrameworkModel;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
@@ -90,14 +91,7 @@ public class DubboApiDocsAnnotationScanner implements ApplicationListener<Applic
     @Autowired
     private ApplicationContext applicationContext;
 
-    @Autowired
-    private ApplicationConfig application;
 
-    @Autowired
-    private RegistryConfig registry;
-
-    @Autowired
-    private ProtocolConfig protocol;
 
     @Autowired(required = false)
     private ProviderConfig providerConfig;
@@ -524,9 +518,13 @@ private ParamBean processHtmlType(Class<?> classType, RequestParam annotation, P
      */
     private <I, T> void exportDubboService(Class<I> serviceClass, T serviceImplInstance, boolean async) {
         ServiceConfig<T> service = new ServiceConfig<>();
+        ApplicationConfig application = FrameworkModel.defaultModel().defaultApplication().getCurrentConfig();
         service.setApplication(application);
-        service.setRegistry(registry);
-        service.setProtocol(protocol);
+        List<RegistryConfig> registrys = FrameworkModel.defaultModel().defaultApplication().getApplicationConfigManager().getDefaultRegistries();
+        Collection<ProtocolConfig> protocols = FrameworkModel.defaultModel().defaultApplication().getApplicationConfigManager().getProtocols();
+
+        service.setRegistry(registrys.get(0));
+        service.setProtocol(protocols.iterator().next());
         service.setInterface(serviceClass);
         service.setRef(serviceImplInstance);
         service.setAsync(async);

diff --git a/dubbo-api-docs/dubbo-api-docs-examples/examples-api/pom.xml b/dubbo-api-docs/dubbo-api-docs-examples/examples-api/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.dubbo.extensions.examples.apidocs</groupId>
         <artifactId>dubbo-api-docs-examples</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/dubbo-api-docs/dubbo-api-docs-examples/examples-provider-sca/pom.xml b/dubbo-api-docs/dubbo-api-docs-examples/examples-provider-sca/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.dubbo.extensions.examples.apidocs</groupId>
         <artifactId>dubbo-api-docs-examples</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.dubbo.extensions.examples.apidocs</groupId>
             <artifactId>examples-api</artifactId>
-            <version>1.0.1-SNAPSHOT</version>
+            <version>${parent.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

diff --git a/dubbo-api-docs/dubbo-api-docs-examples/examples-provider/pom.xml b/dubbo-api-docs/dubbo-api-docs-examples/examples-provider/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.dubbo.extensions.examples.apidocs</groupId>
         <artifactId>dubbo-api-docs-examples</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.dubbo.extensions.examples.apidocs</groupId>
             <artifactId>examples-api</artifactId>
-            <version>1.0.1-SNAPSHOT</version>
+            <version>${parent.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -75,6 +75,7 @@
             <artifactId>dubbo-spring-boot-starter</artifactId>
         </dependency>
 
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-logging</artifactId>
@@ -104,6 +105,12 @@
             <artifactId>dubbo-monitor-default</artifactId>
             <version>${dubbo.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo-dependencies-zookeeper</artifactId>
+            <type>pom</type>
+            <version>${dubbo.version}</version>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/...examples-provider/src/main/java/org/apache/dubbo/apidocs/examples/ExampleApplication.java b/...examples-provider/src/main/java/org/apache/dubbo/apidocs/examples/ExampleApplication.java
@@ -17,23 +17,22 @@
 package org.apache.dubbo.apidocs.examples;
 
 import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
-
-import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.context.annotation.Profile;
 
 /**
  * example dubbo provider service application.
  */
+
 @SpringBootApplication
+@Profile("dev")
 @EnableDubbo(scanBasePackages = {"org.apache.dubbo.apidocs.examples.api"})
 public class ExampleApplication {
 
     public static void main(String[] args) {
         new SpringApplicationBuilder(ExampleApplication.class)
             // Non web applications
-            .web(WebApplicationType.NONE)
             .run(args);
     }
-
 }
diff --git a/dubbo-api-docs/dubbo-api-docs-examples/examples-provider/src/main/resources/application.yml b/dubbo-api-docs/dubbo-api-docs-examples/examples-provider/src/main/resources/application.yml
@@ -33,6 +33,8 @@ dubbo:
     name: dubbo
   application:
     name: dubbo-api-docs-example-provider
+    qos-enable: true
+    qos-port: 22222
   metadata-report:
     address: zookeeper://127.0.0.1:2181
   #    group: DEFAULT_GROUP

diff --git a/dubbo-api-docs/dubbo-api-docs-examples/pom.xml b/dubbo-api-docs/dubbo-api-docs-examples/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.dubbo.extensions</groupId>
         <artifactId>dubbo-api-docs</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/dubbo-api-docs/pom.xml b/dubbo-api-docs/pom.xml
@@ -25,7 +25,7 @@
     </parent>
 
     <artifactId>dubbo-api-docs</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>${project.artifactId}</name>
@@ -42,14 +42,13 @@
         <maven-checkstyle-plugin-version>3.0.0</maven-checkstyle-plugin-version>
 
         <spring-boot.version>2.3.4.RELEASE</spring-boot.version>
-        <dubbo.version>2.7.18</dubbo.version>
-        <dubbo_version>2.7.8</dubbo_version>
+        <dubbo.version>3.2.7</dubbo.version>
         <commons-beanutils.version>1.9.4</commons-beanutils.version>
         <commons-collections.version>4.2</commons-collections.version>
         <disruptor.version>3.4.2</disruptor.version>
         <springfox.version>3.0.0</springfox.version>
         <nacos.version>1.4.0</nacos.version>
-
+        <dubbo.api.docs.version>3.2.0-SNAPSHOT</dubbo.api.docs.version>
         <spring-cloud.version>Hoxton.SR8</spring-cloud.version>
         <spring-cloud-alibaba-dependencies.version>2.2.3.RELEASE</spring-cloud-alibaba-dependencies.version>
     </properties>
@@ -75,12 +74,12 @@
             <dependency>
                 <groupId>org.apache.dubbo.extensions</groupId>
                 <artifactId>dubbo-api-docs-annotations</artifactId>
-                <version>1.0.1-SNAPSHOT</version>
+                <version>${dubbo.api.docs.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.dubbo.extensions</groupId>
                 <artifactId>dubbo-api-docs-core</artifactId>
-                <version>1.0.1-SNAPSHOT</version>
+                <version>${dubbo.api.docs.version}</version>
             </dependency>
 
             <dependency>

diff --git a/dubbo-cluster-extensions/dubbo-cluster-broadcast-1/README.md b/dubbo-cluster-extensions/dubbo-cluster-broadcast-1/README.md
@@ -0,0 +1,5 @@
+
+# Dubbo Cluster BroadCast 1
+
+## Introduction
+The consumer initiates a broadcast call to all providers and obtains the call results of all providers.
diff --git a/dubbo-cluster-extensions/dubbo-cluster-broadcast-1/Readme.md b/dubbo-cluster-extensions/dubbo-cluster-broadcast-1/Readme.md
diff --git a/dubbo-cluster-extensions/dubbo-cluster-broadcast-1/pom.xml b/dubbo-cluster-extensions/dubbo-cluster-broadcast-1/pom.xml
@@ -27,13 +27,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>dubbo-cluster-broadcast-1</artifactId>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo-cluster</artifactId>
+            <version>3.2.7</version>
             <optional>true</optional>
         </dependency>
         <dependency>