Polishing.

Inline methods, lazify query creation.

See #3920

Author: mp911de

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java

@@ -74,6 +74,7 @@
 import org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery;
 import org.springframework.data.repository.query.ReturnedType;
 import org.springframework.data.support.PageableExecutionUtils;
+import org.springframework.data.util.Lazy;
 import org.springframework.data.util.ProxyUtils;
 import org.springframework.data.util.Streamable;
 import org.springframework.lang.Contract;
@@ -104,7 +105,7 @@
  * @author Diego Krupitza
  * @author Seol-JY
  * @author Joshua Chen
- * @author Dockerel
+ * @author Giheon Do
  */
 @Repository
 @Transactional(readOnly = true)
@@ -122,8 +123,8 @@ public class SimpleJpaRepository<T, ID> implements JpaRepositoryImplementation<T
 	private final EntityManager entityManager;
 	private final PersistenceProvider provider;
 
-	private final String deleteAllQueryString;
-	private final String countQueryString;
+	private final Lazy<String> deleteAllQueryString;
+	private final Lazy<String> countQueryString;
 
 	private @Nullable CrudMethodMetadata metadata;
 	private ProjectionFactory projectionFactory;
@@ -145,8 +146,11 @@ public SimpleJpaRepository(JpaEntityInformation<T, ?> entityInformation, EntityM
 		this.provider = PersistenceProvider.fromEntityManager(entityManager);
 		this.projectionFactory = new SpelAwareProxyProjectionFactory();
 
-		this.deleteAllQueryString = getDeleteAllQueryString();
-		this.countQueryString = getCountQueryString();
+		this.deleteAllQueryString = Lazy
+				.of(() -> getQueryString(DELETE_ALL_QUERY_STRING, entityInformation.getEntityName()));
+		this.countQueryString = Lazy
+				.of(() -> getQueryString(String.format(COUNT_QUERY_STRING, provider.getCountQueryPlaceholder(), "%s"),
+						entityInformation.getEntityName()));
 	}
 
 	/**
@@ -188,16 +192,6 @@ protected Class<T> getDomainClass() {
 		return entityInformation.getJavaType();
 	}
 
-	private String getDeleteAllQueryString() {
-		return getQueryString(DELETE_ALL_QUERY_STRING, entityInformation.getEntityName());
-	}
-
-	private String getCountQueryString() {
-
-		String countQuery = String.format(COUNT_QUERY_STRING, provider.getCountQueryPlaceholder(), "%s");
-		return getQueryString(countQuery, entityInformation.getEntityName());
-	}
-
 	@Override
 	@Transactional
 	public void deleteById(ID id) {
@@ -325,7 +319,7 @@ public void deleteAll() {
 	@Transactional
 	public void deleteAllInBatch() {
 
-		Query query = entityManager.createQuery(deleteAllQueryString);
+		Query query = entityManager.createQuery(deleteAllQueryString.get());
 
 		applyQueryHints(query);
 
@@ -646,7 +640,7 @@ public <S extends T, R> R findBy(Example<S> example, Function<FetchableFluentQue
 	@Override
 	public long count() {
 
-		TypedQuery<Long> query = entityManager.createQuery(countQueryString, Long.class);
+		TypedQuery<Long> query = entityManager.createQuery(countQueryString.get(), Long.class);
 
 		applyQueryHintsForCount(query);