feat: add bean instances for easy access on dependency injection usage

ParsekDev · Mar 23, 2024 · 8e2ae68 · 8e2ae68
1 parent a4744bc
commit 8e2ae68
Showing 1 changed file with 20 additions and 14 deletions.
diff --git a/src/main/kotlin/co/statu/parsek/PluginFactory.kt b/src/main/kotlin/co/statu/parsek/PluginFactory.kt
@@ -16,32 +16,38 @@ class PluginFactory : DefaultPluginFactory() {
     }
 
     override fun createInstance(pluginClass: Class<*>, pluginWrapper: PluginWrapper): Plugin? {
-        val pluginBeanContext by lazy {
-            val pluginBeanContext = AnnotationConfigApplicationContext()
-
-            pluginBeanContext.parent = Main.applicationContext
-            pluginBeanContext.classLoader = pluginClass.classLoader
-            pluginBeanContext.scan(pluginClass.`package`.name)
-            pluginBeanContext.refresh()
-
-            pluginBeanContext
-        }
-
         try {
             val constructor = pluginClass.getConstructor()
 
             val plugin = constructor.newInstance() as ParsekPlugin
 
-            pluginEventManager.initializePlugin(plugin, pluginBeanContext)
-
             plugin.pluginId = pluginWrapper.pluginId
             plugin.vertx = vertx
             plugin.pluginEventManager = pluginEventManager
             plugin.environmentType = Main.ENVIRONMENT
             plugin.releaseStage = Main.STAGE
-            plugin.pluginBeanContext = pluginBeanContext
             plugin.applicationContext = Main.applicationContext
 
+            val pluginBeanContext by lazy {
+                val pluginBeanContext = AnnotationConfigApplicationContext()
+
+                pluginBeanContext.parent = Main.applicationContext
+                pluginBeanContext.classLoader = pluginClass.classLoader
+                pluginBeanContext.scan(pluginClass.`package`.name)
+
+                pluginBeanContext.beanFactory.registerSingleton(logger.javaClass.name, logger)
+                pluginBeanContext.beanFactory.registerSingleton(pluginEventManager.javaClass.name, pluginEventManager)
+                pluginBeanContext.beanFactory.registerSingleton(plugin.javaClass.name, plugin)
+
+                pluginBeanContext.refresh()
+
+                pluginBeanContext
+            }
+
+            plugin.pluginBeanContext = pluginBeanContext
+
+            pluginEventManager.initializePlugin(plugin, pluginBeanContext)
+
             runBlocking {
                 plugin.onLoad()
             }