CHARP-4752: Remove deprecated GridFS fields (#1491)

papafe · web-flow · commit acd6644002f2 · 2024-10-10T21:08:34.000+02:00
diff --git a/specifications/gridfs/tests/upload.json b/specifications/gridfs/tests/upload.json
@@ -287,8 +287,7 @@
             "$hex": "11"
           },
           "options": {
-            "chunkSizeBytes": 4,
-            "contentType": "image/jpeg"
+            "chunkSizeBytes": 4
           }
         }
       },
@@ -303,8 +302,7 @@
                 "length": 1,
                 "chunkSize": 4,
                 "uploadDate": "*actual",
-                "filename": "filename",
-                "contentType": "image/jpeg"
+                "filename": "filename"
               }
             ]
           },
diff --git a/src/MongoDB.Driver/GridFS/GridFSBucket.cs b/src/MongoDB.Driver/GridFS/GridFSBucket.cs
@@ -736,8 +736,6 @@ private GridFSUploadStream<TFileId> CreateUploadStream(IReadWriteBindingHandle b
                 id,
                 filename,
                 options.Metadata,
-                options.Aliases,
-                options.ContentType,
                 chunkSizeBytes,
                 batchSize);
 #pragma warning restore
diff --git a/src/MongoDB.Driver/GridFS/GridFSFileInfo.cs b/src/MongoDB.Driver/GridFS/GridFSFileInfo.cs
@@ -39,19 +39,6 @@ public GridFSFileInfo(BsonDocument backingDocument, IGridFSFileInfoSerializer<TF
         {
         }
 
-        // public properties
-        /// <summary>
-        /// Gets the aliases.
-        /// </summary>
-        /// <value>
-        /// The aliases.
-        /// </value>
-        [Obsolete("Place aliases inside metadata instead.")]
-        public IEnumerable<string> Aliases
-        {
-            get { return GetValue<string[]>("Aliases", null); }
-        }
-
         /// <summary>
         /// Gets the backing document.
         /// </summary>
@@ -74,18 +61,6 @@ public int ChunkSizeBytes
             get { return GetValue<int>("ChunkSizeBytes"); }
         }
 
-        /// <summary>
-        /// Gets the type of the content.
-        /// </summary>
-        /// <value>
-        /// The type of the content.
-        /// </value>
-        [Obsolete("Place contentType inside metadata instead.")]
-        public string ContentType
-        {
-            get { return GetValue<string>("ContentType", null); }
-        }
-
         /// <summary>
         /// Gets the filename.
         /// </summary>
diff --git a/src/MongoDB.Driver/GridFS/GridFSFileInfoCompat.cs b/src/MongoDB.Driver/GridFS/GridFSFileInfoCompat.cs
@@ -40,19 +40,6 @@ public GridFSFileInfo(BsonDocument backingDocument)
         {
         }
 
-        // public properties
-        /// <summary>
-        /// Gets the aliases.
-        /// </summary>
-        /// <value>
-        /// The aliases.
-        /// </value>
-        [Obsolete("Place aliases inside metadata instead.")]
-        public IEnumerable<string> Aliases
-        {
-            get { return GetValue<string[]>("Aliases", null); }
-        }
-
         /// <summary>
         /// Gets the backing document.
         /// </summary>
@@ -75,18 +62,6 @@ public int ChunkSizeBytes
             get { return GetValue<int>("ChunkSizeBytes"); }
         }
 
-        /// <summary>
-        /// Gets the type of the content.
-        /// </summary>
-        /// <value>
-        /// The type of the content.
-        /// </value>
-        [Obsolete("Place contentType inside metadata instead.")]
-        public string ContentType
-        {
-            get { return GetValue<string>("ContentType", null); }
-        }
-
         /// <summary>
         /// Gets the filename.
         /// </summary>
diff --git a/src/MongoDB.Driver/GridFS/GridFSForwardOnlyUploadStream.cs b/src/MongoDB.Driver/GridFS/GridFSForwardOnlyUploadStream.cs
@@ -35,15 +35,13 @@ internal class GridFSForwardOnlyUploadStream<TFileId> : GridFSUploadStream<TFile
 
         // fields
         private bool _aborted;
-        private readonly List<string> _aliases;
         private List<byte[]> _batch;
         private long _batchPosition;
         private int _batchSize;
         private readonly IWriteBinding _binding;
         private readonly GridFSBucket<TFileId> _bucket;
         private readonly int _chunkSizeBytes;
         private bool _closed;
-        private readonly string _contentType;
         private bool _disposed;
         private readonly string _filename;
         private readonly TFileId _id;
