From 48e2ddb9a729c8d080f7d3356e9e439a7a2ec938 Mon Sep 17 00:00:00 2001 From: Peter-Josef Meisch Date: Sat, 25 Jun 2022 19:51:50 +0200 Subject: [PATCH] Fix updatebyquery request. Closes #2191 --- .../data/elasticsearch/client/erhlc/RequestFactory.java | 3 +-- .../client/erhlc/ElasticsearchERHLCIntegrationTests.java | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/springframework/data/elasticsearch/client/erhlc/RequestFactory.java b/src/main/java/org/springframework/data/elasticsearch/client/erhlc/RequestFactory.java index 705020d1a5..b87b27ff9b 100644 --- a/src/main/java/org/springframework/data/elasticsearch/client/erhlc/RequestFactory.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/erhlc/RequestFactory.java @@ -1096,8 +1096,7 @@ public UpdateRequest updateRequest(UpdateQuery query, IndexCoordinates index) { 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/client/erhlc/ElasticsearchERHLCIntegrationTests.java b/src/test/java/org/springframework/data/elasticsearch/client/erhlc/ElasticsearchERHLCIntegrationTests.java index 473bf04bd7..5594ee1325 100644 --- a/src/test/java/org/springframework/data/elasticsearch/client/erhlc/ElasticsearchERHLCIntegrationTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/client/erhlc/ElasticsearchERHLCIntegrationTests.java @@ -240,7 +240,7 @@ void shouldUseAllOptionsFromUpdateQuery() { assertThat(fetchSourceContext.excludes()).containsExactlyInAnyOrder("excl"); } - @Test // #1446 + @Test // #1446, #2191 void shouldUseAllOptionsFromUpdateByQuery() throws JSONException { Query searchQuery = new NativeSearchQueryBuilder().withQuery(matchAllQuery()) // @@ -270,9 +270,10 @@ void shouldUseAllOptionsFromUpdateByQuery() throws JSONException { " }" + " }" + '}'; // 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);