modify configuration to avoid circular dependency

Author: s-yonkov-yonkov

multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/FlowableConfiguration.java

@@ -43,12 +43,12 @@ public class FlowableConfiguration {
 
     @Bean
     @DependsOn("liquibaseChangelog")
-    public ProcessEngine processEngine(ApplicationContext applicationContext, SpringProcessEngineConfiguration processEngineConfiguration)
-        throws Exception {
-        ProcessEngineFactoryBean processEngineFactoryBean = new ProcessEngineFactoryBean();
-        processEngineFactoryBean.setApplicationContext(applicationContext);
-        processEngineFactoryBean.setProcessEngineConfiguration(processEngineConfiguration);
-        return processEngineFactoryBean.getObject();
+    public ProcessEngineFactoryBean processEngine(ApplicationContext applicationContext,
+                                                  SpringProcessEngineConfiguration processEngineConfiguration) {
+        ProcessEngineFactoryBean factory = new ProcessEngineFactoryBean();
+        factory.setApplicationContext(applicationContext);
+        factory.setProcessEngineConfiguration(processEngineConfiguration);
+        return factory;
     }
 
     @Bean
@@ -122,14 +122,4 @@ public String jobExecutorId(ApplicationConfiguration applicationConfiguration) {
     private String buildJobExecutorId(String applicationId, int applicationInstanceIndex) {
         return String.format(JOB_EXECUTOR_ID_TEMPLATE, applicationId, applicationInstanceIndex, randomIdGenerator.get());
     }
-
-    @Bean
-    public RuntimeService runtimeService(ProcessEngine processEngine) {
-        return processEngine.getRuntimeService();
-    }
-
-    @Bean
-    public HistoryService historyService(ProcessEngine processEngine) {
-        return processEngine.getHistoryService();
-    }
 }

multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/FlowableServicesConfiguration.java

@@ -0,0 +1,28 @@
+package org.cloudfoundry.multiapps.controller.web.configuration;
+
+import org.flowable.engine.ProcessEngine;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.DependsOn;
+import org.springframework.context.annotation.Lazy;
+
+@Configuration
+public class FlowableServicesConfiguration {
+
+    // Mark as @Lazy and @DependsOn to ensure 'processEngine' is produced first,
+    // and service beans only resolve when actually needed.
+
+    @Bean
+    @Lazy
+    @DependsOn("processEngine")
+    public org.flowable.engine.RuntimeService runtimeService(ProcessEngine processEngine) {
+        return processEngine.getRuntimeService();
+    }
+
+    @Bean
+    @Lazy
+    @DependsOn("processEngine")
+    public org.flowable.engine.HistoryService historyService(ProcessEngine processEngine) {
+        return processEngine.getHistoryService();
+    }
+}