Fix AOT evaluation code generation when method has no parameters.

See #5006
Original pull request: #5005

Author: mp911de

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/AggregationBlocks.java

@@ -173,7 +173,13 @@ static class AggregationCodeBlockBuilder {
 
 			this.context = context;
 			this.queryMethod = queryMethod;
-			this.parameterNames = StringUtils.collectionToDelimitedString(context.getAllParameterNames(), ", ");
+			String parameterNames = StringUtils.collectionToDelimitedString(context.getAllParameterNames(), ", ");
+
+			if (StringUtils.hasText(parameterNames)) {
+				this.parameterNames = ", " + parameterNames;
+			} else {
+				this.parameterNames = "";
+			}
 		}
 
 		AggregationCodeBlockBuilder stages(AggregationInteraction aggregation) {

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/MongoCodeBlocks.java

@@ -169,7 +169,7 @@ static CodeBlock asDocument(String source, String argNames) {
 		if (!StringUtils.hasText(source)) {
 			builder.add("new $T()", Document.class);
 		} else if (containsPlaceholder(source)) {
-			builder.add("bindParameters(ExpressionMarker.class.getEnclosingMethod(), $S, $L);\n", source, argNames);
+			builder.add("bindParameters(ExpressionMarker.class.getEnclosingMethod(), $S$L);\n", source, argNames);
 		} else {
 			builder.add("parse($S)", source);
 		}
@@ -183,7 +183,7 @@ static CodeBlock renderExpressionToDocument(@Nullable String source, String vari
 		if (!StringUtils.hasText(source)) {
 			builder.addStatement("$1T $2L = new $1T()", Document.class, variableName);
 		} else if (containsPlaceholder(source)) {
-			builder.add("$T $L = bindParameters(ExpressionMarker.class.getEnclosingMethod(), $S, $L);\n", Document.class,
+			builder.add("$T $L = bindParameters(ExpressionMarker.class.getEnclosingMethod(), $S$L);\n", Document.class,
 					variableName, source, argNames);
 		} else {
 			builder.addStatement("$1T $2L = parse($3S)", Document.class, variableName, source);
@@ -198,9 +198,17 @@ static CodeBlock evaluateNumberPotentially(String value, Class<? extends Number>
 			return CodeBlock.of("$L", number);
 		} catch (IllegalArgumentException e) {
 
+			String parameterNames = StringUtils.collectionToDelimitedString(context.getAllParameterNames(), ", ");
+
+			if (StringUtils.hasText(parameterNames)) {
+				parameterNames = ", " + parameterNames;
+			} else {
+				parameterNames = "";
+			}
+
 			Builder builder = CodeBlock.builder();
-			builder.add("($T) evaluate(ExpressionMarker.class.getEnclosingMethod(), $S, $L)", targetType, value,
-					StringUtils.collectionToDelimitedString(context.getAllParameterNames(), ", "));
+			builder.add("($T) evaluate(ExpressionMarker.class.getEnclosingMethod(), $S$L)", targetType, value,
+					parameterNames);
 			return builder.build();
 		}
 	}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/QueryBlocks.java

@@ -146,7 +146,14 @@ static class QueryCodeBlockBuilder {
 
 			this.context = context;
 			this.queryMethod = queryMethod;
-			this.parameterNames = StringUtils.collectionToDelimitedString(context.getAllParameterNames(), ", ");
+
+			String parameterNames = StringUtils.collectionToDelimitedString(context.getAllParameterNames(), ", ");
+
+			if (StringUtils.hasText(parameterNames)) {
+				this.parameterNames = ", " + parameterNames;
+			} else {
+				this.parameterNames = "";
+			}
 		}
 
 		QueryCodeBlockBuilder filter(QueryInteraction query) {
@@ -235,7 +242,7 @@ CodeBlock build() {
 					} else {
 
 						builder.addStatement(
-								"$L.collation(collationOf(evaluate(ExpressionMarker.class.getEnclosingMethod(), $S, $L)))",
+								"$L.collation(collationOf(evaluate(ExpressionMarker.class.getEnclosingMethod(), $S$L)))",
 								queryVariableName, collationString, parameterNames);
 					}
 				}
@@ -260,7 +267,7 @@ private CodeBlock renderExpressionToQuery() {
 				return CodeBlock.of("new $T(new $T())", BasicQuery.class, Document.class);
 			} else if (MongoCodeBlocks.containsPlaceholder(source)) {
 				Builder builder = CodeBlock.builder();
-				builder.add("createQuery(ExpressionMarker.class.getEnclosingMethod(), $S, $L)", source, parameterNames);
+				builder.add("createQuery(ExpressionMarker.class.getEnclosingMethod(), $S$L)", source, parameterNames);
 				return builder.build();
 			}
 			else {

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/UpdateBlocks.java

@@ -102,11 +102,20 @@ CodeBlock build() {
 	static class UpdateCodeBlockBuilder {
 
 		private final AotQueryMethodGenerationContext context;
+		private final String parameterNames;
 		private UpdateInteraction source;
 		private String updateVariableName;
 
 		public UpdateCodeBlockBuilder(AotQueryMethodGenerationContext context) {
 			this.context = context;
+
+			String parameterNames = StringUtils.collectionToDelimitedString(context.getAllParameterNames(), ", ");
+
+			if (StringUtils.hasText(parameterNames)) {
+				this.parameterNames = ", " + parameterNames;
+			} else {
+				this.parameterNames = "";
+			}
 		}
 
 		public UpdateCodeBlockBuilder update(UpdateInteraction update) {
@@ -127,7 +136,7 @@ CodeBlock build() {
 			String tmpVariableName = updateVariableName + "Document";
 			builder.add(
 					MongoCodeBlocks.renderExpressionToDocument(source.getUpdate().getUpdateString(), tmpVariableName,
-							StringUtils.collectionToDelimitedString(context.getAllParameterNames(), ", ")));
+							parameterNames));
 			builder.addStatement("$1T $2L = new $1T($3L)", BasicUpdate.class, updateVariableName, tmpVariableName);
 
 			return builder.build();