Fix Analizer Rules (Non Cms Modules) (#13980)

OrchardCMS · Jul 19, 2023 · 0341ba7 · 0341ba7
1 parent b3949ce
commit 0341ba7
Show file tree

Hide file tree

Showing 229 changed files with 809 additions and 794 deletions.
diff --git a/src/OrchardCore.Modules/OrchardCore.Admin/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Admin/AdminMenu.cs
@@ -8,7 +8,7 @@ namespace OrchardCore.Admin
 {
     public class AdminMenu : INavigationProvider
     {
-        private readonly IStringLocalizer S;
+        protected readonly IStringLocalizer S;
 
         public AdminMenu(IStringLocalizer<AdminMenu> localizer)
         {

diff --git a/src/OrchardCore.Modules/OrchardCore.Admin/AdminPageRouteModelProvider.cs b/src/OrchardCore.Modules/OrchardCore.Admin/AdminPageRouteModelProvider.cs
@@ -13,7 +13,7 @@ namespace OrchardCore.Admin
 {
     internal class AdminPageRouteModelProvider : IPageRouteModelProvider
     {
-        private static readonly string RazorPageDocumentKind = "mvc.1.0.razor-page";
+        private const string RazorPageDocumentKind = "mvc.1.0.razor-page";
 
         private readonly IHostEnvironment _hostingEnvironment;
         private readonly ApplicationPartManager _applicationManager;
@@ -75,7 +75,7 @@ public void OnProvidersExecuted(PageRouteModelProviderContext context)
         {
         }
 
-        private IEnumerable<CompiledViewDescriptor> GetPageDescriptors<T>(ApplicationPartManager applicationManager) where T : ViewsFeature, new()
+        private static IEnumerable<CompiledViewDescriptor> GetPageDescriptors<T>(ApplicationPartManager applicationManager) where T : ViewsFeature, new()
         {
             if (applicationManager == null)
             {

diff --git a/src/OrchardCore.Modules/OrchardCore.Admin/Permissions.cs b/src/OrchardCore.Modules/OrchardCore.Admin/Permissions.cs
@@ -6,7 +6,7 @@ namespace OrchardCore.Admin
 {
     public class Permissions : IPermissionProvider
     {
-        public static readonly Permission AccessAdminPanel = new Permission("AccessAdminPanel", "Access admin panel");
+        public static readonly Permission AccessAdminPanel = new("AccessAdminPanel", "Access admin panel");
 
         public Task<IEnumerable<Permission>> GetPermissionsAsync()
         {
@@ -20,32 +20,36 @@ public IEnumerable<PermissionStereotype> GetDefaultStereotypes()
                 new PermissionStereotype
                 {
                     Name = "Administrator",
-                    Permissions = GetPermissions()
+                    Permissions = GetPermissions(),
                 },
-                new PermissionStereotype {
+                new PermissionStereotype
+                {
                     Name = "Editor",
-                    Permissions = GetPermissions()
+                    Permissions = GetPermissions(),
                 },
-                new PermissionStereotype {
+                new PermissionStereotype
+                {
                     Name = "Moderator",
-                    Permissions = GetPermissions()
+                    Permissions = GetPermissions(),
                 },
-                new PermissionStereotype {
+                new PermissionStereotype
+                {
                     Name = "Author",
-                    Permissions = GetPermissions()
+                    Permissions = GetPermissions(),
                 },
-                new PermissionStereotype {
+                new PermissionStereotype
+                {
                     Name = "Contributor",
-                    Permissions = GetPermissions()
+                    Permissions = GetPermissions(),
                 }
             };
         }
 
-        private IEnumerable<Permission> GetPermissions()
+        private static IEnumerable<Permission> GetPermissions()
         {
             return new[]
             {
-                AccessAdminPanel
+                AccessAdminPanel,
             };
         }
     }

diff --git a/src/OrchardCore.Modules/OrchardCore.Admin/PermissionsAdminSettings.cs b/src/OrchardCore.Modules/OrchardCore.Admin/PermissionsAdminSettings.cs
@@ -7,7 +7,7 @@ namespace OrchardCore.Admin
 {
     public class PermissionsAdminSettings : IPermissionProvider
     {
-        public static readonly Permission ManageAdminSettings = new Permission("ManageAdminSettings", "Manage Admin Settings");
+        public static readonly Permission ManageAdminSettings = new("ManageAdminSettings", "Manage Admin Settings");
 
         public Task<IEnumerable<Permission>> GetPermissionsAsync()
         {
@@ -21,7 +21,7 @@ public IEnumerable<PermissionStereotype> GetDefaultStereotypes()
                 new PermissionStereotype
                 {
                     Name = "Administrator",
-                    Permissions = new[] { ManageAdminSettings }
+                    Permissions = new[] { ManageAdminSettings },
                 }
             };
         }

diff --git a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Drivers/DashboardPartDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Drivers/DashboardPartDisplayDriver.cs
@@ -26,7 +26,7 @@ public override async Task<IDisplayResult> UpdateAsync(DashboardPart model, IUpd
             return Edit(model, context);
         }
 
-        private void BuildViewModel(DashboardPartViewModel model, DashboardPart part)
+        private static void BuildViewModel(DashboardPartViewModel model, DashboardPart part)
         {
             model.Position = part.Position;
             model.Width = part.Width;

diff --git a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Migrations.cs b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Migrations.cs
@@ -11,7 +11,7 @@ namespace OrchardCore.AdminDashboard
 {
     public class Migrations : DataMigration
     {
-        private IContentDefinitionManager _contentDefinitionManager;
+        private readonly IContentDefinitionManager _contentDefinitionManager;
         private readonly IRecipeMigrator _recipeMigrator;
 
         public Migrations(IContentDefinitionManager contentDefinitionManager, IRecipeMigrator recipeMigrator)

diff --git a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Permissions.cs b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Permissions.cs
@@ -7,8 +7,8 @@ namespace OrchardCore.AdminDashboard
 {
     public class Permissions : IPermissionProvider
     {
-        public static readonly Permission ManageAdminDashboard = new Permission("ManageAdminDashboard", "Manage the Admin Dashboard");
-        public static readonly Permission AccessAdminDashboard = new Permission("AccessAdminDashboard", "Access the Admin Dashboard", new[] { ManageAdminDashboard });
+        public static readonly Permission ManageAdminDashboard = new("ManageAdminDashboard", "Manage the Admin Dashboard");
+        public static readonly Permission AccessAdminDashboard = new("AccessAdminDashboard", "Access the Admin Dashboard", new[] { ManageAdminDashboard });
 
         public Permissions()
         {
@@ -19,7 +19,7 @@ public Task<IEnumerable<Permission>> GetPermissionsAsync()
             return Task.FromResult(new[]
             {
                 AccessAdminDashboard,
-                ManageAdminDashboard
+                ManageAdminDashboard,
             }
             .AsEnumerable());
         }
@@ -31,23 +31,27 @@ public IEnumerable<PermissionStereotype> GetDefaultStereotypes()
                 new PermissionStereotype
                 {
                     Name = "Administrator",
-                    Permissions = new[] { AccessAdminDashboard, ManageAdminDashboard }
+                    Permissions = new[] { AccessAdminDashboard, ManageAdminDashboard },
                 },
-                new PermissionStereotype {
+                new PermissionStereotype
+                {
                     Name = "Editor",
-                    Permissions = new[] { AccessAdminDashboard }
+                    Permissions = new[] { AccessAdminDashboard },
                 },
-                new PermissionStereotype {
+                new PermissionStereotype
+                {
                     Name = "Moderator",
-                    Permissions = new[] { AccessAdminDashboard }
+                    Permissions = new[] { AccessAdminDashboard },
                 },
-                new PermissionStereotype {
+                new PermissionStereotype
+                {
                     Name = "Author",
-                    Permissions = new[] { AccessAdminDashboard }
+                    Permissions = new[] { AccessAdminDashboard },
                 },
-                new PermissionStereotype {
+                new PermissionStereotype
+                {
                     Name = "Contributor",
-                    Permissions = new[] { AccessAdminDashboard }
+                    Permissions = new[] { AccessAdminDashboard },
                 }
             };
         }

diff --git a/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/AdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/AdminMenu.cs
@@ -7,7 +7,7 @@ namespace OrchardCore.Apis.GraphQL
 {
     public class AdminMenu : INavigationProvider
     {
-        private readonly IStringLocalizer S;
+        protected readonly IStringLocalizer S;
 
         public AdminMenu(IStringLocalizer<AdminMenu> localizer)
         {

diff --git a/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/GraphQLMiddleware.cs b/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/GraphQLMiddleware.cs
@@ -28,9 +28,9 @@ public class GraphQLMiddleware
         private readonly GraphQLSettings _settings;
         private readonly IDocumentExecuter _executer;
         internal static readonly Encoding _utf8Encoding = new UTF8Encoding(false);
-        private readonly static MediaType _jsonMediaType = new MediaType("application/json");
-        private readonly static MediaType _graphQlMediaType = new MediaType("application/graphql");
-        private readonly static JsonSerializerOptions _jsonSerializerOptions = new JsonSerializerOptions { WriteIndented = false, PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
+        private readonly static MediaType _jsonMediaType = new("application/json");
+        private readonly static MediaType _graphQlMediaType = new("application/graphql");
+        private readonly static JsonSerializerOptions _jsonSerializerOptions = new() { WriteIndented = false, PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
 
         public GraphQLMiddleware(
             RequestDelegate next,

diff --git a/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/OrchardFieldNameConverter.cs b/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/OrchardFieldNameConverter.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using GraphQL.Conversion;
 using GraphQL.Types;
 
@@ -13,14 +14,14 @@ public string NameForArgument(string argumentName, IComplexGraphType parentGraph
             return _defaultConverter.NameForArgument(argumentName, parentGraphType, field);
         }
 
-        // TODO: check functionality
+        // TODO: check functionality.
         public string NameForField(string fieldName, IComplexGraphType parentGraphType)
         {
             var attributes = parentGraphType?.GetType().GetCustomAttributes(typeof(GraphQLFieldNameAttribute), true);
 
             if (attributes != null)
             {
-                foreach (GraphQLFieldNameAttribute attribute in attributes)
+                foreach (var attribute in attributes.Cast<GraphQLFieldNameAttribute>())
                 {
                     if (attribute.Field == fieldName)
                     {

diff --git a/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/Permissions.cs b/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/Permissions.cs
@@ -12,7 +12,8 @@ public class Permissions : IPermissionProvider
         public Task<IEnumerable<Permission>> GetPermissionsAsync()
         {
             return Task.FromResult<IEnumerable<Permission>>(
-                new[] {
+                new[]
+                {
                     ExecuteGraphQLMutations,
                     ExecuteGraphQL,
                 }
@@ -22,9 +23,10 @@ public Task<IEnumerable<Permission>> GetPermissionsAsync()
         public IEnumerable<PermissionStereotype> GetDefaultStereotypes()
         {
             return new[] {
-                new PermissionStereotype {
+                new PermissionStereotype
+                {
                     Name = "Administrator",
-                    Permissions = new[] { ExecuteGraphQLMutations }
+                    Permissions = new[] { ExecuteGraphQLMutations },
                 }
             };
         }

diff --git a/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/Services/SchemaService.cs b/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/Services/SchemaService.cs
@@ -15,8 +15,8 @@ public class SchemaService : ISchemaFactory
     {
         private readonly IEnumerable<ISchemaBuilder> _schemaBuilders;
         private readonly IServiceProvider _serviceProvider;
-        private readonly SemaphoreSlim _schemaGenerationSemaphore = new SemaphoreSlim(1, 1);
-        private readonly ConcurrentDictionary<ISchemaBuilder, string> _identifiers = new ConcurrentDictionary<ISchemaBuilder, string>();
+        private readonly SemaphoreSlim _schemaGenerationSemaphore = new(1, 1);
+        private readonly ConcurrentDictionary<ISchemaBuilder, string> _identifiers = new();
 
         private ISchema _schema;
 
@@ -86,7 +86,7 @@ public async Task<ISchema> GetSchemaAsync()
                 {
                     var identifier = await builder.GetIdentifierAsync();
 
-                    // null being a valid value not yet updated.
+                    // Null being a valid value not yet updated.
                     if (identifier != String.Empty)
                     {
                         _identifiers[builder] = identifier;

diff --git a/...Core.Modules/OrchardCore.Apis.GraphQL/ValidationRules/MaxNumberOfResultsValidationRule.cs b/...Core.Modules/OrchardCore.Apis.GraphQL/ValidationRules/MaxNumberOfResultsValidationRule.cs
@@ -11,7 +11,7 @@ public class MaxNumberOfResultsValidationRule : IValidationRule
     {
         private readonly int _maxNumberOfResults;
         private readonly MaxNumberOfResultsValidationMode _maxNumberOfResultsValidationMode;
-        private readonly IStringLocalizer S;
+        protected readonly IStringLocalizer S;
         private readonly ILogger _logger;
 
         public MaxNumberOfResultsValidationRule(
@@ -63,8 +63,13 @@ public Task<INodeVisitor> ValidateAsync(ValidationContext validationContext)
                         }
                         else
                         {
-                            _logger.LogInformation(errorMessage);
-                            arg = new Argument(arg.NameNode, new IntValue(_maxNumberOfResults)); // if disabled mode we just log info and override the arg to be maxvalue
+                            _logger.LogInformation("'{IntValue}' exceeds the maximum number of results for '{ArgumentName}' ({MaxNumber})",
+                                value.Value,
+                                arg.Name,
+                                _maxNumberOfResults);
+
+                            // If disabled mode we just log info and override the arg to be maxvalue.
+                            arg = new Argument(arg.NameNode, new IntValue(_maxNumberOfResults));
                         }
                     }
                 }

diff --git a/...Core.Modules/OrchardCore.Apis.GraphQL/ValidationRules/RequiresPermissionValidationRule.cs b/...Core.Modules/OrchardCore.Apis.GraphQL/ValidationRules/RequiresPermissionValidationRule.cs
@@ -14,7 +14,7 @@ public class RequiresPermissionValidationRule : IValidationRule
     {
         public static readonly string ErrorCode = "Unauthorized";
         private readonly IAuthorizationService _authorizationService;
-        private readonly IStringLocalizer S;
+        protected readonly IStringLocalizer S;
 
         public RequiresPermissionValidationRule(
             IAuthorizationService authorizationService,

diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Controllers/AdminController.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Controllers/AdminController.cs
@@ -27,7 +27,7 @@ public class AdminController : Controller
         private readonly IAuditTrailAdminListQueryService _auditTrailAdminListQueryService;
         private readonly IDisplayManager<AuditTrailEvent> _displayManager;
         private readonly IDisplayManager<AuditTrailIndexOptions> _auditTrailOptionsDisplayManager;
-        private readonly IStringLocalizer S;
+        protected readonly IStringLocalizer S;
 
         public AdminController(
             IOptions<PagerOptions> pagerOptions,

diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Navigation/AuditTrailAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Navigation/AuditTrailAdminMenu.cs
@@ -8,7 +8,7 @@ namespace OrchardCore.AuditTrail.Navigation
 {
     public class AuditTrailAdminMenu : INavigationProvider
     {
-        private readonly IStringLocalizer S;
+        protected readonly IStringLocalizer S;
 
         public AuditTrailAdminMenu(IStringLocalizer<AuditTrailAdminMenu> stringLocalizer)
         {

diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Navigation/AuditTrailSettingsAdminMenu.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Navigation/AuditTrailSettingsAdminMenu.cs
@@ -8,7 +8,7 @@ namespace OrchardCore.AuditTrail.Navigation
 {
     public class AuditTrailSettingsAdminMenu : INavigationProvider
     {
-        private readonly IStringLocalizer S;
+        protected readonly IStringLocalizer S;
 
         public AuditTrailSettingsAdminMenu(IStringLocalizer<AuditTrailSettingsAdminMenu> stringLocalizer)
         {

diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Permissions.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Permissions.cs
@@ -16,7 +16,7 @@ public class Permissions : IPermissionProvider
                     Permissions = new[]
                     {
                         AuditTrailPermissions.ViewAuditTrail,
-                        AuditTrailPermissions.ManageAuditTrailSettings
+                        AuditTrailPermissions.ManageAuditTrailSettings,
                     }
                 },
             };
@@ -25,7 +25,7 @@ public class Permissions : IPermissionProvider
             Task.FromResult(new[]
             {
                 AuditTrailPermissions.ViewAuditTrail,
-                AuditTrailPermissions.ManageAuditTrailSettings
+                AuditTrailPermissions.ManageAuditTrailSettings,
             }
             .AsEnumerable());
     }

diff --git a/src/OrchardCore.Modules/OrchardCore.AuditTrail/Services/AuditTrailBackgroundTask.cs b/src/OrchardCore.Modules/OrchardCore.AuditTrail/Services/AuditTrailBackgroundTask.cs
@@ -39,7 +39,7 @@ public async Task DoWorkAsync(IServiceProvider serviceProvider, CancellationToke
 
                 logger.LogDebug("Starting Audit Trail trimming.");
                 var deletedEvents = await auditTrailManager.TrimEventsAsync(TimeSpan.FromDays(settings.RetentionDays));
-                logger.LogDebug("Audit Trail trimming completed. {0} events were deleted.", deletedEvents);
+                logger.LogDebug("Audit Trail trimming completed. {EventCount} events were deleted.", deletedEvents);
                 settings.LastRunUtc = clock.UtcNow;
 
                 var container = await siteService.LoadSiteSettingsAsync();