Merge pull request #80 from mercyblitz/dev-1.x

Release 0.1.3

Author: mercyblitz

README.md

@@ -62,8 +62,8 @@ pom.xml:
 
 | **Branches** | **Purpose**                                      | **Latest Version** |
 |--------------|--------------------------------------------------|--------------------|
-| **0.2.x**    | Compatible with Spring Cloud 2022.0.x - 2025.0.x | 0.2.1              |
-| **0.1.x**    | Compatible with Spring Cloud Hoxton - 2021.0.x   | 0.1.1              |
+| **0.2.x**    | Compatible with Spring Cloud 2022.0.x - 2025.0.x | 0.2.3              |
+| **0.1.x**    | Compatible with Spring Cloud Hoxton - 2021.0.x   | 0.1.3              |
 
 Then add the specific modules you need:
 

microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/discovery/ReactiveDiscoveryClientAdapter.java

@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.microsphere.spring.cloud.client.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 java.util.List;
+
+/**
+ * An adapter {@link DiscoveryClient} class based on {@link ReactiveDiscoveryClient}
+ *
+ * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
+ * @see DiscoveryClient
+ * @since 1.0.0
+ */
+public class ReactiveDiscoveryClientAdapter implements DiscoveryClient {
+
+    private final ReactiveDiscoveryClient reactiveDiscoveryClient;
+
+    public ReactiveDiscoveryClientAdapter(ReactiveDiscoveryClient reactiveDiscoveryClient) {
+        this.reactiveDiscoveryClient = reactiveDiscoveryClient;
+    }
+
+    @Override
+    public String description() {
+        return this.reactiveDiscoveryClient.description();
+    }
+
+    @Override
+    public List<ServiceInstance> getInstances(String serviceId) {
+        Flux<ServiceInstance> flux = this.reactiveDiscoveryClient.getInstances(serviceId);
+        return toList(flux);
+    }
+
+    @Override
+    public List<String> getServices() {
+        Flux<String> flux = this.reactiveDiscoveryClient.getServices();
+        return toList(flux);
+    }
+
+    @Override
+    public void probe() {
+        this.reactiveDiscoveryClient.probe();
+    }
+
+    @Override
+    public int getOrder() {
+        return this.reactiveDiscoveryClient.getOrder();
+    }
+
+    static <T> List<T> toList(Flux<T> flux) {
+        return flux.collectList().block();
+    }
+}

microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/discovery/autoconfigure/DiscoveryClientAutoConfiguration.java

@@ -85,4 +85,4 @@ public UnionDiscoveryClient unionDiscoveryClient() {
             return new UnionDiscoveryClient();
         }
     }
-}
+}

microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/discovery/autoconfigure/ReactiveDiscoveryClientAutoConfiguration.java

@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.microsphere.spring.cloud.client.discovery.autoconfigure;
+
+import io.microsphere.spring.cloud.client.discovery.ReactiveDiscoveryClientAdapter;
+import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.cloud.client.ConditionalOnBlockingDiscoveryEnabled;
+import org.springframework.cloud.client.ConditionalOnDiscoveryEnabled;
+import org.springframework.cloud.client.ConditionalOnReactiveDiscoveryEnabled;
+import org.springframework.cloud.client.discovery.ReactiveDiscoveryClient;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import static io.microsphere.spring.cloud.client.discovery.constants.DiscoveryClientConstants.DISCOVERY_CLIENT_CLASS_NAME;
+import static io.microsphere.spring.cloud.client.discovery.constants.DiscoveryClientConstants.REACTIVE_COMMONS_CLIENT_AUTO_CONFIGURATION_CLASS_NAME;
+
+/**
+ * The Auto-Configuration class for {@link ReactiveDiscoveryClient}
+ *
+ * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
+ * @see ReactiveDiscoveryClient
+ * @see DiscoveryClientAutoConfiguration
+ * @since 1.0.0
+ */
+@Configuration(proxyBeanMethods = false)
+@ConditionalOnClass(name = {
+        DISCOVERY_CLIENT_CLASS_NAME
+})
+@ConditionalOnDiscoveryEnabled
+@ConditionalOnReactiveDiscoveryEnabled
+@AutoConfigureBefore(name = {
+        REACTIVE_COMMONS_CLIENT_AUTO_CONFIGURATION_CLASS_NAME
+})
+public class ReactiveDiscoveryClientAutoConfiguration {
+
+    @Configuration(proxyBeanMethods = false)
+    @ConditionalOnBlockingDiscoveryEnabled
+    public static class BlockingConfiguration {
+
+        @Bean
+        @ConditionalOnBean(ReactiveDiscoveryClient.class)
+        public ReactiveDiscoveryClientAdapter reactiveDiscoveryClientAdapter(ReactiveDiscoveryClient reactiveDiscoveryClient) {
+            return new ReactiveDiscoveryClientAdapter(reactiveDiscoveryClient);
+        }
+    }
+}

microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/discovery/constants/DiscoveryClientConstants.java

@@ -17,6 +17,7 @@
 package io.microsphere.spring.cloud.client.discovery.constants;
 
 import org.springframework.cloud.client.CommonsClientAutoConfiguration;
+import org.springframework.cloud.client.ReactiveCommonsClientAutoConfiguration;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.cloud.client.discovery.composite.CompositeDiscoveryClient;
 
@@ -30,17 +31,29 @@ public interface DiscoveryClientConstants {
 
     /**
      * The class name of {@link DiscoveryClient}
+     *
+     * @see org.springframework.cloud.client.discovery.DiscoveryClient
      */
     String DISCOVERY_CLIENT_CLASS_NAME = "org.springframework.cloud.client.discovery.DiscoveryClient";
 
     /**
      * The class name of {@link CompositeDiscoveryClient}
+     *
+     * @see org.springframework.cloud.client.discovery.composite.CompositeDiscoveryClient
      */
     String COMPOSITE_DISCOVERY_CLIENT_CLASS_NAME = "org.springframework.cloud.client.discovery.composite.CompositeDiscoveryClient";
 
     /**
      * The class name of {@link CommonsClientAutoConfiguration}
+     *
+     * @see org.springframework.cloud.client.CommonsClientAutoConfiguration
      */
     String COMMONS_CLIENT_AUTO_CONFIGURATION_CLASS_NAME = "org.springframework.cloud.client.CommonsClientAutoConfiguration";
 
-}
+    /**
+     * The class name of {@link ReactiveCommonsClientAutoConfiguration}
+     *
+     * @see org.springframework.cloud.client.ReactiveCommonsClientAutoConfiguration
+     */
+    String REACTIVE_COMMONS_CLIENT_AUTO_CONFIGURATION_CLASS_NAME = "org.springframework.cloud.client.ReactiveCommonsClientAutoConfiguration";
+}

microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/event/ServiceInstancesChangedEvent.java

@@ -86,4 +86,4 @@ public boolean isProcessed() {
         return processed;
     }
 
-}
+}

microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/service/registry/DefaultRegistration.java

@@ -27,4 +27,4 @@
  * @since 1.0.0
  */
 public class DefaultRegistration extends DefaultServiceInstance implements Registration {
-}
+}

microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/service/registry/InMemoryServiceRegistry.java

@@ -77,4 +77,4 @@ protected Map<String, String> getMetadata(Registration registration) {
         }
         return null;
     }
-}
+}

microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/service/registry/MultipleAutoServiceRegistration.java

@@ -47,4 +47,4 @@ protected MultipleRegistration getRegistration() {
     protected MultipleRegistration getManagementRegistration() {
         return this.multipleRegistration;
     }
-}
+}

microsphere-spring-cloud-commons/src/main/java/io/microsphere/spring/cloud/client/service/registry/MultipleRegistration.java

@@ -85,4 +85,4 @@ public <T extends Registration> T special(Class<T> specialClass) {
             return (T) this;
         return (T) this.registrationMap.getOrDefault(specialClass, null);
     }
-}
+}