优化代码

Author: saleson

pom.xml

@@ -12,7 +12,7 @@
     <groupId>cn.springcloud.gray</groupId>
     <artifactId>spring-cloud-gray</artifactId>
     <packaging>pom</packaging>
-    <version>A.1.0.3</version>
+    <version>A.1.0.4-SNAPSHOT</version>
     <url>https://github.com/SpringCloud/spring-cloud-gray</url>
     <organization>
         <name>Spring Cloud中国社区</name>

spring-cloud-gray-client-netflix/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-gray</artifactId>
         <groupId>cn.springcloud.gray</groupId>
-        <version>A.1.0.3</version>
+        <version>A.1.0.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -16,36 +16,42 @@
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@ConditionalOnBean({GrayManager.class, EurekaClient.class})
+@ConditionalOnBean({GrayManager.class})
 public class GrayClientEurekaAutoConfiguration {
 
-    @Autowired
-    private SpringClientFactory springClientFactory;
 
-    @Bean
-    @ConditionalOnMissingBean
-    public InstanceLocalInfo instanceLocalInfo(@Autowired EurekaRegistration registration) {
-        String instanceId = registration.getInstanceConfig().getInstanceId();
-
-        return InstanceLocalInfo.builder()
-                .instanceId(instanceId)
-                .serviceId(registration.getServiceId())
-                .host(registration.getHost())
-                .port(registration.getPort())
-                .build();
-    }
-
-    @Bean
-    @ConditionalOnMissingBean
-    public EurekaServerExplainer eurekaServerExplainer() {
-        return new EurekaServerExplainer(springClientFactory);
+    @ConditionalOnBean({EurekaClient.class})
+    public static class GrayEurekaClientConfiguraion {
+        @Autowired
+        private SpringClientFactory springClientFactory;
+
+        @Bean
+        @ConditionalOnBean({EurekaRegistration.class})
+        @ConditionalOnMissingBean
+        public InstanceLocalInfo instanceLocalInfo(@Autowired EurekaRegistration registration) {
+            String instanceId = registration.getInstanceConfig().getInstanceId();
+
+            return InstanceLocalInfo.builder()
+                    .instanceId(instanceId)
+                    .serviceId(registration.getServiceId())
+                    .host(registration.getHost())
+                    .port(registration.getPort())
+                    .build();
+        }
+
+        @Bean
+        @ConditionalOnMissingBean
+        public EurekaServerExplainer eurekaServerExplainer() {
+            return new EurekaServerExplainer(springClientFactory);
+        }
+
+
+        @Bean
+        @ConditionalOnBean({EurekaServiceRegistry.class, EurekaRegistration.class})
+        public InstanceDiscoveryClient instanceDiscoveryClient(
+                EurekaServiceRegistry eurekaServiceRegistry, EurekaRegistration eurekaRegistration) {
+            return new EurekaInstanceDiscoveryClient(eurekaServiceRegistry, eurekaRegistration);
+        }
     }
 
-
-    @Bean
-    @ConditionalOnBean({EurekaServiceRegistry.class, EurekaRegistration.class})
-    public InstanceDiscoveryClient instanceDiscoveryClient(
-            EurekaServiceRegistry eurekaServiceRegistry, EurekaRegistration eurekaRegistration) {
-        return new EurekaInstanceDiscoveryClient(eurekaServiceRegistry, eurekaRegistration);
-    }
 }

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

@@ -17,36 +17,43 @@
 import java.util.List;
 
 @Configuration
-@ConditionalOnBean({GrayManager.class, RestTemplate.class})
+@ConditionalOnBean(GrayManager.class)
 @ConditionalOnClass(value = {RestTemplate.class, LoadBalanced.class})
 public class GrayRestTemplateAutoConfiguration {
 
-    @Autowired
-    private GrayRequestProperties grayRequestProperties;
-    @Autowired
-    private RibbonConnectionPoint ribbonConnectionPoint;
+
+    @Configuration
+    @ConditionalOnBean(RestTemplate.class)
+    public static class LoadBalanceRestTemplateConfiguration {
+        @Autowired
+        private GrayRequestProperties grayRequestProperties;
+        @Autowired
+        private RibbonConnectionPoint ribbonConnectionPoint;
 
 
-    @Bean
-    public GrayClientHttpRequestIntercptor grayClientHttpRequestIntercptor(
-            @Autowired(required = false) @LoadBalanced List<RestTemplate> restTemplates) {
-        GrayClientHttpRequestIntercptor intercptor = new GrayClientHttpRequestIntercptor(
-                grayRequestProperties, ribbonConnectionPoint);
-        if (restTemplates != null) {
-            restTemplates.forEach(restTemplate -> restTemplate.getInterceptors().add(intercptor));
+        @Bean
+        public GrayClientHttpRequestIntercptor grayClientHttpRequestIntercptor(
+                @Autowired(required = false) @LoadBalanced List<RestTemplate> restTemplates) {
+            GrayClientHttpRequestIntercptor intercptor = new GrayClientHttpRequestIntercptor(
+                    grayRequestProperties, ribbonConnectionPoint);
+            if (restTemplates != null) {
+                restTemplates.forEach(restTemplate -> restTemplate.getInterceptors().add(intercptor));
+            }
+            return intercptor;
         }
-        return intercptor;
-    }
 
 
-    @Configuration
-    @ConditionalOnProperty(value = "gray.request.track.enabled", matchIfMissing = true)
-    public static class GrayTrackRestTemplateConfiguration {
+        @Configuration
+        @ConditionalOnProperty(value = "gray.request.track.enabled", matchIfMissing = true)
+        public static class GrayTrackRestTemplateConfiguration {
 
-        @Bean
-        public RestTemplateRequestInterceptor restTemplateRequestInterceptor() {
-            return new RestTemplateRequestInterceptor();
-        }
+            @Bean
+            public RestTemplateRequestInterceptor restTemplateRequestInterceptor() {
+                return new RestTemplateRequestInterceptor();
+            }
 
+        }
     }
+
+
 }

spring-cloud-gray-client/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-gray</artifactId>
         <groupId>cn.springcloud.gray</groupId>
-        <version>A.1.0.3</version>
+        <version>A.1.0.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -92,9 +92,9 @@ private void joinLoadedGrays(Map<String, GrayService> grayServices) {
         if (grayLoadProperties != null && grayLoadProperties.isEnabled()) {
             grayLoadProperties.getGrayInstances().forEach(
                     instance -> {
-                        if (grayServices.containsKey(instance.getServiceId())
+                        if (!grayServices.containsKey(instance.getServiceId())
                                 || grayServices.get(instance.getServiceId())
-                                .getGrayInstance(instance.getInstanceId()) != null) {
+                                .getGrayInstance(instance.getInstanceId()) == null) {
                             if (instance.getGrayStatus() == null) {
                                 instance.setGrayStatus(GrayStatus.OPEN);
                             }

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

@@ -0,0 +1,13 @@
+package cn.springcloud.gray.client.config;
+
+import cn.springcloud.gray.GrayManager;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ConditionalOnBean(GrayManager.class)
+@ComponentScan(basePackages = {"cn.springcloud.gray.web.resources"})
+public class GrayClientResourcesConfiguration {
+
+}

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

@@ -2,18 +2,20 @@
 
 
 import cn.springcloud.gray.GrayManager;
+import cn.springcloud.gray.web.resources.DiscoveryInstanceResource;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
 @Configuration
 @ConditionalOnBean(GrayManager.class)
-public class GrayClientWebConfiguration {
+public class GrayClientWebConfiguration extends WebMvcConfigurerAdapter {
 
 
-    @Configuration
-    @ComponentScan(basePackages = {"cn.springcloud.gray.web.resources"})
-    public static class GrayClientResourcesConfiguration {
-
+    @Bean
+    public DiscoveryInstanceResource discoveryInstanceResource() {
+        return new DiscoveryInstanceResource();
     }
+
 }

spring-cloud-gray-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-gray</artifactId>
         <groupId>cn.springcloud.gray</groupId>
-        <version>A.1.0.3</version>
+        <version>A.1.0.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

spring-cloud-gray-core/src/main/java/cn/springcloud/gray/model/DecisionDefinition.java

@@ -1,6 +1,5 @@
 package cn.springcloud.gray.model;
 
-import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -15,6 +14,7 @@
 @Getter
 public class DecisionDefinition implements Serializable {
 
+    private static final long serialVersionUID = 7613293834300650748L;
     private String id;
     private String name;
     private Map<String, String> infos = new HashMap<>();