Various improvements

Author: papafe

src/MongoDB.Bson/IO/IBsonReader.cs

@@ -62,7 +62,7 @@ public interface IBsonReader : IDisposable
         /// <summary>
         /// Pops the settings.
         /// </summary>
-        void PopSettings(); //TODO Why do we have push and pop methods? They are not used. We should remove them.
+        void PopSettings();
 
         /// <summary>
         /// Pushes new settings for the reader.

src/MongoDB.Bson/Serialization/BsonSerializerRegistry.cs

@@ -28,7 +28,7 @@ public sealed class BsonSerializerRegistry : IBsonSerializerRegistryInternal
         private readonly ConcurrentDictionary<Type, IBsonSerializer> _cache;
         private readonly ConcurrentStack<IBsonSerializationProvider> _serializationProviders;
         private readonly Func<Type, IBsonSerializer> _createSerializer;
-        private readonly IBsonSerializationDomain _serializationDomain;
+        private readonly IBsonSerializationDomain _serializationDomain;  //FP Need to investigate if we can remove this from here.
 
         // constructors
         /// <summary>

src/MongoDB.Bson/Serialization/Conventions/ConventionRegistryDomain.cs

@@ -1,3 +1,18 @@
+/* Copyright 2010-present MongoDB 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;
 

src/MongoDB.Bson/Serialization/Conventions/ObjectDiscriminatorConvention.cs

@@ -159,12 +159,6 @@ public BsonValue GetDiscriminator(Type nominalType, Type actualType)
             return TypeNameDiscriminator.GetDiscriminator(actualType);
         }
 
-        /// <inheritdoc />
-        internal BsonValue GetDiscriminator(Type nominalType, Type actualType, IBsonSerializationDomain domain)
-        {
-            throw new NotImplementedException();
-        }
-
         /// <inheritdoc/>
         public override int GetHashCode() => 0;
     }

src/MongoDB.Bson/Serialization/Serializers/DynamicDocumentBaseSerializer.cs

@@ -27,7 +27,7 @@ namespace MongoDB.Bson.Serialization.Serializers
     public abstract class DynamicDocumentBaseSerializer<T> : SerializerBase<T> where T : class, IDynamicMetaObjectProvider
     {
         // private fields
-        private IBsonSerializer<object> __objectSerializer;
+        private IBsonSerializer<object> _objectSerializer;
 
         // constructors
         /// <summary>
@@ -146,7 +146,7 @@ public override void Serialize(BsonSerializationContext context, BsonSerializati
         //private methods
         private IBsonSerializer<object> GetObjectSerializer(IBsonSerializationDomain domain)
         {
-            return __objectSerializer ??= domain.LookupSerializer<object>();
+            return _objectSerializer ??= domain.LookupSerializer<object>();
         }
     }
 }

src/MongoDB.Driver/MongoDB.Driver.csproj

@@ -13,7 +13,7 @@
     <IsPackable>true</IsPackable>
   </PropertyGroup>
 
-<!--  The followings have been removed because they are accessed directly through MongoDB.Bson, otherwise there will be a double definition   -->
+<!--  The followings have been removed because they are accessed indirectly through MongoDB.Bson, otherwise there will be a double definition   -->
 <!--  <ItemGroup>-->
 <!--    <Compile Include="..\MongoDB.Shared\DictionaryComparer.cs" Link="Shared\DictionaryComparer.cs" />-->
 <!--    <Compile Include="..\MongoDB.Shared\SequenceComparer.cs" Link="Shared\SequenceComparer.cs" />-->