Rest override support

Author: oxsean

.github/workflows/build-and-test-pr.yml

@@ -326,7 +326,7 @@ jobs:
           cd test && bash ./build-test-image.sh
       - name: "Run tests"
         run: cd test && bash ./run-tests.sh
-      - name: "merge jacoco resule"
+      - name: "merge jacoco result"
         run: |
           cd test/dubbo-test-jacoco-merger && mvn clean compile exec:java -Dexec.mainClass="org.apache.dubbo.test.JacocoMerge" -Dexec.args="${{github.workspace}}"
       - name: "Upload jacoco"

dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-provider/src/main/resources/application.yml

@@ -24,7 +24,8 @@ dubbo:
     qos-enable: false
   protocol:
     name: tri
-    port: ${server.port}
+    port: -1
+    #port: ${server.port}
     triple:
       servlet:
         enable: true

dubbo-metrics/dubbo-tracing/src/test/java/org/apache/dubbo/tracing/filter/AbstractObservationFilterTest.java

@@ -34,6 +34,7 @@ public enum Annotations implements AnnotationEnum {
     ResponseStatus,
     CrossOrigin,
     ExceptionHandler,
+    HttpExchange("org.springframework.web.service.annotation.HttpExchange"),
     Nonnull("javax.annotation.Nonnull");
 
     private final String className;

dubbo-metrics/dubbo-tracing/src/test/java/org/apache/dubbo/tracing/filter/ObservationReceiverFilterTest.java

@@ -62,44 +62,49 @@ public RestToolKit getRestToolKit() {
     @Override
     public RequestMapping resolve(ServiceMeta serviceMeta) {
         AnnotationMeta<?> requestMapping = serviceMeta.findMergedAnnotation(Annotations.RequestMapping);
-        if (requestMapping == null) {
+        AnnotationMeta<?> httpExchange = serviceMeta.findMergedAnnotation(Annotations.HttpExchange);
+        if (requestMapping == null && httpExchange == null) {
             return null;
         }
-        AnnotationMeta<?> responseStatus = serviceMeta.findMergedAnnotation(Annotations.ResponseStatus);
-        AnnotationMeta<?> crossOrigin = serviceMeta.findMergedAnnotation(Annotations.CrossOrigin);
-        String[] methods = requestMapping.getStringArray("method");
-        return builder(requestMapping, responseStatus)
+
+        String[] methods = requestMapping == null
+                ? httpExchange.getStringArray("method")
+                : requestMapping.getStringArray("method");
+        return builder(requestMapping, httpExchange, serviceMeta.findMergedAnnotation(Annotations.ResponseStatus))
                 .method(methods)
                 .name(serviceMeta.getType().getSimpleName())
                 .contextPath(serviceMeta.getContextPath())
-                .cors(buildCorsMeta(crossOrigin, methods))
+                .cors(buildCorsMeta(serviceMeta.findMergedAnnotation(Annotations.CrossOrigin), methods))
                 .build();
     }
 
     @Override
     public RequestMapping resolve(MethodMeta methodMeta) {
         AnnotationMeta<?> requestMapping = methodMeta.findMergedAnnotation(Annotations.RequestMapping);
-        if (requestMapping == null) {
+        AnnotationMeta<?> httpExchange = methodMeta.findMergedAnnotation(Annotations.HttpExchange);
+        if (requestMapping == null && httpExchange == null) {
             AnnotationMeta<?> exceptionHandler = methodMeta.getAnnotation(Annotations.ExceptionHandler);
             if (exceptionHandler != null) {
                 methodMeta.getServiceMeta().addExceptionHandler(methodMeta);
             }
             return null;
         }
+
         ServiceMeta serviceMeta = methodMeta.getServiceMeta();
-        AnnotationMeta<?> responseStatus = methodMeta.findMergedAnnotation(Annotations.ResponseStatus);
-        AnnotationMeta<?> crossOrigin = methodMeta.findMergedAnnotation(Annotations.CrossOrigin);
-        String[] methods = requestMapping.getStringArray("method");
-        return builder(requestMapping, responseStatus)
+        String[] methods = requestMapping == null
+                ? httpExchange.getStringArray("method")
+                : requestMapping.getStringArray("method");
+        return builder(requestMapping, httpExchange, methodMeta.findMergedAnnotation(Annotations.ResponseStatus))
                 .method(methods)
                 .name(methodMeta.getMethod().getName())
                 .contextPath(serviceMeta.getContextPath())
                 .custom(new ServiceVersionCondition(serviceMeta.getServiceGroup(), serviceMeta.getServiceVersion()))
-                .cors(buildCorsMeta(crossOrigin, methods))
+                .cors(buildCorsMeta(methodMeta.findMergedAnnotation(Annotations.CrossOrigin), methods))
                 .build();
     }
 
-    private Builder builder(AnnotationMeta<?> requestMapping, AnnotationMeta<?> responseStatus) {
+    private Builder builder(
+            AnnotationMeta<?> requestMapping, AnnotationMeta<?> httpExchange, AnnotationMeta<?> responseStatus) {
         Builder builder = RequestMapping.builder();
         if (responseStatus != null) {
             HttpStatus value = responseStatus.getEnum("value");
@@ -109,6 +114,11 @@ private Builder builder(AnnotationMeta<?> requestMapping, AnnotationMeta<?> resp
                 builder.responseReason(reason);
             }
         }
+        if (requestMapping == null) {
+            return builder.path(httpExchange.getValueArray())
+                    .consume(httpExchange.getStringArray("contentType"))
+                    .produce(httpExchange.getStringArray("accept"));
+        }
         return builder.path(requestMapping.getValueArray())
                 .param(requestMapping.getStringArray("params"))
                 .header(requestMapping.getStringArray("headers"))