CSHARP-803 - Ignore overriden id members when applying NamedIdMemberConvention

Author: Sridhar Nanjundeswaran

MongoDB.Bson/Serialization/Conventions/NamedIdMemberConvention.cs

@@ -109,12 +109,28 @@ public void Apply(BsonClassMap classMap)
 
                 if (member != null)
                 {
-                    classMap.MapIdMember(member);
-                    return;
+                    if (IsValidIdMember(classMap, member))
+                    {
+                        classMap.MapIdMember(member);
+                        return;
+                    }
                 }
             }
         }
 
+        private bool IsValidIdMember(BsonClassMap classMap, MemberInfo member)
+        {
+            if (member.MemberType == MemberTypes.Property)
+            {
+                var getMethodInfo = ((PropertyInfo)member).GetGetMethod(true);
+                if (getMethodInfo.IsVirtual && getMethodInfo.GetBaseDefinition().DeclaringType != classMap.ClassType)
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+
         /// <summary>
         /// Finds the Id member of a class.
         /// </summary>

MongoDB.BsonUnitTests/Jira/CSharp803Tests.cs

@@ -0,0 +1,43 @@
+/* Copyright 2010-2013 10gen 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 MongoDB.Bson;
+using NUnit.Framework;
+
+namespace MongoDB.BsonUnitTests.Jira
+{
+    [TestFixture]
+    public class CSharp803Tests
+    {
+        private abstract class BaseClassWithProperty
+        {
+            public abstract int Id { get; set; }
+        }
+
+        private class PropertyImpl : BaseClassWithProperty
+        {
+            public override int Id { get; set; }
+        }
+
+        [Test]
+        public void TestSerialization()
+        {
+            var impl = new PropertyImpl { Id = 1 };
+            var doc = impl.ToBsonDocument();
+            var expected = new BsonDocument("_id", 1);
+            Assert.AreEqual(expected, doc);
+        }
+    }
+}

MongoDB.BsonUnitTests/MongoDB.BsonUnitTests.csproj

@@ -90,6 +90,7 @@
     <Compile Include="Jira\CSharp624Tests.cs" />
     <Compile Include="Jira\CSharp637Tests.cs" />
     <Compile Include="Jira\CSharp648Tests.cs" />
+    <Compile Include="Jira\CSharp803Tests.cs" />
     <Compile Include="ObjectModel\LazyBsonArrayTests.cs" />
     <Compile Include="ObjectModel\LazyBsonDocumentTests.cs" />
     <Compile Include="ObjectModel\RawBsonArrayTests.cs" />