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

Allow WriterOptionsBuilder to set ttl to 0.

Browse Source 
Value 0 tells the Cassandra driver to disable the ttl.

Original pull request: #1270.
Closes #1262
This commit is contained in:
Tudor Marc
2022-05-19 22:43:12 +03:00
committed by Mark Paluch
parent 86457135ca
commit 43405cb4e5
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/WriteOptions.java
View File

@@ -153,6 +153,7 @@ public class WriteOptions extends QueryOptions {
* @author Mark Paluch
* @author Lukasz Antoniak
* @author Thomas Strauß
* @author Tudor Marc
* @since 1.5
*/
public static class WriteOptionsBuilder extends QueryOptionsBuilder {
@@ -341,7 +342,7 @@ public class WriteOptions extends QueryOptions {
public WriteOptionsBuilder ttl(Duration ttl) {
Assert.notNull(ttl, "TTL must not be null");
Assert.isTrue(!ttl.isNegative() && !ttl.isZero(), "TTL must be greater than equal to zero");
Assert.isTrue(!ttl.isNegative(), "TTL must be greater than equal to zero");
this.ttl = ttl;

15
spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/WriteOptionsUnitTests.java
View File

@@ -35,6 +35,7 @@ import com.datastax.oss.driver.api.core.DefaultConsistencyLevel;
* @author Mark Paluch
* @author Sam Lightfoot
* @author Thomas Strauß
* @author Tudor Marc
*/
class WriteOptionsUnitTests {
@@ -107,16 +108,18 @@ class WriteOptionsUnitTests {
assertThat(writeOptions.getRoutingKey()).isEqualTo(ByteBuffer.allocate(1));
}
@Test // GH-1248
void buildWriteOptionsWithTtlDurationZero() {
assertThatIllegalArgumentException().isThrownBy(() -> WriteOptions.builder().ttl(0));
assertThatIllegalArgumentException().isThrownBy(() -> WriteOptions.builder().ttl(Duration.ZERO));
}
@Test // GH-1248
void buildWriteOptionsWithTtlNegativeDuration() {
assertThatIllegalArgumentException().isThrownBy(() -> WriteOptions.builder().ttl(-1));
assertThatIllegalArgumentException()
.isThrownBy(() -> WriteOptions.builder().ttl(Duration.of(-1, ChronoUnit.MICROS)));
}
@Test // GH-1262
void buildZeroDurationTtlWriterOptions() {
WriteOptions writeOptions = WriteOptions.builder().ttl(0).build();
assertThat(writeOptions.getTtl()).isEqualTo(Duration.ZERO);
}
}