Drop support for SpEL expressions in the query parsers.

By delaying the creation of count queries beyond the point where SpEL evaluation is carried out, there is no longer a need to handle SpEL expressions in the query parsers.

Resolves #2881.
Original pull request: #2882.

Author: gregturn

spring-data-jpa/src/main/antlr4/org/springframework/data/jpa/repository/query/Hql.g4

@@ -620,7 +620,7 @@ variable
 
 parameter
     : prefix=':' identifier
-    | prefix='?' (INTEGER_LITERAL | spelExpression)?
+    | prefix='?' INTEGER_LITERAL?
     ;
 
 entityName
@@ -629,16 +629,8 @@ entityName
 
 identifier
     : reservedWord
-    | spelExpression
     ;
 
-spelExpression
-    : prefix='#{#' identificationVariable ('.' identificationVariable)*  '}' // #{#entityName}
-    | prefix='#{#[' INTEGER_LITERAL ']}' // #{[0]}
-    | prefix='#{' identificationVariable '(' ( stringLiteral | '[' INTEGER_LITERAL ']' )? ')}' // #{escape([0])} | #{escapeCharacter()}
-    ;
-
-
 character
     : CHARACTER
     ;

spring-data-jpa/src/main/antlr4/org/springframework/data/jpa/repository/query/Jpql.g4

@@ -599,7 +599,6 @@ identification_variable
     | ORDER // Gap in the spec requires supporting 'Order' as an entity name
     | COUNT // Gap in the spec requires supporting 'count' as a possible name
     | KEY // Gap in the sepc requires supported 'key' as a possible name
-    | spel_expression // we use various SpEL expressions in our queries
     ;
 
 constructor_name
@@ -704,12 +703,6 @@ function_name
     : string_literal
     ;
 
-spel_expression
-    : prefix='#{#' identification_variable ('.' identification_variable)*  '}' // #{#entityName}
-    | prefix='#{#[' INTLITERAL ']}' // #{[0]}
-    | prefix='#{' identification_variable '(' ( string_literal | '[' INTLITERAL ']' )? ')}' // #{escape([0])} | #{escapeCharacter()}
-    ;
-
 character_valued_input_parameter
     : CHARACTER
     | input_parameter

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

@@ -2222,8 +2222,6 @@ public List<JpaQueryParsingToken> visitParameter(HqlParser.ParameterContext ctx)
 
 			if (ctx.INTEGER_LITERAL() != null) {
 				tokens.add(new JpaQueryParsingToken(ctx.INTEGER_LITERAL()));
-			} else if (ctx.spelExpression() != null) {
-				tokens.addAll(visit(ctx.spelExpression()));
 			}
 		}
 
@@ -2251,57 +2249,11 @@ public List<JpaQueryParsingToken> visitIdentifier(HqlParser.IdentifierContext ct
 
 		if (ctx.reservedWord() != null) {
 			return visit(ctx.reservedWord());
-		} else if (ctx.spelExpression() != null) {
-			return visit(ctx.spelExpression());
 		} else {
 			return List.of();
 		}
 	}
 
