CSHARP-1194: Craig's further code review changes.

Author: rstam

src/MongoDB.Driver.Tests/OfTypeMongoCollectionTests.cs

@@ -1,4 +1,4 @@
-/* Copyright 2013-2014 MongoDB Inc.
+/* Copyright 2013-2015 MongoDB Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.

src/MongoDB.Driver/FilteredMongoCollectionBase.cs

@@ -26,29 +26,29 @@ internal abstract class FilteredMongoCollectionBase<TDocument> : MongoCollection
     {
         // private fields
         private readonly FilterDefinition<TDocument> _filter;
-        private readonly IMongoCollection<TDocument> _unfilteredCollection;
+        private readonly IMongoCollection<TDocument> _wrappedCollection;
 
         // constructors
-        public FilteredMongoCollectionBase(IMongoCollection<TDocument> unfilteredCollection, FilterDefinition<TDocument> filter)
+        public FilteredMongoCollectionBase(IMongoCollection<TDocument> wrappedCollection, FilterDefinition<TDocument> filter)
         {
-            _unfilteredCollection = unfilteredCollection;
+            _wrappedCollection = wrappedCollection;
             _filter = filter;
         }
 
         // public properties
         public override CollectionNamespace CollectionNamespace
         {
-            get { return _unfilteredCollection.CollectionNamespace; }
+            get { return _wrappedCollection.CollectionNamespace; }
         }
 
         public override IMongoDatabase Database
         {
-            get { return _unfilteredCollection.Database; }
+            get { return _wrappedCollection.Database; }
         }
 
         public override IBsonSerializer<TDocument> DocumentSerializer
         {
-            get { return _unfilteredCollection.DocumentSerializer; }
+            get { return _wrappedCollection.DocumentSerializer; }
         }
 
         public FilterDefinition<TDocument> Filter
@@ -58,18 +58,18 @@ public FilterDefinition<TDocument> Filter
 
         public override IMongoIndexManager<TDocument> Indexes
         {
-            get { return _unfilteredCollection.Indexes; }
+            get { return _wrappedCollection.Indexes; }
         }
 
         public override MongoCollectionSettings Settings
         {
-            get { return _unfilteredCollection.Settings; }
+            get { return _wrappedCollection.Settings; }
         }
 
         // protected properties
-        protected IMongoCollection<TDocument> UnfilteredCollection
+        protected IMongoCollection<TDocument> WrappedCollection
         {
-            get { return _unfilteredCollection; }
+            get { return _wrappedCollection; }
         }
 
         // public methods
@@ -92,49 +92,49 @@ protected IMongoCollection<TDocument> UnfilteredCollection
 
             var optimizedPipeline = new OptimizingPipelineDefinition<TDocument, TResult>(combinedPipeline);
 
-            return _unfilteredCollection.AggregateAsync(optimizedPipeline, options, cancellationToken);
+            return _wrappedCollection.AggregateAsync(optimizedPipeline, options, cancellationToken);
         }
 
         public override Task<BulkWriteResult<TDocument>> BulkWriteAsync(IEnumerable<WriteModel<TDocument>> requests, BulkWriteOptions options = null, CancellationToken cancellationToken = default(CancellationToken))
         {
-            return _unfilteredCollection.BulkWriteAsync(CombineModelFilters(requests), options, cancellationToken);
+            return _wrappedCollection.BulkWriteAsync(CombineModelFilters(requests), options, cancellationToken);
         }
 
         public override Task<long> CountAsync(FilterDefinition<TDocument> filter, CountOptions options = null, CancellationToken cancellationToken = default(CancellationToken))
         {
-            return _unfilteredCollection.CountAsync(CombineFilters(filter), options, cancellationToken);
+            return _wrappedCollection.CountAsync(CombineFilters(filter), options, cancellationToken);
         }
 
         public override Task<IAsyncCursor<TField>> DistinctAsync<TField>(FieldDefinition<TDocument, TField> field, FilterDefinition<TDocument> filter, DistinctOptions options = null, CancellationToken cancellationToken = default(CancellationToken))
         {
-            return _unfilteredCollection.DistinctAsync(field, CombineFilters(filter), options, cancellationToken);
+            return _wrappedCollection.DistinctAsync(field, CombineFilters(filter), options, cancellationToken);
         }
 
         public override Task<IAsyncCursor<TProjection>> FindAsync<TProjection>(FilterDefinition<TDocument> filter, FindOptions<TDocument, TProjection> options = null, CancellationToken cancellationToken = default(CancellationToken))
         {
-            return _unfilteredCollection.FindAsync(CombineFilters(filter), options, cancellationToken);
+            return _wrappedCollection.FindAsync(CombineFilters(filter), options, cancellationToken);
         }
 
         public override Task<TProjection> FindOneAndDeleteAsync<TProjection>(FilterDefinition<TDocument> filter, FindOneAndDeleteOptions<TDocument, TProjection> options = null, CancellationToken cancellationToken = default(CancellationToken))
         {
-            return _unfilteredCollection.FindOneAndDeleteAsync(CombineFilters(filter), options, cancellationToken);
+            return _wrappedCollection.FindOneAndDeleteAsync(CombineFilters(filter), options, cancellationToken);
         }
 
         public override Task<TProjection> FindOneAndReplaceAsync<TProjection>(FilterDefinition<TDocument> filter, TDocument replacement, FindOneAndReplaceOptions<TDocument, TProjection> options = null, CancellationToken cancellationToken = default(CancellationToken))
         {
-            return _unfilteredCollection.FindOneAndReplaceAsync(CombineFilters(filter), replacement, options, cancellationToken);
+            return _wrappedCollection.FindOneAndReplaceAsync(CombineFilters(filter), replacement, options, cancellationToken);
         }
 
         public override Task<TProjection> FindOneAndUpdateAsync<TProjection>(FilterDefinition<TDocument> filter, UpdateDefinition<TDocument> update, FindOneAndUpdateOptions<TDocument, TProjection> options = null, CancellationToken cancellationToken = default(CancellationToken))
         {
-            return _unfilteredCollection.FindOneAndUpdateAsync(CombineFilters(filter), update, options, cancellationToken);
+            return _wrappedCollection.FindOneAndUpdateAsync(CombineFilters(filter), update, options, cancellationToken);
         }
 
         public override Task<IAsyncCursor<TResult>> MapReduceAsync<TResult>(BsonJavaScript map, BsonJavaScript reduce, MapReduceOptions<TDocument, TResult> options = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             options = options ?? new MapReduceOptions<TDocument, TResult>();
             options.Filter = CombineFilters(options.Filter);
-            return _unfilteredCollection.MapReduceAsync(map, reduce, options, cancellationToken);
+            return _wrappedCollection.MapReduceAsync(map, reduce, options, cancellationToken);
         }
 
         // private methods

src/MongoDB.Driver/MongoCollectionImpl.cs

@@ -21,7 +21,6 @@
 using MongoDB.Bson;
 using MongoDB.Bson.IO;
 using MongoDB.Bson.Serialization;
-using MongoDB.Bson.Serialization.Serializers;
 using MongoDB.Driver.Core.Bindings;
 using MongoDB.Driver.Core.Clusters;
 using MongoDB.Driver.Core.Misc;

src/MongoDB.Driver/OfTypeMongoCollection.cs

@@ -13,14 +13,6 @@
 * limitations under the License.
 */
 
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using MongoDB.Bson;
-using MongoDB.Bson.Serialization;
-using MongoDB.Driver.Core.Clusters;
-
 namespace MongoDB.Driver
 {
     internal class OfTypeMongoCollection<TRootDocument, TDerivedDocument> : FilteredMongoCollectionBase<TDerivedDocument>
@@ -47,12 +39,12 @@ public override IFilteredMongoCollection<TMoreDerivedDocument> OfType<TMoreDeriv
 
         public override IMongoCollection<TDerivedDocument> WithReadPreference(ReadPreference readPreference)
         {
-            return new OfTypeMongoCollection<TRootDocument, TDerivedDocument>(_rootDocumentCollection, UnfilteredCollection.WithReadPreference(readPreference), Filter);
+            return new OfTypeMongoCollection<TRootDocument, TDerivedDocument>(_rootDocumentCollection, WrappedCollection.WithReadPreference(readPreference), Filter);
         }
 
         public override IMongoCollection<TDerivedDocument> WithWriteConcern(WriteConcern writeConcern)
         {
-            return new OfTypeMongoCollection<TRootDocument, TDerivedDocument>(_rootDocumentCollection, UnfilteredCollection.WithWriteConcern(writeConcern), Filter);
+            return new OfTypeMongoCollection<TRootDocument, TDerivedDocument>(_rootDocumentCollection, WrappedCollection.WithWriteConcern(writeConcern), Filter);
         }
     }
 }

