From 93152f815710cceb2bf98f6776a32fc4e26049ec Mon Sep 17 00:00:00 2001
From: Fabio Formosa <fabio.formosa@gmail.com>
Date: Sat, 1 Oct 2022 17:29:05 +0200
Subject: [PATCH] #63 tested the default name assignment to the scheduler
 instance

---
 .../QuartzDefaultPropertiesConfig.java        | 22 +++++++++++++++++++
 .../configuration/SchedulerConfig.java        | 10 ---------
 ...hedulerConfigDefaultAppPropertiesTest.java |  2 +-
 3 files changed, 23 insertions(+), 11 deletions(-)
 create mode 100644 quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/configuration/QuartzDefaultPropertiesConfig.java

diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/configuration/QuartzDefaultPropertiesConfig.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/configuration/QuartzDefaultPropertiesConfig.java
new file mode 100644
index 0000000..84d8189
--- /dev/null
+++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/configuration/QuartzDefaultPropertiesConfig.java
@@ -0,0 +1,22 @@
+package it.fabioformosa.quartzmanager.configuration;
+
+import it.fabioformosa.quartzmanager.common.properties.QuartzModuleProperties;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ConditionalOnProperty(name = "quartz.enabled", matchIfMissing = true)
+public class QuartzDefaultPropertiesConfig {
+
+  protected static final String QUARTZ_MANAGER_SCHEDULER_DEFAULT_NAME = "quartz-manager-scheduler";
+
+  @Bean("quartzDefaultProperties")
+  public QuartzModuleProperties defaultApiQuartzProps() {
+    QuartzModuleProperties quartzModuleProperties = new QuartzModuleProperties();
+    quartzModuleProperties.getProperties().setProperty("org.quartz.scheduler.instanceName", QUARTZ_MANAGER_SCHEDULER_DEFAULT_NAME);
+    quartzModuleProperties.getProperties().setProperty("org.quartz.threadPool.threadCount", "1");
+    return quartzModuleProperties;
+  }
+
+}
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 7db06c1..cd89e30 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
@@ -21,8 +21,6 @@ import java.util.Properties;
 @ConditionalOnProperty(name = "quartz.enabled", matchIfMissing = true)
 public class SchedulerConfig {
 
-  protected static final String QUARTZ_MANAGER_SCHEDULER_DEFAULT_NAME = "quartz-manager-scheduler";
-
   private final QuartzModuleProperties quartzModuleProperties;
 
   @Autowired(required = false)
@@ -45,14 +43,6 @@ public class SchedulerConfig {
     return propertiesFactoryBean.getObject();
   }
 
-  @Bean("quartzDefaultProperties")
-  public QuartzModuleProperties persistenceQuartzProps() {
-    QuartzModuleProperties quartzModuleProperties = new QuartzModuleProperties();
-    quartzModuleProperties.getProperties().setProperty("org.quartz.scheduler.instanceName", QUARTZ_MANAGER_SCHEDULER_DEFAULT_NAME);
-    quartzModuleProperties.getProperties().setProperty("org.quartz.threadPool.threadCount", "1");
-    return quartzModuleProperties;
-  }
-
   @Bean(name = "scheduler")
   public SchedulerFactoryBean schedulerFactoryBean(JobFactory jobFactory) throws IOException {
     SchedulerFactoryBean factory = new SchedulerFactoryBean();
diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/configuration/SchedulerConfigDefaultAppPropertiesTest.java b/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/configuration/SchedulerConfigDefaultAppPropertiesTest.java
index 322dc04..bc9ad1f 100644
--- a/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/configuration/SchedulerConfigDefaultAppPropertiesTest.java
+++ b/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/configuration/SchedulerConfigDefaultAppPropertiesTest.java
@@ -7,7 +7,7 @@ import org.quartz.SchedulerException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
-import static it.fabioformosa.quartzmanager.configuration.SchedulerConfig.QUARTZ_MANAGER_SCHEDULER_DEFAULT_NAME;
+import static it.fabioformosa.quartzmanager.configuration.QuartzDefaultPropertiesConfig.QUARTZ_MANAGER_SCHEDULER_DEFAULT_NAME;
 
 @SpringBootTest
 class SchedulerConfigDefaultAppPropertiesTest {