release: release 1.0.4.RELEASE version

Author: kevinten10

capa-spi-aws-config/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>capa-aws-parent</artifactId>
         <groupId>group.rxcloud</groupId>
-        <version>1.0.4-alpha-2</version>
+        <version>1.0.4.RELEASE</version>
     </parent>
 
     <artifactId>capa-spi-aws-config</artifactId>

capa-spi-aws-infrastructure/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>capa-aws-parent</artifactId>
         <groupId>group.rxcloud</groupId>
-        <version>1.0.4-alpha-2</version>
+        <version>1.0.4.RELEASE</version>
     </parent>
 
     <artifactId>capa-spi-aws-infrastructure</artifactId>

capa-spi-aws-mesh/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>capa-aws-parent</artifactId>
         <groupId>group.rxcloud</groupId>
-        <version>1.0.4-alpha-2</version>
+        <version>1.0.4.RELEASE</version>
     </parent>
 
     <artifactId>capa-spi-aws-mesh</artifactId>

capa-spi-aws-mesh/src/main/java/group/rxcloud/capa/spi/aws/mesh/http/AwsCapaHttp.java

@@ -25,6 +25,7 @@
 import group.rxcloud.capa.spi.aws.mesh.http.serializer.AwsCapaSerializerProvider;
 import group.rxcloud.capa.spi.http.CapaSerializeHttpSpi;
 import group.rxcloud.capa.spi.http.config.RpcServiceOptions;
+import group.rxcloud.cloudruntimes.domain.core.invocation.HttpExtension;
 import group.rxcloud.cloudruntimes.utils.TypeRef;
 import okhttp3.Headers;
 import okhttp3.OkHttpClient;
@@ -34,6 +35,7 @@
 import org.slf4j.LoggerFactory;
 import software.amazon.awssdk.utils.StringUtils;
 
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
@@ -54,15 +56,25 @@ public AwsCapaHttp(OkHttpClient httpClient, CapaObjectSerializer objectSerialize
     }
 
     @Override
