root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Polish 

Closes gh-16299
This commit is contained in:
Johnny Lim 2019-03-25 22:15:47 +09:00 committed by Stephane Nicoll
parent 89f93b28d7
commit 40d0d6b113
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayMigrationScriptMissingException.java
View File

@ -32,8 +32,8 @@ public class FlywayMigrationScriptMissingException extends RuntimeException {
FlywayMigrationScriptMissingException(List<String> locations) { FlywayMigrationScriptMissingException(List<String> locations) {
super(locations.isEmpty() ? "Migration script locations not configured" super(locations.isEmpty() ? "Migration script locations not configured"
: "Cannot find migrations location in: " + locations : "Cannot find migration scripts in: " + locations
+ " (please add migrations or check your Flyway configuration)"); + " (please add migration scripts or check your Flyway configuration)");
this.locations = new ArrayList<>(locations); this.locations = new ArrayList<>(locations);
} }

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

@ -209,7 +209,7 @@ public class FlywayAutoConfigurationTests {
assertThat(context).getFailure() assertThat(context).getFailure()
.isInstanceOf(BeanCreationException.class); .isInstanceOf(BeanCreationException.class);
assertThat(context).getFailure() assertThat(context).getFailure()
.hasMessageContaining("Cannot find migrations location in"); .hasMessageContaining("Cannot find migration scripts in");
}); });
} }

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java
View File

@ -75,7 +75,7 @@ import org.springframework.util.StringUtils;
* properties from well known file locations. By default properties will be loaded from * properties from well known file locations. By default properties will be loaded from
* 'application.properties' and/or 'application.yml' files in the following locations: * 'application.properties' and/or 'application.yml' files in the following locations:
* <ul> * <ul>
* <li>file:./config/:</li> * <li>file:./config/</li>
* <li>file:./</li> * <li>file:./</li>
* <li>classpath:config/</li> * <li>classpath:config/</li>
* <li>classpath:</li> * <li>classpath:</li>