Skip to content

Commit 4387cd2

Browse files
christophstroblmp911de
authored andcommitted
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.
1 parent 8423ae5 commit 4387cd2

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

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

+2-6
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@
6666
import org.springframework.data.mongodb.core.aggregation.AggregationOperationContext;
6767
import org.springframework.data.mongodb.core.aggregation.AggregationOptions;
6868
import org.springframework.data.mongodb.core.aggregation.AggregationResults;
69-
import org.springframework.data.mongodb.core.aggregation.TypeBasedAggregationOperationContext;
7069
import org.springframework.data.mongodb.core.aggregation.TypedAggregation;
7170
import org.springframework.data.mongodb.core.convert.DbRefResolver;
7271
import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver;
@@ -2112,10 +2111,7 @@ public <O> CloseableIterator<O> aggregateStream(TypedAggregation<?> aggregation,
21122111
Class<O> outputType) {
21132112

21142113
Assert.notNull(aggregation, "Aggregation pipeline must not be null!");
2115-
2116-
AggregationOperationContext context = new TypeBasedAggregationOperationContext(aggregation.getInputType(),
2117-
mappingContext, queryMapper);
2118-
return aggregateStream(aggregation, inputCollectionName, outputType, context);
2114+
return aggregateStream(aggregation, inputCollectionName, outputType, null);
21192115
}
21202116

21212117
/* (non-Javadoc)
@@ -2133,7 +2129,7 @@ public <O> CloseableIterator<O> aggregateStream(TypedAggregation<?> aggregation,
21332129
public <O> CloseableIterator<O> aggregateStream(Aggregation aggregation, Class<?> inputType, Class<O> outputType) {
21342130

21352131
return aggregateStream(aggregation, getCollectionName(inputType), outputType,
2136-
new TypeBasedAggregationOperationContext(inputType, mappingContext, queryMapper));
2132+
queryOperations.createAggregation(aggregation, inputType).getAggregationOperationContext());
21372133
}
21382134

21392135
/* (non-Javadoc)

0 commit comments

Comments
 (0)