Skip to content

Commit c7d1799

Browse files
authored
Fix JDK8 compilation errors introduced by cherry-picking #1363. (#1817)
Closes #1816.
1 parent 9625a81 commit c7d1799

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

src/main/java/com/querydsl/couchbase/document/CouchbaseDocumentSerializer.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
*/
1616
package com.querydsl.couchbase.document;
1717

18+
import static com.querydsl.core.types.OrderSpecifier.NullHandling.NullsFirst;
19+
import static com.querydsl.core.types.OrderSpecifier.NullHandling.NullsLast;
20+
1821
import java.util.Collection;
1922
import java.util.List;
2023
import java.util.regex.Pattern;
@@ -31,6 +34,7 @@
3134
import com.querydsl.core.types.Operation;
3235
import com.querydsl.core.types.Operator;
3336
import com.querydsl.core.types.Ops;
37+
import com.querydsl.core.types.Order;
3438
import com.querydsl.core.types.OrderSpecifier;
3539
import com.querydsl.core.types.ParamExpression;
3640
import com.querydsl.core.types.Path;
@@ -39,7 +43,6 @@
3943
import com.querydsl.core.types.SubQueryExpression;
4044
import com.querydsl.core.types.TemplateExpression;
4145
import com.querydsl.core.types.Visitor;
42-
import com.querydsl.core.types.Order;
4346

4447
/**
4548
* Serializes the given Querydsl query to a Document query for Couchbase.
@@ -58,11 +61,8 @@ public Sort toSort(List<OrderSpecifier<?>> orderBys) {
5861
for (OrderSpecifier<?> orderBy : orderBys) {
5962
Object key = orderBy.getTarget().accept(this, null);
6063
String keyAsString = key.toString();
61-
Sort.NullHandling sortNullHandling = switch (orderBy.getNullHandling()) {
62-
case NullsFirst -> Sort.NullHandling.NULLS_FIRST;
63-
case NullsLast -> Sort.NullHandling.NULLS_LAST;
64-
default -> Sort.NullHandling.NATIVE;
65-
};
64+
Sort.NullHandling sortNullHandling = orderBy.getNullHandling() == NullsFirst ? Sort.NullHandling.NULLS_FIRST
65+
: orderBy.getNullHandling() == NullsLast ? Sort.NullHandling.NULLS_LAST : Sort.NullHandling.NATIVE;
6666
Sort.Direction sortDirection = orderBy.getOrder() == Order.ASC ? Sort.Direction.ASC : Sort.Direction.DESC;
6767
Sort.Order sortOrder = new Sort.Order(sortDirection, keyAsString, sortNullHandling);
6868
sort = sort.and(Sort.by(sortOrder));

src/test/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryQuerydslIntegrationTests.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,10 @@
2525

2626
import java.util.Arrays;
2727
import java.util.Comparator;
28+
import java.util.List;
2829
import java.util.Locale;
2930
import java.util.Optional;
31+
import java.util.stream.Collectors;
3032
import java.util.stream.StreamSupport;
3133

3234
import org.junit.jupiter.api.AfterAll;
@@ -419,7 +421,7 @@ void testIn() {
419421
@Test
420422
void testSort(){
421423
{
422-
BooleanExpression predicate = airline.name.in(Arrays.stream(saved).map(Airline::getName).toList());
424+
BooleanExpression predicate = airline.name.in((Arrays.stream(saved).map(Airline::getName)).collect(Collectors.toList()));
423425
Iterable<Airline> result = airlineRepository.findAll(predicate, Sort.by("name").ascending());
424426
assertArrayEquals(StreamSupport.stream(result.spliterator(), false).toArray(Airline[]::new),
425427
Arrays.stream(saved)
@@ -429,7 +431,7 @@ void testSort(){
429431
}
430432

431433
{
432-
BooleanExpression predicate = airline.name.in(Arrays.stream(saved).map(Airline::getName).toList());
434+
BooleanExpression predicate = airline.name.in((Arrays.stream(saved).map(Airline::getName)).collect(Collectors.toList()));
433435
Iterable<Airline> result = airlineRepository.findAll(predicate, Sort.by("name").descending());
434436
assertArrayEquals(StreamSupport.stream(result.spliterator(), false).toArray(Airline[]::new),
435437
Arrays.stream(saved)
@@ -439,7 +441,7 @@ void testSort(){
439441
}
440442

441443
{
442-
BooleanExpression predicate = airline.name.in(Arrays.stream(saved).map(Airline::getName).toList());
444+
BooleanExpression predicate = airline.name.in((Arrays.stream(saved).map(Airline::getName)).collect(Collectors.toList()));
443445
Iterable<Airline> result = airlineRepository.findAll(predicate, airline.name.asc());
444446
assertArrayEquals(StreamSupport.stream(result.spliterator(), false).toArray(Airline[]::new),
445447
Arrays.stream(saved)
@@ -449,7 +451,7 @@ void testSort(){
449451
}
450452

451453
{
452-
BooleanExpression predicate = airline.name.in(Arrays.stream(saved).map(Airline::getName).toList());
454+
BooleanExpression predicate = airline.name.in((Arrays.stream(saved).map(Airline::getName)).collect(Collectors.toList()));
453455
Iterable<Airline> result = airlineRepository.findAll(predicate, airline.name.desc());
454456
assertArrayEquals(StreamSupport.stream(result.spliterator(), false).toArray(Airline[]::new),
455457
Arrays.stream(saved)

0 commit comments

Comments
 (0)