Added comments

papafe · papafe · commit 8b14426013a8 · 2025-01-13T18:24:31.000+01:00
diff --git a/src/MongoDB.Bson/BsonDefaults.cs b/src/MongoDB.Bson/BsonDefaults.cs
@@ -34,15 +34,15 @@ public static class BsonDefaults
 
         // public static properties
         /// <summary>
-        /// Gets or sets the dynamic array serializer.  //TODO What to we do with this?
+        /// Gets or sets the dynamic array serializer.
         /// </summary>
         public static IBsonSerializer DynamicArraySerializer
         {
             get
             {
                 if (!__dynamicArraySerializerWasSet)
                 {
-                    __dynamicArraySerializer = BsonSerializer.LookupSerializer<List<object>>();
+                    __dynamicArraySerializer = BsonSerializer.LookupSerializer<List<object>>();  //TODO I think we could keep this as is
                 }
                 return __dynamicArraySerializer;
             }
@@ -62,7 +62,7 @@ public static IBsonSerializer DynamicDocumentSerializer
             {
                 if (!__dynamicDocumentSerializerWasSet)
                 {
-                    __dynamicDocumentSerializer = BsonSerializer.LookupSerializer<ExpandoObject>();
+                    __dynamicDocumentSerializer = BsonSerializer.LookupSerializer<ExpandoObject>();   //TODO I think we could keep this as is
                 }
                 return __dynamicDocumentSerializer;
             }
diff --git a/src/MongoDB.Bson/BsonExtensionMethods.cs b/src/MongoDB.Bson/BsonExtensionMethods.cs
@@ -84,7 +84,7 @@ public static byte[] ToBson(
 
             if (serializer == null)
             {
-                serializer = BsonSerializer.LookupSerializer(nominalType);
+                serializer = BsonSerializer.LookupSerializer(nominalType);   //TODO I think we need another method with the domain as input
             }
             if (serializer.ValueType != nominalType)
             {
@@ -165,7 +165,7 @@ public static BsonDocument ToBsonDocument(
                     return convertibleToBsonDocument.ToBsonDocument(); // use the provided ToBsonDocument method
                 }
 
-                serializer = BsonSerializer.LookupSerializer(nominalType);
+                serializer = BsonSerializer.LookupSerializer(nominalType);    //TODO I think we need another method with the domain as input
             }
             if (serializer.ValueType != nominalType)
             {
@@ -236,7 +236,7 @@ public static string ToJson(
 
             if (serializer == null)
             {
-                serializer = BsonSerializer.LookupSerializer(nominalType);
+                serializer = BsonSerializer.LookupSerializer(nominalType);    //TODO I think we need another method with the domain as input
             }
             if (serializer.ValueType != nominalType)
             {
diff --git a/src/MongoDB.Bson/Serialization/BsonClassMap.cs b/src/MongoDB.Bson/Serialization/BsonClassMap.cs
@@ -284,7 +284,7 @@ public static Type GetMemberInfoType(MemberInfo memberInfo)
         /// <returns>All registered class maps.</returns>
         public static IEnumerable<BsonClassMap> GetRegisteredClassMaps()
         {
-            BsonSerializer.ConfigLock.EnterReadLock();
+            BsonSerializer.ConfigLock.EnterReadLock();  //TODO It would make sense to look at this after the PR by Robert is merged
             try
             {
                 return __classMaps.Values.ToList(); // return a copy for thread safety
diff --git a/src/MongoDB.Bson/Serialization/BsonMemberMap.cs b/src/MongoDB.Bson/Serialization/BsonMemberMap.cs
@@ -301,7 +301,7 @@ public IBsonSerializer GetSerializer()
                 // return special serializer for BsonValue members that handles the _csharpnull representation
                 if (_memberTypeIsBsonValue)
                 {
-                    var wrappedSerializer = BsonSerializer.LookupSerializer(_memberType);
+                    var wrappedSerializer = BsonSerializer.LookupSerializer(_memberType);   //TODO We need another version of this with the domain as input
                     var isBsonArraySerializer = wrappedSerializer is IBsonArraySerializer;
                     var isBsonDocumentSerializer = wrappedSerializer is IBsonDocumentSerializer;
 
diff --git a/src/MongoDB.Bson/Serialization/BsonSerializationProviderBase.cs b/src/MongoDB.Bson/Serialization/BsonSerializationProviderBase.cs
@@ -24,7 +24,7 @@ namespace MongoDB.Bson.Serialization
     public abstract class BsonSerializationProviderBase : IRegistryAwareBsonSerializationProvider
     {
         /// <inheritdoc/>
-        public virtual IBsonSerializer GetSerializer(Type type)
+        public virtual IBsonSerializer GetSerializer(Type type)  //TODO Need to make another version with the domain as input
         {
             return GetSerializer(type, BsonSerializer.SerializerRegistry);
         }
@@ -38,7 +38,7 @@ public virtual IBsonSerializer GetSerializer(Type type)
         /// <param name="serializerTypeDefinition">The serializer type definition.</param>
         /// <param name="typeArguments">The type arguments.</param>
         /// <returns>A serializer.</returns>
-        protected virtual IBsonSerializer CreateGenericSerializer(Type serializerTypeDefinition, params Type[] typeArguments)
+        protected virtual IBsonSerializer CreateGenericSerializer(Type serializerTypeDefinition, params Type[] typeArguments)   //TODO We need another version of this with the domain as input
         {
             return CreateGenericSerializer(serializerTypeDefinition, typeArguments, BsonSerializer.SerializerRegistry);
         }
@@ -65,7 +65,7 @@ protected virtual IBsonSerializer CreateGenericSerializer(Type serializerTypeDef
         /// <returns>A serializer.</returns>
         protected virtual IBsonSerializer CreateSerializer(Type serializerType)
         {
-            return CreateSerializer(serializerType, BsonSerializer.SerializerRegistry);
+            return CreateSerializer(serializerType, BsonSerializer.SerializerRegistry);   //TODO We need another version of this with the domain as input
         }
 
         /// <summary>
diff --git a/src/MongoDB.Bson/Serialization/Conventions/ConventionRegistry.cs b/src/MongoDB.Bson/Serialization/Conventions/ConventionRegistry.cs
@@ -21,7 +21,7 @@ namespace MongoDB.Bson.Serialization.Conventions
     /// <summary>
     /// Represents a registry of conventions.
     /// </summary>
-    public static class ConventionRegistry
+    public static class ConventionRegistry  //TODO Probably this should get the same treatment as BsonSerializer....
     {
         // private static fields
         private readonly static List<ConventionPackContainer> __conventionPacks = new List<ConventionPackContainer>();
diff --git a/src/MongoDB.Bson/Serialization/Conventions/LookupIdGeneratorConvention.cs b/src/MongoDB.Bson/Serialization/Conventions/LookupIdGeneratorConvention.cs
@@ -35,6 +35,8 @@ public void PostProcess(BsonClassMap classMap)
             {
                 if (idMemberMap.IdGenerator == null)
                 {
+                    //TODO For this, we either add a new PostProcess method to the IPostProcessingConvention that takes the domain
+                    //or we pass the domain to the BsonClassMap. The first probably makes more sense, but it's messier.
                     var idGenerator = BsonSerializer.LookupIdGenerator(idMemberMap.MemberType);
                     if (idGenerator != null)
                     {
diff --git a/src/MongoDB.Bson/Serialization/Conventions/ObjectDiscriminatorConvention.cs b/src/MongoDB.Bson/Serialization/Conventions/ObjectDiscriminatorConvention.cs
@@ -135,7 +135,7 @@ public Type GetActualType(IBsonReader bsonReader, Type nominalType)
                     {
                         discriminator = discriminator.AsBsonArray.Last(); // last item is leaf class discriminator
                     }
-                    actualType = BsonSerializer.LookupActualType(nominalType, discriminator);
+                    actualType = BsonSerializer.LookupActualType(nominalType, discriminator);  //TODO For this (and other discriminator conventions) we need to add methods to IDiscriminatorConvention to pass the domain
                 }
                 bsonReader.ReturnToBookmark(bookmark);
                 return actualType;
diff --git a/src/MongoDB.Bson/Serialization/Conventions/StringIdStoredAsObjectIdConvention.cs b/src/MongoDB.Bson/Serialization/Conventions/StringIdStoredAsObjectIdConvention.cs
@@ -38,7 +38,7 @@ public void Apply(BsonMemberMap memberMap)
                 return;
             }
 
-            var defaultStringSerializer = BsonSerializer.LookupSerializer(typeof(string));
+            var defaultStringSerializer = BsonSerializer.LookupSerializer(typeof(string));  //TODO For this we'd need to add a new Apply(memberMap, domain) method to IMemberMapConvention
             if (memberMap.GetSerializer() != defaultStringSerializer)
             {
                 return;
diff --git a/src/MongoDB.Bson/Serialization/IBsonSerializerExtensions.cs b/src/MongoDB.Bson/Serialization/IBsonSerializerExtensions.cs
@@ -58,7 +58,7 @@ public static TValue Deserialize<TValue>(this IBsonSerializer<TValue> serializer
         public static IDiscriminatorConvention GetDiscriminatorConvention(this IBsonSerializer serializer) =>
             serializer is IHasDiscriminatorConvention hasDiscriminatorConvention
                 ? hasDiscriminatorConvention.DiscriminatorConvention
-                : BsonSerializer.LookupDiscriminatorConvention(serializer.ValueType);
+                : BsonSerializer.LookupDiscriminatorConvention(serializer.ValueType);   //TODO We need another version of this with the domain as input
 
         /// <summary>
         /// Serializes a value.
diff --git a/src/MongoDB.Bson/Serialization/Serializers/BsonDocumentSerializer.cs b/src/MongoDB.Bson/Serialization/Serializers/BsonDocumentSerializer.cs
@@ -89,7 +89,7 @@ public bool GetDocumentId(
             if (bsonDocument.TryGetValue("_id", out idBsonValue))
             {
                 id = idBsonValue;
-                idGenerator = BsonSerializer.LookupIdGenerator(id.GetType());
+                idGenerator = BsonSerializer.LookupIdGenerator(id.GetType());  //TODO For this we need add a new GetDocumentId to IBsonIdProvider
 
                 if (idGenerator == null)
                 {
diff --git a/src/MongoDB.Bson/Serialization/Serializers/DictionarySerializerBase.cs b/src/MongoDB.Bson/Serialization/Serializers/DictionarySerializerBase.cs
@@ -59,6 +59,7 @@ public DictionarySerializerBase()
         /// <param name="dictionaryRepresentation">The dictionary representation.</param>
         public DictionarySerializerBase(DictionaryRepresentation dictionaryRepresentation)
             : this(dictionaryRepresentation, BsonSerializer.LookupSerializer<object>(), BsonSerializer.LookupSerializer<object>())
+        //TODO We could keep this, and add a new constructor DictionarySerializerBase(dictionaryRepresentation, domain)
         {
         }
 
@@ -387,6 +388,7 @@ public DictionarySerializerBase()
         /// <param name="dictionaryRepresentation">The dictionary representation.</param>
         public DictionarySerializerBase(DictionaryRepresentation dictionaryRepresentation)
             : this(dictionaryRepresentation, BsonSerializer.SerializerRegistry)
+        //TODO We could keep this, and add a new constructor DictionarySerializerBase(dictionaryRepresentation, domain)
         {
         }
 
diff --git a/src/MongoDB.Bson/Serialization/Serializers/DiscriminatedInterfaceSerializer.cs b/src/MongoDB.Bson/Serialization/Serializers/DiscriminatedInterfaceSerializer.cs
@@ -47,7 +47,7 @@ private static IBsonSerializer<TInterface> CreateInterfaceSerializer()
             var classMapType = classMapDefinition.MakeGenericType(typeof(TInterface));
             var classMap = (BsonClassMap)Activator.CreateInstance(classMapType);
             classMap.AutoMap();
-            classMap.SetDiscriminatorConvention(BsonSerializer.LookupDiscriminatorConvention(typeof(TInterface)));
+            classMap.SetDiscriminatorConvention(BsonSerializer.LookupDiscriminatorConvention(typeof(TInterface)));  //TODO This is only called by the constructor, we need a new one with the domain as input
             classMap.Freeze();
             return new BsonClassMapSerializer<TInterface>(classMap);
         }
@@ -97,7 +97,7 @@ public DiscriminatedInterfaceSerializer(IDiscriminatorConvention discriminatorCo
 
             _interfaceType = typeof(TInterface);
             _discriminatorConvention = discriminatorConvention ?? interfaceSerializer.GetDiscriminatorConvention();
-            _objectSerializer = BsonSerializer.LookupSerializer<object>();
+            _objectSerializer = BsonSerializer.LookupSerializer<object>();  //TODO We need a new constructor, that takes the domain as input.
             if (_objectSerializer is ObjectSerializer standardObjectSerializer)
             {
                 _objectSerializer = standardObjectSerializer.WithDiscriminatorConvention(_discriminatorConvention);
diff --git a/src/MongoDB.Bson/Serialization/Serializers/DynamicDocumentBaseSerializer.cs b/src/MongoDB.Bson/Serialization/Serializers/DynamicDocumentBaseSerializer.cs
@@ -26,8 +26,8 @@ namespace MongoDB.Bson.Serialization.Serializers
     /// <typeparam name="T">The dynamic type.</typeparam>
     public abstract class DynamicDocumentBaseSerializer<T> : SerializerBase<T> where T : class, IDynamicMetaObjectProvider
     {
-        // private static fields
-        private static readonly IBsonSerializer<object> __objectSerializer = BsonSerializer.LookupSerializer<object>();
+        // private fields
+        private IBsonSerializer<object> __objectSerializer;
 
         // constructors
         /// <summary>
@@ -58,7 +58,7 @@ public override T Deserialize(BsonDeserializationContext context, BsonDeserializ
                     while (bsonReader.ReadBsonType() != BsonType.EndOfDocument)
                     {
                         var name = bsonReader.ReadName();
-                        var value = __objectSerializer.Deserialize(dynamicContext);
+                        var value = GetObjectSerializer(context.Domain).Deserialize(dynamicContext);
                         SetValueForMember(document, name, value);
                     }
                     bsonReader.ReadEndDocument();
@@ -101,7 +101,7 @@ public override void Serialize(BsonSerializationContext context, BsonSerializati
                 if (TryGetValueForMember(value, memberName, out memberValue))
                 {
                     bsonWriter.WriteName(memberName);
-                    __objectSerializer.Serialize(dynamicContext, memberValue);
+                    GetObjectSerializer(context.Domain).Serialize(dynamicContext, memberValue);
                 }
             }
             bsonWriter.WriteEndDocument();
@@ -142,5 +142,11 @@ public override void Serialize(BsonSerializationContext context, BsonSerializati
         /// <param name="value">The value.</param>
         /// <returns><c>true</c> if the member should be serialized; otherwise <c>false</c>.</returns>
         protected abstract bool TryGetValueForMember(T document, string memberName, out object value);
+
+        //private methods
+        private IBsonSerializer<object> GetObjectSerializer(IBsonSerializationDomain domain)
+        {
+            return __objectSerializer ??= domain.LookupSerializer<object>();
+        }
     }
 }
diff --git a/src/MongoDB.Bson/Serialization/Serializers/EnumerableSerializerBase.cs b/src/MongoDB.Bson/Serialization/Serializers/EnumerableSerializerBase.cs
@@ -35,7 +35,7 @@ public abstract class EnumerableSerializerBase<TValue> : SerializerBase<TValue>,
         /// Initializes a new instance of the <see cref="EnumerableSerializerBase{TValue}"/> class.
         /// </summary>
         protected EnumerableSerializerBase()
-            : this(BsonSerializer.SerializerRegistry)
+            : this(BsonSerializer.SerializerRegistry)  //TODO Need a new constructor that takes the domain as input
         {
         }
 
@@ -234,7 +234,7 @@ public abstract class EnumerableSerializerBase<TValue, TItem> : SerializerBase<T
         /// Initializes a new instance of the <see cref="EnumerableSerializerBase{TValue, TItem}"/> class.
         /// </summary>
         protected EnumerableSerializerBase()
-            : this(BsonSerializer.SerializerRegistry)
+            : this(BsonSerializer.SerializerRegistry)   //TODO Need a new constructor that takes the domain as input
         {
         }
 
diff --git a/src/MongoDB.Bson/Serialization/Serializers/ExpandoObjectSerializer.cs b/src/MongoDB.Bson/Serialization/Serializers/ExpandoObjectSerializer.cs
@@ -29,14 +29,13 @@ namespace MongoDB.Bson.Serialization.Serializers
     public sealed class ExpandoObjectSerializer : DynamicDocumentBaseSerializer<ExpandoObject>
     {
         // private fields
-        private readonly IBsonSerializer<List<object>> _listSerializer;
+        private IBsonSerializer<List<object>> _listSerializer;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ExpandoObjectSerializer"/> class.
         /// </summary>
         public ExpandoObjectSerializer()
         {
-            _listSerializer = BsonSerializer.LookupSerializer<List<object>>();
         }
 
         /// <summary>
diff --git a/src/MongoDB.Bson/Serialization/Serializers/IEnumerableDeserializingAsCollectionSerializer.cs b/src/MongoDB.Bson/Serialization/Serializers/IEnumerableDeserializingAsCollectionSerializer.cs
@@ -50,7 +50,7 @@ private static void EnsureTIEnumerableIsAnInterface()
         /// Initializes a new instance of the IEnumerableDeserializingAsCollectionSerializer class.
         /// </summary>
         public IEnumerableDeserializingAsCollectionSerializer()
-            : this(BsonSerializer.SerializerRegistry)
+            : this(BsonSerializer.SerializerRegistry)   //TODO Need a new constructor that takes the domain as input
         {
         }
 
diff --git a/src/MongoDB.Bson/Serialization/Serializers/ImpliedImplementationInterfaceSerializer.cs b/src/MongoDB.Bson/Serialization/Serializers/ImpliedImplementationInterfaceSerializer.cs
@@ -52,7 +52,7 @@ public sealed class ImpliedImplementationInterfaceSerializer<TInterface, TImplem
         /// Initializes a new instance of the <see cref="ImpliedImplementationInterfaceSerializer{TInterface, TImplementation}"/> class.
         /// </summary>
         public ImpliedImplementationInterfaceSerializer()
-            : this(BsonSerializer.SerializerRegistry)
+            : this(BsonSerializer.SerializerRegistry)   //TODO Need a new constructor that takes the domain as input
         {
         }
 
diff --git a/src/MongoDB.Bson/Serialization/Serializers/KeyValuePairSerializer.cs b/src/MongoDB.Bson/Serialization/Serializers/KeyValuePairSerializer.cs
@@ -66,7 +66,7 @@ public KeyValuePairSerializer()
         /// </summary>
         /// <param name="representation">The representation.</param>
         public KeyValuePairSerializer(BsonType representation)
-            : this(representation, BsonSerializer.SerializerRegistry)
+            : this(representation, BsonSerializer.SerializerRegistry)   //TODO Need a new constructor that takes the domain as input
         {
         }
 
diff --git a/src/MongoDB.Bson/Serialization/Serializers/NullableSerializer.cs b/src/MongoDB.Bson/Serialization/Serializers/NullableSerializer.cs
@@ -64,7 +64,7 @@ public sealed class NullableSerializer<T> :
         /// Initializes a new instance of the <see cref="NullableSerializer{T}"/> class.
         /// </summary>
         public NullableSerializer()
-            : this(BsonSerializer.SerializerRegistry)
+            : this(BsonSerializer.SerializerRegistry)   //TODO Need a new constructor that takes the domain as input
         {
         }
 
diff --git a/src/MongoDB.Bson/Serialization/Serializers/ObjectSerializer.cs b/src/MongoDB.Bson/Serialization/Serializers/ObjectSerializer.cs
@@ -67,7 +67,7 @@ public sealed class ObjectSerializer : ClassSerializerBase<object>, IHasDiscrimi
         /// Initializes a new instance of the <see cref="ObjectSerializer"/> class.
         /// </summary>
         public ObjectSerializer()
-            : this(BsonSerializer.LookupDiscriminatorConvention(typeof(object)))
+            : this(BsonSerializer.LookupDiscriminatorConvention(typeof(object)))   //TODO Need a new constructor that takes the domain as input
         {
         }
 
@@ -96,7 +96,7 @@ public ObjectSerializer(IDiscriminatorConvention discriminatorConvention, GuidRe
         /// </summary>
         /// <param name="allowedTypes">A delegate that determines what types are allowed.</param>
         public ObjectSerializer(Func<Type, bool> allowedTypes)
-            : this(BsonSerializer.LookupDiscriminatorConvention(typeof(object)), allowedTypes)
+            : this(BsonSerializer.LookupDiscriminatorConvention(typeof(object)), allowedTypes)   //TODO Need a new constructor that takes the domain as input
         {
         }
 
diff --git a/src/MongoDB.Bson/Serialization/Serializers/SerializeAsNominalTypeSerializer.cs b/src/MongoDB.Bson/Serialization/Serializers/SerializeAsNominalTypeSerializer.cs
@@ -32,7 +32,7 @@ public sealed class SerializeAsNominalTypeSerializer<TActualType, TNominalType>
         /// Initializes a new instance of the <see cref="SerializeAsNominalTypeSerializer{TActualType, TNominalType}"/> class.
         /// </summary>
         public SerializeAsNominalTypeSerializer()
-            : this(BsonSerializer.SerializerRegistry)
+            : this(BsonSerializer.SerializerRegistry)   //TODO Need a new constructor that takes the domain as input
         {
         }
 
diff --git a/src/MongoDB.Bson/Serialization/Serializers/ThreeDimensionalArraySerializer.cs b/src/MongoDB.Bson/Serialization/Serializers/ThreeDimensionalArraySerializer.cs
@@ -34,7 +34,7 @@ public sealed class ThreeDimensionalArraySerializer<TItem> :
         /// Initializes a new instance of the <see cref="ThreeDimensionalArraySerializer{TItem}"/> class.
         /// </summary>
         public ThreeDimensionalArraySerializer()
-            : this(BsonSerializer.SerializerRegistry)
+            : this(BsonSerializer.SerializerRegistry)   //TODO Need a new constructor that takes the domain as input
         {
         }
 
diff --git a/src/MongoDB.Bson/Serialization/Serializers/TupleSerializers.cs b/src/MongoDB.Bson/Serialization/Serializers/TupleSerializers.cs
@@ -114,7 +114,7 @@ public sealed class TupleSerializer<T1> : SealedClassSerializerBase<Tuple<T1>>,
         /// Initializes a new instance of the <see cref="TupleSerializer{T1}"/> class.
         /// </summary>
         public TupleSerializer()
-            : this(BsonSerializer.SerializerRegistry)
+            : this(BsonSerializer.SerializerRegistry)   //TODO Need a new constructor that takes the domain as input (also for all the other constructors in here)
         {
         }
 
diff --git a/src/MongoDB.Bson/Serialization/Serializers/TwoDimensionalArraySerializer.cs b/src/MongoDB.Bson/Serialization/Serializers/TwoDimensionalArraySerializer.cs
@@ -34,7 +34,7 @@ public sealed class TwoDimensionalArraySerializer<TItem> :
         /// Initializes a new instance of the <see cref="TwoDimensionalArraySerializer{TItem}"/> class.
         /// </summary>
         public TwoDimensionalArraySerializer()
-            : this(BsonSerializer.SerializerRegistry)
+            : this(BsonSerializer.SerializerRegistry)   //TODO Need a new constructor that takes the domain as input
         {
         }
 
diff --git a/src/MongoDB.Bson/Serialization/Serializers/ValueTupleSerializers.cs b/src/MongoDB.Bson/Serialization/Serializers/ValueTupleSerializers.cs
@@ -75,7 +75,7 @@ public sealed class ValueTupleSerializer<T1> : StructSerializerBase<ValueTuple<T
         /// Initializes a new instance of the <see cref="ValueTupleSerializer{T1}"/> class.
         /// </summary>
         public ValueTupleSerializer()
-            : this(BsonSerializer.SerializerRegistry)
+            : this(BsonSerializer.SerializerRegistry)   //TODO Need a new constructor that takes the domain as input
         {
         }
 

Original file line number	Diff line number	Diff line change
`@@ -34,15 +34,15 @@ public static class BsonDefaults`
`34`	`34`
`35`	`35`	`// public static properties`
`36`	`36`	`/// <summary>`
`37`		`- /// Gets or sets the dynamic array serializer. //TODO What to we do with this?`
	`37`	`+ /// Gets or sets the dynamic array serializer.`
`38`	`38`	`/// </summary>`
`39`	`39`	`public static IBsonSerializer DynamicArraySerializer`
`40`	`40`	`{`
`41`	`41`	`get`
`42`	`42`	`{`
`43`	`43`	`if (!__dynamicArraySerializerWasSet)`
`44`	`44`	`{`
`45`		`- __dynamicArraySerializer = BsonSerializer.LookupSerializer<List<object>>();`
	`45`	`+ __dynamicArraySerializer = BsonSerializer.LookupSerializer<List<object>>(); //TODO I think we could keep this as is`
`46`	`46`	`}`
`47`	`47`	`return __dynamicArraySerializer;`
`48`	`48`	`}`
`@@ -62,7 +62,7 @@ public static IBsonSerializer DynamicDocumentSerializer`
`62`	`62`	`{`
`63`	`63`	`if (!__dynamicDocumentSerializerWasSet)`
`64`	`64`	`{`
`65`		`- __dynamicDocumentSerializer = BsonSerializer.LookupSerializer<ExpandoObject>();`
	`65`	`+ __dynamicDocumentSerializer = BsonSerializer.LookupSerializer<ExpandoObject>(); //TODO I think we could keep this as is`
`66`	`66`	`}`
`67`	`67`	`return __dynamicDocumentSerializer;`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public static byte[] ToBson(`
`84`	`84`
`85`	`85`	`if (serializer == null)`
`86`	`86`	`{`
`87`		`- serializer = BsonSerializer.LookupSerializer(nominalType);`
	`87`	`+ serializer = BsonSerializer.LookupSerializer(nominalType); //TODO I think we need another method with the domain as input`
`88`	`88`	`}`
`89`	`89`	`if (serializer.ValueType != nominalType)`
`90`	`90`	`{`
`@@ -165,7 +165,7 @@ public static BsonDocument ToBsonDocument(`
`165`	`165`	`return convertibleToBsonDocument.ToBsonDocument(); // use the provided ToBsonDocument method`
`166`	`166`	`}`
`167`	`167`
`168`		`- serializer = BsonSerializer.LookupSerializer(nominalType);`
	`168`	`+ serializer = BsonSerializer.LookupSerializer(nominalType); //TODO I think we need another method with the domain as input`
`169`	`169`	`}`
`170`	`170`	`if (serializer.ValueType != nominalType)`
`171`	`171`	`{`
`@@ -236,7 +236,7 @@ public static string ToJson(`
`236`	`236`
`237`	`237`	`if (serializer == null)`
`238`	`238`	`{`
`239`		`- serializer = BsonSerializer.LookupSerializer(nominalType);`
	`239`	`+ serializer = BsonSerializer.LookupSerializer(nominalType); //TODO I think we need another method with the domain as input`
`240`	`240`	`}`
`241`	`241`	`if (serializer.ValueType != nominalType)`
`242`	`242`	`{`
Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,7 @@ public static Type GetMemberInfoType(MemberInfo memberInfo)`
`284`	`284`	`/// <returns>All registered class maps.</returns>`
`285`	`285`	`public static IEnumerable<BsonClassMap> GetRegisteredClassMaps()`
`286`	`286`	`{`
`287`		`- BsonSerializer.ConfigLock.EnterReadLock();`
	`287`	`+ BsonSerializer.ConfigLock.EnterReadLock(); //TODO It would make sense to look at this after the PR by Robert is merged`
`288`	`288`	`try`
`289`	`289`	`{`
`290`	`290`	`return __classMaps.Values.ToList(); // return a copy for thread safety`
Original file line number	Diff line number	Diff line change
`@@ -301,7 +301,7 @@ public IBsonSerializer GetSerializer()`
`301`	`301`	`// return special serializer for BsonValue members that handles the _csharpnull representation`
`302`	`302`	`if (_memberTypeIsBsonValue)`
`303`	`303`	`{`
`304`		`- var wrappedSerializer = BsonSerializer.LookupSerializer(_memberType);`
	`304`	`+ var wrappedSerializer = BsonSerializer.LookupSerializer(_memberType); //TODO We need another version of this with the domain as input`
`305`	`305`	`var isBsonArraySerializer = wrappedSerializer is IBsonArraySerializer;`
`306`	`306`	`var isBsonDocumentSerializer = wrappedSerializer is IBsonDocumentSerializer;`
`307`	`307`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ namespace MongoDB.Bson.Serialization`
`24`	`24`	`public abstract class BsonSerializationProviderBase : IRegistryAwareBsonSerializationProvider`
`25`	`25`	`{`
`26`	`26`	`/// <inheritdoc/>`
`27`		`- public virtual IBsonSerializer GetSerializer(Type type)`
	`27`	`+ public virtual IBsonSerializer GetSerializer(Type type) //TODO Need to make another version with the domain as input`
`28`	`28`	`{`
`29`	`29`	`return GetSerializer(type, BsonSerializer.SerializerRegistry);`
`30`	`30`	`}`
`@@ -38,7 +38,7 @@ public virtual IBsonSerializer GetSerializer(Type type)`
`38`	`38`	`/// <param name="serializerTypeDefinition">The serializer type definition.</param>`
`39`	`39`	`/// <param name="typeArguments">The type arguments.</param>`
`40`	`40`	`/// <returns>A serializer.</returns>`
`41`		`- protected virtual IBsonSerializer CreateGenericSerializer(Type serializerTypeDefinition, params Type[] typeArguments)`
	`41`	`+ protected virtual IBsonSerializer CreateGenericSerializer(Type serializerTypeDefinition, params Type[] typeArguments) //TODO We need another version of this with the domain as input`
`42`	`42`	`{`
`43`	`43`	`return CreateGenericSerializer(serializerTypeDefinition, typeArguments, BsonSerializer.SerializerRegistry);`
`44`	`44`	`}`
`@@ -65,7 +65,7 @@ protected virtual IBsonSerializer CreateGenericSerializer(Type serializerTypeDef`
`65`	`65`	`/// <returns>A serializer.</returns>`
`66`	`66`	`protected virtual IBsonSerializer CreateSerializer(Type serializerType)`
`67`	`67`	`{`
`68`		`- return CreateSerializer(serializerType, BsonSerializer.SerializerRegistry);`
	`68`	`+ return CreateSerializer(serializerType, BsonSerializer.SerializerRegistry); //TODO We need another version of this with the domain as input`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ namespace MongoDB.Bson.Serialization.Conventions`
`21`	`21`	`/// <summary>`
`22`	`22`	`/// Represents a registry of conventions.`
`23`	`23`	`/// </summary>`
`24`		`- public static class ConventionRegistry`
	`24`	`+ public static class ConventionRegistry //TODO Probably this should get the same treatment as BsonSerializer....`
`25`	`25`	`{`
`26`	`26`	`// private static fields`
`27`	`27`	`private readonly static List<ConventionPackContainer> __conventionPacks = new List<ConventionPackContainer>();`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,8 @@ public void PostProcess(BsonClassMap classMap)`
`35`	`35`	`{`
`36`	`36`	`if (idMemberMap.IdGenerator == null)`
`37`	`37`	`{`
	`38`	`+ //TODO For this, we either add a new PostProcess method to the IPostProcessingConvention that takes the domain`
	`39`	`+ //or we pass the domain to the BsonClassMap. The first probably makes more sense, but it's messier.`
`38`	`40`	`var idGenerator = BsonSerializer.LookupIdGenerator(idMemberMap.MemberType);`
`39`	`41`	`if (idGenerator != null)`
`40`	`42`	`{`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ public Type GetActualType(IBsonReader bsonReader, Type nominalType)`
`135`	`135`	`{`
`136`	`136`	`discriminator = discriminator.AsBsonArray.Last(); // last item is leaf class discriminator`
`137`	`137`	`}`
`138`		`- actualType = BsonSerializer.LookupActualType(nominalType, discriminator);`
	`138`	`+ actualType = BsonSerializer.LookupActualType(nominalType, discriminator); //TODO For this (and other discriminator conventions) we need to add methods to IDiscriminatorConvention to pass the domain`
`139`	`139`	`}`
`140`	`140`	`bsonReader.ReturnToBookmark(bookmark);`
`141`	`141`	`return actualType;`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public void Apply(BsonMemberMap memberMap)`
`38`	`38`	`return;`
`39`	`39`	`}`
`40`	`40`
`41`		`- var defaultStringSerializer = BsonSerializer.LookupSerializer(typeof(string));`
	`41`	`+ var defaultStringSerializer = BsonSerializer.LookupSerializer(typeof(string)); //TODO For this we'd need to add a new Apply(memberMap, domain) method to IMemberMapConvention`
`42`	`42`	`if (memberMap.GetSerializer() != defaultStringSerializer)`
`43`	`43`	`{`
`44`	`44`	`return;`