Fix configuration not supplying for Beans

EternalCodeTeam · Jan 23, 2025 · 1442f68 · 1442f68
1 parent 65ca9cd
commit 1442f68
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/EternalCore.java b/eternalcore-core/src/main/java/com/eternalcode/core/EternalCore.java
@@ -1,6 +1,8 @@
 package com.eternalcode.core;
 
 import com.eternalcode.core.compatibility.CompatibilityService;
+import com.eternalcode.core.configuration.ReloadableConfig;
+import com.eternalcode.core.configuration.compatibility.ConfigurationCompatibilityV21_2;
 import com.eternalcode.core.injector.DependencyInjector;
 import com.eternalcode.core.injector.annotations.component.Component;
 import com.eternalcode.core.injector.annotations.component.ConfigurationFile;
@@ -78,6 +80,8 @@ public EternalCore(Plugin plugin) {
             beanFactory.addCandidate(beanCandidate);
         }
 
+        beanFactory.initializeCandidates(ConfigurationCompatibilityV21_2.class); // TODO: Remove this when the cdn will be fixed
+        beanFactory.initializeCandidates(ReloadableConfig.class); // TODO: Remove this when the cdn will be fixed
         beanFactory.initializeCandidates();
 
         this.publisher = beanFactory.getDependency(Publisher.class);

diff --git a/...ava/com/eternalcode/core/configuration/compatibility/ConfigurationCompatibilityV21_2.java b/...ava/com/eternalcode/core/configuration/compatibility/ConfigurationCompatibilityV21_2.java
@@ -7,9 +7,10 @@
 import com.eternalcode.core.injector.annotations.component.Controller;
 import com.eternalcode.core.publish.Subscribe;
 
+// TODO: Make this package private
 @Controller
 @Compatibility(from = @Version(minor = 21, patch = 2))
-class ConfigurationCompatibilityV21_2 {
+public class ConfigurationCompatibilityV21_2 {
 
     @Subscribe
     void onConfigSettingsSetup(ConfigurationSettingsSetupEvent event) {

diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/injector/bean/LazyBeanCandidate.java b/eternalcore-core/src/main/java/com/eternalcode/core/injector/bean/LazyBeanCandidate.java
@@ -15,9 +15,7 @@ public LazyBeanCandidate(String name, Supplier<Object> instanceSupplier) {
 
     @Override
     public boolean isCandidate(Class<?> clazz) {
-        Class<?> type = this.getInstance().getClass();
-
-        return clazz.isAssignableFrom(type);
+        return clazz.isAssignableFrom(getType());
     }
 
     @Override

diff --git a/...nalcore-core/src/main/java/com/eternalcode/core/injector/bean/LazyFieldBeanCandidate.java b/...nalcore-core/src/main/java/com/eternalcode/core/injector/bean/LazyFieldBeanCandidate.java
@@ -28,7 +28,7 @@ public LazyFieldBeanCandidate(Supplier<Object> instance, Field field, Bean bean)
     }
 
     public LazyFieldBeanCandidate(DependencyInjector dependencyInjector, Class<?> componentClass, Field field, Bean bean) {
-        this(() -> dependencyInjector.newInstance(componentClass), field, bean);
+        this(() -> dependencyInjector.getDependencyProvider().getDependency(componentClass), field, bean);
     }
 
     @Override