Merge pull request #51 from SpringCloud/A

A

Author: saleson

README.md

@@ -2,9 +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.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)
+[![A Release](https://img.shields.io/badge/release-A.1.1.3-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.4-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.3-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.2</version>
+    <version>A.1.1.3</version>
     <url>https://github.com/SpringCloud/spring-cloud-gray</url>
     <organization>
         <name>Spring Cloud中国社区</name>
@@ -393,6 +393,9 @@
                                 </goals>
                             </execution>
                         </executions>
+                        <configuration>
+                            <additionalparam>-Xdoclint:none</additionalparam>
+                        </configuration>
                     </plugin>
                     <!-- GPG -->
                     <plugin>

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

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

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

@@ -6,6 +6,8 @@
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 
 /**
@@ -42,6 +44,16 @@ public interface GrayManager {
 
     List<RequestInterceptor> getRequeestInterceptors(String interceptroType);
 
+    /**
+     * 以serviceId -> grayInstances的形式返回所有灰度服务的实例信息
+     *
+     * @return
+     */
+    default Map<String, Collection<GrayInstance>> getMapByAllGrayServices() {
+        return allGrayServices().stream()
+                .collect(Collectors.toMap(GrayService::getServiceId, GrayService::getGrayInstances));
+    }
+
     void setup();
 
     void shutdown();

spring-cloud-gray-client/src/main/java/cn/springcloud/gray/routing/connectionpoint/RoutingConnectionPoint.java

@@ -2,22 +2,37 @@
 
 
 import java.io.IOException;
+import java.util.Objects;
+import java.util.function.Consumer;
 
 public interface RoutingConnectionPoint {
 
 
-    default <T> T execute(RoutingConnectPointContext connectPointContext, Supplier<T> supplier) throws IOException {
+    default <T> T execute(RoutingConnectPointContext connectPointContext, Supplier<T> supplier) {
         try {
             executeConnectPoint(connectPointContext);
             return supplier.get();
         } catch (Exception e) {
             connectPointContext.setThrowable(e);
-            throw e;
+            throw new RuntimeException(e);
         } finally {
             shutdownconnectPoint(connectPointContext);
         }
     }
 
+    default <T> T execute(
+            RoutingConnectPointContext connectPointContext,
+            Supplier<T> supplier,
+            Consumer<RoutingConnectPointContext> finalConsumer) {
+        try {
+            return execute(connectPointContext, supplier);
+        } finally {
+            if (!Objects.isNull(finalConsumer)) {
+                finalConsumer.accept(connectPointContext);
+            }
+        }
+    }
+
 
     void executeConnectPoint(RoutingConnectPointContext connectPointContext);
 

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.2</version>
+        <version>A.1.1.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -16,7 +16,11 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>

spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/resources/domain/ApiRes.java renamed to spring-cloud-gray-core/src/main/java/cn/springcloud/gray/api/ApiRes.java

@@ -1,4 +1,4 @@
-package cn.springcloud.gray.server.resources.domain;
+package cn.springcloud.gray.api;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -15,7 +15,6 @@ public class ApiRes<T> {
     public static final String CODE_NOT_FOUND = "404";
 
 
-
     private String code = "0";
     private String message;
     private T data;

spring-cloud-gray-core/src/main/java/cn/springcloud/gray/exceptions/NotFoundException.java

@@ -0,0 +1,15 @@
+package cn.springcloud.gray.exceptions;
+
+/**
+ * @author saleson
+ * @date 2019-11-25 21:53
+ */
+public class NotFoundException extends RuntimeException {
+
+    public NotFoundException() {
+    }
+
+    public NotFoundException(String message) {
+        super(message);
+    }
+}

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

@@ -1,5 +1,6 @@
 package cn.springcloud.gray.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -15,6 +16,7 @@
 @ToString
 @Setter
 @Getter
+@JsonIgnoreProperties({"gray"})
 public class GrayInstance implements Serializable {
 
     private static final long serialVersionUID = 1604426811546120884L;