From 0658ad8e851c313c2e7f63fecf82145cdf337435 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Thu, 27 Nov 2025 17:34:47 +0300 Subject: [PATCH] Remove JetBrains.Annotations and improve formatting Removed all usages of JetBrains.Annotations attributes and related imports from resource permission interfaces and context classes. Reformatted method signatures and constructors for better readability and consistency. --- .../Permissions/IPermissionValueProvider.cs | 1 - .../Resources/IResourcePermissionChecker.cs | 27 +++++++++++++++---- .../Resources/IResourcePermissionStore.cs | 1 - .../IResourcePermissionValueProvider.cs | 1 - .../Resources/ResourcePermissionGrantInfo.cs | 12 ++++++--- .../ResourcePermissionValueCheckContext.cs | 7 ++--- .../ResourcePermissionValuesCheckContext.cs | 11 +++----- 7 files changed, 36 insertions(+), 24 deletions(-) diff --git a/framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/IPermissionValueProvider.cs b/framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/IPermissionValueProvider.cs index ae9252632d..683f513cf4 100644 --- a/framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/IPermissionValueProvider.cs +++ b/framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/IPermissionValueProvider.cs @@ -6,7 +6,6 @@ public interface IPermissionValueProvider { string Name { get; } - //TODO: Rename to GetResult? (CheckAsync throws exception by naming convention) Task CheckAsync(PermissionValueCheckContext context); Task CheckAsync(PermissionValuesCheckContext context); diff --git a/framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/Resources/IResourcePermissionChecker.cs b/framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/Resources/IResourcePermissionChecker.cs index 5b3bf1eee1..0270d2c96b 100644 --- a/framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/Resources/IResourcePermissionChecker.cs +++ b/framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/Resources/IResourcePermissionChecker.cs @@ -1,16 +1,33 @@ using System.Security.Claims; using System.Threading.Tasks; -using JetBrains.Annotations; namespace Volo.Abp.Authorization.Permissions.Resources; public interface IResourcePermissionChecker { - Task IsGrantedAsync([NotNull] string name, string resourceName, string resourceKey); + Task IsGrantedAsync( + string name, + string resourceName, + string resourceKey + ); - Task IsGrantedAsync(ClaimsPrincipal? claimsPrincipal, [NotNull] string name, string resourceName, string resourceKey); + Task IsGrantedAsync( + ClaimsPrincipal? claimsPrincipal, + string name, + string resourceName, + string resourceKey + ); - Task IsGrantedAsync([NotNull] string[] names, string resourceName, string resourceKey); + Task IsGrantedAsync( + string[] names, + string resourceName, + string resourceKey + ); - Task IsGrantedAsync(ClaimsPrincipal? claimsPrincipal, [NotNull] string[] names, string resourceName, string resourceKey); + Task IsGrantedAsync( + ClaimsPrincipal? claimsPrincipal, + string[] names, + string resourceName, + string resourceKey + ); } diff --git a/framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/Resources/IResourcePermissionStore.cs b/framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/Resources/IResourcePermissionStore.cs index 355f3330f9..42f751b4c5 100644 --- a/framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/Resources/IResourcePermissionStore.cs +++ b/framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/Resources/IResourcePermissionStore.cs @@ -1,4 +1,3 @@ -using System.Collections.Generic; using System.Threading.Tasks; namespace Volo.Abp.Authorization.Permissions.Resources; diff --git a/framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/Resources/IResourcePermissionValueProvider.cs b/framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/Resources/IResourcePermissionValueProvider.cs index 655b2cda6e..288b878e5d 100644 --- a/framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/Resources/IResourcePermissionValueProvider.cs +++ b/framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/Resources/IResourcePermissionValueProvider.cs @@ -6,7 +6,6 @@ public interface IResourcePermissionValueProvider { string Name { get; } - //TODO: Rename to GetResult? (CheckAsync throws exception by naming convention) Task CheckAsync(ResourcePermissionValueCheckContext context); Task CheckAsync(ResourcePermissionValuesCheckContext context); diff --git a/framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/Resources/ResourcePermissionGrantInfo.cs b/framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/Resources/ResourcePermissionGrantInfo.cs index 9977c5eb2a..4eb9604454 100644 --- a/framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/Resources/ResourcePermissionGrantInfo.cs +++ b/framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/Resources/ResourcePermissionGrantInfo.cs @@ -1,6 +1,4 @@ -using JetBrains.Annotations; - -namespace Volo.Abp.Authorization.Permissions.Resources; +namespace Volo.Abp.Authorization.Permissions.Resources; public class ResourcePermissionGrantInfo : PermissionGrantInfo { @@ -8,7 +6,13 @@ public class ResourcePermissionGrantInfo : PermissionGrantInfo public string ResourceKey { get; } - public ResourcePermissionGrantInfo([NotNull] string name, bool isGranted, string resourceName, string resourceKey, string? providerName = null, string? providerKey = null) + public ResourcePermissionGrantInfo( + string name, + bool isGranted, + string resourceName, + string resourceKey, + string? providerName = null, + string? providerKey = null) : base(name, isGranted, providerName, providerKey) { ResourceName = resourceName; diff --git a/framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/Resources/ResourcePermissionValueCheckContext.cs b/framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/Resources/ResourcePermissionValueCheckContext.cs index 54e7f80e35..dc8c78be64 100644 --- a/framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/Resources/ResourcePermissionValueCheckContext.cs +++ b/framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/Resources/ResourcePermissionValueCheckContext.cs @@ -1,22 +1,19 @@ using System.Security.Claims; -using JetBrains.Annotations; namespace Volo.Abp.Authorization.Permissions.Resources; public class ResourcePermissionValueCheckContext : PermissionValueCheckContext { - [NotNull] public string ResourceName { get; } - [NotNull] public string ResourceKey { get; } - public ResourcePermissionValueCheckContext([NotNull] PermissionDefinition permission, string resourceName, string resourceKey) + public ResourcePermissionValueCheckContext(PermissionDefinition permission, string resourceName, string resourceKey) : this(permission, null, resourceName, resourceKey) { } - public ResourcePermissionValueCheckContext([NotNull] PermissionDefinition permission, ClaimsPrincipal? principal, string resourceName, string resourceKey) + public ResourcePermissionValueCheckContext(PermissionDefinition permission, ClaimsPrincipal? principal, string resourceName, string resourceKey) : base(permission, principal) { ResourceName = resourceName; diff --git a/framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/Resources/ResourcePermissionValuesCheckContext.cs b/framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/Resources/ResourcePermissionValuesCheckContext.cs index 7de44b1a0d..239f74fc19 100644 --- a/framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/Resources/ResourcePermissionValuesCheckContext.cs +++ b/framework/src/Volo.Abp.Authorization.Abstractions/Volo/Abp/Authorization/Permissions/Resources/ResourcePermissionValuesCheckContext.cs @@ -1,38 +1,35 @@ using System.Collections.Generic; using System.Security.Claims; -using JetBrains.Annotations; namespace Volo.Abp.Authorization.Permissions.Resources; public class ResourcePermissionValuesCheckContext : PermissionValuesCheckContext { - [NotNull] public string ResourceName { get; } - [NotNull] public string ResourceKey { get; } - public ResourcePermissionValuesCheckContext([NotNull] PermissionDefinition permission,string resourceName, string resourceKey) + public ResourcePermissionValuesCheckContext(PermissionDefinition permission,string resourceName, string resourceKey) : this([permission], null, resourceName, resourceKey) { } - public ResourcePermissionValuesCheckContext([NotNull] PermissionDefinition permission, ClaimsPrincipal? principal, string resourceName, string resourceKey) + public ResourcePermissionValuesCheckContext(PermissionDefinition permission, ClaimsPrincipal? principal, string resourceName, string resourceKey) : this([permission], principal, resourceName, resourceKey) { } - public ResourcePermissionValuesCheckContext([NotNull] List permissions, string resourceName, string resourceKey) + public ResourcePermissionValuesCheckContext(List permissions, string resourceName, string resourceKey) : this(permissions, null, resourceName, resourceKey) { ResourceName = resourceName; ResourceKey = resourceKey; } - public ResourcePermissionValuesCheckContext([NotNull] List permissions, ClaimsPrincipal? principal, string resourceName, string resourceKey) + public ResourcePermissionValuesCheckContext(List permissions, ClaimsPrincipal? principal, string resourceName, string resourceKey) : base(permissions, principal) { ResourceName = resourceName;