feat: add multi component support

kevinten10 · kevinten10 · commit fc6a2a1f7574 · 2021-11-30T18:56:38.000+08:00
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
@@ -81,6 +81,7 @@ public CapaConfigStore build() {
      * @return Instance of {@link CapaConfigStore} implementor
      */
     private CapaConfigStore buildCapaConfigStore() {
+        // TODO: 2021/11/30 build multi component
         // load spi capa config store impl
         return CapaClassLoader.loadComponentClassObj(
                 "configuration",
diff --git a/sdk-component/src/main/java/group/rxcloud/capa/component/pubsub/CapaPubSubBuilder.java b/sdk-component/src/main/java/group/rxcloud/capa/component/pubsub/CapaPubSubBuilder.java
@@ -52,6 +52,7 @@ public CapaPubSub build() {
      * @return Instance of {@link CapaPubSub} implementor
      */
     private CapaPubSub buildCapaPubSub() {
+        // TODO: 2021/11/30 build multi component
         return CapaClassLoader.loadComponentClassObj("pubsub", CapaPubSub.class);
     }
 }
diff --git a/sdk-infrastructure/src/main/java/group/rxcloud/capa/infrastructure/hook/ConfigurationHooks.java b/sdk-infrastructure/src/main/java/group/rxcloud/capa/infrastructure/hook/ConfigurationHooks.java
@@ -28,11 +28,15 @@
 import java.util.List;
 import java.util.Map;
 
+/**
+ * The Mixer configuration hooks.
+ */
 public interface ConfigurationHooks extends ConfigurationRuntimes {
 
-    String currentStoreName();
-
-    String currentAppId();
+    /**
+     * Registry Store Names.
+     */
+    List<String> registryStoreNames();
 
     @Override
     default <T> Mono<List<ConfigurationItem<T>>> getConfiguration(String storeName, String appId, List<String> keys, Map<String, String> metadata, TypeRef<T> type) {
diff --git a/sdk-infrastructure/src/main/java/group/rxcloud/capa/infrastructure/hook/TelemetryHooks.java b/sdk-infrastructure/src/main/java/group/rxcloud/capa/infrastructure/hook/TelemetryHooks.java
@@ -22,6 +22,9 @@
 import io.opentelemetry.context.propagation.ContextPropagators;
 import reactor.core.publisher.Mono;
 
+/**
+ * The Mixer telemetry hooks.
+ */
 public interface TelemetryHooks extends TelemetryRuntimes {
 
     @Override
diff --git a/sdk-spi-demo/src/main/java/group/rxcloud/capa/spi/demo/http/DemoCapaHttp.java b/sdk-spi-demo/src/main/java/group/rxcloud/capa/spi/demo/http/DemoCapaHttp.java
@@ -26,6 +26,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 
@@ -47,12 +48,15 @@ public DemoCapaHttp(OkHttpClient httpClient, CapaObjectSerializer objectSerializ
     }
 
     @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) {
         DemoRpcServiceOptions demoRpcServiceOptions = (DemoRpcServiceOptions) rpcServiceOptions;
         logger.info("[DemoCapaHttp.invokeSpiApi] rpcServiceOptions[{}]", demoRpcServiceOptions);
 
diff --git a/sdk-spi/src/main/java/group/rxcloud/capa/spi/http/CapaHttpSpi.java b/sdk-spi/src/main/java/group/rxcloud/capa/spi/http/CapaHttpSpi.java
@@ -22,7 +22,6 @@
 import group.rxcloud.capa.spi.http.config.CapaSpiOptionsLoader;
 import group.rxcloud.capa.spi.http.config.CapaSpiProperties;
 import group.rxcloud.capa.spi.http.config.RpcServiceOptions;
-import group.rxcloud.cloudruntimes.domain.core.invocation.HttpExtension;
 import group.rxcloud.cloudruntimes.utils.TypeRef;
 import okhttp3.OkHttpClient;
 import org.slf4j.Logger;
@@ -41,15 +40,18 @@ public abstract class CapaHttpSpi extends CapaHttp {
 
     private static final Logger logger = LoggerFactory.getLogger(CapaHttpSpi.class);
 
+    /**
+     * Instantiates a new Capa http spi.
+     *
+     * @param httpClient       the http client
+     * @param objectSerializer the object serializer
+     */
     public CapaHttpSpi(OkHttpClient httpClient, CapaObjectSerializer objectSerializer) {
         super(httpClient, objectSerializer);
     }
 
     /**
      * Templates, delegate to specific http invoker.
-     *
-     * @param httpMethod    Ignore, fix to POST. FIXME
-     * @param urlParameters Ignore, fix to EMPTY. FIXME
      */
     @Override
     protected <T> CompletableFuture<HttpResponse<T>> doInvokeApi(String httpMethod,
@@ -73,22 +75,6 @@ protected <T> CompletableFuture<HttpResponse<T>> doInvokeApi(String httpMethod,
                 logger.debug("[CapaHttpSpi] invoke rpc context[{}]", context);
             }
         }
-        // FIXME Ignore, fix to POST.
-        if (!HttpExtension.POST.getMethod().toString().equalsIgnoreCase(httpMethod)) {
-            if (logger.isWarnEnabled()) {
-                logger.warn("[CapaHttpSpi] invoke rpc httpMethod[{}] only support POST now.",
-                        httpMethod);
-            }
-            httpMethod = HttpExtension.POST.getMethod().toString();
-        }
-        // FIXME Ignore, fix to EMPTY.
-        if (urlParameters != null && !urlParameters.isEmpty()) {
-            if (logger.isWarnEnabled()) {
-                logger.warn("[CapaHttpSpi] invoke rpc urlParameters[{}] not supported now.",
-                        urlParameters);
-            }
-            urlParameters = null;
-        }
 
         // parse url path segments
         Objects.requireNonNull(pathSegments, "pathSegments");
@@ -112,7 +98,7 @@ protected <T> CompletableFuture<HttpResponse<T>> doInvokeApi(String httpMethod,
 
         // spi invoke
         CompletableFuture<HttpResponse<T>> invokeSpiApi =
-                invokeSpiApi(appId, method, requestData, headers, type, rpcServiceOptions);
+                invokeSpiApi(appId, method, requestData, httpMethod, headers, urlParameters, type, rpcServiceOptions);
         invokeSpiApi.whenComplete((tHttpResponse, throwable) -> {
             if (throwable != null) {
                 if (logger.isWarnEnabled()) {
@@ -141,6 +127,9 @@ protected <T> CompletableFuture<HttpResponse<T>> doInvokeApi(String httpMethod,
 
     /**
      * Override to get the configuration of the corresponding appId.
+     *
+     * @param appId the app id
+     * @return the rpc service options
      */
     protected RpcServiceOptions getRpcServiceOptions(String appId) {
         CapaSpiOptionsLoader capaSpiOptionsLoader = CapaSpiProperties.getSpiOptionsLoader();
@@ -154,15 +143,20 @@ protected RpcServiceOptions getRpcServiceOptions(String appId) {
      * @param appId             the app id
      * @param method            the invoke method
      * @param requestData       the request data
+     * @param httpMethod        the http method
      * @param headers           the headers
+     * @param urlParameters     the url parameters
      * @param type              the response type
      * @param rpcServiceOptions the rpc service options
      * @return the async completable future
      */
-    protected abstract <T> CompletableFuture<HttpResponse<T>> invokeSpiApi(String appId,
-                                                                           String method,
-                                                                           Object requestData,
-                                                                           Map<String, String> headers,
-                                                                           TypeRef<T> type,
-                                                                           RpcServiceOptions rpcServiceOptions);
+    protected abstract <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);
 }
diff --git a/sdk-spi/src/main/java/group/rxcloud/capa/spi/telemetry/CapaReadWriteSpanSpi.java b/sdk-spi/src/main/java/group/rxcloud/capa/spi/telemetry/CapaReadWriteSpanSpi.java
@@ -24,10 +24,8 @@
  */
 public abstract class CapaReadWriteSpanSpi extends CapaReadWriteSpan {
 
-
     public CapaReadWriteSpanSpi(String tracerName, String version, String schemaUrl,
                                 ReadWriteSpan span) {
         super(tracerName, version, schemaUrl, span);
     }
-
 }
diff --git a/sdk-spi/src/main/java/group/rxcloud/capa/spi/telemetry/CapaSpanBuilderSpi.java b/sdk-spi/src/main/java/group/rxcloud/capa/spi/telemetry/CapaSpanBuilderSpi.java
@@ -28,5 +28,4 @@ public CapaSpanBuilderSpi(String tracerName, String version, String schemaUrl, S
                               SpanBuilder spanBuilder) {
         super(tracerName, version, schemaUrl, spanName, spanBuilder);
     }
-
 }
diff --git a/sdk-spi/src/main/java/group/rxcloud/capa/spi/telemetry/CapaTracerBuilderSpi.java b/sdk-spi/src/main/java/group/rxcloud/capa/spi/telemetry/CapaTracerBuilderSpi.java
@@ -27,5 +27,4 @@ public abstract class CapaTracerBuilderSpi extends CapaTracerBuilder {
     public CapaTracerBuilderSpi(String tracerName, TracerBuilder builder) {
         super(tracerName, builder);
     }
-
 }
diff --git a/sdk-spi/src/main/java/group/rxcloud/capa/spi/telemetry/CapaTracerSpi.java b/sdk-spi/src/main/java/group/rxcloud/capa/spi/telemetry/CapaTracerSpi.java
@@ -27,5 +27,4 @@ public abstract class CapaTracerSpi extends CapaTracer {
     public CapaTracerSpi(String tracerName, String version, String schemaUrl, Tracer tracer) {
         super(tracerName, version, schemaUrl, tracer);
     }
-
 }
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
@@ -292,12 +292,15 @@ public TestCapaSerializeHttpSpi(OkHttpClient httpClient, CapaObjectSerializer ob
         }
 
         @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) {
             return CompletableFuture.supplyAsync(
                     () -> {
                         return new HttpResponse<>(null, null, 200);
diff --git a/sdk/src/main/java/group/rxcloud/capa/configuration/AbstractCapaConfigurationClient.java b/sdk/src/main/java/group/rxcloud/capa/configuration/AbstractCapaConfigurationClient.java
@@ -34,6 +34,8 @@
  */
 public abstract class AbstractCapaConfigurationClient implements CapaConfigurationClient {
 
+    protected List<String> registryNames;
+
     @Override
     public Mono<Void> saveConfiguration(SaveConfigurationRequest saveConfigurationRequest) {
         return Mono.error(new UnsupportedOperationException("unsupported save configuration"));
diff --git a/sdk/src/main/java/group/rxcloud/capa/configuration/CapaConfigurationClientStore.java b/sdk/src/main/java/group/rxcloud/capa/configuration/CapaConfigurationClientStore.java
@@ -28,6 +28,7 @@
 import reactor.core.publisher.Mono;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -50,11 +51,13 @@ public class CapaConfigurationClientStore extends AbstractCapaConfigurationClien
     public CapaConfigurationClientStore(List<CapaConfigStore> stores) {
         if (stores == null || stores.isEmpty()) {
             this.configStores = new HashMap<>(2, 1);
+            this.registryNames = Collections.emptyList();
         } else {
             this.configStores = stores.stream()
                     .collect(Collectors.toMap(
                             CapaConfigStore::getStoreName,
                             Function.identity()));
+            this.registryNames = new ArrayList<>(this.configStores.keySet());
         }
     }
 
diff --git a/sdk/src/main/java/group/rxcloud/capa/pubsub/AbstractCapaPubSubClient.java b/sdk/src/main/java/group/rxcloud/capa/pubsub/AbstractCapaPubSubClient.java
@@ -19,6 +19,7 @@
 import group.rxcloud.cloudruntimes.domain.core.pubsub.PublishEventRequest;
 import reactor.core.publisher.Mono;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -28,6 +29,8 @@
  */
 public abstract class AbstractCapaPubSubClient implements CapaPubSubClient {
 
+    protected List<String> registryNames;
+
     @Override
     public Mono<String> publishEvent(String pubsubName, String topicName, Object data) {
         PublishEventRequest publishEventRequest = new PublishEventRequest(pubsubName, topicName, data);
diff --git a/sdk/src/main/java/group/rxcloud/capa/pubsub/CapaPubSubClientPubSub.java b/sdk/src/main/java/group/rxcloud/capa/pubsub/CapaPubSubClientPubSub.java
@@ -22,6 +22,8 @@
 import group.rxcloud.cloudruntimes.domain.core.pubsub.PublishEventRequest;
 import reactor.core.publisher.Mono;
 
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -44,11 +46,13 @@ public class CapaPubSubClientPubSub extends AbstractCapaPubSubClient {
     public CapaPubSubClientPubSub(List<CapaPubSub> pubSubs) {
         if (pubSubs == null || pubSubs.isEmpty()) {
             this.pubSubs = new HashMap<>(2, 1);
+            this.registryNames = Collections.emptyList();
         } else {
             this.pubSubs = pubSubs.stream()
                     .collect(Collectors.toMap(
                             CapaPubSub::getPubSubName,
                             Function.identity()));
+            this.registryNames = new ArrayList<>(this.pubSubs.keySet());
         }
     }
 
diff --git a/sdk/src/main/java/group/rxcloud/capa/rpc/AbstractCapaRpcClient.java b/sdk/src/main/java/group/rxcloud/capa/rpc/AbstractCapaRpcClient.java
@@ -22,6 +22,7 @@
 import group.rxcloud.cloudruntimes.utils.TypeRef;
 import reactor.core.publisher.Mono;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -31,6 +32,8 @@
  */
 public abstract class AbstractCapaRpcClient implements CapaRpcClient {
 
+    protected List<String> registryNames;
+
     @Override
     public <T> Mono<T> invokeMethod(String appId, String methodName, Object request, HttpExtension httpExtension, Map<String, String> metadata, TypeRef<T> type) {
         InvokeMethodRequestBuilder builder = new InvokeMethodRequestBuilder(appId, methodName);
diff --git a/sdk/src/main/java/group/rxcloud/capa/rpc/CapaRpcClientHttp.java b/sdk/src/main/java/group/rxcloud/capa/rpc/CapaRpcClientHttp.java
@@ -23,6 +23,7 @@
 import group.rxcloud.cloudruntimes.utils.TypeRef;
 import reactor.core.publisher.Mono;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -41,6 +42,9 @@ public class CapaRpcClientHttp extends AbstractCapaRpcClient {
 
     public CapaRpcClientHttp(CapaHttp client) {
         this.client = client;
+
+        this.registryNames = new ArrayList<>(1);
+        this.registryNames.add("http");
     }
 
     @Override
diff --git a/sdk/src/main/java/group/rxcloud/capa/telemetry/CapaTelemetryClientGlobal.java b/sdk/src/main/java/group/rxcloud/capa/telemetry/CapaTelemetryClientGlobal.java
@@ -25,6 +25,9 @@
 import io.opentelemetry.context.propagation.ContextPropagators;
 import reactor.core.publisher.Mono;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class CapaTelemetryClientGlobal implements CapaTelemetryClient, OpenTelemetry {
 
     // noop as default.
@@ -52,7 +55,11 @@ static void set(CapaTelemetryClientGlobal capaTelemetryClient) {
         instance = capaTelemetryClient;
     }
 
-   CapaTelemetryClientGlobal() {
+    protected List<String> registryNames;
+
+    CapaTelemetryClientGlobal() {
+        this.registryNames = new ArrayList<>(1);
+        this.registryNames.add("opentelemetry");
     }
 
     @Override
@@ -106,31 +113,31 @@ public Mono<Tracer> buildTracer(String tracerName, String version) {
     public Mono<Tracer> buildTracer(String tracerName, String version, String schemaUrl) {
         return Mono.fromSupplier(() -> {
             return tracerProvider.tracerBuilder(tracerName).setInstrumentationVersion(version).setSchemaUrl(schemaUrl)
-                                 .build();
+                    .build();
         });
     }
 
     @Override
     public Mono<Meter> buildMeter(String meterName) {
         return Mono.fromSupplier(() -> {
             return meterProvider.meterBuilder(meterName)
-                                 .build();
+                    .build();
         });
     }
 
     @Override
     public Mono<Meter> buildMeter(String meterName, String version) {
         return Mono.fromSupplier(() -> {
             return meterProvider.meterBuilder(meterName).setInstrumentationVersion(version)
-                                 .build();
+                    .build();
         });
     }
 
     @Override
     public Mono<Meter> buildMeter(String meterName, String version, String schemaUrl) {
         return Mono.fromSupplier(() -> {
             return meterProvider.meterBuilder(meterName).setInstrumentationVersion(version).setSchemaUrl(schemaUrl)
-                                 .build();
+                    .build();
         });
     }
 

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ public CapaPubSub build() {`
`52`	`52`	`* @return Instance of {@link CapaPubSub} implementor`
`53`	`53`	`*/`
`54`	`54`	`private CapaPubSub buildCapaPubSub() {`
	`55`	`+ // TODO: 2021/11/30 build multi component`
`55`	`56`	`return CapaClassLoader.loadComponentClassObj("pubsub", CapaPubSub.class);`
`56`	`57`	`}`
`57`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,10 +24,8 @@`
`24`	`24`	`*/`
`25`	`25`	`public abstract class CapaReadWriteSpanSpi extends CapaReadWriteSpan {`
`26`	`26`
`27`		`-`
`28`	`27`	`public CapaReadWriteSpanSpi(String tracerName, String version, String schemaUrl,`
`29`	`28`	`ReadWriteSpan span) {`
`30`	`29`	`super(tracerName, version, schemaUrl, span);`
`31`	`30`	`}`
`32`		`-`
`33`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,5 +28,4 @@ public CapaSpanBuilderSpi(String tracerName, String version, String schemaUrl, S`
`28`	`28`	`SpanBuilder spanBuilder) {`
`29`	`29`	`super(tracerName, version, schemaUrl, spanName, spanBuilder);`
`30`	`30`	`}`
`31`		`-`
`32`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,5 +27,4 @@ public abstract class CapaTracerBuilderSpi extends CapaTracerBuilder {`
`27`	`27`	`public CapaTracerBuilderSpi(String tracerName, TracerBuilder builder) {`
`28`	`28`	`super(tracerName, builder);`
`29`	`29`	`}`
`30`		`-`
`31`	`30`	`}`