|
15 | 15 | */
|
16 | 16 | package org.springframework.data.elasticsearch.client.elc;
|
17 | 17 |
|
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.*; |
24 | 20 |
|
25 | 21 | import co.elastic.clients.elasticsearch._types.Conflicts;
|
26 | 22 | import co.elastic.clients.elasticsearch._types.InlineScript;
|
|
36 | 32 | import co.elastic.clients.elasticsearch._types.mapping.TypeMapping;
|
37 | 33 | import co.elastic.clients.elasticsearch._types.query_dsl.Like;
|
38 | 34 | 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.*; |
51 | 36 | import co.elastic.clients.elasticsearch.core.bulk.BulkOperation;
|
52 | 37 | import co.elastic.clients.elasticsearch.core.bulk.CreateOperation;
|
53 | 38 | import co.elastic.clients.elasticsearch.core.bulk.IndexOperation;
|
|
57 | 42 | import co.elastic.clients.elasticsearch.core.search.Highlight;
|
58 | 43 | import co.elastic.clients.elasticsearch.core.search.Rescore;
|
59 | 44 | 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.*; |
62 | 46 | 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; |
71 | 47 | import co.elastic.clients.elasticsearch.indices.update_aliases.Action;
|
72 | 48 | import co.elastic.clients.json.JsonData;
|
73 | 49 | import co.elastic.clients.json.JsonpDeserializer;
|
|
105 | 81 | import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
|
106 | 82 | import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
|
107 | 83 | 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.*; |
121 | 85 | import org.springframework.data.elasticsearch.core.reindex.ReindexRequest;
|
122 | 86 | import org.springframework.data.elasticsearch.core.reindex.Remote;
|
123 | 87 | import org.springframework.data.elasticsearch.support.DefaultStringObjectMap;
|
@@ -916,7 +880,7 @@ public DeleteByQueryRequest documentDeleteByQueryRequest(Query query, Class<?> c
|
916 | 880 | .docAsUpsert(query.getDocAsUpsert()) //
|
917 | 881 | .ifSeqNo(query.getIfSeqNo() != null ? Long.valueOf(query.getIfSeqNo()) : null) //
|
918 | 882 | .ifPrimaryTerm(query.getIfPrimaryTerm() != null ? Long.valueOf(query.getIfPrimaryTerm()) : null) //
|
919 |
| - .refresh(TypeUtils.refresh(refreshPolicy)) // |
| 883 | + .refresh(query.getRefreshPolicy() != null ? refresh(query.getRefreshPolicy()) : refresh(refreshPolicy)) // |
920 | 884 | .retryOnConflict(query.getRetryOnConflict()) //
|
921 | 885 | ;
|
922 | 886 |
|
|
0 commit comments