root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Add @Nullable to value in param() methods in JdbcClient 

Closes gh-31084
This commit is contained in:
Toshiaki Maki 2023-08-21 22:50:38 +09:00 committed by GitHub
parent c2bdc23b5e
commit 8f7d61650d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/DefaultJdbcClient.java
View File

@ -41,6 +41,7 @@ import org.springframework.jdbc.core.namedparam.SimplePropertySqlParameterSource
import org.springframework.jdbc.core.namedparam.SqlParameterSource;
import org.springframework.jdbc.support.KeyHolder;
import org.springframework.jdbc.support.rowset.SqlRowSet;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
/**
@ -102,13 +103,13 @@ final class DefaultJdbcClient implements JdbcClient {
}
@Override
public StatementSpec param(Object value) {
public StatementSpec param(@Nullable Object value) {
this.indexedParams.add(value);
return this;
}
@Override
public StatementSpec param(int jdbcIndex, Object value) {
public StatementSpec param(int jdbcIndex, @Nullable Object value) {
if (jdbcIndex < 1) {
throw new IllegalArgumentException("Invalid JDBC index: needs to start at 1");
}
@ -127,18 +128,18 @@ final class DefaultJdbcClient implements JdbcClient {
}
@Override
public StatementSpec param(int jdbcIndex, Object value, int sqlType) {
public StatementSpec param(int jdbcIndex, @Nullable Object value, int sqlType) {
return param(jdbcIndex, new SqlParameterValue(sqlType, value));
}
@Override
public StatementSpec param(String name, Object value) {
public StatementSpec param(String name, @Nullable Object value) {
this.namedParams.addValue(name, value);
return this;
}
@Override
public StatementSpec param(String name, Object value, int sqlType) {
public StatementSpec param(String name, @Nullable Object value, int sqlType) {
this.namedParams.addValue(name, value, sqlType);
return this;
}

11
spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/JdbcClient.java
View File

@ -35,6 +35,7 @@ import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
import org.springframework.jdbc.core.namedparam.SqlParameterSource;
import org.springframework.jdbc.support.KeyHolder;
import org.springframework.jdbc.support.rowset.SqlRowSet;
import org.springframework.lang.Nullable;
/**
* A fluent {@code JdbcClient} with common JDBC query and update operations,
@ -124,7 +125,7 @@ public interface JdbcClient {
* @return this statement specification (for chaining)
* @see java.sql.PreparedStatement#setObject(int, Object)
*/
StatementSpec param(Object value);
StatementSpec param(@Nullable Object value);
/**
* Bind a positional JDBC statement parameter for "?" placeholder resolution
@ -134,7 +135,7 @@ public interface JdbcClient {
* @return this statement specification (for chaining)
* @see java.sql.PreparedStatement#setObject(int, Object)
*/
StatementSpec param(int jdbcIndex, Object value);
StatementSpec param(int jdbcIndex, @Nullable Object value);
/**
* Bind a positional JDBC statement parameter for "?" placeholder resolution
@ -145,7 +146,7 @@ public interface JdbcClient {
* @return this statement specification (for chaining)
* @see java.sql.PreparedStatement#setObject(int, Object, int)
*/
StatementSpec param(int jdbcIndex, Object value, int sqlType);
StatementSpec param(int jdbcIndex, @Nullable Object value, int sqlType);
/**
* Bind a named statement parameter for ":x" placeholder resolution,
@ -155,7 +156,7 @@ public interface JdbcClient {
* @return this statement specification (for chaining)
* @see org.springframework.jdbc.core.namedparam.MapSqlParameterSource#addValue(String, Object)
*/
StatementSpec param(String name, Object value);
StatementSpec param(String name, @Nullable Object value);
/**
* Bind a named statement parameter for ":x" placeholder resolution,
@ -166,7 +167,7 @@ public interface JdbcClient {
* @return this statement specification (for chaining)
* @see org.springframework.jdbc.core.namedparam.MapSqlParameterSource#addValue(String, Object, int)
*/
StatementSpec param(String name, Object value, int sqlType);
StatementSpec param(String name, @Nullable Object value, int sqlType);
/**
* Bind a var-args list of positional parameters for "?" placeholder resolution.