From 6f0d1ee9e772e4b36811227503e64cfa8a76d27c Mon Sep 17 00:00:00 2001 From: Peter-Josef Meisch Date: Tue, 5 Nov 2019 10:05:14 +0100 Subject: [PATCH] DATAES-684 - Polishing. (cherry picked from commit 24751972a8f266281e948eaf5f73f66003d4b896) --- .../reactive/ReactiveElasticsearchClient.java | 16 ++++++++-------- .../ReactiveElasticsearchClientTests.java | 10 ++++------ .../ReactiveElasticsearchClientUnitTests.java | 5 ++--- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/src/main/java/org/springframework/data/elasticsearch/client/reactive/ReactiveElasticsearchClient.java b/src/main/java/org/springframework/data/elasticsearch/client/reactive/ReactiveElasticsearchClient.java index a30dbc71d..b3340ad2b 100644 --- a/src/main/java/org/springframework/data/elasticsearch/client/reactive/ReactiveElasticsearchClient.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/reactive/ReactiveElasticsearchClient.java @@ -15,8 +15,6 @@ */ package org.springframework.data.elasticsearch.client.reactive; -import org.elasticsearch.action.bulk.BulkRequest; -import org.elasticsearch.action.bulk.BulkResponse; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -32,6 +30,8 @@ import org.elasticsearch.action.admin.indices.get.GetIndexRequest; import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest; import org.elasticsearch.action.admin.indices.open.OpenIndexRequest; import org.elasticsearch.action.admin.indices.refresh.RefreshRequest; +import org.elasticsearch.action.bulk.BulkRequest; +import org.elasticsearch.action.bulk.BulkResponse; import org.elasticsearch.action.delete.DeleteRequest; import org.elasticsearch.action.delete.DeleteResponse; import org.elasticsearch.action.get.GetRequest; @@ -437,8 +437,8 @@ public interface ReactiveElasticsearchClient { * Execute a {@link BulkRequest} against the {@literal bulk} API. * * @param consumer never {@literal null}. - * @see Bulk - * API on elastic.co + * @see Bulk API on + * elastic.co * @return a {@link Mono} emitting the emitting operation response. */ default Mono bulk(Consumer consumer) { @@ -452,8 +452,8 @@ public interface ReactiveElasticsearchClient { * Execute a {@link BulkRequest} against the {@literal bulk} API. * * @param bulkRequest must not be {@literal null}. - * @see Bulk - * API on elastic.co + * @see Bulk API on + * elastic.co * @return a {@link Mono} emitting the emitting operation response. */ default Mono bulk(BulkRequest bulkRequest) { @@ -465,8 +465,8 @@ public interface ReactiveElasticsearchClient { * * @param headers Use {@link HttpHeaders} to provide eg. authentication data. Must not be {@literal null}. * @param bulkRequest must not be {@literal null}. - * @see Bulk - * API on elastic.co + * @see Bulk API on + * elastic.co * @return a {@link Mono} emitting operation response. */ Mono bulk(HttpHeaders headers, BulkRequest bulkRequest); diff --git a/src/test/java/org/springframework/data/elasticsearch/client/reactive/ReactiveElasticsearchClientTests.java b/src/test/java/org/springframework/data/elasticsearch/client/reactive/ReactiveElasticsearchClientTests.java index d505d1d0c..0b146d159 100644 --- a/src/test/java/org/springframework/data/elasticsearch/client/reactive/ReactiveElasticsearchClientTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/client/reactive/ReactiveElasticsearchClientTests.java @@ -18,7 +18,6 @@ package org.springframework.data.elasticsearch.client.reactive; import static org.assertj.core.api.Assertions.*; import lombok.SneakyThrows; -import org.elasticsearch.action.bulk.BulkRequest; import reactor.test.StepVerifier; import java.io.IOException; @@ -34,6 +33,7 @@ import org.elasticsearch.ElasticsearchStatusException; import org.elasticsearch.Version; import org.elasticsearch.action.admin.indices.create.CreateIndexRequest; import org.elasticsearch.action.admin.indices.get.GetIndexRequest; +import org.elasticsearch.action.bulk.BulkRequest; import org.elasticsearch.action.delete.DeleteRequest; import org.elasticsearch.action.get.GetRequest; import org.elasticsearch.action.get.MultiGetRequest; @@ -669,18 +669,16 @@ public class ReactiveElasticsearchClientTests { bulkRequest.add(requestFirstDoc); bulkRequest.add(requestSecondDoc); - client.bulk(bulkRequest) - .as(StepVerifier::create) // + client.bulk(bulkRequest).as(StepVerifier::create) // .consumeNextWith(it -> { assertThat(it.status()).isEqualTo(RestStatus.OK); assertThat(it.hasFailures()).isFalse(); - Arrays.stream(it.getItems()).forEach(itemResponse-> { + Arrays.stream(it.getItems()).forEach(itemResponse -> { assertThat(itemResponse.status()).isEqualTo(RestStatus.OK); assertThat(itemResponse.getVersion()).isEqualTo(2); }); - }) - .verifyComplete(); + }).verifyComplete(); } private AddToIndexOfType addSourceDocument() { diff --git a/src/test/java/org/springframework/data/elasticsearch/client/reactive/ReactiveElasticsearchClientUnitTests.java b/src/test/java/org/springframework/data/elasticsearch/client/reactive/ReactiveElasticsearchClientUnitTests.java index 09373c17b..bfdf18b45 100644 --- a/src/test/java/org/springframework/data/elasticsearch/client/reactive/ReactiveElasticsearchClientUnitTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/client/reactive/ReactiveElasticsearchClientUnitTests.java @@ -20,7 +20,6 @@ import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import static org.springframework.data.elasticsearch.client.reactive.ReactiveMockClientTestsUtils.MockWebClientProvider.Receive.*; -import org.elasticsearch.action.bulk.BulkRequest; import org.elasticsearch.rest.RestStatus; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; @@ -31,6 +30,7 @@ import java.util.Collections; import org.elasticsearch.ElasticsearchStatusException; import org.elasticsearch.action.DocWriteResponse.Result; +import org.elasticsearch.action.bulk.BulkRequest; import org.elasticsearch.action.delete.DeleteRequest; import org.elasticsearch.action.get.GetRequest; import org.elasticsearch.action.get.MultiGetRequest; @@ -636,8 +636,7 @@ public class ReactiveElasticsearchClientUnitTests { final BulkRequest bulkRequest = new BulkRequest(); bulkRequest.add(updateRequest); - client.bulk(bulkRequest) - .as(StepVerifier::create) // + client.bulk(bulkRequest).as(StepVerifier::create) // .consumeNextWith(bulkResponse -> { assertThat(bulkResponse.status()).isEqualTo(RestStatus.OK);