Task #13958 Move Rest Protocol to SPI Extensions (#14061)

.artifacts

@@ -47,7 +47,6 @@ dubbo-kubernetes
 dubbo-maven-plugin
 dubbo-metadata
 dubbo-metadata-api
-dubbo-metadata-rest
 dubbo-metadata-definition-protobuf
 dubbo-metadata-processor
 dubbo-metadata-report-nacos
@@ -76,7 +75,6 @@ dubbo-registry-nacos
 dubbo-registry-zookeeper
 dubbo-remoting
 dubbo-remoting-api
-dubbo-remoting-http
 dubbo-remoting-http12
 dubbo-remoting-netty
 dubbo-remoting-netty4
@@ -87,7 +85,6 @@ dubbo-rpc
 dubbo-rpc-api
 dubbo-rpc-dubbo
 dubbo-rpc-injvm
-dubbo-rpc-rest
 dubbo-rpc-triple
 dubbo-security
 dubbo-serialization

dubbo-compatible/pom.xml

@@ -48,11 +48,6 @@
       <artifactId>dubbo-remoting-zookeeper</artifactId>
       <version>${project.parent.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.dubbo</groupId>
-      <artifactId>dubbo-rpc-rest</artifactId>
-      <version>${project.parent.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.dubbo</groupId>
       <artifactId>dubbo-filter-cache</artifactId>
@@ -63,6 +58,17 @@
       <artifactId>dubbo-filter-validation</artifactId>
       <version>${project.parent.version}</version>
     </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <!-- JAX-RS API -->
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>javax.ws.rs-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>

dubbo-compatible/src/main/java/com/alibaba/dubbo/common/Constants.java

@@ -41,7 +41,6 @@ public class Constants
                 org.apache.dubbo.common.serialize.Constants,
                 org.apache.dubbo.common.config.configcenter.Constants,
                 org.apache.dubbo.metadata.report.support.Constants,
-                org.apache.dubbo.rpc.protocol.rest.Constants,
                 org.apache.dubbo.registry.Constants {
     public static final String PROVIDER = "provider";
 

dubbo-compatible/src/test/java/org/apache/dubbo/metadata/annotation/processing/util/AnnotationUtilsTest.java

@@ -18,14 +18,12 @@
 
 import org.apache.dubbo.config.annotation.Service;
 import org.apache.dubbo.metadata.annotation.processing.AbstractAnnotationProcessingTest;
-import org.apache.dubbo.metadata.rest.SpringRestService;
 import org.apache.dubbo.metadata.tools.TestService;
 import org.apache.dubbo.metadata.tools.TestServiceImpl;
 
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.Element;
-import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.TypeMirror;
 import javax.ws.rs.Path;
@@ -35,7 +33,6 @@
 import java.util.Set;
 
 import org.junit.jupiter.api.Test;
-import org.springframework.web.bind.annotation.GetMapping;
 
 import static org.apache.dubbo.metadata.annotation.processing.util.AnnotationUtils.findAnnotation;
 import static org.apache.dubbo.metadata.annotation.processing.util.AnnotationUtils.findMetaAnnotation;
@@ -45,9 +42,7 @@
 import static org.apache.dubbo.metadata.annotation.processing.util.AnnotationUtils.getAttribute;
 import static org.apache.dubbo.metadata.annotation.processing.util.AnnotationUtils.getValue;
 import static org.apache.dubbo.metadata.annotation.processing.util.AnnotationUtils.isAnnotationPresent;
-import static org.apache.dubbo.metadata.annotation.processing.util.MethodUtils.findMethod;
 import static org.apache.dubbo.metadata.annotation.processing.util.MethodUtils.getAllDeclaredMethods;
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -241,13 +236,6 @@ void testGetAttribute() {
 
         assertNull(getAttribute(findAnnotation(testType, Path.class), null));
         assertNull(getAttribute(findAnnotation(testType, (Class) null), null));
-
-        ExecutableElement method = findMethod(getType(SpringRestService.class), "param", String.class);
-
-        AnnotationMirror annotation = findAnnotation(method, GetMapping.class);
-
-        assertArrayEquals(new String[] {"/param"}, (String[]) getAttribute(annotation, "value"));
-        assertNull(getAttribute(annotation, "path"));
     }
 
     @Test

dubbo-config/dubbo-config-api/pom.xml

@@ -108,13 +108,6 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.dubbo</groupId>
-      <artifactId>dubbo-rpc-rest</artifactId>
-      <version>${project.parent.version}</version>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.apache.dubbo</groupId>
       <artifactId>dubbo-remoting-netty4</artifactId>