File tree Expand file tree Collapse file tree 2 files changed +11
-7
lines changed
spring-data-cassandra/src
main/java/org/springframework/data/cassandra/core/cql
test/java/org/springframework/data/cassandra/core/cql Expand file tree Collapse file tree 2 files changed +11
-7
lines changed Original file line number Diff line number Diff line change @@ -145,6 +145,7 @@ public int hashCode() {
145145 * @author Mark Paluch
146146 * @author Lukasz Antoniak
147147 * @author Thomas Strauß
148+ * @author Tudor Marc
148149 * @since 1.5
149150 */
150151 public static class WriteOptionsBuilder extends QueryOptionsBuilder {
@@ -288,7 +289,7 @@ public WriteOptionsBuilder ttl(int ttl) {
288289 public WriteOptionsBuilder ttl (Duration ttl ) {
289290
290291 Assert .notNull (ttl , "TTL must not be null" );
291- Assert .isTrue (!ttl .isNegative () && ! ttl . isZero () , "TTL must be greater than equal to zero" );
292+ Assert .isTrue (!ttl .isNegative (), "TTL must be greater than equal to zero" );
292293
293294 this .ttl = ttl ;
294295
Original file line number Diff line number Diff line change 3535 * @author Mark Paluch
3636 * @author Sam Lightfoot
3737 * @author Thomas Strauß
38+ * @author Tudor Marc
3839 */
3940class WriteOptionsUnitTests {
4041
@@ -107,16 +108,18 @@ void buildWriteOptionsMutate() {
107108 assertThat (writeOptions .getRoutingKey ()).isEqualTo (ByteBuffer .allocate (1 ));
108109 }
109110
110- @ Test // GH-1248
111- void buildWriteOptionsWithTtlDurationZero () {
112- assertThatIllegalArgumentException ().isThrownBy (() -> WriteOptions .builder ().ttl (0 ));
113- assertThatIllegalArgumentException ().isThrownBy (() -> WriteOptions .builder ().ttl (Duration .ZERO ));
114- }
115-
116111 @ Test // GH-1248
117112 void buildWriteOptionsWithTtlNegativeDuration () {
118113 assertThatIllegalArgumentException ().isThrownBy (() -> WriteOptions .builder ().ttl (-1 ));
119114 assertThatIllegalArgumentException ()
120115 .isThrownBy (() -> WriteOptions .builder ().ttl (Duration .of (-1 , ChronoUnit .MICROS )));
121116 }
117+
118+ @ Test // GH-1262
119+ void buildZeroDurationTtlWriterOptions () {
120+
121+ WriteOptions writeOptions = WriteOptions .builder ().ttl (0 ).build ();
122+
123+ assertThat (writeOptions .getTtl ()).isEqualTo (Duration .ZERO );
124+ }
122125}
You can’t perform that action at this time.
0 commit comments