优化配置类

Author: saleson

spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/resttemplate/configuration/GrayRestTemplateAutoConfiguration.java

@@ -7,6 +7,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.context.annotation.Bean;
@@ -19,36 +20,48 @@
 @ConditionalOnClass(value = RestTemplate.class)
 public class GrayRestTemplateAutoConfiguration {
 
-    @Autowired
-    private GrayRequestProperties grayRequestProperties;
-    @Autowired
-    private RibbonConnectionPoint ribbonConnectionPoint;
 
+    @ConditionalOnMissingBean(RestTemplate.class)
+    @ConditionalOnClass({LoadBalanced.class})
+    public static class LoadBalancedRestTemplateConfiguration {
 
-    @Bean
-    @LoadBalanced
-    @ConditionalOnMissingBean
-    public RestTemplate restTemplate() {
-        RestTemplate restTemplate = new RestTemplate();
-//        restTemplate.getInterceptors().add(grayClientHttpRequestIntercptor);
-        return restTemplate;
+        @Autowired
+        private GrayRequestProperties grayRequestProperties;
+        @Autowired
+        private RibbonConnectionPoint ribbonConnectionPoint;
+
+        @Bean
+        @LoadBalanced
+        public RestTemplate restTemplate() {
+            RestTemplate restTemplate = new RestTemplate();
+            return restTemplate;
+        }
+
+        @Bean
+        public GrayClientHttpRequestIntercptor grayClientHttpRequestIntercptor(@LoadBalanced List<RestTemplate> restTemplates) {
+            GrayClientHttpRequestIntercptor intercptor = new GrayClientHttpRequestIntercptor(
+                    grayRequestProperties, ribbonConnectionPoint);
+            restTemplates.forEach(restTemplate -> restTemplate.getInterceptors().add(intercptor));
+            return intercptor;
+        }
     }
 
 
-    @Bean
-    public GrayClientHttpRequestIntercptor grayClientHttpRequestIntercptor(@LoadBalanced List<RestTemplate> restTemplates) {
-        GrayClientHttpRequestIntercptor intercptor = new GrayClientHttpRequestIntercptor(
-                grayRequestProperties, ribbonConnectionPoint);
-        restTemplates.forEach(restTemplate -> restTemplate.getInterceptors().add(intercptor));
-        return intercptor;
+    @ConditionalOnMissingBean(RestTemplate.class)
+    @ConditionalOnMissingClass({"org.springframework.cloud.client.loadbalancer.LoadBalanced"})
+    public static class RestTemplateConfiguration {
+        @Bean
+        public RestTemplate restTemplate() {
+            RestTemplate restTemplate = new RestTemplate();
+            return restTemplate;
+        }
     }
 
 
     @Configuration
     @ConditionalOnProperty(value = "gray.request.track.enabled", matchIfMissing = true)
     public static class GrayTrackRestTemplateConfiguration {
 
-
         @Bean
         public RestTemplateRequestInterceptor restTemplateRequestInterceptor() {
             return new RestTemplateRequestInterceptor();

spring-cloud-gray-client/src/main/java/cn/springcloud/gray/client/config/GrayClientAutoConfiguration.java

@@ -34,19 +34,6 @@ public class GrayClientAutoConfiguration {
     private GrayClientProperties grayClientProperties;
 
 
-    @Bean
-    @ConditionalOnMissingBean
-    @ConditionalOnProperty(value = "gray.client.serverUrl")
-    public InformationClient informationClient(@Autowired(required = false) RestTemplate restTemplate) {
-        InformationClient httpClient = new HttpInformationClient(grayClientProperties.getServerUrl(), restTemplate);
-        if (grayClientProperties.isRetryable()) {
-            return new RetryableInformationClient(Math.max(3, grayClientProperties.getRetryNumberOfRetries()), httpClient);
-        } else {
-            return httpClient;
-        }
-    }
-
-
     @Bean
     @ConditionalOnMissingBean
     public GrayManager grayManager(
@@ -75,4 +62,30 @@ public RequestLocalStorage requestLocalStorage() {
     }
 
 
+    @Configuration
+    public static class InformationClientConfiguration {
+
+
+        @Bean("grayInformationRestTemplate")
+        @ConditionalOnMissingBean(name = {"grayInformationRestTemplate"})
+        public RestTemplate grayInformationRestTemplate() {
+            return new RestTemplate();
+        }
+
+
+        @Bean
+        @ConditionalOnMissingBean
+        @ConditionalOnProperty(value = "gray.client.serverUrl")
+        public InformationClient informationClient(
+                @Autowired(required = false) RestTemplate grayInformationRestTemplate,
+                GrayClientProperties grayClientProperties) {
+            InformationClient httpClient = new HttpInformationClient(grayClientProperties.getServerUrl(), grayInformationRestTemplate);
+            if (grayClientProperties.isRetryable()) {
+                return new RetryableInformationClient(Math.max(3, grayClientProperties.getRetryNumberOfRetries()), httpClient);
+            } else {
+                return httpClient;
+            }
+        }
+    }
+
 }

spring-cloud-gray-client/src/main/java/cn/springcloud/gray/client/config/GrayTrackConfiguration.java

@@ -19,7 +19,6 @@
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -42,7 +41,7 @@ public GrayTrackHolder grayTrackHolder(
 
     @ConditionalOnProperty(value = "gray.client.runenv", havingValue = "web", matchIfMissing = true)
     @Configuration
-    public static class GrayClientWebConfiguration extends WebMvcConfigurerAdapter {
+    public static class GrayClientWebConfiguration {
 
         @Autowired
         private GrayTrackProperties grayTrackProperties;
@@ -61,7 +60,7 @@ public GrayTrackFilter grayTrackFilter(GrayTrackHolder grayTrackHolder) {
 
 
         @Bean
-        public FilterRegistrationBean companyUrlFilterRegister(GrayTrackFilter filter) {
+        public FilterRegistrationBean grayTrackFilter(GrayTrackFilter filter) {
             GrayTrackProperties.Web webProperties = grayTrackProperties.getWeb();
             FilterRegistrationBean registration = new FilterRegistrationBean();
             //注入过滤器