Cwikius-Spring/spring-data-elasticsearch
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-data-elasticsearch.git synced 2025-06-22 12:02:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added support for searchSimilar in ElasticsearchRepository

Browse Source 
https://github.com/BioMedCentralLtd/spring-data-elasticsearch/issues/4
This commit is contained in:
Rizwan Idrees 2013-03-19 17:26:32 +00:00
parent 41de820c70
commit c78bfc0f5c
5 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/springframework/data/elasticsearch/core/query/AbstractQuery.java
View File

@ -33,8 +33,6 @@ import static org.apache.commons.collections.CollectionUtils.addAll;
*/
abstract class AbstractQuery implements Query{
private static final Pageable DEFAULT_PAGE = new PageRequest(0, DEFAULT_PAGE_SIZE);
protected Pageable pageable = DEFAULT_PAGE;
protected Sort sort;
protected List<String> indices = new ArrayList<String>();

5
src/main/java/org/springframework/data/elasticsearch/core/query/MoreLikeThisQuery.java
View File

@ -16,14 +16,13 @@
package org.springframework.data.elasticsearch.core.query;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import java.util.ArrayList;
import java.util.List;
import static org.apache.commons.collections.CollectionUtils.addAll;
import static org.springframework.data.elasticsearch.core.query.Query.DEFAULT_PAGE_SIZE;
import static org.springframework.data.elasticsearch.core.query.Query.DEFAULT_PAGE;
/**
* MoreLikeThisQuery
@ -50,7 +49,7 @@ public class MoreLikeThisQuery {
private Integer minWordLen;
private Integer maxWordLen;
private Float boostTerms;
private Pageable pageable = new PageRequest(0, DEFAULT_PAGE_SIZE);
private Pageable pageable = DEFAULT_PAGE;
public String getId() {
return id;

4
src/main/java/org/springframework/data/elasticsearch/core/query/Query.java
View File

@ -17,6 +17,7 @@
package org.springframework.data.elasticsearch.core.query;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
@ -29,7 +30,8 @@ import java.util.List;
*/
public interface Query {
int DEFAULT_PAGE_SIZE = 10;
public static final int DEFAULT_PAGE_SIZE = 10;
public static final Pageable DEFAULT_PAGE = new PageRequest(0, DEFAULT_PAGE_SIZE);
/**

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

@ -42,4 +42,6 @@ public interface ElasticsearchRepository<T, ID extends Serializable> extends Ela
Page<T> search(SearchQuery searchQuery);
Page<T> searchSimilar(T entity);
Page<T> searchSimilar(T entity, Pageable pageable);
}

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

@ -32,6 +32,7 @@ import java.util.List;
import static org.elasticsearch.index.query.QueryBuilders.inQuery;
import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
import static org.springframework.data.elasticsearch.core.query.Query.DEFAULT_PAGE;
/**
* Elasticsearch specific repository implementation. Likely to be used as target within {@link ElasticsearchRepositoryFactory}
@ -185,12 +186,20 @@ public class SimpleElasticsearchRepository<T> implements ElasticsearchRepository
@Override
public Page<T> searchSimilar(T entity) {
return searchSimilar(entity, DEFAULT_PAGE);
}
@Override
public Page<T> searchSimilar(T entity, Pageable pageable) {
Assert.notNull(entity, "Cannot search similar records for 'null'.");
Assert.notNull(entity, "Pageable cannot be 'null'");
MoreLikeThisQuery query = new MoreLikeThisQuery();
query.setId(extractIdFromBean(entity));
query.setPageable(pageable);
return elasticsearchOperations.moreLikeThis(query, getEntityClass());
}
@Override
public void delete(String id) {
Assert.notNull(id, "Cannot delete entity with id 'null'.");