DATAJPA-1061 - Polishing.

Tweaked the formatting and the naming of variables.

Original pull request: #276.

Author: schauder

src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java

@@ -258,12 +258,12 @@ public static String applySorting(String query, Sort sort, String alias) {
 			builder.append(", ");
 		}
 
-		Set<String> aliases = getOuterJoinAliases(query);
-		Set<String> fieldAliases = getFunctionAliases(query);
-		fieldAliases.addAll(getFieldAliases(query));
+		Set<String> joinAliases = getOuterJoinAliases(query);
+		Set<String> 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 static String applySorting(String query, Sort sort, String alias) {
 	 * @param order the order object to build the clause for.
 	 * @return
 	 */
-	private static String getOrderClause(Set<String> joinAliases, Set<String> fieldAlias, String alias, Order order) {
+	private static String getOrderClause(Set<String> joinAliases, Set<String> 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));
 		}
 

src/test/java/org/springframework/data/jpa/repository/query/QueryUtilsUnitTests.java

@@ -427,7 +427,6 @@ public void appliesSortCorrectlyForFieldAliases() {
 
 		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 void appliesSortCorrectlyForFunctionAliases() {
 
 		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 void appliesSortCorrectlyForSimpleField() {
 
 		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"));