CF/P AVAD: Fixes Deserialization of ChangeFeedItem and ChangeFeedMetadata to support System.Text.Json and Newtonsoft.Json

Microsoft.Azure.Cosmos/src/Resource/FullFidelity/ChangeFeedItem.cs

@@ -4,6 +4,7 @@
 
 namespace Microsoft.Azure.Cosmos
 {
+    using System.Text.Json.Serialization;
     using Newtonsoft.Json;
 
     /// <summary>
@@ -59,18 +60,21 @@ class ChangeFeedItem<T>
         /// The full fidelity change feed current item.
         /// </summary>
         [JsonProperty(PropertyName = "current")]
+        [JsonPropertyName("current")]
         public T Current { get; set; }
 
         /// <summary>
         /// The full fidelity change feed metadata.
         /// </summary>
         [JsonProperty(PropertyName = "metadata", NullValueHandling = NullValueHandling.Ignore)]
+        [JsonPropertyName("metadata")]
         public ChangeFeedMetadata Metadata { get; set; }
 
         /// <summary>
         /// For delete operations, previous image is always going to be provided. The previous image on replace operations is not going to be exposed by default and requires account-level or container-level opt-in.
         /// </summary>
         [JsonProperty(PropertyName = "previous", NullValueHandling = NullValueHandling.Ignore)]
+        [JsonPropertyName("previous")]
         public T Previous { get; set; }
     }
 }

Microsoft.Azure.Cosmos/src/Resource/FullFidelity/ChangeFeedMetadata.cs

@@ -5,9 +5,10 @@
 namespace Microsoft.Azure.Cosmos
 {
     using System;
+    using System.Text.Json;
+    using System.Text.Json.Serialization;
     using Microsoft.Azure.Documents;
     using Newtonsoft.Json;
-    using Newtonsoft.Json.Converters;
 
     /// <summary>
     /// The metadata of a change feed resource with <see cref="ChangeFeedMode"/> is initialized to <see cref="ChangeFeedMode.AllVersionsAndDeletes"/>.
@@ -16,39 +17,66 @@ namespace Microsoft.Azure.Cosmos
     public
 #else
     internal
-#endif 
+#endif
         class ChangeFeedMetadata
     {
+        /// <summary>
+        /// New instance of meta data for <see cref="ChangeFeedItem{T}"/> created.
+        /// </summary>
+        /// <param name="conflictResolutionTimestamp"></param>
+        /// <param name="lsn"></param>
+        /// <param name="operationType"></param>
+        /// <param name="previousLSN"></param>
+        /// <param name="isTimeToLiveExpired"></param>
+        public ChangeFeedMetadata(
+            DateTime conflictResolutionTimestamp,
+            long lsn,
+            ChangeFeedOperationType operationType,
+            long previousLSN,
+            bool isTimeToLiveExpired)
+        {
+            this.ConflictResolutionTimestamp = conflictResolutionTimestamp;
+            this.Lsn = lsn;
+            this.OperationType = operationType;
+            this.PreviousLSN = previousLSN;
+            this.IsTimeToLiveExpired = isTimeToLiveExpired;
+        }
+
         /// <summary>
         /// The conflict resolution timestamp.
         /// </summary>
         [JsonProperty(PropertyName = "crts", NullValueHandling = NullValueHandling.Ignore)]
-        [JsonConverter(typeof(UnixDateTimeConverter))]
-        public DateTime ConflictResolutionTimestamp { get; internal set; }
+        [JsonPropertyName("crts")]
+        [Newtonsoft.Json.JsonConverter(typeof(UnixDateTimeConverter))]
+        [System.Text.Json.Serialization.JsonConverter(typeof(Resource.FullFidelity.Converters.STJUnixDateTimeConverter))]
+        public DateTime ConflictResolutionTimestamp { get; }
 
         /// <summary>
         /// The current logical sequence number.
         /// </summary>
         [JsonProperty(PropertyName = "lsn", NullValueHandling = NullValueHandling.Ignore)]
-        public long Lsn { get; internal set;  }
+        [JsonPropertyName("lsn")]
+        public long Lsn { get; }
 
         /// <summary>
         /// The change feed operation type.
         /// </summary>
-        [JsonProperty(PropertyName = "operationType")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public ChangeFeedOperationType OperationType { get; internal set; }
+        [JsonProperty(PropertyName = "operationType", NullValueHandling = NullValueHandling.Ignore)]
+        [JsonPropertyName("operationType")]
+        public ChangeFeedOperationType OperationType { get; }
 
         /// <summary>
         /// The previous logical sequence number.
         /// </summary>
-        [JsonProperty(PropertyName = "previousImageLSN", NullValueHandling = NullValueHandling.Ignore)]
-        public long PreviousLsn { get; internal set; }
+        [Newtonsoft.Json.JsonProperty(PropertyName = "previousImageLSN", NullValueHandling = NullValueHandling.Ignore)]
+        [JsonPropertyName("previousImageLSN")]
+        public long PreviousLSN { get; }
 
         /// <summary>
         /// Used to distinquish explicit deletes (e.g. via DeleteItem) from deletes caused by TTL expiration (a collection may define time-to-live policy for documents).
         /// </summary>
-        [JsonProperty(PropertyName = "timeToLiveExpired", NullValueHandling= NullValueHandling.Ignore)]
-        public bool IsTimeToLiveExpired { get; internal set; }
+        [JsonProperty(PropertyName = "timeToLiveExpired", NullValueHandling = NullValueHandling.Ignore)]
+        [JsonPropertyName("timeToLiveExpired")]
+        public bool IsTimeToLiveExpired { get; }
     }
 }

Microsoft.Azure.Cosmos/src/Resource/FullFidelity/Converters/STJUnixDateTimeConverter.cs

@@ -0,0 +1,46 @@
+//------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//------------------------------------------------------------
+
+namespace Microsoft.Azure.Cosmos.Resource.FullFidelity.Converters
+{
+    using System;
+    using System.Text.Json;
+    using System.Text.Json.Serialization;
+
+    /// <summary>
+    /// UnixDateTimeConverter for System.Text.Json
+    /// </summary>
+    internal class STJUnixDateTimeConverter : JsonConverter<DateTime>
+    {
+        /// <summary>
+        /// Read.
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns>DateTime.</returns>
+        public override DateTime Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            if (reader.TokenType != JsonTokenType.Number)
+            {
+                throw new JsonException("Expected a number representing the Unix timestamp.");
+            }
+
+            long unixTime = reader.GetInt64();
+            return DateTimeOffset.FromUnixTimeSeconds(unixTime).UtcDateTime;
+        }
+
+        /// <summary>
+        /// Write.
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="value"></param>
+        /// <param name="options"></param>
+        public override void Write(Utf8JsonWriter writer, DateTime value, JsonSerializerOptions options)
+        {
+            long unixTime = ((DateTimeOffset)value).ToUnixTimeSeconds();
+            writer.WriteNumberValue(unixTime);
+        }
+    }
+}