bug fix : custom repository methods should work with pageable request

SpringDataElasticsearchDevs · Apr 3, 2013 · 0d072ab · 0d072ab
1 parent 23e7a0a
commit 0d072ab
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 1 deletion.
diff --git a/.../java/org/springframework/data/elasticsearch/repository/query/ElasticsearchPartQuery.java b/.../java/org/springframework/data/elasticsearch/repository/query/ElasticsearchPartQuery.java
@@ -47,7 +47,8 @@ public Object execute(Object[] parameters) {
         ParametersParameterAccessor accessor = new ParametersParameterAccessor(queryMethod.getParameters(), parameters);
         CriteriaQuery query = createQuery(accessor);
         if(queryMethod.isPageQuery()){
-            return  elasticsearchOperations.queryForPage(query, queryMethod.getEntityInformation().getJavaType());
+            query.setPageable(accessor.getPageable());
+            return elasticsearchOperations.queryForPage(query, queryMethod.getEntityInformation().getJavaType());
         }
         return elasticsearchOperations.queryForObject(query, queryMethod.getEntityInformation().getJavaType());
     }

diff --git a/...ava/org/springframework/data/elasticsearch/repository/query/ElasticsearchStringQuery.java b/...ava/org/springframework/data/elasticsearch/repository/query/ElasticsearchStringQuery.java
@@ -63,6 +63,7 @@ public Object execute(Object[] parameters) {
         ParametersParameterAccessor accessor = new ParametersParameterAccessor(queryMethod.getParameters(), parameters);
         StringQuery stringQuery = createQuery(accessor);
         if(queryMethod.isPageQuery()){
+            stringQuery.setPageable(accessor.getPageable());
             return  elasticsearchOperations.queryForPage(stringQuery, queryMethod.getEntityInformation().getJavaType());
         }
         return elasticsearchOperations.queryForObject(stringQuery, queryMethod.getEntityInformation().getJavaType());

diff --git a/src/test/java/org/springframework/data/elasticsearch/Book.java b/src/test/java/org/springframework/data/elasticsearch/Book.java
@@ -15,6 +15,7 @@
  */
 package org.springframework.data.elasticsearch;
 
+import org.springframework.data.annotation.Id;
 import org.springframework.data.elasticsearch.annotations.Document;
 /**
  * @author Rizwan Idrees
@@ -23,6 +24,7 @@
 @Document(indexName = "book",type = "book")
 public class Book {
 
+    @Id
     private String id;
     private String name;
     private Author author;

diff --git a/.../java/org/springframework/data/elasticsearch/repositories/CustomMethodRepositoryTest.java b/.../java/org/springframework/data/elasticsearch/repositories/CustomMethodRepositoryTest.java
@@ -23,6 +23,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.elasticsearch.SampleEntity;
 import org.springframework.data.elasticsearch.core.ElasticsearchTemplate;
 import org.springframework.data.elasticsearch.core.query.DeleteQuery;
@@ -34,6 +35,7 @@
 import java.util.Arrays;
 import java.util.List;
 
+import static org.apache.commons.lang.RandomStringUtils.random;
 import static org.apache.commons.lang.RandomStringUtils.randomNumeric;
 import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
 import static org.hamcrest.Matchers.*;
@@ -413,4 +415,52 @@ public void shouldExecuteCustomMethodWithBooleanParameter(){
         assertThat(page.getTotalElements(), is(equalTo(1L)));
     }
 
+    @Test
+    public void shouldReturnPageableResultsWithQueryAnnotationExpectedPageSize() {
+        // given
+        for (int i = 0; i < 30; i++) {
+            String documentId = String.valueOf(i);
+            SampleEntity sampleEntity = new SampleEntity();
+            sampleEntity.setId(documentId);
+            sampleEntity.setMessage("message");
+            sampleEntity.setVersion(System.currentTimeMillis());
+            repository.save(sampleEntity);
+        }
+        // when
+        Page<SampleEntity> pageResult = repository.findByMessage("message", new PageRequest(0, 23, new Sort(new Sort.Order(Sort.Direction.ASC,"message"))));
+        // then
+        assertThat(pageResult.getTotalElements(), is(equalTo(30L)));
+        assertThat(pageResult.getContent().size(), is(equalTo(23)));
+    }
+
+    @Test
+    public void shouldReturnPageableResultsWithGivenSortingOrder(){
+        //given
+        String documentId = random(5);
+        SampleEntity sampleEntity = new SampleEntity();
+        sampleEntity.setId(documentId);
+        sampleEntity.setMessage("abc");
+        sampleEntity.setVersion(System.currentTimeMillis());
+        repository.save(sampleEntity);
+
+        String documentId2 = randomNumeric(5);
+        SampleEntity sampleEntity2 = new SampleEntity();
+        sampleEntity2.setId(documentId2);
+        sampleEntity2.setMessage("abd");
+        sampleEntity.setVersion(System.currentTimeMillis());
+        repository.save(sampleEntity2);
+
+        String documentId3 = randomNumeric(5);
+        SampleEntity sampleEntity3 = new SampleEntity();
+        sampleEntity3.setId(documentId3);
+        sampleEntity3.setMessage("abe");
+        sampleEntity.setVersion(System.currentTimeMillis());
+        repository.save(sampleEntity3);
+        //when
+        Page<SampleEntity> pageResult = repository.findByMessageContaining("a", new PageRequest(0, 23, new Sort(new Sort.Order(Sort.Direction.DESC,"message"))));
+        //then
+        assertThat(pageResult.getContent().isEmpty(),is(false));
+        assertThat(pageResult.getContent().get(0).getMessage(),is(sampleEntity3.getMessage()));
+    }
+
 }