From 04d0aa140f3343dca19ed62519cdcda5a372e4aa Mon Sep 17 00:00:00 2001 From: Oliver Drotbohm Date: Wed, 28 Aug 2019 14:32:22 +0200 Subject: [PATCH] DATAJPA-1594 - Polishing. Formatting and whitespace. --- .../data/jpa/repository/support/Querydsl.java | 10 ++++------ .../support/QuerydslJpaPredicateExecutor.java | 8 ++++---- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/springframework/data/jpa/repository/support/Querydsl.java b/src/main/java/org/springframework/data/jpa/repository/support/Querydsl.java index 9f0c5e7fd..63aa6632d 100644 --- a/src/main/java/org/springframework/data/jpa/repository/support/Querydsl.java +++ b/src/main/java/org/springframework/data/jpa/repository/support/Querydsl.java @@ -156,6 +156,7 @@ public class Querydsl { private JPQLQuery addOrderByFrom(QSort qsort, JPQLQuery query) { List> orderSpecifiers = qsort.getOrderSpecifiers(); + return query.orderBy(orderSpecifiers.toArray(new OrderSpecifier[0])); } @@ -234,12 +235,9 @@ public class Querydsl { while (path != null) { - if (!path.hasNext() && order.isIgnoreCase()) { - // if order is ignore-case we have to treat the last path segment as a String. - sortPropertyExpression = Expressions.stringPath((Path) sortPropertyExpression, path.getSegment()).lower(); - } else { - sortPropertyExpression = Expressions.path(path.getType(), (Path) sortPropertyExpression, path.getSegment()); - } + sortPropertyExpression = !path.hasNext() && order.isIgnoreCase() // + ? Expressions.stringPath((Path) sortPropertyExpression, path.getSegment()).lower() // + : Expressions.path(path.getType(), (Path) sortPropertyExpression, path.getSegment()); path = path.next(); } diff --git a/src/main/java/org/springframework/data/jpa/repository/support/QuerydslJpaPredicateExecutor.java b/src/main/java/org/springframework/data/jpa/repository/support/QuerydslJpaPredicateExecutor.java index 89fc4b6e6..0f834f750 100644 --- a/src/main/java/org/springframework/data/jpa/repository/support/QuerydslJpaPredicateExecutor.java +++ b/src/main/java/org/springframework/data/jpa/repository/support/QuerydslJpaPredicateExecutor.java @@ -64,7 +64,7 @@ public class QuerydslJpaPredicateExecutor implements QuerydslPredicateExecuto /** * Creates a new {@link QuerydslJpaPredicateExecutor} from the given domain class and {@link EntityManager} and uses * the given {@link EntityPathResolver} to translate the domain class into an {@link EntityPath}. - * + * * @param entityInformation must not be {@literal null}. * @param entityManager must not be {@literal null}. * @param resolver must not be {@literal null}. @@ -121,7 +121,7 @@ public class QuerydslJpaPredicateExecutor implements QuerydslPredicateExecuto return executeSorted(createQuery(predicate).select(path), orders); } - /* + /* * (non-Javadoc) * @see org.springframework.data.querydsl.QuerydslPredicateExecutor#findAll(com.mysema.query.types.Predicate, org.springframework.data.domain.Sort) */ @@ -134,7 +134,7 @@ public class QuerydslJpaPredicateExecutor implements QuerydslPredicateExecuto return executeSorted(createQuery(predicate).select(path), sort); } - /* + /* * (non-Javadoc) * @see org.springframework.data.querydsl.QuerydslPredicateExecutor#findAll(com.mysema.query.types.OrderSpecifier[]) */ @@ -171,7 +171,7 @@ public class QuerydslJpaPredicateExecutor implements QuerydslPredicateExecuto return createQuery(predicate).fetchCount(); } - /* + /* * (non-Javadoc) * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#exists(com.mysema.query.types.Predicate) */