From 53697857abcf8dbf3f7e4b8212ab90a1ec2b356d Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Tue, 11 Jul 2023 14:26:57 +0800 Subject: [PATCH] Enable nullable annotations for Volo.Abp.AspNetCore.Mvc.Client.Common --- ...olo.Abp.AspNetCore.Mvc.Client.Common.csproj | 2 ++ .../Client/RemoteExternalLocalizationStore.cs | 6 +++--- .../Mvc/Client/RemoteFeatureChecker.cs | 2 +- .../Client/RemoteLocalizationContributor.cs | 18 +++++++++--------- .../Mvc/Client/RemoteSettingProvider.cs | 2 +- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo.Abp.AspNetCore.Mvc.Client.Common.csproj b/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo.Abp.AspNetCore.Mvc.Client.Common.csproj index 9f9ddb9755..49c0eca552 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo.Abp.AspNetCore.Mvc.Client.Common.csproj +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo.Abp.AspNetCore.Mvc.Client.Common.csproj @@ -5,6 +5,8 @@ netstandard2.0;netstandard2.1;net7.0 + enable + Nullable Volo.Abp.AspNetCore.Mvc.Client.Common Volo.Abp.AspNetCore.Mvc.Client.Common $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/RemoteExternalLocalizationStore.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/RemoteExternalLocalizationStore.cs index c5548acc62..4de2f28391 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/RemoteExternalLocalizationStore.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/RemoteExternalLocalizationStore.cs @@ -22,13 +22,13 @@ public class RemoteExternalLocalizationStore : IExternalLocalizationStore, ITran LocalizationOptions = localizationOptions.Value; } - public virtual LocalizationResourceBase GetResourceOrNull(string resourceName) + public virtual LocalizationResourceBase? GetResourceOrNull(string resourceName) { var configurationDto = ConfigurationClient.Get(); return CreateLocalizationResourceFromConfigurationOrNull(resourceName, configurationDto); } - public virtual async Task GetResourceOrNullAsync(string resourceName) + public virtual async Task GetResourceOrNullAsync(string resourceName) { var configurationDto = await ConfigurationClient.GetAsync(); return CreateLocalizationResourceFromConfigurationOrNull(resourceName, configurationDto); @@ -63,7 +63,7 @@ public class RemoteExternalLocalizationStore : IExternalLocalizationStore, ITran return resources.ToArray(); } - protected virtual LocalizationResourceBase CreateLocalizationResourceFromConfigurationOrNull( + protected virtual LocalizationResourceBase? CreateLocalizationResourceFromConfigurationOrNull( string resourceName, ApplicationConfigurationDto configurationDto) { diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/RemoteFeatureChecker.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/RemoteFeatureChecker.cs index d3969e7888..f356324445 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/RemoteFeatureChecker.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/RemoteFeatureChecker.cs @@ -13,7 +13,7 @@ public class RemoteFeatureChecker : FeatureCheckerBase ConfigurationClient = configurationClient; } - public override async Task GetOrNullAsync(string name) + public override async Task GetOrNullAsync(string name) { var configuration = await ConfigurationClient.GetAsync(); return configuration.Features.Values.GetOrDefault(name); diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/RemoteLocalizationContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/RemoteLocalizationContributor.cs index e6e180c5f2..c361186a75 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/RemoteLocalizationContributor.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/RemoteLocalizationContributor.cs @@ -14,9 +14,9 @@ public class RemoteLocalizationContributor : ILocalizationResourceContributor { public bool IsDynamic => true; - private LocalizationResourceBase _resource; - private ICachedApplicationConfigurationClient _applicationConfigurationClient; - private ILogger _logger; + private LocalizationResourceBase _resource = default!; + private ICachedApplicationConfigurationClient _applicationConfigurationClient = default!; + private ILogger _logger = default!; public void Initialize(LocalizationResourceInitializationContext context) { @@ -26,7 +26,7 @@ public class RemoteLocalizationContributor : ILocalizationResourceContributor ?? NullLogger.Instance; } - public virtual LocalizedString GetOrNull(string cultureName, string name) + public virtual LocalizedString? GetOrNull(string cultureName, string name) { /* cultureName is not used because remote localization can only * be done in the current culture. */ @@ -34,7 +34,7 @@ public class RemoteLocalizationContributor : ILocalizationResourceContributor return GetOrNullInternal(_resource.ResourceName, name); } - protected virtual LocalizedString GetOrNullInternal(string resourceName, string name) + protected virtual LocalizedString? GetOrNullInternal(string resourceName, string name) { var resource = GetResourceOrNull(resourceName); if (resource == null) @@ -50,7 +50,7 @@ public class RemoteLocalizationContributor : ILocalizationResourceContributor foreach (var baseResource in resource.BaseResources) { - value = GetOrNullInternal(baseResource, name); + value = GetOrNullInternal(baseResource, name)?.ToString(); if (value != null) { return new LocalizedString(name, value); @@ -121,19 +121,19 @@ public class RemoteLocalizationContributor : ILocalizationResourceContributor return Task.FromResult((IEnumerable)Array.Empty()); } - protected virtual ApplicationLocalizationResourceDto GetResourceOrNull(string resourceName) + protected virtual ApplicationLocalizationResourceDto? GetResourceOrNull(string resourceName) { var applicationConfigurationDto = _applicationConfigurationClient.Get(); return GetResourceOrNull(applicationConfigurationDto, resourceName); } - protected virtual async Task GetResourceOrNullAsync(string resourceName) + protected virtual async Task GetResourceOrNullAsync(string resourceName) { var applicationConfigurationDto = await _applicationConfigurationClient.GetAsync(); return GetResourceOrNull(applicationConfigurationDto, resourceName); } - protected virtual ApplicationLocalizationResourceDto GetResourceOrNull( + protected virtual ApplicationLocalizationResourceDto? GetResourceOrNull( ApplicationConfigurationDto applicationConfigurationDto, string resourceName) { diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/RemoteSettingProvider.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/RemoteSettingProvider.cs index 2599df1ef6..6553ee9881 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/RemoteSettingProvider.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/RemoteSettingProvider.cs @@ -15,7 +15,7 @@ public class RemoteSettingProvider : ISettingProvider, ITransientDependency ConfigurationClient = configurationClient; } - public async Task GetOrNullAsync(string name) + public async Task GetOrNullAsync(string name) { var configuration = await ConfigurationClient.GetAsync(); return configuration.Setting.Values.GetOrDefault(name);