are we done?

Author: christophstrobl

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ArrayOperators.java

@@ -356,6 +356,7 @@ public SortArray sort(Sort sort) {
 		 * @return new instance of {@link SortArray}.
 		 * @since 4.5
 		 */
+		@SuppressWarnings("NullAway")
 		public SortArray sort(Direction direction) {
 
 			if (usesFieldRef()) {

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/VectorSearchOperation.java

@@ -237,7 +237,10 @@ public Document toDocument(AggregationOperationContext context) {
 		}
 
 		$vectorSearch.append("index", indexName);
-		$vectorSearch.append("limit", limit.max());
+
+		if(limit.isLimited()) { // TODO: exception or pass it on?
+			$vectorSearch.append("limit", limit.max());
+		}
 
 		if (numCandidates != null) {
 			$vectorSearch.append("numCandidates", numCandidates);

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ConvertingParameterAccessor.java

@@ -77,7 +77,7 @@ public PotentiallyConvertingIterator iterator() {
 	}
 
 	@Override
-	public Vector getVector() {
+	public @Nullable Vector getVector() {
 		return delegate.getVector();
 	}
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/VectorSearchAggregation.java

@@ -63,7 +63,6 @@ public VectorSearchAggregation(MongoQueryMethod method, MongoOperations mongoOpe
 		this.delegate = new VectorSearchDelegate(method, mongoOperations.getConverter(), delegate);
 	}
 
-	@SuppressWarnings("unchecked")
 	@Override
 	protected Object doExecute(MongoQueryMethod method, ResultProcessor processor, ConvertingParameterAccessor accessor,
 			@Nullable Class<?> typeToRead) {

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/VectorSearchDelegate.java

@@ -47,6 +47,7 @@
 import org.springframework.data.repository.query.ValueExpressionDelegate;
 import org.springframework.data.repository.query.parser.Part;
 import org.springframework.data.repository.query.parser.PartTree;
+import org.springframework.util.NumberUtils;
 import org.springframework.util.StringUtils;
 
 /**
@@ -136,17 +137,14 @@ QueryContainer createQuery(ValueExpressionEvaluator evaluator, ResultProcessor p
 				outputType, getSimilarityFunction(accessor), indexName);
 	}
 
-	public AggregationPipeline createVectorSearchPipeline(VectorSearchInput input, String scoreField, Class<?> outputType,
+	@SuppressWarnings("NullAway")
+	AggregationPipeline createVectorSearchPipeline(VectorSearchInput input, String scoreField, Class<?> outputType,
 			MongoParameterAccessor accessor, ValueExpressionEvaluator evaluator) {
 
 		Vector vector = accessor.getVector();
 		Score score = accessor.getScore();
 		Range<Score> distance = accessor.getScoreRange();
-		Limit limit = Limit.unlimited();
-
-		if (input.query().isLimited()) {
-			limit = Limit.of(input.query().getLimit());
-		}
+		Limit limit = Limit.of(input.query().getLimit());
 
 		List<AggregationOperation> stages = new ArrayList<>();
 		VectorSearchOperation $vectorSearch = Aggregation.vectorSearch(indexName).path(input.path()).vector(vector)
@@ -223,21 +221,38 @@ public AggregationPipeline createVectorSearchPipeline(VectorSearchInput input, S
 	private VectorSearchInput createSearchInput(ValueExpressionEvaluator evaluator, MongoParameterAccessor accessor,
 			ParameterBindingDocumentCodec codec, ParameterBindingContext context) {
 
-		VectorSearchInput query = queryFactory.createQuery(accessor, codec, context);
-		Limit limit;
+		VectorSearchInput input = queryFactory.createQuery(accessor, codec, context);
+		Limit limit = getLimit(evaluator, accessor);
+		if(!input.query.isLimited() || (input.query.isLimited() && !limit.isUnlimited())) {
+			input.query().limit(limit);
+		}
+		return input;
+	}
+
+	private Limit getLimit(ValueExpressionEvaluator evaluator, MongoParameterAccessor accessor) {
+
 		if (this.limitExpression != null) {
+
 			Object value = evaluator.evaluate(this.limitExpression);
-			limit = value instanceof Limit l ? l : Limit.of(((Number) value).intValue());
-		} else if (this.limit.isLimited()) {
-			limit = this.limit;
-		} else {
-			limit = accessor.getLimit();
+			if (value != null) {
+				if (value instanceof Limit l) {
+					return l;
+				}
+				if (value instanceof Number n) {
+					return Limit.of(n.intValue());
+				}
+				if (value instanceof String s) {
+					return Limit.of(NumberUtils.parseNumber(s, Integer.class));
+				}
+				throw new IllegalArgumentException("Invalid type for Limit. Found [%s], expected Limit or Number");
+			}
 		}
 
-		if (limit.isLimited()) {
-			query.query().limit(limit);
+		if (this.limit.isLimited()) {
+			return this.limit;
 		}
-		return query;
+
+		return accessor.getLimit();
 	}
 
 	public String getQueryString() {
@@ -378,6 +393,7 @@ private class PartTreeQueryFactory implements VectorSearchQueryFactory {
 			this.tree = tree;
 		}
 
+		@SuppressWarnings("NullAway")
 		public VectorSearchInput createQuery(MongoParameterAccessor parameterAccessor, ParameterBindingDocumentCodec codec,
 				ParameterBindingContext context) {
 

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/VectorSearchOperationUnitTests.java

@@ -15,14 +15,14 @@
  */
 package org.springframework.data.mongodb.core.aggregation;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.springframework.data.mongodb.test.util.Assertions.assertThat;
 
 import java.util.List;
 
 import org.bson.Document;
 import org.junit.jupiter.api.Test;
-
 import org.springframework.data.annotation.Id;
+import org.springframework.data.domain.Limit;
 import org.springframework.data.mongodb.core.aggregation.VectorSearchOperation.SearchType;
 import org.springframework.data.mongodb.core.mapping.Field;
 import org.springframework.data.mongodb.core.query.Criteria;
@@ -103,6 +103,16 @@ void mapsCriteriaToDomainType() {
 				.containsExactly(new Document("$vectorSearch", new Document($VECTOR_SEARCH).append("filter", filter)));
 	}
 
+	@Test
+	void withInvalidLimit() {
+
+		VectorSearchOperation $search = VectorSearchOperation.search("vector_index").path("plot_embedding")
+				.vector(-0.0016261312, -0.028070757, -0.011342932).limit(Limit.unlimited());
+
+		List<Document> stages = $search.toPipelineStages(TestAggregationContext.contextFor(Movie.class));
+		assertThat(stages.get(0)).doesNotContainKey("$vectorSearch.limit");
+	}
+
 	static class Movie {
 
 		@Id String id;