[vNext] System.Text.Json as default serialization mechanism

Microsoft.Azure.Cosmos/azuredata/Azure.Cosmos.csproj

@@ -69,18 +69,24 @@
     <Compile Include="..\src\SqlObjects\**\*.cs">
       <Link>SqlObjects\%(RecursiveDir)\%(Filename)%(Extension)</Link>
     </Compile>
-    <Compile Include="..\src\Fluent\Settings\*.cs" Exclude="..\src\Fluent\Settings\ContainerBuilder.cs">
+    <Compile Include="..\src\Fluent\Settings\*.cs" Exclude="..\src\Fluent\Settings\ContainerBuilder.cs;..\src\Fluent\Settings\ContainerDefinition.cs">
       <Link>Fluent\Settings\%(RecursiveDir)\%(Filename)%(Extension)</Link>
     </Compile>
     <Compile Include="..\src\Json\**\*.cs">
       <Link>Json\%(RecursiveDir)\%(Filename)%(Extension)</Link>
     </Compile>
-    <Compile Include="..\src\Spatial\**\*.cs">
-      <Link>Spatial\%(RecursiveDir)\%(Filename)%(Extension)</Link>
+    <Compile Include="..\src\Serializer\DefaultJsonSerializationSettings.cs">
+      <Link>Serializer\%(Filename)%(Extension)</Link>
+    </Compile>
+    <Compile Include="..\src\Serializer\CosmosJsonSerializerWrapper.cs">
+      <Link>Serializer\%(Filename)%(Extension)</Link>
     </Compile>
     <Compile Include="..\src\Serializer\CosmosSerializationOptions.cs">
       <Link>Serializer\%(Filename)%(Extension)</Link>
     </Compile>
+    <Compile Include="..\src\Serializer\CosmosSerializer.cs">
+      <Link>Serializer\%(Filename)%(Extension)</Link>
+    </Compile>
     <Compile Include="..\src\Serializer\CosmosSerializationFormatOptions.cs">
       <Link>Serializer\%(Filename)%(Extension)</Link>
     </Compile>
@@ -105,7 +111,7 @@
     <Compile Include="..\src\CosmosElements\**\*.cs">
       <Link>CosmosElements\%(RecursiveDir)\%(Filename)%(Extension)</Link>
     </Compile>
-    <Compile Include="..\src\ChangeFeedProcessor\**\*.cs" Exclude="..\src\ChangeFeedProcessor\FeedManagement\RemainingWorkEstimatorCore.cs;..\src\ChangeFeedProcessor\FeedProcessing\ChangeFeedObserverContextCore.cs;..\src\ChangeFeedProcessor\FeedProcessing\FeedProcessorCore.cs;..\src\ChangeFeedProcessor\Utils\CosmosContainerExtensions.cs;..\src\ChangeFeedProcessor\LeaseManagement\DocumentServiceLeaseContainerCosmos.cs;..\src\ChangeFeedProcessor\LeaseManagement\DocumentServiceLeaseUpdaterCosmos.cs;..\src\ChangeFeedProcessor\LeaseManagement\DocumentServiceLeaseStoreCosmos.cs">
+    <Compile Include="..\src\ChangeFeedProcessor\**\*.cs" Exclude="..\src\ChangeFeedProcessor\FeedManagement\RemainingWorkEstimatorCore.cs;..\src\ChangeFeedProcessor\FeedProcessing\ChangeFeedObserverContextCore.cs;..\src\ChangeFeedProcessor\FeedProcessing\FeedProcessorCore.cs;..\src\ChangeFeedProcessor\Utils\CosmosContainerExtensions.cs;..\src\ChangeFeedProcessor\LeaseManagement\DocumentServiceLeaseContainerCosmos.cs;..\src\ChangeFeedProcessor\LeaseManagement\DocumentServiceLeaseUpdaterCosmos.cs;..\src\ChangeFeedProcessor\LeaseManagement\DocumentServiceLeaseStoreCosmos.cs;..\src\ChangeFeedProcessor\LeaseManagement\DocumentServiceLeaseCore.cs">
       <Link>ChangeFeedProcessor\%(RecursiveDir)\%(Filename)%(Extension)</Link>
     </Compile>
     <Compile Include="..\src\Headers\*.cs" Exclude="..\src\Headers\Headers.cs;..\src\Headers\CosmosMessageHeadersInternal.cs">
