Polishing.

Formatting.
Reduced scope of field to variable.

Original pull request #3954

Author: schauder

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/JSqlParserQueryEnhancer.java

@@ -15,9 +15,8 @@
  */
 package org.springframework.data.jpa.repository.query;
 
-import static org.springframework.data.jpa.repository.query.JSqlParserUtils.getJSqlCount;
-import static org.springframework.data.jpa.repository.query.JSqlParserUtils.getJSqlLower;
-import static org.springframework.data.jpa.repository.query.QueryUtils.checkSortExpression;
+import static org.springframework.data.jpa.repository.query.JSqlParserUtils.*;
+import static org.springframework.data.jpa.repository.query.QueryUtils.*;
 
 import net.sf.jsqlparser.expression.Alias;
 import net.sf.jsqlparser.expression.Expression;
@@ -75,7 +74,6 @@
 public class JSqlParserQueryEnhancer implements QueryEnhancer {
 
 	private final QueryProvider query;
-	private final Statement statement;
 	private final ParsedType parsedType;
 	private final boolean hasConstructorExpression;
 	private final @Nullable String primaryAlias;
@@ -90,15 +88,15 @@ public class JSqlParserQueryEnhancer implements QueryEnhancer {
 	public JSqlParserQueryEnhancer(QueryProvider query) {
 
 		this.query = query;
-		this.statement = parseStatement(query.getQueryString(), Statement.class);
+		Statement statement = parseStatement(query.getQueryString(), Statement.class);
 
 		this.parsedType = detectParsedType(statement);
 		this.hasConstructorExpression = QueryUtils.hasConstructorExpression(query.getQueryString());
-		this.primaryAlias = detectAlias(this.parsedType, this.statement);
-		this.projection = detectProjection(this.statement);
-		this.selectAliases = Collections.unmodifiableSet(getSelectionAliases(this.statement));
-		this.joinAliases = Collections.unmodifiableSet(getJoinAliases(this.statement));
-		this.serialized = SerializationUtils.serialize(this.statement);
+		this.primaryAlias = detectAlias(this.parsedType, statement);
+		this.projection = detectProjection(statement);
+		this.selectAliases = Collections.unmodifiableSet(getSelectionAliases(statement));
+		this.joinAliases = Collections.unmodifiableSet(getJoinAliases(statement));
+		this.serialized = SerializationUtils.serialize(statement);
 	}
 
 	/**
@@ -217,8 +215,8 @@ private static Set<String> getJoinAliases(Statement statement) {
 	 * @param statement
 	 * @param mapper
 	 * @param fallback
-	 * @return
 	 * @param <T>
+	 * @return
 	 */
 	private static <T> T doWithPlainSelect(Statement statement, java.util.function.Function<PlainSelect, T> mapper,
 			Supplier<T> fallback) {
@@ -238,8 +236,8 @@ private static <T> T doWithPlainSelect(Statement statement, java.util.function.F
 	 * @param skipIf
 	 * @param mapper
 	 * @param fallback
-	 * @return
 	 * @param <T>
+	 * @return
 	 */
 	private static <T> T doWithPlainSelect(Statement statement, Predicate<PlainSelect> skipIf,
 			java.util.function.Function<PlainSelect, T> mapper, Supplier<T> fallback) {