Some improvements

papafe · papafe · commit 2157ae81dafd · 2025-02-12T15:29:44.000+01:00
diff --git a/src/MongoDB.Bson/Serialization/BsonClassMap.cs b/src/MongoDB.Bson/Serialization/BsonClassMap.cs
@@ -34,7 +34,6 @@ public class BsonClassMap
         // private fields
         private readonly Type _classType;
         private readonly List<BsonCreatorMap> _creatorMaps;
-        private readonly IConventionPack _conventionPack;
         private readonly bool _isAnonymous;
         private readonly List<BsonMemberMap> _allMemberMaps; // includes inherited member maps
         private readonly ReadOnlyCollection<BsonMemberMap> _allMemberMapsReadonly;
@@ -65,7 +64,6 @@ public BsonClassMap(Type classType)
         {
             _classType = classType;
             _creatorMaps = new List<BsonCreatorMap>();
-            _conventionPack = ConventionRegistry.Lookup(classType);
             _isAnonymous = classType.IsAnonymousType();
             _allMemberMaps = new List<BsonMemberMap>();
             _allMemberMapsReadonly = _allMemberMaps.AsReadOnly();
@@ -119,14 +117,6 @@ public IEnumerable<BsonCreatorMap> CreatorMaps
             get { return _creatorMaps; }
         }
 
-        /// <summary>
-        /// Gets the conventions used for auto mapping.
-        /// </summary>
-        public IConventionPack ConventionPack
-        {
-            get { return _conventionPack; }
-        }
-
         /// <summary>
         /// Gets the declared member maps (only for members declared in this class).
         /// </summary>
@@ -359,10 +349,16 @@ public static bool TryRegisterClassMap<TClass>(Func<BsonClassMap<TClass>> classM
         /// <summary>
         /// Automaps the class.
         /// </summary>
-        public void AutoMap()
+        public void AutoMap() => AutoMap(BsonSerializer.DefaultSerializationDomain);
+
+        /// <summary>
+        /// //TODO
+        /// </summary>
+        /// <param name="serializationDomain"></param>
+        public void AutoMap(IBsonSerializationDomain serializationDomain)
         {
             if (_frozen) { ThrowFrozenException(); }
-            AutoMapClass();
+            AutoMapClass(serializationDomain);
         }
 
         /// <summary>
@@ -1208,9 +1204,10 @@ IDiscriminatorConvention LookupDiscriminatorConvention()
         }
 
         // private methods
