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

Polishing.

Browse Source 
Simplify invocation chain, simplify tests.

See #1248
Original pull request: #1249.
This commit is contained in:
Mark Paluch
2022-03-28 10:48:55 +02:00
parent 0509bf58ed
commit 9686749178
2 changed files with 9 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,6 +36,7 @@ import com.datastax.oss.driver.api.core.CqlIdentifier;
* @author Lukasz Antoniak
* @author Tomasz Lelek
* @author Sam Lightfoot
* @author Thomas Strauß
* @see QueryOptions
*/
public class WriteOptions extends QueryOptions {
@@ -274,12 +275,7 @@ public class WriteOptions extends QueryOptions {
* @return {@code this} {@link WriteOptionsBuilder}
*/
public WriteOptionsBuilder ttl(int ttl) {
Assert.isTrue(ttl >= 0, "TTL must be greater than equal to zero");
this.ttl = Duration.ofSeconds(ttl);
return this;
return ttl(Duration.ofSeconds(ttl));
}
/**

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

@@ -62,8 +62,7 @@ class WriteOptionsUnitTests {
assertThat(writeOptions.getTracing()).isTrue();
assertThat(writeOptions.getKeyspace()).isEqualTo(CqlIdentifier.fromCql("my_keyspace"));
assertThat(writeOptions.isIdempotent()).isEqualTo(true);
assertThat(writeOptions.getRoutingKeyspace()).isEqualTo(
CqlIdentifier.fromCql("routing_keyspace"));
assertThat(writeOptions.getRoutingKeyspace()).isEqualTo(CqlIdentifier.fromCql("routing_keyspace"));
assertThat(writeOptions.getRoutingKey()).isEqualTo(ByteBuffer.allocate(1));
}
@@ -104,36 +103,20 @@ class WriteOptionsUnitTests {
assertThat(mutated.getPageSize()).isEqualTo(10);
assertThat(mutated.getTracing()).isTrue();
assertThat(writeOptions.isIdempotent()).isEqualTo(true);
assertThat(writeOptions.getRoutingKeyspace()).isEqualTo(
CqlIdentifier.fromCql("routing_keyspace"));
assertThat(writeOptions.getRoutingKeyspace()).isEqualTo(CqlIdentifier.fromCql("routing_keyspace"));
assertThat(writeOptions.getRoutingKey()).isEqualTo(ByteBuffer.allocate(1));
}
@Test // GH-1248
void buildWriteOptionsWithTtlDurationZero() {
try {
WriteOptions writeOptions = WriteOptions.builder()
.ttl(Duration.ZERO)
.build();
fail("WiteOptionsBuilder must not allow zero TTL");
}
catch (Exception e) {
// expected behavior
}
assertThatIllegalArgumentException().isThrownBy(() -> WriteOptions.builder().ttl(0));
assertThatIllegalArgumentException().isThrownBy(() -> WriteOptions.builder().ttl(Duration.ZERO));
}
@Test // GH-1248
void buildWriteOptionsWithTtlNegativeDuration() {
try {
WriteOptions writeOptions = WriteOptions.builder()
.ttl(Duration.of(-1, ChronoUnit.MICROS))
.build();
fail("WiteOptionsBuilder must not allow negative TTL");
}
catch (Exception e) {
// expected behavior
}
assertThatIllegalArgumentException().isThrownBy(() -> WriteOptions.builder().ttl(-1));
assertThatIllegalArgumentException()
.isThrownBy(() -> WriteOptions.builder().ttl(Duration.of(-1, ChronoUnit.MICROS)));
}
}