Replace ApplicationConfigurationBuilder by AbpApplicationConfigurationAppService

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationConfigurationBuilder.cs → framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationAppService.cs

@@ -1,24 +1,24 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Options;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Services;
 using Volo.Abp.Authorization;
-using Volo.Abp.DependencyInjection;
 using Volo.Abp.Localization;
 
 namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
 {
-    public class ApplicationConfigurationBuilder : IApplicationConfigurationBuilder, ITransientDependency
+    public class AbpApplicationConfigurationAppService : ApplicationService, IAbpApplicationConfigurationAppService
     {
         private readonly AbpLocalizationOptions _localizationOptions;
         private readonly IServiceProvider _serviceProvider;
         private readonly IAbpAuthorizationPolicyProvider _abpAuthorizationPolicyProvider;
         private readonly IAuthorizationService _authorizationService;
 
-        public ApplicationConfigurationBuilder(
+        public AbpApplicationConfigurationAppService(
             IOptions<AbpLocalizationOptions> localizationOptions,
             IServiceProvider serviceProvider,
             IAbpAuthorizationPolicyProvider abpAuthorizationPolicyProvider,
@@ -30,7 +30,7 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
             _localizationOptions = localizationOptions.Value;
         }
 
-        public async Task<ApplicationConfigurationDto> GetAsync() //TODO: Test, at least with a simple Get
+        public async Task<ApplicationConfigurationDto> GetAsync()
         {
             //TODO: Optimize & cache..?
 
@@ -66,7 +66,9 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
             {
                 var dictionary = new Dictionary<string, string>();
 
-                var localizer = _serviceProvider.GetRequiredService(typeof(IStringLocalizer<>).MakeGenericType(resource.ResourceType)) as IStringLocalizer;
+                var localizer = _serviceProvider.GetRequiredService(
+                    typeof(IStringLocalizer<>).MakeGenericType(resource.ResourceType)
+                ) as IStringLocalizer;
 
                 foreach (var localizedString in localizer.GetAllStrings())
                 {

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationController.cs

@@ -6,17 +6,18 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
     [Route("api/abp/application-configuration")]
     public class AbpApplicationConfigurationController : AbpController
     {
-        private readonly IApplicationConfigurationBuilder _configurationBuilder;
+        private readonly IAbpApplicationConfigurationAppService _applicationConfigurationAppService;
 
-        public AbpApplicationConfigurationController(IApplicationConfigurationBuilder configurationBuilder)
+        public AbpApplicationConfigurationController(
+            IAbpApplicationConfigurationAppService applicationConfigurationAppService)
         {
-            _configurationBuilder = configurationBuilder;
+            _applicationConfigurationAppService = applicationConfigurationAppService;
         }
 
         [HttpGet]
-        public Task<ApplicationConfigurationDto> Get()
+        public Task<ApplicationConfigurationDto> GetAsync()
         {
-            return _configurationBuilder.GetAsync();
+            return _applicationConfigurationAppService.GetAsync();
         }
     }
 }

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationScriptController.cs

@@ -12,14 +12,14 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
     [DisableAuditing]
     public class AbpApplicationConfigurationScriptController : AbpController
     {
-        private readonly IApplicationConfigurationBuilder _configurationBuilder;
+        private readonly IAbpApplicationConfigurationAppService _configurationAppService;
         private readonly IJsonSerializer _jsonSerializer;
 
         public AbpApplicationConfigurationScriptController(
-            IApplicationConfigurationBuilder configurationBuilder,
+            IAbpApplicationConfigurationAppService configurationAppService,
             IJsonSerializer jsonSerializer)
         {
-            _configurationBuilder = configurationBuilder;
+            _configurationAppService = configurationAppService;
             _jsonSerializer = jsonSerializer;
         }
 
@@ -28,7 +28,7 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
         public async Task<string> Get()
         {
             return CreateAbpExtendScript(
-                await _configurationBuilder.GetAsync()
+                await _configurationAppService.GetAsync()
             );
         }
 

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/IApplicationConfigurationBuilder.cs → framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/IAbpApplicationConfigurationAppService.cs

@@ -1,8 +1,9 @@
 using System.Threading.Tasks;
+using Volo.Abp.Application.Services;
 
 namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
 {
-    public interface IApplicationConfigurationBuilder
+    public interface IAbpApplicationConfigurationAppService : IApplicationService
     {
         Task<ApplicationConfigurationDto> GetAsync();
     }

framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationConfigurationBuilder_Tests.cs

@@ -9,7 +9,7 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations
         [Fact]
         public async Task ApplicationConfigurationBuilder_GetAsync()
         {
-            var applicationConfigurationBuilder = GetRequiredService<IApplicationConfigurationBuilder>();
+            var applicationConfigurationBuilder = GetRequiredService<IAbpApplicationConfigurationAppService>();
 
             var config = await applicationConfigurationBuilder.GetAsync();