CSHARP-4955: Add Render overload with RenderArgs (#1278)

* CSHARP-4955: Add Render overload with RenderArgs
mongodb · Jul 24, 2024 · 452b06f · 452b06f
1 parent 0d8134e
commit 452b06f
Show file tree

Hide file tree

Showing 118 changed files with 7,308 additions and 7,083 deletions.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -52,8 +52,12 @@
     </PackageReference>
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="..\MongoDB.Shared\IsExternalInit.cs" Visible="false" />
+  </ItemGroup>
+
   <ItemGroup>
     <None Include="..\..\packageIcon.png" Pack="true" PackagePath="" />
     <None Include="..\..\README.md" Pack="true" PackagePath=""/>
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/MongoDB.Driver.GridFS/GridFSBucket.cs b/src/MongoDB.Driver.GridFS/GridFSBucket.cs
@@ -628,8 +628,9 @@ private FindOperation<GridFSFileInfo<TFileId>> CreateFindOperation(FilterDefinit
             var filesCollectionNamespace = this.GetFilesCollectionNamespace();
             var messageEncoderSettings = this.GetMessageEncoderSettings();
             var linqProvider = _database.Client.Settings.LinqProvider;
-            var renderedFilter = filter.Render(_fileInfoSerializer, _options.SerializerRegistry, linqProvider);
-            var renderedSort = options.Sort == null ? null : options.Sort.Render(_fileInfoSerializer, _options.SerializerRegistry, linqProvider);
+            var args = new RenderArgs<GridFSFileInfo<TFileId>>(_fileInfoSerializer, _options.SerializerRegistry, linqProvider);
+            var renderedFilter = filter.Render(args);
+            var renderedSort = options.Sort == null ? null : options.Sort.Render(args);
 
             return new FindOperation<GridFSFileInfo<TFileId>>(
                 filesCollectionNamespace,

diff --git a/src/MongoDB.Driver.GridFS/GridFSBucketCompat.cs b/src/MongoDB.Driver.GridFS/GridFSBucketCompat.cs
@@ -13,7 +13,6 @@
 * limitations under the License.
 */
 
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -242,7 +241,7 @@ private IEnumerable<GridFSFileInfo> TransformFileInfos(IEnumerable<GridFSFileInf
         private FilterDefinition<GridFSFileInfo<ObjectId>> WrapFilter(FilterDefinition<GridFSFileInfo> filter)
         {
             var linqProvider = Database.Client.Settings.LinqProvider;
-            var renderedFilter = filter.Render(GridFSFileInfoSerializer.Instance, BsonSerializer.SerializerRegistry, linqProvider);
+            var renderedFilter = filter.Render(new(GridFSFileInfoSerializer.Instance, BsonSerializer.SerializerRegistry, linqProvider));
             return new BsonDocumentFilterDefinition<GridFSFileInfo<ObjectId>>(renderedFilter);
         }
 
@@ -251,7 +250,7 @@ private GridFSFindOptions<ObjectId> WrapFindOptions(GridFSFindOptions options)
             if (options != null)
             {
                 var linqProvider = Database.Client.Settings.LinqProvider;
-                var renderedSort = options.Sort == null ? null : options.Sort.Render(GridFSFileInfoSerializer.Instance, BsonSerializer.SerializerRegistry, linqProvider);
+                var renderedSort = options.Sort == null ? null : options.Sort.Render(new(GridFSFileInfoSerializer.Instance, BsonSerializer.SerializerRegistry, linqProvider));
                 var wrappedSort = renderedSort == null ? null : new BsonDocumentSortDefinition<GridFSFileInfo<ObjectId>>(renderedSort);
                 return new GridFSFindOptions<ObjectId>
                 {

diff --git a/src/MongoDB.Driver/AggregateExpressionDefinition.cs b/src/MongoDB.Driver/AggregateExpressionDefinition.cs
@@ -75,7 +75,18 @@ public static implicit operator AggregateExpressionDefinition<TSource, TResult>(
         /// <param name="serializerRegistry">The serializer registry.</param>
         /// <param name="linqProvider">The LINQ provider.</param>
         /// <returns>The rendered aggregation expression.</returns>
-        public abstract BsonValue Render(IBsonSerializer<TSource> sourceSerializer, IBsonSerializerRegistry serializerRegistry, LinqProvider linqProvider);
+        [Obsolete("Use Render(RenderArgs<TSource> args) overload instead.")]
+        public virtual BsonValue Render(IBsonSerializer<TSource> sourceSerializer, IBsonSerializerRegistry serializerRegistry, LinqProvider linqProvider)
+        {
+            return Render(new(sourceSerializer, serializerRegistry, linqProvider));
+        }
+
+        /// <summary>
+        /// Renders the aggregation expression to a <see cref="BsonValue"/>.
+        /// </summary>
+        /// <param name="args">The render arguments.</param>
+        /// <returns>A <see cref="BsonValue"/>.</returns>
+        public abstract BsonValue Render(RenderArgs<TSource> args);
     }
 
     /// <summary>
@@ -101,7 +112,7 @@ public BsonValueAggregateExpressionDefinition(BsonValue expression)
 
         // public methods
         /// <inheritdoc/>
-        public override BsonValue Render(IBsonSerializer<TSource> sourceSerializer, IBsonSerializerRegistry serializerRegistry, LinqProvider linqProvider)
+        public override BsonValue Render(RenderArgs<TSource> args)
         {
             return _expression;
         }
@@ -143,10 +154,10 @@ internal ExpressionAggregateExpressionDefinition(
 
         // public methods
         /// <inheritdoc/>
-        public override BsonValue Render(IBsonSerializer<TSource> sourceSerializer, IBsonSerializerRegistry serializerRegistry, LinqProvider linqProvider)
+        public override BsonValue Render(RenderArgs<TSource> args)
         {
-            var contextData = _contextData?.With("SerializerRegistry", serializerRegistry);
-            return linqProvider.GetAdapter().TranslateExpressionToAggregateExpression(_expression, sourceSerializer, serializerRegistry, _translationOptions, contextData);
+            var contextData = _contextData?.With("SerializerRegistry", args.SerializerRegistry);
+            return args.LinqProvider.GetAdapter().TranslateExpressionToAggregateExpression(_expression, args.DocumentSerializer, args.SerializerRegistry, _translationOptions, contextData);
         }
     }
 
@@ -177,9 +188,9 @@ public DocumentsAggregateExpressionDefinition(
 
         // public methods
         /// <inheritdoc/>
-        public override BsonValue Render(IBsonSerializer<NoPipelineInput> sourceSerializer, IBsonSerializerRegistry serializerRegistry, LinqProvider linqProvider)
+        public override BsonValue Render(RenderArgs<NoPipelineInput> args)
         {
-            var documentSerializer = _documentSerializer ?? serializerRegistry.GetSerializer<TDocument>();
+            var documentSerializer = _documentSerializer ?? args.SerializerRegistry.GetSerializer<TDocument>();
             return SerializationHelper.SerializeValues(documentSerializer, _documents);
         }
     }

diff --git a/src/MongoDB.Driver/AggregateFacet.cs b/src/MongoDB.Driver/AggregateFacet.cs
@@ -79,14 +79,25 @@ protected AggregateFacet(string name)
         /// <param name="serializerRegistry">The serializer registry.</param>
         /// <param name="linqProvider">The LINQ provider.</param>
         /// <returns>The rendered pipeline.</returns>
-        public abstract BsonArray RenderPipeline(IBsonSerializer<TInput> inputSerializer, IBsonSerializerRegistry serializerRegistry, LinqProvider linqProvider);
+        [Obsolete("Use Render(RenderArgs<TInput> args) overload instead.")]
+        public virtual BsonArray RenderPipeline(IBsonSerializer<TInput> inputSerializer, IBsonSerializerRegistry serializerRegistry, LinqProvider linqProvider)
+        {
+            return RenderPipeline(new(inputSerializer, serializerRegistry, linqProvider));
+        }
+
+        /// <summary>
+        /// Renders the facet pipeline.
+        /// </summary>
+        /// <param name="args">The render arguments.</param>
+        /// <returns>A <see cref="BsonValue"/>.</returns>
+        public abstract BsonArray RenderPipeline(RenderArgs<TInput> args);
     }
 
     /// <summary>
     /// Represents a facet to be passed to the Facet method.
     /// </summary>
     /// <typeparam name="TInput">The type of the input documents.</typeparam>
-    /// <typeparam name="TOutput">The type of the otuput documents.</typeparam>
+    /// <typeparam name="TOutput">The type of the output documents.</typeparam>
     public class AggregateFacet<TInput, TOutput> : AggregateFacet<TInput>
     {
         /// <summary>
@@ -112,9 +123,9 @@ public AggregateFacet(string name, PipelineDefinition<TInput, TOutput> pipeline)
         public PipelineDefinition<TInput, TOutput> Pipeline { get; private set; }
 
         /// <inheritdoc/>
-        public override BsonArray RenderPipeline(IBsonSerializer<TInput> inputSerializer, IBsonSerializerRegistry serializerRegistry, LinqProvider linqProvider)
+        public override BsonArray RenderPipeline(RenderArgs<TInput> args)
         {
-            var renderedPipeline = Pipeline.Render(inputSerializer, serializerRegistry, linqProvider);
+            var renderedPipeline = Pipeline.Render(args);
             return new BsonArray(renderedPipeline.Documents);
         }
     }