DATAES-866 - Polishing.

This commit is contained in:
Peter-Josef Meisch 2020-06-21 19:41:28 +02:00
parent 36f0907881
commit 6332534ea1
4 changed files with 17 additions and 6 deletions

View File

@ -98,7 +98,6 @@ import org.elasticsearch.search.SearchHits;
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;

View File

@ -419,6 +419,20 @@ public interface ReactiveElasticsearchClient {
*/
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.
*

View File

@ -645,7 +645,7 @@ public class ReactiveElasticsearchTemplate implements ReactiveElasticsearchOpera
@Override
public Flux<Suggest> suggest(SuggestBuilder suggestion, Class<?> entityType) {
return suggest(suggestion, getIndexCoordinatesFor(entityType));
return doSuggest(suggestion, getIndexCoordinatesFor(entityType));
}
@Override

View File

@ -693,10 +693,8 @@ public class ReactiveElasticsearchClientTests {
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);