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 tested the default name assignment to the scheduler instance

Browse Source
This commit is contained in:
Fabio Formosa
2022-10-01 17:29:05 +02:00
parent 1e99602c68
commit 93152f8157
3 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/configuration/QuartzDefaultPropertiesConfig.java Normal file
View File

@@ -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;
}
}

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

@@ -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();

2
quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/configuration/SchedulerConfigDefaultAppPropertiesTest.java
View File

@@ -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 {