Spring/spring-data-r2dbc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing.

Browse Source 
Remove unused imports. Use more explicit lambda parameter naming.

Original pull request: #690.
See #689
This commit is contained in:
Mark Paluch
2021-12-07 09:22:24 +01:00
parent 2a0603054f
commit db82073512
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/springframework/data/r2dbc/core/DefaultDatabaseClient.java
View File

@@ -1486,7 +1486,7 @@ class DefaultDatabaseClient implements DatabaseClient, ConnectionAccessor {
String sql = getRequiredSql(operation);
Function<Connection, Statement> insertFunction = wrapPreparedOperation(sql, operation)
.andThen(statement -> statement.returnGeneratedValues());
.andThen(Statement::returnGeneratedValues);
Function<Connection, Flux<Result>> resultFunction = toFunction(sql, StatementFilterFunctions.empty(),
insertFunction);

16
src/main/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplate.java
View File

@@ -542,9 +542,9 @@ public class R2dbcEntityTemplate implements R2dbcEntityOperations, BeanFactoryAw
RelationalPersistentEntity<T> 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<T> 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);
});
});
}

1
src/test/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplateUnitTests.java
View File

@@ -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;