Browse Source

Favor relaxed type mapping over strict one for aggregateStream.

Align aggregation context usage of aggregate and aggregate stream methods.

Closes #4132
Original pull request: #4147.
3.4.x
Christoph Strobl 3 years ago committed by Mark Paluch
parent
commit
4387cd20e2
No known key found for this signature in database
GPG Key ID: 4406B84C1661DCD1
  1. 8
      spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java

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

@ -66,7 +66,6 @@ import org.springframework.data.mongodb.core.aggregation.Aggregation; @@ -66,7 +66,6 @@ import org.springframework.data.mongodb.core.aggregation.Aggregation;
import org.springframework.data.mongodb.core.aggregation.AggregationOperationContext;
import org.springframework.data.mongodb.core.aggregation.AggregationOptions;
import org.springframework.data.mongodb.core.aggregation.AggregationResults;
import org.springframework.data.mongodb.core.aggregation.TypeBasedAggregationOperationContext;
import org.springframework.data.mongodb.core.aggregation.TypedAggregation;
import org.springframework.data.mongodb.core.convert.DbRefResolver;
import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver;
@ -2112,10 +2111,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware, @@ -2112,10 +2111,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
Class<O> outputType) {
Assert.notNull(aggregation, "Aggregation pipeline must not be null!");
AggregationOperationContext context = new TypeBasedAggregationOperationContext(aggregation.getInputType(),
mappingContext, queryMapper);
return aggregateStream(aggregation, inputCollectionName, outputType, context);
return aggregateStream(aggregation, inputCollectionName, outputType, null);
}
/* (non-Javadoc)
@ -2133,7 +2129,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware, @@ -2133,7 +2129,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
public <O> CloseableIterator<O> aggregateStream(Aggregation aggregation, Class<?> inputType, Class<O> outputType) {
return aggregateStream(aggregation, getCollectionName(inputType), outputType,
new TypeBasedAggregationOperationContext(inputType, mappingContext, queryMapper));
queryOperations.createAggregation(aggregation, inputType).getAggregationOperationContext());
}
/* (non-Javadoc)

Loading…
Cancel
Save