From 3480625d88e7fd993d8cbc8ee2361e6f7d575e79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Tue, 9 Jul 2019 15:53:53 +0300 Subject: [PATCH] #1403 Remove IFeatureChecker sync extensions --- .../Abp/Features/FeatureCheckerExtensions.cs | 40 +------------------ 1 file changed, 1 insertion(+), 39 deletions(-) diff --git a/framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureCheckerExtensions.cs b/framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureCheckerExtensions.cs index 68bae0a5e5..8850408df0 100644 --- a/framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureCheckerExtensions.cs +++ b/framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureCheckerExtensions.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Threading.Tasks; using JetBrains.Annotations; using Volo.Abp.Authorization; -using Volo.Abp.Threading; namespace Volo.Abp.Features { @@ -22,30 +21,6 @@ namespace Volo.Abp.Features return value?.To() ?? defaultValue; } - public static string GetOrNull( - [NotNull] this IFeatureChecker featureChecker, - [NotNull] string name) - { - Check.NotNull(featureChecker, nameof(featureChecker)); - return AsyncHelper.RunSync(() => featureChecker.GetOrNullAsync(name)); - } - - public static T Get( - [NotNull] this IFeatureChecker featureChecker, - [NotNull] string name, - T defaultValue = default) - where T : struct - { - return AsyncHelper.RunSync(() => featureChecker.GetAsync(name, defaultValue)); - } - - public static bool IsEnabled( - [NotNull] this IFeatureChecker featureChecker, - [NotNull] string name) - { - return AsyncHelper.RunSync(() => featureChecker.IsEnabledAsync(name)); - } - public static async Task IsEnabledAsync(this IFeatureChecker featureChecker, bool requiresAll, params string[] featureNames) { if (featureNames.IsNullOrEmpty()) @@ -77,11 +52,6 @@ namespace Volo.Abp.Features return false; } - public static bool IsEnabled(this IFeatureChecker featureChecker, bool requiresAll, params string[] featureNames) - { - return AsyncHelper.RunSync(() => featureChecker.IsEnabledAsync(requiresAll, featureNames)); - } - public static async Task CheckEnabledAsync(this IFeatureChecker featureChecker, string featureName) { if (!(await featureChecker.IsEnabledAsync(featureName))) @@ -89,15 +59,7 @@ namespace Volo.Abp.Features throw new AbpAuthorizationException("Feature is not enabled: " + featureName); } } - - public static void CheckEnabled(this IFeatureChecker featureChecker, string featureName) - { - if (!featureChecker.IsEnabled(featureName)) - { - throw new AbpAuthorizationException("Feature is not enabled: " + featureName); - } - } - + public static async Task CheckEnabledAsync(this IFeatureChecker featureChecker, bool requiresAll, params string[] featureNames) { if (featureNames.IsNullOrEmpty())