CSHARP-1191: Code review changes to GridFSBucketOptions.

Author: rstam

src/MongoDB.Driver.GridFS.Tests/GridFSBucketOptionsTests.cs

@@ -102,7 +102,7 @@ public void ChunkSizeBytes_set_should_throw_when_value_is_invalid(
         public void constructor_with_immutable_other_should_initialize_instance()
         {
             var mutable = new GridFSBucketOptions { BucketName = "bucket", ChunkSizeBytes = 123, ReadPreference = ReadPreference.Secondary, WriteConcern = WriteConcern.WMajority };
-            var other = mutable.ToImmutable();
+            var other = new ImmutableGridFSBucketOptions(mutable);
 
             var result = new GridFSBucketOptions(other);
 
@@ -156,19 +156,6 @@ public void ReadPreference_set_should_have_expected_result()
             subject.ReadPreference.Should().Be(ReadPreference.Secondary);
         }
 
-        [Test]
-        public void ToImmutable_should_return_expected_result()
-        {
-            var subject = new GridFSBucketOptions { BucketName = "bucket", ChunkSizeBytes = 123, ReadPreference = ReadPreference.Secondary, WriteConcern = WriteConcern.WMajority };
-
-            var result = subject.ToImmutable();
-
-            result.BucketName.Should().Be(subject.BucketName);
-            result.ChunkSizeBytes.Should().Be(subject.ChunkSizeBytes);
-            result.ReadPreference.Should().Be(subject.ReadPreference);
-            result.WriteConcern.Should().Be(subject.WriteConcern);
-        }
-
         [Test]
         public void WriteConcern_get_should_return_expected_result()
         {
@@ -196,7 +183,7 @@ public class ImmutableGridFSBucketOptionsTests
         [Test]
         public void BucketName_get_should_return_expected_result()
         {
-            var subject = new GridFSBucketOptions { BucketName = "bucket" }.ToImmutable();
+            var subject = new ImmutableGridFSBucketOptions(new GridFSBucketOptions { BucketName = "bucket" });
 
             var result = subject.BucketName;
 
@@ -206,7 +193,7 @@ public void BucketName_get_should_return_expected_result()
         [Test]
         public void ChunkSizeBytes_get_should_return_expected_result()
         {
-            var subject = new GridFSBucketOptions { ChunkSizeBytes = 123 }.ToImmutable();
+            var subject = new ImmutableGridFSBucketOptions(new GridFSBucketOptions { ChunkSizeBytes = 123 });
 
             var result = subject.ChunkSizeBytes;
 
@@ -216,7 +203,9 @@ public void ChunkSizeBytes_get_should_return_expected_result()
         [Test]
         public void constructor_with_arguments_should_initialize_instance()
         {
-            var result = new ImmutableGridFSBucketOptions("bucket", 123, ReadPreference.Secondary, WriteConcern.WMajority);
+            var mutable = new GridFSBucketOptions { BucketName = "bucket", ChunkSizeBytes = 123, ReadPreference = ReadPreference.Secondary, WriteConcern = WriteConcern.WMajority };
+
+            var result = new ImmutableGridFSBucketOptions(mutable);
 
             result.BucketName.Should().Be("bucket");
             result.ChunkSizeBytes.Should().Be(123);
@@ -255,46 +244,20 @@ public void Defaults_get_should_return_expected_result()
             result.WriteConcern.Should().BeNull();
         }
 
-        [Test]
-        public void implicit_conversion_from_mutable_should_return_expected_result()
-        {
-            var mutable = new GridFSBucketOptions { BucketName = "bucket", ChunkSizeBytes = 123, ReadPreference = ReadPreference.Secondary, WriteConcern = WriteConcern.WMajority };
-
-            var result = (ImmutableGridFSBucketOptions)mutable;
-
-            result.BucketName.Should().Be(mutable.BucketName);
-            result.ChunkSizeBytes.Should().Be(mutable.ChunkSizeBytes);
-            result.ReadPreference.Should().Be(mutable.ReadPreference);
-            result.WriteConcern.Should().Be(mutable.WriteConcern);
-        }
-
         [Test]
         public void ReadPreference_get_should_return_expected_result()
         {
-            var subject = new GridFSBucketOptions { ReadPreference = ReadPreference.Secondary }.ToImmutable();
+            var subject = new ImmutableGridFSBucketOptions(new GridFSBucketOptions { ReadPreference = ReadPreference.Secondary });
 
             var result = subject.ReadPreference;
 
             result.Should().Be(ReadPreference.Secondary);
         }
 
-        [Test]
-        public void ToMutable_should_return_expected_result()
-        {
-            var subject = new GridFSBucketOptions { BucketName = "bucket", ChunkSizeBytes = 123, ReadPreference = ReadPreference.Secondary, WriteConcern = WriteConcern.WMajority }.ToImmutable();
-
-            var result = subject.ToMutable();
-
-            result.BucketName.Should().Be(subject.BucketName);
-            result.ChunkSizeBytes.Should().Be(subject.ChunkSizeBytes);
-            result.ReadPreference.Should().Be(subject.ReadPreference);
-            result.WriteConcern.Should().Be(subject.WriteConcern);
-        }
-
         [Test]
         public void WriteConcern_get_should_return_expected_result()
         {
-            var subject = new GridFSBucketOptions { WriteConcern = WriteConcern.WMajority }.ToImmutable();
+            var subject = new ImmutableGridFSBucketOptions(new GridFSBucketOptions { WriteConcern = WriteConcern.WMajority });
 
             var result = subject.WriteConcern;
 

src/MongoDB.Driver.GridFS.Tests/GridFSBucketTests.cs

@@ -34,18 +34,21 @@ public class GridFSBucketTests
         public void constructor_should_initialize_instance()
         {
             var database = Substitute.For<IMongoDatabase>();
-            var options = new ImmutableGridFSBucketOptions();
+            var options = new GridFSBucketOptions();
 
             var result = new GridFSBucket(database, options);
 
             result.Database.Should().BeSameAs(database);
-            result.Options.Should().BeSameAs(options);
+            result.Options.BucketName.Should().Be(options.BucketName);
+            result.Options.ChunkSizeBytes.Should().Be(options.ChunkSizeBytes);
+            result.Options.ReadPreference.Should().Be(options.ReadPreference);
+            result.Options.WriteConcern.Should().Be(options.WriteConcern);
         }
 
         [Test]
         public void constructor_should_throw_when_database_is_null()
         {
-            var options = new ImmutableGridFSBucketOptions();
+            var options = new GridFSBucketOptions();
 
             Action action = () => new GridFSBucket(null, options);
 
@@ -214,12 +217,15 @@ public void OpenUploadStreamAsync_should_throw_when_filename_is_null()
         public void Options_get_should_return_the_expected_result()
         {
             var database = Substitute.For<IMongoDatabase>();
-            var options = new ImmutableGridFSBucketOptions();
+            var options = new GridFSBucketOptions();
             var subject = new GridFSBucket(database, options);
 
             var result = subject.Options;
 
-            result.Should().BeSameAs(options);
+            result.BucketName.Should().Be(options.BucketName);
+            result.ChunkSizeBytes.Should().Be(options.ChunkSizeBytes);
+            result.ReadPreference.Should().Be(options.ReadPreference);
+            result.WriteConcern.Should().Be(options.WriteConcern);
         }
 
         [Test]
@@ -306,7 +312,7 @@ public void UploadFromStreamAsync_id_should_throw_when_source_is_null()
         }
 
         // private methods
-        private GridFSBucket CreateSubject(ImmutableGridFSBucketOptions options = null)
+        private GridFSBucket CreateSubject(GridFSBucketOptions options = null)
         {
             var cluster = Substitute.For<ICluster>();
 

src/MongoDB.Driver.GridFS/GridFSBucket.cs

@@ -43,10 +43,10 @@ public class GridFSBucket : IGridFSBucket
 
         // constructors
         /// <inheritdoc />
-        public GridFSBucket(IMongoDatabase database, ImmutableGridFSBucketOptions options = null)
+        public GridFSBucket(IMongoDatabase database, GridFSBucketOptions options = null)
         {
             _database = Ensure.IsNotNull(database, nameof(database));
-            _options = options ?? ImmutableGridFSBucketOptions.Defaults;
+            _options = options == null ? ImmutableGridFSBucketOptions.Defaults : new ImmutableGridFSBucketOptions(options);
 
             _cluster = database.Client.Cluster;
             _ensuredIndexes = 0;

src/MongoDB.Driver.GridFS/GridFSBucketOptions.cs

@@ -43,6 +43,7 @@ public GridFSBucketOptions()
         /// <param name="other">The other <see cref="GridFSBucketOptions"/> from which to copy the values.</param>
         public GridFSBucketOptions(GridFSBucketOptions other)
         {
+            Ensure.IsNotNull(other, nameof(other));
             _bucketName = other.BucketName;
             _chunkSizeBytes = other.ChunkSizeBytes;
             _readPreference = other.ReadPreference;
@@ -55,6 +56,7 @@ public GridFSBucketOptions(GridFSBucketOptions other)
         /// <param name="other">The other <see cref="ImmutableGridFSBucketOptions"/> from which to copy the values.</param>
         public GridFSBucketOptions(ImmutableGridFSBucketOptions other)
         {
+            Ensure.IsNotNull(other, nameof(other));
             _bucketName = other.BucketName;
             _chunkSizeBytes = other.ChunkSizeBytes;
             _readPreference = other.ReadPreference;
@@ -117,16 +119,6 @@ public WriteConcern WriteConcern
             get { return _writeConcern; }
             set { _writeConcern = value; }
         }
-
-        // public methods
-        /// <summary>
-        /// Returns an immutable GridFSBucketOptions.
-        /// </summary>
-        /// <returns>An immutable GridFSBucketOptions.</returns>
-        public ImmutableGridFSBucketOptions ToImmutable()
-        {
-            return new ImmutableGridFSBucketOptions(_bucketName, _chunkSizeBytes, _readPreference, _writeConcern);
-        }
     }
 
     /// <summary>
@@ -149,19 +141,6 @@ public static ImmutableGridFSBucketOptions Defaults
         {
             get { return __defaults; }
         }
-
-        // static methods
-        /// <summary>
-        /// Performs an implicit conversion from <see cref="GridFSBucketOptions"/> to <see cref="ImmutableGridFSBucketOptions"/>.
-        /// </summary>
-        /// <param name="mutable">The mutable options.</param>
-        /// <returns>
-        /// The result of the conversion.
-        /// </returns>
-        public static implicit operator ImmutableGridFSBucketOptions(GridFSBucketOptions mutable)
-        {
-            return mutable.ToImmutable();
-        }
         #endregion
 
         // fields
@@ -181,22 +160,16 @@ public ImmutableGridFSBucketOptions()
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ImmutableGridFSBucketOptions"/> class.
+        /// Initializes a new instance of the <see cref="ImmutableGridFSBucketOptions" /> class.
         /// </summary>
-        /// <param name="bucketName">The bucket name.</param>
-        /// <param name="chunkSizeBytes">The chunk size bytes.</param>
-        /// <param name="readPreference">The read preference.</param>
-        /// <param name="writeConcern">The write concern.</param>
-        public ImmutableGridFSBucketOptions(
-            string bucketName,
-            int chunkSizeBytes,
-            ReadPreference readPreference,
-            WriteConcern writeConcern)
+        /// <param name="other">The other <see cref="GridFSBucketOptions"/> from which to copy the values.</param>
+        public ImmutableGridFSBucketOptions(GridFSBucketOptions other)
         {
-            _bucketName = Ensure.IsNotNullOrEmpty(bucketName, nameof(bucketName));
-            _chunkSizeBytes = Ensure.IsGreaterThanOrEqualToZero(chunkSizeBytes, nameof(chunkSizeBytes));
-            _readPreference = readPreference;
-            _writeConcern = writeConcern;
+            Ensure.IsNotNull(other, nameof(other));
+            _bucketName = other.BucketName;
+            _chunkSizeBytes = other.ChunkSizeBytes;
+            _readPreference = other.ReadPreference;
+            _writeConcern = other.WriteConcern;
         }
 
         // properties
@@ -243,15 +216,5 @@ public WriteConcern WriteConcern
         {
             get { return _writeConcern; }
         }
-
-        // public methods
-        /// <summary>
-        /// Converts this immutable instance of GridFSBucketOptions to a mutable instance.
-        /// </summary>
-        /// <returns>A mutable instance of the GridFSBucketOptions.</returns>
-        public GridFSBucketOptions ToMutable()
-        {
-            return new GridFSBucketOptions(this);
-        }
     }
 }