Update spring and remove @Inject where @bean is present (#1762) LMCROSSITXSADEPLOY-3375

LMCROSSITXSADEPLOY-3375

Author: s-yonkov-yonkov

multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/auditlogging/AuditLogBean.java

@@ -2,7 +2,6 @@
 
 import javax.sql.DataSource;
 
-import jakarta.inject.Inject;
 import org.cloudfoundry.multiapps.controller.core.auditlogging.impl.AuditLoggingFacadeSLImpl;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -11,61 +10,51 @@
 public class AuditLogBean {
 
     @Bean
-    @Inject
     public AuditLoggingFacade buildAuditLoggingFacade(DataSource dataSource, UserInfoProvider userInfoProvider) {
         return new AuditLoggingFacadeSLImpl(dataSource, userInfoProvider);
     }
 
     @Bean
-    @Inject
     public CsrfTokenApiServiceAuditLog buildCsrfTokenApiServiceAuditLog(AuditLoggingFacade auditLoggingFacade) {
         return new CsrfTokenApiServiceAuditLog(auditLoggingFacade);
     }
 
     @Bean
-    @Inject
     public FilesApiServiceAuditLog buildFilesApiServiceAuditLog(AuditLoggingFacade auditLoggingFacade) {
         return new FilesApiServiceAuditLog(auditLoggingFacade);
     }
 
     @Bean
-    @Inject
     public LoginAttemptAuditLog buildLoginAttemptAuditLog(AuditLoggingFacade auditLoggingFacade) {
         return new LoginAttemptAuditLog(auditLoggingFacade);
     }
 
     @Bean
-    @Inject
     public InfoApiServiceAuditLog buildInfoApiServiceAuditLog(AuditLoggingFacade auditLoggingFacade) {
         return new InfoApiServiceAuditLog(auditLoggingFacade);
     }
 
     @Bean
-    @Inject
     public MtasApiServiceAuditLog buildMtasApiServiceAuditLog(AuditLoggingFacade auditLoggingFacade) {
         return new MtasApiServiceAuditLog(auditLoggingFacade);
     }
 
     @Bean
-    @Inject
     public OperationsApiServiceAuditLog buildOperationsApiServiceAuditLog(AuditLoggingFacade auditLoggingFacade) {
         return new OperationsApiServiceAuditLog(auditLoggingFacade);
     }
 
     @Bean
-    @Inject
     public MtaConfigurationPurgerAuditLog buildMtaConfigurationPurgerAuditLog(AuditLoggingFacade auditLoggingFacade) {
         return new MtaConfigurationPurgerAuditLog(auditLoggingFacade);
     }
 
     @Bean
-    @Inject
     public ConfigurationSubscriptionServiceAuditLog buildAConfigurationSubscriptionServiceAuditLog(AuditLoggingFacade auditLoggingFacade) {
         return new ConfigurationSubscriptionServiceAuditLog(auditLoggingFacade);
     }
 
     @Bean
-    @Inject
     public ConfigurationEntryServiceAuditLog buildAConfigurationEntryServiceAuditLog(AuditLoggingFacade auditLoggingFacade) {
         return new ConfigurationEntryServiceAuditLog(auditLoggingFacade);
     }

multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/flowable/FlowableFacade.java

@@ -30,8 +30,10 @@
 import org.flowable.variable.api.persistence.entity.VariableInstance;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.DependsOn;
 
 @Named
+@DependsOn("processEngine")
 public class FlowableFacade {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(FlowableFacade.class);

multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/jobs/LockOwnerReporter.java

@@ -15,9 +15,11 @@
 import org.flowable.engine.ProcessEngine;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.DependsOn;
 import org.springframework.scheduling.annotation.Scheduled;
 
 @Named
+@DependsOn("processEngine")
 public class LockOwnerReporter {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(LockOwnerReporter.class);

multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/util/LockOwnerReleaser.java

@@ -11,8 +11,10 @@
 import org.flowable.engine.impl.cmd.ClearProcessInstanceLockTimesCmd;
 import org.flowable.job.api.Job;
 import org.flowable.job.service.JobServiceConfiguration;
+import org.springframework.context.annotation.DependsOn;
 
 @Named("lockOwnerReleaser")
+@DependsOn("processEngine")
 public class LockOwnerReleaser {
 
     private final ProcessEngine processEngine;

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

@@ -2,7 +2,6 @@
 
 import javax.sql.DataSource;
 
-import jakarta.inject.Inject;
 import liquibase.integration.spring.SpringLiquibase;
 import org.cloudfoundry.multiapps.controller.core.util.ApplicationConfiguration;
 import org.cloudfoundry.multiapps.controller.persistence.DataSourceWithDialect;
@@ -26,7 +25,6 @@ public class DatabaseConfiguration {
     private static final String LIQUIBASE_CHANGELOG = "classpath:/org/cloudfoundry/multiapps/controller/persistence/db/changelog/db-changelog.xml";
     private static final String ENTITY_MANAGER_DEFAULT_PERSISTENCE_UNIT_NAME = "Default";
 
-    @Inject
     @Bean
     public CloudDataSourceFactoryBean dataSource(DataSourceFactory dataSourceFactory, EnvironmentServicesFinder vcapServiceFinder,
                                                  ApplicationConfiguration configuration) {
@@ -38,13 +36,11 @@ public DefaultDataSourceDialect dataSourceDialect() {
         return new DefaultDataSourceDialect();
     }
 
-    @Inject
     @Bean
     public DataSourceWithDialect dataSourceWithDialect(DataSource dataSource, DataSourceDialect dataSourceDialect) {
         return new DataSourceWithDialect(dataSource, dataSourceDialect);
     }
 
-    @Inject
     @Bean
     public DataSourceTransactionManager transactionManager(DataSource dataSource, ApplicationConfiguration applicationConfiguration) {
         DataSourceTransactionManager dataSourceTransactionManager = new DataSourceTransactionManager(dataSource);
@@ -79,7 +75,6 @@ public EclipseLinkJpaVendorAdapter eclipseLinkJpaVendorAdapter() {
         return eclipseLinkJpaVendorAdapter;
     }
 
-    @Inject
     @Bean
     public SpringLiquibase liquibaseChangelog(DataSource dataSource) {
         return getLiquibaseTemplate(dataSource, LIQUIBASE_CHANGELOG);

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

@@ -5,14 +5,10 @@
 import java.util.function.Supplier;
 import javax.sql.DataSource;
 
-import jakarta.inject.Inject;
 import org.cloudfoundry.multiapps.controller.core.util.ApplicationConfiguration;
 import org.flowable.common.engine.impl.AbstractEngineConfiguration;
 import org.flowable.common.engine.impl.async.DefaultAsyncTaskExecutor;
 import org.flowable.common.engine.impl.persistence.StrongUuidGenerator;
-import org.flowable.engine.HistoryService;
-import org.flowable.engine.ProcessEngine;
-import org.flowable.engine.RuntimeService;
 import org.flowable.job.service.impl.asyncexecutor.AsyncExecutor;
 import org.flowable.job.service.impl.asyncexecutor.DefaultAsyncJobExecutor;
 import org.flowable.job.service.impl.asyncexecutor.FailedJobCommandFactory;
@@ -42,18 +38,28 @@ public class FlowableConfiguration {
     protected Supplier<String> randomIdGenerator = () -> UUID.randomUUID()
                                                              .toString();
 
-    @Inject
+    /**
+     * Creates the ProcessEngine bean via ProcessEngineFactoryBean.
+     *
+     * Important: We return ProcessEngineFactoryBean (which implements FactoryBean<ProcessEngine>)
+     * instead of calling getObject() directly. This allows Spring to properly manage the factory bean's
+     * lifecycle and ensures the ProcessEngine is created at the correct time during context initialization.
+     *
+     * This approach resolves intermittent circular dependency issues that can occur with Spring 6.2.15+
+     * when beans depending on ProcessEngine are initialized concurrently.
+     *
+     * @see FlowableServicesConfiguration for RuntimeService and HistoryService beans
+     */
     @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;
     }
 
-    @Inject
     @Bean
     @DependsOn("liquibaseChangelog")
     public SpringProcessEngineConfiguration processEngineConfiguration(DataSource dataSource, PlatformTransactionManager transactionManager,
@@ -79,7 +85,6 @@ public SpringProcessEngineConfiguration processEngineConfiguration(DataSource da
         return processEngineConfiguration;
     }
 
-    @Inject
     @Bean
     public AsyncExecutor jobExecutor(DefaultAsyncTaskExecutor asyncTaskExecutor, String jobExecutorId) {
         DefaultAsyncJobExecutor jobExecutor = new DefaultAsyncJobExecutor() {
@@ -103,7 +108,6 @@ protected void initAsyncJobExecutionThreadPool() {
         return jobExecutor;
     }
 
-    @Inject
     @Bean
     public DefaultAsyncTaskExecutor taskExecutor(ApplicationConfiguration configuration) {
         DefaultAsyncTaskExecutor taskExecutor = new DefaultAsyncTaskExecutor();
@@ -114,7 +118,6 @@ public DefaultAsyncTaskExecutor taskExecutor(ApplicationConfiguration configurat
         return taskExecutor;
     }
 
-    @Inject
     @Bean
     public String jobExecutorId(ApplicationConfiguration applicationConfiguration) {
         String applicationGuid = applicationConfiguration.getApplicationGuid();
@@ -128,16 +131,4 @@ public String jobExecutorId(ApplicationConfiguration applicationConfiguration) {
     private String buildJobExecutorId(String applicationId, int applicationInstanceIndex) {
         return String.format(JOB_EXECUTOR_ID_TEMPLATE, applicationId, applicationInstanceIndex, randomIdGenerator.get());
     }
-
-    @Inject
-    @Bean
-    public RuntimeService runtimeService(ProcessEngine processEngine) {
-        return processEngine.getRuntimeService();
-    }
-
-    @Inject
-    @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,36 @@
+package org.cloudfoundry.multiapps.controller.web.configuration;
+
+import org.flowable.engine.HistoryService;
+import org.flowable.engine.ProcessEngine;
+import org.flowable.engine.RuntimeService;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.DependsOn;
+
+/**
+ * Configuration for Flowable engine service beans.
+ *
+ * These beans are extracted from FlowableConfiguration to ensure proper initialization order.
+ * The @DependsOn("processEngine") ensures that the ProcessEngineFactoryBean is fully initialized
+ * and the ProcessEngine is available before these service beans are created.
+ *
+ * Note: @Lazy is not used here because:
+ * 1. The ProcessEngine is properly managed via ProcessEngineFactoryBean, which handles lifecycle correctly
+ * 2. Components like FlowableHistoricDataCleaner need HistoryService at startup for scheduled jobs
+ * 3. Using @Lazy could cause unexpected initialization timing issues
+ */
+@Configuration
+public class FlowableServicesConfiguration {
+
+    @Bean
+    @DependsOn("processEngine")
+    public RuntimeService runtimeService(ProcessEngine processEngine) {
+        return processEngine.getRuntimeService();
+    }
+
+    @Bean
+    @DependsOn("processEngine")
+    public HistoryService historyService(ProcessEngine processEngine) {
+        return processEngine.getHistoryService();
+    }
+}

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

@@ -2,8 +2,6 @@
 
 import java.util.Map;
 
-import jakarta.inject.Inject;
-
 import org.cloudfoundry.multiapps.controller.web.monitoring.Metrics;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -14,7 +12,6 @@ public class JmxConfiguration {
 
     private static final String METRICS_BEAN = "org.cloudfoundry.multiapps.controller.web.monitoring:type=Metrics,name=MetricsMBean";
 
-    @Inject
     @Bean
     public MBeanExporter jmxExporter(Metrics metrics) {
         MBeanExporter mBeanExporter = new MBeanExporter();

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

@@ -3,34 +3,31 @@
 import java.text.MessageFormat;
 import java.time.Duration;
 
-import jakarta.inject.Inject;
-
+import io.micrometer.core.instrument.Clock;
+import io.micrometer.core.instrument.Metrics;
+import io.micrometer.core.instrument.config.MeterFilter;
+import io.micrometer.jmx.JmxConfig;
+import io.micrometer.jmx.JmxMeterRegistry;
 import org.cloudfoundry.multiapps.controller.core.util.ApplicationConfiguration;
 import org.cloudfoundry.multiapps.controller.persistence.util.EnvironmentServicesFinder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import io.micrometer.core.instrument.Clock;
-import io.micrometer.core.instrument.Metrics;
-import io.micrometer.core.instrument.config.MeterFilter;
-import io.micrometer.jmx.JmxConfig;
-import io.micrometer.jmx.JmxMeterRegistry;
-
 @Configuration
 public class MicrometerConfiguration {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(MicrometerConfiguration.class);
     public static final String DYNATRACE_SERVICE_NAME = "deploy-service-dynatrace";
     private static final String CLIENT_CONNECTIONS_METRICS_PREFIX = "reactor.netty.connection.provider.cloudfoundry-client.";
 
-    @Inject
     @Bean
     public JmxMeterRegistry jmxMeterRegistry(ApplicationConfiguration configuration, EnvironmentServicesFinder vcapServiceFinder) {
         if (vcapServiceFinder.findJdbcService(DYNATRACE_SERVICE_NAME) == null) {
-            LOGGER.warn(MessageFormat.format("Skipping registration of JmxMeterRegistry, since service \"{0}\" is not bound to the application.",
-                                             DYNATRACE_SERVICE_NAME));
+            LOGGER.warn(
+                MessageFormat.format("Skipping registration of JmxMeterRegistry, since service \"{0}\" is not bound to the application.",
+                                     DYNATRACE_SERVICE_NAME));
             return null;
         }
         Integer stepInSeconds = configuration.getMicrometerStepInSeconds();

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

@@ -4,7 +4,6 @@
 import java.text.MessageFormat;
 import java.util.Map;
 
-import jakarta.inject.Inject;
 import org.cloudfoundry.multiapps.common.util.JsonUtil;
 import org.cloudfoundry.multiapps.controller.client.facade.util.RestUtil;
 import org.cloudfoundry.multiapps.controller.client.uaa.UAAClient;
@@ -17,7 +16,6 @@
 @Configuration
 public class UAAClientConfiguration {
 
-    @Inject
     @Bean
     public UAAClient uaaClient(ApplicationConfiguration configuration) {
         if (configuration.shouldSkipSslValidation()) {