From f8c3e0e5aaf3c3c00e5eb1ac688fc738e1cc8cf9 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 8 Jun 2021 14:58:16 -0700 Subject: [PATCH] Respect custom username/password properties Fix a bug in `DataSourceInitializationConfiguration` and in `R2dbcInitializationConfiguration` that was stopping custom username/password properties from being applied. Fixes gh-26676 --- .../sql/init/DataSourceInitializationConfiguration.java | 2 +- .../sql/init/R2dbcInitializationConfiguration.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sql/init/DataSourceInitializationConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sql/init/DataSourceInitializationConfiguration.java index e836d8dc0013..8a7089a48767 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sql/init/DataSourceInitializationConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sql/init/DataSourceInitializationConfiguration.java @@ -44,7 +44,7 @@ DataSourceScriptDatabaseInitializer dataSourceScriptDatabaseInitializer(DataSour private static DataSource determineDataSource(DataSource dataSource, String username, String password) { if (StringUtils.hasText(username) && StringUtils.hasText(password)) { - DataSourceBuilder.derivedFrom(dataSource).username(username).password(password) + return DataSourceBuilder.derivedFrom(dataSource).username(username).password(password) .type(SimpleDriverDataSource.class).build(); } return dataSource; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sql/init/R2dbcInitializationConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sql/init/R2dbcInitializationConfiguration.java index e6aee342edf4..8bf8621337c0 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sql/init/R2dbcInitializationConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sql/init/R2dbcInitializationConfiguration.java @@ -50,7 +50,7 @@ R2dbcScriptDatabaseInitializer r2dbcScriptDatabaseInitializer(ConnectionFactory private static ConnectionFactory determineConnectionFactory(ConnectionFactory connectionFactory, String username, String password) { if (StringUtils.hasText(username) && StringUtils.hasText(password)) { - ConnectionFactoryBuilder.derivefrom(connectionFactory).username(username).password(password).build(); + return ConnectionFactoryBuilder.derivefrom(connectionFactory).username(username).password(password).build(); } return connectionFactory; }