Updates following review

Author: ajcvickers

src/EFCore.Abstractions/DbFunctionAttribute.cs

@@ -2,8 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 using Microsoft.EntityFrameworkCore.Utilities;
-using CA = System.Diagnostics.CodeAnalysis;
 
 namespace Microsoft.EntityFrameworkCore
 {
@@ -48,7 +48,7 @@ public DbFunctionAttribute(string name, string? schema = null)
         /// <summary>
         ///     The name of the function in the database.
         /// </summary>
-        [CA.DisallowNullAttribute]
+        [DisallowNull]
         public virtual string? Name
         {
             get => _name;

src/EFCore.Cosmos/Diagnostics/CosmosEventId.cs

@@ -6,21 +6,21 @@
 
 namespace Microsoft.EntityFrameworkCore.Diagnostics
 {
-        /// <summary>
-        ///     <para>
-        ///         Event IDs for Cosmos events that correspond to messages logged to an <see cref="ILogger" />
-        ///         and events sent to a <see cref="DiagnosticSource" />.
-        ///     </para>
-        ///     <para>
-        ///         These IDs are also used with <see cref="WarningsConfigurationBuilder" /> to configure the
-        ///         behavior of warnings.
-        ///     </para>
-        /// </summary>
-        /// <remarks>
-        ///     See <see href="https://aka.ms/efcore-docs-diagnostics">Logging, events, and diagnostics</see>, and
-        ///     <see href="https://aka.ms/efcore-docs-cosmos">Accessing Azure Cosmos DB with EF Core</see> for more information.
-        /// </remarks>
-        public static class CosmosEventId
+    /// <summary>
+    ///     <para>
+    ///         Event IDs for Cosmos events that correspond to messages logged to an <see cref="ILogger" />
+    ///         and events sent to a <see cref="DiagnosticSource" />.
+    ///     </para>
+    ///     <para>
+    ///         These IDs are also used with <see cref="WarningsConfigurationBuilder" /> to configure the
+    ///         behavior of warnings.
+    ///     </para>
+    /// </summary>
+    /// <remarks>
+    ///     See <see href="https://aka.ms/efcore-docs-diagnostics">Logging, events, and diagnostics</see>, and
+    ///     <see href="https://aka.ms/efcore-docs-cosmos">Accessing Azure Cosmos DB with EF Core</see> for more information.
+    /// </remarks>
+    public static class CosmosEventId
     {
         // Warning: These values must not change between releases.
         // Only add new values to the end of sections, never in the middle.

src/EFCore.Cosmos/Extensions/CosmosEntityTypeExtensions.cs

@@ -26,14 +26,14 @@ public static class CosmosEntityTypeExtensions
         public static string? GetContainer(this IReadOnlyEntityType entityType)
             => entityType.BaseType != null
                 ? entityType.GetRootType().GetContainer()
-                : (string?)entityType[CosmosAnnotationNames.ContainerName]
-                ?? GetDefaultContainer(entityType);
+                : ((string?)entityType[CosmosAnnotationNames.ContainerName]
+                    ?? GetDefaultContainer(entityType));
 
         private static string? GetDefaultContainer(IReadOnlyEntityType entityType)
             => entityType.FindOwnership() != null
                 ? null
-                : entityType.Model.GetDefaultContainer()
-                ?? entityType.ShortName();
+                : (entityType.Model.GetDefaultContainer()
+                    ?? entityType.ShortName());
 
         /// <summary>
         ///     Sets the name of the container to which the entity type is mapped.

src/EFCore.Cosmos/Query/Internal/CosmosShapedQueryCompilingExpressionVisitor.CosmosProjectionBindingRemovingExpressionVisitor.cs

@@ -32,8 +32,8 @@ protected override ProjectionExpression GetProjection(ProjectionBindingExpressio
             private int GetProjectionIndex(ProjectionBindingExpression projectionBindingExpression)
                 => projectionBindingExpression.ProjectionMember != null
                     ? _selectExpression.GetMappedProjection(projectionBindingExpression.ProjectionMember).GetConstantValue<int>()
-                    : projectionBindingExpression.Index
-                    ?? throw new InvalidOperationException(CoreStrings.TranslationFailed(projectionBindingExpression.Print()));
+                    : (projectionBindingExpression.Index
+                        ?? throw new InvalidOperationException(CoreStrings.TranslationFailed(projectionBindingExpression.Print())));
         }
     }
 }

src/EFCore.Cosmos/Storage/Internal/CosmosExecutionStrategy.cs

@@ -122,8 +122,8 @@ static bool IsTransient(HttpStatusCode statusCode)
             var baseDelay = base.GetNextDelay(lastException);
             return baseDelay == null
                 ? null
-                : CallOnWrappedException(lastException, GetDelayFromException)
-                ?? baseDelay;
+                : (CallOnWrappedException(lastException, GetDelayFromException)
+                    ?? baseDelay);
         }
 
         private static TimeSpan? GetDelayFromException(Exception exception)

src/EFCore.Cosmos/Storage/Internal/CosmosTypeMappingSource.cs

@@ -50,9 +50,9 @@ public CosmosTypeMappingSource(TypeMappingSourceDependencies dependencies)
 
             return _clrTypeMappings.TryGetValue(clrType, out var mapping)
                 ? mapping
-                : FindPrimitiveMapping(mappingInfo)
-                ?? FindCollectionMapping(mappingInfo)
-                ?? base.FindMapping(mappingInfo);
+                : (FindPrimitiveMapping(mappingInfo)
+                    ?? FindCollectionMapping(mappingInfo)
+                    ?? base.FindMapping(mappingInfo));
         }
 
         private CoreTypeMapping? FindPrimitiveMapping(in TypeMappingInfo mappingInfo)

src/EFCore.Sqlite.Core/Query/Internal/SqliteSqlTranslatingExpressionVisitor.cs

@@ -316,9 +316,9 @@ protected override Expression VisitBinary(BinaryExpression binaryExpression)
         private static Type? GetProviderType(SqlExpression? expression)
             => expression == null
                 ? null
-                : expression.TypeMapping?.Converter?.ProviderClrType
-                ?? expression.TypeMapping?.ClrType
-                ?? expression.Type;
+                : (expression.TypeMapping?.Converter?.ProviderClrType
+                    ?? expression.TypeMapping?.ClrType
+                    ?? expression.Type);
 
         private static bool AreOperandsDecimals(SqlBinaryExpression sqlExpression)
             => GetProviderType(sqlExpression.Left) == typeof(decimal)