Update method metadata rendering

Author: christophstrobl

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

@@ -109,11 +109,11 @@ protected void customizeConstructor(AotRepositoryConstructorBuilder constructorB
 		}
 
 		QueryInteraction query = createStringQuery(getRepositoryInformation(), queryMethod,
-				AnnotatedElementUtils.findMergedAnnotation(method, Query.class), method.getParameterCount());
+				AnnotatedElementUtils.findMergedAnnotation(method, Query.class));
 
 		if (queryMethod.isGeoNearQuery() || (queryMethod.getParameters().getMaxDistanceIndex() != -1
 				&& queryMethod.getReturnType().isCollectionLike())) {
-			NearQueryInteraction near = new NearQueryInteraction(query);
+			NearQueryInteraction near = new NearQueryInteraction(query, queryMethod.getParameters());
 			return nearQueryMethodContributor(queryMethod, near);
 		}
 
@@ -160,7 +160,7 @@ protected void customizeConstructor(AotRepositoryConstructorBuilder constructorB
 
 	@SuppressWarnings("NullAway")
 	private QueryInteraction createStringQuery(RepositoryInformation repositoryInformation, MongoQueryMethod queryMethod,
-			@Nullable Query queryAnnotation, int parameterCount) {
+			@Nullable Query queryAnnotation) {
 
 		QueryInteraction query;
 		if (queryMethod.hasAnnotatedQuery() && queryAnnotation != null) {

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

@@ -18,9 +18,8 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.repository.query.MongoParameters;
 import org.springframework.data.repository.aot.generate.QueryMetadata;
-import org.springframework.util.StringUtils;
 
 /**
  * An {@link MongoInteraction} to execute a query.
@@ -32,10 +31,12 @@ class NearQueryInteraction extends MongoInteraction implements QueryMetadata {
 
 	private final InteractionType interactionType;
 	private final QueryInteraction query;
+	private final MongoParameters parameters;
 
-	NearQueryInteraction(QueryInteraction query) {
+	NearQueryInteraction(QueryInteraction query, MongoParameters parameters) {
 		interactionType = InteractionType.QUERY;
 		this.query = query;
+		this.parameters = parameters;
 	}
 
 	@Override
@@ -51,9 +52,17 @@ public QueryInteraction getQuery() {
 	public Map<String, Object> serialize() {
 
 		Map<String, Object> serialized = new LinkedHashMap<>();
-
-
-
+		serialized.put("near", "?%s".formatted(parameters.getNearIndex()));
+		if (parameters.getRangeIndex() != -1) {
+			serialized.put("minDistance", "?%s".formatted(parameters.getRangeIndex()));
+			serialized.put("maxDistance", "?%s".formatted(parameters.getRangeIndex()));
+		} else if (parameters.getMaxDistanceIndex() != -1) {
+			serialized.put("minDistance", "?%s".formatted(parameters.getMaxDistanceIndex()));
+		}
+		Object filter = query.serialize().get("filter"); // TODO: filter position index can be off due to bindable params
+		if (filter != null) {
+			serialized.put("filter", filter);
+		}
 		return serialized;
 	}
 }

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/MongoRepositoryMetadataTests.java

@@ -15,19 +15,19 @@
  */
 package org.springframework.data.mongodb.repository.aot;
 
-import static net.javacrumbs.jsonunit.assertj.JsonAssertions.*;
-import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Mockito.*;
+import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
 
 import example.aot.UserRepository;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
+import java.util.List;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -150,7 +150,7 @@ void shouldDocumentAggregation() throws IOException {
 
 		assertThatJson(json).inPath("$.methods[?(@.name == 'findAllLastnames')].query").isArray().element(0).isObject()
 				.containsEntry("pipeline",
-						"[{ '$match' : { 'last_name' : { '$ne' : null } } }, { '$project': { '_id' : '$last_name' } }]");
+						List.of("{ '$match' : { 'last_name' : { '$ne' : null } } }", "{ '$project': { '_id' : '$last_name' } }"));
 	}
 
 	@Test // GH-4964
@@ -165,7 +165,7 @@ void shouldDocumentPipelineUpdate() throws IOException {
 
 		assertThatJson(json).inPath("$.methods[?(@.name == 'findAndIncrementVisitsViaPipelineByLastname')].query").isArray()
 				.element(0).isObject().containsEntry("filter", "{'lastname':?0}").containsEntry("update-pipeline",
-						"[{ '$set' : { 'visits' : { '$ifNull' : [ {'$add' : [ '$visits', ?1 ] }, ?1 ] } } }]");
+						List.of("{ '$set' : { 'visits' : { '$ifNull' : [ {'$add' : [ '$visits', ?1 ] }, ?1 ] } } }"));
 	}
 
 	@Test // GH-4964