Improve startup time

pom.xml

@@ -217,6 +217,17 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>io.smallrye</groupId>
+        <artifactId>jandex-maven-plugin</artifactId>
+        <version>3.2.7</version>
+        <executions>
+          <execution>
+            <id>make-index</id>
+            <goals><goal>jandex</goal></goals>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>com.qmino</groupId>
         <artifactId>miredot-plugin</artifactId>

src/main/java/org/ohdsi/webapi/CacheConfig.java

@@ -2,8 +2,10 @@
 
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
 
 @Configuration
+@Lazy(false)
 @EnableCaching
 public class CacheConfig {
 

src/main/java/org/ohdsi/webapi/DataAccessConfig.java

@@ -11,6 +11,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.DependsOn;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.context.annotation.Primary;
 import org.springframework.core.env.Environment;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
@@ -36,6 +37,7 @@
  *
  */
 @Configuration
+@Lazy(false)
 @EnableTransactionManagement
 @EnableJpaRepositories(repositoryFactoryBeanClass = EntityGraphJpaRepositoryFactoryBean.class)
 public class DataAccessConfig {

src/main/java/org/ohdsi/webapi/FlywayConfig.java

@@ -9,6 +9,7 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
 import com.zaxxer.hikari.HikariDataSource;
 
 
@@ -19,6 +20,7 @@
  * Java-based migrations can access Spring beans via the static ApplicationContextHolder.
  */
 @Configuration
+@Lazy(false)
 @ConditionalOnProperty(prefix = "spring.flyway", name = "enabled", matchIfMissing = true)
 public class FlywayConfig {
 

src/main/java/org/ohdsi/webapi/JobConfig.java

@@ -26,6 +26,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.DependsOn;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.context.annotation.Primary;
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -36,6 +37,7 @@
  * Spring Batch 5.x configuration for Java 21 / Spring Boot 3.2
  */
 @Configuration
+@Lazy(false)
 @EnableBatchProcessing
 public class JobConfig {
 

src/main/java/org/ohdsi/webapi/JobInvalidator.java

@@ -9,15 +9,15 @@
 import org.springframework.batch.core.repository.JobRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.DependsOn;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.support.TransactionTemplate;
 
-import jakarta.annotation.PostConstruct;
 import java.util.Calendar;
 
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.event.EventListener;
+
 @Component
-@DependsOn("flyway")
 public class JobInvalidator {
 
     private static final Logger log = LoggerFactory.getLogger(JobInvalidator.class);
@@ -37,8 +37,8 @@ public JobInvalidator(JobRepository repository,
         this.jobExecutionDao = jobExecutionDao;
     }
 
-    @PostConstruct
-    private void invalidateGenerations() {
+    @EventListener(ApplicationReadyEvent.class)
+    public void invalidateGenerations() {
         transactionTemplateRequiresNew.execute(s -> {
             jobExecutionDao.getRunningJobExecutions().forEach(this::invalidationJobExecution);
             return null;

src/main/java/org/ohdsi/webapi/SchedulerConfiguration.java

@@ -4,12 +4,14 @@
 import com.cronutils.model.definition.CronDefinitionBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.scheduling.TaskScheduler;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
 
 import static com.cronutils.model.CronType.QUARTZ;
 
 @Configuration
+@Lazy(false)
 public class SchedulerConfiguration {
 
   @Bean

src/main/java/org/ohdsi/webapi/ShiroConfiguration.java

@@ -9,24 +9,21 @@
 import org.apache.shiro.web.servlet.AbstractShiroFilter;
 import org.ohdsi.webapi.shiro.AtlasWebSecurityManager;
 import org.ohdsi.webapi.shiro.lockout.*;
-import org.ohdsi.webapi.shiro.management.DataSourceAccessBeanPostProcessor;
-import org.ohdsi.webapi.shiro.management.DisabledSecurity;
 import org.ohdsi.webapi.shiro.management.Security;
-import org.ohdsi.webapi.shiro.management.datasource.DataSourceAccessParameterResolver;
 import org.ohdsi.webapi.shiro.realms.JwtAuthRealm;
 import org.ohdsi.webapi.shiro.subject.WebDelegatingRunAsSubjectFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.DependsOn;
+import org.springframework.context.annotation.Lazy;
 
 import jakarta.servlet.Filter;
 import java.util.Map;
@@ -37,6 +34,7 @@
  */
 
 @Configuration
+@Lazy(false)
 public class ShiroConfiguration {
 
     private static final Logger log = LoggerFactory.getLogger(ShiroConfiguration.class);
@@ -47,8 +45,6 @@ public class ShiroConfiguration {
     private long initialDuration;
     @Value("${security.duration.increment}")
     private long increment;
-    @Value("${spring.aop.proxy-target-class:false}")
-    private Boolean proxyTargetClass;
     @Autowired
     protected ApplicationEventPublisher eventPublisher;
 
@@ -121,13 +117,6 @@ public LockoutStrategy lockoutStrategy() {
         return new ExponentLockoutStrategy(initialDuration, increment, maxLoginAttempts);
     }
 
-    @Bean
-    @ConditionalOnMissingBean(value = DisabledSecurity.class)
-    public DataSourceAccessBeanPostProcessor dataSourceAccessBeanPostProcessor(DataSourceAccessParameterResolver parameterResolver) {
-
-        return new DataSourceAccessBeanPostProcessor(parameterResolver, proxyTargetClass);
-    }
-
     /**
      * Register the Shiro filter with the servlet container.
      * This is necessary for Spring Boot to properly apply the filter to all requests.

src/main/java/org/ohdsi/webapi/security/PermissionService.java

@@ -43,8 +43,10 @@
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.context.WebApplicationContext;
 
-import jakarta.annotation.PostConstruct;
 import java.io.Serializable;
+
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.event.EventListener;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -106,8 +108,8 @@ public PermissionService(
         this.conversionService = conversionService;
     }
 
-    @PostConstruct
-    private void postConstruct() {
+    @EventListener(ApplicationReadyEvent.class)
+    public void postConstruct() {
 
         this.repositories = new Repositories(appContext);
 

src/main/java/org/ohdsi/webapi/service/CDMResultsService.java

@@ -34,11 +34,9 @@
 import org.springframework.batch.core.job.builder.SimpleJobBuilder;
 import org.springframework.batch.core.repository.JobRepository;
 import org.springframework.batch.core.step.builder.StepBuilder;
-import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.DependsOn;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -52,8 +50,11 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.event.EventListener;
 import org.springframework.web.server.ResponseStatusException;
 
+import jakarta.annotation.PostConstruct;
 import java.util.AbstractMap.SimpleEntry;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -79,8 +80,7 @@
  */
 @RestController
 @RequestMapping("/cdmresults")
-@DependsOn({"jobInvalidator", "flyway"})
-public class CDMResultsService extends AbstractDaoService implements InitializingBean {
+public class CDMResultsService extends AbstractDaoService {
     private final Logger logger = LoggerFactory.getLogger(CDMResultsService.class);
 
     private static final String CONCEPT_COUNT_SQL = "/resources/cdmresults/sql/getConceptRecordCount.sql";
@@ -135,9 +135,13 @@ public class CDMResultsService extends AbstractDaoService implements Initializin
     @Autowired
     private ConversionService conversionService;
 
-    @Override
-    public void afterPropertiesSet() throws Exception {
+    @PostConstruct
+    public void initQueryRunner() {
         queryRunner.init(this.getSourceDialect(), objectMapper);
+    }
+
+    @EventListener(ApplicationReadyEvent.class)
+    public void onApplicationReady() {
         warmCaches();
     }
 

src/main/java/org/ohdsi/webapi/service/CohortGenerationService.java

@@ -31,17 +31,17 @@
 import org.springframework.batch.repeat.exception.ExceptionHandler;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.DependsOn;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.support.TransactionTemplate;
 
-import jakarta.annotation.PostConstruct;
-
 import java.util.Arrays;
+
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.event.EventListener;
 import java.util.Calendar;
 import java.util.List;
 import java.util.Objects;
@@ -57,7 +57,6 @@
 import static org.ohdsi.webapi.Constants.Params.DEMOGRAPHIC_STATS;
 
 @Component
-@DependsOn("flyway")
 public class CohortGenerationService extends AbstractDaoService implements GeneratesNotification {
 
   private final CohortDefinitionRepository cohortDefinitionRepository;
@@ -193,7 +192,7 @@ private JobParametersBuilder getJobParametersBuilder(Source source, CohortDefini
     return builder;
   }
 
-  @PostConstruct
+  @EventListener(ApplicationReadyEvent.class)
   public void init(){
 
     invalidateCohortGenerations();