From b4ca9bae08fe5ed49fd5e416a28f3174dcccf201 Mon Sep 17 00:00:00 2001
From: Sean Yang <oxsean@gmail.com>
Date: Wed, 6 Nov 2024 09:35:40 +0800
Subject: [PATCH] Spring6 compatibility

---
 dubbo-config/dubbo-config-spring6/pom.xml     |  12 +-
 dubbo-config/pom.xml                          |   2 -
 dubbo-dependencies-bom/pom.xml                |   6 +-
 .../tri/rest/support/spring/Helper.java       |  32 +++
 .../spring/SpringResponseRestFilter.java      |   2 +-
 .../dubbo-spring-boot-3-autoconfigure/pom.xml |   6 +-
 pom.xml                                       | 205 +++++++++++++++++-
 7 files changed, 244 insertions(+), 21 deletions(-)

diff --git a/dubbo-config/dubbo-config-spring6/pom.xml b/dubbo-config/dubbo-config-spring6/pom.xml
index 673fe767162..520beba17a3 100644
--- a/dubbo-config/dubbo-config-spring6/pom.xml
+++ b/dubbo-config/dubbo-config-spring6/pom.xml
@@ -28,8 +28,6 @@
   <properties>
     <maven.compiler.source>17</maven.compiler.source>
     <maven.compiler.target>17</maven.compiler.target>
-    <spring.version>6.1.14</spring.version>
-    <spring-boot.version>3.0.9</spring-boot.version>
   </properties>
 
   <dependencies>
@@ -48,22 +46,22 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      <version>${spring.version}</version>
+      <version>${spring-6.version}</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-      <version>${spring.version}</version>
+      <version>${spring-6.version}</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
-      <version>${spring.version}</version>
+      <version>${spring-6.version}</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>${spring.version}</version>
+      <version>${spring-6.version}</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -74,7 +72,7 @@
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-test</artifactId>
-      <version>${spring-boot.version}</version>
+      <version>${spring-boot-3.version}</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
diff --git a/dubbo-config/pom.xml b/dubbo-config/pom.xml
index ecfb4322ec3..bc404270a6d 100644
--- a/dubbo-config/pom.xml
+++ b/dubbo-config/pom.xml
@@ -56,8 +56,6 @@
         <jdk>[17,)</jdk>
       </activation>
       <modules>
-        <module>dubbo-config-api</module>
-        <module>dubbo-config-spring</module>
         <module>dubbo-config-spring6</module>
       </modules>
     </profile>
diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index a9cdc007d06..25397c73d88 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -90,6 +90,7 @@
     <!-- Common libs -->
     <!-- <spring_version>4.3.30.RELEASE</spring_version> -->
     <spring_version>5.3.39</spring_version>
+    <spring_boot_version>2.7.18</spring_boot_version>
     <spring_security_version>5.8.15</spring_security_version>
     <javassist_version>3.30.2-GA</javassist_version>
     <byte-buddy_version>1.15.7</byte-buddy_version>
@@ -187,7 +188,6 @@
     <open_feign_version>3.1.9</open_feign_version>
     <jakarta.xml.bind-api.version>4.0.2</jakarta.xml.bind-api.version>
     <jaxb-runtime.version>2.4.0-b180830.0438</jaxb-runtime.version>
-    <spring-boot.version>2.7.18</spring-boot.version>
     <!-- Spring boot buddy is lower than the delivery dependency package version and can only show the defined dependency version -->
     <byte-buddy.version>1.15.1</byte-buddy.version>
     <prometheus-client.version>0.16.0</prometheus-client.version>
@@ -259,7 +259,7 @@
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-dependencies</artifactId>
-        <version>${spring-boot.version}</version>
+        <version>${spring_boot_version}</version>
         <type>pom</type>
         <scope>import</scope>
         <exclusions>
@@ -272,7 +272,7 @@
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-logging</artifactId>
-        <version>${spring-boot.version}</version>
+        <version>${spring_boot_version}</version>
         <exclusions>
           <exclusion>
             <groupId>ch.qos.logback</groupId>