@@ -58,8 +56,6 @@ public GridFSForwardOnlyUploadStream(
             TFileId id,
             string filename,
             BsonDocument metadata,
-            IEnumerable<string> aliases,
-            string contentType,
             int chunkSizeBytes,
             int batchSize)
         {
@@ -68,8 +64,6 @@ public GridFSForwardOnlyUploadStream(
             _id = id;
             _filename = filename;
             _metadata = metadata; // can be null
-            _aliases = aliases == null ? null : aliases.ToList(); // can be null
-            _contentType = contentType; // can be null
             _chunkSizeBytes = chunkSizeBytes;
             _batchSize = batchSize;
             _batch = new List<byte[]>();
@@ -315,8 +309,6 @@ private BsonDocument CreateFilesCollectionDocument()
                 { "chunkSize", _chunkSizeBytes },
                 { "uploadDate", uploadDateTime },
                 { "filename", _filename },
-                { "contentType", _contentType, _contentType != null },
-                { "aliases", () => new BsonArray(_aliases.Select(a => new BsonString(a))), _aliases != null },
                 { "metadata", _metadata, _metadata != null }
             };
         }
diff --git a/src/MongoDB.Driver/GridFS/GridFSUploadOptions.cs b/src/MongoDB.Driver/GridFS/GridFSUploadOptions.cs
@@ -26,26 +26,10 @@ namespace MongoDB.Driver.GridFS
     public class GridFSUploadOptions
     {
         // fields
-        private IEnumerable<string> _aliases;
         private int? _batchSize;
         private int? _chunkSizeBytes;
-        private string _contentType;
         private BsonDocument _metadata;
 
-        // properties
-        /// <summary>
-        /// Gets or sets the aliases.
-        /// </summary>
-        /// <value>
-        /// The aliases.
-        /// </value>
-        [Obsolete("Place aliases inside metadata instead.")]
-        public IEnumerable<string> Aliases
-        {
-            get { return _aliases; }
-            set { _aliases = value; }
-        }
-
         /// <summary>
         /// Gets or sets the batch size.
         /// </summary>
@@ -73,19 +57,6 @@ public int? ChunkSizeBytes
             set { _chunkSizeBytes = Ensure.IsNullOrGreaterThanZero(value, nameof(value)); }
         }
 
-        /// <summary>
-        /// Gets or sets the type of the content.
-        /// </summary>
-        /// <value>
-        /// The type of the content.
-        /// </value>
-        [Obsolete("Place contentType inside metadata instead.")]
-        public string ContentType
-        {
-            get { return _contentType; }
-            set { _contentType = Ensure.IsNullOrNotEmpty(value, nameof(value)); }
-        }
-
         /// <summary>
         /// Gets or sets the metadata.
         /// </summary>
