spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity

Polish "Avoid NPE in SimpleDataSourceProperties when driver is null"

Browse Source 
See gh-45976
This commit is contained in:
Stéphane Nicoll
2025-06-17 14:53:57 +02:00
parent 1cf0d4e7fe
commit 1f031f5fa6
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DataSourceBuilder.java
+1 -1
View File
@@ -709,7 +709,7 @@ public final class DataSourceBuilder<T extends DataSource> {
SimpleDataSourceProperties() {
add(DataSourceProperty.URL, SimpleDriverDataSource::getUrl, SimpleDriverDataSource::setUrl);
add(DataSourceProperty.DRIVER_CLASS_NAME, Class.class,
(dataSource) -> dataSource.getDriver() == null ? null : dataSource.getDriver().getClass(),
(dataSource) -> (dataSource.getDriver() != null) ? dataSource.getDriver().getClass() : null,
SimpleDriverDataSource::setDriverClass);
add(DataSourceProperty.USERNAME, SimpleDriverDataSource::getUsername, SimpleDriverDataSource::setUsername);
add(DataSourceProperty.PASSWORD, SimpleDriverDataSource::getPassword, SimpleDriverDataSource::setPassword);
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DataSourceBuilderTests.java
+1 -1
View File
@@ -358,7 +358,7 @@ class DataSourceBuilderTests {
}
@Test
void buildWhenDerivedFromSimpleDriverDataSourceWithDriverNotSetSucceeds() throws Exception {
void buildWhenDerivedFromSimpleDriverDataSourceAndDriverNotSetBuilds() {
SimpleDriverDataSource dataSource = new SimpleDriverDataSource();
dataSource.setUsername("test");
dataSource.setPassword("secret");