diff --git a/dubbo-plugin/dubbo-rest-spring/src/main/java/org/apache/dubbo/rpc/protocol/tri/rest/support/spring/Helper.java b/dubbo-plugin/dubbo-rest-spring/src/main/java/org/apache/dubbo/rpc/protocol/tri/rest/support/spring/Helper.java
index fd818c06770..26d38cbd61e 100644
--- a/dubbo-plugin/dubbo-rest-spring/src/main/java/org/apache/dubbo/rpc/protocol/tri/rest/support/spring/Helper.java
+++ b/dubbo-plugin/dubbo-rest-spring/src/main/java/org/apache/dubbo/rpc/protocol/tri/rest/support/spring/Helper.java
@@ -19,13 +19,30 @@
 import org.apache.dubbo.rpc.protocol.tri.rest.mapping.meta.AnnotationMeta;
 
 import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
 
+import org.springframework.core.SpringVersion;
+import org.springframework.http.ResponseEntity;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.ValueConstants;
 
 final class Helper {
 
+    public static boolean IS_SPRING_6;
+
+    private static Method getStatusCode;
+    private static Method value;
+
     private Helper() {}
 
+    static {
+        try {
+            String version = SpringVersion.getVersion();
+            IS_SPRING_6 = StringUtils.hasLength(version) && version.charAt(0) >= '6';
+        } catch (Throwable ignored) {
+        }
+    }
+
     public static boolean isRequired(AnnotationMeta<Annotation> annotation) {
         return annotation.getBoolean("required");
     }
@@ -41,4 +58,19 @@ public static String defaultValue(AnnotationMeta<Annotation> annotation, String
     public static String defaultValue(String value) {
         return ValueConstants.DEFAULT_NONE.equals(value) ? null : value;
     }
+
+    public static int getStatusCode(ResponseEntity<?> entity) {
+        if (IS_SPRING_6) {
+            try {
+                if (getStatusCode == null) {
+                    getStatusCode = ResponseEntity.class.getMethod("getStatusCode");
+                    value = getStatusCode.getReturnType().getMethod("value");
+                }
+                return (Integer) value.invoke(getStatusCode.invoke(entity));
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
+        return entity.getStatusCode().value();
+    }
 }
diff --git a/dubbo-plugin/dubbo-rest-spring/src/main/java/org/apache/dubbo/rpc/protocol/tri/rest/support/spring/SpringResponseRestFilter.java b/dubbo-plugin/dubbo-rest-spring/src/main/java/org/apache/dubbo/rpc/protocol/tri/rest/support/spring/SpringResponseRestFilter.java
index 05458703c58..f182551087a 100644
--- a/dubbo-plugin/dubbo-rest-spring/src/main/java/org/apache/dubbo/rpc/protocol/tri/rest/support/spring/SpringResponseRestFilter.java
+++ b/dubbo-plugin/dubbo-rest-spring/src/main/java/org/apache/dubbo/rpc/protocol/tri/rest/support/spring/SpringResponseRestFilter.java
@@ -87,7 +87,7 @@ public void onResponse(Result result, HttpRequest request, HttpResponse response
             ResponseEntity<?> entity = (ResponseEntity<?>) value;
             result.setValue(HttpResult.builder()
                     .body(entity.getBody())
-                    .status(entity.getStatusCode().value())
+                    .status(Helper.getStatusCode(entity))
                     .headers(entity.getHeaders())
                     .build());
             return;
diff --git a/dubbo-spring-boot-project/dubbo-spring-boot-3-autoconfigure/pom.xml b/dubbo-spring-boot-project/dubbo-spring-boot-3-autoconfigure/pom.xml
index 07ec5b92a4a..feeedbe2b8a 100644
--- a/dubbo-spring-boot-project/dubbo-spring-boot-3-autoconfigure/pom.xml
+++ b/dubbo-spring-boot-project/dubbo-spring-boot-3-autoconfigure/pom.xml
@@ -28,16 +28,12 @@
   <packaging>jar</packaging>
   <description>Apache Dubbo Spring Boot 3 Auto-Configure</description>
 
-  <properties>
-    <spring-boot.version>3.2.1</spring-boot.version>
-  </properties>
-
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-dependencies</artifactId>
-        <version>${spring-boot.version}</version>
+        <version>${spring-boot-3.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/pom.xml b/pom.xml
index 02d93df0521..52fc8a66450 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,6 +129,7 @@
     <checkstyle_unix.skip>true</checkstyle_unix.skip>
     <rat.skip>true</rat.skip>
     <jacoco.skip>true</jacoco.skip>
+    <spotless.action>check</spotless.action>
 
     <!-- Maven plugins -->
     <maven_jar_version>3.4.2</maven_jar_version>
@@ -148,10 +149,13 @@
     <maven_protobuf_plugin_version>0.6.1</maven_protobuf_plugin_version>
     <maven_gmavenplus.version>3.0.2</maven_gmavenplus.version>
 
+    <!-- For unify spring boot 3 version -->
+    <spring-6.version>6.1.14</spring-6.version>
+    <spring-boot-3.version>3.3.5</spring-boot-3.version>
+
     <protobuf-protoc_version>3.22.3</protobuf-protoc_version>
     <grpc_version>1.54.0</grpc_version>
     <spotless-maven-plugin.version>2.43.0</spotless-maven-plugin.version>
-    <spotless.action>check</spotless.action>
     <dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version>
     <palantirJavaFormat.version>2.38.0</palantirJavaFormat.version>
     <revision>3.3.2-SNAPSHOT</revision>
@@ -710,8 +714,6 @@
                       <version>${log4j2_version}</version>
                     </additionalDependency>
                   </additionalDependencies>
-                  <!--FIXME-->
-                  <!--<doclint>all,-missing</doclint>-->
                   <doclint>none</doclint>
                 </configuration>
               </execution>
@@ -982,5 +984,202 @@
         <module>dubbo-demo</module>
       </modules>
     </profile>
+    <profile>
+      <id>spring-6</id>
+      <dependencyManagement>
+        <dependencies>
+          <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aop</artifactId>
+            <version>${spring-6.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aspects</artifactId>
+            <version>${spring-6.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <version>${spring-6.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>${spring-6.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-indexer</artifactId>
+            <version>${spring-6.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+            <version>${spring-6.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>${spring-6.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core-test</artifactId>
+            <version>${spring-6.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-expression</artifactId>
+            <version>${spring-6.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-instrument</artifactId>
+            <version>${spring-6.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jcl</artifactId>
+            <version>${spring-6.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jdbc</artifactId>
+            <version>${spring-6.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>${spring-6.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-tx</artifactId>
+            <version>${spring-6.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>${spring-6.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <version>${spring-6.version}</version>
+          </dependency>
+        </dependencies>
+      </dependencyManagement>
+    </profile>
+    <profile>
+      <id>spring-boot-3</id>
+      <properties>
+        <tomcat.version>10.1.31</tomcat.version>
+      </properties>
+      <dependencyManagement>
+        <dependencies>
+          <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot</artifactId>
+            <version>${spring-boot-3.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
+            <version>${spring-boot-3.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+            <version>${spring-boot-3.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-test</artifactId>
+            <version>${spring-boot-3.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-test-autoconfigure</artifactId>
+            <version>${spring-boot-3.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <version>${spring-boot-3.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-actuator</artifactId>
+            <version>${spring-boot-3.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-actuator-autoconfigure</artifactId>
+            <version>${spring-boot-3.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+            <version>${spring-boot-3.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <version>${spring-boot-3.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+            <version>${spring-boot-3.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-json</artifactId>
+            <version>${spring-boot-3.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-log4j2</artifactId>
+            <version>${spring-boot-3.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-logging</artifactId>
+            <version>${spring-boot-3.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+            <version>${spring-boot-3.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+            <version>${spring-boot-3.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <version>${spring-boot-3.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-core</artifactId>
+            <version>${tomcat.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-el</artifactId>
+            <version>${tomcat.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-websocket</artifactId>
+            <version>${tomcat.version}</version>
+          </dependency>
+        </dependencies>
+      </dependencyManagement>
+    </profile>
   </profiles>
 </project>