Changed IEnumerable<TMember> to IEnumerable<TValue> in typed builders. Renamed some variables to more closely align with their type names. Replaced a few <V> with <TMember>.

Author: rstam

Driver/Builders/FieldsBuilder.cs

@@ -18,6 +18,7 @@
 using System.Linq;
 using System.Linq.Expressions;
 using System.Text;
+
 using MongoDB.Bson;
 using MongoDB.Bson.IO;
 using MongoDB.Bson.Serialization;
@@ -197,10 +198,8 @@ public static IMongoFields Null
         /// <summary>
         /// Adds one or more field names to be excluded from the results.
         /// </summary>
-        /// <param name="memberExpressions">One or more field names.</param>
-        /// <returns>
-        /// The builder (so method calls can be chained).
-        /// </returns>
+        /// <param name="memberExpressions">The member expressions.</param>
+        /// <returns>The builder (so method calls can be chained).</returns>
         public static FieldsBuilder<TDocument> Exclude(params Expression<Func<TDocument, object>>[] memberExpressions)
         {
             return new FieldsBuilder<TDocument>().Exclude(memberExpressions);
@@ -210,9 +209,7 @@ public static FieldsBuilder<TDocument> Exclude(params Expression<Func<TDocument,
         /// Adds one or more field names to be included in the results.
         /// </summary>
         /// <param name="memberExpressions">The member expressions.</param>
-        /// <returns>
-        /// The builder (so method calls can be chained).
-        /// </returns>
+        /// <returns>The builder (so method calls can be chained).</returns>
         public static FieldsBuilder<TDocument> Include(params Expression<Func<TDocument, object>>[] memberExpressions)
         {
             return new FieldsBuilder<TDocument>().Include(memberExpressions);
@@ -221,28 +218,24 @@ public static FieldsBuilder<TDocument> Include(params Expression<Func<TDocument,
         /// <summary>
         /// Adds a slice to be included in the results.
         /// </summary>
-        /// <typeparam name="TMember">The type of the member.</typeparam>
+        /// <typeparam name="TValue">The type of the enumerable member values.</typeparam>
         /// <param name="memberExpression">The member expression.</param>
         /// <param name="size">The size of the slice (negative sizes are taken from the end).</param>
-        /// <returns>
-        /// The builder (so method calls can be chained).
-        /// </returns>
-        public static FieldsBuilder<TDocument> Slice<TMember>(Expression<Func<TDocument, IEnumerable<TMember>>> memberExpression, int size)
+        /// <returns>The builder (so method calls can be chained).</returns>
+        public static FieldsBuilder<TDocument> Slice<TValue>(Expression<Func<TDocument, IEnumerable<TValue>>> memberExpression, int size)
         {
             return new FieldsBuilder<TDocument>().Slice(memberExpression, size);
         }
 
         /// <summary>
         /// Adds a slice to be included in the results.
         /// </summary>
-        /// <typeparam name="TMember">The type of the member.</typeparam>
+        /// <typeparam name="TValue">The type of the enumerable member values.</typeparam>
         /// <param name="memberExpression">The member expression.</param>
         /// <param name="skip">The number of values to skip.</param>
         /// <param name="limit">The number of values to extract.</param>
-        /// <returns>
-        /// The builder (so method calls can be chained).
-        /// </returns>
-        public static FieldsBuilder<TDocument> Slice<TMember>(Expression<Func<TDocument, IEnumerable<TMember>>> memberExpression, int skip, int limit)
+        /// <returns>The builder (so method calls can be chained).</returns>
+        public static FieldsBuilder<TDocument> Slice<TValue>(Expression<Func<TDocument, IEnumerable<TValue>>> memberExpression, int skip, int limit)
         {
             return new FieldsBuilder<TDocument>().Slice(memberExpression, skip, limit);
         }
@@ -255,7 +248,8 @@ public static FieldsBuilder<TDocument> Slice<TMember>(Expression<Func<TDocument,
     [Serializable]
     public class FieldsBuilder<TDocument> : BuilderBase, IMongoFields
     {
-        private readonly BsonSerializationInfoHelper _serializationHelper;
+        // private fields
+        private readonly BsonSerializationInfoHelper _serializationInfoHelper;
         private FieldsBuilder _fieldsBuilder;
 
         // constructors
@@ -264,7 +258,7 @@ public class FieldsBuilder<TDocument> : BuilderBase, IMongoFields
         /// </summary>
         public FieldsBuilder()
         {
-            _serializationHelper = new BsonSerializationInfoHelper();
+            _serializationInfoHelper = new BsonSerializationInfoHelper();
             _fieldsBuilder = new FieldsBuilder();
         }
 
@@ -273,13 +267,10 @@ public FieldsBuilder()
         /// Adds one or more field names to be excluded from the results.
         /// </summary>
         /// <param name="memberExpressions">The member expressions.</param>
-        /// <returns>
-        /// The builder (so method calls can be chained).
-        /// </returns>
+        /// <returns>The builder (so method calls can be chained).</returns>
         public FieldsBuilder<TDocument> Exclude(params Expression<Func<TDocument, object>>[] memberExpressions)
         {
             var elementNames = GetElementNames(memberExpressions);
-
             _fieldsBuilder = _fieldsBuilder.Exclude(elementNames.ToArray());
             return this;
         }
@@ -288,61 +279,53 @@ public FieldsBuilder<TDocument> Exclude(params Expression<Func<TDocument, object
         /// Adds one or more field names to be included in the results.
         /// </summary>
         /// <param name="memberExpressions">The member expressions.</param>
-        /// <returns>
-        /// The builder (so method calls can be chained).
-        /// </returns>
+        /// <returns>The builder (so method calls can be chained).</returns>
         public FieldsBuilder<TDocument> Include(params Expression<Func<TDocument, object>>[] memberExpressions)
         {
             var elementNames = GetElementNames(memberExpressions);
-
             _fieldsBuilder = _fieldsBuilder.Include(elementNames.ToArray());
             return this;
         }
 
         /// <summary>
         /// Adds a slice to be included in the results.
         /// </summary>
-        /// <typeparam name="TMember">The type of the member.</typeparam>
+        /// <typeparam name="TValue">The type of the enumerable member values.</typeparam>
         /// <param name="memberExpression">The member expression.</param>
         /// <param name="size">The size of the slice (negative sizes are taken from the end).</param>
-        /// <returns>
-        /// The builder (so method calls can be chained).
-        /// </returns>
-        public FieldsBuilder<TDocument> Slice<TMember>(Expression<Func<TDocument, IEnumerable<TMember>>> memberExpression, int size)
+        /// <returns>The builder (so method calls can be chained).</returns>
+        public FieldsBuilder<TDocument> Slice<TValue>(Expression<Func<TDocument, IEnumerable<TValue>>> memberExpression, int size)
         {
-            var info = _serializationHelper.GetSerializationInfo(memberExpression);
-            _fieldsBuilder = _fieldsBuilder.Slice(info.ElementName, size);
+            var serializationInfo = _serializationInfoHelper.GetSerializationInfo(memberExpression);
+            _fieldsBuilder = _fieldsBuilder.Slice(serializationInfo.ElementName, size);
             return this;
         }
 
         /// <summary>
         /// Adds a slice to be included in the results.
         /// </summary>
-        /// <typeparam name="TMember">The type of the member.</typeparam>
+        /// <typeparam name="TValue">The type of the enumerable member values.</typeparam>
         /// <param name="memberExpression">The member expression.</param>
         /// <param name="skip">The number of values to skip.</param>
         /// <param name="limit">The number of values to extract.</param>
-        /// <returns>
-        /// The builder (so method calls can be chained).
-        /// </returns>
-        public FieldsBuilder<TDocument> Slice<TMember>(Expression<Func<TDocument, IEnumerable<TMember>>> memberExpression, int skip, int limit)
+        /// <returns>The builder (so method calls can be chained).</returns>
+        public FieldsBuilder<TDocument> Slice<TValue>(Expression<Func<TDocument, IEnumerable<TValue>>> memberExpression, int skip, int limit)
         {
-            var info = _serializationHelper.GetSerializationInfo(memberExpression);
-            _fieldsBuilder = _fieldsBuilder.Slice(info.ElementName, skip, limit);
+            var serializationInfo = _serializationInfoHelper.GetSerializationInfo(memberExpression);
+            _fieldsBuilder = _fieldsBuilder.Slice(serializationInfo.ElementName, skip, limit);
             return this;
         }
 
         /// <summary>
         /// Converts this object to a BsonDocument.
         /// </summary>
-        /// <returns>
-        /// A BsonDocument.
-        /// </returns>
+        /// <returns>A BsonDocument.</returns>
         public override BsonDocument ToBsonDocument()
         {
             return _fieldsBuilder.ToBsonDocument();
         }
 
+        // protected methods
         /// <summary>
         /// Serializes the result of the builder to a BsonWriter.
         /// </summary>
@@ -354,10 +337,11 @@ protected override void Serialize(BsonWriter bsonWriter, Type nominalType, IBson
             ((IBsonSerializable)_fieldsBuilder).Serialize(bsonWriter, nominalType, options);
         }
 
+        // private methods
         private IEnumerable<string> GetElementNames(IEnumerable<Expression<Func<TDocument, object>>> memberExpressions)
         {
             var elementNames = memberExpressions
-                .Select(x => _serializationHelper.GetSerializationInfo(x))
+                .Select(x => _serializationInfoHelper.GetSerializationInfo(x))
                 .Select(x => x.ElementName);
             return elementNames;
         }

Driver/Builders/GeoHaystackSearchOptionsBuilder.cs

@@ -18,6 +18,7 @@
 using System.Linq;
 using System.Linq.Expressions;
 using System.Text;
+
 using MongoDB.Bson;
 using MongoDB.Bson.IO;
 using MongoDB.Bson.Serialization;
@@ -189,9 +190,7 @@ public static GeoHaystackSearchOptionsBuilder<TDocument> SetMaxDistance(double v
         /// <typeparam name="TMember">The member type.</typeparam>
         /// <param name="memberExpression">The member expression.</param>
         /// <param name="value">The value fo the additional field.</param>
-        /// <returns>
-        /// The builder (so method calls can be chained).
-        /// </returns>
+        /// <returns>The builder (so method calls can be chained).</returns>
         public static GeoHaystackSearchOptionsBuilder<TDocument> SetQuery<TMember>(Expression<Func<TDocument, TMember>> memberExpression, TMember value)
         {
             return new GeoHaystackSearchOptionsBuilder<TDocument>().SetQuery(memberExpression, value);
@@ -205,7 +204,8 @@ public static GeoHaystackSearchOptionsBuilder<TDocument> SetQuery<TMember>(Expre
     [Serializable]
     public class GeoHaystackSearchOptionsBuilder<TDocument> : BuilderBase, IMongoGeoHaystackSearchOptions
     {
-        private readonly BsonSerializationInfoHelper _serializationHelper;
+        // private fields
+        private readonly BsonSerializationInfoHelper _serializationInfoHelper;
         private GeoHaystackSearchOptionsBuilder _geoHaystackBuilder;
 
         // constructors
@@ -214,7 +214,7 @@ public class GeoHaystackSearchOptionsBuilder<TDocument> : BuilderBase, IMongoGeo
         /// </summary>
         public GeoHaystackSearchOptionsBuilder()
         {
-            _serializationHelper = new BsonSerializationInfoHelper();
+            _serializationInfoHelper = new BsonSerializationInfoHelper();
             _geoHaystackBuilder = new GeoHaystackSearchOptionsBuilder();
         }
 
@@ -247,28 +247,25 @@ public GeoHaystackSearchOptionsBuilder<TDocument> SetMaxDistance(double value)
         /// <typeparam name="TMember">The type of the member.</typeparam>
         /// <param name="memberExpression">The member expression.</param>
         /// <param name="value">The value fo the additional field.</param>
-        /// <returns>
-        /// The builder (so method calls can be chained).
-        /// </returns>
+        /// <returns>The builder (so method calls can be chained).</returns>
         public GeoHaystackSearchOptionsBuilder<TDocument> SetQuery<TMember>(Expression<Func<TDocument, TMember>> memberExpression, TMember value)
         {
-            var info = _serializationHelper.GetSerializationInfo(memberExpression);
-            var serializedValue = _serializationHelper.SerializeValue(info, value);
-            _geoHaystackBuilder = _geoHaystackBuilder.SetQuery(info.ElementName, serializedValue);
+            var serializationInfo = _serializationInfoHelper.GetSerializationInfo(memberExpression);
+            var serializedValue = _serializationInfoHelper.SerializeValue(serializationInfo, value);
+            _geoHaystackBuilder = _geoHaystackBuilder.SetQuery(serializationInfo.ElementName, serializedValue);
             return this;
         }
 
         /// <summary>
         /// Converts this object to a BsonDocument.
         /// </summary>
-        /// <returns>
-        /// A BsonDocument.
-        /// </returns>
+        /// <returns>A BsonDocument.</returns>
         public override BsonDocument ToBsonDocument()
         {
             return _geoHaystackBuilder.ToBsonDocument();
         }
 
+        // protected methods
         /// <summary>
         /// Serializes the result of the builder to a BsonWriter.
         /// </summary>
@@ -280,4 +277,4 @@ protected override void Serialize(BsonWriter bsonWriter, Type nominalType, IBson
             ((IBsonSerializable)_geoHaystackBuilder).Serialize(bsonWriter, nominalType, options);
         }
     }
-}
+}

Driver/Builders/GroupByBuilder.cs

@@ -18,6 +18,7 @@
 using System.Linq;
 using System.Linq.Expressions;
 using System.Text;
+
 using MongoDB.Bson;
 using MongoDB.Bson.IO;
 using MongoDB.Bson.Serialization;
@@ -61,6 +62,7 @@ public class GroupByBuilder : BuilderBase, IMongoGroupBy
         // private fields
         private BsonDocument _document;
 
+        // constructors
         /// <summary>
         /// Initializes a new instance of the <see cref="GroupByBuilder"/> class.
         /// </summary>
@@ -69,7 +71,6 @@ public GroupByBuilder()
             _document = new BsonDocument();
         }
 
-        // constructors
         /// <summary>
         /// Initializes a new instance of the GroupByBuilder class.
         /// </summary>
@@ -85,9 +86,7 @@ public GroupByBuilder(string[] names)
         /// Sets one or more key names.
         /// </summary>
         /// <param name="names">The names.</param>
-        /// <returns>
-        /// The builder (so method calls can be chained).
-        /// </returns>
+        /// <returns>The builder (so method calls can be chained).</returns>
         public GroupByBuilder Keys(params string[] names)
         {
             foreach (var name in names)
@@ -126,6 +125,7 @@ protected override void Serialize(BsonWriter bsonWriter, Type nominalType, IBson
     /// <typeparam name="TDocument">The type of the document.</typeparam>
     public static class GroupBy<TDocument>
     {
+        // public static methods
         /// <summary>
         /// Sets one or more key names.
         /// </summary>
@@ -143,29 +143,30 @@ public static GroupByBuilder<TDocument> Keys(params Expression<Func<TDocument, o
     /// <typeparam name="TDocument">The type of the document.</typeparam>
     public class GroupByBuilder<TDocument> : BuilderBase, IMongoGroupBy
     {
-        private readonly BsonSerializationInfoHelper _serializationHelper;
+        // private fields
+        private readonly BsonSerializationInfoHelper _serializationInfoHelper;
         private GroupByBuilder _groupByBuilder;
 
+        // constructors
         /// <summary>
         /// Initializes a new instance of the <see cref="GroupByBuilder&lt;TDocument&gt;"/> class.
         /// </summary>
         public GroupByBuilder()
         {
-            _serializationHelper = new BsonSerializationInfoHelper();
+            _serializationInfoHelper = new BsonSerializationInfoHelper();
             _groupByBuilder = new GroupByBuilder();
         }
 
+        // public methods
         /// <summary>
         /// Sets one or more key names.
         /// </summary>
         /// <param name="memberExpressions">One or more key names.</param>
-        /// <returns>
-        /// The builder (so method calls can be chained).
-        /// </returns>
+        /// <returns>The builder (so method calls can be chained).</returns>
         public GroupByBuilder<TDocument> Keys(params Expression<Func<TDocument, object>>[] memberExpressions)
         {
             var names = memberExpressions
-                .Select(x => _serializationHelper.GetSerializationInfo(x))
+                .Select(x => _serializationInfoHelper.GetSerializationInfo(x))
                 .Select(x => x.ElementName);
 
             _groupByBuilder = _groupByBuilder.Keys(names.ToArray());
@@ -175,14 +176,13 @@ public GroupByBuilder<TDocument> Keys(params Expression<Func<TDocument, object>>
         /// <summary>
         /// Converts this object to a BsonDocument.
         /// </summary>
-        /// <returns>
-        /// A BsonDocument.
-        /// </returns>
+        /// <returns>A BsonDocument.</returns>
         public override BsonDocument ToBsonDocument()
         {
             return _groupByBuilder.ToBsonDocument();
         }
 
+        // protected methods
         /// <summary>
         /// Serializes the result of the builder to a BsonWriter.
         /// </summary>
@@ -194,4 +194,4 @@ protected override void Serialize(BsonWriter bsonWriter, Type nominalType, IBson
             ((IBsonSerializable)_groupByBuilder).Serialize(bsonWriter, nominalType, options);
         }
     }
-}
+}