Support reserved word usage in EQL state field, single and collection-valued fields.

Closes #3829

Author: mp911de

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

@@ -705,18 +705,22 @@ subtype
 
 collection_valued_field
     : identification_variable
+    | reserved_word
     ;
 
 single_valued_object_field
     : identification_variable
+    | reserved_word
     ;
 
 state_field
     : identification_variable
+    | reserved_word
     ;
 
 collection_value_field
     : identification_variable
+    | reserved_word
     ;
 
 entity_name

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

@@ -2469,21 +2469,37 @@ public List<JpaQueryParsingToken> visitSubtype(EqlParser.SubtypeContext ctx) {
 
 	@Override
 	public List<JpaQueryParsingToken> visitCollection_valued_field(EqlParser.Collection_valued_fieldContext ctx) {
+
+		if (ctx.reserved_word() != null) {
+			return visit(ctx.reserved_word());
+		}
 		return visit(ctx.identification_variable());
 	}
 
 	@Override
 	public List<JpaQueryParsingToken> visitSingle_valued_object_field(EqlParser.Single_valued_object_fieldContext ctx) {
+
+		if (ctx.reserved_word() != null) {
+			return visit(ctx.reserved_word());
+		}
 		return visit(ctx.identification_variable());
 	}
 
 	@Override
 	public List<JpaQueryParsingToken> visitState_field(EqlParser.State_fieldContext ctx) {
+
+		if (ctx.reserved_word() != null) {
+			return visit(ctx.reserved_word());
+		}
 		return visit(ctx.identification_variable());
 	}
 
 	@Override
 	public List<JpaQueryParsingToken> visitCollection_value_field(EqlParser.Collection_value_fieldContext ctx) {
+
+		if (ctx.reserved_word() != null) {
+			return visit(ctx.reserved_word());
+		}
 		return visit(ctx.identification_variable());
 	}
 

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/EqlComplianceTests.java

@@ -78,6 +78,7 @@ void selectClause() {
 
 		assertQuery("SELECT COUNT(e) FROM Employee e");
 		assertQuery("SELECT MAX(e.salary) FROM Employee e");
+		assertQuery("select sum(i.size.foo.bar.new) from Item i");
 		assertQuery("SELECT NEW com.acme.reports.EmpReport(e.firstName, e.lastName, e.salary) FROM Employee e");
 	}
 
@@ -348,8 +349,11 @@ void specialOperators() {
 		assertQuery("SELECT toDo FROM Employee e JOIN e.toDoList toDo WHERE INDEX(toDo) = 1");
 		assertQuery("SELECT p FROM Employee e JOIN e.priorities p WHERE KEY(p) = 'high'");
 		assertQuery("SELECT e FROM Employee e WHERE SIZE(e.managedEmployees) < 2");
+		assertQuery("SELECT e FROM Employee e WHERE SIZE(e.managedEmployees.new) < 2");
 		assertQuery("SELECT e FROM Employee e WHERE e.managedEmployees IS EMPTY");
+		assertQuery("SELECT e FROM Employee e WHERE e.managedEmployee.size.new IS EMPTY");
 		assertQuery("SELECT e FROM Employee e WHERE 'write code' MEMBER OF e.responsibilities");
+		assertQuery("SELECT e FROM Employee e WHERE 'write code' MEMBER OF e.responsibilities.size");
 		assertQuery("SELECT p FROM Project p WHERE TYPE(p) = LargeProject");
 
 		/**