Added separate request options for read vs write.

Microsoft.Azure.Cosmos/src/Batch/ItemBatchOperation.cs

@@ -171,7 +171,10 @@ internal static Result WriteOperation(ref RowWriter writer, TypeArgument typeArg
                     }
                 }
 
-                if (options.ReturnMinimalResponse)
+                if (ItemRequestOptions.ShouldSetNoContentHeader(
+                    options.NoContentResponseOnWrite,
+                    options.NoContentResponseOnRead,
+                    operation.OperationType))
                 {
                     r = writer.WriteBool("minimalReturnPreference", true);
                     if (r != Result.Success)

Microsoft.Azure.Cosmos/src/Batch/TransactionalBatchItemRequestOptions.cs

@@ -18,6 +18,26 @@ public class TransactionalBatchItemRequestOptions : RequestOptions
         /// <seealso cref="Microsoft.Azure.Cosmos.IndexingPolicy"/>
         public IndexingDirective? IndexingDirective { get; set; }
 
+        /// <summary>
+        /// Gets or sets the boolean to only return the headers and status code in the Cosmos DB response.
+        /// This removes the resource from the response. This reduces networking and CPU load by not sending
+        /// the resource back over the network and serializing it on the client.
+        /// </summary>
+        /// <remarks>
+        /// This is optimal for workloads where the returned resource is not used.
+        /// </remarks>
+        public virtual bool? NoContentResponseOnWrite { get; set; }
+
+        /// <summary>
+        /// Gets or sets the boolean to only return the headers and status code in the Cosmos DB response.
+        /// This removes the resource from the response. This reduces networking and CPU load by not sending
+        /// the resource back over the network and serializing it on the client.
+        /// </summary>
+        /// <remarks>
+        /// This is optimal for workloads where the returned resource is not used.
+        /// </remarks>
+        public virtual bool? NoContentResponseOnRead { get; set; }
+
         /// <summary>
         /// Options to encrypt properties of the item.
         /// </summary>
@@ -35,14 +55,14 @@ internal static TransactionalBatchItemRequestOptions FromItemRequestOptions(Item
                 return null;
             }
 
-            RequestOptions requestOptions = itemRequestOptions as RequestOptions;
             TransactionalBatchItemRequestOptions batchItemRequestOptions = new TransactionalBatchItemRequestOptions();
             batchItemRequestOptions.IndexingDirective = itemRequestOptions.IndexingDirective;
-            batchItemRequestOptions.IfMatchEtag = requestOptions.IfMatchEtag;
-            batchItemRequestOptions.IfNoneMatchEtag = requestOptions.IfNoneMatchEtag;
-            batchItemRequestOptions.Properties = requestOptions.Properties;
-            batchItemRequestOptions.ReturnMinimalResponse = requestOptions.ReturnMinimalResponse;
-            batchItemRequestOptions.IsEffectivePartitionKeyRouting = requestOptions.IsEffectivePartitionKeyRouting;
+            batchItemRequestOptions.IfMatchEtag = itemRequestOptions.IfMatchEtag;
+            batchItemRequestOptions.IfNoneMatchEtag = itemRequestOptions.IfNoneMatchEtag;
+            batchItemRequestOptions.Properties = itemRequestOptions.Properties;
+            batchItemRequestOptions.NoContentResponseOnWrite = itemRequestOptions.NoContentResponseOnWrite;
+            batchItemRequestOptions.NoContentResponseOnRead = itemRequestOptions.NoContentResponseOnRead;
+            batchItemRequestOptions.IsEffectivePartitionKeyRouting = itemRequestOptions.IsEffectivePartitionKeyRouting;
             return batchItemRequestOptions;
         }
     }

Microsoft.Azure.Cosmos/src/RequestOptions/ItemRequestOptions.cs

@@ -97,6 +97,46 @@ public ConsistencyLevel? ConsistencyLevel
             set => this.BaseConsistencyLevel = value;
         }
 
