Cwikius-Spring/spring-data-elasticsearch
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-data-elasticsearch.git synced 2025-07-01 16:22:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix updatebyquery request.

Browse Source 
Original Pull Request #2197
Closes #2191

(cherry picked from commit f90138076659e5452fd38444c85cfee0745b074c)
(cherry picked from commit ae66cbd619b012b898072ef059de71ac1626b330)
This commit is contained in:
Peter-Josef Meisch 2022-06-25 19:55:22 +02:00
parent 4ed7f96919
commit c58e3b3a8f
No known key found for this signature in database
GPG Key ID: DE108246970C7708
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/springframework/data/elasticsearch/core/RequestFactory.java
View File

@ -1472,8 +1472,7 @@ class RequestFactory {
public UpdateByQueryRequest updateByQueryRequest(UpdateQuery query, IndexCoordinates index) { public UpdateByQueryRequest updateByQueryRequest(UpdateQuery query, IndexCoordinates index) {
String indexName = index.getIndexName(); final UpdateByQueryRequest updateByQueryRequest = new UpdateByQueryRequest(index.getIndexNames());
final UpdateByQueryRequest updateByQueryRequest = new UpdateByQueryRequest(indexName);
updateByQueryRequest.setScript(getScript(query)); updateByQueryRequest.setScript(getScript(query));
if (query.getAbortOnVersionConflict() != null) { if (query.getAbortOnVersionConflict() != null) {

5
src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplateTests.java
View File

@ -124,7 +124,7 @@ public class ElasticsearchRestTemplateTests extends ElasticsearchTemplateTests {
assertThat(fetchSourceContext.excludes()).containsExactlyInAnyOrder("excl"); assertThat(fetchSourceContext.excludes()).containsExactlyInAnyOrder("excl");
} }
@Test // #1446 @Test // #1446, #2191
void shouldUseAllOptionsFromUpdateByQuery() throws JSONException { void shouldUseAllOptionsFromUpdateByQuery() throws JSONException {
NativeSearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(matchAllQuery()) // NativeSearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(matchAllQuery()) //
@ -154,9 +154,10 @@ public class ElasticsearchRestTemplateTests extends ElasticsearchTemplateTests {
" }" + " }" + '}'; " }" + " }" + '}';
// when // when
UpdateByQueryRequest request = getRequestFactory().updateByQueryRequest(updateQuery, IndexCoordinates.of("index")); UpdateByQueryRequest request = getRequestFactory().updateByQueryRequest(updateQuery, IndexCoordinates.of("index1", "index2"));
// then // then
assertThat(request.indices()).containsExactlyInAnyOrder("index1", "index2");
assertThat(request).isNotNull(); assertThat(request).isNotNull();
assertThat(request.getSearchRequest().indicesOptions()).usingRecursiveComparison() assertThat(request.getSearchRequest().indicesOptions()).usingRecursiveComparison()
.isEqualTo(IndicesOptions.LENIENT_EXPAND_OPEN); .isEqualTo(IndicesOptions.LENIENT_EXPAND_OPEN);