优化代码

Author: saleson

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

@@ -25,14 +25,6 @@ public interface GrayClientConfig {
     int grayEnrollDealyTimeInMs();
 
 
-    /**
-     * 灰度服务器的url
-     *
-     * @return 返回gray-server的url
-     */
-    String getServerUrl();
-
-
     /**
      * 更新灰度列表的时间间隔(ms)，小于等于0将不会开启定时轮询
      *
@@ -41,18 +33,4 @@ public interface GrayClientConfig {
     int getServiceUpdateIntervalTimerInMs();
 
 
-    /**
-     * 在和灰度服务器通信时，如果交互失败，是否重试。
-     *
-     * @return 返回是否重试
-     */
-    boolean isRetryable();
-
-    /**
-     * 重试次数
-     *
-     * @return 返回重试次数
-     */
-    int getRetryNumberOfRetries();
-
 }

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

@@ -5,9 +5,8 @@
 import cn.springcloud.gray.client.config.properties.GrayClientProperties;
 import cn.springcloud.gray.client.config.properties.GrayLoadProperties;
 import cn.springcloud.gray.client.config.properties.GrayRequestProperties;
-import cn.springcloud.gray.communication.HttpInformationClient;
+import cn.springcloud.gray.client.config.properties.GrayServerProperties;
 import cn.springcloud.gray.communication.InformationClient;
-import cn.springcloud.gray.communication.RetryableInformationClient;
 import cn.springcloud.gray.decision.GrayDecisionFactoryKeeper;
 import cn.springcloud.gray.request.RequestLocalStorage;
 import cn.springcloud.gray.request.ThreadLocalRequestStorage;
@@ -18,15 +17,19 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.web.client.RestTemplate;
 
 import java.util.List;
 
 @Configuration
-@EnableConfigurationProperties({GrayClientProperties.class, GrayRequestProperties.class, GrayLoadProperties.class})
-//@ConditionalOnBean(GrayClientMarkerConfiguration.GrayClientMarker.class)
+@EnableConfigurationProperties(
+        {GrayClientProperties.class,
+                GrayServerProperties.class,
+                GrayRequestProperties.class,
+                GrayLoadProperties.class})
 @ConditionalOnProperty(value = "gray.enabled")
