Respect custom username/password properties

Fix a bug in `DataSourceInitializationConfiguration` that was stopping custom username/password properties from being applied. Fixes gh-26676
spring-projects · May 26, 2021 · e559484 · e559484
1 parent 7d60936
commit e559484
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/...va/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializationConfiguration.java b/...va/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializationConfiguration.java
@@ -64,7 +64,7 @@ class DataSourceInitializationConfiguration {
 
 	private static DataSource determineDataSource(Supplier<DataSource> dataSource, String username, String password) {
 		if (StringUtils.hasText(username) && StringUtils.hasText(password)) {
-			DataSourceBuilder.derivedFrom(dataSource.get()).type(SimpleDriverDataSource.class).username(username)
+			return DataSourceBuilder.derivedFrom(dataSource.get()).type(SimpleDriverDataSource.class).username(username)
 					.password(password).build();
 		}
 		return dataSource.get();

diff --git a/...org/springframework/boot/autoconfigure/jdbc/DataSourceInitializationIntegrationTests.java b/...org/springframework/boot/autoconfigure/jdbc/DataSourceInitializationIntegrationTests.java
@@ -198,7 +198,9 @@ void dataSourceInitializedWithSchemaCredentials() {
 						"spring.datasource.schema-username:admin", "spring.datasource.schema-password:admin")
 				.run((context) -> {
 					assertThat(context).hasFailed();
-					assertThat(context.getStartupFailure()).isInstanceOf(BeanCreationException.class);
+					assertThat(context.getStartupFailure()).isInstanceOf(BeanCreationException.class)
+							.hasMessageContaining("invalid authorization specification");
+					context.getStartupFailure().printStackTrace();
 				});
 	}
 
@@ -212,7 +214,8 @@ void dataSourceInitializedWithDataCredentials() {
 						"spring.datasource.data-username:admin", "spring.datasource.data-password:admin")
 				.run((context) -> {
 					assertThat(context).hasFailed();
-					assertThat(context.getStartupFailure()).isInstanceOf(BeanCreationException.class);
+					assertThat(context.getStartupFailure()).isInstanceOf(BeanCreationException.class)
+							.hasMessageContaining("invalid authorization specification");
 				});
 	}