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

DATACMNS-67 - QueryMethod considers methods retuning Iterable collection queries.

Browse Source
This commit is contained in:
Oliver Gierke
2011-08-25 07:56:21 +02:00
parent f13c53866c
commit 651a1f2db2
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-data-commons-core/src/main/java/org/springframework/data/repository/query/QueryMethod.java
View File

@@ -150,8 +150,7 @@ public class QueryMethod {
public boolean isCollectionQuery() {
Class<?> returnType = method.getReturnType();
return org.springframework.util.ClassUtils.isAssignable(List.class,
returnType);
return !isPageQuery() && org.springframework.util.ClassUtils.isAssignable(Iterable.class, returnType);
}

25
spring-data-commons-core/src/test/java/org/springframework/data/repository/query/QueryMethodUnitTests.java
View File

@@ -15,6 +15,9 @@
*/
package org.springframework.data.repository.query;
import static org.junit.Assert.*;
import static org.hamcrest.CoreMatchers.*;
import java.lang.reflect.Method;
import org.junit.Test;
@@ -37,7 +40,7 @@ public class QueryMethodUnitTests {
RepositoryMetadata metadata;
@Test(expected = IllegalStateException.class)
public void rejectsPagingMethodWithInvalidaReturnType() throws SecurityException, NoSuchMethodException {
public void rejectsPagingMethodWithInvalidReturnType() throws Exception {
Method method = SampleRepository.class.getMethod("pagingMethodWithInvalidReturnType", Pageable.class);
new QueryMethod(method, metadata);
@@ -50,10 +53,25 @@ public class QueryMethodUnitTests {
}
@Test
public void setsUpSimpleQueryMethodCorrectly() throws NoSuchMethodException, SecurityException {
public void setsUpSimpleQueryMethodCorrectly() throws Exception {
Method method = SampleRepository.class.getMethod("findByUsername", String.class);
new QueryMethod(method, metadata);
}
@Test
public void considersIterableMethodForCollectionQuery() throws Exception {
Method method = SampleRepository.class.getMethod("sampleMethod");
QueryMethod queryMethod = new QueryMethod(method, metadata);
assertThat(queryMethod.isCollectionQuery(), is(true));
}
@Test
public void doesNotConsiderPageMethodCollectionQuery() throws Exception {
Method method = SampleRepository.class.getMethod("anotherSampleMethod", Pageable.class);
QueryMethod queryMethod = new QueryMethod(method, metadata);
assertThat(queryMethod.isPageQuery(), is(true));
assertThat(queryMethod.isCollectionQuery(), is(false));
}
interface SampleRepository {
String pagingMethodWithInvalidReturnType(Pageable pageable);
@@ -61,5 +79,8 @@ public class QueryMethodUnitTests {
Page<String> pagingMethodWithoutPageable();
String findByUsername(String username);
Iterable<String> sampleMethod();
Page<String> anotherSampleMethod(Pageable pageable);
}
}