bugfix: #490

alibaba · May 6, 2024 · 9532cb5 · 9532cb5
1 parent 1a8c433
commit 9532cb5
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/...tension-starter/src/main/java/com/alibaba/cola/extension/register/ExtensionBootstrap.java b/...tension-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