From 17a25cb0adc4ecd8673117fe9ca1d7d2a2f5472c Mon Sep 17 00:00:00 2001 From: Peter-Josef Meisch Date: Wed, 24 Feb 2021 21:16:52 +0100 Subject: [PATCH] Polishing --- .../DefaultReactiveElasticsearchClient.java | 46 +++++-------- .../client/reactive/RequestCreator.java | 68 +++++++++---------- 2 files changed, 52 insertions(+), 62 deletions(-) diff --git a/src/main/java/org/springframework/data/elasticsearch/client/reactive/DefaultReactiveElasticsearchClient.java b/src/main/java/org/springframework/data/elasticsearch/client/reactive/DefaultReactiveElasticsearchClient.java index f38917131..e98d9647a 100644 --- a/src/main/java/org/springframework/data/elasticsearch/client/reactive/DefaultReactiveElasticsearchClient.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/reactive/DefaultReactiveElasticsearchClient.java @@ -79,18 +79,7 @@ import org.elasticsearch.action.update.UpdateRequest; import org.elasticsearch.action.update.UpdateResponse; import org.elasticsearch.client.GetAliasesResponse; import org.elasticsearch.client.Request; -import org.elasticsearch.client.indices.CreateIndexRequest; -import org.elasticsearch.client.indices.GetFieldMappingsRequest; -import org.elasticsearch.client.indices.GetFieldMappingsResponse; -import org.elasticsearch.client.indices.GetIndexRequest; -import org.elasticsearch.client.indices.GetIndexResponse; -import org.elasticsearch.client.indices.GetIndexTemplatesRequest; -import org.elasticsearch.client.indices.GetIndexTemplatesResponse; -import org.elasticsearch.client.indices.GetMappingsRequest; -import org.elasticsearch.client.indices.GetMappingsResponse; -import org.elasticsearch.client.indices.IndexTemplatesExistRequest; -import org.elasticsearch.client.indices.PutIndexTemplateRequest; -import org.elasticsearch.client.indices.PutMappingRequest; +import org.elasticsearch.client.indices.*; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.DeprecationHandler; import org.elasticsearch.common.xcontent.NamedXContentRegistry; @@ -647,7 +636,7 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch // region indices operations @Override public Mono createIndex(HttpHeaders headers, - org.elasticsearch.action.admin.indices.create.CreateIndexRequest createIndexRequest) { + org.elasticsearch.action.admin.indices.create.CreateIndexRequest createIndexRequest) { return sendRequest(createIndexRequest, requestCreator.indexCreate(), AcknowledgedResponse.class, headers) // .map(AcknowledgedResponse::isAcknowledged) // @@ -670,21 +659,22 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch } @Override - public Mono existsIndex(HttpHeaders headers, org.elasticsearch.action.admin.indices.get.GetIndexRequest request) { + public Mono existsIndex(HttpHeaders headers, + org.elasticsearch.action.admin.indices.get.GetIndexRequest request) { return sendRequest(request, requestCreator.indexExists(), RawActionResponse.class, headers) // .flatMap(response -> response.releaseBody().thenReturn(response.statusCode().is2xxSuccessful())) // .next(); } - @Override - public Mono existsIndex(HttpHeaders headers, GetIndexRequest request) { - return sendRequest(request, requestCreator.indexExistsRequest(), RawActionResponse.class, headers) // - .flatMap(response -> response.releaseBody().thenReturn(response.statusCode().is2xxSuccessful())) // - .next(); - } + @Override + public Mono existsIndex(HttpHeaders headers, GetIndexRequest request) { + return sendRequest(request, requestCreator.indexExistsRequest(), RawActionResponse.class, headers) // + .flatMap(response -> response.releaseBody().thenReturn(response.statusCode().is2xxSuccessful())) // + .next(); + } - @Override + @Override public Mono deleteIndex(HttpHeaders headers, DeleteIndexRequest request) { return sendRequest(request, requestCreator.indexDelete(), AcknowledgedResponse.class, headers) // @@ -701,15 +691,15 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch @Override public Mono getMapping(HttpHeaders headers, - org.elasticsearch.action.admin.indices.mapping.get.GetMappingsRequest getMappingsRequest) { + org.elasticsearch.action.admin.indices.mapping.get.GetMappingsRequest getMappingsRequest) { return sendRequest(getMappingsRequest, requestCreator.getMapping(), - org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse.class, headers).next(); + org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse.class, headers).next(); } @Override public Mono getMapping(HttpHeaders headers, GetMappingsRequest getMappingsRequest) { return sendRequest(getMappingsRequest, requestCreator.getMappingRequest(), GetMappingsResponse.class, headers) // - .next(); + .next(); } @Override @@ -726,7 +716,7 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch @Override public Mono putMapping(HttpHeaders headers, - org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest putMappingRequest) { + org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest putMappingRequest) { return sendRequest(putMappingRequest, requestCreator.putMapping(), AcknowledgedResponse.class, headers) // .map(AcknowledgedResponse::isAcknowledged) // @@ -735,9 +725,9 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch @Override public Mono putMapping(HttpHeaders headers, PutMappingRequest putMappingRequest) { - return sendRequest(putMappingRequest, requestCreator.putMappingRequest(), AcknowledgedResponse.class, headers) // - .map(AcknowledgedResponse::isAcknowledged) // - .next(); + return sendRequest(putMappingRequest, requestCreator.putMappingRequest(), AcknowledgedResponse.class, headers) // + .map(AcknowledgedResponse::isAcknowledged) // + .next(); } @Override diff --git a/src/main/java/org/springframework/data/elasticsearch/client/reactive/RequestCreator.java b/src/main/java/org/springframework/data/elasticsearch/client/reactive/RequestCreator.java index a2beccc9e..abe82762d 100644 --- a/src/main/java/org/springframework/data/elasticsearch/client/reactive/RequestCreator.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/reactive/RequestCreator.java @@ -114,36 +114,36 @@ public interface RequestCreator { // --> INDICES - /** - * @deprecated since 4.2 - */ - @Deprecated + /** + * @deprecated since 4.2 + */ + @Deprecated default Function indexExists() { return RequestConverters::indexExists; } - /** - * @since 4.2 - */ - default Function indexExistsRequest() { - return RequestConverters::indexExists; - } + /** + * @since 4.2 + */ + default Function indexExistsRequest() { + return RequestConverters::indexExists; + } default Function indexDelete() { return RequestConverters::indexDelete; } - /** - * @deprecated since 4.2 - */ - @Deprecated + /** + * @deprecated since 4.2 + */ + @Deprecated default Function indexCreate() { return RequestConverters::indexCreate; } - /** - * @since 4.2 - */ + /** + * @since 4.2 + */ default Function createIndexRequest() { return RequestConverters::indexCreate; } @@ -160,20 +160,20 @@ public interface RequestCreator { return RequestConverters::indexRefresh; } - /** - * @deprecated since 4.2 - */ - @Deprecated + /** + * @deprecated since 4.2 + */ + @Deprecated default Function putMapping() { return RequestConverters::putMapping; } - /** - * @since 4.2 - */ - default Function putMappingRequest() { - return RequestConverters::putMapping; - } + /** + * @since 4.2 + */ + default Function putMappingRequest() { + return RequestConverters::putMapping; + } default Function flushIndex() { return RequestConverters::flushIndex; @@ -192,19 +192,19 @@ public interface RequestCreator { /** * @since 4.1 - * @deprecated since 4.2 + * @deprecated since 4.2 */ @Deprecated default Function getMapping() { return RequestConverters::getMapping; } - /** - * @since 4.2 - */ - default Function getMappingRequest() { - return RequestConverters::getMapping; - } + /** + * @since 4.2 + */ + default Function getMappingRequest() { + return RequestConverters::getMapping; + } /** * @since 4.1