Initial work on CSHARP-415 and CSHARP-417. BsonTypeMapper is now bidirectional with the introduction of the new MapToDotNetValue method. More careful analysis of when C# null means to ignore an item (as in functional construction) and when C# null maps to BsonNull.Value. Also looked carefully at when values cross the .NET to BsonDocument object model boundary and invoke MapToBsonValue or MapToDotNetValue as appropriate. BsonArray and BsonDocument now throw an exception on any attempt to set a value to C# null. Simplified GetDocumentId in BsonDocument to return the BsonValue unchanged. Added new BsonBinaryDataGuidGenerator for use with BsonDocument when the _id is a BsonBinaryData value holding a Guid. Changed BsonClassMapSerializer to use the new MapToDotNetValue method in the BsonTypeMapper instead of its own (now removed) version.

Author: Robert Stam

Bson/Bson.csproj

@@ -91,6 +91,7 @@
     <Compile Include="ObjectModel\GuidConverter.cs" />
     <Compile Include="IO\JsonReaderSettings.cs" />
     <Compile Include="ObjectModel\ICustomBsonTypeMapper.cs" />
+    <Compile Include="ObjectModel\BsonTypeMapperOptions.cs" />
     <Compile Include="Serialization\Attributes\BsonDateTimeOptionsAttribute.cs" />
     <Compile Include="Serialization\Attributes\BsonDictionaryOptionsAttribute.cs" />
     <Compile Include="Serialization\Attributes\BsonExtraElementsAttribute.cs" />

Bson/ObjectModel/BsonArray.cs

@@ -217,7 +217,13 @@ public IEnumerable<BsonValue> Values
         public BsonValue this[int index]
         {
             get { return _values[index]; }
-            set { _values[index] = value; }
+            set {
+                if (value == null)
+                {
+                    throw new ArgumentNullException("value");
+                }
+                _values[index] = value;
+            }
         }
 
         // public static methods
@@ -450,7 +456,13 @@ public BsonArray AddRange(IEnumerable<BsonValue> values)
         {
             if (values != null)
             {
-                _values.AddRange(values);
+                foreach (var value in values)
+                {
+                    if (value != null)
+                    {
+                        _values.Add(value);
+                    }
+                }
             }
             return this;
         }
@@ -551,7 +563,7 @@ public BsonArray AddRange(IEnumerable<string> values)
             {
                 foreach (var value in values)
                 {
-                    _values.Add(BsonString.Create(value));
+                    _values.Add((value == null) ? (BsonValue)BsonNull.Value : BsonString.Create(value));
                 }
             }
             return this;
@@ -568,7 +580,7 @@ public BsonArray AddRange(IEnumerable values)
             {
                 foreach (var value in values)
                 {
-                    _values.Add(BsonValue.Create(value));
+                    _values.Add(BsonTypeMapper.MapToBsonValue(value));
                 }
             }
             return this;
@@ -635,6 +647,10 @@ public override int CompareTo(BsonValue other)
         /// <returns>True if the array contains the value.</returns>
         public bool Contains(BsonValue value)
         {
+            if (value == null)
+            {
+                throw new ArgumentNullException("value");
+            }
             return _values.Contains(value);
         }
 
@@ -731,6 +747,10 @@ public override int GetHashCode()
         /// <returns>The zero based index of the value (or -1 if not found).</returns>
         public int IndexOf(BsonValue value)
         {
+            if (value == null)
+            {
+                throw new ArgumentNullException("value");
+            }
             return _values.IndexOf(value);
         }
 
@@ -742,6 +762,10 @@ public int IndexOf(BsonValue value)
         /// <returns>The zero based index of the value (or -1 if not found).</returns>
         public int IndexOf(BsonValue value, int index)
         {
+            if (value == null)
+            {
+                throw new ArgumentNullException("value");
+            }
             return _values.IndexOf(value, index);
         }
 
@@ -754,6 +778,10 @@ public int IndexOf(BsonValue value, int index)
         /// <returns>The zero based index of the value (or -1 if not found).</returns>
         public int IndexOf(BsonValue value, int index, int count)
         {
+            if (value == null)
+            {
+                throw new ArgumentNullException("value");
+            }
             return _values.IndexOf(value, index, count);
         }
 
@@ -764,6 +792,10 @@ public int IndexOf(BsonValue value, int index, int count)
         /// <param name="value">The new value.</param>
         public void Insert(int index, BsonValue value)
         {
+            if (value == null)
+            {
+                throw new ArgumentNullException("value");
+            }
             _values.Insert(index, value);
         }
 
@@ -774,6 +806,10 @@ public void Insert(int index, BsonValue value)
         /// <returns>True if the value was removed.</returns>
         public bool Remove(BsonValue value)
         {
+            if (value == null)
+            {
+                throw new ArgumentNullException("value");
+            }
             return _values.Remove(value);
         }
 

Bson/ObjectModel/BsonBinaryData.cs

@@ -60,6 +60,10 @@ public BsonBinaryData(byte[] bytes, BsonBinarySubType subType)
         public BsonBinaryData(byte[] bytes, BsonBinarySubType subType, GuidRepresentation guidRepresentation)
             : base(BsonType.Binary)
         {
+            if (bytes == null)
+            {
+                throw new ArgumentNullException("bytes");
+            }
             if (subType == BsonBinarySubType.UuidStandard || subType == BsonBinarySubType.UuidLegacy)
             {
                 if (bytes.Length != 16)
@@ -165,11 +169,11 @@ public BsonBinarySubType SubType
         /// <summary>
         /// Converts a byte array to a BsonBinaryData.
         /// </summary>
-        /// <param name="value">A byte array.</param>
+        /// <param name="bytes">A byte array.</param>
         /// <returns>A BsonBinaryData.</returns>
-        public static implicit operator BsonBinaryData(byte[] value)
+        public static implicit operator BsonBinaryData(byte[] bytes)
         {
-            return BsonBinaryData.Create(value);
+            return BsonBinaryData.Create(bytes);
         }
 
         /// <summary>