-@Import({GrayDecisionFactoryConfiguration.class, GrayTrackConfiguration.class})
+@Import({InformationClientConfiguration.class,
+        GrayDecisionFactoryConfiguration.class,
+        GrayTrackConfiguration.class})
 public class GrayClientAutoConfiguration {
 
 
@@ -61,31 +64,4 @@ public RequestLocalStorage requestLocalStorage() {
         return new ThreadLocalRequestStorage();
     }
 
-
-    @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/GrayLoadAutoConfigration.java

@@ -0,0 +1,54 @@
+package cn.springcloud.gray.client.config;
+
+import cn.springcloud.gray.client.config.properties.GrayServerProperties;
+import cn.springcloud.gray.communication.HttpInformationClient;
+import cn.springcloud.gray.communication.InformationClient;
+import cn.springcloud.gray.communication.RetryableInformationClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.cloud.client.loadbalancer.LoadBalanced;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.client.RestTemplate;
+
+@Configuration
+@ConditionalOnProperty(value = "gray.server.url")
+public class InformationClientConfiguration {
+
+
+    @Configuration
+    @ConditionalOnProperty(value = "gray.server.loadbalanced", havingValue = "false", matchIfMissing = true)
+    public static class DefaultGrayInformationRestTemplate {
+        @Bean("grayInformationRestTemplate")
+        @ConditionalOnMissingBean(name = {"grayInformationRestTemplate"})
+        public RestTemplate grayInformationRestTemplate() {
+            return new RestTemplate();
+        }
+    }
+
+    @Configuration
+    @ConditionalOnProperty(value = "gray.server.loadbalanced")
+    public static class LoadBalancedGrayInformationRestTemplate {
+        @Bean("grayInformationRestTemplate")
+        @LoadBalanced
+        @ConditionalOnMissingBean(name = {"grayInformationRestTemplate"})
+        public RestTemplate grayInformationRestTemplate() {
+            return new RestTemplate();
+        }
+    }
+
+
+    @Bean
+    @ConditionalOnMissingBean
+    public InformationClient informationClient(
+            @Autowired(required = false) RestTemplate grayInformationRestTemplate,
+            GrayServerProperties grayServerProperties) {
+        InformationClient httpClient = new HttpInformationClient(grayServerProperties.getUrl(), grayInformationRestTemplate);
+        if (grayServerProperties.isRetryable()) {
+            return new RetryableInformationClient(Math.max(3, grayServerProperties.getRetryNumberOfRetries()), httpClient);
+        } else {
+            return httpClient;
+        }
+    }
+}

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

@@ -1,7 +1,6 @@
 package cn.springcloud.gray.client.config.properties;
 
 import cn.springcloud.gray.GrayClientConfig;
-import cn.springcloud.gray.communication.RetryableInformationClient;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 @ConfigurationProperties("gray.client")
@@ -11,24 +10,9 @@ public class GrayClientProperties implements GrayClientConfig {
 
     private int serviceUpdateIntervalTimerInMs = 60000;
 
-    private String informationClient = "http";
-
-    private String serverUrl = "";
-
-    private boolean retryable = true;
-    private int retryNumberOfRetries = RetryableInformationClient.DEFAULT_NUMBER_OF_RETRIES;
-
     private InstanceConfig instance = new InstanceConfig();
 
 
-    public String getInformationClient() {
-        return informationClient;
-    }
-
-    public void setInformationClient(String informationClient) {
-        this.informationClient = informationClient;
-    }
-
     @Override
     public String runenv() {
         return runenv;
@@ -44,19 +28,12 @@ public int grayEnrollDealyTimeInMs() {
         return instance.getGrayEnrollDealyTimeInMs();
     }
 
-    public String getServerUrl() {
-        return serverUrl;
-    }
 
     @Override
     public int getServiceUpdateIntervalTimerInMs() {
         return serviceUpdateIntervalTimerInMs;
     }
 
-    public void setServerUrl(String serverUrl) {
-        this.serverUrl = serverUrl;
-    }
-
 
     public void setServiceUpdateIntervalTimerInMs(int serviceUpdateIntervalTimerInMs) {
         this.serviceUpdateIntervalTimerInMs = serviceUpdateIntervalTimerInMs;
@@ -71,22 +48,6 @@ public void setInstance(InstanceConfig instance) {
     }
 
 
-    public boolean isRetryable() {
-        return retryable;
-    }
-
-    public void setRetryable(boolean retryable) {
-        this.retryable = retryable;
-    }
-
-    public int getRetryNumberOfRetries() {
-        return retryNumberOfRetries;
-    }
-
-    public void setRetryNumberOfRetries(int retryNumberOfRetries) {
-        this.retryNumberOfRetries = retryNumberOfRetries;
-    }
-
     /**
      * 实例
      */
@@ -95,7 +56,6 @@ public class InstanceConfig {
         private boolean grayEnroll = false;
         private int grayEnrollDealyTimeInMs = 40000;
         private boolean useMultiVersion = false;
-        private String instanceId;
 
         public boolean isGrayEnroll() {
             return grayEnroll;
@@ -126,12 +86,6 @@ public void setUseMultiVersion(boolean useMultiVersion) {
             this.useMultiVersion = useMultiVersion;
         }
 
-        public String getInstanceId() {
-            return instanceId;
-        }
 
-        public void setInstanceId(String instanceId) {
-            this.instanceId = instanceId;
-        }
     }
 }

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

@@ -0,0 +1,19 @@
+package cn.springcloud.gray.client.config.properties;
+
+import cn.springcloud.gray.communication.RetryableInformationClient;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@Setter
+@Getter
+@ConfigurationProperties("gray.server")
+public class GrayServerProperties {
+
+    private String url;
+    private boolean loadbalanced;
+    //在和灰度服务器通信时，如果交互失败，是否重试。
+    private boolean retryable = true;
+    //重试次数
+    private int retryNumberOfRetries = RetryableInformationClient.DEFAULT_NUMBER_OF_RETRIES;
+}

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

@@ -18,4 +18,5 @@ gray:
   client:
     instance:
       grayEnroll: false #是否在启动后自动注册成灰度实例
-    serverUrl: http://localhost:20202 #灰度服务端的url
+  server:
+    url: http://localhost:20202 #灰度服务端的url

spring-cloud-gray-samples/spring-cloud-gray-service-a-sample/src/main/resources/config/application.yml

@@ -19,4 +19,5 @@ gray:
   client:
     instance:
       grayEnroll: true #是否在启动后自动注册成灰度实例
-    serverUrl: http://localhost:20202 #灰度服务端的url
+  server:
+    url: http://localhost:20202 #灰度服务端的url

spring-cloud-gray-samples/spring-cloud-gray-service-a1-sample/src/main/resources/config/application.yml

@@ -45,8 +45,8 @@ feign:
 
 gray:
   enabled: true
-  client:
-    server-url: http://localhost:20202
+  server:
+    url: http://localhost:20202
   request:
     track:
       web:

spring-cloud-gray-samples/spring-cloud-gray-service-b-sample/src/main/resources/config/application.yml

@@ -50,8 +50,9 @@ zuul:
 #      serviceId: eureka-client #指定路由到的serviceId
 gray:
   #  enabled: true
+  server:
+    url: http://localhost:20202
   client:
-    server-url: http://localhost:20202
     serviceUpdateIntervalTimerInMs: 0
   request:
     track: