Cwikius-Spring/spring-data-elasticsearch
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-data-elasticsearch.git synced 2025-05-31 09:12:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

DATAES-832 - findAllById repository method returns iterable with null elements for not found ids.

Browse Source
This commit is contained in:
Peter-Josef Meisch 2020-05-18 17:52:34 +02:00
parent b439acac16
commit 49f1516b9e
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepository.java
View File

@ -17,9 +17,9 @@ package org.springframework.data.elasticsearch.repository.support;
import static org.elasticsearch.index.query.QueryBuilders.*;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.stream.Collectors;
@ -152,10 +152,23 @@ public class SimpleElasticsearchRepository<T, ID> implements ElasticsearchReposi
@Override
public Iterable<T> findAllById(Iterable<ID> ids) {
Assert.notNull(ids, "ids can't be null.");
NativeSearchQuery query = new NativeSearchQueryBuilder().withIds(stringIdsRepresentation(ids)).build();
return execute(operations1 -> operations1.multiGet(query, entityClass, getIndexCoordinates())).stream()
.filter(Objects::nonNull).collect(Collectors.toList());
List<T> result = new ArrayList<>();
List<T> multiGetEntities = execute(operations -> operations.multiGet(query, entityClass, getIndexCoordinates()));
if (multiGetEntities != null) {
multiGetEntities.forEach(entity -> {
if (entity != null) {
result.add(entity);
}
});
}
return result;
}
@Override