Improvements

Author: papafe

src/MongoDB.Bson/BsonDefaults.cs

@@ -43,10 +43,9 @@ public static IBsonSerializer DynamicDocumentSerializer
             set => BsonSerializer.DefaultSerializationDomain.BsonDefaults.DynamicDocumentSerializer = value;
         }
 
-        /* QUESTION How do we do with those two? I don't think I can remove references to them without breaking public API.
-         * We should modify the API to have those two values (in the writer/reader settings where they are used) be nullable.
+        /* DOMAIN-API We should modify the API to have those two values (and in the writer/reader settings where they are used) be nullable.
          * The problem is that we need to now when these values have been set externally or not. If they have not, then they should
-         * be retrieved from the closest domain. We could use a negative sentinel value for that, but that would not be the best.
+         * be retrieved from the closest domain.
          */
 
         /// <summary>

src/MongoDB.Driver/ClusteredIndexOptions.cs

@@ -64,6 +64,7 @@ public bool Unique
             set => _unique = value;
         }
 
+        //DOMAIN-API This version will need to go away.
         internal BsonDocument Render(IBsonSerializer<TDocument> documentSerializer, IBsonSerializerRegistry serializerRegistry, ExpressionTranslationOptions translationOptions)
         {
             return new BsonDocument {
@@ -72,5 +73,14 @@ internal BsonDocument Render(IBsonSerializer<TDocument> documentSerializer, IBso
                 { "name", _name, _name != null }
             };
         }
+
+        internal BsonDocument Render(IBsonSerializer<TDocument> documentSerializer, IBsonSerializationDomain serializationDomain, ExpressionTranslationOptions translationOptions)
+        {
+            return new BsonDocument {
+                { "key", _key.Render(new(documentSerializer, serializationDomain, translationOptions: translationOptions)) },
+                { "unique", _unique },
+                { "name", _name, _name != null }
+            };
+        }
     }
 }

src/MongoDB.Driver/Core/Operations/RetryableInsertCommandOperation.cs

@@ -139,7 +139,7 @@ public override void Serialize(BsonSerializationContext context, BsonSerializati
                 {
                     if (_cachedSerializer.ValueType != actualType)
                     {
-                        _cachedSerializer = BsonSerializer.LookupSerializer(actualType);  //FP This needs to go, need to access MongoDB.Bson internals to access domain
+                        _cachedSerializer = context.SerializationDomain.LookupSerializer(actualType);
                     }
                     serializer = _cachedSerializer;
                 }

src/MongoDB.Driver/Core/WireProtocol/Messages/Encoders/BinaryEncoders/ClientBulkWriteOpsSectionFormatter.cs

@@ -63,7 +63,7 @@ public void FormatSection(ClientBulkWriteOpsCommandMessageSection section, IBson
                 throw new ArgumentException("Writer must be an instance of BsonBinaryWriter.");
             }
 
-            _serializerRegistry = BsonSerializer.SerializerRegistry; //FP This needs to go, need to access MongoDB.Bson internals to access domain
+            _serializerRegistry = writer.Settings.SerializationDomain.SerializerRegistry;
             var serializationContext = BsonSerializationContext.CreateRoot(binaryWriter);
             _idsMap = section.IdsMap;
             var stream = binaryWriter.BsonStream;

src/MongoDB.Driver/CreateCollectionOptions.cs

@@ -38,6 +38,7 @@ public class CreateCollectionOptions
         private TimeSeriesOptions _timeSeriesOptions;
         private bool? _usePowerOf2Sizes;
         private IBsonSerializerRegistry _serializerRegistry;
+        private IBsonSerializationDomain _serializationDomain;
         private DocumentValidationAction? _validationAction;
         private DocumentValidationLevel? _validationLevel;
 
@@ -126,6 +127,8 @@ public bool? NoPadding
             set { _noPadding = value; }
         }
 
+        //DOMAIN-API We need to remove this, and have only the SerializationDomain property.
+        //We should also decide if we even need any of those two properties.
         /// <summary>
         /// Gets or sets the serializer registry.
         /// </summary>
@@ -135,6 +138,12 @@ public IBsonSerializerRegistry SerializerRegistry
             set { _serializerRegistry = value; }
         }
 
+        internal IBsonSerializationDomain SerializationDomain
+        {
+            get => _serializationDomain;
+            set => _serializationDomain = value;
+        }
+
         /// <summary>
         /// Gets or sets the storage engine options.
         /// </summary>
@@ -203,6 +212,7 @@ public virtual CreateCollectionOptions Clone() =>
                 _maxSize = _maxSize,
                 _noPadding = _noPadding,
                 _serializerRegistry = _serializerRegistry,
+                _serializationDomain = _serializationDomain,
                 _storageEngine = _storageEngine,
                 _timeSeriesOptions = _timeSeriesOptions,
                 _usePowerOf2Sizes = _usePowerOf2Sizes,
@@ -245,6 +255,7 @@ internal static CreateCollectionOptions<TDocument> CoercedFrom(CreateCollectionO
                     MaxSize = options.MaxSize,
                     NoPadding = options.NoPadding,
                     SerializerRegistry = options.SerializerRegistry,
+                    SerializationDomain = options.SerializationDomain,
                     StorageEngine = options.StorageEngine,
                     TimeSeriesOptions = options.TimeSeriesOptions,
                     UsePowerOf2Sizes = options.UsePowerOf2Sizes,

src/MongoDB.Driver/CreateViewOptions.cs

@@ -27,6 +27,7 @@ public class CreateViewOptions<TDocument>
         private Collation _collation;
         private IBsonSerializer<TDocument> _documentSerializer;
         private IBsonSerializerRegistry _serializerRegistry;
+        private IBsonSerializationDomain _serializationDomain;
 
         // properties
         /// <summary>
@@ -53,6 +54,8 @@ public IBsonSerializer<TDocument> DocumentSerializer
             set { _documentSerializer = value; }
         }
 
