Add GetBsonReaderSettings to SerializationFactory. This allows to pas…

…s Read configuration options down to the protocol.

source/MongoDB.Tests/MongoDB.Tests.csproj

@@ -121,6 +121,7 @@
     <Compile Include="UnitTests\Serialization\Descriptors\GenericListPropertyTests.cs" />
     <Compile Include="UnitTests\Serialization\Descriptors\OperatorTests.cs" />
     <Compile Include="UnitTests\Serialization\Descriptors\PolymorphicObjectTests.cs" />
+    <Compile Include="UnitTests\Serialization\SerializationFactoryTests.cs" />
     <Compile Include="UnitTests\Serialization\SerializationTestBase.cs" />
     <Compile Include="IntegrationTests\SecondServer\TestAuthentication.cs" />
     <Compile Include="UnitTests\Bson\TestBsonReader.cs" />
@@ -209,4 +210,4 @@
     </None>
   </ItemGroup>
   <ItemGroup />
-</Project>
+</Project>

source/MongoDB.Tests/UnitTests/Configuration/MongoConfigurationTests.cs

@@ -39,6 +39,5 @@ public void Test()
                 });
             });
         }
-
     }
 }

source/MongoDB.Tests/UnitTests/Serialization/SerializationFactoryTests.cs

@@ -0,0 +1,27 @@
+using MongoDB.Configuration;
+using MongoDB.Serialization;
+using NUnit.Framework;
+
+namespace MongoDB.UnitTests.Serialization
+{
+    [TestFixture]
+    public class SerializationFactoryTests
+    {
+        [Test]
+        public void GetBsonReaderSettingsDefaults()
+        {
+            var factory = new SerializationFactory();
+            var readerSettings = factory.GetBsonReaderSettings(typeof(int));
+            Assert.AreEqual(readerSettings.ReadLocalTime,true);
+            Assert.IsNotNull(readerSettings.Builder);
+        }
+
+        [Test]
+        public void ReadLocalTimeCanBeChangedByConfig()
+        {
+            var factory = new SerializationFactory(new MongoConfiguration {ReadLocalTime = false});
+            var readerSettings = factory.GetBsonReaderSettings(typeof(int));
+            Assert.AreEqual(readerSettings.ReadLocalTime, false);
+        }
+    }
+}

source/MongoDB/Connections/Connection.cs

@@ -243,12 +243,11 @@ private T SendCommandCore<T>(ISerializationFactory factory, string database, Typ
                 Query = command
             };
 
-            var builder = factory.GetBsonBuilder(typeof(T));
+            var readerSettings = factory.GetBsonReaderSettings(typeof(T));
 
             try
             {
-                var settings = new BsonReaderSettings(builder);
-                var reply = SendTwoWayMessage<T>(query, settings);
+                var reply = SendTwoWayMessage<T>(query, readerSettings);
 
                 if(reply.CursorId > 0)
                     SendMessage(new KillCursorsMessage(reply.CursorId));

source/MongoDB/Cursor_1.cs

@@ -271,11 +271,10 @@ private void RetrieveData(){
             if (_fields != null)
                 query.ReturnFieldSelector = _fields;
 
-            var builder = _serializationFactory.GetBsonBuilder(typeof(T));
+            var readerSettings = _serializationFactory.GetBsonReaderSettings(typeof(T));
 
             try {
-                var settings = new BsonReaderSettings(builder);
-                _reply = _connection.SendTwoWayMessage<T>(query, settings);
+                _reply = _connection.SendTwoWayMessage<T>(query, readerSettings);
                 Id = _reply.CursorId;
                 if (_limit < 0)
                     _limit = _limit * -1;
@@ -291,11 +290,10 @@ private void RetrieveData(){
         private void RetrieveMoreData(){
             var getMoreMessage = new GetMoreMessage(FullCollectionName, Id, _limit);
 
-            var builder = _serializationFactory.GetBsonBuilder(typeof(T));
+            var readerSettings = _serializationFactory.GetBsonReaderSettings(typeof(T));
 
             try {
-                var settings = new BsonReaderSettings(builder);
-                _reply = _connection.SendTwoWayMessage<T>(getMoreMessage, settings);
+                _reply = _connection.SendTwoWayMessage<T>(getMoreMessage, readerSettings);
                 Id = _reply.CursorId;
             } catch (IOException exception) {
                 Id = 0;

source/MongoDB/Serialization/ISerializationFactory.cs

@@ -9,18 +9,11 @@ namespace MongoDB.Serialization
     public interface ISerializationFactory
     {
         /// <summary>
-        /// Gets the bson builder.
+        /// Gets the bson writer settings.
         /// </summary>
         /// <param name="rootType">Type of the root.</param>
         /// <returns></returns>
-        IBsonObjectBuilder GetBsonBuilder(Type rootType);
-
-        /// <summary>
-        /// Gets the bson descriptor.
-        /// </summary>
-        /// <param name="rootType">Type of the root.</param>
-        /// <returns></returns>
-        IBsonObjectDescriptor GetBsonDescriptor(Type rootType);
+        BsonWriterSettings GetBsonWriterSettings(Type rootType);
 
         /// <summary>
         /// Gets the name of the collection given the rootType.
@@ -35,5 +28,19 @@ public interface ISerializationFactory
         /// <param name="type">The type.</param>
         /// <returns></returns>
         IObjectDescriptor GetObjectDescriptor(Type type);
+
+        /// <summary>
+        /// Gets the descriptor.
+        /// </summary>
+        /// <param name="rootType">Type of the root.</param>
+        /// <returns></returns>
+        IBsonObjectDescriptor GetBsonDescriptor(Type rootType);
+
+        /// <summary>
+        /// Gets the bson reader settings.
+        /// </summary>
+        /// <param name="rootType">Type of the root.</param>
+        /// <returns></returns>
+        BsonReaderSettings GetBsonReaderSettings(Type rootType);
     }
 }

source/MongoDB/Serialization/SerializationFactory.cs

@@ -49,6 +49,29 @@ public IBsonObjectDescriptor GetBsonDescriptor(Type rootType)
             return new BsonClassMapDescriptor(_configuration.MappingStore, rootType);
         }
 
+        /// <summary>
+        /// Gets the bson reader settings.
+        /// </summary>
+        /// <param name="rootType">Type of the root.</param>
+        /// <returns></returns>
+        public BsonReaderSettings GetBsonReaderSettings(Type rootType)
+        {
+            return new BsonReaderSettings(GetBsonBuilder(rootType))
+            {
+                ReadLocalTime = _configuration.ReadLocalTime
+            };
+        }
+
+        /// <summary>
+        /// Gets the bson writer settings.
+        /// </summary>
+        /// <param name="rootType">Type of the root.</param>
+        /// <returns></returns>
+        public BsonWriterSettings GetBsonWriterSettings(Type rootType)
+        {
+            return new BsonWriterSettings(GetBsonDescriptor(rootType));
+        }
+
         /// <summary>
         /// Gets the name of the collection given the rootType.
         /// </summary>