优化GrayManger加载Sping容器中的RequestInterceptor的逻辑

Author: saleson

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

@@ -3,17 +3,16 @@
 import cn.springcloud.gray.communication.InformationClient;
 import cn.springcloud.gray.decision.GrayDecisionFactoryKeeper;
 
-import java.util.List;
-
 public abstract class AbstractCommunicableGrayManager extends SimpleGrayManager implements CommunicableGrayManager {
 
     private GrayClientConfig grayClientConfig;
     private InformationClient informationClient;
 
     public AbstractCommunicableGrayManager(
-            GrayClientConfig grayClientConfig, GrayDecisionFactoryKeeper grayDecisionFactoryKeeper,
-            List<RequestInterceptor> requestInterceptors, InformationClient informationClient) {
-        super(grayDecisionFactoryKeeper, requestInterceptors);
+            GrayClientConfig grayClientConfig,
+            GrayDecisionFactoryKeeper grayDecisionFactoryKeeper,
+            InformationClient informationClient) {
+        super(grayDecisionFactoryKeeper);
         this.grayClientConfig = grayClientConfig;
         this.informationClient = informationClient;
     }

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

@@ -1,9 +1,8 @@
 package cn.springcloud.gray;
 
 import cn.springcloud.gray.decision.GrayDecision;
-import cn.springcloud.gray.decision.MultiGrayDecision;
-import cn.springcloud.gray.decision.factory.GrayDecisionFactory;
 import cn.springcloud.gray.decision.GrayDecisionFactoryKeeper;
+import cn.springcloud.gray.decision.MultiGrayDecision;
 import cn.springcloud.gray.model.DecisionDefinition;
 import cn.springcloud.gray.model.GrayInstance;
 import cn.springcloud.gray.model.PolicyDefinition;
@@ -29,8 +28,7 @@ public abstract class AbstractGrayManager implements GrayManager {
 
 
     public AbstractGrayManager(
-            GrayDecisionFactoryKeeper grayDecisionFactoryKeeper, List<RequestInterceptor> requestInterceptors) {
-        initRequestInterceptors(requestInterceptors);
+            GrayDecisionFactoryKeeper grayDecisionFactoryKeeper) {
         this.grayDecisionFactoryKeeper = grayDecisionFactoryKeeper;
     }
 
@@ -78,31 +76,32 @@ private GrayDecision createGrayDecision(PolicyDefinition policyDefinition) {
     }
 
 
-    private void initRequestInterceptors(List<RequestInterceptor> requestInterceptors) {
-        if (requestInterceptors == null || requestInterceptors.isEmpty()) {
-            return;
-        }
-        List<RequestInterceptor> all = new ArrayList<>();
-        for (RequestInterceptor interceptor : requestInterceptors) {
-            if (StringUtils.equals(interceptor.interceptroType(), "all")) {
-                all.add(interceptor);
-            } else {
-                List<RequestInterceptor> interceptors = this.requestInterceptors.get(interceptor.interceptroType());
-                if (interceptors == null) {
-                    interceptors = new ArrayList<>();
-                    this.requestInterceptors.put(interceptor.interceptroType(), interceptors);
+    public void setRequestInterceptors(Collection<RequestInterceptor> requestInterceptors) {
+        Map<String, List<RequestInterceptor>> requestInterceptorMap = new HashMap<>();
+        if (CollectionUtils.isNotEmpty(requestInterceptors)) {
+            List<RequestInterceptor> all = new ArrayList<>();
+            for (RequestInterceptor interceptor : requestInterceptors) {
+                if (StringUtils.equals(interceptor.interceptroType(), "all")) {
+                    all.add(interceptor);
+                } else {
+                    List<RequestInterceptor> interceptors = requestInterceptorMap.get(interceptor.interceptroType());
+                    if (interceptors == null) {
+                        interceptors = new ArrayList<>();
+                        requestInterceptorMap.put(interceptor.interceptroType(), interceptors);
+                    }
+                    interceptors.add(interceptor);
                 }
-                interceptors.add(interceptor);
             }
+            putTypeAllTo(requestInterceptorMap, all);
         }
-        putTypeAllTo(all);
+        this.requestInterceptors = requestInterceptorMap;
     }
 
-    private void putTypeAllTo(List<RequestInterceptor> all) {
+    private void putTypeAllTo(Map<String, List<RequestInterceptor>> requestInterceptorMap, List<RequestInterceptor> all) {
         if (all.isEmpty()) {
             return;
         }
-        requestInterceptors.values().forEach(list -> {
+        requestInterceptorMap.values().forEach(list -> {
             list.addAll(all);
             OrderComparator.sort(list);
         });

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

@@ -24,9 +24,8 @@ public DefaultGrayManager(
             GrayClientConfig grayClientConfig,
             GrayLoadProperties grayLoadProperties,
             GrayDecisionFactoryKeeper grayDecisionFactoryKeeper,
-            List<RequestInterceptor> requestInterceptors,
             InformationClient informationClient) {
-        super(grayClientConfig, grayDecisionFactoryKeeper, requestInterceptors, informationClient);
+        super(grayClientConfig, grayDecisionFactoryKeeper, informationClient);
         this.grayLoadProperties = grayLoadProperties;
         openForWork();
     }

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

@@ -8,6 +8,8 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 
+import java.util.Map;
+
 @Slf4j
 public class GrayClientInitializer implements ApplicationContextAware, InitializingBean {
     private ApplicationContext cxt;
@@ -17,6 +19,9 @@ public void afterPropertiesSet() throws Exception {
         GrayClientHolder.setGrayManager(getBean("grayManager", GrayManager.class));
         GrayClientHolder.setRequestLocalStorage(getBean("requestLocalStorage", RequestLocalStorage.class));
         GrayClientHolder.setServerExplainer(getBean("serverExplainer", ServerExplainer.class));
+
+        initGrayManagerRequestInterceptors();
+
     }
 
 
@@ -38,4 +43,16 @@ private <T> T getBean(String beanName, Class<T> cls) {
         }
         return t;
     }
+
+
+    /**
+     * 为了解耦合，特别将GrayManger加载Sping容器中的RequestInterceptor的逻辑独立出来
+     */
+    private void initGrayManagerRequestInterceptors() {
+        Map<String, RequestInterceptor> requestInterceptors = cxt.getBeansOfType(RequestInterceptor.class);
+        GrayManager grayManager = GrayClientHolder.getGrayManager();
+        if (grayManager instanceof AbstractGrayManager) {
+            ((AbstractGrayManager) grayManager).setRequestInterceptors(requestInterceptors.values());
+        }
+    }
 }

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

@@ -42,6 +42,5 @@ public interface GrayManager {
 
     List<RequestInterceptor> getRequeestInterceptors(String interceptroType);
 
-
     void shutdown();
 }

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

@@ -7,7 +7,6 @@
 
 import java.util.Collection;
 import java.util.Collections;
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.Lock;
@@ -21,8 +20,8 @@ public class SimpleGrayManager extends AbstractGrayManager {
     protected Lock lock = new ReentrantLock();
 
 
-    public SimpleGrayManager(GrayDecisionFactoryKeeper grayDecisionFactoryKeeper, List<RequestInterceptor> requestInterceptors) {
-        super(grayDecisionFactoryKeeper, requestInterceptors);
+    public SimpleGrayManager(GrayDecisionFactoryKeeper grayDecisionFactoryKeeper) {
+        super(grayDecisionFactoryKeeper);
     }
 
 

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

@@ -18,8 +18,6 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
-import java.util.List;
-
 @Configuration
 @EnableConfigurationProperties(
         {GrayClientProperties.class,
@@ -42,11 +40,9 @@ public class GrayClientAutoConfiguration {
     public GrayManager grayManager(
             @Autowired(required = false) GrayLoadProperties grayLoadProperties,
             GrayDecisionFactoryKeeper grayDecisionFactoryKeeper,
-            @Autowired(required = false) List<RequestInterceptor> requestInterceptors,
             @Autowired(required = false) InformationClient informationClient) {
         return new DefaultGrayManager(
-                grayClientProperties, grayLoadProperties, grayDecisionFactoryKeeper,
-                requestInterceptors, informationClient);
+                grayClientProperties, grayLoadProperties, grayDecisionFactoryKeeper, informationClient);
     }
 
 

spring-cloud-gray-samples/spring-cloud-gray-service-a-sample/src/main/java/cn/springcloud/service/a/configuration/GraylConfiguration.java

@@ -18,7 +18,9 @@ public class GraylConfiguration {
 
     @Bean
     public SimpleGrayManager grayManager() {
-        return new SimpleGrayManager(grayDecisionFactoryKeeper, requestInterceptors);
+        SimpleGrayManager simpleGrayManager = new SimpleGrayManager(grayDecisionFactoryKeeper);
+        simpleGrayManager.setRequestInterceptors(requestInterceptors);
+        return simpleGrayManager;
     }
 
 

spring-cloud-gray-samples/spring-cloud-gray-service-b-sample/src/main/java/cn/springcloud/gray/service/b/configuration/GraylConfiguration.java

@@ -18,7 +18,9 @@ public class GraylConfiguration {
 
     @Bean
     public SimpleGrayManager grayManager() {
-        return new SimpleGrayManager(grayDecisionFactoryKeeper, requestInterceptors);
+        SimpleGrayManager simpleGrayManager = new SimpleGrayManager(grayDecisionFactoryKeeper);
+        simpleGrayManager.setRequestInterceptors(requestInterceptors);
+        return simpleGrayManager;
     }
 
 

spring-cloud-gray-samples/spring-cloud-gray-zuul-sample/src/main/java/cn/springcloud/gray/zuul/configuration/GraylConfiguration.java

@@ -19,7 +19,9 @@ public class GraylConfiguration {
 
     @Bean
     public GrayManager grayManager() {
-        return new SimpleGrayManager(grayDecisionFactoryKeeper, requestInterceptors);
+        SimpleGrayManager simpleGrayManager = new SimpleGrayManager(grayDecisionFactoryKeeper);
+        simpleGrayManager.setRequestInterceptors(requestInterceptors);
+        return simpleGrayManager;
     }