Refine CollectionName API.

Author: mp911de

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

@@ -69,13 +69,8 @@ String resolveCollectionName(BulkOperation operation) {
 	String resolveCollectionName(TypedNamespace namespace) {
 
 		if (namespace.hasCollectionName()) {
-			CollectionName collectionName = namespace.getRequiredCollectionName();
-			if (collectionName.getEntityClass() == Object.class) {
-				return collectionName.getCollectionName();
-			}
-			return entityOperations.determineCollectionName(collectionName.getEntityClass());
+			return namespace.getRequiredCollectionName().getCollectionName(entityOperations::getRequiredPersistentEntity);
 		}
-
 		return entityOperations.determineCollectionName(namespace.type());
 	}
 

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

@@ -220,14 +220,19 @@ public String determineCollectionName(@Nullable Class<?> entityClass) {
 					"No class parameter provided, entity collection can't be determined");
 		}
 
+		return getRequiredPersistentEntity(entityClass).getCollection();
+	}
+
+	MongoPersistentEntity<?> getRequiredPersistentEntity(Class<?> entityClass) {
+
 		MongoPersistentEntity<?> persistentEntity = context.getPersistentEntity(entityClass);
 
 		if (persistentEntity == null) {
 			throw new MappingException(String.format(
 					"Cannot determine collection name from type '%s'. Is it a store native type?", entityClass.getName()));
 		}
 
-		return persistentEntity.getCollection();
+		return persistentEntity;
 	}
 
 	public Query getByIdInQuery(Collection<?> entities) {

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

@@ -15,6 +15,10 @@
  */
 package org.springframework.data.mongodb.core.mapping;
 
+import java.util.function.Function;
+
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.util.Assert;
 
 /**
@@ -31,6 +35,11 @@ public interface CollectionName {
 	 */
 	String getCollectionName();
 
+	/**
+	 * Returns the collection name, potentially by considering a {@link MongoPersistentEntity}.
+	 */
+	String getCollectionName(Function<Class<?>, @Nullable MongoPersistentEntity<?>> entityLookup);
+
 	/**
 	 * Returns the entity class for which the collection name is derived.
 	 */

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

@@ -15,6 +15,10 @@
  */
 package org.springframework.data.mongodb.core.mapping;
 
+import java.util.function.Function;
+
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.core.annotation.MergedAnnotations;
 import org.springframework.data.mongodb.MongoCollectionUtils;
 import org.springframework.util.ObjectUtils;
@@ -34,6 +38,11 @@ public String getCollectionName() {
 			return collectionName;
 		}
 
+		@Override
+		public String getCollectionName(Function<Class<?>, @Nullable MongoPersistentEntity<?>> entityLookup) {
+			return getCollectionName();
+		}
+
 		@Override
 		public Class<?> getEntityClass() {
 			return Object.class;
@@ -67,6 +76,13 @@ public String getCollectionName() {
 					.orElseGet(() -> MongoCollectionUtils.getPreferredCollectionName(entityClass));
 		}
 
+		@Override
+		public String getCollectionName(Function<Class<?>, @Nullable MongoPersistentEntity<?>> entityLookup) {
+
+			MongoPersistentEntity<?> entity = entityLookup.apply(getEntityClass());
+			return entity != null ? entity.getCollection() : getCollectionName();
+		}
+
 		@Override
 		public Class<?> getEntityClass() {
 			return entityClass;