Allow contentType to be null in calls to UploadObject.

Fixes issue googleapis#117.
jskeet · Apr 27, 2016 · b6c35ca · b6c35ca
1 parent 3e44287
commit b6c35ca
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/Google.Storage.V1/StorageClient.UploadObject.cs b/src/Google.Storage.V1/StorageClient.UploadObject.cs
@@ -29,7 +29,7 @@ public abstract partial class StorageClient
         /// <param name="bucket">The name of the bucket containing the object. Must not be null.</param>
         /// <param name="objectName">The name of the object within the bucket. Must not be null.</param>
         /// <param name="contentType">The content type of the object. This should be a MIME type
-        /// such as "text/html" or "application/octet-stream". Must not be null, but may be empty.</param>
+        /// such as "text/html" or "application/octet-stream". May be null.</param>
         /// <param name="source">The stream to read the data from. Must not be null.</param>
         /// <param name="options">Additional options for the upload. May be null, in which case appropriate
         /// defaults will be used.</param>
@@ -52,7 +52,7 @@ public abstract partial class StorageClient
         /// <param name="bucket">The name of the bucket containing the object. Must not be null.</param>
         /// <param name="objectName">The name of the object within the bucket. Must not be null.</param>
         /// <param name="contentType">The content type of the object. This should be a MIME type
-        /// such as "text/html" or "application/octet-stream". Must not be null, but may be empty.</param>
+        /// such as "text/html" or "application/octet-stream". May be null.</param>
         /// <param name="source">The stream to read the data from. Must not be null.</param>
         /// <returns>A task representing the asynchronous operation, with a result returning the
         /// <see cref="Object"/> representation of the uploaded object.</returns>
@@ -67,7 +67,7 @@ public virtual Task<Object> UploadObjectAsync(string bucket, string objectName,
         /// <param name="bucket">The name of the bucket containing the object. Must not be null.</param>
         /// <param name="objectName">The name of the object within the bucket. Must not be null.</param>
         /// <param name="contentType">The content type of the object. This should be a MIME type
-        /// such as "text/html" or "application/octet-stream". Must not be null, but may be empty.</param>
+        /// such as "text/html" or "application/octet-stream". May be null.</param>
         /// <param name="source">The stream to read the data from. Must not be null.</param>
         /// <param name="options">Additional options for the upload. May be null, in which case appropriate
         /// defaults will be used.</param>

diff --git a/src/Google.Storage.V1/StorageClientImpl.UploadObject.cs b/src/Google.Storage.V1/StorageClientImpl.UploadObject.cs
@@ -34,7 +34,6 @@ public sealed partial class StorageClientImpl : StorageClient
         {
             ValidateBucket(bucket);
             Preconditions.CheckNotNull(objectName, nameof(objectName));
-            Preconditions.CheckNotNull(contentType, nameof(contentType));
             return UploadObject(
                 new Object { Bucket = bucket, Name = objectName, ContentType = contentType },
                 source, options, progress);
@@ -59,7 +58,6 @@ public override Task<Object> UploadObjectAsync(string bucket, string objectName,
         {
             ValidateBucket(bucket);
             Preconditions.CheckNotNull(objectName, nameof(objectName));
-            Preconditions.CheckNotNull(contentType, nameof(contentType));
             return UploadObjectAsync(new Object { Bucket = bucket, Name = objectName, ContentType = contentType },
                 source, options, cancellationToken, progress);
         }