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 4d9749a..63b897c 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 @@ -2,10 +2,8 @@ package it.fabioformosa.quartzmanager.configuration; import it.fabioformosa.quartzmanager.common.properties.QuartzModuleProperties; import it.fabioformosa.quartzmanager.scheduler.AutowiringSpringBeanJobFactory; -import org.quartz.Job; import org.quartz.spi.JobFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.config.PropertiesFactoryBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.ApplicationContext; @@ -13,7 +11,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.core.io.ClassPathResource; -import org.springframework.scheduling.quartz.JobDetailFactoryBean; import org.springframework.scheduling.quartz.SchedulerFactoryBean; import java.io.IOException; @@ -24,25 +21,9 @@ import java.util.Properties; @ConditionalOnProperty(name = "quartz.enabled") public class SchedulerConfig { - private static JobDetailFactoryBean createJobDetail(Class jobClass) { - JobDetailFactoryBean factoryBean = new JobDetailFactoryBean(); - factoryBean.setJobClass(jobClass); - factoryBean.setDurability(false); - return factoryBean; - } - - @Value("${quartz-manager.jobClass}") - private String jobClassname; - @Autowired(required = false) private QuartzModuleProperties quartzModuleProperties; - @Bean - public JobDetailFactoryBean jobDetail() throws ClassNotFoundException { - Class JobClass = (Class) Class.forName(jobClassname); - return createJobDetail(JobClass); - } - @Bean public JobFactory jobFactory(ApplicationContext applicationContext) { AutowiringSpringBeanJobFactory jobFactory = new AutowiringSpringBeanJobFactory(); diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/test/resources/application.yml b/quartz-manager-parent/quartz-manager-starter-api/src/test/resources/application.yml index 88a3041..1d3a7ac 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/test/resources/application.yml +++ b/quartz-manager-parent/quartz-manager-starter-api/src/test/resources/application.yml @@ -15,4 +15,4 @@ logging: org.quartz: INFO quartz-manager: - jobClass: it.fabioformosa.quartzmanager.jobs.SampleJob + jobClassPackages: it.fabioformosa.quartzmanager.jobs diff --git a/quartz-manager-parent/quartz-manager-web-showcase/src/main/resources/application.yml b/quartz-manager-parent/quartz-manager-web-showcase/src/main/resources/application.yml index 722ad7e..fde9f72 100644 --- a/quartz-manager-parent/quartz-manager-web-showcase/src/main/resources/application.yml +++ b/quartz-manager-parent/quartz-manager-web-showcase/src/main/resources/application.yml @@ -51,7 +51,6 @@ quartz-manager: cookie-strategy: enabled: true cookie: AUTH-TOKEN - jobClass: it.fabioformosa.quartzmanager.jobs.myjobs.SampleJob jobClassPackages: it.fabioformosa.quartzmanager.jobs accounts: in-memory: