diff --git a/pom.xml b/pom.xml
index c3245aad49..989ab0deb9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
org.springframework.data
spring-data-mongodb-parent
- 4.5.0-SNAPSHOT
+ 4.5.x-GENERATED-REPOSITORIES-SNAPSHOT
pom
Spring Data MongoDB
@@ -26,7 +26,7 @@
multi
spring-data-mongodb
- 3.5.0-SNAPSHOT
+ 3.5.x-GENERATED-REPOSITORIES-SNAPSHOT
5.2.1
${mongo}
${mongo}
diff --git a/spring-data-mongodb-distribution/pom.xml b/spring-data-mongodb-distribution/pom.xml
index 58c63dfc97..56d5b91242 100644
--- a/spring-data-mongodb-distribution/pom.xml
+++ b/spring-data-mongodb-distribution/pom.xml
@@ -15,7 +15,7 @@
org.springframework.data
spring-data-mongodb-parent
- 4.5.0-SNAPSHOT
+ 4.5.x-GENERATED-REPOSITORIES-SNAPSHOT
../pom.xml
diff --git a/spring-data-mongodb/pom.xml b/spring-data-mongodb/pom.xml
index 98516a5ba9..cdbb32b347 100644
--- a/spring-data-mongodb/pom.xml
+++ b/spring-data-mongodb/pom.xml
@@ -13,7 +13,7 @@
org.springframework.data
spring-data-mongodb-parent
- 4.5.0-SNAPSHOT
+ 4.5.x-GENERATED-REPOSITORIES-SNAPSHOT
../pom.xml
@@ -273,6 +273,12 @@
test
+
+ org.springframework
+ spring-core-test
+ test
+
+
org.jetbrains.kotlin
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/aot/generated/AotQueryCreator.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/aot/generated/AotQueryCreator.java
new file mode 100644
index 0000000000..c0fbfc4ee9
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/aot/generated/AotQueryCreator.java
@@ -0,0 +1,199 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.aot.generated;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import org.bson.conversions.Bson;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Range;
+import org.springframework.data.domain.ScrollPosition;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.geo.Distance;
+import org.springframework.data.geo.Point;
+import org.springframework.data.mongodb.core.convert.MongoCustomConversions;
+import org.springframework.data.mongodb.core.convert.MongoWriter;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.data.mongodb.core.query.Collation;
+import org.springframework.data.mongodb.core.query.CriteriaDefinition.Placeholder;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.TextCriteria;
+import org.springframework.data.mongodb.core.query.UpdateDefinition;
+import org.springframework.data.mongodb.repository.query.ConvertingParameterAccessor;
+import org.springframework.data.mongodb.repository.query.MongoParameterAccessor;
+import org.springframework.data.mongodb.repository.query.MongoQueryCreator;
+import org.springframework.data.repository.query.parser.PartTree;
+import org.springframework.data.util.TypeInformation;
+import org.springframework.lang.Nullable;
+
+import com.mongodb.DBRef;
+
+/**
+ * @author Christoph Strobl
+ * @since 2025/01
+ */
+public class AotQueryCreator {
+
+ private MongoMappingContext mappingContext;
+
+ public AotQueryCreator() {
+
+ MongoMappingContext mongoMappingContext = new MongoMappingContext();
+ mongoMappingContext.setSimpleTypeHolder(
+ MongoCustomConversions.create((cfg) -> cfg.useNativeDriverJavaTimeCodecs()).getSimpleTypeHolder());
+ mongoMappingContext.setAutoIndexCreation(false);
+ mongoMappingContext.afterPropertiesSet();
+
+ this.mappingContext = mongoMappingContext;
+ }
+
+ StringQuery createQuery(PartTree partTree, int parameterCount) {
+
+ Query query = new MongoQueryCreator(partTree,
+ new PlaceholderConvertingParameterAccessor(new PlaceholderParameterAccessor(parameterCount)), mappingContext)
+ .createQuery();
+
+ if(partTree.isLimiting()) {
+ query.limit(partTree.getMaxResults());
+ }
+ return new StringQuery(query);
+ }
+
+ static class PlaceholderConvertingParameterAccessor extends ConvertingParameterAccessor {
+
+ /**
+ * Creates a new {@link ConvertingParameterAccessor} with the given {@link MongoWriter} and delegate.
+ *
+ * @param delegate must not be {@literal null}.
+ */
+ public PlaceholderConvertingParameterAccessor(PlaceholderParameterAccessor delegate) {
+ super(PlaceholderWriter.INSTANCE, delegate);
+ }
+ }
+
+ enum PlaceholderWriter implements MongoWriter