Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.7.x' into 3.0.x

Browse Source 
Closes gh-35131
This commit is contained in:
Andy Wilkinson
2023-04-24 15:07:43 +01:00
parent 7f0402f869 90952a2dd9
commit 598e090e8f
2 changed files with 3 additions and 3 deletions
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/FlywayProperties.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2022 the original author or authors.
* Copyright 2012-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -571,7 +571,7 @@ public class FlywayProperties {
}
public String getPassword() {
return (this.password != null) ? this.password : "";
return this.password;
}
public void setPassword(String password) {

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

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