Skip to content

Commit 60a9a00

Browse files
committed
Pass entity in repository delete(entity) and deleteAll(entities). (#1726)
Closes #1725.
1 parent 766ff60 commit 60a9a00

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/main/java/org/springframework/data/couchbase/repository/support/SimpleCouchbaseRepository.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public void deleteById(ID id) {
111111
@Override
112112
public void delete(T entity) {
113113
Assert.notNull(entity, "Entity must not be null!");
114-
operations.removeById(getJavaType()).inScope(getScope()).inCollection(getCollection()).one(getId(entity));
114+
operations.removeById(getJavaType()).inScope(getScope()).inCollection(getCollection()).oneEntity(entity);
115115
}
116116

117117
@Override
@@ -125,7 +125,7 @@ public void deleteAllById(Iterable<? extends ID> ids) {
125125
public void deleteAll(Iterable<? extends T> entities) {
126126
Assert.notNull(entities, "The given Iterable of entities must not be null!");
127127
operations.removeById(getJavaType()).inScope(getScope()).inCollection(getCollection())
128-
.all(Streamable.of(entities).map(this::getId).toList());
128+
.allEntities((Collection<Object>)Streamable.of(entities).toList());
129129
}
130130

131131
@Override

src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryKeyValueIntegrationTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ void saveReplaceUpsertInsert() {
113113
assertThrows(DuplicateKeyException.class, () -> userRepository.save(user));
114114
user.setVersion(saveVersion + 1);
115115
assertThrows(OptimisticLockingFailureException.class, () -> userRepository.save(user));
116-
userRepository.delete(user);
116+
userRepository.deleteById(user.getId());
117117

118118
// Airline does not have a version
119119
Airline airline = new Airline(UUID.randomUUID().toString(), "MyAirline", null);

0 commit comments

Comments
 (0)