Merge pull request #46 from SpringCloud/A

A

Author: saleson

README.md

@@ -2,8 +2,9 @@
 
 
 [![License](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
-[![A Release](https://img.shields.io/badge/release-A.1.1.1-blue)](https://github.com/SpringCloud/spring-cloud-gray/releases/tag/A.1.1.1)
-[![B Release](https://img.shields.io/badge/release-B.0.0.1-blue)](https://github.com/SpringCloud/spring-cloud-gray/releases/tag/B.0.0.1)
+[![A Release](https://img.shields.io/badge/release-A.1.1.2-blue)](https://github.com/SpringCloud/spring-cloud-gray/releases/tag/A.1.1.2)
+[![B Release](https://img.shields.io/badge/release-B.0.0.2-blue)](https://github.com/SpringCloud/spring-cloud-gray/releases/tag/B.0.0.2)
+[![B Release](https://img.shields.io/badge/release-C.0.0.1-blue)](https://github.com/SpringCloud/spring-cloud-gray/releases/tag/C.0.0.1)
 
 ## 介绍
 Spring Cloud Gray 是一套开源的微服务灰度路由解决方案，它由spring-cloud-gray-client，spring-cloud-gray-client-netflix 和 spring-cloud-tray-server，spring-cloud-gray-webui组成。<br/>

pom.xml

@@ -12,7 +12,7 @@
     <groupId>cn.springcloud.gray</groupId>
     <artifactId>spring-cloud-gray</artifactId>
     <packaging>pom</packaging>
-    <version>A.1.1.1</version>
+    <version>A.1.1.2</version>
     <url>https://github.com/SpringCloud/spring-cloud-gray</url>
     <organization>
         <name>Spring Cloud中国社区</name>

sonar-project.properties

@@ -0,0 +1,29 @@
+#projectKey是项目的唯一标识，不能出现重复，可随意起
+sonar.projectKey=spring-cloud-gray
+# this is the name displayed in the SonarQube UI，不能是中文
+sonar.projectName=spring-cloud-gray
+# 项目的版本号
+sonar.projectVersion=A.1.1.2
+# 项目的代码的编码格式
+sonar.sourceEndcoding=UTF-8
+# 项目的语言
+sonar.language=java
+sonar.modules=spring-cloud-gray-client,spring-cloud-gray-core,spring-cloud-gray-client-netflix,spring-cloud-gray-server,spring-cloud-gray-utils,spring-cloud-gray-server-plugins,spring-cloud-gray-plugins
+# 项目的源代码目录
+sonar.sources=src
+# 项目的编译生成的class文件的所在目录
+sonar.java.binaries=target/classes
+#
+#
+#client-plugins.sonar.projectBaseDir=spring-cloud-gray-plugins
+#client-plugins.sonar.language=java
+#client-plugins.sonar.modules=spring-cloud-gray-plugin-eureka,spring-cloud-gray-plugin-event-stream,spring-cloud-gray-plugin-feign,spring-cloud-gray-plugin-ribbon-nacos-discovery,spring-cloud-gray-plugin-webmvc,spring-cloud-gray-plugin-zuul
+#client-plugins.sonar.sources=src
+#client-plugins.sonar.java.binaries=target/classes
+##
+##
+#server-plugins.sonar.projectBaseDir=spring-cloud-gray-server-plugins
+#server-plugins.sonar.modules=spring-cloud-gray-server-plugin-eureka,spring-cloud-gray-server-plugin-event-stream,spring-cloud-gray-server-plugin-nacos-discovery
+#server-plugins.sonar.language=java
+#server-plugins.sonar.sources=src
+#server-plugins.sonar.java.binaries=target/classes

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

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

@@ -12,6 +12,7 @@
 import cn.springcloud.gray.servernode.ServerListProcessor;
 import cn.springcloud.gray.servernode.ServerSpec;
 import com.netflix.loadbalancer.Server;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.ListUtils;
 import org.apache.commons.lang3.StringUtils;
 
@@ -90,9 +91,11 @@ private String getServiceId(List<Server> servers){
         if (grayRequest != null && StringUtils.isNotEmpty(grayRequest.getServiceId())) {
             return grayRequest.getServiceId();
         }
-        Server server = servers.get(0);
-        if(!Objects.isNull(server)){
-            return server.getMetaInfo().getServiceIdForDiscovery();
+        if(CollectionUtils.isNotEmpty(servers)) {
+            Server server = servers.get(0);
+            if (!Objects.isNull(server)) {
+                return server.getMetaInfo().getServiceIdForDiscovery();
+            }
         }
         return null;
     }

spring-cloud-gray-client/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-gray</artifactId>
         <groupId>cn.springcloud.gray</groupId>
-        <version>A.1.1.1</version>
+        <version>A.1.1.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

spring-cloud-gray-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-gray</artifactId>
         <groupId>cn.springcloud.gray</groupId>
-        <version>A.1.1.1</version>
+        <version>A.1.1.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

spring-cloud-gray-core/src/main/java/cn/springcloud/gray/model/DecisionDefinition.java

@@ -2,6 +2,7 @@
 
 import lombok.Getter;
 import lombok.Setter;
+import lombok.ToString;
 
 import java.io.Serializable;
 import java.util.HashMap;
@@ -10,6 +11,7 @@
 /**
  * 灰度策略
  */
+@ToString
 @Setter
 @Getter
 public class DecisionDefinition implements Serializable {

spring-cloud-gray-core/src/main/java/cn/springcloud/gray/model/GrayInstance.java

@@ -2,16 +2,17 @@
 
 import lombok.Getter;
 import lombok.Setter;
+import lombok.ToString;
 
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 
 /**
  * 灰度实例，有状态属性
  */
+@ToString
 @Setter
 @Getter
 public class GrayInstance implements Serializable {

spring-cloud-gray-core/src/main/java/cn/springcloud/gray/model/GrayTrackDefinition.java

@@ -2,7 +2,9 @@
 
 import lombok.Getter;
 import lombok.Setter;
+import lombok.ToString;
 
+@ToString
 @Setter
 @Getter
 public class GrayTrackDefinition {