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-951 - Revert DATAES-934.

Browse Source 
Original PR: #537
This commit is contained in:
Peter-Josef Meisch 2020-10-15 17:25:40 +02:00 committed by GitHub
parent e13c9483ae
commit 0ce2c499d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/springframework/data/elasticsearch/repository/ElasticsearchRepository.java
View File

@ -75,13 +75,6 @@ public interface ElasticsearchRepository<T, ID> extends PagingAndSortingReposito
*/ */
Page<T> search(Query searchQuery); Page<T> search(Query searchQuery);
/**
* execute the given query and return the result in a SearchPage.
*
* @since 4.1
*/
SearchPage<T> searchQuery(Query query);
/** /**
* Search for similar entities using a morelikethis query * Search for similar entities using a morelikethis query
* *

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

@ -253,12 +253,6 @@ public class SimpleElasticsearchRepository<T, ID> implements ElasticsearchReposi
return (Page<T>) SearchHitSupport.unwrapSearchHits(page); return (Page<T>) SearchHitSupport.unwrapSearchHits(page);
} }
@Override
public SearchPage<T> searchQuery(Query query) {
SearchHits<T> searchHits = execute(operations -> operations.search(query, entityClass, getIndexCoordinates()));
return SearchHitSupport.searchPageFor(searchHits, query.getPageable());
}
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public Page<T> searchSimilar(T entity, @Nullable String[] fields, Pageable pageable) { public Page<T> searchSimilar(T entity, @Nullable String[] fields, Pageable pageable) {

18
src/test/java/org/springframework/data/elasticsearch/repository/support/simple/SimpleElasticsearchRepositoryIntegrationTests.java
View File

@ -718,24 +718,6 @@ public class SimpleElasticsearchRepositoryIntegrationTests {
.containsExactlyInAnyOrder("id-one", "id-two", "id-three"); .containsExactlyInAnyOrder("id-one", "id-two", "id-three");
} }
@Test // DATAES-934
@DisplayName("should use query and return SearchPage")
void shouldUseQueryAndReturnSearchPage() {
List<SampleEntity> entities = createSampleEntitiesWithMessage("test", 20);
repository.saveAll(entities);
Criteria criteria = new Criteria("message").is("test");
CriteriaQuery query = new CriteriaQuery(new Criteria("message").is("test"));
query.setPageable(PageRequest.of(0, 8));
SearchPage<SampleEntity> searchPage = repository.searchQuery(query);
assertThat(searchPage.getTotalElements()).isEqualTo(20l);
assertThat(searchPage.stream().count()).isEqualTo(8l);
assertThat(searchPage.nextPageable().getOffset()).isEqualTo(8l);
}
private static List<SampleEntity> createSampleEntitiesWithMessage(String message, int numberOfEntities) { private static List<SampleEntity> createSampleEntitiesWithMessage(String message, int numberOfEntities) {
List<SampleEntity> sampleEntities = new ArrayList<>(); List<SampleEntity> sampleEntities = new ArrayList<>();