[Internal] SystemTextJsonSerializer: Adds STJ Serializer

Microsoft.Azure.Cosmos.Encryption.Custom/tests/EmulatorTests/MdeCustomEncryptionTests.cs

@@ -1043,7 +1043,7 @@ public async Task VerifyDekOperationWithSystemTextSerializer()
                 DefaultIgnoreCondition = System.Text.Json.Serialization.JsonIgnoreCondition.WhenWritingNull
             };
 
-            CosmosSystemTextJsonSerializer cosmosSystemTextJsonSerializer = new CosmosSystemTextJsonSerializer(jsonSerializerOptions);
+            LegacyEncryptionTests.CosmosSystemTextJsonSerializer cosmosSystemTextJsonSerializer = new (jsonSerializerOptions);
 
             CosmosClient clientWithCosmosSystemTextJsonSerializer = TestCommon.CreateCosmosClient(builder => builder
                 .WithCustomSerializer(cosmosSystemTextJsonSerializer)

Microsoft.Azure.Cosmos/src/Serializer/CosmosSystemTextJsonSerializer.cs

@@ -0,0 +1,104 @@
+// ------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+// ------------------------------------------------------------
+
+namespace Microsoft.Azure.Cosmos
+{
+    using System;
+    using System.IO;
+    using System.Reflection;
+    using System.Text.Json;
+    using System.Text.Json.Serialization;
+
+    /// <summary>
+    /// This class provides a default implementation of System.Text.Json Cosmos Linq Serializer.
+    /// </summary>
+    internal class CosmosSystemTextJsonSerializer : CosmosLinqSerializer
+    {
+        /// <summary>
+        /// A read-only instance of <see cref="JsonSerializerOptions"/>.
+        /// </summary>
+        private readonly JsonSerializerOptions jsonSerializerOptions;
+
+        /// <summary>
+        /// Creates an instance of <see cref="CosmosSystemTextJsonSerializer"/>
+        /// with the default values for the Cosmos SDK
+        /// </summary>
+        /// <param name="jsonSerializerOptions">An instance of <see cref="JsonSerializerOptions"/> containing the json serialization options.</param>
+        internal CosmosSystemTextJsonSerializer(
+            JsonSerializerOptions jsonSerializerOptions)
+        {
+            this.jsonSerializerOptions = jsonSerializerOptions;
+        }
+
+        /// <inheritdoc/>
+        public override T FromStream<T>(Stream stream)
+        {
+            if (stream == null)
+                throw new ArgumentNullException(nameof(stream));
+
+            if (typeof(Stream).IsAssignableFrom(typeof(T)))
+            {
+                return (T)(object)stream;
+            }
+
+            if (stream.CanSeek && stream.Length == 0)
+            {
+                return default;
+            }
+
+            using (stream)
+            {
+                using StreamReader reader = new (stream);
+                return JsonSerializer.Deserialize<T>(reader.ReadToEnd(), this.jsonSerializerOptions);
+            }
+        }
+
+        /// <inheritdoc/>
+        public override Stream ToStream<T>(T input)
+        {
+            MemoryStream streamPayload = new ();
+            using Utf8JsonWriter writer = new (streamPayload);
+
+            JsonSerializer.Serialize(writer, input, this.jsonSerializerOptions);
+
+            streamPayload.Position = 0;
+            return streamPayload;
+        }
+
+        /// <summary>
+        /// Convert a MemberInfo to a string for use in LINQ query translation.
+        /// </summary>
+        /// <param name="memberInfo">Any MemberInfo used in the query.</param>
+        /// <returns>A serialized representation of the member.</returns>
+        /// <remarks>
+        /// Note that this is just a default implementation which handles the basic scenarios.To handle any special cases,
+        /// please create a custom serializer which inherits from the <see cref="CosmosSystemTextJsonSerializer"/> and overrides the
+        /// SerializeMemberName() method.
+        /// </remarks>
+        public override string SerializeMemberName(MemberInfo memberInfo)
+        {
+            JsonExtensionDataAttribute jsonExtensionDataAttribute =
+                 memberInfo.GetCustomAttribute<JsonExtensionDataAttribute>(true);
+
+            if (jsonExtensionDataAttribute != null)
+            {
+                return null;
+            }
+
+            JsonPropertyNameAttribute jsonPropertyNameAttribute = memberInfo.GetCustomAttribute<JsonPropertyNameAttribute>(true);
+
+            if (!string.IsNullOrEmpty(jsonPropertyNameAttribute?.Name))
+            {
+                return jsonPropertyNameAttribute.Name;
+            }
+
+            if (this.jsonSerializerOptions.PropertyNamingPolicy != null)
+            {
+                return this.jsonSerializerOptions.PropertyNamingPolicy.ConvertName(memberInfo.Name);
+            }
+
+            return memberInfo.Name;
+        }
+    }
+}

Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/BaselineTest/TestBaseline/LinqAggregateCustomSerializationBaseline.TestAggregateQueriesWithCustomSerializer.xml

@@ -1,7 +1,7 @@
 <Results>
   <Result>
     <Input>
-      <Description><![CDATA[Avg, Custom serializer: True]]></Description>
+      <Description><![CDATA[Avg, Serializer Name: SystemTextJsonLinqSerializer]]></Description>
       <Expression><![CDATA[query.Average(doc => doc.NumericField), Object)]]></Expression>
     </Input>
     <Output>
