From 20f03049635070f14f1cd93e5d9001d355d2d055 Mon Sep 17 00:00:00 2001 From: Francois Rivard Date: Thu, 19 Oct 2023 11:34:13 -0400 Subject: [PATCH 1/3] Add scroll to search request serialization. Signed-off-by: Francois Rivard --- .../org/opensearch/client/opensearch/core/SearchRequest.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/SearchRequest.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/SearchRequest.java index cccf3e522a..0c43a66337 100644 --- a/java-client/src/main/java/org/opensearch/client/opensearch/core/SearchRequest.java +++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/SearchRequest.java @@ -963,6 +963,10 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) { generator.writeEnd(); } + if (this.scroll != null) { + generator.writeKey("scroll"); + generator.write(this.scroll._toJsonString()); + } if (ApiTypeHelper.isDefined(this.searchAfter)) { generator.writeKey("search_after"); generator.writeStartArray(); From a7120ee7c4539a8db42a1450a2512e51f15afad6 Mon Sep 17 00:00:00 2001 From: Francois Rivard Date: Thu, 19 Oct 2023 16:04:08 -0400 Subject: [PATCH 2/3] Add comment to changelog. Signed-off-by: Francois Rivard --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dac2b79946..b6a05b787d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,6 +38,7 @@ This section is for maintaining a changelog for all breaking changes for the cli ### Removed ### Fixed +- Fix for 'scroll' parameter not serialized to SearchRequest. ### Security From 7df27b821d421e9ae5a24394bd718da6352a3b9f Mon Sep 17 00:00:00 2001 From: Francois Rivard <74623412+frivard-coveo@users.noreply.github.com> Date: Thu, 19 Oct 2023 17:25:07 -0400 Subject: [PATCH 3/3] Update CHANGELOG.md Co-authored-by: Andriy Redko Signed-off-by: Francois Rivard <74623412+frivard-coveo@users.noreply.github.com> --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b6a05b787d..04d4cc13dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,7 +38,7 @@ This section is for maintaining a changelog for all breaking changes for the cli ### Removed ### Fixed -- Fix for 'scroll' parameter not serialized to SearchRequest. +- Fix for 'scroll' parameter not serialized to SearchRequest ([#677](https://github.com/opensearch-project/opensearch-java/pull/677)) ### Security