From db82073512d6509b66d8aedd8df24c965dd84a00 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 7 Dec 2021 09:22:24 +0100 Subject: [PATCH] Polishing. Remove unused imports. Use more explicit lambda parameter naming. Original pull request: #690. See #689 --- .../data/r2dbc/core/DefaultDatabaseClient.java | 2 +- .../data/r2dbc/core/R2dbcEntityTemplate.java | 16 ++++++++-------- .../r2dbc/core/R2dbcEntityTemplateUnitTests.java | 1 - 3 files changed, 9 insertions(+), 10 deletions(-) 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 9fe58ba..16a083d 100644 --- a/src/main/java/org/springframework/data/r2dbc/core/DefaultDatabaseClient.java +++ b/src/main/java/org/springframework/data/r2dbc/core/DefaultDatabaseClient.java @@ -1486,7 +1486,7 @@ class DefaultDatabaseClient implements DatabaseClient, ConnectionAccessor { String sql = getRequiredSql(operation); Function insertFunction = wrapPreparedOperation(sql, operation) - .andThen(statement -> statement.returnGeneratedValues()); + .andThen(Statement::returnGeneratedValues); Function> resultFunction = toFunction(sql, StatementFilterFunctions.empty(), insertFunction); diff --git a/src/main/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplate.java b/src/main/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplate.java index 3bec1f3..1718bd4 100644 --- a/src/main/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplate.java +++ b/src/main/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplate.java @@ -542,9 +542,9 @@ public class R2dbcEntityTemplate implements R2dbcEntityOperations, BeanFactoryAw RelationalPersistentEntity persistentEntity = getRequiredEntity(entity); - return maybeCallBeforeConvert(entity, tableName).flatMap(it -> { + return maybeCallBeforeConvert(entity, tableName).flatMap(onBeforeConvert -> { - T initializedEntity = setVersionIfNecessary(persistentEntity, it); + T initializedEntity = setVersionIfNecessary(persistentEntity, onBeforeConvert); OutboundRow outboundRow = dataAccessStrategy.getOutboundRow(initializedEntity); @@ -647,25 +647,25 @@ public class R2dbcEntityTemplate implements R2dbcEntityOperations, BeanFactoryAw RelationalPersistentEntity persistentEntity = getRequiredEntity(entity); - return maybeCallBeforeConvert(entity, tableName).flatMap(it -> { + return maybeCallBeforeConvert(entity, tableName).flatMap(onBeforeConvert -> { T entityToUse; Criteria matchingVersionCriteria; if (persistentEntity.hasVersionProperty()) { - matchingVersionCriteria = createMatchingVersionCriteria(it, persistentEntity); - entityToUse = incrementVersion(persistentEntity, it); + matchingVersionCriteria = createMatchingVersionCriteria(onBeforeConvert, persistentEntity); + entityToUse = incrementVersion(persistentEntity, onBeforeConvert); } else { - entityToUse = it; + entityToUse = onBeforeConvert; matchingVersionCriteria = null; } OutboundRow outboundRow = dataAccessStrategy.getOutboundRow(entityToUse); return maybeCallBeforeSave(entityToUse, outboundRow, tableName) // - .flatMap(entityToSave -> { + .flatMap(onBeforeSave -> { SqlIdentifier idColumn = persistentEntity.getRequiredIdProperty().getColumnName(); Parameter id = outboundRow.remove(idColumn); @@ -675,7 +675,7 @@ public class R2dbcEntityTemplate implements R2dbcEntityOperations, BeanFactoryAw criteria = criteria.and(matchingVersionCriteria); } - return doUpdate(entityToSave, tableName, persistentEntity, criteria, outboundRow); + return doUpdate(onBeforeSave, tableName, persistentEntity, criteria, outboundRow); }); }); } diff --git a/src/test/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplateUnitTests.java b/src/test/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplateUnitTests.java index 104c274..bcca246 100644 --- a/src/test/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplateUnitTests.java +++ b/src/test/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplateUnitTests.java @@ -22,7 +22,6 @@ import io.r2dbc.spi.test.MockColumnMetadata; import io.r2dbc.spi.test.MockResult; import io.r2dbc.spi.test.MockRow; import io.r2dbc.spi.test.MockRowMetadata; -import lombok.ToString; import lombok.Value; import lombok.With; import reactor.core.publisher.Mono;