Spring/spring-data-jpa
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAJPA-1619 - Polishing.

Browse Source 
Simplified code.
Fixed `@Nullable` annotation.
Improved documentation.

Original pull request: #396.
This commit is contained in:
Jens Schauder
2019-11-05 11:54:18 +01:00
committed by Mark Paluch
parent 6a868d09d0
commit b59ca531f5
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/org/springframework/data/jpa/repository/query/PartTreeJpaQuery.java
View File

@@ -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<ParameterMetadata<?>> expressions;
private final PersistenceProvider persistenceProvider;
private final Map<List<ParameterMetadata<?>>, 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,

3
src/test/java/org/springframework/data/jpa/repository/query/PartTreeJpaQueryIntegrationTests.java
View File

@@ -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());
}