代码优化

saleson · saleson · commit ab6a28c7acc2 · 2019-07-08T23:48:05.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
     <groupId>cn.springcloud.gray</groupId>
     <artifactId>spring-cloud-gray</artifactId>
     <packaging>pom</packaging>
-    <version>A.1.0.8</version>
+    <version>A.1.0.9</version>
     <url>https://github.com/SpringCloud/spring-cloud-gray</url>
     <organization>
         <name>Spring Cloud中国社区</name>
diff --git a/spring-cloud-gray-client-netflix/pom.xml b/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.8</version>
+        <version>A.1.0.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/zuul/ZuulRequestInterceptor.java b/spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/zuul/ZuulRequestInterceptor.java
@@ -29,21 +29,21 @@ public boolean pre(GrayRequest request) {
             RequestContext context = (RequestContext) request.getAttribute(
                     GrayPreZuulFilter.GRAY_REQUEST_ATTRIBUTE_NAME_ZUUL_REQUEST_CONTEXT);
             if (StringUtils.isNotEmpty(grayTrack.getUri())) {
-                context.addZuulRequestHeader(GrayHttpTrackInfo.GRAY_TRACK_URI, grayTrack.getUri());
+                context.getZuulRequestHeaders().put(GrayHttpTrackInfo.GRAY_TRACK_URI, grayTrack.getUri());
             }
             if (StringUtils.isNotEmpty(grayTrack.getTraceIp())) {
-                context.addZuulRequestHeader(GrayHttpTrackInfo.GRAY_TRACK_TRACE_IP, grayTrack.getTraceIp());
+                context.getZuulRequestHeaders().put(GrayHttpTrackInfo.GRAY_TRACK_TRACE_IP, grayTrack.getTraceIp());
             }
             if (StringUtils.isNotEmpty(grayTrack.getMethod())) {
-                context.addZuulRequestHeader(GrayHttpTrackInfo.GRAY_TRACK_METHOD, grayTrack.getMethod());
+                context.getZuulRequestHeaders().put(GrayHttpTrackInfo.GRAY_TRACK_METHOD, grayTrack.getMethod());
             }
             if (grayTrack.getParameters() != null && !grayTrack.getParameters().isEmpty()) {
                 grayTrack.getParameters().entrySet().forEach(entry -> {
                     String name = new StringBuilder().append(GrayHttpTrackInfo.GRAY_TRACK_PARAMETER_PREFIX)
                             .append(GrayTrackInfo.GRAY_TRACK_SEPARATE)
                             .append(entry.getKey()).toString();
                     entry.getValue().forEach(v -> {
-                        context.addZuulRequestHeader(name, v);
+                        context.getZuulRequestHeaders().put(name, v);
                     });
                 });
             }
@@ -53,7 +53,7 @@ public boolean pre(GrayRequest request) {
                             .append(GrayTrackInfo.GRAY_TRACK_SEPARATE)
                             .append(entry.getKey()).toString();
                     entry.getValue().forEach(v -> {
-                        context.addZuulRequestHeader(name, v);
+                        context.getZuulRequestHeaders().put(name, v);
                     });
                 });
             }
@@ -64,7 +64,7 @@ public boolean pre(GrayRequest request) {
                     String name = new StringBuilder().append(GrayTrackInfo.GRAY_TRACK_ATTRIBUTE_PREFIX)
                             .append(GrayTrackInfo.GRAY_TRACK_SEPARATE)
                             .append(entry.getKey()).toString();
-                    context.addZuulRequestHeader(name, entry.getValue());
+                    context.getZuulRequestHeaders().put(name, entry.getValue());
                 });
             }
 
diff --git a/spring-cloud-gray-client/pom.xml b/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.8</version>
+        <version>A.1.0.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/decision/factory/FlowRateGrayDecisionFactory.java b/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/decision/factory/FlowRateGrayDecisionFactory.java
@@ -60,7 +60,7 @@ private void initFieldGetters() {
                 (grayReq, field) -> {
                     GrayHttpTrackInfo grayHttpTrackInfo = ((GrayHttpTrackInfo) grayReq.getGrayTrackInfo());
                     if (!Objects.isNull(grayHttpTrackInfo)) {
-                        return getValueForMultiValueMap(grayHttpTrackInfo.getHeaders(), field);
+                        return joinString(grayHttpTrackInfo.getHeader(field));
                     }
                     return null;
                 });
