Skip to content

Commit b1e6e51

Browse files
committed
Fix refresh policy in UpdateQuery.
Original Pull Request #2696 Closes #2692 (cherry picked from commit 2d0aee0) (cherry picked from commit 572cc7f)
1 parent d5df3bf commit b1e6e51

File tree

1 file changed

+6
-42
lines changed

1 file changed

+6
-42
lines changed

src/main/java/org/springframework/data/elasticsearch/client/elc/RequestConverter.java

+6-42
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,8 @@
1515
*/
1616
package org.springframework.data.elasticsearch.client.elc;
1717

18-
import static org.springframework.data.elasticsearch.client.elc.TypeUtils.searchType;
19-
import static org.springframework.data.elasticsearch.client.elc.TypeUtils.slices;
20-
import static org.springframework.data.elasticsearch.client.elc.TypeUtils.time;
21-
import static org.springframework.data.elasticsearch.client.elc.TypeUtils.timeStringMs;
22-
import static org.springframework.data.elasticsearch.client.elc.TypeUtils.toFloat;
23-
import static org.springframework.util.CollectionUtils.isEmpty;
18+
import static org.springframework.data.elasticsearch.client.elc.TypeUtils.*;
19+
import static org.springframework.util.CollectionUtils.*;
2420

2521
import co.elastic.clients.elasticsearch._types.Conflicts;
2622
import co.elastic.clients.elasticsearch._types.InlineScript;
@@ -36,18 +32,7 @@
3632
import co.elastic.clients.elasticsearch._types.mapping.TypeMapping;
3733
import co.elastic.clients.elasticsearch._types.query_dsl.Like;
3834
import co.elastic.clients.elasticsearch.cluster.HealthRequest;
39-
import co.elastic.clients.elasticsearch.core.BulkRequest;
40-
import co.elastic.clients.elasticsearch.core.ClosePointInTimeRequest;
41-
import co.elastic.clients.elasticsearch.core.DeleteByQueryRequest;
42-
import co.elastic.clients.elasticsearch.core.DeleteRequest;
43-
import co.elastic.clients.elasticsearch.core.GetRequest;
44-
import co.elastic.clients.elasticsearch.core.IndexRequest;
45-
import co.elastic.clients.elasticsearch.core.MgetRequest;
46-
import co.elastic.clients.elasticsearch.core.MsearchRequest;
47-
import co.elastic.clients.elasticsearch.core.OpenPointInTimeRequest;
48-
import co.elastic.clients.elasticsearch.core.SearchRequest;
49-
import co.elastic.clients.elasticsearch.core.UpdateByQueryRequest;
50-
import co.elastic.clients.elasticsearch.core.UpdateRequest;
35+
import co.elastic.clients.elasticsearch.core.*;
5136
import co.elastic.clients.elasticsearch.core.bulk.BulkOperation;
5237
import co.elastic.clients.elasticsearch.core.bulk.CreateOperation;
5338
import co.elastic.clients.elasticsearch.core.bulk.IndexOperation;
@@ -57,17 +42,8 @@
5742
import co.elastic.clients.elasticsearch.core.search.Highlight;
5843
import co.elastic.clients.elasticsearch.core.search.Rescore;
5944
import co.elastic.clients.elasticsearch.core.search.SourceConfig;
60-
import co.elastic.clients.elasticsearch.indices.CreateIndexRequest;
61-
import co.elastic.clients.elasticsearch.indices.DeleteIndexRequest;
45+
import co.elastic.clients.elasticsearch.indices.*;
6246
import co.elastic.clients.elasticsearch.indices.ExistsRequest;
63-
import co.elastic.clients.elasticsearch.indices.GetAliasRequest;
64-
import co.elastic.clients.elasticsearch.indices.GetIndexRequest;
65-
import co.elastic.clients.elasticsearch.indices.GetIndicesSettingsRequest;
66-
import co.elastic.clients.elasticsearch.indices.GetMappingRequest;
67-
import co.elastic.clients.elasticsearch.indices.IndexSettings;
68-
import co.elastic.clients.elasticsearch.indices.PutMappingRequest;
69-
import co.elastic.clients.elasticsearch.indices.RefreshRequest;
70-
import co.elastic.clients.elasticsearch.indices.UpdateAliasesRequest;
7147
import co.elastic.clients.elasticsearch.indices.update_aliases.Action;
7248
import co.elastic.clients.json.JsonData;
7349
import co.elastic.clients.json.JsonpDeserializer;
@@ -105,19 +81,7 @@
10581
import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
10682
import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
10783
import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
108-
import org.springframework.data.elasticsearch.core.query.BaseQuery;
109-
import org.springframework.data.elasticsearch.core.query.BulkOptions;
110-
import org.springframework.data.elasticsearch.core.query.CriteriaQuery;
111-
import org.springframework.data.elasticsearch.core.query.GeoDistanceOrder;
112-
import org.springframework.data.elasticsearch.core.query.IndexQuery;
113-
import org.springframework.data.elasticsearch.core.query.MoreLikeThisQuery;
114-
import org.springframework.data.elasticsearch.core.query.Order;
115-
import org.springframework.data.elasticsearch.core.query.Query;
116-
import org.springframework.data.elasticsearch.core.query.RescorerQuery;
117-
import org.springframework.data.elasticsearch.core.query.ScriptData;
118-
import org.springframework.data.elasticsearch.core.query.SourceFilter;
119-
import org.springframework.data.elasticsearch.core.query.StringQuery;
120-
import org.springframework.data.elasticsearch.core.query.UpdateQuery;
84+
import org.springframework.data.elasticsearch.core.query.*;
12185
import org.springframework.data.elasticsearch.core.reindex.ReindexRequest;
12286
import org.springframework.data.elasticsearch.core.reindex.Remote;
12387
import org.springframework.data.elasticsearch.support.DefaultStringObjectMap;
@@ -916,7 +880,7 @@ public DeleteByQueryRequest documentDeleteByQueryRequest(Query query, Class<?> c
916880
.docAsUpsert(query.getDocAsUpsert()) //
917881
.ifSeqNo(query.getIfSeqNo() != null ? Long.valueOf(query.getIfSeqNo()) : null) //
918882
.ifPrimaryTerm(query.getIfPrimaryTerm() != null ? Long.valueOf(query.getIfPrimaryTerm()) : null) //
919-
.refresh(TypeUtils.refresh(refreshPolicy)) //
883+
.refresh(query.getRefreshPolicy() != null ? refresh(query.getRefreshPolicy()) : refresh(refreshPolicy)) //
920884
.retryOnConflict(query.getRetryOnConflict()) //
921885
;
922886

0 commit comments

Comments
 (0)