Merge pull request #34 from reactivegroup/feature/spi_change

kevinten10 · web-flow · commit ce9ad7f3e432 · 2021-11-15T23:21:16.000+08:00
feat: diff spi properties
diff --git a/sdk-component/src/main/java/group/rxcloud/capa/component/configstore/CapaConfigStoreBuilder.java b/sdk-component/src/main/java/group/rxcloud/capa/component/configstore/CapaConfigStoreBuilder.java
@@ -87,7 +87,7 @@ public CapaConfigStore build() {
     private CapaConfigStore buildCapaConfigStore() {
         // load spi capa config store impl
         try {
-            Properties properties = CapaProperties.COMPONENT_PROPERTIES_SUPPLIER.get();
+            Properties properties = CapaProperties.COMPONENT_PROPERTIES_SUPPLIER.apply("configuration");
             String capaConfigStoreClassPath = properties.getProperty(CapaConfigStore.class.getName());
             Class<? extends CapaConfigStore> aClass = (Class<? extends CapaConfigStore>) Class.forName(capaConfigStoreClassPath);
             Constructor<? extends CapaConfigStore> constructor = aClass.getConstructor(CapaObjectSerializer.class);
diff --git a/sdk-component/src/main/java/group/rxcloud/capa/component/http/CapaHttpBuilder.java b/sdk-component/src/main/java/group/rxcloud/capa/component/http/CapaHttpBuilder.java
@@ -108,7 +108,7 @@ private CapaHttp buildCapaHttp() {
 
         // load spi capa http impl
         try {
-            Properties properties = CapaProperties.COMPONENT_PROPERTIES_SUPPLIER.get();
+            Properties properties = CapaProperties.COMPONENT_PROPERTIES_SUPPLIER.apply("rpc");
             String capaHttpClassPath = properties.getProperty(CapaHttp.class.getName());
             Class<? extends CapaHttp> aClass = (Class<? extends CapaHttp>) Class.forName(capaHttpClassPath);
             Constructor<? extends CapaHttp> constructor = aClass.getConstructor(OkHttpClient.class, CapaObjectSerializer.class);
diff --git a/sdk-component/src/test/resources/capa-component-configuration.properties b/sdk-component/src/test/resources/capa-component-configuration.properties
@@ -1,2 +1 @@
-group.rxcloud.capa.component.http.CapaHttp=group.rxcloud.capa.component.http.TestCapaHttp
-group.rxcloud.capa.component.configstore.CapaConfigStore=group.rxcloud.capa.component.configstore.TestCapaConfigStore
+group.rxcloud.capa.component.configstore.CapaConfigStore=group.rxcloud.capa.component.configstore.TestCapaConfigStore
diff --git a/sdk-component/src/test/resources/capa-component-rpc.properties b/sdk-component/src/test/resources/capa-component-rpc.properties
@@ -0,0 +1 @@
+group.rxcloud.capa.component.http.CapaHttp=group.rxcloud.capa.component.http.TestCapaHttp
diff --git a/sdk-infrastructure/pom.xml b/sdk-infrastructure/pom.xml
@@ -77,6 +77,18 @@
             <artifactId>jackson-databind</artifactId>
             <version>${jackson.version}</version>
         </dependency>
+
+        <!-- unit test -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/sdk-infrastructure/src/main/java/group/rxcloud/capa/infrastructure/config/CapaProperties.java b/sdk-infrastructure/src/main/java/group/rxcloud/capa/infrastructure/config/CapaProperties.java
@@ -20,10 +20,15 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
+import java.util.Map;
+import java.util.Objects;
 import java.util.Properties;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
 import java.util.function.Supplier;
 
-import static group.rxcloud.capa.infrastructure.constants.CapaConstants.Properties.CAPA_COMPONENT_PROPERTIES;
+import static group.rxcloud.capa.infrastructure.constants.CapaConstants.Properties.CAPA_COMPONENT_PROPERTIES_PREFIX;
+import static group.rxcloud.capa.infrastructure.constants.CapaConstants.Properties.CAPA_COMPONENT_PROPERTIES_SUFFIX;
 
 /**
  * Global properties for Capa's SDK, using Supplier so they are dynamically resolved.
@@ -50,26 +55,35 @@ public abstract class CapaProperties {
     /**
      * Capa's timeout in seconds for HTTP client reads.
      */
-    public static final Supplier<Integer> HTTP_CLIENT_READ_TIMEOUT_SECONDS = () -> DEFAULT_HTTP_CLIENT_READTIMEOUTSECONDS;
+    public static final Supplier<Integer> HTTP_CLIENT_READ_TIMEOUT_SECONDS
+            = () -> DEFAULT_HTTP_CLIENT_READTIMEOUTSECONDS;
 
     /**
-     * Capa's component properties.
+     * Capa's component properties cache map.
      */
-    private static final Properties COMPONENT_PROPERTIES = loadCapaComponentProperties();
+    private static final Map<String, Properties> COMPONENT_PROPERTIES_MAP = new ConcurrentHashMap<>();
 
     /**
      * Capa's component properties.
      */
-    public static final Supplier<Properties> COMPONENT_PROPERTIES_SUPPLIER = () -> COMPONENT_PROPERTIES;
+    public static final Function<String, Properties> COMPONENT_PROPERTIES_SUPPLIER
+            = (componentDomain) -> COMPONENT_PROPERTIES_MAP.computeIfAbsent(componentDomain,
+            s -> loadCapaComponentProperties(componentDomain));
+
+    private static Properties loadCapaComponentProperties(final String componentDomain) {
+        Objects.requireNonNull(componentDomain, "componentDomain not found.");
+
+        final String fileName = CAPA_COMPONENT_PROPERTIES_PREFIX
+                + componentDomain.toLowerCase()
+                + CAPA_COMPONENT_PROPERTIES_SUFFIX;
 
-    private static Properties loadCapaComponentProperties() {
-        try (InputStream in = CapaProperties.class.getResourceAsStream(CAPA_COMPONENT_PROPERTIES)) {
+        try (InputStream in = CapaProperties.class.getResourceAsStream(fileName)) {
             InputStreamReader inputStreamReader = new InputStreamReader(in, StandardCharsets.UTF_8);
             Properties properties = new Properties();
             properties.load(inputStreamReader);
             return properties;
         } catch (IOException e) {
-            throw new IllegalArgumentException(CAPA_COMPONENT_PROPERTIES + " file not found.");
+            throw new IllegalArgumentException(fileName + " file not found.");
         }
     }
 }
diff --git a/sdk-infrastructure/src/main/java/group/rxcloud/capa/infrastructure/constants/CapaConstants.java b/sdk-infrastructure/src/main/java/group/rxcloud/capa/infrastructure/constants/CapaConstants.java
@@ -27,6 +27,7 @@ interface Environments {
 
     interface Properties {
 
-        String CAPA_COMPONENT_PROPERTIES = "/capa-component.properties";
+        String CAPA_COMPONENT_PROPERTIES_PREFIX = "/capa-component-";
+        String CAPA_COMPONENT_PROPERTIES_SUFFIX = ".properties";
     }
 }
diff --git a/sdk-infrastructure/src/main/java/group/rxcloud/capa/infrastructure/env/CapaEnvironment.java b/sdk-infrastructure/src/main/java/group/rxcloud/capa/infrastructure/env/CapaEnvironment.java
@@ -38,6 +38,13 @@ public abstract class CapaEnvironment {
 
     static {
         // setup cloud env
+        initCloudEnv();
+
+        // setup vpc env
+        initVpcEnv();
+    }
+
+    private static void initCloudEnv() {
         final String cloudRuntimesEnvDeployCloud = System.getProperty(CLOUD_RUNTIMES_ENV_DEPLOY_CLOUD);
         if ("CTRIP".equalsIgnoreCase(cloudRuntimesEnvDeployCloud)) {
             deployCloudEnvironment = DeployCloudEnvironment.CTRIP_IDC;
@@ -48,8 +55,9 @@ public abstract class CapaEnvironment {
         if (deployCloudEnvironment == null) {
             deployCloudEnvironment = DeployCloudEnvironment.CTRIP_IDC;
         }
+    }
 
-        // setup vpc env
+    private static void initVpcEnv() {
         final String cloudRuntimesEnvDeployVpc = System.getProperty(CLOUD_RUNTIMES_ENV_DEPLOY_VPC);
         if ("FWS".equalsIgnoreCase(cloudRuntimesEnvDeployVpc)
                 || "FAT".equalsIgnoreCase(cloudRuntimesEnvDeployVpc)) {
diff --git a/sdk-infrastructure/src/test/java/group/rxcloud/capa/infrastructure/config/CapaPropertiesTest.java b/sdk-infrastructure/src/test/java/group/rxcloud/capa/infrastructure/config/CapaPropertiesTest.java
@@ -0,0 +1,45 @@
+/*
+ * 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 group.rxcloud.capa.infrastructure.config;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.util.Properties;
+
+public class CapaPropertiesTest {
+
+
+    @Test
+    public void testGetApiProtocol_Success() {
+        String apiProtocol = CapaProperties.API_PROTOCOL.get();
+        Assertions.assertEquals("HTTP", apiProtocol);
+    }
+
+    @Test
+    public void testGetHttpClientReadTimeoutSeconds_Success() {
+        Integer httpClientReadTimeoutSeconds = CapaProperties.HTTP_CLIENT_READ_TIMEOUT_SECONDS.get();
+        Assertions.assertEquals(60, httpClientReadTimeoutSeconds.intValue());
+    }
+
+    @Test
+    public void testGetComponentProperties_Success() {
+        Properties properties = CapaProperties.COMPONENT_PROPERTIES_SUPPLIER.apply("rpc");
+        String value = properties.getProperty("key");
+        Assertions.assertEquals("value", value);
+    }
+}
diff --git a/sdk-infrastructure/src/test/java/group/rxcloud/capa/infrastructure/serializer/DefaultObjectSerializerTest.java b/sdk-infrastructure/src/test/java/group/rxcloud/capa/infrastructure/serializer/DefaultObjectSerializerTest.java
@@ -0,0 +1,53 @@
+/*
+ * 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 group.rxcloud.capa.infrastructure.serializer;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+
+public class DefaultObjectSerializerTest {
+
+    private DefaultObjectSerializer defaultObjectSerializer;
+
+    @BeforeEach
+    public void setUp() {
+        defaultObjectSerializer = new DefaultObjectSerializer();
+    }
+
+    @Test
+    public void testGetContentType_Success() {
+        String contentType = defaultObjectSerializer.getContentType();
+        Assertions.assertEquals("application/json", contentType);
+    }
+
+    @Test
+    public void testSerialize_Success() throws IOException {
+        byte[] serializeNull = defaultObjectSerializer.serialize(null);
+        Assertions.assertNull(serializeNull);
+
+        byte[] serializeByte = defaultObjectSerializer.serialize(new byte[0]);
+        Assertions.assertNotNull(serializeByte);
+
+        byte[] serializeString = defaultObjectSerializer.serialize("serialize");
+        Assertions.assertNotNull(serializeString);
+    }
+
+
+}
diff --git a/sdk-infrastructure/src/test/resources/capa-component-rpc.properties b/sdk-infrastructure/src/test/resources/capa-component-rpc.properties
@@ -0,0 +1 @@
+key=value
diff --git a/sdk-spi-demo/src/main/resources/capa-component-configuration.properties b/sdk-spi-demo/src/main/resources/capa-component-configuration.properties
@@ -0,0 +1 @@
+group.rxcloud.capa.component.configstore.CapaConfigStore=group.rxcloud.capa.spi.demo.configstore.DemoCapaConfigStore
diff --git a/sdk-spi-demo/src/main/resources/capa-component-rpc.properties b/sdk-spi-demo/src/main/resources/capa-component-rpc.properties
@@ -0,0 +1,2 @@
+group.rxcloud.capa.component.http.CapaHttp=group.rxcloud.capa.spi.demo.http.DemoCapaHttp
+group.rxcloud.capa.spi.config.CapaSpiOptionsLoader=group.rxcloud.capa.spi.demo.config.DemoSpiOptionsLoader
diff --git a/sdk-spi-demo/src/main/resources/capa-component.properties b/sdk-spi-demo/src/main/resources/capa-component.properties
diff --git a/sdk-spi/src/main/java/group/rxcloud/capa/spi/config/CapaSpiProperties.java b/sdk-spi/src/main/java/group/rxcloud/capa/spi/config/CapaSpiProperties.java
@@ -35,7 +35,7 @@ public abstract class CapaSpiProperties {
     public static CapaSpiOptionsLoader getSpiOptionsLoader() {
         // load spi capa http impl
         try {
-            Properties properties = CapaProperties.COMPONENT_PROPERTIES_SUPPLIER.get();
+            Properties properties = CapaProperties.COMPONENT_PROPERTIES_SUPPLIER.apply("rpc");
             String classPath = properties.getProperty(CapaSpiOptionsLoader.class.getName());
             Class<? extends CapaSpiOptionsLoader> aClass = (Class<? extends CapaSpiOptionsLoader>) Class.forName(classPath);
             Constructor<? extends CapaSpiOptionsLoader> constructor = aClass.getConstructor();
diff --git a/sdk-spi/src/test/java/group/rxcloud/capa/spi/http/CapaSerializeHttpSpiTest.java b/sdk-spi/src/test/java/group/rxcloud/capa/spi/http/CapaSerializeHttpSpiTest.java
@@ -24,13 +24,7 @@
 import group.rxcloud.capa.infrastructure.serializer.ObjectSerializer;
 import group.rxcloud.capa.spi.config.RpcServiceOptions;
 import group.rxcloud.cloudruntimes.utils.TypeRef;
-import okhttp3.OkHttpClient;
-import okhttp3.RequestBody;
-import okhttp3.Request;
-import okhttp3.Response;
-import okhttp3.ResponseBody;
-import okhttp3.MediaType;
-import okhttp3.Protocol;
+import okhttp3.*;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -101,6 +95,22 @@ public void testGetRequestBodyWithSerialize_SuccessWhenHeaderIsNull() {
         Assertions.assertEquals("json", subtype);
     }
 
+    @Test
+    public void testGetRequestHeaderWithParams_SuccessWhenHeaderHasValue() {
+        Map<String, String> headersParams = new HashMap<>();
+        headersParams.put("key", "value");
+        Headers requestHeaderWithParams = capaSerializeHttpSpi.getRequestHeaderWithParams(headersParams);
+        String value = requestHeaderWithParams.get("key");
+        Assertions.assertEquals("value", value);
+    }
+
+    @Test
+    public void testGetRequestHeaderWithParams_SuccessWhenHeaderIsNull() {
+        Headers requestHeaderWithParams = capaSerializeHttpSpi.getRequestHeaderWithParams(null);
+        String value = requestHeaderWithParams.get("key");
+        Assertions.assertNull(value);
+    }
+
     @Test
     public void testDoAsyncInvoke0_Success() {
         Request request = new Request.Builder().url("https://www.url/").build();
@@ -166,6 +176,7 @@ public void testOnResponseInSerializationResponseFutureCallback_Success() throws
         future.cancel(true);
     }
 
+
     @Test
     public void testGetRpcServiceOptions_Success() {
         RpcServiceOptions rpcServiceOptions = capaSerializeHttpSpi.getRpcServiceOptions("appId");
@@ -211,15 +222,15 @@ private class TestRuntimeExceptionObjectSerializer extends ObjectSerializer impl
          * {@inheritDoc}
          */
         @Override
-        public byte[] serialize(Object o)  {
+        public byte[] serialize(Object o) {
             throw new RuntimeException("test serialize exception");
         }
 
         /**
          * {@inheritDoc}
          */
         @Override
-        public <T> T deserialize(byte[] data, TypeRef<T> type)  {
+        public <T> T deserialize(byte[] data, TypeRef<T> type) {
             throw new RuntimeException("test deserialize exception");
         }
 
diff --git a/sdk-spi/src/test/resources/capa-component-rpc.properties b/sdk-spi/src/test/resources/capa-component-rpc.properties
diff --git a/sdk/src/test/resources/capa-component-rpc.properties b/sdk/src/test/resources/capa-component-rpc.properties

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`-group.rxcloud.capa.component.http.CapaHttp=group.rxcloud.capa.component.http.TestCapaHttp`
`2`		`-group.rxcloud.capa.component.configstore.CapaConfigStore=group.rxcloud.capa.component.configstore.TestCapaConfigStore`
	`1`	`+group.rxcloud.capa.component.configstore.CapaConfigStore=group.rxcloud.capa.component.configstore.TestCapaConfigStore`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+group.rxcloud.capa.component.http.CapaHttp=group.rxcloud.capa.component.http.TestCapaHttp`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ interface Environments {`
`27`	`27`
`28`	`28`	`interface Properties {`
`29`	`29`
`30`		`- String CAPA_COMPONENT_PROPERTIES = "/capa-component.properties";`
	`30`	`+ String CAPA_COMPONENT_PROPERTIES_PREFIX = "/capa-component-";`
	`31`	`+ String CAPA_COMPONENT_PROPERTIES_SUFFIX = ".properties";`
`31`	`32`	`}`
`32`	`33`	`}`