From 14c1f7ea8514aaca67ff713375b1b2223eaa296f Mon Sep 17 00:00:00 2001
From: Fabio Formosa <fabio.formosa@gmail.com>
Date: Thu, 6 Oct 2022 20:15:24 +0200
Subject: [PATCH] #63 fixed the injection of the quartz properties of the
 modules

---
 .../quartzmanager/configuration/SchedulerConfig.java      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/configuration/SchedulerConfig.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/configuration/SchedulerConfig.java
index cd89e30..037a02b 100644
--- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/configuration/SchedulerConfig.java
+++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/configuration/SchedulerConfig.java
@@ -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);