From edc6d9b0427ebb52241f9df46041cf8e8a640cc0 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Tue, 17 Mar 2020 11:32:09 +0100 Subject: [PATCH] #289 - Polishing. Minor formatting. Original pull request: #308. --- .../data/r2dbc/core/DefaultDatabaseClient.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/org/springframework/data/r2dbc/core/DefaultDatabaseClient.java b/src/main/java/org/springframework/data/r2dbc/core/DefaultDatabaseClient.java index f4204c9c..5f0fc0f8 100644 --- a/src/main/java/org/springframework/data/r2dbc/core/DefaultDatabaseClient.java +++ b/src/main/java/org/springframework/data/r2dbc/core/DefaultDatabaseClient.java @@ -1237,7 +1237,9 @@ class DefaultDatabaseClient implements DatabaseClient, ConnectionAccessor { SqlIdentifier table; if (StringUtils.isEmpty(this.table)) { + Assert.state(this.typeToUpdate != null, "Type to update must not be null!"); + table = dataAccessStrategy.getTableName(this.typeToUpdate); } else { table = this.table; @@ -1260,6 +1262,7 @@ class DefaultDatabaseClient implements DatabaseClient, ConnectionAccessor { } Assert.state(this.assignments != null, "Update assignments must not be null!"); + StatementMapper.UpdateSpec update = mapper.createUpdate(table, this.assignments); if (this.where != null) { @@ -1403,7 +1406,9 @@ class DefaultDatabaseClient implements DatabaseClient, ConnectionAccessor { SqlIdentifier table; if (StringUtils.isEmpty(this.table)) { + Assert.state(this.typeToDelete != null, "Type to delete must not be null!"); + table = dataAccessStrategy.getTableName(this.typeToDelete); } else { table = this.table; @@ -1495,6 +1500,7 @@ class DefaultDatabaseClient implements DatabaseClient, ConnectionAccessor { return it -> { Flux from = Flux.defer(() -> { + Statement statement = statementFactory.apply(it); return filterFunction.filter(statement, executeFunction); }).cast(Result.class);