diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryTransformers.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryTransformers.java
index 1a0372d9f5..4ac21b1f3f 100644
--- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryTransformers.java
+++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryTransformers.java
@@ -52,16 +52,16 @@ static CountSelectionTokenStream create(QueryTokenStream selection) {
 					continue;
 				}
 
-				if (token.equals(TOKEN_AS)) {
+				if (TOKEN_AS.equals(token)) {
 					skipNext = true;
 					continue;
 				}
 
-				if (!token.equals(TOKEN_COMMA) && token.isExpression()) {
+				if (!TOKEN_COMMA.equals(token) && token.isExpression()) {
 					token = QueryTokens.token(token.value());
 				}
 
-				if (!containsNew && token.equals(TOKEN_NEW)) {
+				if (!containsNew && TOKEN_NEW.equals(token)) {
 					containsNew = true;
 				}
 
@@ -89,12 +89,12 @@ public CountSelectionTokenStream withoutConstructorExpression() {
 
 			for (QueryToken token : this) {
 
-				if (token.equals(TOKEN_OPEN_PAREN)) {
+				if (TOKEN_OPEN_PAREN.equals(token)) {
 					nestingLevel++;
 					continue;
 				}
 
-				if (token.equals(TOKEN_CLOSE_PAREN)) {
+				if (TOKEN_CLOSE_PAREN.equals(token)) {
 					nestingLevel--;
 					continue;
 				}