From d6263d6483c13ac09b9d9c574429a66758529352 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Thu, 19 Jul 2018 14:36:07 +0200 Subject: [PATCH] DATAJPA-1163 - Polishing. Reduced visibility of newly introduced method. Moved method for test into inner class of the test Original pull request: #283. --- .../jpa/repository/query/ExpressionBasedStringQuery.java | 2 +- .../data/jpa/repository/query/SimpleJpaQueryUnitTests.java | 6 +++++- .../data/jpa/repository/sample/UserRepository.java | 4 ---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/springframework/data/jpa/repository/query/ExpressionBasedStringQuery.java b/src/main/java/org/springframework/data/jpa/repository/query/ExpressionBasedStringQuery.java index a7d867456..5b38a072e 100644 --- a/src/main/java/org/springframework/data/jpa/repository/query/ExpressionBasedStringQuery.java +++ b/src/main/java/org/springframework/data/jpa/repository/query/ExpressionBasedStringQuery.java @@ -68,7 +68,7 @@ class ExpressionBasedStringQuery extends StringQuery { * @param parser Parser for resolving SpEL expressions. Must not be {@literal null}. * @return A query supporting SpEL expressions. */ - public static ExpressionBasedStringQuery from(DeclaredQuery query, JpaEntityMetadata metadata, + static ExpressionBasedStringQuery from(DeclaredQuery query, JpaEntityMetadata metadata, SpelExpressionParser parser) { return new ExpressionBasedStringQuery(query.getQueryString(), metadata, parser); } diff --git a/src/test/java/org/springframework/data/jpa/repository/query/SimpleJpaQueryUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/SimpleJpaQueryUnitTests.java index d6633dea6..a7b344d7e 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/SimpleJpaQueryUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/query/SimpleJpaQueryUnitTests.java @@ -239,7 +239,7 @@ public class SimpleJpaQueryUnitTests { when(em.createQuery(Mockito.anyString())).thenReturn(query); - Method method = UserRepository.class.getMethod("findAllWithExpressionInCountQuery", Pageable.class); + Method method = SampleRepository.class.getMethod("findAllWithExpressionInCountQuery", Pageable.class); JpaQueryMethod queryMethod = new JpaQueryMethod(method, metadata, factory, extractor); AbstractJpaQuery jpaQuery = new SimpleJpaQuery(queryMethod, em, "select u from User u", EVALUATION_CONTEXT_PROVIDER, @@ -281,6 +281,10 @@ public class SimpleJpaQueryUnitTests { @Query("select u from User u") Collection projectWithExplicitQuery(); + + @Query(value = "select u from #{#entityName} u", countQuery = "select count(u.id) from #{#entityName} u") + List findAllWithExpressionInCountQuery(Pageable pageable); + } interface UserProjection {} diff --git a/src/test/java/org/springframework/data/jpa/repository/sample/UserRepository.java b/src/test/java/org/springframework/data/jpa/repository/sample/UserRepository.java index 417882bfc..f33c0222b 100644 --- a/src/test/java/org/springframework/data/jpa/repository/sample/UserRepository.java +++ b/src/test/java/org/springframework/data/jpa/repository/sample/UserRepository.java @@ -556,10 +556,6 @@ public interface UserRepository // DATAJPA-1334 List findByNamedQueryWithConstructorExpression(); - // DATAJPA-1163 - @Query(value = "select u from #{#entityName} u", countQuery = "select count(u.id) from #{#entityName} u") - List findAllWithExpressionInCountQuery(Pageable pageable); - interface RolesAndFirstname { String getFirstname();