From b5451d54eeb35b950e8d071f66e4cb773de0ce9b Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Fri, 2 May 2014 13:06:52 +0100 Subject: [PATCH] Polish --- .../boot/autoconfigure/flyway/FlywayAutoConfiguration.java | 3 +-- .../autoconfigure/liquibase/LiquibaseAutoConfiguration.java | 1 - .../boot/autoconfigure/liquibase/LiquibaseProperties.java | 3 +-- spring-boot-docs/src/main/asciidoc/howto.adoc | 1 + 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java index 6190539dc6b..3aa3be768a6 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java @@ -41,7 +41,6 @@ import com.googlecode.flyway.core.Flyway; * {@link EnableAutoConfiguration Auto-configuration} for Flyway database migrations. * * @author Dave Syer - * * @since 1.1.0 */ @Configuration @@ -74,7 +73,7 @@ public class FlywayAutoConfiguration { boolean exists = false; for (String location : this.properties.getLocations()) { Resource resource = this.resourceLoader.getResource(location); - exists = !exists && resource.exists(); + exists = (!exists && resource.exists()); } Assert.state(exists, "Cannot find migrations location in: " + this.properties.getLocations() diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java index 496369965b1..05f14c10ffc 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java @@ -41,7 +41,6 @@ import org.springframework.util.Assert; * {@link EnableAutoConfiguration Auto-configuration} for Liquibase. * * @author Marcel Overdijk - * * @since 1.1.0 */ @Configuration diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseProperties.java index a8adc010c76..93d8565e2c5 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseProperties.java @@ -26,7 +26,6 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * Configuration properties to configure {@link SpringLiquibase}. * * @author Marcel Overdijk - * * @since 1.1.0 */ @ConfigurationProperties(prefix = "liquibase", ignoreUnknownFields = false) @@ -41,7 +40,7 @@ public class LiquibaseProperties { private String defaultSchema; - private boolean dropFirst = false; + private boolean dropFirst; private boolean enabled = true; diff --git a/spring-boot-docs/src/main/asciidoc/howto.adoc b/spring-boot-docs/src/main/asciidoc/howto.adoc index 1745b610093..169a453e0f3 100644 --- a/spring-boot-docs/src/main/asciidoc/howto.adoc +++ b/spring-boot-docs/src/main/asciidoc/howto.adoc @@ -1111,6 +1111,7 @@ There is a {github-code}/spring-boot-samples/spring-boot-sample-flyway[Flyway sa you can see how to set things up. + [[howto-execute-liquibase-database-migrations-on-startup]] ==== Execute Liquibase database migrations on startup To automatically run Liquibase database migrations on startup, add the