Polish contribution

Closes gh-9411

Author: snicoll

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfiguration.java

@@ -29,11 +29,11 @@
 import org.quartz.Trigger;
 
 import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.boot.autoconfigure.AbstractDependsOnBeanFactoryPostProcessor;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnSingleCandidate;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
@@ -130,12 +130,22 @@ private void customize(SchedulerFactoryBean schedulerFactoryBean) {
 
 	@Configuration
 	@ConditionalOnSingleCandidate(DataSource.class)
-	@ConditionalOnProperty(prefix = "spring.quartz", name = "job-store-type", havingValue = "jdbc")
 	protected static class JdbcStoreTypeConfiguration {
 
 		@Bean
-		public static InitializerSchedulerDependencyPostProcessor initializerSchedulerDependencyPostProcessor() {
-			return new InitializerSchedulerDependencyPostProcessor();
+		public SchedulerFactoryBeanCustomizer dataSourceCustomizer(
+				QuartzProperties properties, DataSource dataSource,
+				ObjectProvider<PlatformTransactionManager> transactionManager) {
+			return schedulerFactoryBean -> {
+				if (properties.getJobStoreType() == JobStoreType.JDBC) {
+					schedulerFactoryBean.setDataSource(dataSource);
+					PlatformTransactionManager txManager = transactionManager
+							.getIfUnique();
+					if (txManager != null) {
+						schedulerFactoryBean.setTransactionManager(txManager);
+					}
+				}
+			};
 		}
 
 		@Bean
@@ -146,22 +156,16 @@ public QuartzDatabaseInitializer quartzDatabaseInitializer(DataSource dataSource
 		}
 
 		@Bean
-		public SchedulerFactoryBeanCustomizer dataSourceCustomizer(DataSource dataSource,
-				ObjectProvider<PlatformTransactionManager> transactionManager) {
-			return schedulerFactoryBean -> {
-				schedulerFactoryBean.setDataSource(dataSource);
-				PlatformTransactionManager txManager = transactionManager.getIfUnique();
-				if (txManager != null) {
-					schedulerFactoryBean.setTransactionManager(txManager);
-				}
-			};
+		public static DatabaseInitializerSchedulerDependencyPostProcessor databaseInitializerSchedulerDependencyPostProcessor() {
+			return new DatabaseInitializerSchedulerDependencyPostProcessor();
 		}
 
-		private static class InitializerSchedulerDependencyPostProcessor
-				extends SchedulerDependsOnPostProcessor {
+		private static class DatabaseInitializerSchedulerDependencyPostProcessor
+				extends AbstractDependsOnBeanFactoryPostProcessor {
 
-			InitializerSchedulerDependencyPostProcessor() {
-				super("quartzDatabaseInitializer");
+			DatabaseInitializerSchedulerDependencyPostProcessor() {
+				super(Scheduler.class, SchedulerFactoryBean.class,
+						"quartzDatabaseInitializer");
 			}
 
 		}

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/SchedulerDependsOnPostProcessor.java

@@ -50,11 +50,13 @@
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 import org.springframework.core.env.Environment;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.scheduling.quartz.LocalDataSourceJobStore;
 import org.springframework.scheduling.quartz.LocalTaskExecutorThreadPool;
 import org.springframework.scheduling.quartz.QuartzJobBean;
+import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -199,13 +201,10 @@ private void load(Class<?>[] configs, String... environment) {
 		this.context = ctx;
 	}
 
+	@Import(ComponentThatUsesScheduler.class)
+	@Configuration
 	protected static class BaseQuartzConfiguration {
 
-		@Bean
-		public ComponentThatUsesScheduler component() {
-			return new ComponentThatUsesScheduler();
-		}
-
 	}
 
 	@Configuration
@@ -283,9 +282,13 @@ public SchedulerFactoryBeanCustomizer customizer() {
 
 	public static class ComponentThatUsesScheduler {
 
-		@Autowired
 		private Scheduler scheduler;
 
+		public ComponentThatUsesScheduler(Scheduler scheduler) {
+			Assert.notNull(scheduler, "Scheduler must not be null");
+			this.scheduler = scheduler;
+		}
+
 	}
 
 	public static class FooJob extends QuartzJobBean {

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfigurationTests.java

@@ -23,14 +23,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-quartz</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-jdbc</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.h2database</groupId>
-			<artifactId>h2</artifactId>
-		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

spring-boot-samples/spring-boot-sample-quartz/pom.xml

@@ -18,36 +18,21 @@
 
 import org.quartz.JobBuilder;
 import org.quartz.JobDetail;
-import org.quartz.Scheduler;
 import org.quartz.SimpleScheduleBuilder;
 import org.quartz.Trigger;
 import org.quartz.TriggerBuilder;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
 
 @SpringBootApplication
-public class SampleQuartzApplication implements CommandLineRunner {
-
-	@Autowired
-	private Scheduler scheduler;
+public class SampleQuartzApplication {
 
 	public static void main(String[] args) {
 		SpringApplication.run(SampleQuartzApplication.class, args);
 	}
 
-	@Override
-	public void run(String... args) throws Exception {
-		Trigger trigger = TriggerBuilder.newTrigger().forJob(sampleJobDetail())
-				.withIdentity("startTrigger").usingJobData("name", "Boot").startNow()
-				.build();
-
-		this.scheduler.scheduleJob(trigger);
-	}
-
 	@Bean
 	public JobDetail sampleJobDetail() {
 		return JobBuilder.newJob(SampleJob.class).withIdentity("sampleJob")