Merge pull request #70 from reactivegroup/feature/rpc_add_header

kevinten10 · web-flow · commit f7e1d871fe92 · 2021-12-16T18:34:49.000+08:00
feat: rpc add accept header
diff --git a/capa-spi-aws-config/pom.xml b/capa-spi-aws-config/pom.xml
@@ -34,11 +34,6 @@
             <artifactId>capa-spi-aws-infrastructure</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>group.rxcloud</groupId>
-            <artifactId>capa-foundation</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>appconfig</artifactId>
diff --git a/capa-spi-aws-config/src/test/java/group/rxcloud/capa/spi/aws/config/AwsCapaConfigStoreTest.java b/capa-spi-aws-config/src/test/java/group/rxcloud/capa/spi/aws/config/AwsCapaConfigStoreTest.java
@@ -66,7 +66,6 @@ public void setUp() {
         Whitebox.setInternalState(ins, "appConfigAsyncClient", client);
         PowerMockito.when(client.getConfiguration(ArgumentMatchers.any(GetConfigurationRequest.class))).thenReturn(mockGetConfigurationRespV1());
 
-
         SerializerProcessor serializerProcessor = PowerMockito.mock(SerializerProcessor.class);
         Whitebox.setInternalState(ins, "serializerProcessor", serializerProcessor);
         User user = new User();
diff --git a/capa-spi-aws-infrastructure/pom.xml b/capa-spi-aws-infrastructure/pom.xml
@@ -37,6 +37,11 @@
             <artifactId>capa-sdk-spi</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>group.rxcloud</groupId>
+            <artifactId>capa-foundation</artifactId>
+        </dependency>
+
         <!-- unit test -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
diff --git a/capa-spi-aws-infrastructure/src/main/java/group/rxcloud/capa/spi/aws/infrastructure/AwsCapaEnvironment.java b/capa-spi-aws-infrastructure/src/main/java/group/rxcloud/capa/spi/aws/infrastructure/AwsCapaEnvironment.java
@@ -16,6 +16,8 @@
  */
 package group.rxcloud.capa.spi.aws.infrastructure;
 
+import group.rxcloud.capa.addons.foundation.CapaFoundation;
+import group.rxcloud.capa.addons.foundation.FoundationType;
 import group.rxcloud.capa.infrastructure.CapaEnvironment;
 import group.rxcloud.capa.infrastructure.CapaProperties;
 
@@ -39,8 +41,8 @@ public String getDeployRegion() {
 
     @Override
     public String getDeployEnv() {
-        String envKey = Settings.getEnvKey();
-        return System.getProperty(envKey);
+        // FIXME: 2021/12/15 use trip logic currently
+        return CapaFoundation.getEnv(FoundationType.TRIP);
     }
 
     abstract static class Settings {
diff --git a/capa-spi-aws-log/pom.xml b/capa-spi-aws-log/pom.xml
@@ -29,7 +29,7 @@
     <artifactId>capa-spi-aws-log</artifactId>
 
     <properties>
-        <log4j.version>2.15.0</log4j.version>
+        <log4j.version>2.16.0</log4j.version>
         <logback.version>1.2.3</logback.version>
         <gson.version>2.8.0</gson.version>
         <sentinel.core.version>1.8.2</sentinel.core.version>
@@ -40,10 +40,7 @@
             <groupId>group.rxcloud</groupId>
             <artifactId>capa-spi-aws-infrastructure</artifactId>
         </dependency>
-        <dependency>
-            <groupId>group.rxcloud</groupId>
-            <artifactId>capa-foundation</artifactId>
-        </dependency>
+
         <dependency>
             <groupId>group.rxcloud</groupId>
             <artifactId>capa-id-generator</artifactId>
@@ -80,14 +77,15 @@
             <version>${logback.version}</version>
             <optional>true</optional>
         </dependency>
-        <!--log4j-->
+        <!-- log4j -->
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
             <version>${log4j.version}</version>
             <optional>true</optional>
         </dependency>
-        <!--http-->
+
+        <!-- http -->
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
@@ -101,11 +99,12 @@
             <artifactId>sentinel-core</artifactId>
             <version>${sentinel.core.version}</version>
         </dependency>
+
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <scope>test</scope>
             <version>1.18.22</version>
+            <scope>test</scope>
         </dependency>
         <!-- unit test -->
         <dependency>
diff --git a/capa-spi-aws-mesh/src/main/java/group/rxcloud/capa/spi/aws/mesh/AwsCapaRpcProperties.java b/capa-spi-aws-mesh/src/main/java/group/rxcloud/capa/spi/aws/mesh/AwsCapaRpcProperties.java
@@ -16,6 +16,8 @@
  */
 package group.rxcloud.capa.spi.aws.mesh;
 
+import group.rxcloud.capa.addons.foundation.CapaFoundation;
+import group.rxcloud.capa.addons.foundation.FoundationType;
 import group.rxcloud.capa.infrastructure.CapaProperties;
 import group.rxcloud.capa.infrastructure.exceptions.CapaErrorContext;
 import group.rxcloud.capa.infrastructure.exceptions.CapaException;
@@ -55,7 +57,8 @@ abstract class Settings {
                     throw new CapaException(CapaErrorContext.PARAMETER_ERROR, "Rpc Port: " + awsRpcAppMeshPort);
                 }
 
-                rpcAwsAppMeshNamespace = properties.getProperty(RPC_AWS_APP_MESH_NAMESPACE, rpcAwsAppMeshNamespace);
+                // FIXME: 2021/12/15 use trip logic currently
+                rpcAwsAppMeshNamespace = CapaFoundation.getNamespace(FoundationType.TRIP);
             }
 
             public static Integer getRpcAwsAppMeshPort() {
diff --git a/capa-spi-aws-mesh/src/main/java/group/rxcloud/capa/spi/aws/mesh/http/AwsCapaHttp.java b/capa-spi-aws-mesh/src/main/java/group/rxcloud/capa/spi/aws/mesh/http/AwsCapaHttp.java
@@ -35,10 +35,12 @@
 import org.slf4j.LoggerFactory;
 import software.amazon.awssdk.utils.StringUtils;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
 
 
 /**
@@ -80,6 +82,30 @@ protected <T> CompletableFuture<HttpResponse<T>> invokeSpiApi(String appId,
                 (AwsRpcServiceOptions) rpcServiceOptions);
     }
 
+    private static final String ACCEPT_KEY = "accept";
+    private static final String ACCEPT_ALL = "*/*";
+
+    private void setRequestHeaderOfAccept(Map<String, String> headers, RequestBody body) {
+        final List<String> accepts = new ArrayList<>(3);
+        // 1. set user accept header
+        final String userAcceptValue = headers.get(ACCEPT_KEY);
+        if (userAcceptValue != null && userAcceptValue.length() > 0) {
+            accepts.add(userAcceptValue);
+        }
+        // 2. set accept header same with content-type
+        final String contentType = body.contentType().toString();
+        if (contentType != null && contentType.length() > 0) {
+            accepts.add(contentType);
+        }
+        // 3. add */* at last
+        accepts.add(ACCEPT_ALL);
+
+        final String acceptStr = accepts.stream()
+                .distinct()
+                .collect(Collectors.joining(","));
+        headers.put(ACCEPT_KEY, acceptStr);
+    }
+
     private interface AwsHttpInvoker {
 
         /**
@@ -198,6 +224,9 @@ private <T> CompletableFuture<HttpResponse<T>> invokeHttp(String url,
                                                                   TypeRef<T> type) {
             // generate http request body
             RequestBody body = getRequestBodyWithSerialize(requestData, headers);
+
+            setRequestHeaderOfAccept(headers, body);
+
             Headers header = getRequestHeaderWithParams(headers);
 
             // make http request
diff --git a/capa-spi-aws-mesh/src/main/resources/capa-component-rpc-aws.properties b/capa-spi-aws-mesh/src/main/resources/capa-component-rpc-aws.properties
@@ -5,7 +5,7 @@ RPC_AWS_APP_MESH_TEMPLATE=http://{serviceId}.{namespace}.svc.cluster.local:{serv
 RPC_AWS_APP_MESH_PORT=8080
 #
 # rpc aws app mesh namespace
-RPC_AWS_APP_MESH_NAMESPACE=FWS
+RPC_AWS_APP_MESH_NAMESPACE=meshnamespace
 #
 # rpc aws app mesh serializer
 RPC_AWS_APP_MESH_SERIALIZER=baiji
diff --git a/capa-spi-aws-mesh/src/test/java/group/rxcloud/capa/spi/aws/mesh/env/AwsRpcEnvironmentTest.java b/capa-spi-aws-mesh/src/test/java/group/rxcloud/capa/spi/aws/mesh/env/AwsRpcEnvironmentTest.java
@@ -37,6 +37,6 @@ public void testGetSerializer_SuccessWhenDefault() {
     @Test
     public void testGetNamespace_SuccessWhenDefault() {
         String namespace = AwsCapaRpcProperties.AppMeshProperties.Settings.getRpcAwsAppMeshNamespace();
-        Assertions.assertEquals("FWS", namespace);
+        Assertions.assertNull(namespace);
     }
 }
diff --git a/capa-spi-aws-mesh/src/test/java/group/rxcloud/capa/spi/aws/mesh/http/AwsCapaHttpTest.java b/capa-spi-aws-mesh/src/test/java/group/rxcloud/capa/spi/aws/mesh/http/AwsCapaHttpTest.java
@@ -50,18 +50,21 @@ public void setUp() {
     @Test
     public void testInvokeSpiApi_Success() {
         AwsSpiOptionsLoader awsSpiOptionsLoader = new AwsSpiOptionsLoader();
-        AwsRpcServiceOptions awsRpcServiceOptions = awsSpiOptionsLoader.loadRpcServiceOptions("appId");
 
-        CompletableFuture<HttpResponse<String>> responseCompletableFuture = awsCapaHttp.invokeSpiApi("appId",
-                "method",
-                "requestData",
-                "POST",
-                new HashMap<>(),
-                new HashMap<>(),
-                TypeRef.STRING,
-                awsRpcServiceOptions);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            AwsRpcServiceOptions awsRpcServiceOptions = awsSpiOptionsLoader.loadRpcServiceOptions("appId");
 
-        responseCompletableFuture.cancel(true);
+            CompletableFuture<HttpResponse<String>> responseCompletableFuture = awsCapaHttp.invokeSpiApi("appId",
+                    "method",
+                    "requestData",
+                    "POST",
+                    new HashMap<>(),
+                    new HashMap<>(),
+                    TypeRef.STRING,
+                    awsRpcServiceOptions);
+
+            responseCompletableFuture.cancel(true);
+        });
     }
 
     @Test
diff --git a/capa-spi-aws-mesh/src/test/java/group/rxcloud/capa/spi/aws/mesh/http/config/AwsRpcServiceOptionsTest.java b/capa-spi-aws-mesh/src/test/java/group/rxcloud/capa/spi/aws/mesh/http/config/AwsRpcServiceOptionsTest.java
@@ -34,8 +34,8 @@ public void setUp() {
         awsToAwsServiceOptions = new AwsRpcServiceOptions.AwsToAwsServiceOptions(
                 "appId",
                 8080,
-                "FWS",
-                "FWS");
+                "meshnamespace",
+                "meshnamespace");
         awsRpcServiceOptions.setAwsToAwsServiceOptions(awsToAwsServiceOptions);
     }
 
@@ -58,8 +58,8 @@ public void testGetAwsToAwsServiceOptions_Success() {
 
         Assertions.assertEquals("appId", awsToAwsServiceOptions.getServiceId());
         Assertions.assertEquals(8080, awsToAwsServiceOptions.getServicePort());
-        Assertions.assertEquals("FWS", awsToAwsServiceOptions.getNamespace());
-        Assertions.assertEquals("FWS", awsToAwsServiceOptions.getServiceEnv());
+        Assertions.assertEquals("meshnamespace", awsToAwsServiceOptions.getNamespace());
+        Assertions.assertEquals("meshnamespace", awsToAwsServiceOptions.getServiceEnv());
     }
 
     @Test
diff --git a/capa-spi-aws-mesh/src/test/java/group/rxcloud/capa/spi/aws/mesh/http/config/AwsSpiOptionsLoaderTest.java b/capa-spi-aws-mesh/src/test/java/group/rxcloud/capa/spi/aws/mesh/http/config/AwsSpiOptionsLoaderTest.java
@@ -23,7 +23,7 @@ public class AwsSpiOptionsLoaderTest {
 
     @Test
     public void testLoadRpcServiceOptions_Success() {
-        System.setProperty("ENV", "FWS");
+        System.setProperty("ENV", "meshnamespace");
 
         AwsSpiOptionsLoader awsSpiOptionsLoader = new AwsSpiOptionsLoader();
 
@@ -35,7 +35,7 @@ public void testLoadRpcServiceOptions_Success() {
 
         Assertions.assertEquals("appId", awsToAwsServiceOptions.getServiceId());
         Assertions.assertEquals(8080, awsToAwsServiceOptions.getServicePort());
-        Assertions.assertEquals("FWS", awsToAwsServiceOptions.getNamespace());
-        Assertions.assertEquals("FWS", awsToAwsServiceOptions.getServiceEnv());
+        Assertions.assertNotNull(awsToAwsServiceOptions.getServiceEnv());
+        Assertions.assertNull(awsToAwsServiceOptions.getNamespace());
     }
 }
diff --git a/capa-spi-aws-telemetry/pom.xml b/capa-spi-aws-telemetry/pom.xml
@@ -29,21 +29,15 @@
     <artifactId>capa-spi-aws-telemetry</artifactId>
 
     <properties>
-        <slf4j.version>1.7.21</slf4j.version>
-        <log4j.version>2.14.1</log4j.version>
-        <logback.version>1.2.3</logback.version>
         <gson.version>2.8.0</gson.version>
     </properties>
+
     <dependencies>
         <dependency>
             <groupId>group.rxcloud</groupId>
             <artifactId>capa-spi-aws-infrastructure</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>group.rxcloud</groupId>
-            <artifactId>capa-foundation</artifactId>
-        </dependency>
         <dependency>
             <groupId>group.rxcloud</groupId>
             <artifactId>capa-id-generator</artifactId>
@@ -60,7 +54,8 @@
             <artifactId>gson</artifactId>
             <version>${gson.version}</version>
         </dependency>
-        <!--http-->
+
+        <!-- http -->
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
diff --git a/pom.xml b/pom.xml
@@ -67,8 +67,8 @@
         <module>capa-spi-aws-mesh</module>
         <module>capa-spi-aws-config</module>
         <module>capa-spi-aws-telemetry</module>
-        <module>capa-spi-aws-infrastructure</module>
         <module>capa-spi-aws-log</module>
+        <module>capa-spi-aws-infrastructure</module>
         <module>example</module>
     </modules>
 
@@ -81,6 +81,10 @@
         <aws-sdk.version>2.17.40</aws-sdk.version>
         <guava.version>19.0</guava.version>
         <capa-addons.version>1.0.7.RELEASE</capa-addons.version>
+        <http.client.version>4.5.13</http.client.version>
+        <netty.bom.version>4.1.68.Final</netty.bom.version>
+        <http.core.version>4.4.11</http.core.version>
+        <byte-buddy.version>1.12.2</byte-buddy.version>
         <junit.version>5.3.1</junit.version>
         <mockito-core.version>3.6.0</mockito-core.version>
         <powermock.version>2.0.9</powermock.version>
@@ -92,10 +96,6 @@
         <maven.resource.version>3.2.0</maven.resource.version>
         <maven.surefire.version>3.0.0-M1</maven.surefire.version>
         <maven.jacoco.version>0.8.6</maven.jacoco.version>
-        <byte-buddy.version>1.12.2</byte-buddy.version>
-        <http.client.version>4.5.13</http.client.version>
-        <netty.bom.version>4.1.68.Final</netty.bom.version>
-        <http.core.version>4.4.11</http.core.version>
     </properties>
 
     <dependencyManagement>
@@ -355,7 +355,7 @@
                 <scope>import</scope>
             </dependency>
 
-            <!--http-->
+            <!-- aws http client -->
             <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty-bom</artifactId>

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ RPC_AWS_APP_MESH_TEMPLATE=http://{serviceId}.{namespace}.svc.cluster.local:{serv`
`5`	`5`	`RPC_AWS_APP_MESH_PORT=8080`
`6`	`6`	`#`
`7`	`7`	`# rpc aws app mesh namespace`
`8`		`-RPC_AWS_APP_MESH_NAMESPACE=FWS`
	`8`	`+RPC_AWS_APP_MESH_NAMESPACE=meshnamespace`
`9`	`9`	`#`
`10`	`10`	`# rpc aws app mesh serializer`
`11`	`11`	`RPC_AWS_APP_MESH_SERIALIZER=baiji`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,6 @@ public void testGetSerializer_SuccessWhenDefault() {`
`37`	`37`	`@Test`
`38`	`38`	`public void testGetNamespace_SuccessWhenDefault() {`
`39`	`39`	`String namespace = AwsCapaRpcProperties.AppMeshProperties.Settings.getRpcAwsAppMeshNamespace();`
`40`		`- Assertions.assertEquals("FWS", namespace);`
	`40`	`+ Assertions.assertNull(namespace);`
`41`	`41`	`}`
`42`	`42`	`}`