Merged refactoring that renamed BsonDefaultSerializer to BsonDefaultSerializationProvider.

Author: rstam

Bson/Serialization/BsonClassMapSerializationProvider.cs

@@ -1,4 +1,19 @@
-using System;
+/* Copyright 2010-2012 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 System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -28,4 +43,4 @@ public IBsonSerializer GetSerializer(Type type)
             return null;
         }
     }
-}
+}

Bson/Serialization/BsonDefaultSerializationProvider.cs

@@ -19,18 +19,10 @@
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.Drawing;
-using System.Drawing.Imaging;
 using System.Globalization;
-using System.IO;
 using System.Linq;
 using System.Net;
-using System.Reflection;
-using System.Text;
-using System.Text.RegularExpressions;
 
-using MongoDB.Bson.IO;
-using MongoDB.Bson.Serialization.Attributes;
-using MongoDB.Bson.Serialization.Conventions;
 using MongoDB.Bson.Serialization.Serializers;
 
 namespace MongoDB.Bson.Serialization
@@ -41,7 +33,6 @@ namespace MongoDB.Bson.Serialization
     internal class BsonDefaultSerializationProvider : IBsonSerializationProvider
     {
         // private static fields
-        private static BsonDefaultSerializationProvider __instance = new BsonDefaultSerializationProvider();
         private static Dictionary<Type, IBsonSerializer> __serializers;
         private static Dictionary<Type, Type> __genericSerializerDefinitions;
 

Bson/Serialization/BsonSerializer.cs

@@ -50,7 +50,7 @@ public static class BsonSerializer
         // static constructor
         static BsonSerializer()
         {
-            RegisterDefaultSerializationProvider();
+            RegisterDefaultSerializationProviders();
             RegisterIdGenerators();
         }
 
@@ -834,7 +834,7 @@ internal static void EnsureKnownTypesAreRegistered(Type nominalType)
                     var knownTypesAttribute = nominalType.GetCustomAttributes(typeof(BsonKnownTypesAttribute), false);
                     if (knownTypesAttribute != null && knownTypesAttribute.Length > 0)
                     {
-                        //try and force a scan of the known types
+                        // try and force a scan of the known types
                         LookupSerializer(nominalType);
                     }
 
@@ -848,9 +848,9 @@ internal static void EnsureKnownTypesAreRegistered(Type nominalType)
         }
 
         // private static methods
-        private static void RegisterDefaultSerializationProvider()
+        private static void RegisterDefaultSerializationProviders()
         {
-            //These are run in reverse order.
+            // last one registered gets first chance at providing the serializer
             RegisterSerializationProvider(new BsonClassMapSerializationProvider());
             RegisterSerializationProvider(new BsonDefaultSerializationProvider());
         }