Skip to content

Commit 3f39f5d

Browse files
sothawosothawo
authored
Use correct classes in reactive operations.
Original Pull Request #1724 Closes #1721
1 parent 2f5773a commit 3f39f5d

File tree

8 files changed

+22
-96
lines changed

8 files changed

+22
-96
lines changed

‎src/main/java/org/springframework/data/elasticsearch/client/reactive/DefaultReactiveElasticsearchClient.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -685,6 +685,7 @@ public Mono<Void> flushIndex(HttpHeaders headers, FlushRequest flushRequest) {
685685
}
686686

687687
@Override
688+
@Deprecated
688689
public Mono<org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse> getMapping(HttpHeaders headers,
689690
org.elasticsearch.action.admin.indices.mapping.get.GetMappingsRequest getMappingsRequest) {
690691
return sendRequest(getMappingsRequest, requestCreator.getMapping(),

‎src/main/java/org/springframework/data/elasticsearch/client/util/RequestConverters.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -812,6 +812,7 @@ public static Request indexRefresh(RefreshRequest refreshRequest) {
812812
return request;
813813
}
814814

815+
@Deprecated
815816
public static Request putMapping(PutMappingRequest putMappingRequest) {
816817
// The concreteIndex is an internal concept, not applicable to requests made over the REST API.
817818
if (putMappingRequest.getConcreteIndex() != null) {

‎src/main/java/org/springframework/data/elasticsearch/core/AbstractDefaultIndexOperations.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,10 +184,12 @@ public void refresh() {
184184
protected abstract void doRefresh(IndexCoordinates indexCoordinates);
185185

186186
@Override
187+
@Deprecated
187188
public boolean addAlias(AliasQuery query) {
188189
return doAddAlias(query, getIndexCoordinates());
189190
}
190191

192+
@Deprecated
191193
protected abstract boolean doAddAlias(AliasQuery query, IndexCoordinates index);
192194

193195
@Override
@@ -198,10 +200,12 @@ public List<AliasMetadata> queryForAlias() {
198200
protected abstract List<AliasMetadata> doQueryForAlias(IndexCoordinates index);
199201

200202
@Override
203+
@Deprecated
201204
public boolean removeAlias(AliasQuery query) {
202205
return doRemoveAlias(query, getIndexCoordinates());
203206
}
204207

208+
@Deprecated
205209
protected abstract boolean doRemoveAlias(AliasQuery query, IndexCoordinates index);
206210

207211
@Override

‎src/main/java/org/springframework/data/elasticsearch/core/DefaultIndexOperations.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ protected Map<String, Object> doGetMapping(IndexCoordinates index) {
141141
}
142142

143143
@Override
144+
@Deprecated
144145
protected boolean doAddAlias(AliasQuery query, IndexCoordinates index) {
145146

146147
IndicesAliasesRequest request = requestFactory.indicesAddAliasesRequest(query, index);
@@ -149,6 +150,7 @@ protected boolean doAddAlias(AliasQuery query, IndexCoordinates index) {
149150
}
150151

151152
@Override
153+
@Deprecated
152154
protected boolean doRemoveAlias(AliasQuery query, IndexCoordinates index) {
153155

154156
Assert.notNull(index, "No index defined for Alias");

‎src/main/java/org/springframework/data/elasticsearch/core/DefaultReactiveIndexOperations.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@
2727
import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest;
2828
import org.elasticsearch.action.admin.indices.alias.get.GetAliasesRequest;
2929
import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest;
30-
import org.elasticsearch.action.admin.indices.get.GetIndexRequest;
31-
import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsRequest;
3230
import org.elasticsearch.action.admin.indices.settings.get.GetSettingsRequest;
3331
import org.elasticsearch.action.admin.indices.template.delete.DeleteIndexTemplateRequest;
3432
import org.elasticsearch.client.GetAliasesResponse;
3533
import org.elasticsearch.client.indices.CreateIndexRequest;
34+
import org.elasticsearch.client.indices.GetIndexRequest;
3635
import org.elasticsearch.client.indices.GetIndexTemplatesRequest;
36+
import org.elasticsearch.client.indices.GetMappingsRequest;
3737
import org.elasticsearch.client.indices.IndexTemplatesExistRequest;
3838
import org.elasticsearch.client.indices.PutIndexTemplateRequest;
3939
import org.slf4j.Logger;
@@ -153,7 +153,7 @@ public Mono<Boolean> delete() {
153153
@Override
154154
public Mono<Boolean> exists() {
155155

156-
GetIndexRequest request = requestFactory.getIndexRequestReactive(getIndexCoordinates().getIndexName());
156+
GetIndexRequest request = requestFactory.getIndexRequest(getIndexCoordinates());
157157
return Mono.from(operations.executeWithIndicesClient(client -> client.existsIndex(request)));
158158
}
159159

@@ -185,21 +185,21 @@ public Mono<Document> createMapping(Class<?> clazz) {
185185

186186
@Override
187187
public Mono<Boolean> putMapping(Mono<Document> mapping) {
188-
return mapping.map(document -> requestFactory.putMappingRequestReactive(getIndexCoordinates(), document)) //
188+
return mapping.map(document -> requestFactory.putMappingRequest(getIndexCoordinates(), document)) //
189189
.flatMap(request -> Mono.from(operations.executeWithIndicesClient(client -> client.putMapping(request))));
190190
}
191191

192192
@Override
193193
public Mono<Document> getMapping() {
194194

195195
IndexCoordinates indexCoordinates = getIndexCoordinates();
196-
GetMappingsRequest request = requestFactory.getMappingRequestReactive(indexCoordinates);
196+
GetMappingsRequest request = requestFactory.getMappingsRequest(indexCoordinates);
197197

198198
return Mono.from(operations.executeWithIndicesClient(client -> client.getMapping(request)))
199199
.flatMap(getMappingsResponse -> {
200-
Document document = Document.create();
201-
document.put("properties",
202-
getMappingsResponse.mappings().get(indexCoordinates.getIndexName()).get("properties").getSourceAsMap());
200+
Map<String, Object> source = getMappingsResponse.mappings().get(indexCoordinates.getIndexName())
201+
.getSourceAsMap();
202+
Document document = Document.from(source);
203203
return Mono.just(document);
204204
});
205205
}

‎src/main/java/org/springframework/data/elasticsearch/core/DefaultTransportIndexOperations.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ protected boolean doAddAlias(AliasQuery query, IndexCoordinates index) {
153153
}
154154

155155
@Override
156+
@Deprecated
156157
protected boolean doRemoveAlias(AliasQuery query, IndexCoordinates index) {
157158

158159
Assert.notNull(index, "No index defined for Alias");

‎src/main/java/org/springframework/data/elasticsearch/core/RequestFactory.java‎

Lines changed: 4 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ public RequestFactory(ElasticsearchConverter elasticsearchConverter) {
133133
}
134134

135135
// region alias
136+
@Deprecated
136137
public IndicesAliasesRequest.AliasActions aliasAction(AliasQuery query, IndexCoordinates index) {
137138

138139
Assert.notNull(index, "No index defined for Alias");
@@ -178,6 +179,7 @@ public GetAliasesRequest getAliasesRequest(@Nullable String[] aliasNames, @Nulla
178179
return getAliasesRequest;
179180
}
180181

182+
@Deprecated
181183
public IndicesAliasesRequest indicesAddAliasesRequest(AliasQuery query, IndexCoordinates index) {
182184
IndicesAliasesRequest.AliasActions aliasAction = aliasAction(query, index);
183185
IndicesAliasesRequest request = new IndicesAliasesRequest();
@@ -253,6 +255,7 @@ public IndicesAliasesRequestBuilder indicesAliasesRequestBuilder(Client client,
253255
return requestBuilder;
254256
}
255257

258+
@Deprecated
256259
public IndicesAliasesRequest indicesRemoveAliasesRequest(AliasQuery query, IndexCoordinates index) {
257260

258261
String[] indexNames = index.getIndexNames();
@@ -264,6 +267,7 @@ public IndicesAliasesRequest indicesRemoveAliasesRequest(AliasQuery query, Index
264267
.addAliasAction(aliasAction);
265268
}
266269

270+
@Deprecated
267271
IndicesAliasesRequestBuilder indicesRemoveAliasesRequestBuilder(Client client, AliasQuery query,
268272
IndexCoordinates index) {
269273

@@ -347,26 +351,7 @@ public BulkRequestBuilder bulkRequestBuilder(Client client, List<?> queries, Bul
347351
// endregion
348352

349353
// region index management
350-
/**
351-
* creates a CreateIndexRequest from the rest-high-level-client library.
352-
*
353-
* @param index name of the index
354-
* @param settings optional settings
355-
* @return request
356-
*/
357-
public CreateIndexRequest createIndexRequest(IndexCoordinates index, @Nullable Document settings) {
358-
return createIndexRequest(index, settings, null);
359-
}
360354

361-
/**
362-
* creates a CreateIndexRequest from the rest-high-level-client library.
363-
*
364-
* @param index name of the index
365-
* @param settings optional settings
366-
* @param mapping optional mapping
367-
* @return request
368-
* @since 4.2
369-
*/
370355
public CreateIndexRequest createIndexRequest(IndexCoordinates index, @Nullable Document settings, @Nullable Document mapping) {
371356
CreateIndexRequest request = new CreateIndexRequest(index.getIndexName());
372357

@@ -381,38 +366,6 @@ public CreateIndexRequest createIndexRequest(IndexCoordinates index, @Nullable D
381366
return request;
382367
}
383368

384-
/**
385-
* creates a CreateIndexRequest from the elasticsearch library, used by the reactive methods.
386-
*
387-
* @param indexName name of the index
388-
* @param settings optional settings
389-
* @return request
390-
*/
391-
public org.elasticsearch.action.admin.indices.create.CreateIndexRequest createIndexRequestReactive(String indexName,
392-
@Nullable Document settings) {
393-
394-
org.elasticsearch.action.admin.indices.create.CreateIndexRequest request = new org.elasticsearch.action.admin.indices.create.CreateIndexRequest(
395-
indexName);
396-
request.index(indexName);
397-
398-
if (settings != null && !settings.isEmpty()) {
399-
request.settings(settings);
400-
}
401-
return request;
402-
}
403-
404-
public CreateIndexRequestBuilder createIndexRequestBuilder(Client client, IndexCoordinates index,
405-
@Nullable Document settings) {
406-
407-
String indexName = index.getIndexName();
408-
CreateIndexRequestBuilder createIndexRequestBuilder = client.admin().indices().prepareCreate(indexName);
409-
410-
if (settings != null) {
411-
createIndexRequestBuilder.setSettings(settings);
412-
}
413-
return createIndexRequestBuilder;
414-
}
415-
416369
public CreateIndexRequestBuilder createIndexRequestBuilder(Client client, IndexCoordinates index,
417370
@Nullable Document settings, @Nullable Document mapping) {
418371

@@ -431,29 +384,10 @@ public CreateIndexRequestBuilder createIndexRequestBuilder(Client client, IndexC
431384
return createIndexRequestBuilder;
432385
}
433386

434-
/**
435-
* creates a GetIndexRequest from the rest-high-level-client library.
436-
*
437-
* @param index name of the index
438-
* @return request
439-
*/
440387
public GetIndexRequest getIndexRequest(IndexCoordinates index) {
441388
return new GetIndexRequest(index.getIndexNames());
442389
}
443390

444-
/**
445-
* creates a CreateIndexRequest from the elasticsearch library, used by the reactive methods.
446-
*
447-
* @param indexName name of the index
448-
* @return request
449-
*/
450-
public org.elasticsearch.action.admin.indices.get.GetIndexRequest getIndexRequestReactive(String indexName) {
451-
452-
org.elasticsearch.action.admin.indices.get.GetIndexRequest request = new org.elasticsearch.action.admin.indices.get.GetIndexRequest();
453-
request.indices(indexName);
454-
return request;
455-
}
456-
457391
public IndicesExistsRequest indicesExistsRequest(IndexCoordinates index) {
458392

459393
String[] indexNames = index.getIndexNames();
@@ -485,15 +419,6 @@ public PutMappingRequest putMappingRequest(IndexCoordinates index, Document mapp
485419
return request;
486420
}
487421

488-
public org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest putMappingRequestReactive(
489-
IndexCoordinates index, Document mapping) {
490-
org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest request = new org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest(
491-
index.getIndexName());
492-
request.type("not-used-but-must-be-there");
493-
request.source(mapping);
494-
return request;
495-
}
496-
497422
public PutMappingRequestBuilder putMappingRequestBuilder(Client client, IndexCoordinates index, Document mapping) {
498423

499424
String[] indexNames = index.getIndexNames();
@@ -503,13 +428,6 @@ public PutMappingRequestBuilder putMappingRequestBuilder(Client client, IndexCoo
503428
return requestBuilder;
504429
}
505430

506-
public org.elasticsearch.action.admin.indices.mapping.get.GetMappingsRequest getMappingRequestReactive(
507-
IndexCoordinates index) {
508-
org.elasticsearch.action.admin.indices.mapping.get.GetMappingsRequest request = new org.elasticsearch.action.admin.indices.mapping.get.GetMappingsRequest();
509-
request.indices(index.getIndexName());
510-
return request;
511-
}
512-
513431
public GetSettingsRequest getSettingsRequest(String indexName, boolean includeDefaults) {
514432
return new GetSettingsRequest().indices(indexName).includeDefaults(includeDefaults);
515433
}

‎src/test/java/org/springframework/data/elasticsearch/core/ReactiveIndexOperationsTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
import org.springframework.data.elasticsearch.core.index.PutTemplateRequest;
5252
import org.springframework.data.elasticsearch.core.index.TemplateData;
5353
import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
54-
import org.springframework.data.elasticsearch.junit.jupiter.ElasticsearchRestTemplateConfiguration;
5554
import org.springframework.data.elasticsearch.junit.jupiter.ReactiveElasticsearchRestTemplateConfiguration;
5655
import org.springframework.data.elasticsearch.junit.jupiter.SpringIntegrationTest;
5756
import org.springframework.lang.Nullable;
@@ -67,7 +66,7 @@ public class ReactiveIndexOperationsTest {
6766
public static final String TESTINDEX = "reactive-index-operations-testindex";
6867

6968
@Configuration
70-
@Import({ ReactiveElasticsearchRestTemplateConfiguration.class, ElasticsearchRestTemplateConfiguration.class })
69+
@Import({ ReactiveElasticsearchRestTemplateConfiguration.class })
7170
static class Config {}
7271

7372
@Autowired private ReactiveElasticsearchOperations operations;

0 commit comments

Comments
 (0)