Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Seal all Startup, Configuration and Filter classes #16238

Merged
merged 12 commits into from
Jun 5, 2024
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion src/OrchardCore.Modules/OrchardCore.Admin/AdminFilter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace OrchardCore.Admin
/// Intercepts any request to check whether it applies to the admin site.
/// If so it marks the request as such and ensures the user as the right to access it.
/// </summary>
public class AdminFilter : ActionFilterAttribute, IAsyncPageFilter
public sealed class AdminFilter : ActionFilterAttribute, IAsyncPageFilter
{
private readonly IAuthorizationService _authorizationService;

Expand Down
4 changes: 2 additions & 2 deletions src/OrchardCore.Modules/OrchardCore.Admin/AdminMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@

namespace OrchardCore.Admin
{
public class AdminMenu : INavigationProvider
public sealed class AdminMenu : INavigationProvider
{
private static readonly RouteValueDictionary _routeValues = new()
{
{ "area", "OrchardCore.Settings" },
{ "groupId", AdminSiteSettingsDisplayDriver.GroupId },
};

protected readonly IStringLocalizer S;
internal readonly IStringLocalizer S;

public AdminMenu(IStringLocalizer<AdminMenu> localizer)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace OrchardCore.Admin
/// This filter inject a Navigation shape in the Navigation zone of the Layout
/// for any ViewResult returned from an Admin controller.
/// </summary>
public class AdminMenuFilter : IAsyncResultFilter
public sealed class AdminMenuFilter : IAsyncResultFilter
{
private readonly ILayoutAccessor _layoutAccessor;
private readonly IShapeFactory _shapeFactory;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace OrchardCore.Admin
/// This filter makes an controller that starts with Admin and Razor Pages in /Pages/Admin folder behave as
/// it had the <see cref="AdminAttribute"/>.
/// </summary>
public class AdminZoneFilter : IAsyncResourceFilter
public sealed class AdminZoneFilter : IAsyncResourceFilter
{
public Task OnResourceExecutionAsync(ResourceExecutingContext context, ResourceExecutionDelegate next)
{
Expand Down
2 changes: 1 addition & 1 deletion src/OrchardCore.Modules/OrchardCore.Admin/Permissions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace OrchardCore.Admin;

public class Permissions : IPermissionProvider
public sealed class Permissions : IPermissionProvider
{
[Obsolete("This will be removed in a future release. Instead use 'AdminPermissions.AccessAdminPanel'.")]
public static readonly Permission AccessAdminPanel = AdminPermissions.AccessAdminPanel;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace OrchardCore.Admin;

public class PermissionsAdminSettings : IPermissionProvider
public sealed class PermissionsAdminSettings : IPermissionProvider
{
public static readonly Permission ManageAdminSettings = new("ManageAdminSettings", "Manage Admin Settings");

Expand Down
8 changes: 4 additions & 4 deletions src/OrchardCore.Modules/OrchardCore.Admin/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

namespace OrchardCore.Admin
{
public class Startup : StartupBase
public sealed class Startup : StartupBase
{
private readonly AdminOptions _adminOptions;
private readonly IShellConfiguration _configuration;
Expand Down Expand Up @@ -76,7 +76,7 @@ public override void Configure(IApplicationBuilder builder, IEndpointRouteBuilde
}
}

public class AdminPagesStartup : StartupBase
public sealed class AdminPagesStartup : StartupBase
{
public override int Order
=> OrchardCoreConstants.ConfigureOrder.AdminPages;
Expand All @@ -92,7 +92,7 @@ public override void ConfigureServices(IServiceCollection services)
}

[RequireFeatures("OrchardCore.Deployment")]
public class DeploymentStartup : StartupBase
public sealed class DeploymentStartup : StartupBase
{
public override void ConfigureServices(IServiceCollection services)
{
Expand All @@ -101,7 +101,7 @@ public override void ConfigureServices(IServiceCollection services)
}

[RequireFeatures("OrchardCore.Liquid")]
public class LiquidStartup : StartupBase
public sealed class LiquidStartup : StartupBase
{
public override void ConfigureServices(IServiceCollection services)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace OrchardCore.AdminDashboard;

public class Permissions : IPermissionProvider
public sealed class Permissions : IPermissionProvider
{
public static readonly Permission ManageAdminDashboard = new("ManageAdminDashboard", "Manage the Admin Dashboard");
public static readonly Permission AccessAdminDashboard = new("AccessAdminDashboard", "Access the Admin Dashboard", new[] { ManageAdminDashboard });
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

namespace OrchardCore.AdminDashboard
{
public class Startup : StartupBase
public sealed class Startup : StartupBase
{
public override int ConfigureOrder => -10;

Expand Down
5 changes: 3 additions & 2 deletions src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@

namespace OrchardCore.AdminMenu
{
public class AdminMenu : INavigationProvider
public sealed class AdminMenu : INavigationProvider
{
private readonly AdminMenuNavigationProvidersCoordinator _adminMenuNavigationProvider;
private protected IStringLocalizer S;

internal readonly IStringLocalizer S;

public AdminMenu(AdminMenuNavigationProvidersCoordinator adminMenuNavigationProvider,
IStringLocalizer<AdminMenu> localizer)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace OrchardCore.AdminMenu;

public class Permissions : IPermissionProvider
public sealed class Permissions : IPermissionProvider
{
public static readonly Permission ManageAdminMenu = new("ManageAdminMenu", "Manage the admin menu");
public static readonly Permission ViewAdminMenuAll = new("ViewAdminMenuAll", "View Admin Menu - View All", new[] { ManageAdminMenu });
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace OrchardCore.AdminMenu.Services
// Those are classes that add new 'AdminNodes' to a 'NavigationBuilder' using custom logic specific to the module that register them.
// This class handles their inclusion on the admin menu.
// This class is itself one more 'INavigationProvider' so it can be called from this module's AdminMenu.cs.
public class AdminMenuNavigationProvidersCoordinator : INavigationProvider
public sealed class AdminMenuNavigationProvidersCoordinator : INavigationProvider
{
private readonly IAdminMenuService _adminMenuService;
private readonly IAuthorizationService _authorizationService;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace OrchardCore.AdminMenu.Services;

public class AdminMenuPermissionService : IAdminMenuPermissionService
public sealed class AdminMenuPermissionService : IAdminMenuPermissionService
{
private readonly IEnumerable<IPermissionProvider> _permissionProviders;

Expand Down
2 changes: 1 addition & 1 deletion src/OrchardCore.Modules/OrchardCore.AdminMenu/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

namespace OrchardCore.AdminMenu
{
public class Startup : StartupBase
public sealed class Startup : StartupBase
{
public override void ConfigureServices(IServiceCollection services)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
namespace OrchardCore.Alias.GraphQL
{
[RequireFeatures("OrchardCore.Apis.GraphQL")]
public class Startup : StartupBase
public sealed class Startup : StartupBase
{
public override void ConfigureServices(IServiceCollection services)
{
Expand Down
2 changes: 1 addition & 1 deletion src/OrchardCore.Modules/OrchardCore.Alias/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

namespace OrchardCore.Alias
{
public class Startup : StartupBase
public sealed class Startup : StartupBase
{
public override void ConfigureServices(IServiceCollection services)
{
Expand Down
4 changes: 2 additions & 2 deletions src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/AdminMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

namespace OrchardCore.Apis.GraphQL
{
public class AdminMenu : INavigationProvider
public sealed class AdminMenu : INavigationProvider
{
protected readonly IStringLocalizer S;
internal readonly IStringLocalizer S;

public AdminMenu(IStringLocalizer<AdminMenu> localizer)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace OrchardCore.Apis.GraphQL;

public class Permissions : IPermissionProvider
public sealed class Permissions : IPermissionProvider
{
[Obsolete("This will be removed in a future release. Instead use 'OrchardCore.Apis.GraphQL.CommonPermissions.ExecuteGraphQLMutations'.")]
public static readonly Permission ExecuteGraphQLMutations = CommonPermissions.ExecuteGraphQLMutations;
Expand Down
3 changes: 1 addition & 2 deletions src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
using OrchardCore.Apis.GraphQL.Services;
using OrchardCore.Apis.GraphQL.ValidationRules;
using OrchardCore.Environment.Shell.Configuration;
using OrchardCore.Extensions;
using OrchardCore.Json;
using OrchardCore.Json.Extensions;
using OrchardCore.Modules;
Expand All @@ -22,7 +21,7 @@

namespace OrchardCore.Apis.GraphQL
{
public class Startup : StartupBase
public sealed class Startup : StartupBase
{
private readonly IHostEnvironment _hostingEnvironment;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

namespace OrchardCore.ArchiveLater;

public class Startup : StartupBase
public sealed class Startup : StartupBase
{

public override void ConfigureServices(IServiceCollection services)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@

namespace OrchardCore.AuditTrail.Navigation
{
public class AuditTrailAdminMenu : INavigationProvider
public sealed class AuditTrailAdminMenu : INavigationProvider
{
private static readonly RouteValueDictionary _routeValues = new()
{
{ "area", "OrchardCore.AuditTrail" },
{ "correlationId", string.Empty },
};

protected readonly IStringLocalizer S;
internal readonly IStringLocalizer S;

public AuditTrailAdminMenu(IStringLocalizer<AuditTrailAdminMenu> stringLocalizer)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@

namespace OrchardCore.AuditTrail.Navigation
{
public class AuditTrailSettingsAdminMenu : INavigationProvider
public sealed class AuditTrailSettingsAdminMenu : INavigationProvider
{
private static readonly RouteValueDictionary _routeValues = new()
{
{ "area", "OrchardCore.Settings" },
{ "groupId", AuditTrailSettingsGroup.Id },
};

protected readonly IStringLocalizer S;
internal readonly IStringLocalizer S;

public AuditTrailSettingsAdminMenu(IStringLocalizer<AuditTrailSettingsAdminMenu> stringLocalizer)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace OrchardCore.AuditTrail;

public class Permissions : IPermissionProvider
public sealed class Permissions : IPermissionProvider
{
[Obsolete("This will be removed in a future release. Instead use 'OrchardCore.AuditTrail.AuditTrailPermissions.ViewAuditTrail'.")]
public static readonly Permission ViewAuditTrail = AuditTrailPermissions.ViewAuditTrail;
Expand Down
4 changes: 2 additions & 2 deletions src/OrchardCore.Modules/OrchardCore.AuditTrail/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

namespace OrchardCore.AuditTrail
{
public class Startup : StartupBase
public sealed class Startup : StartupBase
{
public override void ConfigureServices(IServiceCollection services)
{
Expand Down Expand Up @@ -124,7 +124,7 @@ public override void ConfigureServices(IServiceCollection services)
}

[RequireFeatures("OrchardCore.Deployment")]
public class DeploymentStartup : StartupBase
public sealed class DeploymentStartup : StartupBase
{
public override void ConfigureServices(IServiceCollection services)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
namespace OrchardCore.Autoroute.GraphQL
{
[RequireFeatures("OrchardCore.Apis.GraphQL")]
public class Startup : StartupBase
public sealed class Startup : StartupBase
{
public override void ConfigureServices(IServiceCollection services)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace OrchardCore.Autoroute;

public class Permissions : IPermissionProvider
public sealed class Permissions : IPermissionProvider
{
public static readonly Permission SetHomepage = new("SetHomepage", "Set homepage.");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
namespace OrchardCore.Autoroute.RemotePublishing
{
[RequireFeatures("OrchardCore.RemotePublishing")]
public class RemotePublishingStartup : StartupBase
public sealed class RemotePublishingStartup : StartupBase
{
public override void ConfigureServices(IServiceCollection services)
{
Expand Down
5 changes: 3 additions & 2 deletions src/OrchardCore.Modules/OrchardCore.Autoroute/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,10 @@

namespace OrchardCore.Autoroute
{
public class Startup : StartupBase
public sealed class Startup : StartupBase
{
public override int ConfigureOrder => -100;
public override int ConfigureOrder
=> OrchardCoreConstants.ConfigureOrder.Autoroute;

public override void ConfigureServices(IServiceCollection services)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

namespace OrchardCore.BackgroundTasks
{
public class AdminMenu : INavigationProvider
public sealed class AdminMenu : INavigationProvider
{
protected readonly IStringLocalizer S;
internal readonly IStringLocalizer S;

public AdminMenu(IStringLocalizer<AdminMenu> localizer) => S = localizer;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace OrchardCore.BackgroundTasks;

public class Permissions : IPermissionProvider
public sealed class Permissions : IPermissionProvider
{
public static readonly Permission ManageBackgroundTasks = new("ManageBackgroundTasks", "Manage background tasks");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace OrchardCore.BackgroundTasks
{
public class Startup : StartupBase
public sealed class Startup : StartupBase
{
public override void ConfigureServices(IServiceCollection services)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
namespace OrchardCore.ContentFields.GraphQL
{
[RequireFeatures("OrchardCore.Apis.GraphQL")]
public class Startup : StartupBase
public sealed class Startup : StartupBase
{
public override void ConfigureServices(IServiceCollection services)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
namespace OrchardCore.ContentFields.Media
{
[RequireFeatures("OrchardCore.Media")]
public class Startup : StartupBase
public sealed class Startup : StartupBase
{
public override void ConfigureServices(IServiceCollection services)
{
Expand Down
Loading
Loading