Merge pull request #19 from SpringCloud/A

A

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.4</version>
+    <version>A.1.0.5</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.4</version>
+        <version>A.1.0.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -39,8 +39,6 @@ public boolean pre(GrayRequest request) {
                     String name = new StringBuilder().append(GrayHttpTrackInfo.GRAY_TRACK_PARAMETER_PREFIX)
                             .append(GrayTrackInfo.GRAY_TRACK_SEPARATE)
                             .append(entry.getKey()).toString();
-                    context.addZuulRequestHeader(GrayHttpTrackInfo.GRAY_TRACK_METHOD, grayTrack.getMethod());
-
                     entry.getValue().forEach(v -> {
                         context.addZuulRequestHeader(name, v);
                     });

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.4</version>
+        <version>A.1.0.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -37,6 +37,21 @@ public HttpParameterGrayDecisionFactory httpParameterGrayDecisionFactory() {
         public TraceIpGrayDecisionFactory traceIpGrayDecisionFactory() {
             return new TraceIpGrayDecisionFactory();
         }
+
+        @Bean
+        public HttpTrackParameterGrayDecisionFactory httpTrackParameterGrayDecisionFactory() {
+            return new HttpTrackParameterGrayDecisionFactory();
+        }
+
+        @Bean
+        public HttpTrackHeaderGrayDecisionFactory httpTrackHeaderGrayDecisionFactory() {
+            return new HttpTrackHeaderGrayDecisionFactory();
+        }
+
+        @Bean
+        public TrackAttributeGrayDecisionFactory trackAttributeGrayDecisionFactory() {
+            return new TrackAttributeGrayDecisionFactory();
+        }
     }
 
 

spring-cloud-gray-client/src/main/java/cn/springcloud/gray/decision/compare/Comparators.java

@@ -1,12 +1,16 @@
 package cn.springcloud.gray.decision.compare;
 
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
 public class Comparators {
 
 
-    private static Map<CompareMode, PredicateComparator> collectionStringComparators = new HashMap<>();
+    private static Map<CompareMode, PredicateComparator<Collection<String>>> collectionStringComparators = new HashMap<>();
+    private static Map<CompareMode, PredicateComparator<String>> stringStringComparators = new HashMap<>();
 
     static {
         collectionStringComparators.put(CompareMode.EQUAL, new CollectionStringEqualComparator());
@@ -15,10 +19,18 @@ public class Comparators {
         collectionStringComparators.put(CompareMode.CONTAINS_ALL, new CollectionStringContainAllComparator());
         collectionStringComparators.put(CompareMode.NOT_CONTAINS_ALL, new CollectionStringNotContainAllComparator());
         collectionStringComparators.put(CompareMode.NOT_CONTAINS_ANY, new CollectionStringNotContainAnyComparator());
+
+        stringStringComparators.put(CompareMode.EQUAL, (arg1, arg2) -> StringUtils.equals(arg1, arg2));
+        stringStringComparators.put(CompareMode.UNEQUAL, (arg1, arg2) -> !StringUtils.equals(arg1, arg2));
     }
 
 
-    public static PredicateComparator getCollectionStringComparator(CompareMode mode) {
+    public static PredicateComparator<Collection<String>> getCollectionStringComparator(CompareMode mode) {
         return collectionStringComparators.get(mode);
     }
+
+
+    public static PredicateComparator<String> getStringComparator(CompareMode mode) {
+        return stringStringComparators.get(mode);
+    }
 }

spring-cloud-gray-client/src/main/java/cn/springcloud/gray/decision/factory/HttpHeaderGrayDecisionFactory.java

@@ -2,8 +2,8 @@
 
 import cn.springcloud.gray.decision.GrayDecision;
 import cn.springcloud.gray.decision.compare.Comparators;
+import cn.springcloud.gray.decision.compare.PredicateComparator;
 import cn.springcloud.gray.request.GrayHttpRequest;
-import cn.springcloud.gray.request.GrayRequest;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -23,9 +23,14 @@ public HttpHeaderGrayDecisionFactory() {
     public GrayDecision apply(Config configBean) {
         return args -> {
             GrayHttpRequest grayRequest = (GrayHttpRequest) args.getGrayRequest();
+
+            PredicateComparator<Collection<String>> predicateComparator =
+                    Comparators.getCollectionStringComparator(configBean.getCompareMode());
+            if (predicateComparator == null) {
+                return false;
+            }
             Map<String, ? extends Collection<String>> headers = grayRequest.getHeaders();
-            return Comparators.getCollectionStringComparator(configBean.getCompareMode())
-                    .test(headers.get(configBean.getHeader()), configBean.getValues());
+            return predicateComparator.test(headers.get(configBean.getHeader()), configBean.getValues());
         };
     }
 

spring-cloud-gray-client/src/main/java/cn/springcloud/gray/decision/factory/HttpMethodGrayDecisionFactory.java

@@ -1,15 +1,13 @@
 package cn.springcloud.gray.decision.factory;
 
 import cn.springcloud.gray.decision.GrayDecision;
+import cn.springcloud.gray.decision.compare.Comparators;
+import cn.springcloud.gray.decision.compare.PredicateComparator;
 import cn.springcloud.gray.request.GrayHttpRequest;
-import cn.springcloud.gray.request.GrayRequest;
 import lombok.Getter;
 import lombok.Setter;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.HttpMethod;
 
-import java.util.Objects;
-
 public class HttpMethodGrayDecisionFactory extends AbstractGrayDecisionFactory<HttpMethodGrayDecisionFactory.Config> {
 
 
@@ -21,14 +19,18 @@ public HttpMethodGrayDecisionFactory() {
     public GrayDecision apply(Config configBean) {
         return args -> {
             GrayHttpRequest grayRequest = (GrayHttpRequest) args.getGrayRequest();
-            return StringUtils.endsWithIgnoreCase(grayRequest.getMethod(), configBean.getMethod().name());
+            PredicateComparator<String> predicateComparator = Comparators.getStringComparator(configBean.getCompareMode());
+            if (predicateComparator == null) {
+                return false;
+            }
+            return predicateComparator.test(grayRequest.getMethod(), configBean.getMethod().name());
         };
     }
 
 
     @Setter
     @Getter
-    public static class Config {
+    public static class Config extends CompareGrayDecisionFactory.CompareConfig {
         private HttpMethod method;
 
     }

spring-cloud-gray-client/src/main/java/cn/springcloud/gray/decision/factory/HttpParameterGrayDecisionFactory.java

@@ -2,15 +2,14 @@
 
 import cn.springcloud.gray.decision.GrayDecision;
 import cn.springcloud.gray.decision.compare.Comparators;
+import cn.springcloud.gray.decision.compare.PredicateComparator;
 import cn.springcloud.gray.request.GrayHttpRequest;
-import cn.springcloud.gray.request.GrayRequest;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 
 public class HttpParameterGrayDecisionFactory extends CompareGrayDecisionFactory<HttpParameterGrayDecisionFactory.Config> {
 
@@ -23,8 +22,12 @@ public HttpParameterGrayDecisionFactory() {
     public GrayDecision apply(Config configBean) {
         return args -> {
             GrayHttpRequest grayRequest = (GrayHttpRequest) args.getGrayRequest();
-            return Comparators.getCollectionStringComparator(configBean.getCompareMode())
-                    .test(grayRequest.getParameters().get(configBean.getName()), configBean.getValues());
+            PredicateComparator<Collection<String>> predicateComparator =
+                    Comparators.getCollectionStringComparator(configBean.getCompareMode());
+            if (predicateComparator == null) {
+                return false;
+            }
+            return predicateComparator.test(grayRequest.getParameters().get(configBean.getName()), configBean.getValues());
         };
     }
 

spring-cloud-gray-client/src/main/java/cn/springcloud/gray/decision/factory/HttpTrackHeaderGrayDecisionFactory.java

@@ -0,0 +1,34 @@
+package cn.springcloud.gray.decision.factory;
+
+import cn.springcloud.gray.decision.GrayDecision;
+import cn.springcloud.gray.decision.compare.Comparators;
+import cn.springcloud.gray.decision.compare.PredicateComparator;
+import cn.springcloud.gray.request.GrayHttpTrackInfo;
+
+import java.util.Collection;
+import java.util.Map;
+
+public class HttpTrackHeaderGrayDecisionFactory extends CompareGrayDecisionFactory<HttpHeaderGrayDecisionFactory.Config> {
+
+    public HttpTrackHeaderGrayDecisionFactory() {
+        super(HttpHeaderGrayDecisionFactory.Config.class);
+    }
+
+    @Override
+    public GrayDecision apply(HttpHeaderGrayDecisionFactory.Config configBean) {
+        return args -> {
+            GrayHttpTrackInfo grayTrackInfo = (GrayHttpTrackInfo) args.getGrayRequest().getGrayTrackInfo();
+            if (grayTrackInfo == null) {
+                return false;
+            }
+
+            Map<String, ? extends Collection<String>> headers = grayTrackInfo.getHeaders();
+            PredicateComparator<Collection<String>> predicateComparator =
+                    Comparators.getCollectionStringComparator(configBean.getCompareMode());
+            if (predicateComparator == null) {
+                return false;
+            }
+            return predicateComparator.test(headers.get(configBean.getHeader()), configBean.getValues());
+        };
+    }
+}