DATAES-684 - Polishing.

(cherry picked from commit 2475197)

Author: sothawo

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.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 @@ default Mono<BulkByScrollResponse> deleteBy(DeleteByQueryRequest deleteRequest)
 	 * Execute a {@link BulkRequest} against the {@literal bulk} API.
 	 *
 	 * @param consumer never {@literal null}.
-	 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-bulk.html">Bulk
-	 *      API on elastic.co</a>
+	 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-bulk.html">Bulk API on
+	 *      elastic.co</a>
 	 * @return a {@link Mono} emitting the emitting operation response.
 	 */
 	default Mono<BulkResponse> bulk(Consumer<BulkRequest> consumer) {
@@ -452,8 +452,8 @@ default Mono<BulkResponse> bulk(Consumer<BulkRequest> consumer) {
 	 * Execute a {@link BulkRequest} against the {@literal bulk} API.
 	 *
 	 * @param bulkRequest must not be {@literal null}.
-	 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-bulk.html">Bulk
-	 *      API on elastic.co</a>
+	 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-bulk.html">Bulk API on
+	 *      elastic.co</a>
 	 * @return a {@link Mono} emitting the emitting operation response.
 	 */
 	default Mono<BulkResponse> bulk(BulkRequest bulkRequest) {
@@ -465,8 +465,8 @@ default Mono<BulkResponse> bulk(BulkRequest bulkRequest) {
 	 *
 	 * @param headers Use {@link HttpHeaders} to provide eg. authentication data. Must not be {@literal null}.
 	 * @param bulkRequest must not be {@literal null}.
-	 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-bulk.html">Bulk
-	 *      API on elastic.co</a>
+	 * @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-bulk.html">Bulk API on
+	 *      elastic.co</a>
 	 * @return a {@link Mono} emitting operation response.
 	 */
 	Mono<BulkResponse> bulk(HttpHeaders headers, BulkRequest bulkRequest);

src/test/java/org/springframework/data/elasticsearch/client/reactive/ReactiveElasticsearchClientTests.java

@@ -18,7 +18,6 @@
 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.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 void bulkShouldUpdateExistingDocument() {
 		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() {

src/test/java/org/springframework/data/elasticsearch/client/reactive/ReactiveElasticsearchClientUnitTests.java

@@ -20,7 +20,6 @@
 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 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 void bulkShouldEmitResponseCorrectly() {
 		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);