support spring cloud gateway discovery (#246)

Author: GuoYL123

spring-cloud-huawei-dependencies/pom.xml

@@ -25,6 +25,7 @@
     <snakeyaml.version>1.26</snakeyaml.version>
     <commons-configuration.version>1.10</commons-configuration.version>
     <websocket.version>1.5.0</websocket.version>
+    <reactor.version>3.3.3.RELEASE</reactor.version>
   </properties>
 
   <dependencyManagement>
@@ -161,6 +162,11 @@
         <artifactId>Java-WebSocket</artifactId>
         <version>${websocket.version}</version>
       </dependency>
+      <dependency>
+        <groupId>io.projectreactor</groupId>
+        <artifactId>reactor-core</artifactId>
+        <version>${reactor.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 </project>

spring-cloud-huawei-sample/gateway-demo/gateway/src/main/resources/application.yaml

@@ -6,13 +6,6 @@ spring:
     name: gateway-service
   cloud:
     gateway:
-      routes:
-        - id: backend-service             # 将 /provider1/开头的请求，转发到provider1
-          uri: lb://backend-service
-          predicates:
-            - Path=/**
-          filters:
-            - StripPrefix=1
       discovery:
         locator:
           enabled: true

spring-cloud-huawei-servicecomb-discovery/pom.xml

@@ -78,5 +78,9 @@
       <groupId>org.java-websocket</groupId>
       <artifactId>Java-WebSocket</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.projectreactor</groupId>
+      <artifactId>reactor-core</artifactId>
+    </dependency>
   </dependencies>
 </project>

spring-cloud-huawei-servicecomb-discovery/src/main/java/com/huaweicloud/servicecomb/discovery/client/ServiceCombClient.java

@@ -354,12 +354,12 @@ public List<ServiceInstance> getInstances(Microservice microservice, String revi
             map.put(ZONE, instance.getDataCenterInfo().getZone());
           }
           instanceList.add(
-              new DefaultServiceInstance(instance.getInstanceId(), instance.getServiceId(), host,
+              new DefaultServiceInstance(instance.getInstanceId(), instance.getServiceName(), host,
                   port, false, map));
         }
         return instanceList;
       } else if (response.getStatusCode() != HttpStatus.SC_NOT_MODIFIED) {
-        LOGGER.warn(
+        LOGGER.debug(
             "read response failed. status:" + response.getStatusCode() + "; message:" + response
                 .getStatusMessage() + "; content:" + response.getContent());
       }

spring-cloud-huawei-servicecomb-discovery/src/main/java/com/huaweicloud/servicecomb/discovery/discovery/MicroserviceHandler.java

@@ -21,15 +21,11 @@
 import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.cloud.client.ServiceInstance;
-import com.huaweicloud.common.exception.ServiceCombException;
 import com.huaweicloud.servicecomb.discovery.client.ServiceCombClient;
 import com.huaweicloud.servicecomb.discovery.client.model.Framework;
 import com.huaweicloud.servicecomb.discovery.client.model.Microservice;
@@ -41,7 +37,6 @@
  * @Date 12:26 2019-07-17
  **/
 public class MicroserviceHandler {
-  private static final Logger LOGGER = LoggerFactory.getLogger(MicroserviceHandler.class);
 
   public static final Map<String, String> serviceRevision = new ConcurrentHashMap<>();
 

spring-cloud-huawei-servicecomb-discovery/src/main/java/com/huaweicloud/servicecomb/discovery/discovery/ServiceCombReactiveDiscoveryClient.java

@@ -0,0 +1,38 @@
+package com.huaweicloud.servicecomb.discovery.discovery;
+
+import org.springframework.cloud.client.ServiceInstance;
+import org.springframework.cloud.client.discovery.DiscoveryClient;
+import org.springframework.cloud.client.discovery.ReactiveDiscoveryClient;
+import reactor.core.publisher.Flux;
+import reactor.core.scheduler.Schedulers;
+
+/**
+ * @Author GuoYl123
+ * @Date 2020/8/18
+ **/
+public class ServiceCombReactiveDiscoveryClient implements ReactiveDiscoveryClient {
+
+  private DiscoveryClient discoveryClient;
+
+  public ServiceCombReactiveDiscoveryClient(DiscoveryClient serviceCombDiscoveryClient) {
+    this.discoveryClient = serviceCombDiscoveryClient;
+  }
+
+  @Override
+  public String description() {
+    return "this is servicecomb reactive implement";
+  }
+
+  @Override
+  public Flux<ServiceInstance> getInstances(String serviceId) {
+    return Flux.defer(() -> Flux.fromIterable(discoveryClient.getInstances(serviceId)))
+        .subscribeOn(Schedulers.boundedElastic());
+  }
+
+
+  @Override
+  public Flux<String> getServices() {
+    return Flux.defer(() -> Flux.fromIterable(discoveryClient.getServices()))
+        .subscribeOn(Schedulers.boundedElastic());
+  }
+}

spring-cloud-huawei-servicecomb-discovery/src/main/java/com/huaweicloud/servicecomb/discovery/discovery/ServiceCombReactiveDiscoveryClientConfiguration.java

@@ -0,0 +1,35 @@
+package com.huaweicloud.servicecomb.discovery.discovery;
+
+import com.huaweicloud.servicecomb.discovery.ConditionalOnServiceCombDiscoveryEnabled;
+import com.huaweicloud.servicecomb.discovery.client.ServiceCombClient;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.cloud.client.ConditionalOnDiscoveryEnabled;
+import org.springframework.cloud.client.ConditionalOnReactiveDiscoveryEnabled;
+import org.springframework.cloud.client.ReactiveCommonsClientAutoConfiguration;
+import org.springframework.cloud.client.discovery.composite.reactive.ReactiveCompositeDiscoveryClientAutoConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @Author GuoYl123
+ * @Date 2020/8/18
+ **/
+@Configuration(proxyBeanMethods = false)
+@ConditionalOnDiscoveryEnabled
+@ConditionalOnReactiveDiscoveryEnabled
+@ConditionalOnServiceCombDiscoveryEnabled
+@AutoConfigureAfter({ServiceCombDiscoveryClientConfiguration.class,
+    ReactiveCompositeDiscoveryClientAutoConfiguration.class})
+@AutoConfigureBefore({ReactiveCommonsClientAutoConfiguration.class})
+public class ServiceCombReactiveDiscoveryClientConfiguration {
+
+  @Bean
+  @ConditionalOnMissingBean
+  public ServiceCombReactiveDiscoveryClient serviceCombDiscoveryClient(
+      ServiceCombDiscoveryProperties discoveryProperties, ServiceCombClient serviceCombClient) {
+    return new ServiceCombReactiveDiscoveryClient(
+        new ServiceCombDiscoveryClient(discoveryProperties, serviceCombClient));
+  }
+}

spring-cloud-huawei-servicecomb-discovery/src/main/resources/META-INF/spring.factories

@@ -1,5 +1,6 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   com.huaweicloud.servicecomb.discovery.discovery.ServiceCombDiscoveryClientConfiguration,\
 com.huaweicloud.servicecomb.discovery.ribbon.ServiceCombRibbonAutoConfiguration,\
-com.huaweicloud.servicecomb.discovery.registry.ServiceCombRegistryAutoConfiguration
+com.huaweicloud.servicecomb.discovery.registry.ServiceCombRegistryAutoConfiguration, \
+com.huaweicloud.servicecomb.discovery.discovery.ServiceCombReactiveDiscoveryClientConfiguration