-    protected <T> CompletableFuture<HttpResponse<T>> invokeSpiApi(String appId,
-                                                                  String method,
-                                                                  Object requestData,
-                                                                  Map<String, String> headers,
-                                                                  TypeRef<T> type,
-                                                                  RpcServiceOptions rpcServiceOptions) {
+    protected <T> CompletableFuture<HttpResponse<T>> invokeSpiApi(
+            String appId,
+            String method,
+            Object requestData,
+            String httpMethod,
+            Map<String, String> headers,
+            Map<String, List<String>> urlParameters,
+            TypeRef<T> type,
+            RpcServiceOptions rpcServiceOptions) {
         Objects.requireNonNull(rpcServiceOptions, "rpcServiceOptions");
         AwsToAwsHttpServiceMeshInvoker awsToAwsHttpServiceMeshInvoker = new AwsToAwsHttpServiceMeshInvoker();
-        return awsToAwsHttpServiceMeshInvoker.doInvokeSpiApi(appId, method, requestData, headers, type, (AwsRpcServiceOptions) rpcServiceOptions);
+        return awsToAwsHttpServiceMeshInvoker.doInvokeSpiApi(
+                appId,
+                method,
+                requestData,
+                httpMethod,
+                headers, urlParameters,
+                type,
+                (AwsRpcServiceOptions) rpcServiceOptions);
     }
 
     private interface AwsHttpInvoker {
@@ -79,12 +91,15 @@ private interface AwsHttpInvoker {
          * @param rpcServiceOptions the rpc service options
          * @return the async completable future
          */
-        <T> CompletableFuture<HttpResponse<T>> doInvokeSpiApi(String appId,
-                                                              String method,
-                                                              Object requestData,
-                                                              Map<String, String> headers,
-                                                              TypeRef<T> type,
-                                                              AwsRpcServiceOptions rpcServiceOptions);
+        <T> CompletableFuture<HttpResponse<T>> doInvokeSpiApi(
+                String appId,
+                String method,
+                Object requestData,
+                String httpMethod,
+                Map<String, String> headers,
+                Map<String, List<String>> urlParameters,
+                TypeRef<T> type,
+                AwsRpcServiceOptions rpcServiceOptions);
     }
 
     /**
@@ -98,12 +113,15 @@ private class AwsToAwsHttpServiceMeshInvoker implements AwsHttpInvoker {
         private static final String POST = "POST";
 
         @Override
-        public <T> CompletableFuture<HttpResponse<T>> doInvokeSpiApi(String appId,
-                                                                     String method,
-                                                                     Object requestData,
-                                                                     Map<String, String> headers,
-                                                                     TypeRef<T> type,
-                                                                     AwsRpcServiceOptions rpcServiceOptions) {
+        public <T> CompletableFuture<HttpResponse<T>> doInvokeSpiApi(
+                String appId,
+                String method,
+                Object requestData,
+                String httpMethod,
+                Map<String, String> headers,
+                Map<String, List<String>> urlParameters,
+                TypeRef<T> type,
+                AwsRpcServiceOptions rpcServiceOptions) {
             AwsRpcServiceOptions.AwsToAwsServiceOptions awsToAwsServiceOptions = rpcServiceOptions.getAwsToAwsServiceOptions();
             final String serviceId = awsToAwsServiceOptions.getServiceId();
             if (StringUtils.isBlank(serviceId)) {
@@ -114,25 +132,50 @@ public <T> CompletableFuture<HttpResponse<T>> doInvokeSpiApi(String appId,
             final int servicePort = awsToAwsServiceOptions.getServicePort();
             final String namespace = awsToAwsServiceOptions.getNamespace();
 
-            return doAsyncInvoke(method, requestData, headers, type, serviceId, namespace, servicePort);
+            if (httpMethod == null) {
+                httpMethod = POST;
+            }
+
+            return doAsyncInvoke(
+                    method,
+                    requestData,
+                    httpMethod,
+                    headers,
+                    urlParameters,
+                    type,
+                    serviceId,
+                    namespace,
+                    servicePort);
         }
 
-        private <T> CompletableFuture<HttpResponse<T>> doAsyncInvoke(String method,
-                                                                     Object requestData,
-                                                                     Map<String, String> headers,
-                                                                     TypeRef<T> type,
-                                                                     String serviceId,
-                                                                     String namespace,
-                                                                     int servicePort) {
+        private <T> CompletableFuture<HttpResponse<T>> doAsyncInvoke(
+                String method,
+                Object requestData,
+                String httpMethod,
+                Map<String, String> headers,
+                Map<String, List<String>> urlParameters,
+                TypeRef<T> type,
+                String serviceId,
+                String namespace,
+                int servicePort) {
             // generate app mesh http url
             final String appMeshHttpUrl = AwsCapaRpcProperties.AppMeshProperties.Settings.getRpcAwsAppMeshTemplate()
                     .replace("{serviceId}", serviceId)
                     .replace("{namespace}", namespace)
                     .replace("{servicePort}", String.valueOf(servicePort))
                     .replace("{operation}", method);
 
+            if (HttpExtension.GET.getMethod().toString().equals(httpMethod)) {
+                // TODO: 2021/11/30 append urlParameters to url
+            }
+
             // async invoke
-            CompletableFuture<HttpResponse<T>> asyncInvoke0 = post(appMeshHttpUrl, requestData, headers, type);
+            CompletableFuture<HttpResponse<T>> asyncInvoke0 = invokeHttp(
+                    appMeshHttpUrl,
+                    requestData,
+                    httpMethod,
+                    headers,
+                    type);
             asyncInvoke0.exceptionally(throwable -> {
                 if (logger.isWarnEnabled()) {
                     logger.warn("[AwsCapaHttp] async invoke error", throwable);
@@ -142,10 +185,12 @@ private <T> CompletableFuture<HttpResponse<T>> doAsyncInvoke(String method,
             return asyncInvoke0;
         }
 
-        private <T> CompletableFuture<HttpResponse<T>> post(String url,
-                                                            Object requestData,
-                                                            Map<String, String> headers,
-                                                            TypeRef<T> type) {
+        private <T> CompletableFuture<HttpResponse<T>> invokeHttp(
+                String url,
+                Object requestData,
+                String httpMethod,
+                Map<String, String> headers,
+                TypeRef<T> type) {
             // generate http request body
             RequestBody body = getRequestBodyWithSerialize(requestData, headers);
             Headers header = getRequestHeaderWithParams(headers);
@@ -154,7 +199,7 @@ private <T> CompletableFuture<HttpResponse<T>> post(String url,
             Request request = new Request.Builder()
                     .url(url)
                     .headers(header)
-                    .method(POST, body)
+                    .method(httpMethod, body)
                     .build();
 
             return doAsyncInvoke0(request, type);

capa-spi-aws-mesh/src/main/java/group/rxcloud/capa/spi/aws/mesh/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.mesh;

capa-spi-aws-mesh/src/test/java/group/rxcloud/capa/spi/aws/mesh/http/AwsCapaHttpTest.java

@@ -55,6 +55,8 @@ public void testInvokeSpiApi_Success() {
         CompletableFuture<HttpResponse<String>> responseCompletableFuture = awsCapaHttp.invokeSpiApi("appId",
                 "method",
                 "requestData",
+                "POST",
+                new HashMap<>(),
                 new HashMap<>(),
                 TypeRef.STRING,
                 awsRpcServiceOptions);
@@ -71,6 +73,8 @@ public void testInvokeSpiApi_FailWhenServiceIdIsNull() {
             awsCapaHttp.invokeSpiApi("appId",
                     "method",
                     "requestData",
+                    "POST",
+                    new HashMap<>(),
                     new HashMap<>(),
                     TypeRef.STRING,
                     awsRpcServiceOptions);

pom.xml

@@ -23,7 +23,7 @@
     <groupId>group.rxcloud</groupId>
     <artifactId>capa-aws-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.4-alpha-2</version>
+    <version>1.0.4.RELEASE</version>
     <name>capa-aws-parent</name>
     <description>AWS for Capa.</description>
     <url>https://github.com/reactivegroup</url>
@@ -73,7 +73,7 @@
         <java.version>8</java.version>
         <file.encoding>UTF-8</file.encoding>
         <maven.version>3.8.1</maven.version>
-        <capa.version>1.0.7-beta-3</capa.version>
+        <capa.version>1.0.7.RELEASE</capa.version>
         <aws-sdk.version>2.17.40</aws-sdk.version>
         <junit.version>5.3.1</junit.version>
         <mockito-core.version>3.6.0</mockito-core.version>
@@ -101,22 +101,22 @@
             <dependency>
                 <groupId>group.rxcloud</groupId>
                 <artifactId>capa-spi-aws</artifactId>
-                <version>1.0.4-alpha-2</version>
+                <version>1.0.4.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>group.rxcloud</groupId>
                 <artifactId>capa-spi-aws-infrastructure</artifactId>
-                <version>1.0.4-alpha-2</version>
+                <version>1.0.4.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>group.rxcloud</groupId>
                 <artifactId>capa-spi-aws-mesh</artifactId>
-                <version>1.0.4-alpha-2</version>
+                <version>1.0.4.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>group.rxcloud</groupId>
                 <artifactId>capa-spi-aws-config</artifactId>
-                <version>1.0.4-alpha-2</version>
+                <version>1.0.4.RELEASE</version>
             </dependency>
 
             <dependency>