Skip to content

Commit 787a4c3

Browse files
committed
Fix searchRequest to use Min(size, maxResults) as actual pageSize
See spring-projects#3089
1 parent 4b731a7 commit 787a4c3

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

src/main/java/org/springframework/data/elasticsearch/client/elc/RequestConverter.java

+5-3
Original file line numberDiff line numberDiff line change
@@ -1487,9 +1487,11 @@ private <T> void prepareSearchRequest(Query query, @Nullable String routing, @Nu
14871487
addIndicesOptions(builder, query.getIndicesOptions());
14881488
}
14891489

1490-
if (query.isLimiting()) {
1491-
builder.size(query.getMaxResults());
1492-
}
1490+
var maxResults = query.getMaxResults();
1491+
if (query.isLimiting() && maxResults != null) {
1492+
var pageSize = Math.min(maxResults, query.getPageable().getPageSize());
1493+
builder.size(pageSize);
1494+
}
14931495

14941496
if (query.getMinScore() > 0) {
14951497
builder.minScore((double) query.getMinScore());

0 commit comments

Comments
 (0)