Renamed SimpleQueryBuilder to UntypedQueryBuilder.

Author: rstam

Driver/Builders/TypedQueryBuilder.cs

@@ -37,7 +37,7 @@ public class QueryBuilder<TDocument>
         private readonly BsonSerializationInfoHelper _serializationInfoHelper;
         private readonly IBsonSerializer _rootSerializer;
         private readonly PredicateTranslator _predicateTranslator;
-        private readonly SimpleQueryBuilder _queryBuilder;
+        private readonly UntypedQueryBuilder _queryBuilder;
 
         // constructors
         /// <summary>
@@ -57,7 +57,7 @@ internal QueryBuilder(BsonSerializationInfoHelper serializationInfoHelper, IBson
             _serializationInfoHelper = serializationInfoHelper;
             _rootSerializer = rootSerializer;
             _predicateTranslator = new PredicateTranslator(_serializationInfoHelper);
-            _queryBuilder = new SimpleQueryBuilder();
+            _queryBuilder = new UntypedQueryBuilder();
         }
 
         // public methods

Driver/Builders/SimpleQueryBuilder.cs renamed to Driver/Builders/UntypedQueryBuilder.cs

@@ -23,7 +23,7 @@
 
 namespace MongoDB.Driver.Builders
 {
-    internal class SimpleQueryBuilder
+    internal class UntypedQueryBuilder
     {
         // public methods
         /// <summary>

Driver/Driver.csproj

@@ -90,7 +90,7 @@
     <Compile Include="Builders\IndexOptionsBuilder.cs" />
     <Compile Include="Builders\MapReduceOptionsBuilder.cs" />
     <Compile Include="Builders\QueryBuilder.cs" />
-    <Compile Include="Builders\SimpleQueryBuilder.cs" />
+    <Compile Include="Builders\UntypedQueryBuilder.cs" />
     <Compile Include="Builders\SortByBuilder.cs" />
     <Compile Include="Builders\TypedQueryBuilder.cs" />
     <Compile Include="Builders\UpdateBuilder.cs" />
@@ -267,4 +267,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

Driver/Linq/Translators/PredicateTranslator.cs

@@ -34,7 +34,7 @@ internal class PredicateTranslator
     {
         // private fields
         private readonly BsonSerializationInfoHelper _serializationInfoHelper;
-        private readonly SimpleQueryBuilder _queryBuilder;
+        private readonly UntypedQueryBuilder _queryBuilder;
 
         // constructors
         /// <summary>
@@ -44,7 +44,7 @@ internal class PredicateTranslator
         public PredicateTranslator(BsonSerializationInfoHelper serializationHelper)
         {
             _serializationInfoHelper = serializationHelper;
-            _queryBuilder = new SimpleQueryBuilder();
+            _queryBuilder = new UntypedQueryBuilder();
         }
 
         // public methods
@@ -635,7 +635,7 @@ private IMongoQuery BuildModQuery(Expression variableExpression, ExpressionType
         private IMongoQuery BuildNotQuery(UnaryExpression unaryExpression)
         {
             var queryDocument = new QueryDocument(BuildQuery(unaryExpression.Operand).ToBsonDocument());
-            return new SimpleQueryBuilder().Not(queryDocument);
+            return new UntypedQueryBuilder().Not(queryDocument);
         }
 
         private IMongoQuery BuildOrElseQuery(BinaryExpression binaryExpression)