Skip to content

Commit f901380

Browse files
authored
Fix updatebyquery request.
Original Pull Request spring-projects#2197 Closes spring-projects#2191
1 parent 1e4b70b commit f901380

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/main/java/org/springframework/data/elasticsearch/client/erhlc/RequestFactory.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -1096,8 +1096,7 @@ public UpdateRequest updateRequest(UpdateQuery query, IndexCoordinates index) {
10961096

10971097
public UpdateByQueryRequest updateByQueryRequest(UpdateQuery query, IndexCoordinates index) {
10981098

1099-
String indexName = index.getIndexName();
1100-
final UpdateByQueryRequest updateByQueryRequest = new UpdateByQueryRequest(indexName);
1099+
final UpdateByQueryRequest updateByQueryRequest = new UpdateByQueryRequest(index.getIndexNames());
11011100
updateByQueryRequest.setScript(getScript(query));
11021101

11031102
if (query.getAbortOnVersionConflict() != null) {

src/test/java/org/springframework/data/elasticsearch/client/erhlc/ElasticsearchERHLCIntegrationTests.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ void shouldUseAllOptionsFromUpdateQuery() {
240240
assertThat(fetchSourceContext.excludes()).containsExactlyInAnyOrder("excl");
241241
}
242242

243-
@Test // #1446
243+
@Test // #1446, #2191
244244
void shouldUseAllOptionsFromUpdateByQuery() throws JSONException {
245245

246246
Query searchQuery = new NativeSearchQueryBuilder().withQuery(matchAllQuery()) //
@@ -270,9 +270,10 @@ void shouldUseAllOptionsFromUpdateByQuery() throws JSONException {
270270
" }" + " }" + '}';
271271

272272
// when
273-
UpdateByQueryRequest request = getRequestFactory().updateByQueryRequest(updateQuery, IndexCoordinates.of("index"));
273+
UpdateByQueryRequest request = getRequestFactory().updateByQueryRequest(updateQuery, IndexCoordinates.of("index1", "index2"));
274274

275275
// then
276+
assertThat(request.indices()).containsExactlyInAnyOrder("index1", "index2");
276277
assertThat(request).isNotNull();
277278
assertThat(request.getSearchRequest().indicesOptions()).usingRecursiveComparison()
278279
.isEqualTo(IndicesOptions.LENIENT_EXPAND_OPEN);

0 commit comments

Comments
 (0)