Bug 490

cola-components/cola-component-extension-starter/src/main/java/com/alibaba/cola/extension/register/AbstractComponentExecutor.java

@@ -3,6 +3,10 @@
 import com.alibaba.cola.extension.BizScenario;
 import com.alibaba.cola.extension.ExtensionCoordinate;
 
+import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ForkJoinPool;
 import java.util.function.Consumer;
 import java.util.function.Function;
 
@@ -31,6 +35,26 @@ public <R, T> R execute(ExtensionCoordinate extensionCoordinate, Function<T, R>
         return execute((Class<T>) extensionCoordinate.getExtensionPointClass(), extensionCoordinate.getBizScenario(), exeFunction);
     }
 
+    public <R, T> CompletableFuture<R> executeAsync(Class<T> targetClz, BizScenario bizScenario, Function<T, R> exeFunction) {
+        return executeAsync(targetClz, bizScenario, exeFunction, null);
+    }
+
+    /**
+     * the async execute api. if the param {executor} is null, will use forkJoin pool
+     * other similar.
+     */
+    public <R, T> CompletableFuture<R> executeAsync(Class<T> targetClz, BizScenario bizScenario, Function<T, R> exeFunction, Executor executor) {
+        return CompletableFuture.supplyAsync(() -> execute(targetClz, bizScenario, exeFunction), Objects.nonNull(executor) ? executor : ForkJoinPool.commonPool());
+    }
+
+    public <R, T> CompletableFuture<R> executeAsync(ExtensionCoordinate extensionCoordinate, Function<T, R> exeFunction) {
+        return executeAsync(extensionCoordinate, exeFunction, null);
+    }
+
+    public <R, T> CompletableFuture<R> executeAsync(ExtensionCoordinate extensionCoordinate, Function<T, R> exeFunction, Executor executor) {
+        return CompletableFuture.supplyAsync(() -> execute(extensionCoordinate, exeFunction), Objects.nonNull(executor) ? executor : ForkJoinPool.commonPool());
+    }
+
     /**
      * Execute extension without Response
      *
@@ -48,5 +72,21 @@ public <T> void executeVoid(ExtensionCoordinate extensionCoordinate, Consumer<T>
         executeVoid(extensionCoordinate.getExtensionPointClass(), extensionCoordinate.getBizScenario(), exeFunction);
     }
 
+    public <T> void executeVoidAsync(Class<T> targetClz, BizScenario context, Consumer<T> exeFunction) {
+        executeVoidAsync(targetClz, context, exeFunction, null);
+    }
+
+    public <T> void executeVoidAsync(Class<T> targetClz, BizScenario context, Consumer<T> exeFunction, Executor executor) {
+        CompletableFuture.runAsync(() -> executeVoid(targetClz, context, exeFunction), Objects.nonNull(executor) ? executor : ForkJoinPool.commonPool());
+    }
+
+    public <T> void executeVoidAsync(ExtensionCoordinate extensionCoordinate, Consumer<T> exeFunction) {
+        executeVoidAsync(extensionCoordinate, exeFunction, null);
+    }
+
+    public <T> void executeVoidAsync(ExtensionCoordinate extensionCoordinate, Consumer<T> exeFunction, Executor executor) {
+        CompletableFuture.runAsync(() -> executeVoid(extensionCoordinate, exeFunction), Objects.nonNull(executor) ? executor : ForkJoinPool.commonPool());
+    }
+
     protected abstract <C> C locateComponent(Class<C> targetClz, BizScenario context);
 }

cola-components/cola-component-extension-starter/src/main/java/com/alibaba/cola/extension/register/ExtensionBootstrap.java

@@ -3,6 +3,7 @@
 import com.alibaba.cola.extension.Extension;
 import com.alibaba.cola.extension.ExtensionPointI;
 import com.alibaba.cola.extension.Extensions;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
@@ -18,6 +19,7 @@
  * @author Frank Zhang
  * @date 2020-06-18 7:55 PM
  */
+@Slf4j
 @Component
 public class ExtensionBootstrap implements ApplicationContextAware {
 
@@ -28,14 +30,16 @@ public class ExtensionBootstrap implements ApplicationContextAware {
 
     @PostConstruct
     public void init(){
-        Map<String, Object> extensionBeans = applicationContext.getBeansWithAnnotation(Extension.class);
-        extensionBeans.values().forEach(
-                extension -> extensionRegister.doRegistration((ExtensionPointI) extension)
-        );
-
-        // handle @Extensions annotation
-        Map<String, Object> extensionsBeans = applicationContext.getBeansWithAnnotation(Extensions.class);
-        extensionsBeans.values().forEach( extension -> extensionRegister.doRegistrationExtensions((ExtensionPointI) extension));
+        Map<String, ExtensionPointI> extMap = applicationContext.getBeansOfType(ExtensionPointI.class);
+        for (ExtensionPointI ext : extMap.values()) {
+            if (ext.getClass().isAnnotationPresent(Extension.class)) {
+                extensionRegister.doRegistration(ext);
+            }else if (ext.getClass().isAnnotationPresent(Extensions.class)){
+                extensionRegister.doRegistrationExtensions(ext);
+            }else {
+                log.error("There is no annotation for @Extension or @Extension on this extension class:{}" , ext.getClass());
+            }
+        }
     }
 
     @Override

cola-components/cola-component-statemachine/pom.xml

@@ -8,6 +8,7 @@
     </parent>
 
     <artifactId>cola-component-statemachine</artifactId>
+    <version>4.4.1-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>