Commit acbdd87

committed

Polishing.

Delegate calls from deprecated methods to their replacement methods. Simplify tests. See #1494 Original pull request: #1495

1 parent 74189c7 commit acbdd87Copy full SHA for acbdd87

File tree

-26

lines changed

spring-data-cassandra/src
- main/java/org/springframework/data/cassandra/core/cql
  - QueryOptions.java
- test/java/org/springframework/data/cassandra/core/cql
  - QueryOptionsUnitTests.java

-26

lines changed

Lines changed: 2 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -219,12 +219,10 @@ public boolean equals(@Nullable Object o) {`
`219`	`219`	`return true;`
`220`	`220`	`}`
`221`	`221`
`222`		`- if (!(o instanceof QueryOptions)) {`
	`222`	`+ if (!(o instanceof QueryOptionsoptions)) {`
`223`	`223`	`return false;`
`224`	`224`	`}`
`225`	`225`
`226`		`- QueryOptions options = (QueryOptions) o;`
`227`		`-`
`228`	`226`	`if (!ObjectUtils.nullSafeEquals(consistencyLevel, options.consistencyLevel)) {`
`229`	`227`	`return false;`
`230`	`228`	`}`
`@@ -482,12 +480,7 @@ public QueryOptionsBuilder readTimeout(long readTimeout, TimeUnit timeUnit) {`
`482`	`480`	`*/`
`483`	`481`	`@Deprecated`
`484`	`482`	`public QueryOptionsBuilder readTimeout(Duration readTimeout) {`
`485`		`-`
`486`		`- Assert.isTrue(!readTimeout.isNegative(), "ReadTimeout must be greater than equal to zero");`
`487`		`-`
`488`		`- this.timeout = readTimeout;`
`489`		`-`
`490`		`- return this;`
	`483`	`+ return timeout(readTimeout);`
`491`	`484`	`}`
`492`	`485`
`493`	`486`	`/**`

Lines changed: 2 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -99,22 +99,7 @@ void buildZeroDurationTimeoutQueryOptions() {`
`99`	`99`	`@Test // GH-1494`
`100`	`100`	`void shouldRejectNegativeDurationTimeoutQueryOptions() {`
`101`	`101`
`102`		`- assertThatIllegalArgumentException().isThrownBy(`
`103`		`- () -> QueryOptions.builder().timeout(Duration.ofSeconds(-1)).build());`
`104`		`- }`
`105`		`-`
`106`		`- @Test // GH-1494`
`107`		`- void buildZeroDurationReadTimeoutQueryOptions() {`
`108`		`-`
`109`		`- QueryOptions queryOptions = QueryOptions.builder().readTimeout(Duration.ofSeconds(0)).build();`
`110`		`-`
`111`		`- assertThat(queryOptions.getReadTimeout()).isEqualTo(Duration.ZERO);`
`112`		`- }`
`113`		`-`
`114`		`- @Test // GH-1494`
`115`		`- void shouldRejectNegativeDurationReadTimeoutQueryOptions() {`
`116`		`-`
`117`		`- assertThatIllegalArgumentException().isThrownBy(`
`118`		`- () -> QueryOptions.builder().readTimeout(Duration.ofSeconds(-1)).build());`
	`102`	`+ assertThatIllegalArgumentException()`
	`103`	`+ .isThrownBy(() -> QueryOptions.builder().timeout(Duration.ofSeconds(-1)).build());`
`119`	`104`	`}`
`120`	`105`	`}`

Comments

(0)