优化代码

Author: saleson

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

@@ -0,0 +1,89 @@
+package cn.springcloud.gray.client.netflix;
+
+import cn.springcloud.gray.GrayClientHolder;
+import cn.springcloud.gray.GrayManager;
+import cn.springcloud.gray.RequestInterceptor;
+import cn.springcloud.gray.UpdateableGrayManager;
+import cn.springcloud.gray.client.switcher.GraySwitcher;
+import cn.springcloud.gray.request.LocalStorageLifeCycle;
+import cn.springcloud.gray.request.RequestLocalStorage;
+import cn.springcloud.gray.servernode.ServerExplainer;
+import cn.springcloud.gray.servernode.ServerListProcessor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+
+import java.util.Map;
+
+@Slf4j
+public class GrayNetflixClientInitializer implements ApplicationContextAware, InitializingBean {
+    private ApplicationContext cxt;
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        GrayClientHolder.setGrayManager(getBean("grayManager", GrayManager.class));
+        GrayClientHolder.setRequestLocalStorage(getBean("requestLocalStorage", RequestLocalStorage.class));
+        GrayClientHolder.setLocalStorageLifeCycle(getBean("localStorageLifeCycle", LocalStorageLifeCycle.class));
+        GrayClientHolder.setServerExplainer(getBean("serverExplainer", ServerExplainer.class));
+        GrayClientHolder.setServerListProcessor(
+                getBean("serverListProcessor", ServerListProcessor.class, new ServerListProcessor.Default()));
+        GrayClientHolder.setGraySwitcher(
+                getBean("graySwitcher", GraySwitcher.class, new GraySwitcher.DefaultGraySwitcher()));
+
+        initGrayManagerRequestInterceptors();
+
+    }
+
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        this.cxt = applicationContext;
+    }
+
+
+    private <T> T getBean(String beanName, Class<T> cls) {
+        T t = null;
+        try {
+            t = cxt.getBean(beanName, cls);
+        } catch (BeansException e) {
+            log.warn("没有从spring容器中找到name为'{}', class为'{}'的Bean", beanName, cls);
+        }
+        if (t == null) {
+            t = cxt.getBean(cls);
+        }
+        return t;
+    }
+
+    private <T> T getBean(String beanName, Class<T> cls, T defaultBean) {
+        try {
+            return getBean(beanName, cls);
+        } catch (BeansException e) {
+            log.warn("没有从spring容器中找到name为'{}', class为'{}'的Bean, 返回默认的bean:{}", beanName, cls, defaultBean);
+            return defaultBean;
+        }
+    }
+
+    private <T> T getBeanNullable(String beanName, Class<T> cls) {
+        try {
+            return getBean(beanName, cls);
+        } catch (BeansException e) {
+            log.warn("没有从spring容器中找到name为'{}', class为'{}'的Bean", beanName, cls);
+            return null;
+        }
+    }
+
+
+    /**
+     * 为了解耦合，特别将GrayManger加载Sping容器中的RequestInterceptor的逻辑独立出来
+     */
+    private void initGrayManagerRequestInterceptors() {
+        Map<String, RequestInterceptor> requestInterceptors = cxt.getBeansOfType(RequestInterceptor.class);
+        GrayManager grayManager = GrayClientHolder.getGrayManager();
+        if (grayManager instanceof UpdateableGrayManager) {
+            ((UpdateableGrayManager) grayManager).setRequestInterceptors(requestInterceptors.values());
+        }
+        grayManager.setup();
+    }
+}

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

@@ -1,8 +1,8 @@
 package cn.springcloud.gray.client.netflix.configuration;
 
-import cn.springcloud.gray.InstanceLocalInfo;
 import cn.springcloud.gray.client.config.properties.GrayHoldoutServerProperties;
 import cn.springcloud.gray.client.netflix.eureka.EurekaInstanceDiscoveryClient;
+import cn.springcloud.gray.client.netflix.eureka.EurekaInstanceLocalInfoInitiralizer;
 import cn.springcloud.gray.client.netflix.eureka.EurekaServerExplainer;
 import cn.springcloud.gray.client.netflix.eureka.EurekaServerListProcessor;
 import cn.springcloud.gray.servernode.InstanceDiscoveryClient;
