Cwikius-Spring/spring-data-elasticsearch
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-data-elasticsearch.git synced 2025-07-06 18:52:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

SimpleElasticsearchRepository still uses erhlc code.

Browse Source 
Original Pull Request #2239
Closes #2238
This commit is contained in:
Peter-Josef Meisch 2022-07-24 22:03:01 +02:00 committed by GitHub
parent 1c31a31e11
commit 3e950b8053
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,8 +15,6 @@
*/ */
package org.springframework.data.elasticsearch.repository.support; package org.springframework.data.elasticsearch.repository.support;
import static org.springframework.util.CollectionUtils.*;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@ -28,11 +26,9 @@ import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort; import org.springframework.data.domain.Sort;
import org.springframework.data.elasticsearch.client.erhlc.NativeSearchQueryBuilder;
import org.springframework.data.elasticsearch.core.AbstractElasticsearchTemplate; import org.springframework.data.elasticsearch.core.AbstractElasticsearchTemplate;
import org.springframework.data.elasticsearch.core.ElasticsearchOperations; import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
import org.springframework.data.elasticsearch.core.IndexOperations; import org.springframework.data.elasticsearch.core.IndexOperations;
import org.springframework.data.elasticsearch.core.MultiGetItem;
import org.springframework.data.elasticsearch.core.RefreshPolicy; import org.springframework.data.elasticsearch.core.RefreshPolicy;
import org.springframework.data.elasticsearch.core.SearchHit; import org.springframework.data.elasticsearch.core.SearchHit;
import org.springframework.data.elasticsearch.core.SearchHitSupport; import org.springframework.data.elasticsearch.core.SearchHitSupport;
@ -152,24 +148,12 @@ public class SimpleElasticsearchRepository<T, ID> implements ElasticsearchReposi
Assert.notNull(ids, "ids can't be null."); Assert.notNull(ids, "ids can't be null.");
List<T> result = new ArrayList<>(); List<T> result = new ArrayList<>();
Query idQuery = getIdQuery(ids); Query query = getIdQuery(ids);
if (isEmpty(idQuery.getIds())) {
return result;
}
List<MultiGetItem<T>> multiGetItems = execute( List<SearchHit<T>> searchHitList = execute(
operations -> operations.multiGet(idQuery, entityClass, getIndexCoordinates())); operations -> operations.search(query, entityClass, getIndexCoordinates()).getSearchHits());
// noinspection ConstantConditions
if (multiGetItems != null) { return (List<T>) SearchHitSupport.unwrapSearchHits(searchHitList);
multiGetItems.forEach(multiGetItem -> {
if (multiGetItem.hasItem()) {
result.add(multiGetItem.getItem());
}
});
}
return result;
} }
@Override @Override
@ -339,7 +323,7 @@ public class SimpleElasticsearchRepository<T, ID> implements ElasticsearchReposi
private Query getIdQuery(Iterable<? extends ID> ids) { private Query getIdQuery(Iterable<? extends ID> ids) {
List<String> stringIds = stringIdsRepresentation(ids); List<String> stringIds = stringIdsRepresentation(ids);
return new NativeSearchQueryBuilder().withIds(stringIds).build(); return operations.idsQuery(stringIds);
} }
// endregion // endregion