@@ -226,7 +232,7 @@
 
   <ItemGroup>
     <PackageReference Include="Azure.Core" Version="1.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
+    <PackageReference Include="System.Text.Json" Version="4.7.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="16.4.16" PrivateAssets="All" />
 
@@ -236,7 +242,7 @@
 
     <!--HybridRow & Azure.Core Dependencies-->
     <PackageReference Include="System.Memory" Version="4.5.3" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.6.0" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.0" />
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.2" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>

Microsoft.Azure.Cosmos/azuredata/ChangeFeedProcessor/FeedManagement/RemainingWorkEstimatorCore.cs

@@ -11,20 +11,20 @@ namespace Azure.Cosmos.ChangeFeed
     using System.Globalization;
     using System.Linq;
     using System.Net;
+    using System.Text.Json;
     using System.Threading;
     using System.Threading.Tasks;
     using Azure.Cosmos.Serialization;
     using Microsoft.Azure.Cosmos;
     using Microsoft.Azure.Cosmos.Core.Trace;
     using Microsoft.Azure.Documents;
-    using Newtonsoft.Json.Linq;
 
     internal sealed class RemainingWorkEstimatorCore : RemainingWorkEstimator
     {
         private const char PKRangeIdSeparator = ':';
         private const char SegmentSeparator = '#';
-        private const string LSNPropertyName = "_lsn";
-        private static readonly CosmosSerializer DefaultSerializer = new CosmosJsonDotNetSerializer();
+        private static readonly JsonEncodedText LSNPropertyName = JsonEncodedText.Encode("_lsn");
+        private static readonly CosmosSerializer DefaultSerializer = new CosmosTextJsonSerializer();
         private readonly Func<string, string, bool, FeedIterator> feedCreator;
         private readonly DocumentServiceLeaseContainer leaseContainer;
         private readonly int degreeOfParallelism;
@@ -125,26 +125,26 @@ internal static string ExtractLsnFromSessionToken(string sessionToken)
             return segments[1];
         }
 
-        private static string GetFirstItemLSN(Collection<JObject> items)
+        private static long GetFirstItemLSN(Collection<JsonElement> items)
         {
-            JObject item = RemainingWorkEstimatorCore.GetFirstItem(items);
-            if (item == null)
+            JsonElement? item = RemainingWorkEstimatorCore.GetFirstItem(items);
+            if (!item.HasValue)
             {
-                return null;
+                return 0;
             }
 
-            if (item.TryGetValue(LSNPropertyName, StringComparison.OrdinalIgnoreCase, out JToken property))
+            if (item.Value.TryGetProperty(LSNPropertyName.EncodedUtf8Bytes, out JsonElement property))
             {
-                return property.Value<string>();
+                return property.GetInt64();
             }
 
             DefaultTrace.TraceWarning("Change Feed response item does not include LSN.");
-            return null;
+            return 0;
         }
 
