attempt to improve bean order initialization in task modules

Evolveum · Oct 12, 2023 · 35c99ea · 35c99ea
1 parent a1d40e9
commit 35c99ea
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/...uartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/quartz/LocalScheduler.java b/...uartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/quartz/LocalScheduler.java
@@ -13,6 +13,7 @@
 import org.jetbrains.annotations.Nullable;
 import org.quartz.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.DependsOn;
 import org.springframework.stereotype.Component;
 
 import com.evolveum.midpoint.schema.result.OperationResult;
@@ -37,6 +38,7 @@
  * - SHOULD NOT update task objects themselves.
  * - Even it SHOULD NOT query task state. All of this has to be done by callers.
  */
+@DependsOn("quartzInitializationHelper")
 @Component
 public class LocalScheduler {
 

diff --git a/...rc/main/java/com/evolveum/midpoint/task/quartzimpl/quartz/QuartzInitializationHelper.java b/...rc/main/java/com/evolveum/midpoint/task/quartzimpl/quartz/QuartzInitializationHelper.java
@@ -22,6 +22,7 @@
 import org.quartz.impl.StdSchedulerFactory;
 import org.quartz.listeners.SchedulerListenerSupport;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.DependsOn;
 import org.springframework.stereotype.Component;
 
 import com.evolveum.midpoint.schema.result.OperationResult;
@@ -36,6 +37,7 @@
 /**
  * Helps with Quartz starting and stopping.
  */
+@DependsOn("taskManagerConfiguration")
 @Component
 class QuartzInitializationHelper {