CSHARP-1449: Code review changes.

rstam · rstam · commit ed5c0b3c365e · 2015-11-12T11:53:58.000-05:00
diff --git a/src/MongoDB.Driver.Core.Tests/Core/Operations/AsyncCursorEnumerableOneTimeAdapterTests.cs b/src/MongoDB.Driver.Core.Tests/Core/Operations/AsyncCursorEnumerableOneTimeAdapterTests.cs
@@ -23,12 +23,12 @@
 namespace MongoDB.Driver.Core.Operations
 {
     [TestFixture]
-    public class EnumerableOneTimeAsyncCursorTests
+    public class AsyncCursorEnumerableOneTimeAdapterTests
     {
         [Test]
         public void constructor_should_throw_when_cursor_is_null()
         {
-            Action action = () => new EnumerableOneTimeAsyncCursor<BsonDocument>(null, CancellationToken.None);
+            Action action = () => new AsyncCursorEnumerableOneTimeAdapter<BsonDocument>(null, CancellationToken.None);
 
             action.ShouldThrow<ArgumentNullException>().And.ParamName.Should().Be("cursor");
         }
@@ -39,7 +39,7 @@ public void GetEnumerator_should_return_expected_result()
             var cursor = Substitute.For<IAsyncCursor<BsonDocument>>();
             cursor.MoveNext().Returns(true, false);
             cursor.Current.Returns(new[] { new BsonDocument("_id", 0) });
-            var subject = new EnumerableOneTimeAsyncCursor<BsonDocument>(cursor, CancellationToken.None);
+            var subject = new AsyncCursorEnumerableOneTimeAdapter<BsonDocument>(cursor, CancellationToken.None);
 
             var result = subject.GetEnumerator();
 
@@ -52,7 +52,7 @@ public void GetEnumerator_should_return_expected_result()
         public void GetEnumerator_should_throw_when_called_more_than_once()
         {
             var cursor = Substitute.For<IAsyncCursor<BsonDocument>>();
-            var subject = new EnumerableOneTimeAsyncCursor<BsonDocument>(cursor, CancellationToken.None);
+            var subject = new AsyncCursorEnumerableOneTimeAdapter<BsonDocument>(cursor, CancellationToken.None);
             subject.GetEnumerator();
 
             Action action = () => subject.GetEnumerator();
diff --git a/src/MongoDB.Driver.Core.Tests/Core/Operations/AsyncCursorSourceEnumerableAdapterTests.cs b/src/MongoDB.Driver.Core.Tests/Core/Operations/AsyncCursorSourceEnumerableAdapterTests.cs
@@ -23,12 +23,12 @@
 namespace MongoDB.Driver.Core.Operations
 {
     [TestFixture]
-    public class EnumerableAsyncCursorSourceTests
+    public class AsyncCursorSourceEnumerableAdapterTests
     {
         [Test]
         public void constructor_should_throw_when_source_is_null()
         {
-            Action action = () => new EnumerableAsyncCursorSource<BsonDocument>(null, CancellationToken.None);
+            Action action = () => new AsyncCursorSourceEnumerableAdapter<BsonDocument>(null, CancellationToken.None);
 
             action.ShouldThrow<ArgumentNullException>().And.ParamName.Should().Be("source");
         }
@@ -40,7 +40,7 @@ public void GetEnumerator_should_call_ToCursor_each_time(
             var source = Substitute.For<IAsyncCursorSource<BsonDocument>>();
             var cursor = Substitute.For<IAsyncCursor<BsonDocument>>();
             source.ToCursor().Returns(cursor);
-            var subject = new EnumerableAsyncCursorSource<BsonDocument>(source, CancellationToken.None);
+            var subject = new AsyncCursorSourceEnumerableAdapter<BsonDocument>(source, CancellationToken.None);
 
             for (var i = 0; i < times; i++)
             {
diff --git a/src/MongoDB.Driver.Core.Tests/MongoDB.Driver.Core.Tests.csproj b/src/MongoDB.Driver.Core.Tests/MongoDB.Driver.Core.Tests.csproj
@@ -70,8 +70,8 @@
     <Compile Include="Core\Operations\AsyncCursorTests.cs" />
     <Compile Include="Core\Operations\BulkMixedWriteOperationTests.cs" />
     <Compile Include="Core\Operations\BulkWriteOperationErrorTests.cs" />
-    <Compile Include="Core\Operations\EnumerableAsyncCursorSourceTests.cs" />
-    <Compile Include="Core\Operations\EnumerableOneTimeAsyncCursorTests.cs" />
+    <Compile Include="Core\Operations\AsyncCursorSourceEnumerableAdapterTests.cs" />
+    <Compile Include="Core\Operations\AsyncCursorEnumerableOneTimeAdapterTests.cs" />
     <Compile Include="Core\Operations\GeoSearchOperationTests.cs" />
     <Compile Include="Core\Operations\GeoNearOperationTests.cs" />
     <Compile Include="Core\Operations\CreateCollectionOperationTests.cs" />
diff --git a/src/MongoDB.Driver.Core/Core/Operations/AsyncCursorEnumerableOneTimeAdapter.cs b/src/MongoDB.Driver.Core/Core/Operations/AsyncCursorEnumerableOneTimeAdapter.cs
@@ -21,15 +21,15 @@
 
 namespace MongoDB.Driver.Core.Operations
 {
-    internal class EnumerableOneTimeAsyncCursor<TDocument> : IEnumerable<TDocument>
+    internal class AsyncCursorEnumerableOneTimeAdapter<TDocument> : IEnumerable<TDocument>
     {
         // private fields
         private readonly CancellationToken _cancellationToken;
         private readonly IAsyncCursor<TDocument> _cursor;
         private bool _hasBeenEnumerated;
 
         // constructors
-        public EnumerableOneTimeAsyncCursor(IAsyncCursor<TDocument> cursor, CancellationToken cancellationToken)
+        public AsyncCursorEnumerableOneTimeAdapter(IAsyncCursor<TDocument> cursor, CancellationToken cancellationToken)
         {
             _cursor = Ensure.IsNotNull(cursor, nameof(cursor));
             _cancellationToken = cancellationToken;
diff --git a/src/MongoDB.Driver.Core/Core/Operations/AsyncCursorSourceEnumerableAdapter.cs b/src/MongoDB.Driver.Core/Core/Operations/AsyncCursorSourceEnumerableAdapter.cs
@@ -21,14 +21,14 @@
 
 namespace MongoDB.Driver.Core.Operations
 {
-    internal class EnumerableAsyncCursorSource<TDocument> : IEnumerable<TDocument>
+    internal class AsyncCursorSourceEnumerableAdapter<TDocument> : IEnumerable<TDocument>
     {
         // private fields
         private readonly CancellationToken _cancellationToken;
         private readonly IAsyncCursorSource<TDocument> _source;
 
         // constructors
-        public EnumerableAsyncCursorSource(IAsyncCursorSource<TDocument> source, CancellationToken cancellationToken)
+        public AsyncCursorSourceEnumerableAdapter(IAsyncCursorSource<TDocument> source, CancellationToken cancellationToken)
         {
             _source = Ensure.IsNotNull(source, nameof(source));
             _cancellationToken = cancellationToken;
diff --git a/src/MongoDB.Driver.Core/IAsyncCursor.cs b/src/MongoDB.Driver.Core/IAsyncCursor.cs
@@ -322,7 +322,7 @@ public static class IAsyncCursorExtensions
         /// <returns>An IEnumerable</returns>
         public static IEnumerable<TDocument> ToEnumerable<TDocument>(this IAsyncCursor<TDocument> cursor, CancellationToken cancellationToken = default(CancellationToken))
         {
-            return new EnumerableOneTimeAsyncCursor<TDocument>(cursor, cancellationToken);
+            return new AsyncCursorEnumerableOneTimeAdapter<TDocument>(cursor, cancellationToken);
         }
 
         /// <summary>
diff --git a/src/MongoDB.Driver.Core/IAsyncCursorSource.cs b/src/MongoDB.Driver.Core/IAsyncCursorSource.cs
@@ -282,7 +282,7 @@ public static class IAsyncCursorSourceExtensions
         /// <returns>An IEnumerable.</returns>
         public static IEnumerable<TDocument> ToEnumerable<TDocument>(this IAsyncCursorSource<TDocument> source, CancellationToken cancellationToken = default(CancellationToken))
         {
-            return new EnumerableAsyncCursorSource<TDocument>(source, cancellationToken);
+            return new AsyncCursorSourceEnumerableAdapter<TDocument>(source, cancellationToken);
         }
 
         /// <summary>
diff --git a/src/MongoDB.Driver.Core/MongoDB.Driver.Core.csproj b/src/MongoDB.Driver.Core/MongoDB.Driver.Core.csproj
@@ -147,8 +147,8 @@
     <Compile Include="Core\Operations\CreateIndexesUsingInsertOperation.cs" />
     <Compile Include="DocumentValidationAction.cs" />
     <Compile Include="DocumentValidationLevel.cs" />
-    <Compile Include="Core\Operations\EnumerableOneTimeAsyncCursor.cs" />
-    <Compile Include="Core\Operations\EnumerableAsyncCursorSource.cs" />
+    <Compile Include="Core\Operations\AsyncCursorEnumerableOneTimeAdapter.cs" />
+    <Compile Include="Core\Operations\AsyncCursorSourceEnumerableAdapter.cs" />
     <Compile Include="Core\Operations\GeoSearchOperation.cs" />
     <Compile Include="Core\Operations\GeoNearOperation.cs" />
     <Compile Include="Core\Operations\ListCollectionsUsingCommandOperation.cs" />
diff --git a/src/MongoDB.Driver/Linq/AggregateQueryableExecutionModel.cs b/src/MongoDB.Driver/Linq/AggregateQueryableExecutionModel.cs
@@ -93,6 +93,7 @@ internal override Task ExecuteAsync<TInput>(IMongoCollection<TInput> collection,
 
         internal override object Execute<TInput>(IMongoCollection<TInput> collection, AggregateOptions options)
         {
+            // TODO: modify LINQ to have a sync version of this
             return new AsyncCursorEnumerableAdapter<TOutput>(ct => ((Task<IAsyncCursor<TOutput>>)ExecuteAsync(collection, options, ct)).GetAwaiter().GetResult(), CancellationToken.None);
         }
     }
diff --git a/src/MongoDB.Driver/MongoCollectionImpl.cs b/src/MongoDB.Driver/MongoCollectionImpl.cs
@@ -145,43 +145,43 @@ public override async Task<IAsyncCursor<TResult>> AggregateAsync<TResult>(Pipeli
 
         public override BulkWriteResult<TDocument> BulkWrite(IEnumerable<WriteModel<TDocument>> requests, BulkWriteOptions options, CancellationToken cancellationToken)
         {
-            var requestsList = Ensure.IsNotNull(requests, nameof(requests)).ToList();
-            if (requestsList.Count == 0)
+            Ensure.IsNotNull(requests, nameof(requests));
+            if (!requests.Any())
             {
                 throw new ArgumentException("Must contain at least 1 request.", "requests");
             }
             options = options ?? new BulkWriteOptions();
 
-            var operation = CreateBulkWriteOperation(requestsList, options);
+            var operation = CreateBulkWriteOperation(requests, options);
             try
             {
                 var result = ExecuteWriteOperation(operation, cancellationToken);
-                return BulkWriteResult<TDocument>.FromCore(result, requestsList);
+                return BulkWriteResult<TDocument>.FromCore(result, requests);
             }
             catch (MongoBulkWriteOperationException ex)
             {
-                throw MongoBulkWriteException<TDocument>.FromCore(ex, requestsList);
+                throw MongoBulkWriteException<TDocument>.FromCore(ex, requests.ToList());
             }
         }
 
         public override async Task<BulkWriteResult<TDocument>> BulkWriteAsync(IEnumerable<WriteModel<TDocument>> requests, BulkWriteOptions options, CancellationToken cancellationToken)
         {
-            var requestsList = Ensure.IsNotNull(requests, nameof(requests)).ToList();
-            if (requestsList.Count == 0)
+            Ensure.IsNotNull(requests, nameof(requests));
+            if (!requests.Any())
             {
                 throw new ArgumentException("Must contain at least 1 request.", "requests");
             }
             options = options ?? new BulkWriteOptions();
 
-            var operation = CreateBulkWriteOperation(requestsList, options);
+            var operation = CreateBulkWriteOperation(requests, options);
             try
             {
                 var result = await ExecuteWriteOperationAsync(operation, cancellationToken).ConfigureAwait(false);
-                return BulkWriteResult<TDocument>.FromCore(result, requestsList);
+                return BulkWriteResult<TDocument>.FromCore(result, requests);
             }
             catch (MongoBulkWriteOperationException ex)
             {
-                throw MongoBulkWriteException<TDocument>.FromCore(ex, requestsList);
+                throw MongoBulkWriteException<TDocument>.FromCore(ex, requests.ToList());
             }
         }
 
@@ -520,7 +520,7 @@ private AggregateToCollectionOperation CreateAggregateToCollectionOperation<TRes
             };
         }
 
-        private BulkMixedWriteOperation CreateBulkWriteOperation(List<WriteModel<TDocument>> requests, BulkWriteOptions options)
+        private BulkMixedWriteOperation CreateBulkWriteOperation(IEnumerable<WriteModel<TDocument>> requests, BulkWriteOptions options)
         {
             return new BulkMixedWriteOperation(
                 _collectionNamespace,

Original file line number	Diff line number	Diff line change
`@@ -23,12 +23,12 @@`
`23`	`23`	`namespace MongoDB.Driver.Core.Operations`
`24`	`24`	`{`
`25`	`25`	`[TestFixture]`
`26`		`- public class EnumerableOneTimeAsyncCursorTests`
	`26`	`+ public class AsyncCursorEnumerableOneTimeAdapterTests`
`27`	`27`	`{`
`28`	`28`	`[Test]`
`29`	`29`	`public void constructor_should_throw_when_cursor_is_null()`
`30`	`30`	`{`
`31`		`- Action action = () => new EnumerableOneTimeAsyncCursor<BsonDocument>(null, CancellationToken.None);`
	`31`	`+ Action action = () => new AsyncCursorEnumerableOneTimeAdapter<BsonDocument>(null, CancellationToken.None);`
`32`	`32`
`33`	`33`	`action.ShouldThrow<ArgumentNullException>().And.ParamName.Should().Be("cursor");`
`34`	`34`	`}`
`@@ -39,7 +39,7 @@ public void GetEnumerator_should_return_expected_result()`
`39`	`39`	`var cursor = Substitute.For<IAsyncCursor<BsonDocument>>();`
`40`	`40`	`cursor.MoveNext().Returns(true, false);`
`41`	`41`	`cursor.Current.Returns(new[] { new BsonDocument("_id", 0) });`
`42`		`- var subject = new EnumerableOneTimeAsyncCursor<BsonDocument>(cursor, CancellationToken.None);`
	`42`	`+ var subject = new AsyncCursorEnumerableOneTimeAdapter<BsonDocument>(cursor, CancellationToken.None);`
`43`	`43`
`44`	`44`	`var result = subject.GetEnumerator();`
`45`	`45`
`@@ -52,7 +52,7 @@ public void GetEnumerator_should_return_expected_result()`
`52`	`52`	`public void GetEnumerator_should_throw_when_called_more_than_once()`
`53`	`53`	`{`
`54`	`54`	`var cursor = Substitute.For<IAsyncCursor<BsonDocument>>();`
`55`		`- var subject = new EnumerableOneTimeAsyncCursor<BsonDocument>(cursor, CancellationToken.None);`
	`55`	`+ var subject = new AsyncCursorEnumerableOneTimeAdapter<BsonDocument>(cursor, CancellationToken.None);`
`56`	`56`	`subject.GetEnumerator();`
`57`	`57`
`58`	`58`	`Action action = () => subject.GetEnumerator();`
Original file line number	Diff line number	Diff line change
`@@ -21,15 +21,15 @@`
`21`	`21`
`22`	`22`	`namespace MongoDB.Driver.Core.Operations`
`23`	`23`	`{`
`24`		`- internal class EnumerableOneTimeAsyncCursor<TDocument> : IEnumerable<TDocument>`
	`24`	`+ internal class AsyncCursorEnumerableOneTimeAdapter<TDocument> : IEnumerable<TDocument>`
`25`	`25`	`{`
`26`	`26`	`// private fields`
`27`	`27`	`private readonly CancellationToken _cancellationToken;`
`28`	`28`	`private readonly IAsyncCursor<TDocument> _cursor;`
`29`	`29`	`private bool _hasBeenEnumerated;`
`30`	`30`
`31`	`31`	`// constructors`
`32`		`- public EnumerableOneTimeAsyncCursor(IAsyncCursor<TDocument> cursor, CancellationToken cancellationToken)`
	`32`	`+ public AsyncCursorEnumerableOneTimeAdapter(IAsyncCursor<TDocument> cursor, CancellationToken cancellationToken)`
`33`	`33`	`{`
`34`	`34`	`_cursor = Ensure.IsNotNull(cursor, nameof(cursor));`
`35`	`35`	`_cancellationToken = cancellationToken;`
Original file line number	Diff line number	Diff line change
`@@ -21,14 +21,14 @@`
`21`	`21`
`22`	`22`	`namespace MongoDB.Driver.Core.Operations`
`23`	`23`	`{`
`24`		`- internal class EnumerableAsyncCursorSource<TDocument> : IEnumerable<TDocument>`
	`24`	`+ internal class AsyncCursorSourceEnumerableAdapter<TDocument> : IEnumerable<TDocument>`
`25`	`25`	`{`
`26`	`26`	`// private fields`
`27`	`27`	`private readonly CancellationToken _cancellationToken;`
`28`	`28`	`private readonly IAsyncCursorSource<TDocument> _source;`
`29`	`29`
`30`	`30`	`// constructors`
`31`		`- public EnumerableAsyncCursorSource(IAsyncCursorSource<TDocument> source, CancellationToken cancellationToken)`
	`31`	`+ public AsyncCursorSourceEnumerableAdapter(IAsyncCursorSource<TDocument> source, CancellationToken cancellationToken)`
`32`	`32`	`{`
`33`	`33`	`_source = Ensure.IsNotNull(source, nameof(source));`
`34`	`34`	`_cancellationToken = cancellationToken;`
Original file line number	Diff line number	Diff line change
`@@ -322,7 +322,7 @@ public static class IAsyncCursorExtensions`
`322`	`322`	`/// <returns>An IEnumerable</returns>`
`323`	`323`	`public static IEnumerable<TDocument> ToEnumerable<TDocument>(this IAsyncCursor<TDocument> cursor, CancellationToken cancellationToken = default(CancellationToken))`
`324`	`324`	`{`
`325`		`- return new EnumerableOneTimeAsyncCursor<TDocument>(cursor, cancellationToken);`
	`325`	`+ return new AsyncCursorEnumerableOneTimeAdapter<TDocument>(cursor, cancellationToken);`
`326`	`326`	`}`
`327`	`327`
`328`	`328`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,7 @@ public static class IAsyncCursorSourceExtensions`
`282`	`282`	`/// <returns>An IEnumerable.</returns>`
`283`	`283`	`public static IEnumerable<TDocument> ToEnumerable<TDocument>(this IAsyncCursorSource<TDocument> source, CancellationToken cancellationToken = default(CancellationToken))`
`284`	`284`	`{`
`285`		`- return new EnumerableAsyncCursorSource<TDocument>(source, cancellationToken);`
	`285`	`+ return new AsyncCursorSourceEnumerableAdapter<TDocument>(source, cancellationToken);`
`286`	`286`	`}`
`287`	`287`
`288`	`288`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,7 @@ internal override Task ExecuteAsync<TInput>(IMongoCollection<TInput> collection,`
`93`	`93`
`94`	`94`	`internal override object Execute<TInput>(IMongoCollection<TInput> collection, AggregateOptions options)`
`95`	`95`	`{`
	`96`	`+ // TODO: modify LINQ to have a sync version of this`
`96`	`97`	`return new AsyncCursorEnumerableAdapter<TOutput>(ct => ((Task<IAsyncCursor<TOutput>>)ExecuteAsync(collection, options, ct)).GetAwaiter().GetResult(), CancellationToken.None);`
`97`	`98`	`}`
`98`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -145,43 +145,43 @@ public override async Task<IAsyncCursor<TResult>> AggregateAsync<TResult>(Pipeli`
`145`	`145`
`146`	`146`	`public override BulkWriteResult<TDocument> BulkWrite(IEnumerable<WriteModel<TDocument>> requests, BulkWriteOptions options, CancellationToken cancellationToken)`
`147`	`147`	`{`
`148`		`- var requestsList = Ensure.IsNotNull(requests, nameof(requests)).ToList();`
`149`		`- if (requestsList.Count == 0)`
	`148`	`+ Ensure.IsNotNull(requests, nameof(requests));`
	`149`	`+ if (!requests.Any())`
`150`	`150`	`{`
`151`	`151`	`throw new ArgumentException("Must contain at least 1 request.", "requests");`
`152`	`152`	`}`
`153`	`153`	`options = options ?? new BulkWriteOptions();`
`154`	`154`
`155`		`- var operation = CreateBulkWriteOperation(requestsList, options);`
	`155`	`+ var operation = CreateBulkWriteOperation(requests, options);`
`156`	`156`	`try`
`157`	`157`	`{`
`158`	`158`	`var result = ExecuteWriteOperation(operation, cancellationToken);`
`159`		`- return BulkWriteResult<TDocument>.FromCore(result, requestsList);`
	`159`	`+ return BulkWriteResult<TDocument>.FromCore(result, requests);`
`160`	`160`	`}`
`161`	`161`	`catch (MongoBulkWriteOperationException ex)`
`162`	`162`	`{`
`163`		`- throw MongoBulkWriteException<TDocument>.FromCore(ex, requestsList);`
	`163`	`+ throw MongoBulkWriteException<TDocument>.FromCore(ex, requests.ToList());`
`164`	`164`	`}`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`public override async Task<BulkWriteResult<TDocument>> BulkWriteAsync(IEnumerable<WriteModel<TDocument>> requests, BulkWriteOptions options, CancellationToken cancellationToken)`
`168`	`168`	`{`
`169`		`- var requestsList = Ensure.IsNotNull(requests, nameof(requests)).ToList();`
`170`		`- if (requestsList.Count == 0)`
	`169`	`+ Ensure.IsNotNull(requests, nameof(requests));`
	`170`	`+ if (!requests.Any())`
`171`	`171`	`{`
`172`	`172`	`throw new ArgumentException("Must contain at least 1 request.", "requests");`
`173`	`173`	`}`
`174`	`174`	`options = options ?? new BulkWriteOptions();`
`175`	`175`
`176`		`- var operation = CreateBulkWriteOperation(requestsList, options);`
	`176`	`+ var operation = CreateBulkWriteOperation(requests, options);`
`177`	`177`	`try`
`178`	`178`	`{`
`179`	`179`	`var result = await ExecuteWriteOperationAsync(operation, cancellationToken).ConfigureAwait(false);`
`180`		`- return BulkWriteResult<TDocument>.FromCore(result, requestsList);`
	`180`	`+ return BulkWriteResult<TDocument>.FromCore(result, requests);`
`181`	`181`	`}`
`182`	`182`	`catch (MongoBulkWriteOperationException ex)`
`183`	`183`	`{`
`184`		`- throw MongoBulkWriteException<TDocument>.FromCore(ex, requestsList);`
	`184`	`+ throw MongoBulkWriteException<TDocument>.FromCore(ex, requests.ToList());`
`185`	`185`	`}`
`186`	`186`	`}`
`187`	`187`
`@@ -520,7 +520,7 @@ private AggregateToCollectionOperation CreateAggregateToCollectionOperation<TRes`
`520`	`520`	`};`
`521`	`521`	`}`
`522`	`522`
`523`		`- private BulkMixedWriteOperation CreateBulkWriteOperation(List<WriteModel<TDocument>> requests, BulkWriteOptions options)`
	`523`	`+ private BulkMixedWriteOperation CreateBulkWriteOperation(IEnumerable<WriteModel<TDocument>> requests, BulkWriteOptions options)`
`524`	`524`	`{`
`525`	`525`	`return new BulkMixedWriteOperation(`
`526`	`526`	`_collectionNamespace,`