From a4b3ca82eda1508b9676893faf5f05e00af291e8 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Mon, 24 Jun 2019 14:00:44 +0200 Subject: [PATCH] DATAJPA-1061 - Polishing. Tweaked the formatting and the naming of variables. Original pull request: #276. --- .../data/jpa/repository/query/QueryUtils.java | 12 ++++++------ .../jpa/repository/query/QueryUtilsUnitTests.java | 3 --- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java b/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java index 42557667a..b2d7b925c 100644 --- a/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java +++ b/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java @@ -258,12 +258,12 @@ public abstract class QueryUtils { builder.append(", "); } - Set aliases = getOuterJoinAliases(query); - Set fieldAliases = getFunctionAliases(query); - fieldAliases.addAll(getFieldAliases(query)); + Set joinAliases = getOuterJoinAliases(query); + Set selectionAliases = getFunctionAliases(query); + selectionAliases.addAll(getFieldAliases(query)); for (Order order : sort) { - builder.append(getOrderClause(aliases, fieldAliases, alias, order)).append(", "); + builder.append(getOrderClause(joinAliases, selectionAliases, alias, order)).append(", "); } builder.delete(builder.length() - 2, builder.length()); @@ -280,13 +280,13 @@ public abstract class QueryUtils { * @param order the order object to build the clause for. * @return */ - private static String getOrderClause(Set joinAliases, Set fieldAlias, String alias, Order order) { + private static String getOrderClause(Set joinAliases, Set selectionAlias, String alias, Order order) { String property = order.getProperty(); checkSortExpression(order); - if (fieldAlias.contains(property)) { + if (selectionAlias.contains(property)) { return String.format("%s %s", property, toJpaDirection(order)); } diff --git a/src/test/java/org/springframework/data/jpa/repository/query/QueryUtilsUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/QueryUtilsUnitTests.java index 94c66db14..f37eaf7a8 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/QueryUtilsUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/query/QueryUtilsUnitTests.java @@ -427,7 +427,6 @@ public class QueryUtilsUnitTests { String query = "SELECT m.price, lower(m.title) AS title, a.name as authorName FROM Magazine m INNER JOIN m.author a"; Sort sort = new Sort("authorName"); - String fullQuery = applySorting(query, sort); assertThat(fullQuery, endsWith("order by authorName asc")); @@ -438,7 +437,6 @@ public class QueryUtilsUnitTests { String query = "SELECT m.price, lower(m.title) AS title, a.name as authorName FROM Magazine m INNER JOIN m.author a"; Sort sort = new Sort("title"); - String fullQuery = applySorting(query, sort); assertThat(fullQuery, endsWith("order by title asc")); @@ -449,7 +447,6 @@ public class QueryUtilsUnitTests { String query = "SELECT m.price, lower(m.title) AS title, a.name as authorName FROM Magazine m INNER JOIN m.author a"; Sort sort = new Sort("price"); - String fullQuery = applySorting(query, sort); assertThat(fullQuery, endsWith("order by m.price asc"));