DATAMONGO-2296 - Polishing.

Use getCollectionName() in MongoTemplate.insert/save. Consistently use getCollectionName(Class) from ReactiveMongoTemplate and fluent API implementations.

Original pull request: #768.

Author: mp911de

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

@@ -118,17 +118,6 @@ public String determineCollectionName(@Nullable Class<?> entityClass) {
 		return context.getRequiredPersistentEntity(entityClass).getCollection();
 	}
 
-	/**
-	 * Returns the collection name to be used for the given entity.
-	 *
-	 * @param obj can be {@literal null}.
-	 * @return
-	 */
-	@Nullable
-	public String determineEntityCollectionName(@Nullable Object obj) {
-		return null == obj ? null : determineCollectionName(obj.getClass());
-	}
-
 	public Query getByIdInQuery(Collection<?> entities) {
 
 		MultiValueMap<String, Object> byIds = new LinkedMultiValueMap<>();

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

@@ -1199,7 +1199,7 @@ public <T> T insert(T objectToSave) {
 		Assert.notNull(objectToSave, "ObjectToSave must not be null!");
 
 		ensureNotIterable(objectToSave);
-		return insert(objectToSave, operations.determineEntityCollectionName(objectToSave));
+		return insert(objectToSave, getCollectionName(ClassUtils.getUserClass(objectToSave)));
 	}
 
 	/*
@@ -1330,9 +1330,7 @@ protected <T> Collection<T> doInsertAll(Collection<? extends T> listToSave, Mong
 				continue;
 			}
 
-			MongoPersistentEntity<?> entity = mappingContext.getRequiredPersistentEntity(element.getClass());
-
-			String collection = entity.getCollection();
+			String collection = getCollectionName(ClassUtils.getUserClass(element));
 			List<T> collectionElements = elementsByCollection.get(collection);
 
 			if (null == collectionElements) {
@@ -1398,7 +1396,7 @@ protected <T> Collection<T> doInsertBatch(String collectionName, Collection<? ex
 	public <T> T save(T objectToSave) {
 
 		Assert.notNull(objectToSave, "Object to save must not be null!");
-		return save(objectToSave, operations.determineEntityCollectionName(objectToSave));
+		return save(objectToSave, getCollectionName(ClassUtils.getUserClass(objectToSave)));
 	}
 
 	@Override

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

@@ -116,11 +116,11 @@ private String getCollectionName(Aggregation aggregation) {
 				TypedAggregation<?> typedAggregation = (TypedAggregation<?>) aggregation;
 
 				if (typedAggregation.getInputType() != null) {
-					return template.determineCollectionName(typedAggregation.getInputType());
+					return template.getCollectionName(typedAggregation.getInputType());
 				}
 			}
 
-			return template.determineCollectionName(domainType);
+			return template.getCollectionName(domainType);
 		}
 	}
 }

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

@@ -238,7 +238,7 @@ private FindPublisherPreparer getCursorPreparer(Query query) {
 		}
 
 		private String getCollectionName() {
-			return StringUtils.hasText(collection) ? collection : template.determineCollectionName(domainType);
+			return StringUtils.hasText(collection) ? collection : template.getCollectionName(domainType);
 		}
 
 		private String asString() {

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

@@ -96,7 +96,7 @@ public ReactiveInsert<T> inCollection(String collection) {
 		}
 
 		private String getCollectionName() {
-			return StringUtils.hasText(collection) ? collection : template.determineCollectionName(domainType);
+			return StringUtils.hasText(collection) ? collection : template.getCollectionName(domainType);
 		}
 	}
 }

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

@@ -171,7 +171,7 @@ public ReactiveMapReduce<T> reduce(String reduceFunction) {
 		}
 
 		private String getCollectionName() {
-			return StringUtils.hasText(collection) ? collection : template.determineCollectionName(domainType);
+			return StringUtils.hasText(collection) ? collection : template.getCollectionName(domainType);
 		}
 	}
 }