From 0c2f49e253cabbe1b386c061ee8c60ddc1896b88 Mon Sep 17 00:00:00 2001 From: David Byron Date: Sat, 11 Apr 2026 17:28:14 -0700 Subject: [PATCH] Fix the SingleConnectionDataSource constructor to allow null url, username, password since the underlying AbstractDriverBasedDataSource.setUrl, setUsername and setPassword methods allow null. The @NonNullFields annotation in spring-jdbc/src/main/java/org/springframework/jdbc/datasource/package-info.java requires null without an explicit @Nullable annotation. Signed-off-by: David Byron --- .../datasource/DriverManagerDataSource.java | 4 ++- .../SingleConnectionDataSource.java | 2 +- .../SingleConnectionDataSourceTest.kt | 34 +++++++++++++++++++ 3 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 spring-jdbc/src/test/kotlin/org/springframework/jdbc/datasource/SingleConnectionDataSourceTest.kt diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java index 6a8160063f1b..4be989d0c8f9 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java @@ -21,6 +21,8 @@ import java.sql.SQLException; import java.util.Properties; +import org.jspecify.annotations.Nullable; + import org.springframework.util.Assert; import org.springframework.util.ClassUtils; @@ -90,7 +92,7 @@ public DriverManagerDataSource(String url) { * @param password the JDBC password to use for accessing the DriverManager * @see java.sql.DriverManager#getConnection(String, String, String) */ - public DriverManagerDataSource(String url, String username, String password) { + public DriverManagerDataSource(@Nullable String url, @Nullable String username, @Nullable String password) { setUrl(url); setUsername(username); setPassword(password); diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SingleConnectionDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SingleConnectionDataSource.java index 6cc44269bbb1..bd90136206d6 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SingleConnectionDataSource.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SingleConnectionDataSource.java @@ -93,7 +93,7 @@ public SingleConnectionDataSource() { * close-suppressing proxy or the physical Connection * @see java.sql.DriverManager#getConnection(String, String, String) */ - public SingleConnectionDataSource(String url, String username, String password, boolean suppressClose) { + public SingleConnectionDataSource(@Nullable String url, @Nullable String username, @Nullable String password, boolean suppressClose) { super(url, username, password); this.suppressClose = suppressClose; } diff --git a/spring-jdbc/src/test/kotlin/org/springframework/jdbc/datasource/SingleConnectionDataSourceTest.kt b/spring-jdbc/src/test/kotlin/org/springframework/jdbc/datasource/SingleConnectionDataSourceTest.kt new file mode 100644 index 000000000000..75d58c8353a9 --- /dev/null +++ b/spring-jdbc/src/test/kotlin/org/springframework/jdbc/datasource/SingleConnectionDataSourceTest.kt @@ -0,0 +1,34 @@ +/* + * Copyright 2002-present 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. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.jdbc.datasource + +import org.junit.jupiter.api.Assertions.assertNotNull +import org.junit.jupiter.api.Test + +class SingleConnectionDataSourceTest { + + // The underlying AbstractDriverBasedDataSource.setUrl, setUsername and setPassword + // methods allow null, so ensure the SingleConnectionDataSource constructor does too. + @Test + fun `construct SingleConnectionDataSource with null properties`() { + val url: String? = null + val username: String? = null + val password: String? = null + val singleConnectionDataSource = SingleConnectionDataSource(url, username, password, false /* arbitrary */) + assertNotNull(singleConnectionDataSource) + } +}