@@ -351,7 +351,7 @@ private <S extends T> ArangoCursor<T> findAllInternal(final Pageable pageable, @
351
351
buildFilterClause (example , bindVars ), buildPageableClause (pageable , "e" ));
352
352
arangoOperations .collection (domainClass );
353
353
return arangoOperations .query (query , bindVars ,
354
- pageable != null && pageable . isPaged () ? new AqlQueryOptions ().fullCount (true ) : null , domainClass );
354
+ pageable != null ? new AqlQueryOptions ().fullCount (true ) : null , domainClass );
355
355
}
356
356
357
357
private <S extends T > String buildFilterClause (final Example <S > example , final Map <String , Object > bindVars ) {
@@ -366,7 +366,12 @@ private <S extends T> String buildFilterClause(final Example<S> example, final M
366
366
private String buildPageableClause (final Pageable pageable , final String varName ) {
367
367
if (pageable == null ) return "" ;
368
368
Sort persistentSort = AqlUtils .toPersistentSort (pageable .getSort (), mappingContext , domainClass );
369
- Pageable persistentPageable = PageRequest .of (pageable .getPageNumber (), pageable .getPageSize (), persistentSort );
369
+ Pageable persistentPageable ;
370
+ if (pageable .isPaged ()) {
371
+ persistentPageable = PageRequest .of (pageable .getPageNumber (), pageable .getPageSize (), persistentSort );
372
+ } else {
373
+ persistentPageable = pageable ;
374
+ }
370
375
return AqlUtils .buildPageableClause (persistentPageable , varName );
371
376
}
372
377
0 commit comments