Fix searchRequest to use Min(size, maxResults) as actual pageSize.

See spring-projects#3089

Author: hy2850

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

@@ -112,6 +112,7 @@
  * @author cdalxndr
  * @author scoobyzhang
  * @author Haibo Liu
+ * @author Hyuncheol Park
  * @since 4.4
  */
 class RequestConverter extends AbstractQueryProcessor {
@@ -1487,8 +1488,10 @@ private <T> void prepareSearchRequest(Query query, @Nullable String routing, @Nu
 			addIndicesOptions(builder, query.getIndicesOptions());
 		}
 
-		if (query.isLimiting()) {
-			builder.size(query.getMaxResults());
+		var maxResults = query.getMaxResults();
+		if (query.isLimiting() && maxResults != null) {
+			var pageSize = Math.min(maxResults, query.getPageable().getPageSize());
+			builder.size(pageSize);
 		}
 
 		if (query.getMinScore() > 0) {

src/test/java/org/springframework/data/elasticsearch/client/elc/RequestConverterTest.java

@@ -15,7 +15,7 @@
  */
 package org.springframework.data.elasticsearch.client.elc;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import co.elastic.clients.json.jackson.JacksonJsonpMapper;
 
@@ -24,6 +24,7 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.data.annotation.Id;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Field;
 import org.springframework.data.elasticsearch.annotations.FieldType;
@@ -40,6 +41,7 @@
 /**
  * @author Peter-Josef Meisch
  * @author Han Seungwoo
+ * @author Hyuncheol Park
  */
 class RequestConverterTest {
 
@@ -89,6 +91,72 @@ void refreshSetByDeleteRequest() {
 		assertThat(deleteByQueryRequest.refresh()).isTrue();
 	}
 
+	@Test // #3089
+	@DisplayName("When maxResults is set (size < maxResults), pageSize should be the minimum of maxResults and pageable size")
+	void searchRequestPageSizeSmallerThanMaxResults() {
+		var size = 123;
+		var maxResults = size * 12;
+
+		var query = StringQuery.builder("""
+					{
+						"match_all":{}
+					}
+					""")
+				.withPageable(Pageable.ofSize(size))
+				.withMaxResults(maxResults)
+				.build();
+
+		var searchRequest = requestConverter.searchRequest(query, null, SampleEntity.class, IndexCoordinates.of("foo"), false, false, null);
+		var actualPageSize = searchRequest.size();
+
+		assertThat(actualPageSize).isEqualTo(size);
+		assertThat(actualPageSize).isNotEqualTo(maxResults);
+	}
+
+	@Test // #3089
+	@DisplayName("When maxResults is set (size == maxResults), pageSize should be equal to maxResults and pageable size")
+	void searchRequestPageSizeEqualToMaxResults() {
+		var pageSize = 123;
+		var maxResults = pageSize;
+
+		var query = StringQuery.builder("""
+					{
+						"match_all":{}
+					}
+					""")
+				.withPageable(Pageable.ofSize(pageSize))
+				.withMaxResults(maxResults)
+				.build();
+
+		var searchRequest = requestConverter.searchRequest(query, null, SampleEntity.class, IndexCoordinates.of("foo"), false, false, null);
+		var actualPageSize = searchRequest.size();
+
+		assertThat(actualPageSize).isEqualTo(pageSize);
+		assertThat(actualPageSize).isEqualTo(maxResults);
+	}
+
+	@Test // #3089
+	@DisplayName("When maxResults is set (size > maxResults), pageSize should be the minimum of maxResults and pageable size")
+	void searchRequestPageSizeLargerThanMaxResults() {
+		var pageSize = 123;
+		var maxResults = 99;
+
+		var query = StringQuery.builder("""
+					{
+						"match_all":{}
+					}
+					""")
+				.withPageable(Pageable.ofSize(pageSize))
+				.withMaxResults(maxResults)
+				.build();
+
+		var searchRequest = requestConverter.searchRequest(query, null, SampleEntity.class, IndexCoordinates.of("foo"), false, false, null);
+		var actualPageSize = searchRequest.size();
+
+		assertThat(actualPageSize).isNotEqualTo(pageSize);
+		assertThat(actualPageSize).isEqualTo(maxResults);
+	}
+
 	@Document(indexName = "does-not-matter")
 	static class SampleEntity {
 		@Nullable