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

Merge branch '3.0.x' 

Closes gh-35132
This commit is contained in:
Andy Wilkinson 2023-04-24 15:59:21 +01:00
parent 7ffacf43f3 598e090e8f
commit 9cd04c55fb
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -188,8 +188,7 @@ public class FlywayAutoConfiguration {
private void applyConnectionDetails(FlywayConnectionDetails connectionDetails, DataSourceBuilder<?> builder) { private void applyConnectionDetails(FlywayConnectionDetails connectionDetails, DataSourceBuilder<?> builder) {
builder.username(connectionDetails.getUsername()); builder.username(connectionDetails.getUsername());
String password = connectionDetails.getPassword(); builder.password(connectionDetails.getPassword());
builder.password((password != null) ? password : "");
String driverClassName = connectionDetails.getDriverClassName(); String driverClassName = connectionDetails.getDriverClassName();
if (StringUtils.hasText(driverClassName)) { if (StringUtils.hasText(driverClassName)) {
builder.driverClassName(driverClassName); builder.driverClassName(driverClassName);

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

@ -215,7 +215,7 @@ class FlywayAutoConfigurationTests {
DataSource dataSource = context.getBean(Flyway.class).getConfiguration().getDataSource(); DataSource dataSource = context.getBean(Flyway.class).getConfiguration().getDataSource();
assertThat(dataSource).isNotNull(); assertThat(dataSource).isNotNull();
assertThat(dataSource).hasFieldOrPropertyWithValue("username", null); assertThat(dataSource).hasFieldOrPropertyWithValue("username", null);
assertThat(dataSource).hasFieldOrPropertyWithValue("password", ""); assertThat(dataSource).hasFieldOrPropertyWithValue("password", null);
}); });
} }