Merge pull request #550 from mercyblitz/master

Dubbo Spring Cloud Update

spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboLoadBalancedRestTemplateAutoConfiguration.java

@@ -35,6 +35,7 @@ import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceFactor
 import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.cloud.client.loadbalancer.LoadBalancerInterceptor;
 import org.springframework.cloud.client.loadbalancer.RestTemplateCustomizer;
+import org.springframework.cloud.client.loadbalancer.RetryLoadBalancerInterceptor;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.event.EventListener;
 import org.springframework.core.env.Environment;
@@ -56,7 +57,7 @@ import java.util.Map;
 @Configuration
 @ConditionalOnClass(name = {"org.springframework.web.client.RestTemplate"})
 @AutoConfigureAfter(name = {"org.springframework.cloud.client.loadbalancer.LoadBalancerAutoConfiguration"})
-public class DubboLoadBalancedRestTemplateAutoConfiguration implements BeanClassLoaderAware {
+public class DubboLoadBalancedRestTemplateAutoConfiguration implements BeanClassLoaderAware, SmartInitializingSingleton {
 
     private static final Class<DubboTransported> DUBBO_TRANSPORTED_CLASS = DubboTransported.class;
 
@@ -65,9 +66,12 @@ public class DubboLoadBalancedRestTemplateAutoConfiguration implements BeanClass
     @Autowired
     private DubboServiceMetadataRepository repository;
 
-    @Autowired
+    @Autowired(required = false)
     private LoadBalancerInterceptor loadBalancerInterceptor;
 
+    @Autowired(required = false)
+    private RetryLoadBalancerInterceptor retryLoadBalancerInterceptor;
+
     @Autowired
     private ConfigurableListableBeanFactory beanFactory;
 
@@ -86,6 +90,17 @@ public class DubboLoadBalancedRestTemplateAutoConfiguration implements BeanClass
 
     private ClassLoader classLoader;
 
+    /**
+     * The {@link ClientHttpRequestInterceptor} bean that may be {@link LoadBalancerInterceptor} or {@link RetryLoadBalancerInterceptor}
+     */
+    private ClientHttpRequestInterceptor loadBalancerInterceptorBean;
+
+    @Override
+    public void afterSingletonsInstantiated() {
+        loadBalancerInterceptorBean = retryLoadBalancerInterceptor != null ?
+                retryLoadBalancerInterceptor :
+                loadBalancerInterceptor;
+    }
 
     /**
      * Adapt the {@link RestTemplate} beans that are annotated  {@link LoadBalanced @LoadBalanced} and
@@ -140,7 +155,7 @@ public class DubboLoadBalancedRestTemplateAutoConfiguration implements BeanClass
 
         List<ClientHttpRequestInterceptor> interceptors = new ArrayList<>(restTemplate.getInterceptors());
 
-        int index = interceptors.indexOf(loadBalancerInterceptor);
+        int index = loadBalancerInterceptorBean == null ? -1 : interceptors.indexOf(loadBalancerInterceptorBean);
 
         index = index < 0 ? 0 : index;
 
@@ -157,4 +172,5 @@ public class DubboLoadBalancedRestTemplateAutoConfiguration implements BeanClass
     public void setBeanClassLoader(ClassLoader classLoader) {
         this.classLoader = classLoader;
     }
+
 }

spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/pom.xml

@@ -96,41 +96,19 @@
             <version>${project.version}</version>
         </dependency>
 
-    </dependencies>
-
-    <profiles>
-
-        <!-- Nacos -->
-        <profile>
-            <id>nacos</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <!-- Nacos Service Discovery -->
+        <!-- Spring Cloud Nacos Service Discovery -->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
-            </dependencies>
-        </profile>
 
-        <profile>
-            <id>eureka</id>
-            <dependencies>
-                <!-- Eureka Service Discovery -->
+        <!-- Spring Cloud Eureka Service Discovery -->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
         </dependency>
-            </dependencies>
-        </profile>
 
-        <!-- Zookeeper -->
-        <profile>
-            <id>zookeeper</id>
-            <dependencies>
-                <!-- Zookeeper Service Discovery -->
+        <!-- Spring Cloud Zookeeper Service Discovery -->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-zookeeper-discovery</artifactId>
@@ -161,22 +139,14 @@
             <artifactId>curator-framework</artifactId>
             <version>${curator.version}</version>
         </dependency>
-            </dependencies>
-        </profile>
 
-        <profile>
-            <id>consul</id>
-            <dependencies>
-                <!-- Spring Cloud Consul -->
+        <!-- Spring Cloud Consul Service Discovery -->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-consul-discovery</artifactId>
             <version>${spring-cloud-consul.version}</version>
         </dependency>
     </dependencies>
-        </profile>
-
-    </profiles>
 
     <build>
         <plugins>

spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-consumer-sample/pom.xml

@@ -21,17 +21,23 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
-        <!-- Sample API -->
+        <!-- Spring Cloud Open Feign -->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-dubbo-sample-api</artifactId>
-            <version>${project.version}</version>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
 
-        <!-- Spring Cloud Open Feign -->
+        <!-- Spring Retry -->
+        <dependency>
+            <groupId>org.springframework.retry</groupId>
+            <artifactId>spring-retry</artifactId>
+        </dependency>
+
+        <!-- Sample API -->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
+            <artifactId>spring-cloud-dubbo-sample-api</artifactId>
+            <version>${project.version}</version>
         </dependency>
 
     </dependencies>