DATAES-866 - Polishing.

Author: sothawo

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

@@ -98,7 +98,6 @@
 import org.elasticsearch.search.aggregations.Aggregation;
 import org.elasticsearch.search.suggest.Suggest;
 import org.reactivestreams.Publisher;
-
 import org.springframework.data.elasticsearch.client.ClientConfiguration;
 import org.springframework.data.elasticsearch.client.ClientLogger;
 import org.springframework.data.elasticsearch.client.ElasticsearchHost;

src/main/java/org/springframework/data/elasticsearch/client/reactive/ReactiveElasticsearchClient.java

@@ -419,6 +419,20 @@ default Flux<SearchHit> search(SearchRequest searchRequest) {
 	 */
 	Flux<SearchHit> search(HttpHeaders headers, SearchRequest searchRequest);
 
+	/**
+	 * Execute the given {@link SearchRequest} against the {@literal search} API.
+	 *
+	 * @param consumer never {@literal null}.
+	 * @return the {@link Flux} emitting {@link Suggest suggestions} one by one.
+	 * @since 4.1
+	 */
+	default Flux<Suggest> suggest(Consumer<SearchRequest> consumer) {
+
+		SearchRequest request = new SearchRequest();
+		consumer.accept(request);
+		return suggest(request);
+	}
+
 	/**
 	 * Execute the given {@link SearchRequest} against the {@literal search} API.
 	 *

src/main/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplate.java

@@ -645,7 +645,7 @@ public Flux<Aggregation> aggregate(Query query, Class<?> entityType, IndexCoordi
 
 	@Override
 	public Flux<Suggest> suggest(SuggestBuilder suggestion, Class<?> entityType) {
-		return suggest(suggestion, getIndexCoordinatesFor(entityType));
+		return doSuggest(suggestion, getIndexCoordinatesFor(entityType));
 	}
 
 	@Override

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

@@ -693,10 +693,8 @@ public void suggestReturnsSuggestionResults() throws IOException {
 
 		addSourceDocument().ofType(TYPE_I).to(INDEX_I);
 
-		SuggestBuilder suggestBuilder = new SuggestBuilder().addSuggestion(
-				"firstname",
-				new CompletionSuggestionBuilder("firstname").prefix("ch")
-		);
+		SuggestBuilder suggestBuilder = new SuggestBuilder().addSuggestion("firstname",
+				new CompletionSuggestionBuilder("firstname").prefix("ch"));
 
 		SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder().query(QueryBuilders.matchAllQuery());
 		searchSourceBuilder.suggest(suggestBuilder);