+        /// <summary>
+        /// Gets or sets the boolean to only return the headers and status code in the Cosmos DB response.
+        /// This removes the resource from the response. This reduces networking and CPU load by not sending
+        /// the resource back over the network and serializing it on the client.
+        /// </summary>
+        /// <example>
+        /// <code language="c#">
+        /// <![CDATA[
+        /// ItemRequestOption requestOptions = new ItemRequestOptions() { NoContentResponseOnWrite = true };
+        /// ItemResponse itemResponse = await this.container.CreateItemAsync<ToDoActivity>(tests, new PartitionKey(test.status), requestOptions);
+        /// Assert.AreEqual(HttpStatusCode.Created, itemResponse.StatusCode);
+        /// Assert.IsNull(itemResponse.Resource);
+        /// ]]>
+        /// </code>
+        /// </example>
+        /// <remarks>
+        /// This is optimal for workloads where the returned resource is not used.
+        /// </remarks>
+        public virtual bool? NoContentResponseOnWrite { get; set; }
+
+        /// <summary>
+        /// Gets or sets the boolean to only return the headers and status code in the Cosmos DB response.
+        /// This removes the resource from the response. This reduces networking and CPU load by not sending
+        /// the resource back over the network and serializing it on the client.
+        /// </summary>
+        /// <example>
+        /// <code language="c#">
+        /// <![CDATA[
+        /// ItemRequestOption requestOptions = new ItemRequestOptions() { NoContentResponseOnWrite = true };
+        /// ItemResponse itemResponse = await this.container.ReadItemAsync<ToDoActivity>(tests, new PartitionKey(test.status), requestOptions);
+        /// Assert.AreEqual(HttpStatusCode.Created, itemResponse.StatusCode);
+        /// Assert.IsNull(itemResponse.Resource);
+        /// ]]>
+        /// </code>
+        /// </example>
+        /// <remarks>
+        /// This is optimal for workloads where the returned resource is not used.
+        /// </remarks>
+        public virtual bool? NoContentResponseOnRead { get; set; }
+
         /// <summary>
         /// Options to encrypt properties of the item.
         /// </summary>
@@ -132,7 +172,34 @@ internal override void PopulateRequestOptions(RequestMessage request)
 
             RequestOptions.SetSessionToken(request, this.SessionToken);
 
+            if (ItemRequestOptions.ShouldSetNoContentHeader(
+                this.NoContentResponseOnWrite,
+                this.NoContentResponseOnRead,
+                request.OperationType))
+            {
+                request.Headers.Add(HttpConstants.HttpHeaders.Prefer, HttpConstants.HttpHeaderValues.PreferReturnMinimal);
+            }
+
             base.PopulateRequestOptions(request);
         }
+
+        internal static bool ShouldSetNoContentHeader(
+            bool? onItemWrite,
+            bool? onItemRead,
+            OperationType operationType)
+        {
+            if (onItemRead.HasValue &&
+                onItemRead.Value &&
+                operationType == OperationType.Read)
+            {
+                return true;
+            }
+
+            return onItemWrite.HasValue &&
+              onItemWrite.Value &&
+              (operationType == OperationType.Create ||
+              operationType == OperationType.Replace ||
+              operationType == OperationType.Upsert);
+        }
     }
 }

Microsoft.Azure.Cosmos/src/RequestOptions/QueryRequestOptions.cs

@@ -143,13 +143,6 @@ public ConsistencyLevel? ConsistencyLevel
         /// </remarks>
         public string SessionToken { get; set; }
 
-        /// <inheritdoc/>
-        public override bool ReturnMinimalResponse
-        {
-            get => base.ReturnMinimalResponse;
-            set => throw new NotSupportedException("ReturnMinimalResponse is not supported on query operations. Please use SQL to change the response.");
-        }
-
         internal CosmosElement CosmosElementContinuationToken { get; set; }
 
         internal string StartId { get; set; }

Microsoft.Azure.Cosmos/src/RequestOptions/RequestOptions.cs

@@ -32,26 +32,6 @@ public class RequestOptions
         /// </remarks>
         public string IfNoneMatchEtag { get; set; }
 
-        /// <summary>
-        /// Gets or sets the boolean to only return the headers and status code in the Cosmos DB response.
-        /// This removes the resource from the response. This reduces networking and CPU load by not sending
-        /// the resource back over the network and serializing it on the client.
-        /// </summary>
-        /// <example>
-        /// <code language="c#">
-        /// <![CDATA[
-        /// ItemRequestOption requestOptions = new ItemRequestOptions() { ReturnMinimalResponse = true };
-        /// ItemResponse itemResponse = await this.container.CreateItemAsync<ToDoActivity>(tests, new PartitionKey(test.status), requestOptions);
-        /// Assert.AreEqual(HttpStatusCode.Created, itemResponse.StatusCode);
-        /// Assert.IsNull(itemResponse.Resource);
-        /// ]]>
-        /// </code>
-        /// </example>
-        /// <remarks>
-        /// This is optimal for workloads where the returned resource is not used.
-        /// </remarks>
-        public virtual bool ReturnMinimalResponse { get; set; }
-
         /// <summary>
         /// Gets or sets the boolean to use effective partition key routing in the cosmos db request.
         /// </summary>
@@ -100,11 +80,6 @@ internal virtual void PopulateRequestOptions(RequestMessage request)
             {
                 request.Headers.Add(HttpConstants.HttpHeaders.IfNoneMatch, this.IfNoneMatchEtag);
             }
-
-            if (this.ReturnMinimalResponse)
-            {
-                request.Headers.Add(HttpConstants.HttpHeaders.Prefer, HttpConstants.HttpHeaderValues.PreferReturnMinimal);
-            }
         }
 
         /// <summary>