Simplified

papafe · papafe · commit ec1723c24f12 · 2025-06-12T14:33:12.000+02:00
diff --git a/src/MongoDB.Bson/InternalExtensions.cs b/src/MongoDB.Bson/InternalExtensions.cs
@@ -0,0 +1,58 @@
+/* Copyright 2010-present MongoDB Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using MongoDB.Bson.IO;
+using MongoDB.Bson.Serialization;
+using MongoDB.Bson.Serialization.Conventions;
+
+namespace MongoDB.Bson
+{
+    internal static class InternalExtensions
+    {
+        public static Type GetActualTypeInternal(this IDiscriminatorConvention discriminatorConvention, IBsonReader bsonReader, Type nominalType, IBsonSerializationDomain serializationDomain)
+        {
+            if (discriminatorConvention is IDiscriminatorConventionInternal internalConvention)
+            {
+                return internalConvention.GetActualType(bsonReader, nominalType, serializationDomain);
+            }
+            return discriminatorConvention.GetActualType(bsonReader, nominalType);
+        }
+
+        public static void ApplyInternal(this IMemberMapConvention memberMapConvention, BsonMemberMap memberMap, IBsonSerializationDomain serializationDomain)
+        {
+            if (memberMapConvention is IMemberMapConventionInternal internalConvention)
+            {
+                internalConvention.Apply(memberMap, serializationDomain);
+            }
+            else
+            {
+                memberMapConvention.Apply(memberMap);
+            }
+        }
+
+        public static void PostProcessInternal(this IPostProcessingConvention postProcessingConvention, BsonClassMap classMap, IBsonSerializationDomain serializationDomain)
+        {
+            if (postProcessingConvention is IPostProcessingConventionInternal internalConvention)
+            {
+                internalConvention.PostProcess(classMap, serializationDomain);
+            }
+            else
+            {
+                postProcessingConvention.PostProcess(classMap);
+            }
+        }
+    }
+}
diff --git a/src/MongoDB.Bson/Serialization/Conventions/ConventionRunner.cs b/src/MongoDB.Bson/Serialization/Conventions/ConventionRunner.cs
@@ -60,14 +60,7 @@ internal void Apply(BsonClassMap classMap, IBsonSerializationDomain serializatio
             {
                 foreach (var memberMap in classMap.DeclaredMemberMaps)
                 {
-                    if (convention is IMemberMapConventionInternal internalConvention)
-                    {
-                        internalConvention.Apply(memberMap, serializationDomain);
-                    }
-                    else
-                    {
-                        convention.Apply(memberMap);
-                    }
+                    convention.ApplyInternal(memberMap, serializationDomain);
                 }
             }
 
@@ -81,14 +74,7 @@ internal void Apply(BsonClassMap classMap, IBsonSerializationDomain serializatio
 
             foreach (var convention in _conventions.OfType<IPostProcessingConvention>())
             {
-                if (convention is IPostProcessingConventionInternal internalConvention)
-                {
-                    internalConvention.PostProcess(classMap, serializationDomain);
-                }
-                else
-                {
-                    convention.PostProcess(classMap);
-                }
+                convention.PostProcessInternal(classMap, serializationDomain);
             }
         }
     }
diff --git a/src/MongoDB.Bson/Serialization/Conventions/IMemberMapConvention.cs b/src/MongoDB.Bson/Serialization/Conventions/IMemberMapConvention.cs
@@ -25,7 +25,6 @@ public interface IMemberMapConvention : IConvention
         /// </summary>
         /// <param name="memberMap">The member map.</param>
         void Apply(BsonMemberMap memberMap);
-
     }
 
     internal interface IMemberMapConventionInternal : IMemberMapConvention
diff --git a/src/MongoDB.Bson/Serialization/IBsonIdProvider.cs b/src/MongoDB.Bson/Serialization/IBsonIdProvider.cs
@@ -32,6 +32,16 @@ public interface IBsonIdProvider
         /// <returns>True if the document has an Id.</returns>
         bool GetDocumentId(object document, out object id, out Type idNominalType, out IIdGenerator idGenerator);
 
+        /// <summary>
+        /// Sets the document Id.
+        /// </summary>
+        /// <param name="document">The document.</param>
+        /// <param name="id">The Id.</param>
+        void SetDocumentId(object document, object id);
+    }
+
+    internal interface IBsonIdProviderInternal : IBsonIdProvider
+    {
         /// <summary>
         /// //TODO
         /// </summary>
@@ -42,12 +52,5 @@ public interface IBsonIdProvider
         /// <param name="idGenerator"></param>
         /// <returns></returns>
         bool GetDocumentId(object document, IBsonSerializationDomain serializationDomain, out object id, out Type idNominalType, out IIdGenerator idGenerator);
-
-        /// <summary>
-        /// Sets the document Id.
-        /// </summary>
-        /// <param name="document">The document.</param>
-        /// <param name="id">The Id.</param>
-        void SetDocumentId(object document, object id);
     }
 }
diff --git a/src/MongoDB.Bson/Serialization/Serializers/BsonClassMapSerializer.cs b/src/MongoDB.Bson/Serialization/Serializers/BsonClassMapSerializer.cs
@@ -90,16 +90,7 @@ public override TClass Deserialize(BsonDeserializationContext context, BsonDeser
 
             var discriminatorConvention = _classMap.GetDiscriminatorConvention(context.SerializationDomain as IBsonSerializationDomainInternal);
 
-            Type actualType;
-
-            if (discriminatorConvention is IDiscriminatorConventionInternal discriminatorConventionInternal)
-            {
-                actualType = discriminatorConventionInternal.GetActualType(bsonReader, args.NominalType, context.SerializationDomain);
-            }
-            else
-            {
-                actualType = discriminatorConvention.GetActualType(bsonReader, args.NominalType);
-            }
+            var actualType = discriminatorConvention.GetActualTypeInternal(bsonReader, args.NominalType, context.SerializationDomain);
 
             if (actualType == typeof(TClass))
             {
diff --git a/src/MongoDB.Bson/Serialization/Serializers/ClassSerializerBase.cs b/src/MongoDB.Bson/Serialization/Serializers/ClassSerializerBase.cs
@@ -101,7 +101,7 @@ protected virtual TValue DeserializeValue(BsonDeserializationContext context, Bs
         protected virtual Type GetActualType(BsonDeserializationContext context)
         {
             var discriminatorConvention = this.GetDiscriminatorConvention();
-            return discriminatorConvention.GetActualType(context.Reader, typeof(TValue));
+            return discriminatorConvention.GetActualTypeInternal(context.Reader, typeof(TValue), context.SerializationDomain);
         }
 
         /// <summary>
diff --git a/src/MongoDB.Bson/Serialization/Serializers/DiscriminatedInterfaceSerializer.cs b/src/MongoDB.Bson/Serialization/Serializers/DiscriminatedInterfaceSerializer.cs
@@ -158,7 +158,7 @@ public override TInterface Deserialize(BsonDeserializationContext context, BsonD
             }
             else
             {
-                var actualType = _discriminatorConvention.GetActualType(bsonReader, typeof(TInterface));
+                var actualType = _discriminatorConvention.GetActualTypeInternal(bsonReader, typeof(TInterface), context.SerializationDomain);
                 if (actualType == _interfaceType)
                 {
                     var message = string.Format("Unable to determine actual type of object to deserialize for interface type {0}.", _interfaceType.FullName);
diff --git a/src/MongoDB.Bson/Serialization/Serializers/DiscriminatedWrapperSerializer.cs b/src/MongoDB.Bson/Serialization/Serializers/DiscriminatedWrapperSerializer.cs
@@ -73,7 +73,7 @@ public override TValue Deserialize(BsonDeserializationContext context, BsonDeser
         {
             var bsonReader = context.Reader;
             var nominalType = args.NominalType;
-            var actualType = _discriminatorConvention.GetActualType(bsonReader, nominalType);
+            var actualType = _discriminatorConvention.GetActualTypeInternal(bsonReader, nominalType, context.SerializationDomain);
             var serializer = context.SerializationDomain.LookupSerializer(actualType);
 
             TValue value = default(TValue);
diff --git a/src/MongoDB.Bson/Serialization/Serializers/ObjectSerializer.cs b/src/MongoDB.Bson/Serialization/Serializers/ObjectSerializer.cs
@@ -364,16 +364,7 @@ private object DeserializeDiscriminatedValue(BsonDeserializationContext context,
         {
             var bsonReader = context.Reader;
 
-            Type actualType;
-
-            if (_discriminatorConvention is IDiscriminatorConventionInternal discriminatorConventionInternal)
-            {
-                actualType = discriminatorConventionInternal.GetActualType(bsonReader, args.NominalType, context.SerializationDomain);  //TODO I think these type of things could become an internal extension methods
-            }
-            else
-            {
-                actualType = _discriminatorConvention.GetActualType(bsonReader, args.NominalType);
-            }
+            var actualType = _discriminatorConvention.GetActualTypeInternal(bsonReader, args.NominalType, context.SerializationDomain);
 
             if (!_allowedDeserializationTypes(actualType))
             {

Original file line number	Diff line number	Diff line change
`@@ -60,14 +60,7 @@ internal void Apply(BsonClassMap classMap, IBsonSerializationDomain serializatio`
`60`	`60`	`{`
`61`	`61`	`foreach (var memberMap in classMap.DeclaredMemberMaps)`
`62`	`62`	`{`
`63`		`- if (convention is IMemberMapConventionInternal internalConvention)`
`64`		`- {`
`65`		`- internalConvention.Apply(memberMap, serializationDomain);`
`66`		`- }`
`67`		`- else`
`68`		`- {`
`69`		`- convention.Apply(memberMap);`
`70`		`- }`
	`63`	`+ convention.ApplyInternal(memberMap, serializationDomain);`
`71`	`64`	`}`
`72`	`65`	`}`
`73`	`66`
`@@ -81,14 +74,7 @@ internal void Apply(BsonClassMap classMap, IBsonSerializationDomain serializatio`
`81`	`74`
`82`	`75`	`foreach (var convention in _conventions.OfType<IPostProcessingConvention>())`
`83`	`76`	`{`
`84`		`- if (convention is IPostProcessingConventionInternal internalConvention)`
`85`		`- {`
`86`		`- internalConvention.PostProcess(classMap, serializationDomain);`
`87`		`- }`
`88`		`- else`
`89`		`- {`
`90`		`- convention.PostProcess(classMap);`
`91`		`- }`
	`77`	`+ convention.PostProcessInternal(classMap, serializationDomain);`
`92`	`78`	`}`
`93`	`79`	`}`
`94`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ public interface IMemberMapConvention : IConvention`
`25`	`25`	`/// </summary>`
`26`	`26`	`/// <param name="memberMap">The member map.</param>`
`27`	`27`	`void Apply(BsonMemberMap memberMap);`
`28`		`-`
`29`	`28`	`}`
`30`	`29`
`31`	`30`	`internal interface IMemberMapConventionInternal : IMemberMapConvention`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ protected virtual TValue DeserializeValue(BsonDeserializationContext context, Bs`
`101`	`101`	`protected virtual Type GetActualType(BsonDeserializationContext context)`
`102`	`102`	`{`
`103`	`103`	`var discriminatorConvention = this.GetDiscriminatorConvention();`
`104`		`- return discriminatorConvention.GetActualType(context.Reader, typeof(TValue));`
	`104`	`+ return discriminatorConvention.GetActualTypeInternal(context.Reader, typeof(TValue), context.SerializationDomain);`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ public override TInterface Deserialize(BsonDeserializationContext context, BsonD`
`158`	`158`	`}`
`159`	`159`	`else`
`160`	`160`	`{`
`161`		`- var actualType = _discriminatorConvention.GetActualType(bsonReader, typeof(TInterface));`
	`161`	`+ var actualType = _discriminatorConvention.GetActualTypeInternal(bsonReader, typeof(TInterface), context.SerializationDomain);`
`162`	`162`	`if (actualType == _interfaceType)`
`163`	`163`	`{`
`164`	`164`	`var message = string.Format("Unable to determine actual type of object to deserialize for interface type {0}.", _interfaceType.FullName);`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public override TValue Deserialize(BsonDeserializationContext context, BsonDeser`
`73`	`73`	`{`
`74`	`74`	`var bsonReader = context.Reader;`
`75`	`75`	`var nominalType = args.NominalType;`
`76`		`- var actualType = _discriminatorConvention.GetActualType(bsonReader, nominalType);`
	`76`	`+ var actualType = _discriminatorConvention.GetActualTypeInternal(bsonReader, nominalType, context.SerializationDomain);`
`77`	`77`	`var serializer = context.SerializationDomain.LookupSerializer(actualType);`
`78`	`78`
`79`	`79`	`TValue value = default(TValue);`