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

DATAJDBC-481 - Properly increase version of immutable aggregate roots on update.

Browse Source
This commit is contained in:
Jens Schauder
2020-01-30 10:05:37 +01:00
parent 2f9d4b2c83
commit d77e9cd837
3 changed files with 46 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/AggregateChangeExecutor.java
View File

@@ -68,18 +68,21 @@ class AggregateChangeExecutor {
List<DbAction<?>> actions = new ArrayList<>();
aggregateChange.forEachAction(action -> {
action.executeWith(interpreter);
actions.add(action);
});
T newRoot = populateIdsIfNecessary(actions);
if (newRoot != null) {
newRoot = populateRootVersionIfNecessary(newRoot, actions);
aggregateChange.setEntity(newRoot);
T root = populateIdsIfNecessary(actions);
root = root == null ? aggregateChange.getEntity() : root;
if (root != null) {
root = populateRootVersionIfNecessary(root, actions);
aggregateChange.setEntity(root);
}
}
@SuppressWarnings("unchecked")
private <T> T populateRootVersionIfNecessary(T newRoot, List<DbAction<?>> actions) {
// Does the root entity have a version attribute?
@@ -90,7 +93,8 @@ class AggregateChangeExecutor {
}
// Find the root action
Optional<DbAction<?>> rootAction = actions.parallelStream().filter(action -> action instanceof DbAction.WithVersion)
Optional<DbAction<?>> rootAction = actions.parallelStream() //
.filter(action -> action instanceof DbAction.WithVersion) //
.findFirst();
if (!rootAction.isPresent()) {

49
spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/DefaultJdbcInterpreter.java
View File

@@ -118,30 +118,37 @@ class DefaultJdbcInterpreter implements Interpreter {
RelationalPersistentEntity<T> persistentEntity = getRequiredPersistentEntity(update.getEntityType());
if (persistentEntity.hasVersionProperty()) {
// If the root aggregate has a version property, increment it.
Number previousVersion = RelationalEntityVersionUtils.getVersionNumberFromEntity(update.getEntity(),
persistentEntity, converter);
Assert.notNull(previousVersion, "The root aggregate cannot be updated because the version property is null.");
T rootEntity = RelationalEntityVersionUtils.setVersionNumberOnEntity(update.getEntity(),
previousVersion.longValue() + 1, persistentEntity, converter);
if (accessStrategy.updateWithVersion(rootEntity, update.getEntityType(), previousVersion)) {
// Successful update, set the in-memory version on the action.
update.setNextVersion(previousVersion);
} else {
throw new OptimisticLockingFailureException(
String.format(UPDATE_FAILED_OPTIMISTIC_LOCKING, update.getEntity()));
}
updateWithVersion(update, persistentEntity);
} else {
updateWithoutVersion(update);
}
}
if (!accessStrategy.update(update.getEntity(), update.getEntityType())) {
private <T> void updateWithoutVersion(UpdateRoot<T> update) {
throw new IncorrectUpdateSemanticsDataAccessException(
String.format(UPDATE_FAILED, update.getEntity(), getIdFrom(update)));
}
if (!accessStrategy.update(update.getEntity(), update.getEntityType())) {
throw new IncorrectUpdateSemanticsDataAccessException(
String.format(UPDATE_FAILED, update.getEntity(), getIdFrom(update)));
}
}
private <T> void updateWithVersion(UpdateRoot<T> update, RelationalPersistentEntity<T> persistentEntity) {
// If the root aggregate has a version property, increment it.
Number previousVersion = RelationalEntityVersionUtils.getVersionNumberFromEntity(update.getEntity(),
persistentEntity, converter);
Assert.notNull(previousVersion, "The root aggregate cannot be updated because the version property is null.");
update.setNextVersion(previousVersion.longValue() + 1);
T rootEntity = RelationalEntityVersionUtils.setVersionNumberOnEntity(update.getEntity(), update.getNextVersion(),
persistentEntity, converter);
if (!accessStrategy.updateWithVersion(rootEntity, update.getEntityType(), previousVersion)) {
throw new OptimisticLockingFailureException(
String.format(UPDATE_FAILED_OPTIMISTIC_LOCKING, update.getEntity()));
}
}

14
spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateTemplateIntegrationTests.java
View File

@@ -709,13 +709,15 @@ public class JdbcAggregateTemplateIntegrationTests {
assertThat(reloadedAggregate.getVersion()).describedAs("version field should initially have the value 1")
.isEqualTo(1L);
AggregateWithImmutableVersion saved = template.save(reloadedAggregate);
AggregateWithImmutableVersion updatedAggregate = template.findById(id, aggregate.getClass());
AggregateWithImmutableVersion savedAgain = template.save(reloadedAggregate);
AggregateWithImmutableVersion reloadedAgain = template.findById(id, aggregate.getClass());
assertThat(saved.version)
.describedAs("returned by save(): "+ saved + " vs. returned by findById(): " + updatedAggregate)
.isEqualTo(updatedAggregate.version);
assertThat(updatedAggregate.getVersion()).describedAs("version field should increment by one with each save")
assertThat(savedAgain.version)
.describedAs("The object returned by save should have an increased version")
.isEqualTo(2L);
assertThat(reloadedAgain.getVersion())
.describedAs("version field should increment by one with each save")
.isEqualTo(2L);
assertThatThrownBy(() -> template.save(new AggregateWithImmutableVersion(id, 1L)))