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

Merge branch '6.0.x'

This commit is contained in:
Juergen Hoeller 2023-08-16 11:00:58 +02:00
parent 0b99872704 1e75041b00
commit d77595bf2c
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-r2dbc/src/main/java/org/springframework/r2dbc/core/DatabaseClient.java
View File

@ -164,8 +164,7 @@ public interface DatabaseClient extends ConnectionAccessor {
interface GenericExecuteSpec { interface GenericExecuteSpec {
/** /**
* Bind a non-{@code null} value to a parameter identified by its * Bind a non-{@code null} value to a parameter identified by its {@code index}.
* {@code index}. {@code value} can be either a scalar value or {@link io.r2dbc.spi.Parameter}.
* @param index zero based index to bind the parameter to * @param index zero based index to bind the parameter to
* @param value either a scalar value or a {@link io.r2dbc.spi.Parameter} * @param value either a scalar value or a {@link io.r2dbc.spi.Parameter}
*/ */

1
spring-r2dbc/src/main/java/org/springframework/r2dbc/core/DefaultDatabaseClient.java
View File

@ -284,7 +284,6 @@ final class DefaultDatabaseClient implements DatabaseClient {
return new DefaultGenericExecuteSpec(byIndex, this.byName, this.sqlSupplier, this.filterFunction); return new DefaultGenericExecuteSpec(byIndex, this.byName, this.sqlSupplier, this.filterFunction);
} }
@SuppressWarnings("deprecation")
@Override @Override
public DefaultGenericExecuteSpec bind(String name, Object value) { public DefaultGenericExecuteSpec bind(String name, Object value) {
assertNotPreparedOperation(); assertNotPreparedOperation();