@@ -12,8 +12,6 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.netflix.eureka.serviceregistry.EurekaRegistration;
-import org.springframework.cloud.netflix.eureka.serviceregistry.EurekaServiceRegistry;
 import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -29,17 +27,9 @@ public class GrayClientEurekaAutoConfiguration {
     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();
+    public EurekaInstanceLocalInfoInitiralizer eurekaInstanceLocalInfoInitiralizer() {
+        return new EurekaInstanceLocalInfoInitiralizer();
     }
 
     @Bean
@@ -50,10 +40,8 @@ public EurekaServerExplainer eurekaServerExplainer() {
 
 
     @Bean
-    @ConditionalOnBean({EurekaServiceRegistry.class, EurekaRegistration.class})
-    public InstanceDiscoveryClient instanceDiscoveryClient(
-            EurekaServiceRegistry eurekaServiceRegistry, EurekaRegistration eurekaRegistration) {
-        return new EurekaInstanceDiscoveryClient(eurekaServiceRegistry, eurekaRegistration);
+    public InstanceDiscoveryClient instanceDiscoveryClient() {
+        return new EurekaInstanceDiscoveryClient();
     }
 
 

spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/eureka/EurekaInstanceDiscoveryClient.java

@@ -3,24 +3,35 @@
 import cn.springcloud.gray.model.InstanceStatus;
 import cn.springcloud.gray.servernode.InstanceDiscoveryClient;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.cloud.netflix.eureka.serviceregistry.EurekaRegistration;
 import org.springframework.cloud.netflix.eureka.serviceregistry.EurekaServiceRegistry;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
 
 @Slf4j
-public class EurekaInstanceDiscoveryClient implements InstanceDiscoveryClient {
+public class EurekaInstanceDiscoveryClient implements ApplicationContextAware, InitializingBean, InstanceDiscoveryClient {
 
     private EurekaServiceRegistry eurekaServiceRegistry;
     private EurekaRegistration eurekaRegistration;
+    private ApplicationContext applicationContext;
 
 
-    public EurekaInstanceDiscoveryClient(EurekaServiceRegistry eurekaServiceRegistry, EurekaRegistration eurekaRegistration) {
-        this.eurekaServiceRegistry = eurekaServiceRegistry;
-        this.eurekaRegistration = eurekaRegistration;
-    }
 
     @Override
     public void setStatus(InstanceStatus status) {
         eurekaServiceRegistry.setStatus(eurekaRegistration, EurekaInstatnceTransformer.toEurekaInstanceStatus(status).name());
     }
 
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        eurekaServiceRegistry = applicationContext.getBean(EurekaServiceRegistry.class);
+        eurekaRegistration = applicationContext.getBean(EurekaRegistration.class);
+    }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        this.applicationContext = applicationContext;
+    }
 }

spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/eureka/EurekaInstanceLocalInfoInitiralizer.java

@@ -0,0 +1,41 @@
+package cn.springcloud.gray.client.netflix.eureka;
+
+import cn.springcloud.gray.local.InstanceLocalInfo;
+import cn.springcloud.gray.local.InstanceLocalInfoInitiralizer;
+import com.netflix.appinfo.EurekaInstanceConfig;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+
+public class EurekaInstanceLocalInfoInitiralizer implements InstanceLocalInfoInitiralizer, ApplicationContextAware {
+
+    private ApplicationContext applicationContext;
+    private InstanceLocalInfo instanceLocalInfo;
+
+
+
+    @Override
+    public InstanceLocalInfo getInstanceLocalInfo() {
+        if(instanceLocalInfo==null){
+            EurekaInstanceConfig eurekaInstanceConfig = applicationContext.getBean(EurekaInstanceConfig.class);
+            String instanceId = eurekaInstanceConfig.getInstanceId();
+
+            int port = eurekaInstanceConfig.getNonSecurePort();
+            if(eurekaInstanceConfig.getSecurePortEnabled()){
+                port = eurekaInstanceConfig.getSecurePort();
+            }
+            instanceLocalInfo =  InstanceLocalInfo.builder()
+                    .instanceId(instanceId)
+                    .serviceId(eurekaInstanceConfig.getAppname())
+                    .host(eurekaInstanceConfig.getHostName(false))
+                    .port(port)
+                    .build();
+        }
+        return instanceLocalInfo;
+    }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        this.applicationContext = applicationContext;
+    }
+}

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

@@ -1,6 +1,7 @@
 package cn.springcloud.gray;
 
 import cn.springcloud.gray.client.switcher.GraySwitcher;
+import cn.springcloud.gray.local.InstanceLocalInfo;
 import cn.springcloud.gray.request.LocalStorageLifeCycle;
 import cn.springcloud.gray.request.RequestLocalStorage;
 import cn.springcloud.gray.servernode.ServerExplainer;
@@ -14,6 +15,7 @@ public class GrayClientHolder {
     private static ServerExplainer<?> serverExplainer;
     private static ServerListProcessor<?> serverListProcessor;
     private static GraySwitcher graySwitcher = new GraySwitcher.DefaultGraySwitcher();
+    private static InstanceLocalInfo instanceLocalInfo;
 
     public static GrayManager getGrayManager() {
         return grayManager;
@@ -62,4 +64,12 @@ public static GraySwitcher getGraySwitcher() {
     public static void setGraySwitcher(GraySwitcher graySwitcher) {
         GrayClientHolder.graySwitcher = graySwitcher;
     }
+
+    public static InstanceLocalInfo getInstanceLocalInfo() {
+        return instanceLocalInfo;
+    }
+
+    public static void setInstanceLocalInfo(InstanceLocalInfo instanceLocalInfo) {
+        GrayClientHolder.instanceLocalInfo = instanceLocalInfo;
+    }
 }

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

@@ -1,6 +1,7 @@
 package cn.springcloud.gray;
 
 import cn.springcloud.gray.client.switcher.GraySwitcher;
+import cn.springcloud.gray.local.InstanceLocalInfoInitiralizer;
 import cn.springcloud.gray.request.LocalStorageLifeCycle;
 import cn.springcloud.gray.request.RequestLocalStorage;
 import cn.springcloud.gray.servernode.ServerExplainer;
@@ -30,14 +31,24 @@ public void afterPropertiesSet() throws Exception {
 
         initGrayManagerRequestInterceptors();
 
+        loadInstanceLocalInfo();
     }
 
 
+
     @Override
     public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
         this.cxt = applicationContext;
     }
 
+    private void loadInstanceLocalInfo(){
+        InstanceLocalInfoInitiralizer instanceLocalInfoInitiralizer = getBean("instanceLocalInfoInitiralizer", InstanceLocalInfoInitiralizer.class);
+        if(instanceLocalInfoInitiralizer==null){
+            return;
+        }
+        GrayClientHolder.setInstanceLocalInfo(instanceLocalInfoInitiralizer.getInstanceLocalInfo());
+    }
+
 
     private <T> T getBean(String beanName, Class<T> cls) {
         T t = null;

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

@@ -2,7 +2,7 @@
 
 import cn.springcloud.gray.CommunicableGrayManager;
 import cn.springcloud.gray.GrayClientConfig;
-import cn.springcloud.gray.InstanceLocalInfo;
+import cn.springcloud.gray.local.InstanceLocalInfo;
 import cn.springcloud.gray.model.GrayInstance;
 import cn.springcloud.gray.model.GrayStatus;
 import lombok.extern.slf4j.Slf4j;

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

@@ -9,6 +9,7 @@
 import cn.springcloud.gray.communication.InformationClient;
 import cn.springcloud.gray.decision.GrayDecision;
 import cn.springcloud.gray.decision.GrayDecisionFactoryKeeper;
+import cn.springcloud.gray.local.InstanceLocalInfo;
 import cn.springcloud.gray.request.LocalStorageLifeCycle;
 import cn.springcloud.gray.request.RequestLocalStorage;
 import cn.springcloud.gray.request.ThreadLocalRequestStorage;

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

@@ -1,36 +1,29 @@
 package cn.springcloud.gray.client.config;
 
 import cn.springcloud.gray.GrayManager;
-import cn.springcloud.gray.InstanceLocalInfo;
-import cn.springcloud.gray.InstanceLocalInfoAware;
+import cn.springcloud.gray.local.InstanceLocalInfo;
+import cn.springcloud.gray.local.InstanceLocalInfoAware;
+import cn.springcloud.gray.local.InstanceLocalInfoAwareProcessor;
+import cn.springcloud.gray.local.InstanceLocalInfoInitiralizer;
 import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
 @ConditionalOnBean(GrayManager.class)
 public class GrayClientBeanPostProcessorConfiguration {
 
-
     @Bean
-//    @ConditionalOnBean(InstanceLocalInfo.class)
-    public BeanPostProcessor beanPostProcessor(InstanceLocalInfo instanceLocalInfo) {
-        return new BeanPostProcessor() {
-            @Override
-            public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
-                if (bean instanceof InstanceLocalInfoAware) {
-                    ((InstanceLocalInfoAware) bean).setInstanceLocalInfo(instanceLocalInfo);
-                }
-                return bean;
-            }
-
-            @Override
-            public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
-                return bean;
-            }
-        };
+    @ConditionalOnProperty(value = "gray.aware.instanceLocalInfo.enabled", matchIfMissing = true)
+    public InstanceLocalInfoAwareProcessor instanceLocalInfoAwareProcessor(
+            InstanceLocalInfoInitiralizer instanceLocalInfoInitiralizer) {
+        return new InstanceLocalInfoAwareProcessor(instanceLocalInfoInitiralizer.getInstanceLocalInfo());
     }
 
+
+
 }