+        //DOMAIN-API We need to remove this, and have only the SerializationDomain property.
+        //We should also decide if we even need any of those two properties.
         /// <summary>
         /// Gets or sets the serializer registry.
         /// </summary>
@@ -64,5 +67,11 @@ public IBsonSerializerRegistry SerializerRegistry
             get { return _serializerRegistry; }
             set { _serializerRegistry = value; }
         }
+
+        internal IBsonSerializationDomain SerializationDomain
+        {
+            get => _serializationDomain;
+            set => _serializationDomain = value;
+        }
     }
 }

src/MongoDB.Driver/FieldValueSerializerHelper.cs

@@ -20,6 +20,7 @@
 using MongoDB.Bson;
 using MongoDB.Bson.Serialization;
 using MongoDB.Bson.Serialization.Serializers;
+using MongoDB.Driver.Linq.Linq3Implementation.Serializers;
 using MongoDB.Driver.Support;
 
 namespace MongoDB.Driver
@@ -51,7 +52,7 @@ public static IBsonSerializer GetSerializerForValueType(IBsonSerializer fieldSer
             // serialize numeric values without converting them
             if (fieldType.IsNumeric() && valueType.IsNumeric())
             {
-                var valueSerializer = BsonSerializer.SerializerRegistry.GetSerializer(valueType);  //QUESTION What to we do here? We don't even use the input serializer registry. Probably ask Robert
+                var valueSerializer = StandardSerializers.GetSerializer(valueType);
                 if (HasStringRepresentation(fieldSerializer))
                 {
                     valueSerializer = WithStringRepresentation(valueSerializer);

src/MongoDB.Driver/MongoDatabase.cs

@@ -612,9 +612,16 @@ private IWriteOperation<BsonDocument> CreateCreateCollectionOperation<TDocument>
             var serializerRegistry = options.SerializerRegistry ?? BsonSerializer.SerializerRegistry;
             var documentSerializer = options.DocumentSerializer ?? serializerRegistry.GetSerializer<TDocument>();
 
-            var clusteredIndex = options.ClusteredIndex?.Render(documentSerializer, serializerRegistry, translationOptions);
-            var validator = options.Validator?.Render(new(documentSerializer, serializerRegistry, translationOptions: translationOptions));
+            //DOMAIN-API This will need to go away
+            RenderArgs<TDocument> renderArgs = options.SerializationDomain is null ?
+                new(documentSerializer, serializerRegistry, translationOptions: translationOptions) :
+                new(documentSerializer, options.SerializationDomain, translationOptions: translationOptions);
 
+            //DOMAIN-API This will need to go away
+            var clusteredIndex = options.SerializationDomain is null?  options.ClusteredIndex?.Render(documentSerializer, serializerRegistry, translationOptions):
+                options.ClusteredIndex?.Render(documentSerializer, options.SerializationDomain, translationOptions);
+
+            var validator = options.Validator?.Render(renderArgs);
             var collectionNamespace = new CollectionNamespace(_databaseNamespace, name);
 
             var effectiveEncryptedFields = EncryptedCollectionHelper.GetEffectiveEncryptedFields(collectionNamespace, options.EncryptedFields, _client.Settings?.AutoEncryptionOptions?.EncryptedFieldsMap);
@@ -656,7 +663,13 @@ private CreateViewOperation CreateCreateViewOperation<TDocument, TResult>(
             var translationOptions = _client.Settings.TranslationOptions;
             var serializerRegistry = options.SerializerRegistry ?? BsonSerializer.SerializerRegistry;
             var documentSerializer = options.DocumentSerializer ?? serializerRegistry.GetSerializer<TDocument>();
-            var pipelineDocuments = pipeline.Render(new (documentSerializer, serializerRegistry, translationOptions: translationOptions)).Documents;
+
+            //DOMAIN-API This will need to go away
+            RenderArgs<TDocument> renderArgs = options.SerializationDomain is null ?
+                new(documentSerializer, serializerRegistry, translationOptions: translationOptions) :
+                new(documentSerializer, options.SerializationDomain, translationOptions: translationOptions);
+
+            var pipelineDocuments = pipeline.Render(renderArgs).Documents;
             return new CreateViewOperation(_databaseNamespace, viewName, viewOn, pipelineDocuments, GetMessageEncoderSettings())
             {
                 Collation = options.Collation,

src/MongoDB.Driver/PipelineStageDefinition.cs

@@ -139,6 +139,7 @@ public interface IPipelineStageDefinition
         /// </summary>
         Type OutputType { get; }
 
+        //DOMAIN-API We need to swap the serializer registry for the serialization domain.
         /// <summary>
         /// Renders the specified document serializer.
         /// </summary>

src/MongoDB.Driver/RenderArgs.cs

@@ -40,7 +40,7 @@ public record struct RenderArgs<TDocument>
         private readonly ExpressionTranslationOptions _translationOptions = default;
         private readonly IBsonSerializationDomain _serializationDomain = default;
 
-        //QUESTION We need to stop using this constructor internally, and use the one with the serialization domain instead. How do we do that...?
+        //DOMAIN-API We need to stop using this constructor, and use the one with the serialization domain instead.
         /// <summary>
         /// Initializes a new instance of the <see cref="RenderArgs{TDocument}"/> record.
         /// </summary>