From b59ca531f585525e4d791791d9a2ac1ebf7f3828 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Tue, 5 Nov 2019 11:54:18 +0100 Subject: [PATCH] DATAJPA-1619 - Polishing. Simplified code. Fixed `@Nullable` annotation. Improved documentation. Original pull request: #396. --- .../data/jpa/repository/query/PartTreeJpaQuery.java | 11 +++-------- .../query/PartTreeJpaQueryIntegrationTests.java | 3 +-- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/springframework/data/jpa/repository/query/PartTreeJpaQuery.java b/src/main/java/org/springframework/data/jpa/repository/query/PartTreeJpaQuery.java index f6156cf13..e5c3c9e51 100644 --- a/src/main/java/org/springframework/data/jpa/repository/query/PartTreeJpaQuery.java +++ b/src/main/java/org/springframework/data/jpa/repository/query/PartTreeJpaQuery.java @@ -76,7 +76,7 @@ public class PartTreeJpaQuery extends AbstractJpaQuery { * @param method must not be {@literal null}. * @param em must not be {@literal null}. * @param persistenceProvider must not be {@literal null}. - * @param escape + * @param escape character used for escaping characters used as patterns in LIKE-expressions. */ PartTreeJpaQuery(JpaQueryMethod method, EntityManager em, PersistenceProvider persistenceProvider, EscapeCharacter escape) { @@ -210,7 +210,6 @@ public class PartTreeJpaQuery extends AbstractJpaQuery { private final @Nullable CriteriaQuery cachedCriteriaQuery; private final @Nullable ParameterBinder cachedParameterBinder; - private final @Nullable List> expressions; private final PersistenceProvider persistenceProvider; private final Map>, ParameterBinder> binderCache = new ConcurrentHashMap<>(); private final QueryParameterSetter.QueryMetadataCache metadataCache = new QueryParameterSetter.QueryMetadataCache(); @@ -223,12 +222,10 @@ public class PartTreeJpaQuery extends AbstractJpaQuery { if (recreateQueries) { this.cachedCriteriaQuery = null; - this.expressions = null; this.cachedParameterBinder = null; } else { this.cachedCriteriaQuery = creator.createQuery(); - this.expressions = creator.getParameterExpressions(); - this.cachedParameterBinder = getBinder(expressions); + this.cachedParameterBinder = getBinder(creator.getParameterExpressions()); } } @@ -364,7 +361,7 @@ public class PartTreeJpaQuery extends AbstractJpaQuery { @Override protected JpaQueryCreator createCreator(PersistenceProvider persistenceProvider, - JpaParametersParameterAccessor accessor) { + @Nullable JpaParametersParameterAccessor accessor) { EntityManager entityManager = getEntityManager(); CriteriaBuilder builder = entityManager.getCriteriaBuilder(); @@ -382,8 +379,6 @@ public class PartTreeJpaQuery extends AbstractJpaQuery { /** * Customizes binding by skipping the pagination. - * - * @see QueryPreparer#invokeBinding(ParameterBinder, TypedQuery, JpaParametersParameterAccessor) */ @Override protected Query invokeBinding(ParameterBinder binder, TypedQuery query, JpaParametersParameterAccessor accessor, diff --git a/src/test/java/org/springframework/data/jpa/repository/query/PartTreeJpaQueryIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/query/PartTreeJpaQueryIntegrationTests.java index e483a087c..32b45db76 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/PartTreeJpaQueryIntegrationTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/query/PartTreeJpaQueryIntegrationTests.java @@ -38,7 +38,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; - import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; @@ -260,7 +259,7 @@ public class PartTreeJpaQueryIntegrationTests { while (split.hasNext()) { - Assert.notNull(source, "result must not be null."); + Assert.notNull(result, "result must not be null."); result = getField(result, split.next()); }