Merge pull request #49 from reactivegroup/refactor/classLoader

refactor: refactor spi class loader

Author: kevinten10

sdk-component/src/main/java/group/rxcloud/capa/component/configstore/CapaConfigStoreBuilder.java

@@ -17,14 +17,10 @@
 package group.rxcloud.capa.component.configstore;
 
 
-import group.rxcloud.capa.infrastructure.config.CapaProperties;
+import group.rxcloud.capa.infrastructure.CapaClassLoader;
 import group.rxcloud.capa.infrastructure.serializer.CapaObjectSerializer;
 import group.rxcloud.capa.infrastructure.serializer.DefaultObjectSerializer;
 
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Properties;
-
 /**
  * A builder for the {@link CapaConfigStore} implementor.
  */
@@ -86,15 +82,10 @@ public CapaConfigStore build() {
      */
     private CapaConfigStore buildCapaConfigStore() {
         // load spi capa config store impl
-        try {
-            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);
-            Object newInstance = constructor.newInstance(this.objectSerializer);
-            return (CapaConfigStore) newInstance;
-        } catch (ClassNotFoundException | NoSuchMethodException | InvocationTargetException | InstantiationException | IllegalAccessException e) {
-            throw new IllegalArgumentException("No CapaConfigStore Client supported.");
-        }
+        return CapaClassLoader.loadComponentClassObj(
+                "configuration",
+                CapaConfigStore.class,
+                new Class[]{CapaObjectSerializer.class},
+                new Object[]{this.objectSerializer});
     }
 }

sdk-component/src/main/java/group/rxcloud/capa/component/http/CapaHttpBuilder.java

@@ -17,15 +17,13 @@
 package group.rxcloud.capa.component.http;
 
 
-import group.rxcloud.capa.infrastructure.config.CapaProperties;
+import group.rxcloud.capa.infrastructure.CapaClassLoader;
+import group.rxcloud.capa.infrastructure.CapaProperties;
 import group.rxcloud.capa.infrastructure.serializer.CapaObjectSerializer;
 import group.rxcloud.capa.infrastructure.serializer.DefaultObjectSerializer;
 import okhttp3.OkHttpClient;
 
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
 import java.time.Duration;
-import java.util.Properties;
 import java.util.concurrent.atomic.AtomicReference;
 
 /**
@@ -107,15 +105,10 @@ private CapaHttp buildCapaHttp() {
         }
 
         // load spi capa http impl
-        try {
-            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);
-            Object newInstance = constructor.newInstance(OK_HTTP_CLIENT.get(), this.objectSerializer);
-            return (CapaHttp) newInstance;
-        } catch (ClassNotFoundException | NoSuchMethodException | InvocationTargetException | InstantiationException | IllegalAccessException e) {
-            throw new IllegalArgumentException("No CapaHttp Client supported.");
-        }
+        return CapaClassLoader.loadComponentClassObj(
+                "rpc",
+                CapaHttp.class,
+                new Class[]{OkHttpClient.class, CapaObjectSerializer.class},
+                new Object[]{OK_HTTP_CLIENT.get(), this.objectSerializer});
     }
 }

sdk-component/src/main/java/group/rxcloud/capa/component/pubsub/CapaPubSubBuilder.java

@@ -16,11 +16,7 @@
  */
 package group.rxcloud.capa.component.pubsub;
 
-import group.rxcloud.capa.infrastructure.config.CapaProperties;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Properties;
+import group.rxcloud.capa.infrastructure.CapaClassLoader;
 
 /**
  * A builder for the {@link CapaPubSub} implementor.
@@ -56,15 +52,6 @@ public CapaPubSub build() {
      * @return Instance of {@link CapaPubSub} implementor
      */
     private CapaPubSub buildCapaPubSub() {
-        try {
-            Properties properties = CapaProperties.COMPONENT_PROPERTIES_SUPPLIER.apply("pubsub");
-            String capaPubSubClassPath = properties.getProperty(CapaPubSub.class.getName());
-            Class<? extends CapaPubSub> aClass = (Class<? extends CapaPubSub>) Class.forName(capaPubSubClassPath);
-            Constructor<? extends CapaPubSub> constructor = aClass.getConstructor();
-            Object newInstance = constructor.newInstance();
-            return (CapaPubSub) newInstance;
-        } catch (ClassNotFoundException | NoSuchMethodException | InvocationTargetException | InstantiationException | IllegalAccessException e) {
-            throw new IllegalArgumentException("No CapaPubSub Client supported.");
-        }
+        return CapaClassLoader.loadComponentClassObj("pubsub", CapaPubSub.class);
     }
 }

sdk-component/src/main/java/group/rxcloud/capa/component/state/Store.java

@@ -0,0 +1,2 @@
+# configuration component
+group.rxcloud.capa.component.configstore.CapaConfigStore=your-spi-class-path

sdk-component/src/main/resources/capa-component-configuration.properties

@@ -0,0 +1,2 @@
+# pubsub component
+group.rxcloud.capa.component.pubsub.CapaPubSub=your-spi-class-path

sdk-component/src/main/resources/capa-component-pubsub.properties

@@ -0,0 +1,2 @@
+# rpc component
+group.rxcloud.capa.component.http.CapaHttp=your-spi-class-path

sdk-component/src/main/resources/capa-component-rpc.properties

@@ -46,5 +46,4 @@ public void testStoreConfigSetterGetter_Success() {
 
         Assertions.assertEquals("30000", storeConfig.getTimeOut());
     }
-
 }

sdk-component/src/test/java/group/rxcloud/capa/component/configstore/StoreConfigTest.java

@@ -27,6 +27,7 @@
  * @date 2021/10/19
  */
 public class SubscribeReqTest {
+
     @Test
     public void testSubscribeReqSetterGetter_Success() {
         SubscribeReq req = new SubscribeReq();

sdk-component/src/test/java/group/rxcloud/capa/component/configstore/SubscribeReqTest.java

@@ -25,6 +25,7 @@
  * @date 2021/10/19
  */
 public class SubscribeRespTest {
+
     @Test
     public void testSubscribeRespSetterGetter_Success() {
         SubscribeResp<String> resp = new SubscribeResp<>();