Patch : Refactors the TrySerializeValueParameter method for PatchOperation and makes it public

Microsoft.Azure.Cosmos/src/Patch/PatchOperation.cs

@@ -5,6 +5,7 @@
 namespace Microsoft.Azure.Cosmos
 {
  using System;
+ using System.IO;
  using Newtonsoft.Json;
 
  /// <summary>
@@ -29,9 +30,16 @@ abstract class PatchOperation
  [JsonProperty(PropertyName = PatchConstants.PropertyNames.Path)]
  public abstract string Path { get; }
 
- internal virtual bool TrySerializeValueParameter(
+ /// <summary>
+ /// Serializes the value parameter, if specified for the PatchOperation.
+ /// </summary>
+ /// <param name="cosmosSerializer">Serializer to be used.</param>
+ /// <param name="valueParam">Outputs the serialized stream if value parameter is specified, null otherwise.</param>
+ /// <returns>True if value is serialized, false otherwise.</returns>
+ /// <remarks>Output stream should be disposed after use.</remarks>
+ public virtual bool TrySerializeValueParameter(
  CosmosSerializer cosmosSerializer,
- out string valueParam)
+ out Stream valueParam)
  {
  valueParam = null;
  return false;

Microsoft.Azure.Cosmos/src/Patch/PatchOperationCore{T}.cs

@@ -33,20 +33,14 @@ public PatchOperationCore(
 
  public override string Path { get; }
 
- internal override bool TrySerializeValueParameter(
+ public override bool TrySerializeValueParameter(
  CosmosSerializer cosmosSerializer,
- out string valueParam)
+ out Stream valueParam)
  {
  // Use the user serializer so custom conversions are correctly handled
- using (Stream stream = cosmosSerializer.ToStream(this.Value))
- {
- using (StreamReader streamReader = new StreamReader(stream))
- {
- valueParam = streamReader.ReadToEnd();
- }
- }
+ valueParam = cosmosSerializer.ToStream(this.Value);
 
  return true;
  }
  }
-}
+}

Microsoft.Azure.Cosmos/src/Patch/PatchOperationsJsonConverter.cs

@@ -6,6 +6,7 @@ namespace Microsoft.Azure.Cosmos
 {
  using System;
  using System.Collections.Generic;
+ using System.IO;
  using Newtonsoft.Json;
 
  /// <summary>
@@ -87,8 +88,17 @@ public override void WriteJson(
  writer.WritePropertyName(PatchConstants.PropertyNames.Path);
  writer.WriteValue(operation.Path);
 
- if (operation.TrySerializeValueParameter(this.userSerializer, out string valueParam))
+ if (operation.TrySerializeValueParameter(this.userSerializer, out Stream valueStream))
  {
+ string valueParam;
+ using (valueStream)
+ {
+ using (StreamReader streamReader = new StreamReader(valueStream))
+ {
+ valueParam = streamReader.ReadToEnd();
+ }
+ }
+
  writer.WritePropertyName(PatchConstants.PropertyNames.Value);
  writer.WriteRawValue(valueParam);
  }

Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Contracts/DotNetPreviewSDKAPI.json

@@ -1340,6 +1340,11 @@
  }
  },
  "Members": {
+ "Boolean TrySerializeValueParameter(Microsoft.Azure.Cosmos.CosmosSerializer, System.IO.Stream ByRef)": {
+ "Type": "Method",
+ "Attributes": [],
+ "MethodInfo": "Boolean TrySerializeValueParameter(Microsoft.Azure.Cosmos.CosmosSerializer, System.IO.Stream ByRef);IsAbstract:False;IsStatic:False;IsVirtual:True;IsGenericMethod:False;IsConstructor:False;IsFinal:False;"
+ },
  "Microsoft.Azure.Cosmos.PatchOperation Add[T](System.String, T)": {
  "Type": "Method",
  "Attributes": [],

Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/PatchOperationTests.cs

@@ -72,14 +72,26 @@ private static void ValidateOperations<T>(PatchOperation patchOperation, PatchOp
  {
  string expected;
  CosmosSerializer cosmosSerializer = new CosmosJsonDotNetSerializer();
- Stream stream = cosmosSerializer.ToStream(value);
- using (StreamReader streamReader = new StreamReader(stream))
+ using (Stream stream = cosmosSerializer.ToStream(value))
  {
- expected = streamReader.ReadToEnd();
+ using (StreamReader streamReader = new StreamReader(stream))
+ {
+ expected = streamReader.ReadToEnd();
+ }
  }
 
- Assert.IsTrue(patchOperation.TrySerializeValueParameter(new CustomSerializer(), out string valueParam));
- Assert.AreEqual(expected, valueParam);
+ Assert.IsTrue(patchOperation.TrySerializeValueParameter(new CustomSerializer(), out Stream valueParam));
+
+ string actual;
+ using (valueParam)
+ {
+ using (StreamReader streamReader = new StreamReader(valueParam))
+ {
+ actual = streamReader.ReadToEnd();
+ }
+ }
+
+ Assert.AreEqual(expected, actual);
  }
  }