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

DATACOUCH-666 - Handle immutable entity in replace. (#288)

Browse Source 
Co-authored-by: mikereiche <michael.reiche@couchbase.com>
This commit is contained in:
Michael Reiche
2020-12-09 08:07:16 -08:00
committed by GitHub
parent 7aeb5e463d
commit 3d7743920f
4 changed files with 49 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/springframework/data/couchbase/core/ReactiveReplaceByIdOperationSupport.java
View File

@@ -72,10 +72,8 @@ public class ReactiveReplaceByIdOperationSupport implements ReactiveReplaceByIdO
return Mono.just(object).flatMap(o -> {
CouchbaseDocument converted = template.support().encodeEntity(o);
return template.getCollection(collection).reactive()
.replace(converted.getId(), converted.export(), buildReplaceOptions(o)).map(result -> {
template.support().applyUpdatedCas(o, result.cas());
return o;
});
.replace(converted.getId(), converted.export(), buildReplaceOptions(o)).map(result ->
(T)template.support().applyUpdatedCas(o, result.cas()));
}).onErrorMap(throwable -> {
if (throwable instanceof RuntimeException) {
return template.potentiallyConvertRuntimeException((RuntimeException) throwable);

83
src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateKeyValueIntegrationTests.java
View File

@@ -40,6 +40,7 @@ import org.springframework.dao.DuplicateKeyException;
import org.springframework.data.couchbase.CouchbaseClientFactory;
import org.springframework.data.couchbase.SimpleCouchbaseClientFactory;
import org.springframework.data.couchbase.domain.Config;
import org.springframework.data.couchbase.domain.PersonValue;
import org.springframework.data.couchbase.domain.User;
import org.springframework.data.couchbase.domain.UserAnnotated;
import org.springframework.data.couchbase.util.ClusterAwareIntegrationTests;
@@ -146,44 +147,6 @@ class CouchbaseTemplateKeyValueIntegrationTests extends ClusterAwareIntegrationT
}
}
@Test
void replaceWithExpiry() {
User user = new User(UUID.randomUUID().toString(), "firstname", "lastname");
try {
User modified = couchbaseTemplate.upsertById(User.class).withExpiry(Duration.ofSeconds(1)).one(user);
couchbaseTemplate.replaceById(User.class).withExpiry(Duration.ofSeconds(1)).one(user);
assertEquals(user, modified);
sleepSecs(2);
User found = couchbaseTemplate.findById(User.class).one(user.getId());
assertNull(found, "found should have been null as document should be expired");
} finally {
try {
couchbaseTemplate.removeById().one(user.getId());
} catch (DataRetrievalFailureException e) {
//
}
}
}
@Test
void replaceWithExpiryAnnotation() {
UserAnnotated user = new UserAnnotated(UUID.randomUUID().toString(), "firstname", "lastname");
try {
UserAnnotated modified = couchbaseTemplate.upsertById(UserAnnotated.class).one(user);
modified = couchbaseTemplate.replaceById(UserAnnotated.class).one(user);
assertEquals(user, modified);
sleepSecs(6);
User found = couchbaseTemplate.findById(UserAnnotated.class).one(user.getId());
assertNull(found, "found should have been null as document should be expired");
} finally {
try {
couchbaseTemplate.removeById().one(user.getId());
} catch (DataRetrievalFailureException e) {
//
}
}
}
@Test
void findDocWhichDoesNotExist() {
assertNull(couchbaseTemplate.findById(User.class).one(UUID.randomUUID().toString()));
@@ -293,6 +256,50 @@ class CouchbaseTemplateKeyValueIntegrationTests extends ClusterAwareIntegrationT
}
@Test
@IgnoreWhen(clusterTypes = ClusterType.MOCKED)
void saveAndFindImmutableById() {
PersonValue personValue = new PersonValue(null, 123, "f", "l");
System.out.println("personValue: " + personValue);
// personValue = personValue.withVersion(123);
PersonValue inserted = null;
PersonValue upserted = null;
PersonValue replaced = null;
try {
inserted = couchbaseTemplate.insertById(PersonValue.class).one(personValue);
assertNotEquals(0, inserted.getVersion());
PersonValue foundInserted = couchbaseTemplate.findById(PersonValue.class).one(inserted.getId());
assertNotNull(foundInserted, "inserted personValue not found");
assertEquals(inserted, foundInserted);
// upsert will be inserted
couchbaseTemplate.removeById().one(inserted.getId());
upserted = couchbaseTemplate.upsertById(PersonValue.class).one(inserted);
assertNotEquals(0, upserted.getVersion());
PersonValue foundUpserted = couchbaseTemplate.findById(PersonValue.class).one(upserted.getId());
assertNotNull(foundUpserted, "upserted personValue not found");
assertEquals(upserted, foundUpserted);
// upsert will be replaced
upserted = couchbaseTemplate.upsertById(PersonValue.class).one(inserted);
assertNotEquals(0, upserted.getVersion());
PersonValue foundUpserted2 = couchbaseTemplate.findById(PersonValue.class).one(upserted.getId());
assertNotNull(foundUpserted2, "upserted personValue not found");
assertEquals(upserted, foundUpserted2);
replaced = couchbaseTemplate.replaceById(PersonValue.class).one(upserted);
assertNotEquals(0, replaced.getVersion());
PersonValue foundReplaced = couchbaseTemplate.findById(PersonValue.class).one(replaced.getId());
assertNotNull(foundReplaced, "replaced personValue not found");
assertEquals(replaced, foundReplaced);
} finally {
couchbaseTemplate.removeById().one(inserted.getId());
}
}
private void sleepSecs(int i) {
try {
Thread.sleep(i * 1000);

3
src/test/java/org/springframework/data/couchbase/domain/PersonValue.java
View File

@@ -35,7 +35,8 @@ import org.springframework.data.couchbase.core.mapping.id.GenerationStrategy;
public class PersonValue {
@Id @GeneratedValue(strategy = GenerationStrategy.UNIQUE)
@With String id;
// @Version @With
@Version
@With
long version;
@Field String firstname;
@Field String lastname;

4
src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryKeyValueIntegrationTests.java
View File

@@ -99,13 +99,9 @@ public class CouchbaseRepositoryKeyValueIntegrationTests extends ClusterAwareInt
@IgnoreWhen(clusterTypes = ClusterType.MOCKED)
void saveAndFindImmutableById() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
PersonValue personValue = new PersonValue(null, 0, "f", "l");
//assertFalse(personValueRepository.existsById(personValue.getId()));
personValue = personValueRepository.save(personValue);
Optional<PersonValue> found = personValueRepository.findById(personValue.getId());
assertTrue(found.isPresent());
Method m = PersonValue.class.getMethod("equals", Object.class);
m.invoke(personValue, new Object[] { found.get() });
personValue.equals(found.get());
assertEquals(personValue, found.get());
personValueRepository.delete(personValue);
}