优化GrayClientHolder代码

Author: saleson

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

@@ -1,7 +1,7 @@
 package cn.springcloud.gray.client.netflix.ribbon;
 
+import cn.springcloud.gray.GrayClientHolder;
 import cn.springcloud.gray.GrayManager;
-import cn.springcloud.gray.client.netflix.GrayClientHolder;
 import cn.springcloud.gray.model.GrayService;
 import cn.springcloud.gray.request.GrayRequest;
 import cn.springcloud.gray.request.RequestLocalStorage;

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

@@ -1,40 +1,28 @@
 package cn.springcloud.gray.client.netflix.ribbon.configuration;
 
 import cn.springcloud.gray.GrayManager;
-import cn.springcloud.gray.client.netflix.GrayClientHolder;
 import cn.springcloud.gray.client.netflix.ribbon.GrayLoadBalanceRule;
-import cn.springcloud.gray.servernode.ServerExplainer;
 import cn.springcloud.gray.request.RequestLocalStorage;
+import cn.springcloud.gray.servernode.ServerExplainer;
 import com.netflix.client.config.IClientConfig;
 import com.netflix.loadbalancer.IRule;
 import com.netflix.loadbalancer.Server;
-import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-public class GrayRibbonClientsConfiguration implements InitializingBean {
-
-    @Autowired
-    private GrayManager grayManager;
-    @Autowired
-    private RequestLocalStorage requestLocalStorage;
-    @Autowired
-    private ServerExplainer<Server> serverExplainer;
+public class GrayRibbonClientsConfiguration {
 
     @Bean
-    public IRule ribbonRule(@Autowired(required = false) IClientConfig config) {
+    public IRule ribbonRule(
+            @Autowired(required = false) IClientConfig config,
+            GrayManager grayManager,
+            RequestLocalStorage requestLocalStorage,
+            ServerExplainer<Server> serverExplainer) {
         GrayLoadBalanceRule rule = new GrayLoadBalanceRule(grayManager, requestLocalStorage, serverExplainer);
         rule.initWithNiwsConfig(config);
         return rule;
     }
 
-
-    @Override
-    public void afterPropertiesSet() throws Exception {
-        GrayClientHolder.setGrayManager(grayManager);
-        GrayClientHolder.setRequestLocalStorage(requestLocalStorage);
-        GrayClientHolder.setServerExplainer(serverExplainer);
-    }
 }

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

@@ -1,15 +1,13 @@
-package cn.springcloud.gray.client.netflix;
+package cn.springcloud.gray;
 
-import cn.springcloud.gray.GrayManager;
-import cn.springcloud.gray.servernode.ServerExplainer;
 import cn.springcloud.gray.request.RequestLocalStorage;
-import com.netflix.loadbalancer.Server;
+import cn.springcloud.gray.servernode.ServerExplainer;
 
 public class GrayClientHolder {
 
     private static GrayManager grayManager;
     private static RequestLocalStorage requestLocalStorage;
-    private static ServerExplainer<Server> serverExplainer;
+    private static ServerExplainer<?> serverExplainer;
 
     public static GrayManager getGrayManager() {
         return grayManager;
@@ -27,11 +25,11 @@ public static void setRequestLocalStorage(RequestLocalStorage requestLocalStorag
         GrayClientHolder.requestLocalStorage = requestLocalStorage;
     }
 
-    public static ServerExplainer<Server> getServerExplainer() {
-        return serverExplainer;
+    public static <SERVER> ServerExplainer<SERVER> getServerExplainer() {
+        return (ServerExplainer<SERVER>) serverExplainer;
     }
 
-    public static void setServerExplainer(ServerExplainer<Server> serverExplainer) {
+    public static void setServerExplainer(ServerExplainer<?> serverExplainer) {
         GrayClientHolder.serverExplainer = serverExplainer;
     }
 }

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

@@ -0,0 +1,41 @@
+package cn.springcloud.gray;
+
+import cn.springcloud.gray.request.RequestLocalStorage;
+import cn.springcloud.gray.servernode.ServerExplainer;
+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;
+
+@Slf4j
+public class GrayClientInitializer 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.setServerExplainer(getBean("serverExplainer", ServerExplainer.class));
+    }
+
+
+    @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;
+    }
+}

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

@@ -64,4 +64,10 @@ public RequestLocalStorage requestLocalStorage() {
         return new ThreadLocalRequestStorage();
     }
 
+
+    @Bean
+    public GrayClientInitializer grayClientInitializer() {
+        return new GrayClientInitializer();
+    }
+
 }

spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/GrayServerInitializingDestroyBean.java

@@ -73,7 +73,12 @@ private void initGrayInstanceRecordEvictionTask() {
     }
 
     private <T> T getBean(String beanName, Class<T> cls) {
-        T t = appCxt.getBean(beanName, cls);
+        T t = null;
+        try {
+            t = appCxt.getBean(beanName, cls);
+        } catch (BeansException e) {
+            log.warn("没有从spring容器中找到name为'{}', class为'{}'的Bean", beanName, cls);
+        }
         if (t == null) {
             t = appCxt.getBean(cls);
         }