src/MongoDB.Driver/OfTypeSerializer.cs

@@ -13,7 +13,6 @@
 * limitations under the License.
 */
 
-using System;
 using MongoDB.Bson.Serialization;
 using MongoDB.Bson.Serialization.Serializers;
 
@@ -41,18 +40,6 @@ public override void Serialize(BsonSerializationContext context, BsonSerializati
             _derivedDocumentSerializer.Serialize(context, args, value);
         }
 
-        public BsonSerializationInfo GetMemberSerializationInfo(string memberName)
-        {
-            BsonSerializationInfo serializationInfo;
-            if (!TryGetMemberSerializationInfo(memberName, out serializationInfo))
-            {
-                var message = string.Format("Unable to determine serialization info for {0}.", memberName);
-                throw new InvalidOperationException(message);
-            }
-
-            return serializationInfo;
-        }
-
         public bool TryGetMemberSerializationInfo(string memberName, out BsonSerializationInfo serializationInfo)
         {
             var documentSerializer = _derivedDocumentSerializer as IBsonDocumentSerializer;
@@ -65,5 +52,4 @@ public bool TryGetMemberSerializationInfo(string memberName, out BsonSerializati
             return documentSerializer.TryGetMemberSerializationInfo(memberName, out serializationInfo);
         }
     }
-
 }

src/MongoDB.Driver/PipelineDefinition.cs

@@ -162,8 +162,8 @@ public sealed class CombinedPipelineDefinition<TInput, TIntermediateOutput, TOut
         /// <param name="second">The second pipeline.</param>
         public CombinedPipelineDefinition(PipelineDefinition<TInput, TIntermediateOutput> first, PipelineDefinition<TIntermediateOutput, TOutput> second)
         {
-            _first = Ensure.IsNotNull(first, "first");
-            _second = Ensure.IsNotNull(second, "second");
+            _first = Ensure.IsNotNull(first, nameof(first));
+            _second = Ensure.IsNotNull(second, nameof(second));
         }
 
         /// <summary>