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

Drop superfluous class argument from delete methods in JdbcAggregateTemplate.

Browse Source 
Closes: #1315
Original pull request: #1324.
This commit is contained in:
Jens Schauder
2022-08-26 14:37:19 +02:00
committed by Jens Schauder
parent 01e98dc171
commit aef1e34f5e
6 changed files with 60 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/ImmutableAggregateTemplateHsqlIntegrationTests.java
View File

@@ -161,7 +161,7 @@ public class ImmutableAggregateTemplateHsqlIntegrationTests {
LegoSet saved = template.save(legoSet);
template.delete(saved, LegoSet.class);
template.delete(saved);
SoftAssertions softly = new SoftAssertions();

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

@@ -305,7 +305,7 @@ class JdbcAggregateTemplateIntegrationTests {
template.save(legoSet);
template.delete(legoSet, LegoSet.class);
template.delete(legoSet);
assertSoftly(softly -> {
@@ -338,7 +338,7 @@ class JdbcAggregateTemplateIntegrationTests {
LegoSet legoSet2 = template.save(createLegoSet("Some Name"));
template.save(createLegoSet("Some other Name"));
template.deleteAll(List.of(legoSet1, legoSet2), LegoSet.class);
template.deleteAll(List.of(legoSet1, legoSet2));
assertSoftly(softly -> {
@@ -378,8 +378,7 @@ class JdbcAggregateTemplateIntegrationTests {
assertThat(template.count(AggregateWithImmutableVersion.class)).isEqualTo(3);
template.deleteAll(List.of(savedAggregate1, twiceSavedAggregate2, twiceSavedAggregate3),
AggregateWithImmutableVersion.class);
template.deleteAll(List.of(savedAggregate1, twiceSavedAggregate2, twiceSavedAggregate3));
assertThat(template.count(AggregateWithImmutableVersion.class)).isEqualTo(0);
}
@@ -737,7 +736,7 @@ class JdbcAggregateTemplateIntegrationTests {
assertThat(reloaded.four).isEqualTo(chain4.four);
assertThat(reloaded.chain3.chain2.chain1.chain0.zeroValue).isEqualTo(chain4.chain3.chain2.chain1.chain0.zeroValue);
template.delete(chain4, Chain4.class);
template.delete(chain4);
assertThat(count("CHAIN0")).isEqualTo(0);
}
@@ -768,7 +767,7 @@ class JdbcAggregateTemplateIntegrationTests {
assertThat(reloaded.four).isEqualTo(chain4.four);
assertThat(reloaded.chain3.chain2.chain1.chain0.zeroValue).isEqualTo(chain4.chain3.chain2.chain1.chain0.zeroValue);
template.delete(chain4, NoIdChain4.class);
template.delete(chain4);
assertThat(count("CHAIN0")).isEqualTo(0);
}
@@ -913,17 +912,17 @@ class JdbcAggregateTemplateIntegrationTests {
final Long id = aggregate.getId();
assertThatThrownBy(
() -> template.delete(new AggregateWithImmutableVersion(id, 0L), AggregateWithImmutableVersion.class))
() -> template.delete(new AggregateWithImmutableVersion(id, 0L)))
.describedAs("deleting an aggregate with an outdated version should raise an exception")
.isInstanceOf(OptimisticLockingFailureException.class);
assertThatThrownBy(
() -> template.delete(new AggregateWithImmutableVersion(id, 2L), AggregateWithImmutableVersion.class))
() -> template.delete(new AggregateWithImmutableVersion(id, 2L)))
.describedAs("deleting an aggregate with a future version should raise an exception")
.isInstanceOf(OptimisticLockingFailureException.class);
// This should succeed
template.delete(aggregate, AggregateWithImmutableVersion.class);
template.delete(aggregate);
aggregate = new AggregateWithImmutableVersion(null, null);
aggregate = template.save(aggregate);

5
spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateTemplateUnitTests.java
View File

@@ -30,7 +30,6 @@ import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.data.annotation.Id;
import org.springframework.data.annotation.Version;
@@ -247,7 +246,7 @@ public class JdbcAggregateTemplateUnitTests {
EntityWithImmutableVersion entity = new EntityWithImmutableVersion(1L, 1L);
when(callbacks.callback(any(), any(), any())).thenReturn(entity, entity);
template.delete(entity, EntityWithImmutableVersion.class);
template.delete(entity);
ArgumentCaptor<Object> aggregateChangeCaptor = ArgumentCaptor.forClass(Object.class);
verify(callbacks).callback(eq(BeforeDeleteCallback.class), any(), aggregateChangeCaptor.capture());
@@ -264,7 +263,7 @@ public class JdbcAggregateTemplateUnitTests {
when(callbacks.callback(any(Class.class), any(), any())).thenReturn(second);
template.delete(first, SampleEntity.class);
template.delete(first);
verify(callbacks).callback(eq(BeforeDeleteCallback.class), eq(first), any(MutableAggregateChange.class));
verify(callbacks).callback(AfterDeleteCallback.class, second);