-	@Override
-	public List<JpaQueryParsingToken> visitSpelExpression(HqlParser.SpelExpressionContext ctx) {
-
-		List<JpaQueryParsingToken> tokens = new ArrayList<>();
-
-		if (ctx.prefix.equals("#{#")) { // #{#entityName}
-
-			tokens.add(new JpaQueryParsingToken(ctx.prefix));
-
-			ctx.identificationVariable().forEach(identificationVariableContext -> {
-				tokens.addAll(visit(identificationVariableContext));
-				tokens.add(TOKEN_DOT);
-			});
-			CLIP(tokens);
-
-			tokens.add(TOKEN_CLOSE_BRACE);
-
-		} else if (ctx.prefix.equals("#{#[")) { // #{[0]}
-
-			tokens.add(new JpaQueryParsingToken(ctx.prefix));
-			tokens.add(new JpaQueryParsingToken(ctx.INTEGER_LITERAL()));
-			tokens.add(TOKEN_CLOSE_SQUARE_BRACKET_BRACE);
-
-		} else if (ctx.prefix.equals("#{")) {// #{escape([0])} or #{escape('foo')}
-
-			tokens.add(new JpaQueryParsingToken(ctx.prefix));
-			tokens.addAll(visit(ctx.identificationVariable(0)));
-			tokens.add(TOKEN_OPEN_PAREN);
-
-			if (ctx.stringLiteral() != null) {
-				tokens.addAll(visit(ctx.stringLiteral()));
-			} else if (ctx.INTEGER_LITERAL() != null) {
-
-				tokens.add(TOKEN_OPEN_SQUARE_BRACKET);
-				tokens.add(new JpaQueryParsingToken(ctx.INTEGER_LITERAL()));
-				tokens.add(TOKEN_CLOSE_SQUARE_BRACKET);
-			}
-
-			tokens.add(TOKEN_CLOSE_PAREN_BRACE);
-		}
-
-		return tokens;
-	}
-
 	@Override
 	public List<JpaQueryParsingToken> visitCharacter(HqlParser.CharacterContext ctx) {
 		return List.of(new JpaQueryParsingToken(ctx.CHARACTER()));

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

@@ -2124,8 +2124,6 @@ public List<JpaQueryParsingToken> visitIdentification_variable(JpqlParser.Identi
 			return List.of(new JpaQueryParsingToken(ctx.ORDER()));
 		} else if (ctx.KEY() != null) {
 			return List.of(new JpaQueryParsingToken(ctx.KEY()));
-		} else if (ctx.spel_expression() != null) {
-			return visit(ctx.spel_expression());
 		} else {
 			return List.of();
 		}
@@ -2322,48 +2320,6 @@ public List<JpaQueryParsingToken> visitFunction_name(JpqlParser.Function_nameCon
 		return visit(ctx.string_literal());
 	}
 
-	@Override
-	public List<JpaQueryParsingToken> visitSpel_expression(JpqlParser.Spel_expressionContext ctx) {
-
-		List<JpaQueryParsingToken> tokens = new ArrayList<>();
-
-		if (ctx.prefix.equals("#{#")) { // #{#entityName}
-
-			tokens.add(new JpaQueryParsingToken(ctx.prefix));
-			ctx.identification_variable().forEach(identificationVariableContext -> {
-				tokens.addAll(visit(identificationVariableContext));
-				tokens.add(TOKEN_DOT);
-			});
-			CLIP(tokens);
-			tokens.add(TOKEN_CLOSE_BRACE);
-
-		} else if (ctx.prefix.equals("#{#[")) { // #{[0]}
-
-			tokens.add(new JpaQueryParsingToken(ctx.prefix));
-			tokens.add(new JpaQueryParsingToken(ctx.INTLITERAL()));
-			tokens.add(TOKEN_CLOSE_SQUARE_BRACKET_BRACE);
-
-		} else if (ctx.prefix.equals("#{")) {// #{escape([0])} or #{escape('foo')}
-
-			tokens.add(new JpaQueryParsingToken(ctx.prefix));
-			tokens.addAll(visit(ctx.identification_variable(0)));
-			tokens.add(TOKEN_OPEN_PAREN);
-
-			if (ctx.string_literal() != null) {
-				tokens.addAll(visit(ctx.string_literal()));
-			} else if (ctx.INTLITERAL() != null) {
-
-				tokens.add(TOKEN_OPEN_SQUARE_BRACKET);
-				tokens.add(new JpaQueryParsingToken(ctx.INTLITERAL()));
-				tokens.add(TOKEN_CLOSE_SQUARE_BRACKET);
-			}
-
-			tokens.add(TOKEN_CLOSE_PAREN_BRACE);
-		}
-
-		return tokens;
-	}
-
 	@Override
 	public List<JpaQueryParsingToken> visitCharacter_valued_input_parameter(
 			JpqlParser.Character_valued_input_parameterContext ctx) {