From 75a1a2491453ae609749fb46dfff7aea64b1e927 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Sun, 1 Sep 2019 13:45:21 -0700
Subject: [PATCH] Polish "Ensure Flyway/Liquibase runs before Quartz"

See gh-17539
---
 .../quartz/QuartzAutoConfiguration.java       | 78 ++++++-------------
 1 file changed, 25 insertions(+), 53 deletions(-)

diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfiguration.java
index 0f7a4928b1..02776b0e52 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfiguration.java
@@ -22,14 +22,12 @@ import java.util.Properties;
 import javax.sql.DataSource;
 
 import liquibase.integration.spring.SpringLiquibase;
-import org.flywaydb.core.Flyway;
 import org.quartz.Calendar;
 import org.quartz.JobDetail;
 import org.quartz.Scheduler;
 import org.quartz.Trigger;
 
 import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.boot.autoconfigure.AbstractDependsOnBeanFactoryPostProcessor;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -163,6 +161,7 @@ public class QuartzAutoConfiguration {
 				QuartzProperties properties) {
 			DataSource dataSourceToUse = getDataSource(dataSource, quartzDataSource);
 			return new QuartzDataSourceInitializer(dataSourceToUse, resourceLoader, properties);
+
 		}
 
 		/**
@@ -171,66 +170,39 @@ public class QuartzAutoConfiguration {
 		 * bean(s).
 		 */
 		@Configuration
-		protected static class SchedulerQuartzDataSourceInitializerDependencyConfiguration
-				extends AbstractSchedulerDependsOnBeanFactoryPostProcessor {
+		static class QuartzSchedulerDependencyConfiguration {
 
-			SchedulerQuartzDataSourceInitializerDependencyConfiguration() {
-				super(QuartzDataSourceInitializer.class);
+			@Bean
+			public static SchedulerDependsOnBeanFactoryPostProcessor quartzSchedulerDataSourceInitializerDependsOnBeanFactoryPostProcessor() {
+				return new SchedulerDependsOnBeanFactoryPostProcessor(QuartzDataSourceInitializer.class);
 			}
 
-		}
-
-		/**
-		 * Additional configuration to ensure that {@link SchedulerFactoryBean} and
-		 * {@link Scheduler} beans depend on the {@link SpringLiquibase} bean(s).
-		 */
-		@Configuration
-		@ConditionalOnClass(SpringLiquibase.class)
-		@ConditionalOnBean(SpringLiquibase.class)
-		protected static class SchedulerSpringLiquibaseDependencyConfiguration
-				extends AbstractSchedulerDependsOnBeanFactoryPostProcessor {
-
-			SchedulerSpringLiquibaseDependencyConfiguration() {
-				super(SpringLiquibase.class);
+			@Bean
+			@ConditionalOnBean(FlywayMigrationInitializer.class)
+			public static SchedulerDependsOnBeanFactoryPostProcessor quartzSchedulerFilywayDependsOnBeanFactoryPostProcessor() {
+				return new SchedulerDependsOnBeanFactoryPostProcessor(FlywayMigrationInitializer.class);
 			}
 
-		}
-
-		/**
-		 * Additional configuration to ensure that {@link SchedulerFactoryBean} and
-		 * {@link Scheduler} beans depend on the {@link FlywayMigrationInitializer}
-		 * bean(s).
-		 */
-		@Configuration
-		@ConditionalOnClass(Flyway.class)
-		@ConditionalOnBean(FlywayMigrationInitializer.class)
-		protected static class SchedulerFlywayMigrationInitializerDependencyConfiguration
-				extends AbstractSchedulerDependsOnBeanFactoryPostProcessor {
-
-			SchedulerFlywayMigrationInitializerDependencyConfiguration() {
-				super(FlywayMigrationInitializer.class);
-			}
-
-		}
-
-		/**
-		 * {@link BeanFactoryPostProcessor} that can be used to declare that all
-		 * {@link Scheduler} and {@link SchedulerFactoryBean} beans should "depend on" one
-		 * or more specific beans.
-		 */
-		protected abstract static class AbstractSchedulerDependsOnBeanFactoryPostProcessor
-				extends AbstractDependsOnBeanFactoryPostProcessor {
-
-			/**
-			 * Create an instance with dependency types.
-			 * @param dependencyTypes dependency types
-			 */
-			protected AbstractSchedulerDependsOnBeanFactoryPostProcessor(Class<?>... dependencyTypes) {
-				super(Scheduler.class, SchedulerFactoryBean.class, dependencyTypes);
+			@Bean
+			@ConditionalOnBean(SpringLiquibase.class)
+			public static SchedulerDependsOnBeanFactoryPostProcessor quartzSchedulerLiquibaseDependsOnBeanFactoryPostProcessor() {
+				return new SchedulerDependsOnBeanFactoryPostProcessor(SpringLiquibase.class);
 			}
 
 		}
 
 	}
 
+	/**
+	 * {@link AbstractDependsOnBeanFactoryPostProcessor} for Quartz {@link Scheduler} and
+	 * {@link SchedulerFactoryBean}.
+	 */
+	private static class SchedulerDependsOnBeanFactoryPostProcessor extends AbstractDependsOnBeanFactoryPostProcessor {
+
+		SchedulerDependsOnBeanFactoryPostProcessor(Class<?>... dependencyTypes) {
+			super(Scheduler.class, SchedulerFactoryBean.class, dependencyTypes);
+		}
+
+	}
+
 }