Renamed Func queryBuilder parameters to queryBuilderFunction. Renamed lamda parameter from q to qb in query builder functions in unit tests.

Author: rstam

Driver/Builders/QueryBuilder.cs

@@ -43,12 +43,12 @@ public static IMongoQuery Null
         /// Builds a query using a strongly-typed query builder.
         /// </summary>
         /// <typeparam name="TDocument"></typeparam>
-        /// <param name="queryBuilder">The query.</param>
+        /// <param name="queryBuilderFunction">A function that builds a query using the supplied query builder.</param>
         /// <returns>an IMongoQuery.</returns>
-        public static IMongoQuery Build<TDocument>(Func<QueryBuilder<TDocument>, IMongoQuery> queryBuilder)
+        public static IMongoQuery Build<TDocument>(Func<QueryBuilder<TDocument>, IMongoQuery> queryBuilderFunction)
         {
-            var builder = new QueryBuilder<TDocument>();
-            return queryBuilder(builder);
+            var queryBuilder = new QueryBuilder<TDocument>();
+            return queryBuilderFunction(queryBuilder);
         }
 
         /// <summary>

Driver/Builders/TypedQueryBuilder.cs

@@ -103,16 +103,16 @@ public IMongoQuery And(params IMongoQuery[] queries)
         /// </summary>
         /// <typeparam name="TValue">The type of the enumerable member values.</typeparam>
         /// <param name="memberExpression">The member expression representing the element to test.</param>
-        /// <param name="queryBuilder">The query to match elements with.</param>
+        /// <param name="elementQueryBuilderFunction">A function that builds a query using the supplied query builder.</param>
         /// <returns>
         /// An IMongoQuery.
         /// </returns>
-        public IMongoQuery ElemMatch<TValue>(Expression<Func<TDocument, IEnumerable<TValue>>> memberExpression, Func<QueryBuilder<TValue>, IMongoQuery> queryBuilder)
+        public IMongoQuery ElemMatch<TValue>(Expression<Func<TDocument, IEnumerable<TValue>>> memberExpression, Func<QueryBuilder<TValue>, IMongoQuery> elementQueryBuilderFunction)
         {
             var serializationInfo = _serializationInfoHelper.GetSerializationInfo(memberExpression);
             var itemSerializationInfo = _serializationInfoHelper.GetItemSerializationInfo("ElemMatch", serializationInfo);
             var elementQueryBuilder = new QueryBuilder<TValue>(_serializationInfoHelper, itemSerializationInfo.Serializer);
-            var elementQuery = queryBuilder(elementQueryBuilder);
+            var elementQuery = elementQueryBuilderFunction(elementQueryBuilder);
             return _queryBuilder.ElemMatch(serializationInfo.ElementName, elementQuery);
         }
 

Driver/Builders/UpdateBuilder.cs

@@ -1406,13 +1406,13 @@ public static UpdateBuilder<TDocument> Pull<TValue>(Expression<Func<TDocument, I
         /// </summary>
         /// <typeparam name="TValue">The type of the enumerable member values.</typeparam>
         /// <param name="memberExpression">The member expression.</param>
-        /// <param name="queryBuilder">A query that specifies which elements to remove.</param>
+        /// <param name="elementQueryBuilderFunction">A function that builds a query using the supplied query builder.</param>
         /// <returns>
         /// The builder (so method calls can be chained).
         /// </returns>
-        public static UpdateBuilder<TDocument> Pull<TValue>(Expression<Func<TDocument, IEnumerable<TValue>>> memberExpression, Func<QueryBuilder<TValue>, IMongoQuery> queryBuilder)
+        public static UpdateBuilder<TDocument> Pull<TValue>(Expression<Func<TDocument, IEnumerable<TValue>>> memberExpression, Func<QueryBuilder<TValue>, IMongoQuery> elementQueryBuilderFunction)
         {
-            return new UpdateBuilder<TDocument>().Pull(memberExpression, queryBuilder);
+            return new UpdateBuilder<TDocument>().Pull(memberExpression, elementQueryBuilderFunction);
         }
 
         /// <summary>
@@ -1794,25 +1794,25 @@ public UpdateBuilder<TDocument> Pull<TValue>(Expression<Func<TDocument, IEnumera
         /// </summary>
         /// <typeparam name="TValue">The type of the enumerable member values.</typeparam>
         /// <param name="memberExpression">The member expression.</param>
-        /// <param name="queryBuilder">A query that specifies which elements to remove.</param>
+        /// <param name="elementQueryBuilderFunction">A function that builds a query using the supplied query builder.</param>
         /// <returns>
         /// The builder (so method calls can be chained).
         /// </returns>
-        public UpdateBuilder<TDocument> Pull<TValue>(Expression<Func<TDocument, IEnumerable<TValue>>> memberExpression, Func<QueryBuilder<TValue>, IMongoQuery> queryBuilder)
+        public UpdateBuilder<TDocument> Pull<TValue>(Expression<Func<TDocument, IEnumerable<TValue>>> memberExpression, Func<QueryBuilder<TValue>, IMongoQuery> elementQueryBuilderFunction)
         {
             if (memberExpression == null)
             {
                 throw new ArgumentNullException("memberExpression");
             }
-            if (queryBuilder == null)
+            if (elementQueryBuilderFunction == null)
             {
-                throw new ArgumentNullException("queryBuilder");
+                throw new ArgumentNullException("elementQueryBuilderFunction");
             }
 
             var serializationInfo = _serializationInfoHelper.GetSerializationInfo(memberExpression);
             var itemSerializationInfo = _serializationInfoHelper.GetItemSerializationInfo("Pull", serializationInfo);
             var elementQueryBuilder = new QueryBuilder<TValue>(_serializationInfoHelper, itemSerializationInfo.Serializer);
-            var elementQuery = queryBuilder(elementQueryBuilder);
+            var elementQuery = elementQueryBuilderFunction(elementQueryBuilder);
             _updateBuilder = _updateBuilder.Pull(serializationInfo.ElementName, elementQuery);
             return this;
         }