Skip to content

Commit ef7a962

Browse files
papafepapafe
committed
Small fixes
1 parent a641602 commit ef7a962

File tree

7 files changed

+18
-20
lines changed

7 files changed

+18
-20
lines changed

‎src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MethodTranslators/PickMethodToAggregationExpressionTranslator.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,8 +293,7 @@ private static AstSortFields TranslateSortByDefinitionGeneric<TDocument>(
293293
SortDefinition<TDocument> sortByDefinition,
294294
IBsonSerializer<TDocument> documentSerializer)
295295
{
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));
298297
var fields = new List<AstSortField>();
299298
foreach (var element in sortDocument)
300299
{

‎src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MethodTranslators/WindowMethodToAggregationExpressionTranslator.cs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -460,15 +460,14 @@ private static AstWindow TranslateWindow(TranslationContext context, Expression
460460
{
461461
var windowConstant = windowExpression.GetConstantValue<SetWindowFieldsWindow>(expression);
462462
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);
465464
}
466465

467466
private static AstWindow ToAstWindow(
468467
SetWindowFieldsWindow window,
469468
object sortBy,
470469
IBsonSerializer inputSerializer,
471-
BsonSerializerRegistry serializerRegistry,
470+
IBsonSerializationDomain serializationDomain,
472471
ExpressionTranslationOptions translationOptions)
473472
{
474473
if (window == null)
@@ -495,7 +494,7 @@ private static AstWindow ToAstWindow(
495494
IBsonSerializer upperBoundaryValueSerializer = null;
496495
if (lowerValueBoundary != null || upperValueBoundary != null)
497496
{
498-
var sortBySerializer = GetSortBySerializer(sortBy, inputSerializer, serializerRegistry, translationOptions);
497+
var sortBySerializer = GetSortBySerializer(sortBy, inputSerializer, serializationDomain, translationOptions);
499498
if (lowerValueBoundary != null)
500499
{
501500
lowerBoundaryValueSerializer = ValueRangeWindowBoundaryConvertingValueSerializerFactory.Create(lowerValueBoundary, sortBySerializer);
@@ -522,7 +521,7 @@ private static AstWindow ToAstWindow(
522521
private static IBsonSerializer GetSortBySerializer(
523522
object sortBy,
524523
IBsonSerializer inputSerializer,
525-
BsonSerializerRegistry serializerRegistry,
524+
IBsonSerializationDomain serializationDomain,
526525
ExpressionTranslationOptions translationOptions)
527526
{
528527
Ensure.IsNotNull(sortBy, nameof(sortBy));
@@ -534,13 +533,13 @@ private static IBsonSerializer GetSortBySerializer(
534533
nameof(GetSortBySerializerGeneric),
535534
BindingFlags.NonPublic | BindingFlags.Static);
536535
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 });
538537
}
539538

540539
private static IBsonSerializer GetSortBySerializerGeneric<TDocument>(
541540
SortDefinition<TDocument> sortBy,
542541
IBsonSerializer<TDocument> documentSerializer,
543-
BsonSerializerRegistry serializerRegistry,
542+
IBsonSerializationDomain serializationDomain,
544543
ExpressionTranslationOptions translationOptions)
545544
{
546545
var directionalSortBy = sortBy as DirectionalSortDefinition<TDocument>;
@@ -554,7 +553,7 @@ private static IBsonSerializer GetSortBySerializerGeneric<TDocument>(
554553
}
555554

556555
var field = directionalSortBy.Field;
557-
var renderedField = field.Render(new(documentSerializer, serializerRegistry, translationOptions: translationOptions));
556+
var renderedField = field.Render(new(documentSerializer, serializationDomain, translationOptions: translationOptions));
558557

559558
return renderedField.FieldSerializer;
560559
}

‎src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToFilterTranslators/MethodTranslators/InjectMethodToFilterTranslator.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public static AstFilter Translate(TranslationContext context, MethodCallExpressi
6161
var serializerRegistry = BsonSerializer.SerializerRegistry;
6262

6363
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 });
6565

6666
return AstFilter.Raw(renderedFilter);
6767
}
@@ -73,8 +73,8 @@ public static AstFilter Translate(TranslationContext context, MethodCallExpressi
7373
private static BsonDocument RenderFilter<TDocument>(
7474
FilterDefinition<TDocument> filterDefinition,
7575
IBsonSerializer<TDocument> documentSerializer,
76-
IBsonSerializerRegistry serializerRegistry,
76+
IBsonSerializationDomain serializationDomain,
7777
ExpressionTranslationOptions translationOptions) =>
78-
filterDefinition.Render(new(documentSerializer, serializerRegistry, translationOptions: translationOptions));
78+
filterDefinition.Render(new(documentSerializer, serializationDomain, translationOptions: translationOptions));
7979
}
8080
}

‎src/MongoDB.Driver/MongoClient.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ private ListDatabasesOperation CreateListDatabasesOperation(ListDatabasesOptions
535535
{
536536
AuthorizedDatabases = options.AuthorizedDatabases,
537537
Comment = options.Comment,
538-
Filter = options.Filter?.Render(new(BsonDocumentSerializer.Instance, BsonSerializer.SerializerRegistry, translationOptions: translationOptions)),
538+
Filter = options.Filter?.Render(new(BsonDocumentSerializer.Instance, _settings.SerializationDomain, translationOptions: translationOptions)),
539539
NameOnly = options.NameOnly,
540540
RetryRequested = _settings.RetryReads
541541
};
@@ -594,7 +594,7 @@ private RenderArgs<BsonDocument> GetRenderArgs()
594594
{
595595
var translationOptions = Settings.TranslationOptions;
596596
var serializerRegistry = BsonSerializer.SerializerRegistry;
597-
return new RenderArgs<BsonDocument>(BsonDocumentSerializer.Instance, serializerRegistry, translationOptions: translationOptions);
597+
return new RenderArgs<BsonDocument>(BsonDocumentSerializer.Instance, _settings.SerializationDomain, translationOptions: translationOptions);
598598
}
599599

600600
private IClientSessionHandle StartSession(ClientSessionOptions options)

‎src/MongoDB.Driver/MongoCollectionImpl.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1291,13 +1291,13 @@ private IBsonSerializer<TItem> GetItemSerializerForDistinctMany<TItem>(RenderedF
12911291
private RenderArgs<TDocument> GetRenderArgs()
12921292
{
12931293
var translationOptions = _database.Client.Settings.TranslationOptions;
1294-
return new RenderArgs<TDocument>(_documentSerializer, _settings.SerializerRegistry, translationOptions: translationOptions);
1294+
return new RenderArgs<TDocument>(_documentSerializer, _settings.SerializationDomain, translationOptions: translationOptions);
12951295
}
12961296

12971297
private RenderArgs<TDocument> GetRenderArgs(ExpressionTranslationOptions translationOptions)
12981298
{
12991299
translationOptions = translationOptions.AddMissingOptionsFrom(_database.Client.Settings.TranslationOptions);
1300-
return new RenderArgs<TDocument>(_documentSerializer, _settings.SerializerRegistry, translationOptions: translationOptions);
1300+
return new RenderArgs<TDocument>(_documentSerializer, _settings.SerializationDomain, translationOptions: translationOptions);
13011301
}
13021302

13031303
private IEnumerable<BsonDocument> RenderArrayFilters(IEnumerable<ArrayFilterDefinition> arrayFilters)

‎src/MongoDB.Driver/MongoDatabase.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -828,13 +828,13 @@ private MessageEncoderSettings GetMessageEncoderSettings()
828828
private RenderArgs<TDocument> GetRenderArgs<TDocument>(IBsonSerializer<TDocument> documentSerializer)
829829
{
830830
var translationOptions = _client.Settings.TranslationOptions;
831-
return new RenderArgs<TDocument>(documentSerializer, _settings.SerializerRegistry, translationOptions: translationOptions);
831+
return new RenderArgs<TDocument>(documentSerializer, _settings.SerializationDomain, translationOptions: translationOptions);
832832
}
833833

834834
private RenderArgs<TDocument> GetRenderArgs<TDocument>(IBsonSerializer<TDocument> documentSerializer, ExpressionTranslationOptions translationOptions)
835835
{
836836
translationOptions = translationOptions.AddMissingOptionsFrom(_client.Settings.TranslationOptions);
837-
return new RenderArgs<TDocument>(documentSerializer, _settings.SerializerRegistry, translationOptions: translationOptions);
837+
return new RenderArgs<TDocument>(documentSerializer, _settings.SerializationDomain, translationOptions: translationOptions);
838838
}
839839
}
840840
}

‎src/MongoDB.Driver/RenderArgs.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public RenderArgs(
7878
/// <param name="renderForElemMatch">Value that specifies whether rendering an $elemMatch.</param>
7979
/// <param name="translationOptions">The translation options.</param>
8080
/// <param name="serializationDomain">//TODO</param>
81-
public RenderArgs(
81+
internal RenderArgs(
8282
IBsonSerializer<TDocument> documentSerializer,
8383
IBsonSerializationDomain serializationDomain,
8484
PathRenderArgs pathRenderArgs = default,

0 commit comments

Comments
 (0)