diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationConfigurationBuilder.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationAppService.cs similarity index 87% rename from framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationConfigurationBuilder.cs rename to framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationAppService.cs index 9ad4d2343e..17c1d78911 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationConfigurationBuilder.cs +++ b/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 localizationOptions, IServiceProvider serviceProvider, IAbpAuthorizationPolicyProvider abpAuthorizationPolicyProvider, @@ -30,7 +30,7 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations _localizationOptions = localizationOptions.Value; } - public async Task GetAsync() //TODO: Test, at least with a simple Get + public async Task GetAsync() { //TODO: Optimize & cache..? @@ -66,7 +66,9 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations { var dictionary = new Dictionary(); - 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()) { diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationController.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationController.cs index b117a68956..98e6d41b8e 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationController.cs +++ b/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 Get() + public Task GetAsync() { - return _configurationBuilder.GetAsync(); + return _applicationConfigurationAppService.GetAsync(); } } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationScriptController.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationScriptController.cs index 5772eceeb0..291cc3b1bf 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationScriptController.cs +++ b/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 Get() { return CreateAbpExtendScript( - await _configurationBuilder.GetAsync() + await _configurationAppService.GetAsync() ); } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/IApplicationConfigurationBuilder.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/IAbpApplicationConfigurationAppService.cs similarity index 57% rename from framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/IApplicationConfigurationBuilder.cs rename to framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/IAbpApplicationConfigurationAppService.cs index 2b820f48c6..4c521b9efc 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/IApplicationConfigurationBuilder.cs +++ b/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 GetAsync(); } diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationConfigurationBuilder_Tests.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationConfigurationBuilder_Tests.cs index 0d2e84a0cf..c5f53e4721 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationConfigurationBuilder_Tests.cs +++ b/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(); + var applicationConfigurationBuilder = GetRequiredService(); var config = await applicationConfigurationBuilder.GetAsync();