Small fixes

papafe · papafe · commit 5f954c67513b · 2025-06-13T15:04:56.000+02:00
diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MethodTranslators/PickMethodToAggregationExpressionTranslator.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MethodTranslators/PickMethodToAggregationExpressionTranslator.cs
@@ -293,8 +293,7 @@ private static AstSortFields TranslateSortByDefinitionGeneric<TDocument>(
             SortDefinition<TDocument> sortByDefinition,
             IBsonSerializer<TDocument> documentSerializer)
         {
-            var serializerRegistry = context.SerializationDomain.SerializerRegistry;
-            var sortDocument = sortByDefinition.Render(new(documentSerializer, serializerRegistry, translationOptions: context.TranslationOptions));
+            var sortDocument = sortByDefinition.Render(new(documentSerializer, context.SerializationDomain, translationOptions: context.TranslationOptions));
             var fields = new List<AstSortField>();
             foreach (var element in sortDocument)
             {
diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MethodTranslators/WindowMethodToAggregationExpressionTranslator.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MethodTranslators/WindowMethodToAggregationExpressionTranslator.cs
@@ -460,15 +460,14 @@ private static AstWindow TranslateWindow(TranslationContext context, Expression
         {
             var windowConstant = windowExpression.GetConstantValue<SetWindowFieldsWindow>(expression);
             var sortBy = context.Data?.GetValueOrDefault<object>("SortBy", null);
-            var serializerRegistry = context.Data?.GetValueOrDefault<BsonSerializerRegistry>("SerializerRegistry", null);
-            return ToAstWindow(windowConstant, sortBy, inputSerializer, serializerRegistry, context.TranslationOptions);
+            return ToAstWindow(windowConstant, sortBy, inputSerializer, context.SerializationDomain, context.TranslationOptions);
         }
 
         private static AstWindow ToAstWindow(
             SetWindowFieldsWindow window,
             object sortBy,
             IBsonSerializer inputSerializer,
-            BsonSerializerRegistry serializerRegistry,
+            IBsonSerializationDomain serializationDomain,
             ExpressionTranslationOptions translationOptions)
         {
             if (window == null)
@@ -495,7 +494,7 @@ private static AstWindow ToAstWindow(
                 IBsonSerializer upperBoundaryValueSerializer = null;
                 if (lowerValueBoundary != null || upperValueBoundary != null)
                 {
-                    var sortBySerializer = GetSortBySerializer(sortBy, inputSerializer, serializerRegistry, translationOptions);
+                    var sortBySerializer = GetSortBySerializer(sortBy, inputSerializer, serializationDomain, translationOptions);
                     if (lowerValueBoundary != null)
                     {
                         lowerBoundaryValueSerializer = ValueRangeWindowBoundaryConvertingValueSerializerFactory.Create(lowerValueBoundary, sortBySerializer);
@@ -522,7 +521,7 @@ private static AstWindow ToAstWindow(
         private static IBsonSerializer GetSortBySerializer(
             object sortBy,
             IBsonSerializer inputSerializer,
-            BsonSerializerRegistry serializerRegistry,
+            IBsonSerializationDomain serializationDomain,
             ExpressionTranslationOptions translationOptions)
         {
             Ensure.IsNotNull(sortBy, nameof(sortBy));
@@ -534,13 +533,13 @@ private static IBsonSerializer GetSortBySerializer(
                 nameof(GetSortBySerializerGeneric),
                 BindingFlags.NonPublic | BindingFlags.Static);
             var methodInfo = methodInfoDefinition.MakeGenericMethod(documentType);
-            return (IBsonSerializer)methodInfo.Invoke(null, new object[] { sortBy, inputSerializer, serializerRegistry, translationOptions });
+            return (IBsonSerializer)methodInfo.Invoke(null, new object[] { sortBy, inputSerializer, serializationDomain, translationOptions });
         }
 
         private static IBsonSerializer GetSortBySerializerGeneric<TDocument>(
             SortDefinition<TDocument> sortBy,
             IBsonSerializer<TDocument> documentSerializer,
-            BsonSerializerRegistry serializerRegistry,
+            IBsonSerializationDomain serializationDomain,
             ExpressionTranslationOptions translationOptions)
         {
             var directionalSortBy = sortBy as DirectionalSortDefinition<TDocument>;
@@ -554,7 +553,7 @@ private static IBsonSerializer GetSortBySerializerGeneric<TDocument>(
             }
 
             var field = directionalSortBy.Field;
-            var renderedField = field.Render(new(documentSerializer, serializerRegistry, translationOptions: translationOptions));
+            var renderedField = field.Render(new(documentSerializer, serializationDomain, translationOptions: translationOptions));
 
             return renderedField.FieldSerializer;
         }
diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToFilterTranslators/MethodTranslators/InjectMethodToFilterTranslator.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToFilterTranslators/MethodTranslators/InjectMethodToFilterTranslator.cs
@@ -61,7 +61,7 @@ public static AstFilter Translate(TranslationContext context, MethodCallExpressi
                 var serializerRegistry = BsonSerializer.SerializerRegistry;
 
                 var renderFilterMethod = __renderFilterMethodInfo.MakeGenericMethod(filterDefinitionDocumentType);
-                var renderedFilter = (BsonDocument)renderFilterMethod.Invoke(null, new[] { filterDefinition, documentSerializer, serializerRegistry, context.TranslationOptions });
+                var renderedFilter = (BsonDocument)renderFilterMethod.Invoke(null, new[] { filterDefinition, documentSerializer, context.SerializationDomain, context.TranslationOptions });
 
                 return AstFilter.Raw(renderedFilter);
             }
@@ -73,8 +73,8 @@ public static AstFilter Translate(TranslationContext context, MethodCallExpressi
         private static BsonDocument RenderFilter<TDocument>(
             FilterDefinition<TDocument> filterDefinition,
             IBsonSerializer<TDocument> documentSerializer,
-            IBsonSerializerRegistry serializerRegistry,
+            IBsonSerializationDomain serializationDomain,
             ExpressionTranslationOptions translationOptions) =>
-                filterDefinition.Render(new(documentSerializer, serializerRegistry, translationOptions: translationOptions));
+                filterDefinition.Render(new(documentSerializer, serializationDomain, translationOptions: translationOptions));
     }
 }
diff --git a/src/MongoDB.Driver/MongoClient.cs b/src/MongoDB.Driver/MongoClient.cs
@@ -593,7 +593,7 @@ private ListDatabasesOperation CreateListDatabaseOperation(
             {
                 AuthorizedDatabases = options.AuthorizedDatabases,
                 Comment = options.Comment,
-                Filter = options.Filter?.Render(new(BsonDocumentSerializer.Instance, BsonSerializer.SerializerRegistry, translationOptions: translationOptions)),
+                Filter = options.Filter?.Render(new(BsonDocumentSerializer.Instance, _settings.SerializationDomain, translationOptions: translationOptions)),
                 NameOnly = options.NameOnly,
                 RetryRequested = _settings.RetryReads
             };
@@ -693,7 +693,7 @@ private RenderArgs<BsonDocument> GetRenderArgs()
         {
             var translationOptions = Settings.TranslationOptions;
             var serializerRegistry = BsonSerializer.SerializerRegistry;
-            return new RenderArgs<BsonDocument>(BsonDocumentSerializer.Instance, serializerRegistry, translationOptions: translationOptions);
+            return new RenderArgs<BsonDocument>(BsonDocumentSerializer.Instance, _settings.SerializationDomain, translationOptions: translationOptions);
         }
 
         private IClientSessionHandle StartImplicitSession()
diff --git a/src/MongoDB.Driver/MongoCollectionImpl.cs b/src/MongoDB.Driver/MongoCollectionImpl.cs
@@ -1381,13 +1381,13 @@ private IBsonSerializer<TItem> GetItemSerializerForDistinctMany<TItem>(RenderedF
         private RenderArgs<TDocument> GetRenderArgs()
         {
             var translationOptions = _database.Client.Settings.TranslationOptions;
-            return new RenderArgs<TDocument>(_documentSerializer, _settings.SerializerRegistry, translationOptions: translationOptions);
+            return new RenderArgs<TDocument>(_documentSerializer, _settings.SerializationDomain, translationOptions: translationOptions);
         }
 
         private RenderArgs<TDocument> GetRenderArgs(ExpressionTranslationOptions translationOptions)
         {
             translationOptions = translationOptions.AddMissingOptionsFrom(_database.Client.Settings.TranslationOptions);
-            return new RenderArgs<TDocument>(_documentSerializer, _settings.SerializerRegistry, translationOptions: translationOptions);
+            return new RenderArgs<TDocument>(_documentSerializer, _settings.SerializationDomain, translationOptions: translationOptions);
         }
 
         private TResult ExecuteReadOperation<TResult>(IClientSessionHandle session, IReadOperation<TResult> operation, CancellationToken cancellationToken = default(CancellationToken))
diff --git a/src/MongoDB.Driver/MongoDatabase.cs b/src/MongoDB.Driver/MongoDatabase.cs
@@ -924,13 +924,13 @@ private MessageEncoderSettings GetMessageEncoderSettings()
         private RenderArgs<TDocument> GetRenderArgs<TDocument>(IBsonSerializer<TDocument> documentSerializer)
         {
             var translationOptions = _client.Settings.TranslationOptions;
-            return new RenderArgs<TDocument>(documentSerializer, _settings.SerializerRegistry, translationOptions: translationOptions);
+            return new RenderArgs<TDocument>(documentSerializer, _settings.SerializationDomain, translationOptions: translationOptions);
         }
 
         private RenderArgs<TDocument> GetRenderArgs<TDocument>(IBsonSerializer<TDocument> documentSerializer, ExpressionTranslationOptions translationOptions)
         {
             translationOptions = translationOptions.AddMissingOptionsFrom(_client.Settings.TranslationOptions);
-            return new RenderArgs<TDocument>(documentSerializer, _settings.SerializerRegistry, translationOptions: translationOptions);
+            return new RenderArgs<TDocument>(documentSerializer, _settings.SerializationDomain, translationOptions: translationOptions);
         }
 
         private void UsingImplicitSession(Action<IClientSessionHandle> func, CancellationToken cancellationToken)
diff --git a/src/MongoDB.Driver/RenderArgs.cs b/src/MongoDB.Driver/RenderArgs.cs
@@ -78,7 +78,7 @@ public RenderArgs(
         /// <param name="renderForElemMatch">Value that specifies whether rendering an $elemMatch.</param>
         /// <param name="translationOptions">The translation options.</param>
         /// <param name="serializationDomain">//TODO</param>
-        public RenderArgs(
+        internal RenderArgs(
             IBsonSerializer<TDocument> documentSerializer,
             IBsonSerializationDomain serializationDomain,
             PathRenderArgs pathRenderArgs = default,

Original file line number	Diff line number	Diff line change
`@@ -293,8 +293,7 @@ private static AstSortFields TranslateSortByDefinitionGeneric<TDocument>(`
`293`	`293`	`SortDefinition<TDocument> sortByDefinition,`
`294`	`294`	`IBsonSerializer<TDocument> documentSerializer)`
`295`	`295`	`{`
`296`		`- var serializerRegistry = context.SerializationDomain.SerializerRegistry;`
`297`		`- var sortDocument = sortByDefinition.Render(new(documentSerializer, serializerRegistry, translationOptions: context.TranslationOptions));`
	`296`	`+ var sortDocument = sortByDefinition.Render(new(documentSerializer, context.SerializationDomain, translationOptions: context.TranslationOptions));`
`298`	`297`	`var fields = new List<AstSortField>();`
`299`	`298`	`foreach (var element in sortDocument)`
`300`	`299`	`{`
Original file line number	Diff line number	Diff line change
`@@ -460,15 +460,14 @@ private static AstWindow TranslateWindow(TranslationContext context, Expression`
`460`	`460`	`{`
`461`	`461`	`var windowConstant = windowExpression.GetConstantValue<SetWindowFieldsWindow>(expression);`
`462`	`462`	`var sortBy = context.Data?.GetValueOrDefault<object>("SortBy", null);`
`463`		`- var serializerRegistry = context.Data?.GetValueOrDefault<BsonSerializerRegistry>("SerializerRegistry", null);`
`464`		`- return ToAstWindow(windowConstant, sortBy, inputSerializer, serializerRegistry, context.TranslationOptions);`
	`463`	`+ return ToAstWindow(windowConstant, sortBy, inputSerializer, context.SerializationDomain, context.TranslationOptions);`
`465`	`464`	`}`
`466`	`465`
`467`	`466`	`private static AstWindow ToAstWindow(`
`468`	`467`	`SetWindowFieldsWindow window,`
`469`	`468`	`object sortBy,`
`470`	`469`	`IBsonSerializer inputSerializer,`
`471`		`- BsonSerializerRegistry serializerRegistry,`
	`470`	`+ IBsonSerializationDomain serializationDomain,`
`472`	`471`	`ExpressionTranslationOptions translationOptions)`
`473`	`472`	`{`
`474`	`473`	`if (window == null)`
`@@ -495,7 +494,7 @@ private static AstWindow ToAstWindow(`
`495`	`494`	`IBsonSerializer upperBoundaryValueSerializer = null;`
`496`	`495`	`if (lowerValueBoundary != null \|\| upperValueBoundary != null)`
`497`	`496`	`{`
`498`		`- var sortBySerializer = GetSortBySerializer(sortBy, inputSerializer, serializerRegistry, translationOptions);`
	`497`	`+ var sortBySerializer = GetSortBySerializer(sortBy, inputSerializer, serializationDomain, translationOptions);`
`499`	`498`	`if (lowerValueBoundary != null)`
`500`	`499`	`{`
`501`	`500`	`lowerBoundaryValueSerializer = ValueRangeWindowBoundaryConvertingValueSerializerFactory.Create(lowerValueBoundary, sortBySerializer);`
`@@ -522,7 +521,7 @@ private static AstWindow ToAstWindow(`
`522`	`521`	`private static IBsonSerializer GetSortBySerializer(`
`523`	`522`	`object sortBy,`
`524`	`523`	`IBsonSerializer inputSerializer,`
`525`		`- BsonSerializerRegistry serializerRegistry,`
	`524`	`+ IBsonSerializationDomain serializationDomain,`
`526`	`525`	`ExpressionTranslationOptions translationOptions)`
`527`	`526`	`{`
`528`	`527`	`Ensure.IsNotNull(sortBy, nameof(sortBy));`
`@@ -534,13 +533,13 @@ private static IBsonSerializer GetSortBySerializer(`
`534`	`533`	`nameof(GetSortBySerializerGeneric),`
`535`	`534`	`BindingFlags.NonPublic \| BindingFlags.Static);`
`536`	`535`	`var methodInfo = methodInfoDefinition.MakeGenericMethod(documentType);`
`537`		`- return (IBsonSerializer)methodInfo.Invoke(null, new object[] { sortBy, inputSerializer, serializerRegistry, translationOptions });`
	`536`	`+ return (IBsonSerializer)methodInfo.Invoke(null, new object[] { sortBy, inputSerializer, serializationDomain, translationOptions });`
`538`	`537`	`}`
`539`	`538`
`540`	`539`	`private static IBsonSerializer GetSortBySerializerGeneric<TDocument>(`
`541`	`540`	`SortDefinition<TDocument> sortBy,`
`542`	`541`	`IBsonSerializer<TDocument> documentSerializer,`
`543`		`- BsonSerializerRegistry serializerRegistry,`
	`542`	`+ IBsonSerializationDomain serializationDomain,`
`544`	`543`	`ExpressionTranslationOptions translationOptions)`
`545`	`544`	`{`
`546`	`545`	`var directionalSortBy = sortBy as DirectionalSortDefinition<TDocument>;`
`@@ -554,7 +553,7 @@ private static IBsonSerializer GetSortBySerializerGeneric<TDocument>(`
`554`	`553`	`}`
`555`	`554`
`556`	`555`	`var field = directionalSortBy.Field;`
`557`		`- var renderedField = field.Render(new(documentSerializer, serializerRegistry, translationOptions: translationOptions));`
	`556`	`+ var renderedField = field.Render(new(documentSerializer, serializationDomain, translationOptions: translationOptions));`
`558`	`557`
`559`	`558`	`return renderedField.FieldSerializer;`
`560`	`559`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public static AstFilter Translate(TranslationContext context, MethodCallExpressi`
`61`	`61`	`var serializerRegistry = BsonSerializer.SerializerRegistry;`
`62`	`62`
`63`	`63`	`var renderFilterMethod = __renderFilterMethodInfo.MakeGenericMethod(filterDefinitionDocumentType);`
`64`		`- var renderedFilter = (BsonDocument)renderFilterMethod.Invoke(null, new[] { filterDefinition, documentSerializer, serializerRegistry, context.TranslationOptions });`
	`64`	`+ var renderedFilter = (BsonDocument)renderFilterMethod.Invoke(null, new[] { filterDefinition, documentSerializer, context.SerializationDomain, context.TranslationOptions });`
`65`	`65`
`66`	`66`	`return AstFilter.Raw(renderedFilter);`
`67`	`67`	`}`
`@@ -73,8 +73,8 @@ public static AstFilter Translate(TranslationContext context, MethodCallExpressi`
`73`	`73`	`private static BsonDocument RenderFilter<TDocument>(`
`74`	`74`	`FilterDefinition<TDocument> filterDefinition,`
`75`	`75`	`IBsonSerializer<TDocument> documentSerializer,`
`76`		`- IBsonSerializerRegistry serializerRegistry,`
	`76`	`+ IBsonSerializationDomain serializationDomain,`
`77`	`77`	`ExpressionTranslationOptions translationOptions) =>`
`78`		`- filterDefinition.Render(new(documentSerializer, serializerRegistry, translationOptions: translationOptions));`
	`78`	`+ filterDefinition.Render(new(documentSerializer, serializationDomain, translationOptions: translationOptions));`
`79`	`79`	`}`
`80`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -593,7 +593,7 @@ private ListDatabasesOperation CreateListDatabaseOperation(`
`593`	`593`	`{`
`594`	`594`	`AuthorizedDatabases = options.AuthorizedDatabases,`
`595`	`595`	`Comment = options.Comment,`
`596`		`- Filter = options.Filter?.Render(new(BsonDocumentSerializer.Instance, BsonSerializer.SerializerRegistry, translationOptions: translationOptions)),`
	`596`	`+ Filter = options.Filter?.Render(new(BsonDocumentSerializer.Instance, _settings.SerializationDomain, translationOptions: translationOptions)),`
`597`	`597`	`NameOnly = options.NameOnly,`
`598`	`598`	`RetryRequested = _settings.RetryReads`
`599`	`599`	`};`
`@@ -693,7 +693,7 @@ private RenderArgs<BsonDocument> GetRenderArgs()`
`693`	`693`	`{`
`694`	`694`	`var translationOptions = Settings.TranslationOptions;`
`695`	`695`	`var serializerRegistry = BsonSerializer.SerializerRegistry;`
`696`		`- return new RenderArgs<BsonDocument>(BsonDocumentSerializer.Instance, serializerRegistry, translationOptions: translationOptions);`
	`696`	`+ return new RenderArgs<BsonDocument>(BsonDocumentSerializer.Instance, _settings.SerializationDomain, translationOptions: translationOptions);`
`697`	`697`	`}`
`698`	`698`
`699`	`699`	`private IClientSessionHandle StartImplicitSession()`
Original file line number	Diff line number	Diff line change
`@@ -1381,13 +1381,13 @@ private IBsonSerializer<TItem> GetItemSerializerForDistinctMany<TItem>(RenderedF`
`1381`	`1381`	`private RenderArgs<TDocument> GetRenderArgs()`
`1382`	`1382`	`{`
`1383`	`1383`	`var translationOptions = _database.Client.Settings.TranslationOptions;`
`1384`		`- return new RenderArgs<TDocument>(_documentSerializer, _settings.SerializerRegistry, translationOptions: translationOptions);`
	`1384`	`+ return new RenderArgs<TDocument>(_documentSerializer, _settings.SerializationDomain, translationOptions: translationOptions);`
`1385`	`1385`	`}`
`1386`	`1386`
`1387`	`1387`	`private RenderArgs<TDocument> GetRenderArgs(ExpressionTranslationOptions translationOptions)`
`1388`	`1388`	`{`
`1389`	`1389`	`translationOptions = translationOptions.AddMissingOptionsFrom(_database.Client.Settings.TranslationOptions);`
`1390`		`- return new RenderArgs<TDocument>(_documentSerializer, _settings.SerializerRegistry, translationOptions: translationOptions);`
	`1390`	`+ return new RenderArgs<TDocument>(_documentSerializer, _settings.SerializationDomain, translationOptions: translationOptions);`
`1391`	`1391`	`}`
`1392`	`1392`
`1393`	`1393`	`private TResult ExecuteReadOperation<TResult>(IClientSessionHandle session, IReadOperation<TResult> operation, CancellationToken cancellationToken = default(CancellationToken))`
Original file line number	Diff line number	Diff line change
`@@ -924,13 +924,13 @@ private MessageEncoderSettings GetMessageEncoderSettings()`
`924`	`924`	`private RenderArgs<TDocument> GetRenderArgs<TDocument>(IBsonSerializer<TDocument> documentSerializer)`
`925`	`925`	`{`
`926`	`926`	`var translationOptions = _client.Settings.TranslationOptions;`
`927`		`- return new RenderArgs<TDocument>(documentSerializer, _settings.SerializerRegistry, translationOptions: translationOptions);`
	`927`	`+ return new RenderArgs<TDocument>(documentSerializer, _settings.SerializationDomain, translationOptions: translationOptions);`
`928`	`928`	`}`
`929`	`929`
`930`	`930`	`private RenderArgs<TDocument> GetRenderArgs<TDocument>(IBsonSerializer<TDocument> documentSerializer, ExpressionTranslationOptions translationOptions)`
`931`	`931`	`{`
`932`	`932`	`translationOptions = translationOptions.AddMissingOptionsFrom(_client.Settings.TranslationOptions);`
`933`		`- return new RenderArgs<TDocument>(documentSerializer, _settings.SerializerRegistry, translationOptions: translationOptions);`
	`933`	`+ return new RenderArgs<TDocument>(documentSerializer, _settings.SerializationDomain, translationOptions: translationOptions);`
`934`	`934`	`}`
`935`	`935`
`936`	`936`	`private void UsingImplicitSession(Action<IClientSessionHandle> func, CancellationToken cancellationToken)`