Improve exception message when deriving collection name from type fails.

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-mongodb-parent</artifactId>
-	<version>4.0.0-SNAPSHOT</version>
+	<version>4.0.0-GH-4061-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Spring Data MongoDB</name>

spring-data-mongodb-benchmarks/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.0.0-GH-4061-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-mongodb-distribution/pom.xml

@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>4.0.0-GH-4061-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-mongodb/pom.xml

@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.springframework.data</groupId>
     <artifactId>spring-data-mongodb-parent</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0-GH-4061-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

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

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

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

@@ -77,6 +77,7 @@ public interface MongoOperations extends FluentMongoOperations {
 	 *
 	 * @param entityClass must not be {@literal null}.
 	 * @return never {@literal null}.
+	 * @throws org.springframework.data.mapping.MappingException if the collection name cannot be derived from the type.
 	 */
 	String getCollectionName(Class<?> entityClass);
 
@@ -918,6 +919,8 @@ <T> T findAndModify(Query query, UpdateDefinition update, FindAndModifyOptions o
 	 *          fields specification. Must not be {@literal null}.
 	 * @param replacement the replacement document. Must not be {@literal null}.
 	 * @return the converted object that was updated or {@literal null}, if not found.
+	 * @throws org.springframework.data.mapping.MappingException if the collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given replacement value.
 	 * @since 2.1
 	 */
 	@Nullable
@@ -959,6 +962,8 @@ default <T> T findAndReplace(Query query, T replacement, String collectionName)
 	 * @return the converted object that was updated or {@literal null}, if not found. Depending on the value of
 	 *         {@link FindAndReplaceOptions#isReturnNew()} this will either be the object as it was before the update or
 	 *         as it is after the update.
+	 * @throws org.springframework.data.mapping.MappingException if the collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given replacement value.
 	 * @since 2.1
 	 */
 	@Nullable
@@ -1032,6 +1037,8 @@ default <T> T findAndReplace(Query query, T replacement, FindAndReplaceOptions o
 	 * @return the converted object that was updated or {@literal null}, if not found. Depending on the value of
 	 *         {@link FindAndReplaceOptions#isReturnNew()} this will either be the object as it was before the update or
 	 *         as it is after the update.
+	 * @throws org.springframework.data.mapping.MappingException if the collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given replacement value.
 	 * @since 2.1
 	 */
 	@Nullable
@@ -1115,6 +1122,8 @@ <S, T> T findAndReplace(Query query, S replacement, FindAndReplaceOptions option
 	 *          {@literal null}.
 	 * @param entityClass class that determines the collection to use. Must not be {@literal null}.
 	 * @return the count of matching documents.
+	 * @throws org.springframework.data.mapping.MappingException if the collection name cannot be
+	 * 	  {@link #getCollectionName(Class) derived} from the given type.
 	 * @see #exactCount(Query, Class)
 	 * @see #estimatedCount(Class)
 	 */
@@ -1170,6 +1179,8 @@ <S, T> T findAndReplace(Query query, S replacement, FindAndReplaceOptions option
 	 *
 	 * @param entityClass must not be {@literal null}.
 	 * @return the estimated number of documents.
+	 * @throws org.springframework.data.mapping.MappingException if the collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given type.
 	 * @since 3.1
 	 */
 	default long estimatedCount(Class<?> entityClass) {
@@ -1206,6 +1217,8 @@ default long estimatedCount(Class<?> entityClass) {
 	 *          {@literal null}.
 	 * @param entityClass class that determines the collection to use. Must not be {@literal null}.
 	 * @return the count of matching documents.
+	 * @throws org.springframework.data.mapping.MappingException if the collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given type.
 	 * @since 3.4
 	 */
 	default long exactCount(Query query, Class<?> entityClass) {
@@ -1273,6 +1286,8 @@ default long exactCount(Query query, String collectionName) {
 	 * @param objectToSave the object to store in the collection. Must not be {@literal null}.
 	 * @return the inserted object.
 	 * @throws IllegalArgumentException in case the {@code objectToSave} is collection-like.
+	 * @throws org.springframework.data.mapping.MappingException if the target collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given object type.
 	 */
 	<T> T insert(T objectToSave);
 
@@ -1297,6 +1312,8 @@ default long exactCount(Query query, String collectionName) {
 	 * @param batchToSave the batch of objects to save. Must not be {@literal null}.
 	 * @param entityClass class that determines the collection to use. Must not be {@literal null}.
 	 * @return the inserted objects that.
+	 * @throws org.springframework.data.mapping.MappingException if the target collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given type.
 	 */
 	<T> Collection<T> insert(Collection<? extends T> batchToSave, Class<?> entityClass);
 
@@ -1315,6 +1332,8 @@ default long exactCount(Query query, String collectionName) {
 	 *
 	 * @param objectsToSave the list of objects to save. Must not be {@literal null}.
 	 * @return the inserted objects.
+	 * @throws org.springframework.data.mapping.MappingException if the target collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} for the given objects.
 	 */
 	<T> Collection<T> insertAll(Collection<? extends T> objectsToSave);
 
@@ -1333,6 +1352,8 @@ default long exactCount(Query query, String collectionName) {
 	 * @param objectToSave the object to store in the collection. Must not be {@literal null}.
 	 * @return the saved object.
 	 * @throws IllegalArgumentException in case the {@code objectToSave} is collection-like.
+	 * @throws org.springframework.data.mapping.MappingException if the target collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given object type.
 	 */
 	<T> T save(T objectToSave);
 
@@ -1367,9 +1388,11 @@ default long exactCount(Query query, String collectionName) {
 	 *          the existing object. Must not be {@literal null}.
 	 * @param entityClass class that determines the collection to use. Must not be {@literal null}.
 	 * @return the {@link UpdateResult} which lets you access the results of the previous write.
-	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
+	 * @throws org.springframework.data.mapping.MappingException if the target collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given type.
+	 * @since 3.0
 	 */
 	UpdateResult upsert(Query query, UpdateDefinition update, Class<?> entityClass);
 
@@ -1421,9 +1444,11 @@ default long exactCount(Query query, String collectionName) {
 	 *          the existing. Must not be {@literal null}.
 	 * @param entityClass class that determines the collection to use.
 	 * @return the {@link UpdateResult} which lets you access the results of the previous write.
-	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
+	 * @throws org.springframework.data.mapping.MappingException if the target collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given type.
+	 * @since 3.0
 	 */
 	UpdateResult updateFirst(Query query, UpdateDefinition update, Class<?> entityClass);
 
@@ -1475,9 +1500,11 @@ default long exactCount(Query query, String collectionName) {
 	 *          the existing. Must not be {@literal null}.
 	 * @param entityClass class of the pojo to be operated on. Must not be {@literal null}.
 	 * @return the {@link UpdateResult} which lets you access the results of the previous write.
-	 * @since 3.0
+	 * @throws org.springframework.data.mapping.MappingException if the target collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given type.
 	 * @see Update
 	 * @see AggregationUpdate
+	 * @since 3.0
 	 */
 	UpdateResult updateMulti(Query query, UpdateDefinition update, Class<?> entityClass);
 
@@ -1525,6 +1552,8 @@ default long exactCount(Query query, String collectionName) {
 	 *
 	 * @param object must not be {@literal null}.
 	 * @return the {@link DeleteResult} which lets you access the results of the previous delete.
+	 * @throws org.springframework.data.mapping.MappingException if the target collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given object type.
 	 */
 	DeleteResult remove(Object object);
 
@@ -1548,6 +1577,8 @@ default long exactCount(Query query, String collectionName) {
 	 * @param entityClass class that determines the collection to use.
 	 * @return the {@link DeleteResult} which lets you access the results of the previous delete.
 	 * @throws IllegalArgumentException when {@literal query} or {@literal entityClass} is {@literal null}.
+	 * @throws org.springframework.data.mapping.MappingException if the target collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given type.
 	 */
 	DeleteResult remove(Query query, Class<?> entityClass);
 
@@ -1595,6 +1626,8 @@ default long exactCount(Query query, String collectionName) {
 	 * @param query the query document that specifies the criteria used to find and remove documents.
 	 * @param entityClass class of the pojo to be operated on.
 	 * @return the {@link List} converted objects deleted by this operation.
+	 * @throws org.springframework.data.mapping.MappingException if the target collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given type.
 	 * @since 1.5
 	 */
 	<T> List<T> findAllAndRemove(Query query, Class<T> entityClass);