From fd930e3fdefad0e61cba1bc1bef6c84b0a172d27 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Wed, 16 May 2012 14:36:06 +0200 Subject: [PATCH] DATACMNS-171 - Let JpaQueryMethod new method of QueryMethod. Drop custom method to determine whether a query method returns an entity and rather use the newly introduced method in Spring Data Commons' QueryMethod. --- .../data/jpa/repository/query/JpaQueryMethod.java | 9 --------- .../data/jpa/repository/query/SimpleJpaQuery.java | 4 ++-- .../jpa/repository/query/JpaQueryMethodUnitTests.java | 4 ++-- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryMethod.java b/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryMethod.java index 429146cff..243875b6f 100644 --- a/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryMethod.java +++ b/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryMethod.java @@ -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. diff --git a/src/main/java/org/springframework/data/jpa/repository/query/SimpleJpaQuery.java b/src/main/java/org/springframework/data/jpa/repository/query/SimpleJpaQuery.java index 36502e838..ef2b7b816 100644 --- a/src/main/java/org/springframework/data/jpa/repository/query/SimpleJpaQuery.java +++ b/src/main/java/org/springframework/data/jpa/repository/query/SimpleJpaQuery.java @@ -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); } diff --git a/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryMethodUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryMethodUnitTests.java index d8e2933a3..be0e92335 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryMethodUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryMethodUnitTests.java @@ -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)); } /**