CSHARP-5233: Remove IMongoQueryable interface.

Author: rstam

src/MongoDB.Driver/IMongoCollectionExtensions.cs

@@ -15,6 +15,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Linq.Expressions;
 using System.Threading;
 using System.Threading.Tasks;
@@ -67,7 +68,7 @@ public static IAggregateFluent<TDocument> Aggregate<TDocument>(this IMongoCollec
         /// <param name="collection">The collection.</param>
         /// <param name="aggregateOptions">The aggregate options</param>
         /// <returns>A queryable source of documents.</returns>
-        public static IMongoQueryable<TDocument> AsQueryable<TDocument>(this IMongoCollection<TDocument> collection, AggregateOptions aggregateOptions = null)
+        public static IQueryable<TDocument> AsQueryable<TDocument>(this IMongoCollection<TDocument> collection, AggregateOptions aggregateOptions = null)
         {
             Ensure.IsNotNull(collection, nameof(collection));
 
@@ -82,7 +83,7 @@ public static IMongoQueryable<TDocument> AsQueryable<TDocument>(this IMongoColle
         /// <param name="session">The session.</param>
         /// <param name="aggregateOptions">The aggregate options</param>
         /// <returns>A queryable source of documents.</returns>
-        public static IMongoQueryable<TDocument> AsQueryable<TDocument>(this IMongoCollection<TDocument> collection, IClientSessionHandle session, AggregateOptions aggregateOptions = null)
+        public static IQueryable<TDocument> AsQueryable<TDocument>(this IMongoCollection<TDocument> collection, IClientSessionHandle session, AggregateOptions aggregateOptions = null)
         {
             Ensure.IsNotNull(collection, nameof(collection));
             Ensure.IsNotNull(session, nameof(session));
@@ -2652,7 +2653,7 @@ public static Task<IChangeStreamCursor<ChangeStreamDocument<TDocument>>> WatchAs
         }
 
         // private static methods
-        private static IMongoQueryable<TDocument> AsQueryableHelper<TDocument>(IMongoCollection<TDocument> collection, IClientSessionHandle session, AggregateOptions aggregateOptions)
+        private static IQueryable<TDocument> AsQueryableHelper<TDocument>(IMongoCollection<TDocument> collection, IClientSessionHandle session, AggregateOptions aggregateOptions)
         {
             aggregateOptions = aggregateOptions ?? new AggregateOptions();
             return LinqProviderAdapter.AsQueryable(collection, session, aggregateOptions);

src/MongoDB.Driver/IMongoDatabaseExtensions.cs

@@ -13,6 +13,7 @@
 * limitations under the License.
 */
 
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using MongoDB.Bson;
@@ -62,7 +63,7 @@ public static IAggregateFluent<NoPipelineInput> Aggregate(this IMongoDatabase da
         /// <param name="database">The database.</param>
         /// <param name="aggregateOptions">The aggregate options</param>
         /// <returns>A queryable source of documents.</returns>
-        public static IMongoQueryable<NoPipelineInput> AsQueryable(this IMongoDatabase database, AggregateOptions aggregateOptions = null)
+        public static IQueryable<NoPipelineInput> AsQueryable(this IMongoDatabase database, AggregateOptions aggregateOptions = null)
         {
             Ensure.IsNotNull(database, nameof(database));
 
@@ -76,7 +77,7 @@ public static IMongoQueryable<NoPipelineInput> AsQueryable(this IMongoDatabase d
         /// <param name="session">The session.</param>
         /// <param name="aggregateOptions">The aggregate options</param>
         /// <returns>A queryable source of documents.</returns>
-        public static IMongoQueryable<NoPipelineInput> AsQueryable(this IMongoDatabase database, IClientSessionHandle session, AggregateOptions aggregateOptions = null)
+        public static IQueryable<NoPipelineInput> AsQueryable(this IMongoDatabase database, IClientSessionHandle session, AggregateOptions aggregateOptions = null)
         {
             Ensure.IsNotNull(database, nameof(database));
             Ensure.IsNotNull(session, nameof(session));
@@ -167,7 +168,7 @@ public static Task<IChangeStreamCursor<ChangeStreamDocument<BsonDocument>>> Watc
         }
 
         // private static methods
-        private static IMongoQueryable<NoPipelineInput> AsQueryableHelper(IMongoDatabase database, IClientSessionHandle session, AggregateOptions aggregateOptions)
+        private static IQueryable<NoPipelineInput> AsQueryableHelper(IMongoDatabase database, IClientSessionHandle session, AggregateOptions aggregateOptions)
         {
             aggregateOptions = aggregateOptions ?? new AggregateOptions();
             return LinqProviderAdapter.AsQueryable(database, session, aggregateOptions);

src/MongoDB.Driver/Linq/IMongoQueryable.cs

@@ -0,0 +1,58 @@
+/* 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.Linq;
+using MongoDB.Bson;
+using MongoDB.Driver.Core.Misc;
+
+namespace MongoDB.Driver.Linq
+{
+    /// <summary>
+    /// Extension methods for IQueryble.
+    /// </summary>
+    public static class IQueryableExtensions
+    {
+
+        /// <summary>
+        /// Gets the most recently logged stages.
+        /// </summary>
+        /// <typeparam name="TSource">The type of the source documents.</typeparam>
+        /// <param name="source">The source.</param>
+        /// <returns>The logged stages.</returns>
+        public static BsonDocument[] GetLoggedStages<TSource>(this IQueryable<TSource> source)
+        {
+            Ensure.IsNotNull(source, nameof(source));
+            return source.GetMongoQueryProvider().LoggedStages;
+        }
+
+        /// <summary>
+        /// Gets the source's provider cast to an IMongoQueryProvider.
+        /// </summary>
+        /// <param name="source">The source.</param>
+        /// <returns>The MongoDB query provider.</returns>
+        public static IMongoQueryProvider GetMongoQueryProvider(this IQueryable source)
+        {
+            Ensure.IsNotNull(source, nameof(source));
+            var provider = source.Provider as IMongoQueryProvider;
+            if (provider == null)
+            {
+                throw new ArgumentException($"The source argument must be a MongoDB IQueryable.", nameof(source));
+            }
+
+            return provider;
+        }
+    }
+}

src/MongoDB.Driver/Linq/IQueryableExtensions.cs

@@ -14,6 +14,7 @@
 */
 
 using System;
+using System.Linq;
 using System.Linq.Expressions;
 using MongoDB.Bson.Serialization;
 
@@ -38,14 +39,14 @@ public static object Evaluate(this Expression expression)
         public static (string CollectionName, IBsonSerializer DocumentSerializer) GetCollectionInfo(this Expression innerExpression, Expression containerExpression)
         {
             if (innerExpression is ConstantExpression constantExpression &&
-                constantExpression.Value is IMongoQueryable mongoQueryable &&
-                mongoQueryable.Provider is IMongoQueryProviderInternal mongoQueryProvider &&
+                constantExpression.Value is IQueryable queryable &&
+                queryable.Provider is IMongoQueryProviderInternal mongoQueryProvider &&
                 mongoQueryProvider.CollectionNamespace != null)
             {
                 return (mongoQueryProvider.CollectionNamespace.CollectionName, mongoQueryProvider.PipelineInputSerializer);
             }
 
-            var message = $"inner expression is not an IMongoQueryable representing a collection";
+            var message = $"inner expression must be a MongoDB IQueryable against a collection";
             throw new ExpressionNotSupportedException(innerExpression, containerExpression, because: message);
         }
 

src/MongoDB.Driver/Linq/Linq3Implementation/ExtensionMethods/ExpressionExtensions.cs

@@ -18,7 +18,6 @@
 using System.Linq.Expressions;
 using MongoDB.Bson;
 using MongoDB.Bson.Serialization;
-using MongoDB.Bson.Serialization.Options;
 using MongoDB.Bson.Serialization.Serializers;
 
 namespace MongoDB.Driver.Linq.Linq3Implementation.Misc
@@ -102,22 +101,6 @@ public static bool IsWideningConvert(Type sourceType, Type targetType)
             return __wideningConverts.Contains((sourceType, targetType));
         }
 
-        public static Expression RemoveConvertToMongoQueryable(Expression expression)
-        {
-            if (expression.NodeType == ExpressionType.Convert)
-            {
-                var convertExpression = (UnaryExpression)expression;
-                var convertToType = convertExpression.Type;
-                if (convertToType.IsGenericType &&
-                    convertToType.GetGenericTypeDefinition() == typeof(IMongoQueryable<>))
-                {
-                    return convertExpression.Operand;
-                }
-            }
-
-            throw new ExpressionNotSupportedException(expression);
-        }
-
         public static Expression RemoveConvertToEnumUnderlyingType(Expression expression)
         {
             if (expression.NodeType == ExpressionType.Convert)

src/MongoDB.Driver/Linq/Linq3Implementation/Misc/ConvertHelper.cs

@@ -31,7 +31,7 @@ internal abstract class MongoQuery<TOutput>
         public abstract Task<IAsyncCursor<TOutput>> ExecuteAsync();
     }
 
-    internal class MongoQuery<TDocument, TOutput> : MongoQuery<TOutput>, IOrderedMongoQueryable<TOutput>, IMongoQueryableForwarder<TOutput>
+    internal class MongoQuery<TDocument, TOutput> : MongoQuery<TOutput>, IOrderedQueryable<TOutput>, IAsyncCursorSource<TOutput>, IMongoQueryableForwarder<TOutput>
     {
         // private fields
         private readonly Expression _expression;