Merge pull request #13 from reactivegroup/refactor/optimize_rpc

kevinten10 · web-flow · commit f77152fbdf71 · 2021-11-14T00:45:12.000+08:00
refactor: optimize rpc app mesh module
diff --git a/capa-spi-aws-config/src/main/java/group/rxcloud/capa/spi/aws/config/package-info.java b/capa-spi-aws-config/src/main/java/group/rxcloud/capa/spi/aws/config/package-info.java
@@ -14,5 +14,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package group.rxcloud.capa.spi.aws.config;
diff --git a/capa-spi-aws-mesh/pom.xml b/capa-spi-aws-mesh/pom.xml
@@ -30,7 +30,7 @@
     <name>capa-skd-spi-aws-appmesh</name>
 
     <properties>
-        <capa-serialzer.version>1.0.0.RELEASE</capa-serialzer.version>
+        <capa-serializer.version>1.0.1.RELEASE</capa-serializer.version>
     </properties>
     
     <dependencies>
@@ -39,16 +39,18 @@
             <artifactId>capa-spi-aws-infrastructure</artifactId>
         </dependency>
 
+        <!-- https://mvnrepository.com/artifact/group.rxcloud/capa-serializer -->
         <dependency>
             <groupId>group.rxcloud</groupId>
-            <artifactId>capa-serialzer</artifactId>
-            <version>${capa-serialzer.version}</version>
+            <artifactId>capa-serializer</artifactId>
+            <version>${capa-serializer.version}</version>
         </dependency>
 
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>appmesh</artifactId>
         </dependency>
+
         <!-- unit test -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
