Renamed ResultSerializer to ProjectionSerializer for projection definitions.

rstam · rstam · commit 5442c3150c0a · 2015-03-16T16:29:32.000-04:00
diff --git a/src/MongoDB.Driver.Tests/Linq/Translators/AggregateProjectionTranslatorTests_Group.cs b/src/MongoDB.Driver.Tests/Linq/Translators/AggregateProjectionTranslatorTests_Group.cs
@@ -295,7 +295,7 @@ private async Task<ProjectedResult<TResult>> Group<TKey, TResult>(Expression<Fun
             var projectionInfo = AggregateProjectionTranslator.TranslateGroup<TKey, Root, TResult>(idProjector, groupProjector, serializer, BsonSerializer.SerializerRegistry);
 
             var pipelineOperator = new BsonDocument("$group", projectionInfo.Document);
-            using (var cursor = await _collection.AggregateAsync<TResult>(new PipelineStagePipelineDefinition<Root, TResult>(new PipelineStageDefinition<Root, TResult>[] { pipelineOperator }, projectionInfo.ResultSerializer)))
+            using (var cursor = await _collection.AggregateAsync<TResult>(new PipelineStagePipelineDefinition<Root, TResult>(new PipelineStageDefinition<Root, TResult>[] { pipelineOperator }, projectionInfo.ProjectionSerializer)))
             {
                 var list = await cursor.ToListAsync();
                 return new ProjectedResult<TResult>
diff --git a/src/MongoDB.Driver.Tests/Linq/Translators/AggregateProjectionTranslatorTests_Project.cs b/src/MongoDB.Driver.Tests/Linq/Translators/AggregateProjectionTranslatorTests_Project.cs
@@ -759,7 +759,7 @@ private async Task<ProjectedResult<TResult>> Project<TResult>(Expression<Func<Ro
             var projectionInfo = AggregateProjectionTranslator.TranslateProject<Root, TResult>(projector, serializer, BsonSerializer.SerializerRegistry);
 
             var pipelineOperator = new BsonDocument("$project", projectionInfo.Document);
-            using (var cursor = await _collection.AggregateAsync<TResult>(new PipelineStagePipelineDefinition<Root, TResult>(new PipelineStageDefinition<Root, TResult>[] { pipelineOperator }, projectionInfo.ResultSerializer)))
+            using (var cursor = await _collection.AggregateAsync<TResult>(new PipelineStagePipelineDefinition<Root, TResult>(new PipelineStageDefinition<Root, TResult>[] { pipelineOperator }, projectionInfo.ProjectionSerializer)))
             {
                 var list = await cursor.ToListAsync();
                 return new ProjectedResult<TResult>
diff --git a/src/MongoDB.Driver.Tests/Linq/Translators/FindProjectionTranslatorTests.cs b/src/MongoDB.Driver.Tests/Linq/Translators/FindProjectionTranslatorTests.cs
@@ -246,7 +246,7 @@ private ProjectedResult<T> Project<T>(Expression<Func<Root, T>> projector, strin
                 return new ProjectedResult<T>
                 {
                     Projection = projectionInfo.Document,
-                    Value = projectionInfo.ResultSerializer.Deserialize(context)
+                    Value = projectionInfo.ProjectionSerializer.Deserialize(context)
                 };
             }
         }
diff --git a/src/MongoDB.Driver/AggregateFluent.cs b/src/MongoDB.Driver/AggregateFluent.cs
@@ -68,7 +68,7 @@ public override IAggregateFluent<TNewResult> Group<TNewResult>(ProjectionDefinit
                 (s, sr) => 
                 {
                     var renderedProjection = group.Render(s, sr);
-                    return new RenderedPipelineStageDefinition<TNewResult>(operatorName, new BsonDocument(operatorName, renderedProjection.Document), renderedProjection.ResultSerializer);
+                    return new RenderedPipelineStageDefinition<TNewResult>(operatorName, new BsonDocument(operatorName, renderedProjection.Document), renderedProjection.ProjectionSerializer);
                 });
 
             return AppendStage<TNewResult>(stage);
@@ -103,7 +103,7 @@ public override IAggregateFluent<TNewResult> Project<TNewResult>(ProjectionDefin
                 (s, sr) =>
                 {
                     var renderedProjection = projection.Render(s, sr);
-                    return new RenderedPipelineStageDefinition<TNewResult>(operatorName, new BsonDocument(operatorName, renderedProjection.Document), renderedProjection.ResultSerializer);
+                    return new RenderedPipelineStageDefinition<TNewResult>(operatorName, new BsonDocument(operatorName, renderedProjection.Document), renderedProjection.ProjectionSerializer);
                 });
 
             return AppendStage<TNewResult>(stage);
diff --git a/src/MongoDB.Driver/MongoCollectionImpl.cs b/src/MongoDB.Driver/MongoCollectionImpl.cs
@@ -215,7 +215,7 @@ public override Task<IAsyncCursor<TProjection>> FindAsync<TProjection>(FilterDef
 
             var operation = new FindOperation<TProjection>(
                 _collectionNamespace,
-                renderedProjection.ResultSerializer,
+                renderedProjection.ProjectionSerializer,
                 _messageEncoderSettings)
             {
                 AllowPartialResults = options.AllowPartialResults,
@@ -246,7 +246,7 @@ public override Task<TProjection> FindOneAndDeleteAsync<TProjection>(FilterDefin
             var operation = new FindOneAndDeleteOperation<TProjection>(
                 _collectionNamespace,
                 filter.Render(_documentSerializer, _settings.SerializerRegistry),
-                new FindAndModifyValueDeserializer<TProjection>(renderedProjection.ResultSerializer),
+                new FindAndModifyValueDeserializer<TProjection>(renderedProjection.ProjectionSerializer),
                 _messageEncoderSettings)
             {
                 MaxTime = options.MaxTime,
@@ -271,7 +271,7 @@ public override Task<TProjection> FindOneAndReplaceAsync<TProjection>(FilterDefi
                 _collectionNamespace,
                 filter.Render(_documentSerializer, _settings.SerializerRegistry),
                 new BsonDocumentWrapper(replacementObject, _documentSerializer),
-                new FindAndModifyValueDeserializer<TProjection>(renderedProjection.ResultSerializer),
+                new FindAndModifyValueDeserializer<TProjection>(renderedProjection.ProjectionSerializer),
                 _messageEncoderSettings)
             {
                 IsUpsert = options.IsUpsert,
@@ -297,7 +297,7 @@ public override Task<TProjection> FindOneAndUpdateAsync<TProjection>(FilterDefin
                 _collectionNamespace,
                 filter.Render(_documentSerializer, _settings.SerializerRegistry),
                 update.Render(_documentSerializer, _settings.SerializerRegistry),
-                new FindAndModifyValueDeserializer<TProjection>(renderedProjection.ResultSerializer),
+                new FindAndModifyValueDeserializer<TProjection>(renderedProjection.ProjectionSerializer),
                 _messageEncoderSettings)
             {
                 IsUpsert = options.IsUpsert,
diff --git a/src/MongoDB.Driver/ProjectionDefinition.cs b/src/MongoDB.Driver/ProjectionDefinition.cs

Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,7 @@ private async Task<ProjectedResult<TResult>> Group<TKey, TResult>(Expression<Fun`
`295`	`295`	`var projectionInfo = AggregateProjectionTranslator.TranslateGroup<TKey, Root, TResult>(idProjector, groupProjector, serializer, BsonSerializer.SerializerRegistry);`
`296`	`296`
`297`	`297`	`var pipelineOperator = new BsonDocument("$group", projectionInfo.Document);`
`298`		`- using (var cursor = await _collection.AggregateAsync<TResult>(new PipelineStagePipelineDefinition<Root, TResult>(new PipelineStageDefinition<Root, TResult>[] { pipelineOperator }, projectionInfo.ResultSerializer)))`
	`298`	`+ using (var cursor = await _collection.AggregateAsync<TResult>(new PipelineStagePipelineDefinition<Root, TResult>(new PipelineStageDefinition<Root, TResult>[] { pipelineOperator }, projectionInfo.ProjectionSerializer)))`
`299`	`299`	`{`
`300`	`300`	`var list = await cursor.ToListAsync();`
`301`	`301`	`return new ProjectedResult<TResult>`
Original file line number	Diff line number	Diff line change
`@@ -759,7 +759,7 @@ private async Task<ProjectedResult<TResult>> Project<TResult>(Expression<Func<Ro`
`759`	`759`	`var projectionInfo = AggregateProjectionTranslator.TranslateProject<Root, TResult>(projector, serializer, BsonSerializer.SerializerRegistry);`
`760`	`760`
`761`	`761`	`var pipelineOperator = new BsonDocument("$project", projectionInfo.Document);`
`762`		`- using (var cursor = await _collection.AggregateAsync<TResult>(new PipelineStagePipelineDefinition<Root, TResult>(new PipelineStageDefinition<Root, TResult>[] { pipelineOperator }, projectionInfo.ResultSerializer)))`
	`762`	`+ using (var cursor = await _collection.AggregateAsync<TResult>(new PipelineStagePipelineDefinition<Root, TResult>(new PipelineStageDefinition<Root, TResult>[] { pipelineOperator }, projectionInfo.ProjectionSerializer)))`
`763`	`763`	`{`
`764`	`764`	`var list = await cursor.ToListAsync();`
`765`	`765`	`return new ProjectedResult<TResult>`
Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ private ProjectedResult<T> Project<T>(Expression<Func<Root, T>> projector, strin`
`246`	`246`	`return new ProjectedResult<T>`
`247`	`247`	`{`
`248`	`248`	`Projection = projectionInfo.Document,`
`249`		`- Value = projectionInfo.ResultSerializer.Deserialize(context)`
	`249`	`+ Value = projectionInfo.ProjectionSerializer.Deserialize(context)`
`250`	`250`	`};`
`251`	`251`	`}`
`252`	`252`	`}`