diff --git a/src/main/java/org/springframework/data/elasticsearch/client/elc/ElasticsearchTemplate.java b/src/main/java/org/springframework/data/elasticsearch/client/elc/ElasticsearchTemplate.java index 04a07f20c..f849c2822 100644 --- a/src/main/java/org/springframework/data/elasticsearch/client/elc/ElasticsearchTemplate.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/elc/ElasticsearchTemplate.java @@ -468,7 +468,7 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate { @Override public List> multiSearch(List queries, List> classes, - List indexes) { + List indexes) { Assert.notNull(queries, "queries must not be null"); Assert.notNull(classes, "classes must not be null"); @@ -652,9 +652,8 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate { failedDocuments); } - return bulkResponse.items().stream() - .map(item -> new IndexedObjectInformation(item.id(), item.index(), item.seqNo(), item.primaryTerm(), - item.version())) + return bulkResponse.items().stream().map( + item -> new IndexedObjectInformation(item.id(), item.index(), item.seqNo(), item.primaryTerm(), item.version())) .collect(Collectors.toList()); } diff --git a/src/main/java/org/springframework/data/elasticsearch/client/erhlc/ElasticsearchRestTemplate.java b/src/main/java/org/springframework/data/elasticsearch/client/erhlc/ElasticsearchRestTemplate.java index dea1a3403..ff19938a5 100644 --- a/src/main/java/org/springframework/data/elasticsearch/client/erhlc/ElasticsearchRestTemplate.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/erhlc/ElasticsearchRestTemplate.java @@ -381,8 +381,7 @@ public class ElasticsearchRestTemplate extends AbstractElasticsearchTemplate { response.getPrimaryTerm(), // response.getVersion()); } else { - return new IndexedObjectInformation(bulkItemResponse.getId(), bulkItemResponse.getIndex(), null, null, - null); + return new IndexedObjectInformation(bulkItemResponse.getId(), bulkItemResponse.getIndex(), null, null, null); } }).collect(Collectors.toList()); @@ -561,7 +560,7 @@ public class ElasticsearchRestTemplate extends AbstractElasticsearchTemplate { @Override public List> multiSearch(List queries, List> classes, - List indexes) { + List indexes) { Assert.notNull(queries, "queries must not be null"); Assert.notNull(classes, "classes must not be null"); diff --git a/src/main/java/org/springframework/data/elasticsearch/core/SearchOperations.java b/src/main/java/org/springframework/data/elasticsearch/core/SearchOperations.java index 3a3947cc3..7a9c29a80 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/SearchOperations.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/SearchOperations.java @@ -140,8 +140,10 @@ public interface SearchOperations { * @param classes the entity classes used for property mapping * @param indexes the indexes to run the queries against * @return list of SearchHits + * @since 5.1 */ - List> multiSearch(List queries, List> classes, List indexes); + List> multiSearch(List queries, List> classes, + List indexes); /** * Execute the criteria query against elasticsearch and return result as {@link SearchHits} @@ -232,19 +234,20 @@ public interface SearchOperations { /** * Opens a point in time (pit) in Elasticsearch. * - * @param index the index name(s) to use - * @param keepAlive the duration the pit shoult be kept alive + * @param index the index name(s) to use + * @param keepAlive the duration the pit shoult be kept alive * @return the pit identifier * @since 5.0 */ default String openPointInTime(IndexCoordinates index, Duration keepAlive) { return openPointInTime(index, keepAlive, false); } + /** * Opens a point in time (pit) in Elasticsearch. * - * @param index the index name(s) to use - * @param keepAlive the duration the pit shoult be kept alive + * @param index the index name(s) to use + * @param keepAlive the duration the pit shoult be kept alive * @param ignoreUnavailable if {$literal true} the call will fail if any of the indices is missing or closed * @return the pit identifier * @since 5.0 diff --git a/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchIntegrationTests.java b/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchIntegrationTests.java index 0d37336fc..d5f659a26 100755 --- a/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchIntegrationTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchIntegrationTests.java @@ -29,16 +29,7 @@ import java.lang.Double; import java.lang.Integer; import java.lang.Long; import java.lang.Object; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.UUID; +import java.util.*; import java.util.stream.Collectors; import java.util.stream.IntStream; @@ -1784,8 +1775,7 @@ public abstract class ElasticsearchIntegrationTests { List> searchHitsList = operations.multiSearch(queries, Lists.newArrayList(SampleEntity.class, Book.class), - List.of(IndexCoordinates.of(indexNameProvider.indexName()), - IndexCoordinates.of(bookIndex.getIndexName()))); + List.of(IndexCoordinates.of(indexNameProvider.indexName()), IndexCoordinates.of(bookIndex.getIndexName()))); bookIndexOperations.delete();