Skip to content

Commit 2d41ed0

Browse files
committed
Fix nullability annotations on query builder range selectors
1 parent 8cb77c4 commit 2d41ed0

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/select/OngoingSelection.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ default Select element(@NonNull String collectionName, @NonNull Term index) {
348348
* @see Selector#range(Selector, Term, Term)
349349
*/
350350
@NonNull
351-
default Select range(@NonNull Selector collection, @NonNull Term left, @NonNull Term right) {
351+
default Select range(@NonNull Selector collection, @Nullable Term left, @Nullable Term right) {
352352
return selector(Selector.range(collection, left, right));
353353
}
354354

@@ -362,7 +362,7 @@ default Select range(@NonNull Selector collection, @NonNull Term left, @NonNull
362362
*/
363363
@NonNull
364364
default Select range(
365-
@NonNull CqlIdentifier collectionId, @NonNull Term left, @NonNull Term right) {
365+
@NonNull CqlIdentifier collectionId, @Nullable Term left, @Nullable Term right) {
366366
return range(Selector.column(collectionId), left, right);
367367
}
368368

@@ -373,7 +373,7 @@ default Select range(
373373
* @see Selector#range(String, Term, Term)
374374
*/
375375
@NonNull
376-
default Select range(@NonNull String collectionName, @NonNull Term left, @NonNull Term right) {
376+
default Select range(@NonNull String collectionName, @Nullable Term left, @Nullable Term right) {
377377
return range(CqlIdentifier.fromCql(collectionName), left, right);
378378
}
379379

query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/select/Selector.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ static Selector element(@NonNull String collectionName, @NonNull Term index) {
238238
* only left-bound.
239239
*/
240240
@NonNull
241-
static Selector range(@NonNull Selector collection, @NonNull Term left, @NonNull Term right) {
241+
static Selector range(@NonNull Selector collection, @Nullable Term left, @Nullable Term right) {
242242
return new RangeSelector(collection, left, right);
243243
}
244244

@@ -250,7 +250,7 @@ static Selector range(@NonNull Selector collection, @NonNull Term left, @NonNull
250250
*/
251251
@NonNull
252252
static Selector range(
253-
@NonNull CqlIdentifier collectionId, @NonNull Term left, @NonNull Term right) {
253+
@NonNull CqlIdentifier collectionId, @Nullable Term left, @Nullable Term right) {
254254
return range(column(collectionId), left, right);
255255
}
256256

@@ -259,7 +259,7 @@ static Selector range(
259259
* range(CqlIdentifier.fromCql(collectionName), left, right)}.
260260
*/
261261
@NonNull
262-
static Selector range(@NonNull String collectionName, @NonNull Term left, @NonNull Term right) {
262+
static Selector range(@NonNull String collectionName, @Nullable Term left, @Nullable Term right) {
263263
return range(CqlIdentifier.fromCql(collectionName), left, right);
264264
}
265265

0 commit comments

Comments
 (0)