-        private static JObject GetFirstItem(Collection<JObject> response)
+        private static JsonElement? GetFirstItem(Collection<JsonElement> response)
         {
-            using (IEnumerator<JObject> e = response.GetEnumerator())
+            using (IEnumerator<JsonElement> e = response.GetEnumerator())
             {
                 while (e.MoveNext())
                 {
@@ -167,14 +167,14 @@ private static long TryConvertToNumber(string number)
             return parsed;
         }
 
-        private static Collection<JObject> GetItemsFromResponse(Response response)
+        private static Collection<JsonElement> GetItemsFromResponse(Response response)
         {
             if (response.ContentStream == null)
             {
-                return new Collection<JObject>();
+                return new Collection<JsonElement>();
             }
 
-            return RemainingWorkEstimatorCore.DefaultSerializer.FromStream<CosmosFeedResponseUtil<JObject>>(response.ContentStream).Data;
+            return RemainingWorkEstimatorCore.DefaultSerializer.FromStream<CosmosFeedResponseUtil<JsonElement>>(response.ContentStream).Data;
         }
 
         private async Task<long> GetRemainingWorkAsync(DocumentServiceLease existingLease, CancellationToken cancellationToken)
@@ -196,9 +196,9 @@ private async Task<long> GetRemainingWorkAsync(DocumentServiceLease existingLeas
 
                 response.Headers.TryGetValue(HttpConstants.HttpHeaders.SessionToken, out string sessionToken);
                 long parsedLSNFromSessionToken = RemainingWorkEstimatorCore.TryConvertToNumber(ExtractLsnFromSessionToken(sessionToken));
-                Collection<JObject> items = RemainingWorkEstimatorCore.GetItemsFromResponse(response);
+                Collection<JsonElement> items = RemainingWorkEstimatorCore.GetItemsFromResponse(response);
                 long lastQueryLSN = items.Count > 0
-                    ? RemainingWorkEstimatorCore.TryConvertToNumber(RemainingWorkEstimatorCore.GetFirstItemLSN(items)) - 1
+                    ? RemainingWorkEstimatorCore.GetFirstItemLSN(items) - 1
                     : parsedLSNFromSessionToken;
                 if (lastQueryLSN < 0)
                 {

Microsoft.Azure.Cosmos/azuredata/ChangeFeedProcessor/LeaseManagement/DocumentServiceLeaseCore.cs

@@ -0,0 +1,96 @@
+//------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//------------------------------------------------------------
+namespace Azure.Cosmos.ChangeFeed
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Globalization;
+    using System.Text.Json.Serialization;
+
+    [Serializable]
+    internal sealed class DocumentServiceLeaseCore : DocumentServiceLease
+    {
+        private static readonly DateTime UnixStartTime = new DateTime(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc);
+
+        public DocumentServiceLeaseCore()
+        {
+        }
+
+        public DocumentServiceLeaseCore(DocumentServiceLeaseCore other)
+        {
+            this.LeaseId = other.LeaseId;
+            this.LeaseToken = other.LeaseToken;
+            this.Owner = other.Owner;
+            this.ContinuationToken = other.ContinuationToken;
+            this.ETag = other.ETag;
+            this.TS = other.TS;
+            this.ExplicitTimestamp = other.ExplicitTimestamp;
+            this.Properties = other.Properties;
+        }
+
+        [JsonPropertyName("id")]
+        public string LeaseId { get; set; }
+
+        [JsonIgnore]
+        public override string Id => this.LeaseId;
+
+        [JsonPropertyName("_etag")]
+        public string ETag { get; set; }
+
+        [JsonPropertyName("LeaseToken")]
+        public string LeaseToken { get; set; }
+
+        [JsonPropertyName("PartitionId")]
+        private string PartitionId
+        {
+            set
+            {
+                this.LeaseToken = value;
+            }
+        }
+
+        [JsonIgnore]
+        public override string CurrentLeaseToken => this.LeaseToken;
+
+        [JsonPropertyName("Owner")]
+        public override string Owner { get; set; }
+
+        /// <summary>
+        /// Gets or sets the current value for the offset in the stream.
+        /// </summary>
+        [JsonPropertyName("ContinuationToken")]
+        public override string ContinuationToken { get; set; }
+
+        [JsonIgnore]
+        public override DateTime Timestamp
+        {
+            get { return this.ExplicitTimestamp ?? UnixStartTime.AddSeconds(this.TS); }
+            set { this.ExplicitTimestamp = value; }
+        }
+
+        [JsonIgnore]
+        public override string ConcurrencyToken => this.ETag;
+
+        [JsonPropertyName("properties")]
+        public override Dictionary<string, string> Properties { get; set; } = new Dictionary<string, string>();
+
+        [JsonPropertyName("timestamp")]
+        private DateTime? ExplicitTimestamp { get; set; }
+
+        [JsonPropertyName("_ts")]
+        private long TS { get; set; }
+
+        public override string ToString()
+        {
+            return string.Format(
+                CultureInfo.InvariantCulture,
+                "{0} Owner='{1}' Continuation={2} Timestamp(local)={3} Timestamp(server)={4}",
+                this.Id,
+                this.Owner,
+                this.ContinuationToken,
+                this.Timestamp.ToUniversalTime(),
+                UnixStartTime.AddSeconds(this.TS).ToUniversalTime());
+        }
+    }
+}

Microsoft.Azure.Cosmos/azuredata/ChangeFeedProcessor/LeaseManagement/DocumentServiceLeaseStoreCosmos.cs

@@ -5,8 +5,8 @@
 namespace Azure.Cosmos.ChangeFeed
 {
     using System;
+    using System.Text.Json.Serialization;
     using System.Threading.Tasks;
-    using Newtonsoft.Json;
 
     /// <summary>
     /// Implementation of <see cref="DocumentServiceLeaseStore"/> for state in Azure Cosmos DB
@@ -96,10 +96,10 @@ private string GetStoreLockName()
 
         private class LockDocument
         {
-            [JsonProperty("id")]
+            [JsonPropertyName("id")]
             public string Id { get; set; }
 
-            [JsonProperty("ttl")]
+            [JsonPropertyName("ttl")]
             public int TimeToLive { get; set; }
         }
     }

Microsoft.Azure.Cosmos/azuredata/ChangeFeedProcessor/Utils/CosmosContainerExtensions.cs

@@ -13,7 +13,7 @@ namespace Azure.Cosmos.ChangeFeed
 
     internal static class CosmosContainerExtensions
     {
-        public static readonly CosmosSerializer DefaultJsonSerializer = new CosmosJsonDotNetSerializer();
+        public static readonly CosmosSerializer DefaultJsonSerializer = new CosmosTextJsonSerializer();
 
         public static async Task<T> TryGetItemAsync<T>(
             this CosmosContainer container,

Microsoft.Azure.Cosmos/azuredata/CosmosClient.cs

@@ -647,7 +647,7 @@ internal void Init(
                 defaultJsonSerializer: this.ClientOptions.PropertiesSerializer,
                 userJsonSerializer: userSerializer);
 
-            CosmosSerializer sqlQuerySpecSerializer = CosmosSqlQuerySpecJsonConverter.CreateSqlQuerySpecSerializer(
+            CosmosSerializer sqlQuerySpecSerializer = TextJsonCosmosSqlQuerySpecConverter.CreateSqlQuerySpecSerializer(
                 cosmosSerializer: userSerializer,
                 propertiesSerializer: this.ClientOptions.PropertiesSerializer);
 

Microsoft.Azure.Cosmos/azuredata/CosmosClientOptions.cs

@@ -9,13 +9,14 @@ namespace Azure.Cosmos
     using System.Data.Common;
     using System.Linq;
     using System.Net;
+    using System.Text.Json;
+    using System.Text.Json.Serialization;
     using Azure.Core;
     using Azure.Cosmos.Fluent;
     using Azure.Cosmos.Serialization;
     using Microsoft.Azure.Cosmos;    
     using Microsoft.Azure.Documents;
     using Microsoft.Azure.Documents.Client;
-    using Newtonsoft.Json;
 
     /// <summary>
     /// Defines all the configurable options that the CosmosClient requires.
@@ -32,6 +33,7 @@ namespace Azure.Cosmos
     /// 
     /// CosmosClient client = new CosmosClient("endpoint", "key", clientOptions);
     /// </example>
+    [JsonConverter(typeof(TextJsonCosmosClientOptionsConverter))]
     public class CosmosClientOptions : ClientOptions
     {
         /// <summary>
@@ -52,7 +54,7 @@ public class CosmosClientOptions : ClientOptions
         /// <summary>
         /// Default request timeout
         /// </summary>
-        private static readonly CosmosSerializer propertiesSerializer = new CosmosJsonSerializerWrapper(new CosmosJsonDotNetSerializer());
+        private static readonly CosmosSerializer propertiesSerializer = new CosmosJsonSerializerWrapper(new CosmosTextJsonSerializer());
 
         private int gatewayModeMaxConnectionLimit;
         private CosmosSerializationOptions serializerOptions;
@@ -272,7 +274,6 @@ public int? MaxTcpConnectionsPerEndpoint
         /// <summary>
         /// (Gateway/Https) Get or set the proxy information used for web requests.
         /// </summary>
-        [JsonIgnore]
         public IWebProxy WebProxy
         {
             get => this.webProxy;
@@ -330,7 +331,6 @@ public CosmosSerializationOptions SerializerOptions
         /// 
         /// CosmosClient client = new CosmosClient("endpoint", "key", clientOptions);
         /// </example>
-        [JsonConverter(typeof(ClientOptionJsonConverter))]
         public CosmosSerializer Serializer
         {
             get => this.serializer;
@@ -375,7 +375,6 @@ public CosmosSerializer Serializer
         /// The default serializer is always used for all system owned types like DatabaseProperties.
         /// The default serializer is used for user types if no UserJsonSerializer is specified
         /// </summary>
-        [JsonConverter(typeof(ClientOptionJsonConverter))]
         internal CosmosSerializer PropertiesSerializer => CosmosClientOptions.propertiesSerializer;
 
         internal Collection<RequestHandler> CustomHandlers { get; }
@@ -493,7 +492,7 @@ internal CosmosSerializer GetCosmosSerializerWithWrapperOrDefault()
         {
             if (this.SerializerOptions != null)
             {
-                CosmosJsonDotNetSerializer cosmosJsonDotNetSerializer = new CosmosJsonDotNetSerializer(this.SerializerOptions);
+                CosmosTextJsonSerializer cosmosJsonDotNetSerializer = new CosmosTextJsonSerializer(this.SerializerOptions);
                 return new CosmosJsonSerializerWrapper(cosmosJsonDotNetSerializer);
             }
             else
@@ -666,47 +665,7 @@ private void ValidateDirectTCPSettings()
         /// <returns>Returns a JSON string of the current configuration.</returns>
         internal string GetSerializedConfiguration()
         {
-            return JsonConvert.SerializeObject(this);
-        }
-
-        /// <summary>
-        /// The complex object passed in by the user can contain objects that can not be serialized. Instead just log the types.
-        /// </summary>
-        private class ClientOptionJsonConverter : JsonConverter
-        {
-            public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-            {
-                Collection<RequestHandler> handlers = value as Collection<RequestHandler>;
-                if (handlers != null)
-                {
-                    writer.WriteValue(string.Join(":", handlers.Select(x => x.GetType())));
-                    return;
-                }
-
-                CosmosJsonSerializerWrapper cosmosJsonSerializerWrapper = value as CosmosJsonSerializerWrapper;
-                if (value is CosmosJsonSerializerWrapper)
-                {
-                    writer.WriteValue(cosmosJsonSerializerWrapper.InternalJsonSerializer.GetType().ToString());
-                }
-
-                CosmosSerializer cosmosSerializer = value as CosmosSerializer;
-                if (cosmosSerializer is CosmosSerializer)
-                {
-                    writer.WriteValue(cosmosSerializer.GetType().ToString());
-                }
-            }
-
-            public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-            {
-                throw new NotImplementedException("Unnecessary because CanRead is false. The type will skip the converter.");
-            }
-
-            public override bool CanRead => false;
-
-            public override bool CanConvert(Type objectType)
-            {
-                return objectType == typeof(DateTime);
-            }
+            return JsonSerializer.Serialize(this);
         }
     }
 }