github/quartz-manager
1
0
Fork 0
mirror of https://github.com/fabioformosa/quartz-manager.git synced 2025-12-30 06:03:15 +09:00
Code Issues Packages Projects Releases Wiki Activity

#63 fixed the injection of the quartz properties of the modules

Browse Source
This commit is contained in:
Fabio Formosa
2022-10-06 20:15:24 +02:00
parent 0652a6ec5e
commit 14c1f7ea85
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/configuration/SchedulerConfig.java
View File

@@ -14,6 +14,7 @@ import org.springframework.core.io.ClassPathResource;
import org.springframework.scheduling.quartz.SchedulerFactoryBean;
import java.io.IOException;
import java.util.List;
import java.util.Properties;
@ComponentScan(basePackages = {"it.fabioformosa.quartzmanager.controllers"})
@@ -21,10 +22,10 @@ import java.util.Properties;
@ConditionalOnProperty(name = "quartz.enabled", matchIfMissing = true)
public class SchedulerConfig {
private final QuartzModuleProperties quartzModuleProperties;
private final List<QuartzModuleProperties> quartzModuleProperties;
@Autowired(required = false)
public SchedulerConfig(QuartzModuleProperties quartzModuleProperties) {
public SchedulerConfig(List<QuartzModuleProperties> quartzModuleProperties) {
this.quartzModuleProperties = quartzModuleProperties;
}
@@ -48,8 +49,7 @@ public class SchedulerConfig {
SchedulerFactoryBean factory = new SchedulerFactoryBean();
factory.setJobFactory(jobFactory);
Properties mergedProperties = new Properties();
if (quartzModuleProperties != null)
mergedProperties.putAll(quartzModuleProperties.getProperties());
quartzModuleProperties.stream().forEach(prop -> mergedProperties.putAll(prop.getProperties()));
mergedProperties.putAll(quartzProperties());
factory.setQuartzProperties(mergedProperties);
factory.setAutoStartup(false);