Triple Unary Call Support On Servlet (#14314)

* servlet * fix(servlet): Some bugfix * fix(servlet): Some protocol config read bugfix
apache · Jun 16, 2024 · 2486674 · 2486674
1 parent 35adffa
commit 2486674
Show file tree

Hide file tree

Showing 42 changed files with 1,079 additions and 43 deletions.
diff --git a/.artifacts b/.artifacts
@@ -94,6 +94,7 @@ dubbo-spring-boot
 dubbo-spring-boot-actuator
 dubbo-spring-boot-actuator-compatible
 dubbo-spring-boot-autoconfigure
+dubbo-spring-boot-3-autoconfigure
 dubbo-spring-boot-autoconfigure-compatible
 dubbo-spring-boot-compatible
 dubbo-observability-spring-boot-starters
@@ -117,4 +118,4 @@ dubbo-plugin-loom
 dubbo-rest-jaxrs
 dubbo-rest-servlet
 dubbo-rest-spring
-
+dubbo-triple-servlet
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/io/StreamUtils.java b/dubbo-common/src/main/java/org/apache/dubbo/common/io/StreamUtils.java
@@ -261,7 +261,7 @@ public static byte[] readBytes(InputStream in) throws IOException {
         if (in.getClass() == ByteArrayInputStream.class) {
             return readBytes((ByteArrayInputStream) in);
         }
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        ByteArrayOutputStream out = new ByteArrayOutputStream(1024);
         byte[] buffer = new byte[4096];
         int bytesRead;
         while ((bytesRead = in.read(buffer)) != -1) {

diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/nested/TripleConfig.java b/dubbo-common/src/main/java/org/apache/dubbo/config/nested/TripleConfig.java
@@ -193,6 +193,25 @@ public class TripleConfig implements Serializable {
      */
     private String http3CcAlgorithm;
 
+    /**
+     * Enable servlet support, requests are transport through the servlet container,
+     * which only supports unary calls due to protocol limitations
+     * <p>The default value is false.
+     */
+    private Boolean enableServlet;
+
+    /**
+     * The URL patterns that the servlet filter will be registered for.
+     * <p>The default value is '/*'.
+     */
+    private String[] servletFilterUrlPatterns;
+
+    /**
+     * The order of the servlet filter.
+     * <p>The default value is -1000000.
+     */
+    private Integer servletFilterOrder;
+
     public Integer getMaxBodySize() {
         return maxBodySize;
     }
@@ -401,6 +420,30 @@ public void setHttp3CcAlgorithm(String http3CcAlgorithm) {
         this.http3CcAlgorithm = http3CcAlgorithm;
     }
 
+    public Boolean getEnableServlet() {
+        return enableServlet;
+    }
+
+    public void setEnableServlet(Boolean enableServlet) {
+        this.enableServlet = enableServlet;
+    }
+
+    public String[] getServletFilterUrlPatterns() {
+        return servletFilterUrlPatterns;
+    }
+
+    public void setServletFilterUrlPatterns(String[] servletFilterUrlPatterns) {
+        this.servletFilterUrlPatterns = servletFilterUrlPatterns;
+    }
+
+    public Integer getServletFilterOrder() {
+        return servletFilterOrder;
+    }
+
+    public void setServletFilterOrder(Integer servletFilterOrder) {
+        this.servletFilterOrder = servletFilterOrder;
+    }
+
     public void checkDefault() {
         if (maxBodySize == null) {
             maxBodySize = 1 << 23;
@@ -438,20 +481,5 @@ public void checkDefault() {
         if (maxHeaderListSize == null) {
             maxHeaderListSize = 1 << 15;
         }
-        if (http3InitialMaxData == null) {
-            http3InitialMaxData = 1 << 23;
-        }
-        if (http3InitialMaxStreamDataBidiLocal == null) {
-            http3InitialMaxStreamDataBidiLocal = 1 << 20;
-        }
-        if (http3InitialMaxStreamDataBidiRemote == null) {
-            http3InitialMaxStreamDataBidiRemote = 1 << 20;
-        }
-        if (http3InitialMaxStreamsBidi == null) {
-            http3InitialMaxStreamsBidi = (long) 1 << 30;
-        }
-        if (http3InitialMaxStreamsUni == null) {
-            http3InitialMaxStreamsUni = (long) 1 << 30;
-        }
     }
 }
diff --git a/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-provider/pom.xml b/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-provider/pom.xml
@@ -92,6 +92,11 @@
       <version>${project.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-web</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>org.apache.dubbo</groupId>
       <artifactId>dubbo-spring-boot-starter</artifactId>

diff --git a/...dubbo-demo-spring-boot/dubbo-demo-spring-boot-provider/src/main/resources/application.yml b/...dubbo-demo-spring-boot/dubbo-demo-spring-boot-provider/src/main/resources/application.yml
@@ -21,9 +21,12 @@ spring:
 dubbo:
   application:
     name: ${spring.application.name}
+    qos-enable: false
   protocol:
-    name: dubbo
-    port: -1
+    name: tri
+    port: ${server.port}
+    triple:
+      enable-servlet: true
   registry:
     id: zk-registry
     address: zookeeper://127.0.0.1:2181
@@ -41,3 +44,10 @@ dubbo:
       exporter:
         enabled: true
     enable-metadata: true
+
+server:
+  port: 8081
+  http2:
+    enabled: true
+  tomcat:
+    keep-alive-timeout: 180000
diff --git a/dubbo-demo/dubbo-demo-spring-boot/pom.xml b/dubbo-demo/dubbo-demo-spring-boot/pom.xml
@@ -65,4 +65,14 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
+
+  <profiles>
+    <profile>
+      <id>spring-boot-3</id>
+      <properties>
+        <spring-boot.version>3.2.1</spring-boot.version>
+        <spring-boot-maven-plugin.version>3.2.1</spring-boot-maven-plugin.version>
+      </properties>
+    </profile>
+  </profiles>
 </project>
diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
@@ -109,6 +109,7 @@
     <protobuf-java_version>3.25.3</protobuf-java_version>
     <javax_annotation-api_version>1.3.2</javax_annotation-api_version>
     <servlet_version>3.1.0</servlet_version>
+    <servlet6_version>6.1.0</servlet6_version>
     <jetty_version>9.4.54.v20240208</jetty_version>
     <validation_new_version>3.1.0</validation_new_version>
     <validation_version>1.1.0.Final</validation_version>
@@ -412,7 +413,12 @@
         <artifactId>javax.servlet-api</artifactId>
         <version>${servlet_version}</version>
       </dependency>
-
+      <dependency>
+        <groupId>jakarta.servlet</groupId>
+        <artifactId>jakarta.servlet-api</artifactId>
+        <version>${servlet6_version}</version>
+        <scope>provided</scope>
+      </dependency>
       <dependency>
         <groupId>com.squareup.okhttp3</groupId>
         <artifactId>okhttp</artifactId>
@@ -1036,6 +1042,12 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>skip-spotless</id>
+      <properties>
+        <spotless.skip>true</spotless.skip>
+      </properties>
+    </profile>
   </profiles>
 
 </project>
diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
@@ -204,5 +204,11 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>skip-spotless</id>
+      <properties>
+        <spotless.skip>true</spotless.skip>
+      </properties>
+    </profile>
   </profiles>
 </project>
diff --git a/dubbo-distribution/dubbo-all-shaded/pom.xml b/dubbo-distribution/dubbo-all-shaded/pom.xml
@@ -133,7 +133,13 @@
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
-
+    <dependency>
+      <groupId>org.apache.dubbo</groupId>
+      <artifactId>dubbo-triple-servlet</artifactId>
+      <version>${project.version}</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
     <!-- metadata -->
     <dependency>
       <groupId>org.apache.dubbo</groupId>
@@ -488,6 +494,7 @@
                   <include>org.apache.dubbo:dubbo-rest-jaxrs</include>
                   <include>org.apache.dubbo:dubbo-rest-servlet</include>
                   <include>org.apache.dubbo:dubbo-rest-spring</include>
+                  <include>org.apache.dubbo:dubbo-triple-servlet</include>
                   <include>org.apache.dubbo:dubbo-serialization-api</include>
                   <include>org.apache.dubbo:dubbo-serialization-hessian2</include>
                   <include>org.apache.dubbo:dubbo-serialization-fastjson2</include>

diff --git a/dubbo-distribution/dubbo-all/pom.xml b/dubbo-distribution/dubbo-all/pom.xml
@@ -290,6 +290,13 @@
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>org.apache.dubbo</groupId>
+      <artifactId>dubbo-triple-servlet</artifactId>
+      <version>${project.version}</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
 
     <!-- registry -->
     <dependency>
@@ -536,6 +543,7 @@
                   <include>org.apache.dubbo:dubbo-rest-jaxrs</include>
                   <include>org.apache.dubbo:dubbo-rest-servlet</include>
                   <include>org.apache.dubbo:dubbo-rest-spring</include>
+                  <include>org.apache.dubbo:dubbo-triple-servlet</include>
                   <include>org.apache.dubbo:dubbo-serialization-api</include>
                   <include>org.apache.dubbo:dubbo-serialization-hessian2</include>
                   <include>org.apache.dubbo:dubbo-serialization-fastjson2</include>

diff --git a/dubbo-distribution/dubbo-bom/pom.xml b/dubbo-distribution/dubbo-bom/pom.xml
@@ -344,6 +344,11 @@
         <artifactId>dubbo-rest-spring</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.dubbo</groupId>
+        <artifactId>dubbo-triple-servlet</artifactId>
+        <version>${project.version}</version>
+      </dependency>
 
       <!-- registry -->
       <dependency>
@@ -490,6 +495,11 @@
         <artifactId>dubbo-spring-boot-autoconfigure</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.dubbo</groupId>
+        <artifactId>dubbo-spring-boot-3-autoconfigure</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.dubbo</groupId>
         <artifactId>dubbo-spring-boot-compatible</artifactId>

diff --git a/dubbo-distribution/pom.xml b/dubbo-distribution/pom.xml
@@ -115,5 +115,11 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>skip-spotless</id>
+      <properties>
+        <spotless.skip>true</spotless.skip>
+      </properties>
+    </profile>
   </profiles>
 </project>
diff --git a/...ava/org/apache/dubbo/rpc/protocol/tri/rest/support/servlet/ServletHttpRequestAdaptee.java b/...ava/org/apache/dubbo/rpc/protocol/tri/rest/support/servlet/ServletHttpRequestAdaptee.java
@@ -19,6 +19,7 @@
 import org.apache.dubbo.common.utils.CollectionUtils;
 import org.apache.dubbo.remoting.http12.HttpChannel;
 import org.apache.dubbo.remoting.http12.HttpMetadata;
+import org.apache.dubbo.remoting.http12.HttpVersion;
 import org.apache.dubbo.remoting.http12.message.DefaultHttpRequest;
 
 import javax.servlet.AsyncContext;
@@ -319,7 +320,7 @@ public Map<String, String[]> getParameterMap() {
 
     @Override
     public String getProtocol() {
-        return isHttp2() ? "HTTP/2.0" : "HTTP/1.1";
+        return isHttp2() ? HttpVersion.HTTP2.getProtocol() : HttpVersion.HTTP1.getProtocol();
     }
 
     @Override