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

DATACMNS-171 - Let JpaQueryMethod new method of QueryMethod.

Browse Source 
Drop custom method to determine whether a query method returns an entity and rather use the newly introduced method in Spring Data Commons' QueryMethod.
This commit is contained in:
Oliver Gierke
2012-05-16 14:36:06 +02:00
parent 72da417171
commit fd930e3fde
3 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/org/springframework/data/jpa/repository/query/JpaQueryMethod.java
View File

@@ -227,15 +227,6 @@ public class JpaQueryMethod extends QueryMethod {
return (Boolean) AnnotationUtils.getValue(method.getAnnotation(Modifying.class), "clearAutomatically");
}
/**
* Returns whether the query method will actually return entities.
*
* @return
*/
boolean isQueryMethodForEntity() {
return getDomainClass().isAssignableFrom(getReturnedObjectType());
}
/**
* Returns the {@link Query} annotation's attribute casted to the given type or default value if no annotation
* available.

4
src/main/java/org/springframework/data/jpa/repository/query/SimpleJpaQuery.java
View File

@@ -90,8 +90,8 @@ final class SimpleJpaQuery extends AbstractJpaQuery {
Query query = null;
if (method.isNativeQuery()) {
query = method.isQueryMethodForEntity() ? em.createNativeQuery(sortedQueryString, method.getReturnedObjectType())
: em.createNativeQuery(sortedQueryString);
query = method.isQueryForEntity() ? em.createNativeQuery(sortedQueryString, method.getReturnedObjectType()) : em
.createNativeQuery(sortedQueryString);
} else {
query = em.createQuery(sortedQueryString);
}

4
src/test/java/org/springframework/data/jpa/repository/query/JpaQueryMethodUnitTests.java
View File

@@ -289,8 +289,8 @@ public class JpaQueryMethodUnitTests {
when(metadata.getReturnedDomainClass(findsProjections)).thenReturn((Class) Integer.class);
when(metadata.getReturnedDomainClass(findsProjection)).thenReturn((Class) Integer.class);
assertThat(new JpaQueryMethod(findsProjections, metadata, extractor).isQueryMethodForEntity(), is(false));
assertThat(new JpaQueryMethod(findsProjection, metadata, extractor).isQueryMethodForEntity(), is(false));
assertThat(new JpaQueryMethod(findsProjections, metadata, extractor).isQueryForEntity(), is(false));
assertThat(new JpaQueryMethod(findsProjection, metadata, extractor).isQueryForEntity(), is(false));
}
/**