@@ -69,7 +69,7 @@ private void initFieldGetters() {
                 (grayReq, field) -> {
                     GrayHttpTrackInfo grayHttpTrackInfo = ((GrayHttpTrackInfo) grayReq.getGrayTrackInfo());
                     if (!Objects.isNull(grayHttpTrackInfo)) {
-                        return getValueForMultiValueMap(grayHttpTrackInfo.getParameters(), field);
+                        return joinString(grayHttpTrackInfo.getParameter(field));
                     }
                     return null;
                 });
@@ -84,7 +84,10 @@ private String getFieldValue(GrayHttpRequest grayRequest, Config configBean) {
     }
 
     private String getValueForMultiValueMap(Map<String, ? extends Collection<String>> map, String field) {
-        Collection<String> collection = map.get(field);
+        return joinString(map.get(field));
+    }
+
+    private String joinString(Collection<String> collection) {
         if (collection != null) {
             return StringUtils.join(collection, ",");
         }
diff --git a/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/decision/factory/HttpTrackHeaderGrayDecisionFactory.java b/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/decision/factory/HttpTrackHeaderGrayDecisionFactory.java
@@ -6,7 +6,6 @@
 import cn.springcloud.gray.request.GrayHttpTrackInfo;
 
 import java.util.Collection;
-import java.util.Map;
 
 public class HttpTrackHeaderGrayDecisionFactory extends CompareGrayDecisionFactory<HttpHeaderGrayDecisionFactory.Config> {
 
@@ -22,13 +21,12 @@ public GrayDecision apply(HttpHeaderGrayDecisionFactory.Config configBean) {
                 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());
+            return predicateComparator.test(grayTrackInfo.getHeader(configBean.getHeader()), configBean.getValues());
         };
     }
 }
diff --git a/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/decision/factory/HttpTrackParameterGrayDecisionFactory.java b/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/decision/factory/HttpTrackParameterGrayDecisionFactory.java
@@ -26,7 +26,7 @@ public GrayDecision apply(HttpParameterGrayDecisionFactory.Config configBean) {
             if (predicateComparator == null) {
                 return false;
             }
-            return predicateComparator.test(grayTrackInfo.getParameters().get(configBean.getName()), configBean.getValues());
+            return predicateComparator.test(grayTrackInfo.getParameter(configBean.getName()), configBean.getValues());
         };
     }
 }
diff --git a/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/request/GrayHttpTrackInfo.java b/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/request/GrayHttpTrackInfo.java
@@ -1,16 +1,16 @@
 package cn.springcloud.gray.request;
 
-import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
+import org.apache.commons.collections.MapUtils;
 import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
