From c58e3b3a8f52950f3378f1b969b187b050d89daa Mon Sep 17 00:00:00 2001 From: Peter-Josef Meisch Date: Sat, 25 Jun 2022 19:55:22 +0200 Subject: [PATCH] Fix updatebyquery request. Original Pull Request #2197 Closes #2191 (cherry picked from commit f90138076659e5452fd38444c85cfee0745b074c) (cherry picked from commit ae66cbd619b012b898072ef059de71ac1626b330) --- .../data/elasticsearch/core/RequestFactory.java | 3 +-- .../elasticsearch/core/ElasticsearchRestTemplateTests.java | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/springframework/data/elasticsearch/core/RequestFactory.java b/src/main/java/org/springframework/data/elasticsearch/core/RequestFactory.java index 8d9db44a6..3a0d4f67f 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/RequestFactory.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/RequestFactory.java @@ -1472,8 +1472,7 @@ class RequestFactory { public UpdateByQueryRequest updateByQueryRequest(UpdateQuery query, IndexCoordinates index) { - String indexName = index.getIndexName(); - final UpdateByQueryRequest updateByQueryRequest = new UpdateByQueryRequest(indexName); + final UpdateByQueryRequest updateByQueryRequest = new UpdateByQueryRequest(index.getIndexNames()); updateByQueryRequest.setScript(getScript(query)); if (query.getAbortOnVersionConflict() != null) { diff --git a/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplateTests.java b/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplateTests.java index c9fbf3674..c29a39371 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplateTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplateTests.java @@ -124,7 +124,7 @@ public class ElasticsearchRestTemplateTests extends ElasticsearchTemplateTests { assertThat(fetchSourceContext.excludes()).containsExactlyInAnyOrder("excl"); } - @Test // #1446 + @Test // #1446, #2191 void shouldUseAllOptionsFromUpdateByQuery() throws JSONException { NativeSearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(matchAllQuery()) // @@ -154,9 +154,10 @@ public class ElasticsearchRestTemplateTests extends ElasticsearchTemplateTests { " }" + " }" + '}'; // when - UpdateByQueryRequest request = getRequestFactory().updateByQueryRequest(updateQuery, IndexCoordinates.of("index")); + UpdateByQueryRequest request = getRequestFactory().updateByQueryRequest(updateQuery, IndexCoordinates.of("index1", "index2")); // then + assertThat(request.indices()).containsExactlyInAnyOrder("index1", "index2"); assertThat(request).isNotNull(); assertThat(request.getSearchRequest().indicesOptions()).usingRecursiveComparison() .isEqualTo(IndicesOptions.LENIENT_EXPAND_OPEN);