Code cleanup & modernization

src/EFCore.Analyzers/InternalUsageDiagnosticAnalyzer.cs

@@ -194,8 +194,7 @@ private static void AnalyzeNamedTypeSymbol(SymbolAnalysisContext context, INamed
             {
                 var location = declaringSyntax.GetSyntax() switch
                 {
-                    CSharpSyntax.ClassDeclarationSyntax s when s.BaseList?.Types.Count > 0
-                        => s.BaseList.Types[0].GetLocation(),
+                    CSharpSyntax.ClassDeclarationSyntax { BaseList.Types.Count: > 0 } s => s.BaseList.Types[0].GetLocation(),
                     { } otherSyntax => otherSyntax.GetLocation()
                 };
 
@@ -246,7 +245,8 @@ private static void AnalyzeMethodTypeSymbol(SymbolAnalysisContext context, IMeth
             {
                 var location = declaringSyntax.GetSyntax() switch
                 {
-                    CSharpSyntax.ParameterSyntax s when s.Type != null => s.Type.GetLocation(),
+                    CSharpSyntax.ParameterSyntax { Type: not null } s => s.Type.GetLocation(),
+
                     { } otherSyntax => otherSyntax.GetLocation()
                 };
 
@@ -283,9 +283,7 @@ private static void ReportDiagnostic(SymbolAnalysisContext context, SyntaxNode s
     private static SyntaxNode NarrowDownSyntax(SyntaxNode syntax)
         => syntax switch
         {
-            CSharpSyntax.InvocationExpressionSyntax s
-                when s.Expression is CSharpSyntax.MemberAccessExpressionSyntax memberAccessSyntax
-                => memberAccessSyntax.Name,
+            CSharpSyntax.InvocationExpressionSyntax { Expression: CSharpSyntax.MemberAccessExpressionSyntax memberAccessSyntax } => memberAccessSyntax.Name,
             CSharpSyntax.MemberAccessExpressionSyntax s => s.Name,
             CSharpSyntax.ObjectCreationExpressionSyntax s => s.Type,
             CSharpSyntax.PropertyDeclarationSyntax s => s.Type,

src/EFCore.Cosmos/Diagnostics/Internal/CosmosLoggerExtensions.cs

@@ -68,7 +68,7 @@ private static string ExecutingSqlQuery(EventDefinitionBase definition, EventDat
         return d.GenerateMessage(
             p.ContainerId,
             p.LogSensitiveData ? p.PartitionKey : "?",
-            FormatParameters(p.Parameters, p.LogSensitiveData && p.Parameters.Count > 0),
+            FormatParameters(p.Parameters, p is { LogSensitiveData: true, Parameters.Count: > 0 }),
             Environment.NewLine,
             p.QuerySql);
     }
@@ -183,7 +183,7 @@ private static string ExecutedReadNext(EventDefinitionBase definition, EventData
                 p.ActivityId,
                 p.ContainerId,
                 p.LogSensitiveData ? p.PartitionKey : "?",
-                FormatParameters(p.Parameters, p.LogSensitiveData && p.Parameters.Count > 0),
+                FormatParameters(p.Parameters, p is { LogSensitiveData: true, Parameters.Count: > 0 }),
                 Environment.NewLine,
                 p.QuerySql));
     }

src/EFCore.Cosmos/Metadata/Conventions/CosmosManyToManyJoinEntityTypeConvention.cs

@@ -142,10 +142,8 @@ private void CreateSkipNavigationForeignKey(
     private void ProcessJoinPartitionKey(IConventionSkipNavigation skipNavigation)
     {
         var inverseSkipNavigation = skipNavigation.Inverse;
-        if (skipNavigation.JoinEntityType != null
-            && skipNavigation.IsCollection
-            && inverseSkipNavigation != null
-            && inverseSkipNavigation.IsCollection
+        if (skipNavigation is { JoinEntityType: not null, IsCollection: true }
+            && inverseSkipNavigation is { IsCollection: true }
             && inverseSkipNavigation.JoinEntityType == skipNavigation.JoinEntityType)
         {
             var joinEntityType = skipNavigation.JoinEntityType;

src/EFCore.Cosmos/Metadata/Conventions/CosmosValueGenerationConvention.cs

@@ -72,8 +72,7 @@ public virtual void ProcessEntityTypeAnnotationChanged(
         if (propertyType == typeof(int))
         {
             var ownership = entityType.FindOwnership();
-            if (ownership != null
-                && !ownership.IsUnique
+            if (ownership is { IsUnique: false }
                 && !entityType.IsDocumentRoot())
             {
                 var pk = property.FindContainingPrimaryKey();

src/EFCore.Cosmos/Metadata/Internal/CosmosPropertyExtensions.cs

@@ -23,8 +23,7 @@ public static bool IsOrdinalKeyProperty(this IReadOnlyProperty property)
             property.DeclaringEntityType.IsOwned(), $"Expected {property.DeclaringEntityType.DisplayName()} to be owned.");
         Check.DebugAssert(property.GetJsonPropertyName().Length == 0, $"Expected {property.Name} to be non-persisted.");
 
-        return property.FindContainingPrimaryKey() is IReadOnlyKey key
-            && key.Properties.Count > 1
+        return property.FindContainingPrimaryKey() is IReadOnlyKey { Properties.Count: > 1 }
             && !property.IsForeignKey()
             && property.ClrType == typeof(int)
             && (property.ValueGenerated & ValueGenerated.OnAdd) != 0;

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

@@ -316,7 +316,7 @@ protected override Expression VisitMember(MemberExpression memberExpression)
         var navigationProjection = innerEntityProjection.BindMember(
             memberExpression.Member, innerExpression.Type, clientEval: true, out var propertyBase);
 
-        if (!(propertyBase is INavigation navigation)
+        if (propertyBase is not INavigation navigation
             || !navigation.IsEmbedded())
         {
             return NullSafeUpdate(innerExpression);
@@ -509,7 +509,7 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCallExp
                 navigationProjection = innerEntityProjection.BindMember(
                     memberName, visitedSource.Type, clientEval: true, out var propertyBase);
 
-                if (!(propertyBase is INavigation projectedNavigation)
+                if (propertyBase is not INavigation projectedNavigation
                     || !projectedNavigation.IsEmbedded())
                 {
                     return null;
@@ -567,7 +567,7 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCallExp
 
                     case nameof(Queryable.Select)
                         when genericMethod == QueryableMethods.Select:
-                        if (!(visitedSource is CollectionShaperExpression shaper))
+                        if (visitedSource is not CollectionShaperExpression shaper)
                         {
                             return null;
                         }

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

@@ -78,8 +78,7 @@ protected CosmosQueryableMethodTranslatingExpressionVisitor(
     /// </summary>
     public override Expression Visit(Expression expression)
     {
-        if (expression is MethodCallExpression methodCallExpression
-            && methodCallExpression.Method.IsGenericMethod
+        if (expression is MethodCallExpression { Method.IsGenericMethod: true } methodCallExpression
             && methodCallExpression.Method.GetGenericMethodDefinition() == QueryableMethods.FirstOrDefaultWithoutPredicate)
         {
             if (methodCallExpression.Arguments[0] is MethodCallExpression queryRootMethodCallExpression
@@ -90,8 +89,7 @@ public override Expression Visit(Expression expression)
                 {
                     var entityType = entityQueryRootExpression.EntityType;
 
-                    if (queryRootMethodCallExpression.Arguments[1] is UnaryExpression unaryExpression
-                        && unaryExpression.Operand is LambdaExpression lambdaExpression)
+                    if (queryRootMethodCallExpression.Arguments[1] is UnaryExpression { Operand: LambdaExpression lambdaExpression })
                     {
                         var queryProperties = new List<IProperty>();
                         var parameterNames = new List<string>();
@@ -636,9 +634,7 @@ protected override ShapedQueryExpression TranslateOfType(ShapedQueryExpression s
             }
 
             var selectExpression = (SelectExpression)source.QueryExpression;
-            if (!(translation is SqlConstantExpression sqlConstantExpression
-                    && sqlConstantExpression.Value is bool constantValue
-                    && constantValue))
+            if (translation is not SqlConstantExpression { Value: true })
             {
                 selectExpression.ApplyPredicate(translation);
             }

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

@@ -86,8 +86,7 @@ protected override Expression VisitBinary(BinaryExpression binaryExpression)
                             projectionExpression = projection.Expression;
                             storeName = projection.Alias;
                         }
-                        else if (projectionExpression is UnaryExpression convertExpression
-                                 && convertExpression.NodeType == ExpressionType.Convert)
+                        else if (projectionExpression is UnaryExpression { NodeType: ExpressionType.Convert } convertExpression)
                         {
                             // Unwrap EntityProjectionExpression when the root entity is not projected
                             projectionExpression = ((UnaryExpression)convertExpression.Operand).Operand;
@@ -155,9 +154,7 @@ protected override Expression VisitBinary(BinaryExpression binaryExpression)
                     }
                 }
 
-                if (binaryExpression.Left is MemberExpression memberExpression
-                    && memberExpression.Member is FieldInfo fieldInfo
-                    && fieldInfo.IsInitOnly)
+                if (binaryExpression.Left is MemberExpression { Member: FieldInfo { IsInitOnly: true } } memberExpression)
                 {
                     return memberExpression.Assign(Visit(binaryExpression.Right));
                 }
@@ -418,8 +415,7 @@ private static void IncludeReference<TIncludingEntity, TIncludedEntity>(
                 if (relatedEntity != null)
                 {
                     fixup(includingEntity, relatedEntity);
-                    if (inverseNavigation != null
-                        && !inverseNavigation.IsCollection)
+                    if (inverseNavigation is { IsCollection: false })
                     {
                         inverseNavigation.SetIsLoadedWhenNoTracking(relatedEntity);
                     }

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

@@ -322,7 +322,7 @@ public void Reset()
 
             private bool ShapeResult()
             {
-                var hasNext = !(_item is null);
+                var hasNext = _item is not null;
 
                 _cosmosQueryContext.InitializeStateManager(_standAloneStateManager);
 

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

@@ -4,7 +4,6 @@
 #nullable disable
 
 using System.Collections;
-using System.Diagnostics.CodeAnalysis;
 using Microsoft.EntityFrameworkCore.Cosmos.Internal;
 
 namespace Microsoft.EntityFrameworkCore.Cosmos.Query.Internal;
@@ -354,8 +353,7 @@ protected override Expression VisitExtension(Expression extensionExpression)
 
                 if (result.NodeType == ExpressionType.Convert
                     && result.Type == typeof(ValueBuffer)
-                    && result is UnaryExpression outerUnary
-                    && outerUnary.Operand.NodeType == ExpressionType.Convert
+                    && result is UnaryExpression { Operand.NodeType: ExpressionType.Convert } outerUnary
                     && outerUnary.Operand.Type == typeof(object))
                 {
                     result = ((UnaryExpression)outerUnary.Operand).Operand;
@@ -751,7 +749,7 @@ protected override Expression VisitTypeBinary(TypeBinaryExpression typeBinaryExp
 
     private Expression TryBindMember(Expression source, MemberIdentity member)
     {
-        if (!(source is EntityReferenceExpression entityReferenceExpression))
+        if (source is not EntityReferenceExpression entityReferenceExpression)
         {
             return null;
         }
@@ -814,7 +812,7 @@ private bool TryRewriteContainsEntity(Expression source, Expression item, out Ex
     {
         result = null;
 
-        if (!(item is EntityReferenceExpression itemEntityReference))
+        if (item is not EntityReferenceExpression itemEntityReference)
         {
             return false;
         }
@@ -1026,7 +1024,7 @@ private static List<TProperty> ParameterListValueExtractor<TEntity, TProperty>(
     }
 
     private static bool IsNullSqlConstantExpression(Expression expression)
-        => expression is SqlConstantExpression sqlConstant && sqlConstant.Value == null;
+        => expression is SqlConstantExpression { Value: null };
 
     private static bool TryEvaluateToConstant(Expression expression, out SqlConstantExpression sqlConstantExpression)
     {
@@ -1061,7 +1059,7 @@ private static bool CanEvaluate(Expression expression)
     private static bool TranslationFailed(Expression original, Expression translation, out SqlExpression castTranslation)
     {
         if (original != null
-            && !(translation is SqlExpression))
+            && translation is not SqlExpression)
         {
             castTranslation = null;
             return true;
@@ -1106,8 +1104,7 @@ private sealed class SqlTypeMappingVerifyingExpressionVisitor : ExpressionVisito
     {
         protected override Expression VisitExtension(Expression extensionExpression)
         {
-            if (extensionExpression is SqlExpression sqlExpression
-                && sqlExpression.TypeMapping == null)
+            if (extensionExpression is SqlExpression { TypeMapping: null } sqlExpression)
             {
                 throw new InvalidOperationException(CosmosStrings.NullTypeMappingInSqlTree(sqlExpression.Print()));
             }

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

@@ -187,10 +187,8 @@ public CosmosStringMethodTranslator(ISqlExpressionFactory sqlExpressionFactory)
 
             if (SubstringMethodInfoWithTwoArgs.Equals(method))
             {
-                return arguments[0] is SqlConstantExpression constant
-                    && constant.Value is int intValue
-                    && intValue == 0
-                        ? TranslateSystemFunction("LEFT", method.ReturnType, instance, arguments[1])
+                return arguments[0] is SqlConstantExpression { Value: 0 }
+                    ? TranslateSystemFunction("LEFT", method.ReturnType, instance, arguments[1])
                         : TranslateSystemFunction("SUBSTRING", method.ReturnType, instance, arguments[0], arguments[1]);
             }
         }
@@ -237,8 +235,7 @@ public CosmosStringMethodTranslator(ISqlExpressionFactory sqlExpressionFactory)
         {
             var comparisonTypeArgument = arguments[^1];
 
-            if (comparisonTypeArgument is SqlConstantExpression constantComparisonTypeArgument
-                && constantComparisonTypeArgument.Value is StringComparison comparisonTypeArgumentValue
+            if (comparisonTypeArgument is SqlConstantExpression { Value: StringComparison comparisonTypeArgumentValue }
                 && (comparisonTypeArgumentValue == StringComparison.OrdinalIgnoreCase
                     || comparisonTypeArgumentValue == StringComparison.Ordinal))
             {

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

@@ -21,8 +21,7 @@ public static class ExpressionExtensions
     {
         for (var i = 0; i < expressions.Length; i++)
         {
-            if (expressions[i] is SqlExpression sql
-                && sql.TypeMapping != null)
+            if (expressions[i] is SqlExpression { TypeMapping: not null } sql)
             {
                 return sql.TypeMapping;
             }

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

@@ -304,9 +304,7 @@ public virtual void ClearOrdering()
     /// </summary>
     public virtual void ApplyPredicate(SqlExpression expression)
     {
-        if (expression is SqlConstantExpression sqlConstant
-            && sqlConstant.Value is bool boolValue
-            && boolValue)
+        if (expression is SqlConstantExpression { Value: true })
         {
             return;
         }

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

@@ -70,9 +70,7 @@ private void Print(
         object? value,
         ExpressionPrinter expressionPrinter)
     {
-        if (value is IEnumerable enumerable
-            && !(value is string)
-            && !(value is byte[]))
+        if (value is IEnumerable enumerable and not (string or byte[]))
         {
             var first = true;
             foreach (var item in enumerable)

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

@@ -3,7 +3,6 @@
 
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.EntityFrameworkCore.Cosmos.Internal;
-using Microsoft.EntityFrameworkCore.Cosmos.Storage.Internal;
 using Microsoft.EntityFrameworkCore.Internal;
 
 namespace Microsoft.EntityFrameworkCore.Cosmos.Query.Internal;

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

@@ -484,8 +484,7 @@ private static void ProcessResponse(ResponseMessage response, IUpdateEntry entry
         }
 
         var jObjectProperty = entry.EntityType.FindProperty(StoreKeyConvention.JObjectPropertyName);
-        if (jObjectProperty != null
-            && jObjectProperty.ValueGenerated == ValueGenerated.OnAddOrUpdate
+        if (jObjectProperty is { ValueGenerated: ValueGenerated.OnAddOrUpdate }
             && response.Content != null)
         {
             using var responseStream = response.Content;

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

@@ -90,8 +90,7 @@ public CosmosTypeMappingSource(TypeMappingSourceDependencies dependencies)
                     clrType, CreateArrayComparer(elementMapping, elementType), jsonValueReaderWriter: jsonValueReaderWriter);
         }
 
-        if (clrType.IsGenericType
-            && !clrType.IsGenericTypeDefinition)
+        if (clrType is { IsGenericType: true, IsGenericTypeDefinition: false })
         {
             var genericTypeDefinition = clrType.GetGenericTypeDefinition();
             if (genericTypeDefinition == typeof(List<>)

src/EFCore.Design/Design/Internal/CSharpHelper.cs

@@ -1028,7 +1028,7 @@ public virtual string UnknownLiteral(object? value)
         }
 
         var valueType = value.GetType();
-        if (valueType.IsGenericType && !valueType.IsGenericTypeDefinition)
+        if (valueType is { IsGenericType: true, IsGenericTypeDefinition: false })
         {
             var genericArguments = valueType.GetGenericArguments();
             switch (value)
@@ -1519,8 +1519,7 @@ private static bool IsIdentifierPartCharacter(char ch)
         if (ch < 'a')
         {
             return (ch < 'A'
-                ? ch >= '0'
-                && ch <= '9'
+                ? ch is >= '0' and <= '9'
                 : ch <= 'Z')
                 || ch == '_';
         }

src/EFCore.Design/Design/Internal/DbContextOperations.cs

@@ -161,7 +161,7 @@ public virtual void Optimize(string? outputDir, string? modelNamespace, string?
         _reporter.WriteInformation(DesignStrings.CompiledModelGenerated($"options.UseModel({fullName}.Instance)"));
 
         var cacheKeyFactory = context.GetService<IModelCacheKeyFactory>();
-        if (!(cacheKeyFactory is ModelCacheKeyFactory))
+        if (cacheKeyFactory is not ModelCacheKeyFactory)
         {
             _reporter.WriteWarning(DesignStrings.CompiledModelCustomCacheKeyFactory(cacheKeyFactory.GetType().ShortDisplayName()));
         }

src/EFCore.Design/Extensions/ScaffoldingModelExtensions.cs

@@ -27,8 +27,7 @@ public static bool IsSimpleManyToManyJoinEntityType(this IEntityType entityType)
             var primaryKey = entityType.FindPrimaryKey();
             var properties = entityType.GetProperties().ToList();
             var foreignKeys = entityType.GetForeignKeys().ToList();
-            if (primaryKey != null
-                && primaryKey.Properties.Count > 1
+            if (primaryKey is { Properties.Count: > 1 }
                 && foreignKeys.Count == 2
                 && primaryKey.Properties.Count == properties.Count
                 && foreignKeys[0].Properties.Count + foreignKeys[1].Properties.Count == properties.Count

src/EFCore.Design/Migrations/Design/CSharpSnapshotGenerator.cs

@@ -91,7 +91,7 @@ protected virtual void GenerateEntityTypes(
         }
 
         foreach (var entityType in nonOwnedTypes.Where(
-                     e => e.GetDeclaredNavigations().Any(n => !n.IsOnDependent && !n.ForeignKey.IsOwnership)))
+                     e => e.GetDeclaredNavigations().Any(n => n is { IsOnDependent: false, ForeignKey.IsOwnership: false })))
         {
             stringBuilder.AppendLine();