Spring/spring-data-redis
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAREDIS-547 - Fix query execution when derived criteria is empty.

Browse Source 
We now make sure to pipe finder queries without any criteria to the according find all method. This allows usage of `PagingAndSortingRepository.findAllBy(Pageable page)` as well as finders without any criteria like `findTop3By()`.

Original pull request: #216.
This commit is contained in:
Christoph Strobl
2016-08-24 10:08:58 +02:00
committed by Mark Paluch
parent d4af51e77d
commit 83ff5ec85b
4 changed files with 111 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/test/java/org/springframework/data/redis/repository/RedisRepositoryIntegrationTestBase.java
View File

@@ -15,10 +15,9 @@
*/
package org.springframework.data.redis.repository;
import static org.hamcrest.CoreMatchers.*;
import static org.hamcrest.collection.IsCollectionWithSize.*;
import static org.hamcrest.collection.IsIterableContainingInAnyOrder.*;
import static org.hamcrest.core.Is.*;
import static org.hamcrest.core.IsCollectionContaining.*;
import static org.junit.Assert.*;
import java.io.Serializable;
@@ -42,7 +41,7 @@ import org.springframework.data.redis.core.index.IndexConfiguration;
import org.springframework.data.redis.core.index.IndexDefinition;
import org.springframework.data.redis.core.index.Indexed;
import org.springframework.data.redis.core.index.SimpleIndexDefinition;
import org.springframework.data.repository.CrudRepository;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
* Base for testing Redis repository support in different configurations.
@@ -190,7 +189,76 @@ public abstract class RedisRepositoryIntegrationTestBase {
assertThat(eddardAndJon, containsInAnyOrder(eddard, jon));
}
public static interface PersonRepository extends CrudRepository<Person, String> {
/**
* @see DATAREDIS-547
*/
@Test
public void shouldApplyFirstKeywordCorrectly() {
Person eddard = new Person("eddard", "stark");
Person robb = new Person("robb", "stark");
Person jon = new Person("jon", "snow");
repo.save(Arrays.asList(eddard, robb, jon));
assertThat(repo.findFirstBy(), hasSize(1));
}
/**
* @see DATAREDIS-547
*/
@Test
public void shouldApplyPageableCorrectlyWhenUsingFindAll() {
Person eddard = new Person("eddard", "stark");
Person robb = new Person("robb", "stark");
Person jon = new Person("jon", "snow");
repo.save(Arrays.asList(eddard, robb, jon));
Page<Person> firstPage = repo.findAll(new PageRequest(0, 2));
assertThat(firstPage.getContent(), hasSize(2));
assertThat(repo.findAll(firstPage.nextPageable()).getContent(), hasSize(1));
}
/**
* @see DATAREDIS-547
*/
@Test
public void shouldApplyTopKeywordCorrectly() {
Person eddard = new Person("eddard", "stark");
Person robb = new Person("robb", "stark");
Person jon = new Person("jon", "snow");
repo.save(Arrays.asList(eddard, robb, jon));
assertThat(repo.findTop2By(), hasSize(2));
}
/**
* @see DATAREDIS-547
*/
@Test
public void shouldApplyTopKeywordCorrectlyWhenCriteriaPresent() {
Person eddard = new Person("eddard", "stark");
Person tyrion = new Person("tyrion", "lannister");
Person robb = new Person("robb", "stark");
Person jon = new Person("jon", "snow");
Person arya = new Person("arya", "stark");
repo.save(Arrays.asList(eddard, tyrion, robb, jon, arya));
List<Person> result = repo.findTop2ByLastname("stark");
assertThat(result, hasSize(2));
for (Person p : result) {
assertThat(p.getLastname(), is("stark"));
}
}
public static interface PersonRepository extends PagingAndSortingRepository<Person, String> {
List<Person> findByFirstname(String firstname);
@@ -201,6 +269,12 @@ public abstract class RedisRepositoryIntegrationTestBase {
List<Person> findByFirstnameAndLastname(String firstname, String lastname);
List<Person> findByFirstnameOrLastname(String firstname, String lastname);
List<Person> findFirstBy();
List<Person> findTop2By();
List<Person> findTop2ByLastname(String lastname);
}
/**