Merge branch 'master' into feature/rpc_log

kevinten10 · kevinten10 · commit 55010b0e6585 · 2021-10-28T17:08:14.000+08:00
diff --git a/examples/pom.xml b/examples/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>capa-parent</artifactId>
         <groupId>group.rxcloud</groupId>
-        <version>${revision}</version>
+        <version>1.0.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>capa-examples</artifactId>
diff --git a/examples/src/main/java/group/rxcloud/capa/examples/configuration/DemoConfigurationClient.java b/examples/src/main/java/group/rxcloud/capa/examples/configuration/DemoConfigurationClient.java
@@ -20,12 +20,12 @@
 import group.rxcloud.capa.configuration.CapaConfigurationClient;
 import group.rxcloud.capa.configuration.CapaConfigurationClientBuilder;
 import group.rxcloud.cloudruntimes.domain.core.configuration.ConfigurationItem;
-import group.rxcloud.cloudruntimes.domain.core.configuration.ConfigurationRequestItem;
 import group.rxcloud.cloudruntimes.domain.core.configuration.SubConfigurationResp;
 import group.rxcloud.cloudruntimes.utils.TypeRef;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -37,14 +37,8 @@ public static void main(String[] args) throws InterruptedException {
 
         CapaConfigurationClient capaConfigurationClient = new CapaConfigurationClientBuilder(storeConfig).build();
 
-        ConfigurationRequestItem configurationRequestItem = new ConfigurationRequestItem();
-        configurationRequestItem.setAppId("test");
-        configurationRequestItem.setStoreName("config");
-        configurationRequestItem.setKeys(Collections.singletonList("test.json"));
-
         // get
-        Mono<List<ConfigurationItem<String>>> configuration =
-                capaConfigurationClient.getConfiguration(configurationRequestItem, TypeRef.STRING);
+        Mono<List<ConfigurationItem<String>>> configuration = capaConfigurationClient.getConfiguration("config", "123", new ArrayList<>(), Collections.emptyMap(), TypeRef.STRING);
 
         List<ConfigurationItem<String>> block = configuration.block();
 
@@ -53,8 +47,7 @@ public static void main(String[] args) throws InterruptedException {
         }
 
         // subscribe
-        Flux<SubConfigurationResp<String>> subConfigurationRespFlux =
-                capaConfigurationClient.subscribeConfiguration(configurationRequestItem, TypeRef.STRING);
+        Flux<SubConfigurationResp<String>> subConfigurationRespFlux = capaConfigurationClient.subscribeConfiguration("config", "123", new ArrayList<>(), Collections.emptyMap(), TypeRef.STRING);
 
         subConfigurationRespFlux.subscribe(resp -> {
             System.out.println(resp);
diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
     <groupId>group.rxcloud</groupId>
     <artifactId>capa-parent</artifactId>
     <packaging>pom</packaging>
-    <version>${revision}</version>
+    <version>1.0.4-SNAPSHOT</version>
     <name>capa-sdk-parent</name>
     <description>SDK for Capa.</description>
     <url>https://github.com/reactivegroup</url>
@@ -85,7 +85,6 @@
         <checkstyle.skip>true</checkstyle.skip>
         <rat.skip>true</rat.skip>
         <jacoco.skip>true</jacoco.skip>
-        <revision>1.0.4-SNAPSHOT</revision>
     </properties>
 
     <dependencyManagement>
diff --git a/sdk-component/pom.xml b/sdk-component/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>group.rxcloud</groupId>
         <artifactId>capa-parent</artifactId>
-        <version>${revision}</version>
+        <version>1.0.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>capa-sdk-component</artifactId>
diff --git a/sdk-infrastructure/pom.xml b/sdk-infrastructure/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>capa-parent</artifactId>
         <groupId>group.rxcloud</groupId>
-        <version>${revision}</version>
+        <version>1.0.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>capa-sdk-infrastructure</artifactId>
diff --git a/sdk-spi-demo/pom.xml b/sdk-spi-demo/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>capa-parent</artifactId>
         <groupId>group.rxcloud</groupId>
-        <version>${revision}</version>
+        <version>1.0.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>capa-sdk-spi-demo</artifactId>
diff --git a/sdk-spi/pom.xml b/sdk-spi/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>capa-parent</artifactId>
         <groupId>group.rxcloud</groupId>
-        <version>${revision}</version>
+        <version>1.0.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>capa-sdk-spi</artifactId>
diff --git a/sdk/pom.xml b/sdk/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>group.rxcloud</groupId>
         <artifactId>capa-parent</artifactId>
-        <version>${revision}</version>
+        <version>1.0.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>capa-sdk</artifactId>
diff --git a/sdk/src/main/java/group/rxcloud/capa/configuration/AbstractCapaConfigurationClient.java b/sdk/src/main/java/group/rxcloud/capa/configuration/AbstractCapaConfigurationClient.java
@@ -17,10 +17,16 @@
 package group.rxcloud.capa.configuration;
 
 
+import group.rxcloud.cloudruntimes.domain.core.configuration.ConfigurationItem;
 import group.rxcloud.cloudruntimes.domain.core.configuration.ConfigurationRequestItem;
 import group.rxcloud.cloudruntimes.domain.core.configuration.SaveConfigurationRequest;
+import group.rxcloud.cloudruntimes.domain.core.configuration.SubConfigurationResp;
+import group.rxcloud.cloudruntimes.utils.TypeRef;
+import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
+import java.util.List;
+
 /**
  * Abstract class with convenient methods common between client implementations.
  *
@@ -37,4 +43,14 @@ public Mono<Void> saveConfiguration(SaveConfigurationRequest saveConfigurationRe
     public Mono<Void> deleteConfiguration(ConfigurationRequestItem configurationRequestItem) {
         return Mono.error(new UnsupportedOperationException("unsupported delete configuration"));
     }
+
+    @Override
+    public <T> Mono<List<ConfigurationItem<T>>> getConfiguration(ConfigurationRequestItem configurationRequestItem, TypeRef<T> type) {
+        return Mono.error(new UnsupportedOperationException("unsupported get configuration with ConfigurationRequestItem as parameter"));
+    }
+
+    @Override
+    public <T> Flux<SubConfigurationResp<T>> subscribeConfiguration(ConfigurationRequestItem configurationRequestItem, TypeRef<T> type) {
+        return Flux.error(new UnsupportedOperationException("unsupported subscribe configuration with ConfigurationRequestItem as parameter"));
+    }
 }
diff --git a/sdk/src/main/java/group/rxcloud/capa/configuration/CapaConfigurationClient.java b/sdk/src/main/java/group/rxcloud/capa/configuration/CapaConfigurationClient.java
@@ -26,24 +26,44 @@
 import reactor.core.publisher.Mono;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Generic Client Adapter to be used regardless of the specific Configuration Client implementation required.
  */
 public interface CapaConfigurationClient extends DefaultCloudRuntimesClient {
 
+    @Override
+    <T> Mono<List<ConfigurationItem<T>>> getConfiguration(String storeName, String appId, List<String> keys, Map<String, String> metadata, TypeRef<T> type);
+
+    @Override
+    <T> Mono<List<ConfigurationItem<T>>> getConfiguration(String storeName, String appId, List<String> keys, Map<String, String> metadata, String group, TypeRef<T> type);
+
+    @Override
+    <T> Mono<List<ConfigurationItem<T>>> getConfiguration(String storeName, String appId, List<String> keys, Map<String, String> metadata, String group, String label, TypeRef<T> type);
+
     @Override
     <T> Mono<List<ConfigurationItem<T>>> getConfiguration(ConfigurationRequestItem configurationRequestItem, TypeRef<T> type);
 
     @Override
-    Mono<Void> saveConfiguration(SaveConfigurationRequest saveConfigurationRequest);
+    <T> Flux<SubConfigurationResp<T>> subscribeConfiguration(String storeName, String appId, List<String> keys, Map<String, String> metadata, TypeRef<T> type);
 
     @Override
-    Mono<Void> deleteConfiguration(ConfigurationRequestItem configurationRequestItem);
+    <T> Flux<SubConfigurationResp<T>> subscribeConfiguration(String storeName, String appId, List<String> keys, Map<String, String> metadata, String group, TypeRef<T> type);
+
+    @Override
+    <T> Flux<SubConfigurationResp<T>> subscribeConfiguration(String storeName, String appId, List<String> keys, Map<String, String> metadata, String group, String label, TypeRef<T> type);
 
     @Override
     <T> Flux<SubConfigurationResp<T>> subscribeConfiguration(ConfigurationRequestItem configurationRequestItem, TypeRef<T> type);
 
+    @Override
+    Mono<Void> saveConfiguration(SaveConfigurationRequest saveConfigurationRequest);
+
+    @Override
+    Mono<Void> deleteConfiguration(ConfigurationRequestItem configurationRequestItem);
+
+
     @Override
     default Mono<Void> shutdown() {
         return Mono.empty();
diff --git a/sdk/src/main/java/group/rxcloud/capa/configuration/CapaConfigurationClientStore.java b/sdk/src/main/java/group/rxcloud/capa/configuration/CapaConfigurationClientStore.java
@@ -22,17 +22,16 @@
 import group.rxcloud.capa.component.configstore.SubscribeResp;
 import group.rxcloud.capa.infrastructure.exceptions.CapaExceptions;
 import group.rxcloud.cloudruntimes.domain.core.configuration.ConfigurationItem;
-import group.rxcloud.cloudruntimes.domain.core.configuration.ConfigurationRequestItem;
 import group.rxcloud.cloudruntimes.domain.core.configuration.SubConfigurationResp;
 import group.rxcloud.cloudruntimes.utils.TypeRef;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
-import java.util.Objects;
-import java.util.Map;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.ArrayList;
+import java.util.Map;
+import java.util.Objects;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -68,26 +67,30 @@ private CapaConfigStore getStore(String storeName) {
     }
 
     @Override
-    public <T> Mono<List<ConfigurationItem<T>>> getConfiguration(ConfigurationRequestItem configurationRequestItem, TypeRef<T> type) {
+    public <T> Mono<List<ConfigurationItem<T>>> getConfiguration(String storeName, String appId, List<String> keys, Map<String, String> metadata, TypeRef<T> type) {
+        return getConfiguration(storeName, appId, keys, metadata, null, null, type);
+    }
+
+    @Override
+    public <T> Mono<List<ConfigurationItem<T>>> getConfiguration(String storeName, String appId, List<String> keys, Map<String, String> metadata, String group, TypeRef<T> type) {
+        return getConfiguration(storeName, appId, keys, metadata, group, null, type);
+    }
+
+    @Override
+    public <T> Mono<List<ConfigurationItem<T>>> getConfiguration(String storeName, String appId, List<String> keys, Map<String, String> metadata, String group, String label, TypeRef<T> type) {
         try {
-            final String storeName = configurationRequestItem.getStoreName();
             final CapaConfigStore store = this.getStore(storeName);
 
-            final String appId = configurationRequestItem.getAppId();
-            String group = configurationRequestItem.getGroup();
-            String label = configurationRequestItem.getLabel();
-            List<String> keys = configurationRequestItem.getKeys();
-            Map<String, String> metadata = configurationRequestItem.getMetadata();
             if (group == null || group.trim().isEmpty()) {
                 group = store.getDefaultGroup();
             }
             if (label == null || label.trim().isEmpty()) {
                 label = store.getDefaultLabel();
             }
-            if (keys == null) {
+            if (keys == null || keys.isEmpty()) {
                 keys = new ArrayList<>(2);
             }
-            if (metadata == null) {
+            if (metadata == null || metadata.isEmpty()) {
                 metadata = new HashMap<>(2, 1);
             }
 
@@ -111,47 +114,30 @@ public <T> Mono<List<ConfigurationItem<T>>> getConfiguration(ConfigurationReques
                             return Mono.empty();
                         }
                         return Flux.fromStream(configurationItems
-                                        .stream()
-                                        .map(this::getStoreResponse))
+                                .stream()
+                                .map(this::getStoreResponse))
                                 .collectList();
                     });
         } catch (Exception ex) {
             return CapaExceptions.wrapMono(ex);
         }
     }
 
-    private GetRequest getStoreRequest(String appId, String group, String label, List<String> keys, Map<String, String> metadata) {
-        GetRequest getRequest = new GetRequest();
-        getRequest.setAppId(appId);
-        getRequest.setGroup(group);
-        getRequest.setLabel(label);
-        getRequest.setKeys(keys);
-        getRequest.setMetadata(metadata);
-        return getRequest;
+    @Override
+    public <T> Flux<SubConfigurationResp<T>> subscribeConfiguration(String storeName, String appId, List<String> keys, Map<String, String> metadata, TypeRef<T> type) {
+        return subscribeConfiguration(storeName, appId, keys, metadata, null, null, type);
     }
 
-    private <T> ConfigurationItem<T> getStoreResponse(group.rxcloud.capa.component.configstore.ConfigurationItem<T> tConfigurationItem) {
-        ConfigurationItem<T> configurationItem = new ConfigurationItem<>();
-        configurationItem.setKey(tConfigurationItem.getKey());
-        configurationItem.setContent(tConfigurationItem.getContent());
-        configurationItem.setGroup(tConfigurationItem.getGroup());
-        configurationItem.setLabel(tConfigurationItem.getLabel());
-        configurationItem.setTags(tConfigurationItem.getTags());
-        configurationItem.setMetadata(tConfigurationItem.getMetadata());
-        return configurationItem;
+    @Override
+    public <T> Flux<SubConfigurationResp<T>> subscribeConfiguration(String storeName, String appId, List<String> keys, Map<String, String> metadata, String group, TypeRef<T> type) {
+        return subscribeConfiguration(storeName, appId, keys, metadata, group, null, type);
     }
 
     @Override
-    public <T> Flux<SubConfigurationResp<T>> subscribeConfiguration(ConfigurationRequestItem configurationRequestItem, TypeRef<T> type) {
+    public <T> Flux<SubConfigurationResp<T>> subscribeConfiguration(String storeName, String appId, List<String> keys, Map<String, String> metadata, String group, String label, TypeRef<T> type) {
         try {
-            final String storeName = configurationRequestItem.getStoreName();
             final CapaConfigStore store = this.getStore(storeName);
 
-            final String appId = configurationRequestItem.getAppId();
-            String group = configurationRequestItem.getGroup();
-            String label = configurationRequestItem.getLabel();
-            List<String> keys = configurationRequestItem.getKeys();
-            Map<String, String> metadata = configurationRequestItem.getMetadata();
             if (group == null || group.trim().isEmpty()) {
                 group = store.getDefaultGroup();
             }
@@ -192,6 +178,28 @@ public <T> Flux<SubConfigurationResp<T>> subscribeConfiguration(ConfigurationReq
         }
     }
 
+
+    private GetRequest getStoreRequest(String appId, String group, String label, List<String> keys, Map<String, String> metadata) {
+        GetRequest getRequest = new GetRequest();
+        getRequest.setAppId(appId);
+        getRequest.setGroup(group);
+        getRequest.setLabel(label);
+        getRequest.setKeys(keys);
+        getRequest.setMetadata(metadata);
+        return getRequest;
+    }
+
+    private <T> ConfigurationItem<T> getStoreResponse(group.rxcloud.capa.component.configstore.ConfigurationItem<T> tConfigurationItem) {
+        ConfigurationItem<T> configurationItem = new ConfigurationItem<>();
+        configurationItem.setKey(tConfigurationItem.getKey());
+        configurationItem.setContent(tConfigurationItem.getContent());
+        configurationItem.setGroup(tConfigurationItem.getGroup());
+        configurationItem.setLabel(tConfigurationItem.getLabel());
+        configurationItem.setTags(tConfigurationItem.getTags());
+        configurationItem.setMetadata(tConfigurationItem.getMetadata());
+        return configurationItem;
+    }
+
     private SubscribeReq getSubscribeRequest(String appId, String group, String label, List<String> keys, Map<String, String> metadata) {
         SubscribeReq subscribeReq = new SubscribeReq();
         subscribeReq.setAppId(appId);
diff --git a/sdk/src/test/java/group/rxcloud/capa/configuration/CapaConfigurationClientBuilderTest.java b/sdk/src/test/java/group/rxcloud/capa/configuration/CapaConfigurationClientBuilderTest.java
@@ -40,7 +40,7 @@ public void testBuild_WithCapaConfigStoreBuilderListAsParametersConstructor() {
     }
 
     @Test
-    public void testBuild_WithCapaConfigStoreBuilderSuppierAsParametersConstructor() {
+    public void testBuild_WithCapaConfigStoreBuilderSupplierAsParametersConstructor() {
         CapaConfigStoreBuilder storeBuilder = Mockito.mock(CapaConfigStoreBuilder.class);
         CapaConfigStore configStore = Mockito.mock(CapaConfigStore.class);
         Mockito.when(storeBuilder.build()).thenReturn(configStore);
diff --git a/sdk/src/test/java/group/rxcloud/capa/configuration/CapaConfigurationClientStoreTest.java b/sdk/src/test/java/group/rxcloud/capa/configuration/CapaConfigurationClientStoreTest.java
