[Internal] DTS: Refactors casing in DTS response and adds tests

Microsoft.Azure.Cosmos/src/DistributedTransaction/DistributedTransactionCommitter.cs

@@ -95,8 +95,8 @@ private static void EnrichRequestMessage(RequestMessage requestMessage, Distribu
         {
             // Set DTC-specific headers
             requestMessage.Headers.Add(HttpConstants.HttpHeaders.IdempotencyToken, serverRequest.IdempotencyToken.ToString());
-            requestMessage.Headers.Add(HttpConstants.HttpHeaders.OperationType, requestMessage.OperationType.ToString());
-            requestMessage.Headers.Add(HttpConstants.HttpHeaders.ResourceType, requestMessage.ResourceType.ToString());
+            requestMessage.Headers.Add(HttpConstants.HttpHeaders.OperationType, requestMessage.OperationType.ToOperationTypeString());
+            requestMessage.Headers.Add(HttpConstants.HttpHeaders.ResourceType, requestMessage.ResourceType.ToResourceTypeString());
             requestMessage.UseGatewayMode = true;
         }
 

Microsoft.Azure.Cosmos/src/DistributedTransaction/DistributedTransactionOperationResult.cs

@@ -42,10 +42,15 @@ internal DistributedTransactionOperationResult(DistributedTransactionOperationRe
 
         /// <summary>
         /// Initializes a new instance of the <see cref="DistributedTransactionOperationResult"/> class.
-        /// This protected constructor is intended for use by derived classes.
         /// </summary>
+        /// <remarks>
+        /// Must be <c>public</c> for System.Text.Json reflection-based deserialization.
+        /// System.Text.Json 6.x only scans <c>BindingFlags.Public</c> constructors when resolving
+        /// <see cref="JsonConstructorAttribute"/>; non-public constructors are not found.
+        /// Support for non-public constructors was added in System.Text.Json 7.0.
+        /// </remarks>
         [JsonConstructor]
-        protected DistributedTransactionOperationResult()
+        public DistributedTransactionOperationResult()
         {
         }
 
@@ -60,7 +65,7 @@ protected DistributedTransactionOperationResult()
         /// Gets the HTTP status code returned by the operation.
         /// </summary>
         [JsonInclude]
-        [JsonPropertyName("statuscode")]
+        [JsonPropertyName("statusCode")]
         public virtual HttpStatusCode StatusCode { get; internal set; }
 
         /// <summary>
@@ -91,33 +96,27 @@ protected DistributedTransactionOperationResult()
         [JsonIgnore]
         public virtual Stream ResourceStream { get; internal set; }
 
-        /// <summary>
-        /// Used for JSON deserialization of the base64-encoded resource body.
-        /// </summary>
-        [JsonInclude]
-        [JsonPropertyName("resourcebody")]
-        internal string ResourceBodyBase64
-        {
-            get => null; // Write-only for deserialization
-            set
-            {
-                if (!string.IsNullOrEmpty(value))
-                {
-                    byte[] resourceBody = Convert.FromBase64String(value);
-                    this.ResourceStream = new MemoryStream(resourceBody, 0, resourceBody.Length, writable: false, publiclyVisible: true);
-                }
-            }
-        }
-
         /// <summary>
         /// Request charge in request units for the operation.
         /// </summary>
+        [JsonInclude]
         [JsonPropertyName("requestCharge")]
-        internal virtual double RequestCharge { get; set; }
+        public virtual double RequestCharge { get; internal set; }
 
-        [JsonPropertyName("substatuscode")]
+        [JsonIgnore]
         internal virtual SubStatusCodes SubStatusCode { get; set; }
 
+        /// <summary>
+        /// Gets the sub-status code value as an unsigned integer.
+        /// </summary>
+        [JsonInclude]
+        [JsonPropertyName("subStatusCode")]
+        public virtual uint SubStatusCodeValue
+        {
+            get => (uint)this.SubStatusCode;
+            internal set => this.SubStatusCode = (SubStatusCodes)value;
+        }
+
         /// <summary>
         /// ActivityId related to the operation.
         /// </summary>
@@ -127,14 +126,35 @@ internal string ResourceBodyBase64
         [JsonIgnore]
         internal ITrace Trace { get; set; }
 
+        private static readonly JsonSerializerOptions CaseInsensitiveOptions = new JsonSerializerOptions
+        {
+            PropertyNameCaseInsensitive = true,
+        };
+
         /// <summary>
         /// Creates a <see cref="DistributedTransactionOperationResult"/> from a JSON element.
         /// </summary>
         /// <param name="json">The JSON element containing the operation result.</param>
         /// <returns>The deserialized operation result.</returns>
         internal static DistributedTransactionOperationResult FromJson(JsonElement json)
         {
-            return JsonSerializer.Deserialize<DistributedTransactionOperationResult>(json);
+            DistributedTransactionOperationResult result = JsonSerializer.Deserialize<DistributedTransactionOperationResult>(json, DistributedTransactionOperationResult.CaseInsensitiveOptions);
+
+            if (json.TryGetProperty("resourceBody", out JsonElement resourceBody)
+                && resourceBody.ValueKind != JsonValueKind.Undefined
+                && resourceBody.ValueKind != JsonValueKind.Null)
+            {
+                // resourceBody is expected to be a JSON object (Cosmos DB document)
+                if (resourceBody.ValueKind != JsonValueKind.Object)
+                {
+                    throw new JsonException($"The 'resourceBody' value must be a JSON object, but was '{resourceBody.ValueKind}'.");
+                }
+
+                byte[] bytes = JsonSerializer.SerializeToUtf8Bytes(resourceBody);
+                result.ResourceStream = new MemoryStream(bytes, 0, bytes.Length, writable: false, publiclyVisible: true);
+            }
+
+            return result;
         }
     }
 }

Microsoft.Azure.Cosmos/src/DistributedTransaction/DistributedTransactionResponse.cs

@@ -314,7 +314,6 @@ private static async Task<DistributedTransactionResponse> PopulateFromJsonConten
 
                             DistributedTransactionOperationResult operationResult = DistributedTransactionOperationResult.FromJson(operationElement);
                             operationResult.Trace = trace;
-                            operationResult.SessionToken ??= responseMessage.Headers.Session;
                             operationResult.ActivityId = responseMessage.Headers.ActivityId;
                             results.Add(operationResult);
                         }
@@ -370,7 +369,6 @@ private void CreateAndPopulateResults(
                 this.results.Add(new DistributedTransactionOperationResult(this.StatusCode)
                 {
                     SubStatusCode = this.SubStatusCode,
-                    SessionToken = this.Headers?.Session,
                     ActivityId = this.ActivityId,
                     Trace = trace
                 });