-@Getter
 public class GrayHttpTrackInfo extends GrayTrackInfo {
 
     public static final String GRAY_TRACK_HEADER_PREFIX = GRAY_TRACK_PREFIX + "header";
@@ -23,26 +23,52 @@ public class GrayHttpTrackInfo extends GrayTrackInfo {
 
     private HttpHeaders headers = new HttpHeaders();
     @Setter
+    @Getter
     private String method;
     private MultiValueMap<String, String> parameters = new LinkedMultiValueMap<>();
     @Setter
+    @Getter
     private String uri;
 
     public void addHeader(String name, String value) {
-        headers.add(name, value);
+        headers.add(name.toLowerCase(), value);
     }
 
     public void setHeader(String name, List<String> values) {
-        headers.put(name, values);
+        headers.put(name.toLowerCase(), values);
+    }
+
+    public List<String> getHeader(String name) {
+        return headers.get(name.toLowerCase());
     }
 
 
     public void addParameter(String name, String value) {
-        parameters.add(name, value);
+        parameters.add(name.toLowerCase(), value);
     }
 
     public void setParameters(String name, List<String> value) {
-        parameters.put(name, value);
+        parameters.put(name.toLowerCase(), value);
+    }
+
+    public List<String> getParameter(String name) {
+        return parameters.get(name.toLowerCase());
+    }
+
+    public Set<String> headerNames() {
+        return headers.keySet();
+    }
+
+    public Set<String> parameterNames() {
+        return parameters.keySet();
+    }
+
+    public Map<String, List<String>> getHeaders() {
+        return MapUtils.unmodifiableMap(headers);
+    }
+
+    public Map<String, List<String>> getParameters() {
+        return MapUtils.unmodifiableMap(parameters);
     }
 
 
diff --git a/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/request/GrayTrackInfo.java b/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/request/GrayTrackInfo.java
@@ -13,9 +13,9 @@ public class GrayTrackInfo {
 
     public static final String GRAY_TRACK_SEPARATE = "__";
 
-    public static final String GRAY_TRACK_PREFIX = "_G_T_";
+    public static final String GRAY_TRACK_PREFIX = "_g_t_";
 
-    public static final String GRAY_TRACK_TRACE_IP = GRAY_TRACK_PREFIX + "traceIP";
+    public static final String GRAY_TRACK_TRACE_IP = GRAY_TRACK_PREFIX + "trace_ip";
 
     public static final String GRAY_TRACK_ATTRIBUTE_PREFIX = GRAY_TRACK_PREFIX + "attr";
 
@@ -25,11 +25,11 @@ public class GrayTrackInfo {
     private Map<String, String> attributes = new HashMap<>(32);
 
     public String getAttribute(String name) {
-        return attributes.get(name);
+        return attributes.get(name.toLowerCase());
     }
 
     public void setAttribute(String name, String value) {
-        attributes.put(name, value);
+        attributes.put(name.toLowerCase(), value);
     }
 
 
diff --git a/spring-cloud-gray-core/pom.xml b/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.8</version>
+        <version>A.1.0.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gray-dependencies/pom.xml b/spring-cloud-gray-dependencies/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-gray</artifactId>
         <groupId>cn.springcloud.gray</groupId>
-        <version>A.1.0.8</version>
+        <version>A.1.0.9</version>
     </parent>
     <!--    <parent>-->
     <!--        <groupId>org.springframework.boot</groupId>-->
@@ -17,7 +17,7 @@
 
     <groupId>cn.springcloud.gray</groupId>
     <artifactId>spring-cloud-gray-dependencies</artifactId>
-    <version>A.1.0.8</version>
+    <version>A.1.0.9</version>
     <packaging>pom</packaging>
 
     <licenses>
diff --git a/spring-cloud-gray-samples/pom.xml b/spring-cloud-gray-samples/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-gray</artifactId>
         <groupId>cn.springcloud.gray</groupId>
-        <version>A.1.0.8</version>
+        <version>A.1.0.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gray-samples/spring-cloud-gray-eureka-sample/pom.xml b/spring-cloud-gray-samples/spring-cloud-gray-eureka-sample/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-gray-samples</artifactId>
         <groupId>cn.springcloud.gray</groupId>
-        <version>A.1.0.8</version>
+        <version>A.1.0.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -20,7 +20,7 @@
         <dependency>
             <artifactId>spring-cloud-gray-utils</artifactId>
             <groupId>cn.springcloud.gray</groupId>
-            <version>A.1.0.8</version>
+            <version>A.1.0.9</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/spring-cloud-gray-samples/spring-cloud-gray-server-sample/pom.xml b/spring-cloud-gray-samples/spring-cloud-gray-server-sample/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-gray-samples</artifactId>
         <groupId>cn.springcloud.gray</groupId>
-        <version>A.1.0.8</version>
+        <version>A.1.0.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gray-samples/spring-cloud-gray-service-a-sample/pom.xml b/spring-cloud-gray-samples/spring-cloud-gray-service-a-sample/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-gray-samples</artifactId>
         <groupId>cn.springcloud.gray</groupId>
-        <version>A.1.0.8</version>
+        <version>A.1.0.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gray-samples/spring-cloud-gray-service-a1-sample/pom.xml b/spring-cloud-gray-samples/spring-cloud-gray-service-a1-sample/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-gray-samples</artifactId>
         <groupId>cn.springcloud.gray</groupId>
-        <version>A.1.0.8</version>
+        <version>A.1.0.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gray-samples/spring-cloud-gray-service-b-sample/pom.xml b/spring-cloud-gray-samples/spring-cloud-gray-service-b-sample/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-gray-samples</artifactId>
         <groupId>cn.springcloud.gray</groupId>
-        <version>A.1.0.8</version>
+        <version>A.1.0.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gray-samples/spring-cloud-gray-stream-sample/pom.xml b/spring-cloud-gray-samples/spring-cloud-gray-stream-sample/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-gray-samples</artifactId>
         <groupId>cn.springcloud.gray</groupId>
-        <version>A.1.0.8</version>
+        <version>A.1.0.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gray-samples/spring-cloud-gray-zuul-sample/pom.xml b/spring-cloud-gray-samples/spring-cloud-gray-zuul-sample/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-gray-samples</artifactId>
         <groupId>cn.springcloud.gray</groupId>
-        <version>A.1.0.8</version>
+        <version>A.1.0.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gray-server/pom.xml b/spring-cloud-gray-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-gray</artifactId>
         <groupId>cn.springcloud.gray</groupId>
-        <version>A.1.0.8</version>
+        <version>A.1.0.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/resources/domain/ApiRes.java b/spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/resources/domain/ApiRes.java
@@ -12,6 +12,7 @@
 public class ApiRes<T> {
 
     public static final String CODE_SUCCESS = "0";
+    public static final String CODE_NOT_FOUND = "404";
 
     private String code = "0";
     private String message;
diff --git a/spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/resources/rest/DiscoverInstanceResource.java b/spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/resources/rest/DiscoverInstanceResource.java
diff --git a/spring-cloud-gray-starter-dependencies/pom.xml b/spring-cloud-gray-starter-dependencies/pom.xml
diff --git a/spring-cloud-gray-utils/pom.xml b/spring-cloud-gray-utils/pom.xml
diff --git a/spring-cloud-starter-gray-client/pom.xml b/spring-cloud-starter-gray-client/pom.xml
diff --git a/spring-cloud-starter-gray-eureka-server/pom.xml b/spring-cloud-starter-gray-eureka-server/pom.xml
diff --git a/spring-cloud-starter-gray-server/pom.xml b/spring-cloud-starter-gray-server/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`import cn.springcloud.gray.request.GrayHttpTrackInfo;`
`7`	`7`
`8`	`8`	`import java.util.Collection;`
`9`		`-import java.util.Map;`
`10`	`9`
`11`	`10`	`public class HttpTrackHeaderGrayDecisionFactory extends CompareGrayDecisionFactory<HttpHeaderGrayDecisionFactory.Config> {`
`12`	`11`
`@@ -22,13 +21,12 @@ public GrayDecision apply(HttpHeaderGrayDecisionFactory.Config configBean) {`
`22`	`21`	`return false;`
`23`	`22`	`}`
`24`	`23`
`25`		`- Map<String, ? extends Collection<String>> headers = grayTrackInfo.getHeaders();`
`26`	`24`	`PredicateComparator<Collection<String>> predicateComparator =`
`27`	`25`	`Comparators.getCollectionStringComparator(configBean.getCompareMode());`
`28`	`26`	`if (predicateComparator == null) {`
`29`	`27`	`return false;`
`30`	`28`	`}`
`31`		`- return predicateComparator.test(headers.get(configBean.getHeader()), configBean.getValues());`
	`29`	`+ return predicateComparator.test(grayTrackInfo.getHeader(configBean.getHeader()), configBean.getValues());`
`32`	`30`	`};`
`33`	`31`	`}`
`34`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public GrayDecision apply(HttpParameterGrayDecisionFactory.Config configBean) {`
`26`	`26`	`if (predicateComparator == null) {`
`27`	`27`	`return false;`
`28`	`28`	`}`
`29`		`- return predicateComparator.test(grayTrackInfo.getParameters().get(configBean.getName()), configBean.getValues());`
	`29`	`+ return predicateComparator.test(grayTrackInfo.getParameter(configBean.getName()), configBean.getValues());`
`30`	`30`	`};`
`31`	`31`	`}`
`32`	`32`	`}`