CSHARP-1418: Make sure null GridFS options are replaced with default options everywhere.

Author: rstam

src/MongoDB.Driver.GridFS.Tests/Specifications/gridfs/GridFSDownloadAsBytesAsyncTest.cs

@@ -25,7 +25,7 @@ public abstract class GridFSDownloadAsyncTestBase : GridFSTestBase
     {
         // fields
         protected ObjectId _id;
-        protected GridFSDownloadOptions _options = new GridFSDownloadOptions();
+        protected GridFSDownloadOptions _options = null;
 
         // constructors
         public GridFSDownloadAsyncTestBase(BsonDocument data, BsonDocument testDefinition)
@@ -70,6 +70,7 @@ private void ParseOptions(BsonDocument options)
         {
             foreach (var option in options.Elements)
             {
+                _options = _options ?? new GridFSDownloadOptions();
                 switch (option.Name)
                 {
                     case "checkMD5":

src/MongoDB.Driver.GridFS.Tests/Specifications/gridfs/GridFSDownloadAsBytesByNameAsyncTest.cs

@@ -25,7 +25,7 @@ public abstract class GridFSGetByNameAsyncTestBase : GridFSTestBase
     {
         // fields
         protected string _filename;
-        protected GridFSDownloadByNameOptions _options = new GridFSDownloadByNameOptions();
+        protected GridFSDownloadByNameOptions _options = null;
 
         // constructors
         public GridFSGetByNameAsyncTestBase(BsonDocument data, BsonDocument testDefinition)
@@ -70,6 +70,7 @@ private void ParseOptions(BsonDocument options)
         {
             foreach (var option in options.Elements)
             {
+                _options = _options ?? new GridFSDownloadByNameOptions();
                 switch (option.Name)
                 {
                     case "checkMD5":

src/MongoDB.Driver.GridFS.Tests/Specifications/gridfs/GridFSUploadFromBytesAsyncTest.cs

@@ -26,7 +26,7 @@ public abstract class GridFSPutAsyncTestBase : GridFSTestBase
     {
         // fields
         protected string _filename;
-        protected GridFSUploadOptions _options = new GridFSUploadOptions();
+        protected GridFSUploadOptions _options = null;
         protected byte[] _source;
 
         // constructors
@@ -76,6 +76,7 @@ private void ParseOptions(BsonDocument options)
         {
             foreach (var option in options.Elements)
             {
+                _options = _options ?? new GridFSUploadOptions();
                 switch (option.Name)
                 {
                     case "aliases":

src/MongoDB.Driver.GridFS/GridFSBucket.cs

@@ -100,12 +100,14 @@ public ImmutableGridFSBucketOptions Options
         public Task<byte[]> DownloadAsBytesAsync(BsonValue id, GridFSDownloadOptions options = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             Ensure.IsNotNull(id, nameof(id));
+            options = options ?? new GridFSDownloadOptions();
             return DownloadAsBytesHelperAsync(id, options, cancellationToken);
         }
 
         /// <inheritdoc />
         public Task<byte[]> DownloadAsBytesAsync(ObjectId id, GridFSDownloadOptions options = null, CancellationToken cancellationToken = default(CancellationToken))
         {
+            options = options ?? new GridFSDownloadOptions();
             return DownloadAsBytesHelperAsync(new BsonObjectId(id), options, cancellationToken);
         }
 
@@ -135,13 +137,15 @@ public ImmutableGridFSBucketOptions Options
         {
             Ensure.IsNotNull(id, nameof(id));
             Ensure.IsNotNull(destination, nameof(destination));
+            options = options ?? new GridFSDownloadOptions();
             return DownloadToStreamHelperAsync(id, destination, options, cancellationToken);
         }
 
         /// <inheritdoc />
         public Task DownloadToStreamAsync(ObjectId id, Stream destination, GridFSDownloadOptions options = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             Ensure.IsNotNull(destination, nameof(destination));
+            options = options ?? new GridFSDownloadOptions();
             return DownloadToStreamHelperAsync(new BsonObjectId(id), destination, options, cancellationToken);
         }
 
@@ -220,12 +224,14 @@ public ImmutableGridFSBucketOptions Options
         public Task<GridFSDownloadStream> OpenDownloadStreamAsync(BsonValue id, GridFSDownloadOptions options = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             Ensure.IsNotNull(id, nameof(id));
+            options = options ?? new GridFSDownloadOptions();
             return OpenDownloadStreamHelperAsync(id, options, cancellationToken);
         }
 
         /// <inheritdoc />
         public Task<GridFSDownloadStream> OpenDownloadStreamAsync(ObjectId id, GridFSDownloadOptions options = null, CancellationToken cancellationToken = default(CancellationToken))
         {
+            options = options ?? new GridFSDownloadOptions();
             return OpenDownloadStreamHelperAsync(new BsonObjectId(id), options, cancellationToken);
         }
 
@@ -366,7 +372,7 @@ private async Task CreateChunksCollectionIndexesAsync(IReadWriteBindingHandle bi
             await operation.ExecuteAsync(binding, cancellationToken).ConfigureAwait(false);
         }
 
-        private GridFSDownloadStream CreateDownloadStream(IReadBindingHandle binding, GridFSFileInfo fileInfo, GridFSDownloadOptions options = null, CancellationToken cancellationToken = default(CancellationToken))
+        private GridFSDownloadStream CreateDownloadStream(IReadBindingHandle binding, GridFSFileInfo fileInfo, GridFSDownloadOptions options, CancellationToken cancellationToken = default(CancellationToken))
         {
             var checkMD5 = options.CheckMD5 ?? false;
             var seekable = options.Seekable ?? false;
@@ -423,7 +429,7 @@ private async Task CreateFilesCollectionIndexesAsync(IReadWriteBindingHandle bin
             }
         }
 
-        private async Task<byte[]> DownloadAsBytesHelperAsync(BsonValue id, GridFSDownloadOptions options = null, CancellationToken cancellationToken = default(CancellationToken))
+        private async Task<byte[]> DownloadAsBytesHelperAsync(BsonValue id, GridFSDownloadOptions options, CancellationToken cancellationToken = default(CancellationToken))
         {
             using (var binding = await GetSingleServerReadBindingAsync(cancellationToken).ConfigureAwait(false))
             {
@@ -446,7 +452,7 @@ private async Task CreateFilesCollectionIndexesAsync(IReadWriteBindingHandle bin
             }
         }
 
-        private async Task DownloadToStreamHelperAsync(IReadBindingHandle binding, GridFSFileInfo fileInfo, Stream destination, GridFSDownloadOptions options = null, CancellationToken cancellationToken = default(CancellationToken))
+        private async Task DownloadToStreamHelperAsync(IReadBindingHandle binding, GridFSFileInfo fileInfo, Stream destination, GridFSDownloadOptions options, CancellationToken cancellationToken = default(CancellationToken))
         {
             var checkMD5 = options.CheckMD5 ?? false;
 
@@ -467,7 +473,7 @@ private async Task CreateFilesCollectionIndexesAsync(IReadWriteBindingHandle bin
             }
         }
 
-        private async Task DownloadToStreamHelperAsync(BsonValue id, Stream destination, GridFSDownloadOptions options = null, CancellationToken cancellationToken = default(CancellationToken))
+        private async Task DownloadToStreamHelperAsync(BsonValue id, Stream destination, GridFSDownloadOptions options, CancellationToken cancellationToken = default(CancellationToken))
         {
             using (var binding = await GetSingleServerReadBindingAsync(cancellationToken).ConfigureAwait(false))
             {
@@ -617,10 +623,8 @@ private async Task<bool> IsFilesCollectionEmptyAsync(IReadWriteBindingHandle bin
             return true;
         }
 
-        private async Task<GridFSDownloadStream> OpenDownloadStreamHelperAsync(BsonValue id, GridFSDownloadOptions options = null, CancellationToken cancellationToken = default(CancellationToken))
+        private async Task<GridFSDownloadStream> OpenDownloadStreamHelperAsync(BsonValue id, GridFSDownloadOptions options, CancellationToken cancellationToken = default(CancellationToken))
         {
-            options = options ?? new GridFSDownloadByNameOptions();
-
             using (var binding = await GetSingleServerReadBindingAsync(cancellationToken).ConfigureAwait(false))
             {
                 var fileInfo = await GetFileInfoAsync(binding, id, cancellationToken).ConfigureAwait(false);