Browse Source

Polish

pull/768/merge
Phillip Webb 12 years ago
parent
commit
b5451d54ee
  1. 3
      spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
  2. 1
      spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java
  3. 3
      spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseProperties.java
  4. 1
      spring-boot-docs/src/main/asciidoc/howto.adoc

3
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java

@ -41,7 +41,6 @@ import com.googlecode.flyway.core.Flyway; @@ -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 { @@ -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()

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

@ -41,7 +41,6 @@ import org.springframework.util.Assert; @@ -41,7 +41,6 @@ import org.springframework.util.Assert;
* {@link EnableAutoConfiguration Auto-configuration} for Liquibase.
*
* @author Marcel Overdijk
*
* @since 1.1.0
*/
@Configuration

3
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseProperties.java

@ -26,7 +26,6 @@ import org.springframework.boot.context.properties.ConfigurationProperties; @@ -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 { @@ -41,7 +40,7 @@ public class LiquibaseProperties {
private String defaultSchema;
private boolean dropFirst = false;
private boolean dropFirst;
private boolean enabled = true;

1
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 @@ -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

Loading…
Cancel
Save