From 255640f32a30f63c7f2ab63664a182125133b908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Tue, 9 Jul 2019 16:22:02 +0300 Subject: [PATCH] Remove sync extensions for ISettingProvider --- .../AbpApplicationBuilderExtensions.cs | 2 +- .../Abp/Settings/SettingProviderExtensions.cs | 25 ------------------- 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpApplicationBuilderExtensions.cs b/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpApplicationBuilderExtensions.cs index c0cc9f228c..c139c49ba1 100644 --- a/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpApplicationBuilderExtensions.cs +++ b/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpApplicationBuilderExtensions.cs @@ -59,7 +59,7 @@ namespace Microsoft.AspNetCore.Builder languages = AsyncHelper.RunSync(() => languageProvider.GetLanguagesAsync()); var settingProvider = scope.ServiceProvider.GetRequiredService(); - defaultLanguage = settingProvider.GetOrNull(LocalizationSettingNames.DefaultLanguage); + defaultLanguage = AsyncHelper.RunSync(() => settingProvider.GetOrNullAsync(LocalizationSettingNames.DefaultLanguage)); } var options = !languages.Any() diff --git a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingProviderExtensions.cs b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingProviderExtensions.cs index d3f372baca..fb67c4ae77 100644 --- a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingProviderExtensions.cs +++ b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingProviderExtensions.cs @@ -1,8 +1,6 @@ using System; -using System.Collections.Generic; using System.Threading.Tasks; using JetBrains.Annotations; -using Volo.Abp.Threading; namespace Volo.Abp.Settings { @@ -29,28 +27,5 @@ namespace Volo.Abp.Settings var value = await settingProvider.GetOrNullAsync(name); return value?.To() ?? defaultValue; } - - public static string GetOrNull([NotNull] this ISettingProvider settingProvider, [NotNull] string name) - { - Check.NotNull(settingProvider, nameof(settingProvider)); - return AsyncHelper.RunSync(() => settingProvider.GetOrNullAsync(name)); - } - - public static List GetAll([NotNull] this ISettingProvider settingProvider) - { - Check.NotNull(settingProvider, nameof(settingProvider)); - return AsyncHelper.RunSync(settingProvider.GetAllAsync); - } - - public static T Get([NotNull] this ISettingProvider settingProvider, [NotNull] string name, T defaultValue = default) - where T : struct - { - return AsyncHelper.RunSync(() => settingProvider.GetAsync(name, defaultValue)); - } - - public static bool IsTrue([NotNull] this ISettingProvider settingProvider, [NotNull] string name) - { - return AsyncHelper.RunSync(() => settingProvider.IsTrueAsync(name)); - } } } \ No newline at end of file