@@ -12,7 +12,7 @@ FROM root]]></SqlQuery>
   </Result>
   <Result>
     <Input>
-      <Description><![CDATA[Sum, Custom serializer: True]]></Description>
+      <Description><![CDATA[Sum, Serializer Name: SystemTextJsonLinqSerializer]]></Description>
       <Expression><![CDATA[query.Sum(doc => doc.NumericField), Object)]]></Expression>
     </Input>
     <Output>
@@ -23,7 +23,7 @@ FROM root]]></SqlQuery>
   </Result>
   <Result>
     <Input>
-      <Description><![CDATA[Select many -> Filter -> Select -> Average, Custom serializer: True]]></Description>
+      <Description><![CDATA[Select many -> Filter -> Select -> Average, Serializer Name: SystemTextJsonLinqSerializer]]></Description>
       <Expression><![CDATA[query.SelectMany(doc => doc.ArrayField.Where(m => ((m % 3) == 0)).Select(m => m)).Average(), Object)]]></Expression>
     </Input>
     <Output>
@@ -36,7 +36,7 @@ WHERE ((m0 % 3) = 0)]]></SqlQuery>
   </Result>
   <Result>
     <Input>
-      <Description><![CDATA[Select number -> Skip -> Count, Custom serializer: True]]></Description>
+      <Description><![CDATA[Select number -> Skip -> Count, Serializer Name: SystemTextJsonLinqSerializer]]></Description>
       <Expression><![CDATA[query.Select(f => f.NumericField).Skip(2).Count(), Object)]]></Expression>
     </Input>
     <Output>
@@ -63,7 +63,7 @@ FROM root]]></SqlQuery>
   </Result>
   <Result>
     <Input>
-      <Description><![CDATA[Avg, Custom serializer: False]]></Description>
+      <Description><![CDATA[Avg, Serializer Name: SystemTextJsonSerializer]]></Description>
       <Expression><![CDATA[query.Average(doc => doc.NumericField), Object)]]></Expression>
     </Input>
     <Output>
@@ -74,7 +74,7 @@ FROM root]]></SqlQuery>
   </Result>
   <Result>
     <Input>
-      <Description><![CDATA[Sum, Custom serializer: False]]></Description>
+      <Description><![CDATA[Sum, Serializer Name: SystemTextJsonSerializer]]></Description>
       <Expression><![CDATA[query.Sum(doc => doc.NumericField), Object)]]></Expression>
     </Input>
     <Output>
@@ -85,7 +85,7 @@ FROM root]]></SqlQuery>
   </Result>
   <Result>
     <Input>
