Static analysis: redundancies in symbol declarations

Part of #26805.
dotnet · Dec 7, 2021 · b7e7dc2 · b7e7dc2
1 parent ad1cf49
commit b7e7dc2
Show file tree

Hide file tree

Showing 65 changed files with 160 additions and 211 deletions.
diff --git a/src/EFCore.Cosmos/Metadata/Conventions/CosmosManyToManyJoinEntityTypeConvention.cs b/src/EFCore.Cosmos/Metadata/Conventions/CosmosManyToManyJoinEntityTypeConvention.cs
@@ -93,27 +93,28 @@ private void ConfigurePartitionKeyJoinEntityType(
         CreateSkipNavigationForeignKey(skipNavigation.Inverse!, joinEntityTypeBuilder, partitionKey);
     }
 
-    private IConventionForeignKey CreateSkipNavigationForeignKey(
+    private void CreateSkipNavigationForeignKey(
         IConventionSkipNavigation skipNavigation,
         IConventionEntityTypeBuilder joinEntityTypeBuilder,
         IConventionProperty partitionKeyProperty)
     {
         if (skipNavigation.ForeignKey != null
             && !skipNavigation.Builder.CanSetForeignKey(null))
         {
-            return skipNavigation.ForeignKey;
+            return;
         }
 
         var principalKey = skipNavigation.DeclaringEntityType.FindPrimaryKey();
         if (principalKey == null
             || principalKey.Properties.All(p => p.Name != partitionKeyProperty.Name))
         {
-            return CreateSkipNavigationForeignKey(skipNavigation, joinEntityTypeBuilder);
+            CreateSkipNavigationForeignKey(skipNavigation, joinEntityTypeBuilder);
+            return;
         }
 
         if (skipNavigation.ForeignKey?.Properties.Contains(partitionKeyProperty) == true)
         {
-            return skipNavigation.ForeignKey;
+            return;
         }
 
         var dependentProperties = new IConventionProperty[principalKey.Properties.Count];
@@ -136,8 +137,6 @@ private IConventionForeignKey CreateSkipNavigationForeignKey(
             .Metadata;
 
         skipNavigation.Builder.HasForeignKey(foreignKey);
-
-        return foreignKey;
     }
 
     private void ProcessJoinPartitionKey(IConventionSkipNavigation skipNavigation)

diff --git a/src/EFCore.Cosmos/Query/Internal/CosmosSqlTranslatingExpressionVisitor.cs b/src/EFCore.Cosmos/Query/Internal/CosmosSqlTranslatingExpressionVisitor.cs
@@ -916,7 +916,7 @@ private static bool CanEvaluate(Expression expression)
         switch (expression)
 #pragma warning restore IDE0066 // Convert switch statement to expression
         {
-            case ConstantExpression constantExpression:
+            case ConstantExpression:
                 return true;
 
             case NewExpression newExpression:

diff --git a/src/EFCore.Cosmos/Storage/Internal/CosmosDatabaseCreator.cs b/src/EFCore.Cosmos/Storage/Internal/CosmosDatabaseCreator.cs
@@ -163,10 +163,9 @@ private IUpdateAdapter AddSeedData()
         var updateAdapter = _updateAdapterFactory.CreateStandalone();
         foreach (var entityType in _designTimeModel.Model.GetEntityTypes())
         {
-            IEntityType? targetEntityType = null;
             foreach (var targetSeed in entityType.GetSeedData())
             {
-                targetEntityType ??= updateAdapter.Model.FindEntityType(entityType.Name)!;
+                updateAdapter.Model.FindEntityType(entityType.Name);
                 var entry = updateAdapter.CreateEntry(targetSeed, entityType);
                 entry.EntityState = EntityState.Added;
             }

diff --git a/src/EFCore.Design/Design/Internal/CSharpHelper.cs b/src/EFCore.Design/Design/Internal/CSharpHelper.cs
@@ -264,23 +264,21 @@ public virtual string Identifier(string name, ICollection<string>? scope = null,
         return _keywords.Contains(identifier) ? "@" + identifier : identifier;
     }
 
-    private static StringBuilder ChangeFirstLetterCase(StringBuilder builder, bool capitalize)
+    private static void ChangeFirstLetterCase(StringBuilder builder, bool capitalize)
     {
         if (builder.Length == 0)
         {
-            return builder;
+            return;
         }
 
         var first = builder[index: 0];
         if (char.IsUpper(first) == capitalize)
         {
-            return builder;
+            return;
         }
 
         builder.Remove(startIndex: 0, length: 1)
             .Insert(index: 0, value: capitalize ? char.ToUpperInvariant(first) : char.ToLowerInvariant(first));
-
-        return builder;
     }
 
     /// <summary>

diff --git a/src/EFCore.Design/Design/Internal/DatabaseOperations.cs b/src/EFCore.Design/Design/Internal/DatabaseOperations.cs
@@ -11,7 +11,6 @@ namespace Microsoft.EntityFrameworkCore.Design.Internal;
 /// </summary>
 public class DatabaseOperations
 {
-    private readonly IOperationReporter _reporter;
     private readonly string _projectDir;
     private readonly string? _rootNamespace;
     private readonly string? _language;
@@ -35,7 +34,6 @@ public DatabaseOperations(
         bool nullable,
         string[]? args)
     {
-        _reporter = reporter;
         _projectDir = projectDir;
         _rootNamespace = rootNamespace;
         _language = language;

diff --git a/src/EFCore.Design/Design/Internal/MigrationsOperations.cs b/src/EFCore.Design/Design/Internal/MigrationsOperations.cs
@@ -18,7 +18,6 @@ public class MigrationsOperations
     private readonly string _projectDir;
     private readonly string? _rootNamespace;
     private readonly string? _language;
-    private readonly bool _nullable;
     private readonly DesignTimeServicesBuilder _servicesBuilder;
     private readonly DbContextOperations _contextOperations;
     private readonly string[] _args;
@@ -44,7 +43,6 @@ public MigrationsOperations(
         _projectDir = projectDir;
         _rootNamespace = rootNamespace;
         _language = language;
-        _nullable = nullable;
         _args = args ?? Array.Empty<string>();
         _contextOperations = new DbContextOperations(
             reporter,

diff --git a/src/EFCore.Design/Scaffolding/Internal/CSharpRuntimeModelCodeGenerator.cs b/src/EFCore.Design/Scaffolding/Internal/CSharpRuntimeModelCodeGenerator.cs
@@ -58,7 +58,7 @@ public virtual IReadOnlyCollection<ScaffoldedFile> GenerateModel(
         CompiledModelCodeGenerationOptions options)
     {
         var scaffoldedFiles = new List<ScaffoldedFile>();
-        var modelCode = CreateModel(model, options.ModelNamespace, options.ContextType, options.UseNullableReferenceTypes);
+        var modelCode = CreateModel(options.ModelNamespace, options.ContextType, options.UseNullableReferenceTypes);
         var modelFileName = options.ContextType.ShortDisplayName() + ModelSuffix + FileExtension;
         scaffoldedFiles.Add(new ScaffoldedFile { Path = modelFileName, Code = modelCode });
 
@@ -115,7 +115,6 @@ private static string GenerateHeader(SortedSet<string> namespaces, string curren
     }
 
     private string CreateModel(
-        IModel model,
         string @namespace,
         Type contextType,
         bool nullable)
@@ -306,7 +305,7 @@ private string CreateModelBuilder(
                     mainBuilder.AppendLine();
                 }
 
-                foreach (var (entityType, namePair) in entityTypeIds)
+                foreach (var (_, namePair) in entityTypeIds)
                 {
                     var (variableName, entityClassName) = namePair;
 

diff --git a/src/EFCore.Design/Scaffolding/Internal/CompiledModelScaffolder.cs b/src/EFCore.Design/Scaffolding/Internal/CompiledModelScaffolder.cs
@@ -3,7 +3,6 @@
 
 using System.Globalization;
 using System.Text;
-using Microsoft.EntityFrameworkCore.Design.Internal;
 using Microsoft.EntityFrameworkCore.Internal;
 
 namespace Microsoft.EntityFrameworkCore.Scaffolding.Internal;
@@ -16,20 +15,15 @@ namespace Microsoft.EntityFrameworkCore.Scaffolding.Internal;
 /// </summary>
 public class CompiledModelScaffolder : ICompiledModelScaffolder
 {
-    private readonly IOperationReporter _reporter;
-
     /// <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>
-    public CompiledModelScaffolder(
-        ICompiledModelCodeGeneratorSelector modelCodeGeneratorSelector,
-        IOperationReporter reporter)
+    public CompiledModelScaffolder(ICompiledModelCodeGeneratorSelector modelCodeGeneratorSelector)
     {
         ModelCodeGeneratorSelector = modelCodeGeneratorSelector;
-        _reporter = reporter;
     }
 
     /// <summary>

diff --git a/src/EFCore.Design/Scaffolding/Internal/RelationalScaffoldingModelFactory.cs b/src/EFCore.Design/Scaffolding/Internal/RelationalScaffoldingModelFactory.cs
@@ -32,7 +32,6 @@ public class RelationalScaffoldingModelFactory : IScaffoldingModelFactory
     private readonly IPluralizer _pluralizer;
     private readonly ICSharpUtilities _cSharpUtilities;
     private readonly IScaffoldingTypeMapper _scaffoldingTypeMapper;
-    private readonly LoggingDefinitions _loggingDefinitions;
     private readonly IModelRuntimeInitializer _modelRuntimeInitializer;
 
     /// <summary>
@@ -47,15 +46,13 @@ public RelationalScaffoldingModelFactory(
         IPluralizer pluralizer,
         ICSharpUtilities cSharpUtilities,
         IScaffoldingTypeMapper scaffoldingTypeMapper,
-        LoggingDefinitions loggingDefinitions,
         IModelRuntimeInitializer modelRuntimeInitializer)
     {
         _reporter = reporter;
         _candidateNamingService = candidateNamingService;
         _pluralizer = pluralizer;
         _cSharpUtilities = cSharpUtilities;
         _scaffoldingTypeMapper = scaffoldingTypeMapper;
-        _loggingDefinitions = loggingDefinitions;
         _modelRuntimeInitializer = modelRuntimeInitializer;
     }
 

diff --git a/src/EFCore.InMemory/Query/Internal/InMemoryExpressionTranslatingExpressionVisitor.cs b/src/EFCore.InMemory/Query/Internal/InMemoryExpressionTranslatingExpressionVisitor.cs
@@ -1264,7 +1264,7 @@ private static bool CanEvaluate(Expression expression)
         switch (expression)
 #pragma warning restore IDE0066 // Convert switch statement to expression
         {
-            case ConstantExpression constantExpression:
+            case ConstantExpression:
                 return true;
 
             case NewExpression newExpression:

diff --git a/src/EFCore.Relational/Design/Internal/RelationalCSharpRuntimeAnnotationCodeGenerator.cs b/src/EFCore.Relational/Design/Internal/RelationalCSharpRuntimeAnnotationCodeGenerator.cs
@@ -457,14 +457,6 @@ public override void Generate(IForeignKey foreignKey, CSharpRuntimeAnnotationCod
         base.Generate(foreignKey, parameters);
     }
 
-    /// <inheritdoc />
-    public override void Generate(INavigation navigation, CSharpRuntimeAnnotationCodeGeneratorParameters parameters)
-        => base.Generate(navigation, parameters);
-
-    /// <inheritdoc />
-    public override void Generate(ISkipNavigation navigation, CSharpRuntimeAnnotationCodeGeneratorParameters parameters)
-        => base.Generate(navigation, parameters);
-
     /// <inheritdoc />
     public override void Generate(IIndex index, CSharpRuntimeAnnotationCodeGeneratorParameters parameters)
     {

diff --git a/src/EFCore.Relational/Diagnostics/Internal/RelationalCommandDiagnosticsLogger.cs b/src/EFCore.Relational/Diagnostics/Internal/RelationalCommandDiagnosticsLogger.cs
@@ -1293,7 +1293,7 @@ public virtual InterceptionResult DataReaderDisposing(
 
             var eventData = new DataReaderDisposingEventData(
                 definition,
-                (d, p) => ((EventDefinition)d).GenerateMessage(),
+                (d, _) => ((EventDefinition)d).GenerateMessage(),
                 command,
                 dataReader,
                 connection.Context,