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

Take expiry from entity class annotation for getAndTouch. (#1640)

Browse Source 
Closes #1634.
This commit is contained in:
Michael Reiche
2023-01-10 14:14:38 -08:00
committed by mikereiche
parent 3cba5d9aad
commit 7800cf7a27
2 changed files with 53 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/org/springframework/data/couchbase/core/ReactiveFindByIdOperationSupport.java
View File

@@ -63,6 +63,8 @@ public class ReactiveFindByIdOperationSupport implements ReactiveFindByIdOperati
private final ReactiveTemplateSupport support;
private final Duration expiry;
private Duration expiryToUse;
ReactiveFindByIdSupport(ReactiveCouchbaseTemplate template, Class<T> domainType, String scope, String collection,
CommonOptions<?> options, List<String> fields, Duration expiry, ReactiveTemplateSupport support) {
this.template = template;
@@ -86,7 +88,7 @@ public class ReactiveFindByIdOperationSupport implements ReactiveFindByIdOperati
ReactiveCollection reactive = template.getCouchbaseClientFactory().withScope(pArgs.getScope())
.getCollection(pArgs.getCollection()).reactive();
if (pArgs.getOptions() instanceof GetAndTouchOptions) {
return reactive.getAndTouch(docId, expiryToUse(), (GetAndTouchOptions) pArgs.getOptions());
return reactive.getAndTouch(docId, expiryToUse, (GetAndTouchOptions) pArgs.getOptions());
} else {
return reactive.get(docId, (GetOptions) pArgs.getOptions());
}
@@ -142,7 +144,18 @@ public class ReactiveFindByIdOperationSupport implements ReactiveFindByIdOperati
private CommonOptions<?> initGetOptions() {
CommonOptions<?> getOptions;
if (expiry != null || options instanceof GetAndTouchOptions) {
final CouchbasePersistentEntity<?> entity = template.getConverter().getMappingContext()
.getRequiredPersistentEntity(domainType);
Duration entityExpiryAnnotation = entity.getExpiryDuration();
if (expiry != null || entityExpiryAnnotation == null || !entityExpiryAnnotation.isZero()
|| options instanceof GetAndTouchOptions) {
if (expiry != null) {
expiryToUse = expiry;
} else if (entityExpiryAnnotation == null || !entityExpiryAnnotation.isZero()) {
expiryToUse = entityExpiryAnnotation;
} else {
expiryToUse = Duration.ZERO;
}
GetAndTouchOptions gOptions = options != null ? (GetAndTouchOptions) options : getAndTouchOptions();
if (gOptions.build().transcoder() == null) {
gOptions.transcoder(RawJsonTranscoder.INSTANCE);
@@ -160,18 +173,7 @@ public class ReactiveFindByIdOperationSupport implements ReactiveFindByIdOperati
}
return getOptions;
}
private Duration expiryToUse() {
Duration expiryToUse = expiry;
if (expiryToUse != null || options instanceof GetAndTouchOptions) {
if (expiryToUse == null) { // GetAndTouchOptions without specifying expiry -> get expiry from annoation
final CouchbasePersistentEntity<?> entity = template.getConverter().getMappingContext()
.getRequiredPersistentEntity(domainType);
expiryToUse = entity.getExpiryDuration();
}
}
return expiryToUse;
}
}
}

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

@@ -112,6 +112,43 @@ class CouchbaseTemplateKeyValueIntegrationTests extends JavaIntegrationTests {
}
@Test
void findByIdWithExpiryAnnotation() {
try {
UserAnnotated user1 = new UserAnnotated(UUID.randomUUID().toString(), "user1", "user1");
UserAnnotated user2 = new UserAnnotated(UUID.randomUUID().toString(), "user2", "user2");
Collection<UserAnnotated> upserts = (Collection<UserAnnotated>) couchbaseTemplate.upsertById(UserAnnotated.class)
.all(Arrays.asList(user1, user2));
// explicitly set expiry to 10 seconds
UserAnnotated foundUser1 = couchbaseTemplate.findById(UserAnnotated.class).withExpiry(Duration.ofSeconds(10)).one(user1.getId());
user1.setVersion(foundUser1.getVersion());// version will have changed
assertEquals(user1, foundUser1);
UserAnnotated foundUser2 = couchbaseTemplate.findById(UserAnnotated.class).withExpiry(Duration.ofSeconds(10)).one(user2.getId());
user2.setVersion(foundUser2.getVersion());// version will have changed
assertEquals(user2, foundUser2);
// now set user1 expiration back to 1 second with getAndTouch using the @Document(expiry=1) annotation
foundUser1 = couchbaseTemplate.findById(UserAnnotated.class).one(user1.getId());
user1.setVersion(foundUser1.getVersion());// version will have changed
assertEquals(user1, foundUser1);
// user1 should be gone, user2 should still be there
int tries = 0;
Collection<User> foundUsers;
do {
sleepSecs(1);
foundUsers = (Collection<User>) couchbaseTemplate.findById(User.class)
.all(Arrays.asList(user1.getId(), user2.getId()));
} while (tries++ < 7 && foundUsers.size() != 1 && !user2.equals(foundUsers.iterator().next()));
assertEquals(1, foundUsers.size(), "should have found exactly 1 user");
assertEquals(user2, foundUsers.iterator().next());
} finally {
couchbaseTemplate.removeByQuery(User.class).withConsistency(QueryScanConsistency.REQUEST_PLUS).all();
}
}
@Test
void upsertAndFindById() {
User user = new User(UUID.randomUUID().toString(), "firstname", "lastname");