Rest refine

Author: oxsean

.artifacts

@@ -116,6 +116,5 @@ dubbo-tracing
 dubbo-xds
 dubbo-plugin-loom
 dubbo-rest-jaxrs
-dubbo-rest-servlet
 dubbo-rest-spring
 dubbo-triple-servlet

.editorconfig

@@ -42,26 +42,40 @@ ij_java_keep_simple_lambdas_in_one_line = true
 ij_java_keep_simple_methods_in_one_line = true
 ij_java_keep_blank_lines_in_code = 1
 ij_java_keep_blank_lines_in_declarations = 1
+ij_java_blank_lines_after_class_header = 1
 ij_java_class_count_to_use_import_on_demand = 999
 ij_java_names_count_to_use_import_on_demand = 999
 ij_java_imports_layout = org.apache.dubbo.**, |, javax.**, |, java.**, |, *, |, $*
 ij_java_insert_inner_class_imports = true
 ij_java_space_before_array_initializer_left_brace = true
 ij_java_method_parameters_new_line_after_left_paren = true
-ij_java_wrap_comments = true
-ij_java_wrap_long_lines = true
+ij_java_wrap_comments = false
+ij_java_wrap_long_lines = false
 ij_java_enum_constants_wrap = split_into_lines
-ij_java_method_call_chain_wrap = split_into_lines
+ij_java_method_call_chain_wrap = on_every_item
 ij_java_method_parameters_wrap = on_every_item
-ij_java_extends_list_wrap = on_every_item
+ij_java_extends_list_wrap = normal
 ij_java_extends_keyword_wrap = normal
 ij_java_binary_operation_wrap = normal
 ij_java_binary_operation_sign_on_next_line = true
 
+[*.groovy]
+max_line_length = 180
+ij_groovy_label_indent_size = 4
+ij_groovy_keep_blank_lines_in_code = 1
+ij_groovy_keep_blank_lines_in_declarations = 1
+ij_groovy_blank_lines_after_class_header = 1
+ij_groovy_class_count_to_use_import_on_demand = 999
+ij_groovy_names_count_to_use_import_on_demand = 999
+ij_groovy_imports_layout = org.apache.dubbo.**, |, javax.**, |, java.**, |, *, |, $*
+ij_groovy_space_after_type_cast = false
+
 [*.json]
 tab_width = 2
+indent_size = 2
 
 [*.{yml,yaml}]
+tab_width = 2
 indent_size = 2
 
 [*.xml]

dubbo-common/src/main/java/org/apache/dubbo/common/utils/SystemPropertyConfigUtils.java

