Enable nullable annotations for Volo.Abp.AspNetCore.Mvc.Client.Common

framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo.Abp.AspNetCore.Mvc.Client.Common.csproj

@@ -5,6 +5,8 @@
 
     <PropertyGroup>
         <TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
+        <Nullable>enable</Nullable>
+        <WarningsAsErrors>Nullable</WarningsAsErrors>
         <AssemblyName>Volo.Abp.AspNetCore.Mvc.Client.Common</AssemblyName>
         <PackageId>Volo.Abp.AspNetCore.Mvc.Client.Common</PackageId>
         <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>

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<LocalizationResourceBase> GetResourceOrNullAsync(string resourceName)
+    public virtual async Task<LocalizationResourceBase?> 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)
     {

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<string> GetOrNullAsync(string name)
+    public override async Task<string?> GetOrNullAsync(string name)
     {
         var configuration = await ConfigurationClient.GetAsync();
         return configuration.Features.Values.GetOrDefault(name);

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 LocalizationResourceBase _resource = default!;
-    private ICachedApplicationConfigurationClient _applicationConfigurationClient;
+    private ICachedApplicationConfigurationClient _applicationConfigurationClient = default!;
-    private ILogger<RemoteLocalizationContributor> _logger;
+    private ILogger<RemoteLocalizationContributor> _logger = default!;
 
     public void Initialize(LocalizationResourceInitializationContext context)
     {
@@ -26,7 +26,7 @@ public class RemoteLocalizationContributor : ILocalizationResourceContributor
                   ?? NullLogger<RemoteLocalizationContributor>.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<string>)Array.Empty<string>());
     }
 
-    protected virtual ApplicationLocalizationResourceDto GetResourceOrNull(string resourceName)
+    protected virtual ApplicationLocalizationResourceDto? GetResourceOrNull(string resourceName)
     {
         var applicationConfigurationDto = _applicationConfigurationClient.Get();
         return GetResourceOrNull(applicationConfigurationDto, resourceName);
     }
     
-    protected virtual async Task<ApplicationLocalizationResourceDto> GetResourceOrNullAsync(string resourceName)
+    protected virtual async Task<ApplicationLocalizationResourceDto?> GetResourceOrNullAsync(string resourceName)
     {
         var applicationConfigurationDto = await _applicationConfigurationClient.GetAsync();
         return GetResourceOrNull(applicationConfigurationDto, resourceName);
     }
 
-    protected virtual ApplicationLocalizationResourceDto GetResourceOrNull(
+    protected virtual ApplicationLocalizationResourceDto? GetResourceOrNull(
         ApplicationConfigurationDto applicationConfigurationDto,
         string resourceName)
     {

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<string> GetOrNullAsync(string name)
+    public async Task<string?> GetOrNullAsync(string name)
     {
         var configuration = await ConfigurationClient.GetAsync();
         return configuration.Setting.Values.GetOrDefault(name);