Move new IAggregateFluent members to extension methods

Author: ajcvickers

src/MongoDB.Driver/AggregateFluent.cs

@@ -299,12 +299,6 @@ public override IAggregateFluent<TResult> Search(
             return WithPipeline(_pipeline.Search(searchDefinition, searchOptions));
         }
 
-        public override IAggregateFluent<TNewResult> Search<TNewResult>(
-            SearchDefinition<TResult> searchDefinition,
-            FieldDefinition<TResult, IEnumerable<TNewResult>> returnScope,
-            SearchOptions<TResult> searchOptions = null)
-            => WithPipeline(_pipeline.Search(searchDefinition, returnScope, searchOptions));
-
         public override IAggregateFluent<SearchMetaResult> SearchMeta(
             SearchDefinition<TResult> searchDefinition,
             string indexName = null,
@@ -313,13 +307,6 @@ public override IAggregateFluent<SearchMetaResult> SearchMeta(
             return WithPipeline(_pipeline.SearchMeta(searchDefinition, indexName, count));
         }
 
-        public override IAggregateFluent<SearchMetaResult> SearchMeta(
-            SearchDefinition<TResult> searchDefinition,
-            FieldDefinition<TResult> returnScope,
-            string indexName = null,
-            SearchCountOptions count = null)
-            => WithPipeline(_pipeline.SearchMeta(searchDefinition, returnScope, indexName, count));
-
         public override IAggregateFluent<TResult> Set(SetFieldDefinitions<TResult> fields)
         {
             return WithPipeline(_pipeline.Set(fields));

src/MongoDB.Driver/AggregateFluentBase.cs

@@ -15,7 +15,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq.Expressions;
 using System.Threading;
 using System.Threading.Tasks;
 using MongoDB.Bson;
@@ -257,50 +256,13 @@ public virtual IAggregateFluent<TResult> Search(
             SearchOptions<TResult> searchOptions)
             => throw new NotImplementedException();
 
-        /// <inheritdoc />
-        public virtual IAggregateFluent<TNewResult> Search<TNewResult>(
-            SearchDefinition<TResult> searchDefinition,
-            FieldDefinition<TResult, IEnumerable<TNewResult>> returnScope,
-            SearchOptions<TResult> searchOptions = null)
-            => throw new NotImplementedException();
-
-        /// <inheritdoc />
-        public virtual IAggregateFluent<TNewResult> Search<TNewResult>(
-            SearchDefinition<TResult> searchDefinition,
-            Expression<Func<TResult, IEnumerable<TNewResult>>> returnScope,
-            SearchOptions<TResult> searchOptions = null)
-            => Search(
-                searchDefinition,
-                new ExpressionFieldDefinition<TResult, IEnumerable<TNewResult>>(returnScope),
-                searchOptions);
-
-        /// <inheritdoc />
-        public virtual IAggregateFluent<SearchMetaResult> SearchMeta(
-            SearchDefinition<TResult> searchDefinition,
-            string indexName = null,
-            SearchCountOptions count = null)
-            => throw new NotImplementedException();
-
         /// <inheritdoc />
         public virtual IAggregateFluent<SearchMetaResult> SearchMeta(
             SearchDefinition<TResult> searchDefinition,
-            FieldDefinition<TResult> returnScope,
             string indexName = null,
             SearchCountOptions count = null)
             => throw new NotImplementedException();
 
-        /// <inheritdoc />
-        public virtual IAggregateFluent<SearchMetaResult> SearchMeta(
-            SearchDefinition<TResult> searchDefinition,
-            Expression<Func<TResult, object>> returnScope,
-            string indexName = null,
-            SearchCountOptions count = null)
-            => SearchMeta(
-                searchDefinition,
-                new ExpressionFieldDefinition<TResult>(returnScope),
-                indexName,
-                count);
-
         /// <inheritdoc />
         public virtual IAggregateFluent<TResult> Set(SetFieldDefinitions<TResult> fields) => throw new NotImplementedException();
 

src/MongoDB.Driver/IAggregateFluent.cs

@@ -441,71 +441,15 @@ IAggregateFluent<TResult> Search(
             SearchDefinition<TResult> searchDefinition,
             SearchOptions<TResult> searchOptions);
 
-        /// <summary>
-        /// Appends a $search stage to the pipeline, returning documents from a nested scope.
-        /// </summary>
-        /// <param name="searchDefinition">The search definition.</param>
-        /// <param name="returnScope">The level of nested documents to return.</param>
-        /// <param name="searchOptions">The search options.</param>
-        /// <returns>
-        /// The fluent aggregate interface.
-        /// </returns>
-        IAggregateFluent<TNewResult> Search<TNewResult>(
-            SearchDefinition<TResult> searchDefinition,
-            FieldDefinition<TResult, IEnumerable<TNewResult>> returnScope,
-            SearchOptions<TResult> searchOptions = null);
-
-        /// <summary>
-        /// Appends a $search stage to the pipeline, returning documents from a nested scope.
-        /// </summary>
-        /// <param name="searchDefinition">The search definition.</param>
-        /// <param name="returnScope">The level of nested documents to return.</param>
-        /// <param name="searchOptions">The search options.</param>
-        /// <returns>
-        /// The fluent aggregate interface.
-        /// </returns>
-        IAggregateFluent<TNewResult> Search<TNewResult>(
-            SearchDefinition<TResult> searchDefinition,
-            Expression<Func<TResult, IEnumerable<TNewResult>>> returnScope,
-            SearchOptions<TResult> searchOptions = null);
-
-        /// <summary>
-        /// Appends a $searchMeta stage to the pipeline.
-        /// </summary>
-        /// <param name="searchDefinition">The search definition.</param>
-        /// <param name="indexName">The index name.</param>
-        /// <param name="count">The count options.</param>
-        /// <returns>The fluent aggregate interface.</returns>
-        IAggregateFluent<SearchMetaResult> SearchMeta(
-            SearchDefinition<TResult> searchDefinition,
-            string indexName = null,
-            SearchCountOptions count = null);
-
-        /// <summary>
-        /// Appends a $searchMeta stage to the pipeline.
-        /// </summary>
-        /// <param name="searchDefinition">The search definition.</param>
-        /// <param name="returnScope">The level of nested documents to return.</param>
-        /// <param name="indexName">The index name.</param>
-        /// <param name="count">The count options.</param>
-        /// <returns>The fluent aggregate interface.</returns>
-        IAggregateFluent<SearchMetaResult> SearchMeta(
-            SearchDefinition<TResult> searchDefinition,
-            FieldDefinition<TResult> returnScope,
-            string indexName = null,
-            SearchCountOptions count = null);
-
         /// <summary>
         /// Appends a $searchMeta stage to the pipeline.
         /// </summary>
         /// <param name="searchDefinition">The search definition.</param>
-        /// <param name="returnScope">The level of nested documents to return.</param>
         /// <param name="indexName">The index name.</param>
         /// <param name="count">The count options.</param>
         /// <returns>The fluent aggregate interface.</returns>
         IAggregateFluent<SearchMetaResult> SearchMeta(
             SearchDefinition<TResult> searchDefinition,
-            Expression<Func<TResult, object>> returnScope,
             string indexName = null,
             SearchCountOptions count = null);
 

src/MongoDB.Driver/IAggregateFluentExtensions.cs

@@ -23,6 +23,7 @@
 using MongoDB.Bson.Serialization;
 using MongoDB.Driver.Core.Misc;
 using MongoDB.Driver.GeoJsonObjectModel;
+using MongoDB.Driver.Search;
 
 namespace MongoDB.Driver
 {
@@ -694,6 +695,99 @@ public static IAggregateFluent<TNewResult> ReplaceWith<TResult, TNewResult>(
             return aggregate.AppendStage(PipelineStageDefinitionBuilder.ReplaceWith(newRoot));
         }
 
+        /// <summary>
+        /// Appends a $search stage to the pipeline, returning documents from a nested scope.
+        /// </summary>
+        /// <typeparam name="TResult">The type of the result.</typeparam>
+        /// <typeparam name="TNewResult">The type of the new result.</typeparam>
+        /// <param name="aggregate">The aggregate.</param>
+        /// <param name="searchDefinition">The search definition.</param>
+        /// <param name="returnScope">The level of nested documents to return.</param>
+        /// <param name="searchOptions">The search options.</param>
+        /// <returns>The fluent aggregate interface.</returns>
+        public static IAggregateFluent<TNewResult> Search<TResult, TNewResult>(
+            this IAggregateFluent<TResult> aggregate,
+            SearchDefinition<TResult> searchDefinition,
+            FieldDefinition<TResult, IEnumerable<TNewResult>> returnScope,
+            SearchOptions<TResult> searchOptions = null)
+        {
+            Ensure.IsNotNull(aggregate, nameof(aggregate));
+            Ensure.IsNotNull(searchDefinition, nameof(searchDefinition));
+            Ensure.IsNotNull(returnScope, nameof(returnScope));
+
+            return aggregate.AppendStage(
+                PipelineStageDefinitionBuilder.Search(searchDefinition, returnScope, searchOptions));
+        }
+
+        /// <summary>
+        /// Appends a $search stage to the pipeline, returning documents from a nested scope.
+        /// </summary>
+        /// <typeparam name="TResult">The type of the result.</typeparam>
+        /// <typeparam name="TNewResult">The type of the new result.</typeparam>
+        /// <param name="aggregate">The aggregate.</param>
+        /// <param name="searchDefinition">The search definition.</param>
+        /// <param name="returnScope">The level of nested documents to return.</param>
+        /// <param name="searchOptions">The search options.</param>
+        /// <returns>The fluent aggregate interface.</returns>
+        public static IAggregateFluent<TNewResult> Search<TResult, TNewResult>(
+            this IAggregateFluent<TResult> aggregate,
+            SearchDefinition<TResult> searchDefinition,
+            Expression<Func<TResult, IEnumerable<TNewResult>>> returnScope,
+            SearchOptions<TResult> searchOptions = null)
+            => Search(
+                aggregate,
+                searchDefinition,
+                new ExpressionFieldDefinition<TResult, IEnumerable<TNewResult>>(returnScope),
+                searchOptions);
+
+        /// <summary>
+        /// Appends a $searchMeta stage to the pipeline.
+        /// </summary>
+        /// <typeparam name="TResult">The type of the result.</typeparam>
+        /// <param name="aggregate">The aggregate.</param>
+        /// <param name="searchDefinition">The search definition.</param>
+        /// <param name="returnScope">The level of nested documents to return.</param>
+        /// <param name="indexName">The index name.</param>
+        /// <param name="count">The count options.</param>
+        /// <returns>The fluent aggregate interface.</returns>
+        public static IAggregateFluent<SearchMetaResult> SearchMeta<TResult>(
+            this IAggregateFluent<TResult> aggregate,
+            SearchDefinition<TResult> searchDefinition,
+            FieldDefinition<TResult> returnScope,
+            string indexName = null,
+            SearchCountOptions count = null)
+        {
+            Ensure.IsNotNull(aggregate, nameof(aggregate));
+            Ensure.IsNotNull(searchDefinition, nameof(searchDefinition));
+            Ensure.IsNotNull(returnScope, nameof(returnScope));
+
+            return aggregate.AppendStage(
+                PipelineStageDefinitionBuilder.SearchMeta(searchDefinition, returnScope, indexName, count));
+        }
+
+        /// <summary>
+        /// Appends a $searchMeta stage to the pipeline.
+        /// </summary>
+        /// <typeparam name="TResult">The type of the result.</typeparam>
+        /// <param name="aggregate">The aggregate.</param>
+        /// <param name="searchDefinition">The search definition.</param>
+        /// <param name="returnScope">The level of nested documents to return.</param>
+        /// <param name="indexName">The index name.</param>
+        /// <param name="count">The count options.</param>
+        /// <returns>The fluent aggregate interface.</returns>
+        public static IAggregateFluent<SearchMetaResult> SearchMeta<TResult>(
+            this IAggregateFluent<TResult> aggregate,
+            SearchDefinition<TResult> searchDefinition,
+            Expression<Func<TResult, object>> returnScope,
+            string indexName = null,
+            SearchCountOptions count = null)
+            => SearchMeta(
+                aggregate,
+                searchDefinition,
+                new ExpressionFieldDefinition<TResult>(returnScope),
+                indexName,
+                count);
+
         /// <summary>
         /// Appends a $set stage to the pipeline.
         /// </summary>

tests/MongoDB.Driver.Tests/Search/AtlasSearchTests.cs

@@ -956,7 +956,7 @@ public void ReturnScope(bool useExpression)
 
             var query = useExpression
                 ? aggregate.Search(searchDefinition, e => e.Movies, searchOptions)
-                : aggregate.Search<DirectedMovie>(searchDefinition, "movies", searchOptions);
+                : aggregate.Search<Director, DirectedMovie>(searchDefinition, "movies", searchOptions);
 
             var results = query.ToList();
             results.Count.Should().Be(1);
@@ -972,7 +972,7 @@ public void ReturnScope_nested_path()
             var searchDefinition = Builders<Director>.Search.Range("movies.reviews.rating", SearchRangeBuilder.Gte(8.0));
             var aggregate = GetReturnScopeCollection<Director>().Aggregate();
 
-            var results = aggregate.Search<DirectedMovieReview>(
+            var results = aggregate.Search<Director, DirectedMovieReview>(
                 searchDefinition,
                 "movies.reviews",
                 new() { IndexName = "returnScopeIndex2" }).ToList();
@@ -998,7 +998,7 @@ public void ReturnScope_HasRoot(bool useExpression)
             var searchOptions = new SearchOptions<Director>() { IndexName = "returnScopeIndex1" };
             var query = useExpression
                 ? aggregate.Search(searchDefinition, e => e.Movies, searchOptions)
-                : aggregate.Search<DirectedMovie>(searchDefinition, "movies", searchOptions);
+                : aggregate.Search<Director, DirectedMovie>(searchDefinition, "movies", searchOptions);
 
             var results = query.ToList();
             results.Count.Should().Be(2);
@@ -1027,7 +1027,7 @@ public void ReturnScope_HasAncestor(bool useExpression)
 
             var aggregate = GetReturnScopeCollection<Director>().Aggregate();
 
-            var results = aggregate.Search<DirectedMovieReview>(
+            var results = aggregate.Search<Director, DirectedMovieReview>(
                 searchDefinition,
                 "movies.reviews",
                 new() { IndexName = "returnScopeIndex2" }).ToList();