-      <Description><![CDATA[Select many -> Filter -> Select -> Average, Custom serializer: False]]></Description>
+      <Description><![CDATA[Select many -> Filter -> Select -> Average, Serializer Name: SystemTextJsonSerializer]]></Description>
       <Expression><![CDATA[query.SelectMany(doc => doc.ArrayField.Where(m => ((m % 3) == 0)).Select(m => m)).Average(), Object)]]></Expression>
     </Input>
     <Output>
@@ -98,7 +98,7 @@ WHERE ((m0 % 3) = 0)]]></SqlQuery>
   </Result>
   <Result>
     <Input>
-      <Description><![CDATA[Select number -> Skip -> Count, Custom serializer: False]]></Description>
+      <Description><![CDATA[Select number -> Skip -> Count, Serializer Name: SystemTextJsonSerializer]]></Description>
       <Expression><![CDATA[query.Select(f => f.NumericField).Skip(2).Count(), Object)]]></Expression>
     </Input>
     <Output>
@@ -120,6 +120,68 @@ FROM (
     <Output>
       <SqlQuery><![CDATA[
 SELECT VALUE MIN(root["NumericField"]) 
+FROM root]]></SqlQuery>
+    </Output>
+  </Result>
+  <Result>
+    <Input>
+      <Description><![CDATA[Avg, Serializer Name: CosmosSystemTextJsonSerializer]]></Description>
+      <Expression><![CDATA[query.Average(doc => doc.NumericField), Object)]]></Expression>
+    </Input>
+    <Output>
+      <SqlQuery><![CDATA[
+SELECT VALUE AVG(root["NumberValueDotNet"]) 
+FROM root]]></SqlQuery>
+    </Output>
+  </Result>
+  <Result>
+    <Input>
+      <Description><![CDATA[Sum, Serializer Name: CosmosSystemTextJsonSerializer]]></Description>
+      <Expression><![CDATA[query.Sum(doc => doc.NumericField), Object)]]></Expression>
+    </Input>
+    <Output>
+      <SqlQuery><![CDATA[
+SELECT VALUE SUM(root["NumberValueDotNet"]) 
+FROM root]]></SqlQuery>
+    </Output>
+  </Result>
+  <Result>
+    <Input>
+      <Description><![CDATA[Select many -> Filter -> Select -> Average, Serializer Name: CosmosSystemTextJsonSerializer]]></Description>
+      <Expression><![CDATA[query.SelectMany(doc => doc.ArrayField.Where(m => ((m % 3) == 0)).Select(m => m)).Average(), Object)]]></Expression>
+    </Input>
+    <Output>
+      <SqlQuery><![CDATA[
+SELECT VALUE AVG(m0) 
+FROM root 
+JOIN m0 IN root["ArrayValuesDotNet"] 
+WHERE ((m0 % 3) = 0)]]></SqlQuery>
+    </Output>
+  </Result>
+  <Result>
+    <Input>
+      <Description><![CDATA[Select number -> Skip -> Count, Serializer Name: CosmosSystemTextJsonSerializer]]></Description>
+      <Expression><![CDATA[query.Select(f => f.NumericField).Skip(2).Count(), Object)]]></Expression>
+    </Input>
+    <Output>
+      <SqlQuery><![CDATA[
+SELECT VALUE COUNT(1) 
+FROM (
+    SELECT VALUE root["NumberValueDotNet"] 
+    FROM root 
+    OFFSET 2 LIMIT 2147483647) AS r0
+]]></SqlQuery>
+      <ErrorMessage><![CDATA[Status Code: BadRequest,{"errors":[{"severity":"Error","location":{"start":77,"end":102},"code":"SC2204","message":"'OFFSET LIMIT' clause is not supported in subqueries."}]},0x800A0B00]]></ErrorMessage>
+    </Output>
+  </Result>
+  <Result>
+    <Input>
+      <Description><![CDATA[Select number -> Min w/ mapping]]></Description>
+      <Expression><![CDATA[query.Select(doc => doc.NumericField).Min(num => num), Object)]]></Expression>
+    </Input>
+    <Output>
+      <SqlQuery><![CDATA[
+SELECT VALUE MIN(root["NumberValueDotNet"]) 
 FROM root]]></SqlQuery>
     </Output>
   </Result>