refactored IBsonSerializer to not be aware of members instead opting for a more granular interface such the implementors of IBsonSerializer don't need to implement methods that don't apply.

Author: craiggwilson

Bson/Bson.csproj

@@ -105,6 +105,7 @@
     <Compile Include="Serialization\IBsonClassMapModifier.cs" />
     <Compile Include="Serialization\IBsonMemberMapModifier.cs" />
     <Compile Include="Serialization\IBsonIdProvider.cs" />
+    <Compile Include="Serialization\IBsonMemberSerializationInfoProvider.cs" />
     <Compile Include="Serialization\Options\ArraySerializationOptions.cs" />
     <Compile Include="Serialization\Options\BsonBaseSerializationOptions.cs" />
     <Compile Include="Serialization\Options\DateTimeSerializationOptions.cs" />

Bson/Serialization/BsonClassMapSerializer.cs

@@ -30,7 +30,7 @@ namespace MongoDB.Bson.Serialization
     /// <summary>
     /// Represents a serializer for a class map.
     /// </summary>
-    internal class BsonClassMapSerializer : IBsonSerializer, IBsonIdProvider
+    internal class BsonClassMapSerializer : IBsonSerializer, IBsonIdProvider, IBsonMemberSerializationInfoProvider
     {
         // private fields
         private BsonClassMap _classMap;

Bson/Serialization/IBsonMemberSerializationInfoProvider.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace MongoDB.Bson.Serialization
+{
+    /// <summary>
+    /// Contract for composite serializers that contain a number of named serializers.
+    /// </summary>
+    public interface IBsonMemberSerializationInfoProvider
+    {
+        /// <summary>
+        /// Gets the serialization info for a member.
+        /// </summary>
+        /// <param name="memberName">The member name.</param>
+        /// <returns>The serialization info for the member.</returns>
+        BsonSerializationInfo GetMemberSerializationInfo(string memberName);
+    }
+}

Bson/Serialization/IBsonSerializer.cs

@@ -52,12 +52,6 @@ public interface IBsonSerializer
         /// <returns>The serialization info for the items.</returns>
         BsonSerializationInfo GetItemSerializationInfo();
         /// <summary>
-        /// Gets the serialization info for a member.
-        /// </summary>
-        /// <param name="memberName">The member name.</param>
-        /// <returns>The serialization info for the member.</returns>
-        BsonSerializationInfo GetMemberSerializationInfo(string memberName);
-        /// <summary>
         /// Serializes an object to a BsonWriter.
         /// </summary>
         /// <param name="bsonWriter">The BsonWriter.</param>

Bson/Serialization/Serializers/BsonBaseSerializer.cs

@@ -113,17 +113,6 @@ public virtual BsonSerializationInfo GetItemSerializationInfo()
             throw new NotSupportedException(message);
         }
 
-        /// <summary>
-        /// Gets the serialization info for a member.
-        /// </summary>
-        /// <param name="memberName">The member name.</param>
-        /// <returns>The serialization info for the member.</returns>
-        public virtual BsonSerializationInfo GetMemberSerializationInfo(string memberName)
-        {
-            var message = string.Format("{0} does not implement the GetMemberSerializationInfo method.", this.GetType().Name);
-            throw new NotSupportedException(message);
-        }
-
         /// <summary>
         /// Serializes an object to a BsonWriter.
         /// </summary>

Driver/Core/MongoDBRef.cs

@@ -193,7 +193,7 @@ public override string ToString()
     /// <summary>
     /// Represents a serializer for MongoDBRefs.
     /// </summary>
-    public class MongoDBRefSerializer : BsonBaseSerializer
+    public class MongoDBRefSerializer : BsonBaseSerializer, IBsonMemberSerializationInfoProvider
     {
         // public methods
         /// <summary>
@@ -255,7 +255,7 @@ public override object Deserialize(
         /// </summary>
         /// <param name="memberName">The member name.</param>
         /// <returns>The serialization info for the member.</returns>
-        public override BsonSerializationInfo GetMemberSerializationInfo(string memberName)
+        public BsonSerializationInfo GetMemberSerializationInfo(string memberName)
         {
             string elementName;
             IBsonSerializer serializer;

Driver/Core/SystemProfileInfo.cs

@@ -328,7 +328,7 @@ public string User
     /// <summary>
     /// Represents a serializer for SystemProfileInfo.
     /// </summary>
-    public class SystemProfileInfoSerializer : BsonBaseSerializer
+    public class SystemProfileInfoSerializer : BsonBaseSerializer, IBsonMemberSerializationInfoProvider
     {
         // public methods
         /// <summary>
@@ -462,7 +462,7 @@ public override object Deserialize(
         /// </summary>
         /// <param name="memberName">The member name.</param>
         /// <returns>The serialization info for the member.</returns>
-        public override BsonSerializationInfo GetMemberSerializationInfo(string memberName)
+        public BsonSerializationInfo GetMemberSerializationInfo(string memberName)
         {
             string elementName;
             IBsonSerializer serializer;

Driver/Linq/Translators/SelectQuery.cs

@@ -1529,11 +1529,12 @@ private BsonSerializationInfo GetSerializationInfoMember(IBsonSerializer seriali
             var containingExpression = memberExpression.Expression;
             if (containingExpression.NodeType == ExpressionType.Parameter)
             {
-                try
+                var memberInfoProvider = serializer as IBsonMemberSerializationInfoProvider;
+                if(memberInfoProvider != null)
                 {
-                    return serializer.GetMemberSerializationInfo(memberName);
+                    return memberInfoProvider.GetMemberSerializationInfo(memberName);
                 }
-                catch (NotSupportedException)
+                else
                 {
                     var message = string.Format("LINQ queries on fields or properties of class {0} are not supported because the serializer for {0} does not implement the GetMemberSerializationInfo method.", declaringType.Name);
                     throw new NotSupportedException(message);
@@ -1542,16 +1543,17 @@ private BsonSerializationInfo GetSerializationInfoMember(IBsonSerializer seriali
             else
             {
                 var containingSerializationInfo = GetSerializationInfo(serializer, containingExpression);
-                try
+                var memberInfoProvider = containingSerializationInfo.Serializer as IBsonMemberSerializationInfoProvider;
+                if(memberInfoProvider != null)
                 {
-                    var memberSerializationInfo = containingSerializationInfo.Serializer.GetMemberSerializationInfo(memberName);
+                    var memberSerializationInfo = memberInfoProvider.GetMemberSerializationInfo(memberName);
                     return new BsonSerializationInfo(
                         containingSerializationInfo.ElementName + "." + memberSerializationInfo.ElementName,
                         memberSerializationInfo.Serializer,
                         memberSerializationInfo.NominalType,
                         memberSerializationInfo.SerializationOptions);
                 }
-                catch (NotSupportedException)
+                else
                 {
                     var message = string.Format("LINQ queries on fields or properties of class {0} are not supported because the serializer for {0} does not implement the GetMemberSerializationInfo method.", declaringType.Name);
                     throw new NotSupportedException(message);