diff --git a/capa-spi-aws-mesh/src/main/java/group/rxcloud/capa/spi/aws/mesh/config/AwsSpiOptionsLoader.java b/capa-spi-aws-mesh/src/main/java/group/rxcloud/capa/spi/aws/mesh/config/AwsSpiOptionsLoader.java
@@ -34,7 +34,7 @@ public AwsRpcServiceOptions loadRpcServiceOptions(String appId) {
 
         // get variable
         CapaEnvironment.DeployVpcEnvironment deployVpcEnvironment = CapaEnvironment.getDeployVpcEnvironment();
-        int servicePort = AwsRpcEnvironment.getServicePort();
+        final int servicePort = AwsRpcEnvironment.getServicePort();
 
         // generate awsToAwsServiceOptions
         // appid is serviceId
diff --git a/capa-spi-aws-mesh/src/main/java/group/rxcloud/capa/spi/aws/mesh/constants/AwsRpcConstants.java b/capa-spi-aws-mesh/src/main/java/group/rxcloud/capa/spi/aws/mesh/constants/AwsRpcConstants.java
@@ -16,27 +16,28 @@
  */
 package group.rxcloud.capa.spi.aws.mesh.constants;
 
+/**
+ * The Aws rpc constants.
+ */
 public interface AwsRpcConstants {
 
-    interface Environments {
-
-        String AWS_RPC_APP_MESH_DEFAULT_PORT = "AWS_RPC_APP_MESH_DEFAULT_PORT";
-
-    }
-
-    interface RpcProperties {
+    interface AppMeshProperties {
 
         /**
          * The aws app mesh http url template
          * {serviceId}.svc.cluster.local is virtual service name (https://docs.aws.amazon.com/zh_cn/zh_cn/app-mesh/latest/userguide/virtual_services.html)
          */
         String AWS_APP_MESH_TEMPLATE = "http://{serviceId}.svc.cluster.local:{servicePort}/{operation}";
 
+        String RPC_AWS_APP_MESH_DEFAULT_PORT = "8080";
+
+        String RPC_AWS_APP_MESH_PORT = "CAPA_RPC_AWS_APP_MESH_PORT";
     }
 
     interface SerializerProperties {
 
-        String AWS_RPC_APP_MESH_SERIALIZER = "AWS_RPC_APP_MESH_SERIALIZER";
+        String RPC_AWS_APP_MESH_DEFAULT_SERIALIZER = "baiji";
 
+        String RPC_AWS_APP_MESH_SERIALIZER = "CAPA_RPC_AWS_APP_MESH_SERIALIZER";
     }
 }
diff --git a/capa-spi-aws-mesh/src/main/java/group/rxcloud/capa/spi/aws/mesh/env/AwsRpcEnvironment.java b/capa-spi-aws-mesh/src/main/java/group/rxcloud/capa/spi/aws/mesh/env/AwsRpcEnvironment.java
@@ -22,8 +22,10 @@
 
 import java.util.Objects;
 
-import static group.rxcloud.capa.spi.aws.mesh.constants.AwsRpcConstants.Environments.AWS_RPC_APP_MESH_DEFAULT_PORT;
-import static group.rxcloud.capa.spi.aws.mesh.constants.AwsRpcConstants.SerializerProperties.AWS_RPC_APP_MESH_SERIALIZER;
+import static group.rxcloud.capa.spi.aws.mesh.constants.AwsRpcConstants.AppMeshProperties.RPC_AWS_APP_MESH_DEFAULT_PORT;
+import static group.rxcloud.capa.spi.aws.mesh.constants.AwsRpcConstants.AppMeshProperties.RPC_AWS_APP_MESH_PORT;
+import static group.rxcloud.capa.spi.aws.mesh.constants.AwsRpcConstants.SerializerProperties.RPC_AWS_APP_MESH_DEFAULT_SERIALIZER;
+import static group.rxcloud.capa.spi.aws.mesh.constants.AwsRpcConstants.SerializerProperties.RPC_AWS_APP_MESH_SERIALIZER;
 
 /**
  * Rpc System Environment Properties In Aws.
@@ -42,20 +44,28 @@ public abstract class AwsRpcEnvironment {
 
     static {
         // setup server port
-        String awsRpcAppMeshPort = System.getProperty(AWS_RPC_APP_MESH_DEFAULT_PORT);
+        initPort();
+
+        // setup serializer
+        initSerializer();
+    }
+
+    private static void initPort() {
+        String awsRpcAppMeshPort = System.getProperty(RPC_AWS_APP_MESH_PORT);
         if (StringUtils.isBlank(awsRpcAppMeshPort)) {
-            awsRpcAppMeshPort = "8080";
+            awsRpcAppMeshPort = RPC_AWS_APP_MESH_DEFAULT_PORT;
         }
         try {
-            servicePort = Integer.valueOf(awsRpcAppMeshPort);
+            servicePort = Integer.parseInt(awsRpcAppMeshPort);
         } catch (Exception e) {
-            new CapaException(CapaErrorContext.PARAMETER_ERROR, "Rpc Port: " + awsRpcAppMeshPort);
+            throw new CapaException(CapaErrorContext.PARAMETER_ERROR, "Rpc Port: " + awsRpcAppMeshPort);
         }
+    }
 
-        // setup serializer
-        String awsRpcAppMeshSerializer = System.getProperty(AWS_RPC_APP_MESH_SERIALIZER);
+    private static void initSerializer() {
+        String awsRpcAppMeshSerializer = System.getProperty(RPC_AWS_APP_MESH_SERIALIZER);
         if (StringUtils.isBlank(awsRpcAppMeshSerializer)) {
-            awsRpcAppMeshSerializer = "baiji";
+            awsRpcAppMeshSerializer = RPC_AWS_APP_MESH_DEFAULT_SERIALIZER;
         }
         serializer = awsRpcAppMeshSerializer;
     }
@@ -67,5 +77,4 @@ public static int getServicePort() {
     public static String getSerializer() {
         return Objects.requireNonNull(serializer, "Capa Serializer");
     }
-
 }
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
@@ -21,8 +21,7 @@
 import group.rxcloud.capa.infrastructure.exceptions.CapaException;
 import group.rxcloud.capa.infrastructure.serializer.CapaObjectSerializer;
 import group.rxcloud.capa.spi.aws.mesh.config.AwsRpcServiceOptions;
-import group.rxcloud.capa.spi.aws.mesh.constants.AwsRpcConstants;
-import group.rxcloud.capa.spi.aws.mesh.http.serialzer.AwsCapaSerialzerProvider;
+import group.rxcloud.capa.spi.aws.mesh.http.serializer.AwsCapaSerializerProvider;
 import group.rxcloud.capa.spi.config.RpcServiceOptions;
 import group.rxcloud.capa.spi.http.CapaSerializeHttpSpi;
 import group.rxcloud.cloudruntimes.utils.TypeRef;
@@ -38,6 +37,8 @@
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 
+import static group.rxcloud.capa.spi.aws.mesh.constants.AwsRpcConstants.AppMeshProperties.AWS_APP_MESH_TEMPLATE;
+
 public class AwsCapaHttp extends CapaSerializeHttpSpi {
 
     private static final Logger logger = LoggerFactory.getLogger(AwsCapaHttp.class);
@@ -49,7 +50,7 @@ public class AwsCapaHttp extends CapaSerializeHttpSpi {
      * @param objectSerializer the object serializer
      */
     public AwsCapaHttp(OkHttpClient httpClient, CapaObjectSerializer objectSerializer) {
-        super(httpClient, AwsCapaSerialzerProvider.getSerializerOrDefault(objectSerializer));
+        super(httpClient, AwsCapaSerializerProvider.getSerializerOrDefault(objectSerializer));
     }
 
     @Override
@@ -59,22 +60,19 @@ protected <T> CompletableFuture<HttpResponse<T>> invokeSpiApi(String appId,
                                                                   Map<String, String> headers,
                                                                   TypeRef<T> type,
                                                                   RpcServiceOptions rpcServiceOptions) {
-
         Objects.requireNonNull(rpcServiceOptions, "rpcServiceOptions");
         AwsToAwsHttpServiceMeshInvoker awsToAwsHttpServiceMeshInvoker = new AwsToAwsHttpServiceMeshInvoker();
-        CompletableFuture<HttpResponse<T>> httpResponseCompletableFuture
-                = awsToAwsHttpServiceMeshInvoker.doInvokeSpiApi(
-                appId,
-                method,
-                requestData,
-                headers,
-                type,
-                (AwsRpcServiceOptions) rpcServiceOptions);
-
+        CompletableFuture<HttpResponse<T>> httpResponseCompletableFuture =
+                awsToAwsHttpServiceMeshInvoker.doInvokeSpiApi(
+                        appId,
+                        method,
+                        requestData,
+                        headers,
+                        type,
+                        (AwsRpcServiceOptions) rpcServiceOptions);
         return httpResponseCompletableFuture;
     }
 
-
     private interface AwsHttpInvoker {
 
         /**
@@ -95,7 +93,6 @@ <T> CompletableFuture<HttpResponse<T>> doInvokeSpiApi(String appId,
                                                               Map<String, String> headers,
                                                               TypeRef<T> type,
                                                               AwsRpcServiceOptions rpcServiceOptions);
-
     }
 
     /**
@@ -115,8 +112,8 @@ public <T> CompletableFuture<HttpResponse<T>> doInvokeSpiApi(String appId,
                                                                      Map<String, String> headers,
                                                                      TypeRef<T> type,
                                                                      AwsRpcServiceOptions rpcServiceOptions) {
-            AwsRpcServiceOptions.AwsToAwsServiceOptions awsToAwsServiceOptions
-                    = rpcServiceOptions.getAwsToAwsServiceOptions();
+            AwsRpcServiceOptions.AwsToAwsServiceOptions awsToAwsServiceOptions =
+                    rpcServiceOptions.getAwsToAwsServiceOptions();
 
             final String serviceId = awsToAwsServiceOptions.getServiceId();
             final int servicePort = awsToAwsServiceOptions.getServicePort();
@@ -129,15 +126,14 @@ public <T> CompletableFuture<HttpResponse<T>> doInvokeSpiApi(String appId,
             return doAsyncInvoke(method, requestData, headers, type, serviceId, servicePort);
         }
 
-
         private <T> CompletableFuture<HttpResponse<T>> doAsyncInvoke(String method,
                                                                      Object requestData,
                                                                      Map<String, String> headers,
                                                                      TypeRef<T> type,
                                                                      String serviceId,
                                                                      int servicePort) {
             // generate app mesh http url
-            final String appMeshHttpUrl = AwsRpcConstants.RpcProperties.AWS_APP_MESH_TEMPLATE
+            final String appMeshHttpUrl = AWS_APP_MESH_TEMPLATE
                     .replace("{serviceId}", serviceId)
                     .replace("{servicePort}", String.valueOf(servicePort))
                     .replace("{operation}", method);
@@ -146,7 +142,7 @@ private <T> CompletableFuture<HttpResponse<T>> doAsyncInvoke(String method,
             CompletableFuture<HttpResponse<T>> asyncInvoke0 = post(appMeshHttpUrl, requestData, headers, type);
             asyncInvoke0.exceptionally(throwable -> {
                 if (logger.isWarnEnabled()) {
-                    logger.warn("[CtripCapaHttp] async invoke error", throwable);
+                    logger.warn("[AwsCapaHttp] async invoke error", throwable);
                 }
                 throw new CapaException(CapaErrorContext.DEPENDENT_SERVICE_ERROR, throwable);
             });
@@ -170,6 +166,5 @@ private <T> CompletableFuture<HttpResponse<T>> post(String url,
 
             return doAsyncInvoke0(request, type);
         }
-
     }
 }
diff --git a/capa-spi-aws-mesh/src/main/java/group/rxcloud/capa/spi/aws/mesh/http/serializer/AwsCapaSerializerProvider.java b/capa-spi-aws-mesh/src/main/java/group/rxcloud/capa/spi/aws/mesh/http/serializer/AwsCapaSerializerProvider.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package group.rxcloud.capa.spi.aws.mesh.http.serialzer;
+package group.rxcloud.capa.spi.aws.mesh.http.serializer;
 
 import group.rxcloud.capa.infrastructure.serializer.CapaObjectSerializer;
 import group.rxcloud.capa.infrastructure.serializer.DefaultObjectSerializer;
@@ -24,9 +24,9 @@
 import java.util.Map;
 
 /**
- * The capa serialzer provider.
+ * The capa serializer provider.
  */
-public interface AwsCapaSerialzerProvider {
+public interface AwsCapaSerializerProvider {
 
     /**
      * Gets serializer or default.
@@ -51,8 +51,7 @@ final class AwsCapaSerializerFactory {
             SERIALIZER_FACTORY = new HashMap<>(2, 1);
 
             SERIALIZER_FACTORY.put("default", new DefaultObjectSerializer());
-            SERIALIZER_FACTORY.put("baiji", new BaijiSSJsonObjectSerialzer());
+            SERIALIZER_FACTORY.put("baiji", new BaijiSSJsonObjectSerializer());
         }
     }
-
 }
diff --git a/capa-spi-aws-mesh/src/main/java/group/rxcloud/capa/spi/aws/mesh/http/serializer/BaijiSSJsonObjectSerializer.java b/capa-spi-aws-mesh/src/main/java/group/rxcloud/capa/spi/aws/mesh/http/serializer/BaijiSSJsonObjectSerializer.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package group.rxcloud.capa.spi.aws.mesh.http.serialzer;
+package group.rxcloud.capa.spi.aws.mesh.http.serializer;
 
-import group.rxcloud.capa.addons.serialzer.CapaSerialzer;
-import group.rxcloud.capa.addons.serialzer.ssjson.SSJsonSerializer;
+import group.rxcloud.capa.addons.serializer.CapaSerialzer;
+import group.rxcloud.capa.addons.serializer.ssjson.SSJsonSerializer;
 import group.rxcloud.capa.infrastructure.serializer.CapaObjectSerializer;
 import group.rxcloud.cloudruntimes.utils.TypeRef;
 
@@ -28,7 +28,7 @@
 /**
  * Serializes and deserializes the object with baiji.
  */
-public class BaijiSSJsonObjectSerialzer implements CapaObjectSerializer {
+public class BaijiSSJsonObjectSerializer implements CapaObjectSerializer {
 
     private static final SSJsonSerializer SERIALIZER = CapaSerialzer.ssJsonSerializer;
 
@@ -62,7 +62,6 @@ public <T> T deserialize(byte[] data, TypeRef<T> type) throws IOException {
         return (T) deserialize;
     }
 
-
     /**
      * Returns the content type of the request.
      *
@@ -72,5 +71,4 @@ public <T> T deserialize(byte[] data, TypeRef<T> type) throws IOException {
     public String getContentType() {
         return "application/bjjson";
     }
-
 }
diff --git a/capa-spi-aws-mesh/src/test/java/group/rxcloud/capa/spi/aws/mesh/http/AwsCapaSerialzerProviderTest.java b/capa-spi-aws-mesh/src/test/java/group/rxcloud/capa/spi/aws/mesh/http/AwsCapaSerialzerProviderTest.java
@@ -18,15 +18,15 @@
 
 
 import group.rxcloud.capa.infrastructure.serializer.CapaObjectSerializer;
-import group.rxcloud.capa.spi.aws.mesh.http.serialzer.AwsCapaSerialzerProvider;
+import group.rxcloud.capa.spi.aws.mesh.http.serializer.AwsCapaSerializerProvider;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 public class AwsCapaSerialzerProviderTest {
 
     @Test
     public void testGetSerializerOrDefault_Success() {
-        CapaObjectSerializer serializerOrDefault = AwsCapaSerialzerProvider.getSerializerOrDefault(null);
+        CapaObjectSerializer serializerOrDefault = AwsCapaSerializerProvider.getSerializerOrDefault(null);
         Assertions.assertEquals("application/bjjson", serializerOrDefault.getContentType());
     }
 
diff --git a/capa-spi-aws/pom.xml b/capa-spi-aws/pom.xml
@@ -39,6 +39,7 @@
             <groupId>group.rxcloud</groupId>
             <artifactId>capa-spi-aws-config</artifactId>
         </dependency>
+
         <!-- unit test -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
diff --git a/pom.xml b/pom.xml
@@ -80,7 +80,7 @@
         <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>
-        <revision>1.0.1-SNAPSHOT</revision>
+        <revision>1.0.1.RELEASE</revision>
     </properties>
 
     <dependencyManagement>
@@ -93,6 +93,11 @@
             </dependency>
 
             <!-- SDK modules -->
+            <dependency>
+                <groupId>group.rxcloud</groupId>
+                <artifactId>capa-spi-aws</artifactId>
+                <version>${revision}</version>
+            </dependency>
             <dependency>
                 <groupId>group.rxcloud</groupId>
                 <artifactId>capa-spi-aws-infrastructure</artifactId>
