Update exception translation for bulk writes to multiple collections.

This commit makes sure to translate ClientBulkWriteExceptions to BulkOperationException.
It also includes some nullability fixes and updates the documentation.

See: #5087

Author: christophstrobl

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/BulkOperationException.java

@@ -16,27 +16,35 @@
 package org.springframework.data.mongodb;
 
 import java.util.List;
+import java.util.Optional;
 
 import org.jspecify.annotations.Nullable;
 import org.springframework.dao.DataAccessException;
+import org.springframework.data.util.Lazy;
+import org.springframework.util.NumberUtils;
 
+import com.mongodb.ClientBulkWriteException;
 import com.mongodb.MongoBulkWriteException;
 import com.mongodb.bulk.BulkWriteError;
+import com.mongodb.bulk.BulkWriteInsert;
 import com.mongodb.bulk.BulkWriteResult;
+import com.mongodb.bulk.BulkWriteUpsert;
+import com.mongodb.client.model.bulk.ClientBulkWriteResult;
 
 /**
  * Is thrown when errors occur during bulk operations.
  *
  * @author Tobias Trelle
  * @author Oliver Gierke
+ * @author Christoph Strobl
  * @since 1.9
  */
 public class BulkOperationException extends DataAccessException {
 
 	private static final long serialVersionUID = 73929601661154421L;
 
-	private final List<BulkWriteError> errors;
-	private final BulkWriteResult result;
+	private final Lazy<List<BulkWriteError>> errors;
+	private final Lazy<BulkWriteResult> result;
 
 	/**
 	 * Creates a new {@link BulkOperationException} with the given message and source {@link MongoBulkWriteException}.
@@ -48,15 +56,78 @@ public BulkOperationException(@Nullable String message, MongoBulkWriteException
 
 		super(message, source);
 
-		this.errors = source.getWriteErrors();
-		this.result = source.getWriteResult();
+		this.errors = Lazy.of(source.getWriteErrors());
+		this.result = Lazy.of(source.getWriteResult());
+	}
+
+	/**
+	 * @param message
+	 * @param source
+	 */
+	public BulkOperationException(@Nullable String message, ClientBulkWriteException source) {
+		super(message, source);
+
+		this.errors = Lazy.of(() -> source.getWriteErrors().values().stream()
+				.map(error -> new BulkWriteError(error.getCode(), error.getMessage(), error.getDetails(), -1)).toList());
+		this.result = Lazy.of(() -> convertToBulkWriteResult(source.getPartialResult()));
 	}
 
 	public List<BulkWriteError> getErrors() {
-		return errors;
+		return errors.get();
 	}
 
 	public BulkWriteResult getResult() {
-		return result;
+		return result.get();
 	}
+
+	private static BulkWriteResult convertToBulkWriteResult(Optional<ClientBulkWriteResult> source) {
+
+		if (source.isEmpty()) {
+			return BulkWriteResult.unacknowledged();
+		}
+
+		ClientBulkWriteResult clientBulkWriteResult = source.get();
+		if (!clientBulkWriteResult.isAcknowledged()) {
+			return BulkWriteResult.unacknowledged();
+		}
+
+		return new BulkWriteResult() {
+
+			@Override
+			public boolean wasAcknowledged() {
+				return true;
+			}
+
+			@Override
+			public int getInsertedCount() {
+				return NumberUtils.convertNumberToTargetClass(clientBulkWriteResult.getInsertedCount(), Integer.class);
+			}
+
+			@Override
+			public int getMatchedCount() {
+				return NumberUtils.convertNumberToTargetClass(clientBulkWriteResult.getMatchedCount(), Integer.class);
+			}
+
+			@Override
+			public int getDeletedCount() {
+				return NumberUtils.convertNumberToTargetClass(clientBulkWriteResult.getDeletedCount(), Integer.class);
+			}
+
+			@Override
+			public int getModifiedCount() {
+				return NumberUtils.convertNumberToTargetClass(clientBulkWriteResult.getModifiedCount(), Integer.class);
+			}
+
+			@Override
+			public List<BulkWriteInsert> getInserts() {
+				throw new UnsupportedOperationException();
+			}
+
+			@Override
+			public List<BulkWriteUpsert> getUpserts() {
+				throw new UnsupportedOperationException();
+			}
+		};
+	}
+
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/SessionAwareMethodInterceptor.java

@@ -98,9 +98,9 @@ public <T> SessionAwareMethodInterceptor(ClientSession session, T target, Class<
 		this.sessionType = sessionType;
 	}
 
-	Class<?> targetType(@Nullable Class<?> targetType) {
+	Class<?> targetType(Class<?> targetType) {
 
-		if(ClassUtils.isAssignable(clientType, targetType)) {
+		if (ClassUtils.isAssignable(clientType, targetType)) {
 			return clientType;
 		}
 		return ClassUtils.isAssignable(databaseType, targetType) ? databaseType : collectionType;

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

@@ -67,6 +67,7 @@ public BulkWriteResult write(String defaultDatabase, Bulk bulk, BulkWriteOptions
 		return writeToMultipleCollections(defaultDatabase, bulk, options);
 	}
 
+	@SuppressWarnings("NullAway")
 	private BulkWriteResult writeToSingleCollection(String defaultDatabase, Bulk bulk,
 			BulkWriteOptions options, TypedNamespace namespace) {
 
@@ -96,6 +97,7 @@ private BulkWriteResult writeToSingleCollection(String defaultDatabase, Bulk bul
 		}
 	}
 
+	@SuppressWarnings("NullAway")
 	private BulkWriteResult writeToMultipleCollections(String defaultDatabase, Bulk bulk,
 			BulkWriteOptions options) {
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2026 the original author or authors.
+ * Copyright 2026-present 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.
@@ -43,6 +43,7 @@
  * Base class for {@link BulkWriter} and {@link ReactiveBulkWriter}.
  *
  * @author Mark Paluch
+ * @author Christoph Strobl
  * @since 5.1
  */
 abstract class BulkWriterSupport {
@@ -81,13 +82,13 @@ MongoPersistentEntity<?> getPersistentEntity(BulkOperationContext context) {
 		BulkOperationContext.TypedNamespace namespace = context.namespace();
 
 		if (namespace.type() != null) {
-			return mappingContext.getRequiredPersistentEntity(namespace.type());
+			return mappingContext.getPersistentEntity(namespace.type());
 		}
 
 		if (namespace.hasCollectionName()) {
 			CollectionName collectionName = namespace.getRequiredCollectionName();
 			if (collectionName.getEntityClass() != Object.class) {
-				return mappingContext.getRequiredPersistentEntity(collectionName.getEntityClass());
+				return mappingContext.getPersistentEntity(collectionName.getEntityClass());
 			}
 		}
 

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

@@ -92,7 +92,7 @@
  * @see MongoTemplate
  * @see ReactiveMongoTemplate
  */
-public class EntityOperations {
+class EntityOperations {
 
 	private static final String ID_FIELD = FieldName.ID.name();
 

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

@@ -17,6 +17,7 @@
 
 import java.util.Set;
 
+import com.mongodb.ClientBulkWriteException;
 import org.bson.BsonInvalidOperationException;
 import org.jspecify.annotations.Nullable;
 import org.springframework.dao.DataAccessException;
@@ -27,6 +28,7 @@
 import org.springframework.dao.InvalidDataAccessResourceUsageException;
 import org.springframework.dao.PermissionDeniedDataAccessException;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
+import org.springframework.data.mongodb.BulkOperationException;
 import org.springframework.data.mongodb.ClientSessionException;
 import org.springframework.data.mongodb.TransientClientSessionException;
 import org.springframework.data.mongodb.UncategorizedMongoDbException;
@@ -63,7 +65,7 @@ public class MongoExceptionTranslator implements PersistenceExceptionTranslator
 	private static final Set<String> RESOURCE_USAGE_EXCEPTIONS = Set.of("MongoInternalException");
 
 	private static final Set<String> DATA_INTEGRITY_EXCEPTIONS = Set.of("WriteConcernException", "MongoWriteException",
-			"MongoBulkWriteException");
+			"MongoBulkWriteException", "ClientBulkWriteException");
 
 	private static final Set<String> SECURITY_EXCEPTIONS = Set.of("MongoCryptException");
 
@@ -112,6 +114,9 @@ DataAccessException doTranslateException(RuntimeException ex) {
 							return new DuplicateKeyException(ex.getMessage(), ex);
 						}
 					}
+					return new BulkOperationException(ex.getMessage(), bulkException);
+				} else if (ex instanceof ClientBulkWriteException clientBulkWriteException) {
+					return new BulkOperationException(ex.getMessage(), clientBulkWriteException);
 				}
 			}
 

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

@@ -172,12 +172,14 @@ public interface MongoOperations extends FluentMongoOperations {
 	<T> T execute(String collectionName, CollectionCallback<T> action);
 
 	/**
-	 * Executes the given {@link Bulk} to perform insert, update, and delete operations on multiple collections (requires
-	 * MongoDB 8.0+).
+	 * Executes the given {@link Bulk} to perform insert, update, and delete operations.
+	 * <p>
+	 * <strong>NOTE:</strong> targeting multiple collections requires MongoDB 8.0+.
 	 *
 	 * @param bulk the {@link Bulk} to write.
 	 * @param options additional options applied to the execution.
-	 * @return never {@literal null}.
+	 * @return the result of the bulk write operation. Never {@literal null}.
+	 * @since 5.1
 	 */
 	BulkWriteResult bulkWrite(Bulk bulk, BulkWriteOptions options);
 

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

@@ -376,7 +376,7 @@ public void setApplicationContext(ApplicationContext applicationContext) throws
 			setEntityCallbacks(EntityCallbacks.create(applicationContext));
 		}
 
-		if (mappingContext instanceof ApplicationEventPublisherAware applicationEventPublisherAware) {
+		if (eventPublisher != null && mappingContext instanceof ApplicationEventPublisherAware applicationEventPublisherAware) {
 			applicationEventPublisherAware.setApplicationEventPublisher(eventPublisher);
 		}
 

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

@@ -31,7 +31,7 @@
  * @author Mark Paluch
  * @since 2.1
  */
-public class PropertyOperations {
+class PropertyOperations {
 
 	private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
 

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

@@ -81,7 +81,7 @@
  * @author Florian Lüdiger
  * @since 3.0
  */
-public class QueryOperations {
+class QueryOperations {
 
 	private final QueryMapper queryMapper;
 	private final UpdateMapper updateMapper;