diff --git a/tests/MongoDB.Driver.Tests/GridFS/GridFSFileInfoTests.cs b/tests/MongoDB.Driver.Tests/GridFS/GridFSFileInfoTests.cs
@@ -27,38 +27,6 @@ namespace MongoDB.Driver.Tests.GridFS
 {
     public class GridFSFileInfoTests
     {
-        [Fact]
-        public void Aliases_get_should_return_the_expected_result()
-        {
-            var value = new[] { "alias" };
-            var subject = CreateSubject(aliases: value);
-
-#pragma warning disable 618
-            var result = subject.Aliases;
-#pragma warning restore
-
-            result.Should().Equal(value);
-        }
-
-        [Theory]
-        [ParameterAttributeData]
-        public void Aliases_should_be_deserialized_correctly(
-            [Values(null, new string[0], new string[] { null }, new[] { "a" }, new[] { "a", "b" })]
-            string[] value)
-        {
-            var document = CreateFilesCollectionDocument();
-            if (value != null)
-            {
-                document["aliases"] = new BsonArray(value);
-            }
-
-            var subject = DeserializeFilesCollectionDocument(document);
-
-#pragma warning disable 618
-            subject.Aliases.Should().Equal(value);
-#pragma warning restore
-        }
-
         [Fact]
         public void BackingDocument_get_should_return_the_expected_result()
         {
@@ -101,38 +69,6 @@ public void constructor_should_initialize_instance()
             result.BackingDocument.Should().BeSameAs(backdocument);
         }
 
-        [Fact]
-        public void ContentType_get_should_return_the_expected_result()
-        {
-            var value = "application/image";
-            var subject = CreateSubject(contentType: value);
-
-#pragma warning disable 618
-            var result = subject.ContentType;
-#pragma warning restore
-
-            result.Should().Be(value);
-        }
-
-        [Theory]
-        [ParameterAttributeData]
-        public void ContentType_should_be_deserialized_correctly(
-            [Values(null, "type")]
-            string value)
-        {
-            var document = CreateFilesCollectionDocument();
-            if (value != null)
-            {
-                document["contentType"] = value;
-            }
-
-            var subject = DeserializeFilesCollectionDocument(document);
-
-#pragma warning disable 618
-            subject.ContentType.Should().Be(value);
-#pragma warning restore
-        }
-
         [Theory]
         [ParameterAttributeData]
         public void ExtraElements_should_be_deserialized_correctly(
diff --git a/tests/MongoDB.Driver.Tests/GridFS/GridFSUploadOptionsTests.cs b/tests/MongoDB.Driver.Tests/GridFS/GridFSUploadOptionsTests.cs
@@ -24,32 +24,6 @@ namespace MongoDB.Driver.Tests.GridFS
 {
     public class GridFSUploadOptionsTests
     {
-        [Fact]
-        public void Aliases_get_should_return_expected_result()
-        {
-#pragma warning disable 618
-            var value = new[] { "alias" };
-            var subject = new GridFSUploadOptions { Aliases = value };
-
-            var result = subject.Aliases;
-#pragma warning restore
-
-            result.Should().BeSameAs(value);
-        }
-
-        [Fact]
-        public void Aliases_set_should_have_expected_result()
-        {
-            var subject = new GridFSUploadOptions();
-            var value = new[] { "alias" };
-
-#pragma warning disable 618
-            subject.Aliases = value;
-
-            subject.Aliases.Should().BeSameAs(value);
-#pragma warning restore
-        }
-
         [Fact]
         public void BatchSize_get_should_return_expected_result()
         {
@@ -116,52 +90,14 @@ public void ChunkSizeBytes_set_should_throw_when_value_is_invalid(
             action.ShouldThrow<ArgumentException>().And.ParamName.Should().Be("value");
         }
 
-        [Fact]
-        public void ContentType_get_should_return_expected_result()
-        {
-#pragma warning disable 618
-            var subject = new GridFSUploadOptions { ContentType = "type" };
-
-            var result = subject.ContentType;
-
-            result.Should().Be("type");
-#pragma warning restore
-        }
-
-        [Fact]
-        public void ContentType_set_should_have_expected_result()
-        {
-#pragma warning disable 618
-            var subject = new GridFSUploadOptions();
-
-            subject.ContentType = "type";
-
-            subject.ContentType.Should().Be("type");
-#pragma warning restore
-        }
-
-        [Fact]
-        public void ContentType_set_should_throw_when_value_is_invalid()
-        {
-#pragma warning disable 618
-            var subject = new GridFSUploadOptions();
-
-            Action action = () => subject.ContentType = "";
-
-            action.ShouldThrow<ArgumentException>().And.ParamName.Should().Be("value");
-#pragma warning restore
-        }
-
         [Fact]
         public void default_constructor_should_return_expected_result()
         {
             var result = new GridFSUploadOptions();
 
 #pragma warning disable 618
-            result.Aliases.Should().BeNull();
             result.BatchSize.Should().NotHaveValue();
             result.ChunkSizeBytes.Should().NotHaveValue();
-            result.ContentType.Should().BeNull();
             result.Metadata.Should().BeNull();
 #pragma warning restore
         }
diff --git a/tests/MongoDB.Driver.Tests/Specifications/gridfs/GridFSUploadFromBytesTest.cs b/tests/MongoDB.Driver.Tests/Specifications/gridfs/GridFSUploadFromBytesTest.cs
@@ -85,22 +85,10 @@ private void ParseOptions(BsonDocument options)
                 _options = _options ?? new GridFSUploadOptions();
                 switch (option.Name)
                 {
-                    case "aliases":
-#pragma warning disable 618
-                        _options.Aliases = option.Value.AsBsonArray.Select(v => v.AsString);
-#pragma warning restore
-                        break;
-
                     case "chunkSizeBytes":
                         _options.ChunkSizeBytes = option.Value.ToInt32();
                         break;
 
-                    case "contentType":
-#pragma warning disable 618
-                        _options.ContentType = option.Value.AsString;
-#pragma warning restore
-                        break;
-
                     case "metadata":
                         _options.Metadata = option.Value.AsBsonDocument;
                         break;

Original file line number	Diff line number	Diff line change
`@@ -287,8 +287,7 @@`
`287`	`287`	`"$hex": "11"`
`288`	`288`	`},`
`289`	`289`	`"options": {`
`290`		`- "chunkSizeBytes": 4,`
`291`		`- "contentType": "image/jpeg"`
	`290`	`+ "chunkSizeBytes": 4`
`292`	`291`	`}`
`293`	`292`	`}`
`294`	`293`	`},`
`@@ -303,8 +302,7 @@`
`303`	`302`	`"length": 1,`
`304`	`303`	`"chunkSize": 4,`
`305`	`304`	`"uploadDate": "*actual",`
`306`		`- "filename": "filename",`
`307`		`- "contentType": "image/jpeg"`
	`305`	`+ "filename": "filename"`
`308`	`306`	`}`
`309`	`307`	`]`
`310`	`308`	`},`