From 4d4385b7ba194e4cec731b90eb6bb88bcb85ffc0 Mon Sep 17 00:00:00 2001 From: Fabio Formosa Date: Sat, 8 Oct 2022 13:05:01 +0200 Subject: [PATCH] #40 customized the quartz.properties file for quartz-manager in managed-quartz.properties --- .../quartzmanager/api/configuration/SchedulerConfig.java | 6 +++--- .../quartzmanager/api/converters/JobKeyToJobDetailDTO.java | 2 +- .../quartzmanager/api/services/SchedulerService.java | 2 +- .../quartzmanager/api/services/SimpleTriggerService.java | 2 +- .../quartzmanager/api/services/TriggerService.java | 2 +- .../SchedulerConfigDefaultAppPropertiesTest.java | 2 ++ .../{quartz.properties => managed-quartz.properties} | 0 7 files changed, 9 insertions(+), 7 deletions(-) rename quartz-manager-parent/quartz-manager-starter-api/src/test/resources/{quartz.properties => managed-quartz.properties} (100%) diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/configuration/SchedulerConfig.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/configuration/SchedulerConfig.java index 488869b..eee8d29 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/configuration/SchedulerConfig.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/configuration/SchedulerConfig.java @@ -37,7 +37,7 @@ public class SchedulerConfig { } @ConditionalOnResource(resources = {"managed-quartz.properties"}) - @Bean + @Bean(name = "ManagedQuartzProperties") public Properties quartzProperties() throws IOException { PropertiesFactoryBean propertiesFactoryBean = new PropertiesFactoryBean(); propertiesFactoryBean.setLocation(new ClassPathResource("/managed-quartz.properties")); @@ -45,8 +45,8 @@ public class SchedulerConfig { return propertiesFactoryBean.getObject(); } - @Bean(name = "quartzScheduler") - public SchedulerFactoryBean schedulerFactoryBean(@Qualifier("quartzJobFactory") JobFactory jobFactory, Properties quartzProperties) throws IOException { + @Bean(name = "quartzManagerScheduler") + public SchedulerFactoryBean schedulerFactoryBean(@Qualifier("quartzJobFactory") JobFactory jobFactory, @Autowired(required = false) @Qualifier("ManagedQuartzProperties") Properties quartzProperties) throws IOException { SchedulerFactoryBean factory = new SchedulerFactoryBean(); factory.setJobFactory(jobFactory); Properties mergedProperties = new Properties(); diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/converters/JobKeyToJobDetailDTO.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/converters/JobKeyToJobDetailDTO.java index 7f20b69..bcabadc 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/converters/JobKeyToJobDetailDTO.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/converters/JobKeyToJobDetailDTO.java @@ -13,7 +13,7 @@ import org.springframework.stereotype.Component; @Component public class JobKeyToJobDetailDTO extends AbstractBaseConverterToDTO { - @Qualifier("quartzScheduler") + @Qualifier("quartzManagerScheduler") @Autowired private Scheduler scheduler; diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/services/SchedulerService.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/services/SchedulerService.java index 3c4c3e0..c2291ab 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/services/SchedulerService.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/services/SchedulerService.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Service; @Service public class SchedulerService extends AbstractSchedulerService{ - public SchedulerService(@Qualifier("quartzScheduler") Scheduler scheduler, ConversionService conversionService) { + public SchedulerService(@Qualifier("quartzManagerScheduler") Scheduler scheduler, ConversionService conversionService) { super(scheduler, conversionService); } diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/services/SimpleTriggerService.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/services/SimpleTriggerService.java index 88ffa93..9393ce3 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/services/SimpleTriggerService.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/services/SimpleTriggerService.java @@ -12,7 +12,7 @@ import org.springframework.stereotype.Service; @Service public class SimpleTriggerService extends AbstractSchedulerService { - public SimpleTriggerService(@Qualifier("quartzScheduler") Scheduler scheduler, ConversionService conversionService) { + public SimpleTriggerService(@Qualifier("quartzManagerScheduler") Scheduler scheduler, ConversionService conversionService) { super(scheduler, conversionService); } diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/services/TriggerService.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/services/TriggerService.java index 7538009..31bfa9c 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/services/TriggerService.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/services/TriggerService.java @@ -19,7 +19,7 @@ public class TriggerService { private Scheduler scheduler; private ConversionService conversionService; - public TriggerService(@Qualifier("quartzScheduler") Scheduler scheduler, ConversionService conversionService) { + public TriggerService(@Qualifier("quartzManagerScheduler") Scheduler scheduler, ConversionService conversionService) { this.scheduler = scheduler; this.conversionService = conversionService; } diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/configuration/SchedulerConfigDefaultAppPropertiesTest.java b/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/configuration/SchedulerConfigDefaultAppPropertiesTest.java index b06bf73..9054f97 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/configuration/SchedulerConfigDefaultAppPropertiesTest.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/configuration/SchedulerConfigDefaultAppPropertiesTest.java @@ -5,12 +5,14 @@ import org.junit.jupiter.api.Test; import org.quartz.Scheduler; import org.quartz.SchedulerException; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.test.context.SpringBootTest; @SpringBootTest class SchedulerConfigDefaultAppPropertiesTest { @Autowired + @Qualifier("quartzManagerScheduler") private Scheduler scheduler; @Test diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/test/resources/quartz.properties b/quartz-manager-parent/quartz-manager-starter-api/src/test/resources/managed-quartz.properties similarity index 100% rename from quartz-manager-parent/quartz-manager-starter-api/src/test/resources/quartz.properties rename to quartz-manager-parent/quartz-manager-starter-api/src/test/resources/managed-quartz.properties