-        private void AutoMapClass()
+        private void AutoMapClass(IBsonSerializationDomain serializationDomain)
         {
-            new ConventionRunner(_conventionPack).Apply(this);
+            var conventionPack = serializationDomain.ConventionRegistry.Lookup(_classType);
+            new ConventionRunner(conventionPack).Apply(this);
 
             foreach (var memberMap in _declaredMemberMaps)
             {
diff --git a/src/MongoDB.Bson/Serialization/BsonClassMapDomain.cs b/src/MongoDB.Bson/Serialization/BsonClassMapDomain.cs
@@ -8,8 +8,14 @@ namespace MongoDB.Bson.Serialization;
 internal class BsonClassMapDomain : IBsonClassMapDomain
 {
     // private fields
+    private readonly IBsonSerializationDomain _serializationDomain;
     private readonly Dictionary<Type, BsonClassMap> _classMaps = new();
 
+    public BsonClassMapDomain(BsonSerializationDomain serializationDomain)
+    {
+        _serializationDomain = serializationDomain;
+    }
+
     /// <summary>
     /// Gets all registered class maps.
     /// </summary>
@@ -83,7 +89,7 @@ public BsonClassMap LookupClassMap(Type classType)
         var classMapDefinition = typeof(BsonClassMap<>);
         var classMapType = classMapDefinition.MakeGenericType(classType);
         var newClassMap = (BsonClassMap)Activator.CreateInstance(classMapType);
-        newClassMap.AutoMap();
+        newClassMap.AutoMap(_serializationDomain);
 
         BsonSerializer.ConfigLock.EnterWriteLock();
         try
@@ -109,7 +115,7 @@ public BsonClassMap LookupClassMap(Type classType)
     /// <returns>The class map.</returns>
     public BsonClassMap<TClass> RegisterClassMap<TClass>()
     {
-        return RegisterClassMap<TClass>(cm => { cm.AutoMap(); });
+        return RegisterClassMap<TClass>(cm => { cm.AutoMap(_serializationDomain); });
     }
 
     /// <summary>
@@ -156,12 +162,12 @@ public void RegisterClassMap(BsonClassMap classMap)
     /// <returns>True if this call registered the class map, false if the class map was already registered.</returns>
     public bool TryRegisterClassMap<TClass>()
     {
-        return TryRegisterClassMap(ClassMapFactory);
+        return TryRegisterClassMap(() => ClassMapFactory(_serializationDomain));
 
-        static BsonClassMap<TClass> ClassMapFactory()
+        static BsonClassMap<TClass> ClassMapFactory(IBsonSerializationDomain serializationDomain)
         {
             var classMap = new BsonClassMap<TClass>();
-            classMap.AutoMap();
+            classMap.AutoMap(serializationDomain);
             return classMap;
         }
     }
diff --git a/src/MongoDB.Bson/Serialization/BsonSerializationDomain.cs b/src/MongoDB.Bson/Serialization/BsonSerializationDomain.cs
@@ -38,9 +38,8 @@ internal class BsonSerializationDomain : IBsonSerializationDomainInternal, IDisp
         public BsonSerializationDomain(string name = null) //TODO name is used for testing
         {
             CreateSerializerRegistry();
+            CreateSubDomains();
             RegisterIdGenerators();
-            _classMapDomain = new BsonClassMapDomain();
-            _conventionRegistryDomain = new ConventionRegistryDomain();
             Name = name ?? "CUSTOM";  //TODO remove after testing is done
         }
 
@@ -815,6 +814,12 @@ private void CreateSerializerRegistry()
             _serializerRegistry.RegisterSerializationProvider(new BsonObjectModelSerializationProvider());
         }
 
+        private void CreateSubDomains()
+        {
+            _classMapDomain = new BsonClassMapDomain(this);
+            _conventionRegistryDomain = new ConventionRegistryDomain();
+        }
+
         private void RegisterIdGenerators()
         {
             RegisterIdGenerator(typeof(BsonObjectId), BsonObjectIdGenerator.Instance);
diff --git a/src/MongoDB.Bson/Serialization/Serializers/DiscriminatedInterfaceSerializer.cs b/src/MongoDB.Bson/Serialization/Serializers/DiscriminatedInterfaceSerializer.cs
@@ -46,7 +46,7 @@ private static IBsonSerializer<TInterface> CreateInterfaceSerializer(IBsonSerial
             var classMapDefinition = typeof(BsonClassMap<>);
             var classMapType = classMapDefinition.MakeGenericType(typeof(TInterface));
             var classMap = (BsonClassMap)Activator.CreateInstance(classMapType);
-            classMap.AutoMap();
+            classMap.AutoMap(domain);
             classMap.SetDiscriminatorConvention(domain.LookupDiscriminatorConvention(typeof(TInterface)));
             classMap.Freeze(domain);
             return new BsonClassMapSerializer<TInterface>(classMap);
diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MemberInitExpressionToAggregationExpressionTranslator.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MemberInitExpressionToAggregationExpressionTranslator.cs
@@ -47,7 +47,7 @@ public static AggregationExpression Translate(
             var constructorInfo = newExpression.Constructor; // note: can be null when using the default constructor with a struct
             var constructorArguments = newExpression.Arguments;
             var computedFields = new List<AstComputedField>();
-            var classMap = CreateClassMap(newExpression.Type, constructorInfo, out var creatorMap);
+            var classMap = CreateClassMap(context, newExpression.Type, constructorInfo, out var creatorMap);
 
             if (constructorInfo != null && creatorMap != null)
             {
@@ -100,12 +100,12 @@ public static AggregationExpression Translate(
             return new AggregationExpression(expression, ast, serializer);
         }
 
-        private static BsonClassMap CreateClassMap(Type classType, ConstructorInfo constructorInfo, out BsonCreatorMap creatorMap)
+        private static BsonClassMap CreateClassMap(TranslationContext context, Type classType, ConstructorInfo constructorInfo, out BsonCreatorMap creatorMap)
         {
             BsonClassMap baseClassMap = null;
             if (classType.BaseType != null)
             {
-                baseClassMap = CreateClassMap(classType.BaseType, null, out _);
+                baseClassMap = CreateClassMap(context, classType.BaseType, null, out _);
             }
 
             var classMapType = typeof(BsonClassMap<>).MakeGenericType(classType);
@@ -120,7 +120,7 @@ private static BsonClassMap CreateClassMap(Type classType, ConstructorInfo const
                 creatorMap = null;
             }
 
-            classMap.AutoMap();
+            classMap.AutoMap(context.SerializationDomain);
             classMap.IdMemberMap?.SetElementName("_id"); // normally happens when Freeze is called but we need it sooner here
 
             return classMap;
diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/TranslationContext.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/TranslationContext.cs
@@ -32,31 +32,35 @@ public static TranslationContext Create(
         {
             var symbolTable = new SymbolTable();
             var nameGenerator = new NameGenerator();
-            return new TranslationContext(symbolTable, nameGenerator, translationOptions, data);
+            return new TranslationContext(symbolTable, nameGenerator, translationOptions, BsonSerializer.DefaultSerializationDomain, data); //TODO It'll be annoying to pass the serialization domain in the call here
         }
         #endregion
 
         // private fields
         private readonly TranslationContextData _data;
         private readonly NameGenerator _nameGenerator;
+        private readonly IBsonSerializationDomain _serializationDomain;
         private readonly SymbolTable _symbolTable;
         private readonly ExpressionTranslationOptions _translationOptions;
 
         private TranslationContext(
             SymbolTable symbolTable,
             NameGenerator nameGenerator,
             ExpressionTranslationOptions translationOptions,
+            IBsonSerializationDomain serializationDomain,
             TranslationContextData data = null)
         {
             _symbolTable = Ensure.IsNotNull(symbolTable, nameof(symbolTable));
             _nameGenerator = Ensure.IsNotNull(nameGenerator, nameof(nameGenerator));
             _translationOptions = translationOptions ?? new ExpressionTranslationOptions();
+            _serializationDomain = Ensure.IsNotNull(serializationDomain, nameof(serializationDomain));
             _data = data; // can be null
         }
 
         // public properties
         public TranslationContextData Data => _data;
         public NameGenerator NameGenerator => _nameGenerator;
+        public IBsonSerializationDomain SerializationDomain => _serializationDomain;
         public SymbolTable SymbolTable => _symbolTable;
         public ExpressionTranslationOptions TranslationOptions => _translationOptions;
 

Original file line number	Diff line number	Diff line change
`@@ -38,9 +38,8 @@ internal class BsonSerializationDomain : IBsonSerializationDomainInternal, IDisp`
`38`	`38`	`public BsonSerializationDomain(string name = null) //TODO name is used for testing`
`39`	`39`	`{`
`40`	`40`	`CreateSerializerRegistry();`
	`41`	`+ CreateSubDomains();`
`41`	`42`	`RegisterIdGenerators();`
`42`		`- _classMapDomain = new BsonClassMapDomain();`
`43`		`- _conventionRegistryDomain = new ConventionRegistryDomain();`
`44`	`43`	`Name = name ?? "CUSTOM"; //TODO remove after testing is done`
`45`	`44`	`}`
`46`	`45`
`@@ -815,6 +814,12 @@ private void CreateSerializerRegistry()`
`815`	`814`	`_serializerRegistry.RegisterSerializationProvider(new BsonObjectModelSerializationProvider());`
`816`	`815`	`}`
`817`	`816`
	`817`	`+ private void CreateSubDomains()`
	`818`	`+ {`
	`819`	`+ _classMapDomain = new BsonClassMapDomain(this);`
	`820`	`+ _conventionRegistryDomain = new ConventionRegistryDomain();`
	`821`	`+ }`
	`822`	`+`
`818`	`823`	`private void RegisterIdGenerators()`
`819`	`824`	`{`
`820`	`825`	`RegisterIdGenerator(typeof(BsonObjectId), BsonObjectIdGenerator.Instance);`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public static AggregationExpression Translate(`
`47`	`47`	`var constructorInfo = newExpression.Constructor; // note: can be null when using the default constructor with a struct`
`48`	`48`	`var constructorArguments = newExpression.Arguments;`
`49`	`49`	`var computedFields = new List<AstComputedField>();`
`50`		`- var classMap = CreateClassMap(newExpression.Type, constructorInfo, out var creatorMap);`
	`50`	`+ var classMap = CreateClassMap(context, newExpression.Type, constructorInfo, out var creatorMap);`
`51`	`51`
`52`	`52`	`if (constructorInfo != null && creatorMap != null)`
`53`	`53`	`{`
`@@ -100,12 +100,12 @@ public static AggregationExpression Translate(`
`100`	`100`	`return new AggregationExpression(expression, ast, serializer);`
`101`	`101`	`}`
`102`	`102`
`103`		`- private static BsonClassMap CreateClassMap(Type classType, ConstructorInfo constructorInfo, out BsonCreatorMap creatorMap)`
	`103`	`+ private static BsonClassMap CreateClassMap(TranslationContext context, Type classType, ConstructorInfo constructorInfo, out BsonCreatorMap creatorMap)`
`104`	`104`	`{`
`105`	`105`	`BsonClassMap baseClassMap = null;`
`106`	`106`	`if (classType.BaseType != null)`
`107`	`107`	`{`
`108`		`- baseClassMap = CreateClassMap(classType.BaseType, null, out _);`
	`108`	`+ baseClassMap = CreateClassMap(context, classType.BaseType, null, out _);`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`var classMapType = typeof(BsonClassMap<>).MakeGenericType(classType);`
`@@ -120,7 +120,7 @@ private static BsonClassMap CreateClassMap(Type classType, ConstructorInfo const`
`120`	`120`	`creatorMap = null;`
`121`	`121`	`}`
`122`	`122`
`123`		`- classMap.AutoMap();`
	`123`	`+ classMap.AutoMap(context.SerializationDomain);`
`124`	`124`	`classMap.IdMemberMap?.SetElementName("_id"); // normally happens when Freeze is called but we need it sooner here`
`125`	`125`
`126`	`126`	`return classMap;`