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

Rename derivefrom to align with DataSourceBuilder

Browse Source 
Rename the `derivefrom` method in `ConnectionFactoryBuilder` to
`derivedFrom` to align with `DataSourceBuilder`.

Fixes gh-26810
This commit is contained in:
Phillip Webb
2021-06-08 15:00:29 -07:00
parent f8c3e0e5aa
commit b7ac1e6cd7
3 changed files with 21 additions and 5 deletions
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/sql/init/R2dbcInitializationConfiguration.java
View File

@@ -50,7 +50,8 @@ class R2dbcInitializationConfiguration {
private static ConnectionFactory determineConnectionFactory(ConnectionFactory connectionFactory, String username,
String password) {
if (StringUtils.hasText(username) && StringUtils.hasText(password)) {
return ConnectionFactoryBuilder.derivefrom(connectionFactory).username(username).password(password).build();
return ConnectionFactoryBuilder.derivedFrom(connectionFactory).username(username).password(password)
.build();
}
return connectionFactory;
}