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

Align @Indexed(expireAfter) with expireAfterSeconds.

Browse Source 
This commit fixes an issue where expireAfter=0s behaves differently from expireAfterSeconds=0 where the former would not be applied.

Closes #4844
Original pull request: #4848
This commit is contained in:
Christoph Strobl
2024-12-06 13:11:26 +01:00
committed by Mark Paluch
parent d6fe3c0ec7
commit ad39a43582
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexResolver.java
View File

@@ -563,7 +563,7 @@ public class MongoPersistentEntityIndexResolver implements IndexResolver {
Duration timeout = computeIndexTimeout(index.expireAfter(),
() -> getEvaluationContextForProperty(persistentProperty.getOwner()));
if (!timeout.isZero() && !timeout.isNegative()) {
if (!timeout.isNegative()) {
indexDefinition.expire(timeout);
}
}

14
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexResolverUnitTests.java
View File

@@ -222,6 +222,15 @@ public class MongoPersistentEntityIndexResolverUnitTests {
assertThat(indexDefinitions.get(0).getIndexOptions()).containsEntry("expireAfterSeconds", 600L);
}
@Test // GH-4844
public void shouldResolveZeroTimeoutFromString() {
List<IndexDefinitionHolder> indexDefinitions = prepareMappingContextAndResolveIndexForType(
WithExpireAfterZeroSecondsAsPlainString.class);
assertThat(indexDefinitions.get(0).getIndexOptions()).containsEntry("expireAfterSeconds", 0L);
}
@Test // DATAMONGO-2112
public void shouldResolveTimeoutFromIso8601String() {
@@ -383,6 +392,11 @@ public class MongoPersistentEntityIndexResolverUnitTests {
@Indexed(expireAfter = "10m") String withTimeout;
}
@Document
class WithExpireAfterZeroSecondsAsPlainString {
@Indexed(expireAfter = "0s") String withTimeout;
}
@Document
class WithIso8601Style {
@Indexed(expireAfter = "P1D") String withTimeout;