Sort is not working when declared in Pageable in spring-data-couchbase version 4.3.0

[Imritg]

Hi,
I recently upgraded to spring-data-couchbase 4.3.0 and sort (which worked in 4.2.5) stoped working.
I did changes in order to make it work.

After checking the differences between both versions, it looks like there is a missing assignment in 4.3.0.

spring-data-couchbase - 4.3.0 (Does not set sort and the returned value is ignored)

public Query with(final Pageable pageable) {
    if (pageable.isUnpaged()) {
        return this;
    } else {
        this.limit = pageable.getPageSize();
        this.skip = pageable.getOffset();
        if (!this.sort.equals(pageable.getSort())) {
            this.sort.and(pageable.getSort());
        }
        return this;
    }
}
 
public Sort and(Sort sort) {
    Assert.notNull(sort, "Sort must not be null!");
    ArrayList<Sort.Order> these = new ArrayList(this.orders);
    Iterator var3 = sort.iterator();
    while(var3.hasNext()) {
        Sort.Order order = (Sort.Order)var3.next();
        these.add(order);
    }
    return by((List)these);
}

spring-data-couchbase - 4.2.5 - working - sort is set

public Query with(final Pageable pageable) {
    if (pageable.isUnpaged()) {
        return this;
    } else {
        this.limit = pageable.getPageSize();
        this.skip = pageable.getOffset();
        return this.with(pageable.getSort());
    }
}
 
public Query with(Sort sort) {
    Assert.notNull(sort, "Sort must not be null!");
    if (sort.isUnsorted()) {
        return this;
    } else {
        this.sort = this.sort.and(sort);
        return this;
    }
}

[mikereiche]

Please provide the query that is not working. Thanks.

When I add this to CouchbaseRepositoryQueryIntegrationTests it passes and produces the query

SELECT META(my_bucket).id AS __id, META(my_bucket).cas AS __cas, iata, icao, createdBy, META(my_bucket).expiration, sizeFROMmy_bucketWHERE_class = "airport" ORDER BY iata ASC

	@Test
	void sorted() {
		airportRepository.withOptions(QueryOptions.queryOptions().scanConsistency(REQUEST_PLUS)).deleteAll();
		String[] iatas = { "JFK", "IAD", "SFO", "SJC", "SEA", "LAX", "PHX" };

		airportRepository.countOne();
		try {
			airportRepository.saveAll(
					Arrays.stream(iatas).map((iata) -> new Airport("airports::" + iata, iata, iata.toLowerCase(Locale.ROOT)))
							.collect(Collectors.toSet()));
			List<Airport> airports = airportRepository.withOptions(QueryOptions.queryOptions().scanConsistency(REQUEST_PLUS)).findAll(Sort.by("iata"));
			String[] sortedIatas = iatas.clone();
			Arrays.sort(sortedIatas);
			for(int i=0; i< sortedIatas.length; i++){
				assertEquals(sortedIatas[i], airports.get(i).getIata());
			}
		} catch (Exception e) {
			throw new RuntimeException(e);
		}
	}

[Imritg]

I used this query on 4.2.5:

Query query = buildSomeQuery();
Pageable pageableWithSort = PageRequest.of(0, 3, Sort.by("eventDate"));
query.with(pageableWithSort);
couchbaseTemplate.findByQuery(xxx.class).matching(query).all();

after the upgrade to 4.3.0, I changed to this code, which is working:

Query query = buildSomeQuery();
Pageable pageableWithSort = PageRequest.of(0, 3, Sort.by("eventDate"));
query.with(pageableWithSort).with(pageableWithSort.getSort());
couchbaseTemplate.findByQuery(ActivityLogEventDocument.class).matching(query).all();

In the source code of 4.3.0, you can see there is a missing assignment, otherwise, why we have this if condition?

if (!this.sort.equals(pageable.getSort())) {
     this.sort.and(pageable.getSort());
}

The assignment exists in 4.2.5.