From e51024e20ae705bcfccffab2617faf5b038f201f Mon Sep 17 00:00:00 2001
From: Jens Schauder <jschauder@pivotal.io>
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.
---
 .../repository/query/ExpressionBasedStringQuery.java   |  2 +-
 .../jpa/repository/query/SimpleJpaQueryUnitTests.java  | 10 ++++++++--
 .../data/jpa/repository/sample/UserRepository.java     |  4 ----
 3 files changed, 9 insertions(+), 7 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 771ec54f8..161415633 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 d5d1b1c7a..11ed06e70 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
@@ -16,7 +16,9 @@
 package org.springframework.data.jpa.repository.query;
 
 import static org.assertj.core.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.*;
 
 import java.lang.reflect.Method;
@@ -235,7 +237,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,
@@ -277,6 +279,10 @@ public class SimpleJpaQueryUnitTests {
 
 		@Query("select u from User u")
 		Collection<UserProjection> projectWithExplicitQuery();
+
+		@Query(value = "select u from #{#entityName} u", countQuery = "select count(u.id) from #{#entityName} u")
+		List<User> 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 8db0bbd95..c6190b2db 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<NameOnlyDto> findByNamedQueryWithConstructorExpression();
 
-	// DATAJPA-1163
-	@Query(value = "select u from #{#entityName} u", countQuery = "select count(u.id) from #{#entityName} u")
-	List<User> findAllWithExpressionInCountQuery(Pageable pageable);
-
 	interface RolesAndFirstname {
 
 		String getFirstname();