Polish "Ensure that Flyway/Liquibase run before jOOQ's DSLContext is used"

See gh-25279

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java

@@ -167,8 +167,8 @@ public class LiquibaseAutoConfiguration {
 	}
 
 	/**
-	 * Post processor to ensure that {@link EntityManagerFactory} beans depend on the
+	 * Post processor to ensure that {@link EntityManagerFactory} beans depend on any
-	 * liquibase bean.
+	 * {@link SpringLiquibase} beans.
 	 */
 	@ConditionalOnClass(LocalContainerEntityManagerFactoryBean.class)
 	@ConditionalOnBean(AbstractEntityManagerFactoryBean.class)
@@ -182,8 +182,8 @@ public class LiquibaseAutoConfiguration {
 	}
 
 	/**
-	 * Additional configuration to ensure that {@link JdbcOperations} beans depend on the
+	 * Additional configuration to ensure that {@link JdbcOperations} beans depend on any
-	 * liquibase bean.
+	 * {@link SpringLiquibase} beans.
 	 */
 	@ConditionalOnClass(JdbcOperations.class)
 	@ConditionalOnBean(JdbcOperations.class)
@@ -197,7 +197,7 @@ public class LiquibaseAutoConfiguration {
 
 	/**
 	 * Post processor to ensure that {@link NamedParameterJdbcOperations} beans depend on
-	 * the liquibase bean.
+	 * any {@link SpringLiquibase} beans.
 	 */
 	@ConditionalOnClass(NamedParameterJdbcOperations.class)
 	@ConditionalOnBean(NamedParameterJdbcOperations.class)
@@ -211,8 +211,8 @@ public class LiquibaseAutoConfiguration {
 	}
 
 	/**
-	 * Post processor to ensure that {@link DSLContext} beans depend on the liquibase
+	 * Post processor to ensure that {@link DSLContext} beans depend on any
-	 * bean.
+	 * {@link SpringLiquibase} beans.
 	 */
 	@ConditionalOnClass(DSLContext.class)
 	@ConditionalOnBean(DSLContext.class)

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java

@@ -525,24 +525,32 @@ class FlywayAutoConfigurationTests {
 	}
 
 	@Test
-	void userConfigurationDslContextDependency() {
+	void whenFlywayIsAutoConfiguredThenJooqDslContextDependsOnFlywayBeans() {
-		this.contextRunner
+		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class, JooqConfiguration.class)
-				.withUserConfiguration(EmbeddedDataSourceConfiguration.class, CustomFlywayWithJooqConfiguration.class)
 				.run((context) -> {
 					BeanDefinition beanDefinition = context.getBeanFactory().getBeanDefinition("dslContext");
-					assertThat(beanDefinition.getDependsOn()).containsExactly("flyway");
+					assertThat(beanDefinition.getDependsOn()).containsExactly("flywayInitializer", "flyway");
 				});
 	}
 
 	@Test
-	void userConfigurationWithFlywayMigrationAndDslContextDependency() {
+	void whenCustomMigrationInitializerIsDefinedThenJooqDslContextDependsOnIt() {
-		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class,
+		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class, JooqConfiguration.class,
-				CustomFlywayMigrationInitializerWithJooqConfiguration.class).run((context) -> {
+				CustomFlywayMigrationInitializer.class).run((context) -> {
 					BeanDefinition beanDefinition = context.getBeanFactory().getBeanDefinition("dslContext");
 					assertThat(beanDefinition.getDependsOn()).containsExactly("flywayMigrationInitializer", "flyway");
 				});
 	}
 
+	@Test
+	void whenCustomFlywayIsDefinedThenJooqDslContextDependsOnIt() {
+		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class, JooqConfiguration.class,
+				CustomFlyway.class).run((context) -> {
+					BeanDefinition beanDefinition = context.getBeanFactory().getBeanDefinition("dslContext");
+					assertThat(beanDefinition.getDependsOn()).containsExactly("customFlyway");
+				});
+	}
+
 	@Configuration(proxyBeanMethods = false)
 	static class FlywayDataSourceConfiguration {
 
@@ -619,6 +627,16 @@ class FlywayAutoConfigurationTests {
 
 	}
 
+	@Configuration(proxyBeanMethods = false)
+	static class CustomFlyway {
+
+		@Bean
+		Flyway customFlyway() {
+			return Flyway.configure().load();
+		}
+
+	}
+
 	@Configuration(proxyBeanMethods = false)
 	static class CustomFlywayMigrationInitializerWithJpaConfiguration {
 
@@ -771,34 +789,8 @@ class FlywayAutoConfigurationTests {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
-	static class CustomFlywayWithJooqConfiguration {
+	static class JooqConfiguration {
-
-		@Bean
-		Flyway flyway(DataSource dataSource) {
-			return Flyway.configure().dataSource(dataSource).load();
-		}
-
-		@Bean
-		DSLContext dslContext() {
-			return new DefaultDSLContext(SQLDialect.H2);
-		}
-
-	}
-
-	@Configuration
-	protected static class CustomFlywayMigrationInitializerWithJooqConfiguration {
-
-		private final DataSource dataSource;
-
-		protected CustomFlywayMigrationInitializerWithJooqConfiguration(DataSource dataSource) {
-			this.dataSource = dataSource;
-		}
-
-		@Bean
-		public FlywayMigrationInitializer flywayMigrationInitializer(Flyway flyway) {
-			return new FlywayMigrationInitializer(flyway);
-		}
 
 		@Bean
 		DSLContext dslContext() {

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java

@@ -376,7 +376,16 @@ class LiquibaseAutoConfigurationTests {
 	}
 
 	@Test
-	void userConfigurationDslContextDependency() {
+	void whenLiquibaseIsAutoConfiguredThenJooqDslContextDependsOnSpringLiquibaseBeans() {
+		this.contextRunner.withConfiguration(AutoConfigurations.of(JooqAutoConfiguration.class))
+				.withUserConfiguration(EmbeddedDataSourceConfiguration.class).run((context) -> {
+					BeanDefinition beanDefinition = context.getBeanFactory().getBeanDefinition("dslContext");
+					assertThat(beanDefinition.getDependsOn()).containsExactly("liquibase");
+				});
+	}
+
+	@Test
+	void whenCustomSpringLiquibaseIsDefinedThenJooqDslContextDependsOnSpringLiquibaseBeans() {
 		this.contextRunner.withConfiguration(AutoConfigurations.of(JooqAutoConfiguration.class))
 				.withUserConfiguration(LiquibaseUserConfiguration.class, EmbeddedDataSourceConfiguration.class)
 				.run((context) -> {