From 0187e5106dfc5034b8b1650083eab37181ff0de3 Mon Sep 17 00:00:00 2001 From: Madhura Bhave Date: Fri, 16 Aug 2019 16:33:21 -0700 Subject: [PATCH] Polish "Set up SpringLiquibase beans' dependencies by type rather than name" See gh-17805 --- .../data/jpa/EntityManagerFactoryDependsOnPostProcessor.java | 2 ++ .../jdbc/JdbcOperationsDependsOnPostProcessor.java | 2 ++ .../NamedParameterJdbcOperationsDependsOnPostProcessor.java | 2 ++ .../liquibase/LiquibaseAutoConfigurationTests.java | 5 +++-- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jpa/EntityManagerFactoryDependsOnPostProcessor.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jpa/EntityManagerFactoryDependsOnPostProcessor.java index 32723d3c7b..19a8c159ee 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jpa/EntityManagerFactoryDependsOnPostProcessor.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jpa/EntityManagerFactoryDependsOnPostProcessor.java @@ -31,6 +31,7 @@ import org.springframework.orm.jpa.AbstractEntityManagerFactoryBean; * @author Dave Syer * @author Phillip Webb * @author Andy Wilkinson + * @author Andrii Hrytsiuk * @since 1.1.0 * @see BeanDefinition#setDependsOn(String[]) */ @@ -49,6 +50,7 @@ public class EntityManagerFactoryDependsOnPostProcessor extends AbstractDependsO * Creates a new {@code EntityManagerFactoryDependsOnPostProcessor} that will set up * dependencies upon beans with the given types. * @param dependsOn types of the beans to depend upon + * @since 2.1.8 */ public EntityManagerFactoryDependsOnPostProcessor(Class... dependsOn) { super(EntityManagerFactory.class, AbstractEntityManagerFactoryBean.class, dependsOn); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/JdbcOperationsDependsOnPostProcessor.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/JdbcOperationsDependsOnPostProcessor.java index cb15701cd9..ef375dec4d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/JdbcOperationsDependsOnPostProcessor.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/JdbcOperationsDependsOnPostProcessor.java @@ -29,6 +29,7 @@ import org.springframework.jdbc.core.JdbcOperations; * @author Dave Syer * @author Phillip Webb * @author Andy Wilkinson + * @author Andrii Hrytsiuk * @since 2.0.4 * @see BeanDefinition#setDependsOn(String[]) */ @@ -47,6 +48,7 @@ public class JdbcOperationsDependsOnPostProcessor extends AbstractDependsOnBeanF * Creates a new {@code JdbcOperationsDependsOnPostProcessor} that will set up * dependencies upon beans with the given types. * @param dependsOn types of the beans to depend upon + * @since 2.1.8 */ public JdbcOperationsDependsOnPostProcessor(Class... dependsOn) { super(JdbcOperations.class, dependsOn); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/NamedParameterJdbcOperationsDependsOnPostProcessor.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/NamedParameterJdbcOperationsDependsOnPostProcessor.java index 3a72a59afc..d7174a61a2 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/NamedParameterJdbcOperationsDependsOnPostProcessor.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/NamedParameterJdbcOperationsDependsOnPostProcessor.java @@ -27,6 +27,7 @@ import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations; * beans. * * @author Dan Zheng + * @author Andrii Hrytsiuk * @since 2.1.4 * @see BeanDefinition#setDependsOn(String[]) */ @@ -45,6 +46,7 @@ public class NamedParameterJdbcOperationsDependsOnPostProcessor extends Abstract * Creates a new {@code NamedParameterJdbcOperationsDependsOnPostProcessor} that will * set up dependencies upon beans with the given types. * @param dependsOn types of the beans to depend upon + * @since 2.1.8 */ public NamedParameterJdbcOperationsDependsOnPostProcessor(Class... dependsOn) { super(NamedParameterJdbcOperations.class, dependsOn); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java index 5cf9afdc73..d3c819c39f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java @@ -63,6 +63,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Stephane Nicoll * @author Dominic Gunn * @author András Deák + * @author Andrii Hrytsiuk */ public class LiquibaseAutoConfigurationTests { @@ -303,7 +304,7 @@ public class LiquibaseAutoConfigurationTests { } @Test - void userConfigurationBeans() { + public void userConfigurationBeans() { this.contextRunner .withUserConfiguration(LiquibaseUserConfiguration.class, EmbeddedDataSourceConfiguration.class) .run((context) -> { @@ -313,7 +314,7 @@ public class LiquibaseAutoConfigurationTests { } @Test - void userConfigurationJdbcTemplateDependency() { + public void userConfigurationJdbcTemplateDependency() { this.contextRunner.withConfiguration(AutoConfigurations.of(JdbcTemplateAutoConfiguration.class)) .withUserConfiguration(LiquibaseUserConfiguration.class, EmbeddedDataSourceConfiguration.class) .run((context) -> {