Polishing.

Refine assertions.

See #4132
Original pull request: #4147.

Author: mp911de

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

@@ -29,6 +29,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.bson.Document;
 import org.bson.conversions.Bson;
+
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
@@ -2070,6 +2071,8 @@ public <T> GroupByResults<T> group(@Nullable Criteria criteria, String inputColl
 	 */
 	@Override
 	public <O> AggregationResults<O> aggregate(TypedAggregation<?> aggregation, Class<O> outputType) {
+
+		Assert.notNull(aggregation, "Aggregation pipeline must not be null");
 		return aggregate(aggregation, getCollectionName(aggregation.getInputType()), outputType);
 	}
 
@@ -2079,9 +2082,6 @@ public <O> AggregationResults<O> aggregate(TypedAggregation<?> aggregation, Clas
 	@Override
 	public <O> AggregationResults<O> aggregate(TypedAggregation<?> aggregation, String inputCollectionName,
 			Class<O> outputType) {
-
-		Assert.notNull(aggregation, "Aggregation pipeline must not be null!");
-
 		return aggregate(aggregation, inputCollectionName, outputType, null);
 	}
 
@@ -2091,6 +2091,7 @@ public <O> AggregationResults<O> aggregate(TypedAggregation<?> aggregation, Stri
 	@Override
 	public <O> AggregationResults<O> aggregate(Aggregation aggregation, Class<?> inputType, Class<O> outputType) {
 
+		Assert.notNull(aggregation, "Aggregation pipeline must not be null");
 		return aggregate(aggregation, getCollectionName(inputType), outputType,
 				queryOperations.createAggregation(aggregation, inputType).getAggregationOperationContext());
 	}
@@ -2109,8 +2110,6 @@ public <O> AggregationResults<O> aggregate(Aggregation aggregation, String colle
 	@Override
 	public <O> CloseableIterator<O> aggregateStream(TypedAggregation<?> aggregation, String inputCollectionName,
 			Class<O> outputType) {
-
-		Assert.notNull(aggregation, "Aggregation pipeline must not be null!");
 		return aggregateStream(aggregation, inputCollectionName, outputType, null);
 	}
 
@@ -2119,6 +2118,8 @@ public <O> CloseableIterator<O> aggregateStream(TypedAggregation<?> aggregation,
 	 */
 	@Override
 	public <O> CloseableIterator<O> aggregateStream(TypedAggregation<?> aggregation, Class<O> outputType) {
+
+		Assert.notNull(aggregation, "Aggregation pipeline must not be null");
 		return aggregateStream(aggregation, getCollectionName(aggregation.getInputType()), outputType);
 	}
 
@@ -2128,6 +2129,7 @@ public <O> CloseableIterator<O> aggregateStream(TypedAggregation<?> aggregation,
 	@Override
 	public <O> CloseableIterator<O> aggregateStream(Aggregation aggregation, Class<?> inputType, Class<O> outputType) {
 
+		Assert.notNull(aggregation, "Aggregation pipeline must not be null");
 		return aggregateStream(aggregation, getCollectionName(inputType), outputType,
 				queryOperations.createAggregation(aggregation, inputType).getAggregationOperationContext());
 	}
@@ -2286,8 +2288,8 @@ protected <O> AggregationResults<O> doAggregate(Aggregation aggregation, String
 	protected <O> CloseableIterator<O> aggregateStream(Aggregation aggregation, String collectionName,
 			Class<O> outputType, @Nullable AggregationOperationContext context) {
 
-		Assert.hasText(collectionName, "Collection name must not be null or empty!");
 		Assert.notNull(aggregation, "Aggregation pipeline must not be null!");
+		Assert.hasText(collectionName, "Collection name must not be null or empty!");
 		Assert.notNull(outputType, "Output type must not be null!");
 		Assert.isTrue(!aggregation.getOptions().isExplain(), "Can't use explain option with streaming!");
 

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

@@ -1018,7 +1018,6 @@ public <T> Flux<T> findDistinct(Query query, String field, String collectionName
 	public <O> Flux<O> aggregate(TypedAggregation<?> aggregation, String inputCollectionName, Class<O> outputType) {
 
 		Assert.notNull(aggregation, "Aggregation pipeline must not be null!");
-
 		return doAggregate(aggregation, inputCollectionName, aggregation.getInputType(), outputType);
 	}
 
@@ -1028,6 +1027,8 @@ public <O> Flux<O> aggregate(TypedAggregation<?> aggregation, String inputCollec
 	 */
 	@Override
 	public <O> Flux<O> aggregate(TypedAggregation<?> aggregation, Class<O> outputType) {
+
+		Assert.notNull(aggregation, "Aggregation pipeline must not be null");
 		return aggregate(aggregation, getCollectionName(aggregation.getInputType()), outputType);
 	}