CSHARP-2480: Fix ambiguous API calls (#1474)

Author: papafe

src/MongoDB.Driver/IMongoCollectionExtensions.cs

@@ -1426,7 +1426,7 @@ public static IFindFluent<TDocument, TDocument> Find<TDocument>(this IMongoColle
         /// <returns>
         /// The deleted document if one was deleted.
         /// </returns>
-        public static TDocument FindOneAndDelete<TDocument>(this IMongoCollection<TDocument> collection, Expression<Func<TDocument, bool>> filter, FindOneAndDeleteOptions<TDocument, TDocument> options = null, CancellationToken cancellationToken = default(CancellationToken))
+        public static TDocument FindOneAndDelete<TDocument>(this IMongoCollection<TDocument> collection, Expression<Func<TDocument, bool>> filter, FindOneAndDeleteOptions<TDocument> options = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             Ensure.IsNotNull(collection, nameof(collection));
             Ensure.IsNotNull(filter, nameof(filter));
@@ -1548,7 +1548,7 @@ public static IFindFluent<TDocument, TDocument> Find<TDocument>(this IMongoColle
         /// <returns>
         /// The deleted document if one was deleted.
         /// </returns>
-        public static Task<TDocument> FindOneAndDeleteAsync<TDocument>(this IMongoCollection<TDocument> collection, Expression<Func<TDocument, bool>> filter, FindOneAndDeleteOptions<TDocument, TDocument> options = null, CancellationToken cancellationToken = default(CancellationToken))
+        public static Task<TDocument> FindOneAndDeleteAsync<TDocument>(this IMongoCollection<TDocument> collection, Expression<Func<TDocument, bool>> filter, FindOneAndDeleteOptions<TDocument> options = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             Ensure.IsNotNull(collection, nameof(collection));
             Ensure.IsNotNull(filter, nameof(filter));
@@ -1672,7 +1672,7 @@ public static IFindFluent<TDocument, TDocument> Find<TDocument>(this IMongoColle
         /// <returns>
         /// The returned document.
         /// </returns>
-        public static TDocument FindOneAndReplace<TDocument>(this IMongoCollection<TDocument> collection, Expression<Func<TDocument, bool>> filter, TDocument replacement, FindOneAndReplaceOptions<TDocument, TDocument> options = null, CancellationToken cancellationToken = default(CancellationToken))
+        public static TDocument FindOneAndReplace<TDocument>(this IMongoCollection<TDocument> collection, Expression<Func<TDocument, bool>> filter, TDocument replacement, FindOneAndReplaceOptions<TDocument> options = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             Ensure.IsNotNull(collection, nameof(collection));
             Ensure.IsNotNull(filter, nameof(filter));
@@ -1800,7 +1800,7 @@ public static IFindFluent<TDocument, TDocument> Find<TDocument>(this IMongoColle
         /// <returns>
         /// The returned document.
         /// </returns>
-        public static Task<TDocument> FindOneAndReplaceAsync<TDocument>(this IMongoCollection<TDocument> collection, Expression<Func<TDocument, bool>> filter, TDocument replacement, FindOneAndReplaceOptions<TDocument, TDocument> options = null, CancellationToken cancellationToken = default(CancellationToken))
+        public static Task<TDocument> FindOneAndReplaceAsync<TDocument>(this IMongoCollection<TDocument> collection, Expression<Func<TDocument, bool>> filter, TDocument replacement, FindOneAndReplaceOptions<TDocument> options = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             Ensure.IsNotNull(collection, nameof(collection));
             Ensure.IsNotNull(filter, nameof(filter));
@@ -1933,7 +1933,7 @@ public static IFindFluent<TDocument, TDocument> Find<TDocument>(this IMongoColle
         /// <returns>
         /// The returned document.
         /// </returns>
-        public static TDocument FindOneAndUpdate<TDocument>(this IMongoCollection<TDocument> collection, Expression<Func<TDocument, bool>> filter, UpdateDefinition<TDocument> update, FindOneAndUpdateOptions<TDocument, TDocument> options = null, CancellationToken cancellationToken = default(CancellationToken))
+        public static TDocument FindOneAndUpdate<TDocument>(this IMongoCollection<TDocument> collection, Expression<Func<TDocument, bool>> filter, UpdateDefinition<TDocument> update, FindOneAndUpdateOptions<TDocument> options = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             Ensure.IsNotNull(collection, nameof(collection));
             Ensure.IsNotNull(filter, nameof(filter));
@@ -2085,7 +2085,7 @@ public static IFindFluent<TDocument, TDocument> Find<TDocument>(this IMongoColle
         /// <returns>
         /// The returned document.
         /// </returns>
-        public static Task<TDocument> FindOneAndUpdateAsync<TDocument>(this IMongoCollection<TDocument> collection, Expression<Func<TDocument, bool>> filter, UpdateDefinition<TDocument> update, FindOneAndUpdateOptions<TDocument, TDocument> options = null, CancellationToken cancellationToken = default(CancellationToken))
+        public static Task<TDocument> FindOneAndUpdateAsync<TDocument>(this IMongoCollection<TDocument> collection, Expression<Func<TDocument, bool>> filter, UpdateDefinition<TDocument> update, FindOneAndUpdateOptions<TDocument> options = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             Ensure.IsNotNull(collection, nameof(collection));
             Ensure.IsNotNull(filter, nameof(filter));

tests/MongoDB.Driver.Tests/IMongoCollectionExtensionsTests.cs

@@ -20,7 +20,6 @@
 using System.Threading;
 using FluentAssertions;
 using MongoDB.Bson;
-using MongoDB.Driver.Linq;
 using MongoDB.Driver.Tests.Linq.Linq3Implementation;
 using MongoDB.TestHelpers.XunitExtensions;
 using Moq;

tests/MongoDB.Driver.Tests/Jira/CSharp2480Tests.cs

@@ -0,0 +1,45 @@
+/* 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 Moq;
+using Xunit;
+
+namespace MongoDB.Driver.Tests.Jira
+{
+    public class CSharp2480Tests
+    {
+        [Fact(Skip = "No need to run the test, we just need to be sure that the method calls are non-ambiguous")]
+        public void Test()
+        {
+            var collection = new Mock<IMongoCollection<Person>>().Object;
+
+            var replace = new Person { Name = "newName" };
+            collection.FindOneAndReplace(c => c.Name == "Test", replace, new FindOneAndReplaceOptions<Person>());
+            collection.FindOneAndReplaceAsync(c => c.Name == "Test", replace, new FindOneAndReplaceOptions<Person>());
+
+            var updateDefinition = new ObjectUpdateDefinition<Person>(new Person());
+            collection.FindOneAndUpdate(c => c.Name == "Test", updateDefinition, new FindOneAndUpdateOptions<Person>());
+            collection.FindOneAndUpdateAsync(c => c.Name == "Test", updateDefinition, new FindOneAndUpdateOptions<Person>());
+
+            collection.FindOneAndDelete(c => c.Name == "Test", new FindOneAndDeleteOptions<Person>());
+            collection.FindOneAndDeleteAsync(c => c.Name == "Test", new FindOneAndDeleteOptions<Person>());
+        }
+
+        private class Person
+        {
+            public string Name { get; set; }
+        }
+    }
+}