Query: Adds support for System.Text LINQ Custom Serializer

Microsoft.Azure.Cosmos/src/Linq/CosmosLinqQuery.cs

@@ -12,8 +12,8 @@ namespace Microsoft.Azure.Cosmos.Linq
     using System.Threading;
     using System.Threading.Tasks;
     using Microsoft.Azure.Cosmos.Diagnostics;
-    using Microsoft.Azure.Cosmos.Query;
     using Microsoft.Azure.Cosmos.Query.Core;
+    using Microsoft.Azure.Cosmos.Serializer;
     using Microsoft.Azure.Cosmos.Tracing;
     using Newtonsoft.Json;
 
@@ -32,7 +32,7 @@ internal sealed class CosmosLinqQuery<T> : IDocumentQuery<T>, IOrderedQueryable<
         private readonly QueryRequestOptions cosmosQueryRequestOptions;
         private readonly bool allowSynchronousQueryExecution = false;
         private readonly string continuationToken;
-        private readonly CosmosLinqSerializerOptions linqSerializationOptions;
+        private readonly CosmosLinqSerializerOptionsInternal linqSerializationOptions;
 
         public CosmosLinqQuery(
            ContainerInternal container,
@@ -42,7 +42,7 @@ public CosmosLinqQuery(
            QueryRequestOptions cosmosQueryRequestOptions,
            Expression expression,
            bool allowSynchronousQueryExecution,
-           CosmosLinqSerializerOptions linqSerializationOptions = null)
+           CosmosLinqSerializerOptionsInternal linqSerializationOptions = null)
         {
             this.container = container ?? throw new ArgumentNullException(nameof(container));
             this.responseFactory = responseFactory ?? throw new ArgumentNullException(nameof(responseFactory));
@@ -72,7 +72,7 @@ public CosmosLinqQuery(
           string continuationToken,
           QueryRequestOptions cosmosQueryRequestOptions,
           bool allowSynchronousQueryExecution,
-          CosmosLinqSerializerOptions linqSerializerOptions = null)
+          CosmosLinqSerializerOptionsInternal linqSerializerOptions = null)
             : this(
               container,
               responseFactory,

Microsoft.Azure.Cosmos/src/Linq/CosmosLinqQueryProvider.cs

@@ -5,7 +5,6 @@
 namespace Microsoft.Azure.Cosmos.Linq
 {
     using System;
-    using System.Collections.Generic;
     using System.Linq;
     using System.Linq.Expressions;
     using System.Threading;
@@ -24,7 +23,7 @@ internal sealed class CosmosLinqQueryProvider : IQueryProvider
         private readonly bool allowSynchronousQueryExecution;
         private readonly Action<IQueryable> onExecuteScalarQueryCallback;
         private readonly string continuationToken;
-        private readonly CosmosLinqSerializerOptions linqSerializerOptions;
+        private readonly CosmosLinqSerializerOptionsInternal linqSerializerOptions;
 
         public CosmosLinqQueryProvider(
            ContainerInternal container,
@@ -34,7 +33,7 @@ public CosmosLinqQueryProvider(
            QueryRequestOptions cosmosQueryRequestOptions,
            bool allowSynchronousQueryExecution,
            Action<IQueryable> onExecuteScalarQueryCallback = null,
-           CosmosLinqSerializerOptions linqSerializerOptions = null)
+           CosmosLinqSerializerOptionsInternal linqSerializerOptions = null)
         {
             this.container = container;
             this.responseFactory = responseFactory;

Microsoft.Azure.Cosmos/src/Linq/CustomCosmosLinqSerializer.cs

@@ -0,0 +1,56 @@
+//------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//------------------------------------------------------------
+namespace Microsoft.Azure.Cosmos.Linq
+{
+    using System;
+    using System.Globalization;
+    using System.IO;
+    using System.Linq.Expressions;
+    using System.Reflection;
+
+    internal class CustomCosmosLinqSerializer : ICosmosLinqSerializerInternal
+    {
+        private readonly CosmosLinqSerializer CustomCosmosSerializer;
+
+        public CustomCosmosLinqSerializer(CosmosLinqSerializer customCosmosLinqSerializer)
+        {
+            this.CustomCosmosSerializer = customCosmosLinqSerializer;
+        }
+
+        public bool RequiresCustomSerialization(MemberExpression memberExpression, Type memberType)
+        {
+            return true;
+        }
+
+        public string Serialize(object value, MemberExpression memberExpression, Type memberType)
+        {
+            return this.SerializeWithCustomSerializer(value);
+        }
+
+        public string SerializeScalarExpression(ConstantExpression inputExpression)
+        {
+            return this.SerializeWithCustomSerializer(inputExpression.Value);
+        }
+
+        public string SerializeMemberName(MemberInfo memberInfo)
+        {
+            return this.CustomCosmosSerializer.SerializeMemberName(memberInfo);
+        }
+
+        private string SerializeWithCustomSerializer(object value)
+        {
+            StringWriter writer = new StringWriter(CultureInfo.InvariantCulture);
+
+            using (Stream stream = this.CustomCosmosSerializer.ToStream(value))
+            {
+                using (StreamReader streamReader = new StreamReader(stream))
+                {
+                    string propertyValue = streamReader.ReadToEnd();
+                    writer.Write(propertyValue);
+                    return writer.ToString();
+                }
+            }
+        }
+    }
+}

Microsoft.Azure.Cosmos/src/Linq/DefaultCosmosLinqSerializer.cs

@@ -12,8 +12,15 @@ namespace Microsoft.Azure.Cosmos.Linq
     using Microsoft.Azure.Documents;
     using Newtonsoft.Json;
 
-    internal class DefaultCosmosLinqSerializer : ICosmosLinqSerializer
+    internal class DefaultCosmosLinqSerializer : ICosmosLinqSerializerInternal
     {
+        private readonly CosmosPropertyNamingPolicy PropertyNamingPolicy;
+
+        public DefaultCosmosLinqSerializer(CosmosPropertyNamingPolicy propertyNamingPolicy)
+        {
+            this.PropertyNamingPolicy = propertyNamingPolicy;
+        }
+
         public bool RequiresCustomSerialization(MemberExpression memberExpression, Type memberType)
         {
             // There are two ways to specify a custom attribute
@@ -63,9 +70,9 @@ public string SerializeScalarExpression(ConstantExpression inputExpression)
             return JsonConvert.SerializeObject(inputExpression.Value);
         }
 
-        public string SerializeMemberName(MemberInfo memberInfo, CosmosLinqSerializerOptions linqSerializerOptions = null)
+        public string SerializeMemberName(MemberInfo memberInfo)
         {
-            string memberName = null;
+            string memberName = memberInfo.Name;
 
             // Check if Newtonsoft JsonExtensionDataAttribute is present on the member, if so, return empty member name.
             Newtonsoft.Json.JsonExtensionDataAttribute jsonExtensionDataAttribute = memberInfo.GetCustomAttribute<Newtonsoft.Json.JsonExtensionDataAttribute>(true);
@@ -94,15 +101,7 @@ public string SerializeMemberName(MemberInfo memberInfo, CosmosLinqSerializerOpt
                 }
             }
 
-            if (memberName == null)
-            {
-                memberName = memberInfo.Name;
-            }
-
-            if (linqSerializerOptions != null)
-            {
-                memberName = CosmosSerializationUtil.GetStringWithPropertyNamingPolicy(linqSerializerOptions, memberName);
-            }
+            memberName = CosmosSerializationUtil.GetStringWithPropertyNamingPolicy(this.PropertyNamingPolicy, memberName);
 
             return memberName;
         }

Microsoft.Azure.Cosmos/src/Linq/DocumentQueryEvaluator.cs

@@ -17,7 +17,7 @@ internal static class DocumentQueryEvaluator
 
         public static SqlQuerySpec Evaluate(
             Expression expression,
-            CosmosLinqSerializerOptions linqSerializerOptions = null,
+            CosmosLinqSerializerOptionsInternal linqSerializerOptions = null,
             IDictionary<object, string> parameters = null)
         {
             switch (expression.NodeType)
@@ -76,7 +76,7 @@ private static SqlQuerySpec HandleEmptyQuery(ConstantExpression expression)
         private static SqlQuerySpec HandleMethodCallExpression(
             MethodCallExpression expression,
             IDictionary<object, string> parameters,
-            CosmosLinqSerializerOptions linqSerializerOptions = null)
+            CosmosLinqSerializerOptionsInternal linqSerializerOptions = null)
         {
             if (DocumentQueryEvaluator.IsTransformExpression(expression))
             {

Microsoft.Azure.Cosmos/src/Linq/ExpressionToSQL.cs

@@ -14,10 +14,10 @@ namespace Microsoft.Azure.Cosmos.Linq
     using System.Linq.Expressions;
     using System.Reflection;
     using Microsoft.Azure.Cosmos.CosmosElements;
+    using Microsoft.Azure.Cosmos.Serializer;
     using Microsoft.Azure.Cosmos.Spatial;
     using Microsoft.Azure.Cosmos.SqlObjects;
     using Microsoft.Azure.Documents;
-    using Newtonsoft.Json;
     using static Microsoft.Azure.Cosmos.Linq.FromParameterBindings;
 
     // ReSharper disable UnusedParameter.Local
@@ -88,7 +88,7 @@ public static class LinqMethods
         public static SqlQuery TranslateQuery(
             Expression inputExpression,
             IDictionary<object, string> parameters,
-            CosmosLinqSerializerOptions linqSerializerOptions)
+            CosmosLinqSerializerOptionsInternal linqSerializerOptions)
         {
             TranslationContext context = new TranslationContext(linqSerializerOptions, parameters);
             ExpressionToSql.Translate(inputExpression, context); // ignore result here
@@ -503,8 +503,8 @@ private static SqlScalarExpression ApplyCustomConverters(Expression left, SqlLit
                     memberType = memberType.NullableUnderlyingType();
                 }
 
-                bool requiresCustomSerializatior = context.CosmosLinqSerializer.RequiresCustomSerialization(memberExpression, memberType);
-                if (requiresCustomSerializatior)
+                bool requiresCustomSerialization = context.CosmosLinqSerializer.RequiresCustomSerialization(memberExpression, memberType);
+                if (requiresCustomSerialization)
                 {
                     object value = default(object);
                     // Enum

Microsoft.Azure.Cosmos/src/Linq/ICosmosLinqSerializer.cs → Microsoft.Azure.Cosmos/src/Linq/ICosmosLinqSerializerInternal.cs

@@ -7,7 +7,7 @@ namespace Microsoft.Azure.Cosmos.Linq
     using System.Linq.Expressions;
     using System.Reflection;
 
-    internal interface ICosmosLinqSerializer
+    internal interface ICosmosLinqSerializerInternal
     {
         /// <summary>
         /// Returns true if there are custom attributes on a member expression.
@@ -28,6 +28,6 @@ internal interface ICosmosLinqSerializer
         /// <summary>
         /// Serializes a member name with LINQ serializer options applied.
         /// </summary>
-        string SerializeMemberName(MemberInfo memberInfo, CosmosLinqSerializerOptions linqSerializerOptions = null);
+        string SerializeMemberName(MemberInfo memberInfo);
     }
 }

Microsoft.Azure.Cosmos/src/Linq/SQLTranslator.cs

@@ -6,6 +6,7 @@ namespace Microsoft.Azure.Cosmos.Linq
     using System.Collections.Generic;
     using System.Linq.Expressions;
     using Microsoft.Azure.Cosmos.Query.Core;
+    using Microsoft.Azure.Cosmos.Serializer;
     using Microsoft.Azure.Cosmos.SqlObjects;
 
     /// <summary>
@@ -21,7 +22,7 @@ internal static class SqlTranslator
         /// <returns>A string describing the expression translation.</returns>
         internal static string TranslateExpression(
             Expression inputExpression,
-            CosmosLinqSerializerOptions linqSerializerOptions = null)
+            CosmosLinqSerializerOptionsInternal linqSerializerOptions = null)
         {
             TranslationContext context = new TranslationContext(linqSerializerOptions);
 
@@ -32,7 +33,7 @@ internal static string TranslateExpression(
 
         internal static string TranslateExpressionOld(
             Expression inputExpression,
-            CosmosLinqSerializerOptions linqSerializerOptions = null)
+            CosmosLinqSerializerOptionsInternal linqSerializerOptions = null)
         {
             TranslationContext context = new TranslationContext(linqSerializerOptions);
 
@@ -43,7 +44,7 @@ internal static string TranslateExpressionOld(
 
         internal static SqlQuerySpec TranslateQuery(
             Expression inputExpression,
-            CosmosLinqSerializerOptions linqSerializerOptions,
+            CosmosLinqSerializerOptionsInternal linqSerializerOptions,
             IDictionary<object, string> parameters)
         {
             inputExpression = ConstantEvaluator.PartialEval(inputExpression);

Microsoft.Azure.Cosmos/src/Linq/TranslationContext.cs

@@ -7,6 +7,7 @@ namespace Microsoft.Azure.Cosmos.Linq
     using System;
     using System.Collections.Generic;
     using System.Linq.Expressions;
+    using Microsoft.Azure.Cosmos.Serializer;
     using Microsoft.Azure.Cosmos.SqlObjects;
     using static Microsoft.Azure.Cosmos.Linq.ExpressionToSql;
     using static Microsoft.Azure.Cosmos.Linq.FromParameterBindings;
@@ -24,12 +25,7 @@ internal sealed class TranslationContext
         /// <summary>
         /// The LINQ serializer 
         /// </summary>
-        public readonly ICosmosLinqSerializer CosmosLinqSerializer;
-
-        /// <summary>
-        /// User-provided LINQ serializer options
-        /// </summary>
-        public CosmosLinqSerializerOptions LinqSerializerOptions;
+        public readonly ICosmosLinqSerializerInternal CosmosLinqSerializer;
 
         /// <summary>
         /// Set of parameters in scope at any point; used to generate fresh parameter names if necessary.
@@ -72,7 +68,7 @@ internal sealed class TranslationContext
         /// </summary>
         private Stack<SubqueryBinding> subqueryBindingStack;
 
-        public TranslationContext(CosmosLinqSerializerOptions linqSerializerOptions, IDictionary<object, string> parameters = null)
+        public TranslationContext(CosmosLinqSerializerOptionsInternal linqSerializerOptionsInternal, IDictionary<object, string> parameters = null)
         {
             this.InScope = new HashSet<ParameterExpression>();
             this.substitutions = new ParameterSubstitution();
@@ -81,10 +77,20 @@ public TranslationContext(CosmosLinqSerializerOptions linqSerializerOptions, IDi
             this.collectionStack = new List<Collection>();
             this.CurrentQuery = new QueryUnderConstruction(this.GetGenFreshParameterFunc());
             this.subqueryBindingStack = new Stack<SubqueryBinding>();
-            this.LinqSerializerOptions = linqSerializerOptions;
             this.Parameters = parameters;
-            this.MemberNames = new MemberNames(linqSerializerOptions);
-            this.CosmosLinqSerializer = new DefaultCosmosLinqSerializer();
+
+            if (linqSerializerOptionsInternal?.CustomCosmosLinqSerializer != null)
+            {
+                this.CosmosLinqSerializer = new CustomCosmosLinqSerializer(linqSerializerOptionsInternal.CustomCosmosLinqSerializer);
+                this.MemberNames = new MemberNames(new CosmosLinqSerializerOptions());
+            }
+            else
+            {
+                CosmosLinqSerializerOptions linqSerializerOptions = linqSerializerOptionsInternal?.CosmosLinqSerializerOptions ?? new CosmosLinqSerializerOptions();
+
+                this.CosmosLinqSerializer = new DefaultCosmosLinqSerializer(linqSerializerOptions.PropertyNamingPolicy);
+                this.MemberNames = new MemberNames(linqSerializerOptions);
+            }
         }
 
         public Expression LookupSubstitution(ParameterExpression parameter)

Microsoft.Azure.Cosmos/src/Linq/TypeSystem.cs

@@ -21,7 +21,7 @@ public static Type GetElementType(Type type)
 
         public static string GetMemberName(this MemberInfo memberInfo, TranslationContext context)
         {
-            return context.CosmosLinqSerializer.SerializeMemberName(memberInfo, context.LinqSerializerOptions);
+            return context.CosmosLinqSerializer.SerializeMemberName(memberInfo);
         }
 
         private static Type GetElementType(Type type, HashSet<Type> visitedSet)

Microsoft.Azure.Cosmos/src/Resource/Container/ContainerCore.Items.cs

@@ -24,9 +24,9 @@ namespace Microsoft.Azure.Cosmos
     using Microsoft.Azure.Cosmos.Query.Core;
     using Microsoft.Azure.Cosmos.Query.Core.Monads;
     using Microsoft.Azure.Cosmos.Query.Core.QueryClient;
-    using Microsoft.Azure.Cosmos.Query.Core.QueryPlan;
     using Microsoft.Azure.Cosmos.ReadFeed;
     using Microsoft.Azure.Cosmos.ReadFeed.Pagination;
+    using Microsoft.Azure.Cosmos.Serializer;
     using Microsoft.Azure.Cosmos.Tracing;
     using Microsoft.Azure.Documents;
 
@@ -387,22 +387,24 @@ public override IOrderedQueryable<T> GetItemLinqQueryable<T>(
         {
             requestOptions ??= new QueryRequestOptions();
 
-            if (linqSerializerOptions == null && this.ClientContext.ClientOptions.SerializerOptions != null)
+            if (this.ClientContext.ClientOptions != null)
             {
-                linqSerializerOptions = new CosmosLinqSerializerOptions
+                linqSerializerOptions ??= new CosmosLinqSerializerOptions
                 {
-                    PropertyNamingPolicy = this.ClientContext.ClientOptions.SerializerOptions.PropertyNamingPolicy
+                    PropertyNamingPolicy = this.ClientContext.ClientOptions.SerializerOptions?.PropertyNamingPolicy ?? CosmosPropertyNamingPolicy.Default             
                 };
             }
 
+            CosmosLinqSerializerOptionsInternal linqSerializerOptionsInternal = CosmosLinqSerializerOptionsInternal.Create(linqSerializerOptions, this.ClientContext.ClientOptions.Serializer);
+
             return new CosmosLinqQuery<T>(
                 this,
                 this.ClientContext.ResponseFactory,
                 (CosmosQueryClientCore)this.queryClient,
                 continuationToken,
                 requestOptions,
                 allowSynchronousQueryExecution,
-                linqSerializerOptions);
+                linqSerializerOptionsInternal);
         }
 
         public override FeedIterator<T> GetItemQueryIterator<T>(