Use the pre-convention type mapping configuration in query

src/EFCore.Cosmos/Extensions/CosmosServiceCollectionExtensions.cs

@@ -116,8 +116,6 @@ public static IServiceCollection AddEntityFrameworkCosmos(this IServiceCollectio
  .TryAdd<IDatabaseCreator, CosmosDatabaseCreator>()
  .TryAdd<IQueryContextFactory, CosmosQueryContextFactory>()
  .TryAdd<ITypeMappingSource, CosmosTypeMappingSource>()
-
- // New Query pipeline
  .TryAdd<IQueryableMethodTranslatingExpressionVisitorFactory, CosmosQueryableMethodTranslatingExpressionVisitorFactory>()
  .TryAdd<IShapedQueryCompilingExpressionVisitorFactory, CosmosShapedQueryCompilingExpressionVisitorFactory>()
  .TryAdd<ISingletonOptions, ICosmosSingletonOptions>(p => p.GetRequiredService<ICosmosSingletonOptions>())
@@ -128,10 +126,10 @@ public static IServiceCollection AddEntityFrameworkCosmos(this IServiceCollectio
  b => b
  .TryAddSingleton<ICosmosSingletonOptions, CosmosSingletonOptions>()
  .TryAddSingleton<ISingletonCosmosClientWrapper, SingletonCosmosClientWrapper>()
- .TryAddSingleton<ISqlExpressionFactory, SqlExpressionFactory>()
  .TryAddSingleton<IQuerySqlGeneratorFactory, QuerySqlGeneratorFactory>()
- .TryAddSingleton<IMethodCallTranslatorProvider, CosmosMethodCallTranslatorProvider>()
- .TryAddSingleton<IMemberTranslatorProvider, CosmosMemberTranslatorProvider>()
+ .TryAddScoped<ISqlExpressionFactory, SqlExpressionFactory>()
+ .TryAddScoped<IMemberTranslatorProvider, CosmosMemberTranslatorProvider>()
+ .TryAddScoped<IMethodCallTranslatorProvider, CosmosMethodCallTranslatorProvider>()
  .TryAddScoped<ICosmosClientWrapper, CosmosClientWrapper>()
  );
 

src/EFCore.Cosmos/Query/Internal/CosmosQueryTranslationPostprocessorFactory.cs

@@ -3,7 +3,6 @@
 
 using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.EntityFrameworkCore.Utilities;
-using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.EntityFrameworkCore.Cosmos.Query.Internal
 {
@@ -14,11 +13,6 @@ namespace Microsoft.EntityFrameworkCore.Cosmos.Query.Internal
  /// any release. You should only use it directly in your code with extreme caution and knowing that
  /// doing so can result in application failures when updating to a new Entity Framework Core release.
  /// </para>
- /// <para>
- /// The service lifetime is <see cref="ServiceLifetime.Singleton" />. This means a single instance
- /// is used by many <see cref="DbContext" /> instances. The implementation must be thread-safe.
- /// This service cannot depend on services registered as <see cref="ServiceLifetime.Scoped" />.
- /// </para>
  /// </summary>
  public class CosmosQueryTranslationPostprocessorFactory : IQueryTranslationPostprocessorFactory
  {

src/EFCore.Cosmos/Query/Internal/CosmosQueryTranslationPreprocessorFactory.cs

@@ -3,7 +3,6 @@
 
 using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.EntityFrameworkCore.Utilities;
-using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.EntityFrameworkCore.Cosmos.Query.Internal
 {
@@ -14,11 +13,6 @@ namespace Microsoft.EntityFrameworkCore.Cosmos.Query.Internal
  /// any release. You should only use it directly in your code with extreme caution and knowing that
  /// doing so can result in application failures when updating to a new Entity Framework Core release.
  /// </para>
- /// <para>
- /// The service lifetime is <see cref="ServiceLifetime.Singleton" />. This means a single instance
- /// is used by many <see cref="DbContext" /> instances. The implementation must be thread-safe.
- /// This service cannot depend on services registered as <see cref="ServiceLifetime.Scoped" />.
- /// </para>
  /// </summary>
  public class CosmosQueryTranslationPreprocessorFactory : IQueryTranslationPreprocessorFactory
  {

src/EFCore.Cosmos/Query/Internal/CosmosQueryableMethodTranslatingExpressionVisitorFactory.cs

@@ -14,11 +14,6 @@ namespace Microsoft.EntityFrameworkCore.Cosmos.Query.Internal
  /// any release. You should only use it directly in your code with extreme caution and knowing that
  /// doing so can result in application failures when updating to a new Entity Framework Core release.
  /// </para>
- /// <para>
- /// The service lifetime is <see cref="ServiceLifetime.Singleton" />. This means a single instance
- /// is used by many <see cref="DbContext" /> instances. The implementation must be thread-safe.
- /// This service cannot depend on services registered as <see cref="ServiceLifetime.Scoped" />.
- /// </para>
  /// </summary>
  public class CosmosQueryableMethodTranslatingExpressionVisitorFactory : IQueryableMethodTranslatingExpressionVisitorFactory
  {

src/EFCore.Cosmos/Query/Internal/ISqlExpressionFactory.cs

@@ -1,14 +1,11 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
-using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq.Expressions;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Storage;
 
-#nullable disable warnings
-
 namespace Microsoft.EntityFrameworkCore.Cosmos.Query.Internal
 {
  /// <summary>
@@ -25,23 +22,17 @@ public interface ISqlExpressionFactory
  /// any release. You should only use it directly in your code with extreme caution and knowing that
  /// doing so can result in application failures when updating to a new Entity Framework Core release.
  /// </summary>
- SqlExpression ApplyTypeMapping(SqlExpression? sqlExpression, CoreTypeMapping typeMapping);
-
- /// <summary>
- /// This is an internal API that supports the Entity Framework Core infrastructure and not subject to
- /// the same compatibility standards as public APIs. It may be changed or removed without notice in
- /// any release. You should only use it directly in your code with extreme caution and knowing that
- /// doing so can result in application failures when updating to a new Entity Framework Core release.
- /// </summary>
- SqlExpression ApplyDefaultTypeMapping(SqlExpression? sqlExpression);
+ [return: NotNullIfNotNull("sqlExpression")]
+ SqlExpression? ApplyTypeMapping(SqlExpression? sqlExpression, CoreTypeMapping? typeMapping);
 
  /// <summary>
  /// This is an internal API that supports the Entity Framework Core infrastructure and not subject to
  /// the same compatibility standards as public APIs. It may be changed or removed without notice in
  /// any release. You should only use it directly in your code with extreme caution and knowing that
  /// doing so can result in application failures when updating to a new Entity Framework Core release.
  /// </summary>
- CoreTypeMapping FindMapping(Type type);
+ [return: NotNullIfNotNull("sqlExpression")]
+ SqlExpression? ApplyDefaultTypeMapping(SqlExpression? sqlExpression);
 
  /// <summary>
  /// This is an internal API that supports the Entity Framework Core infrastructure and not subject to

src/EFCore.Cosmos/Query/Internal/InExpression.cs

@@ -1,7 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
 using System.Linq.Expressions;
 using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.EntityFrameworkCore.Storage;