Corrected conventions

papafe · papafe · commit 01330fd5a7af · 2025-01-27T10:34:32.000+01:00
diff --git a/src/MongoDB.Bson/Serialization/Conventions/AttributeConventionPack.cs b/src/MongoDB.Bson/Serialization/Conventions/AttributeConventionPack.cs
@@ -87,7 +87,9 @@ public void Apply(BsonCreatorMap creatorMap)
                 }
             }
 
-            public void Apply(BsonMemberMap memberMap)
+            public void Apply(BsonMemberMap memberMap) => Apply(memberMap, BsonSerializer.DefaultDomain);
+
+            public void Apply(BsonMemberMap memberMap, IBsonSerializationDomain domain)
             {
                 var attributes = memberMap.MemberInfo.GetCustomAttributes(inherit: false).OfType<IBsonMemberMapAttribute>();
                 var groupings = attributes.GroupBy(a => (a is BsonSerializerAttribute) ? 1 : 2);
@@ -100,7 +102,9 @@ public void Apply(BsonMemberMap memberMap)
                 }
             }
 
-            public void PostProcess(BsonClassMap classMap)
+            public void PostProcess(BsonClassMap classMap) => PostProcess(classMap, BsonSerializer.DefaultDomain);
+
+            public void PostProcess(BsonClassMap classMap, IBsonSerializationDomain domain)
             {
                 foreach (var attribute in classMap.ClassType.GetTypeInfo().GetCustomAttributes(inherit: false).OfType<IBsonPostProcessingAttribute>())
                 {
diff --git a/src/MongoDB.Bson/Serialization/Conventions/CamelCaseElementNameConvention.cs b/src/MongoDB.Bson/Serialization/Conventions/CamelCaseElementNameConvention.cs
@@ -24,11 +24,11 @@ namespace MongoDB.Bson.Serialization.Conventions
     public class CamelCaseElementNameConvention : ConventionBase, IMemberMapConvention
     {
         // public methods
-        /// <summary>
-        /// Applies a modification to the member map.
-        /// </summary>
-        /// <param name="memberMap">The member map.</param>
-        public void Apply(BsonMemberMap memberMap)
+        /// <inheritdoc />
+        public void Apply(BsonMemberMap memberMap) => Apply(memberMap, BsonSerializer.DefaultDomain);
+
+        /// <inheritdoc />
+        public void Apply(BsonMemberMap memberMap, IBsonSerializationDomain domain)
         {
             string name = memberMap.MemberName;
             name = GetElementName(name);
diff --git a/src/MongoDB.Bson/Serialization/Conventions/DelegateMemberMapConvention.cs b/src/MongoDB.Bson/Serialization/Conventions/DelegateMemberMapConvention.cs
@@ -46,7 +46,10 @@ public DelegateMemberMapConvention(string name, Action<BsonMemberMap> action)
         /// Applies a modification to the member map.
         /// </summary>
         /// <param name="memberMap">The member map.</param>
-        public void Apply(BsonMemberMap memberMap)
+        public void Apply(BsonMemberMap memberMap) => Apply(memberMap, BsonSerializer.DefaultDomain);
+
+        /// <inheritdoc />
+        public void Apply(BsonMemberMap memberMap, IBsonSerializationDomain domain)
         {
             _action(memberMap);
         }
diff --git a/src/MongoDB.Bson/Serialization/Conventions/DelegatePostProcessingConvention.cs b/src/MongoDB.Bson/Serialization/Conventions/DelegatePostProcessingConvention.cs
@@ -46,7 +46,10 @@ public DelegatePostProcessingConvention(string name, Action<BsonClassMap> action
         /// Applies a post processing modification to the class map.
         /// </summary>
         /// <param name="classMap">The class map.</param>
-        public void PostProcess(BsonClassMap classMap)
+        public void PostProcess(BsonClassMap classMap) => PostProcess(classMap, BsonSerializer.DefaultDomain);
+
+        /// <inheritdoc />
+        public void PostProcess(BsonClassMap classMap, IBsonSerializationDomain domain)
         {
             _action(classMap);
         }
diff --git a/src/MongoDB.Bson/Serialization/Conventions/EnumRepresentationConvention.cs b/src/MongoDB.Bson/Serialization/Conventions/EnumRepresentationConvention.cs
@@ -47,7 +47,10 @@ public EnumRepresentationConvention(BsonType representation)
         /// Applies a modification to the member map.
         /// </summary>
         /// <param name="memberMap">The member map.</param>
-        public void Apply(BsonMemberMap memberMap)
+        public void Apply(BsonMemberMap memberMap) => Apply(memberMap, BsonSerializer.DefaultDomain);
+
+        /// <inheritdoc />
+        public void Apply(BsonMemberMap memberMap, IBsonSerializationDomain domain)
         {
             var memberType = memberMap.MemberType;
             var memberTypeInfo = memberType.GetTypeInfo();
diff --git a/src/MongoDB.Bson/Serialization/Conventions/IMemberMapConvention.cs b/src/MongoDB.Bson/Serialization/Conventions/IMemberMapConvention.cs
@@ -25,5 +25,13 @@ public interface IMemberMapConvention : IConvention
         /// </summary>
         /// <param name="memberMap">The member map.</param>
         void Apply(BsonMemberMap memberMap);
+
+        /// <summary>
+        /// //TODO
+        /// </summary>
+        /// <param name="memberMap"></param>
+        /// <param name="domain"></param>
+        void Apply(BsonMemberMap memberMap, IBsonSerializationDomain domain);
+
     }
 }
diff --git a/src/MongoDB.Bson/Serialization/Conventions/IPostProcessingConvention.cs b/src/MongoDB.Bson/Serialization/Conventions/IPostProcessingConvention.cs
@@ -25,5 +25,12 @@ public interface IPostProcessingConvention : IConvention
         /// </summary>
         /// <param name="classMap">The class map.</param>
         void PostProcess(BsonClassMap classMap);
+
+        /// <summary>
+        /// //TODO
+        /// </summary>
+        /// <param name="classMap"></param>
+        /// <param name="domain"></param>
+        void PostProcess(BsonClassMap classMap, IBsonSerializationDomain domain);
     }
 }
diff --git a/src/MongoDB.Bson/Serialization/Conventions/IgnoreIfDefaultConvention.cs b/src/MongoDB.Bson/Serialization/Conventions/IgnoreIfDefaultConvention.cs
@@ -37,7 +37,10 @@ public IgnoreIfDefaultConvention(bool ignoreIfDefault)
         /// Applies a modification to the member map.
         /// </summary>
         /// <param name="memberMap">The member map.</param>
-        public void Apply(BsonMemberMap memberMap)
+        public void Apply(BsonMemberMap memberMap) => Apply(memberMap, BsonSerializer.DefaultDomain);
+
+        /// <inheritdoc />
+        public void Apply(BsonMemberMap memberMap, IBsonSerializationDomain domain)
         {
             memberMap.SetIgnoreIfDefault(_ignoreIfDefault);
         }
diff --git a/src/MongoDB.Bson/Serialization/Conventions/IgnoreIfNullConvention.cs b/src/MongoDB.Bson/Serialization/Conventions/IgnoreIfNullConvention.cs
@@ -37,7 +37,10 @@ public IgnoreIfNullConvention(bool ignoreIfNull)
         /// Applies a modification to the member map.
         /// </summary>
         /// <param name="memberMap">The member map.</param>
-        public void Apply(BsonMemberMap memberMap)
+        public void Apply(BsonMemberMap memberMap) => Apply(memberMap, BsonSerializer.DefaultDomain);
+
+        /// <inheritdoc />
+        public void Apply(BsonMemberMap memberMap, IBsonSerializationDomain domain)
         {
             memberMap.SetIgnoreIfNull(_ignoreIfNull);
         }
diff --git a/src/MongoDB.Bson/Serialization/Conventions/LookupIdGeneratorConvention.cs b/src/MongoDB.Bson/Serialization/Conventions/LookupIdGeneratorConvention.cs
@@ -23,20 +23,19 @@ namespace MongoDB.Bson.Serialization.Conventions
     /// </summary>
     public class LookupIdGeneratorConvention : ConventionBase, IPostProcessingConvention
     {
-        // public methods
-        /// <summary>
-        /// Applies a post processing modification to the class map.
-        /// </summary>
-        /// <param name="classMap">The class map.</param>
-        public void PostProcess(BsonClassMap classMap)
+        /// <inheritdoc/>
+        public void PostProcess(BsonClassMap classMap) => PostProcess(classMap, BsonSerializer.DefaultDomain);
+
+        /// <inheritdoc/>
+        public void PostProcess(BsonClassMap classMap, IBsonSerializationDomain domain)
         {
             var idMemberMap = classMap.IdMemberMap;
             if (idMemberMap != null)
             {
                 if (idMemberMap.IdGenerator == null)
                 {
                     //or we pass the domain to the BsonClassMap. The first probably makes more sense, but it's messier.
-                    var idGenerator = BsonSerializer.LookupIdGenerator(idMemberMap.MemberType);  //TODO ??
+                    var idGenerator = domain.LookupIdGenerator(idMemberMap.MemberType);
                     if (idGenerator != null)
                     {
                         idMemberMap.SetIdGenerator(idGenerator);
diff --git a/src/MongoDB.Bson/Serialization/Conventions/MemberDefaultValueConvention.cs b/src/MongoDB.Bson/Serialization/Conventions/MemberDefaultValueConvention.cs
@@ -43,7 +43,10 @@ public MemberDefaultValueConvention(Type type, object defaultValue)
         /// Applies a modification to the member map.
         /// </summary>
         /// <param name="memberMap">The member map.</param>
-        public void Apply(BsonMemberMap memberMap)
+        public void Apply(BsonMemberMap memberMap) => Apply(memberMap, BsonSerializer.DefaultDomain);
+
+        /// <inheritdoc />
+        public void Apply(BsonMemberMap memberMap, IBsonSerializationDomain domain)
         {
             if (memberMap.MemberType == _type)
             {
diff --git a/src/MongoDB.Bson/Serialization/Conventions/MemberNameElementNameConvention.cs b/src/MongoDB.Bson/Serialization/Conventions/MemberNameElementNameConvention.cs
@@ -28,7 +28,10 @@ public class MemberNameElementNameConvention : ConventionBase, IMemberMapConvent
         /// Applies a modification to the member map.
         /// </summary>
         /// <param name="memberMap">The member map.</param>
-        public void Apply(BsonMemberMap memberMap)
+        public void Apply(BsonMemberMap memberMap) => Apply(memberMap, BsonSerializer.DefaultDomain);
+
+        /// <inheritdoc />
+        public void Apply(BsonMemberMap memberMap, IBsonSerializationDomain domain)
         {
             memberMap.SetElementName(memberMap.MemberName);
         }
diff --git a/src/MongoDB.Bson/Serialization/Conventions/NoIdMemberConvention.cs b/src/MongoDB.Bson/Serialization/Conventions/NoIdMemberConvention.cs
@@ -30,7 +30,10 @@ public class NoIdMemberConvention : ConventionBase, IPostProcessingConvention
         /// Applies a post processing modification to the class map.
         /// </summary>
         /// <param name="classMap">The class map.</param>
-        public void PostProcess(BsonClassMap classMap)
+        public void PostProcess(BsonClassMap classMap) => PostProcess(classMap, BsonSerializer.DefaultDomain);
+
+        /// <inheritdoc />
+        public void PostProcess(BsonClassMap classMap, IBsonSerializationDomain domain)
         {
             classMap.SetIdMember(null);
         }
diff --git a/src/MongoDB.Bson/Serialization/Conventions/ObjectSerializerAllowedTypesConvention.cs b/src/MongoDB.Bson/Serialization/Conventions/ObjectSerializerAllowedTypesConvention.cs
@@ -150,7 +150,10 @@ public bool AllowDefaultFrameworkTypes
         /// Applies a modification to the member map.
         /// </summary>
         /// <param name="memberMap">The member map.</param>
-        public void Apply(BsonMemberMap memberMap)
+        public void Apply(BsonMemberMap memberMap) => Apply(memberMap, BsonSerializer.DefaultDomain);
+
+        /// <inheritdoc />
+        public void Apply(BsonMemberMap memberMap, IBsonSerializationDomain domain)
         {
             var serializer = memberMap.GetSerializer();
 
diff --git a/src/MongoDB.Bson/Serialization/Conventions/ResetMemberMapsConvention.cs b/src/MongoDB.Bson/Serialization/Conventions/ResetMemberMapsConvention.cs
@@ -25,7 +25,10 @@ public class ResetMemberMapsConvention : ConventionBase, IMemberMapConvention
         /// Applies a modification to the member map.
         /// </summary>
         /// <param name="memberMap">The member map.</param>
-        public void Apply(BsonMemberMap memberMap)
+        public void Apply(BsonMemberMap memberMap) => Apply(memberMap, BsonSerializer.DefaultDomain);
+
+        /// <inheritdoc />
+        public void Apply(BsonMemberMap memberMap, IBsonSerializationDomain domain)
         {
             memberMap.Reset();
         }
diff --git a/src/MongoDB.Bson/Serialization/Conventions/StringIdStoredAsObjectIdConvention.cs b/src/MongoDB.Bson/Serialization/Conventions/StringIdStoredAsObjectIdConvention.cs
@@ -26,7 +26,10 @@ namespace MongoDB.Bson.Serialization.Conventions
     public class StringIdStoredAsObjectIdConvention : ConventionBase, IMemberMapConvention
     {
         /// <inheritdoc/>
-        public void Apply(BsonMemberMap memberMap)
+        public void Apply(BsonMemberMap memberMap) => Apply(memberMap, BsonSerializer.DefaultDomain);
+
+        /// <inheritdoc/>
+        public void Apply(BsonMemberMap memberMap, IBsonSerializationDomain domain)
         {
             if (memberMap != memberMap.ClassMap.IdMemberMap)
             {
@@ -38,7 +41,7 @@ public void Apply(BsonMemberMap memberMap)
                 return;
             }
 
-            var defaultStringSerializer = BsonSerializer.LookupSerializer(typeof(string));  //TODO ??
+            var defaultStringSerializer = domain.LookupSerializer(typeof(string));  //TODO ??
             if (memberMap.GetSerializer() != defaultStringSerializer)
             {
                 return;
diff --git a/src/MongoDB.Bson/Serialization/Conventions/StringObjectIdIdGeneratorConvention.cs b/src/MongoDB.Bson/Serialization/Conventions/StringObjectIdIdGeneratorConvention.cs
@@ -29,7 +29,10 @@ public class StringObjectIdIdGeneratorConvention : ConventionBase, IPostProcessi
         /// Applies a post processing modification to the class map.
         /// </summary>
         /// <param name="classMap">The class map.</param>
-        public void PostProcess(BsonClassMap classMap)
+        public void PostProcess(BsonClassMap classMap) => PostProcess(classMap, BsonSerializer.DefaultDomain);
+
+        /// <inheritdoc />
+        public void PostProcess(BsonClassMap classMap, IBsonSerializationDomain domain)
         {
             var idMemberMap = classMap.IdMemberMap;
             if (idMemberMap != null)

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,9 @@ public void Apply(BsonCreatorMap creatorMap)`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`
`90`		`- public void Apply(BsonMemberMap memberMap)`
	`90`	`+ public void Apply(BsonMemberMap memberMap) => Apply(memberMap, BsonSerializer.DefaultDomain);`
	`91`	`+`
	`92`	`+ public void Apply(BsonMemberMap memberMap, IBsonSerializationDomain domain)`
`91`	`93`	`{`
`92`	`94`	`var attributes = memberMap.MemberInfo.GetCustomAttributes(inherit: false).OfType<IBsonMemberMapAttribute>();`
`93`	`95`	`var groupings = attributes.GroupBy(a => (a is BsonSerializerAttribute) ? 1 : 2);`
`@@ -100,7 +102,9 @@ public void Apply(BsonMemberMap memberMap)`
`100`	`102`	`}`
`101`	`103`	`}`
`102`	`104`
`103`		`- public void PostProcess(BsonClassMap classMap)`
	`105`	`+ public void PostProcess(BsonClassMap classMap) => PostProcess(classMap, BsonSerializer.DefaultDomain);`
	`106`	`+`
	`107`	`+ public void PostProcess(BsonClassMap classMap, IBsonSerializationDomain domain)`
`104`	`108`	`{`
`105`	`109`	`foreach (var attribute in classMap.ClassType.GetTypeInfo().GetCustomAttributes(inherit: false).OfType<IBsonPostProcessingAttribute>())`
`106`	`110`	`{`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,10 @@ public DelegateMemberMapConvention(string name, Action<BsonMemberMap> action)`
`46`	`46`	`/// Applies a modification to the member map.`
`47`	`47`	`/// </summary>`
`48`	`48`	`/// <param name="memberMap">The member map.</param>`
`49`		`- public void Apply(BsonMemberMap memberMap)`
	`49`	`+ public void Apply(BsonMemberMap memberMap) => Apply(memberMap, BsonSerializer.DefaultDomain);`
	`50`	`+`
	`51`	`+ /// <inheritdoc />`
	`52`	`+ public void Apply(BsonMemberMap memberMap, IBsonSerializationDomain domain)`
`50`	`53`	`{`
`51`	`54`	`_action(memberMap);`
`52`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,10 @@ public DelegatePostProcessingConvention(string name, Action<BsonClassMap> action`
`46`	`46`	`/// Applies a post processing modification to the class map.`
`47`	`47`	`/// </summary>`
`48`	`48`	`/// <param name="classMap">The class map.</param>`
`49`		`- public void PostProcess(BsonClassMap classMap)`
	`49`	`+ public void PostProcess(BsonClassMap classMap) => PostProcess(classMap, BsonSerializer.DefaultDomain);`
	`50`	`+`
	`51`	`+ /// <inheritdoc />`
	`52`	`+ public void PostProcess(BsonClassMap classMap, IBsonSerializationDomain domain)`
`50`	`53`	`{`
`51`	`54`	`_action(classMap);`
`52`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,5 +25,13 @@ public interface IMemberMapConvention : IConvention`
`25`	`25`	`/// </summary>`
`26`	`26`	`/// <param name="memberMap">The member map.</param>`
`27`	`27`	`void Apply(BsonMemberMap memberMap);`
	`28`	`+`
	`29`	`+ /// <summary>`
	`30`	`+ /// //TODO`
	`31`	`+ /// </summary>`
	`32`	`+ /// <param name="memberMap"></param>`
	`33`	`+ /// <param name="domain"></param>`
	`34`	`+ void Apply(BsonMemberMap memberMap, IBsonSerializationDomain domain);`
	`35`	`+`
`28`	`36`	`}`
`29`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,5 +25,12 @@ public interface IPostProcessingConvention : IConvention`
`25`	`25`	`/// </summary>`
`26`	`26`	`/// <param name="classMap">The class map.</param>`
`27`	`27`	`void PostProcess(BsonClassMap classMap);`
	`28`	`+`
	`29`	`+ /// <summary>`
	`30`	`+ /// //TODO`
	`31`	`+ /// </summary>`
	`32`	`+ /// <param name="classMap"></param>`
	`33`	`+ /// <param name="domain"></param>`
	`34`	`+ void PostProcess(BsonClassMap classMap, IBsonSerializationDomain domain);`
`28`	`35`	`}`
`29`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,10 @@ public IgnoreIfDefaultConvention(bool ignoreIfDefault)`
`37`	`37`	`/// Applies a modification to the member map.`
`38`	`38`	`/// </summary>`
`39`	`39`	`/// <param name="memberMap">The member map.</param>`
`40`		`- public void Apply(BsonMemberMap memberMap)`
	`40`	`+ public void Apply(BsonMemberMap memberMap) => Apply(memberMap, BsonSerializer.DefaultDomain);`
	`41`	`+`
	`42`	`+ /// <inheritdoc />`
	`43`	`+ public void Apply(BsonMemberMap memberMap, IBsonSerializationDomain domain)`
`41`	`44`	`{`
`42`	`45`	`memberMap.SetIgnoreIfDefault(_ignoreIfDefault);`
`43`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,10 @@ public IgnoreIfNullConvention(bool ignoreIfNull)`
`37`	`37`	`/// Applies a modification to the member map.`
`38`	`38`	`/// </summary>`
`39`	`39`	`/// <param name="memberMap">The member map.</param>`
`40`		`- public void Apply(BsonMemberMap memberMap)`
	`40`	`+ public void Apply(BsonMemberMap memberMap) => Apply(memberMap, BsonSerializer.DefaultDomain);`
	`41`	`+`
	`42`	`+ /// <inheritdoc />`
	`43`	`+ public void Apply(BsonMemberMap memberMap, IBsonSerializationDomain domain)`
`41`	`44`	`{`
`42`	`45`	`memberMap.SetIgnoreIfNull(_ignoreIfNull);`
`43`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,20 +23,19 @@ namespace MongoDB.Bson.Serialization.Conventions`
`23`	`23`	`/// </summary>`
`24`	`24`	`public class LookupIdGeneratorConvention : ConventionBase, IPostProcessingConvention`
`25`	`25`	`{`
`26`		`- // public methods`
`27`		`- /// <summary>`
`28`		`- /// Applies a post processing modification to the class map.`
`29`		`- /// </summary>`
`30`		`- /// <param name="classMap">The class map.</param>`
`31`		`- public void PostProcess(BsonClassMap classMap)`
	`26`	`+ /// <inheritdoc/>`
	`27`	`+ public void PostProcess(BsonClassMap classMap) => PostProcess(classMap, BsonSerializer.DefaultDomain);`
	`28`	`+`
	`29`	`+ /// <inheritdoc/>`
	`30`	`+ public void PostProcess(BsonClassMap classMap, IBsonSerializationDomain domain)`
`32`	`31`	`{`
`33`	`32`	`var idMemberMap = classMap.IdMemberMap;`
`34`	`33`	`if (idMemberMap != null)`
`35`	`34`	`{`
`36`	`35`	`if (idMemberMap.IdGenerator == null)`
`37`	`36`	`{`
`38`	`37`	`//or we pass the domain to the BsonClassMap. The first probably makes more sense, but it's messier.`
`39`		`- var idGenerator = BsonSerializer.LookupIdGenerator(idMemberMap.MemberType); //TODO ??`
	`38`	`+ var idGenerator = domain.LookupIdGenerator(idMemberMap.MemberType);`
`40`	`39`	`if (idGenerator != null)`
`41`	`40`	`{`
`42`	`41`	`idMemberMap.SetIdGenerator(idGenerator);`