Preserve `GetMongoQueryable/GetMongoQueryableAsync` for backward compatilibity.

framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/IMongoDbRepository.cs

@@ -3,7 +3,6 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using MongoDB.Driver;
-using MongoDB.Driver.Linq;
 using Volo.Abp.Domain.Entities;
 
 namespace Volo.Abp.Domain.Repositories.MongoDB;
@@ -21,6 +20,12 @@ public interface IMongoDbRepository<TEntity> : IRepository<TEntity>
 
     Task<IMongoCollection<TEntity>> GetCollectionAsync(CancellationToken cancellationToken = default);
 
+    [Obsolete("Use GetQueryable method.")]
+    IQueryable<TEntity> GetMongoQueryable();
+
+    [Obsolete("Use GetQueryableAsync method.")]
+    Task<IQueryable<TEntity>> GetMongoQueryableAsync(CancellationToken cancellationToken = default, AggregateOptions? options = null);
+
     Task<IQueryable<TEntity>> GetQueryableAsync(CancellationToken cancellationToken = default, AggregateOptions? options = null);
 
     Task<IAggregateFluent<TEntity>> GetAggregateAsync(CancellationToken cancellationToken = default, AggregateOptions? options = null);

framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/MongoDbRepository.cs

@@ -499,7 +499,7 @@ public class MongoDbRepository<TMongoDbContext, TEntity>
         await DeleteManyAsync(entities, autoSave, cancellationToken);
     }
 
-    public override async Task DeleteDirectAsync(Expression<Func<TEntity, bool>> predicate, CancellationToken cancellationToken = default)
+    public async override Task DeleteDirectAsync(Expression<Func<TEntity, bool>> predicate, CancellationToken cancellationToken = default)
     {
         cancellationToken = GetCancellationToken(cancellationToken);
 
@@ -523,6 +523,21 @@ public class MongoDbRepository<TMongoDbContext, TEntity>
         }
     }
 
+    [Obsolete("Use GetQueryableAsync method.")]
+    protected override IQueryable<TEntity> GetQueryable()
+    {
+        return ApplyDataFilters(
+            SessionHandle != null
+                ? Collection.AsQueryable(SessionHandle)
+                : Collection.AsQueryable()
+        );
+    }
+
+    public async override Task<IQueryable<TEntity>> GetQueryableAsync()
+    {
+        return await GetQueryableAsync();
+    }
+
     public async override Task<TEntity?> FindAsync(
         Expression<Func<TEntity, bool>> predicate,
         bool includeDetails = true,
@@ -536,21 +551,18 @@ public class MongoDbRepository<TMongoDbContext, TEntity>
     }
 
     [Obsolete("Use GetQueryableAsync method.")]
-    protected override IQueryable<TEntity> GetQueryable()
+    public virtual IQueryable<TEntity> GetMongoQueryable()
     {
-        return ApplyDataFilters(
+        return GetQueryable();
-            SessionHandle != null
-                ? Collection.AsQueryable(SessionHandle)
-                : Collection.AsQueryable()
-        );
     }
 
-    public async override Task<IQueryable<TEntity>> GetQueryableAsync()
+    [Obsolete("Use GetQueryableAsync method.")]
+    public virtual Task<IQueryable<TEntity>> GetMongoQueryableAsync(CancellationToken cancellationToken = default, AggregateOptions? options = null)
     {
-        return await GetQueryableAsync<TEntity>();
+        return GetQueryableAsync<TEntity>(cancellationToken, options);
     }
 
-    public async Task<IQueryable<TEntity>> GetQueryableAsync(CancellationToken cancellationToken = default, AggregateOptions? options = null)
+    public virtual async Task<IQueryable<TEntity>> GetQueryableAsync(CancellationToken cancellationToken = default, AggregateOptions? options = null)
     {
         return await GetQueryableAsync<TEntity>(cancellationToken, options);
     }

framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDbCoreRepositoryExtensions.cs

@@ -3,7 +3,6 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using MongoDB.Driver;
-using MongoDB.Driver.Linq;
 using Volo.Abp.Domain.Entities;
 using Volo.Abp.Domain.Repositories.MongoDB;
 
@@ -37,17 +36,31 @@ public static class MongoDbCoreRepositoryExtensions
         return repository.ToMongoDbRepository().GetCollectionAsync(cancellationToken);
     }
 
+    [Obsolete("Use GetQueryableAsync method.")]
+    public static IQueryable<TEntity> GetMongoQueryable<TEntity>(this IReadOnlyBasicRepository<TEntity> repository)
+        where TEntity : class, IEntity
+    {
+        return repository.ToMongoDbRepository().GetMongoQueryable();
+    }
+
+    [Obsolete("Use GetQueryableAsync method.")]
+    public static Task<IQueryable<TEntity>> GetMongoQueryableAsync<TEntity>(this IReadOnlyBasicRepository<TEntity> repository, CancellationToken cancellationToken = default, AggregateOptions? aggregateOptions = null)
+        where TEntity : class, IEntity
+    {
+        return repository.ToMongoDbRepository().GetMongoQueryableAsync(cancellationToken, aggregateOptions);
+    }
+
     [Obsolete("Use GetQueryableAsync method.")]
     public static IQueryable<TEntity> GetQueryable<TEntity>(this IReadOnlyBasicRepository<TEntity> repository)
         where TEntity : class, IEntity
     {
-        return repository.ToMongoDbRepository().GetQueryable();
+        return repository.ToMongoDbRepository().GetMongoQueryable();
     }
 
-    public static Task<IQueryable<TEntity>> GetQueryableAsync<TEntity>(this IReadOnlyBasicRepository<TEntity> repository, CancellationToken cancellationToken = default, AggregateOptions? aggregateOptions = null)
+    public static Task<IQueryable<TEntity>> GetQueryableAsync<TEntity>(this IReadOnlyBasicRepository<TEntity> repository)
         where TEntity : class, IEntity
     {
-        return repository.ToMongoDbRepository().GetQueryableAsync(cancellationToken, aggregateOptions);
+        return repository.ToMongoDbRepository().GetQueryableAsync();
     }
 
     public static Task<IAggregateFluent<TEntity>> GetAggregateAsync<TEntity>(this IReadOnlyBasicRepository<TEntity> repository, CancellationToken cancellationToken = default, AggregateOptions? aggregateOptions = null)