Polish spring-cloud-incubator/spring-cloud-alibaba#348 : [Feature] Add @DubboTransported Annotation

spring-cloud-alibaba-dubbo/src/test/java/org/springframework/cloud/alibaba/dubbo/bootstrap/DubboSpringCloudBootstrap.java

@@ -17,10 +17,12 @@
 package org.springframework.cloud.alibaba.dubbo.bootstrap;
 
 import com.alibaba.dubbo.config.annotation.Reference;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.cloud.alibaba.dubbo.annotation.DubboTransported;
 import org.springframework.cloud.alibaba.dubbo.service.EchoService;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
@@ -47,16 +49,39 @@ public class DubboSpringCloudBootstrap {
     @Lazy
     private FeignEchoService feignEchoService;
 
-    @GetMapping(value = "/call/echo")
-    public String echo(@RequestParam("message") String message) {
+    @Autowired
+    @Lazy
+    private DubboFeignEchoService dubboFeignEchoService;
+
+    @GetMapping(value = "/dubbo/call/echo")
+    public String dubboEcho(@RequestParam("message") String message) {
+        return echoService.echo(message);
+    }
+
+    @GetMapping(value = "/feign/call/echo")
+    public String feignEcho(@RequestParam("message") String message) {
         return feignEchoService.echo(message);
     }
 
+    @GetMapping(value = "/feign-dubbo/call/echo")
+    public String feignDubboEcho(@RequestParam("message") String message) {
+        return dubboFeignEchoService.echo(message);
+    }
+
     @FeignClient("spring-cloud-alibaba-dubbo")
     public interface FeignEchoService {
 
         @GetMapping(value = "/echo")
         String echo(@RequestParam("message") String message);
+
+    }
+
+    @FeignClient("spring-cloud-alibaba-dubbo")
+    public interface DubboFeignEchoService {
+
+        @GetMapping(value = "/echo")
+        @DubboTransported
+        String echo(@RequestParam("message") String message);
     }
 
     @Bean
@@ -66,6 +91,8 @@ public class DubboSpringCloudBootstrap {
             System.out.println(echoService.echo("mercyblitz"));
             // Spring Cloud Open Feign REST Call
             System.out.println(feignEchoService.echo("mercyblitz"));
+            // Spring Cloud Open Feign REST Call (Dubbo Transported)
+            System.out.println(dubboFeignEchoService.echo("mercyblitz"));
         };
     }
 

spring-cloud-alibaba-dubbo/src/test/java/org/springframework/cloud/alibaba/dubbo/metadata/resolver/DubboTransportedMethodMetadataResolverTest.java

@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.cloud.alibaba.dubbo.metadata.resolver;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.cloud.alibaba.dubbo.annotation.DubboTransported;
+import org.springframework.cloud.alibaba.dubbo.metadata.DubboTransportedMethodMetadata;
+import org.springframework.cloud.openfeign.support.SpringMvcContract;
+import org.springframework.mock.env.MockEnvironment;
+
+import java.util.Set;
+
+/**
+ * {@link DubboTransportedMethodMetadataResolver} Test
+ *
+ * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
+ */
+public class DubboTransportedMethodMetadataResolverTest {
+
+    private DubboTransportedMethodMetadataResolver resolver;
+
+    private MockEnvironment environment;
+
+    @Before
+    public void init() {
+        environment = new MockEnvironment();
+        resolver = new DubboTransportedMethodMetadataResolver(environment, new SpringMvcContract());
+    }
+
+    @Test
+    public void testResolve() {
+        Set<DubboTransportedMethodMetadata> metadataSet = resolver.resolveDubboTransportedMethodMetadataSet(TestDefaultService.class);
+        Assert.assertEquals(1, metadataSet.size());
+    }
+
+
+    @DubboTransported
+    interface TestDefaultService {
+
+        String test(String message);
+
+    }
+}

spring-cloud-alibaba-dubbo/src/test/resources/application.yaml

@@ -12,5 +12,9 @@ dubbo:
   registry:
     address: spring-cloud://nacos
 
+feign:
+  hystrix:
+    enabled: true
+
 server:
   port: 8080