Polishing.

Remove Field type. Refactor container to subclass MongoDBAtlasLocalContainer. Introduce wait/synchronization to avoid container crashes on create index + list search indexes.

See #4706
Original pull request: #4882

Author: mp911de

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

@@ -185,7 +185,7 @@ private JsonSchemaProperty computeSchemaForProperty(List<MongoPersistentProperty
 		Class<?> rawTargetType = computeTargetType(property); // target type before conversion
 		Class<?> targetType = converter.getTypeMapper().getWriteTargetTypeFor(rawTargetType); // conversion target type
 
-		if((rawTargetType.isPrimitive() || ClassUtils.isPrimitiveArray(rawTargetType)) && targetType == Object.class) {
+		if ((rawTargetType.isPrimitive() || ClassUtils.isPrimitiveArray(rawTargetType)) && targetType == Object.class) {
 			targetType = rawTargetType;
 		}
 
@@ -338,8 +338,8 @@ private TypedJsonSchemaObject createSchemaObject(Object type, Collection<?> poss
 
 	private String computePropertyFieldName(PersistentProperty<?> property) {
 
-		return property instanceof MongoPersistentProperty  mongoPersistentProperty ?
-				mongoPersistentProperty.getFieldName() : property.getName();
+		return property instanceof MongoPersistentProperty mongoPersistentProperty ? mongoPersistentProperty.getFieldName()
+				: property.getName();
 	}
 
 	private boolean isRequiredProperty(PersistentProperty<?> property) {

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

@@ -16,15 +16,14 @@
 package org.springframework.data.mongodb.core.aggregation;
 
 import java.util.Arrays;
-import java.util.LinkedHashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 import org.bson.BinaryVector;
 import org.bson.Document;
+
 import org.springframework.data.domain.Limit;
 import org.springframework.data.domain.Vector;
 import org.springframework.data.mongodb.core.mapping.MongoVector;
@@ -177,7 +176,7 @@ public String getKey() {
 	 * can't specify a number less than the number of documents to return (limit). This field is required if
 	 * {@link #searchType(SearchType)} is {@link SearchType#ANN} or {@link SearchType#DEFAULT}.
 	 *
-	 * @param numCandidates
+	 * @param numCandidates number of nearest neighbors to use during the search
 	 * @return a new {@link VectorSearchOperation} with {@code numCandidates} applied.
 	 */
 	@Contract("_ -> new")
@@ -338,20 +337,25 @@ public enum SearchType {
 		ENN
 	}
 
-	// A query path cannot only contain the name of the filed but may also hold additional information about the
-	// analyzer to use;
-	// "path": [ "names", "notes", { "value": "comments", "multi": "mySecondaryAnalyzer" } ]
-	// see: https://www.mongodb.com/docs/atlas/atlas-search/path-construction/#std-label-ref-path
+	/**
+	 * Value object capturing query paths.
+	 */
 	public static class QueryPaths {
 
-		Set<QueryPath<?>> paths;
+		private final Set<QueryPath<?>> paths;
 
-		public static QueryPaths of(QueryPath<String> path) {
+		private QueryPaths(Set<QueryPath<?>> paths) {
+			this.paths = paths;
+		}
 
-			QueryPaths queryPaths = new QueryPaths();
-			queryPaths.paths = new LinkedHashSet<>(2);
-			queryPaths.paths.add(path);
-			return queryPaths;
+		/**
+		 * Factory method to create {@link QueryPaths} from a single {@link QueryPath}.
+		 *
+		 * @param path
+		 * @return a new {@link QueryPaths} instance.
+		 */
+		public static QueryPaths of(QueryPath<String> path) {
+			return new QueryPaths(Set.of(path));
 		}
 
 		Object getPathObject() {
@@ -363,21 +367,19 @@ Object getPathObject() {
 		}
 	}
 
+	/**
+	 * Interface describing a query path contract. Query paths might be simple field names, wildcard paths, or
+	 * multi-paths. paths.
+	 *
+	 * @param <T>
+	 */
 	public interface QueryPath<T> {
 
 		T value();
 
 		static QueryPath<String> path(String field) {
 			return new SimplePath(field);
 		}
-
-		static QueryPath<Map<String, Object>> wildcard(String field) {
-			return new WildcardPath(field);
-		}
-
-		static QueryPath<Map<String, Object>> multi(String field, String analyzer) {
-			return new MultiPath(field, analyzer);
-		}
 	}
 
 	public static class SimplePath implements QueryPath<String> {
@@ -394,36 +396,9 @@ public String value() {
 		}
 	}
 
-	public static class WildcardPath implements QueryPath<Map<String, Object>> {
-
-		String name;
-
-		public WildcardPath(String name) {
-			this.name = name;
-		}
-
-		@Override
-		public Map<String, Object> value() {
-			return Map.of("wildcard", name);
-		}
-	}
-
-	public static class MultiPath implements QueryPath<Map<String, Object>> {
-
-		String field;
-		String analyzer;
-
-		public MultiPath(String field, String analyzer) {
-			this.field = field;
-			this.analyzer = analyzer;
-		}
-
-		@Override
-		public Map<String, Object> value() {
-			return Map.of("value", field, "multi", analyzer);
-		}
-	}
-
+	/**
+	 * Fluent API to configure a path on the VectorSearchOperation builder.
+	 */
 	public interface PathContributor {
 
 		/**
@@ -436,6 +411,9 @@ public interface PathContributor {
 		VectorContributor path(String path);
 	}
 
+	/**
+	 * Fluent API to configure a vector on the VectorSearchOperation builder.
+	 */
 	public interface VectorContributor {
 
 		/**
@@ -458,7 +436,7 @@ default LimitContributor vector(float... vector) {
 		 * @return
 		 */
 		@Contract("_ -> this")
-		default LimitContributor vector(byte... vector) {
+		default LimitContributor vector(byte[] vector) {
 			return vector(BinaryVector.int8Vector(vector));
 		}
 
@@ -510,6 +488,9 @@ default LimitContributor vector(BinaryVector vector) {
 		LimitContributor vector(Vector vector);
 	}
 
+	/**
+	 * Fluent API to configure a limit on the VectorSearchOperation builder.
+	 */
 	public interface LimitContributor {
 
 		/**

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConverters.java

@@ -15,7 +15,7 @@
  */
 package org.springframework.data.mongodb.core.convert;
 
-import static org.springframework.data.convert.ConverterBuilder.reading;
+import static org.springframework.data.convert.ConverterBuilder.*;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -47,6 +47,7 @@
 import org.bson.types.Code;
 import org.bson.types.Decimal128;
 import org.bson.types.ObjectId;
+
 import org.springframework.core.convert.ConversionFailedException;
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.core.convert.converter.ConditionalConverter;
@@ -118,8 +119,6 @@ static Collection<Object> getConvertersToRegister() {
 		converters.add(reading(BsonUndefined.class, Object.class, it -> null));
 		converters.add(reading(String.class, URI.class, URI::create).andWriting(URI::toString));
 
-		converters.add(ByteArrayConverterFactory.INSTANCE);
-
 		return converters;
 	}
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexOperations.java

@@ -33,14 +33,14 @@ public interface IndexOperations {
 	 *
 	 * @param indexDefinition must not be {@literal null}.
 	 * @return the index name.
-	 * @deprecated in favor of {@link #createIndex(IndexDefinition)}.
+	 * @deprecated since 4.5, in favor of {@link #createIndex(IndexDefinition)}.
 	 */
 	@Deprecated(since = "4.5", forRemoval = true)
 	String ensureIndex(IndexDefinition indexDefinition);
 
 	/**
-	 * Create the index for the provided {@link IndexDefinition} exists for the collection indicated by the entity
-	 * class. If not it will be created.
+	 * Create the index for the provided {@link IndexDefinition} exists for the collection indicated by the entity class.
+	 * If not it will be created.
 	 *
 	 * @param indexDefinition must not be {@literal null}.
 	 * @return the index name.

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/ReactiveIndexOperations.java

@@ -33,9 +33,23 @@ public interface ReactiveIndexOperations {
 	 *
 	 * @param indexDefinition must not be {@literal null}.
 	 * @return a {@link Mono} emitting the name of the index on completion.
+	 * @deprecated since 4.5, in favor of {@link #createIndex(IndexDefinition)}.
 	 */
+	@Deprecated(since = "4.5", forRemoval = true)
 	Mono<String> ensureIndex(IndexDefinition indexDefinition);
 
+	/**
+	 * Create the index for the provided {@link IndexDefinition} exists for the collection indicated by the entity class.
+	 * If not it will be created.
+	 *
+	 * @param indexDefinition must not be {@literal null}.
+	 * @return the index name.
+	 * @since 4.5
+	 */
+	default Mono<String> createIndex(IndexDefinition indexDefinition) {
+		return ensureIndex(indexDefinition);
+	}
+
 	/**
 	 * Alters the index with given {@literal name}.
 	 *

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/SearchIndexDefinition.java

@@ -45,7 +45,7 @@ public interface SearchIndexDefinition {
 	 * Returns the index document for this index without any potential entity context resolving field name mappings. The
 	 * resulting document contains the index name, type and {@link #getDefinition(TypeInformation, MappingContext)
 	 * definition}.
-	 * 
+	 *
 	 * @return never {@literal null}.
 	 */
 	default Document getRawIndexDocument() {
@@ -74,12 +74,14 @@ default Document getIndexDocument(@Nullable TypeInformation<?> entity,
 
 	/**
 	 * Returns the actual index definition for this index in the context of a potential entity to resolve field name
-	 * mappings.
+	 * mappings. Entity and context can be {@literal null} to create a generic index definition without applying field
+	 * name mapping.
 	 *
 	 * @param entity can be {@literal null}.
-	 * @param mappingContext
+	 * @param mappingContext can be {@literal null}.
 	 * @return never {@literal null}.
 	 */
 	Document getDefinition(@Nullable TypeInformation<?> entity,
 			@Nullable MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext);
+
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/SearchIndexInfo.java

@@ -27,8 +27,9 @@
 
 /**
  * Index information for a MongoDB Search Index.
- * 
+ *
  * @author Christoph Strobl
+ * @since 4.5
  */
 public class SearchIndexInfo {
 
@@ -42,14 +43,27 @@ public class SearchIndexInfo {
 		this.indexDefinition = Lazy.of(indexDefinition);
 	}
 
+	/**
+	 * Parse a BSON document describing an index into a {@link SearchIndexInfo}.
+	 *
+	 * @param source BSON document describing the index.
+	 * @return a new {@link SearchIndexInfo} instance.
+	 */
 	public static SearchIndexInfo parse(String source) {
 		return of(Document.parse(source));
 	}
 
+	/**
+	 * Create an index from its BSON {@link Document} representation into a {@link SearchIndexInfo}.
+	 *
+	 * @param indexDocument BSON document describing the index.
+	 * @return a new {@link SearchIndexInfo} instance.
+	 */
 	public static SearchIndexInfo of(Document indexDocument) {
 
 		Object id = indexDocument.get("id");
-		SearchIndexStatus status = SearchIndexStatus.valueOf(indexDocument.get("status", "DOES_NOT_EXIST"));
+		SearchIndexStatus status = SearchIndexStatus
+				.valueOf(indexDocument.get("status", SearchIndexStatus.DOES_NOT_EXIST.name()));
 
 		return new SearchIndexInfo(id, status, () -> readIndexDefinition(indexDocument));
 	}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/SearchIndexOperations.java

@@ -27,17 +27,6 @@
  */
 public interface SearchIndexOperations {
 
-	/**
-	 * Create the index for the given {@link SearchIndexDefinition} in the collection indicated by the entity class.
-	 *
-	 * @param indexDefinition must not be {@literal null}.
-	 * @return the index name.
-	 */
-	// TODO: keep or just go with createIndex?
-	default String ensureIndex(SearchIndexDefinition indexDefinition) {
-		return createIndex(indexDefinition);
-	}
-
 	/**
 	 * Create the index for the given {@link SearchIndexDefinition} in the collection indicated by the entity class.
 	 *
@@ -53,7 +42,6 @@ default String ensureIndex(SearchIndexDefinition indexDefinition) {
 	 *
 	 * @param indexDefinition the index definition.
 	 */
-	// TODO: keep or remove since it does not work reliably?
 	void updateIndex(SearchIndexDefinition indexDefinition);
 
 	/**