Static analysis: minor small changes (#26946)

dotnet · Dec 9, 2021 · 8f7f790 · 8f7f790
1 parent c918248
commit 8f7f790
Show file tree

Hide file tree

Showing 33 changed files with 118 additions and 120 deletions.
diff --git a/src/EFCore.Cosmos/Query/Internal/CosmosProjectionBindingExpressionVisitor.cs b/src/EFCore.Cosmos/Query/Internal/CosmosProjectionBindingExpressionVisitor.cs
@@ -110,7 +110,7 @@ public override Expression Visit(Expression expression)
         {
             switch (expression)
             {
-                case ConstantExpression _:
+                case ConstantExpression:
                     return expression;
 
                 case ParameterExpression parameterExpression:
@@ -130,7 +130,7 @@ public override Expression Visit(Expression expression)
 
                     throw new InvalidOperationException(CoreStrings.TranslationFailed(parameterExpression.Print()));
 
-                case MaterializeCollectionNavigationExpression _:
+                case MaterializeCollectionNavigationExpression:
                     return base.Visit(expression);
             }
 

diff --git a/...edQueryCompilingExpressionVisitor.CosmosProjectionBindingRemovingExpressionVisitorBase.cs b/...edQueryCompilingExpressionVisitor.CosmosProjectionBindingRemovingExpressionVisitorBase.cs
@@ -113,7 +113,7 @@ protected override Expression VisitBinary(BinaryExpression binaryExpression)
                                     _ownerMappings[accessExpression] =
                                         (innerObjectAccessExpression.Navigation.DeclaringEntityType, innerAccessExpression);
                                     break;
-                                case RootReferenceExpression _:
+                                case RootReferenceExpression:
                                     innerAccessExpression = _jObjectParameter;
                                     break;
                                 default:

diff --git a/src/EFCore.Cosmos/Query/Internal/CosmosSqlTranslatingExpressionVisitor.cs b/src/EFCore.Cosmos/Query/Internal/CosmosSqlTranslatingExpressionVisitor.cs
@@ -253,9 +253,9 @@ protected override Expression VisitExtension(Expression extensionExpression)
     {
         switch (extensionExpression)
         {
-            case EntityProjectionExpression _:
-            case EntityReferenceExpression _:
-            case SqlExpression _:
+            case EntityProjectionExpression:
+            case EntityReferenceExpression:
+            case SqlExpression:
                 return extensionExpression;
 
             case EntityShaperExpression entityShaperExpression:
@@ -380,7 +380,7 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCallExp
                 && right is SqlExpression rightSql)
             {
                 sqlObject = leftSql;
-                arguments = new SqlExpression[1] { rightSql };
+                arguments = new[] { rightSql };
             }
             else
             {
@@ -407,7 +407,7 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCallExp
             if (left is SqlExpression leftSql
                 && right is SqlExpression rightSql)
             {
-                arguments = new SqlExpression[2] { leftSql, rightSql };
+                arguments = new[] { leftSql, rightSql };
             }
             else
             {
@@ -428,7 +428,7 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCallExp
             if (enumerable is SqlExpression sqlEnumerable
                 && item is SqlExpression sqlItem)
             {
-                arguments = new SqlExpression[2] { sqlEnumerable, sqlItem };
+                arguments = new[] { sqlEnumerable, sqlItem };
             }
             else
             {
@@ -450,7 +450,7 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCallExp
                 && item is SqlExpression sqlItem)
             {
                 sqlObject = sqlEnumerable;
-                arguments = new SqlExpression[1] { sqlItem };
+                arguments = new[] { sqlItem };
             }
             else
             {

diff --git a/src/EFCore.Design/Design/Internal/MigrationsOperations.cs b/src/EFCore.Design/Design/Internal/MigrationsOperations.cs
@@ -20,7 +20,6 @@ public class MigrationsOperations
     private readonly string? _language;
     private readonly DesignTimeServicesBuilder _servicesBuilder;
     private readonly DbContextOperations _contextOperations;
-    private readonly string[] _args;
 
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
@@ -43,7 +42,7 @@ public MigrationsOperations(
         _projectDir = projectDir;
         _rootNamespace = rootNamespace;
         _language = language;
-        _args = args ?? Array.Empty<string>();
+        args ??= Array.Empty<string>();
         _contextOperations = new DbContextOperations(
             reporter,
             assembly,
@@ -52,9 +51,9 @@ public MigrationsOperations(
             rootNamespace,
             language,
             nullable,
-            _args);
+            args);
 
-        _servicesBuilder = new DesignTimeServicesBuilder(assembly, startupAssembly, reporter, _args);
+        _servicesBuilder = new DesignTimeServicesBuilder(assembly, startupAssembly, reporter, args);
     }
 
     /// <summary>

diff --git a/src/EFCore.Design/Migrations/Design/CSharpMigrationOperationGenerator.cs b/src/EFCore.Design/Migrations/Design/CSharpMigrationOperationGenerator.cs
@@ -715,8 +715,6 @@ protected virtual void Generate(AlterDatabaseOperation operation, IndentedString
                     .AppendLine()
                     .Append("oldCollation: ")
                     .Append(Code.Literal(operation.OldDatabase.Collation));
-
-                needComma = true;
             }
 
             builder.Append(")");

diff --git a/src/EFCore.Design/Scaffolding/Internal/CSharpRuntimeModelCodeGenerator.cs b/src/EFCore.Design/Scaffolding/Internal/CSharpRuntimeModelCodeGenerator.cs
@@ -1053,7 +1053,7 @@ private void CreateForeignKey(
 
         using (mainBuilder.Indent())
         {
-            var foreignKeyVariable = "runtimeForeignKey";
+            const string foreignKeyVariable = "runtimeForeignKey";
             var variables = new HashSet<string>
             {
                 declaringEntityType,

diff --git a/src/EFCore.InMemory/Query/Internal/InMemoryExpressionTranslatingExpressionVisitor.cs b/src/EFCore.InMemory/Query/Internal/InMemoryExpressionTranslatingExpressionVisitor.cs
@@ -247,8 +247,8 @@ protected override Expression VisitExtension(Expression extensionExpression)
     {
         switch (extensionExpression)
         {
-            case EntityProjectionExpression _:
-            case EntityReferenceExpression _:
+            case EntityProjectionExpression:
+            case EntityReferenceExpression:
                 return extensionExpression;
 
             case EntityShaperExpression entityShaperExpression:
@@ -527,7 +527,7 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCallExp
             }
 
             @object = left;
-            arguments = new Expression[1] { right };
+            arguments = new[] { right };
         }
         else if (method.Name == nameof(object.Equals)
                  && methodCallExpression.Object == null
@@ -560,7 +560,7 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCallExp
                 return QueryCompilationContext.NotTranslatedExpression;
             }
 
-            arguments = new Expression[2] { left, right };
+            arguments = new[] { left, right };
         }
         else if (method.IsGenericMethod
                  && method.GetGenericMethodDefinition().Equals(EnumerableMethods.Contains))
@@ -582,7 +582,7 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCallExp
                 return QueryCompilationContext.NotTranslatedExpression;
             }
 
-            arguments = new Expression[2] { enumerable, item };
+            arguments = new[] { enumerable, item };
         }
         else if (methodCallExpression.Arguments.Count == 1
                  && method.IsContainsMethod())
@@ -605,7 +605,7 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCallExp
             }
 
             @object = enumerable;
-            arguments = new Expression[1] { item };
+            arguments = new[] { item };
         }
         else
         {

diff --git a/src/EFCore.InMemory/Query/Internal/InMemoryProjectionBindingExpressionVisitor.cs b/src/EFCore.InMemory/Query/Internal/InMemoryProjectionBindingExpressionVisitor.cs
@@ -110,7 +110,7 @@ public virtual Expression Translate(InMemoryQueryExpression queryExpression, Exp
             {
                 switch (expression)
                 {
-                    case ConstantExpression _:
+                    case ConstantExpression:
                         return expression;
 
                     case ProjectionBindingExpression projectionBindingExpression:

diff --git a/src/EFCore.InMemory/Query/Internal/InMemoryQueryExpression.cs b/src/EFCore.InMemory/Query/Internal/InMemoryQueryExpression.cs
@@ -557,7 +557,7 @@ public virtual GroupByShaperExpression ApplyGrouping(
         bool defaultElementSelector)
     {
         var source = ServerQueryExpression;
-        Expression? selector = null;
+        Expression? selector;
         if (defaultElementSelector)
         {
             selector = Lambda(

diff --git a/src/EFCore.Relational/Metadata/Internal/Sequence.cs b/src/EFCore.Relational/Metadata/Internal/Sequence.cs
@@ -747,13 +747,13 @@ public static SequenceData Deserialize(string value)
             => value == null ? null : long.Parse(value, CultureInfo.InvariantCulture);
 
         private static Type AsType(string value)
-            => value == typeof(long).Name
+            => value == nameof(Int64)
                 ? typeof(long)
-                : value == typeof(int).Name
+                : value == nameof(Int32)
                     ? typeof(int)
-                    : value == typeof(short).Name
+                    : value == nameof(Int16)
                         ? typeof(short)
-                        : value == typeof(decimal).Name
+                        : value == nameof(Decimal)
                             ? typeof(decimal)
                             : typeof(byte);
 

diff --git a/src/EFCore.Relational/Migrations/Internal/MigrationsModelDiffer.cs b/src/EFCore.Relational/Migrations/Internal/MigrationsModelDiffer.cs
@@ -1863,7 +1863,7 @@ protected virtual void TrackData(
                     }
 
                     var targetTable = diffContext.FindTarget(sourceTable);
-                    bool removedMapping = !(targetTable != null
+                    var removedMapping = !(targetTable != null
                         && targetKeyMap.Keys.Any(
                             k => k.Item2 == targetTable
                                 && k.Item1.DeclaringEntityType.GetTableMappings().First().Table == firstTargetTable));

diff --git a/src/EFCore.Relational/Query/Internal/RelationalProjectionBindingExpressionVisitor.cs b/src/EFCore.Relational/Query/Internal/RelationalProjectionBindingExpressionVisitor.cs
@@ -118,7 +118,7 @@ public virtual Expression Translate(SelectExpression selectExpression, Expressio
             {
                 switch (expression)
                 {
-                    case ConstantExpression _:
+                    case ConstantExpression:
                         return expression;
 
                     case ParameterExpression parameterExpression:
@@ -306,7 +306,7 @@ protected override Expression VisitExtension(Expression extensionExpression)
                     new ProjectionBindingExpression(_selectExpression, _projectionMembers.Peek(), typeof(ValueBuffer)));
             }
 
-            case IncludeExpression _:
+            case IncludeExpression:
                 return _indexBasedBinding ? base.VisitExtension(extensionExpression) : QueryCompilationContext.NotTranslatedExpression;
 
             case CollectionResultExpression collectionResultExpression:
@@ -544,7 +544,7 @@ protected override Expression VisitNewArray(NewArrayExpression newArrayExpressio
     /// </summary>
     protected override Expression VisitUnary(UnaryExpression unaryExpression)
     {
-        var operand = Visit(unaryExpression.Operand)!;
+        var operand = Visit(unaryExpression.Operand);
 
         return (unaryExpression.NodeType == ExpressionType.Convert
                 || unaryExpression.NodeType == ExpressionType.ConvertChecked)

diff --git a/src/EFCore.Relational/Query/QuerySqlGenerator.cs b/src/EFCore.Relational/Query/QuerySqlGenerator.cs
@@ -86,7 +86,8 @@ public virtual IRelationalCommand GetCommand(SelectExpression selectExpression)
     /// <summary>
     ///     The default alias separator.
     /// </summary>
-    protected virtual string AliasSeparator { get; } = " AS ";
+    protected virtual string AliasSeparator
+        => " AS ";
 
     /// <summary>
     ///     The current SQL command builder.
@@ -838,7 +839,7 @@ protected virtual bool RequiresParentheses(SqlExpression outerExpression, SqlExp
     {
         switch (innerExpression)
         {
-            case LikeExpression _:
+            case LikeExpression:
                 return true;
 
             case SqlUnaryExpression sqlUnaryExpression:
@@ -1069,9 +1070,9 @@ protected virtual void GenerateSetOperation(SetOperationBase setOperation)
         static string GetSetOperation(SetOperationBase operation)
             => operation switch
             {
-                ExceptExpression _ => "EXCEPT",
-                IntersectExpression _ => "INTERSECT",
-                UnionExpression _ => "UNION",
+                ExceptExpression => "EXCEPT",
+                IntersectExpression => "INTERSECT",
+                UnionExpression => "UNION",
                 _ => throw new InvalidOperationException(CoreStrings.UnknownEntity("SetOperationType"))
             };
     }

diff --git a/src/EFCore.Relational/Query/RelationalQueryCompilationContext.cs b/src/EFCore.Relational/Query/RelationalQueryCompilationContext.cs
@@ -37,7 +37,8 @@ public RelationalQueryCompilationContext(
 
     /// <summary>
     ///     A value indicating the <see cref="EntityFrameworkCore.QuerySplittingBehavior" /> configured for the query.
-    ///     If no value has been configured then <see cref="QuerySplittingBehavior.SingleQuery" /> will be used.
+    ///     If no value has been configured then <see cref="Microsoft.EntityFrameworkCore.QuerySplittingBehavior.SingleQuery" />
+    ///     will be used.
     /// </summary>
     public virtual QuerySplittingBehavior? QuerySplittingBehavior { get; internal set; }
 }
diff --git a/src/EFCore.Relational/Query/RelationalQueryableMethodTranslatingExpressionVisitor.cs b/src/EFCore.Relational/Query/RelationalQueryableMethodTranslatingExpressionVisitor.cs
@@ -1308,7 +1308,7 @@ public DeferredOwnedExpansionRemovingVisitor(SelectExpression selectExpression)
                 {
                     DeferredOwnedExpansionExpression doee => UnwrapDeferredEntityProjectionExpression(doee),
                     // For the source entity shaper or owned collection expansion
-                    EntityShaperExpression _ or ShapedQueryExpression _ => expression,
+                    EntityShaperExpression or ShapedQueryExpression => expression,
                     _ => base.Visit(expression)
                 };
 

diff --git a/...uery/RelationalShapedQueryCompilingExpressionVisitor.ShaperProcessingExpressionVisitor.cs b/...uery/RelationalShapedQueryCompilingExpressionVisitor.ShaperProcessingExpressionVisitor.cs
@@ -852,7 +852,7 @@ protected override Expression VisitExtension(Expression extensionExpression)
                     return accessor;
                 }
 
-                case GroupByShaperExpression _:
+                case GroupByShaperExpression:
                     throw new InvalidOperationException(RelationalStrings.ClientGroupByNotSupported);
             }
 

diff --git a/src/EFCore.Relational/Query/RelationalSqlTranslatingExpressionVisitor.cs b/src/EFCore.Relational/Query/RelationalSqlTranslatingExpressionVisitor.cs
@@ -358,9 +358,9 @@ protected override Expression VisitExtension(Expression extensionExpression)
     {
         switch (extensionExpression)
         {
-            case EntityProjectionExpression _:
-            case EntityReferenceExpression _:
-            case SqlExpression _:
+            case EntityProjectionExpression:
+            case EntityReferenceExpression:
+            case SqlExpression:
                 return extensionExpression;
 
             case EntityShaperExpression entityShaperExpression:
@@ -530,7 +530,7 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCallExp
                 && right is SqlExpression rightSql)
             {
                 sqlObject = leftSql;
-                arguments = new SqlExpression[1] { rightSql };
+                arguments = new[] { rightSql };
             }
             else
             {
@@ -565,7 +565,7 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCallExp
             if (left is SqlExpression leftSql
                 && right is SqlExpression rightSql)
             {
-                arguments = new SqlExpression[2] { leftSql, rightSql };
+                arguments = new[] { leftSql, rightSql };
             }
             else
             {
@@ -588,7 +588,7 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCallExp
             if (enumerable is SqlExpression sqlEnumerable
                 && item is SqlExpression sqlItem)
             {
-                arguments = new SqlExpression[2] { sqlEnumerable, sqlItem };
+                arguments = new[] { sqlEnumerable, sqlItem };
             }
             else
             {
@@ -612,7 +612,7 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCallExp
                 && item is SqlExpression sqlItem)
             {
                 sqlObject = sqlEnumerable;
-                arguments = new SqlExpression[1] { sqlItem };
+                arguments = new[] { sqlItem };
             }
             else
             {

diff --git a/src/EFCore.Relational/Query/SqlExpressions/SelectExpression.cs b/src/EFCore.Relational/Query/SqlExpressions/SelectExpression.cs
@@ -217,7 +217,7 @@ internal SelectExpression(IEntityType entityType, TableExpressionBase tableExpre
         {
             TableExpression tableExpression => tableExpression.Table,
             TableValuedFunctionExpression tableValuedFunctionExpression => tableValuedFunctionExpression.StoreFunction,
-            _ => entityType.GetDefaultMappings().Single().Table,
+            _ => entityType.GetDefaultMappings().Single().Table
         };
 
         var tableReferenceExpression = new TableReferenceExpression(this, tableExpressionBase.Alias!);
@@ -1158,7 +1158,7 @@ public void ApplyGrouping(Expression keySelector)
                 newGroupByTerms.Add(newItem);
             }
 
-            keySelector = new ReplacingExpressionVisitor(groupByTerms, newGroupByTerms).Visit(keySelector);
+            new ReplacingExpressionVisitor(groupByTerms, newGroupByTerms).Visit(keySelector);
             groupByTerms = newGroupByTerms;
         }
 
@@ -1706,7 +1706,7 @@ static bool IsNullableProjection(ProjectionExpression projectionExpression)
             {
                 ColumnExpression columnExpression => columnExpression.IsNullable,
                 SqlConstantExpression sqlConstantExpression => sqlConstantExpression.Value == null,
-                _ => true,
+                _ => true
             };
     }
 

diff --git a/src/EFCore.Relational/Storage/RelationalConnection.cs b/src/EFCore.Relational/Storage/RelationalConnection.cs
@@ -976,7 +976,7 @@ await Dependencies.ConnectionLogger.ConnectionErrorAsync(
     }
 
     /// <summary>
-    ///     Template method that by default calls <see cref="DbConnection.CloseAsync" /> but can be overridden
+    ///     Template method that by default calls <see cref="System.Data.Common.DbConnection.CloseAsync" /> but can be overridden
     ///     by providers to make a different call instead.
     /// </summary>
     protected virtual Task CloseDbConnectionAsync()
@@ -1073,7 +1073,7 @@ protected virtual void DisposeDbConnection()
         => DbConnection.Dispose();
 
     /// <summary>
-    ///     Template method that by default calls <see cref="DbConnection.DisposeAsync" /> but can be overridden by
+    ///     Template method that by default calls <see cref="System.Data.Common.DbConnection.DisposeAsync" /> but can be overridden by
     ///     providers to make a different call instead.
     /// </summary>
     protected virtual ValueTask DisposeDbConnectionAsync()