@@ -37,7 +37,10 @@ public class SystemPropertyConfigUtils {
             for (Field field : fields) {
                 try {
                     assert systemProperties != null;
-                    systemProperties.add((String) field.get(null));
+                    Object value = field.get(null);
+                    if (value instanceof String) {
+                        systemProperties.add((String) value);
+                    }
                 } catch (IllegalAccessException e) {
                     throw new IllegalStateException(
                             String.format("%s does not have field of %s", clazz.getName(), field.getName()));

dubbo-dependencies-bom/pom.xml

@@ -109,7 +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>
+    <jakarta_servlet_version>6.1.0</jakarta_servlet_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>
@@ -152,8 +152,7 @@
     <log4j2_version>2.23.1</log4j2_version>
     <commons_io_version>2.16.1</commons_io_version>
     <commons-codec_version>1.16.0</commons-codec_version>
-
-    <embedded_redis_version>1.4.3</embedded_redis_version>
+    <groovy_version>4.0.21</groovy_version>
 
     <!-- Alibaba -->
     <alibaba_spring_context_support_version>1.0.11</alibaba_spring_context_support_version>
@@ -164,7 +163,9 @@
     <awaitility_version>4.2.0</awaitility_version>
     <hamcrest_version>2.2</hamcrest_version>
     <cglib_version>2.2.2</cglib_version>
+    <embedded_redis_version>1.4.3</embedded_redis_version>
     <mockito_version>4.11.0</mockito_version>
+    <spock_version>2.3-groovy-4.0</spock_version>
 
     <jaxb_version>2.2.7</jaxb_version>
     <activation_version>1.2.0</activation_version>
@@ -416,7 +417,7 @@
       <dependency>
         <groupId>jakarta.servlet</groupId>
         <artifactId>jakarta.servlet-api</artifactId>
-        <version>${servlet6_version}</version>
+        <version>${jakarta_servlet_version}</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
@@ -624,6 +625,11 @@
         <artifactId>api</artifactId>
         <version>${envoy_api_version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.groovy</groupId>
+        <artifactId>groovy</artifactId>
+        <version>${groovy_version}</version>
+      </dependency>
 
       <!-- for dubbo-rpc-webservice -->
       <dependency>
@@ -750,6 +756,24 @@
         <version>${spring_version}</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>org.spockframework</groupId>
+        <artifactId>spock-core</artifactId>
+        <version>${spock_version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.spockframework</groupId>
+        <artifactId>spock-spring</artifactId>
+        <version>${spock_version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.spockframework</groupId>
+        <artifactId>spock-junit4</artifactId>
+        <version>${spock_version}</version>
+        <scope>test</scope>
+      </dependency>
 
       <dependency>
         <groupId>com.google.code.gson</groupId>

dubbo-distribution/dubbo-all-shaded/pom.xml

@@ -119,13 +119,6 @@
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>org.apache.dubbo</groupId>
-      <artifactId>dubbo-rest-servlet</artifactId>
-      <version>${project.version}</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>org.apache.dubbo</groupId>
       <artifactId>dubbo-rest-spring</artifactId>
@@ -492,7 +485,6 @@
                   <include>org.apache.dubbo:dubbo-rpc-injvm</include>
                   <include>org.apache.dubbo:dubbo-rpc-triple</include>
                   <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>

dubbo-distribution/dubbo-all/pom.xml

@@ -276,13 +276,6 @@
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>org.apache.dubbo</groupId>
-      <artifactId>dubbo-rest-servlet</artifactId>
-      <version>${project.version}</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>org.apache.dubbo</groupId>
       <artifactId>dubbo-rest-spring</artifactId>
@@ -541,7 +534,6 @@
                   <include>org.apache.dubbo:dubbo-rpc-injvm</include>
                   <include>org.apache.dubbo:dubbo-rpc-triple</include>
                   <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>

dubbo-distribution/dubbo-bom/pom.xml

@@ -334,11 +334,6 @@
         <artifactId>dubbo-rest-jaxrs</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.dubbo</groupId>
-        <artifactId>dubbo-rest-servlet</artifactId>
-        <version>${project.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.dubbo</groupId>
         <artifactId>dubbo-rest-spring</artifactId>

dubbo-plugin/dubbo-rest-jaxrs/src/main/java/org/apache/dubbo/rpc/protocol/tri/rest/support/jaxrs/JaxrsHttpRequestAdaptee.java renamed to dubbo-plugin/dubbo-rest-jaxrs/src/main/java/org/apache/dubbo/rpc/protocol/tri/rest/support/jaxrs/JaxrsHttpRequestAdapter.java

@@ -33,14 +33,14 @@
 import org.jboss.resteasy.spi.ResteasyAsynchronousContext;
 import org.jboss.resteasy.spi.ResteasyUriInfo;
 
-public final class JaxrsHttpRequestAdaptee implements org.jboss.resteasy.spi.HttpRequest {
+public final class JaxrsHttpRequestAdapter implements org.jboss.resteasy.spi.HttpRequest {
 
     private final HttpRequest request;
 
     private HttpHeaders headers;
     private ResteasyUriInfo uriInfo;
 
-    public JaxrsHttpRequestAdaptee(HttpRequest request) {
+    public JaxrsHttpRequestAdapter(HttpRequest request) {
         this.request = request;
     }
 

dubbo-plugin/dubbo-rest-jaxrs/src/main/java/org/apache/dubbo/rpc/protocol/tri/rest/support/jaxrs/JaxrsHttpResponseAdaptee.java renamed to dubbo-plugin/dubbo-rest-jaxrs/src/main/java/org/apache/dubbo/rpc/protocol/tri/rest/support/jaxrs/JaxrsHttpResponseAdapter.java

@@ -24,13 +24,13 @@
 
 import java.io.OutputStream;
 
-public final class JaxrsHttpResponseAdaptee implements org.jboss.resteasy.spi.HttpResponse {
+public final class JaxrsHttpResponseAdapter implements org.jboss.resteasy.spi.HttpResponse {
 
     private final HttpResponse response;
 
     private MultivaluedMap<String, Object> headers;
 
-    public JaxrsHttpResponseAdaptee(HttpResponse response) {
+    public JaxrsHttpResponseAdapter(HttpResponse response) {
         this.response = response;
     }
 

dubbo-plugin/dubbo-rest-jaxrs/src/main/java/org/apache/dubbo/rpc/protocol/tri/rest/support/jaxrs/filter/ContainerRequestContextImpl.java

@@ -20,8 +20,8 @@
 import org.apache.dubbo.remoting.http12.HttpRequest;
 import org.apache.dubbo.remoting.http12.HttpResponse;
 import org.apache.dubbo.rpc.protocol.tri.rest.support.jaxrs.Helper;
-import org.apache.dubbo.rpc.protocol.tri.rest.support.jaxrs.JaxrsHttpRequestAdaptee;
-import org.apache.dubbo.rpc.protocol.tri.rest.support.jaxrs.JaxrsHttpResponseAdaptee;
+import org.apache.dubbo.rpc.protocol.tri.rest.support.jaxrs.JaxrsHttpRequestAdapter;
+import org.apache.dubbo.rpc.protocol.tri.rest.support.jaxrs.JaxrsHttpResponseAdapter;
 import org.apache.dubbo.rpc.protocol.tri.rest.support.jaxrs.MultivaluedMapWrapper;
 
 import javax.ws.rs.container.ContainerRequestContext;
@@ -107,7 +107,7 @@ public void setRequestUri(URI baseUri, URI requestUri) {
     public Request getRequest() {
         Request req = this.req;
         if (req == null) {
-            req = new RequestImpl(new JaxrsHttpRequestAdaptee(request), new JaxrsHttpResponseAdaptee(response));
+            req = new RequestImpl(new JaxrsHttpRequestAdapter(request), new JaxrsHttpResponseAdapter(response));
             this.req = req;
         }
         return req;