Better fix for CSHARP-418. Replaced MemberMaps property with AllMemberMaps and DeclaredMemberMaps to remove ambiguity.

Author: rstam

Bson/Serialization/BsonClassMap.cs

@@ -77,6 +77,14 @@ protected BsonClassMap(Type classType)
         }
 
         // public properties
+        /// <summary>
+        /// Gets all the member maps (including maps for inherited members).
+        /// </summary>
+        public IEnumerable<BsonMemberMap> AllMemberMaps
+        {
+            get { return _allMemberMaps; }
+        }
+
         /// <summary>
         /// Gets the base class map.
         /// </summary>
@@ -101,6 +109,14 @@ public ConventionProfile Conventions
             get { return _conventions; }
         }
 
+        /// <summary>
+        /// Gets the declared member maps (only for members declared in this class).
+        /// </summary>
+        public IEnumerable<BsonMemberMap> DeclaredMemberMaps
+        {
+            get { return _declaredMemberMaps; }
+        }
+
         /// <summary>
         /// Gets the discriminator.
         /// </summary>
@@ -192,6 +208,7 @@ public IEnumerable<Type> KnownTypes
         /// <summary>
         /// Gets the member maps.
         /// </summary>
+        [Obsolete("Use AllMemberMaps or DeclaredMemberMaps instead.")]
         public IEnumerable<BsonMemberMap> MemberMaps
         {
             get { return _allMemberMaps; }
@@ -507,7 +524,7 @@ public BsonClassMap Freeze()
                             _baseClassMap = LookupClassMap(baseType);
                             _discriminatorIsRequired |= _baseClassMap._discriminatorIsRequired;
                             _hasRootClass |= (_isRootClass || _baseClassMap.HasRootClass);
-                            _allMemberMaps.AddRange(_baseClassMap.MemberMaps);
+                            _allMemberMaps.AddRange(_baseClassMap.AllMemberMaps);
                             if (_baseClassMap.IgnoreExtraElements && _baseClassMap.IgnoreExtraElementsIsInherited)
                             {
                                 _ignoreExtraElements = true;
@@ -627,10 +644,10 @@ public BsonClassMap Freeze()
         }
 
         /// <summary>
-        /// Gets a member map.
+        /// Gets a member map (only considers members declared in this class).
         /// </summary>
         /// <param name="memberName">The member name.</param>
-        /// <returns>The member map.</returns>
+        /// <returns>The member map (or null if the member was not found).</returns>
         public BsonMemberMap GetMemberMap(string memberName)
         {
             if (memberName == null)

Bson/Serialization/BsonClassMapSerializer.cs

@@ -130,7 +130,7 @@ public object Deserialize(
                 }
 
                 bsonReader.ReadStartDocument();
-                var missingElementMemberMaps = new HashSet<BsonMemberMap>(classMap.MemberMaps); // make a copy!
+                var missingElementMemberMaps = new HashSet<BsonMemberMap>(classMap.AllMemberMaps); // make a copy!
                 var discriminatorConvention = BsonDefaultSerializer.LookupDiscriminatorConvention(nominalType);
                 while (bsonReader.ReadBsonType() != BsonType.EndOfDocument)
                 {
@@ -249,19 +249,16 @@ public BsonSerializationInfo GetItemSerializationInfo()
         /// <returns>The serialization info for the member.</returns>
         public BsonSerializationInfo GetMemberSerializationInfo(string memberName)
         {
-            var classMap = _classMap;
-            while (classMap != null)
+            foreach (var memberMap in _classMap.AllMemberMaps)
             {
-                var memberMap = classMap.GetMemberMap(memberName);
-                if (memberMap != null)
+                if (memberMap.MemberName == memberName)
                 {
                     var elementName = memberMap.ElementName;
                     var serializer = memberMap.GetSerializer(memberMap.MemberType);
                     var nominalType = memberMap.MemberType;
                     var serializationOptions = memberMap.SerializationOptions;
                     return new BsonSerializationInfo(elementName, serializer, nominalType, serializationOptions);
                 }
-                classMap = classMap.BaseClassMap;
             }
 
             var message = string.Format(
@@ -338,7 +335,7 @@ public void Serialize(
                     }
                 }
 
-                foreach (var memberMap in classMap.MemberMaps)
+                foreach (var memberMap in classMap.AllMemberMaps)
                 {
                     // note: if serializeIdFirst is false then idMemberMap will be null (so no property will be skipped)
                     if (memberMap != idMemberMap)

BsonUnitTests/DefaultSerializer/Attributes/BsonAttributeTests.cs

@@ -181,7 +181,7 @@ public void TestElement()
             var ordered = classMap.GetMemberMap("Ordered");
             Assert.AreEqual("ordered", ordered.ElementName);
             Assert.AreEqual(1, ordered.Order);
-            Assert.AreSame(classMap.MemberMaps.First(), ordered);
+            Assert.AreSame(classMap.AllMemberMaps.First(), ordered);
 
             var noElement = classMap.GetMemberMap("NoElement");
             Assert.AreEqual("NoElement", noElement.ElementName);