spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-17 08:24:13 +00:00
Code Issues Projects Releases Wiki Activity

Refine JdbcTemplate nullability contribution

Browse Source 
Closes gh-37012
This commit is contained in:
Sébastien Deleuze
2026-07-08 16:52:17 +02:00
parent 516a2ca511
commit 16e82cd693
3 changed files with 42 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcOperations.java
+2 -2
View File
@@ -1013,7 +1013,7 @@ public interface JdbcOperations {
* {@link java.sql.Statement#SUCCESS_NO_INFO}/{@link java.sql.Statement#EXECUTE_FAILED})
* @throws DataAccessException if there is any problem issuing the update
*/
int[] batchUpdate(String sql, List<Object[]> batchArgs) throws DataAccessException;
int[] batchUpdate(String sql, List<? extends @Nullable Object[]> batchArgs) throws DataAccessException;
/**
* Execute a batch using the supplied SQL statement with the batch of supplied arguments.
@@ -1026,7 +1026,7 @@ public interface JdbcOperations {
* {@link java.sql.Statement#SUCCESS_NO_INFO}/{@link java.sql.Statement#EXECUTE_FAILED})
* @throws DataAccessException if there is any problem issuing the update
*/
int[] batchUpdate(String sql, List<Object[]> batchArgs, int[] argTypes) throws DataAccessException;
int[] batchUpdate(String sql, List<? extends @Nullable Object[]> batchArgs, int[] argTypes) throws DataAccessException;
/**
* Execute multiple batches using the supplied SQL statement with the collect of supplied
spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java
+2 -2
View File
@@ -1046,12 +1046,12 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
}
@Override
public int[] batchUpdate(String sql, List<@Nullable Object[]> batchArgs) throws DataAccessException {
public int[] batchUpdate(String sql, List<? extends @Nullable Object[]> batchArgs) throws DataAccessException {
return batchUpdate(sql, batchArgs, new int[0]);
}
@Override
public int[] batchUpdate(String sql, List<@Nullable Object[]> batchArgs, int[] argTypes) throws DataAccessException {
public int[] batchUpdate(String sql, List<? extends @Nullable Object[]> batchArgs, int[] argTypes) throws DataAccessException {
if (batchArgs.isEmpty()) {
return new int[0];
}
spring-jdbc/src/test/kotlin/org/springframework/jdbc/core/JdbcOperationsExtensionsTests.kt
+38
View File
@@ -223,4 +223,42 @@ class JdbcOperationsExtensionsTests {
verify { template.query(sql, ofType<RowMapper<Int?>>(), 3) }
}
@Test // gh-37012
fun `batchUpdate with non-null batchArgs`() {
val batchArgs: List<Array<Any>> = listOf(arrayOf(1, "a"), arrayOf(2, "b"))
val result = intArrayOf(1, 1)
every { template.batchUpdate(sql, batchArgs) } returns result
assertThat(template.batchUpdate(sql, batchArgs)).isEqualTo(result)
verify { template.batchUpdate(sql, batchArgs) }
}
@Test // gh-37012
fun `batchUpdate with nullable batchArgs`() {
val batchArgs: List<Array<Any?>> = listOf(arrayOf(1, null), arrayOf(null, "b"))
val result = intArrayOf(1, 1)
every { template.batchUpdate(sql, batchArgs) } returns result
assertThat(template.batchUpdate(sql, batchArgs)).isEqualTo(result)
verify { template.batchUpdate(sql, batchArgs) }
}
@Test // gh-37012
fun `batchUpdate with non-null batchArgs and argTypes`() {
val batchArgs: List<Array<Any>> = listOf(arrayOf(1, "a"), arrayOf(2, "b"))
val argTypes = intArrayOf(JDBCType.INTEGER.vendorTypeNumber, JDBCType.VARCHAR.vendorTypeNumber)
val result = intArrayOf(1, 1)
every { template.batchUpdate(sql, batchArgs, argTypes) } returns result
assertThat(template.batchUpdate(sql, batchArgs, argTypes)).isEqualTo(result)
verify { template.batchUpdate(sql, batchArgs, argTypes) }
}
@Test // gh-37012
fun `batchUpdate with nullable batchArgs and argTypes`() {
val batchArgs: List<Array<Any?>> = listOf(arrayOf(1, null), arrayOf(null, "b"))
val argTypes = intArrayOf(JDBCType.INTEGER.vendorTypeNumber, JDBCType.VARCHAR.vendorTypeNumber)
val result = intArrayOf(1, 1)
every { template.batchUpdate(sql, batchArgs, argTypes) } returns result
assertThat(template.batchUpdate(sql, batchArgs, argTypes)).isEqualTo(result)
verify { template.batchUpdate(sql, batchArgs, argTypes) }
}
}